X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fvertexarray.cpp;h=da868c7963f83a81efed4b08bdb10cb118cf7c80;hb=70d9d2d28e5fe723c6b46894276e4c935f578e2d;hp=0703b1dd57a6d38ee0b3afd4ae98b49aea104172;hpb=ea7832c7c1ffab00cc1168bc8c41375fdd0eae86;p=libs%2Fgl.git

diff --git a/source/core/vertexarray.cpp b/source/core/vertexarray.cpp
index 0703b1dd..da868c79 100644
--- a/source/core/vertexarray.cpp
+++ b/source/core/vertexarray.cpp
@@ -70,13 +70,22 @@ VertexArray::Loader::Loader(VertexArray &a):
 	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("generic", static_cast<void (Loader::*)(unsigned, float)>(&Loader::generic));
+	add("generic", static_cast<void (Loader::*)(unsigned, float, float)>(&Loader::generic));
+	add("generic", static_cast<void (Loader::*)(unsigned, float, float, float)>(&Loader::generic));
+	add("generic", static_cast<void (Loader::*)(unsigned, float, float, float, float)>(&Loader::generic));
 	add("tangent", static_cast<void (Loader::*)(float, float, float)>(&Loader::tangent));
 	add("binormal", static_cast<void (Loader::*)(float, float, float)>(&Loader::binormal));
+	add("group", static_cast<void (Loader::*)(int)>(&Loader::group));
+	add("group", static_cast<void (Loader::*)(int, int)>(&Loader::group));
+	add("group", static_cast<void (Loader::*)(int, int, int)>(&Loader::group));
+	add("group", static_cast<void (Loader::*)(int, int, int, int)>(&Loader::group));
+	add("weight", static_cast<void (Loader::*)(float)>(&Loader::weight));
+	add("weight", static_cast<void (Loader::*)(float, float)>(&Loader::weight));
+	add("weight", static_cast<void (Loader::*)(float, float, float)>(&Loader::weight));
+	add("weight", static_cast<void (Loader::*)(float, float, float, float)>(&Loader::weight));
 
+	// Deprecated
 	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));
@@ -91,10 +100,10 @@ VertexArray::Loader::Loader(VertexArray &a):
 	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));
-	add("attrib2",   static_cast<void (Loader::*)(unsigned, float, float)>(&Loader::attrib));
-	add("attrib3",   static_cast<void (Loader::*)(unsigned, float, float, float)>(&Loader::attrib));
-	add("attrib4",   static_cast<void (Loader::*)(unsigned, float, float, float, float)>(&Loader::attrib));
+	add("generic1",  static_cast<void (Loader::*)(unsigned, float)>(&Loader::generic));
+	add("generic2",  static_cast<void (Loader::*)(unsigned, float, float)>(&Loader::generic));
+	add("generic3",  static_cast<void (Loader::*)(unsigned, float, float, float)>(&Loader::generic));
+	add("generic4",  static_cast<void (Loader::*)(unsigned, float, float, float, float)>(&Loader::generic));
 	add("tangent3",  static_cast<void (Loader::*)(float, float, float)>(&Loader::tangent));
 	add("binormal3", static_cast<void (Loader::*)(float, float, float)>(&Loader::binormal));
 }