Removed root_bone_name in more places
This commit is contained in:
@@ -39,7 +39,6 @@ class PsaBuildOptions:
|
|||||||
self.export_space = 'WORLD'
|
self.export_space = 'WORLD'
|
||||||
self.forward_axis = 'X'
|
self.forward_axis = 'X'
|
||||||
self.up_axis = 'Z'
|
self.up_axis = 'Z'
|
||||||
self.root_bone_name = 'ROOT'
|
|
||||||
self.sequence_source = 'ACTIONS' # One of ('ACTIONS', 'TIMELINE_MARKERS', 'NLA_STRIPS')
|
self.sequence_source = 'ACTIONS' # One of ('ACTIONS', 'TIMELINE_MARKERS', 'NLA_STRIPS')
|
||||||
|
|
||||||
@property
|
@property
|
||||||
@@ -162,7 +161,6 @@ def build_psa(context: Context, options: PsaBuildOptions) -> Psa:
|
|||||||
psx_bone_create_result = create_psx_bones(
|
psx_bone_create_result = create_psx_bones(
|
||||||
armature_objects=armature_objects_for_bones,
|
armature_objects=armature_objects_for_bones,
|
||||||
export_space=options.export_space,
|
export_space=options.export_space,
|
||||||
root_bone_name=options.root_bone_name,
|
|
||||||
forward_axis=options.forward_axis,
|
forward_axis=options.forward_axis,
|
||||||
up_axis=options.up_axis,
|
up_axis=options.up_axis,
|
||||||
scale=options.scale,
|
scale=options.scale,
|
||||||
|
|||||||
@@ -346,14 +346,6 @@ class PSA_OT_export_collection(Operator, ExportHelper, PsaExportMixin):
|
|||||||
op = col.operator(PSK_OT_bone_collection_list_select_all.bl_idname, text='', icon='CHECKBOX_DEHLT')
|
op = col.operator(PSK_OT_bone_collection_list_select_all.bl_idname, text='', icon='CHECKBOX_DEHLT')
|
||||||
op.is_selected = False
|
op.is_selected = False
|
||||||
|
|
||||||
advanced_bones_header, advanced_bones_panel = bones_panel.panel('Advanced', default_closed=True)
|
|
||||||
advanced_bones_header.label(text='Advanced')
|
|
||||||
if advanced_bones_panel:
|
|
||||||
flow = advanced_bones_panel.grid_flow(row_major=True)
|
|
||||||
flow.use_property_split = True
|
|
||||||
flow.use_property_decorate = False
|
|
||||||
flow.prop(self, 'root_bone_name')
|
|
||||||
|
|
||||||
# Transform
|
# Transform
|
||||||
transform_header, transform_panel = layout.panel('Transform', default_closed=False)
|
transform_header, transform_panel = layout.panel('Transform', default_closed=False)
|
||||||
transform_header.label(text='Transform', icon='DRIVER_TRANSFORM')
|
transform_header.label(text='Transform', icon='DRIVER_TRANSFORM')
|
||||||
@@ -565,7 +557,6 @@ def create_psa_export_options(context: Context, armature_objects: Sequence[Objec
|
|||||||
options.scale = pg.scale
|
options.scale = pg.scale
|
||||||
options.forward_axis = pg.forward_axis
|
options.forward_axis = pg.forward_axis
|
||||||
options.up_axis = pg.up_axis
|
options.up_axis = pg.up_axis
|
||||||
options.root_bone_name = pg.root_bone_name
|
|
||||||
options.sequence_source = pg.sequence_source
|
options.sequence_source = pg.sequence_source
|
||||||
|
|
||||||
return options
|
return options
|
||||||
@@ -626,14 +617,6 @@ class PSA_OT_export(Operator, ExportHelper):
|
|||||||
rows=rows
|
rows=rows
|
||||||
)
|
)
|
||||||
|
|
||||||
bones_advanced_header, bones_advanced_panel = bones_panel.panel('Bones Advanced', default_closed=True)
|
|
||||||
bones_advanced_header.label(text='Advanced')
|
|
||||||
if bones_advanced_panel:
|
|
||||||
flow = bones_advanced_panel.grid_flow()
|
|
||||||
flow.use_property_split = True
|
|
||||||
flow.use_property_decorate = False
|
|
||||||
flow.prop(pg, 'root_bone_name', text='Root Bone Name')
|
|
||||||
|
|
||||||
# TRANSFORM
|
# TRANSFORM
|
||||||
transform_header, transform_panel = layout.panel('Advanced', default_closed=False)
|
transform_header, transform_panel = layout.panel('Advanced', default_closed=False)
|
||||||
transform_header.label(text='Transform', icon='DRIVER_TRANSFORM')
|
transform_header.label(text='Transform', icon='DRIVER_TRANSFORM')
|
||||||
|
|||||||
@@ -31,7 +31,6 @@ class PskBuildOptions(object):
|
|||||||
self.export_space = 'WORLD'
|
self.export_space = 'WORLD'
|
||||||
self.forward_axis = 'X'
|
self.forward_axis = 'X'
|
||||||
self.up_axis = 'Z'
|
self.up_axis = 'Z'
|
||||||
self.root_bone_name = 'ROOT'
|
|
||||||
|
|
||||||
|
|
||||||
class PskBuildResult(object):
|
class PskBuildResult(object):
|
||||||
@@ -99,7 +98,6 @@ def build_psk(context: Context, input_objects: PskInputObjects, options: PskBuil
|
|||||||
forward_axis=options.forward_axis,
|
forward_axis=options.forward_axis,
|
||||||
up_axis=options.up_axis,
|
up_axis=options.up_axis,
|
||||||
scale=options.scale,
|
scale=options.scale,
|
||||||
root_bone_name=options.root_bone_name,
|
|
||||||
bone_filter_mode=options.bone_filter_mode,
|
bone_filter_mode=options.bone_filter_mode,
|
||||||
bone_collection_indices=options.bone_collection_indices
|
bone_collection_indices=options.bone_collection_indices
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -179,11 +179,6 @@ class PsxBoneExportMixin:
|
|||||||
)
|
)
|
||||||
bone_collection_list: CollectionProperty(type=PSX_PG_bone_collection_list_item)
|
bone_collection_list: CollectionProperty(type=PSX_PG_bone_collection_list_item)
|
||||||
bone_collection_list_index: IntProperty(default=0, name='', description='')
|
bone_collection_list_index: IntProperty(default=0, name='', description='')
|
||||||
root_bone_name: StringProperty(
|
|
||||||
name='Root Bone Name',
|
|
||||||
description='The name of the root bone when exporting a PSK with either no armature or multiple armatures',
|
|
||||||
default='ROOT',
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class PSX_PG_scene_export(PropertyGroup, TransformMixin):
|
class PSX_PG_scene_export(PropertyGroup, TransformMixin):
|
||||||
|
|||||||
Reference in New Issue
Block a user