Changeset 287 for trunk/src/formats/md3_loader.cc

Timestamp:

07/23/14 15:24:03 (11 years ago)

Author:

epyon

Message:

• mesh_data_pack's in every format
• md5_mesh_data removed, uses standard mesh_data
• BONE_ARRAY in NMD is now a simple set of animation nodes
• bone and animation node concepts merged
• several minor changes

File:

• trunk/src/formats/md3_loader.cc (modified) (2 diffs)

trunk/src/formats/md3_loader.cc

@@ -321 +321 @@
 mesh_data* nv::md3_loader::release_mesh_data( size_t )
 {
-        return release_mesh_frame( -1 );
-}
-
-mesh_data* nv::md3_loader::release_mesh_frame( sint32 frame )
+        mesh_data* data = new mesh_data;
+        release_mesh_frame( data, -1 );
+        return data;
+}
+
+void nv::md3_loader::release_mesh_frame( mesh_data* data, sint32 frame )
 {
         md3_t* md3 = (md3_t*)m_md3;
@@ -394 +396 @@
         }
 
-        mesh_data* result = new mesh_data();
-        result->add_channel( mc_pn );
-        result->add_channel( mc_t );
-        result->add_channel( ic );
-        return result;
-}
-
-tag_map* nv::md3_loader::create_tag_map()
+        data->set_name( (char*)md3->header.name );
+        data->add_channel( mc_pn );
+        data->add_channel( mc_t );
+        data->add_channel( ic );
+}
+
+mesh_nodes_data* nv::md3_loader::release_mesh_nodes_data()
 {
         md3_t* md3 = (md3_t*)m_md3;
-        tag_map* result = new tag_map();
-        for ( sint32 i = 0; i < md3->header.num_tags; ++i )
+        uint32 node_count = md3->header.num_tags;
+        if ( node_count == 0 ) return nullptr;;
+        mesh_node_data* nodes = new mesh_node_data[ node_count ];
+        for ( uint32 i = 0; i < node_count; ++i )
         {
                 const md3_tag_t& rtag = md3->tags[i];
                 std::string name( (char*)(rtag.name) );
 
-                key_data* data = new key_data;
-                data->add_channel( load_tags( name ) );
-                result->insert( name, data );
-        }
-        return result;
-}
-
-mesh_node_data* nv::md3_loader::release_mesh_node_data( size_t index )
-{
-        md3_t* md3 = (md3_t*)m_md3;
-        const md3_tag_t& rtag = md3->tags[index];
-        std::string name( (char*)(rtag.name) );
-
-        mesh_node_data* result = new mesh_node_data;
-        result->transform = mat4();
-        result->name      = name;
-        result->parent_id = -1;
-        result->target_id = -1;
-        result->data = new key_data;
+                nodes[i].transform = mat4();
+                nodes[i].name      = name;
+                nodes[i].parent_id = -1;
+                nodes[i].target_id = -1;
+                nodes[i].data = new key_data;
         
-        key_raw_channel* keys = load_tags( name );
-        result->data->add_channel( keys );
-        return result;
-}
-
-size_t nv::md3_loader::get_node_count() const
-{
-        return ((md3_t*)m_md3)->header.num_tags;
+                key_raw_channel* keys = load_tags( name );
+                nodes[i].data->add_channel( keys );
+        }
+        return new mesh_nodes_data( "tags", node_count, nodes );
+}
+
+mesh_data_pack* nv::md3_loader::release_mesh_data_pack()
+{
+        mesh_data* data = new mesh_data[1];
+        release_mesh_frame( &data[0], -1 );
+        return new mesh_data_pack( 1, data, release_mesh_nodes_data() );
 }