Changeset 1335Tweet

Timestamp:

May 2, 2012, 8:10:33 PM (11 years ago)

Author:

sam

Message:

core: make WorldEntity rotation a quaternion.

Location:

trunk

Files:

• orbital/tank.h (modified) (2 diffs)
• src/worldentity.cpp (modified) (1 diff)
• src/worldentity.h (modified) (1 diff)

trunk/orbital/tank.h

@@ -32 +32 @@
         WorldEntity::TickGame(seconds);
 
+        m_rotation *= quat::rotate(seconds * 20.f, vec3(0, 1, 0));
         m_angle += seconds * 50.f;
     }
@@ -46 +47 @@
         }
 
-        mat4 model = mat4::translate(m_position);
-
+        mat4 model = mat4::translate(m_position) * mat4(m_rotation);
         m_body.Render(model);
 

trunk/src/worldentity.cpp

@@ -27 +27 @@
 {
     m_position = vec3(0);
-    m_rotation = vec3(0);
+    m_rotation = quat(1);
     m_velocity = vec3(0);
     m_bbox[0] = m_bbox[1] = vec3(0);

trunk/src/worldentity.h

@@ -26 +26 @@
 public:
     vec3 m_position;
-    vec3 m_rotation;
     vec3 m_velocity;
+    quat m_rotation;
     vec3 m_bbox[2];