Flowfield & collision avoidance

.gitignore

@@ -322,3 +322,10 @@ win32/CodeAnalyst
 /.ci/flatpak/net.wz2100.wz2100.yaml
 /.ci/flatpak/Toolchain-cross-arch.cmake
 /.ci/flatpak/meson-cross-file.txt
+
+#
+tags
+*.log
+*.txt
+
+comments*

lib/framework/debug.cpp

@@ -112,6 +112,7 @@ static const char *code_part_names[] =
 	"research",
 	"savegame",
 	"repairs",
+	"flowfield",
 	"last"
 };
 

lib/framework/debug.h

@@ -209,6 +209,7 @@ enum code_part
 	LOG_RESEARCH,
 	LOG_SAVEGAME,
 	LOG_REPAIRS,
+	LOG_FLOWFIELD,
 	LOG_LAST /**< _must_ be last! */
 };
 

lib/framework/fixedpoint.h

@@ -50,7 +50,8 @@ static inline WZ_DECL_CONST float UNDEG(uint16_t angle)
 	return angle * (360.f / 65536.0f) * (3.141592f / 180.0f);
 }
 
-// Should be a macro (or two separate functions), since we can't do function overloading for float and int, and we don't want to use the float version for anything game-state related.
+// Should be a macro (or two separate functions), since we can't do function overloading for float and int, 
+// and we don't want to use the float version for anything game-state related.
 // 65536 / 360 = 8192 / 45, with a bit less overflow risk.
 #define DEG(degrees) ((degrees) * 8192 / 45)
 

lib/ivis_opengl/pieblitfunc.cpp

@@ -198,6 +198,26 @@ void iV_Lines(const std::vector<glm::ivec4> &lines, PIELIGHT colour)
 	gfx_api::LinePSO::get().unbind_vertex_buffers(pie_internal::rectBuffer);
 }
 
+void iV_PolyLine(const std::vector<Vector3i> &points, const glm::mat4 &mvp, PIELIGHT colour)
+{
+	std::vector<glm::ivec4> lines;
+	Vector2i result;
+	Vector2i lastPoint;
+
+	for(auto i = 0; i < points.size(); i++){
+		Vector3i source = points[i];
+		pie_RotateProjectWithPerspective(&source, mvp, &result);
+
+		if(i > 0){
+			lines.push_back({ lastPoint.x, lastPoint.y, result.x, result.y });
+		}
+
+		lastPoint = result;
+	}
+
+	iV_Lines(lines, colour);
+}
+
 /**
  *	Assumes render mode set up externally, draws filled rectangle.
  */

lib/ivis_opengl/pieblitfunc.h

@@ -136,6 +136,8 @@ glm::mat4 defaultProjectionMatrix();
 void iV_ShadowBox(int x0, int y0, int x1, int y1, int pad, PIELIGHT first, PIELIGHT second, PIELIGHT fill);
 void iV_Line(int x0, int y0, int x1, int y1, PIELIGHT colour);
 void iV_Lines(const std::vector<glm::ivec4> &lines, PIELIGHT colour);
+// world coordinates
+void iV_PolyLine(const std::vector<Vector3i> &points, const glm::mat4 &mvp, PIELIGHT colour);
 void iV_Box2(int x0, int y0, int x1, int y1, PIELIGHT first, PIELIGHT second);
 static inline void iV_Box(int x0, int y0, int x1, int y1, PIELIGHT first)
 {

src/cheat.cpp

@@ -91,6 +91,7 @@ static CHEAT_ENTRY cheatCodes[] =
 	{"autogame off", kf_AutoGame},
 	{"shakey", kf_ToggleShakeStatus}, //shakey
 	{"list droids", kf_ListDroids},
+	{"toggleff", kf_ToggleFlowField} // switch between Flow field and regular pathfinding / movement logic
 
 };
 

src/clparse.cpp

@@ -34,6 +34,7 @@
 #include "clparse.h"
 #include "display3d.h"
 #include "frontend.h"
+#include "flowfield.h"
 #include "keybind.h"
 #include "loadsave.h"
 #include "main.h"
@@ -337,6 +338,7 @@ typedef enum
 	CLI_CONTINUE,
 	CLI_AUTOHOST,
 	CLI_AUTORATING,
+	CLI_FLOWFIELD,
 	CLI_AUTOHEADLESS,
 #if defined(WZ_OS_WIN)
 	CLI_WIN_ENABLE_CONSOLE,
@@ -416,6 +418,8 @@ static const struct poptOption *getOptionsTable()
 		{ "skirmish", POPT_ARG_STRING, CLI_SKIRMISH,   N_("Start skirmish game with given settings file"), N_("test") },
 		{ "continue", POPT_ARG_NONE, CLI_CONTINUE,   N_("Continue the last saved game"), nullptr },
 		{ "autohost", POPT_ARG_STRING, CLI_AUTOHOST,   N_("Start host game with given settings file"), N_("autohost") },
+		{ "autorating", POPT_ARG_STRING, CLI_AUTORATING,   N_("Query ratings from given server url (containing \"{HASH}\"), when hosting"), N_("autorating") },
+        { "flowfield", POPT_ARG_NONE, CLI_FLOWFIELD, N_("Use advanced Flow fields method for path finding (experimental)"), nullptr },
 		{ "autorating", POPT_ARG_STRING, CLI_AUTORATING,   N_("Query ratings from given server url, when hosting"), N_("autorating") },
 #if defined(WZ_OS_WIN)
 		{ "enableconsole", POPT_ARG_NONE, CLI_WIN_ENABLE_CONSOLE,   N_("Attach or create a console window and display console output (Windows only)"), nullptr },
@@ -959,7 +963,9 @@ bool ParseCommandLine(int argc, const char * const *argv)
 			wz_autoratingUrl = token;
 			debug(LOG_INFO, "Using \"%s\" for ratings.", wz_autoratingUrl.c_str());
 			break;
-
+		case CLI_FLOWFIELD:
+			flowfieldEnable();
+			break;
 		case CLI_AUTOHEADLESS:
 			wz_cli_headless = true;
 			setHeadlessGameMode(true);
@@ -1032,7 +1038,6 @@ bool ParseCommandLine(int argc, const char * const *argv)
 			}
 			debug(LOG_INFO, "Games will automatically start with [%d] players (when ready)", wz_min_autostart_players);
 			break;
-
 		};
 	}
 

src/display3d.cpp

@@ -84,6 +84,7 @@
 #include "warzoneconfig.h"
 #include "multistat.h"
 #include "animation.h"
+#include "flowfield.h"
 #include "faction.h"
 
 /********************  Prototypes  ********************/
@@ -1239,6 +1240,8 @@ static void drawTiles(iView *player)
 	gfx_api::context::get().debugStringMarker("Draw 3D scene - blueprints");
 	displayBlueprints(viewMatrix, perspectiveViewMatrix);
 
+	debugDrawFlowfields(perspectiveViewMatrix * glm::translate(glm::vec3(-player->p.x, 0, player->p.z)));
+
 	pie_RemainingPasses(currentGameFrame); // draws shadows and transparent shapes
 
 	if (!gamePaused())

src/droid.cpp

@@ -71,6 +71,7 @@
 #include "combat.h"
 #include "template.h"
 #include "qtscript.h"
+#include "flowfield.h"
 
 #define DEFAULT_RECOIL_TIME	(GAME_TICKS_PER_SEC/4)
 #define	DROID_DAMAGE_SPREAD	(16 - rand()%32)
@@ -728,7 +729,14 @@ void droidUpdate(DROID *psDroid)
 	syncDebugDroid(psDroid, 'M');
 
 	// update the move system
-	moveUpdateDroid(psDroid);
+	if (isFlowfieldEnabled())
+	{
+		moveUpdateDroid(psDroid);
+	}
+	else 
+	{
+		moveUpdateDroid_original(psDroid);
+	}
 
 	/* Only add smoke if they're visible */
 	if (psDroid->visibleForLocalDisplay() && psDroid->droidType != DROID_PERSON)

src/feature.cpp

@@ -46,6 +46,7 @@
 #include "combat.h"
 #include "multiplay.h"
 #include "qtscript.h"
+#include "flowfield.h"
 
 #include "mapgrid.h"
 #include "display3d.h"
@@ -528,7 +529,7 @@ bool destroyFeature(FEATURE *psDel, unsigned impactTime)
 			}
 		}
 	}
-
+	markTileAsDefaultCost(map_coord(psDel->pos.x), map_coord(psDel->pos.y), PROPULSION_TYPE_WHEELED);
 	removeFeature(psDel);
 	psDel->died = impactTime;
 	return true;