Skip to content

Commit

Permalink
more rebase nonsense
Browse files Browse the repository at this point in the history
  • Loading branch information
teh-cmc committed Apr 19, 2024
1 parent 14fac39 commit 1acbf05
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 28 deletions.
12 changes: 6 additions & 6 deletions crates/re_space_view_spatial/src/visualizers/assets3d.rs
Original file line number Diff line number Diff line change
Expand Up @@ -183,19 +183,19 @@ impl VisualizerSystem for Asset3DVisualizer {

let resolver = ctx.recording().resolver();

let blobs = match results.get_dense::<Blob>(resolver, _query) {
let blobs = match results.get_dense::<Blob>(resolver) {
Some(Ok(blobs)) => blobs,
Some(err @ Err(_)) => err?,
_ => return Ok(()),
};

let media_types = results.get_or_empty_dense(resolver, _query)?;
let transforms = results.get_or_empty_dense(resolver, _query)?;
let media_types = results.get_or_empty_dense(resolver)?;
let transforms = results.get_or_empty_dense(resolver)?;

let data = range_zip_1x2(
blobs.range_indexed(_query.range()),
media_types.range_indexed(_query.range()),
transforms.range_indexed(_query.range()),
blobs.range_indexed(),
media_types.range_indexed(),
transforms.range_indexed(),
)
.filter_map(|(&index, blobs, media_types, transforms)| {
blobs.first().map(|blob| Asset3DComponentData {
Expand Down
12 changes: 6 additions & 6 deletions crates/re_space_view_spatial/src/visualizers/images.rs
Original file line number Diff line number Diff line change
Expand Up @@ -899,19 +899,19 @@ impl ImageVisualizer {

let resolver = ctx.recording().resolver();

let tensors = match results.get_dense::<TensorData>(resolver, _query) {
let tensors = match results.get_dense::<TensorData>(resolver) {
Some(Ok(tensors)) => tensors,
Some(err @ Err(_)) => err?,
_ => return Ok(()),
};

let colors = results.get_or_empty_dense(resolver, _query)?;
let draw_orders = results.get_or_empty_dense(resolver, _query)?;
let colors = results.get_or_empty_dense(resolver)?;
let draw_orders = results.get_or_empty_dense(resolver)?;

let mut data = range_zip_1x2(
tensors.range_indexed(_query.range()),
draw_orders.range_indexed(_query.range()),
colors.range_indexed(_query.range()),
tensors.range_indexed(),
draw_orders.range_indexed(),
colors.range_indexed(),
)
.filter_map(|(&index, tensors, draw_orders, colors)| {
tensors.first().map(|tensor| ImageComponentData {
Expand Down
32 changes: 16 additions & 16 deletions crates/re_space_view_spatial/src/visualizers/meshes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -224,29 +224,29 @@ impl VisualizerSystem for Mesh3DVisualizer {

let resolver = ctx.recording().resolver();

let vertex_positions = match results.get_dense::<Position3D>(resolver, _query) {
let vertex_positions = match results.get_dense::<Position3D>(resolver) {
Some(Ok(positions)) => positions,
Some(err @ Err(_)) => err?,
_ => return Ok(()),
};

let vertex_normals = results.get_or_empty_dense(resolver, _query)?;
let vertex_colors = results.get_or_empty_dense(resolver, _query)?;
let vertex_texcoords = results.get_or_empty_dense(resolver, _query)?;
let mesh_properties = results.get_or_empty_dense(resolver, _query)?;
let mesh_materials = results.get_or_empty_dense(resolver, _query)?;
let albedo_textures = results.get_or_empty_dense(resolver, _query)?;
let class_ids = results.get_or_empty_dense(resolver, _query)?;
let vertex_normals = results.get_or_empty_dense(resolver)?;
let vertex_colors = results.get_or_empty_dense(resolver)?;
let vertex_texcoords = results.get_or_empty_dense(resolver)?;
let mesh_properties = results.get_or_empty_dense(resolver)?;
let mesh_materials = results.get_or_empty_dense(resolver)?;
let albedo_textures = results.get_or_empty_dense(resolver)?;
let class_ids = results.get_or_empty_dense(resolver)?;

let data = range_zip_1x7(
vertex_positions.range_indexed(_query.range()),
vertex_normals.range_indexed(_query.range()),
vertex_colors.range_indexed(_query.range()),
vertex_texcoords.range_indexed(_query.range()),
mesh_properties.range_indexed(_query.range()),
mesh_materials.range_indexed(_query.range()),
albedo_textures.range_indexed(_query.range()),
class_ids.range_indexed(_query.range()),
vertex_positions.range_indexed(),
vertex_normals.range_indexed(),
vertex_colors.range_indexed(),
vertex_texcoords.range_indexed(),
mesh_properties.range_indexed(),
mesh_materials.range_indexed(),
albedo_textures.range_indexed(),
class_ids.range_indexed(),
)
.map(
|(
Expand Down

0 comments on commit 1acbf05

Please sign in to comment.