refactor(view): Simplify some View code

Author: xezon

GeneralsMD/Code/GameEngine/Include/GameClient/View.h

@@ -186,9 +186,9 @@ class View : public Snapshot
 	virtual Real getZoom() { return m_zoom; }
 	virtual void setZoom(Real z) { }
 	virtual Real getHeightAboveGround() { return m_heightAboveGround; }
-	virtual void setHeightAboveGround(Real z) { m_heightAboveGround = z; }
+	virtual void setHeightAboveGround(Real z);
 	virtual void zoom( Real height ); ///< Zoom in/out, closer to the ground, limit to min, or farther away from the ground, limit to max
-	virtual void setZoomToDefault( void ) { }														///< Set zoom to default value
+	virtual void setZoomToDefault( void ) { m_zoom  = 1.0f; } ///< Set zoom to default value
 	virtual Real getMaxZoom( void ) { return m_maxZoom; }								///< return max zoom value
 	virtual void setOkToAdjustHeight( Bool val ) { m_okToAdjustHeight = val; }	///< Set this to adjust camera height
 
@@ -269,8 +269,8 @@ class View : public Snapshot
 
 	Real m_maxZoom;																							///< Largest zoom value (minimum actual zoom)
 	Real m_minZoom;																							///< Smallest zoom value (maximum actual zoom)
-	Real m_maxHeightAboveGround;
-	Real m_minHeightAboveGround;
+	Real m_maxHeightAboveGround;																///< Highest camera above ground value
+	Real m_minHeightAboveGround;																///< Lowest camera above ground value
 	Real m_zoom;																								///< Current zoom value
 	Real m_heightAboveGround;																		///< User's desired height above ground
 	Bool m_zoomLimited;																					///< Camera restricted in zoom height
@@ -280,7 +280,7 @@ class View : public Snapshot
 	Real m_terrainHeightUnderCamera;														///< Cached value for debugging
 
 	ObjectID m_cameraLock;																			///< if nonzero, id of object that the camera should follow
-	Drawable *m_cameraLockDrawable;															///< if nonzero, drawble of object that camera should follow.
+	Drawable *m_cameraLockDrawable;															///< if nonzero, drawable of object that camera should follow.
 	CameraLockType m_lockType;																	///< are we following or just tethering?
 	Real m_lockDist;																						///< how far can we be when tethered?
 
@@ -290,7 +290,7 @@ class View : public Snapshot
 	Bool m_okToAdjustHeight;																		///< Should we attempt to adjust camera height?
 	Bool m_snapImmediate;																				///< Should we immediately snap to the object we're following?
 
-	Coord2D m_guardBandBias; ///< Exttra beefy margins so huge thins can stay "on-screen"
+	Coord2D m_guardBandBias; ///< Extra beefy margins so huge thins can stay "on-screen"
 
 };
 

GeneralsMD/Code/GameEngine/Source/GameClient/View.cpp

@@ -166,14 +166,8 @@ void View::setAngle( Real angle )
  */
 void View::setPitch( Real angle )
 {
-	m_pitchAngle = angle;
-
-	Real limit = PI/5.0f;
-
-	if (m_pitchAngle < -limit)
-		m_pitchAngle = -limit;
-	else if (m_pitchAngle > limit)
-		m_pitchAngle = limit;
+	constexpr Real limit = PI/5.0f;
+	m_pitchAngle = clamp(-limit, angle, limit);
 }
 
 /**
@@ -185,6 +179,19 @@ void View::setAngleAndPitchToDefault( void )
 	m_pitchAngle = m_defaultPitchAngle;
 }
 
+void View::setHeightAboveGround(Real z)
+{
+	// if our zoom is limited, we will stay within a predefined distance from the terrain
+	if( m_zoomLimited )
+	{
+		m_heightAboveGround = clamp(m_minHeightAboveGround, z, m_maxHeightAboveGround);
+	}
+	else
+	{
+		m_heightAboveGround = z;
+	}
+}
+
 /**
  * write the view's current location in to the view location object
  */

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp

@@ -445,13 +445,8 @@ void W3DView::buildCameraTransform( Matrix3D *transform )
 						// WST 10.22.2002. Update the Listener positions used by audio system
 						//--------------------------------------------------------------------
 						Vector3 position = transform->Get_Translation();
-						m_pos.x = position.X;
-						m_pos.y = position.Y;
-						m_pos.z = position.Z;
-
-
-						//DEBUG_LOG(("mpos x%f, y%f, z%f", m_pos.x, m_pos.y, m_pos.z ));
-
+						Coord3D coord(position.X, position.Y, position.Z);
+						View::setPosition(&coord);
 						break;
 					}
 				}
@@ -1919,7 +1914,7 @@ void W3DView::setAngleAndPitchToDefault( void )
 	// call our base class, we are adding functionality
 	View::setAngleAndPitchToDefault();
 
-	this->m_FXPitch = 1.0;
+	m_FXPitch = 1.0;
 
 	// set the camera
 	setCameraTransform();
@@ -1941,19 +1936,7 @@ void W3DView::setDefaultView(Real pitch, Real angle, Real maxHeight)
 //-------------------------------------------------------------------------------------------------
 void W3DView::setHeightAboveGround(Real z)
 {
-	m_heightAboveGround = z;
-
-  // if our zoom is limited, we will stay within a predefined distance from the terrain
-	if( m_zoomLimited )
-	{
-
-		if (m_heightAboveGround < m_minHeightAboveGround)
-			m_heightAboveGround = m_minHeightAboveGround;
-
-		if (m_heightAboveGround > m_maxHeightAboveGround)
-			m_heightAboveGround = m_maxHeightAboveGround;
-
-	}
+	View::setHeightAboveGround(z);
 
 	m_doingMoveCameraOnWaypointPath = false;
 	m_CameraArrivedAtWaypointOnPathFlag = false;