- generic CBaseLevelRegion & Map cell object handling'

SoapyMan · SoapyMan · commit be3c65df8a8b · 2021-07-14T20:51:58.000+06:00
- unpacking all Driver 2 PCOs
diff --git a/DriverLevelTool/driver_routines/regions.cpp b/DriverLevelTool/driver_routines/regions.cpp
@@ -49,6 +49,10 @@ void CBaseLevelRegion::FreeAll()
 
 	delete[] m_cellPointers;
 	m_cellPointers = nullptr;
+
+	if (m_cellObjects)
+		free(m_cellObjects);
+	m_cellObjects = nullptr;
 	
 	m_pvsData = nullptr;	
 	m_roadmapData = nullptr;
@@ -66,6 +70,19 @@ int	CBaseLevelRegion::GetNumber() const
 	return m_regionNumber;
 }
 
+CELL_OBJECT* CBaseLevelRegion::GetCellObject(int num) const
+{
+	int numStraddlers = m_owner->m_numStraddlers;
+
+	if (num >= numStraddlers)
+	{
+		num -= m_owner->m_cell_objects_add[m_regionBarrelNumber] + numStraddlers;
+		return &m_cellObjects[num];
+	}
+
+	return &m_owner->m_straddlers[num];
+}
+
 //-------------------------------------------------------------
 // Region unpacking function
 //-------------------------------------------------------------
@@ -190,6 +207,9 @@ void CBaseLevelMap::FreeAll()
 
 	delete[] m_areaDataStates;
 	m_areaDataStates = nullptr;
+
+	delete[] m_straddlers;
+	m_straddlers = nullptr;
 }
 
 int	CBaseLevelMap::GetAreaDataCount() const
diff --git a/DriverLevelTool/driver_routines/regions.h b/DriverLevelTool/driver_routines/regions.h
@@ -43,6 +43,8 @@ class CBaseLevelRegion
 	bool					IsEmpty() const;
 	int						GetNumber() const;
 
+	CELL_OBJECT*			GetCellObject(int num) const;
+
 protected:
 	static int				UnpackCellPointers(ushort* dest_ptrs, char* src_data, int cell_slots_add, int targetRegion = 0);
 	
@@ -51,6 +53,7 @@ class CBaseLevelRegion
 	Spool*					m_spoolInfo{ nullptr };
 	
 	ushort*					m_cellPointers{ nullptr };		// cell pointers - pointing to CELL_DATA
+	CELL_OBJECT*			m_cellObjects{ nullptr };		// cell objects that represents objects placed in the world
 
 	ushort*					m_pvsData{ nullptr };			// potentially visibile set of cells
 	short*					m_roadmapData{ nullptr };		// heightfield with planes and BSP
@@ -147,6 +150,8 @@ class CBaseLevelMap
 	int							m_regions_across{ 0 };
 	int							m_regions_down{ 0 };
 
+	CELL_OBJECT*				m_straddlers{ nullptr };
+
 	OnRegionLoaded_t			m_onRegionLoaded{ nullptr };
 	OnRegionFreed_t				m_onRegionFreed{ nullptr };
 };
diff --git a/DriverLevelTool/driver_routines/regions_d1.cpp b/DriverLevelTool/driver_routines/regions_d1.cpp
@@ -17,10 +17,6 @@ void CDriver1LevelRegion::FreeAll()
 	if (m_cells)
 		free(m_cells);
 	m_cells = nullptr;
-
-	if (m_cellObjects)
-		free(m_cellObjects);
-	m_cellObjects = nullptr;
 }
 
 void CDriver1LevelRegion::LoadRegionData(const SPOOL_CONTEXT& ctx)
@@ -89,21 +85,6 @@ void CDriver1LevelRegion::LoadRegionData(const SPOOL_CONTEXT& ctx)
 	// TODO: PVS and heightmap data
 }
 
-CELL_OBJECT* CDriver1LevelRegion::GetCellObject(int num) const
-{
-	CDriver1LevelMap* owner = (CDriver1LevelMap*)m_owner;
-
-	int numStraddlers = owner->m_numStraddlers;
-
-	if (num >= numStraddlers)
-	{
-		num -= owner->m_cell_objects_add[m_regionBarrelNumber] + numStraddlers;
-		return &m_cellObjects[num];
-	}
-
-	return &owner->m_straddlers[num];
-}
-
 //----------------------------------------
 // cell iterator
 CELL_OBJECT* CDriver1LevelRegion::StartIterator(CELL_ITERATOR_D1* iterator, int cellNumber) const
@@ -139,9 +120,6 @@ void CDriver1LevelMap::FreeAll()
 	delete[] m_regions;
 	m_regions = nullptr;
 
-	delete[] m_straddlers;
-	m_straddlers = nullptr;
-
 	CBaseLevelMap::FreeAll();
 }
 
diff --git a/DriverLevelTool/driver_routines/regions_d1.h b/DriverLevelTool/driver_routines/regions_d1.h
@@ -26,14 +26,11 @@ class CDriver1LevelRegion : public CBaseLevelRegion
 	void					FreeAll() override;
 	void					LoadRegionData(const SPOOL_CONTEXT& ctx) override;
 
-	CELL_OBJECT*			GetCellObject(int num) const;
-
 	// cell iterator
 	CELL_OBJECT*			StartIterator(CELL_ITERATOR_D1* iterator, int cellNumber) const;
 
 protected:
 	CELL_DATA_D1*			m_cells{ nullptr };				// cell data that holding information about cell pointers. 3D world seeks cells first here
-	CELL_OBJECT*			m_cellObjects{ nullptr };		// cell objects that represents objects placed in the world
 };
 
 
@@ -66,7 +63,6 @@ class CDriver1LevelMap : public CBaseLevelMap
 
 	// Driver 2 - specific
 	CDriver1LevelRegion*	m_regions{ nullptr };					// map of regions
-	CELL_OBJECT*			m_straddlers{ nullptr };				// cell objects between regions
 };
 
 
diff --git a/DriverLevelTool/driver_routines/regions_d2.cpp b/DriverLevelTool/driver_routines/regions_d2.cpp
@@ -333,9 +333,9 @@ void CDriver2LevelRegion::FreeAll()
 		free(m_cells);
 	m_cells = nullptr;
 
-	if (m_cellObjects)
-		free(m_cellObjects);
-	m_cellObjects = nullptr;
+	if (m_packedCellObjects)
+		free(m_packedCellObjects);
+	m_packedCellObjects = nullptr;
 
 	if (m_pvsData)
 		free(m_pvsData);
@@ -405,13 +405,16 @@ void CDriver2LevelRegion::LoadRegionData(const SPOOL_CONTEXT& ctx)
 		pFile->Read(m_cells, m_spoolInfo->cell_data_size[0] * SPOOL_CD_BLOCK_SIZE, sizeof(char));
 
 		// read cell objects
-		m_cellObjects = (PACKED_CELL_OBJECT*)malloc(m_spoolInfo->cell_data_size[2] * SPOOL_CD_BLOCK_SIZE);
+		m_packedCellObjects = (PACKED_CELL_OBJECT*)malloc(m_spoolInfo->cell_data_size[2] * SPOOL_CD_BLOCK_SIZE);
 		pFile->Seek(ctx.lumpInfo->spooled_offset + cellObjectsOffset * SPOOL_CD_BLOCK_SIZE, VS_SEEK_SET);
-		pFile->Read(m_cellObjects, m_spoolInfo->cell_data_size[2] * SPOOL_CD_BLOCK_SIZE, sizeof(char));
+		pFile->Read(m_packedCellObjects, m_spoolInfo->cell_data_size[2] * SPOOL_CD_BLOCK_SIZE, sizeof(char));
 	}
 	else
 		MsgError("BAD PACKED CELL POINTER DATA, region = %d\n", m_regionNumber);
 
+	// post-process
+	UnpackAllCellObjects();
+
 	delete [] packed_cell_pointers;
 
 	pFile->Seek(ctx.lumpInfo->spooled_offset + pvsHeightmapDataOffset * SPOOL_CD_BLOCK_SIZE, VS_SEEK_SET);
@@ -425,6 +428,53 @@ void CDriver2LevelRegion::LoadRegionData(const SPOOL_CONTEXT& ctx)
 	m_owner->OnRegionLoaded(this);
 }
 
+//---------------------------------------------------------------------
+// Unpacks all cell objects from PACKED_CELL_OBJECT
+//---------------------------------------------------------------------
+void CDriver2LevelRegion::UnpackAllCellObjects()
+{
+	CDriver2LevelMap* owner = (CDriver2LevelMap*)m_owner;
+	int numCellObjects = (m_spoolInfo->cell_data_size[2] * SPOOL_CD_BLOCK_SIZE) / sizeof(PACKED_CELL_OBJECT);
+
+	// alloc and convert
+	m_cellObjects = (CELL_OBJECT*)malloc(numCellObjects * sizeof(CELL_OBJECT));
+	memset(m_cellObjects, 0, numCellObjects * sizeof(CELL_OBJECT));
+
+	const OUT_CELL_FILE_HEADER& mapInfo = owner->GetMapInfo();
+	const int numStraddlers = owner->m_numStraddlers;
+	const int cellObjectsAdd = owner->m_cell_objects_add[m_regionBarrelNumber];
+
+	// walk through all cell data
+	for (int i = 0; i < mapInfo.region_size * mapInfo.region_size; i++)
+	{
+		CELL_ITERATOR_D2 ci;
+		PACKED_CELL_OBJECT* pco = StartIterator(&ci, i);
+
+		if (!pco)
+			continue;
+
+		while (pco)
+		{
+			int num = ci.pcd->num & 0x3fff;
+
+			if (num >= numStraddlers)
+			{
+				num -= cellObjectsAdd + numStraddlers;
+				
+				CELL_OBJECT& co = m_cellObjects[num];
+				CDriver2LevelMap::UnpackCellObject(co, pco, ci.nearCell);
+			}
+			else
+			{
+				// unpack straddlers
+				CDriver2LevelMap::UnpackCellObject(owner->m_straddlers[num], pco, ci.nearCell);
+			}
+
+			pco = owner->GetNextPackedCop(&ci);
+		}
+	}
+}
+
 void CDriver2LevelRegion::ReadHeightmapData(const SPOOL_CONTEXT& ctx)
 {
 	IVirtualStream* pFile = ctx.dataStream;
@@ -453,7 +503,7 @@ void CDriver2LevelRegion::ReadHeightmapData(const SPOOL_CONTEXT& ctx)
 	}
 }
 
-PACKED_CELL_OBJECT* CDriver2LevelRegion::GetCellObject(int num) const
+PACKED_CELL_OBJECT* CDriver2LevelRegion::GetPackedCellObject(int num) const
 {
 	CDriver2LevelMap* owner = (CDriver2LevelMap*)m_owner;
 
@@ -462,10 +512,10 @@ PACKED_CELL_OBJECT* CDriver2LevelRegion::GetCellObject(int num) const
 	if (num >= numStraddlers)
 	{
 		num -= owner->m_cell_objects_add[m_regionBarrelNumber] + numStraddlers;
-		return &m_cellObjects[num];
+		return &m_packedCellObjects[num];
 	}
 
-	return &owner->m_straddlers[num];
+	return &owner->m_packedStraddlers[num];
 }
 
 CELL_DATA* CDriver2LevelRegion::GetCellData(int num) const
@@ -481,13 +531,14 @@ PACKED_CELL_OBJECT* CDriver2LevelRegion::StartIterator(CELL_ITERATOR_D2* iterato
 	if (cell_ptr == 0xFFFF)
 		return nullptr;
 
-	const OUT_CELL_FILE_HEADER& mapInfo = m_owner->m_mapInfo;
+	CDriver2LevelMap* owner = (CDriver2LevelMap*)m_owner;
+	const OUT_CELL_FILE_HEADER& mapInfo = owner->m_mapInfo;
 
 	iterator->region = (CDriver2LevelRegion*)this;
 
 	// IDK if it gonna work correct
 	XZPAIR cpos;
-	m_owner->WorldPositionToCellXZ(cpos, {0,0,0});
+	owner->WorldPositionToCellXZ(cpos, {0,0,0});
 
 	// convert cell number to XZ
 	int cellx = cellNumber % mapInfo.region_size;
@@ -503,19 +554,21 @@ PACKED_CELL_OBJECT* CDriver2LevelRegion::StartIterator(CELL_ITERATOR_D2* iterato
 	// get the packed cell data start and near cell
 	CELL_DATA* celld = &m_cells[cell_ptr];
 
-	iterator->listType = 0;
+	iterator->listType = -1;
 
 	if (celld->num & 0x4000) // if we immediately got to the typed list
 	{
-		iterator->listType = celld->num;
+		iterator->listType = celld->num & 0x3fff;
 		celld++; // get to the start
 	}
 
-	PACKED_CELL_OBJECT* ppco = GetCellObject(celld->num & 0x3fff);
+	PACKED_CELL_OBJECT* ppco = GetPackedCellObject(celld->num & 0x3fff);
 	iterator->pcd = celld;
 
+	iterator->co = GetCellObject(celld->num & 0x3fff);
+
 	if (ppco->value == 0xffff && (ppco->pos.vy & 1))
-		ppco = ((CDriver2LevelMap*)m_owner)->GetNextPackedCop(iterator);
+		ppco = owner->GetNextPackedCop(iterator);
 
 	iterator->ppco = ppco;
 
@@ -537,8 +590,8 @@ void CDriver2LevelMap::FreeAll()
 	delete[] m_regions;
 	m_regions = nullptr;
 
-	delete[] m_straddlers;
-	m_straddlers = nullptr;
+	delete[] m_packedStraddlers;
+	m_packedStraddlers = nullptr;
 
 	delete[] m_straights;
 	m_straights = nullptr;
@@ -561,8 +614,11 @@ void CDriver2LevelMap::LoadMapLump(IVirtualStream* pFile)
 
 	// read straddlers
 	// Driver 2 PCO
-	m_straddlers = new PACKED_CELL_OBJECT[m_numStraddlers];
-	pFile->Read(m_straddlers, m_numStraddlers, sizeof(PACKED_CELL_OBJECT));
+	m_packedStraddlers = new PACKED_CELL_OBJECT[m_numStraddlers];
+	pFile->Read(m_packedStraddlers, m_numStraddlers, sizeof(PACKED_CELL_OBJECT));
+
+	m_straddlers = new CELL_OBJECT[m_numStraddlers];
+	memset(m_straddlers, 0, m_numStraddlers * sizeof(CELL_OBJECT));
 }
 
 //-------------------------------------------------------------
@@ -830,15 +886,16 @@ PACKED_CELL_OBJECT* CDriver2LevelMap::GetFirstPackedCop(CELL_ITERATOR_D2* iterat
 		0x8000           - end of cell objects
 	*/
 
-	iterator->listType = 0;
+	iterator->listType = -1;
 
 	if (celld->num & 0x4000) // if we immediately got to the typed list
 	{
-		iterator->listType = celld->num;
+		iterator->listType = celld->num & 0x3fff;
 		celld++; // get to the start
 	}
 
-	PACKED_CELL_OBJECT* ppco = region.GetCellObject(celld->num & 0x3fff);
+	PACKED_CELL_OBJECT* ppco = region.GetPackedCellObject(celld->num & 0x3fff);
+	iterator->co = region.GetCellObject(celld->num & 0x3fff);
 
 	iterator->pcd = celld;
 
@@ -857,6 +914,7 @@ PACKED_CELL_OBJECT* CDriver2LevelMap::GetNextPackedCop(CELL_ITERATOR_D2* iterato
 {
 	ushort num;
 	PACKED_CELL_OBJECT* ppco;
+	CELL_OBJECT* co;
 
 	do {
 		CELL_DATA* celld = iterator->pcd;
@@ -874,24 +932,13 @@ PACKED_CELL_OBJECT* CDriver2LevelMap::GetNextPackedCop(CELL_ITERATOR_D2* iterato
 
 		iterator->pcd = celld;
 
-		/*
-		celld++;
-		num = celld->num;
-
-		if (celld->num & 0x4000) // if we immediately got to the typed list
-		{
-			iterator->listType = celld->num;
-			celld++; // get to the start
-		}
-		
-		if(num & 0x4000)	// start of new sub list?
-			return nullptr;
-		*/
-		ppco = iterator->region->GetCellObject(celld->num & 0x3fff);
+		ppco = iterator->region->GetPackedCellObject(celld->num & 0x3fff);
+		co = iterator->region->GetCellObject(celld->num & 0x3fff);
 
 	} while (ppco->value == 0xffff && (ppco->pos.vy & 1));
 
 	iterator->ppco = ppco;
+	iterator->co = co;
 
 	return ppco;
 }
diff --git a/DriverLevelTool/driver_routines/regions_d2.h b/DriverLevelTool/driver_routines/regions_d2.h
