Merge latest changes from master, resolving merge conflicts #20
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Instead of (0,0,0) being at a dodecahedron's center and (1,1,1) being at the vertex, this change makes it so that (0,0,0) is at the vertex and (1,1,1) is at the corner. This puts the origin where the distortion from a Euclidean cube is at its weakest.
Avoid confusion with faces as a plural nooun, which would normally correspond to polyhedral faces
nalgebra's proc macros are unhygenic and hardcode the package name as nalgebra when looking up functions, so using the matrix! and vector! macros require the ability to reference nalgebra with its full name.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request was made by creating a branch from the
AABBbranch, runninggit merge master, resolving merge conflicts, and making the following changes to fix merge conflicts that weren't automatically detected:self.world.get_mut::<Position>were replaced withself.world.get::<&mut Position>, as this was a change to hecs when it was upgraded.chunk_from_locationfunction in collision.rs,pos.x >= -epsilonwas replaced withpos.x <= pos.w + epsilonfor compatibility with Refactor dodeca.rs to make math easier to understand Ralith/hypermine#232.RealFieldinmath.rswere replaced withRealField + Copyfor compatibility with the nalgebra upgrade. Details are in Refactor dodeca.rs to make math easier to understand Ralith/hypermine#232.