/*
-Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
class Map;
class IGameDef;
+class Environment;
+class ActiveObject;
-struct collisionMoveResult
+enum CollisionType
{
- bool touching_ground;
- bool collides;
- bool collides_xz;
- bool standing_on_unloaded;
+ COLLISION_NODE,
+ COLLISION_OBJECT,
+};
- collisionMoveResult():
- touching_ground(false),
- collides(false),
- collides_xz(false),
- standing_on_unloaded(false)
- {}
+struct CollisionInfo
+{
+ CollisionInfo() {}
+ CollisionType type = COLLISION_NODE;
+ v3s16 node_p = v3s16(-32768,-32768,-32768); // COLLISION_NODE
+ v3f old_speed;
+ v3f new_speed;
};
-// Moves using a single iteration; speed should not exceed pos_max_d/dtime
-collisionMoveResult collisionMoveSimple(Map *map, IGameDef *gamedef,
- f32 pos_max_d, const aabb3f &box_0,
- f32 stepheight, f32 dtime,
- v3f &pos_f, v3f &speed_f, v3f &accel_f);
+struct collisionMoveResult
+{
+ collisionMoveResult() {}
+ bool touching_ground = false;
+ bool collides = false;
+ bool standing_on_object = false;
+ std::vector<CollisionInfo> collisions;
+};
-#if 0
-// This doesn't seem to work and isn't used
-// Moves using as many iterations as needed
-collisionMoveResult collisionMovePrecise(Map *map, IGameDef *gamedef,
+// Moves using a single iteration; speed should not exceed pos_max_d/dtime
+collisionMoveResult collisionMoveSimple(Environment *env,IGameDef *gamedef,
f32 pos_max_d, const aabb3f &box_0,
f32 stepheight, f32 dtime,
- v3f &pos_f, v3f &speed_f, v3f &accel_f);
-#endif
+ v3f *pos_f, v3f *speed_f,
+ v3f accel_f, ActiveObject *self=NULL,
+ bool collideWithObjects=true);
// Helper function:
// Checks for collision of a moving aabbox with a static aabbox
// dtime receives time until first collision, invalid if -1 is returned
int axisAlignedCollision(
const aabb3f &staticbox, const aabb3f &movingbox,
- const v3f &speed, f32 d, f32 &dtime);
+ const v3f &speed, f32 d, f32 *dtime);
// Helper function:
// Checks if moving the movingbox up by the given distance would hit a ceiling.
f32 y_increase, f32 d);
-enum CollisionType
-{
- COLLISION_FALL
-};
-
-struct CollisionInfo
-{
- CollisionType t;
- f32 speed;
-};
-
#endif