Changeset 1350Tweet

Timestamp:

May 8, 2012, 10:04:00 PM (11 years ago)

Author:

sam

Message:

core: add methods to set the camera's view matrix.

Location:

trunk

Files:

• orbital/orbital.cpp (modified) (1 diff)
• src/camera.cpp (modified) (3 diffs)
• src/camera.h (modified) (1 diff)
• src/lol/math/vector.h (modified) (1 diff)
• src/math/vector.cpp (modified) (1 diff)

trunk/orbital/orbital.cpp

@@ -70 +70 @@
     //Ticker::Ref(m_particlesystem);
 
-    m_camera = new Camera(vec3(0, 300, 300),
+    /* Create a camera that matches the settings of XNA Orbital */
+    m_camera = new Camera(vec3(0, 50, 0),
                           vec3(0, 0, 0),
-                          vec3(0, 1, 0));
+                          vec3(0, 0, -1));
+    m_camera->SetOrtho(1280.f / 3, 960.f / 3, -1000.f, 1000.f);
     Ticker::Ref(m_camera);
 

trunk/src/camera.cpp

@@ -32 +32 @@
     m_drawgroup = DRAWGROUP_CAMERA;
 
+    /* Create a default perspective */
+    SetPerspective(45.f, 800.f, 600.f, -1000.f, 1000.f);
     SetPosition(position);
 }
@@ -42 +44 @@
 {
     m_position = pos;
+}
+
+void Camera::SetOrtho(float width, float height, float near, float far)
+{
+    m_proj_matrix = mat4::ortho(width, height, near, far);
+}
+
+void Camera::SetPerspective(float fov, float width, float height,
+                            float near, float far)
+{
+    m_proj_matrix = mat4::perspective(fov, width, height, near, far);
 }
 
@@ -82 +95 @@
 
     m_view_matrix = mat4::lookat(m_position, m_target, m_up);
-    m_proj_matrix = mat4::perspective(45.0f, 640.0f, 480.0f, 1.f, 10000.0f);
-    //m_proj_matrix = mat4::ortho(-160, 160, -120, 120, .1f, 2000.0f);
 }
 

trunk/src/camera.h

@@ -31 +31 @@
 
     void SetPosition(vec3 const &pos);
+    void SetOrtho(float width, float height, float near, float far);
+    void SetPerspective(float fov, float width, float height,
+                        float near, float far);
 
     mat4 const &GetViewMatrix();

trunk/src/lol/math/vector.h

@@ -1815 +1815 @@
     /* Helpers for projection matrices */
     static Mat4<T> ortho(T left, T right, T bottom, T top, T near, T far);
+    static Mat4<T> ortho(T width, T height, 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 fov_y, T width, T height, T near, T far);

trunk/src/math/vector.cpp

@@ -659 +659 @@
 }
 
+template<> mat4 mat4::ortho(float width, float height,
+                            float near, float far)
+{
+    return mat4::ortho(-0.5f * width, 0.5f * width,
+                       -0.5f * height, 0.5f * height, near, far);
+}
+
 template<> mat4 mat4::frustum(float left, float right, float bottom,
                               float top, float near, float far)