diff --git a/crates/viewer/re_renderer/src/importer/obj.rs b/crates/viewer/re_renderer/src/importer/obj.rs index 0008a84579d38..c051edc88a012 100644 --- a/crates/viewer/re_renderer/src/importer/obj.rs +++ b/crates/viewer/re_renderer/src/importer/obj.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use re_types::components::{AlbedoFactor, Color}; +use re_types::components::Color; use smallvec::smallvec; use crate::{ @@ -26,7 +26,6 @@ pub fn load_obj_from_buffer( buffer: &[u8], ctx: &RenderContext, vertex_colors: &Option>, - albedo_factor: &Option, ) -> Result, ObjImportError> { re_tracing::profile_function!(); @@ -102,7 +101,7 @@ pub fn load_obj_from_buffer( label: "default material".into(), index_range: 0..mesh.indices.len() as u32, albedo: texture.clone(), - albedo_factor: albedo_factor.map_or(crate::Rgba::WHITE, |c| c.0.into()), + albedo_factor: crate::Rgba::WHITE, }], }; diff --git a/crates/viewer/re_renderer/src/importer/stl.rs b/crates/viewer/re_renderer/src/importer/stl.rs index f071b8511234a..a29bd553b2d53 100644 --- a/crates/viewer/re_renderer/src/importer/stl.rs +++ b/crates/viewer/re_renderer/src/importer/stl.rs @@ -31,7 +31,6 @@ pub fn load_stl_from_buffer( let Asset3D { blob, vertex_colors, - albedo_factor, .. } = asset3d; @@ -65,7 +64,7 @@ pub fn load_stl_from_buffer( label: name.clone().into(), index_range: 0..num_vertices as u32, albedo: ctx.texture_manager_2d.white_texture_unorm_handle().clone(), - albedo_factor: albedo_factor.map_or(crate::Rgba::WHITE, |c| c.0.into()), + albedo_factor: crate::Rgba::WHITE, }; let mesh = mesh::Mesh { diff --git a/crates/viewer/re_renderer_examples/framework.rs b/crates/viewer/re_renderer_examples/framework.rs index 112953fc04167..3f9f8d5c9e320 100644 --- a/crates/viewer/re_renderer_examples/framework.rs +++ b/crates/viewer/re_renderer_examples/framework.rs @@ -332,7 +332,7 @@ pub fn load_rerun_mesh(re_ctx: &RenderContext) -> Vec { diff --git a/crates/viewer/re_space_view_spatial/src/mesh_loader.rs b/crates/viewer/re_space_view_spatial/src/mesh_loader.rs index d8558245cca4c..405cdc0478767 100644 --- a/crates/viewer/re_space_view_spatial/src/mesh_loader.rs +++ b/crates/viewer/re_space_view_spatial/src/mesh_loader.rs @@ -61,7 +61,6 @@ impl LoadedMesh { bytes, render_ctx, &asset3d.vertex_colors, - &asset3d.albedo_factor, )?, MediaType::STL => { re_renderer::importer::stl::load_stl_from_buffer(asset3d, render_ctx, texture_key)?