Changeset 451 for trunk/src/formats/assimp_loader.cc

Timestamp:

07/30/15 19:47:02 (10 years ago)

Author:

epyon

Message:

• math library started

File:

• trunk/src/formats/assimp_loader.cc (modified) (2 diffs)

trunk/src/formats/assimp_loader.cc

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