unify(radar): Merge Radar code (#1894)

xezon · xezon · commit d17e34e5aa64 · 2025-11-24T23:17:18.000+01:00
diff --git a/Generals/Code/GameEngine/Source/Common/System/Radar.cpp b/Generals/Code/GameEngine/Source/Common/System/Radar.cpp
@@ -355,23 +355,25 @@ void Radar::newMap( TerrainLogic *terrain )
 	m_ySample = m_mapExtent.height() / RADAR_CELL_HEIGHT;
 
 	// find the "middle" height for the terrain (most used value) and water table
-	Int x, y, z;
+	Int x, y;
 	Int terrainSamples = 0, waterSamples = 0;
 
 	m_terrainAverageZ = 0.0f;
 	m_waterAverageZ = 0.0f;
-	ICoord2D radarPoint;
 	Coord3D worldPoint;
-	for( y = 0; y < RADAR_CELL_HEIGHT; y++ )
-		for( x = 0; x < RADAR_CELL_WIDTH; x++ )
-		{
 
-			radarPoint.x = x;
-			radarPoint.y = y;
-			radarToWorld( &radarPoint, &worldPoint );
-			z = terrain->getGroundHeight( worldPoint.x, worldPoint.y );
-			Real waterZ;
-			if( terrain->isUnderwater( worldPoint.x, worldPoint.y, &waterZ ) )
+	// since we're averaging let's skip every second sample...
+	worldPoint.y=0;
+	for( y = 0; y < RADAR_CELL_HEIGHT; y+=2, worldPoint.y+=2.0*m_ySample )
+	{
+		worldPoint.x=0;
+		for( x = 0; x < RADAR_CELL_WIDTH; x+=2, worldPoint.x+=2.0*m_xSample )
+		{
+			// don't use this, we don't really need the
+			// Z position by this function... radarToWorld( &radarPoint, &worldPoint );
+			// and this is done by isUnderwater anyway: z = terrain->getGroundHeight( worldPoint.x, worldPoint.y );
+			Real z,waterZ;
+			if( terrain->isUnderwater( worldPoint.x, worldPoint.y, &waterZ, &z ) )
 			{
 				m_waterAverageZ += z;
 				waterSamples++;
@@ -381,8 +383,8 @@ void Radar::newMap( TerrainLogic *terrain )
 				m_terrainAverageZ += z;
 				terrainSamples++;
 			}
-
 		}
+	}
 
 	// avoid divide by zeros
 	if( terrainSamples == 0 )
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp b/Generals/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp
@@ -2143,7 +2143,12 @@ Bool TerrainLogic::isUnderwater( Real x, Real y, Real *waterZ, Real *terrainZ )
 
 	// if no water here, no height, no nuttin
 	if( waterHandle == NULL )
+  {
+    // but we have to return the terrain Z if requested!
+    if (terrainZ)
+      *terrainZ=getGroundHeight(x,y);
 		return FALSE;
+  }
 
 	//
 	// if this water handle is a grid water use the grid height function, otherwise look into
diff --git a/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp b/Generals/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp
@@ -744,6 +744,7 @@ void StealthUpdate::changeVisualDisguise()
 		FXList::doFXPos( data->m_disguiseFX, self->getPosition() );
 
 		m_disguised = true;
+		self->setStatus( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_DISGUISED ) );
 	}
 	else if( m_disguiseAsPlayerIndex != -1 )
 	{
@@ -809,6 +810,7 @@ void StealthUpdate::changeVisualDisguise()
 
 		FXList::doFXPos( data->m_disguiseRevealFX, self->getPosition() );
 		m_disguised = false;
+		self->clearStatus( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_DISGUISED ) );
 	}
 
 	//Reset the radar (determines color on add)
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp
@@ -40,8 +40,6 @@
 #include "GameLogic/GameLogic.h"
 #include "GameLogic/Object.h"
 
-#include "GameLogic/Module/StealthUpdate.h"
-
 #include "GameClient/Color.h"
 #include "GameClient/ControlBar.h"
 #include "GameClient/Display.h"
@@ -671,9 +669,9 @@ void W3DRadar::renderObjectList( const RadarObject *listHead, TextureClass *text
 		// they are godlike and can see everything)
  		//
  		if( obj->getRadarPriority() == RADAR_PRIORITY_LOCAL_UNIT_ONLY &&
-				obj->getControllingPlayer() != player &&
+ 				obj->getControllingPlayer() != player &&
 				player->isPlayerActive() )
-			continue;
+ 			continue;
 
 		// get object position
 		const Coord3D *pos = obj->getPosition();
@@ -693,12 +691,8 @@ void W3DRadar::renderObjectList( const RadarObject *listHead, TextureClass *text
 		// Now it twinkles for any stealthed object, whether locally controlled or neutral-observer-viewed
 		if( obj->testStatus( OBJECT_STATUS_STEALTHED ) )
 		{
-			StealthUpdate* stealth = obj->getStealth();
-			if( !stealth )
-				continue;
-
       if ( TheControlBar->getCurrentlyViewedPlayerRelationship(obj->getTeam()) == ENEMIES )
-        if( !obj->testStatus( OBJECT_STATUS_DETECTED ) && !stealth->isDisguised() )
+        if( !obj->testStatus( OBJECT_STATUS_DETECTED ) && !obj->testStatus( OBJECT_STATUS_DISGUISED ) )
 				  continue;
 
 			UnsignedByte r, g, b, a;
@@ -1081,7 +1075,7 @@ void W3DRadar::buildTerrainTexture( TerrainLogic *terrain )
 	RGBColor sampleColor;
 	RGBColor color;
 	Int i, j, samples;
-	Int x, y, z;
+	Int x, y;
 	ICoord2D radarPoint;
 	Coord3D worldPoint;
 	Bridge *bridge;
@@ -1094,10 +1088,7 @@ void W3DRadar::buildTerrainTexture( TerrainLogic *terrain )
 			// what point are we inspecting
 			radarPoint.x = x;
 			radarPoint.y = y;
-			radarToWorld( &radarPoint, &worldPoint );
-
-			// get height of the terrain at this sample point
-			z = terrain->getGroundHeight( worldPoint.x, worldPoint.y );
+			radarToWorld2D( &radarPoint, &worldPoint );
 
 			// check to see if this point is part of a working bridge
 			Bool workingBridge = FALSE;
@@ -1142,15 +1133,12 @@ void W3DRadar::buildTerrainTexture( TerrainLogic *terrain )
 								// the the world point we are concerned with
 								radarPoint.x = i;
 								radarPoint.y = j;
-								radarToWorld( &radarPoint, &worldPoint );
-
-								// get Z at this sample height
-								Real underwaterZ = terrain->getGroundHeight( worldPoint.x, worldPoint.y );
+								radarToWorld2D( &radarPoint, &worldPoint );
 
 								// get color for this Z and add to our sample color
-								if( terrain->isUnderwater( worldPoint.x, worldPoint.y ) )
+								Real underwaterZ;
+								if( terrain->isUnderwater( worldPoint.x, worldPoint.y, NULL, &underwaterZ ) )
 								{
-
 									// this is our "color" for water
 									color = waterColor;
 
@@ -1246,7 +1234,7 @@ void W3DRadar::buildTerrainTexture( TerrainLogic *terrain )
 									TheTerrainVisual->getTerrainColorAt( worldPoint.x, worldPoint.y, &color );
 
 									// interpolate the color for height
-									interpolateColorForHeight( &color, z, getTerrainAverageZ(),
+									interpolateColorForHeight( &color, worldPoint.z, getTerrainAverageZ(),
 																						 m_mapExtent.hi.z, m_mapExtent.lo.z );
 
 								}
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Radar.h b/GeneralsMD/Code/GameEngine/Include/Common/Radar.h
@@ -73,7 +73,7 @@ enum RadarEventType CPP_11(: Int)
 	RADAR_EVENT_FAKE,					//Internally creates a radar event, but doesn't notify the player (unit lost
 														//for example, so we can use the spacebar to jump to the event).
 
- 	RADAR_EVENT_NUM_EVENTS
+	RADAR_EVENT_NUM_EVENTS
 
 };
 
@@ -258,8 +258,6 @@ class Radar : public Snapshot,
 	RadarObject *m_localObjectList;				/** list of objects for the local player, sorted
 																					* in exactly the same priority as the regular
 																					* object list for all other objects */
-//	typedef std::list<Object*> HeroList;
-//	HeroList m_heroList;		//< list of pointers to objects with radar icon representations
 
 	Real m_terrainAverageZ;								///< average Z for terrain samples
 	Real m_waterAverageZ;									///< average Z for water samples
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/Radar.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/Radar.cpp
@@ -362,15 +362,15 @@ void Radar::newMap( TerrainLogic *terrain )
 	m_waterAverageZ = 0.0f;
 	Coord3D worldPoint;
 
-  // since we're averaging let's skip every second sample...
-  worldPoint.y=0;
+	// since we're averaging let's skip every second sample...
+	worldPoint.y=0;
 	for( y = 0; y < RADAR_CELL_HEIGHT; y+=2, worldPoint.y+=2.0*m_ySample )
-  {
-    worldPoint.x=0;
-    for( x = 0; x < RADAR_CELL_WIDTH; x+=2, worldPoint.x+=2.0*m_xSample )
+	{
+		worldPoint.x=0;
+		for( x = 0; x < RADAR_CELL_WIDTH; x+=2, worldPoint.x+=2.0*m_xSample )
 		{
 			// don't use this, we don't really need the
-      // Z position by this function... radarToWorld( &radarPoint, &worldPoint );
+			// Z position by this function... radarToWorld( &radarPoint, &worldPoint );
 			// and this is done by isUnderwater anyway: z = terrain->getGroundHeight( worldPoint.x, worldPoint.y );
 			Real z,waterZ;
 			if( terrain->isUnderwater( worldPoint.x, worldPoint.y, &waterZ, &z ) )
@@ -383,9 +383,8 @@ void Radar::newMap( TerrainLogic *terrain )
 				m_terrainAverageZ += z;
 				terrainSamples++;
 			}
-
 		}
-  }
+	}
 
 	// avoid divide by zeros
 	if( terrainSamples == 0 )
@@ -436,7 +435,7 @@ RadarObjectType Radar::addObject( Object *obj )
 		//Because we have support for disguised units pretending to be units from another
 		//team, we need to intercept it here and make sure it's rendered appropriately
 		//based on which client is rendering it.
-    StealthUpdate *update = obj->getStealth();
+		StealthUpdate *update = obj->getStealth();
 		if( update )
 		{
 			if( update->isDisguised() )
@@ -1506,7 +1505,7 @@ void Radar::xfer( Xfer *xfer )
 	XferVersion version = currentVersion;
 	xfer->xferVersion( &version, currentVersion );
 
-	
+
 	if (version <= 1)
 	{
 		const Int localPlayerIndex = ThePlayerList->getLocalPlayer()->getPlayerIndex();
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp
@@ -890,8 +890,8 @@ void W3DRadar::init( void )
 	DEBUG_ASSERTCRASH( m_overlayTexture, ("W3DRadar: Unable to allocate overlay texture") );
 
 	// set filter type for the overlay texture, try it and see if you like it, I don't ;)
-//	m_overlayTexture->Set_Min_Filter( TextureClass::FILTER_TYPE_NONE );
-//	m_overlayTexture->Set_Mag_Filter( TextureClass::FILTER_TYPE_NONE );
+//	m_overlayTexture->Set_Min_Filter( TextureFilterClass::FILTER_TYPE_NONE );
+//	m_overlayTexture->Set_Mag_Filter( TextureFilterClass::FILTER_TYPE_NONE );
 
 	// allocate our shroud texture
 	m_shroudTexture = MSGNEW("TextureClass") TextureClass( m_textureWidth, m_textureHeight,
@@ -1136,7 +1136,7 @@ void W3DRadar::buildTerrainTexture( TerrainLogic *terrain )
 								radarToWorld2D( &radarPoint, &worldPoint );
 
 								// get color for this Z and add to our sample color
-                Real underwaterZ;
+								Real underwaterZ;
 								if( terrain->isUnderwater( worldPoint.x, worldPoint.y, NULL, &underwaterZ ) )
 								{
 									// this is our "color" for water
@@ -1544,7 +1544,7 @@ void W3DRadar::refreshObjects()
 		// they are godlike and can see everything)
  		//
  		if( obj->getRadarPriority() == RADAR_PRIORITY_LOCAL_UNIT_ONLY &&
- 				obj->getControllingPlayer() != player &&
+				obj->getControllingPlayer() != player &&
 				player->isPlayerActive() )
  			continue;
 

Original file line number	Diff line number	Diff line change
`@@ -744,6 +744,7 @@ void StealthUpdate::changeVisualDisguise()`
`744`	`744`	`FXList::doFXPos( data->m_disguiseFX, self->getPosition() );`
`745`	`745`
`746`	`746`	`m_disguised = true;`
	`747`	`+ self->setStatus( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_DISGUISED ) );`
`747`	`748`	`}`
`748`	`749`	`else if( m_disguiseAsPlayerIndex != -1 )`
`749`	`750`	`{`
`@@ -809,6 +810,7 @@ void StealthUpdate::changeVisualDisguise()`
`809`	`810`
`810`	`811`	`FXList::doFXPos( data->m_disguiseRevealFX, self->getPosition() );`
`811`	`812`	`m_disguised = false;`
	`813`	`+ self->clearStatus( MAKE_OBJECT_STATUS_MASK( OBJECT_STATUS_DISGUISED ) );`
`812`	`814`	`}`
`813`	`815`
`814`	`816`	`//Reset the radar (determines color on add)`