Load VertexFormat for Mesh as an array of VertexComponents

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

diff --git a/source/mesh.h b/source/mesh.h
index 9ad924f2a246fe00932dc2744531aa94e7b2d3be..83f2fb0734d3bf31b16e2756977bb53a78d21214 100644 (file)
--- a/source/mesh.h
+++ b/source/mesh.h
@@ -1,22 +1,22 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007-2010  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 {
 
 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
 {
        friend class MeshBuilder;
@@ -27,8 +27,9 @@ public:
        public:
                Loader(Mesh &);
        private:
-               void vertices(VertexFormat);
+               void vertices(const std::vector<VertexComponent> &);
                void batch(PrimitiveType);
+               void winding(FaceWinding);
        };
 
 private:
@@ -36,6 +37,7 @@ private:
        std::list<Batch> batches;
        Buffer *ibuf;
        bool defer_ibuf;
+       const WindingTest *winding;
 
 public:
        Mesh();
@@ -52,7 +54,10 @@ 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;
 };
 
 } // namespace GL