Minor refactoring

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

diff --git a/source/partcache.cpp b/source/partcache.cpp
index 3b944572a45abb8874b06a7f4313e569fab123dd..8b425c2b0a5f255c553d91e67fcca67497c6dd0a 100644 (file)
--- a/source/partcache.cpp
+++ b/source/partcache.cpp
@@ -6,21 +6,29 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-CachedPart::CachedPart():
-       part(0),
-       texture(0),
-       mesh(0)
-{ }
+CachedPart::CachedPart(CachedPart &&other):
+       part(other.part),
+       texture(other.texture),
+       mesh(other.mesh)
+{
+       other.mesh = nullptr;
+}
 
-CachedPart::~CachedPart()
+CachedPart &CachedPart::operator=(CachedPart &&other)
 {
        delete mesh;
+       part = other.part;
+       texture = other.texture;
+       mesh = other.mesh;
+       other.mesh = nullptr;
+       return *this;
 }
 
+CachedPart::~CachedPart()
+{
+       delete mesh;
+}
 
-PartCache::PartCache():
-       rebuilding(false)
-{ }
 
 void PartCache::begin_rebuild()
 {
@@ -39,12 +47,9 @@ void PartCache::insert_special(const Part &part)
        if(!rebuilding)
                throw logic_error("!rebuilding");
 
-       for(current=next; current!=parts.end(); ++current)
-               if(current->part==&part)
-               {
-                       parts.erase(next, current);
-                       break;
-               }
+       current = find_if(next, parts.end(), [&part](const CachedPart &p){ return p.part==∂ });
+       if(current!=parts.end())
+               parts.erase(next, current);
 
        if(current==parts.end())
                current = parts.insert(next, CachedPart());