Added offset to the pathing grid

Author: Causeless

Source/Managers/SettingsMan.cpp

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

Source/System/PathFinder.cpp

@@ -56,6 +56,7 @@ PathFinder::~PathFinder() {
 void PathFinder::Clear() {
 	m_NodeGrid.clear();
 	m_NodeDimension = SCENEGRIDSIZE;
+	m_Offset = Vector();
 }
 
 int PathFinder::Create(int nodeDimension) {
@@ -72,8 +73,10 @@ int PathFinder::Create(int nodeDimension) {
 	m_WrapsX = g_SceneMan.SceneWrapsX();
 	m_WrapsY = g_SceneMan.SceneWrapsY();
 
+	m_Offset = Vector(nodeDimension * 0.5f, nodeDimension * 0.5f);
+
 	// Create and assign scene coordinate positions for all nodes.
-	Vector nodePos = Vector(static_cast<float>(nodeDimension) / 2.0F, static_cast<float>(nodeDimension) / 2.0F);
+	Vector nodePos = Vector(static_cast<float>(nodeDimension) / 2.0F, static_cast<float>(nodeDimension) / 2.0F) + m_Offset;
 	m_NodeGrid.reserve(m_GridWidth * m_GridHeight);
 	for (int y = 0; y < m_GridHeight; ++y) {
 		// Make sure no cell centers are off the scene (since they can overlap the far edge of the scene).
@@ -454,10 +457,10 @@ std::vector<int> PathFinder::GetNodeIdsInBox(Box box) {
 	box.Unflip();
 
 	// Get the extents of the box's potential influence on PathNodes and their connecting edges.
-	int firstX = static_cast<int>(std::floor((box.m_Corner.m_X / static_cast<float>(m_NodeDimension)) + 0.5F) - 1);
-	int lastX = static_cast<int>(std::floor(((box.m_Corner.m_X + box.m_Width) / static_cast<float>(m_NodeDimension)) + 0.5F) + 1);
-	int firstY = static_cast<int>(std::floor((box.m_Corner.m_Y / static_cast<float>(m_NodeDimension)) + 0.5F) - 1);
-	int lastY = static_cast<int>(std::floor(((box.m_Corner.m_Y + box.m_Height) / static_cast<float>(m_NodeDimension)) + 0.5F) + 1);
+	int firstX = static_cast<int>(std::floor( (box.m_Corner.m_X                 / static_cast<float>(m_NodeDimension)) + 0.5F) - 1);
+	int lastX  = static_cast<int>(std::floor(((box.m_Corner.m_X + box.m_Width)  / static_cast<float>(m_NodeDimension)) + 0.5F) + 1);
+	int firstY = static_cast<int>(std::floor( (box.m_Corner.m_Y                 / static_cast<float>(m_NodeDimension)) + 0.5F) - 1);
+	int lastY  = static_cast<int>(std::floor(((box.m_Corner.m_Y + box.m_Height) / static_cast<float>(m_NodeDimension)) + 0.5F) + 1);
 
 	// Only iterate through the grid where the box overlaps any edges.
 	for (int nodeX = firstX; nodeX <= lastX; ++nodeX) {

Source/System/PathFinder.h

@@ -175,6 +175,7 @@ namespace RTE {
 		MicroPather* m_Pather; //!< The actual pathing object that does the pathfinding work. Owned.
 		std::vector<PathNode> m_NodeGrid; //!< The array of PathNodes representing the grid on the scene.
 		unsigned int m_NodeDimension; //!< The width and height of each PathNode, in pixels on the scene.
+		Vector m_Offset;
 		int m_GridWidth; //!< The width of the pathing grid, in PathNodes.
 		int m_GridHeight; //!< The height of the pathing grid, in PathNodes.
 		bool m_WrapsX; //!< Whether the pathing grid wraps on the X axis.