Only allow VertexArray's format to be set once

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

diff --git a/source/core/vertexarray.cpp b/source/core/vertexarray.cpp
index da868c7963f83a81efed4b08bdb10cb118cf7c80..2bb6a6677b9ef5e2099a1a5922b1d2990910708c 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,11 +35,15 @@ void VertexArray::clear()
 
 void VertexArray::reserve(unsigned n)
 {
+       if(format.empty())
+               throw invalid_operation("VertexArray::reserve");
        data.reserve(n*stride);
 }
 
 float *VertexArray::append()
 {
+       if(format.empty())
+               throw invalid_operation("VertexArray::append");
        data.insert(data.end(), stride, 0.0f);
        update_offset();
        dirty = true;
@@ -43,6 +52,8 @@ float *VertexArray::append()
 
 float *VertexArray::modify(unsigned i)
 {
+       if(format.empty())
+               throw invalid_operation("VertexArray::modify");
        dirty = true;
        return &data[0]+i*stride;
 }
@@ -74,8 +85,6 @@ 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("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));
@@ -104,8 +113,13 @@ VertexArray::Loader::Loader(VertexArray &a):
        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));
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
        add("tangent3",  static_cast<void (Loader::*)(float, float, float)>(&Loader::tangent));
        add("binormal3", static_cast<void (Loader::*)(float, float, float)>(&Loader::binormal));
+       add("tangent", static_cast<void (Loader::*)(float, float, float)>(&Loader::tangent));
+       add("binormal", static_cast<void (Loader::*)(float, float, float)>(&Loader::binormal));
+#pragma GCC diagnostic pop
 }
 
 } // namespace GL