Changeset 428

Timestamp:

07/20/15 13:59:34 (10 years ago)

Author:

epyon

Message:

• renaming mesh_nodes_data members to more compliant
• moved string_table to stl

Location:

trunk

Files:

• nv/formats/assimp_loader.hh (modified) (1 diff)
• nv/formats/nmd_loader.hh (modified) (1 diff)
• nv/interface/mesh_data.hh (modified) (4 diffs)
• nv/interface/mesh_loader.hh (modified) (1 diff)
• nv/stl/functional/hash.hh (modified) (1 diff)
• nv/stl/string_table.hh (moved) (moved from trunk/nv/io/string_table.hh) (2 diffs)
• src/formats/assimp_loader.cc (modified) (1 diff)
• src/formats/md5_loader.cc (modified) (3 diffs)
• src/formats/nmd_loader.cc (modified) (1 diff)
• src/gfx/keyframed_mesh.cc (modified) (2 diffs)
• src/gfx/mesh_creator.cc (modified) (3 diffs)
• src/gfx/skeletal_mesh.cc (modified) (9 diffs)
• src/stl/string_table.cc (moved) (moved from trunk/src/io/string_table.cc) (1 diff)

trunk/nv/formats/assimp_loader.hh

@@ -9 +9 @@
 
 #include <nv/common.hh>
-#include <nv/io/string_table.hh>
+#include <nv/stl/string_table.hh>
 #include <nv/interface/mesh_loader.hh>
 #include <nv/interface/mesh_data.hh>

trunk/nv/formats/nmd_loader.hh

@@ -12 +12 @@
 #include <nv/interface/mesh_data.hh>
 #include <nv/stl/vector.hh>
-#include <nv/io/string_table.hh>
+#include <nv/stl/string_table.hh>
 
 namespace nv 

trunk/nv/interface/mesh_data.hh

@@ -47 +47 @@
                 }
 
-                size_t get_count() const { return m_data.size(); }
+                size_t size() const { return m_data.size(); }
+                bool empty() const { return m_data.empty(); }
 
                 bool is_animated( size_t i ) const
@@ -55 +56 @@
                 }
 
-                const data_channel_set* get_node( size_t i ) const
-                {
-                        if ( i >= m_data.size() ) return nullptr;
-                        return m_data[i];
-                }
-
-                const data_channel_set* get_node_by_hash( uint64 h ) const
+                const data_channel_set* get_by_hash( uint64 h ) const
                 {
                         for ( auto data : m_data )
@@ -70 +65 @@
                 }
 
-                int get_node_index_by_hash( uint64 h ) const
+                int get_index_by_hash( uint64 h ) const
                 {
                         for ( uint32 i = 0; i < m_data.size(); ++i )
@@ -124 +119 @@
                 uint32 get_count() const { return m_count; }
                 const mesh_nodes_data* get_nodes() const { return m_nodes; }
-                uint32 get_node_count() const { return m_nodes ? m_nodes->get_count() : 0; }
+                uint32 get_node_count() const { return m_nodes ? m_nodes->size() : 0; }
                 ~mesh_data_pack()
                 {

trunk/nv/interface/mesh_loader.hh

@@ -20 +20 @@
 #include <nv/interface/mesh_data.hh>
 #include <nv/stl/stream.hh>
-#include <nv/io/string_table.hh>
+#include <nv/stl/string_table.hh>
 
 namespace nv 

trunk/nv/stl/functional/hash.hh

@@ -210 +210 @@
         constexpr uint64 operator "" _h64( const char* str, size_t len )
         {
-                return detail::fnv_hash< uint32 >::hash( str, len );
+                return detail::fnv_hash< uint64 >::hash( str, len );
         }
 

trunk/nv/stl/string_table.hh

@@ -10 +10 @@
  */
 
-#ifndef NV_IO_STRING_TABLE_HH
-#define NV_IO_STRING_TABLE_HH
+#ifndef NV_STL_STRING_TABLE_HH
+#define NV_STL_STRING_TABLE_HH
 
 #include <nv/common.hh>
@@ -94 +94 @@
 }
 
-#endif // NV_IO_STRING_TABLE_HH
+#endif // NV_STL_STRING_TABLE_HH

trunk/src/formats/assimp_loader.cc

@@ -305 +305 @@
                                 if ( iname == names.end() )
                                 {
-                                        NV_ASSERT( result->get_count() < MAX_BONES, "Too many bones to merge!" );
-                                        uint16 index = uint16( result->get_count() );
+                                        NV_ASSERT( result->size() < MAX_BONES, "Too many bones to merge!" );
+                                        uint16 index = uint16( result->size() );
                                         result->push_back( bone );
                                         names[ bone->get_name() ] = index;

trunk/src/formats/md5_loader.cc

@@ -112 +112 @@
                         m_nodes = new mesh_nodes_data( make_name( "md5_bones") );
                         discard( sstream, "{" );
-                        for ( size_t i = 0; i < m_nodes->get_count(); ++i )
+                        for ( size_t i = 0; i < m_nodes->size(); ++i )
                         {
                                 std::string name;
@@ -245 +245 @@
 
                         discard( sstream, "{" );
-                        for ( size_t i = 0; i < m_nodes->get_count(); ++i )
+                        for ( size_t i = 0; i < m_nodes->size(); ++i )
                         {
                                 std::string    name;
@@ -288 +288 @@
                         next_line( sstream ); 
 
-                        for ( size_t i = 0; i < m_nodes->get_count(); ++i )
+                        for ( size_t i = 0; i < m_nodes->size(); ++i )
                         {
                                 transform base_frame;

trunk/src/formats/nmd_loader.cc

@@ -206 +206 @@
         nmd_element_header header;
         header.type = nmd_type::ANIMATION;
-        header.children = static_cast<uint16>( nodes.get_count() );
+        header.children = static_cast<uint16>( nodes.size() );
         header.size = total;
         header.name = nodes.get_name();

trunk/src/gfx/keyframed_mesh.cc

@@ -40 +40 @@
         m_pbuffer      = buffer();
 
-        if ( m_tag_map && m_tag_map->get_count() > 0 )
+        if ( m_tag_map && m_tag_map->size() > 0 )
         {
                 m_interpolation_key = (*m_tag_map)[ 0 ]->get_interpolation_key();
@@ -54 +54 @@
 {
         if ( !m_tag_map ) return transform();
-        NV_ASSERT( node_id < m_tag_map->get_count(), "TAGMAP FAIL" );
+        NV_ASSERT( node_id < m_tag_map->size(), "TAGMAP FAIL" );
         NV_ASSERT( (*m_tag_map)[node_id]->size() > 0, "TAG FAIL" );
         raw_channel_interpolator interpolator( ( *m_tag_map )[node_id], m_interpolation_key );

trunk/src/gfx/mesh_creator.cc

@@ -16 +16 @@
         merge_keys();
         uint32 max_frames = 0;
-        for ( size_t i = 0; i < m_data->get_count(); ++i )
-        {
-                data_channel_set* keys = m_data->m_data[i];
+        for ( auto keys : m_data->m_data )
+        {
                 sint16 parent_id = keys->get_parent_id();
                 data_channel_set* pkeys  = ( parent_id != -1 ? m_data->m_data[parent_id] : nullptr );
@@ -49 +48 @@
 void nv::mesh_nodes_creator::merge_keys()
 {
-        for ( size_t i = 0; i < m_data->get_count(); ++i )
+        for ( size_t i = 0; i < m_data->size(); ++i )
         {
                 data_channel_set* old_keys = m_data->m_data[i];
@@ -100 +99 @@
         mat4 post_transform( 1.f/scale * ri33 ); 
 
-        for ( size_t i = 0; i < m_data->get_count(); ++i )
-        {
-                data_channel_set* node = m_data->m_data[i];
+        for ( auto node : m_data->m_data )
+        {
                 node->m_transform = pre_transform * node->m_transform * post_transform;
 

trunk/src/gfx/skeletal_mesh.cc

@@ -18 +18 @@
 
         m_pntdata.assign( pnt_chan->data_cast< md5_vtx_pnt >(), pnt_chan->size() );
-        m_bone_offset.resize( bones->get_count() );
-        m_transform.resize( bones->get_count() );
-
-        for ( uint32 i = 0; i < bones->get_count(); ++i )
+        m_bone_offset.resize( bones->size() );
+        m_transform.resize( bones->size() );
+
+        for ( uint32 i = 0; i < bones->size(); ++i )
         {
                 m_bone_offset[i] = transform( (*bones)[i]->get_transform() );
@@ -110 +110 @@
 
         float frame_num = new_time * m_node_data->get_frame_rate();
-        for ( size_t i = 0; i < m_node_data->get_count(); ++i )
+        for ( size_t i = 0; i < m_node_data->size(); ++i )
         {
                 raw_channel_interpolator interpolator( (*m_node_data)[i], m_interpolation_key );
@@ -122 +122 @@
         m_children  = nullptr;
         m_offsets   = nullptr;
-        uint32 node_count = m_node_data->get_count();
-        m_bone_ids  = new sint16[ node_count ];
+        m_bone_ids  = new sint16[m_node_data->size()];
 
         NV_ASSERT( m_node_data, "node data empty!" );
@@ -129 +128 @@
         if ( !m_node_data->is_flat() )
         {
-                m_children = new vector< uint32 >[ node_count ];
-                for ( uint32 n = 0; n < node_count; ++n )
+                m_children = new vector< uint32 >[m_node_data->size()];
+                for ( uint32 n = 0; n < m_node_data->size(); ++n )
                 {
                         const data_channel_set* node = (*m_node_data)[n];
@@ -153 +152 @@
         }
 
-        for ( uint32 n = 0; n < m_node_data->get_count(); ++n )
+        for ( uint32 n = 0; n < m_node_data->size(); ++n )
                 if ( m_bone_ids[n] >= 0 )
                 {
-                        const data_channel_set* node = m_node_data->get_node(n);
+                        const data_channel_set* node = (*m_node_data)[n];
                         nv::mat4 node_mat( node->get_transform() );
 
@@ -174 +173 @@
         if ( m_prepared ) return;
         unordered_map< uint64, uint16 > bone_names;
-        m_offsets = new mat4[ bones->get_count() ];
-        for ( nv::uint16 bi = 0; bi < bones->get_count(); ++bi )
-        {
-                const data_channel_set* bone = bones->get_node( bi );
+        m_offsets = new mat4[ bones->size() ];
+        for ( nv::uint16 bi = 0; bi < bones->size(); ++bi )
+        {
+                const data_channel_set* bone = (*bones)[ bi ];
                 bone_names[ bone->get_name() ] = bi;
                 m_offsets[bi] = bone->get_transform();
         }
 
-        for ( uint32 n = 0; n < m_node_data->get_count(); ++n )
-        {
-                const data_channel_set* node = m_node_data->get_node( n );
+        for ( uint32 n = 0; n < m_node_data->size(); ++n )
+        {
+                const data_channel_set* node = (*m_node_data)[ n ];
                 sint16 bone_id = -1;
 
@@ -205 +204 @@
         // TODO: fix transforms, which are now embedded,
         //       see note in assimp_loader.cc:load_node
-        const data_channel_set* node = m_node_data->get_node( node_id );
+        const data_channel_set* node = ( *m_node_data )[ node_id ];
         mat4 node_mat( node->get_transform() );
 
@@ -242 +241 @@
         if ( m_bone_data )
         {
-                m_transform = new mat4[ m_bone_data->get_count() ];
+                m_transform = new mat4[ m_bone_data->size() ];
         }
 }
@@ -259 +258 @@
 {
         if ( m_bone_data )
-                m_context->get_device()->set_opt_uniform_array( a_program, "nv_m_bones", m_transform, m_bone_data->get_count() );
+                m_context->get_device()->set_opt_uniform_array( a_program, "nv_m_bones", m_transform, m_bone_data->size() );
 }
 

trunk/src/stl/string_table.cc

@@ -5 +5 @@
 // For conditions of distribution and use, see copying.txt file in root folder.
 
-#include "nv/io/string_table.hh"
+#include "nv/stl/string_table.hh"
 
 nv::string_table::string_table( stream& in )