Add vertex array object support to Mesh

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

diff --git a/source/mesh.h b/source/mesh.h
index 4af66a39e25555a7432d90439045f3ba3d8abb10..2aba273e2b2539cc567a66a25f8525f519c446c9 100644 (file)
--- a/source/mesh.h
+++ b/source/mesh.h
@@ -1,44 +1,74 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007 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 "vertexarray.h"
+#include "windingtest.h"
 
 namespace Msp {
 namespace GL {
 
-class Mesh
+class Buffer;
+class Renderer;
+
+/**
+Raw mesh data, consisting of a VertexArray and one or more Batches.  Though a
+Mesh can draw itself, it's usually used as part of Renderables rather than on
+its own.
+*/
+class Mesh: public Bindable<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 vertices(const std::vector<VertexComponent> &);
                void batch(PrimitiveType);
+               void winding(FaceWinding);
        };
 
+private:
+       VertexArray vertices;
+       std::list<Batch> batches;
+       Buffer *vbuf;
+       Buffer *ibuf;
+       unsigned vao_id;
+       bool defer_buffers;
+       mutable unsigned char dirty;
+       const WindingTest *winding;
+
+public:
        Mesh();
-       Mesh(VertexFormat f);
-       RefPtr<VertexArrayBuilder> modify_vertices() { return vertices.modify(); }
-       void add_batch(const Batch &b);
+       Mesh(const VertexFormat &f);
+       ~Mesh();
+
+       void clear();
+       void use_buffers(bool);
+private:
+       void create_buffers();
+       void refresh() const;
+
+public:
        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 set_winding(const WindingTest *);
+
        void draw() const;
-private:
-       VertexArray vertices;
-       std::list<Batch> batches;
+       void draw(Renderer &) const;
+
+       void bind() const;
+
+       static void unbind();
 };
 
 } // namespace GL