Texture support for raw Mesh3D logging

crates/re_renderer/src/lib.rs

@@ -79,10 +79,12 @@ pub use self::file_resolver::{
 };
 pub use self::file_server::FileServer;
 
-// Re-export used color types.
+// Re-export used color types directly.
 pub use ecolor::{Color32, Hsva, Rgba};
-// Re-export wgpu
-pub use wgpu;
+
+pub mod external {
+    pub use wgpu;
+}
 
 // ---------------------------------------------------------------------------
 

crates/re_space_view_spatial/src/mesh_cache.rs

@@ -9,7 +9,7 @@ use crate::mesh_loader::LoadedMesh;
 
 // ----------------------------------------------------------------------------
 
-#[derive(Debug, PartialEq, Eq, Hash)]
+#[derive(Debug, PartialEq, Eq, Hash, Clone)]
 pub struct MeshCacheKey {
     pub versioned_instance_path_hash: VersionedInstancePathHash,
     pub media_type: Option<MediaType>,

crates/re_space_view_spatial/src/mesh_loader.rs

@@ -233,7 +233,7 @@ fn mesh_texture_from_tensor_data(
         Ok(re_renderer::resource_managers::Texture2DCreationDesc {
             label: "mesh albedo texture from tensor data".into(),
             data,
-            format: re_renderer::wgpu::TextureFormat::Rgba8UnormSrgb,
+            format: re_renderer::external::wgpu::TextureFormat::Rgba8UnormSrgb,
             width,
             height,
         })

crates/re_space_view_spatial/src/visualizers/meshes.rs

@@ -104,15 +104,16 @@ impl Mesh3DVisualizer {
         let outline_mask_ids = ent_context.highlight.index_outline_mask(InstanceKey::SPLAT);
 
         let mesh = ctx.cache.entry(|c: &mut MeshCache| {
+            let key = MeshCacheKey {
+                versioned_instance_path_hash: picking_instance_hash.versioned(primary_row_id),
+                media_type: None,
+            };
             c.entry(
                 &ent_path.to_string(),
-                MeshCacheKey {
-                    versioned_instance_path_hash: picking_instance_hash.versioned(primary_row_id),
-                    media_type: None,
-                },
+                key.clone(),
                 AnyMesh::Mesh {
                     mesh: &mesh,
-                    texture_key: re_log_types::hash::Hash64::hash(primary_row_id).hash64(),
+                    texture_key: re_log_types::hash::Hash64::hash(&key).hash64(),
                 },
                 ctx.render_ctx,
             )

crates/re_space_view_text_log/Cargo.toml

@@ -19,8 +19,9 @@ all-features = true
 re_data_store.workspace = true
 re_data_ui.workspace = true
 re_entity_db.workspace = true
-re_log.workspace = true
 re_log_types.workspace = true
+re_log.workspace = true
+re_query_cache.workspace = true
 re_renderer.workspace = true
 re_tracing.workspace = true
 re_types.workspace = true

crates/re_types/definitions/rerun/components/texcoord2d.fbs

@@ -12,9 +12,8 @@ namespace rerun.components;
 /// A 2D texture UV coordinate.
 ///
 /// Texture coordinates specify a position on a 2D texture.
-/// A range from 0-1 in covers the entire texture in the respective dimension.
-/// The behavior for values outside of this range depends on the visualization/renderer,
-/// but will most commonly repeat the texture.
+/// A range from 0-1 covers the entire texture in the respective dimension.
+/// Unless configured otherwise, the texture repeats outside of this range.
 /// Rerun uses top-left as the origin for UV coordinates.
 ///
 ///   0     U     1

crates/re_types/definitions/rerun/datatypes/material.fbs

@@ -20,7 +20,7 @@ table Material (
   /// Optional albedo texture.
   ///
   /// Used with `vertex_texcoords` on `Mesh3D`.
-  /// Currently supports only RGB & RGBA sRGBA textures, ignoring alpha.
+  /// Currently supports only sRGB(A) textures, ignoring alpha.
   /// (meaning that the tensor must have 3 or 4 channels and use the `u8` format)
   albedo_texture: rerun.datatypes.TensorData (nullable, order: 200);
 }

crates/re_viewer_context/src/gpu_bridge/tensor_to_gpu.rs

@@ -548,7 +548,7 @@ fn pad_and_narrow_and_cast<T: Copy + Pod>(
 pub fn texture_height_width_channels(tensor: &TensorData) -> anyhow::Result<[u32; 3]> {
     use anyhow::Context as _;
 
-    let Some([mut height, width, channel]) = tensor.image_height_width_channels() else {
+    let Some([mut height, mut width, channel]) = tensor.image_height_width_channels() else {
         anyhow::bail!("Tensor with shape {:?} is not an image", tensor.shape);
     };
     height = match tensor.buffer {

rerun_py/rerun_sdk/rerun/datatypes/material_ext.py

@@ -16,7 +16,7 @@ class MaterialExt:
 
     @staticmethod
     def native_to_pa_array_override(data: MaterialArrayLike, data_type: pa.DataType) -> pa.Array:
-        from . import Material, Rgba32Type
+        from . import Material, Rgba32Type, TensorDataType
 
         # If it's a sequence of a single Material, grab the first one
         if isinstance(data, collections.abc.Sequence):
@@ -35,9 +35,11 @@ def native_to_pa_array_override(data: MaterialArrayLike, data_type: pa.DataType)
             type=Rgba32Type().storage_type,
         )
         if data.albedo_texture is not None:
-            albedo_texture = TensorDataExt.native_to_pa_array_override(data.albedo_texture, field_albedo_texture.type)
+            albedo_texture = TensorDataExt.native_to_pa_array_override(
+                data.albedo_texture, TensorDataType().storage_type
+            )
         else:
-            albedo_texture = pa.array([None], type=field_albedo_texture.type)
+            albedo_texture = pa.nulls(1, type=TensorDataType().storage_type)
 
         return pa.StructArray.from_arrays(
             arrays=[albedo_factors, albedo_texture],