Merge pull request #86 from blackberry-gaming/next-sgrenier

Next sgrenier

gameplay/res/shaders/bumped-specular.vsh

@@ -59,7 +59,7 @@ vec4 getPosition()
     skinPosition(blendWeight, matrixIndex);
 
     blendWeight = a_blendWeights[3];
-    matrixIndex = int(a_blendIndices[2]) * 3;
+    matrixIndex = int(a_blendIndices[3]) * 3;
     skinPosition(blendWeight, matrixIndex);
 
     return _skinnedPosition;    
@@ -96,7 +96,7 @@ vec3 getTangentSpaceVector(vec3 vector)
     skinTangentSpaceVector(vector, blendWeight, matrixIndex);
 
     blendWeight = a_blendWeights[3];
-    matrixIndex = int(a_blendIndices[2]) * 3;
+    matrixIndex = int(a_blendIndices[3]) * 3;
     skinTangentSpaceVector(vector, blendWeight, matrixIndex);
 
     return _skinnedNormal;

gameplay/res/shaders/bumped.vsh

@@ -56,7 +56,7 @@ vec4 getPosition()
     skinPosition(blendWeight, matrixIndex);
 
     blendWeight = a_blendWeights[3];
-    matrixIndex = int(a_blendIndices[2]) * 3;
+    matrixIndex = int(a_blendIndices[3]) * 3;
     skinPosition(blendWeight, matrixIndex);
 
     return _skinnedPosition;    
@@ -93,7 +93,7 @@ vec3 getTangentSpaceVector(vec3 vector)
     skinTangentSpaceVector(vector, blendWeight, matrixIndex);
 
     blendWeight = a_blendWeights[3];
-    matrixIndex = int(a_blendIndices[2]) * 3;
+    matrixIndex = int(a_blendIndices[3]) * 3;
     skinTangentSpaceVector(vector, blendWeight, matrixIndex);
 
     return _skinnedNormal;

gameplay/res/shaders/colored-specular.vsh

@@ -57,7 +57,7 @@ vec4 getPosition()
     skinPosition(blendWeight, matrixIndex);
 
     blendWeight = a_blendWeights[3];
-    matrixIndex = int(a_blendIndices[2]) * 3;
+    matrixIndex = int(a_blendIndices[3]) * 3;
     skinPosition(blendWeight, matrixIndex);
 
     return _skinnedPosition;    
@@ -94,7 +94,7 @@ vec3 getNormal()
     skinNormal(blendWeight, matrixIndex);
 
     blendWeight = a_blendWeights[3];
-    matrixIndex = int(a_blendIndices[2]) * 3;
+    matrixIndex = int(a_blendIndices[3]) * 3;
     skinNormal(blendWeight, matrixIndex);
 
     return _skinnedNormal;

gameplay/res/shaders/colored.vsh

@@ -53,7 +53,7 @@ vec4 getPosition()
     skinPosition(blendWeight, matrixIndex);
 
     blendWeight = a_blendWeights[3];
-    matrixIndex = int(a_blendIndices[2]) * 3;
+    matrixIndex = int(a_blendIndices[3]) * 3;
     skinPosition(blendWeight, matrixIndex);
 
     return _skinnedPosition;    
@@ -90,7 +90,7 @@ vec3 getNormal()
     skinNormal(blendWeight, matrixIndex);
 
     blendWeight = a_blendWeights[3];
-    matrixIndex = int(a_blendIndices[2]) * 3;
+    matrixIndex = int(a_blendIndices[3]) * 3;
     skinNormal(blendWeight, matrixIndex);
 
     return _skinnedNormal;

gameplay/res/shaders/diffuse-specular.vsh

@@ -58,7 +58,7 @@ vec4 getPosition()
     skinPosition(blendWeight, matrixIndex);
 
     blendWeight = a_blendWeights[3];
-    matrixIndex = int(a_blendIndices[2]) * 3;
+    matrixIndex = int(a_blendIndices[3]) * 3;
     skinPosition(blendWeight, matrixIndex);
 
     return _skinnedPosition;    
@@ -95,7 +95,7 @@ vec3 getNormal()
     skinNormal(blendWeight, matrixIndex);
 
     blendWeight = a_blendWeights[3];
-    matrixIndex = int(a_blendIndices[2]) * 3;
+    matrixIndex = int(a_blendIndices[3]) * 3;
     skinNormal(blendWeight, matrixIndex);
 
     return _skinnedNormal;

gameplay/res/shaders/diffuse.vsh

@@ -56,7 +56,7 @@ vec4 getPosition()
     skinPosition(blendWeight, matrixIndex);
 
     blendWeight = a_blendWeights[3];
-    matrixIndex = int(a_blendIndices[2]) * 3;
+    matrixIndex = int(a_blendIndices[3]) * 3;
     skinPosition(blendWeight, matrixIndex);
 
     return _skinnedPosition;    
@@ -93,7 +93,7 @@ vec3 getNormal()
     skinNormal(blendWeight, matrixIndex);
 
     blendWeight = a_blendWeights[3];
-    matrixIndex = int(a_blendIndices[2]) * 3;
+    matrixIndex = int(a_blendIndices[3]) * 3;
     skinNormal(blendWeight, matrixIndex);
 
     return _skinnedNormal;

gameplay/res/shaders/textured.vsh

@@ -51,7 +51,7 @@ vec4 getPosition()
     skinPosition(blendWeight, matrixIndex);
 
     blendWeight = a_blendWeights[3];
-    matrixIndex = int(a_blendIndices[2]) * 3;
+    matrixIndex = int(a_blendIndices[3]) * 3;
     skinPosition(blendWeight, matrixIndex);
 
     return _skinnedPosition;