diff --git a/examples/export/export.sh b/examples/export/export.sh index b36522781..07e803138 100755 --- a/examples/export/export.sh +++ b/examples/export/export.sh @@ -79,6 +79,11 @@ echo "Exporting assets..." -i ../mix-and-match/images -o ../mix-and-match/export -n mix-and-match -p atlas-0.5.json \ -i ../mix-and-match/images -o ../mix-and-match/export -n mix-and-match-pma -p atlas-0.5-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 ../powerup/powerup-ess.spine -o ../powerup/export -e json.json \ -i ../powerup/powerup-ess.spine -o ../powerup/export -e binary.json \ -i ../powerup/powerup-pro.spine -o ../powerup/export -e json.json \ @@ -127,14 +132,10 @@ echo "Exporting assets..." -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. +# spineboy-old.spine needs separate export, as its images are in an atlas. "$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 \ +-i ../../spine-libgdx/spine-libgdx-tests/assets/spineboy-old/spineboy-old.spine -o ../../spine-libgdx/spine-libgdx-tests/assets/spineboy-old -e json.json # Export Unity Assets UNITY_BASE_DIR=../spine-unity diff --git a/examples/owl/owl-pro.spine b/examples/owl/owl-pro.spine index 85defbf62..317b0c361 100755 Binary files a/examples/owl/owl-pro.spine and b/examples/owl/owl-pro.spine differ diff --git a/spine-libgdx/spine-libgdx-tests/assets/skin/skin.json b/spine-libgdx/spine-libgdx-tests/assets/skin/skin.json index d686f5763..80f12107d 100644 --- a/spine-libgdx/spine-libgdx-tests/assets/skin/skin.json +++ b/spine-libgdx/spine-libgdx-tests/assets/skin/skin.json @@ -1,5 +1,5 @@ { -com.badlogic.gdx.graphics.g2d.BitmapFont: { default-font: { file: com/badlogic/gdx/utils/arial-15.fnt } }, +com.badlogic.gdx.graphics.g2d.BitmapFont: { default-font: { file: com/badlogic/gdx/utils/lsans-15.fnt } }, com.badlogic.gdx.graphics.Color: { green: { a: 1, b: 0, g: 1, r: 0 }, white: { a: 1, b: 1, g: 1, r: 1 }, diff --git a/spine-libgdx/spine-libgdx-tests/assets/spineboy-old/spineboy-old.json b/spine-libgdx/spine-libgdx-tests/assets/spineboy-old/spineboy-old.json index aa4b25342..8f0efc842 100644 --- a/spine-libgdx/spine-libgdx-tests/assets/spineboy-old/spineboy-old.json +++ b/spine-libgdx/spine-libgdx-tests/assets/spineboy-old/spineboy-old.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "L56RnW+mbehRLXsZX4oI9CbSsr8", - "spine": "3.8.75", + "hash": "F9MaKeu7FF4", + "spine": "4.1.26-beta", "x": -88.95, "y": -2.26, "width": 161.04, @@ -53,12 +53,6 @@ { "name": "default", "attachments": { - "left arm": { - "left-arm": { "x": 15.11, "y": -0.44, "rotation": 33.85, "width": 35, "height": 29 } - }, - "right upper leg": { - "right-upper-leg": { "x": 23.03, "y": 0.26, "rotation": 101.14, "width": 44, "height": 70 } - }, "bb-head": { "bb-head": { "type": "boundingbox", @@ -67,30 +61,15 @@ "color": "60ef00ff" } }, - "left lower leg": { - "left-lower-leg": { "x": 24.56, "y": -1.92, "rotation": 105.76, "width": 49, "height": 64 } - }, - "right arm": { - "right-arm": { "x": 18.34, "y": -2.65, "rotation": 94.32, "width": 21, "height": 45 } - }, - "left shoulder": { - "left-shoulder": { "x": 23.74, "y": 0.12, "rotation": 62.01, "width": 34, "height": 53 } - }, - "neck": { - "neck": { "x": 9.43, "y": -3.66, "rotation": -100.16, "width": 34, "height": 28 } - }, - "head": { - "head": { "x": 53.95, "y": -5.75, "rotation": -86.9, "width": 121, "height": 132 } - }, "eyes": { "eyes": { "x": 28.94, "y": -32.92, "rotation": -86.9, "width": 34, "height": 27 }, "eyes-closed": { "x": 28.78, "y": -32.86, "rotation": -86.9, "width": 34, "height": 27 } }, - "right hand": { - "right-hand": { "x": 6.83, "y": 1.26, "rotation": 91.96, "width": 32, "height": 32 } + "head": { + "head": { "x": 53.95, "y": -5.75, "rotation": -86.9, "width": 121, "height": 132 } }, - "right shoulder": { - "right-shoulder": { "x": 25.87, "y": 0.04, "rotation": 134.45, "width": 52, "height": 51 } + "left arm": { + "left-arm": { "x": 15.11, "y": -0.44, "rotation": 33.85, "width": 35, "height": 29 } }, "left foot": { "left-foot": { "x": 24.35, "y": 8.89, "rotation": 3.32, "width": 65, "height": 30 } @@ -98,20 +77,41 @@ "left hand": { "left-hand": { "x": 0.75, "y": 1.86, "rotation": 31.14, "width": 35, "height": 38 } }, + "left lower leg": { + "left-lower-leg": { "x": 24.56, "y": -1.92, "rotation": 105.76, "width": 49, "height": 64 } + }, + "left shoulder": { + "left-shoulder": { "x": 23.74, "y": 0.12, "rotation": 62.01, "width": 34, "height": 53 } + }, + "left upper leg": { + "left-upper-leg": { "x": 26.12, "y": -1.86, "rotation": 89.1, "width": 33, "height": 67 } + }, + "neck": { + "neck": { "x": 9.43, "y": -3.66, "rotation": -100.16, "width": 34, "height": 28 } + }, "pelvis": { "pelvis": { "x": -4.83, "y": 10.63, "width": 63, "height": 47 } }, - "right lower leg": { - "right-lower-leg": { "x": 23.28, "y": -2.59, "rotation": 111.84, "width": 51, "height": 64 } + "right arm": { + "right-arm": { "x": 18.34, "y": -2.65, "rotation": 94.32, "width": 21, "height": 45 } }, "right foot": { "right-foot": { "x": 19.03, "y": 8.47, "rotation": 1.53, "width": 67, "height": 30 } }, + "right hand": { + "right-hand": { "x": 6.83, "y": 1.26, "rotation": 91.96, "width": 32, "height": 32 } + }, + "right lower leg": { + "right-lower-leg": { "x": 23.28, "y": -2.59, "rotation": 111.84, "width": 51, "height": 64 } + }, + "right shoulder": { + "right-shoulder": { "x": 25.87, "y": 0.04, "rotation": 134.45, "width": 52, "height": 51 } + }, + "right upper leg": { + "right-upper-leg": { "x": 23.03, "y": 0.26, "rotation": 101.14, "width": 44, "height": 70 } + }, "torso": { "torso": { "x": 44.58, "y": -7.08, "rotation": -94.95, "width": 68, "height": 92 } - }, - "left upper leg": { - "left-upper-leg": { "x": 26.12, "y": -1.86, "rotation": 89.1, "width": 33, "height": 67 } } } } @@ -127,158 +127,140 @@ "head": { "rotate": [ {}, - { "time": 0.9615, "angle": -23.11 }, - { "time": 1.7856, "angle": -56.45 }, - { "time": 2.6098, "angle": 1.39 }, - { "time": 3.5713, "angle": 36.12 }, - { "time": 4.258, "angle": 1.24 }, - { "time": 5.2195, "angle": -37.13 }, - { "time": 5.9086, "angle": 2.07 }, - { "time": 6.9044, "angle": 34.72 }, - { "time": 7.7675, "angle": 360 } + { "time": 0.9615, "value": -23.11 }, + { "time": 1.7856, "value": -56.45 }, + { "time": 2.6098, "value": 1.39 }, + { "time": 3.5713, "value": 36.12 }, + { "time": 4.258, "value": 1.24 }, + { "time": 5.2195, "value": -37.13 }, + { "time": 5.9086, "value": 2.07 }, + { "time": 6.9044, "value": 34.72 }, + { "time": 7.7675 } ], "translate": [ - { "curve": 0.191, "c2": 0.41, "c3": 0.586, "c4": 0.76 }, + { + "curve": [ 0.105, 23.73, 0.322, 44, 0.105, -14.65, 0.322, -27.15 ] + }, { "time": 0.5494, "x": 57.89, "y": -35.72, - "curve": 0.39, - "c2": 0.54, - "c3": 0.633, - "c4": 0.73 + "curve": [ 0.71, 73.75, 0.81, 79.33, 0.71, -63.9, 0.81, -73.81 ] }, { "time": 0.9615, "x": 87.26, "y": -87.9, - "curve": 0.325, - "c2": 0.24, - "c3": 0.588, - "c4": 0.37 + "curve": [ 1.095, 73.25, 1.204, 65.66, 1.095, -94.31, 1.204, -97.79 ] }, { "time": 1.3736, "x": 28.89, "y": -114.62, - "curve": 0.383, - "c2": 0.23, - "c3": 0.736, - "c4": 0.56 + "curve": [ 1.531, 4.63, 1.677, -30.17, 1.531, -117.01, 1.677, -120.43 ] }, { "time": 1.7856, "x": -76.58, "y": -124.99, - "curve": 0.129, - "c2": 0.21, - "c3": 0.547, - "c4": 0.64 + "curve": [ 1.839, -92.92, 2.011, -126.37, 1.839, -114.94, 2.011, -94.37 ] }, { "time": 2.1977, "x": -154.38, "y": -77.14, - "curve": 0.354, - "c2": 0.49, - "c3": 0.73, - "c4": 0.9 + "curve": [ 2.344, -167.43, 2.499, -178.36, 2.344, -30.24, 2.499, 9 ] }, { "time": 2.6098, "x": -181.02, "y": 18.57, - "curve": 0.064, - "c2": 0.16, - "c3": 0.521, - "c4": 0.62 + "curve": [ 2.645, -176.12, 2.896, -162.02, 2.645, 36.19, 2.896, 86.84 ] + }, + { + "time": 3.1592, + "x": -150.38, + "y": 128.68, + "curve": [ 3.317, -129.32, 3.48, -112.08, 3.317, 138.36, 3.48, 146.28 ] + }, + { + "time": 3.5713, + "x": -112.08, + "y": 146.28, + "curve": [ 3.638, -112.08, 3.743, -89.83, 3.638, 146.28, 3.743, 130.15 ] }, - { "time": 3.1592, "x": -150.38, "y": 128.68, "curve": 0.382, "c2": 0.55, "c3": 0.778 }, - { "time": 3.5713, "x": -112.08, "y": 146.28, "curve": 0.242, "c3": 0.626, "c4": 0.46 }, { "time": 3.846, "x": -63.71, "y": 111.22, - "curve": 0.399, - "c2": 0.36, - "c3": 0.786, - "c4": 0.77 + "curve": [ 4.01, -58.39, 4.17, -52.34, 4.01, 70.62, 4.17, 24.39 ] }, { "time": 4.258, "x": -48.94, "y": -1.55, - "curve": 0.189, - "c2": 0.21, - "c3": 0.575, - "c4": 0.62 + "curve": [ 4.336, -57.92, 4.495, -75.45, 4.336, -20.53, 4.495, -57.59 ] + }, + { + "time": 4.6701, + "x": -91.7, + "y": -91.93, + "curve": [ 4.87, -118.27, 5.091, -142.8, 4.87, -110.08, 5.091, -126.83 ] }, - { "time": 4.6701, "x": -91.7, "y": -91.93, "curve": 0.363, "c2": 0.52, "c3": 0.766 }, { "time": 5.2195, "x": -142.8, "y": -126.83, - "curve": 0.228, - "c2": 0.35, - "c3": 0.594, - "c4": 0.76 + "curve": [ 5.282, -154.67, 5.383, -168.56, 5.282, -116.86, 5.383, -105.17 ] }, { "time": 5.4943, "x": -176.7, "y": -98.33, - "curve": 0.26, - "c2": 0.4, - "c3": 0.612, - "c4": 0.72 + "curve": [ 5.566, -171.6, 5.662, -167.52, 5.566, -68.62, 5.662, -44.85 ] }, { "time": 5.769, "x": -163.95, "y": -24.05, - "curve": 0.339, - "c2": 0.37, - "c3": 0.676, - "c4": 0.71 + "curve": [ 5.816, -158.85, 5.862, -154.17, 5.816, -11.19, 5.862, 0.64 ] + }, + { + "time": 5.9063, + "x": -150.17, + "y": 10.72, + "curve": [ 6.013, -121.06, 6.11, -102.45, 6.013, 32.19, 6.11, 45.92 ] }, - { "time": 5.9063, "x": -150.17, "y": 10.72, "curve": 0.388, "c2": 0.61, "c3": 0.742 }, { "time": 6.181, "x": -102.45, "y": 45.92, - "curve": 0.31, - "c2": 0.24, - "c3": 0.648, - "c4": 0.59 + "curve": [ 6.266, -90.82, 6.359, -73.86, 6.266, 51.8, 6.359, 60.36 ] }, { "time": 6.4557, "x": -54, "y": 70.4, - "curve": 0.326, - "c2": 0.29, - "c3": 0.664, - "c4": 0.63 + "curve": [ 6.545, -37.79, 6.638, -18.79, 6.545, 66.09, 6.638, 61.04 ] }, { "time": 6.7305, "x": 1.89, "y": 55.55, - "curve": 0.387, - "c2": 0.33, - "c3": 0.769, - "c4": 0.73 + "curve": [ 6.89, 12.58, 7.047, 25.53, 6.89, 49.14, 7.047, 41.38 ] }, { "time": 7.1425, "x": 34.27, "y": 36.14, - "curve": 0.206, - "c2": 0.28, - "c3": 0.596, - "c4": 0.68 + "curve": [ 7.227, 31.38, 7.388, 27.25, 7.227, 26.3, 7.388, 12.25 ] + }, + { + "time": 7.5546, + "x": 23.95, + "y": 1.01, + "curve": [ 7.708, 10.54, 7.867, 0, 7.708, 0.44, 7.867, 0 ] }, - { "time": 7.5546, "x": 23.95, "y": 1.01, "curve": 0.373, "c2": 0.56, "c3": 0.759 }, { "time": 7.9667 } ], "scale": [ @@ -334,10 +316,20 @@ "translate": [ { "x": -11.57, "y": -3.01 }, { "time": 0.2333, "x": -16.2, "y": -19.44 }, - { "time": 0.3333, "x": 7.67, "y": -8.49, "curve": 0.057, "c2": 0.07, "c3": 0.713 }, + { + "time": 0.3333, + "x": 7.67, + "y": -8.49, + "curve": [ 0.335, 8.21, 0.357, 15.39, 0.335, -7.54, 0.357, 5.02 ] + }, { "time": 0.3667, "x": 15.39, "y": 5.02 }, { "time": 0.4667, "x": -7.85, "y": 57.22 }, - { "time": 0.6, "x": -10.82, "y": 96.34, "curve": 0.241, "c2": -0.01 }, + { + "time": 0.6, + "x": -10.82, + "y": 96.34, + "curve": [ 0.632, -10.86, 0.733, -7.02, 0.632, 96.76, 0.733, 54.71 ] + }, { "time": 0.7333, "x": -7.02, "y": 54.71 }, { "time": 0.8, "x": -10.58, "y": 32.2 }, { "time": 0.9333, "x": -31.99, "y": 0.45 }, @@ -352,16 +344,16 @@ }, "left upper leg": { "rotate": [ - { "angle": 17.14 }, - { "time": 0.2333, "angle": 44.35 }, - { "time": 0.3333, "angle": 16.47 }, - { "time": 0.4, "angle": -9.88 }, - { "time": 0.4667, "angle": -11.42 }, - { "time": 0.5667, "angle": 23.47 }, - { "time": 0.7667, "angle": 71.83 }, - { "time": 0.9333, "angle": 65.53 }, - { "time": 1.0667, "angle": 51.01 }, - { "time": 1.3667, "angle": 17.14 } + { "value": 17.14 }, + { "time": 0.2333, "value": 44.35 }, + { "time": 0.3333, "value": 16.47 }, + { "time": 0.4, "value": -9.88 }, + { "time": 0.4667, "value": -11.42 }, + { "time": 0.5667, "value": 23.47 }, + { "time": 0.7667, "value": 71.83 }, + { "time": 0.9333, "value": 65.53 }, + { "time": 1.0667, "value": 51.01 }, + { "time": 1.3667, "value": 17.14 } ], "translate": [ { "x": -3, "y": -2.25, "curve": "stepped" }, @@ -376,15 +368,15 @@ }, "left lower leg": { "rotate": [ - { "angle": -16.25 }, - { "time": 0.2333, "angle": -52.21 }, - { "time": 0.4, "angle": 15.05 }, - { "time": 0.4667, "angle": -8.96 }, - { "time": 0.5667, "angle": -39.53 }, - { "time": 0.7667, "angle": -27.28 }, - { "time": 0.9333, "angle": -3.52 }, - { "time": 1.0667, "angle": -61.92 }, - { "time": 1.3667, "angle": -16.25 } + { "value": -16.25 }, + { "time": 0.2333, "value": -52.21 }, + { "time": 0.4, "value": 15.05 }, + { "time": 0.4667, "value": -8.96 }, + { "time": 0.5667, "value": -39.53 }, + { "time": 0.7667, "value": -27.28 }, + { "time": 0.9333, "value": -3.52 }, + { "time": 1.0667, "value": -61.92 }, + { "time": 1.3667, "value": -16.25 } ], "translate": [ { "curve": "stepped" }, @@ -399,16 +391,16 @@ }, "left foot": { "rotate": [ - { "angle": 0.34 }, - { "time": 0.2333, "angle": 6.2 }, - { "time": 0.3333, "angle": 14.73 }, - { "time": 0.4, "angle": -15.54 }, - { "time": 0.4333, "angle": -21.2 }, - { "time": 0.5667, "angle": -7.56 }, - { "time": 0.7667, "angle": -0.68 }, - { "time": 0.9333, "angle": -0.59 }, - { "time": 1.0667, "angle": 14.65 }, - { "time": 1.3667, "angle": 0.34 } + { "value": 0.34 }, + { "time": 0.2333, "value": 6.2 }, + { "time": 0.3333, "value": 14.73 }, + { "time": 0.4, "value": -15.54 }, + { "time": 0.4333, "value": -21.2 }, + { "time": 0.5667, "value": -7.56 }, + { "time": 0.7667, "value": -0.68 }, + { "time": 0.9333, "value": -0.59 }, + { "time": 1.0667, "value": 14.65 }, + { "time": 1.3667, "value": 0.34 } ], "translate": [ { "curve": "stepped" }, @@ -423,16 +415,20 @@ }, "right upper leg": { "rotate": [ - { "angle": 25.97 }, - { "time": 0.2333, "angle": 46.43 }, - { "time": 0.3333, "angle": 22.62 }, - { "time": 0.4, "angle": 2.13 }, - { "time": 0.4667, "angle": 0.05, "curve": 0, "c3": 0.638, "c4": 0.99 }, - { "time": 0.6, "angle": 65.55 }, - { "time": 0.7667, "angle": 64.93 }, - { "time": 0.9333, "angle": 41.08 }, - { "time": 1.0667, "angle": 66.26 }, - { "time": 1.3667, "angle": 25.97 } + { "value": 25.97 }, + { "time": 0.2333, "value": 46.43 }, + { "time": 0.3333, "value": 22.62 }, + { "time": 0.4, "value": 2.13 }, + { + "time": 0.4667, + "value": 0.05, + "curve": [ 0.467, 0.05, 0.552, 64.9 ] + }, + { "time": 0.6, "value": 65.55 }, + { "time": 0.7667, "value": 64.93 }, + { "time": 0.9333, "value": 41.08 }, + { "time": 1.0667, "value": 66.26 }, + { "time": 1.3667, "value": 25.97 } ], "translate": [ { "x": 5.75, "y": 0.61 }, @@ -450,15 +446,15 @@ }, "right lower leg": { "rotate": [ - { "angle": -27.46 }, - { "time": 0.2333, "angle": -64.04 }, - { "time": 0.4, "angle": -48.36 }, - { "time": 0.5667, "angle": -76.86 }, - { "time": 0.7667, "angle": -26.89 }, - { "time": 0.9, "angle": -18.98 }, - { "time": 0.9333, "angle": -14.19 }, - { "time": 1.0667, "angle": -80.45 }, - { "time": 1.3667, "angle": -27.46 } + { "value": -27.46 }, + { "time": 0.2333, "value": -64.04 }, + { "time": 0.4, "value": -48.36 }, + { "time": 0.5667, "value": -76.86 }, + { "time": 0.7667, "value": -26.89 }, + { "time": 0.9, "value": -18.98 }, + { "time": 0.9333, "value": -14.19 }, + { "time": 1.0667, "value": -80.45 }, + { "time": 1.3667, "value": -27.46 } ], "translate": [ { "curve": "stepped" }, @@ -473,19 +469,19 @@ }, "right foot": { "rotate": [ - { "angle": 1.08 }, - { "time": 0.2333, "angle": 16.03 }, - { "time": 0.3, "angle": 12.95 }, - { "time": 0.3333, "angle": 15.17 }, - { "time": 0.4, "angle": -14.71 }, - { "time": 0.4333, "angle": -12.86 }, - { "time": 0.4667, "angle": -19.18 }, - { "time": 0.5667, "angle": -15.82 }, - { "time": 0.6, "angle": -3.6 }, - { "time": 0.7667, "angle": -3.56 }, - { "time": 0.9333, "angle": 1.86 }, - { "time": 1.0667, "angle": 16.03 }, - { "time": 1.3667, "angle": 1.08 } + { "value": 1.08 }, + { "time": 0.2333, "value": 16.03 }, + { "time": 0.3, "value": 12.95 }, + { "time": 0.3333, "value": 15.17 }, + { "time": 0.4, "value": -14.71 }, + { "time": 0.4333, "value": -12.86 }, + { "time": 0.4667, "value": -19.18 }, + { "time": 0.5667, "value": -15.82 }, + { "time": 0.6, "value": -3.6 }, + { "time": 0.7667, "value": -3.56 }, + { "time": 0.9333, "value": 1.86 }, + { "time": 1.0667, "value": 16.03 }, + { "time": 1.3667, "value": 1.08 } ], "translate": [ { "curve": "stepped" }, @@ -500,14 +496,14 @@ }, "torso": { "rotate": [ - { "angle": -13.35 }, - { "time": 0.2333, "angle": -48.95 }, - { "time": 0.4333, "angle": -35.77 }, - { "time": 0.6, "angle": -4.59 }, - { "time": 0.7667, "angle": 14.61 }, - { "time": 0.9333, "angle": 15.74 }, - { "time": 1.0667, "angle": -32.45 }, - { "time": 1.3667, "angle": -13.35 } + { "value": -13.35 }, + { "time": 0.2333, "value": -48.95 }, + { "time": 0.4333, "value": -35.77 }, + { "time": 0.6, "value": -4.59 }, + { "time": 0.7667, "value": 14.61 }, + { "time": 0.9333, "value": 15.74 }, + { "time": 1.0667, "value": -32.45 }, + { "time": 1.3667, "value": -13.35 } ], "translate": [ { "x": -3.67, "y": 1.69, "curve": "stepped" }, @@ -522,15 +518,15 @@ }, "neck": { "rotate": [ - { "angle": 12.79 }, - { "time": 0.2333, "angle": 16.46 }, - { "time": 0.4, "angle": 26.49 }, - { "time": 0.6, "angle": 15.51 }, - { "time": 0.7667, "angle": 1.35 }, - { "time": 0.9333, "angle": 2.36 }, - { "time": 1.0667, "angle": 6.09 }, - { "time": 1.3, "angle": 21.24 }, - { "time": 1.3667, "angle": 12.79 } + { "value": 12.79 }, + { "time": 0.2333, "value": 16.46 }, + { "time": 0.4, "value": 26.49 }, + { "time": 0.6, "value": 15.51 }, + { "time": 0.7667, "value": 1.35 }, + { "time": 0.9333, "value": 2.36 }, + { "time": 1.0667, "value": 6.09 }, + { "time": 1.3, "value": 21.24 }, + { "time": 1.3667, "value": 12.79 } ], "translate": [ { "curve": "stepped" }, @@ -545,15 +541,15 @@ }, "head": { "rotate": [ - { "angle": 5.2 }, - { "time": 0.2333, "angle": 20.28 }, - { "time": 0.4, "angle": 15.28 }, - { "time": 0.6, "angle": -24.7 }, - { "time": 0.7667, "angle": -11.02 }, - { "time": 0.9333, "angle": -24.38 }, - { "time": 1.0667, "angle": 12 }, - { "time": 1.3, "angle": 4.86 }, - { "time": 1.3667, "angle": 5.2 } + { "value": 5.2 }, + { "time": 0.2333, "value": 20.28 }, + { "time": 0.4, "value": 15.28 }, + { "time": 0.6, "value": -24.7 }, + { "time": 0.7667, "value": -11.02 }, + { "time": 0.9333, "value": -24.38 }, + { "time": 1.0667, "value": 12 }, + { "time": 1.3, "value": 4.86 }, + { "time": 1.3667, "value": 5.2 } ], "translate": [ { "curve": "stepped" }, @@ -568,13 +564,24 @@ }, "left shoulder": { "rotate": [ - { "angle": 0.05, "curve": 0, "c3": 0.621 }, - { "time": 0.2333, "angle": 279.66, "curve": 0.218, "c2": 0.67, "c3": 0.661, "c4": 0.99 }, - { "time": 0.5, "angle": 62.27, "curve": 0.463, "c3": 0.764, "c4": 0.58 }, - { "time": 0.9333, "angle": 28.91 }, - { "time": 1.0667, "angle": -8.63 }, - { "time": 1.1667, "angle": -18.43 }, - { "time": 1.3667, "angle": 0.05 } + { + "value": 0.05, + "curve": [ 0, 0.05, 0.145, -80.34 ] + }, + { + "time": 0.2333, + "value": -80.34, + "curve": [ 0.291, 15.21, 0.41, 60.84 ] + }, + { + "time": 0.5, + "value": 62.27, + "curve": [ 0.701, 62.27, 0.831, 42.92 ] + }, + { "time": 0.9333, "value": 28.91 }, + { "time": 1.0667, "value": -8.63 }, + { "time": 1.1667, "value": -18.43 }, + { "time": 1.3667, "value": 0.05 } ], "translate": [ { "x": -1.77, "y": 0.57, "curve": "stepped" }, @@ -589,9 +596,9 @@ }, "left hand": { "rotate": [ - { "angle": 11.59, "curve": "stepped" }, - { "time": 0.9333, "angle": 11.59, "curve": "stepped" }, - { "time": 1.3667, "angle": 11.59 } + { "value": 11.59, "curve": "stepped" }, + { "time": 0.9333, "value": 11.59, "curve": "stepped" }, + { "time": 1.3667, "value": 11.59 } ], "translate": [ { "curve": "stepped" }, @@ -606,12 +613,12 @@ }, "left arm": { "rotate": [ - { "angle": 0.52 }, - { "time": 0.4333, "angle": 12.82 }, - { "time": 0.6, "angle": 47.56 }, - { "time": 0.9333, "angle": 12.82 }, - { "time": 1.1667, "angle": -6.5 }, - { "time": 1.3667, "angle": 0.52 } + { "value": 0.52 }, + { "time": 0.4333, "value": 12.82 }, + { "time": 0.6, "value": 47.56 }, + { "time": 0.9333, "value": 12.82 }, + { "time": 1.1667, "value": -6.5 }, + { "time": 1.3667, "value": 0.52 } ], "translate": [ { "curve": "stepped" }, @@ -626,13 +633,24 @@ }, "right shoulder": { "rotate": [ - { "angle": 43.82, "curve": 0, "c3": 0.621 }, - { "time": 0.2333, "angle": -8.74, "curve": 0.305, "c2": 0.58, "c3": 0.71, "c4": 0.97 }, - { "time": 0.5333, "angle": -208.03, "curve": 0.463, "c3": 0.764, "c4": 0.58 }, - { "time": 0.9333, "angle": -246.72 }, - { "time": 1.0667, "angle": -307.14 }, - { "time": 1.1667, "angle": 37.15 }, - { "time": 1.3667, "angle": 43.82 } + { + "value": 43.82, + "curve": [ 0, 43.82, 0.145, -8.74 ] + }, + { + "time": 0.2333, + "value": -8.74, + "curve": [ 0.325, 84.47, 0.446, 147.15 ] + }, + { + "time": 0.5333, + "value": 151.97, + "curve": [ 0.719, 151.97, 0.839, 129.53 ] + }, + { "time": 0.9333, "value": 113.28 }, + { "time": 1.0667, "value": 52.86 }, + { "time": 1.1667, "value": 37.15 }, + { "time": 1.3667, "value": 43.82 } ], "translate": [ { "x": -7.84, "y": 7.19, "curve": "stepped" }, @@ -647,11 +665,11 @@ }, "right arm": { "rotate": [ - { "angle": -4.03 }, - { "time": 0.6, "angle": 17.51 }, - { "time": 0.9333, "angle": -4.03 }, - { "time": 1.1667, "angle": -16.73 }, - { "time": 1.3667, "angle": -4.03 } + { "value": -4.03 }, + { "time": 0.6, "value": 17.51 }, + { "time": 0.9333, "value": -4.03 }, + { "time": 1.1667, "value": -16.73 }, + { "time": 1.3667, "value": -4.03 } ], "translate": [ { "curve": "stepped" }, @@ -666,9 +684,9 @@ }, "right hand": { "rotate": [ - { "angle": 22.92, "curve": "stepped" }, - { "time": 0.9333, "angle": 22.92, "curve": "stepped" }, - { "time": 1.3667, "angle": 22.92 } + { "value": 22.92, "curve": "stepped" }, + { "time": 0.9333, "value": 22.92, "curve": "stepped" }, + { "time": 1.3667, "value": 22.92 } ], "translate": [ { "curve": "stepped" }, @@ -684,8 +702,8 @@ "root": { "rotate": [ {}, - { "time": 0.4333, "angle": -14.53 }, - { "time": 0.8, "angle": 9.87 }, + { "time": 0.4333, "value": -14.53 }, + { "time": 0.8, "value": 9.87 }, { "time": 1.3667 } ], "scale": [ @@ -699,15 +717,15 @@ "bones": { "left upper leg": { "rotate": [ - { "angle": -26.56 }, - { "time": 0.1333, "angle": -8.79 }, - { "time": 0.2667, "angle": 9.51 }, - { "time": 0.4, "angle": 30.74 }, - { "time": 0.5333, "angle": 25.34 }, - { "time": 0.6667, "angle": 26.12 }, - { "time": 0.8, "angle": -7.71 }, - { "time": 0.9333, "angle": -21.19 }, - { "time": 1.0667, "angle": -26.56 } + { "value": -26.56 }, + { "time": 0.1333, "value": -8.79 }, + { "time": 0.2667, "value": 9.51 }, + { "time": 0.4, "value": 30.74 }, + { "time": 0.5333, "value": 25.34 }, + { "time": 0.6667, "value": 26.12 }, + { "time": 0.8, "value": -7.71 }, + { "time": 0.9333, "value": -21.19 }, + { "time": 1.0667, "value": -26.56 } ], "translate": [ { "x": -3, "y": -2.25 }, @@ -717,14 +735,22 @@ }, "right upper leg": { "rotate": [ - { "angle": 42.45 }, - { "time": 0.1333, "angle": 52.11 }, - { "time": 0.2667, "angle": 5.96 }, - { "time": 0.5333, "angle": -16.94 }, - { "time": 0.6667, "angle": 1.9 }, - { "time": 0.8, "angle": 28.06, "curve": 0.463, "c2": 0.12 }, - { "time": 0.9333, "angle": 58.69, "curve": 0.5, "c2": 0.02 }, - { "time": 1.0667, "angle": 42.45 } + { "value": 42.45 }, + { "time": 0.1333, "value": 52.11 }, + { "time": 0.2667, "value": 5.96 }, + { "time": 0.5333, "value": -16.94 }, + { "time": 0.6667, "value": 1.9 }, + { + "time": 0.8, + "value": 28.06, + "curve": [ 0.862, 31.74, 0.933, 58.69 ] + }, + { + "time": 0.9333, + "value": 58.69, + "curve": [ 1, 58.37, 1.067, 42.45 ] + }, + { "time": 1.0667, "value": 42.45 } ], "translate": [ { "x": 8.12, "y": -2.36 }, @@ -737,35 +763,42 @@ }, "left lower leg": { "rotate": [ - { "angle": -10.22 }, - { "time": 0.1333, "angle": -55.65 }, - { "time": 0.2667, "angle": -68.13 }, - { "time": 0.5333, "angle": 5.12 }, - { "time": 0.6667, "angle": -28.3 }, - { "time": 0.8, "angle": 4.08 }, - { "time": 0.9333, "angle": 3.53 }, - { "time": 1.0667, "angle": -10.22 } + { "value": -10.22 }, + { "time": 0.1333, "value": -55.65 }, + { "time": 0.2667, "value": -68.13 }, + { "time": 0.5333, "value": 5.12 }, + { "time": 0.6667, "value": -28.3 }, + { "time": 0.8, "value": 4.08 }, + { "time": 0.9333, "value": 3.53 }, + { "time": 1.0667, "value": -10.22 } ] }, "left foot": { "rotate": [ - { "angle": -3.69 }, - { "time": 0.1333, "angle": -10.42 }, - { "time": 0.2667, "angle": -17.15 }, - { "time": 0.4, "angle": -2.84 }, - { "time": 0.5333, "angle": -3.88 }, - { "time": 0.6667, "angle": 2.78 }, - { "time": 0.8, "angle": 1.68 }, - { "time": 0.9333, "angle": -8.54 }, - { "time": 1.0667, "angle": -3.69 } + { "value": -3.69 }, + { "time": 0.1333, "value": -10.42 }, + { "time": 0.2667, "value": -17.15 }, + { "time": 0.4, "value": -2.84 }, + { "time": 0.5333, "value": -3.88 }, + { "time": 0.6667, "value": 2.78 }, + { "time": 0.8, "value": 1.68 }, + { "time": 0.9333, "value": -8.54 }, + { "time": 1.0667, "value": -3.69 } ] }, "right shoulder": { "rotate": [ - { "angle": 20.9, "curve": 0.264, "c3": 0.75 }, - { "time": 0.1333, "angle": 3.72, "curve": 0.273, "c3": 0.842 }, - { "time": 0.6667, "angle": -278.28 }, - { "time": 1.0667, "angle": 20.9 } + { + "value": 20.9, + "curve": [ 0.035, 20.9, 0.1, 3.72 ] + }, + { + "time": 0.1333, + "value": 3.72, + "curve": [ 0.279, 3.72, 0.582, 81.72 ] + }, + { "time": 0.6667, "value": 81.72 }, + { "time": 1.0667, "value": 20.9 } ], "translate": [ { "x": -7.84, "y": 7.19 }, @@ -776,26 +809,37 @@ }, "right arm": { "rotate": [ - { "angle": -4.03, "curve": 0.267, "c2": 0.01, "c3": 0.805, "c4": 0.99 }, - { "time": 0.1333, "angle": -14, "curve": 0.342 }, - { "time": 0.6667, "angle": 36.55, "curve": 0.307, "c3": 0.787, "c4": 0.99 }, - { "time": 1.0667, "angle": -4.03 } + { + "value": -4.03, + "curve": [ 0.036, -4.13, 0.107, -13.9 ] + }, + { + "time": 0.1333, + "value": -14, + "curve": [ 0.316, -14, 0.667, 36.55 ] + }, + { + "time": 0.6667, + "value": 36.55, + "curve": [ 0.789, 36.55, 0.981, -3.62 ] + }, + { "time": 1.0667, "value": -4.03 } ] }, "right hand": { "rotate": [ - { "angle": 22.92 }, - { "time": 0.4, "angle": -8.97 }, - { "time": 0.6667, "angle": 0.51 }, - { "time": 1.0667, "angle": 22.92 } + { "value": 22.92 }, + { "time": 0.4, "value": -8.97 }, + { "time": 0.6667, "value": 0.51 }, + { "time": 1.0667, "value": 22.92 } ] }, "left shoulder": { "rotate": [ - { "angle": -1.48 }, - { "time": 0.1333, "angle": 13.61 }, - { "time": 0.6667, "angle": 280.75 }, - { "time": 1.0667, "angle": -1.48 } + { "value": -1.48 }, + { "time": 0.1333, "value": 13.61 }, + { "time": 0.6667, "value": -79.25 }, + { "time": 1.0667, "value": -1.48 } ], "translate": [ { "x": -1.77, "y": 0.57 }, @@ -805,29 +849,48 @@ }, "left hand": { "rotate": [ - { "angle": 11.59, "curve": 0.17, "c2": 0.37, "c3": 0.632, "c4": 1.55 }, - { "time": 0.1333, "angle": 28.13, "curve": 0.693, "c2": 0.01, "c3": 0.693, "c4": 0.99 }, - { "time": 0.6667, "angle": -27.43, "curve": 0.118, "c2": 0.41, "c3": 0.739, "c4": 1.77 }, - { "time": 0.8, "angle": -36.33 }, - { "time": 1.0667, "angle": 11.59 } + { + "value": 11.59, + "curve": [ 0.023, 17.71, 0.084, 37.23 ] + }, + { + "time": 0.1333, + "value": 28.13, + "curve": [ 0.503, 27.57, 0.503, -26.87 ] + }, + { + "time": 0.6667, + "value": -27.43, + "curve": [ 0.682, -31.08, 0.765, -43.18 ] + }, + { "time": 0.8, "value": -36.33 }, + { "time": 1.0667, "value": 11.59 } ] }, "left arm": { "rotate": [ - { "angle": -8.28 }, - { "time": 0.1333, "angle": 18.43 }, - { "time": 0.6667, "angle": 0.88 }, - { "time": 1.0667, "angle": -8.28 } + { "value": -8.28 }, + { "time": 0.1333, "value": 18.43 }, + { "time": 0.6667, "value": 0.88 }, + { "time": 1.0667, "value": -8.28 } ] }, "torso": { "rotate": [ - { "angle": -10.28 }, - { "time": 0.1333, "angle": -15.39, "curve": 0.546, "c2": 0.01 }, - { "time": 0.4, "angle": -9.78, "curve": 0.58, "c2": 0.17 }, - { "time": 0.6667, "angle": -15.75 }, - { "time": 0.9333, "angle": -7.07 }, - { "time": 1.0667, "angle": -10.28 } + { "value": -10.28 }, + { + "time": 0.1333, + "value": -15.39, + "curve": [ 0.279, -15.33, 0.4, -9.78 ] + }, + { + "time": 0.4, + "value": -9.78, + "curve": [ 0.555, -10.79, 0.667, -15.75 ] + }, + { "time": 0.6667, "value": -15.75 }, + { "time": 0.9333, "value": -7.07 }, + { "time": 1.0667, "value": -10.28 } ], "translate": [ { "x": -3.67, "y": 1.69 }, @@ -839,24 +902,28 @@ }, "right foot": { "rotate": [ - { "angle": -5.25 }, - { "time": 0.2667, "angle": -4.08 }, - { "time": 0.4, "angle": -6.45 }, - { "time": 0.5333, "angle": -5.4 }, - { "time": 0.8, "angle": -11.69 }, - { "time": 0.9333, "angle": 0.46 }, - { "time": 1.0667, "angle": -5.25 } + { "value": -5.25 }, + { "time": 0.2667, "value": -4.08 }, + { "time": 0.4, "value": -6.45 }, + { "time": 0.5333, "value": -5.4 }, + { "time": 0.8, "value": -11.69 }, + { "time": 0.9333, "value": 0.46 }, + { "time": 1.0667, "value": -5.25 } ] }, "right lower leg": { "rotate": [ - { "angle": -3.39 }, - { "time": 0.1333, "angle": -45.53 }, - { "time": 0.2667, "angle": -2.6 }, - { "time": 0.5333, "angle": -19.53 }, - { "time": 0.6667, "angle": -64.8 }, - { "time": 0.8, "angle": -82.56, "curve": 0.557, "c2": 0.18 }, - { "time": 1.0667, "angle": -3.39 } + { "value": -3.39 }, + { "time": 0.1333, "value": -45.53 }, + { "time": 0.2667, "value": -2.6 }, + { "time": 0.5333, "value": -19.53 }, + { "time": 0.6667, "value": -64.8 }, + { + "time": 0.8, + "value": -82.56, + "curve": [ 0.949, -68.31, 1.067, -3.39 ] + }, + { "time": 1.0667, "value": -3.39 } ] }, "hip": { @@ -866,10 +933,18 @@ ], "translate": [ {}, - { "time": 0.1333, "y": -7.62, "curve": 0.273, "c2": 0.86 }, + { + "time": 0.1333, + "y": -7.62, + "curve": [ 0.206, 0, 0.4, 0, 0.206, 6.42, 0.4, 8.7 ] + }, { "time": 0.4, "y": 8.7 }, { "time": 0.5333, "y": -0.42 }, - { "time": 0.6667, "y": -7.06, "curve": 0.236, "c2": 0.9 }, + { + "time": 0.6667, + "y": -7.06, + "curve": [ 0.698, 0, 0.8, 0, 0.698, 1.92, 0.8, 2.92 ] + }, { "time": 0.8, "y": 2.92 }, { "time": 0.9333, "y": 6.78 }, { "time": 1.0667 } @@ -877,28 +952,35 @@ }, "neck": { "rotate": [ - { "angle": 3.6 }, - { "time": 0.1333, "angle": 17.5 }, - { "time": 0.2667, "angle": 6.11 }, - { "time": 0.4, "angle": 3.46 }, - { "time": 0.5333, "angle": 5.18 }, - { "time": 0.6667, "angle": 18.36 }, - { "time": 0.8, "angle": 6.09 }, - { "time": 0.9333, "angle": 2.29 }, - { "time": 1.0667, "angle": 3.6 } + { "value": 3.6 }, + { "time": 0.1333, "value": 17.5 }, + { "time": 0.2667, "value": 6.11 }, + { "time": 0.4, "value": 3.46 }, + { "time": 0.5333, "value": 5.18 }, + { "time": 0.6667, "value": 18.36 }, + { "time": 0.8, "value": 6.09 }, + { "time": 0.9333, "value": 2.29 }, + { "time": 1.0667, "value": 3.6 } ] }, "head": { "rotate": [ - { "angle": 3.6, "curve": 0, "c3": 0.704, "c4": 1.62 }, - { "time": 0.1667, "angle": -0.21 }, - { "time": 0.2667, "angle": 6.11 }, - { "time": 0.4, "angle": 3.46 }, - { "time": 0.5333, "angle": 5.18, "curve": 0, "c3": 0.704, "c4": 1.62 }, - { "time": 0.7, "angle": 1.11 }, - { "time": 0.8, "angle": 6.09 }, - { "time": 0.9333, "angle": 2.29 }, - { "time": 1.0667, "angle": 3.6 } + { + "value": 3.6, + "curve": [ 0, 3.6, 0.117, -2.57 ] + }, + { "time": 0.1667, "value": -0.21 }, + { "time": 0.2667, "value": 6.11 }, + { "time": 0.4, "value": 3.46 }, + { + "time": 0.5333, + "value": 5.18, + "curve": [ 0.533, 5.18, 0.651, -1.41 ] + }, + { "time": 0.7, "value": 1.11 }, + { "time": 0.8, "value": 6.09 }, + { "time": 0.9333, "value": 2.29 }, + { "time": 1.0667, "value": 3.6 } ] }, "root": {