X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fvertexarray.h;h=55ee8d24ae10cb1bff4a4259c3f32d4d1f88aec4;hb=e92de029768eef5f0fd744329e589161b46d0762;hp=4c2a028f83b1439f0104cc275602160332e1757e;hpb=d40673bd28c4b4524d3642b949d9d109dc6f9f24;p=libs%2Fgl.git diff --git a/source/core/vertexarray.h b/source/core/vertexarray.h index 4c2a028f..55ee8d24 100644 --- a/source/core/vertexarray.h +++ b/source/core/vertexarray.h @@ -37,7 +37,7 @@ public: private: VertexFormat format; - std::vector data; + std::vector data; unsigned stride; VertexArray(const VertexArray &); @@ -48,9 +48,6 @@ public: /// Construct a VertexArray and set its format. VertexArray(const VertexFormat &); - /// Deprecated. Use set_format. - DEPRECATED void reset(const VertexFormat &f) { set_format(f); } - /// Sets the format of the VertexArray. void set_format(const VertexFormat &); @@ -63,18 +60,18 @@ public: void reserve(unsigned); /// Append a new vertex at the end of the array and return its location. - float *append(); + char *append(); /// Returns the location of a vertex for modification. - float *modify(unsigned); + char *modify(unsigned); private: virtual unsigned get_data_size() const; virtual const void *get_data_pointer() const { return &data[0]; } public: unsigned size() const { return data.size()/stride; } - const std::vector &get_data() const { return data; } - const float *operator[](unsigned i) const { return &data[0]+i*stride; } + const std::vector &get_data() const { return data; } + const char *operator[](unsigned i) const { return &data[0]+i*stride; } }; } // namespace GL