Merge branch '3.6' into 3.7-beta

CHANGELOG.md

@@ -156,6 +156,7 @@
  * Fixed renderer to work with 3.6 changes
  * Added support for two color tinting. Use the new `TwoColorPolygonBatch` together with `SkeletonRenderer`
  * Added support for clipping. See `SkeletonClipper`. Used automatically by `SkeletonRenderer`. Does not work when using a `SpriteBatch` with `SkeletonRenderer`. Use `PolygonSpriteBatch` or `TwoColorPolygonBatch` instead.
+ * Added `VertexEffect` interface, instances of which can be set on `SkeletonRenderer`. Allows to modify vertices before submitting them to GPU. See `SwirlEffect`, `JitterEffect` and `VertexEffectTest`.
 
 ## Lua
  * **Breaking changes**

spine-libgdx/spine-libgdx-tests/src/com/esotericsoftware/spine/VertexEffectTest.java

@@ -80,7 +80,7 @@ public class VertexEffectTest extends ApplicationAdapter {
 		swirl = new SwirlEffect(400);
 		swirl.setCenter(0, 200);
 		renderer.setVertexEffect(swirl);
-		renderer.setVertexEffect(new JitterEffect(10, 10));
+		// renderer.setVertexEffect(new JitterEffect(10, 10));
 	}
 
 	public void render () {

spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonRenderer.java

@@ -55,6 +55,11 @@ public class SkeletonRenderer {
 	private final SkeletonClipping clipper = new SkeletonClipping();
 	private VertexEffect vertexEffect;
 	private final Vector2 temp = new Vector2();
+	private final Vector2 temp2 = new Vector2();
+	private final Color temp3 = new Color();
+	private final Color temp4 = new Color();
+	private final Color temp5 = new Color();
+	private final Color temp6 = new Color();
 
 	public void draw (Batch batch, Skeleton skeleton) {
 		VertexEffect vertexEffect = this.vertexEffect;
@@ -84,7 +89,7 @@ public class SkeletonRenderer {
 					vertices[v + 2] = uvs[u + 1];
 				}
 
-				if (vertexEffect != null) applyVertexEffect(vertices, 20, 5);
+				if (vertexEffect != null) applyVertexEffect(vertices, 20, 5, c, 0);
 
 				BlendMode blendMode = slot.data.getBlendMode();
 				batch.setBlendFunction(blendMode.getSource(premultipliedAlpha), blendMode.getDest());
@@ -132,7 +137,12 @@ public class SkeletonRenderer {
 
 	@SuppressWarnings("null")
 	public void draw (PolygonSpriteBatch batch, Skeleton skeleton) {
-		Vector2 temp = this.temp;
+		Vector2 tempPos = this.temp;
+		Vector2 tempUv = this.temp2;
+		Color tempLight = this.temp3;
+		Color tempDark = this.temp4;
+		Color temp5 = this.temp5;
+		Color temp6 = this.temp6;
 		VertexEffect vertexEffect = this.vertexEffect;
 		if (vertexEffect != null) vertexEffect.begin(skeleton);
 
@@ -219,20 +229,26 @@ public class SkeletonRenderer {
 					clipper.clipTriangles(vertices, verticesLength, triangles, triangles.length, uvs, c, 0, false);
 					FloatArray clippedVertices = clipper.getClippedVertices();
 					ShortArray clippedTriangles = clipper.getClippedTriangles();
-					if (vertexEffect != null) applyVertexEffect(clippedVertices.items, clippedVertices.size, 5);
+					if (vertexEffect != null) applyVertexEffect(clippedVertices.items, clippedVertices.size, 5, c, 0);
 					batch.draw(texture, clippedVertices.items, 0, clippedVertices.size, clippedTriangles.items, 0,
 						clippedTriangles.size);
 				} else {
 					if (vertexEffect != null) {
+						temp5.set(NumberUtils.floatToIntColor(c));
+						temp6.set(0);
 						for (int v = 0, u = 0; v < verticesLength; v += 5, u += 2) {
-							temp.x = vertices[v];
+							tempPos.x = vertices[v];
-							temp.y = vertices[v + 1];
+							tempPos.y = vertices[v + 1];
-							vertexEffect.transform(temp);
+							tempLight.set(temp5);
-							vertices[v] = temp.x;
+							tempDark.set(temp6);
-							vertices[v + 1] = temp.y;
+							tempUv.x = uvs[u];
-							vertices[v + 2] = c;
+							tempUv.y = uvs[u + 1];							
-							vertices[v + 3] = uvs[u];
+							vertexEffect.transform(tempPos, tempUv, tempLight, tempDark);
-							vertices[v + 4] = uvs[u + 1];
+							vertices[v] = tempPos.x;
+							vertices[v + 1] = tempPos.y;
+							vertices[v + 2] = tempLight.toFloatBits();
+							vertices[v + 3] = tempUv.x;
+							vertices[v + 4] = tempUv.y;
 						}
 					} else {
 						for (int v = 2, u = 0; v < verticesLength; v += 5, u += 2) {
@@ -253,7 +269,12 @@ public class SkeletonRenderer {
 
 	@SuppressWarnings("null")
 	public void draw (TwoColorPolygonBatch batch, Skeleton skeleton) {
-		Vector2 temp = this.temp;
+		Vector2 tempPos = this.temp;
+		Vector2 tempUv = this.temp2;
+		Color tempLight = this.temp3;
+		Color tempDark = this.temp4;
+		Color temp5 = this.temp5;
+		Color temp6 = this.temp6;
 		VertexEffect vertexEffect = this.vertexEffect;
 		if (vertexEffect != null) vertexEffect.begin(skeleton);
 
@@ -344,21 +365,27 @@ public class SkeletonRenderer {
 					clipper.clipTriangles(vertices, verticesLength, triangles, triangles.length, uvs, light, dark, true);
 					FloatArray clippedVertices = clipper.getClippedVertices();
 					ShortArray clippedTriangles = clipper.getClippedTriangles();
-					if (vertexEffect != null) applyVertexEffect(clippedVertices.items, clippedVertices.size, 6);
+					if (vertexEffect != null) applyVertexEffect(clippedVertices.items, clippedVertices.size, 6, light, dark);
 					batch.draw(texture, clippedVertices.items, 0, clippedVertices.size, clippedTriangles.items, 0,
 						clippedTriangles.size);
 				} else {
 					if (vertexEffect != null) {
+						temp5.set(NumberUtils.floatToIntColor(light));
+						temp6.set(NumberUtils.floatToIntColor(dark));
 						for (int v = 0, u = 0; v < verticesLength; v += 6, u += 2) {
-							temp.x = vertices[v];
+							tempPos.x = vertices[v];
-							temp.y = vertices[v + 1];
+							tempPos.y = vertices[v + 1];
-							vertexEffect.transform(temp);
+							tempLight.set(temp5);
-							vertices[v] = temp.x;
+							tempDark.set(temp6);
-							vertices[v + 1] = temp.y;
+							tempUv.x = uvs[u];
-							vertices[v + 2] = light;
+							tempUv.y = uvs[u + 1];				
-							vertices[v + 3] = dark;
+							vertexEffect.transform(tempPos, tempUv, tempLight, tempDark);
-							vertices[v + 4] = uvs[u];
+							vertices[v] = tempPos.x;
-							vertices[v + 5] = uvs[u + 1];
+							vertices[v + 1] = tempPos.y;
+							vertices[v + 2] = tempLight.toFloatBits();
+							vertices[v + 3] = tempDark.toFloatBits();
+							vertices[v + 4] = tempUv.x;
+							vertices[v + 5] = tempUv.y;
 						}
 					} else {
 						for (int v = 2, u = 0; v < verticesLength; v += 6, u += 2) {
@@ -378,15 +405,47 @@ public class SkeletonRenderer {
 		if (vertexEffect != null) vertexEffect.end();
 	}
 
-	private void applyVertexEffect (float[] vertices, int verticesLength, int stride) {
+	private void applyVertexEffect (float[] vertices, int verticesLength, int stride, float light, float dark) {
+		Vector2 tempPos = this.temp;
+		Vector2 tempUv = this.temp2;
+		Color tempLight = this.temp3;
+		Color tempDark = this.temp4;
+		Color temp5 = this.temp5;
+		Color temp6 = this.temp6;
 		VertexEffect vertexEffect = this.vertexEffect;
-		Vector2 temp = this.temp;
+		temp5.set(NumberUtils.floatToIntColor(light));
+		temp6.set(NumberUtils.floatToIntColor(dark));
+		if (stride == 5) {
 			for (int v = 0; v < verticesLength; v += stride) {
-			temp.x = vertices[v];
+				tempPos.x = vertices[v];
-			temp.y = vertices[v + 1];
+				tempPos.y = vertices[v + 1];
-			vertexEffect.transform(temp);
+				tempUv.x = vertices[v + 3];
-			vertices[v] = temp.x;
+				tempUv.y = vertices[v + 4];
-			vertices[v + 1] = temp.y;
+				tempLight.set(temp5);
+				tempDark.set(temp6);
+				vertexEffect.transform(tempPos, tempUv, tempLight, tempDark);
+				vertices[v] = tempPos.x;
+				vertices[v + 1] = tempPos.y;
+				vertices[v + 2] = tempLight.toFloatBits();
+				vertices[v + 3] = tempUv.x;
+				vertices[v + 4] = tempUv.y;
+			}
+		} else {
+			for (int v = 0; v < verticesLength; v += stride) {
+				tempPos.x = vertices[v];
+				tempPos.y = vertices[v + 1];
+				tempUv.x = vertices[v + 4];
+				tempUv.y = vertices[v + 5];
+				tempLight.set(temp5);
+				tempDark.set(temp6);
+				vertexEffect.transform(tempPos, tempUv, tempLight, tempDark);
+				vertices[v] = tempPos.x;
+				vertices[v + 1] = tempPos.y;
+				vertices[v + 2] = tempLight.toFloatBits();
+				vertices[v + 3] = tempDark.toFloatBits();
+				vertices[v + 4] = tempUv.x;
+				vertices[v + 5] = tempUv.y;
+			}
 		}
 	}
 
@@ -409,7 +468,7 @@ public class SkeletonRenderer {
 	static public interface VertexEffect {
 		public void begin (Skeleton skeleton);
 
-		public void transform (Vector2 vertex);
+		public void transform (Vector2 position, Vector2 uv, Color color, Color darkColor);
 
 		public void end ();
 	}

spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/vertexeffects/JitterEffect.java

@@ -1,6 +1,7 @@
 
 package com.esotericsoftware.spine.vertexeffects;
 
+import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.math.MathUtils;
 import com.badlogic.gdx.math.Vector2;
 import com.esotericsoftware.spine.Skeleton;
@@ -17,9 +18,9 @@ public class JitterEffect implements VertexEffect {
 	public void begin (Skeleton skeleton) {
 	}
 
-	public void transform (Vector2 vertex) {
+	public void transform (Vector2 position, Vector2 uv, Color light, Color dark) {
-		vertex.x += MathUtils.randomTriangular(-x, y);
+		position.x += MathUtils.randomTriangular(-x, y);
-		vertex.y += MathUtils.randomTriangular(-x, y);
+		position.y += MathUtils.randomTriangular(-x, y);
 	}
 
 	public void end () {

spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/vertexeffects/SwirlEffect.java

@@ -1,6 +1,7 @@
 
 package com.esotericsoftware.spine.vertexeffects;
 
+import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.math.Interpolation;
 import com.badlogic.gdx.math.MathUtils;
 import com.badlogic.gdx.math.Vector2;
@@ -22,15 +23,15 @@ public class SwirlEffect implements VertexEffect {
 		worldY = skeleton.getY() + centerY;
 	}
 
-	public void transform (Vector2 vertex) {
+	public void transform (Vector2 position, Vector2 uv, Color light, Color dark) {
-		float x = vertex.x - worldX;
+		float x = position.x - worldX;
-		float y = vertex.y - worldY;
+		float y = position.y - worldY;
 		float dist = (float)Math.sqrt(x * x + y * y);
 		if (dist < radius) {
 			float theta = interpolation.apply(0, angle, (radius - dist) / radius);
 			float cos = SpineUtils.cos(theta), sin = SpineUtils.sin(theta);
-			vertex.x = cos * x - sin * y + worldX;
+			position.x = cos * x - sin * y + worldX;
-			vertex.y = sin * x + cos * y + worldY;
+			position.y = sin * x + cos * y + worldY;
 		}
 	}
 

spine-ts/build/spine-webgl.d.ts

@@ -1019,6 +1019,13 @@ declare module spine {
         getMean(): number;
     }
 }
+declare module spine {
+    interface VertexEffect {
+        begin(skeleton: Skeleton): void;
+        transform(): any;
+        end(): any;
+    }
+}
 declare module spine {
     abstract class Attachment {
         name: string;