Changeset 398 for trunk/src/gfx/mesh_creator.cc

Timestamp:

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

Author:

epyon

Message:

• cleanup of glm usage

File:

• trunk/src/gfx/mesh_creator.cc (modified) (6 diffs)

trunk/src/gfx/mesh_creator.cc

@@ -21 +21 @@
                 size_t count     = ( keys ? keys->get_channel(0)->count : 0 );
                 size_t pcount    = ( pkeys ? pkeys->get_channel(0)->count : 0 );
-                max_frames = glm::max<uint32>( count, max_frames );
+                max_frames = nv::max<uint32>( count, max_frames );
                 if ( pkeys && pkeys->get_channel_count() > 0 && keys && keys->get_channel_count() > 0 )
                 {
@@ -28 +28 @@
                         for ( unsigned n = 0; n < count; ++n )
                         {
-                                channel[n].tform = pchannel[ glm::min( n, pcount-1 ) ].tform * channel[n].tform;
+                                channel[n].tform = pchannel[ nv::min( n, pcount-1 ) ].tform * channel[n].tform;
                         }
                 }
@@ -63 +63 @@
                         for ( size_t c = 0; c < chan_count; ++c )
                         {
-                                max_keys = glm::max( max_keys, old_keys->get_channel(c)->count );
+                                max_keys = nv::max( max_keys, old_keys->get_channel(c)->count );
                         }
 
@@ -79 +79 @@
                                 for ( uint16 c = 0; c < chan_count; ++c )
                                 {
-                                        size_t idx = glm::min( old_keys->get_channel(c)->count - 1, n );
+                                        size_t idx = nv::min( old_keys->get_channel(c)->count - 1, n );
                                         pkey += old_keys->get_channel(c)->get_raw( idx, pkey );
                                 }
@@ -119 +119 @@
 void nv::mesh_data_creator::transform( float scale, const mat3& r33 )
 {
-        vec3 vertex_offset     = glm::vec3(); 
+        vec3 vertex_offset     = vec3(); 
         mat3 vertex_transform  = scale * r33;
         mat3 normal_transform  = r33;
@@ -297 +297 @@
                         vec3 xyz2 = v2 - v1;
 
-                        //glm::vec3 normal = glm::cross( xyz1, xyz2 );
+                        //vec3 normal = glm::cross( xyz1, xyz2 );
                         //
                         //vtcs[ ti0 ].normal += normal;