Use std::unique_ptr for managing memory

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

diff --git a/source/partcache.h b/source/partcache.h
index 969912431271d501b68267f9f09bb7b05f0427b6..a10efdd084e2a9b5c463fd3ac555886635bb7c36 100644 (file)
--- a/source/partcache.h
+++ b/source/partcache.h
@@ -1,8 +1,10 @@
 #ifndef MSP_GLTK_PARTCACHE_H_
 #define MSP_GLTK_PARTCACHE_H_
 
+#include <memory>
 #include <msp/gl/mesh.h>
 #include <msp/gl/texture2d.h>
+#include "mspgltk_api.h"
 
 namespace Msp {
 namespace GLtk {
@@ -11,34 +13,37 @@ class Part;
 
 struct CachedPart
 {
-       const Part *part;
-       const GL::Texture2D *texture;
-       GL::Mesh *mesh;
-
-       CachedPart();
-       ~CachedPart();
+       const Part *part = nullptr;
+       const GL::Texture2D *texture = nullptr;
+       std::unique_ptr<GL::Mesh> mesh;
 };
 
-class PartCache
+class MSPGLTK_API PartCache
 {
 public:
-       typedef std::list<CachedPart> PartList;
+       class Rebuild
+       {
+       private:
+               PartCache &cache;
+
+       public:
+               Rebuild(PartCache &c): cache(c) { cache.begin_rebuild(); }
+               ~Rebuild() { cache.end_rebuild(); }
+       };
 
 private:
-       bool rebuilding;
-       PartList parts;
-       PartList::iterator next;
-       PartList::iterator current;
+       bool rebuilding = false;
+       std::vector<CachedPart> parts;
+       std::vector<CachedPart>::iterator next;
+       std::vector<CachedPart>::iterator current;
 
 public:
-       PartCache();
-
        void begin_rebuild();
        void insert_special(const Part &);
        GL::Mesh &create_mesh(const Part &, const GL::Texture2D &);
        void end_rebuild();
 
-       const PartList &get_parts() const { return parts; }
+       const std::vector<CachedPart> &get_parts() const { return parts; }
 };
 
 } // namespace GLtk