BGE: Fix Orthographic mode and viewport scaling

- the BGE now uses correct glOrtho projection whe camera is in orthographic mode
-

source/gameengine/VideoTexture/ImageRender.cpp

@@ -181,7 +181,6 @@ void ImageRender::Render()
         frustrum.camnear = -mirrorOffset[2];
         frustrum.camfar = -mirrorOffset[2]+m_clip;
     }
-    const float ortho = 100.0;
     const RAS_IRasterizer::StereoMode stereomode = m_rasterizer->GetStereoMode();
 
     // The screen area that ImageViewport will copy is also the rendering zone
@@ -214,37 +213,44 @@ void ImageRender::Render()
 		float farfrust = m_camera->GetCameraFar();
         float aspect_ratio = 1.0f;
         Scene *blenderScene = m_scene->GetBlenderScene();
+		MT_Matrix4x4 projmat;
 
-        if (orthographic) {
-			lens *= ortho;
-			nearfrust = (nearfrust + 1.0)*ortho;
-			farfrust *= ortho;
-		}
 		// compute the aspect ratio from frame blender scene settings so that render to texture
         // works the same in Blender and in Blender player
         if (blenderScene->r.ysch != 0)
-            aspect_ratio = float(blenderScene->r.xsch) / float(blenderScene->r.ysch);
+            aspect_ratio = float(blenderScene->r.xsch*blenderScene->r.xasp) / float(blenderScene->r.ysch*blenderScene->r.yasp);
 
-        RAS_FramingManager::ComputeDefaultFrustum(
-            nearfrust,
-            farfrust,
-            lens,
-            aspect_ratio,
-            frustrum);
-		
-		MT_Matrix4x4 projmat = m_rasterizer->GetFrustumMatrix(
-			frustrum.x1, frustrum.x2, frustrum.y1, frustrum.y2, frustrum.camnear, frustrum.camfar);
+		if (orthographic) {
 
+			RAS_FramingManager::ComputeDefaultOrtho(
+				nearfrust,
+				farfrust,
+				m_camera->GetScale(),
+				aspect_ratio,
+				frustrum
+			);
+
+			projmat = m_rasterizer->GetOrthoMatrix(
+				frustrum.x1, frustrum.x2, frustrum.y1, frustrum.y2, frustrum.camnear, frustrum.camfar);
+		} else 
+		{
+			RAS_FramingManager::ComputeDefaultFrustum(
+				nearfrust,
+				farfrust,
+				lens,
+				aspect_ratio,
+				frustrum);
+			
+			projmat = m_rasterizer->GetFrustumMatrix(
+				frustrum.x1, frustrum.x2, frustrum.y1, frustrum.y2, frustrum.camnear, frustrum.camfar);
+		}
 		m_camera->SetProjectionMatrix(projmat);
 	}
 
 	MT_Transform camtrans(m_camera->GetWorldToCamera());
-	if (!m_camera->GetCameraData()->m_perspective)
-		camtrans.getOrigin()[2] *= ortho;
 	MT_Matrix4x4 viewmat(camtrans);
 	
-	m_rasterizer->SetViewMatrix(viewmat, m_camera->NodeGetWorldPosition(),
-		m_camera->GetCameraLocation(), m_camera->GetCameraOrientation());
+	m_rasterizer->SetViewMatrix(viewmat, m_camera->NodeGetWorldOrientation(), m_camera->NodeGetWorldPosition(), m_camera->GetCameraData()->m_perspective);
 	m_camera->SetModelviewMatrix(viewmat);
     // restore the stereo mode now that the matrix is computed
     m_rasterizer->SetStereoMode(stereomode);