Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Break up app.rs into parts #2303

Merged
merged 27 commits into from
Jun 5, 2023
Merged

Break up app.rs into parts #2303

Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
fc1bb66
Break up app.rs into a top_panel.rs, rerun_menu.rs and, loading.rs
emilk Jun 2, 2023
0fd68e8
make re_ui private again
emilk Jun 2, 2023
563f6ff
inline once-off function
emilk Jun 2, 2023
43ea299
Make app_options private
emilk Jun 2, 2023
665d96a
Less pub(crate)
emilk Jun 2, 2023
de92245
Less pub(crate)
emilk Jun 2, 2023
846c49f
Remove unnecessary mut
emilk Jun 5, 2023
eff09ae
Move ui files to ui mod
emilk Jun 5, 2023
b275c1d
Break out the wait_screen_ui
emilk Jun 5, 2023
328219d
Remove outdated workaround for old egui bug
emilk Jun 5, 2023
6373bbd
Move mobile_warning_ui to own file
emilk Jun 5, 2023
ec0bed7
Move AppState to its own file
emilk Jun 5, 2023
a7c7f28
Create helper BackgroundTasks
emilk Jun 5, 2023
328a629
Move Profiler from AppState to App
emilk Jun 5, 2023
ae20339
Small refactor of `open` function
emilk Jun 5, 2023
a675f7f
Fix web build
emilk Jun 5, 2023
8f9081c
Break out some code from App::update
emilk Jun 5, 2023
69a65e5
Move loop_selection
emilk Jun 5, 2023
a626900
Move fn cleanup
emilk Jun 5, 2023
d149cf2
Less pub(crate)
emilk Jun 5, 2023
1b3d239
Fix web build
emilk Jun 5, 2023
e1e2b10
Less pub(crate)
emilk Jun 5, 2023
de8cafb
Better naming
emilk Jun 5, 2023
310c214
Small cleanup (use less App in interfaces)
emilk Jun 5, 2023
16a9aed
Make `Caches` non-mut
emilk Jun 5, 2023
c3bbc29
Merge `impl App {` blocks
emilk Jun 5, 2023
3ef7f88
Merge branch 'main' into emilk/app-rs
emilk Jun 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion crates/re_data_ui/src/image.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ impl EntityDataUi for Tensor {
) {
re_tracing::profile_function!();

match ctx.cache.entry::<TensorDecodeCache>().entry(self.clone()) {
let decoded = ctx.cache.entry::<TensorDecodeCache>().entry(self.clone());
match decoded {
Ok(decoded) => {
let annotations = crate::annotations(ctx, query, entity_path);
tensor_ui(
Expand Down
4 changes: 2 additions & 2 deletions crates/re_space_view_spatial/src/scene/parts/images.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ fn to_textured_rect(
let Some([height, width, _]) = tensor.image_height_width_channels() else { return None; };

let debug_name = ent_path.to_string();
let tensor_stats = ctx.cache.entry::<TensorStatsCache>().entry(tensor);
let tensor_stats = *ctx.cache.entry::<TensorStatsCache>().entry(tensor);

match gpu_bridge::tensor_to_gpu(
ctx.render_ctx,
&debug_name,
tensor,
tensor_stats,
&tensor_stats,
annotations,
) {
Ok(colormapped_texture) => {
Expand Down
Loading