fix #5175

spring · Mar 17, 2016 · c82e075 · c82e075
1 parent 6408f6a
commit c82e075
Show file tree

Hide file tree

Showing 4 changed files with 112 additions and 135 deletions.
diff --git a/rts/Game/Camera.cpp b/rts/Game/Camera.cpp
@@ -103,7 +103,7 @@ void CCamera::Update(bool updateDirs, bool updateMats, bool updatePort)
 	if (updateDirs)
 		UpdateDirsFromRot(rot);
 	if (updateMats)
-		UpdateMatrices();
+		UpdateMatrices(globalRendering->viewSizeX, globalRendering->viewSizeY, globalRendering->aspectRatio);
 	if (updatePort)
 		UpdateViewPort(globalRendering->viewPosX, 0, globalRendering->viewSizeX, globalRendering->viewSizeY);
 
@@ -154,15 +154,15 @@ void CCamera::UpdateFrustum()
 	}
 }
 
-void CCamera::UpdateMatrices()
+void CCamera::UpdateMatrices(unsigned int vsx, unsigned int vsy, float var)
 {
 	// recalculate the projection transform
 	switch (projType) {
 		case PROJTYPE_PERSP: {
-			gluPerspectiveSpring(globalRendering->aspectRatio, frustumScales.z, frustumScales.w);
+			gluPerspectiveSpring(var, frustumScales.z, frustumScales.w);
 		} break;
 		case PROJTYPE_ORTHO: {
-			glOrthoScaledSpring(globalRendering->viewSizeX, globalRendering->viewSizeY, frustumScales.z, frustumScales.w);
+			glOrthoScaledSpring(vsx, vsy, frustumScales.z, frustumScales.w);
 		} break;
 		default: {
 			assert(false);

diff --git a/rts/Game/Camera.h b/rts/Game/Camera.h
@@ -188,7 +188,7 @@ class CCamera
 public:
 	void UpdateViewRange();
 	void UpdateFrustum();
-	void UpdateMatrices();
+	void UpdateMatrices(unsigned int vsx, unsigned int vsy, float var);
 	void UpdateViewPort(int px, int py, int sx, int sy);
 
 private: