Changeset 1353Tweet

Timestamp:

May 9, 2012, 1:35:04 AM (11 years ago)

Author:

sam

Message:

orbital: play with the camera.

Location:

trunk

Files:

• orbital/orbital.cpp (modified) (3 diffs)
• orbital/player.h (modified) (1 diff)
• src/camera.cpp (modified) (2 diffs)
• src/camera.h (modified) (1 diff)

trunk/orbital/orbital.cpp

@@ -31 +31 @@
         for (int i = 0; i < 20; i++)
         {
-            m.SendCommand(((i + j) % 2) ? "sc.2,.6,.7,1,scb.2,.6,.7,1"
-                                        : "sc.2,.2,.6,1,scb.2,.2,.6,1");
+            m.SendCommand(((i + j) % 2) ? "sc.0,.1,.2,1,scb.0,.1,.2,1"
+                                        : "sc.0,.0,.1,1,scb.0,.0,.1,1");
             m.SendCommand("ac4,2,44,40,0,0,ty-1,ad4,40,0,ry45");
             m.Scale(vec3(std::sqrt(0.5f)));
@@ -58 +58 @@
     /* Orange/white alien */
     m.SendCommand("sc1,0.7,0,1,afcb12,3,10,0.4,tz3,sc1,1,1,1,afcb2,10,10,0.4");
-    m.SendCommand("rx20,ry30,t0,40,-20,fl");
+    m.SendCommand("t0,40,-20,fl");
+    //m.SendCommand("rx20,ry30,t0,40,-20,fl");
 
     /* Orange fire */
@@ -71 +72 @@
 
     /* Create a camera that matches the settings of XNA Orbital */
-    m_camera = new Camera(vec3(0, 50, 0),
-                          vec3(0, 0, 0),
+    m_camera = new Camera(vec3(0.f, 600.f, 50.f),
+                          vec3(0.f, 0.f, 50.f),
                           vec3(0, 0, -1));
+    m_camera->SetRotation(quat::fromeuler_yxz(0.f, -30.f, 0.f));
     m_camera->SetOrtho(1280.f / 3, 960.f / 3, -1000.f, 1000.f);
     Ticker::Ref(m_camera);
 
     /* Add tanks */
-    for (int j = 0; j < 10; j++)
-    for (int i = 0; i < 10; i++)
+    for (int j = 0; j < 5; j++)
+    for (int i = 0; i < 5; i++)
     {
         m_tanks << new Tank();
-        m_tanks.Last()->m_position = vec3(i * 40.f - 250.f, 0, j * 40.f - 100.f);
-        m_tanks.Last()->SetTarget(vec3(i * 80.f - 200.f, 0, j * 80.f - 130.f));
+        m_tanks.Last()->m_position = vec3(i * 80.f - 250.f, 0, j * 80.f - 100.f);
+        m_tanks.Last()->SetTarget(vec3(i * 160.f - 200.f, 0, j * 160.f - 130.f));
         Ticker::Ref(m_tanks.Last());
     }

trunk/orbital/player.h

@@ -30 +30 @@
         m_drone_mesh.SendCommand("sc0.2,0.7,0,1,afcb3,6,10,0.4,tx-8,afcb3,6,10,0.4,tx4,ty13,fl,sc1,1,1,1,afcb3,6,10,0.4,rx-30,ty13,fl");
 
-        m_position = vec3(0.f, 3.5f, 0.f);
+        m_position = vec3(0.f, 3.5f + 50.f, 0.f);
     }
 

trunk/src/camera.cpp

@@ -44 +44 @@
 {
     m_position = pos;
+}
+
+void Camera::SetRotation(quat const &rot)
+{
+    m_rotation = rot;
 }
 
@@ -94 +99 @@
     m_target += vec3(rightleft, 0, -updown) * 200.f * seconds;
 
-    m_view_matrix = mat4::lookat(m_position, m_target, m_up);
+    m_view_matrix = mat4::lookat(m_position, m_target, m_up)
+                  * mat4(m_rotation);
 }
 

trunk/src/camera.h

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