Changeset 397 for trunk/nv/core/transform.hh

Timestamp:

06/12/15 19:27:20 (10 years ago)

Author:

epyon

Message:

• various cleanups

File:

• trunk/nv/core/transform.hh (modified) (2 diffs)

trunk/nv/core/transform.hh

@@ -25 +25 @@
                 void set_position( const vec3& a_position ) { m_position = a_position; }
                 void set_orientation( const quat& a_orientation ) { m_orientation = a_orientation; }
-                void set_orientation( const vec3& axis, float angle )
-                {
-                        m_orientation = glm::angleAxis( angle, axis );
-                }
+                void set_orientation( float radians, const vec3& axis )
+                { // use glm::radians if degrees!
+                        m_orientation = glm::angleAxis( radians, axis );
+                }
 
                 const vec3& get_position() const { return m_position; }
@@ -42 +42 @@
                         m_position += absolute;
                 }
-                void rotate( const vec3& axis, f32 angle )
-                {
-                        quat temp( angle, axis );
-                        m_orientation = temp * m_orientation;
-                }
+//              void rotate( const vec3& axis, f32 angle )
+//              { // use glm::radians if degrees!
+//                      quat temp( angle, axis );
+//                      m_orientation = temp * m_orientation;
+//              }
                 void set( const mat4& from )
                 {