Changeset 415 for trunk/nv/interface/mesh_data.hh

Timestamp:

07/09/15 20:02:58 (10 years ago)

Author:

epyon

Message:

• naming scheme for data_descriptor changed
• channels can only be created by data_channel_creators

File:

• trunk/nv/interface/mesh_data.hh (modified) (3 diffs)

trunk/nv/interface/mesh_data.hh

@@ -35 +35 @@
                         NV_ASSERT( channel, "nullptr passed to add_channel!" );
                         m_channels.push_back( channel );
-                        if ( channel->element_count() > 0 && channel->descriptor()[0].vslot == slot::INDEX )
+                        if ( channel->size() > 0 && channel->descriptor()[0].vslot == slot::INDEX )
                         {
                                 NV_ASSERT( !m_index_channel, "second index channel!" );
@@ -68 +68 @@
 
 
+                // TODO: this should be "size"
                 size_t get_count() const 
                 {
-                        if ( m_index_channel ) return m_index_channel->element_count();
-                        if ( m_channels.size() > 0 ) return m_channels[0]->element_count();
+                        if ( m_index_channel ) return m_index_channel->size();
+                        if ( m_channels.size() > 0 ) return m_channels[0]->size();
                         return 0;
                 }
@@ -77 +78 @@
                 size_t get_count( size_t channel ) const 
                 {
-                        if ( m_channels.size() > channel ) return m_channels[channel]->element_count();
+                        if ( m_channels.size() > channel ) return m_channels[channel]->size();
                         return 0;
                 }