Changeset 454 for trunk/src/gfx

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

Location:

trunk/src/gfx

Files:

• keyframed_mesh.cc (modified) (2 diffs)
• mesh_creator.cc (modified) (5 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 );
                 }
         }

trunk/src/gfx/mesh_creator.cc

@@ -95 +95 @@
 void nv::mesh_nodes_creator::transform( float scale, const mat3& r33 )
 {
-        mat3 ri33 = glm::inverse( r33 );
+        mat3 ri33 = math::inverse( r33 );
         mat4 pre_transform ( scale * r33 );
         mat4 post_transform( 1.f/scale * ri33 ); 
@@ -150 +150 @@
                         {
                                 vec3& n = *reinterpret_cast<vec3*>( raw_data + vtx_size*i + n_offset );
-                                n = glm::normalize( normal_transform * n );
+                                n = math::normalize( normal_transform * n );
                         }
                 if ( t_offset != -1 )
@@ -156 +156 @@
                         {
                                 vec4& t = *reinterpret_cast<vec4*>(raw_data + vtx_size*i + t_offset );
-                                t = vec4( glm::normalize( normal_transform * vec3(t) ), t[3] );
+                                t = vec4( math::normalize( normal_transform * vec3(t) ), t[3] );
                         }
         }
@@ -299 +299 @@
                         vec3 xyz2 = v2 - v1;
 
-                        //vec3 normal = glm::cross( xyz1, xyz2 );
+                        //vec3 normal = math::cross( xyz1, xyz2 );
                         //
                         //vtcs[ ti0 ].normal += normal;
@@ -323 +323 @@
                 if ( ! ( t.x == 0.0f && t.y == 0.0f && t.z == 0.0f ) )
                 {
-                        tangents[i]    = vec4( glm::normalize(t - n * glm::dot( n, t )), 0.0f ); 
-                        tangents[i][3] = (glm::dot(glm::cross(n, t), tangents2[i]) < 0.0f) ? -1.0f : 1.0f;
+                        tangents[i]    = vec4( math::normalize(t - n * math::dot( n, t )), 0.0f );
+                        tangents[i][3] = ( math::dot( math::cross(n, t), tangents2[i]) < 0.0f) ? -1.0f : 1.0f;
                 }
         }