Changeset 142 for trunk

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

Location:

trunk

Files:

• nv/gfx/texture_atlas.hh (modified) (2 diffs)
• nv/interface/mesh.hh (modified) (1 diff)
• src/gfx/texture_atlas.cc (modified) (2 diffs)

trunk/nv/gfx/texture_atlas.hh

@@ -4 +4 @@
 // This file is part of NV Libraries.
 // For conditions of distribution and use, see copyright notice in nv.hh
+//
+// TODO: fix behavior for exact fits (1024^2 atlas with border 0 only holds 9 256^2 images...)
 
 #ifndef NV_TEXTURE_ATLAS_HH
@@ -19 +21 @@
         {
         public:
-                texture_atlas( ivec2 size, size_t depth );
+                texture_atlas( ivec2 size, size_t depth, size_t border = 1 );
                 region get_region( ivec2 size );
                 void clear();

trunk/nv/interface/mesh.hh

@@ -94 +94 @@
                 {
                         map::iterator i = m_map.find( attr );
-                        if ( i != m_map.end() && i->second->get_type() != type_to_enum<T>::type ) 
+                        if ( i != m_map.end() && i->second->get_type() == type_to_enum<T>::type ) 
                         {
                                 return ((vertex_attribute<T>*)(i->second));

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;
 }