X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexarray.cpp;h=e5e8120432bb856ce7170eb6168e190b206d67ec;hb=485315ca65cb40f33253008a79b0933997bd74f5;hp=54de0c0d1d01beadef6228a8bb29fd7ab7a5e66f;hpb=85c82f93f4874bcf0b04332c9abb62cd2a5b181b;p=libs%2Fgl.git

diff --git a/source/vertexarray.cpp b/source/vertexarray.cpp
index 54de0c0d..e5e81204 100644
--- a/source/vertexarray.cpp
+++ b/source/vertexarray.cpp
@@ -1,12 +1,6 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007-2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include "arb_vertex_program.h"
 #include "buffer.h"
+#include "error.h"
 #include "extension.h"
 #include "gl.h"
 #include "version_1_2.h"
@@ -82,7 +76,7 @@ void VertexArray::reset(const VertexFormat &f)
 void VertexArray::apply() const
 {
 	if(format.empty())
-		throw InvalidState("Trying to apply a vertex array with no data");
+		throw invalid_operation("VertexArray::apply");
 
 	if(vbuf)
 	{
@@ -162,6 +156,7 @@ void VertexArray::apply() const
 				if(i>3 || active_tex)
 					glClientActiveTexture(GL_TEXTURE0+(i-3));
 				glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+				active_tex = i-3;
 			}
 			else
 				glDisableVertexAttribArrayARB(i-11);
@@ -228,6 +223,10 @@ VertexArray::Loader::Loader(VertexArray &a):
 	add("texcoord2", static_cast<void (Loader::*)(float, float)>(&Loader::texcoord));
 	add("texcoord3", static_cast<void (Loader::*)(float, float, float)>(&Loader::texcoord));
 	add("texcoord4", static_cast<void (Loader::*)(float, float, float, float)>(&Loader::texcoord));
+	add("multitexcoord1", static_cast<void (Loader::*)(unsigned, float)>(&Loader::multitexcoord));
+	add("multitexcoord2", static_cast<void (Loader::*)(unsigned, float, float)>(&Loader::multitexcoord));
+	add("multitexcoord3", static_cast<void (Loader::*)(unsigned, float, float, float)>(&Loader::multitexcoord));
+	add("multitexcoord4", static_cast<void (Loader::*)(unsigned, float, float, float, float)>(&Loader::multitexcoord));
 	add("color3",    static_cast<void (Loader::*)(float, float, float)>(&Loader::color));
 	add("color4",    static_cast<void (Loader::*)(float, float, float, float)>(&Loader::color));
 	add("attrib1",   static_cast<void (Loader::*)(unsigned, float)>(&Loader::attrib));
@@ -236,27 +235,5 @@ VertexArray::Loader::Loader(VertexArray &a):
 	add("attrib4",   static_cast<void (Loader::*)(unsigned, float, float, float, float)>(&Loader::attrib));
 }
 
-
-void array_element(int i)
-{
-	glArrayElement(i);
-}
-
-void draw_arrays(PrimitiveType mode, int first, unsigned count)
-{
-	glDrawArrays(mode, first, count);
-}
-
-void draw_elements(PrimitiveType mode, unsigned count, DataType type, const void *indices)
-{
-	glDrawElements(mode, count, type, indices);
-}
-
-void draw_range_elements(PrimitiveType mode, unsigned low, unsigned high, unsigned count, DataType type, const void *indices)
-{
-	static RequireVersion _ver(1, 2);
-	glDrawRangeElements(mode, low, high, count, type, indices);
-}
-
 } // namespace GL
 } // namespace Msp