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

Rasmusgo/quadrics gallery #443

Merged
merged 31 commits into from
Aug 25, 2023
Merged

Rasmusgo/quadrics gallery #443

merged 31 commits into from
Aug 25, 2023

Conversation

rasmusgo
Copy link
Collaborator

OculusScreenshot1692956023

  • Improve grabbing system by preserving relative pose to grabbed object.
  • Add quadrics that can be manipulated by grabbing and moving control points.
  • Render hands with lighting. (instead of unlit).
  • Improve quadrics shader to reduce artifacts.
  • Run clippy on tests in CI.

@rasmusgo
Add hologram_templates.glb
23f62d7
@rasmusgo
Use hologram_templates.glb in custom rendering example
882a39c
@rasmusgo
Add cone variations
f13141a
@rasmusgo
Hardcoded rgb checkers on quadrics
93561e8
@rasmusgo
Preserve relative pose to grabbed object
0b25f68
@rasmusgo
Add grids on quadrics with analytical box filter
a87e4b0
@rasmusgo
Adjust quadrics to have the same radius at the ends
174c94e
@rasmusgo
Grip closest object instead of first object
2403213
@rasmusgo
Add second entity for the back surface of quadrics
f8f6f8e
@rasmusgo
Only grip when button is just pressed
b2807f7
@rasmusgo
Check if hands are holding anything instead of colliding with anything
f28e9d4
@rasmusgo
Make stage navigation system work together with grabbing system
3e16a04 
Grabbing with one hand does not disable navigation with the other.
@rasmusgo
Don't use unlit material for hands
44ed996
@rasmusgo
Quadric surface solver with control points that can be moved by hand
0504abb
@rasmusgo
Tidy up surface_solver.rs
2e8b7c9
@rasmusgo
Use alternative quadratic formula
574592b
@rasmusgo
Use top-down UV-mapping for manipulable quadric
250548e
@rasmusgo
Quadric surfaces with varying number of control points
0e24234
@rasmusgo
Handle clippy warnings in tests
942712c
@rasmusgo
ci.yaml: Run clippy with --tests
78a2329
@rasmusgo
Replace gridTextureGradBox with filteredGrid
c37fc8c
@rasmusgo
Reduce flying pixels in quadrics shader and add long description/deri…
d64c758 
…vation
@rasmusgo
quadrics: Use camera as ray origin to allow for some minor optimizations
98c3cef
@rasmusgo
quadrics: Reuse boundsQTimesHitPoint
cf17f74
@rasmusgo
quadrics: Normalize rayDir for computation of hitpoint derivatives
7942995
@rasmusgo
Simple and effective clamping of hitpoint derivatives
d4c090a
@rasmusgo
Reorder computations to discard earlier
a333fca
@rasmusgo
Add hyperbolic paraboloid (saddle/pringles)
ee83884
@rasmusgo
Comments with names and equations of quadrics
b7da1de
@rasmusgo
Merge branch 'main' into rasmusgo/quadrics-gallery
85509a2 
# Conflicts:
#	hotham/src/lib.rs
#	hotham/src/systems/grabbing.rs
#	hotham/src/systems/hands.rs
kanerogers
kanerogers approved these changes Aug 25, 2023
View reviewed changes
Copy link
Collaborator

@kanerogers kanerogers left a comment

Choose a reason for hiding this comment

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

Looking fantastic!! Nice work.

@rasmusgo rasmusgo merged commit 92f622e into main Aug 25, 2023
3 checks passed
@rasmusgo rasmusgo deleted the rasmusgo/quadrics-gallery branch August 25, 2023 18:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kanerogers kanerogers kanerogers approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@rasmusgo @kanerogers