Changeset 99 for trunk/src

Timestamp:

06/03/13 18:17:48 (12 years ago)

Author:

epyon

Message:

• vertex_buffer - added assign by range (will change with the next commit)
• gl_vertex_buffer - implementation of the above
• gui element - recalculate_absolute_children() added, destructor and fix
• object - get_id added
• lualib_test - cleanups

Location:

trunk/src

Files:

• gl/gl_vertex_buffer.cc (modified) (2 diffs)
• gui/gui_element.cc (modified) (2 diffs)

trunk/src/gl/gl_vertex_buffer.cc

@@ -25 +25 @@
         glBindBuffer( GL_ARRAY_BUFFER, 0);
 }
+
+void gl_vertex_buffer::assign( void* data, int offset, int size )
+{
+        glBindBuffer( GL_ARRAY_BUFFER, m_name.get_value() );
+        glBufferSubData( GL_ARRAY_BUFFER, offset, size, data );
+        glBindBuffer( GL_ARRAY_BUFFER, 0);
+}
+
 
 void gl_vertex_buffer::bind()
@@ -54 +62 @@
         glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, m_name.get_value() );
         glBufferData( GL_ELEMENT_ARRAY_BUFFER, m_size, data, buffer_hint_to_enum( m_hint ) );
+        glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, 0);
+}
+
+void gl_index_buffer::assign( void* data, int offset, int size )
+{
+        glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, m_name.get_value() );
+        glBufferSubData( GL_ELEMENT_ARRAY_BUFFER, offset, size, data );
         glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, 0);
 }

trunk/src/gui/gui_element.cc

@@ -12 +12 @@
 using namespace nv::gui;
 
-element::element( root* aroot, const rectangle r ) 
-        : object( aroot, "" ), m_class(""), m_relative( r ), m_absolute( r ), m_enabled( true ), m_visible( true ), m_dirty( true )
+element::element( root* aroot, const rectangle& r ) 
+        : object( aroot, "" ), m_class(""), m_relative( r ), m_absolute( r ), m_enabled( true ), m_visible( true ), m_dirty( true ), m_render_data( nullptr )
 {
 
@@ -97 +97 @@
         }
 }
+
+void element::recalculate_absolute_children()
+{
+        for ( object* o : *this )
+        {
+                ((element*)o)->recalculate_absolute();
+        }
+}
+
+element::~element()
+{
+        delete m_render_data;
+}