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

Timestamp:

07/31/15 20:25:22 (10 years ago)

Author:

epyon

Message:

• math library work
• glm only referenced in math/common.hh
• still a lot work to do, but its WURF

File:

• trunk/nv/core/transform.hh (modified) (6 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 math::radians if degrees!
-                        m_orientation = glm::angleAxis( radians, axis );
+                {
+                        m_orientation = math::angle_axis( radians, axis );
                 }
 
@@ -36 +36 @@
                 void move( const vec3& heading, float distance )
                 {
-                        m_position += glm::normalize( heading ) * distance;
+                        m_position += math::normalize( heading ) * distance;
                 }
                 void translate( const vec3& absolute )
@@ -42 +42 @@
                         m_position += absolute;
                 }
-//              void rotate( const vec3& axis, f32 angle )
-//              { // use math::radians if degrees!
-//                      quat temp( angle, axis );
-//                      m_orientation = temp * m_orientation;
-//              }
+                void rotate( const vec3& axis, f32 angle )
+                {
+                        quat temp( angle, axis );
+                        m_orientation = temp * m_orientation;
+                }
                 void set( const mat4& from )
                 {
@@ -54 +54 @@
                 mat4 extract() const
                 {
-                        mat4 result = mat4_cast( m_orientation );
+                        mat4 result = math::mat4_cast( m_orientation );
                         result[3] = vec4( m_position, 1.0f );
                         return result;
@@ -60 +60 @@
                 transform inverse() const
                 {
-                        quat new_orient( glm::inverse( m_orientation ) );
+                        quat new_orient( math::inverse( m_orientation ) );
                         // TODO: simplify
-                        return transform( -mat3_cast(new_orient) * m_position, new_orient );
+                        return transform( -math::mat3_cast(new_orient) * m_position, new_orient );
                 }
 
@@ -99 +99 @@
         {
                 return transform( 
-                        glm::mix  ( a.get_position(), b.get_position(), value ), 
-                        glm::slerp( a.get_orientation(), b.get_orientation(), value )
+                        math::mix  ( a.get_position(), b.get_position(), value ), 
+                        math::slerp( a.get_orientation(), b.get_orientation(), value )
                 );
         }