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

types for hyperbolic space #420

Merged

patowen merged 32 commits into Ralith:master from strawberrycinnabar:master

Jul 28, 2024

Contributor

strawberrycinnabar commented Jul 23, 2024

by #264 adds MIsometry and MVector types

haiitsstrawberry added 5 commits

July 8, 2024 23:16


          added MVector in math.rs generally for points and directions in

hyperbolic space, replacing na::Vector4 when appropriate
added MIsometry in math.rs representing hyperbolic isometries, replacing na::Matrix4 when appropriate

to compensate for these changes, added inline functions passing self to
respective functions, as well as reimplementing traits

moved some functions in math.rs with MIsometry and MVector arguments to
respective impls


          Merge branch 'master' of https://github.com/Ralith/hypermine

eba688b

conflict


          reconcile merge

8f3c12d


          cleanup

5e4c4dd


          added back lorentz_normalize() fixing the test

f4a88bc

Ralith requested changes

View reviewed changes

client/src/graphics/draw.rs Outdated Show resolved Hide resolved


          decreased verbosity of some into() calls by using less verbose variat…

4d4b090

…ions

using from()

patowen reviewed

View reviewed changes

common/src/dodeca.rs Show resolved Hide resolved

patowen reviewed

View reviewed changes

common/src/dodeca.rs Outdated Show resolved Hide resolved

patowen reviewed

View reviewed changes

common/src/math.rs Outdated Show resolved Hide resolved

patowen reviewed

View reviewed changes

common/src/math.rs Outdated Show resolved Hide resolved

patowen reviewed

View reviewed changes

common/src/math.rs Outdated Show resolved Hide resolved

patowen reviewed

View reviewed changes

common/src/math.rs Outdated Show resolved Hide resolved

haiitsstrawberry added 5 commits

July 23, 2024 19:22


          removed obsolete commented out code

9c0680e


          readd accidentally removed comment

f22b047


          changed the definition of MVector::origin() for brevity

f322538


          used dual_to_node_f64() and BOUNDING_SPHERE_RADIUS_F64 for better pre…

679f3be

…cision


          formatting

7d048e6

Ralith reviewed

View reviewed changes

client/src/graphics/draw.rs Outdated Show resolved Hide resolved

haiitsstrawberry added 5 commits

July 23, 2024 21:05


          remove redundant <_>

2d8b016


          made wrapped definitions of used MulAssign and AddAssign more concise

1834ae1


          removed unused imports

dc29b03


          concision

b9ad604

concision
concision


          check pass stuff(?)

43f7603

patowen requested changes

View reviewed changes

Collaborator

patowen left a comment

I've reviewed the code more carefully this time. I believe that once my suggestions are dealt with, this PR will be ready to merge.

client/src/local_character_controller.rs Outdated Show resolved Hide resolved

common/src/math.rs Outdated Show resolved Hide resolved

common/src/math.rs Outdated Show resolved Hide resolved

common/src/math.rs Outdated Show resolved Hide resolved

common/src/math.rs Outdated Show resolved Hide resolved

common/src/collision_math.rs Outdated Show resolved Hide resolved

common/src/plane.rs Outdated Show resolved Hide resolved

common/src/plane.rs Outdated Show resolved Hide resolved

common/src/traversal.rs Outdated Show resolved Hide resolved

common/src/traversal.rs Outdated Show resolved Hide resolved

patowen requested a review from Ralith

July 27, 2024 00:05

haiitsstrawberry added 4 commits

July 26, 2024 23:34


          simplification by deref

4c0d61c


          simplify multiplication step

d99b08e


          add inline to function

9bb5b43


          group test related code together

haiitsstrawberry and others added 9 commits

July 27, 2024 00:42


          removed verbose paths having math::

1d3b6d2


          Update common/src/character_controller/collision.rs

3de15b6

Co-authored-by: Patrick <[email protected]>


          Update common/src/collision_math.rs

886b335

Co-authored-by: Patrick <[email protected]>


          Update common/src/collision_math.rs

2667a8b

Co-authored-by: Patrick <[email protected]>


          Update common/src/collision_math.rs

becd604

Co-authored-by: Patrick <[email protected]>


          Update common/src/plane.rs

061428c

Co-authored-by: Patrick <[email protected]>


          Update common/src/plane.rs

926db6e

Co-authored-by: Patrick <[email protected]>


          Update common/src/traversal.rs

cea4366

Co-authored-by: Patrick <[email protected]>


          Update common/src/traversal.rs

7dbf512

Co-authored-by: Patrick <[email protected]>

patowen requested changes

View reviewed changes

Collaborator

patowen left a comment

Looks good to me! Once you run cargo fmt on this, it should be ready to merge.

haiitsstrawberry added 3 commits

July 27, 2024 16:24

guh

4d080da

guh

fe19fec

ok

patowen approved these changes

View reviewed changes

patowen merged commit e80465d into Ralith:master

4 checks passed

Collaborator

patowen commented Jul 28, 2024

Thanks!

Collaborator

patowen commented Jul 28, 2024

The "package" job for Ubuntu failed for this PR, but that is entirely unrelated to this PR. I believe the root cause is actions/checkout#1809. I hope that a good solution is found for this before it's time to release another version of Hypermine, but otherwise, I'm not sure what the best solution will be that requires the least boring maintenance work. Ideally, these GitHub workflows shouldn't need to be edited very often at all, but this is the second time this year that the package workflows randomly broke.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet