Adjust things to conform to changes in other libraries

[libs/gltk.git] / source / partcache.cpp

diff --git a/source/partcache.cpp b/source/partcache.cpp
index 4747cb50b3e585fd45bb6a5be8fe864bd2937266..3b944572a45abb8874b06a7f4313e569fab123dd 100644 (file)
--- a/source/partcache.cpp
+++ b/source/partcache.cpp
@@ -18,8 +18,16 @@ CachedPart::~CachedPart()
 }
 
 
+PartCache::PartCache():
+       rebuilding(false)
+{ }
+
 void PartCache::begin_rebuild()
 {
+       if(rebuilding)
+               throw logic_error("nested rebuild");
+       rebuilding = true;
+
        next = parts.begin();
        current = parts.end();
 }
@@ -28,6 +36,8 @@ void PartCache::insert_special(const Part &part)
 {
        if(part.get_name().empty())
                throw invalid_argument("PartCache::insert_special");
+       if(!rebuilding)
+               throw logic_error("!rebuilding");
 
        for(current=next; current!=parts.end(); ++current)
                if(current->part==&part)
@@ -48,6 +58,9 @@ void PartCache::insert_special(const Part &part)
 
 GL::Mesh &PartCache::create_mesh(const Part &part, const GL::Texture2D &tex)
 {
+       if(!rebuilding)
+               throw logic_error("!rebuilding");
+
        if(current!=parts.end() && current->texture==&tex)
                return *current->mesh;
 
@@ -62,7 +75,7 @@ GL::Mesh &PartCache::create_mesh(const Part &part, const GL::Texture2D &tex)
        {
                current = parts.insert(next, CachedPart());
                current->texture = &tex;
-               current->mesh = new GL::Mesh((GL::TEXCOORD2, GL::COLOR4_UBYTE, GL::VERTEX2));
+               current->mesh = new GL::Mesh((GL::TEXCOORD2, GL::COLOR4,GL::UNSIGNED_BYTE, GL::VERTEX2));
        }
        else
                current->mesh->clear();
@@ -76,6 +89,7 @@ GL::Mesh &PartCache::create_mesh(const Part &part, const GL::Texture2D &tex)
 
 void PartCache::end_rebuild()
 {
+       rebuilding = false;
        parts.erase(next, parts.end());
 }