X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fimmediate.cpp;h=15d3a634a13248063efd29c2f5889fff7110c120;hb=9a9d3517dcfdba5206d9c73ce211feac8e402bc2;hp=8e761f4329c4c5cec8921d62753849fb5ff98e2d;hpb=d1800d7ea80290f4913d0203241cef1409656522;p=libs%2Fgl.git

diff --git a/source/immediate.cpp b/source/immediate.cpp
index 8e761f43..15d3a634 100644
--- a/source/immediate.cpp
+++ b/source/immediate.cpp
@@ -5,6 +5,7 @@ Copyright © 2007  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
+#include "batch.h"
 #include "immediate.h"
 
 namespace Msp {
@@ -13,14 +14,34 @@ namespace GL {
 Immediate::Immediate(VertexFormat f):
 	PrimitiveBuilder(array),
 	array(f)
-{ }
+{
+	array.use_vertex_buffer(0);
+}
+
+void Immediate::reset()
+{
+	if(in_batch)
+		throw InvalidState("Can't reset Immediate between begin() and end()");
+
+	array.clear();
+}
+
+void Immediate::begin_()
+{
+	indices.clear();
+}
 
 void Immediate::end_()
 {
+	Batch batch(type);
+	batch.append(indices);
 	array.apply();
-	glDrawArrays(type, 0, array.size());
+	batch.draw();
+}
 
-	array.clear();
+void Immediate::element_(unsigned i)
+{
+	indices.push_back(i);
 }
 
 } // namespace GL