summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engine/src/rendering/main_render_pass.rs14
1 files changed, 8 insertions, 6 deletions
diff --git a/engine/src/rendering/main_render_pass.rs b/engine/src/rendering/main_render_pass.rs
index ce6e040..c762231 100644
--- a/engine/src/rendering/main_render_pass.rs
+++ b/engine/src/rendering/main_render_pass.rs
@@ -751,6 +751,12 @@ fn add_set_3d_shader_renderable_bindings(
.field("lighting")
.field("material");
+ let diffuse_map_obj_id = material
+ .diffuse_map
+ .as_ref()
+ .map(|diffuse_map| ObjectId::Asset(diffuse_map.id()))
+ .unwrap_or(white_1x1_tex_obj_id);
+
render_pass.commands.extend(
[
model_3d_shader_cursor
@@ -779,17 +785,13 @@ fn add_set_3d_shader_renderable_bindings(
.ambient_map
.as_ref()
.map(|ambient_map| ObjectId::Asset(ambient_map.id()))
- .unwrap_or(white_1x1_tex_obj_id),
+ .unwrap_or(diffuse_map_obj_id),
ShaderBindingTextureKind::Texture2D,
),
)?,
main_3d_shader_cursor.field("diffuse_map").binding(
ShaderBindingValue::Texture(
- material
- .diffuse_map
- .as_ref()
- .map(|diffuse_map| ObjectId::Asset(diffuse_map.id()))
- .unwrap_or(white_1x1_tex_obj_id),
+ diffuse_map_obj_id,
ShaderBindingTextureKind::Texture2D,
),
)?,