X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fmesh.h;h=ba2aebc76c1fd35254f66429f5035e4370d587b5;hb=e1be82a4dfce8d90358c506f65be09da4dc9d5ec;hp=98a028dbc88ea8f231c039ce97dcc48834e3c347;hpb=710363bade528b5015a7c472db3aa90eb08207ab;p=libs%2Fgl.git diff --git a/source/core/mesh.h b/source/core/mesh.h index 98a028db..ba2aebc7 100644 --- a/source/core/mesh.h +++ b/source/core/mesh.h @@ -27,15 +27,18 @@ a Technique and is usually the appropriate way to of rendering geometry. class Mesh: public Resource { friend class MeshBuilder; + class AsyncLoader; public: class Loader: public DataFile::ObjectLoader { + friend class AsyncLoader; + private: - bool allow_gl_calls; + bool allow_gl_calls = true; public: - Loader(Mesh &, bool = true); + Loader(Mesh &); private: void storage(const std::vector &); void vertices(); @@ -80,6 +83,7 @@ private: public: Mesh() = default; Mesh(const VertexFormat &); + Mesh(Mesh &&); ~Mesh(); /** Sets the vertex format for the mesh. It cannot be changed once set. */ @@ -102,7 +106,7 @@ public: /** Adds a batch to the mesh. It may be combined with the last existing batch if the primitive types are compatible. */ - void add_batch(const Batch &b); + void add_batch(Batch &&b); const std::vector &get_batches() const { return batches; }