refactor(view): Fix variable names in View::getScreenCornerWorldPointsAtZ() (TheSuperHackers#2201)

Author: xezon

Core/GameEngine/Include/GameClient/View.h

@@ -118,7 +118,7 @@ class View : public Snapshot
 	/** project the 4 corners of this view into the world and return each point as a parameter,
 			the world points are at the requested Z */
 	virtual void getScreenCornerWorldPointsAtZ( Coord3D *topLeft, Coord3D *topRight,
-																							Coord3D *bottomLeft, Coord3D *bottomRight,
+																							Coord3D *bottomRight, Coord3D *bottomLeft,
 																							Real z );
 
 	virtual void setWidth( Int width ) { m_width = width; }

Core/GameEngine/Source/GameClient/View.cpp

@@ -226,35 +226,38 @@ void View::setLocation( const ViewLocation *location )
 		the world points are at the requested Z */
 //-------------------------------------------------------------------------------------------------
 void View::getScreenCornerWorldPointsAtZ( Coord3D *topLeft, Coord3D *topRight,
-																					Coord3D *bottomLeft, Coord3D *bottomRight,
+																					Coord3D *bottomRight, Coord3D *bottomLeft,
 																					Real z )
 {
-	ICoord2D screenTopLeft, screenTopRight, screenBottomLeft, screenBottomRight;
-	ICoord2D origin;
-	Int viewWidth = getWidth();
-	Int viewHeight = getHeight();
-
 	// sanity
-	if( topLeft == nullptr || topRight == nullptr || bottomLeft == nullptr || bottomRight == nullptr )
+	if( topLeft == nullptr || topRight == nullptr || bottomRight == nullptr || bottomLeft == nullptr)
 		return;
 
+	ICoord2D screenTopLeft;
+	ICoord2D screenTopRight;
+	ICoord2D screenBottomRight;
+	ICoord2D screenBottomLeft;
+	ICoord2D origin;
+	const Int viewWidth = getWidth();
+	const Int viewHeight = getHeight();
+
 	// setup the screen coords for the 4 corners of the viewable display
 	getOrigin( &origin.x, &origin.y );
-	screenTopLeft.x     = origin.x;								// upper left
-	screenTopLeft.y     = origin.y;								// upper left
-	screenTopRight.x    = origin.x + viewWidth;		// upper right
-	screenTopRight.y    = origin.y;								// upper right
-	screenBottomLeft.x  = origin.x + viewWidth;		// lower right
-	screenBottomLeft.y  = origin.y + viewHeight;  // lower right
-	screenBottomRight.x = origin.x;								// lower left
-	screenBottomRight.y = origin.y + viewHeight;	// lower left
+
+	screenTopLeft.x = origin.x;
+	screenTopLeft.y = origin.y;
+	screenTopRight.x = origin.x + viewWidth;
+	screenTopRight.y = origin.y;
+	screenBottomRight.x = origin.x + viewWidth;
+	screenBottomRight.y = origin.y + viewHeight;
+	screenBottomLeft.x = origin.x;
+	screenBottomLeft.y = origin.y + viewHeight;
 
 	// project
 	screenToWorldAtZ( &screenTopLeft, topLeft, z );
 	screenToWorldAtZ( &screenTopRight, topRight, z );
-	screenToWorldAtZ( &screenBottomLeft, bottomLeft, z );
 	screenToWorldAtZ( &screenBottomRight, bottomRight, z );
-
+	screenToWorldAtZ( &screenBottomLeft, bottomLeft, z );
 }
 
 // ------------------------------------------------------------------------------------------------

Core/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp

@@ -183,6 +183,9 @@ void W3DRadar::reconstructViewBox( void )
 	Int i;
 
 	// get the 4 points of the view corners in the 3D world at the average Z height in the map
+	//  1-------2
+	//   \     /
+	//    4---3
 	TheTacticalView->getScreenCornerWorldPointsAtZ( &world[ 0 ],
 																									&world[ 1 ],
 																									&world[ 2 ],

Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp

@@ -1418,6 +1418,9 @@ void W3DView::getAxisAlignedViewRegion(Region3D &axisAlignedRegion)
 	// get the 4 points in 3D space of the 4 corners of the view, we will use a z = 0.0f
 	// value so that we can get everything ... even stuff below the terrain
 	//
+	//  1-------2
+	//   \     /
+	//    4---3
 	Coord3D box[ 4 ];
 	getScreenCornerWorldPointsAtZ( &box[ 0 ], &box[ 1 ], &box[ 2 ], &box[ 3 ], 0.0f );
 

Generals/Code/Tools/WorldBuilder/src/wbview3d.cpp

@@ -178,7 +178,7 @@ class PlaceholderView : public View
 	virtual void screenToTerrain( const ICoord2D *screen, Coord3D *world ) {};  ///< transform screen coord to a point on the 3D terrain
 	virtual void screenToWorldAtZ( const ICoord2D *s, Coord3D *w, Real z ) {};  ///< transform screen point to world point at the specified world Z value
 	virtual void getScreenCornerWorldPointsAtZ( Coord3D *topLeft, Coord3D *topRight,
-																							Coord3D *bottomLeft, Coord3D *bottomRight,
+																							Coord3D *bottomRight, Coord3D *bottomLeft,
 																							Real z ){};
 
 	virtual void drawView( void ) {};															///< Render the world visible in this view.

GeneralsMD/Code/Tools/WorldBuilder/src/wbview3d.cpp

@@ -178,7 +178,7 @@ class PlaceholderView : public View
 	virtual void screenToTerrain( const ICoord2D *screen, Coord3D *world ) {};  ///< transform screen coord to a point on the 3D terrain
 	virtual void screenToWorldAtZ( const ICoord2D *s, Coord3D *w, Real z ) {};  ///< transform screen point to world point at the specified world Z value
 	virtual void getScreenCornerWorldPointsAtZ( Coord3D *topLeft, Coord3D *topRight,
-																							Coord3D *bottomLeft, Coord3D *bottomRight,
+																							Coord3D *bottomRight, Coord3D *bottomLeft,
 																							Real z ){};
 
 	virtual void drawView( void ) {};															///< Render the world visible in this view.