From 1238b3741c609dd4a67ea07c1593acc4b968c22e Mon Sep 17 00:00:00 2001
From: devZoGok <nenkokeko@yandex.com>
Date: Wed, 4 Jun 2025 16:59:03 +0300
Subject: [PATCH] optimized cell selection for blocking

---
 map.cpp | 40 +++++++++++++++++++++++++++-------------
 map.h   |  1 +
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/map.cpp b/map.cpp
index 71e74b7..1b35696 100755
--- a/map.cpp
+++ b/map.cpp
@@ -382,26 +382,39 @@ namespace battleship{
 		return spawnPointsTbl.size();
 	}
 
+	//TODO improve for underwater cells
+	vector<int> Map::getSurroundingCells(Vector3 p, int numRings){
+		int numHorCells = int(mapSize.x / CELL_SIZE.x);
+		int numVertCells = int(mapSize.z / CELL_SIZE.z);
+		int horId = int((.5 * mapSize.x + p.x) / CELL_SIZE.x);
+		int vertId = int((.5 * mapSize.z + p.z) / CELL_SIZE.z);
+
+		vector<int> cellIds;
+
+		for(int i = vertId - numRings; i <= vertId + numRings; i++)
+			for(int j = horId - numRings; j <= horId + numRings; j++)
+				cellIds.push_back(numHorCells * i + j);
+
+		return cellIds;
+	}
+
 	void Map::blockCells(Unit *unit){
-		for(Cell &cell : cells){
-			if(cell.blockedBy && cell.blockedBy != unit) continue;
+		vector<int> surroundingCellIds = getSurroundingCells(unit->getPos(), 0);
 
-			Vector3 cellDir = (cell.pos - unit->getPos()), dirVec = unit->getDirVec(), leftVec = unit->getLeftVec();
-			float forwAngle = std::min(dirVec.getAngleBetween(cellDir.norm()), (-dirVec).getAngleBetween(cellDir.norm()));
-			float forwDist = cellDir.getLength() * cos(forwAngle);
+		for(int scid : surroundingCellIds){
+			if(cells[scid].blockedBy && cells[scid].blockedBy != unit) continue;
 
-			float leftAngle = std::min(leftVec.getAngleBetween(cellDir.norm()), (-leftVec).getAngleBetween(cellDir.norm()));
-			float leftDist = cellDir.getLength() * cos(leftAngle);
-			
-			bool within = (forwDist < .5 * (unit->getLength() + CELL_SIZE.x) && leftDist < .5 * (unit->getWidth() + CELL_SIZE.z));
-			cell.blockedBy = (within ? unit : nullptr);
+			bool within = unit->pointWithinObj(cells[scid].pos);
+			cells[scid].blockedBy = (within ? unit : nullptr);
 		}
 	}
 
 	void Map::unblockCells(Unit *unit){
-		for(Cell &cell : cells)
-			if(cell.blockedBy == unit)
-				cell.blockedBy = nullptr;
+		vector<int> surroundingCellIds = getSurroundingCells(unit->getPos(), 0);
+
+		for(int scid : surroundingCellIds)
+			if(cells[scid].blockedBy == unit)
+				cells[scid].blockedBy = nullptr;
 	}
 
 	void Map::loadSpawnPoints(){
@@ -689,6 +702,7 @@ namespace battleship{
 	}
 
 	//TODO replace search with binary search
+	//TODO optimize horizontal and vertical id calculcation
 	int Map::getCellId(Vector3 pos, bool checkUnderwaterCells){
 		int numHorCells = int(mapSize.x / CELL_SIZE.x), horId = -1;
 
diff --git a/map.h b/map.h
index 5bab637..3002e2c 100755
--- a/map.h
+++ b/map.h
@@ -78,6 +78,7 @@ namespace battleship{
 		bool isPointWithinTerrainObject(vb01::Vector3, int);
 		void loadPlayerGameObjects();
 		int getNumMapSpawnPoints(std::string = "");
+		std::vector<int> getSurroundingCells(vb01::Vector3, int);
 		void blockCells(Unit*);
 		void unblockCells(Unit*);
 		inline std::string getMapName(){return mapName;}