X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fcollision.h;h=87a50282870c11cb5075bce68a99a50f7c496a95;hb=5a02c376ea5f2e7f1dd0a2bd4f08bf953ed4bfc8;hp=6d167bb7be415debaa192e61a3111f46b331ed32;hpb=af05e4b2defde537f3b953a7dae0ef44fae225aa;p=dragonfireclient.git

diff --git a/src/collision.h b/src/collision.h
index 6d167bb7b..87a502828 100644
--- a/src/collision.h
+++ b/src/collision.h
@@ -1,58 +1,88 @@
 /*
-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 General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 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 "common_irrlicht.h"
+#include "irrlichttypes_bloated.h"
+#include <vector>
 
 class Map;
+class IGameDef;
+class Environment;
+class ActiveObject;
 
-struct collisionMoveResult
+enum CollisionType
 {
-	bool touching_ground;
-
-	collisionMoveResult():
-		touching_ground(false)
-	{}
+	COLLISION_NODE,
+	COLLISION_OBJECT,
 };
 
-// Moves using a single iteration; speed should not exceed pos_max_d/dtime
-collisionMoveResult collisionMoveSimple(Map *map, f32 pos_max_d,
-		const core::aabbox3d<f32> &box_0,
-		f32 dtime, v3f &pos_f, v3f &speed_f);
-
-// Moves using as many iterations as needed
-collisionMoveResult collisionMovePrecise(Map *map, f32 pos_max_d,
-		const core::aabbox3d<f32> &box_0,
-		f32 dtime, v3f &pos_f, v3f &speed_f);
-
-enum CollisionType
+enum CollisionAxis
 {
-	COLLISION_FALL
+	COLLISION_AXIS_NONE = -1,
+	COLLISION_AXIS_X,
+	COLLISION_AXIS_Y,
+	COLLISION_AXIS_Z,
 };
 
 struct CollisionInfo
 {
-	CollisionType t;
-	f32 speed;
+	CollisionInfo() = default;
+
+	CollisionType type = COLLISION_NODE;
+	CollisionAxis axis = COLLISION_AXIS_NONE;
+	v3s16 node_p = v3s16(-32768,-32768,-32768); // COLLISION_NODE
+	ActiveObject *object = nullptr; // COLLISION_OBJECT
+	v3f old_speed;
+	v3f new_speed;
+	int plane = -1;
 };
 
-#endif
+struct collisionMoveResult
+{
+	collisionMoveResult() = default;
+
+	bool touching_ground = false;
+	bool collides = false;
+	bool standing_on_object = false;
+	std::vector<CollisionInfo> collisions;
+};
+
+// 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, ActiveObject *self=NULL,
+		bool collideWithObjects=true);
+
+// Helper function:
+// 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
+CollisionAxis axisAlignedCollision(
+		const aabb3f &staticbox, const aabb3f &movingbox,
+		const v3f &speed, f32 *dtime);
 
+// Helper function:
+// Checks if moving the movingbox up by the given distance would hit a ceiling.
+bool wouldCollideWithCeiling(
+		const std::vector<aabb3f> &staticboxes,
+		const aabb3f &movingbox,
+		f32 y_increase, f32 d);