Changeset 454 for trunk/src/formats/obj_loader.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/formats/obj_loader.cc (modified) (1 diff)

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;
                         }
                 }