Changeset 454 for trunk/src/formats

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/formats

Files:

• assimp_loader.cc (modified) (2 diffs)
• obj_loader.cc (modified) (1 diff)

trunk/src/formats/assimp_loader.cc

@@ -134 +134 @@
                 {
                         vec3 v = assimp_vec3_cast( mesh->mVertices[i] );
-                        vec3 n = glm::normalize( assimp_vec3_cast( mesh->mNormals[i] ) );
-                        vec3 t = glm::normalize( assimp_vec3_cast( mesh->mTangents[i] ) );
-                        vec3 b = glm::normalize( assimp_vec3_cast( mesh->mBitangents[i] ) );
+                        vec3 n = math::normalize( assimp_vec3_cast( mesh->mNormals[i] ) );
+                        vec3 t = math::normalize( assimp_vec3_cast( mesh->mTangents[i] ) );
+                        vec3 b = math::normalize( assimp_vec3_cast( mesh->mBitangents[i] ) );
                         vec2 s = assimp_st_cast( mesh->mTextureCoords[0][i] );
 
-                        vec3 t_i = glm::normalize( t - n * glm::dot( n, t ) );
-                        float det = ( glm::dot( glm::cross( n, t ), b ) );
+                        vec3 t_i = math::normalize( t - n * math::dot( n, t ) );
+                        float det = ( math::dot( math::cross( n, t ), b ) );
                         det = ( det < 0.0f ? -1.0f : 1.0f );
                         nv::vec4 vt( t_i[0], t_i[1], t_i[2], det );
@@ -441 +441 @@
 //      {
 //              vec3 scale_vec0 = assimp_vec3_cast( node->mScalingKeys[0].mValue );
-//              float scale_value   = glm::length( math::abs( scale_vec0 - vec3(1,1,1) ) );
+//              float scale_value   = math::length( math::abs( scale_vec0 - vec3(1,1,1) ) );
 //              if ( node->mNumScalingKeys > 1 || scale_value > 0.001 ) 
 //              {

trunk/src/formats/obj_loader.cc

@@ -283 +283 @@
                         if ( ! (tv.x == 0.0f && tv.y == 0.0f && tv.z == 0.0f) )
                         {
-                                m_data[a].tangent    = vec4( glm::normalize(tv - nv * glm::dot( nv, tv )), 0.0f ); 
-                                m_data[a].tangent[3] = (glm::dot(glm::cross(nv, tv), tan2[a]) < 0.0f) ? -1.0f : 1.0f;
+                                m_data[a].tangent    = vec4( math::normalize(tv - nv * math::dot( nv, tv )), 0.0f );
+                                m_data[a].tangent[3] = ( math::dot( math::cross(nv, tv), tan2[a]) < 0.0f) ? -1.0f : 1.0f;
                         }
                 }