Use default member initializers for simple types

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

diff --git a/source/core/mesh.h b/source/core/mesh.h
index 0111bb7798908348cfb09080631c29d7c3e1f6cc..2d56193d14a104ccc3d08bb87fd0a11f5f8bbe11 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"
@@ -64,20 +66,17 @@ private:
 
        VertexArray vertices;
        std::vector<Batch> batches;
-       Buffer *vbuf;
-       Buffer *ibuf;
+       Buffer *vbuf = 0;
+       Buffer *ibuf = 0;
        VertexSetup vtx_setup;
-       mutable unsigned short dirty;
-       bool disallow_rendering;
-       FaceWinding face_winding;
+       mutable unsigned short dirty = 0;
+       bool disallow_rendering = false;
+       FaceWinding face_winding = NON_MANIFOLD;
        std::string debug_name;
 
 public:
-       Mesh(ResourceManager * = 0);
-       Mesh(const VertexFormat &, ResourceManager * = 0);
-private:
-       void init(ResourceManager *);
-public:
+       Mesh() = default;
+       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 &);