SDK 0.2.3

1 files changed, 153 insertions, 153 deletions

diff --git a/LibOVR/Src/Kernel/OVR_Math.cpp b/LibOVR/Src/Kernel/OVR_Math.cpp
index eaf23fe..3c35bde 100644
--- a/LibOVR/Src/Kernel/OVR_Math.cpp
+++ b/LibOVR/Src/Kernel/OVR_Math.cpp
@@ -1,153 +1,153 @@
-/************************************************************************************

-

-Filename    :   OVR_Math.h

-Content     :   Implementation of 3D primitives such as vectors, matrices.

-Created     :   September 4, 2012

-Authors     :   Andrew Reisse, Michael Antonov

-

-Copyright   :   Copyright 2012 Oculus VR, Inc. All Rights reserved.

-

-Use of this software is subject to the terms of the Oculus license

-agreement provided at the time of installation or download, or which

-otherwise accompanies this software in either electronic or hard copy form.

-

-*************************************************************************************/

-

-#include "OVR_Math.h"

-

-#include <float.h>

-

-namespace OVR {

-

-

-//-------------------------------------------------------------------------------------

-// ***** Math

-

-

-// Single-precision Math constants class.

-const float Math<float>::Pi      = 3.1415926f;

-const float Math<float>::TwoPi   = 3.1415926f * 2;

-const float Math<float>::PiOver2 = 3.1415926f / 2.0f;

-const float Math<float>::PiOver4 = 3.1415926f / 4.0f;

-const float Math<float>::E       = 2.7182818f;

-

-const float Math<float>::MaxValue = FLT_MAX;

-const float Math<float>::MinPositiveValue = FLT_MIN;

-

-const float Math<float>::RadToDegreeFactor = 360.0f / Math<float>::TwoPi;

-const float Math<float>::DegreeToRadFactor = Math<float>::TwoPi / 360.0f;

-

-const float Math<float>::Tolerance = 0.00001f;

-const float Math<float>::SingularityRadius = 0.0000001f; // Use for Gimbal lock numerical problems

-

-

-// Double-precision Math constants class.

-const double Math<double>::Pi      = 3.14159265358979;

-const double Math<double>::TwoPi   = 3.14159265358979 * 2;

-const double Math<double>::PiOver2 = 3.14159265358979 / 2.0;

-const double Math<double>::PiOver4 = 3.14159265358979 / 4.0;

-const double Math<double>::E       = 2.71828182845905;

-

-const double Math<double>::MaxValue = DBL_MAX;

-const double Math<double>::MinPositiveValue = DBL_MIN;

-

-const double Math<double>::RadToDegreeFactor = 360.0 / Math<double>::TwoPi;

-const double Math<double>::DegreeToRadFactor = Math<double>::TwoPi / 360.0;

-

-const double Math<double>::Tolerance = 0.00001;

-const double Math<double>::SingularityRadius = 0.000000000001; // Use for Gimbal lock numerical problems

-

-

-

-//-------------------------------------------------------------------------------------

-// ***** Matrix4f

-

-

-Matrix4f Matrix4f::LookAtRH(const Vector3f& eye, const Vector3f& at, const Vector3f& up)

-{

-    Vector3f z = (eye - at).Normalized();  // Forward

-    Vector3f x = up.Cross(z).Normalized(); // Right

-    Vector3f y = z.Cross(x);

-

-    Matrix4f m(x.x,  x.y,  x.z,  -(x * eye),

-               y.x,  y.y,  y.z,  -(y * eye),

-               z.x,  z.y,  z.z,  -(z * eye),

-               0,    0,    0,    1 );

-    return m;

-}

-

-Matrix4f Matrix4f::LookAtLH(const Vector3f& eye, const Vector3f& at, const Vector3f& up)

-{

-    Vector3f z = (at - eye).Normalized();  // Forward

-    Vector3f x = up.Cross(z).Normalized(); // Right

-    Vector3f y = z.Cross(x);

-

-    Matrix4f m(x.x,  x.y,  x.z,  -(x * eye),

-               y.x,  y.y,  y.z,  -(y * eye),

-               z.x,  z.y,  z.z,  -(z * eye),

-               0,    0,    0,    1 ); 

-    return m;

-}

-

-

-Matrix4f Matrix4f::PerspectiveLH(float yfov, float aspect, float znear, float zfar)

-{

-    Matrix4f m;

-    float    tanHalfFov = tan(yfov * 0.5f);

-

-    m.M[0][0] = 1.0f / (aspect * tanHalfFov);

-    m.M[1][1] = 1.0f / tanHalfFov;

-    m.M[2][2] = zfar / (zfar - znear);

-    m.M[3][2] = 1.0f;

-    m.M[2][3] = (zfar * znear) / (znear - zfar);

-    m.M[3][3] = 0.0f;

-

-    // Note: Post-projection matrix result assumes Left-Handed coordinate system,

-    //       with Y up, X right and Z forward. This supports positive z-buffer values.

-    return m;

-}

-

-

-Matrix4f Matrix4f::PerspectiveRH(float yfov, float aspect, float znear, float zfar)

-{

-    Matrix4f m;

-    float    tanHalfFov = tan(yfov * 0.5f);

-  

-    m.M[0][0] = 1.0f / (aspect * tanHalfFov);

-    m.M[1][1] = 1.0f / tanHalfFov;

-    m.M[2][2] = zfar / (znear - zfar);

-   // m.M[2][2] = zfar / (zfar - znear);

-    m.M[3][2] = -1.0f;

-    m.M[2][3] = (zfar * znear) / (znear - zfar);

-    m.M[3][3] = 0.0f;

-

-    // Note: Post-projection matrix result assumes Left-Handed coordinate system,    

-    //       with Y up, X right and Z forward. This supports positive z-buffer values.

-    // This is the case even for RHS cooridnate input.       

-    return m;

-}

-

-

-/*

-OffCenterLH

-

-2*zn/(r-l)   0            0              0

-0            2*zn/(t-b)   0              0

-(l+r)/(l-r)  (t+b)/(b-t)  zf/(zf-zn)     1

-0            0            zn*zf/(zn-zf)  0

-

-*/

-

-

-Matrix4f Matrix4f::Ortho2D(float w, float h)

-{

-    Matrix4f m;

-    m.M[0][0] = 2.0f/w;

-    m.M[1][1] = -2.0f/h;

-    m.M[0][3] = -1.0;

-    m.M[1][3] = 1.0;

-    m.M[2][2] = 0;

-    return m;

-}

-

-}

+/************************************************************************************
+
+Filename    :   OVR_Math.h
+Content     :   Implementation of 3D primitives such as vectors, matrices.
+Created     :   September 4, 2012
+Authors     :   Andrew Reisse, Michael Antonov
+
+Copyright   :   Copyright 2012 Oculus VR, Inc. All Rights reserved.
+
+Use of this software is subject to the terms of the Oculus license
+agreement provided at the time of installation or download, or which
+otherwise accompanies this software in either electronic or hard copy form.
+
+*************************************************************************************/
+
+#include "OVR_Math.h"
+
+#include <float.h>
+
+namespace OVR {
+
+
+//-------------------------------------------------------------------------------------
+// ***** Math
+
+
+// Single-precision Math constants class.
+const float Math<float>::Pi      = 3.1415926f;
+const float Math<float>::TwoPi   = 3.1415926f * 2;
+const float Math<float>::PiOver2 = 3.1415926f / 2.0f;
+const float Math<float>::PiOver4 = 3.1415926f / 4.0f;
+const float Math<float>::E       = 2.7182818f;
+
+const float Math<float>::MaxValue = FLT_MAX;
+const float Math<float>::MinPositiveValue = FLT_MIN;
+
+const float Math<float>::RadToDegreeFactor = 360.0f / Math<float>::TwoPi;
+const float Math<float>::DegreeToRadFactor = Math<float>::TwoPi / 360.0f;
+
+const float Math<float>::Tolerance = 0.00001f;
+const float Math<float>::SingularityRadius = 0.0000001f; // Use for Gimbal lock numerical problems
+
+
+// Double-precision Math constants class.
+const double Math<double>::Pi      = 3.14159265358979;
+const double Math<double>::TwoPi   = 3.14159265358979 * 2;
+const double Math<double>::PiOver2 = 3.14159265358979 / 2.0;
+const double Math<double>::PiOver4 = 3.14159265358979 / 4.0;
+const double Math<double>::E       = 2.71828182845905;
+
+const double Math<double>::MaxValue = DBL_MAX;
+const double Math<double>::MinPositiveValue = DBL_MIN;
+
+const double Math<double>::RadToDegreeFactor = 360.0 / Math<double>::TwoPi;
+const double Math<double>::DegreeToRadFactor = Math<double>::TwoPi / 360.0;
+
+const double Math<double>::Tolerance = 0.00001;
+const double Math<double>::SingularityRadius = 0.000000000001; // Use for Gimbal lock numerical problems
+
+
+
+//-------------------------------------------------------------------------------------
+// ***** Matrix4f
+
+
+Matrix4f Matrix4f::LookAtRH(const Vector3f& eye, const Vector3f& at, const Vector3f& up)
+{
+    Vector3f z = (eye - at).Normalized();  // Forward
+    Vector3f x = up.Cross(z).Normalized(); // Right
+    Vector3f y = z.Cross(x);
+
+    Matrix4f m(x.x,  x.y,  x.z,  -(x * eye),
+               y.x,  y.y,  y.z,  -(y * eye),
+               z.x,  z.y,  z.z,  -(z * eye),
+               0,    0,    0,    1 );
+    return m;
+}
+
+Matrix4f Matrix4f::LookAtLH(const Vector3f& eye, const Vector3f& at, const Vector3f& up)
+{
+    Vector3f z = (at - eye).Normalized();  // Forward
+    Vector3f x = up.Cross(z).Normalized(); // Right
+    Vector3f y = z.Cross(x);
+
+    Matrix4f m(x.x,  x.y,  x.z,  -(x * eye),
+               y.x,  y.y,  y.z,  -(y * eye),
+               z.x,  z.y,  z.z,  -(z * eye),
+               0,    0,    0,    1 ); 
+    return m;
+}
+
+
+Matrix4f Matrix4f::PerspectiveLH(float yfov, float aspect, float znear, float zfar)
+{
+    Matrix4f m;
+    float    tanHalfFov = tan(yfov * 0.5f);
+
+    m.M[0][0] = 1.0f / (aspect * tanHalfFov);
+    m.M[1][1] = 1.0f / tanHalfFov;
+    m.M[2][2] = zfar / (zfar - znear);
+    m.M[3][2] = 1.0f;
+    m.M[2][3] = (zfar * znear) / (znear - zfar);
+    m.M[3][3] = 0.0f;
+
+    // Note: Post-projection matrix result assumes Left-Handed coordinate system,
+    //       with Y up, X right and Z forward. This supports positive z-buffer values.
+    return m;
+}
+
+
+Matrix4f Matrix4f::PerspectiveRH(float yfov, float aspect, float znear, float zfar)
+{
+    Matrix4f m;
+    float    tanHalfFov = tan(yfov * 0.5f);
+  
+    m.M[0][0] = 1.0f / (aspect * tanHalfFov);
+    m.M[1][1] = 1.0f / tanHalfFov;
+    m.M[2][2] = zfar / (znear - zfar);
+   // m.M[2][2] = zfar / (zfar - znear);
+    m.M[3][2] = -1.0f;
+    m.M[2][3] = (zfar * znear) / (znear - zfar);
+    m.M[3][3] = 0.0f;
+
+    // Note: Post-projection matrix result assumes Left-Handed coordinate system,    
+    //       with Y up, X right and Z forward. This supports positive z-buffer values.
+    // This is the case even for RHS cooridnate input.       
+    return m;
+}
+
+
+/*
+OffCenterLH
+
+2*zn/(r-l)   0            0              0
+0            2*zn/(t-b)   0              0
+(l+r)/(l-r)  (t+b)/(b-t)  zf/(zf-zn)     1
+0            0            zn*zf/(zn-zf)  0
+
+*/
+
+
+Matrix4f Matrix4f::Ortho2D(float w, float h)
+{
+    Matrix4f m;
+    m.M[0][0] = 2.0f/w;
+    m.M[1][1] = -2.0f/h;
+    m.M[0][3] = -1.0;
+    m.M[1][3] = 1.0;
+    m.M[2][2] = 0;
+    return m;
+}
+
+}