Get rid of the typedefs for fundamental types

[libs/gl.git] / source / vertexarray.h

diff --git a/source/vertexarray.h b/source/vertexarray.h
index 02fa64f70b0f0cfdfe5c9fa0c893433fa59818f1..7fcbb8bdba7ba50e84cbb8d674e987adbdbc354f 100644 (file)
--- a/source/vertexarray.h
+++ b/source/vertexarray.h
@@ -11,15 +11,15 @@ Distributed under the LGPL
 #include <vector>
 #include <msp/core/refptr.h>
 #include <msp/datafile/loader.h>
+#include "datatype.h"
 #include "primitivetype.h"
-#include "types.h"
 #include "vertexarraybuilder.h"
 #include "vertexformat.h"
 
 namespace Msp {
 namespace GL {
 
-class VertexBuffer;
+class Buffer;
 
 class VertexArray
 {
@@ -33,50 +33,50 @@ public:
 private:
        VertexFormat format;
        std::vector<float> data;
-       uint         stride;
-       VertexBuffer *vbuf;
-       bool         own_vbuf;
+       unsigned stride;
+       Buffer *vbuf;
+       bool own_vbuf;
 
        VertexArray(const VertexArray &);
        VertexArray &operator=(const VertexArray &);
 public:
-       VertexArray(VertexFormat);
+       VertexArray(const VertexFormat &);
        ~VertexArray();
 
-       VertexFormat get_format() const { return format; }
+       const VertexFormat &get_format() const { return format; }
        const std::vector<float> &get_data() const { return data; }
        void         use_vertex_buffer();
-       void         use_vertex_buffer(VertexBuffer *);
+       void         use_vertex_buffer(Buffer *);
        void         reserve(unsigned);
        unsigned     size() const { return data.size()/stride; }
        void         clear();
-       void         reset(VertexFormat);
+       void         reset(const VertexFormat &);
        void         apply() const;
        void         update_data();
        float        *append();
        float        *operator[](unsigned i) { return &data[0]+i*stride; }
        const float  *operator[](unsigned i) const { return &data[0]+i*stride; }
 private:
-       void set_array(unsigned, unsigned, unsigned) const;
+       void set_array(unsigned, bool, unsigned) const;
 
        static unsigned enabled_arrays;
 };
 
 void array_element(int);
-void draw_arrays(PrimitiveType, int, sizei);
-void draw_elements(PrimitiveType, sizei, DataType, const void *);
-void draw_range_elements(PrimitiveType, uint, uint, sizei, DataType, const void *);
+void draw_arrays(PrimitiveType, int, unsigned);
+void draw_elements(PrimitiveType, unsigned, DataType, const void *);
+void draw_range_elements(PrimitiveType, unsigned, unsigned, unsigned, DataType, const void *);
 
-inline void draw_elements(PrimitiveType mode, sizei count, const unsigned *indices)
+inline void draw_elements(PrimitiveType mode, unsigned count, const unsigned *indices)
 { draw_elements(mode, count, UNSIGNED_INT, indices); }
 
-inline void draw_elements(PrimitiveType mode, sizei count, const unsigned short *indices)
+inline void draw_elements(PrimitiveType mode, unsigned count, const unsigned short *indices)
 { draw_elements(mode, count, UNSIGNED_SHORT, indices); }
 
-inline void draw_range_elements(PrimitiveType mode, uint low, uint high, sizei count, const unsigned short *indices)
+inline void draw_range_elements(PrimitiveType mode, unsigned low, unsigned high, unsigned count, const unsigned short *indices)
 { draw_range_elements(mode, low, high, count, UNSIGNED_SHORT, indices); }
 
-inline void draw_range_elements(PrimitiveType mode, uint low, uint high, sizei count, const unsigned *indices)
+inline void draw_range_elements(PrimitiveType mode, unsigned low, unsigned high, unsigned count, const unsigned *indices)
 { draw_range_elements(mode, low, high, count, UNSIGNED_INT, indices); }
 
 } // namespace GL