Changeset 413 for trunk/nv/interface/data_descriptor.hh

Timestamp:

07/09/15 18:53:08 (10 years ago)

Author:

epyon

Message:

• data_descriptor creators ( buggy )

File:

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

trunk/nv/interface/data_descriptor.hh

@@ -284 +284 @@
                 }
 
+                template < typename Struct >
+                static data_descriptor create()
+                {
+                        data_descriptor result;
+                        result.initialize< Struct >();
+                        return result;
+                }
+
         protected:
 
@@ -306 +314 @@
         struct raw_data_channel
         {
-                raw_data_channel() : data( nullptr ), m_count( 0 ) {}
+                raw_data_channel() : m_data( nullptr ), m_count( 0 ) {}
                 ~raw_data_channel()
                 {
-                        if ( data != nullptr ) delete[] data;
+                        if ( m_data != nullptr ) delete[] m_data;
                 }
 
@@ -316 +324 @@
                 uint32 element_count() const { return m_count; }
                 uint32 raw_size() const { return m_count * m_desc.element_size(); }
-                const uint8* raw_data() const { return data; }
+                const uint8* raw_data() const { return m_data; }
+
+                // TODO: constexpr compile-time cast check?
+                template < typename Struct >
+                const Struct* data_cast() const 
+                { 
+                        return reinterpret_cast<const Struct*>( m_data );
+                }
 
                 bool has_slot( slot vslot ) const { return m_desc.has_slot( vslot ); }
 
-                template < typename VTX >
+                template < typename Struct >
                 static raw_data_channel* create( uint32 count = 0 )
                 {
                         raw_data_channel* result = new raw_data_channel();
-                        result->m_desc.initialize<VTX>();
+                        result->m_desc.initialize<Struct>();
                         result->m_count = count;
-                        result->data = ( count > 0 ? ( new uint8[result->raw_size()] ) : nullptr );
+                        result->m_data = ( count > 0 ? ( new uint8[result->raw_size()] ) : nullptr );
                         return result;
                 }
@@ -334 +349 @@
                         result->m_desc = desc;
                         result->m_count = count;
-                        result->data = ( count > 0 ? ( new uint8[result->raw_size()] ) : nullptr );
+                        result->m_data = ( count > 0 ? ( new uint8[result->raw_size()] ) : nullptr );
                         return result;
                 }
 
-                friend class mesh_creator;
-                friend class mesh_data_creator;
-
-                uint8*          data;
+                template < typename Struct >
+                friend class data_channel_creator;
+                friend class raw_data_channel_creator;
+
         protected:
+                uint8*          m_data;
                 data_descriptor m_desc;
                 uint32          m_count;
@@ -348 +364 @@
         };
 
+        class raw_data_channel_creator
+        {
+        public:
+                raw_data_channel_creator( const data_descriptor& desc, uint32 size )
+                {
+                        m_channel = raw_data_channel::create( desc, size );
+                        m_owned   = true;
+                }
+                explicit raw_data_channel_creator( raw_data_channel* channel )
+                {
+                        m_channel = channel;
+                        m_owned   = false;
+                }
+
+                uint32 element_size() const { return m_channel->element_size(); }
+                uint32 size() const { return m_channel->element_count(); }
+                uint32 raw_size() const { return m_channel->element_count() * m_channel->element_size(); }
+                uint8* raw_data() { return m_channel->m_data; }
+                const uint8* raw_data() const { return m_channel->m_data; }
+                raw_data_channel* channel() { return m_channel; }
+
+                data_descriptor& descriptor() { return m_channel->m_desc; }
+                const data_descriptor& descriptor() const { return m_channel->m_desc; }
+
+                raw_data_channel* release()
+                {
+                        raw_data_channel* result = m_channel;
+                        m_channel = nullptr;
+                        return result;
+                }
+
+                ~raw_data_channel_creator()
+                {
+                        if ( m_owned && m_channel ) delete m_channel;
+                }
+        protected:
+                raw_data_channel* m_channel;
+                bool              m_owned;
+        };
+
+        template < typename Struct >
+        class data_channel_creator : public raw_data_channel_creator
+        {
+        public:
+                explicit data_channel_creator( uint32 size ) 
+                        : raw_data_channel_creator( data_descriptor::create< Struct >(), size ) {}
+                // TODO - descriptor check
+                explicit data_channel_creator( raw_data_channel* channel )
+                        : raw_data_channel_creator( channel ) {}
+                
+                Struct* data() { return reinterpret_cast< Struct* >( m_channel->m_data ); }
+                const Struct* data() const { return reinterpret_cast< const Struct* >( m_channel->m_data ); }
+
+                const Struct& operator []( uint32 i ) const
+                {
+                        NV_ASSERT( i < m_channel->m_count, "data_channel_creator indexing failure!" );
+                        return reinterpret_cast< const Struct* >( m_channel->m_data )[i];
+                }
+
+                Struct& operator []( uint32 i ) 
+                {
+                        NV_ASSERT( i < m_channel->m_count, "data_channel_creator indexing failure!" );
+                        return reinterpret_cast<Struct*>( m_channel->m_data )[i];
+                }
+        };
 }
 
 #endif // NV_INTERFACE_DATA_DESCRIPTOR_HH
-