Rename Material to AlbedoFactor

rerun-io · Jul 10, 2024 · 42d2673 · 42d2673
1 parent 9ac0b75
commit 42d2673
Show file tree

Hide file tree

Showing 60 changed files with 275 additions and 887 deletions.
diff --git a/crates/store/re_types/definitions/rerun/archetypes/mesh3d.fbs b/crates/store/re_types/definitions/rerun/archetypes/mesh3d.fbs
@@ -42,8 +42,8 @@ table Mesh3D (
   /// An optional uv texture coordinate for each vertex.
   vertex_texcoords: [rerun.components.Texcoord2D] ("attr.rerun.component_optional", nullable, order: 3200);
 
-  /// Optional material properties for the mesh as a whole.
-  mesh_material: rerun.components.Material ("attr.rerun.component_optional", nullable, order: 3300);
+  /// A color multiplier applied to the whole mesh.
+  albedo_factor: rerun.components.AlbedoFactor ("attr.rerun.component_optional", nullable, order: 3300);
 
   /// Optional albedo texture.
   ///

diff --git a/crates/store/re_types/definitions/rerun/components.fbs b/crates/store/re_types/definitions/rerun/components.fbs
@@ -1,4 +1,5 @@
 include "./components/aggregation_policy.fbs";
+include "./components/albedo_factor.fbs";
 include "./components/annotation_context.fbs";
 include "./components/axis_length.fbs";
 include "./components/blob.fbs";
@@ -20,7 +21,6 @@ include "./components/line_strip3d.fbs";
 include "./components/magnification_filter.fbs";
 include "./components/marker_shape.fbs";
 include "./components/marker_size.fbs";
-include "./components/material.fbs";
 include "./components/media_type.fbs";
 include "./components/name.fbs";
 include "./components/opacity.fbs";

diff --git a/...definitions/rerun/components/material.fbs → ...itions/rerun/components/albedo_factor.fbs b/...definitions/rerun/components/material.fbs → ...itions/rerun/components/albedo_factor.fbs
@@ -9,10 +9,10 @@ namespace rerun.components;
 
 // ---
 
-/// Material properties of a mesh, e.g. its color multiplier.
-table Material (
-  "attr.rust.derive": "Default, PartialEq, Eq"
+/// A color multiplier, usually applied to a whole entity, e.g. a mesh.
+table AlbedoFactor (
+  "attr.rust.derive": "PartialEq, Eq"
 ) {
-  material: rerun.datatypes.Material (order: 100);
+  albedo_factor: rerun.datatypes.Rgba32 (order: 100);
 }
 
diff --git a/crates/store/re_types/definitions/rerun/datatypes.fbs b/crates/store/re_types/definitions/rerun/datatypes.fbs
@@ -10,7 +10,6 @@ include "./datatypes/keypoint_id.fbs";
 include "./datatypes/keypoint_pair.fbs";
 include "./datatypes/mat3x3.fbs";
 include "./datatypes/mat4x4.fbs";
-include "./datatypes/material.fbs";
 include "./datatypes/quaternion.fbs";
 include "./datatypes/range1d.fbs";
 include "./datatypes/range2d.fbs";

diff --git a/crates/store/re_types/definitions/rerun/datatypes/material.fbs b/crates/store/re_types/definitions/rerun/datatypes/material.fbs
diff --git a/crates/store/re_types/src/archetypes/mesh3d.rs b/crates/store/re_types/src/archetypes/mesh3d.rs
diff --git a/crates/store/re_types/src/components/.gitattributes b/crates/store/re_types/src/components/.gitattributes
diff --git a/...store/re_types/src/components/material.rs → .../re_types/src/components/albedo_factor.rs b/...store/re_types/src/components/material.rs → .../re_types/src/components/albedo_factor.rs
diff --git a/crates/store/re_types/src/components/albedo_factor_ext.rs b/crates/store/re_types/src/components/albedo_factor_ext.rs
@@ -0,0 +1,10 @@
+use crate::datatypes::Rgba32;
+
+use super::AlbedoFactor;
+
+impl Default for AlbedoFactor {
+    #[inline]
+    fn default() -> Self {
+        Self(Rgba32::WHITE)
+    }
+}
diff --git a/crates/store/re_types/src/components/material_ext.rs b/crates/store/re_types/src/components/material_ext.rs
diff --git a/crates/store/re_types/src/components/mod.rs b/crates/store/re_types/src/components/mod.rs
diff --git a/crates/store/re_types/src/datatypes/.gitattributes b/crates/store/re_types/src/datatypes/.gitattributes