Improvements to Bufferable

[libs/gl.git] / source / bufferable.cpp

diff --git a/source/bufferable.cpp b/source/bufferable.cpp
index abd10b3a865baa44bbc078c0745b65cb5682fba6..60df3eec92c1bd188dbab825e998baf1dd97e7b4 100644 (file)
--- a/source/bufferable.cpp
+++ b/source/bufferable.cpp
@@ -9,7 +9,7 @@ namespace GL {
 
 Bufferable::Bufferable():
        buffer(0),
-       buffer_offset(0),
+       offset(0),
        next_in_buffer(0),
        prev_in_buffer(0),
        dirty(false)
@@ -33,10 +33,13 @@ void Bufferable::use_buffer(Buffer *buf, Bufferable *prev)
        {
                prev_in_buffer = prev;
                if(prev_in_buffer)
+               {
+                       next_in_buffer = prev_in_buffer->next_in_buffer;
                        prev_in_buffer->next_in_buffer = this;
+               }
        }
 
-       update_buffer_offset();
+       update_offset();
 }
 
 void Bufferable::unlink_from_buffer()
@@ -46,43 +49,44 @@ void Bufferable::unlink_from_buffer()
        if(next_in_buffer)
        {
                next_in_buffer->prev_in_buffer = prev_in_buffer;
-               next_in_buffer->update_buffer_offset();
+               next_in_buffer->update_offset();
        }
        prev_in_buffer = 0;
        next_in_buffer = 0;
+       buffer = 0;
 }
 
-void Bufferable::update_buffer_offset()
+void Bufferable::update_offset()
 {
-       unsigned offset = 0;
+       unsigned new_offset = 0;
        if(prev_in_buffer)
-               offset = prev_in_buffer->buffer_offset+prev_in_buffer->get_data_size();
+               new_offset = prev_in_buffer->offset+prev_in_buffer->get_data_size();
 
        unsigned align = get_alignment();
-       offset += align-1;
-       offset -= offset%align;
-       if(offset!=buffer_offset)
+       new_offset += align-1;
+       new_offset -= new_offset%align;
+       if(new_offset!=offset)
        {
-               buffer_offset = offset;
+               offset = new_offset;
                dirty = true;
                offset_changed();
        }
 
        if(next_in_buffer)
-               next_in_buffer->update_buffer_offset();
+               next_in_buffer->update_offset();
 
-       /* Do not resize the buffer here, as the offsets may change multiple times
-       before the buffer is actually used */
+       /* Do not resize the buffer here, as more bufferables may be added before
+       the buffer is actually used. */
 }
 
-void Bufferable::update_buffer_data() const
+void Bufferable::update_buffer() const
 {
-       if(buffer_offset+get_data_size()>=buffer->get_size())
+       if(offset+get_data_size()>=buffer->get_size())
        {
                const Bufferable *last = this;
                for(; last->next_in_buffer; last=last->next_in_buffer) ;
 
-               unsigned total_size = last->buffer_offset+last->get_data_size();
+               unsigned total_size = last->offset+last->get_data_size();
 
                if(total_size>buffer->get_size())
                {