Changeset 660Tweet

Timestamp:

Feb 18, 2011, 1:09:15 AM (10 years ago)

Author:

sam

Message:

Implement float4x4::ortho() and float4x4::translate().

Location:

trunk/src

Files:

• matrix.cpp (modified) (2 diffs)
• matrix.h (modified) (1 diff)

trunk/src/matrix.cpp

@@ -63 +63 @@
 }
 
+template<> float4x4 float4x4::ortho(float left, float right, float bottom,
+                                    float top, float near, float far)
+{
+    float invrl = (right != left) ? 1.0f / (right - left) : 0.0f;
+    float invtb = (top != bottom) ? 1.0f / (top - bottom) : 0.0f;
+    float invfn = (far != near) ? 1.0f / (far - near) : 0.0f;
+
+    float4x4 ret(0.0f);
+    ret[0][0] = 2.0f * invrl;
+    ret[1][1] = 2.0f * invtb;
+    ret[2][2] = -2.0f * invfn;
+    ret[3][0] = - (right + left) * invrl;
+    ret[3][1] = - (top + bottom) * invtb;
+    ret[3][2] = - (far + near) * invfn;
+    ret[3][3] = 1.0f;
+    return ret;
+}
+
 template<> float4x4 float4x4::frustum(float left, float right, float bottom,
                                       float top, float near, float far)
@@ -90 +108 @@
 }
 
+template<> float4x4 float4x4::translate(float x, float y, float z)
+{
+    float4x4 ret(1.0f);
+    ret[3][0] = x;
+    ret[3][1] = y;
+    ret[3][2] = z;
+    return ret;
+}
+

trunk/src/matrix.h

@@ -196 +196 @@
     Mat4<T> invert() const;
 
+    static Mat4<T> ortho(T left, T right, T bottom, T top, T near, T far);
     static Mat4<T> frustum(T left, T right, T bottom, T top, T near, T far);
     static Mat4<T> perspective(T theta, T width, T height, T near, T far);
+    static Mat4<T> translate(T x, T y, T z);
 
     inline Mat4<T> operator +(Mat4<T> const val) const