bilbo/d3d10
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

header: render materials array, material_index, buffer paths

Browse Source
This commit is contained in:
Zack Buhman 2026-04-12 23:53:34 -05:00
parent 70b46b0dd8
commit 94cecfe810
2 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
collada/cpp_header.py
View File

@ -10,6 +10,7 @@ def render_input_elements(key_name, semantic__semantic_index__stride):
yield f'.semantic = "{semantic}",'
yield f".semantic_index = {semantic_index},"
yield f".format = input_format::FLOAT{stride},"
#yield f".size = {4 * stride},"
yield "},"
yield "};"
@ -95,10 +96,10 @@ def render_node_transforms(node_name, transformation_elements, render_transform)
def render_node_geometry_instance_materials(prefix, node_name, i,
items):
yield f"instance_material const {prefix}_instance_materials_{node_name}_{i}[] = {{"
for element_index, material_name, emission_input_set, ambient_input_set, diffuse_input_set, specular_input_set in items:
for element_index, material_index, emission_input_set, ambient_input_set, diffuse_input_set, specular_input_set in items:
yield "{"
yield f".element_index = {element_index}, // an index into mesh.triangles"
yield f".material = &material_{material_name},"
yield f".material_index = {material_index}, // an index into materials"
yield ""
yield f".emission = {{ .input_set = {emission_input_set} }},"
yield f".ambient = {{ .input_set = {ambient_input_set} }},"
@ -222,6 +223,12 @@ def render_library_material(material_name, effect_name):
yield f".effect = &effect_{effect_name},"
yield "};"
def render_library_materials(material_names):
yield "material const * const materials[] = {"
for material_name in material_names:
yield f"&material_{material_name},"
yield "};"
def render_input_elements_list(items):
yield "inputs const inputs_list[] = {"
for key_name, elements_count in items:
@ -244,15 +251,18 @@ def render_descriptor(namespace):
yield ".images = images,"
yield ".images_count = (sizeof (images)) / (sizeof (images[0])),"
yield ""
yield f'.position_normal_texture_buffer = "data/scenes/{namespace}/scene.vtx",'
yield f'.joint_weight_buffer = "data/scenes/{namespace}/scene.vjw",'
yield f'.index_buffer = "data/scenes/{namespace}/scene.idx",'
yield ".materials = materials,"
yield ".materials_count = (sizeof (materials)) / (sizeof (materials[0])),"
yield ""
yield f'.position_normal_texture_buffer = "data/scenes/{namespace}/{namespace}.vtx",'
yield f'.joint_weight_buffer = "data/scenes/{namespace}/{namespace}.vjw",'
yield f'.index_buffer = "data/scenes/{namespace}/{namespace}.idx",'
yield "};"
def render_prelude(namespace):
yield '#include "collada/types.h"'
yield ''
yield f'#include "data/scenes/{namespace}.h"'
yield f'#include "scenes/{namespace}/{namespace}.h"'
yield ''
yield f'namespace {namespace} {{'
yield ''

14
collada/header.py
View File

@ -64,6 +64,9 @@ class State:
input_filename: str
relative_path: bool
# material names
material_name_indices: Dict[str, int]
def __init__(self, input_filename):
self.vertex_buffer = BytesIO()
self.index_buffer = BytesIO()
@ -81,6 +84,7 @@ class State:
self.effect_textures_by_texcoord = defaultdict(list)
self.input_filename = input_filename
self.relative_path = False
self.material_name_indices = {}
def _sanitize(name):
return name.replace(' ', '_').replace('-', '_').replace('.', '_').replace('/', '_')
@ -264,6 +268,7 @@ def render_node_geometry_instance_materials(state, collada, prefix, node_name, i
# target is an XML id
material = collada.lookup(instance_material.target, types.Material)
material_name = sanitize_name(state, material.id, material)
material_index = state.material_name_indices[material_name]
channel_to_input_set = {}
for bind_vertex_input in instance_material.bind_vertex_inputs:
@ -273,7 +278,6 @@ def render_node_geometry_instance_materials(state, collada, prefix, node_name, i
else:
channel_to_input_set[bind_vertex_input.semantic] = bind_vertex_input.input_set
effect = collada.lookup(material.instance_effect.url, types.Effect)
profile_common, = effect.profile_common
shader = profile_common.technique.shader
@ -282,7 +286,7 @@ def render_node_geometry_instance_materials(state, collada, prefix, node_name, i
ambient_input_set = shader_to_input_set(channel_to_input_set, shader, attrgetter("ambient"))
diffuse_input_set = shader_to_input_set(channel_to_input_set, shader, attrgetter("diffuse"))
specular_input_set = shader_to_input_set(channel_to_input_set, shader, attrgetter("specular"))
yield element_index, material_name, emission_input_set, ambient_input_set, diffuse_input_set, specular_input_set
yield element_index, material_index, emission_input_set, ambient_input_set, diffuse_input_set, specular_input_set
yield from lang_header.render_node_geometry_instance_materials(prefix, node_name, i, items())
@ -588,11 +592,17 @@ def render_library_effects(state, collada):
def render_library_materials(state, collada):
for library_materials in collada.library_materials:
material_names = []
for material in library_materials.materials:
effect = collada.lookup(material.instance_effect.url, types.Effect)
material_name = sanitize_name(state, material.id, material)
effect_name = sanitize_name(state, effect.id, effect)
yield from lang_header.render_library_material(material_name, effect_name)
material_names.append(material_name)
yield from lang_header.render_library_materials(material_names)
for i, material_name in enumerate(material_names):
assert material_name not in state.material_name_indices, material_name
state.material_name_indices[material_name] = i
def render_input_elements_list(state):
def items():