Change the vertex group attribute to be an integer vector

diff --git a/shaderlib/msp_interface.glsl b/shaderlib/msp_interface.glsl
index 959f9ba55b31742662bbd088c4a11c80df5165fd..860b0c794d23a4b6edd0bd61859f8e2f1dfd82ae 100644 (file)
--- a/shaderlib/msp_interface.glsl
+++ b/shaderlib/msp_interface.glsl
@@ -43,7 +43,7 @@ layout(location=0) in vec4 vertex;
 layout(location=1) in vec4 color;
 layout(location=2) in vec3 normal;
 layout(location=3) in vec3 tangent;
 layout(location=1) in vec4 color;
 layout(location=2) in vec3 normal;
 layout(location=3) in vec3 tangent;

-layout(location=4) in vec4 group;
+layout(location=4) in ivec4 group;

 layout(location=5) in vec4 weight;
 layout(location=6) in vec4 texcoord;
 layout(location=7) in vec4 texcoord1;
 layout(location=5) in vec4 weight;
 layout(location=6) in vec4 texcoord;
 layout(location=7) in vec4 texcoord1;

diff --git a/source/core/vertexformat.h b/source/core/vertexformat.h
index 132d0b95a88a0b36411b70a55ade9a48c5c19c15..68c3e4c9a38828f42cba32729dae126ee3f75187 100644 (file)
--- a/source/core/vertexformat.h
+++ b/source/core/vertexformat.h
@@ -40,10 +40,10 @@ enum VertexAttribute
        COLOR4 = 0x05C4,
        NORMAL3 = 0x09C3,
        TANGENT3 = 0x0DC3,
        COLOR4 = 0x05C4,
        NORMAL3 = 0x09C3,
        TANGENT3 = 0x0DC3,

-       GROUP1 = 0x11C1,
-       GROUP2 = 0x11C2,
-       GROUP3 = 0x11C3,
-       GROUP4 = 0x11C4,
+       GROUP1 = 0x10C9,
+       GROUP2 = 0x10CA,
+       GROUP3 = 0x10CB,
+       GROUP4 = 0x10CC,

        WEIGHT1 = 0x15C1,
        WEIGHT2 = 0x15C2,
        WEIGHT3 = 0x15C3,
        WEIGHT1 = 0x15C1,
        WEIGHT2 = 0x15C2,
        WEIGHT3 = 0x15C3,