Changeset 382 for trunk/src/formats

Timestamp:

06/01/15 20:39:35 (10 years ago)

Author:

epyon

Message:

• massive C++11 update (upgrade to MSVC 2015)
• array/dynamic_array - fully based on memory containers (will be moved) (in progress)

Location:

trunk/src/formats

Files:

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

trunk/src/formats/assimp_loader.cc

@@ -238 +238 @@
                         aiMesh* mesh = scene->mMeshes[mc];
 
-                        NV_LOG_NOTICE( "Mesh #", mc, "   - ", std::string( mesh->mName.data ) );
+                        NV_LOG_NOTICE( "Mesh #", mc, "   - ", string_ref( (char*)mesh->mName.data ) );
                         NV_LOG_NOTICE( "  bones   - ", mesh->mNumBones );
                         NV_LOG_NOTICE( "  uvs     - ", mesh->mNumUVComponents[0] );

trunk/src/formats/obj_loader.cc

@@ -280 +280 @@
                 for ( nv::size_t a = 0; a < count; ++a )
                 {
-                        const vec3& n = m_data[a].normal;
-                        const vec3& t = tan1[a];
-                        if ( ! (t.x == 0.0f && t.y == 0.0f && t.z == 0.0f) )
+                        const vec3& nv = m_data[a].normal;
+                        const vec3& tv = tan1[a];
+                        if ( ! (tv.x == 0.0f && tv.y == 0.0f && tv.z == 0.0f) )
                         {
-                                m_data[a].tangent    = vec4( glm::normalize(t - n * glm::dot( n, t )), 0.0f ); 
-                                m_data[a].tangent[3] = (glm::dot(glm::cross(n, t), tan2[a]) < 0.0f) ? -1.0f : 1.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;
                         }
                 }