Changeset 13 for trunk/src

Timestamp:

01/26/13 20:23:31 (12 years ago)

Author:

epyon

Message:

• pure image functionality of texture_atlas split into image clas

Location:

trunk/src/gl

Files:

• image.cc (added)
• texture_atlas.cc (modified) (5 diffs)

trunk/src/gl/texture_atlas.cc

@@ -7 +7 @@
 #include "nv/gl/texture_atlas.hh"
 
+#include "nv/logging.hh"
+
 using namespace nv;
 
 texture_atlas::texture_atlas( glm::ivec2 size, size_t depth )
-        : m_size( size ), m_depth( depth ), m_used( 0 ), m_data( nullptr )
+        : image( size, depth ), m_used( 0 )
 {
         m_nodes.push_back( glm::ivec3( 1, 1, m_size.x - 2 ) );
-        m_data = new uint8[ m_size.x * m_size.y * m_depth ];
         fill( 0 );
 }
 
-glm::ivec4 texture_atlas::get_region( glm::ivec2 size )
+region texture_atlas::get_region( glm::ivec2 size )
 {
-        glm::ivec4 region (0,0,size.x,size.y);
+        region r ( glm::ivec2(0,0), size );
     size_t i;
 
@@ -37 +38 @@
                                 best_index = i;
                                 best_width = node.z;
-                                region.x = node.x;
-                                region.y = y;
+                                r.pos.x = node.x;
+                                r.pos.y = y;
                         }
         }
@@ -45 +46 @@
         if( best_index == -1 )
     {
-        return glm::ivec4( -1, -1, 0, 0 );
+        return region( glm::ivec2( -1, -1 ), glm::ivec2( 0, 0 ) );
     }
 
-    m_nodes.insert( m_nodes.begin() + best_index, glm::ivec3( region.x, region.y + size.y, size.x ) );
+    m_nodes.insert( m_nodes.begin() + best_index, glm::ivec3( r.pos.x, r.pos.y + size.y, size.x ) );
 
     for( size_t i = best_index+1; i < m_nodes.size(); ++i )
@@ -78 +79 @@
     merge();
     m_used += size.x * size.y;
-    return region;
-}
-
-void texture_atlas::set_region( glm::ivec4 region, const uint8 * data, size_t stride )
-{
-    for( size_t i = 0; i < region[3]; ++i )
-    {
-        memcpy( m_data+((region.y+i)*m_size.x + region.x ) * m_depth, 
-                data + (i*stride), m_size.x * m_depth );
-    }
+    return r;
 }
 
@@ -140 +132 @@
         fill( 0 );
 }
-
-void texture_atlas::fill( uint8 value )
-{
-        memset( m_data, value, m_size.x * m_size.y * m_depth );
-}
-
-texture_atlas::~texture_atlas()
-{
-        delete[] m_data;
-}
-