oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Add disable_jump to liquids and ladders (#7688)

Browse source 
Remove second nodedef check by improving the colliding node detection
Also remove the 2nd check in old_move, correct standing node a bit
This commit is contained in:
SmallJoker 2019-06-10 13:00:35 +02:00 • committed by GitHub
parent bd6f1cca9d
commit e40be619f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 60 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/collision.h
View file

@ -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);