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

Timestamp:

06/13/15 11:20:22 (10 years ago)

Author:

epyon

Message:

• cleanup of glm usage

File:

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

trunk/nv/core/transform.hh

@@ -26 +26 @@
                 void set_orientation( const quat& a_orientation ) { m_orientation = a_orientation; }
                 void set_orientation( float radians, const vec3& axis )
-                { // use glm::radians if degrees!
+                { // use math::radians if degrees!
                         m_orientation = glm::angleAxis( radians, axis );
                 }
@@ -43 +43 @@
                 }
 //              void rotate( const vec3& axis, f32 angle )
-//              { // use glm::radians if degrees!
+//              { // use math::radians if degrees!
 //                      quat temp( angle, axis );
 //                      m_orientation = temp * m_orientation;
@@ -54 +54 @@
                 mat4 extract() const
                 {
-                        mat4 result = glm::mat4_cast( m_orientation );
+                        mat4 result = mat4_cast( m_orientation );
                         result[3] = vec4( m_position, 1.0f );
                         return result;
@@ -62 +62 @@
                         quat new_orient( glm::inverse( m_orientation ) );
                         // TODO: simplify
-                        return transform( -glm::mat3_cast(new_orient) * m_position, new_orient );
+                        return transform( -mat3_cast(new_orient) * m_position, new_orient );
                 }
 
@@ -100 +100 @@
                 return transform( 
                         glm::mix  ( a.get_position(), b.get_position(), value ), 
-                        glm::slerp( a.get_orientation(), b.get_orientation(), value ) 
+                        glm::slerp( a.get_orientation(), b.get_orientation(), value )
                 );
         }