bugfix(view): Fix and improve map border camera constraint behavior to allow see all areas of the map comfortably

Author: xezon

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

@@ -4342,9 +4342,8 @@ Bool InGameUI::areSelectedObjectsControllable() const
 //------------------------------------------------------------------------------
 void InGameUI::resetCamera()
 {
-	ViewLocation currentView;
-	TheTacticalView->getLocation( &currentView );
-	TheTacticalView->resetCamera( &currentView.getPosition(), 1, 0.0f, 0.0f );
+	TheTacticalView->setAngleAndPitchToDefault();
+	TheTacticalView->setZoomToDefault();
 }
 
 //------------------------------------------------------------------------------

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

@@ -101,7 +101,6 @@ void View::init( void )
 	m_zoom = 1.0f;
 	m_maxHeightAboveGround = TheGlobalData->m_maxCameraHeight;
 	m_minHeightAboveGround = TheGlobalData->m_minCameraHeight;
-	m_okToAdjustHeight = FALSE;
 
 	m_defaultAngle = 0.0f;
 	m_defaultPitchAngle = 0.0f;

GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DView.h

@@ -226,7 +226,7 @@ class W3DView : public View, public SubsystemInterface
 	virtual void set3DWireFrameMode(Bool enable);	///<enables custom wireframe rendering of 3D viewport
 
 	Bool updateCameraMovements(void);
-	virtual void forceCameraAreaConstraintRecalc(void) { calcCameraAreaConstraints(); }
+	virtual void forceCameraAreaConstraintRecalc(void) { m_cameraAreaConstraintsValid = false; }
 
 	virtual void setGuardBandBias( const Coord2D *gb ) { m_guardBandBias.x = gb->x; m_guardBandBias.y = gb->y; }
 
@@ -278,10 +278,17 @@ class W3DView : public View, public SubsystemInterface
 
 	Region2D m_cameraAreaConstraints; ///< Camera should be constrained to be within this area
 	Bool m_cameraAreaConstraintsValid; ///< If false, recalculates the camera area constraints in the next render update
+	Bool m_clipIntoCameraConstraintsNow; ///< If true, clips the camera into the camera area constraints in the next render update
+	Bool m_recalcCameraConstraintsAfterScrolling; ///< Recalculates the camera area constraints after the user has moved the camera
+	Bool m_recalcCamera; ///< Recalculates the camera transform in the next render update
 
 	void setCameraTransform( void );								///< set the transform matrix of m_3DCamera, based on m_pos & m_angle
 	void buildCameraTransform( Matrix3D *transform );			///< calculate (but do not set) the transform matrix of m_3DCamera, based on m_pos & m_angle
+	void updateCameraAreaConstraints();
 	void calcCameraAreaConstraints();			///< Recalculates the camera area constraints
+	void moveCameraIntoAreaConstraints();
+	void clipCameraIntoAreaConstraints();
+	Bool isWithinCameraAreaConstraints() const;
 	Bool isWithinCameraHeightConstraints() const;
 	void moveAlongWaypointPath(Real milliseconds); ///< Move camera along path.
 	void getPickRay(const ICoord2D *screen, Vector3 *rayStart, Vector3 *rayEnd);	///<returns a line segment (ray) originating at the given screen position