diff --git a/examples/alien/export/alien-ess.json b/examples/alien/export/alien-ess.json index 5ced1445d..1f9348544 100644 --- a/examples/alien/export/alien-ess.json +++ b/examples/alien/export/alien-ess.json @@ -1,7 +1,7 @@ { "skeleton": { "hash": "zgiHK9o7sFk", - "spine": "4.0.58-beta", + "spine": "4.0.07", "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 index 970dff0c2..1154d360b 100644 Binary files a/examples/alien/export/alien-ess.skel and b/examples/alien/export/alien-ess.skel differ diff --git a/examples/alien/export/alien-pma.atlas b/examples/alien/export/alien-pma.atlas index 0b248eb76..7ad0e4fd9 100644 --- a/examples/alien/export/alien-pma.atlas +++ b/examples/alien/export/alien-pma.atlas @@ -2,6 +2,7 @@ alien-pma.png size: 1024, 1024 filter: Linear, Linear pma: true + scale: 0.5 back-foot bounds: 1013, 577, 8, 6 back-shin diff --git a/examples/alien/export/alien-pma.png b/examples/alien/export/alien-pma.png index 6019cb401..aaf3344ad 100644 Binary files a/examples/alien/export/alien-pma.png and b/examples/alien/export/alien-pma.png differ diff --git a/examples/alien/export/alien-pro.json b/examples/alien/export/alien-pro.json index 6894e51ff..341cfe68d 100644 --- a/examples/alien/export/alien-pro.json +++ b/examples/alien/export/alien-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "drbU7NZilig", - "spine": "4.0.58-beta", + "hash": "tnPDOU8oIi0", + "spine": "4.0.07", "x": -191.3, "y": -4.51, "width": 368.26, @@ -217,8 +217,7 @@ "x": -143, "y": -143.95, "mixRotate": 0, - "mixScaleX": 0, - "mixScaleY": 0 + "mixScaleX": 0 }, { "name": "jaw", @@ -229,8 +228,7 @@ "x": 47, "y": -7.76, "mixRotate": 0, - "mixScaleX": 0, - "mixScaleY": 0 + "mixScaleX": 0 } ], "skins": [ @@ -295,7 +293,7 @@ "eye-stalk": { "type": "mesh", "uvs": [ 1, 0.17186, 0.87544, 0.29277, 0.89315, 0.69314, 1, 0.90273, 1, 1, 0.7891, 1, 0.5655, 0.70926, 0.44374, 0.59641, 0.34633, 0.55745, 0.27217, 0.58566, 0.2124, 0.55341, 0.13048, 0.57894, 0, 0.57625, 0, 0.46609, 0.1327, 0.46206, 0.23011, 0.43922, 0.26995, 0.46877, 0.3574, 0.45265, 0.43489, 0.46743, 0.49134, 0.42712, 0.58764, 0.22829, 0.83891, 0, 1, 0 ], - "triangles": [ 11, 14, 10, 11, 12, 13, 14, 11, 13, 10, 14, 15, 8, 16, 17, 9, 10, 16, 8, 9, 16, 10, 15, 16, 8, 17, 18, 8, 18, 7, 21, 22, 0, 1, 21, 0, 20, 21, 1, 19, 2, 6, 1, 19, 20, 2, 19, 1, 7, 19, 6, 5, 6, 2, 5, 2, 3, 5, 3, 4, 7, 18, 19 ], + "triangles": [ 14, 11, 13, 11, 12, 13, 11, 14, 10, 10, 14, 15, 10, 15, 16, 8, 9, 16, 9, 10, 16, 8, 16, 17, 8, 18, 7, 8, 17, 18, 7, 18, 19, 5, 3, 4, 5, 2, 3, 5, 6, 2, 7, 19, 6, 2, 19, 1, 1, 19, 20, 19, 2, 6, 20, 21, 1, 1, 21, 0, 21, 22, 0 ], "vertices": [ 1, 12, 79.5, 42.99, 1, 1, 12, 59.69, 27.15, 1, 1, 12, 62.51, -25.3, 1, 1, 12, 79.5, -52.76, 1, 1, 12, 79.5, -65.5, 1, 1, 12, 45.97, -65.5, 1, 3, 12, 10.41, -27.41, 0.70014, 13, -19.9, 24.68, 0.25564, 14, -36.04, 24.68, 0.04422, 4, 12, -8.95, -12.63, 0.39574, 13, -0.31, 10.2, 0.4047, 14, -16.45, 10.2, 0.19226, 15, -32.6, 10.2, 0.0073, 4, 12, -24.43, -7.53, 0.15434, 13, 15.26, 5.34, 0.37965, 14, -0.89, 5.34, 0.35628, 15, -17.03, 5.34, 0.10973, 5, 12, -36.23, -11.22, 0.02406, 13, 26.99, 9.22, 0.22083, 14, 10.84, 9.22, 0.43184, 15, -5.3, 9.22, 0.25041, 16, -21.44, 9.22, 0.07286, 4, 13, 36.56, 5.15, 0.06689, 14, 20.41, 5.15, 0.29978, 15, 4.27, 5.15, 0.3765, 16, -11.88, 5.15, 0.25684, 3, 14, 33.38, 8.7, 0.13576, 15, 17.24, 8.7, 0.31231, 16, 1.09, 8.7, 0.55192, 3, 14, 54.13, 8.67, 0.01597, 15, 37.99, 8.67, 0.22361, 16, 21.84, 8.67, 0.76041, 3, 14, 54.36, -5.76, 0.0282, 15, 38.22, -5.76, 0.22512, 16, 22.07, -5.76, 0.74668, 3, 14, 33.27, -6.62, 0.15732, 15, 17.13, -6.62, 0.33196, 16, 0.98, -6.62, 0.51072, 4, 13, 33.98, -9.85, 0.07948, 14, 17.83, -9.85, 0.31806, 15, 1.69, -9.85, 0.37309, 16, -14.46, -9.85, 0.22937, 5, 12, -36.58, 4.09, 0.01783, 13, 27.58, -6.08, 0.25225, 14, 11.44, -6.08, 0.42239, 15, -4.71, -6.08, 0.2484, 16, -20.85, -6.08, 0.05913, 4, 12, -22.67, 6.2, 0.13761, 13, 13.71, -8.41, 0.43417, 14, -2.43, -8.41, 0.32491, 15, -18.58, -8.41, 0.10331, 4, 12, -10.35, 4.27, 0.36851, 13, 1.36, -6.67, 0.45713, 14, -14.78, -6.67, 0.16417, 15, -30.93, -6.67, 0.0102, 3, 12, -1.38, 9.55, 0.67485, 13, -7.53, -12.09, 0.29353, 14, -23.67, -12.09, 0.03163, 2, 12, 13.93, 35.59, 0.8884, 13, -22.43, -38.37, 0.1116, 1, 12, 53.89, 65.5, 1, 1, 12, 79.5, 65.5, 1 ], "hull": 23, "edges": [ 26, 28, 28, 30, 30, 32, 32, 34, 34, 36, 36, 38, 38, 40, 42, 44, 40, 42, 24, 26, 24, 22, 22, 20, 20, 18, 18, 16, 16, 14, 14, 12, 8, 10, 12, 10, 8, 6, 6, 4, 4, 2, 0, 44, 2, 0 ], @@ -307,7 +305,7 @@ "eye": { "type": "mesh", "uvs": [ 0.85047, 0.13875, 0.98667, 0.3431, 0.98667, 0.47303, 0.98667, 0.61454, 0.94572, 0.71073, 0.87413, 0.83398, 0.77706, 0.9087, 0.64923, 0.98667, 0.4973, 0.98667, 0.35595, 0.98667, 0.23924, 0.92448, 0.14613, 0.8644, 0.07706, 0.75411, 0.01333, 0.63014, 0.01333, 0.50033, 0.01333, 0.37742, 0.07112, 0.26126, 0.12819, 0.14655, 0.24031, 0.08097, 0.35595, 0.01333, 0.5103, 0.01333, 0.65547, 0.01333, 0.366, 0.90333, 0.6247, 0.89943, 0.8132, 0.79283, 0.9159, 0.61083, 0.9159, 0.36513, 0.808, 0.19483, 0.6325, 0.09083, 0.379, 0.08433, 0.1905, 0.20133, 0.0826, 0.38333, 0.0865, 0.61473, 0.2022, 0.80973, 0.50622, 0.08759, 0.29444, 0.13681, 0.13626, 0.29283, 0.08455, 0.49897, 0.13693, 0.69972, 0.27542, 0.85157, 0.49981, 0.90131, 0.72342, 0.8436, 0.87136, 0.68977, 0.9159, 0.47303, 0.91047, 0.22878, 0.85853, 0.27458, 0.76322, 0.08263, 0.72248, 0.14415, 0.50307, 0.48708, 0.33447, 0.33295, 0.28782, 0.37309, 0.26812, 0.4291, 0.2617, 0.49394, 0.27452, 0.55711, 0.29889, 0.60566, 0.34608, 0.65543, 0.38241, 0.68026, 0.43365, 0.69791, 0.50138, 0.70162, 0.56522, 0.69777, 0.62072, 0.67742, 0.66618, 0.64788, 0.69809, 0.59441, 0.71324, 0.55008, 0.72398, 0.47956, 0.71325, 0.42499, 0.68781, 0.37664, 0.65111, 0.3452, 0.60899, 0.32153, 0.56154, 0.30809, 0.50458, 0.29603, 0.44539, 0.29983, 0.39825, 0.31109 ], - "triangles": [ 48, 71, 70, 48, 70, 69, 72, 71, 48, 49, 72, 48, 50, 49, 48, 51, 50, 48, 48, 69, 68, 48, 68, 67, 48, 67, 66, 48, 66, 65, 48, 65, 64, 52, 51, 48, 63, 48, 64, 53, 52, 48, 62, 48, 63, 54, 53, 48, 61, 48, 62, 55, 54, 48, 48, 56, 55, 61, 60, 48, 56, 48, 57, 60, 59, 48, 48, 58, 57, 59, 58, 48, 21, 0, 46, 29, 19, 20, 18, 19, 29, 34, 29, 20, 28, 20, 21, 28, 21, 46, 34, 20, 28, 35, 18, 29, 47, 28, 46, 27, 46, 0, 47, 46, 27, 30, 17, 18, 30, 18, 35, 1, 44, 0, 27, 0, 44, 16, 17, 30, 45, 27, 44, 36, 16, 30, 34, 71, 29, 69, 70, 34, 29, 72, 35, 34, 70, 71, 28, 69, 34, 68, 69, 28, 71, 72, 29, 49, 30, 35, 47, 68, 28, 72, 49, 35, 50, 36, 30, 26, 45, 44, 67, 68, 47, 67, 47, 27, 66, 67, 27, 1, 26, 44, 49, 50, 30, 45, 66, 27, 31, 16, 36, 15, 16, 31, 65, 66, 45, 65, 45, 26, 51, 36, 50, 31, 36, 51, 2, 43, 26, 65, 26, 43, 2, 26, 1, 64, 65, 43, 51, 37, 31, 52, 37, 51, 14, 15, 31, 14, 31, 37, 25, 43, 2, 63, 64, 43, 25, 63, 43, 25, 2, 3, 53, 32, 37, 53, 37, 52, 14, 37, 32, 13, 14, 32, 42, 63, 25, 62, 63, 42, 38, 32, 53, 38, 53, 54, 4, 25, 3, 42, 25, 4, 12, 13, 32, 12, 32, 38, 42, 61, 62, 24, 61, 42, 55, 33, 38, 55, 38, 54, 12, 38, 33, 5, 42, 4, 24, 42, 5, 41, 61, 24, 60, 61, 41, 39, 33, 55, 39, 55, 56, 11, 12, 33, 41, 59, 60, 23, 59, 41, 40, 57, 58, 40, 58, 59, 23, 40, 59, 22, 39, 56, 22, 56, 57, 22, 57, 40, 6, 41, 24, 6, 24, 5, 10, 33, 39, 10, 39, 22, 11, 33, 10, 9, 10, 22, 8, 22, 40, 9, 22, 8, 6, 7, 23, 6, 23, 41, 8, 40, 23, 7, 8, 23 ], + "triangles": [ 59, 58, 48, 48, 58, 57, 60, 59, 48, 56, 48, 57, 61, 60, 48, 48, 56, 55, 55, 54, 48, 61, 48, 62, 54, 53, 48, 62, 48, 63, 53, 52, 48, 63, 48, 64, 52, 51, 48, 48, 65, 64, 48, 66, 65, 48, 67, 66, 48, 68, 67, 48, 69, 68, 51, 50, 48, 50, 49, 48, 49, 72, 48, 72, 71, 48, 48, 70, 69, 48, 71, 70, 7, 8, 23, 8, 40, 23, 6, 23, 41, 6, 7, 23, 9, 22, 8, 8, 22, 40, 9, 10, 22, 11, 33, 10, 10, 39, 22, 10, 33, 39, 6, 24, 5, 6, 41, 24, 22, 57, 40, 22, 56, 57, 22, 39, 56, 23, 40, 59, 40, 58, 59, 40, 57, 58, 23, 59, 41, 41, 59, 60, 11, 12, 33, 39, 55, 56, 39, 33, 55, 60, 61, 41, 41, 61, 24, 24, 42, 5, 5, 42, 4, 12, 38, 33, 55, 38, 54, 55, 33, 38, 24, 61, 42, 42, 61, 62, 12, 32, 38, 12, 13, 32, 42, 25, 4, 4, 25, 3, 38, 53, 54, 38, 32, 53, 62, 63, 42, 42, 63, 25, 13, 14, 32, 14, 37, 32, 53, 37, 52, 53, 32, 37, 25, 2, 3, 25, 63, 43, 63, 64, 43, 25, 43, 2, 14, 31, 37, 14, 15, 31, 52, 37, 51, 51, 37, 31, 64, 65, 43, 2, 26, 1, 65, 26, 43, 2, 43, 26, 31, 36, 51, 51, 36, 50, 65, 45, 26, 65, 66, 45, 15, 16, 31, 31, 16, 36, 45, 66, 27, 49, 50, 30, 1, 26, 44, 66, 67, 27, 67, 47, 27, 67, 68, 47, 26, 45, 44, 50, 36, 30, 72, 49, 35, 47, 68, 28, 49, 30, 35, 71, 72, 29, 68, 69, 28, 28, 69, 34, 34, 70, 71, 29, 72, 35, 69, 70, 34, 34, 71, 29, 36, 16, 30, 45, 27, 44, 16, 17, 30, 27, 0, 44, 1, 44, 0, 30, 18, 35, 30, 17, 18, 47, 46, 27, 27, 46, 0, 47, 28, 46, 35, 18, 29, 34, 20, 28, 28, 21, 46, 28, 20, 21, 34, 29, 20, 18, 19, 29, 29, 19, 20, 21, 0, 46 ], "vertices": [ 1, 9, 52.57, 54.19, 1, 1, 9, 73, 23.53, 1, 1, 9, 73, 4.05, 1, 1, 9, 73, -17.18, 1, 1, 9, 66.86, -31.61, 1, 1, 9, 58.65, -50.88, 1, 1, 9, 41.56, -61.3, 1, 1, 9, 22.38, -73, 1, 1, 9, -0.4, -73, 1, 1, 9, -21.61, -73, 1, 1, 9, -38.33, -63.87, 1, 1, 9, -54.84, -54.86, 1, 1, 9, -63.44, -38.12, 1, 1, 9, -73, -19.52, 1, 1, 9, -73, -0.05, 1, 1, 9, -73, 18.39, 1, 1, 9, -64.33, 35.81, 1, 1, 9, -55.77, 53.02, 1, 1, 9, -38.95, 62.85, 1, 1, 9, -21.61, 73, 1, 1, 9, 1.55, 73, 1, 1, 9, 23.32, 73, 1, 2, 9, -20.1, -60.5, 0.79808, 17, -20.1, -60.5, 0.20192, 2, 9, 18.71, -59.91, 0.79438, 17, 18.71, -59.91, 0.20562, 2, 9, 46.98, -43.92, 0.79438, 17, 46.98, -43.92, 0.20562, 2, 9, 62.39, -16.62, 0.79808, 17, 62.39, -16.62, 0.20192, 2, 9, 62.39, 20.23, 0.79808, 17, 62.39, 20.23, 0.20192, 2, 9, 46.2, 45.78, 0.79438, 17, 46.2, 45.78, 0.20562, 2, 9, 19.88, 61.38, 0.79808, 17, 19.88, 61.38, 0.20192, 2, 9, -18.15, 62.35, 0.79808, 17, -18.15, 62.35, 0.20192, 2, 9, -46.42, 44.8, 0.79438, 17, -46.42, 44.8, 0.20562, 2, 9, -62.61, 17.5, 0.79808, 17, -62.61, 17.5, 0.20192, 2, 9, -62.02, -17.21, 0.79808, 17, -62.02, -17.21, 0.20192, 2, 9, -44.67, -46.46, 0.79438, 17, -44.67, -46.46, 0.20562, 2, 9, 0.93, 61.86, 0.79808, 17, 0.93, 61.86, 0.20192, 2, 9, -30.83, 54.48, 0.79728, 17, -30.83, 54.48, 0.20272, 2, 9, -54.56, 31.08, 0.79728, 17, -54.56, 31.08, 0.20272, 2, 9, -62.32, 0.15, 0.79808, 17, -62.32, 0.15, 0.20192, 2, 9, -54.46, -29.96, 0.79728, 17, -54.46, -29.96, 0.20272, 2, 9, -33.69, -52.74, 0.79728, 17, -33.69, -52.74, 0.20272, 2, 9, -0.03, -60.2, 0.79728, 17, -0.03, -60.2, 0.20272, 2, 9, 33.51, -51.54, 0.79648, 17, 33.51, -51.54, 0.20352, 2, 9, 55.7, -28.47, 0.79728, 17, 55.7, -28.47, 0.20272, 2, 9, 62.39, 4.05, 0.79808, 17, 62.39, 4.05, 0.20192, 1, 9, 61.57, 40.68, 1, 2, 9, 53.78, 33.81, 0.79728, 17, 53.78, 33.81, 0.20272, 1, 9, 39.48, 62.61, 1, 2, 9, 33.37, 53.38, 0.79728, 17, 33.37, 53.38, 0.20272, 2, 9, 0.46, 1.94, 0.33108, 17, 0.46, 1.94, 0.66892, 2, 9, -24.83, 25.06, 0.38094, 17, -24.83, 25.06, 0.61906, 2, 9, -31.83, 19.04, 0.38174, 17, -31.83, 19.04, 0.61826, 2, 9, -34.78, 10.63, 0.38544, 17, -34.78, 10.63, 0.61456, 2, 9, -35.74, 0.91, 0.38624, 17, -35.74, 0.91, 0.61376, 2, 9, -33.82, -8.57, 0.38544, 17, -33.82, -8.57, 0.61456, 2, 9, -30.17, -15.85, 0.38174, 17, -30.17, -15.85, 0.61826, 2, 9, -23.09, -23.32, 0.38094, 17, -23.09, -23.32, 0.61906, 2, 9, -17.64, -27.04, 0.38174, 17, -17.64, -27.04, 0.61826, 2, 9, -9.95, -29.69, 0.38464, 17, -9.95, -29.69, 0.61536, 2, 9, 0.21, -30.24, 0.38174, 17, 0.21, -30.24, 0.61826, 2, 9, 9.78, -29.67, 0.38014, 17, 9.78, -29.67, 0.61986, 2, 9, 18.11, -26.61, 0.37724, 17, 18.11, -26.61, 0.62276, 2, 9, 24.93, -22.18, 0.38014, 17, 24.93, -22.18, 0.61986, 2, 9, 29.71, -14.16, 0.38174, 17, 29.71, -14.16, 0.61826, 2, 9, 31.99, -7.51, 0.38544, 17, 31.99, -7.51, 0.61456, 2, 9, 33.6, 3.07, 0.38624, 17, 33.6, 3.07, 0.61376, 2, 9, 31.99, 11.25, 0.38544, 17, 31.99, 11.25, 0.61456, 2, 9, 28.17, 18.5, 0.38174, 17, 28.17, 18.5, 0.61826, 2, 9, 22.67, 23.22, 0.38094, 17, 22.67, 23.22, 0.61906, 2, 9, 16.35, 26.77, 0.38174, 17, 16.35, 26.77, 0.61826, 2, 9, 9.23, 28.79, 0.38544, 17, 9.23, 28.79, 0.61456, 2, 9, 0.69, 30.6, 0.38624, 17, 0.69, 30.6, 0.61376, 2, 9, -8.19, 30.03, 0.38544, 17, -8.19, 30.03, 0.61456, 2, 9, -15.26, 28.34, 0.38174, 17, -15.26, 28.34, 0.61826 ], "hull": 22, "edges": [ 38, 40, 40, 42, 56, 68, 68, 58, 40, 68, 38, 36, 36, 34, 58, 70, 70, 60, 36, 70, 30, 32, 32, 34, 60, 72, 72, 62, 32, 72, 26, 28, 28, 30, 62, 74, 74, 64, 28, 74, 26, 24, 24, 22, 64, 76, 76, 66, 24, 76, 18, 20, 20, 22, 44, 78, 78, 66, 20, 78, 14, 16, 16, 18, 44, 80, 80, 46, 16, 80, 14, 12, 12, 10, 46, 82, 82, 48, 12, 82, 6, 8, 8, 10, 48, 84, 84, 50, 8, 84, 2, 4, 4, 6, 50, 86, 86, 52, 4, 86, 2, 88, 88, 0, 52, 90, 90, 54, 88, 90, 42, 92, 92, 0, 54, 94, 94, 56, 92, 94, 42, 0, 0, 2, 18, 44, 26, 64, 30, 62, 6, 50, 2, 52, 56, 42, 38, 58, 60, 98, 98, 96, 72, 100, 100, 96, 98, 100, 62, 102, 102, 96, 100, 102, 74, 104, 104, 96, 102, 104, 64, 106, 106, 96, 104, 106, 76, 108, 108, 96, 106, 108, 66, 110, 110, 96, 108, 110, 78, 112, 112, 96, 110, 112, 44, 114, 114, 96, 112, 114, 80, 116, 116, 96, 114, 116, 46, 118, 118, 96, 116, 118, 82, 120, 120, 96, 118, 120, 48, 122, 122, 96, 120, 122, 84, 124, 124, 96, 122, 124, 50, 126, 126, 96, 124, 126, 86, 128, 128, 96, 126, 128, 52, 130, 130, 96, 128, 130, 90, 132, 132, 96, 130, 132, 54, 134, 134, 96, 132, 134, 94, 136, 136, 96, 134, 136, 56, 138, 138, 96, 136, 138, 68, 140, 140, 96, 138, 140, 58, 142, 142, 96, 140, 142, 70, 144, 144, 96, 142, 144, 144, 98, 66, 22, 46, 14, 10, 48, 54, 0, 60, 34 ], diff --git a/examples/alien/export/alien-pro.skel b/examples/alien/export/alien-pro.skel index a493fa979..aa87537c8 100644 Binary files a/examples/alien/export/alien-pro.skel and b/examples/alien/export/alien-pro.skel differ diff --git a/examples/alien/export/alien.atlas b/examples/alien/export/alien.atlas index 4810c66d6..337ddfa2d 100644 --- a/examples/alien/export/alien.atlas +++ b/examples/alien/export/alien.atlas @@ -1,6 +1,7 @@ alien.png size: 1024, 1024 filter: Linear, Linear + scale: 0.5 back-foot bounds: 1013, 577, 8, 6 back-shin diff --git a/examples/coin/export/coin-pma.png b/examples/coin/export/coin-pma.png index 759102d64..93e97ded9 100644 Binary files a/examples/coin/export/coin-pma.png and b/examples/coin/export/coin-pma.png differ diff --git a/examples/coin/export/coin.png b/examples/coin/export/coin.png index 5221caea1..2298d1349 100644 Binary files a/examples/coin/export/coin.png and b/examples/coin/export/coin.png differ diff --git a/examples/dragon/export/dragon-ess.json b/examples/dragon/export/dragon-ess.json index 1f84045c7..2d4d2ff8f 100644 --- a/examples/dragon/export/dragon-ess.json +++ b/examples/dragon/export/dragon-ess.json @@ -1,7 +1,7 @@ { "skeleton": { "hash": "UIFpNNbbcQI", - "spine": "4.0.58-beta", + "spine": "4.0.07", "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 index bcd8c0f31..f31fa4ff6 100644 Binary files a/examples/dragon/export/dragon-ess.skel and b/examples/dragon/export/dragon-ess.skel differ diff --git a/examples/dragon/export/dragon-pma.atlas b/examples/dragon/export/dragon-pma.atlas index 71e7d2b3e..ddb49be5d 100644 --- a/examples/dragon/export/dragon-pma.atlas +++ b/examples/dragon/export/dragon-pma.atlas @@ -87,7 +87,7 @@ tail06 thiagobrayner bounds: 54, 912, 350, 31 -dragon-pma2.png +dragon-pma_2.png size: 1024, 512 filter: Linear, Linear pma: true diff --git a/examples/dragon/export/dragon-pma.png b/examples/dragon/export/dragon-pma.png index 9d14c3faf..e35d53861 100644 Binary files a/examples/dragon/export/dragon-pma.png and b/examples/dragon/export/dragon-pma.png differ diff --git a/examples/dragon/export/dragon-pma2.png b/examples/dragon/export/dragon-pma2.png deleted file mode 100644 index 7137909ff..000000000 Binary files a/examples/dragon/export/dragon-pma2.png and /dev/null differ diff --git a/examples/dragon/export/dragon-pma_2.png b/examples/dragon/export/dragon-pma_2.png new file mode 100644 index 000000000..454a7fcdd Binary files /dev/null and b/examples/dragon/export/dragon-pma_2.png differ diff --git a/examples/dragon/export/dragon.atlas b/examples/dragon/export/dragon.atlas index edbe3731a..5bf75b80d 100644 --- a/examples/dragon/export/dragon.atlas +++ b/examples/dragon/export/dragon.atlas @@ -86,7 +86,7 @@ tail06 thiagobrayner bounds: 54, 912, 350, 31 -dragon2.png +dragon_2.png size: 1024, 512 filter: Linear, Linear head diff --git a/examples/dragon/export/dragon2.png b/examples/dragon/export/dragon2.png deleted file mode 100644 index 2bea28bc6..000000000 Binary files a/examples/dragon/export/dragon2.png and /dev/null differ diff --git a/examples/dragon/export/dragon_2.png b/examples/dragon/export/dragon_2.png new file mode 100644 index 000000000..a1d453e8c Binary files /dev/null and b/examples/dragon/export/dragon_2.png differ diff --git a/examples/goblins/export/goblins-pma.png b/examples/goblins/export/goblins-pma.png index 6555065f7..4613441cb 100644 Binary files a/examples/goblins/export/goblins-pma.png and b/examples/goblins/export/goblins-pma.png differ diff --git a/examples/goblins/export/goblins.png b/examples/goblins/export/goblins.png index 5c1e4e7b6..2fab39406 100644 Binary files a/examples/goblins/export/goblins.png and b/examples/goblins/export/goblins.png differ diff --git a/examples/hero/export/hero-pma.png b/examples/hero/export/hero-pma.png index 3293bdf25..d57095726 100644 Binary files a/examples/hero/export/hero-pma.png and b/examples/hero/export/hero-pma.png differ diff --git a/examples/hero/export/hero.png b/examples/hero/export/hero.png index e1ab4f53a..d10217369 100644 Binary files a/examples/hero/export/hero.png and b/examples/hero/export/hero.png differ diff --git a/examples/mix-and-match/export/mix-and-match-pma.atlas b/examples/mix-and-match/export/mix-and-match-pma.atlas index 909610e55..c2eb27f20 100644 --- a/examples/mix-and-match/export/mix-and-match-pma.atlas +++ b/examples/mix-and-match/export/mix-and-match-pma.atlas @@ -2,6 +2,7 @@ mix-and-match-pma.png size: 1024, 512 filter: Linear, Linear pma: true + scale: 0.5 base-head bounds: 587, 2, 95, 73 boy/arm-front diff --git a/examples/mix-and-match/export/mix-and-match-pma.png b/examples/mix-and-match/export/mix-and-match-pma.png index 9e370905f..c1721a211 100644 Binary files a/examples/mix-and-match/export/mix-and-match-pma.png and b/examples/mix-and-match/export/mix-and-match-pma.png differ diff --git a/examples/mix-and-match/export/mix-and-match-pro.json b/examples/mix-and-match/export/mix-and-match-pro.json index 545201934..1e01790af 100644 --- 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.58-beta", + "spine": "4.0.07", "x": -240.58, "y": -3.38, "width": 410.36, @@ -840,9 +840,7 @@ "target": "eye-back-pupil", "mixRotate": 0, "mixX": 0.4, - "mixY": 0.4, "mixScaleX": 0, - "mixScaleY": 0, "mixShearY": 0 }, { @@ -852,9 +850,7 @@ "target": "eye-front-pupil", "mixRotate": 0, "mixX": 0.4, - "mixY": 0.4, "mixScaleX": 0, - "mixScaleY": 0, "mixShearY": 0 }, { @@ -864,9 +860,7 @@ "target": "head-control", "mixRotate": 0, "mixX": 0.2, - "mixY": 0.2, "mixScaleX": 0, - "mixScaleY": 0, "mixShearY": 0 }, { @@ -879,9 +873,7 @@ "y": 46.72, "mixRotate": 0, "mixX": 0.05, - "mixY": 0.05, "mixScaleX": 0, - "mixScaleY": 0, "mixShearY": 0 }, { @@ -894,9 +886,7 @@ "y": 27.17, "mixRotate": 0, "mixX": 0.15, - "mixY": 0.15, "mixScaleX": 0, - "mixScaleY": 0, "mixShearY": 0 }, { @@ -911,9 +901,7 @@ "shearY": -36, "mixRotate": 0, "mixX": 0.6, - "mixY": 0.6, "mixScaleX": 0, - "mixScaleY": 0, "mixShearY": 0 }, { @@ -924,9 +912,7 @@ "x": -88.92, "mixRotate": 0, "mixX": -1, - "mixY": -1, "mixScaleX": 0, - "mixScaleY": 0, "mixShearY": 0 }, { @@ -938,7 +924,6 @@ "x": 132.85, "y": 58.02, "mixScaleX": 0, - "mixScaleY": 0, "mixShearY": 0 }, { @@ -950,7 +935,6 @@ "x": 17.25, "y": 41.79, "mixScaleX": 0, - "mixScaleY": 0, "mixShearY": 0 }, { @@ -962,7 +946,6 @@ "x": 147.87, "y": -60.85, "mixScaleX": 0, - "mixScaleY": 0, "mixShearY": 0 }, { @@ -974,7 +957,6 @@ "x": 23.51, "y": -48.52, "mixScaleX": 0, - "mixScaleY": 0, "mixShearY": 0 }, { @@ -986,7 +968,6 @@ "x": 130.03, "y": -50.13, "mixScaleX": 0, - "mixScaleY": 0, "mixShearY": 0 }, { @@ -998,7 +979,6 @@ "x": 129.36, "y": 40.42, "mixScaleX": 0, - "mixScaleY": 0, "mixShearY": 0 }, { @@ -1011,9 +991,7 @@ "y": -46.12, "mixRotate": 0.18, "mixX": 0, - "mixY": 0, "mixScaleX": 0, - "mixScaleY": 0, "mixShearY": 0 }, { @@ -1026,9 +1004,7 @@ "y": 29.54, "mixRotate": 0.186, "mixX": 0, - "mixY": 0, "mixScaleX": 0, - "mixScaleY": 0, "mixShearY": 0 }, { @@ -1042,9 +1018,7 @@ "y": -0.72, "shearY": -36, "mixX": 0.7, - "mixY": 0.7, "mixScaleX": 0, - "mixScaleY": 0, "mixShearY": 0 }, { @@ -1058,9 +1032,7 @@ "y": 2.23, "shearY": -36, "mixX": 0.7, - "mixY": 0.7, "mixScaleX": 0, - "mixScaleY": 0, "mixShearY": 0 } ], diff --git a/examples/mix-and-match/export/mix-and-match-pro.skel b/examples/mix-and-match/export/mix-and-match-pro.skel index 269e5b4bf..aa4f833ea 100644 Binary files a/examples/mix-and-match/export/mix-and-match-pro.skel and b/examples/mix-and-match/export/mix-and-match-pro.skel differ diff --git a/examples/mix-and-match/export/mix-and-match.atlas b/examples/mix-and-match/export/mix-and-match.atlas index 634a73cb1..3cab05d5e 100644 --- a/examples/mix-and-match/export/mix-and-match.atlas +++ b/examples/mix-and-match/export/mix-and-match.atlas @@ -1,6 +1,7 @@ mix-and-match.png size: 1024, 512 filter: Linear, Linear + scale: 0.5 base-head bounds: 587, 2, 95, 73 boy/arm-front diff --git a/examples/owl/export/owl-pma.atlas b/examples/owl/export/owl-pma.atlas index 92a0515b8..686314430 100644 --- a/examples/owl/export/owl-pma.atlas +++ b/examples/owl/export/owl-pma.atlas @@ -2,6 +2,7 @@ owl-pma.png size: 1024, 512 filter: Linear, Linear pma: true + scale: 0.5 L_eye-closed bounds: 512, 5, 90, 86 rotate: 90 diff --git a/examples/owl/export/owl-pma.png b/examples/owl/export/owl-pma.png index 32cc1e5cd..bf5c7e2c7 100644 Binary files a/examples/owl/export/owl-pma.png and b/examples/owl/export/owl-pma.png differ diff --git a/examples/owl/export/owl-pro.json b/examples/owl/export/owl-pro.json index d23e61c88..4610c4646 100644 --- a/examples/owl/export/owl-pro.json +++ b/examples/owl/export/owl-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "HV648sya8jg", - "spine": "4.0.58-beta", + "hash": "D48YMP6TYgI", + "spine": "4.0.07", "x": -644, "y": -274, "width": 1350.84, @@ -131,9 +131,7 @@ "target": "control", "mixRotate": 0, "mixX": -1, - "mixY": -1, "mixScaleX": 0, - "mixScaleY": 0, "mixShearY": 0 } ], @@ -259,7 +257,16 @@ "L_eye-pupil": { "x": 122.5, "y": -38.81, "width": 125, "height": 119 } }, "L_foot": { - "L_foot": { "x": 289.24, "y": 23.18, "rotation": -4.56, "width": 128, "height": 95 } + "L_foot": { + "type": "mesh", + "uvs": [ 1, 1, 0, 1, 0, 0, 1, 0 ], + "triangles": [ 1, 2, 3, 1, 3, 0 ], + "vertices": [ 349.26, -29.25, 221.66, -19.09, 229.21, 75.61, 356.81, 65.45 ], + "hull": 4, + "edges": [ 0, 2, 2, 4, 4, 6, 0, 6 ], + "width": 128, + "height": 95 + } }, "L_wing": { "L_wing": { @@ -313,7 +320,16 @@ "R_eye-pupil": { "x": -123.5, "y": -38.81, "width": 125, "height": 119 } }, "R_foot": { - "R_foot": { "x": -3.72, "y": 15.78, "rotation": 16.02, "width": 128, "height": 95 } + "R_foot": { + "type": "mesh", + "uvs": [ 1, 1, 0, 1, 0, 0, 1, 0 ], + "triangles": [ 1, 2, 3, 1, 3, 0 ], + "vertices": [ 70.9, -12.21, -52.13, -47.54, -78.35, 43.77, 44.68, 79.1 ], + "hull": 4, + "edges": [ 0, 2, 2, 4, 4, 6, 0, 6 ], + "width": 128, + "height": 95 + } }, "R_wing": { "R_wing": { @@ -367,9 +383,124 @@ "down": { "bones": { "control": { + "rotate": [ + { "value": -4.49 } + ], "translate": [ - { "y": -31.86 } + { "x": 0.49, "y": -67.91 } + ], + "scale": [ + { "y": 0.847 } ] + }, + "tail-feathers": { + "translate": [ + { "x": -1.43, "y": 32.34 } + ], + "scale": [ + { "x": 0.829 } + ] + }, + "body-top-control": { + "translate": [ + { "x": -25.53, "y": -33.19 } + ] + }, + "head": { + "rotate": [ + { "value": 16.75 } + ], + "translate": [ + { "x": -113.66 } + ], + "scale": [ + { "x": 1.017, "y": 1.017 } + ] + }, + "control-back": { + "translate": [ + { "y": 6.82 } + ] + }, + "branch-2": { + "rotate": [ + { "value": -13.73 } + ] + }, + "branch-1": { + "rotate": [ + { "value": -10.56 } + ] + }, + "branch-3": { + "rotate": [ + { "value": 0.72 } + ] + }, + "branch-4": { + "rotate": [ + { "value": 0.72 } + ] + }, + "branch-6": { + "rotate": [ + { "value": 6.85 } + ] + }, + "leaf-2": { + "rotate": [ + { "value": -13.94 } + ] + }, + "leaf-3": { + "rotate": [ + { "value": -34.11 } + ] + }, + "leaf-5": { + "rotate": [ + { "value": -49.78 } + ] + } + }, + "deform": { + "default": { + "head-base": { + "head-base": [ + { + "offset": 7, + "vertices": [ 14.94373, 0, 12.65295, 0, 12.65233, -1.0E-5, 67.01102, -1.0E-5, 56.73529, 0, 56.73491, -1.0E-5, 67.71835, -1.0E-5, 57.33374, 0, 57.33344, -1.0E-5, 67.71835, 0, 57.33344, -1.0E-5, 67.34274, -1.0E-5, 57.01584, 0, 57.01547, 0, 20.78079, -1.0E-5, 17.5946, 0, 17.59413, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4.65256, 0, 3.94009, 0, 3.93906, 0, 8.86218, -1.0E-5, 7.50494, 0, 7.50377, 3.80679, 7.12328, 2.63647, 5.78107, 2.6363, 5.77944, 6.80575, -18.05002, 6.80558, -18.05162, 6.80575, -18.05002, 6.80558, -18.05162, 6.80575, -18.05002, 6.80558, -18.05162, 6.80575, -18.05002, 6.80558, -18.05162, 4.0068, -9.92122, 4.00659, -9.92301, 2.52487, -0.27368, 2.5247, -0.27514, 0.78302, 16.37561, 0.78287, 16.3739, 0, 20.84903, 0, 20.84752, 0, 20.84903, 0, 20.84752, 0, 20.84903, 0, 20.84752, 0, 20.84903, 0, 20.84752, 0, 20.84903, 0, 20.84752, 0, 3.59885, 0, 3.59729, 0, 0.78192, 0, 0.66266, 0, -0.8714, 0, -0.73761, 0, 14.92346, 0, 12.63475, 0, 15.32294, 0, 12.97321, 0, 20.35486, 0, 17.2334, 0.25634, 7.79885, 0.1778, 6.58624, 0, 35.55524, 0, 30.10268, 0, 42.37582, 0, 35.87729, 0, 45.64838, 0, 38.64833, 0, 21.29605, 0, 18.03027, 0, 20.06952, 0, 16.99168, 0, 27.19852, 0, 23.02756, 0, -2.28232, 0, -1.93265, 0, -4.93713, 0, -4.18004, 0, -4.41357, 0, -3.73672, 4.18564, -6.46916, 2.8986, -5.75401, 0, 12.58502, 0, 10.65575, 0, 16.75674, 0, 14.18719, 7.05116, -13.72548, 4.88302, -12.08656, 4.88288, -12.08753, 6.80575, -18.05002, 6.80558, -18.05162, 0, 20.84903, 0, 20.84752, 0, 18.38699, 0, 15.56738, 2.47823, 3.10307, 1.71634, 2.46333, 5.14171, -9.52105, 3.56069, -8.40152, 6.80575, -18.05002, 6.80558, -18.05162, 0, 20.84903, 0, 20.84752, 0, -7.3945, 0, -6.26045, 0, -2.11862, 0, -1.79346, 0, -2.90344, 0, -2.45781, 0, -7.88242, 0, -6.67371, 0, -6.67361, 0, -3.1828, 0, -2.69247, 0, -2.69414, 0, 0.65915, 0, 0.55807, 0, 1.86981, 0, 1.58313, 0.06213, -3.64604, 0.0432, -3.09045, 0.91777, -1.83724, 0.63572, -1.61568, 0, 6.82599, 0, 5.77931, 0, -21.77914, 0, -18.4391, 0, -21.9791, 0, -18.60844, 0, 5.51465, 0, 4.66925, 0, 6.16968, 0, 5.22366, 2.15704, 4.34937, 1.49408, 3.54054, 1.49391, 3.53944, 0, 6.90668, 0, 5.84891, 0, 5.84795, 0, -1.7995, 0, -1.5231, 0, -1.52324, 0, 2.10727, 0, 1.78445, 0, 14.38007, 0, 12.17538, 0, 5.34238, 0, 4.52444, 0, 4.5231, 0, -2.23868, 0, -1.89496, 0, -1.89513, 0, 7.08655, 0, 5.99965, 0, 31.15753, 0, 26.37973, 0, 42.88345, 0, 36.30704, 0, 39.49829, -1.0E-5, 33.44131, 0, 33.44121, 0, 33.70972, 0, 28.54018, 0, 20.23813, 0, 17.13489 ] + } + ] + }, + "L_foot": { + "L_foot": [ + { + "vertices": [ 0.18475, -11.92622, 1.50322, -1.16228, 9.49197, -2.14086, 8.17357, -12.90479 ] + } + ] + }, + "L_wing": { + "L_wing": [ + { + "vertices": [ -72.47807, 0, 3.19443, -72.4077, -72.47807, 0, 3.19443, -72.4077, -72.47807, 0, 3.19443, -72.4077, 26.35396, -20.44797, 19.26654, 27.22954 ] + } + ] + }, + "R_foot": { + "R_foot": [ + { + "vertices": [ 10.15533, 0.83983, 14.67896, -12.2128, 4.99141, -15.57014, 0.4679, -2.5175 ] + } + ] + }, + "R_wing": { + "R_wing": [ + { + "vertices": [ -72.47807, 0, 3.19443, -72.4077, -72.47807, 0, 3.19443, -72.4077, -6.02205, 15.33593, -15.05563, -6.6922, -72.47807, 0, 3.19443, -72.4077 ] + } + ] + } } } }, @@ -572,17 +703,295 @@ "bones": { "control": { "translate": [ - { "x": 36.77 } + { "x": 36.13, "y": -9.34 } + ], + "scale": [ + { "x": 0.881 } ] + }, + "body-top-control": { + "translate": [ + { "x": 201.35, "y": 7.73 } + ] + }, + "head": { + "rotate": [ + { "value": 33.29 } + ], + "translate": [ + { "x": 5.95, "y": -53.29 } + ], + "scale": [ + { "x": 0.98 } + ], + "shear": [ + { "x": 2.27, "y": -14.16 } + ] + }, + "control-back": { + "translate": [ + { "x": -14.04, "y": -8.25 } + ] + }, + "tail-feathers": { + "rotate": [ + { "value": -21.71 } + ], + "translate": [ + { "x": -66.39, "y": -2.93 } + ] + }, + "branch-6": { + "rotate": [ + { "value": -12.55 } + ] + }, + "branch-1": { + "rotate": [ + { "value": -4.71 } + ], + "shear": [ + { "x": -0.6 } + ] + }, + "leaf-1": { + "rotate": [ + { "value": -7.07 } + ] + }, + "leaf-7": { + "rotate": [ + { "value": -1.77 } + ] + }, + "leaf-3": { + "rotate": [ + { "value": -45.61 } + ] + }, + "branch-2": { + "rotate": [ + { "value": -13.14 } + ] + }, + "branch-3": { + "rotate": [ + { "value": -3.9 } + ] + }, + "branch-4": { + "rotate": [ + { "value": -17.48 } + ] + }, + "leaf-2": { + "rotate": [ + { "value": -9.76 } + ] + }, + "leaf-5": { + "rotate": [ + { "value": -22 } + ] + }, + "leaf-4": { + "rotate": [ + { "value": -9.91 } + ] + }, + "leaf-6": { + "rotate": [ + { "value": -9.91 } + ] + } + }, + "deform": { + "default": { + "head-base": { + "head-base": [ + { + "offset": 28, + "vertices": [ -3.41531, 1.32523, -3.00798, 1.32536, -3.00795, 1.32538, -13.18137, 2.46658, -11.60915, 2.46693, -11.60909, 2.46701, -24.95767, 2.91684, -21.98106, 2.91736, -21.98091, 2.9175, -24.95767, 2.91684, -21.98106, 2.91736, -21.98091, 2.9175, -24.95767, 2.91684, -21.98106, 2.91736, -21.98091, 2.9175, -24.95767, 2.91684, -21.98106, 2.91736, -21.98091, 2.9175, 0, 0, 0, 0, 0, 0, -13.94728, 9.2356, -13.94693, 9.23602, -34.88094, 21.34346, -34.88048, 21.34392, -34.03203, 20.858, -34.03159, 20.85857, -15.79938, 10.16179, -15.79893, 10.1624, -3.29639, 2.12108, -3.29633, 2.12112, 0, 0, 0, 0, 0, 0, 0, 0, -2.33473, -7.05453, -2.33449, -7.05409, -6.45872, -19.51779, -6.45844, -19.51738, -6.45872, -19.51779, -6.45844, -19.51738, -2.69571, -8.14571, -2.69562, -8.14552, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -0.96945, 0.53802, -0.85397, 0.53859, 0, 0, 0, 0, 0, 0, 0, 0, -8.70248, 4.69284, -7.66454, 4.69325, -7.66441, 4.69341, -27.66286, 17.12148, -27.66251, 17.12209, -1.01492, -3.06616, -1.01476, -3.06607, 0, 0, 0, 0, 0, 0, 0, 0, -2.82654, 1.60172, -2.4894, 1.60188, -15.98976, 10.32721, -15.98938, 10.3277, -0.64944, -1.96115, -0.64929, -1.96082, -8.67078, 1.01303, -7.6366, 1.01357, -2.97052, 0.34692, -2.61644, 0.3476, -10.75204, 1.25653, -9.46964, 1.25705, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -18.93701, 2.21329, -16.67841, 2.21358, -16.67833, 2.21367, -16.15625, 1.88818, -14.22923, 1.8886, -14.22917, 1.88867, -7.32959, 0.85648, -6.4554, 0.85704, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -2.45544, 0.45947, -2.16273, 0.45963, -2.16269, 0.4597, -0.45786, 0.17761, -0.40327, 0.17772, -4.47153, 0.83658, -3.93811, 0.83688 ] + } + ] + }, + "L_foot": { + "L_foot": [ + { + "vertices": [ 32.68079, -7.56046, 32.68079, -7.56046, 32.68079, -7.56046, 32.68079, -7.56046 ] + } + ] + }, + "L_wing": { + "L_wing": [ + { + "vertices": [ -4.27489, 26.67386, -26.45953, -5.4467, 46.59749, 18.47894, -20.51476, 45.73743, 13.95807, -43.26625, 42.60894, 15.85114, -36.91428, -35.07135, 36.66417, -35.33297 ] + } + ] + }, + "R_foot": { + "R_foot": [ + { + "vertices": [ -20.46537, -32.39883, -25.30428, -2.89771, -3.40881, 0.69367, 1.43011, -28.8075 ] + } + ] + }, + "R_wing": { + "R_wing": [ + { + "vertices": [ 18.48068, 129.83382, -130.52315, 12.7402, 96.8046, 109.6412, -113.80231, 91.87796, 38.92776, 16.92949, -18.6298, 38.14354, -39.39606, 37.12224, -35.35072, -40.99409 ] + } + ] + } } } }, "right": { "bones": { "control": { + "rotate": [ + { "value": -1.83 } + ], "translate": [ - { "x": -39.22 } + { "x": -27.71, "y": 0.14 } ] + }, + "head": { + "rotate": [ + { "value": 0.36 } + ], + "translate": [ + { "x": -12.95, "y": 32.1 } + ], + "scale": [ + { "x": 0.949 } + ], + "shear": [ + { "y": 12.9 } + ] + }, + "body-top-control": { + "translate": [ + { "x": -198.07, "y": -21.06 } + ] + }, + "control-back": { + "translate": [ + { "x": 14.52, "y": 22.15 } + ], + "scale": [ + { "x": 0.824 } + ] + }, + "tail-feathers": { + "rotate": [ + { "value": 12.67 } + ], + "translate": [ + { "x": 85.12, "y": 3.76 } + ] + }, + "branch-1": { + "shear": [ + { "x": 5.71 } + ] + }, + "leaf-1": { + "rotate": [ + { "value": -4.65 } + ] + }, + "leaf-7": { + "rotate": [ + { "value": -0.49 } + ] + }, + "branch-2": { + "rotate": [ + { "value": 14.88 } + ], + "shear": [ + { "y": 7.92 } + ] + }, + "branch-6": { + "rotate": [ + { "value": 22.6 } + ] + }, + "leaf-4": { + "rotate": [ + { "value": 33.05 } + ] + }, + "leaf-6": { + "rotate": [ + { "value": 9.92 } + ] + }, + "leaf-3": { + "rotate": [ + { "value": -0.07 } + ] + }, + "branch-4": { + "rotate": [ + { "value": 7.3 } + ] + }, + "leaf-5": { + "rotate": [ + { "value": 14.96 } + ] + }, + "leaf-2": { + "rotate": [ + { "value": -12.1 } + ] + }, + "branch-3": { + "rotate": [ + { "value": 5.4 } + ] + } + }, + "deform": { + "default": { + "head-base": { + "head-base": [ + { + "vertices": [ 11.1344, -1.06403, 13.4433, -1.51923, 11.08145, -1.51938, 12.53537, -1.19803, 15.13455, -1.71051, 12.47559, -1.71072, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.56973, 0.88794, 0.60562, 0.86386, 7.85834, 12.59955, 10.15225, 12.26709, 8.36813, 12.26724, 3.38986, 7.69897, 4.49231, 7.55347, 3.70251, 7.55368, -0.97604, 5.23138, -0.92181, 5.26715, -0.76071, 5.26755, 1.32083, 22.53156, 2.72308, 22.45892, 2.24338, 22.45923, -3.96936, 19.33832, -3.84851, 19.48505, -3.17334, 19.48557, -6.3392, 31.11188, -6.13593, 31.3457, -5.05893, 31.34583, -24.94391, 28.39221, -28.82199, 29.39117, -23.75919, 29.3912, -56.22678, 14.04083, -46.34955, 14.04099, -56.22678, 14.04083, -46.34955, 14.04099, -56.22678, 14.04083, -46.34955, 14.04099, -38.34558, 15.25574, -31.60992, 15.2561, -7.34616, 3.76868, -6.05621, 3.76898, 0, 0, 0, 0, 2.16394, -6.08075, 1.78259, -6.08026, 6.83832, -19.22064, 5.63589, -19.22021, 6.83832, -19.22064, 5.63589, -19.22021, 6.83832, -19.22064, 5.63589, -19.22021, 3.1478, -8.84509, 2.59338, -8.84448, 38.20682, -13.54205, 31.49402, -13.54196, 22.70163, -2.56564, 18.71329, -2.56577, 0, 0, 0, 0, -0.43359, 3.77911, -0.27841, 3.79391, 0.11462, 0.26648, 0.12549, 0.26163, 1.81287, -0.17331, 1.80423, -0.24731, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -2.63617, 1.49402, -3.11993, 1.60059, -2.57245, 1.6011, -23.26324, 6.68951, -19.1777, 6.68982, 1.72217, -4.84058, 1.41837, -4.8396, 0.2225, -0.6604, 0.1955, -0.66821, 0, 0, 0, 0, 0, 0, 0, 0, -17.02399, 8.7337, -14.03403, 8.73428, 3.4574, -9.71698, 2.84891, -9.71613, 1.56943, 4.6452, 1.7587, 4.57733, -0.13034, 0.7984, -0.0975, 0.80319, -0.81927, 3.48224, -0.67593, 3.51291, 11.55099, -1.10391, 13.94623, -1.57617, 11.49603, -1.57617, 7.56793, -0.7233, 9.13727, -1.03268, 7.53198, -1.03275, 1.63562, -0.15628, 1.62781, -0.22321, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -5.16141, 15.28809, -5.4942, 15.48712, -4.53036, 15.48749, -3.8877, 17.94763, -3.81842, 18.09192, -3.14871, 18.09222, 3.01028, 16.62122, 4.4769, 16.48401, 3.68909, 16.48447, 0.54437, 3.79083, 0.69931, 3.76553, 9.14157, -3.81387, 8.9776, -4.18481, 12.65292, -1.20917, 15.27689, -1.72641, 12.59274, -1.72662, 20.33411, -1.94312, 24.55048, -2.77457, 20.23727, -2.77475, 5.69284, -0.54407, 5.66556, -0.77692, 5.24939, -0.50168, 5.22458, -0.71631, 0, 0, 0, 0, 4.19965, 7.2785, 5.45303, 7.10022, 4.49445, 7.10037, 1.8887, 2.94391, 2.00775, 2.86407, 1.66986, 3.74084, 1.82175, 3.6698 ] + } + ] + }, + "L_foot": { + "L_foot": [ + { + "vertices": [ 39.31265, 4.41002, 41.72089, -32.44155, 14.37022, -34.22886, 11.96194, 2.62272 ] + } + ] + }, + "L_wing": { + "L_wing": [ + { + "vertices": [ 117.33383, -45.40262, 40.18668, 119.21864, 56.25742, -57.3571, 54.82147, 58.72855, -3.51584, 22.62314, -22.44652, -4.51169, 57.56076, 34.57768, -37.08134, 55.97851 ] + } + ] + }, + "R_foot": { + "R_foot": [ + { + "vertices": [ -30.70229, -18.33, -30.70229, -18.33, -30.70229, -18.33, -30.70229, -18.33 ] + } + ] + }, + "R_wing": { + "R_wing": [ + { + "vertices": [ 109.29965, -8.02332, 3.1934, 109.53658, -6.01328, -56.23985, 56.44511, -3.53917, -150.89093, 30.36821, -23.69317, -152.09174, -25.20395, 129.73512, -128.50223, -30.90591 ] + } + ] + } } } }, @@ -590,8 +999,126 @@ "bones": { "control": { "translate": [ - { "y": 41.67 } + { "x": 0.3, "y": 34.37 } + ], + "scale": [ + { "y": 0.82 } ] + }, + "control-back": { + "translate": [ + { "y": -17.04 } + ] + }, + "owl-base": { + "rotate": [ + { "value": -4.43 } + ], + "translate": [ + { "x": 18.2, "y": 11.22 } + ], + "scale": [ + { "x": 0.966 } + ] + }, + "tail-feathers": { + "translate": [ + { "x": 0.02, "y": -1.52 } + ], + "scale": [ + { "x": 1.375 } + ] + }, + "body-top-control": { + "translate": [ + { "x": -4.77, "y": 214.56 } + ] + }, + "head": { + "translate": [ + { "x": -7.82, "y": -13.16 } + ] + }, + "branch-1": { + "rotate": [ + { "value": 4.94 } + ] + }, + "branch-2": { + "rotate": [ + { "value": 0.52 } + ] + }, + "branch-3": { + "rotate": [ + { "value": 1.64 } + ] + }, + "branch-4": { + "rotate": [ + { "value": -10.43 } + ] + }, + "branch-6": { + "rotate": [ + { "value": -5.42 } + ] + }, + "leaf-6": { + "rotate": [ + { "value": -5.42 } + ] + }, + "leaf-2": { + "rotate": [ + { "value": 4.46 } + ] + } + }, + "deform": { + "default": { + "body": { + "body": [ + { + "vertices": [ 9.78479, 0.43167, -8.5E-4, -9.79428, -11.07703, -0.48866, -0.00134, 11.08782, -20.53809, -0.9061, -28.18424, -1.2431, -4.9E-4, 28.21165, -28.17087, -1.24221, -3.1E-4, 28.19826, 0, 24.02027, -6.0E-5, 11.5683, -1.2E-4, -13.20591, 0, -22.67455, 28.15435, 1.2429, -5.5E-4, -28.18175, 28.14419, 1.24231, -0.0011, -28.17157, 20.9281, 0.92327, 0.10129, 0.00519, -1.2E-4, -0.10139, 0.59372, 0.02641, -7.3E-4, -0.59428, 15.61523, 0.6889, 15.26075, 0.674, -2.4E-4, -15.27561, 0, -0.2351, -14.31816, -0.63171, -13.76835, -0.60672, -1.8E-4, 13.78173, -1.2E-4, 12.47625, 0, -14.37328 ] + } + ] + }, + "head-base": { + "head-base": [ + { + "vertices": [ 18.08182, 3.28656, 18.08179, 2.69717, 18.08178, 2.69556, -2.08492, 2.81512, -2.08508, 2.31323, -2.08507, 2.30927, -8.5588, 0.05725, -8.55899, 0.05139, -8.55895, 0.04797, -3.56028, 0.02087, -3.56047, 0.02148, -3.56043, 0.01813, 4.05834, -0.03473, 4.05819, -0.02759, 10.06431, -0.07898, 10.06412, -0.06018, 10.06416, -0.06366, -1.18406, 0.43097, -1.1842, 0.3598, -1.1842, 0.35504, -22.98684, 1.70819, -22.98685, 1.40356, -22.98685, 1.40192, -22.18155, 1.67535, -22.18157, 1.3768, -22.18156, 1.37482, -21.46276, 1.13605, -21.46278, 0.93509, -21.46278, 0.93274, -11.08284, 0.68683, -11.08286, 0.56689, -11.08287, 0.56433, 0.1016, -3.78925, 0.10144, -3.10156, 0.10147, -3.10522, 0.26772, -8.18402, 0.26778, -8.18665, 0.26772, -8.18402, 0.26778, -8.18665, 0.26772, -8.18402, 0.26778, -8.18665, 0.26772, -8.18402, 0.26778, -8.18665, 0.26772, -8.18402, 0.26778, -8.18665, 0.26772, -8.18402, 0.26778, -8.18665, 0.26772, -8.18402, 0.26778, -8.18665, 0.26772, -8.18402, 0.26778, -8.18665, 0.26772, -8.18402, 0.26778, -8.18665, 0.26772, -8.18402, 0.26778, -8.18665, 0.26772, -8.18402, 0.26778, -8.18665, -1.74113, -4.18475, -1.7411, -4.18774, 15.8009, 1.18192, 15.80089, 1.1803, -1.88757, -4.98645, -1.8877, -4.08496, 0.13537, -5.04669, 0.13525, -4.13477, -4.33013, 1.79584, -4.33031, 1.47333, 4.45505, 5.67249, 4.45488, 4.65088, 0, 0, 0, 0, 0.18132, -6.76221, 0.18118, -5.54102, 0.40078, -0.00842, 0.40061, -0.00568, -10.01764, 0.73737, -10.0178, 0.60657, 10.43705, -0.08221, 10.43689, -0.06635, 0.27294, 0.21985, 0.27294, 0.18121, 0, 0, 0, 0, 0.17916, -0.00677, 0.179, -0.00452, 0.11242, -4.19293, 0.11229, -3.43506, 0.13193, -4.92053, 0.13181, -4.03156, 0.01666, -0.62231, 0.01653, -0.50916, 0.204, -7.60742, 0.20387, -6.23346, 0.1807, -6.73987, 0.18056, -5.52264, 0.2084, -7.77295, 0.20825, -6.36969, 0.23492, -8.75995, 0.23476, -7.17548, 0.2348, -7.1781, 0.26772, -8.18402, 0.26778, -8.18665, 0.26772, -8.18402, 0.26778, -8.18665, 0.22325, -8.32697, 0.22312, -6.82336, 0.23393, -8.72394, 0.2338, -7.14856, 0.22255, -8.30029, 0.22242, -6.80145, 0.26772, -8.18402, 0.26778, -8.18665, 0.26772, -8.18402, 0.26778, -8.18665, -3.50412, 1.55554, -3.50416, 1.27625, -5.88762, 2.62024, -5.88765, 2.1488, -0.90049, -1.34583, -0.90065, -1.10168, 10.97694, 4.55176, 10.97691, 3.73422, 10.97687, 3.73248, -4.2139, 0.11591, -4.21404, 0.10239, -4.21406, 0.09705, 4.95192, 7.71997, 4.95192, 6.32831, 0.15553, -5.79968, 0.1554, -4.75214, 0.1638, -6.10944, 0.16368, -5.00592, 0.1761, -6.56738, 0.17597, -5.38116, 0.16425, -6.12555, 0.16413, -5.01947, 2.14045, 2.33923, 2.1404, 1.91858, -1.85151, -0.18054, -1.85164, -0.14532, 0, 0, 0, 0, 0, 0, 0, 0, 0.14525, -5.41821, 0.14508, -4.43677, 0.14511, -4.43958, -1.12234, 0.20605, -1.12251, 0.17688, -1.1225, 0.17065, -10.04741, 1.59747, -10.04749, 1.31299, -10.0475, 1.31073, -9.60033, 1.93549, -9.60038, 1.58783, -1.90081, -5.94379, -1.90096, -4.87024, -0.06005, 1.354, -0.06008, 1.11313, -0.0601, 1.11108, 24.57889, 4.97925, 24.57886, 4.08423, 24.57883, 4.08252, 1.27811, 5.86395, 1.27796, 4.80841, 1.27968, 3.76697, 1.27951, 3.08911, 1.03323, 2.66321, 1.03302, 2.18518, -2.23629, 0.79535, -2.23643, 0.65601, -2.23644, 0.65265, 3.64207, 0.25793, 3.6419, 0.2124, -3.56169, 1.526, -3.56186, 1.25299 ] + } + ] + }, + "L_foot": { + "L_foot": [ + { + "vertices": [ 5.89397, 0.69042, 5.89397, 0.69042, 5.89397, 0.69042, 5.89397, 0.69042 ] + } + ] + }, + "L_wing": { + "L_wing": [ + { + "vertices": [ -11.13373, 20.07786, -19.56781, -12.00009, 23.31055, 16.37385, -17.38553, 22.57391, 17.65799, -39.82292, 39.00579, 19.4036, -16.78632, -36.11907, 36.82366, -15.17023 ] + } + ] + }, + "R_foot": { + "R_foot": [ + { + "vertices": [ 35.48705, -0.58566, 32.90477, 10.12547, 40.85446, 12.04202, 43.43665, 1.33094 ] + } + ] + }, + "R_wing": { + "R_wing": [ + { + "vertices": [ 24.96088, -21.2647, 20.14355, 25.88189, 6.7001, -22.29713, 21.97984, 7.68417, 8.16104, -3.76462, 3.40096, 8.32676, 26.42206, -2.73223, 1.56473, 26.52477 ] + } + ] + } } } } diff --git a/examples/owl/export/owl-pro.skel b/examples/owl/export/owl-pro.skel index b72cc0235..24937e6dd 100644 Binary files a/examples/owl/export/owl-pro.skel and b/examples/owl/export/owl-pro.skel differ diff --git a/examples/owl/export/owl.atlas b/examples/owl/export/owl.atlas index a7a87d6b9..1b1d4b8b1 100644 --- a/examples/owl/export/owl.atlas +++ b/examples/owl/export/owl.atlas @@ -1,6 +1,7 @@ owl.png size: 1024, 512 filter: Linear, Linear + scale: 0.5 L_eye-closed bounds: 512, 5, 90, 86 rotate: 90 diff --git a/examples/powerup/export/powerup-pma.png b/examples/powerup/export/powerup-pma.png index 466b3a246..85e6673c9 100644 Binary files a/examples/powerup/export/powerup-pma.png and b/examples/powerup/export/powerup-pma.png differ diff --git a/examples/powerup/export/powerup.png b/examples/powerup/export/powerup.png index 1b5e28f86..8689eb99e 100644 Binary files a/examples/powerup/export/powerup.png and b/examples/powerup/export/powerup.png differ diff --git a/examples/raptor/export/raptor-pma.png b/examples/raptor/export/raptor-pma.png index 8119189a9..842f3207f 100644 Binary files a/examples/raptor/export/raptor-pma.png and b/examples/raptor/export/raptor-pma.png differ diff --git a/examples/raptor/export/raptor.png b/examples/raptor/export/raptor.png index 9140cfc79..531519ccc 100644 Binary files a/examples/raptor/export/raptor.png and b/examples/raptor/export/raptor.png differ diff --git a/examples/raptor/manual-maps/raptor-normals.png b/examples/raptor/manual-maps/raptor-normals.png index ee6b29297..bcc8f0a10 100644 Binary files a/examples/raptor/manual-maps/raptor-normals.png and b/examples/raptor/manual-maps/raptor-normals.png differ diff --git a/examples/raptor/manual-maps/raptor-rim-mask.png b/examples/raptor/manual-maps/raptor-rim-mask.png index 71beff415..4e581aa22 100644 Binary files a/examples/raptor/manual-maps/raptor-rim-mask.png and b/examples/raptor/manual-maps/raptor-rim-mask.png differ diff --git a/examples/speedy/export/speedy-pma.png b/examples/speedy/export/speedy-pma.png index 4de3527c7..414ed24cb 100644 Binary files a/examples/speedy/export/speedy-pma.png and b/examples/speedy/export/speedy-pma.png differ diff --git a/examples/speedy/export/speedy.png b/examples/speedy/export/speedy.png index ad0aeaafd..d1f3e3b60 100644 Binary files a/examples/speedy/export/speedy.png and b/examples/speedy/export/speedy.png differ diff --git a/examples/spineboy/export/spineboy-pma.png b/examples/spineboy/export/spineboy-pma.png index 527fbeb8f..21ce45f27 100644 Binary files a/examples/spineboy/export/spineboy-pma.png and b/examples/spineboy/export/spineboy-pma.png differ diff --git a/examples/spineboy/export/spineboy.png b/examples/spineboy/export/spineboy.png index 3f7eb0644..55c901795 100644 Binary files a/examples/spineboy/export/spineboy.png and b/examples/spineboy/export/spineboy.png differ diff --git a/examples/stretchyman/export/stretchyman-pma.png b/examples/stretchyman/export/stretchyman-pma.png index 1fa519ac0..acd0a5ab5 100644 Binary files a/examples/stretchyman/export/stretchyman-pma.png and b/examples/stretchyman/export/stretchyman-pma.png differ diff --git a/examples/stretchyman/export/stretchyman-pro.json b/examples/stretchyman/export/stretchyman-pro.json index 7d9abe03a..dd11cb012 100644 --- 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.58-beta", + "spine": "4.0.07", "x": -100.47, "y": -9.21, "width": 260.65, @@ -426,8 +426,7 @@ "scaleY": -3.0E-4, "shearY": 0.1, "mixRotate": 0, - "mixScaleX": 0, - "mixScaleY": 0 + "mixScaleX": 0 }, { "name": "front-foot-position", @@ -441,8 +440,7 @@ "scaleY": -3.0E-4, "shearY": 0.1, "mixRotate": 0, - "mixScaleX": 0, - "mixScaleY": 0 + "mixScaleX": 0 } ], "path": [ diff --git a/examples/stretchyman/export/stretchyman-pro.skel b/examples/stretchyman/export/stretchyman-pro.skel index 9dc2872e9..59a4d5ed5 100644 Binary files a/examples/stretchyman/export/stretchyman-pro.skel and b/examples/stretchyman/export/stretchyman-pro.skel differ diff --git a/examples/tank/export/tank-pma.png b/examples/tank/export/tank-pma.png index 2494ef8b1..066e78411 100644 Binary files a/examples/tank/export/tank-pma.png and b/examples/tank/export/tank-pma.png differ diff --git a/examples/tank/export/tank.png b/examples/tank/export/tank.png index 8f7eb72da..d2ff3bc97 100644 Binary files a/examples/tank/export/tank.png and b/examples/tank/export/tank.png differ diff --git a/examples/vine/export/vine-pma.png b/examples/vine/export/vine-pma.png index 7805c8b69..45b6d8063 100644 Binary files a/examples/vine/export/vine-pma.png and b/examples/vine/export/vine-pma.png differ diff --git a/examples/vine/export/vine-pro.json b/examples/vine/export/vine-pro.json index 125937a01..b760e7adb 100644 --- a/examples/vine/export/vine-pro.json +++ b/examples/vine/export/vine-pro.json @@ -1,7 +1,7 @@ { "skeleton": { "hash": "mROo4Xkf3Fs", - "spine": "4.0.58-beta", + "spine": "4.0.07", "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 index 647e7d1f3..e3e4fc684 100644 Binary files a/examples/vine/export/vine-pro.skel and b/examples/vine/export/vine-pro.skel differ diff --git a/examples/windmill/export/windmill-ess.json b/examples/windmill/export/windmill-ess.json index ed57607d8..98cecaaea 100644 --- a/examples/windmill/export/windmill-ess.json +++ b/examples/windmill/export/windmill-ess.json @@ -1,7 +1,7 @@ { "skeleton": { "hash": "tBKgYacI7e4", - "spine": "4.0.58-beta", + "spine": "4.0.07", "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 index da48bee84..89e0e3313 100644 Binary files a/examples/windmill/export/windmill-ess.skel and b/examples/windmill/export/windmill-ess.skel differ diff --git a/examples/windmill/export/windmill-pma.atlas b/examples/windmill/export/windmill-pma.atlas index 36878fd3b..8abee6cff 100644 --- a/examples/windmill/export/windmill-pma.atlas +++ b/examples/windmill/export/windmill-pma.atlas @@ -2,6 +2,7 @@ windmill-pma.png size: 1024, 512 filter: Linear, Linear pma: true + scale: 0.5 bush1 bounds: 398, 8, 56, 38 bush2 diff --git a/examples/windmill/export/windmill-pma.png b/examples/windmill/export/windmill-pma.png index ac2ff4fc0..98dc0c30f 100644 Binary files a/examples/windmill/export/windmill-pma.png and b/examples/windmill/export/windmill-pma.png differ diff --git a/examples/windmill/export/windmill.atlas b/examples/windmill/export/windmill.atlas index 17227d767..bf0a6cd99 100644 --- a/examples/windmill/export/windmill.atlas +++ b/examples/windmill/export/windmill.atlas @@ -1,6 +1,7 @@ windmill.png size: 1024, 512 filter: Linear, Linear + scale: 0.5 bush1 bounds: 398, 8, 56, 38 bush2