Skip to content

Commit c838ad3

Browse files
grtlrgrtlr
committed
pipe through space origin
1 parent d112216 commit c838ad3

File tree

15 files changed

+34
-21
lines changed

15 files changed

+34
-21
lines changed

‎crates/viewer/re_view/src/view_property_ui.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ pub fn view_property_ui_with_redirect<A: Archetype + ArchetypeReflectionMarker>(
4242
viewer_ctx: ctx.viewer_ctx,
4343
view_id: redirect_with_view_id,
4444
view_class_identifier: ctx.view_class_identifier,
45+
space_origin: ctx.space_origin,
4546
view_state: ctx.view_state,
4647
query_result: &re_viewer_context::DataQueryResult::default(),
4748
},

‎crates/viewer/re_view_bar_chart/src/view_class.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ impl ViewClass for BarChartView {
144144
view_id: ViewId,
145145
) -> Result<(), ViewSystemExecutionError> {
146146
list_item::list_item_scope(ui, "bar_char_selection_ui", |ui| {
147-
let ctx = self.view_context(ctx, view_id, state);
147+
let ctx = self.view_context(ctx, view_id, state, _space_origin);
148148
view_property_ui::<PlotBackground>(&ctx, ui);
149149
view_property_ui::<PlotLegend>(&ctx, ui);
150150
});
@@ -173,7 +173,7 @@ impl ViewClass for BarChartView {
173173
.get::<BarChartVisualizerSystem>()?
174174
.charts;
175175

176-
let ctx = self.view_context(ctx, view_id, state);
176+
let ctx = self.view_context(ctx, view_id, state, query.space_origin);
177177
let background = ViewProperty::from_archetype::<PlotBackground>(
178178
blueprint_db,
179179
ctx.blueprint_query(),

‎crates/viewer/re_view_graph/src/view.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ impl ViewClass for GraphView {
182182
});
183183

184184
re_ui::list_item::list_item_scope(ui, "graph_selection_ui", |ui| {
185-
let ctx = self.view_context(ctx, view_id, state);
185+
let ctx = self.view_context(ctx, view_id, state, _space_origin);
186186
view_property_ui::<GraphBackground>(&ctx, ui);
187187
view_property_ui::<VisualBounds2D>(&ctx, ui);
188188
view_property_force_ui::<ForceLink>(&ctx, ui);
@@ -217,7 +217,7 @@ impl ViewClass for GraphView {
217217

218218
let state = state.downcast_mut::<GraphViewState>()?;
219219

220-
let view_ctx = self.view_context(ctx, query.view_id, state);
220+
let view_ctx = self.view_context(ctx, query.view_id, state, query.space_origin);
221221
let params = ForceLayoutParams::get(&view_ctx)?;
222222

223223
let background = ViewProperty::from_archetype::<GraphBackground>(

‎crates/viewer/re_view_map/src/map_view.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ impl ViewClass for MapView {
174174
view_id: ViewId,
175175
) -> Result<(), ViewSystemExecutionError> {
176176
re_ui::list_item::list_item_scope(ui, "map_selection_ui", |ui| {
177-
let ctx = self.view_context(ctx, view_id, state);
177+
let ctx = self.view_context(ctx, view_id, state, _space_origin);
178178
re_view::view_property_ui::<MapZoom>(&ctx, ui);
179179
re_view::view_property_ui::<MapBackground>(&ctx, ui);
180180
});
@@ -212,7 +212,7 @@ impl ViewClass for MapView {
212212
// Map Provider
213213
//
214214

215-
let view_ctx = self.view_context(ctx, query.view_id, state);
215+
let view_ctx = self.view_context(ctx, query.view_id, state, query.space_origin);
216216
let map_provider = map_background
217217
.component_or_fallback(&view_ctx, MapBackground::descriptor_provider().component)?;
218218
if state.selected_provider != map_provider {

‎crates/viewer/re_view_spatial/src/ui_2d.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ impl SpatialView2D {
153153
viewer_ctx: ctx,
154154
view_id: query.view_id,
155155
view_class_identifier: Self::identifier(),
156+
space_origin: query.space_origin,
156157
view_state: state,
157158
query_result: ctx.lookup_query_result(query.view_id),
158159
};
@@ -202,7 +203,7 @@ impl SpatialView2D {
202203

203204
// Convert ui coordinates to/from scene coordinates.
204205
let ui_from_scene = {
205-
let view_ctx = self.view_context(ctx, query.view_id, state);
206+
let view_ctx = self.view_context(ctx, query.view_id, state, query.space_origin);
206207
let mut new_state = state.clone();
207208
let ui_from_scene =
208209
ui_from_scene(&view_ctx, &response, &mut new_state, &bounds_property);
@@ -212,7 +213,7 @@ impl SpatialView2D {
212213
};
213214
let scene_from_ui = ui_from_scene.inverse();
214215

215-
let view_ctx = self.view_context(ctx, query.view_id, state);
216+
let view_ctx = self.view_context(ctx, query.view_id, state, query.space_origin);
216217
let near_clip_plane: blueprint_components::NearClipPlane = clip_property
217218
.component_or_fallback(
218219
&view_ctx,
@@ -279,7 +280,7 @@ impl SpatialView2D {
279280
};
280281
let mut view_builder = ViewBuilder::new(ctx.render_ctx(), target_config)?;
281282

282-
let view_ctx = self.view_context(ctx, query.view_id, state); // Recreate view state to handle context editing during picking.
283+
let view_ctx = self.view_context(ctx, query.view_id, state, query.space_origin); // Recreate view state to handle context editing during picking.
283284

284285
for draw_data in system_output.drain_draw_data() {
285286
view_builder.queue_draw(ctx.render_ctx(), draw_data);

‎crates/viewer/re_view_spatial/src/ui_3d.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ impl SpatialView3D {
145145

146146
let mut state_3d = state.state_3d.clone();
147147

148-
let view_context = self.view_context(ctx, query.view_id, state);
148+
let view_context = self.view_context(ctx, query.view_id, state, query.space_origin);
149149

150150
let information_property = ViewProperty::from_archetype::<SpatialInformation>(
151151
ctx.blueprint_db(),
@@ -321,7 +321,7 @@ impl SpatialView3D {
321321
} else {
322322
state.state_3d.eye_state.start_interpolation();
323323
state.state_3d.eye_state.focus_entity(
324-
&self.view_context(ctx, query.view_id, state),
324+
&self.view_context(ctx, query.view_id, state, query.space_origin),
325325
space_cameras,
326326
&state.bounding_boxes,
327327
&eye_property,
@@ -394,7 +394,7 @@ impl SpatialView3D {
394394
view_builder.queue_draw(ctx.render_ctx(), draw_data);
395395
}
396396

397-
let view_ctx = self.view_context(ctx, query.view_id, state);
397+
let view_ctx = self.view_context(ctx, query.view_id, state, query.space_origin);
398398

399399
// Optional 3D line grid.
400400
let grid_config = ViewProperty::from_archetype::<LineGrid3D>(

‎crates/viewer/re_view_spatial/src/view_2d.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ impl ViewClass for SpatialView2D {
232232
});
233233

234234
re_ui::list_item::list_item_scope(ui, "spatial_view2d_selection_ui", |ui| {
235-
let view_ctx = self.view_context(ctx, view_id, state);
235+
let view_ctx = self.view_context(ctx, view_id, state, _space_origin);
236236
view_property_ui::<VisualBounds2D>(&view_ctx, ui);
237237
view_property_ui::<NearClipPlane>(&view_ctx, ui);
238238
view_property_ui::<Background>(&view_ctx, ui);

‎crates/viewer/re_view_spatial/src/view_3d.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ impl ViewClass for SpatialView3D {
525525
});
526526

527527
re_ui::list_item::list_item_scope(ui, "spatial_view3d_selection_ui", |ui| {
528-
let view_ctx = self.view_context(ctx, view_id, state);
528+
let view_ctx = self.view_context(ctx, view_id, state, space_origin);
529529
view_property_ui::<SpatialInformation>(&view_ctx, ui);
530530
view_property_ui::<EyeControls3D>(&view_ctx, ui);
531531
view_property_ui::<Background>(&view_ctx, ui);

‎crates/viewer/re_view_tensor/src/view_class.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ Set the displayed dimensions in a selection panel.",
144144
});
145145

146146
list_item::list_item_scope(ui, "tensor_selection_ui", |ui| {
147-
let ctx = self.view_context(ctx, view_id, state);
147+
let ctx = self.view_context(ctx, view_id, state, _space_origin);
148148
view_property_ui::<TensorScalarMapping>(&ctx, ui);
149149
view_property_ui::<TensorViewFit>(&ctx, ui);
150150
});
@@ -238,7 +238,7 @@ Set the displayed dimensions in a selection panel.",
238238
});
239239
} else if let Some(tensor_view) = tensors.first() {
240240
state.tensor = Some(tensor_view.clone());
241-
self.view_tensor(ctx, &mut ui, state, query.view_id, &tensor_view.tensor)?;
241+
self.view_tensor(ctx, &mut ui, state, query.view_id, query.space_origin, &tensor_view.tensor)?;
242242
} else {
243243
ui.centered_and_justified(|ui| ui.label("(empty)"));
244244
}
@@ -266,6 +266,7 @@ impl TensorView {
266266
ui: &mut egui::Ui,
267267
state: &ViewTensorState,
268268
view_id: ViewId,
269+
space_origin: &EntityPath,
269270
tensor: &TensorData,
270271
) -> Result<(), ViewSystemExecutionError> {
271272
re_tracing::profile_function!();
@@ -318,7 +319,7 @@ impl TensorView {
318319
];
319320

320321
egui::ScrollArea::both().auto_shrink(false).show(ui, |ui| {
321-
let ctx = self.view_context(ctx, view_id, state);
322+
let ctx = self.view_context(ctx, view_id, state, space_origin);
322323
if let Err(err) =
323324
Self::tensor_slice_ui(&ctx, ui, state, dimension_labels, &slice_selection)
324325
{

‎crates/viewer/re_view_text_log/src/view_class.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ Filter message types and toggle column visibility in a selection panel.",
171171
let state = state.downcast_mut::<TextViewState>()?;
172172

173173
ui.list_item_scope("text_log_selection_ui", |ui| {
174-
let ctx = self.view_context(ctx, view_id, state);
174+
let ctx = self.view_context(ctx, view_id, state, _space_origin);
175175
re_view::view_property_ui::<TextLogColumns>(&ctx, ui);
176176
view_property_ui_rows(&ctx, ui);
177177
re_view::view_property_ui::<TextLogFormat>(&ctx, ui);
@@ -211,7 +211,7 @@ Filter message types and toggle column visibility in a selection panel.",
211211
query.view_id,
212212
);
213213

214-
let view_ctx = self.view_context(ctx, query.view_id, state);
214+
let view_ctx = self.view_context(ctx, query.view_id, state, query.space_origin);
215215

216216
let monospace_body = format_property.component_or_fallback::<Enabled>(
217217
&view_ctx,

0 commit comments

Comments
 (0)