Add vertex array object support to Mesh

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

diff --git a/source/mesh.h b/source/mesh.h
index 1abbefd39746270d6892d83b2fff3f840e22c6de..2aba273e2b2539cc567a66a25f8525f519c446c9 100644 (file)
--- a/source/mesh.h
+++ b/source/mesh.h
@@ -1,16 +1,10 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007-2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_MESH_H_
 #define MSP_GL_MESH_H_
 
 #include <msp/datafile/objectloader.h>
 #include "batch.h"
 #include "vertexarray.h"
+#include "windingtest.h"
 
 namespace Msp {
 namespace GL {
@@ -18,7 +12,12 @@ namespace GL {
 class Buffer;
 class Renderer;
 
-class Mesh
+/**
+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;
 
@@ -28,15 +27,20 @@ public:
        public:
                Loader(Mesh &);
        private:
-               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;
-       bool defer_ibuf;
+       unsigned vao_id;
+       bool defer_buffers;
+       mutable unsigned char dirty;
+       const WindingTest *winding;
 
 public:
        Mesh();
@@ -45,7 +49,11 @@ public:
 
        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);
@@ -53,8 +61,14 @@ public:
        void add_batch(const Batch &b);
        const std::list<Batch> &get_batches() { return batches; }
 
+       void set_winding(const WindingTest *);
+
        void draw() const;
        void draw(Renderer &) const;
+
+       void bind() const;
+
+       static void unbind();
 };
 
 } // namespace GL