diff options
| author | SmallJoker <SmallJoker@users.noreply.github.com> | 2019-06-10 13:00:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-10 13:00:35 +0200 |
| commit | e40be619f2a30c7a4d5042d922f0fe57539411d5 (patch) | |
| tree | dfa1bf7dd18f15e2fe3053d88b64dbb99b1ab03c /src/collision.h | |
| parent | bd6f1cca9dc357a6dbd54e86b3f575282daf6e1e (diff) | |
| download | minetest-e40be619f2a30c7a4d5042d922f0fe57539411d5.tar.gz minetest-e40be619f2a30c7a4d5042d922f0fe57539411d5.tar.bz2 minetest-e40be619f2a30c7a4d5042d922f0fe57539411d5.zip | |
Add disable_jump to liquids and ladders (#7688)
Remove second nodedef check by improving the colliding node detection
Also remove the 2nd check in old_move, correct standing node a bit
Diffstat (limited to 'src/collision.h')
| -rw-r--r-- | src/collision.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/collision.h b/src/collision.h index 4c5594528..85df02c96 100644 --- a/src/collision.h +++ b/src/collision.h @@ -33,11 +33,20 @@ enum CollisionType COLLISION_OBJECT, }; +enum CollisionAxis +{ + COLLISION_AXIS_NONE = -1, + COLLISION_AXIS_X, + COLLISION_AXIS_Y, + COLLISION_AXIS_Z, +}; + struct CollisionInfo { CollisionInfo() = default; CollisionType type = COLLISION_NODE; + CollisionAxis axis = COLLISION_AXIS_NONE; v3s16 node_p = v3s16(-32768,-32768,-32768); // COLLISION_NODE v3f old_speed; v3f new_speed; @@ -66,7 +75,7 @@ collisionMoveResult collisionMoveSimple(Environment *env,IGameDef *gamedef, // Checks for collision of a moving aabbox with a static aabbox // Returns -1 if no collision, 0 if X collision, 1 if Y collision, 2 if Z collision // dtime receives time until first collision, invalid if -1 is returned -int axisAlignedCollision( +CollisionAxis axisAlignedCollision( const aabb3f &staticbox, const aabb3f &movingbox, const v3f &speed, f32 d, f32 *dtime); |