Use set_manager instead of passing the manager to the constructor

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

diff --git a/source/core/mesh.h b/source/core/mesh.h
index 0111bb7798908348cfb09080631c29d7c3e1f6cc..89f51fdd9e3493aa97bddd3e40409bffeb34f991 100644 (file)
--- a/source/core/mesh.h
+++ b/source/core/mesh.h
@@ -1,6 +1,8 @@
 #ifndef MSP_GL_MESH_H_
 #define MSP_GL_MESH_H_
 
+#include <string>
+#include <vector>
 #include <msp/datafile/objectloader.h>
 #include "batch.h"
 #include "cullface.h"
@@ -73,11 +75,8 @@ private:
        std::string debug_name;
 
 public:
-       Mesh(ResourceManager * = 0);
-       Mesh(const VertexFormat &, ResourceManager * = 0);
-private:
-       void init(ResourceManager *);
-public:
+       Mesh();
+       Mesh(const VertexFormat &);
        ~Mesh();
 
        void storage(const VertexFormat &);
@@ -107,7 +106,7 @@ private:
 public:
        virtual int get_load_priority() const { return 1; }
        virtual Resource::AsyncLoader *load(IO::Seekable &, const Resources * = 0);
-       virtual UInt64 get_data_size() const;
+       virtual std::uint64_t get_data_size() const;
        virtual void unload();
 
        void set_debug_name(const std::string &);