X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fvertexarray.cpp;h=a4dffbb7bae4876af7c9535a1f965e8431b64f7b;hp=5674bbe0ddda48472cc0423b5230fe754710b3fc;hb=b59c47a7ed2ed3f69a3349a2d76ef02891f0c685;hpb=9dc2c20e8c7ac91d932b12492591b65786e24b0f

diff --git a/source/vertexarray.cpp b/source/vertexarray.cpp
index 5674bbe0..a4dffbb7 100644
--- a/source/vertexarray.cpp
+++ b/source/vertexarray.cpp
@@ -135,7 +135,7 @@ void VertexArray::apply(bool use_legacy) const
 	if(!set_current(this) && !dirty)
 		return;
 
-	Buffer *vbuf = get_buffer();
+	const Buffer *vbuf = get_buffer();
 	Bind _bind_vbuf(vbuf, ARRAY_BUFFER);
 	if(vbuf && dirty)
 		update_buffer();
@@ -252,6 +252,27 @@ VertexArray::Array::Array():
 VertexArray::Loader::Loader(VertexArray &a):
 	VertexArrayBuilder(a)
 {
+	add("vertex", static_cast<void (Loader::*)(float, float)>(&Loader::vertex));
+	add("vertex", static_cast<void (Loader::*)(float, float, float)>(&Loader::vertex));
+	add("vertex", static_cast<void (Loader::*)(float, float, float, float)>(&Loader::vertex));
+	add("normal", static_cast<void (Loader::*)(float, float, float)>(&Loader::normal));
+	add("texcoord", static_cast<void (Loader::*)(float)>(&Loader::texcoord));
+	add("texcoord", static_cast<void (Loader::*)(float, float)>(&Loader::texcoord));
+	add("texcoord", static_cast<void (Loader::*)(float, float, float)>(&Loader::texcoord));
+	add("texcoord", static_cast<void (Loader::*)(float, float, float, float)>(&Loader::texcoord));
+	add("multitexcoord", static_cast<void (Loader::*)(unsigned, float)>(&Loader::multitexcoord));
+	add("multitexcoord", static_cast<void (Loader::*)(unsigned, float, float)>(&Loader::multitexcoord));
+	add("multitexcoord", static_cast<void (Loader::*)(unsigned, float, float, float)>(&Loader::multitexcoord));
+	add("multitexcoord", static_cast<void (Loader::*)(unsigned, float, float, float, float)>(&Loader::multitexcoord));
+	add("color", static_cast<void (Loader::*)(float, float, float)>(&Loader::color));
+	add("color", static_cast<void (Loader::*)(float, float, float, float)>(&Loader::color));
+	add("attrib", static_cast<void (Loader::*)(unsigned, float)>(&Loader::attrib));
+	add("attrib", static_cast<void (Loader::*)(unsigned, float, float)>(&Loader::attrib));
+	add("attrib", static_cast<void (Loader::*)(unsigned, float, float, float)>(&Loader::attrib));
+	add("attrib", static_cast<void (Loader::*)(unsigned, float, float, float, float)>(&Loader::attrib));
+	add("tangent", static_cast<void (Loader::*)(float, float, float)>(&Loader::tangent));
+	add("binormal", static_cast<void (Loader::*)(float, float, float)>(&Loader::binormal));
+
 	add("vertex2",   static_cast<void (Loader::*)(float, float)>(&Loader::vertex));
 	add("vertex3",   static_cast<void (Loader::*)(float, float, float)>(&Loader::vertex));
 	add("vertex4",   static_cast<void (Loader::*)(float, float, float, float)>(&Loader::vertex));