Bind ProgramData to a Program upon construction

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

diff --git a/source/mesh.h b/source/mesh.h
index 8e1f906cf2dcbbd89ecb9c556a721991b7899b1a..1abbefd39746270d6892d83b2fff3f840e22c6de 100644 (file)
--- a/source/mesh.h
+++ b/source/mesh.h
@@ -1,33 +1,33 @@
 /* $Id$
 
 This file is part of libmspgl
-Copyright © 2007 Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2011  Mikko Rasa, Mikkosoft Productions
 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 Renderer;
+
 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 +35,26 @@ public:
 private:
        VertexArray vertices;
        std::list<Batch> batches;
+       Buffer *ibuf;
+       bool defer_ibuf;
 
 public:
        Mesh();
-       Mesh(VertexFormat f);
+       Mesh(const VertexFormat &f);
+       ~Mesh();
+
+       void clear();
+       void use_buffers(bool);
 
-       void use_vertex_buffer(bool);
-       RefPtr<MeshBuilder> modify();
        const VertexArray &get_vertices() const { return vertices; }
+       unsigned get_n_vertices() const;
+       float *modify_vertex(unsigned);
+
        void add_batch(const Batch &b);
        const std::list<Batch> &get_batches() { return batches; }
+
        void draw() const;
+       void draw(Renderer &) const;
 };
 
 } // namespace GL