Changeset 398 for trunk/src/formats

Timestamp:

06/13/15 11:20:22 (10 years ago)

Author:

epyon

Message:

• cleanup of glm usage

File:

• trunk/src/formats/md5_loader.cc (modified) (6 diffs)

trunk/src/formats/md5_loader.cc

@@ -31 +31 @@
 }
 
-static void unit_quat_w( glm::quat& quat )
+static void unit_quat_w( nv::quat& quat )
 {
         float t = 1.0f - ( quat.x * quat.x ) - ( quat.y * quat.y ) - ( quat.z * quat.z );
@@ -343 +343 @@
                 md5_vtx_pnt& vtc = vtcs[i];
 
-                vtc.position = glm::vec3(0);
-                vtc.normal   = glm::vec3(0);
-                vtc.tangent  = glm::vec3(0);
+                vtc.position = vec3(0);
+                vtc.normal   = vec3(0);
+                vtc.tangent  = vec3(0);
 
                 stable_sort( weights + start_weight, weights + start_weight + weight_count, [] ( const md5_weight& a, const md5_weight& b ) -> bool { return a.bias > b.bias; } );
@@ -386 +386 @@
                                 const mesh_node_data&  joint = nodes[weight.joint_id];
                                 const transform tr = transform( joint.transform ).inverse();
-                                glm::vec3 rot_pos = tr.get_orientation() * weight.pos;
+                                vec3 rot_pos = tr.get_orientation() * weight.pos;
 
                                 vtc.position += ( tr.get_position() + rot_pos ) * weight.bias;
@@ -404 +404 @@
                 uint32 ti2 = idata[ i * 3 + 2 ];
  
-                glm::vec3 v1 = vtcs[ ti0 ].position;
-                glm::vec3 v2 = vtcs[ ti1 ].position;
-                glm::vec3 v3 = vtcs[ ti2 ].position;
-                glm::vec3 xyz1 = v3 - v1;
-                glm::vec3 xyz2 = v2 - v1;
-
-                glm::vec3 normal = glm::cross( xyz1, xyz2 );
+                vec3 v1 = vtcs[ ti0 ].position;
+                vec3 v2 = vtcs[ ti1 ].position;
+                vec3 v3 = vtcs[ ti2 ].position;
+                vec3 xyz1 = v3 - v1;
+                vec3 xyz2 = v2 - v1;
+
+                vec3 normal = glm::cross( xyz1, xyz2 );
 
                 vtcs[ ti0 ].normal += normal;
@@ -436 +436 @@
                 md5_vtx_pntiw& vdata = vtx_data[i];
 
-                glm::vec3 normal  = glm::normalize( vtcs[i].normal );
-                glm::vec3 tangent = glm::normalize( vtcs[i].tangent );
+                vec3 normal  = glm::normalize( vtcs[i].normal );
+                vec3 tangent = glm::normalize( vtcs[i].tangent );
                 vtcs[i].normal   = normal;
                 vtcs[i].tangent  = tangent;
 
                 vdata.position = vtcs[i].position;
-                vdata.normal   = glm::vec3(0);
-                vdata.tangent  = glm::vec3(0);
+                vdata.normal   = vec3(0);
+                vdata.tangent  = vec3(0);
  
                 for ( size_t j = 0; j < 4; ++j )
@@ -484 +484 @@
                         transform ptr;
                         if ( pjoint.data->get_channel(0)->count > index ) ptr = ptv[ index ];
-                        glm::vec3 rot_pos = ptr.get_orientation() * pos;
+                        vec3 rot_pos = ptr.get_orientation() * pos;
 
                         pos    = ptr.get_position() + rot_pos;