Changeset 424 for trunk/src/formats

Timestamp:

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

Author:

epyon

Message:

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

Location:

trunk/src/formats

Files:

• assimp_loader.cc (modified) (7 diffs)
• md2_loader.cc (modified) (2 diffs)
• md3_loader.cc (modified) (4 diffs)
• md5_loader.cc (modified) (8 diffs)
• nmd_loader.cc (modified) (5 diffs)
• obj_loader.cc (modified) (2 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 )
         {

trunk/src/formats/md2_loader.cc

@@ -313 +313 @@
 data_channel_set* nv::md2_loader::release_mesh_data( size_t )
 {
-        data_channel_set* data = data_channel_set_creator::create( 3 );
+        data_channel_set* data = data_channel_set_creator::create_set( 3 );
         release_mesh_frame( data, -1 );
         return data;
@@ -367 +367 @@
 mesh_data_pack* nv::md2_loader::release_mesh_data_pack()
 {
-        data_channel_set* data = data_channel_set_creator::create_array( 1, 3 );
+        data_channel_set* data = data_channel_set_creator::create_set_array( 1, 3 );
         release_mesh_frame( &data[0], -1 );
         return new mesh_data_pack( 1, data );

trunk/src/formats/md3_loader.cc

@@ -324 +324 @@
 data_channel_set* nv::md3_loader::release_mesh_data( nv::size_t index )
 {
-        data_channel_set* data = data_channel_set_creator::create(3);
+        data_channel_set* data = data_channel_set_creator::create_set(3);
         release_mesh_frame( data, -1, static_cast< sint32 >( index ) );
         return data;
@@ -424 +424 @@
                 const md3_tag_t& rtag = md3->tags[i];
                 string_view name( reinterpret_cast< const char* >(rtag.name) );
-
-                nodes[i].transform = mat4();
-                nodes[i].name = hash_string< uint64 >( name.data() );
-                nodes[i].parent_id = -1;
-                nodes[i].data      = data_channel_set_creator::create( 1 );
-                load_tags( data_channel_set_creator( nodes[i].data ).add_channel<md3_key>( uint32( md3->header.num_frames ) ).channel(), name );
+                nodes[i].data      = data_channel_set_creator::create_set( 1 );
+                data_channel_set_creator access( nodes[i].data );
+                access.set_name( hash_string< uint64 >( name.data() ) );
+                load_tags( access.add_channel<md3_key>( uint32( md3->header.num_frames ) ).channel(), name );
         }
         int name_;
@@ -442 +440 @@
         if ( m_merge_all )
         {
-                data = data_channel_set_creator::create_array(1,3);
+                data = data_channel_set_creator::create_set_array(1,3);
                 release_mesh_frame( &data[0], -1, -1 );
                 data_channel_set_creator( &data[0] ).set_name( reinterpret_cast< char* >( md3->header.name ) );
@@ -449 +447 @@
         {
                 count = md3->header.num_surfaces;
-                data = data_channel_set_creator::create_array( count, 3 );
+                data = data_channel_set_creator::create_set_array( count, 3 );
                 for ( int i = 0; i < count; ++i )
                 {

trunk/src/formats/md5_loader.cc

@@ -118 +118 @@
                         {
                                 std::string name;
-                                sstream >> name >> nodes[i].parent_id;
+                                sint16 parent_id;
+                                sstream >> name >> parent_id;
                                 vec3 pos;
                                 quat orient;
@@ -128 +129 @@
                                 unit_quat_w( orient );
                                 remove_quotes( name );
-//                              nodes[i].name = name;
-                                nodes[i].name = hash_string< uint64 >( name.c_str() );
-//                              nodes[i].target_id       = -1;
-                                nodes[i].parent_id       = -1;
-                                nodes[i].transform       = transform( pos, orient ).inverse().extract();
-                                nodes[i].data            = nullptr;
+                                nodes[i].data       = data_channel_set_creator::create_set( 0 );
+                                data_channel_set_creator access( nodes[i].data );
+                                access.set_parent_id( parent_id );
+                                access.set_transform( transform( pos, orient ).inverse().extract() );
+                                access.set_name( hash_string< uint64 >( name.c_str() ) );
                                 next_line( sstream );
                         }
@@ -141 +141 @@
                 {
                         assert( m_type == MESH );
-                        data_channel_set* mesh = data_channel_set_creator::create( 4 );
+                        data_channel_set* mesh = data_channel_set_creator::create_set( 4 );
                         data_channel_set_creator maccess( mesh );
 
@@ -251 +251 @@
                         {
                                 std::string    name;
-                                sstream >> name >> nodes[i].parent_id >> joint_infos[i].flags >> joint_infos[i].start_index;
+                                sint16 parent_id;
+                                sstream >> name >> parent_id >> joint_infos[i].flags >> joint_infos[i].start_index;
                                 remove_quotes( name );
-//                              nodes[i].name = name;
-                                nodes[i].name = hash_string< uint64 >( name.c_str() );
-                                nodes[i].transform = mat4();
-                                nodes[i].data = data_channel_set_creator::create( 1 );
-                                data_channel_set_creator( nodes[i].data ).add_channel< md5_key_t >( num_frames );
+                                nodes[i].data = data_channel_set_creator::create_set( 1 );
+                                data_channel_set_creator access( nodes[i].data );
+                                access.add_channel< md5_key_t >( num_frames );
+                                access.set_name( hash_string< uint64 >( name.c_str() ) );
+                                access.set_parent_id( parent_id );
                                 next_line( sstream );
                         }
@@ -391 +392 @@
                                 md5_weight& weight           = weights[start_weight + j];
                                 const mesh_node_data&  joint = nodes[weight.joint_id];
-                                const transform tr = transform( joint.transform ).inverse();
+                                const transform tr = transform( joint.data->get_transform() ).inverse();
                                 vec3 rot_pos = tr.get_orientation() * weight.pos;
 
@@ -454 +455 @@
                 {
                         const mesh_node_data&  joint = nodes[vdata.boneindex[j]];
-                        const transform tr = transform( joint.transform ).inverse();
+                        const transform tr = transform( joint.data->get_transform() ).inverse();
                         vdata.normal  += ( normal  * tr.get_orientation() ) * vdata.boneweight[j];
                         vdata.tangent += ( tangent * tr.get_orientation() ) * vdata.boneweight[j];
@@ -472 +473 @@
                 const md5_joint_info& jinfo = joint_infos[i];
                 mesh_node_data& joint = nodes[i];
-                int parent_id         = joint.parent_id;
+                int parent_id         = joint.data->get_parent_id();
 
                 vec3 pos    = base_frames[i].get_position();
@@ -519 +520 @@
 {
         uint32 size = m_meshes.size();
-        data_channel_set* meshes = data_channel_set_creator::create_array( size, 4 );
+        data_channel_set* meshes = data_channel_set_creator::create_set_array( size, 4 );
         for ( uint32 i = 0; i < size; ++i )
         {

trunk/src/formats/nmd_loader.cc

@@ -37 +37 @@
 bool nv::nmd_loader::load_mesh( stream& source, const nmd_element_header& e )
 {
-        data_channel_set* mesh = data_channel_set_creator::create( e.children );
+        data_channel_set* mesh = data_channel_set_creator::create_set( e.children );
         load_channel_set( source, mesh, e );
 //      m_mesh_names.push_back( e.name );
@@ -55 +55 @@
 {
         uint32 size = m_meshes.size();
-        data_channel_set* meshes = data_channel_set_creator::create_array( size, 0 );
+        data_channel_set* meshes = data_channel_set_creator::create_set_array( size, 0 );
         for ( uint32 i = 0; i < size; ++i )
         {
@@ -119 +119 @@
 bool nv::nmd_loader::load_node( stream& source, mesh_node_data* data, const nmd_element_header& e )
 {
-        data->name = e.name;
-        data->parent_id = e.parent_id;
-        data->transform = e.transform;
-        data->data = nullptr;
+        data->data = data_channel_set_creator::create_set( e.children );
         if ( e.children > 0 )
         {
-                data->data = data_channel_set_creator::create( e.children );
                 load_channel_set( source, data->data, e );
         }
+        data_channel_set_creator access( data->data );
+        access.set_name( e.name );
+        access.set_parent_id( e.parent_id );
+        access.set_transform( e.transform );
         return true;
 }
@@ -206 +206 @@
         eheader.children   = static_cast<uint16>( chan_count );
         eheader.size       = chan_size;
-        eheader.name       = node->name;
-        eheader.parent_id  = node->parent_id;
-        eheader.transform  = node->transform;
+        eheader.name       = node->data->get_name();
+        eheader.parent_id  = node->data->get_parent_id();
+        eheader.transform  = node->data->get_transform();
         eheader.attributes = 0;
         stream_out.write( &eheader, sizeof( eheader ), 1 );
-        if ( node->data ) nmd_dump_channel_set( node->data, stream_out );
+        if ( chan_count > 0 ) nmd_dump_channel_set( node->data, stream_out );
 }
 
@@ -238 +238 @@
         eheader.children   = static_cast<uint16>( mesh.size() );
         eheader.size       = size;
-        int uncomment;
-//      eheader.name       = mesh.get_name();
-//      eheader.transform  = mesh.get_transform();
-//      eheader.parent_id  = mesh.get_parent_id();
-        eheader.name       = 0;
-        eheader.transform  = mat4();
-        eheader.parent_id  = -1;
+        eheader.name       = mesh.get_name();
+        eheader.transform  = mesh.get_transform();
+        eheader.parent_id  = mesh.get_parent_id();
         eheader.attributes = 0;
         stream_out.write( &eheader, sizeof( eheader ), 1 );

trunk/src/formats/obj_loader.cc

@@ -326 +326 @@
                 }
         
-                data_channel_set* result = data_channel_set_creator::create( 1 );
+                data_channel_set* result = data_channel_set_creator::create_set( 1 );
                 data_channel_set_creator raccess( result );// ( reader->name );
                 uint8* rdata = raccess.add_channel( m_descriptor, reader->size * 3 ).raw_data();
@@ -359 +359 @@
 {
         uint32 size = m_meshes.size();
-        data_channel_set* meshes = data_channel_set_creator::create_array( size, 1 );
+        data_channel_set* meshes = data_channel_set_creator::create_set_array( size, 1 );
         for ( uint32 i = 0; i < size; ++i )
         {