X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprimitivebuilder.cpp;h=92b2cb0eb0b76ef97c73875bd00f14651409c3b8;hb=0f3ae7cf6aed59f07895dfbef6740be3b666fc20;hp=ca8f4f3c5343ff973aef0ab1e33173b5d6e4adc4;hpb=d1800d7ea80290f4913d0203241cef1409656522;p=libs%2Fgl.git

diff --git a/source/primitivebuilder.cpp b/source/primitivebuilder.cpp
index ca8f4f3c..92b2cb0e 100644
--- a/source/primitivebuilder.cpp
+++ b/source/primitivebuilder.cpp
@@ -29,7 +29,7 @@ void PrimitiveBuilder::begin(PrimitiveType t)
 
 void PrimitiveBuilder::end()
 {
-	if(in_batch)
+	if(!in_batch)
 		throw InvalidState("end() called without begin()");
 
 	builder=0;
@@ -38,6 +38,15 @@ void PrimitiveBuilder::end()
 	end_();
 }
 
+void PrimitiveBuilder::element(unsigned i)
+{
+	if(!in_batch)
+		throw InvalidState("Element specification not between begin() and end()");
+	if(i>=array.size())
+		throw InvalidParameterValue("Element index out of range");
+	element_(i);
+}
+
 PrimitiveType PrimitiveBuilder::get_type() const
 {
 	if(!in_batch)
@@ -47,13 +56,13 @@ PrimitiveType PrimitiveBuilder::get_type() const
 
 void PrimitiveBuilder::vertex_(float x, float y, float z, float w)
 {
-	if(!in_batch)
-		throw InvalidState("Vertex specification not between begin() and end()");
-
 	builder->texcoord(ts, tt, tr,tq);
 	builder->color(cr, cg, cb, ca);
 	builder->normal(nx, ny, nz);
 	builder->vertex(x, y, z, w);
+
+	if(in_batch)
+		element_(array.size()-1);
 }
 
 } // namespace GL