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

Timestamp:

07/08/14 18:29:24 (11 years ago)

Author:

epyon

Message:

• unified mesh_raw_channel and mesh_raw_index_channel
• string_table cleaned up and implementation of creator split into a cc file

File:

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

trunk/nv/interface/mesh_data.hh

@@ -24 +24 @@
                 vertex_descriptor desc;
                 uint8*            data;
-                uint32            size;
                 uint32            count;
 
-                mesh_raw_channel() : data( nullptr ), size( 0 ) {}
+                mesh_raw_channel() : data( nullptr ), count( 0 ) {}
                 ~mesh_raw_channel() 
                 {
                         if ( data != nullptr ) delete[] data;
                 }
+
+                bool is_index() const { return count > 0 && desc.slots[0].vslot == INDEX; }
+
+                uint32 size() const { return count * desc.size; }
 
                 template < typename VTX >
@@ -39 +42 @@
                         result->desc.initialize<VTX>();
                         result->count = count;
-                        result->size  = count * sizeof( VTX );
-                        result->data  = (count > 0 ? ( new uint8[ result->size ] ) : nullptr );
+                        result->data  = (count > 0 ? ( new uint8[ result->size() ] ) : nullptr );
                         return result;
                 }
@@ -48 +50 @@
                         result->desc  = vtxdesc;
                         result->count = count;
-                        result->size  = count * sizeof( vtxdesc.size );
-                        result->data  = (count > 0 ? ( new uint8[ result->size ] ) : nullptr );
+                        result->data  = (count > 0 ? ( new uint8[ result->size() ] ) : nullptr );
                         return result;
-                }
-        };
-
-        struct mesh_raw_index_channel
-        {
-                datatype          etype;
-                uint8*            data;
-                uint32            size;
-                uint32            count;
-
-                mesh_raw_index_channel() : etype( NONE ), data( nullptr ), size( 0 ) {}
-                ~mesh_raw_index_channel() 
-                {
-                        if ( data != nullptr ) delete[] data;
                 }
 
                 template < typename ITYPE >
-                static mesh_raw_index_channel* create( uint32 count = 0 )
+                static mesh_raw_channel* create_index( uint32 count = 0 )
                 {
-                        mesh_raw_index_channel* result = new mesh_raw_index_channel();
-                        result->etype = type_to_enum< ITYPE >::type;
+                        mesh_raw_channel* result = new mesh_raw_channel();
+                        result->desc.initialize_index<ITYPE>();
                         result->count = count;
-                        result->size  = count * sizeof( ITYPE );
-                        result->data  = (count > 0 ? ( new uint8[ result->size ] ) : nullptr );
+                        result->data  = (count > 0 ? ( new uint8[ result->size() ] ) : nullptr );
                         return result;
                 }
 
-                static mesh_raw_index_channel* create( datatype etype, uint32 count = 0 )
+                // TODO: remove this
+                static mesh_raw_channel* create_index( datatype etype, uint32 count = 0 )
                 {
-                        mesh_raw_index_channel* result = new mesh_raw_index_channel();
-                        result->etype = etype;
+                        mesh_raw_channel* result = new mesh_raw_channel();
+                        result->desc.initialize_index( etype );
                         result->count = count;
-                        result->size  = count * get_datatype_info( etype ).size;
-                        result->data  = (count > 0 ? ( new uint8[ result->size ] ) : nullptr );
+                        result->data  = (count > 0 ? ( new uint8[ result->size() ] ) : nullptr );
                         return result;
                 }
+
         };
 
@@ -93 +80 @@
         public:
                 mesh_data() : m_index_channel( nullptr ) {}
-                void add_channel( mesh_raw_channel* channel ) { m_channels.push_back( channel ); }
-                void set_index_channel( mesh_raw_index_channel* channel )
+                void add_channel( mesh_raw_channel* channel ) 
                 {
-                        if ( m_index_channel ) delete m_index_channel;
-                        m_index_channel = channel;
+                        NV_ASSERT( channel, "nullptr passed to add_channel!" );
+                        m_channels.push_back( channel );
+                        if ( channel->is_index() )
+                        {
+                                NV_ASSERT( !m_index_channel, "second index channel!" );
+                                m_index_channel = channel;
+                        }
                 }
 
-                const std::vector< mesh_raw_channel* >& get_channel_data() const { return m_channels; }
-                const mesh_raw_index_channel*           get_index_channel() const { return m_index_channel; }
+                const std::vector< mesh_raw_channel* >& get_raw_channels() const { return m_channels; }
+                const mesh_raw_channel*           get_index_channel() const { return m_index_channel; }
 
                 size_t get_count() const 
@@ -116 +107 @@
                 }
 
+                template < typename VTX >
+                const mesh_raw_channel* get_channel() const
+                {
+                        vertex_descriptor compare;
+                        compare.initialize<VTX>();
+                        for ( auto ch : m_channels )
+                        {
+                                if ( ch->desc == compare )
+                                {
+                                        return ch;
+                                }
+                        }
+                        return nullptr;
+                }
+
+                template < typename VTX >
+                const VTX* get_channel_data() const
+                {
+                        vertex_descriptor compare;
+                        compare.initialize<VTX>();
+                        for ( auto ch : m_channels )
+                        {
+                                if ( ch->desc == compare )
+                                {
+                                        return (VTX*)ch->data;
+                                }
+                        }
+                        return nullptr;
+                }
+
                 virtual ~mesh_data()
                 {
                         for ( auto channel : m_channels ) delete channel;
-                        if ( m_index_channel ) delete m_index_channel;
                 }
         private:
                 std::vector< mesh_raw_channel* > m_channels;
-                mesh_raw_index_channel*          m_index_channel;
+                mesh_raw_channel*                m_index_channel;
         };