X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fprimitivebuilder.cpp;h=dd869908d9240df76b2f48a2308a0396613a35ad;hp=42e9d39cbb71c5bf1f56eaf53975bdd140fd607d;hb=d713e5391dc5d85759c7aab36f6df7a85c3d8eff;hpb=524515ae47ea553e8e1b9381c2027208f2d096db

diff --git a/source/primitivebuilder.cpp b/source/primitivebuilder.cpp
index 42e9d39c..dd869908 100644
--- a/source/primitivebuilder.cpp
+++ b/source/primitivebuilder.cpp
@@ -1,25 +1,22 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2008, 2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
+#include "error.h"
 #include "primitivebuilder.h"
 
+using namespace std;
+
 namespace Msp {
 namespace GL {
 
 PrimitiveBuilder::PrimitiveBuilder(VertexArray &a):
 	array(a),
 	vab(array),
-	in_batch(false)
+	in_batch(false),
+	offs(0)
 { }
 
 void PrimitiveBuilder::begin(PrimitiveType t)
 {
 	if(in_batch)
-		throw InvalidState("begin() already called");
+		throw invalid_operation("PrimitiveBuilder::begin");
 
 	type = t;
 	in_batch = true;
@@ -30,26 +27,33 @@ void PrimitiveBuilder::begin(PrimitiveType t)
 void PrimitiveBuilder::end()
 {
 	if(!in_batch)
-		throw InvalidState("end() called without begin()");
+		throw invalid_operation("PrimitiveBuilder::end");
 
 	in_batch = false;
 
 	end_();
 }
 
+void PrimitiveBuilder::offset(unsigned o)
+{
+	if(o>array.size())
+		throw out_of_range("PrimitiveBuilder::offset");
+	offs = o;
+}
+
 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);
+		throw invalid_operation("PrimitiveBuilder::element");
+	if(offs+i>=array.size())
+		throw out_of_range("PrimitiveBuilder::element");
+	element_(offs+i);
 }
 
 PrimitiveType PrimitiveBuilder::get_type() const
 {
 	if(!in_batch)
-		throw InvalidState("Not between begin() and end()");
+		throw invalid_operation("PrimitiveBuilder::get_type");
 	return type;
 }