Changeset 383 for trunk/src/gfx

Timestamp:

06/02/15 20:56:15 (10 years ago)

Author:

epyon

Message:

• more work on stl
• fully working vectors!
• copy & copy_n
• removal of a lot of std code!

Location:

trunk/src/gfx

Files:

• image.cc (modified) (6 diffs)
• mesh_creator.cc (modified) (3 diffs)
• skeletal_mesh.cc (modified) (1 diff)

trunk/src/gfx/image.cc

@@ -4 +4 @@
 
 #include "nv/gfx/image.hh"
+#include "nv/stl/algorithm.hh"
 
 using namespace nv;
@@ -31 +32 @@
                 for( int i = 0; i < m_size.y; ++i )
                 {
-                        std::copy( data + i * bline, data + (i + 1) * bline, m_data + bsize - ( i + 1 ) * bline );
+                        raw_copy( data + i * bline, data + (i + 1) * bline, m_data + bsize - ( i + 1 ) * bline );
                 }
 
@@ -37 +38 @@
         else 
         {
-                std::copy( data, data + bsize, m_data );
+                raw_copy( data, data + bsize, m_data );
         }
 }
@@ -43 +44 @@
 void image::fill( uint8 value )
 {
-        std::fill( m_data, m_data + m_size.x * m_size.y * (int)m_depth, value );
+        raw_fill( m_data, m_data + m_size.x * m_size.y * (int)m_depth, value );
 }
 
@@ -56 +57 @@
         {
                 // TODO: test 
-                std::fill( m_data + bpos + bline * i, m_data + bpos + bline * i + stride, value );
+                raw_fill( m_data + bpos + bline * i, m_data + bpos + bline * i + stride, value );
         }
 }
@@ -73 +74 @@
 //              memcpy( m_data+((r.pos.y+i)*m_size.x + r.pos.x ) * m_depth, 
 //                      data + (i*stride), r.size.x * m_depth );
-                std::copy( data + i*stride, data + (i+1)*stride, m_data + bpos + bline * i );
+                raw_copy( data + i*stride, data + (i+1)*stride, m_data + bpos + bline * i );
         }
 }

trunk/src/gfx/mesh_creator.cc

@@ -350 +350 @@
         for ( uint32 i = 0; i < count; ++i )
         {
-                std::copy_n( a->data + i * adesc.size, adesc.size, data + i*desc.size );
-                std::copy_n( b->data + i * bdesc.size, bdesc.size, data + i*desc.size + adesc.size );
+                raw_copy_n( a->data + i * adesc.size, adesc.size, data + i*desc.size );
+                raw_copy_n( b->data + i * bdesc.size, bdesc.size, data + i*desc.size + adesc.size );
         }
         mesh_raw_channel* result = new mesh_raw_channel;
@@ -373 +373 @@
         {
                 size_t a_size = vtx_size * a->count;
-                std::copy_n( a->data, a_size, data );
-                std::copy_n( b->data, vtx_size * b->count, data + a_size );             
+                raw_copy_n( a->data, a_size, data );
+                raw_copy_n( b->data, vtx_size * b->count, data + a_size );
         }
         else
@@ -385 +385 @@
                 for ( size_t i = 0; i < frame_count; ++i )
                 {
-                        std::copy_n( a->data + pos_a, frame_size_a, data + pos );
-                        std::copy_n( b->data + pos_b, frame_size_b, data + pos + frame_size_a );                                pos_a += frame_size_a; 
+                        raw_copy_n( a->data + pos_a, frame_size_a, data + pos );
+                        raw_copy_n( b->data + pos_b, frame_size_b, data + pos + frame_size_a );                         pos_a += frame_size_a;
                         pos_b += frame_size_b; 
                         pos   += frame_size_a + frame_size_b;

trunk/src/gfx/skeletal_mesh.cc

@@ -43 +43 @@
                         }
 
-                        std::fill( m_pntdata.raw_data(), m_pntdata.raw_data() + m_pntdata.raw_size(), 0 );
+                        fill( m_pntdata.raw_data(), m_pntdata.raw_data() + m_pntdata.raw_size(), 0 );
                         for ( unsigned int i = 0; i < vertex_count; ++i )
                         {