attempts to improve nav- todo, make us jump less.

Author: Causeless

Source/Entities/Actor.cpp

@@ -1081,6 +1081,34 @@ void Actor::OnNewMovePath() {
 		// Nowhere to gooooo
 		m_MoveTarget = m_PrevPathTarget = m_Pos;
 	}
+
+	if (!m_MovePath.empty()) {
+		// Smash all non-airborne waypoints down to just above the ground, so they more accurately represent the ground path
+		std::list<Vector>::iterator finalItr = m_MovePath.end();
+		finalItr--;
+		Vector smashedPoint;
+		Vector previousPoint = *(m_MovePath.begin());
+		std::list<Vector>::iterator nextItr = m_MovePath.begin();
+		for (std::list<Vector>::iterator lItr = m_MovePath.begin(); lItr != finalItr; ++lItr) {
+			nextItr++;
+			smashedPoint = g_SceneMan.MovePointToGround((*lItr), m_CharHeight * 0.2, 0, g_SettingsMan.GetPathFinderGridNodeSize() * 2);
+
+			// Only smash if the new location doesn't cause the path to intersect hard terrain ahead or behind of it
+			// Try three times to halve the height to see if that won't intersect
+			for (int i = 0; i < 3; i++) {
+				Vector notUsed;
+				if (!g_SceneMan.CastStrengthRay(previousPoint, smashedPoint - previousPoint, 5, notUsed, 3, g_MaterialDoor) &&
+				    nextItr != m_MovePath.end() && !g_SceneMan.CastStrengthRay(smashedPoint, (*nextItr) - smashedPoint, 5, notUsed, 3, g_MaterialDoor)) {
+					(*lItr) = smashedPoint;
+					break;
+				} else {
+					smashedPoint.m_Y -= ((smashedPoint.m_Y - (*lItr).m_Y) / 2);
+				}
+			}
+
+			previousPoint = (*lItr);
+		}
+	}
 }
 
 void Actor::PreControllerUpdate() {

Source/Lua/LuaBindingsManagers.cpp

@@ -345,9 +345,10 @@ LuaBindingRegisterFunctionDefinitionForType(ManagerLuaBindings, SceneMan) {
 	    .def("CastObstacleRay", &LuaAdaptersSceneMan::CastObstacleRay2)
 	    .def("CastTerrainPenetrationRay", &SceneMan::CastTerrainPenetrationRay)
 	    .def("GetLastRayHitPos", &SceneMan::GetLastRayHitPos)
-	    .def("FindAltitude", (float(SceneMan::*)(const Vector&, int, int)) & SceneMan::FindAltitude)
-	    .def("FindAltitude", (float(SceneMan::*)(const Vector&, int, int, bool)) & SceneMan::FindAltitude)
-	    .def("MovePointToGround", &SceneMan::MovePointToGround)
+	    .def("FindAltitude", (float(SceneMan::*)(const Vector&, int, int)) &SceneMan::FindAltitude)
+	    .def("FindAltitude", (float(SceneMan::*)(const Vector&, int, int, bool)) &SceneMan::FindAltitude)
+	    .def("MovePointToGround", (Vector(SceneMan::*)(const Vector&, int, int)) &SceneMan::MovePointToGround)
+	    .def("MovePointToGround", (Vector(SceneMan::*)(const Vector&, int, int, int)) &SceneMan::MovePointToGround)
 	    .def("IsWithinBounds", &SceneMan::IsWithinBounds)
 	    .def("ForceBounds", (bool(SceneMan::*)(Vector&) const) & SceneMan::ForceBounds) //, out_value(_2))
 	    .def("WrapPosition", (bool(SceneMan::*)(Vector&) const) & SceneMan::WrapPosition) //, out_value(_2))

Source/Managers/SceneMan.cpp

@@ -2242,7 +2242,7 @@ bool SceneMan::IsPointInNoGravArea(const Vector& point) const {
 	return false;
 }
 
-Vector SceneMan::MovePointToGround(const Vector& from, int maxAltitude, int accuracy) {
+Vector SceneMan::MovePointToGround(const Vector& from, int maxAltitude, int accuracy, int maxDistance) {
 	if (IsPointInNoGravArea(from)) {
 		return from;
 	}
@@ -2253,7 +2253,7 @@ Vector SceneMan::MovePointToGround(const Vector& from, int maxAltitude, int accu
 	float altitude = FindAltitude(temp, g_SceneMan.GetSceneHeight(), accuracy);
 
 	// If there's no ground beneath us, do nothing
-	if (altitude == g_SceneMan.GetSceneHeight()) {
+	if (altitude == g_SceneMan.GetSceneHeight() || (maxDistance != 0 && altitude > maxDistance)) {
 		return temp;
 	}
 

Source/Managers/SceneMan.h

@@ -788,11 +788,16 @@ namespace RTE {
 		/// @param from The point to start from. Should be in the air, or the same point will
 		/// be returned (null operation)
 		/// @param maxAltitude The max altitude in px you want the point to be above the ground. (default: 0)
-		/// @param accuracy The accuracy within screen measurement is acceptable. Higher number (default: 0)
-		/// here means less calculation.
+		/// @param accuracy The accuracy within screen measurement is acceptable. Higher number (default: 0) here means less calculation.
+		/// @param maxDistance The maximum distance downwards the point will be moved. Points higher than this will not be moved down.
 		/// @return The new point screen is no higher than accuracy + max altitude over
 		/// the terrain.
-		Vector MovePointToGround(const Vector& from, int maxAltitude = 0, int accuracy = 0);
+		Vector MovePointToGround(const Vector& from, int maxAltitude, int accuracy, int maxDistance);
+
+		// Luabind makes this such a pain
+		Vector MovePointToGround(const Vector& from, int maxAltitude = 0, int accuracy = 0) {
+			return MovePointToGround(from, maxAltitude, accuracy, 0);
+		}
 
 		/// Returns whether the integer coordinates passed in are within the
 		/// bounds of the current Scene, considering its wrapping.