Changeset 424 for trunk/src/formats/assimp_loader.cc

Timestamp:

07/16/15 21:21:19 (10 years ago)

Author:

epyon

Message:

• refactoring WIP! (compiles though - warnings on purpose)

File:

• trunk/src/formats/assimp_loader.cc (modified) (7 diffs)

trunk/src/formats/assimp_loader.cc

@@ -108 +108 @@
 {
         if ( index >= m_mesh_count ) return nullptr;
-        data_channel_set* result = data_channel_set_creator::create( 2 );
+        data_channel_set* result = data_channel_set_creator::create_set( 2 );
         load_mesh_data( result, index );
         return result;
@@ -199 +199 @@
                 aiBone* bone   = mesh->mBones[m];
                 mat4    offset = assimp_mat4_cast( bone->mOffsetMatrix );
-//              bones[m].name = bone->mName.data;
-                bones[m].name = hash_string< uint64 >( bone->mName.data );
-                bones[m].data = nullptr;
-                bones[m].parent_id = -1;
-//              bones[m].target_id = -1;
-                bones[m].transform = offset;
+                bones[m].data = data_channel_set_creator::create_set( 0 );
+                data_channel_set_creator access( bones[m].data );
+                access.set_name( hash_string< uint64 >( bone->mName.data ) );
+                access.set_transform( offset );
         }
         return true;
@@ -302 +300 @@
 
                                 mesh_node_data& bone = bones[b];
-                                auto iname = names.find( bone.name );
+                                auto iname = names.find( bone.data->get_name() );
                                 if ( iname == names.end() )
                                 {
@@ -308 +306 @@
                                         uint16 index = uint16( final_bones.size() );
                                         final_bones.push_back( bone );
-                                        names[ bone.name] = index;
+                                        names[ bone.data->get_name() ] = index;
                                         translate[b] = index;
                                 }
@@ -390 +388 @@
         mesh_node_data& a_data = nodes[ this_id ];
 
-//      a_data.name      = name;
-        a_data.name = hash_string< uint64 >( name.c_str() );
-        a_data.parent_id = parent_id;
+        if (anode) 
+                create_keys( &a_data, anode );
+        else
+                a_data.data = data_channel_set_creator::create_set( 0 );
+
+        data_channel_set_creator access( a_data.data );
+        access.set_name( hash_string< uint64 >( name.c_str() ) );
+        access.set_parent_id( parent_id );
         // This value is ignored by the create_transformed_keys, but needed by create_direct_keys!
         // TODO: find a common solution!
         //       This is bad because create_transformed_keys never uses node-transformations for
         //       node's without keys
-        a_data.transform = nv::assimp_mat4_cast( node->mTransformation );
-        if (this_id == 0)
-                a_data.transform = mat4();
-        a_data.data = nullptr;
-
-        if (anode) create_keys( &a_data, anode );
+        access.set_transform( nv::assimp_mat4_cast( node->mTransformation ) );
+        if ( this_id == 0 ) access.set_transform( mat4() );
 
         nv::sint16 next = this_id + 1;
@@ -421 +420 @@
         }
 
-        data->data = data_channel_set_creator::create( 2 );
+        data->data = data_channel_set_creator::create_set( 2 );
         data_channel_set_creator key_set( data->data );
 
@@ -465 +464 @@
         const aiScene* scene = reinterpret_cast<const aiScene*>( m_scene );
         bool has_bones = false;
-        data_channel_set* meshes = data_channel_set_creator::create_array( m_mesh_count, 2 );
+        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 )
         {