Changeset 142 for trunk/src

Timestamp:

07/03/13 23:38:00 (12 years ago)

Author:

epyon

Message:

• texture_atlas - optionally takes a border parameter (default 1)
• texture_atlas - TODO: fix behavior for exact fits (1024^{2 atlas only holds 9 256}2 images...)
• mesh - get_attribute fixed

File:

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

trunk/src/gfx/texture_atlas.cc

@@ -12 +12 @@
 using namespace nv;
 
-texture_atlas::texture_atlas( glm::ivec2 size, size_t depth )
+texture_atlas::texture_atlas( glm::ivec2 size, size_t depth, size_t border /*= 1*/ )
         : image( size, depth ), m_used( 0 )
 {
-        m_nodes.push_back( glm::ivec3( 1, 1, m_size.x - 2 ) );
+        m_nodes.push_back( glm::ivec3( border, border, m_size.x - 2 * border ) );
         fill( 0 );
 }
@@ -79 +79 @@
         }
         merge();
-        m_used += static_cast<uint16>(size.x * size.y);
+        m_used += static_cast<uint32>(size.x * size.y);
         return r;
 }