X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fvertexarray.cpp;h=347e42595a1387bf7630a87344a6dc96f7425ac3;hp=712e76e6011c2ce8aec1e70668d4e8f0ec76f21b;hb=86721a55699193e63c76e8a0a7b0ced0416c1cce;hpb=68b74ce23dd20822b07d79dc25aa0a0a19ef27a5

diff --git a/source/core/vertexarray.cpp b/source/core/vertexarray.cpp
index 712e76e6..347e4259 100644
--- a/source/core/vertexarray.cpp
+++ b/source/core/vertexarray.cpp
@@ -74,9 +74,16 @@ VertexArray::Loader::Loader(VertexArray &a):
 	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));
@@ -95,8 +102,13 @@ VertexArray::Loader::Loader(VertexArray &a):
 	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));
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 	add("tangent3",  static_cast<void (Loader::*)(float, float, float)>(&Loader::tangent));
 	add("binormal3", static_cast<void (Loader::*)(float, float, float)>(&Loader::binormal));
+	add("tangent", static_cast<void (Loader::*)(float, float, float)>(&Loader::tangent));
+	add("binormal", static_cast<void (Loader::*)(float, float, float)>(&Loader::binormal));
+#pragma GCC diagnostic pop
 }
 
 } // namespace GL