Changeset 534 for trunk/src/formats/assimp_loader.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/formats/assimp_loader.cc (modified) (16 diffs)

trunk/src/formats/assimp_loader.cc

@@ -1 @@
-// Copyright (C) 2014-2015 ChaosForge Ltd
+// Copyright (C) 2014-2017 ChaosForge Ltd
 // http://chaosforge.org/
 //
@@ -107 +107 @@
         m_mesh_count = 0;
         NV_LOG_NOTICE( "AssImp loading file..." );
-        size_t size = source.size();
+        uint32 size = static_cast< uint32 >( source.size() );
         char* data  = new char[ size ];
         source.read( data, size, 1 );
@@ -143 +143 @@
 }
 
-data_channel_set* nv::assimp_loader::release_mesh_data( size_t index, data_node_info& info )
+data_channel_set* nv::assimp_loader::release_mesh_data( uint32 index, data_node_info& info )
 {
         if ( index >= m_mesh_count ) return nullptr;
@@ -149 +149 @@
         return m_meshes[index];
 }
-void nv::assimp_loader::load_mesh_data( data_channel_set* data, size_t index, data_node_info& info )
+void nv::assimp_loader::load_mesh_data( data_channel_set* data, uint32 index, data_node_info& info )
 {
         const aiMesh*  mesh  = m_data->scene->mMeshes[ index ];
@@ -161 +161 @@
                 desc.initialize< assimp_plain_vtx >();
         data_channel_set_creator maccess( data );
-        string64 name( mesh->mName.data, mesh->mName.length );
+        string64 name( mesh->mName.data, static_cast< uint32 >( mesh->mName.length ) );
         if ( mesh->mName.length == 0 )
         {
@@ -170 +170 @@
                                         if ( node->mMeshes[i] == index )
                                         {
-                                                name.assign( node->mName.data, node->mName.length );
+                                                name.assign( node->mName.data, static_cast< uint32 >( node->mName.length ) );
                                                 if ( i != 0 )
                                                 {
@@ -215 +215 @@
                 {
                         aiBone* bone  = mesh->mBones[m];
-                        for ( size_t w=0; w<bone->mNumWeights; w++)
+                        for ( uint32 w=0; w<bone->mNumWeights; w++)
                         {
                                 assimp_skinned_vtx& v = vtx[ bone->mWeights[w].mVertexId ];
                                 bool found = false;
-                                for ( size_t i = 0 ; i < 4; ++i )
+                                for ( uint32 i = 0 ; i < 4; ++i )
                                 {
                                         if ( v.boneweight[i] <= 0.0f ) 
@@ -281 +281 @@
                         aiMesh* mesh = m_data->scene->mMeshes[mc];
 
-                        NV_LOG_NOTICE( "Mesh #", mc, "   - ", string_view( static_cast<char*>( mesh->mName.data ), mesh->mName.length ) );
+                        NV_LOG_NOTICE( "Mesh #", mc, "   - ", string_view( static_cast<char*>( mesh->mName.data ), static_cast< uint32 >( mesh->mName.length ) ) );
                         NV_LOG_NOTICE( "  bones   - ", mesh->mNumBones );
                         NV_LOG_NOTICE( "  uvs     - ", mesh->mNumUVComponents[0] );
@@ -303 +303 @@
         for ( auto node : m_data->nodes )
         {
-                NV_LOG_NOTICE( "Node : ", string_view( node->mName.data, node->mName.length ) );
+                NV_LOG_NOTICE( "Node : ", string_view( node->mName.data, static_cast< uint32 >( node->mName.length ) ) );
         }
 
         for ( auto skeleton : m_data->skeletons )
         {
-                NV_LOG_NOTICE( "Skeleton : ", string_view( skeleton->mName.data, skeleton->mName.length ) );
+                NV_LOG_NOTICE( "Skeleton : ", string_view( skeleton->mName.data, static_cast< uint32 >( skeleton->mName.length ) ) );
         }
 
@@ -353 +353 @@
         }
 
-        string_view name( ainode->mName.data, ainode->mName.length );
+        string_view name( ainode->mName.data, static_cast< uint32 >( ainode->mName.length ) );
         if ( name.starts_with( '_' ) ) return;
 
@@ -409 +409 @@
                         {
                                 assimp_skinned_vtx& vertex = channel.data()[v];
-                                for ( size_t i = 0; i < 4; ++i )
+                                for ( uint32 i = 0; i < 4; ++i )
                                 {
                                         if ( vertex.boneweight[i] > 0.0f )
@@ -430 +430 @@
                         int pid = bone_data[i].parent_id;
                         if ( pid >= 0 )
-                                bone_data[i].transform = tr * bone_data[ size_t( pid ) ].transform;
+                                bone_data[i].transform = tr * bone_data[uint32( pid ) ].transform;
                         else
                                 bone_data[i].transform = tr;
@@ -447 +447 @@
 }
 
-mesh_nodes_data* nv::assimp_loader::release_mesh_nodes_data( size_t index /*= 0*/ )
+mesh_nodes_data* nv::assimp_loader::release_mesh_nodes_data( uint32 index /*= 0*/ )
 {
         if ( m_data->scene == nullptr ) return nullptr;
@@ -484 +484 @@
 }
 
-data_node_list* nv::assimp_loader::release_data_node_list( size_t /*= 0 */ )
+data_node_list* nv::assimp_loader::release_data_node_list( uint32 /*= 0 */ )
 {
         return release_merged_bones();
 }
 
-bool nv::assimp_loader::is_animated( size_t /*= 0 */ )
+bool nv::assimp_loader::is_animated( uint32 /*= 0 */ )
 {
         int this_is_incorrect;
@@ -623 +623 @@
 //      bool has_bones = false;
 //      data_channel_set* meshes = data_channel_set_creator::create_set_array( m_mesh_count, 2 );
-//      for ( size_t m = 0; m < m_mesh_count; ++m )
+//      for ( uint32 m = 0; m < m_mesh_count; ++m )
 //      {
 //              const aiMesh* mesh = scene->mMeshes[ m ];
@@ -635 +635 @@
 // }
 
-nv::size_t nv::assimp_loader::get_nodes_data_count() const
+uint32 nv::assimp_loader::get_nodes_data_count() const
 {
         if ( m_data->scene == nullptr ) return 0;