Inherit Loaders from the ObjectLoader classes

[libs/gl.git] / source / mesh.h

diff --git a/source/mesh.h b/source/mesh.h
index 8e1f906cf2dcbbd89ecb9c556a721991b7899b1a..044e70843d345aa06b960cfdb3697c93a9053584 100644 (file)
--- a/source/mesh.h
+++ b/source/mesh.h
@@ -8,26 +8,25 @@ Distributed under the LGPL
 #ifndef MSP_GL_MESH_H_
 #define MSP_GL_MESH_H_
 
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 #include "batch.h"
-#include "meshbuilder.h"
 #include "vertexarray.h"
 
 namespace Msp {
 namespace GL {
 
+class Buffer;
+
 class Mesh
 {
        friend class MeshBuilder;
 
 public:
-       class Loader: public DataFile::Loader
+       class Loader: public DataFile::ObjectLoader<Mesh>
        {
        public:
                Loader(Mesh &);
        private:
-               Mesh &mesh;
-
                void vertices(VertexFormat);
                void batch(PrimitiveType);
        };
@@ -35,17 +34,21 @@ public:
 private:
        VertexArray vertices;
        std::list<Batch> batches;
+       Buffer *ibuf;
 
 public:
        Mesh();
-       Mesh(VertexFormat f);
+       Mesh(const VertexFormat &f);
 
        void use_vertex_buffer(bool);
-       RefPtr<MeshBuilder> modify();
        const VertexArray &get_vertices() const { return vertices; }
+       float *get_vertex(unsigned);
        void add_batch(const Batch &b);
        const std::list<Batch> &get_batches() { return batches; }
+       void clear();
        void draw() const;
+private:
+       void update_index_buffer();
 };
 
 } // namespace GL