brossferatu/coven
Public Access
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tiny refactor

Browse Source
This commit is contained in:
Daniel Bross
2024-10-18 16:12:24 +02:00
parent 8ee000ab74
commit 1d5b4499a4
38 changed files with 645 additions and 637 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
renderer/material.jai
View File

@@ -217,7 +217,7 @@ create_material_for_passes :: (name: string, material_pass_infos: [] Material_Pa
push_context new_context {
for info: material_pass_infos {
pipeline_state := *renderer.pipeline_states[info.pipeline - 1];
pipeline_state := *engine.renderer.pipeline_states[info.pipeline - 1];
vs := get_shader(pipeline_state.vs);
ps := get_shader(pipeline_state.ps);
@@ -366,23 +366,23 @@ set_material_pass_parameters :: (material: *Material, pass_index: s64, render_pa
param.buffer_info.buffer = transform_buffer;
}
case .CAMERA_DATA; {
//param.buffer_info.buffer = renderer.engine_buffers.camera; // @Incomplete
//param.buffer_info.buffer = engine.renderer.engine_buffers.camera; // @Incomplete
}
case .MATERIAL; {
param.buffer_info.buffer = material_buffer;
}
case .DIRECTIONAL_LIGHT; {
//param.buffer_info.buffer = renderer.engine_buffers.directional_light; // @Incomplete
//param.buffer_info.buffer = engine.renderer.engine_buffers.directional_light; // @Incomplete
}
case .POINT_LIGHTS; {
//param.buffer_info.buffer = renderer.engine_buffers.point_lights; // @Incomplete
//param.buffer_info.buffer = engine.renderer.engine_buffers.point_lights; // @Incomplete
}
case .BONE_MATRICES; {
param.buffer_info.buffer = bone_buffer;
}
case .CUSTOM; {
if renderer.callbacks.get_custom_material_parameter_mapping != null {
success, mapping_info := renderer.callbacks.get_custom_material_parameter_mapping(param.mapping_str);
if engine.renderer.callbacks.get_custom_material_parameter_mapping != null {
success, mapping_info := engine.renderer.callbacks.get_custom_material_parameter_mapping(param.mapping_str);
if success {
param.buffer_info.buffer = mapping_info.buffer;
}
@@ -397,10 +397,10 @@ set_material_pass_parameters :: (material: *Material, pass_index: s64, render_pa
case .SAMPLER;
if param.mapping == {
case .REPEAT_SAMPLER; {
param.sampler = renderer.default_samplers.repeat;
param.sampler = engine.renderer.default_samplers.repeat;
}
case .CLAMP_SAMPLER; {
param.sampler = renderer.default_samplers.clamp;
param.sampler = engine.renderer.default_samplers.clamp;
}
}
if param.sampler != 0 {
@@ -435,8 +435,8 @@ set_material_pass_parameters :: (material: *Material, pass_index: s64, render_pa
input_index = 3;
}
case .CUSTOM; {
if renderer.callbacks.get_custom_material_parameter_mapping != null {
success, mapping_info := renderer.callbacks.get_custom_material_parameter_mapping(param.mapping_str);
if engine.renderer.callbacks.get_custom_material_parameter_mapping != null {
success, mapping_info := engine.renderer.callbacks.get_custom_material_parameter_mapping(param.mapping_str);
if success {
param.texture = mapping_info.texture;
}
@@ -446,12 +446,12 @@ set_material_pass_parameters :: (material: *Material, pass_index: s64, render_pa
if is_texture_input {
input := render_pass.inputs[input_index];
owning_pass := parray_get(*renderer.render_graph.render_passes, input.pass_handle);
owning_pass := parray_get(*engine.renderer.render_graph.render_passes, engine.input.pass_handle);
if input.rt_index == DEPTH_STENCIL_SLOT {
if engine.input.rt_index == DEPTH_STENCIL_SLOT {
push_cmd_set_texture(renderer, param.slot, owning_pass.depth_stencil);
} else {
push_cmd_set_texture(renderer, param.slot, owning_pass.render_targets[input.rt_index]);
push_cmd_set_texture(renderer, param.slot, owning_pass.render_targets[engine.input.rt_index]);
}
} else {
if param.texture > 0 {