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

Jump to bottom

Support projecting 3D entities in 2D views #2008

Merged
merged 41 commits into from
May 3, 2023
Merged

Support projecting 3D entities in 2D views #2008

merged 41 commits into from
May 3, 2023

Conversation

Wumpf
Copy link
Member

@Wumpf Wumpf commented Apr 30, 2023 •
edited by github-actions bot
Loading

  • always use a perspective transform to render 2d views now, taking over a pinhole camera is there is one
  • "late stage" projection transform in view builder for easy panning and zooming inside otherwise fixed perspective transform
    • shares some code with the same transform used for picking
  • transform cache deals strictly with Affine3 now
  • explicit 2D modes for point & line rendering - mainly so that we don't get perspective distortion on 2D objects now that 2D things render with perspective camera, but seems useful in general!

Fixes gfx-rs/naga#1581

3D.to.2D.2.mp4

What

Checklist

PR Build Summary: https://build.rerun.io/pr/2008

Wumpf added 24 commits April 17, 2023 16:53
@Wumpf
transform cache now deals with Affine3 matrices only
b0a6f77
@Wumpf
use a perspective camera in 2d views that sit at a space camera
40e6e1d
@Wumpf
clarify/simplify use of focal length
a252372
@Wumpf
refine camera plane distance heuristic for 2D scenes and make it conf…
23cfc66 
…igurable again
@Wumpf
Merge remote-tracking branch 'origin/main' into andreas/fix-3d-to-2d-…
f8e8a00 
…projections
@Wumpf
comment wip
c272deb
@Wumpf
Merge remote-tracking branch 'origin/main' into andreas/fix-3d-to-2d-…
bb96958 
…projections
@Wumpf
merge fixup and comment improvements
e8cf284
@Wumpf
line & point builder now work with affine transforms
0791702
@Wumpf
wip
6d5acba
@Wumpf
improved image plane heuristic for 2D
7d8ee3b
@Wumpf
hack for image plane distance for in inverse pinhole transforms. remo…
2398efe 
…ve setting from ui again for 2d views
@Wumpf
add viewport transformation to viewbuilder
338c1da
@Wumpf
better viewport transform
bf28f87
@Wumpf
limit zoom, correctly handle ui scale under viewport zoom
118c8c8
@Wumpf
2D points now draw as real 2D circles
e31277d
@Wumpf
better 2D rendering for lines with perspective camera around
2f3bcf0
@Wumpf
disable 3D labels in 2D views
53d5ff0
@Wumpf
space camera no longer required for correct pinhole camera in ui_2d
4fea9db
@Wumpf
consistent canvas rect handling, take principal point into account wh…
2584ce4 
…en displaying 2d canvas
@Wumpf
comments on the nature of our interim 3D->2D solution
65788f2
@Wumpf
point out that picking should use same transforms
39f46f4
@Wumpf
easier point/line flag building
b89d4ef
@Wumpf
minor cleanup
85414a0
@Wumpf Wumpf changed the title Fix 3d to 2d projections 3d to 2d projections Apr 30, 2023
@Wumpf Wumpf added 🔺 re_renderer affects re_renderer itself 📺 re_viewer affects re_viewer itself labels Apr 30, 2023
@Wumpf Wumpf mentioned this pull request Apr 30, 2023
Merged
2 tasks
emilk
emilk requested changes May 2, 2023
View reviewed changes
Copy link
Member

@emilk emilk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good overall, but I have some questions I want to talk through :)

crates/re_renderer/shader/point_cloud.wgsl Show resolved Hide resolved
crates/re_renderer/shader/utils/sphere_quad.wgsl Outdated Show resolved Hide resolved
crates/re_renderer/src/line_strip_builder.rs Show resolved Hide resolved
crates/re_renderer/src/renderer/lines.rs Show resolved Hide resolved
crates/re_renderer/src/renderer/point_cloud.rs Outdated Show resolved Hide resolved
crates/re_viewer/src/misc/transform_cache.rs Outdated Show resolved Hide resolved
crates/re_viewer/src/misc/transform_cache.rs Outdated Show resolved Hide resolved
crates/re_viewer/src/ui/view_spatial/ui_2d.rs Outdated Show resolved Hide resolved
crates/re_viewer/src/ui/view_spatial/ui_2d.rs Outdated Show resolved Hide resolved
crates/re_log_types/src/component_types/transform.rs Outdated Show resolved Hide resolved
@Wumpf
Copy link
Member Author

Wumpf commented May 2, 2023

almost done. Only the NDC function left (wanted to rename the fields of recttransform, add tests, add comments) and the fwidth issue @jprochazk pointed out.

@Wumpf Wumpf force-pushed the andreas/fix-3d-to-2d-projections branch from 9242d65 to ec0a980 Compare May 3, 2023 10:01
@Wumpf Wumpf requested a review from emilk May 3, 2023 10:03
@Wumpf Wumpf merged commit f1c580f into main May 3, 2023
@Wumpf Wumpf deleted the andreas/fix-3d-to-2d-projections branch May 3, 2023 13:22
This was referenced May 3, 2023
Merged
Merged
@emilk emilk changed the title 3d to 2d projections Support projecting 3D entities in 2D views May 25, 2023
@emilk emilk mentioned this pull request May 25, 2023
Closed
1 task
@pablovela5620 pablovela5620 mentioned this pull request Jun 5, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jprochazk jprochazk jprochazk left review comments

@emilk emilk Awaiting requested review from emilk

Assignees
No one assigned
Labels
🔺 re_renderer affects re_renderer itself 📺 re_viewer affects re_viewer itself
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Wumpf @emilk @jprochazk