Changeset 533 for trunk/src/gfx/texture_atlas.cc

Timestamp:

01/12/17 13:16:48 (8 years ago)

Author:

epyon

Message:

• getting rid of size_t
• datatypes now restricted to uint32 size
• 64-bit compatibility
• copyright updates where modified

File:

• trunk/src/gfx/texture_atlas.cc (modified) (5 diffs)

trunk/src/gfx/texture_atlas.cc

@@ -11 +11 @@
 using namespace nv;
 
-texture_atlas::texture_atlas( ivec2 size, nv::size_t depth, nv::size_t border /*= 1*/ )
+texture_atlas::texture_atlas( ivec2 size, uint32 depth, uint32 border /*= 1*/ )
         : image( size, depth ), m_used( 0 ), m_border( border )
 {
@@ -26 +26 @@
         int best_width  = nv::limits::si_max;
 
-        for( size_t i=0; i < m_nodes.size(); ++i )
+        for( uint32 i=0; i < m_nodes.size(); ++i )
         {
                 int y = fit( i, size );
@@ -51 +51 @@
         m_nodes.insert( m_nodes.begin() + best_index, ivec3( r.pos.x, r.pos.y + size.y, size.x ) );
 
-        for( size_t i = static_cast<size_t>( best_index )+1; i < m_nodes.size(); ++i )
+        for( uint32 i = static_cast<uint32>( best_index )+1; i < m_nodes.size(); ++i )
         {
                 ivec3 node = m_nodes[ i ];
@@ -82 +82 @@
 }
 
-int texture_atlas::fit( nv::size_t index, ivec2 size )
+int texture_atlas::fit( uint32 index, ivec2 size )
 {
         ivec3 node = m_nodes[ index ];
@@ -113 +113 @@
 void texture_atlas::merge()
 {
-        for ( size_t i=0; i < m_nodes.size()-1; ++i )
+        for ( uint32 i=0; i < m_nodes.size()-1; ++i )
     {
                 if ( m_nodes[ i ].y == m_nodes[ i+1 ].y )