Changeset 3062 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Matrix4x4.cpp

Timestamp:

10/23/08 14:53:23 (16 years ago)

Author:

mattausch

Message:

updating camera system: debug version

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Matrix4x4.cpp (modified) (3 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Matrix4x4.cpp

@@ -649 +649 @@
 }
 
-Matrix4x4 
-NormalTransformMatrix(const Matrix4x4 &tform)
+
+Matrix4x4  NormalTransformMatrix(const Matrix4x4 &tform)
 {
         Matrix4x4 m = tform;
@@ -692 +692 @@
         return m;
 }
-/*
-
-template<class REAL>
-Matrix4<REAL>& scaleTranslateToFit(Matrix4<REAL>& output, const Vector3<REAL>& vMin, const Vector3<REAL>& vMax) {
-        const REAL diffX = vMax.x()-vMin.x();
-        output[ 0] = 2/diffX;
-        output[ 4] = 0;
-        output[ 8] = 0;
-        output[12] = -(vMax.x()+vMin.x())/diffX;
-
-        const REAL diffY = vMax.y()-vMin.y();
-        output[ 1] = 0;
-        output[ 5] = 2/diffY;
-        output[ 9] = 0;
-        output[13] = -(vMax.y()+vMin.y())/diffY;
-
-        const REAL diffZ = vMax.z()-vMin.z();
-        output[ 2] = 0;
-        output[ 6] = 0;
-        output[10] = 2/diffZ;
-        output[14] = -(vMax.z()+vMin.z())/diffZ;
-
-        output[ 3] = 0;
-        output[ 7] = 0;
-        output[11] = 0;
-        output[15] = 1;
-        return output;
-}
+
+
+/** The resultig matrix that is equal to the result of glFrustum
 */
-
-
-
-//output is initialized with the same result as glFrustum
 Matrix4x4 GetFrustum(float left, float right, 
                                          float bottom, float top, 
@@ -781 +752 @@
 
 
-}
+/** The resultig matrix that is equal to the result of glOrtho
+*/
+Matrix4x4 GetOrtho(float left, float right, float bottom, float top, float far, float near)
+{
+        Matrix4x4 m;
+
+        const float xDif = 1.0f / (right - left);
+        const float yDif = 1.0f / (top - bottom);
+        const float zDif = 1.0f / (far - near);
+
+        m.x[0][0] = 2.0f * xDif;
+        m.x[0][1] = .0f;
+        m.x[0][2] = .0f;
+        m.x[0][3] = .0f;
+
+        m.x[1][0] = .0f;
+        m.x[1][1] = 2.0f * yDif;
+        m.x[1][2] = .0f;
+        m.x[1][3] = .0f;
+
+        m.x[2][0] = .0f;
+        m.x[2][1] = .0f;
+        m.x[2][2] = -2.0f * zDif;
+        m.x[2][3] = .0f;
+        
+        m.x[3][0] = (right + left) * xDif;
+        m.x[3][1] = (top + bottom) * yDif;
+        m.x[3][2] = (far + near) * zDif;
+        m.x[3][3] = 1.0f;
+
+        return m;
+}
+
+/** The resultig matrix that is equal to the result of gluPerspective
+*/
+Matrix4x4 GetPerspective(float fov, float aspect, float near, float far)
+{
+        Matrix4x4 m;
+
+        const float x = 1.0f / tan(fov * 0.5f);
+        const float zDif = 1.0f / (near - far);
+
+        m.x[0][0] = x / aspect;
+        m.x[0][1] = .0f;
+        m.x[0][2] = .0f;
+        m.x[0][3] = .0f;
+
+        m.x[1][0] = .0f;
+        m.x[1][1] = x;
+        m.x[1][2] = .0f;
+        m.x[1][3] = .0f;
+
+        m.x[2][0] = .0f;
+        m.x[2][1] = .0f;
+        m.x[2][2] = (far + near) * zDif;
+        m.x[2][3] = -1.0f;
+        
+        m.x[3][0] = .0f;
+        m.x[3][1] = .0f;
+        m.x[3][2] = 2.0f *(far * near) * zDif;
+        m.x[3][3] = 0.0f;
+
+        return m;
+}
+
+
+}