Changeset 1302Tweet

Timestamp:

Apr 27, 2012, 8:04:48 PM (11 years ago)

Author:

sam

Message:

orbital: make better use of the camera.

Location:

trunk/orbital

Files:

• camera.h (modified) (1 diff)
• orbital.cpp (modified) (3 diffs)

trunk/orbital/camera.h

@@ -39 +39 @@
 
         m_view_matrix = mat4::lookat(m_position, m_target, m_up);
-        m_proj_matrix = mat4::perspective(45.0f, 640.0f, 480.0f, 0.1f, 10.0f);
+        m_proj_matrix = mat4::perspective(45.0f, 640.0f, 480.0f, 1.f, 1000.0f);
+        //m_proj_matrix = mat4::ortho(0, 640, 0, -480, .1f, 2000.0f);
     }
 

trunk/orbital/orbital.cpp

@@ -33 +33 @@
     m.SendCommand("t0,0,-60,fl");
 
-    m.SendCommand("sc1,0,1,1,afcb10,10,10,2,rx45,rz45");
+    m.SendCommand("sc1,0,1,1,afcb10,10,10,1,rx45,rz45");
     m.SendCommand("t-20,-20,0,fl");
 
@@ -64 +64 @@
 
     m_particlesystem = new ParticleSystem();
-    m_camera = new Camera(vec3(0, 0, -4),
-                          vec3(0, 1, 0),
-                          vec3(0, 2, 0));
+    m_camera = new Camera(vec3(0, 150, 200),
+                          vec3(0, 0, 0),
+                          vec3(0, 1, 0));
 
     m_angle = 0;
@@ -84 +84 @@
     mat4 anim = mat4::rotate(m_angle, vec3(0, 1, 0))
               * mat4::rotate(m_angle * 0.25f, vec3(0, 0, 1));
-    mat4 model = mat4::translate(vec3(0, 0, -4.5))
-               * mat4::scale(vec3(0.025));
+    mat4 model = mat4::translate(vec3(0));
 
     m_modelview = m_camera->GetViewMatrix() * model * anim;