Changeset 534 for trunk/src/gfx/mesh_creator.cc

Timestamp:

01/12/17 14:41:17 (8 years ago)

Author:

epyon

Message:

CONTINUED:

• getting rid of size_t
• datatypes now restricted to uint32 size
• 64-bit compatibility
• copyright updates where modified

File:

• trunk/src/gfx/mesh_creator.cc (modified) (4 diffs)

trunk/src/gfx/mesh_creator.cc

@@ -15 +15 @@
 void nv::mesh_nodes_creator::merge_keys()
 {
-        for ( size_t i = 0; i < m_data->size(); ++i )
+        for ( uint32 i = 0; i < m_data->size(); ++i )
         {
                 data_channel_set* old_keys = m_data->m_data[i];
                 if ( old_keys && old_keys->size() > 0 )
                 {
-                        size_t chan_count = old_keys->size();
+                        uint32 chan_count = old_keys->size();
                         if ( chan_count == 1 
                                 && old_keys->get_channel(0)->descriptor().size() == 1
@@ -516 +516 @@
         NV_ASSERT( a.size() % frame_count == 0, "Merge - append first mesh empty!" );
         NV_ASSERT( b.size() % frame_count == 0, "Merge - append second mesh empty!" );
-        size_t vtx_size = a.element_size();
+        uint32 vtx_size = a.element_size();
 
         raw_data_channel result = data_channel_creator::create( a.descriptor(), a.size() + b.size() );
@@ -523 +523 @@
         if ( frame_count == 1 )
         {
-                size_t a_size = vtx_size * a.size();
+                uint32 a_size = vtx_size * a.size();
                 raw_copy_n( a.raw_data(), a_size, rdata );
                 raw_copy_n( b.raw_data(), vtx_size * b.size(), rdata + a_size );
@@ -529 +529 @@
         else
         {
-                size_t frame_size_a = ( a.size() / frame_count ) * vtx_size;
-                size_t frame_size_b = ( b.size() / frame_count ) * vtx_size;
-                size_t pos_a = 0;
-                size_t pos_b = 0;
-                size_t pos   = 0;
-                for ( size_t i = 0; i < frame_count; ++i )
+                uint32 frame_size_a = ( a.size() / frame_count ) * vtx_size;
+                uint32 frame_size_b = ( b.size() / frame_count ) * vtx_size;
+                uint32 pos_a = 0;
+                uint32 pos_b = 0;
+                uint32 pos   = 0;
+                for ( uint32 i = 0; i < frame_count; ++i )
                 {
                         raw_copy_n( a.raw_data() + pos_a, frame_size_a, rdata + pos );