Keep track of which components have been set in Transform

[libs/gl.git] / source / immediate.cpp

diff --git a/source/immediate.cpp b/source/immediate.cpp
index 3d808d320897d9c1610ebf2da3650d56e7859d94..cf1be08ed7204209d0d572b851ce76b7c58469ff 100644 (file)
--- a/source/immediate.cpp
+++ b/source/immediate.cpp
@@ -1,10 +1,5 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
+#include "batch.h"
+#include "error.h"
 #include "immediate.h"
 
 namespace Msp {
@@ -14,24 +9,28 @@ Immediate::Immediate(VertexFormat f):
        PrimitiveBuilder(array),
        array(f)
 {
-       array.use_vertex_buffer(0);
+       array.use_buffer(0);
 }
 
 void Immediate::reset()
 {
        if(in_batch)
-               throw InvalidState("Can't reset Immediate between begin() and end()");
+               throw invalid_operation("Immediate::reset");
 
        array.clear();
+}
+
+void Immediate::begin_()
+{
        indices.clear();
 }
 
 void Immediate::end_()
 {
+       Batch batch(type);
+       batch.append(indices);
        array.apply();
-       draw_elements(type, indices.size(), &indices[0]);
-
-       indices.clear();
+       batch.draw();
 }
 
 void Immediate::element_(unsigned i)