[runtimes] Fixed owl example project, export and runtime scripts

The owl example project was not keying the control bone, leading to incorrect additive blending. The export.sh and runtimes.sh script in example/export did not account for the folder structure change in spine-ts.
Libnezz · Sep 13, 2021 · 67c0d39 · 67c0d39
1 parent 31c2f4a
commit 67c0d39
Show file tree

Hide file tree

Showing 342 changed files with 4,564 additions and 6,139 deletions.
diff --git a/examples/alien/export/alien-ess.json b/examples/alien/export/alien-ess.json
@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "zgiHK9o7sFk",
-	"spine": "4.0.07",
+	"spine": "4.0.31",
 	"x": -191.3,
 	"y": -4.51,
 	"width": 365.79,

diff --git a/examples/alien/export/alien-ess.skel b/examples/alien/export/alien-ess.skel
diff --git a/examples/alien/export/alien-pro.json b/examples/alien/export/alien-pro.json
@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "tnPDOU8oIi0",
-	"spine": "4.0.07",
+	"spine": "4.0.31",
 	"x": -191.3,
 	"y": -4.51,
 	"width": 368.26,

diff --git a/examples/alien/export/alien-pro.skel b/examples/alien/export/alien-pro.skel
diff --git a/examples/coin/export/coin-pma.png b/examples/coin/export/coin-pma.png
diff --git a/examples/coin/export/coin-pro.json b/examples/coin/export/coin-pro.json
@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "svidebPqqeg",
-	"spine": "4.0.07",
+	"spine": "4.0.31",
 	"x": -152.5,
 	"y": -151,
 	"width": 305,

diff --git a/examples/coin/export/coin-pro.skel b/examples/coin/export/coin-pro.skel
diff --git a/examples/coin/export/coin.png b/examples/coin/export/coin.png
diff --git a/examples/dragon/export/dragon-ess.json b/examples/dragon/export/dragon-ess.json
@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "UIFpNNbbcQI",
-	"spine": "4.0.07",
+	"spine": "4.0.31",
 	"x": -366.31,
 	"y": -286.62,
 	"width": 660.39,

diff --git a/examples/dragon/export/dragon-ess.skel b/examples/dragon/export/dragon-ess.skel
diff --git a/examples/dragon/export/dragon-pma.png b/examples/dragon/export/dragon-pma.png
diff --git a/examples/dragon/export/dragon-pma_2.png b/examples/dragon/export/dragon-pma_2.png
diff --git a/examples/dragon/export/dragon_2.png b/examples/dragon/export/dragon_2.png
diff --git a/examples/export/export.sh b/examples/export/export.sh
@@ -121,16 +121,20 @@ echo "Exporting assets..."
 -i ../vine/images -o ../vine/export -n vine -p atlas-1.0.json \
 -i ../vine/images -o ../vine/export -n vine-pma -p atlas-1.0-pma.json \
 \
--i ../owl/owl-pro.spine -o ../owl/export -e json.json \
--i ../owl/owl-pro.spine -o ../owl/export -e binary.json \
--i ../owl/images -o ../owl/export -n owl -p atlas-0.5.json \
--i ../owl/images -o ../owl/export -n owl-pma -p atlas-0.5-pma.json \
-\
 -i ../windmill/windmill-ess.spine -o ../windmill/export -e json.json \
 -i ../windmill/windmill-ess.spine -o ../windmill/export -e binary.json \
 -i ../windmill/images -o ../windmill/export -n windmill -p atlas-0.5.json \
 -i ../windmill/images -o ../windmill/export -n windmill-pma -p atlas-0.5-pma.json
 
+# Owl needs separate export, as cleaning would kill keys in idle animation, which
+# would lead to incorrect additive animation blending.
+"$SPINE_EXE" \
+-u $version ${@:2} \
+-i ../owl/owl-pro.spine -o ../owl/export -e json.json \
+-i ../owl/owl-pro.spine -o ../owl/export -e binary.json \
+-i ../owl/images -o ../owl/export -n owl -p atlas-0.5.json \
+-i ../owl/images -o ../owl/export -n owl-pma -p atlas-0.5-pma.json \
+
 # Export Unity Assets
 UNITY_BASE_DIR=../spine-unity
 if [ -d "$UNITY_BASE_DIR" ]; then

diff --git a/examples/export/runtimes.sh b/examples/export/runtimes.sh
diff --git a/examples/goblins/export/goblins-ess.json b/examples/goblins/export/goblins-ess.json
@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "vsus27NzL88",
-	"spine": "4.0.07",
+	"spine": "4.0.31",
 	"x": -92.53,
 	"y": -5.3,
 	"width": 234.03,

diff --git a/examples/goblins/export/goblins-ess.skel b/examples/goblins/export/goblins-ess.skel
diff --git a/examples/goblins/export/goblins-pma.png b/examples/goblins/export/goblins-pma.png
diff --git a/examples/goblins/export/goblins-pro.json b/examples/goblins/export/goblins-pro.json
@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "PtTAK+zF95I",
-	"spine": "4.0.07",
+	"spine": "4.0.31",
 	"x": -134.12,
 	"y": -3.28,
 	"width": 266.94,

diff --git a/examples/goblins/export/goblins-pro.skel b/examples/goblins/export/goblins-pro.skel
diff --git a/examples/goblins/export/goblins.png b/examples/goblins/export/goblins.png
diff --git a/examples/hero/export/hero-ess.json b/examples/hero/export/hero-ess.json
@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "cJR8Fbsu8Hg",
-	"spine": "4.0.07",
+	"spine": "4.0.31",
 	"x": -87.83,
 	"y": 0.01,
 	"width": 319.3,

diff --git a/examples/hero/export/hero-ess.skel b/examples/hero/export/hero-ess.skel
diff --git a/examples/hero/export/hero-pma.png b/examples/hero/export/hero-pma.png
diff --git a/examples/hero/export/hero-pro.json b/examples/hero/export/hero-pro.json
@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "3ozYAtTiEh8",
-	"spine": "4.0.07",
+	"spine": "4.0.31",
 	"x": -85.7,
 	"y": -0.02,
 	"width": 321.77,

diff --git a/examples/hero/export/hero-pro.skel b/examples/hero/export/hero-pro.skel
diff --git a/examples/hero/export/hero.png b/examples/hero/export/hero.png
diff --git a/examples/mix-and-match/export/mix-and-match-pro.json b/examples/mix-and-match/export/mix-and-match-pro.json
@@ -1,7 +1,7 @@
 {
 "skeleton": {
-	"hash": "EedJfu7UJ/I",
-	"spine": "4.0.07",
+	"hash": "bR3EmyUwO+g",
+	"spine": "4.0.31",
 	"x": -240.58,
 	"y": -3.38,
 	"width": 410.36,
@@ -6643,7 +6643,7 @@
 				"translate": [
 					{},
 					{ "time": 0.2, "x": -13.37, "y": -33.42 },
-					{ "time": 0.5667, "x": 5.92, "y": 24.83, "curve": "stepped" },
+					{ "time": 0.5667, "x": 5.92, "y": 24.83 },
 					{ "time": 1.1667, "x": 5.92, "y": 24.83 },
 					{ "time": 1.4, "x": -3.11, "y": 35.48 },
 					{ "time": 2.3, "x": 12.15, "y": 12.12 },

diff --git a/examples/mix-and-match/export/mix-and-match-pro.skel b/examples/mix-and-match/export/mix-and-match-pro.skel
diff --git a/examples/owl/export/owl-pro.json b/examples/owl/export/owl-pro.json
@@ -1,7 +1,7 @@
 {
 "skeleton": {
-	"hash": "D48YMP6TYgI",
-	"spine": "4.0.07",
+	"hash": "5OTv2PhCedw",
+	"spine": "4.0.31",
 	"x": -644,
 	"y": -274,
 	"width": 1350.84,
@@ -696,6 +696,17 @@
 					{ "time": 6, "value": -4.1 },
 					{ "time": 6.6667 }
 				]
+			},
+			"control": {
+				"rotate": [
+					{}
+				],
+				"translate": [
+					{}
+				],
+				"scale": [
+					{}
+				]
 			}
 		}
 	},

diff --git a/examples/owl/export/owl-pro.skel b/examples/owl/export/owl-pro.skel
diff --git a/examples/owl/owl-pro.spine b/examples/owl/owl-pro.spine
diff --git a/examples/powerup/export/powerup-ess.json b/examples/powerup/export/powerup-ess.json
@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "oNeCFa8SiWU",
-	"spine": "4.0.07",
+	"spine": "4.0.31",
 	"x": -207.3,
 	"y": 119.41,
 	"width": 413.19,

diff --git a/examples/powerup/export/powerup-ess.skel b/examples/powerup/export/powerup-ess.skel
diff --git a/examples/powerup/export/powerup-pma.png b/examples/powerup/export/powerup-pma.png
diff --git a/examples/powerup/export/powerup-pro.json b/examples/powerup/export/powerup-pro.json
@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "1WHGXJIHCvk",
-	"spine": "4.0.07",
+	"spine": "4.0.31",
 	"x": -208.76,
 	"y": 119.41,
 	"width": 414.65,

diff --git a/examples/powerup/export/powerup-pro.skel b/examples/powerup/export/powerup-pro.skel
diff --git a/examples/powerup/export/powerup.png b/examples/powerup/export/powerup.png
diff --git a/examples/raptor/export/raptor-pma.png b/examples/raptor/export/raptor-pma.png
diff --git a/examples/raptor/export/raptor-pro.json b/examples/raptor/export/raptor-pro.json
@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "c1+xCfJH+TE",
-	"spine": "4.0.07",
+	"spine": "4.0.31",
 	"x": -809.16,
 	"y": -73.54,
 	"width": 1287.65,

diff --git a/examples/raptor/export/raptor-pro.skel b/examples/raptor/export/raptor-pro.skel
diff --git a/examples/raptor/export/raptor.png b/examples/raptor/export/raptor.png
diff --git a/examples/raptor/manual-maps/raptor-normals.png b/examples/raptor/manual-maps/raptor-normals.png
diff --git a/examples/raptor/manual-maps/raptor-rim-mask.png b/examples/raptor/manual-maps/raptor-rim-mask.png
diff --git a/examples/speedy/export/speedy-ess.json b/examples/speedy/export/speedy-ess.json
@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "Q9eFOmFPMXI",
-	"spine": "4.0.07",
+	"spine": "4.0.31",
 	"x": -95.43,
 	"y": -18.79,
 	"width": 196.03,

diff --git a/examples/speedy/export/speedy-ess.skel b/examples/speedy/export/speedy-ess.skel
diff --git a/examples/speedy/export/speedy-pma.png b/examples/speedy/export/speedy-pma.png
diff --git a/examples/speedy/export/speedy.png b/examples/speedy/export/speedy.png
diff --git a/examples/spineboy/export/spineboy-ess.json b/examples/spineboy/export/spineboy-ess.json
@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "lS/mQzJwi+I",
-	"spine": "4.0.07",
+	"spine": "4.0.31",
 	"x": -221.27,
 	"y": -8.57,
 	"width": 470.72,

diff --git a/examples/spineboy/export/spineboy-ess.skel b/examples/spineboy/export/spineboy-ess.skel
diff --git a/examples/spineboy/export/spineboy-pma.png b/examples/spineboy/export/spineboy-pma.png
diff --git a/examples/spineboy/export/spineboy-pro.json b/examples/spineboy/export/spineboy-pro.json
@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "IQgkYFQG8ng",
-	"spine": "4.0.07",
+	"spine": "4.0.31",
 	"x": -188.63,
 	"y": -7.94,
 	"width": 418.45,

diff --git a/examples/spineboy/export/spineboy-pro.skel b/examples/spineboy/export/spineboy-pro.skel
diff --git a/examples/spineboy/export/spineboy.png b/examples/spineboy/export/spineboy.png
diff --git a/examples/spinosaurus/export/spinosaurus-ess.json b/examples/spinosaurus/export/spinosaurus-ess.json
@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "Ytk7Zos6DR4",
-	"spine": "4.0.07",
+	"spine": "4.0.31",
 	"x": -840,
 	"y": -766.03,
 	"width": 1680,

diff --git a/examples/spinosaurus/export/spinosaurus-ess.skel b/examples/spinosaurus/export/spinosaurus-ess.skel
diff --git a/examples/stretchyman/export/stretchyman-pma.png b/examples/stretchyman/export/stretchyman-pma.png
diff --git a/examples/stretchyman/export/stretchyman-pro.json b/examples/stretchyman/export/stretchyman-pro.json
@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "F+EPhClYhR8",
-	"spine": "4.0.07",
+	"spine": "4.0.31",
 	"x": -100.47,
 	"y": -9.21,
 	"width": 260.65,

diff --git a/examples/stretchyman/export/stretchyman-pro.skel b/examples/stretchyman/export/stretchyman-pro.skel
diff --git a/examples/tank/export/tank-pma.png b/examples/tank/export/tank-pma.png
diff --git a/examples/tank/export/tank-pro.json b/examples/tank/export/tank-pro.json
@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "3P3VgYJ8Bxk",
-	"spine": "4.0.07",
+	"spine": "4.0.31",
 	"x": -5852.65,
 	"y": -348.5,
 	"width": 7202.61,

diff --git a/examples/tank/export/tank-pro.skel b/examples/tank/export/tank-pro.skel
diff --git a/examples/tank/export/tank.png b/examples/tank/export/tank.png
diff --git a/examples/vine/export/vine-pro.json b/examples/vine/export/vine-pro.json
@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "mROo4Xkf3Fs",
-	"spine": "4.0.07",
+	"spine": "4.0.31",
 	"x": -87.7,
 	"y": -1.71,
 	"width": 227.65,

diff --git a/examples/vine/export/vine-pro.skel b/examples/vine/export/vine-pro.skel
diff --git a/examples/windmill/export/windmill-ess.json b/examples/windmill/export/windmill-ess.json
@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "tBKgYacI7e4",
-	"spine": "4.0.07",
+	"spine": "4.0.31",
 	"x": -564.6,
 	"y": -335.4,
 	"width": 1124.2,

diff --git a/examples/windmill/export/windmill-ess.skel b/examples/windmill/export/windmill-ess.skel
diff --git a/examples/windmill/export/windmill-pma.png b/examples/windmill/export/windmill-pma.png
diff --git a/spine-as3/spine-as3-example/src/spineboy-ess.json b/spine-as3/spine-as3-example/src/spineboy-ess.json
@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "lS/mQzJwi+I",
-	"spine": "4.0.58-beta",
+	"spine": "4.0.31",
 	"x": -221.27,
 	"y": -8.57,
 	"width": 470.72,

diff --git a/spine-as3/spine-as3-example/src/spineboy.atlas b/spine-as3/spine-as3-example/src/spineboy.atlas
@@ -1,6 +1,7 @@
 spineboy.png
 	size: 1024, 256
 	filter: Linear, Linear
+	scale: 0.5
 crosshair
 	bounds: 813, 160, 45, 45
 eye-indifferent

diff --git a/spine-cocos2d-objc/Resources/coin-pro.json b/spine-cocos2d-objc/Resources/coin-pro.json
@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "svidebPqqeg",
-	"spine": "4.0.58-beta",
+	"spine": "4.0.31",
 	"x": -152.5,
 	"y": -151,
 	"width": 305,

diff --git a/spine-cocos2d-objc/Resources/goblins-pro.json b/spine-cocos2d-objc/Resources/goblins-pro.json
@@ -1,7 +1,7 @@
 {
 "skeleton": {
 	"hash": "PtTAK+zF95I",
-	"spine": "4.0.58-beta",
+	"spine": "4.0.31",
 	"x": -134.12,
 	"y": -3.28,
 	"width": 266.94,