Changeset 116 for trunk

Timestamp:

06/11/13 22:33:08 (12 years ago)

Author:

epyon

Message:

• support for indexed arrays

Location:

trunk

Files:

• nv/interface/device.hh (modified) (1 diff)
• nv/interface/vertex_buffer.hh (modified) (3 diffs)
• src/gl/gl_context.cc (modified) (1 diff)
• src/gl/gl_vertex_buffer.cc (modified) (1 diff)

trunk/nv/interface/device.hh

@@ -51 +51 @@
                                 const vertex_attribute_base* i = m->get_indices();
                                 index_buffer* vb = create_index_buffer( hint, i->get_size(), i->get_data() );
-                                result->set_index_buffer( vb, true );
+                                result->set_index_buffer( vb, i->get_base_type(), true );
                         }
                         return result;

trunk/nv/interface/vertex_buffer.hh

@@ -93 +93 @@
         {
         public:
-                vertex_array() : m_map(), m_index( nullptr ) {}
+                vertex_array() : m_map(), m_index( nullptr ), m_index_owner( false ), m_index_type(INT) {}
                 void add_vertex_buffer( int location, vertex_buffer* buffer, datatype datatype, int components, int offset = 0, int stride = 0, bool owner = true ) 
                 {
@@ -107 +107 @@
                         }
                 };
-                void set_index_buffer( index_buffer* buffer, bool owner ) 
+                void set_index_buffer( index_buffer* buffer, datatype datatype, bool owner ) 
                 { 
-                        m_index = buffer; 
+                        m_index       = buffer; 
                         m_index_owner = owner; 
+                        m_index_type  = datatype;
                 }
+                bool has_index_buffer() const { return m_index != nullptr; }
+                datatype get_index_buffer_type() const { return m_index_type; }
                 virtual void bind() = 0;
                 virtual void unbind() = 0;
@@ -124 +127 @@
                 vertex_buffer_attribute_map m_map;
                 index_buffer* m_index;
-                bool m_index_owner;
+                bool          m_index_owner;
+                datatype      m_index_type;
         };
 

trunk/src/gl/gl_context.cc

@@ -363 +363 @@
                 p->bind();
                 va->bind();
-                glDrawArrays( primitive_to_enum(prim), 0, count);
+                if ( va->has_index_buffer() )
+                {
+                        glDrawElements( primitive_to_enum(prim), count, datatype_to_gl_enum( va->get_index_buffer_type() ), 0 );
+                }
+                else
+                {
+                        glDrawArrays( primitive_to_enum(prim), 0, count);
+                }
                 va->unbind();
                 p->unbind();

trunk/src/gl/gl_vertex_buffer.cc

@@ -92 +92 @@
         }
 
+        if ( m_index )
+        {
+                m_index->bind();
+        }
 }
 
 void gl_vertex_array::unbind()
 {
+        if ( m_index )
+        {
+                m_index->unbind();
+        }
+
         for ( vertex_buffer_attribute_map::iterator i = m_map.begin();  i != m_map.end(); ++i ) 
         {