X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fvertexarray.cpp;h=67a90ef7e2ea6810de672903d64a44674d35fe67;hb=e1d07383b29e8581230b50f45606192d1f21f5dd;hp=e3aef7a0eea16cd38302d068535edaa255c56028;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266;p=libs%2Fgl.git

diff --git a/source/core/vertexarray.cpp b/source/core/vertexarray.cpp
index e3aef7a0..67a90ef7 100644
--- a/source/core/vertexarray.cpp
+++ b/source/core/vertexarray.cpp
@@ -20,7 +20,7 @@ void VertexArray::reset(const VertexFormat &f)
 {
 	clear();
 	format = f;
-	stride = get_stride(format);
+	stride = format.stride();
 }
 
 void VertexArray::clear()
@@ -70,12 +70,20 @@ 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));
 
 	add("vertex2",   static_cast<void (Loader::*)(float, float)>(&Loader::vertex));
 	add("vertex3",   static_cast<void (Loader::*)(float, float, float)>(&Loader::vertex));
@@ -91,10 +99,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));
 }