fixed Z ortho Stage

oxygine/src/Stage.cpp

@@ -169,7 +169,7 @@ namespace oxygine
     {
         //initialize projection and view matrix
         Matrix proj;
-        Matrix::orthoLH(proj, (float)viewport.getWidth(), (float)viewport.getHeight(), 0, 1);
+        Matrix::orthoLH(proj, (float)viewport.getWidth(), (float)viewport.getHeight(), 0.2f, 10000);
         Matrix view = makeViewMatrix(viewport.getWidth(), viewport.getHeight());
         render(&clearColor, viewport, view, proj);
     }

oxygine/src/math/Matrix.h

@@ -259,9 +259,9 @@ namespace oxygine
                                             const vector3& Up)
     {
         vector3 x, y, z, temp;
-        vector3::normalize(&z, At - Eye);
-        vector3::normalize(&x, *vector3::cross(&temp, Up, z));
-        vector3::normalize(&y, *vector3::cross(&temp, z, x));
+        vector3::normalize(z, At - Eye);
+        vector3::normalize(x, vector3::cross(temp, Up, z));
+        vector3::normalize(y, vector3::cross(temp, z, x));
 
         out = matrix(
                   x.x, y.x, z.x, 0,
@@ -279,9 +279,9 @@ namespace oxygine
                                             const vector3& Up)
     {
         vector3 x, y, z, temp;
-        vector3::normalize(&z, Eye - At);
-        vector3::normalize(&x, *vector3::cross(&temp, Up, z));
-        vector3::normalize(&y, *vector3::cross(&temp, z, x));
+        vector3::normalize(z, Eye - At);
+        vector3::normalize(x, vector3::cross(temp, Up, z));
+        vector3::normalize(y, vector3::cross(temp, z, x));
 
         *out = matrix(
                    x.x, y.x, z.x, 0,
@@ -364,10 +364,10 @@ namespace oxygine
         float x = y / aspect;
 
         out = matrix(
-                  x, 0, 0, 0,
-                  0, y, 0, 0,
-                  0, 0, zFar / (zFar - zNear), 1,
-                  0, 0, -zFar * zNear / (zFar - zNear), 0);
+                  x, 0.0f, 0.0f, 0.0f,
+                  0.0f, y, 0.0f, 0.0f,
+                  0.0f, 0.0f, zFar / (zFar - zNear), 1.0f,
+                  0.0f, 0.0f, -zFar * zNear / (zFar - zNear), 0.0f);
         return out;
     }
 
@@ -377,11 +377,11 @@ namespace oxygine
         float y = T(1) / scalar::tan(T(0.5) * fovy);
         float x = y / aspect;
 
-        *out = matrix(
-                   x, 0, 0, 0,
-                   0, y, 0, 0,
-                   0, 0, zFar / (zFar - zNear), -1,
-                   0, 0, zFar * zNear / (zFar - zNear), 0);
+        out = matrix(
+                  x, 0.0f, 0.0f, 0.0f,
+                  0.0f, y, 0.0f, 0.0f,
+                  0.0f, 0.0f, zFar / (zFar - zNear), -1.0f,
+                  0.0f, 0.0f, zFar * zNear / (zFar - zNear), 0.0f);
         return out;
     }