X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fvertexarray.h;h=60e035f9a6ad429cef54bee4aaa1832d38fb4e08;hb=be6ffe96ecb4707599fe1a6f620c348760213d46;hp=290fa10c455f07b56f95c6ab0da3cfa9cc8f5fab;hpb=acaefb4c669f01855252818ef0a2958cbdababc3;p=libs%2Fgl.git diff --git a/source/core/vertexarray.h b/source/core/vertexarray.h index 290fa10c..60e035f9 100644 --- a/source/core/vertexarray.h +++ b/source/core/vertexarray.h @@ -32,12 +32,12 @@ public: private: VertexFormat format; std::vector data; - unsigned stride; + unsigned stride = 0; VertexArray(const VertexArray &); VertexArray &operator=(const VertexArray &); public: - VertexArray(); + VertexArray() = default; /// Construct a VertexArray and set its format. VertexArray(const VertexFormat &); @@ -51,21 +51,21 @@ public: void clear(); /// Reserve space for vertices. - void reserve(unsigned); + void reserve(std::size_t n); /// Append a new vertex at the end of the array and return its location. char *append(); /// Returns the location of a vertex for modification. - char *modify(unsigned); + char *modify(std::size_t); private: - virtual unsigned get_data_size() const; + virtual std::size_t get_data_size() const; virtual const void *get_data_pointer() const { return &data[0]; } public: - unsigned size() const { return data.size()/stride; } + std::size_t size() const { return data.size()/stride; } const std::vector &get_data() const { return data; } - const char *operator[](unsigned i) const { return &data[0]+i*stride; } + const char *operator[](std::size_t i) const { return &data[0]+i*stride; } }; } // namespace GL