Collapse the shared part of Mesh::draw and draw_instanced

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

diff --git a/source/mesh.h b/source/mesh.h
index db0163e17ef3521ef471109758b9d846c6649782..9e086e8770502778167702a3bebaa6cc935f6148 100644 (file)
--- a/source/mesh.h
+++ b/source/mesh.h
@@ -5,6 +5,7 @@
 #include "batch.h"
 #include "resource.h"
 #include "vertexarray.h"
+#include "vertexsetup.h"
 #include "windingtest.h"
 
 namespace Msp {
@@ -12,14 +13,13 @@ namespace GL {
 
 class Buffer;
 class Renderer;
-class VertexSetup;
 
 /**
 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>, public Resource
+class Mesh: public Resource
 {
        friend class MeshBuilder;
 
@@ -56,7 +56,7 @@ private:
        std::vector<Batch> batches;
        Buffer *vbuf;
        Buffer *ibuf;
-       VertexSetup *vtx_setup;
+       VertexSetup vtx_setup;
        bool defer_buffers;
        mutable bool dirty;
        bool disallow_rendering;
@@ -71,12 +71,12 @@ public:
        ~Mesh();
 
        void clear();
-       void use_buffers(bool);
 private:
        void create_buffers();
 
 public:
        const VertexArray &get_vertices() const { return vertices; }
+       const VertexSetup &get_vertex_setup() const { return vtx_setup; }
        const Buffer *get_index_buffer() const { return ibuf; }
        unsigned get_n_vertices() const;
        float *modify_vertex(unsigned);
@@ -86,15 +86,12 @@ public:
 
        void set_winding(const WindingTest *);
 
-       void draw() const;
        void draw(Renderer &) const;
+       void draw_instanced(Renderer &, const VertexSetup &, unsigned) const;
+private:
+       void draw(Renderer &, const VertexSetup *, unsigned) const;
 
-       /** Binds the mesh for rendering.  The vertex array is applied using generic
-       attributes only.  Uses vertex array object if possible. */
-       void bind() const;
-
-       static void unbind();
-
+public:
        virtual int get_load_priority() const { return 1; }
        virtual Resource::AsyncLoader *load(IO::Seekable &, const Resources * = 0);
        virtual UInt64 get_data_size() const;