/*
-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;
+
+enum CollisionType
+{
+ COLLISION_NODE,
+ COLLISION_OBJECT,
+};
+
+struct CollisionInfo
+{
+ enum CollisionType type;
+ v3s16 node_p; // COLLISION_NODE
+ bool bouncy;
+ v3f old_speed;
+ v3f new_speed;
+
+ CollisionInfo():
+ type(COLLISION_NODE),
+ node_p(-32768,-32768,-32768),
+ bouncy(false),
+ old_speed(0,0,0),
+ new_speed(0,0,0)
+ {}
+};
struct collisionMoveResult
{
bool collides;
bool collides_xz;
bool standing_on_unloaded;
+ std::vector<CollisionInfo> collisions;
collisionMoveResult():
touching_ground(false),
};
// Moves using a single iteration; speed should not exceed pos_max_d/dtime
-collisionMoveResult collisionMoveSimple(Map *map, IGameDef *gamedef,
+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);
+ v3f &pos_f, v3f &speed_f,
+ v3f &accel_f,ActiveObject* self=0,
+ bool collideWithObjects=true);
#if 0
// This doesn't seem to work and isn't used
f32 y_increase, f32 d);
-enum CollisionType
-{
- COLLISION_FALL
-};
-
-struct CollisionInfo
-{
- CollisionType t;
- f32 speed;
-};
-
#endif