Tooltips: Unify the tooltip[] and list[] description tooltip display functions (...

[oweals/minetest.git] / src / collision.h

diff --git a/src/collision.h b/src/collision.h
index 243c4b294732439b75bd562eda7915fadb940c80..1ceaba81c802752859f94da7c091faad90a63a33 100644 (file)
--- a/src/collision.h
+++ b/src/collision.h
@@ -1,6 +1,6 @@
 /*
-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
@@ -25,6 +25,31 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 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
 {
@@ -32,29 +57,25 @@ struct collisionMoveResult
        bool collides;
        bool collides_xz;
        bool standing_on_unloaded;
+       bool standing_on_object;
+       std::vector<CollisionInfo> collisions;
 
        collisionMoveResult():
                touching_ground(false),
                collides(false),
                collides_xz(false),
-               standing_on_unloaded(false)
+               standing_on_unloaded(false),
+               standing_on_object(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);
-
-#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,
-               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
@@ -62,7 +83,7 @@ collisionMoveResult collisionMovePrecise(Map *map, IGameDef *gamedef,
 // 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.
@@ -72,16 +93,5 @@ bool wouldCollideWithCeiling(
                f32 y_increase, f32 d);
 
 
-enum CollisionType
-{
-       COLLISION_FALL
-};
-
-struct CollisionInfo
-{
-       CollisionType t;
-       f32 speed;
-};
-
 #endif