Process MemberAccess nodes in FunctionInliner

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

diff --git a/source/mesh.h b/source/mesh.h
index 14cb072dda26891dafb4fcf402e4055358f1a48b..70370633fd0425cf88222ceab22b40d012604a35 100644 (file)
--- a/source/mesh.h
+++ b/source/mesh.h
@@ -52,7 +52,7 @@ private:
        };
 
        VertexArray vertices;
-       std::list<Batch> batches;
+       std::vector<Batch> batches;
        Buffer *vbuf;
        Buffer *ibuf;
        unsigned vao_id;
@@ -82,18 +82,21 @@ public:
        float *modify_vertex(unsigned);
 
        void add_batch(const Batch &b);
-       const std::list<Batch> &get_batches() { return batches; }
+       const std::vector<Batch> &get_batches() const { return batches; }
 
        void set_winding(const WindingTest *);
 
        void draw() const;
        void draw(Renderer &) 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();
 
-       virtual Resource::AsyncLoader *load(IO::Seekable &);
+       virtual int get_load_priority() const { return 1; }
+       virtual Resource::AsyncLoader *load(IO::Seekable &, const Resources * = 0);
        virtual UInt64 get_data_size() const;
        virtual void unload();
 };