Changeset 424 for trunk/src/formats/md5_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/md5_loader.cc (modified) (8 diffs)

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 )
         {