X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fmesh.h;h=14b08a964cd59e2889c853cc8230afaa81a97a34;hb=be6ffe96ecb4707599fe1a6f620c348760213d46;hp=89f51fdd9e3493aa97bddd3e40409bffeb34f991;hpb=ef650a483b4201a1e9727f9a86e59894344d30e8;p=libs%2Fgl.git diff --git a/source/core/mesh.h b/source/core/mesh.h index 89f51fdd..14b08a96 100644 --- a/source/core/mesh.h +++ b/source/core/mesh.h @@ -66,16 +66,16 @@ private: VertexArray vertices; std::vector 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(); + Mesh() = default; Mesh(const VertexFormat &); ~Mesh(); @@ -89,8 +89,8 @@ public: const VertexArray &get_vertices() const { return vertices; } const VertexSetup &get_vertex_setup() const { return vtx_setup; } const Buffer *get_index_buffer() const { return ibuf; } - unsigned get_n_vertices() const; - char *modify_vertex(unsigned); + std::size_t get_n_vertices() const; + char *modify_vertex(std::size_t); void add_batch(const Batch &b); const std::vector &get_batches() const { return batches; }