Weighting start

This commit is contained in:
William Herald Snyder 2020-10-12 09:45:21 -04:00
parent 8dea6fac49
commit 2599a7203e
3 changed files with 31 additions and 4 deletions

View File

@ -34,7 +34,7 @@ class GeometrySegment:
material_name: str = "" material_name: str = ""
positions: List[Vector] = field(default_factory=list) positions: List[Vector] = field(default_factory=list)
weights: List[Tuple[int, float]] = field(default_factory=List) weights: List[Tuple[int, float]] = None
normals: List[Vector] = field(default_factory=list) normals: List[Vector] = field(default_factory=list)
colors: List[List[float]] = None colors: List[List[float]] = None
texcoords: List[Vector] = field(default_factory=list) texcoords: List[Vector] = field(default_factory=list)

View File

@ -22,6 +22,11 @@ def gather_models(apply_modifiers: bool, export_target: str) -> List[Model]:
parents = create_parents_set() parents = create_parents_set()
models_list: List[Model] = [] models_list: List[Model] = []
model_indices: Dict[str, int] = {}
for i, uneval_obj in enumerate(select_objects(export_target)):
if not (uneval_obj.type in SKIPPED_OBJECT_TYPES and uneval_obj.name not in parents):
model_indices[uneval_obj.name] = i
for uneval_obj in select_objects(export_target): for uneval_obj in select_objects(export_target):
if uneval_obj.type in SKIPPED_OBJECT_TYPES and uneval_obj.name not in parents: if uneval_obj.type in SKIPPED_OBJECT_TYPES and uneval_obj.name not in parents:
@ -49,9 +54,15 @@ def gather_models(apply_modifiers: bool, export_target: str) -> List[Model]:
else: else:
model.parent = obj.parent.name model.parent = obj.parent.name
if obj.type in MESH_OBJECT_TYPES: if obj.type in MESH_OBJECT_TYPES:
mesh = obj.to_mesh() mesh = obj.to_mesh()
model.geometry = create_mesh_geometry(mesh)
vgroups_to_indices = {}
for i, vgroup in enumerate(obj.vertex_groups):
vgroups_to_indices[i] = model_indices[vgroup.name]
model.geometry = create_mesh_geometry(mesh, vgroups_to_indices)
obj.to_mesh_clear() obj.to_mesh_clear()
_, _, world_scale = obj.matrix_world.decompose() _, _, world_scale = obj.matrix_world.decompose()
@ -83,7 +94,7 @@ def create_parents_set() -> Set[str]:
return parents return parents
def create_mesh_geometry(mesh: bpy.types.Mesh) -> List[GeometrySegment]: def create_mesh_geometry(mesh: bpy.types.Mesh, vgrps_to_indices : Dict[int, int]) -> List[GeometrySegment]:
""" Creates a list of GeometrySegment objects from a Blender mesh. """ Creates a list of GeometrySegment objects from a Blender mesh.
Does NOT create triangle strips in the GeometrySegment however. """ Does NOT create triangle strips in the GeometrySegment however. """
@ -104,6 +115,10 @@ def create_mesh_geometry(mesh: bpy.types.Mesh) -> List[GeometrySegment]:
for segment in segments: for segment in segments:
segment.colors = [] segment.colors = []
if vgrps_to_indices:
for segment in segments:
segment.weights = []
for segment, material in zip(segments, mesh.materials): for segment, material in zip(segments, mesh.materials):
segment.material_name = material.name segment.material_name = material.name
@ -157,6 +172,14 @@ def create_mesh_geometry(mesh: bpy.types.Mesh) -> List[GeometrySegment]:
segment.positions.append(convert_vector_space(mesh.vertices[vertex_index].co)) segment.positions.append(convert_vector_space(mesh.vertices[vertex_index].co))
segment.normals.append(convert_vector_space(vertex_normal)) segment.normals.append(convert_vector_space(vertex_normal))
if vgrps_to_indices is not None:
for i,grp_el in mesh.vertices[vertex_index].groups:
segment.weights.append(tuple(vgrps_to_indices[grp_el.group], grp_el.weight))
if i > 3:
break
while (i < 3):
segment.weights.append(tuple(0,0.0))
if mesh.uv_layers.active is None: if mesh.uv_layers.active is None:
segment.texcoords.append(Vector((0.0, 0.0))) segment.texcoords.append(Vector((0.0, 0.0)))
else: else:
@ -185,7 +208,8 @@ def create_mesh_geometry(mesh: bpy.types.Mesh) -> List[GeometrySegment]:
def get_model_type(obj: bpy.types.Object) -> ModelType: def get_model_type(obj: bpy.types.Object) -> ModelType:
""" Get the ModelType for a Blender object. """ """ Get the ModelType for a Blender object. """
# TODO: Skinning support, etc if obj.parent_type == "ARMATURE":
return ModelType.SKIN
if obj.type in MESH_OBJECT_TYPES: if obj.type in MESH_OBJECT_TYPES:
return ModelType.STATIC return ModelType.STATIC

View File

@ -129,6 +129,9 @@ def _write_modl(modl: Writer, model: Model, index: int, material_index: Dict[str
for segment in model.geometry: for segment in model.geometry:
with geom.create_child("SEGM") as segm: with geom.create_child("SEGM") as segm:
_write_segm(segm, segment, material_index) _write_segm(segm, segment, material_index)
if model.type = ModelType.SKIN:
with modl.create_child("ENVL") as envl:
if model.collisionprimitive is not None: if model.collisionprimitive is not None:
with modl.create_child("SWCI") as swci: with modl.create_child("SWCI") as swci: