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

Timestamp:

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

Author:

epyon

Message:

• cleanup of glm usage

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( glm::ivec2 size, nv::size_t depth, nv::size_t border /*= 1*/ )
+texture_atlas::texture_atlas( ivec2 size, nv::size_t depth, nv::size_t border /*= 1*/ )
         : image( size, depth ), m_used( 0 ), m_border( border )
 {
-        m_nodes.push_back( glm::ivec3( m_border, m_border, m_size.x - 2 * static_cast<int>( m_border ) ) );
+        m_nodes.push_back( ivec3( m_border, m_border, m_size.x - 2 * static_cast<int>( m_border ) ) );
         fill( 0 );
 }
 
-region texture_atlas::get_region( glm::ivec2 size )
+region texture_atlas::get_region( ivec2 size )
 {
-        region r ( glm::ivec2(0,0), size );
+        region r ( ivec2(0,0), size );
 
         int best_height = INT_MAX;
@@ -31 +31 @@
                 if ( y >= 0 )
                 {
-                        glm::ivec3 node = m_nodes[ i ];
+                        ivec3 node = m_nodes[ i ];
                         if ( ( (y + size.y) < best_height ) ||
                                 ( ((y + size.y) == best_height) && (node.z < best_width)) )
@@ -46 +46 @@
         if ( best_index == -1 )
         {
-                return region( glm::ivec2( -1, -1 ), glm::ivec2( 0, 0 ) );
+                return region( ivec2( -1, -1 ), ivec2( 0, 0 ) );
         }
 
-        m_nodes.insert( m_nodes.begin() + best_index, glm::ivec3( r.pos.x, r.pos.y + size.y, size.x ) );
+        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 )
         {
-                glm::ivec3 node = m_nodes[ i ];
-                glm::ivec3 prev = m_nodes[ i-1 ];
+                ivec3 node = m_nodes[ i ];
+                ivec3 prev = m_nodes[ i-1 ];
 
                 if ( node.x < prev.x + prev.z )
@@ -82 +82 @@
 }
 
-int texture_atlas::fit( nv::size_t index, glm::ivec2 size )
+int texture_atlas::fit( nv::size_t index, ivec2 size )
 {
-        glm::ivec3 node = m_nodes[ index ];
+        ivec3 node = m_nodes[ index ];
 
         if ( node.x + size.x > m_size.x - static_cast<int>( m_border ) ) 
@@ -128 +128 @@
         m_nodes.clear();
         m_used = 0;
-        m_nodes.push_back( glm::ivec3( 1, 1, m_size.x - 2 ) );
+        m_nodes.push_back( ivec3( 1, 1, m_size.x - 2 ) );
         fill( 0 );
 }