Make VertexFormat capable of storing type information

[libs/gl.git] / source / core / vertexarray.cpp

diff --git a/source/core/vertexarray.cpp b/source/core/vertexarray.cpp
index 712e76e6011c2ce8aec1e70668d4e8f0ec76f21b..a13d79cc6b0abd3e0c42362b24dc56fc14e05d27 100644 (file)
--- a/source/core/vertexarray.cpp
+++ b/source/core/vertexarray.cpp
@@ -11,14 +11,19 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
+VertexArray::VertexArray():
+       stride(0)
+{ }
+
 VertexArray::VertexArray(const VertexFormat &f)
 {
-       reset(f);
+       set_format(f);
 }
 
-void VertexArray::reset(const VertexFormat &f)
+void VertexArray::set_format(const VertexFormat &f)
 {
-       clear();
+       if(!format.empty())
+               throw invalid_operation("VertexArray::set_format");
        format = f;
        stride = format.stride();
 }
@@ -30,26 +35,32 @@ void VertexArray::clear()
 
 void VertexArray::reserve(unsigned n)
 {
+       if(format.empty())
+               throw invalid_operation("VertexArray::reserve");
        data.reserve(n*stride);
 }
 
-float *VertexArray::append()
+char *VertexArray::append()
 {
+       if(format.empty())
+               throw invalid_operation("VertexArray::append");
        data.insert(data.end(), stride, 0.0f);
        update_offset();
        dirty = true;
        return &*(data.end()-stride);
 }
 
-float *VertexArray::modify(unsigned i)
+char *VertexArray::modify(unsigned i)
 {
+       if(format.empty())
+               throw invalid_operation("VertexArray::modify");
        dirty = true;
        return &data[0]+i*stride;
 }
 
 unsigned VertexArray::get_data_size() const
 {
-       return data.size()*sizeof(float);
+       return data.size();
 }
 
 
@@ -60,6 +71,7 @@ VertexArray::Loader::Loader(VertexArray &a):
        add("vertex", static_cast<void (Loader::*)(float, float, float)>(&Loader::vertex));
        add("vertex", static_cast<void (Loader::*)(float, float, float, float)>(&Loader::vertex));
        add("normal", static_cast<void (Loader::*)(float, float, float)>(&Loader::normal));
+       add("tangent", static_cast<void (Loader::*)(float, float, float)>(&Loader::tangent));
        add("texcoord", static_cast<void (Loader::*)(float)>(&Loader::texcoord));
        add("texcoord", static_cast<void (Loader::*)(float, float)>(&Loader::texcoord));
        add("texcoord", static_cast<void (Loader::*)(float, float, float)>(&Loader::texcoord));
@@ -74,29 +86,14 @@ VertexArray::Loader::Loader(VertexArray &a):
        add("generic", static_cast<void (Loader::*)(unsigned, float, float)>(&Loader::generic));
        add("generic", static_cast<void (Loader::*)(unsigned, float, float, float)>(&Loader::generic));
        add("generic", static_cast<void (Loader::*)(unsigned, float, float, float, float)>(&Loader::generic));
-       add("tangent", static_cast<void (Loader::*)(float, float, float)>(&Loader::tangent));
-       add("binormal", static_cast<void (Loader::*)(float, float, float)>(&Loader::binormal));
-
-       add("vertex2",   static_cast<void (Loader::*)(float, float)>(&Loader::vertex));
-       add("vertex3",   static_cast<void (Loader::*)(float, float, float)>(&Loader::vertex));
-       add("vertex4",   static_cast<void (Loader::*)(float, float, float, float)>(&Loader::vertex));
-       add("normal3",   static_cast<void (Loader::*)(float, float, float)>(&Loader::normal));
-       add("texcoord1", static_cast<void (Loader::*)(float)>(&Loader::texcoord));
-       add("texcoord2", static_cast<void (Loader::*)(float, float)>(&Loader::texcoord));
-       add("texcoord3", static_cast<void (Loader::*)(float, float, float)>(&Loader::texcoord));
-       add("texcoord4", static_cast<void (Loader::*)(float, float, float, float)>(&Loader::texcoord));
-       add("multitexcoord1", static_cast<void (Loader::*)(unsigned, float)>(&Loader::multitexcoord));
-       add("multitexcoord2", static_cast<void (Loader::*)(unsigned, float, float)>(&Loader::multitexcoord));
-       add("multitexcoord3", static_cast<void (Loader::*)(unsigned, float, float, float)>(&Loader::multitexcoord));
-       add("multitexcoord4", static_cast<void (Loader::*)(unsigned, float, float, float, float)>(&Loader::multitexcoord));
-       add("color3",    static_cast<void (Loader::*)(float, float, float)>(&Loader::color));
-       add("color4",    static_cast<void (Loader::*)(float, float, float, float)>(&Loader::color));
-       add("generic1",  static_cast<void (Loader::*)(unsigned, float)>(&Loader::generic));
-       add("generic2",  static_cast<void (Loader::*)(unsigned, float, float)>(&Loader::generic));
-       add("generic3",  static_cast<void (Loader::*)(unsigned, float, float, float)>(&Loader::generic));
-       add("generic4",  static_cast<void (Loader::*)(unsigned, float, float, float, float)>(&Loader::generic));
-       add("tangent3",  static_cast<void (Loader::*)(float, float, float)>(&Loader::tangent));
-       add("binormal3", static_cast<void (Loader::*)(float, float, float)>(&Loader::binormal));
+       add("group", static_cast<void (Loader::*)(int)>(&Loader::group));
+       add("group", static_cast<void (Loader::*)(int, int)>(&Loader::group));
+       add("group", static_cast<void (Loader::*)(int, int, int)>(&Loader::group));
+       add("group", static_cast<void (Loader::*)(int, int, int, int)>(&Loader::group));
+       add("weight", static_cast<void (Loader::*)(float)>(&Loader::weight));
+       add("weight", static_cast<void (Loader::*)(float, float)>(&Loader::weight));
+       add("weight", static_cast<void (Loader::*)(float, float, float)>(&Loader::weight));
+       add("weight", static_cast<void (Loader::*)(float, float, float, float)>(&Loader::weight));
 }
 
 } // namespace GL