Changeset 454 for trunk/src/gfx/keyframed_mesh.cc

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/src/gfx/keyframed_mesh.cc (modified) (2 diffs)

trunk/src/gfx/keyframed_mesh.cc

@@ -217 +217 @@
                 for ( size_t i = 0; i < m_vertex_count; ++i )
                 {
-                        vtx[i].position = glm::mix( prev[i].position, next[i].position, m_interpolation );
-                        vtx[i].normal   = glm::mix( prev[i].normal,   next[i].normal,   m_interpolation );
-                        vtx[i].tangent  = glm::mix( prev[i].tangent,  next[i].tangent,   m_interpolation );
+                        vtx[i].position = math::mix( prev[i].position, next[i].position, m_interpolation );
+                        vtx[i].normal   = math::mix( prev[i].normal,   next[i].normal,   m_interpolation );
+                        vtx[i].tangent  = math::mix( prev[i].tangent,  next[i].tangent,   m_interpolation );
                 }
         }
@@ -231 +231 @@
                 for ( size_t i = 0; i < m_vertex_count; ++i )
                 {
-                        vtx[i].position = glm::mix( prev[i].position, next[i].position, m_interpolation );
-                        vtx[i].normal   = glm::mix( prev[i].normal,   next[i].normal,   m_interpolation );
+                        vtx[i].position = math::mix( prev[i].position, next[i].position, m_interpolation );
+                        vtx[i].normal   = math::mix( prev[i].normal,   next[i].normal,   m_interpolation );
                 }
         }