Changeset 242

Timestamp:

05/25/14 09:57:11 (11 years ago)

Author:

epyon

Message:

• fix for animation transform_vector
• common four_cc template

Location:

trunk/nv

Files:

• common.hh (modified) (1 diff)
• gfx/animation.hh (modified) (1 diff)

trunk/nv/common.hh

@@ -174 +174 @@
         struct empty_type {};
 
+        template < int a, int b, int c, int d >
+        struct four_cc
+        {
+                static const unsigned int value = (((((d << 8) | c) << 8) | b) << 8) | a;
+        };
+
 } // namespace nv
 

trunk/nv/gfx/animation.hh

@@ -165 +165 @@
                         if ( m_keys.size() == 0 ) return transform();
                         if ( m_keys.size() == 1 ) return m_keys[0];
-                        size_t index = glm::clamp<size_t>( size_t( time ), 0, m_keys.size() - 1 );
+                        size_t index = glm::clamp<size_t>( size_t( time ), 0, m_keys.size() - 2 );
                         float factor = glm::clamp<float> ( time - index, 0.0f, 1.0f );
                         return interpolate( m_keys[ index ], m_keys[ index + 1 ], factor );