Changeset 471 for trunk/src/gfx

Timestamp:

09/21/15 19:13:26 (10 years ago)

Author:

epyon

Message:

• full math library
• GLM dependency removed

Location:

trunk/src/gfx

Files:

• mesh_creator.cc (modified) (2 diffs)
• skeletal_mesh.cc (modified) (1 diff)
• texture_atlas.cc (modified) (1 diff)
• texture_font.cc (modified) (1 diff)

trunk/src/gfx/mesh_creator.cc

@@ -17 +17 @@
         if ( m_data->m_flat ) return;
         merge_keys();
-        uint32 max_frames = 0;
+        uint16 max_frames = 0;
 
         nv::vector< sint16 > ids;
@@ -65 +65 @@
                 size_t count     = ( keys ? keys->get_channel_size(0) : 0 );
                 size_t pcount    = ( pkeys ? pkeys->get_channel_size(0) : 0 );
-                max_frames = nv::max<uint32>( count, max_frames );
+                max_frames = nv::max<uint16>( uint16( count ), max_frames );
                 if ( pkeys && pkeys->size() > 0 && keys && keys->size() > 0 )
                 {

trunk/src/gfx/skeletal_mesh.cc

@@ -48 +48 @@
 {
         float  fframe   = ( a_ms_time * 0.001f ) * m_fps;
-        uint32 frame    = math::floor( fframe );
+        uint32 frame    = uint32( math::floor( fframe ) );
         float  reminder = fframe - static_cast<float>( frame );
         uint32 duration = get_frame_count();

trunk/src/gfx/texture_atlas.cc

@@ -22 +22 @@
         region r ( ivec2(0,0), size );
 
-        int best_height = INT_MAX;
+        int best_height = nv::limits::si_max;
         int best_index  = -1;
-        int best_width  = INT_MAX;
+        int best_width  = nv::limits::si_max;
 
         for( size_t i=0; i < m_nodes.size(); ++i )

trunk/src/gfx/texture_font.cc

@@ -172 +172 @@
                 FT_Load_Glyph( face, glyph_index, FT_LOAD_RENDER | FT_LOAD_NO_HINTING);
                 slot = face->glyph;
-                g->advance = ivec2( slot->advance.x/64.0f, slot->advance.y/64.0f );
+                g->advance = vec2( slot->advance.x/64.0f, slot->advance.y/64.0f );
         }
         generate_kerning();