Changeset 480 for trunk/legacy

Timestamp:

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

Author:

epyon

Message:

• cleanup of legacy code
• resource updates

Location:

trunk/legacy

Files:

• keyframed_mesh.cc (moved) (moved from trunk/src/gfx/keyframed_mesh.cc) (2 diffs)
• keyframed_mesh.hh (moved) (moved from trunk/nv/gfx/keyframed_mesh.hh) (2 diffs)
• md2_loader.cc (moved) (moved from trunk/src/formats/md2_loader.cc) (1 diff)
• md2_loader.hh (moved) (moved from trunk/nv/formats/md2_loader.hh) (1 diff)
• md2_normals.inc (moved) (moved from trunk/src/formats/md2_normals.inc)
• md3_loader.cc (moved) (moved from trunk/src/formats/md3_loader.cc) (1 diff)
• md3_loader.hh (moved) (moved from trunk/nv/formats/md3_loader.hh) (1 diff)
• skeletal_mesh.cc (moved) (moved from trunk/src/gfx/skeletal_mesh.cc) (2 diffs)
• skeletal_mesh.hh (moved) (moved from trunk/nv/gfx/skeletal_mesh.hh) (2 diffs)

trunk/legacy/keyframed_mesh.cc

@@ -12 +12 @@
 
 using namespace nv;
+
+#if 0
 
 nv::keyframed_mesh::keyframed_mesh( context* a_context, const data_channel_set* a_data, const mesh_nodes_data* a_tag_map )
@@ -247 +249 @@
         delete[] m_data;
 }
+
+#endif 

trunk/legacy/keyframed_mesh.hh

@@ -11 +11 @@
 #include <nv/interface/context.hh>
 #include <nv/interface/animated_mesh.hh>
-#include <nv/formats/md3_loader.hh>
 
 namespace nv
 {
+
+#if 0
 
         class keyframed_mesh : public animated_mesh
@@ -95 +96 @@
         };
 
+#endif
+
 } // namespace nv
 

trunk/legacy/md2_loader.cc

@@ -368 +368 @@
 }
 
-mesh_data_pack* nv::md2_loader::release_mesh_data_pack()
-{
-        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/legacy/md2_loader.hh

@@ -28 +28 @@
                 virtual bool load( stream& source );
                 virtual data_channel_set* release_mesh_data( size_t index = 0 );
-                virtual mesh_data_pack* release_mesh_data_pack();
                 virtual size_t get_mesh_count() const { return 1; }
         private:

trunk/legacy/md3_loader.cc

@@ -435 +435 @@
 }
 
-mesh_data_pack* nv::md3_loader::release_mesh_data_pack()
-{
-        md3_t* md3 = reinterpret_cast<md3_t*>( m_md3 );
-        int count = 1;
-        data_channel_set* data = nullptr;
-        if ( m_merge_all )
-        {
-                data = data_channel_set_creator::create_set_array(1,3);
-                release_mesh_frame( &data[0], -1, -1 );
-        }
-        else
-        {
-                count = md3->header.num_surfaces;
-                data = data_channel_set_creator::create_set_array( count, 3 );
-                for ( int i = 0; i < count; ++i )
-                {
-                        release_mesh_frame( &data[i], -1, i );
-                        data_channel_set_creator( &data[i] ).set_name( make_name( reinterpret_cast< char* >( md3->surfaces[i].header.name ) ) );
-                }
-        }
-        return new mesh_data_pack( uint32( count ), data, release_mesh_nodes_data() );
-}
-
 nv::size_t md3_loader::get_max_frames() const
 {

trunk/legacy/md3_loader.hh

@@ -34 +34 @@
                 virtual bool load( stream& source );
                 virtual data_channel_set* release_mesh_data( size_t index = 0 );
-                virtual mesh_data_pack* release_mesh_data_pack();
                 virtual size_t get_mesh_count() const { return 1; }
                 size_t get_max_frames() const;

trunk/legacy/skeletal_mesh.cc

@@ -12 +12 @@
 
 #include "nv/core/logging.hh"
-
+#if 0
 void nv::skeletal_animation_entry::update_skeleton( skeleton_instance& data, uint32 a_ms_time ) const
 {
@@ -39 +39 @@
         m_data.prepare( m_temp_anim, bones ? bones : m_temp_anim );
 }
-
-nv::skeletal_mesh::skeletal_mesh( context* a_context, const data_channel_set* a_mesh, const mesh_nodes_data* a_bone_data )
-        : m_skeleton( a_bone_data ? a_bone_data->size() : 0 ), m_context( a_context ), m_bone_data( a_bone_data ), m_index_count( 0 ), m_parent_id(-1)
-{
-        if ( a_mesh )
-        {
-                m_va = a_context->create_vertex_array( a_mesh, nv::STATIC_DRAW );
-                m_index_count = a_mesh->get_channel_size( slot::INDEX );
-                m_parent_id = a_mesh->get_parent_id();
-        }
-}
-
-void nv::skeletal_mesh::update_animation( animation_entry& a_anim, uint32 a_anim_time )
-{
-        skeletal_animation_entry& anim = static_cast<skeletal_animation_entry&>( a_anim );
-        anim.prepare( m_bone_data );
-        anim.update_skeleton( m_skeleton, a_anim_time );
-}
-
-void nv::skeletal_mesh::update_program( program a_program )
-{
-        m_context->get_device()->set_opt_uniform_array( a_program, "nv_m_bones", m_skeleton.transforms(), m_skeleton.size() );
-}
-
-nv::transform nv::skeletal_mesh::get_node_transform( uint32 node_id ) const
-{
-        return transform( get_node_matrix( node_id ) );
-}
-
-nv::mat4 nv::skeletal_mesh::get_node_matrix( uint32 node_id ) const
-{
-        return m_skeleton.transforms()[ node_id ];
-}
+#endif

trunk/legacy/skeletal_mesh.hh

@@ -16 +16 @@
 namespace nv
 {
-        
+#if 0   
         class skeletal_animation_entry : public animation_entry
         {
@@ -33 +33 @@
                 skeleton_binding m_data;
         };
-
-        class skeletal_mesh : public animated_mesh
-        {
-        public:
-                skeletal_mesh( context* a_context, const data_channel_set* a_mesh, const mesh_nodes_data* a_bone_data );
-                virtual vertex_array get_vertex_array() const { return m_va; }
-                virtual size_t get_index_count() const { return m_index_count; }
-                virtual void run_animation( animation_entry& a_anim )
-                {
-                        update_animation( a_anim, 0 );
-                }
-                virtual void update_program( program a_program );
-                virtual void update_animation( animation_entry& a_anim, uint32 a_anim_time );
-                virtual transform get_node_transform( uint32 node_id ) const;
-                virtual mat4 get_node_matrix( uint32 node_id ) const;
-                virtual sint16 get_parent_id() const { return m_parent_id; }
-                virtual uint32 get_node_count() const { return m_skeleton.size(); }
-                skeleton_instance& get_skeleton() { return m_skeleton; }
-                const mesh_nodes_data* get_bone_data() { return m_bone_data; }
-                context* get_context() { return m_context;  }
-                ~skeletal_mesh()
-                {
-                        m_context->release( m_va );
-                }
-        protected:
-                skeleton_instance m_skeleton;
-                vertex_array m_va;
-                uint32       m_index_count;
-                context*     m_context;
-                const mesh_nodes_data* m_bone_data;
-                sint16 m_parent_id;
-        };
+#endif
 
 } // namespace nv