Changeset 376 for trunk/src/gfx

Timestamp:

05/28/15 10:21:10 (10 years ago)

Author:

epyon

Message:

• stl/assert.hh, stl/capi.hh, size_t independent
• GCC 4.8 compatibility
• using template usage
• various minor changes

Location:

trunk/src/gfx

Files:

• image.cc (modified) (2 diffs)
• keyframed_mesh.cc (modified) (1 diff)
• texture_atlas.cc (modified) (2 diffs)

trunk/src/gfx/image.cc

@@ -7 +7 @@
 using namespace nv;
 
-image::image( glm::ivec2 size, size_t depth )
+image::image( glm::ivec2 size, nv::size_t depth )
         : m_size( size ), m_depth( depth ), m_data( nullptr )
 {
@@ -20 +20 @@
 
 
-image::image( glm::ivec2 size, size_t depth, const uint8 * data, bool reversed )
+image::image( glm::ivec2 size, nv::size_t depth, const uint8 * data, bool reversed )
         : m_size( size ), m_depth( depth ), m_data( nullptr )
 {

trunk/src/gfx/keyframed_mesh.cc

@@ -36 +36 @@
 }
 
-size_t keyframed_mesh::get_max_frames() const
+nv::size_t keyframed_mesh::get_max_frames() const
 {
         return m_frame_count;

trunk/src/gfx/texture_atlas.cc

@@ -11 +11 @@
 using namespace nv;
 
-texture_atlas::texture_atlas( glm::ivec2 size, size_t depth, size_t border /*= 1*/ )
+texture_atlas::texture_atlas( glm::ivec2 size, nv::size_t depth, nv::size_t border /*= 1*/ )
         : image( size, depth ), m_used( 0 ), m_border( border )
 {
@@ -82 +82 @@
 }
 
-int texture_atlas::fit( size_t index, glm::ivec2 size )
+int texture_atlas::fit( nv::size_t index, glm::ivec2 size )
 {
         glm::ivec3 node = m_nodes[ index ];