X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fcollision.h;h=85df02c965cc1118a699b06fb7ac59caceb0421e;hb=a462181e5fe631b816cb67a4e2cb8a870ed71840;hp=d72c6d62f1b160edd6d7f0f7f92911e35b4d8537;hpb=c738d1eeabbbe9164a25f6b69bc7ec1a3b44b051;p=oweals%2Fminetest.git

diff --git a/src/collision.h b/src/collision.h
index d72c6d62f..85df02c96 100644
--- a/src/collision.h
+++ b/src/collision.h
@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef COLLISION_HEADER
-#define COLLISION_HEADER
+#pragma once
 
 #include "irrlichttypes_bloated.h"
 #include <vector>
@@ -34,14 +33,24 @@ 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;
+	int plane = -1;
 };
 
 struct collisionMoveResult
@@ -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);
 
@@ -76,7 +85,3 @@ bool wouldCollideWithCeiling(
 		const std::vector<aabb3f> &staticboxes,
 		const aabb3f &movingbox,
 		f32 y_increase, f32 d);
-
-
-#endif
-