Updated pathfind grid node size, and added rudimentary debug rendering

Author: Causeless

Source/Entities/Scene.h

@@ -705,6 +705,11 @@ namespace RTE {
 		/// @return Pointer to preview bitmap.
 		BITMAP* GetPreviewBitmap() const { return m_pPreviewBitmap; };
 
+		/// Gets the pathfinder for a given team.
+		/// @param team The team to get the pathfinder for. NoTeam is valid, and will give a shared pathfinder.
+		/// @return A reference to the pathfinder for the given team.
+		PathFinder& GetPathFinder(Activity::Teams team);
+
 		/// Protected member variable and method declarations
 	protected:
 		// Member variables
@@ -789,11 +794,6 @@ namespace RTE {
 
 		/// Private member variable and method declarations
 	private:
-		/// Gets the pathfinder for a given team.
-		/// @param team The team to get the pathfinder for. NoTeam is valid, and will give a shared pathfinder.
-		/// @return A reference to the pathfinder for the given team.
-		PathFinder& GetPathFinder(Activity::Teams team);
-
 		/// Serializes the SceneObject via the Writer. Necessary because full serialization doesn't know how to deal with duplicate properties.
 		/// @param writer The Writer being used for serialization.
 		/// @param sceneObjectToSave The SceneObject to save.

Source/Managers/SceneMan.cpp

@@ -2591,7 +2591,9 @@ void SceneMan::Draw(BITMAP* targetBitmap, BITMAP* targetGUIBitmap, const Vector&
 	if (!m_pCurrentScene) {
 		return;
 	}
+
 	SLTerrain* terrain = m_pCurrentScene->GetTerrain();
+
 	// Set up the target box to draw to on the target bitmap, if it is larger than the scene in either dimension.
 	Box targetBox(Vector(), static_cast<float>(targetBitmap->w), static_cast<float>(targetBitmap->h));
 
@@ -2643,24 +2645,30 @@ void SceneMan::Draw(BITMAP* targetBitmap, BITMAP* targetGUIBitmap, const Vector&
 				g_ActivityMan.GetActivity()->DrawGUI(targetGUIBitmap, targetPos, m_LastUpdatedScreen);
 			}
 
-#ifdef DRAW_NOGRAV_BOXES
-			if (Scene::Area* noGravArea = m_pCurrentScene->GetArea("NoGravityArea")) {
-				const std::vector<Box>& boxList = noGravArea->GetBoxes();
-				g_FrameMan.SetTransTableFromPreset(TransparencyPreset::MoreTrans);
-				drawing_mode(DRAW_MODE_TRANS, 0, 0, 0);
-
-				std::list<Box> wrappedBoxes;
-				for (std::vector<Box>::const_iterator bItr = boxList.begin(); bItr != boxList.end(); ++bItr) {
-					wrappedBoxes.clear();
-					g_SceneMan.WrapBox(*bItr, wrappedBoxes);
-
-					for (std::list<Box>::iterator wItr = wrappedBoxes.begin(); wItr != wrappedBoxes.end(); ++wItr) {
-						Vector adjCorner = (*wItr).GetCorner() - targetPos;
-						rectfill(targetBitmap, adjCorner.m_X, adjCorner.m_Y, adjCorner.m_X + (*wItr).GetWidth(), adjCorner.m_Y + (*wItr).GetHeight(), g_RedColor);
+			static bool s_drawNoGravBoxes = false;
+			if (s_drawNoGravBoxes) {
+				if (Scene::Area* noGravArea = m_pCurrentScene->GetArea("NoGravityArea")) {
+					const std::vector<Box>& boxList = noGravArea->GetBoxes();
+					g_FrameMan.SetTransTableFromPreset(TransparencyPreset::MoreTrans);
+					drawing_mode(DRAW_MODE_TRANS, 0, 0, 0);
+
+					std::list<Box> wrappedBoxes;
+					for (std::vector<Box>::const_iterator bItr = boxList.begin(); bItr != boxList.end(); ++bItr) {
+						wrappedBoxes.clear();
+						g_SceneMan.WrapBox(*bItr, wrappedBoxes);
+
+						for (std::list<Box>::iterator wItr = wrappedBoxes.begin(); wItr != wrappedBoxes.end(); ++wItr) {
+							Vector adjCorner = (*wItr).GetCorner() - targetPos;
+							rectfill(targetBitmap, adjCorner.m_X, adjCorner.m_Y, adjCorner.m_X + (*wItr).GetWidth(), adjCorner.m_Y + (*wItr).GetHeight(), g_RedColor);
+						}
 					}
 				}
 			}
-#endif
+
+			static int s_drawPathfinderDebugForTeam = -2;
+			if (s_drawPathfinderDebugForTeam > -2) {
+				m_pCurrentScene->GetPathFinder(static_cast<Activity::Teams>(s_drawPathfinderDebugForTeam)).DebugRender(targetBitmap, targetPos, m_LastUpdatedScreen);
+			}
 
 			if (m_pDebugLayer) {
 				m_pDebugLayer->Draw(targetBitmap, targetBox);

Source/Managers/SceneMan.h

@@ -874,12 +874,9 @@ namespace RTE {
 		/// @param screenId Which screen to update for. (default: 0)
 		void Update(int screenId = 0);
 
-		/// Draws this SceneMan's current graphical representation to a
-		/// BITMAP of choice.
-		/// @param targetBitmap A pointer to a BITMAP to draw on, appropriately sized for the split
-		/// screen segment.
-		/// @param targetGUIBitmap The offset into the scene where the target bitmap's upper left corner
-		/// is located.
+		/// Draws this SceneMan's current graphical representation to a BITMAP of choice.
+		/// @param targetBitmap A pointer to a BITMAP to draw on, appropriately sized for the split screen segment.
+		/// @param targetGUIBitmap The offset into the scene where the target bitmap's upper left corner is located.
 		void Draw(BITMAP* targetBitmap, BITMAP* targetGUIBitmap, const Vector& targetPos = Vector(), bool skipBackgroundLayers = false, bool skipTerrain = false);
 
 		/// Clears the color MO layer. Should be done every frame.

Source/Managers/SettingsMan.cpp

@@ -48,7 +48,7 @@ void SettingsMan::Clear() {
 	m_SceneBackgroundAutoScaleMode = 1;
 	m_DisableFactionBuyMenuThemes = false;
 	m_DisableFactionBuyMenuThemeCursors = false;
-	m_PathFinderGridNodeSize = SCENEGRIDSIZE;
+	m_PathFinderGridNodeSize = 18;
 	m_AIUpdateInterval = 2;
 
 	m_NumberOfLuaStatesOverride = -1;

Source/System/PathFinder.cpp

@@ -55,7 +55,7 @@ PathFinder::~PathFinder() {
 
 void PathFinder::Clear() {
 	m_NodeGrid.clear();
-	m_NodeDimension = SCENEGRIDSIZE;
+	m_NodeDimension = 18;
 	m_Offset = Vector();
 }
 
@@ -567,7 +567,7 @@ RTE::PathNode* PathFinder::GetPathNodeAtGridCoords(int x, int y) {
 	return nodeId != -1 ? &m_NodeGrid[nodeId] : nullptr;
 }
 
-int PathFinder::ConvertCoordsToNodeId(int x, int y) {
+int PathFinder::ConvertCoordsToNodeId(int x, int y) const {
 	if (m_WrapsX) {
 		x = x % m_GridWidth;
 		x = x < 0 ? x + m_GridWidth : x;
@@ -584,3 +584,17 @@ int PathFinder::ConvertCoordsToNodeId(int x, int y) {
 
 	return (y * m_GridWidth) + x;
 }
+
+void PathFinder::DebugRender(BITMAP* targetBitmap, const Vector& targetPos, int whichScreen) const {
+	for (int x = 0; x < m_GridWidth; ++x) {
+		Vector startPos = (m_NodeGrid[ConvertCoordsToNodeId(x, 0)].Pos - m_Offset) - targetPos;
+		Vector endPos = startPos + Vector(0.0F, m_NodeDimension * m_GridHeight);
+		line(targetBitmap, startPos.GetX(), startPos.GetY(), endPos.GetX(), endPos.GetY(), g_BlackColor);
+	}
+
+	for (int y = 0; y < m_GridHeight; ++y) {
+		Vector startPos = (m_NodeGrid[ConvertCoordsToNodeId(0, y)].Pos - m_Offset) - targetPos;
+		Vector endPos = startPos + Vector(m_NodeDimension * m_GridWidth, 0.0F);
+		line(targetBitmap, startPos.GetX(), startPos.GetY(), endPos.GetX(), endPos.GetY(), g_BlackColor);
+	}
+}

Source/System/PathFinder.h

@@ -167,6 +167,11 @@ namespace RTE {
 		/// Since void* aren't really human readable, this will print out some concise info without an ending newline.
 		/// @param state The state to print out info about.
 		void PrintStateInfo(void* state) override {}
+
+		/// Draws a debug rendering for this pathfinder to a BITMAP of choice.
+		/// @param targetBitmap A pointer to a BITMAP to draw on.
+		/// @param targetGUIBitmap The offset into the scene where the target bitmap's upper left corner is located.
+		void DebugRender(BITMAP* targetBitmap, const Vector& targetPos = Vector(), int whichScreen = 0) const;
 #pragma endregion
 
 	private:
@@ -230,7 +235,7 @@ namespace RTE {
 		/// @param x The X coordinate, in PathNodes.
 		/// @param y The Y coordinate, in PathNodes.
 		/// @return The PathNode id at the given coordinates.
-		int ConvertCoordsToNodeId(int x, int y);
+		int ConvertCoordsToNodeId(int x, int y) const;
 
 		/// Clears all the member variables of this PathFinder, effectively resetting the members of this abstraction level only.
 		void Clear();