Changeset 480 for trunk/src

Timestamp:

11/03/15 19:06:23 (10 years ago)

Author:

epyon

Message:

• cleanup of legacy code
• resource updates

Location:

trunk/src

Files:

• formats/assimp_loader.cc (modified) (1 diff)
• formats/nmd_loader.cc (modified) (3 diffs)
• formats/obj_loader.cc (modified) (1 diff)
• gfx/mesh_creator.cc (modified) (2 diffs)
• gfx/skeleton_instance.cc (modified) (2 diffs)

trunk/src/formats/assimp_loader.cc

@@ -462 +462 @@
 }
 
-mesh_data_pack* nv::assimp_loader::release_mesh_data_pack()
-{
-        if ( m_scene == nullptr || m_mesh_count == 0 ) return nullptr;
-        const aiScene* scene = reinterpret_cast<const aiScene*>( m_scene );
-        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 )
-        {
-                const aiMesh* mesh = scene->mMeshes[ m ];
-                data_channel_set_creator( &meshes[m] ).set_name( make_name( static_cast<const char*>( mesh->mName.data ) ) );
-                if ( mesh->mNumBones > 0 ) has_bones = true;
-                load_mesh_data(&meshes[m],m);
-        }
-
-        mesh_nodes_data* nodes = ( has_bones ? release_merged_bones( meshes ) : release_mesh_nodes_data(0) );
-        return new mesh_data_pack( m_mesh_count, meshes, nodes );
-}
+// mesh_data_pack* nv::assimp_loader::release_mesh_data_pack()
+// {
+//      if ( m_scene == nullptr || m_mesh_count == 0 ) return nullptr;
+//      const aiScene* scene = reinterpret_cast<const aiScene*>( m_scene );
+//      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 )
+//      {
+//              const aiMesh* mesh = scene->mMeshes[ m ];
+//              data_channel_set_creator( &meshes[m] ).set_name( make_name( static_cast<const char*>( mesh->mName.data ) ) );
+//              if ( mesh->mNumBones > 0 ) has_bones = true;
+//              load_mesh_data(&meshes[m],m);
+//      }
+// 
+//      mesh_nodes_data* nodes = ( has_bones ? release_merged_bones( meshes ) : release_mesh_nodes_data(0) );
+//      return new mesh_data_pack( m_mesh_count, meshes, nodes );
+// }
 
 nv::size_t nv::assimp_loader::get_nodes_data_count() const

trunk/src/formats/nmd_loader.cc

@@ -50 +50 @@
 }
 
-mesh_data_pack* nv::nmd_loader::release_mesh_data_pack()
-{
-        uint32 size = m_meshes.size();
-        data_channel_set* meshes = data_channel_set_creator::create_set_array( size, 0 );
-        for ( uint32 i = 0; i < size; ++i )
-        {
-                meshes[i] = move( *m_meshes[i] );
-                delete m_meshes[i];
-        }
-        m_meshes.clear();
-        return new mesh_data_pack( size, meshes, release_mesh_nodes_data() );
-}
-
 void nv::nmd_loader::reset()
 {
@@ -240 +227 @@
 }
 
-void nv::nmd_dump( stream& stream_out, const mesh_data_pack* model, const string_table* strings, uint64 name )
+void nv::nmd_dump( stream& stream_out, array_view< data_channel_set* > meshes, const mesh_nodes_data* nodes, const string_table* strings /*= nullptr*/, uint64 name /*= 0 */ )
 {
         uint32 elements = ( strings ? 1 : 0 ) // +1 string array
-                + model->get_count() // meshes
-                + ( model->get_node_count() > 0 ? 1 : 0 ); // nodes
+                + meshes.size() // meshes
+                + ( nodes && nodes->size() > 0 ? 1 : 0 ); // nodes
         nmd_dump_header( stream_out, elements, name );
 
-        for ( uint32 i = 0; i < model->get_count(); ++i )
-        {
-                nmd_dump_element( stream_out, *model->get_mesh( i ), nv::nmd_type::MESH );
-        }
-
-        if ( model->get_node_count() > 0 )
-        {
-                nmd_dump_nodes( stream_out, *model->get_nodes() );
+        for ( uint32 i = 0; i < meshes.size(); ++i )
+        {
+                NV_ASSERT( meshes[i], "mesh is null!" );
+                nmd_dump_element( stream_out, *meshes[i], nv::nmd_type::MESH );
+        }
+
+        if ( nodes && nodes->size() > 0 )
+        {
+                nmd_dump_nodes( stream_out, *nodes );
         }
 
@@ -262 +250 @@
         }
 }
+
+void nv::nmd_dump( stream& stream_out, const mesh_nodes_data& animation, const string_table* strings, uint64 name )
+{
+        uint32 elements = ( strings ? 1 : 0 ) // +1 string array
+                + ( animation.size() > 0 ? 1 : 0 ); // nodes
+        nmd_dump_header( stream_out, elements, name );
+
+        if ( animation.size() > 0 )
+        {
+                nmd_dump_nodes( stream_out, animation );
+        }
+
+        if ( strings )
+        {
+                nmd_dump_strings( stream_out, *strings );
+        }
+}

trunk/src/formats/obj_loader.cc

@@ -357 +357 @@
 }
 
-mesh_data_pack* nv::obj_loader::release_mesh_data_pack()
-{
-        uint32 size = m_meshes.size();
-        data_channel_set* meshes = data_channel_set_creator::create_set_array( size, 1 );
-        for ( uint32 i = 0; i < size; ++i )
-        {
-                meshes[i] = move( *m_meshes[i] );
-                delete m_meshes[i];
-        }
-        m_meshes.clear();
-        return new mesh_data_pack( size, meshes );
-}

trunk/src/gfx/mesh_creator.cc

@@ -157 +157 @@
                 }
         }
-}
-
-nv::mesh_data_creator::mesh_data_creator( data_channel_set* data ) : m_data( data )
-{
-        initialize();
 }
 
@@ -656 +651 @@
 }
 
-void nv::mesh_creator::delete_mesh( uint32 index )
-{
-        if ( index < m_pack->get_count() )
-        {
-
-                m_pack->m_meshes[index] = move( m_pack->m_meshes[m_pack->m_count - 1] );
-                m_pack->m_count--;
-        }
-}

trunk/src/gfx/skeleton_instance.cc

@@ -6 +6 @@
 
 #include "nv/gfx/skeleton_instance.hh"
+
+#include "nv/core/profiler.hh"
 
 void nv::skeleton_binding::prepare( const mesh_nodes_data* node_data, const mesh_nodes_data* bone_data )
@@ -62 +64 @@
                         for ( uint32 n = 0; n < node_data->size(); ++n )
                                 if ( ( *node_data )[n]->get_parent_id() == -1 )
-                                        animate_rec( node_data, binding, frame, n, mat4() );
+                                        animate_rec( node_data, binding, frame, n, transform() );
                 }
         }
 }
 
-void nv::skeleton_instance::animate_rec( const mesh_nodes_data* node_data, const skeleton_binding& binding, float frame, uint32 id, const mat4& parent ) 
+void nv::skeleton_instance::animate_rec( const mesh_nodes_data* node_data, const skeleton_binding& binding, float frame, uint32 id, const transform& parent )
 {
         // TODO: fix transforms, which are now embedded,
         //       see note in assimp_loader.cc:load_node
         const data_channel_set* node = ( *node_data )[id];
-        mat4 node_mat( node->get_transform() );
+        transform node_mat( node->get_transform() );
 
         if ( node->size() > 0 )
         {
                 raw_channel_interpolator interpolator( node, binding.m_key );
-                node_mat = interpolator.get< mat4 >( frame );
+                node_mat = interpolator.get< transform >( frame );
         }
 
-        mat4 global_mat = parent * node_mat;
+        transform global_mat = parent * node_mat;
 
         sint16 bone_id = binding.m_indices[id];
         if ( bone_id >= 0 )
         {
-                m_transform[bone_id] = global_mat * binding.m_offsets[bone_id];
+                m_transform[bone_id] = global_mat.extract() * binding.m_offsets[bone_id];
         }