From 1fafbd0cb7a8803610676327e53ba9d3c6a4d54b Mon Sep 17 00:00:00 2001 From: badlogic Date: Wed, 3 May 2017 14:45:25 +0200 Subject: [PATCH] [corona] Added coin sample, added clipping attachment loading, fixed bug in Corona renderer. --- examples/export/runtimes.sh | 4 + spine-corona/data/coin.atlas | 27 +++ spine-corona/data/coin.json | 171 ++++++++++++++++++ spine-corona/data/coin.png | Bin 0 -> 24464 bytes spine-corona/main.lua | 7 +- spine-corona/spine-corona/spine.lua | 8 +- .../spine/utils/Triangulator.java | 1 + spine-lua/AtlasAttachmentLoader.lua | 5 + spine-lua/AttachmentLoader.lua | 5 + spine-lua/SkeletonClipping.lua | 56 ++++++ spine-lua/SkeletonJson.lua | 24 ++- spine-lua/attachments/AttachmentType.lua | 3 +- spine-lua/attachments/ClippingAttachment.lua | 48 +++++ 13 files changed, 351 insertions(+), 8 deletions(-) create mode 100644 spine-corona/data/coin.atlas create mode 100644 spine-corona/data/coin.json create mode 100644 spine-corona/data/coin.png create mode 100644 spine-lua/SkeletonClipping.lua create mode 100644 spine-lua/attachments/ClippingAttachment.lua diff --git a/examples/export/runtimes.sh b/examples/export/runtimes.sh index f39dec09e..0d658945c 100755 --- a/examples/export/runtimes.sh +++ b/examples/export/runtimes.sh @@ -80,6 +80,10 @@ cp -f ../tank/export/tank.png ../../spine-cocos2dx/example/Resources/common/ echo "spine-corona" rm -f ../../spine-corona/data/* +cp -f ../coin/export/coin.json ../../spine-corona/data +cp -f ../coin/export/coin.atlas ../../spine-corona/data +cp -f ../coin/export/coin.png ../../spine-corona/data + cp -f ../goblins/export/goblins-mesh.json ../../spine-corona/data cp -f ../goblins/export/goblins.atlas ../../spine-corona/data cp -f ../goblins/export/goblins.png ../../spine-corona/data diff --git a/spine-corona/data/coin.atlas b/spine-corona/data/coin.atlas new file mode 100644 index 000000000..bcdb26b10 --- /dev/null +++ b/spine-corona/data/coin.atlas @@ -0,0 +1,27 @@ + +coin.png +size: 512,128 +format: RGBA8888 +filter: Linear,Linear +repeat: none +coin + rotate: false + xy: 2, 2 + size: 130, 123 + orig: 130, 123 + offset: 0, 0 + index: -1 +coin-invert + rotate: false + xy: 134, 2 + size: 130, 123 + orig: 130, 123 + offset: 0, 0 + index: -1 +shine + rotate: false + xy: 266, 2 + size: 36, 123 + orig: 36, 123 + offset: 0, 0 + index: -1 diff --git a/spine-corona/data/coin.json b/spine-corona/data/coin.json new file mode 100644 index 000000000..f678be598 --- /dev/null +++ b/spine-corona/data/coin.json @@ -0,0 +1,171 @@ +{ +"skeleton": { "hash": "4cI0KYdFTZbO7vkQYPFQN+yauDw", "spine": "3.6.14-beta", "width": 260, "height": 359.92, "images": "./images/" }, +"bones": [ + { "name": "root" }, + { "name": "coin-root", "parent": "root", "y": 300, "color": "ff0000ff" }, + { "name": "coin", "parent": "coin-root", "color": "ffe037ff" }, + { "name": "clipping", "parent": "coin", "x": 7.25, "scaleX": 0.96, "scaleY": 0.967, "color": "ffe037ff" }, + { "name": "shine", "parent": "coin-root", "rotation": -24.17, "scaleY": 1.478, "color": "ffffffff" } +], +"slots": [ + { "name": "images/coin", "bone": "coin", "attachment": "coin" }, + { "name": "clipping", "bone": "clipping", "attachment": "clipping" }, + { "name": "images/shine", "bone": "shine", "color": "ffffff93", "attachment": "shine", "blend": "additive" } +], +"skins": { + "default": { + "clipping": { + "clipping": { + "type": "clipping", + "end": "images/coin", + "vertexCount": 36, + "vertices": [ 0.82, 120.87, 25.27, 118.4, 49.23, 110.99, 71.46, 98.15, 88.25, 83.08, 102.58, 64.8, 112.21, 46.03, 117.89, 28, 121.35, 9.23, 120.61, -11.52, 117.65, -30.29, 111.72, -48.08, 102.33, -65.61, 89.47, -82.23, 76.24, -94.71, 61.33, -105.13, 46.26, -112.54, 28.73, -118.22, 8.73, -120.89, -12.27, -120.89, -32.03, -116.94, -51.04, -110.27, -67.59, -101.63, -82.91, -88.78, -96.25, -74.21, -108.35, -55.68, -116.5, -35.43, -120.7, -14.19, -121.69, 5.57, -118.97, 27.56, -111.56, 49.04, -100.43, 69.69, -84.38, 87.47, -66.1, 102.29, -45.6, 112.67, -23.62, 118.59 ], + "color": "ce3a3aff" + } + }, + "images/coin": { + "coin": { + "type": "mesh", + "uvs": [ 1, 1, 0.51662, 0.99661, 0.38311, 0.99567, 0.29957, 0.96664, 0.22817, 0.93237, 0.16736, 0.88777, 0.11597, 0.83202, 0.06732, 0.76058, 0.03288, 0.69072, 0.00816, 0.61391, 0, 0.52843, 0, 0.43778, 0.02307, 0.33992, 0.06544, 0.24204, 0.11924, 0.16659, 0.17691, 0.10919, 0.24399, 0.06252, 0.31853, 0.02742, 0.41818, 0.0076, 0.52609, 1.0E-5, 1, 0, 0.45994, 0.99066, 0.37873, 0.97119, 0.30719, 0.94057, 0.24626, 0.89841, 0.19491, 0.85157, 0.14893, 0.79961, 0.11299, 0.73943, 0.08595, 0.67565, 0.06609, 0.60105, 0.05753, 0.52647, 0.05856, 0.44906, 0.07176, 0.36094, 0.10407, 0.28078, 0.15657, 0.19211, 0.22811, 0.1162, 0.29907, 0.0658, 0.38388, 0.02814, 0.46119, 0.00993 ], + "triangles": [ 38, 18, 19, 37, 17, 18, 37, 18, 38, 36, 16, 17, 36, 17, 37, 35, 15, 16, 35, 16, 36, 34, 14, 15, 34, 15, 35, 34, 33, 13, 34, 13, 14, 12, 13, 33, 32, 12, 33, 11, 12, 32, 31, 11, 32, 31, 10, 11, 30, 10, 31, 31, 33, 30, 29, 30, 33, 29, 9, 10, 29, 10, 30, 32, 33, 31, 34, 28, 29, 8, 9, 29, 8, 29, 28, 33, 34, 29, 25, 26, 27, 7, 8, 28, 7, 28, 27, 27, 28, 25, 26, 7, 27, 6, 7, 26, 34, 36, 28, 28, 36, 25, 6, 26, 25, 5, 6, 25, 34, 35, 36, 37, 24, 25, 5, 25, 24, 4, 5, 24, 36, 37, 25, 22, 23, 24, 4, 24, 23, 3, 4, 23, 24, 21, 22, 3, 23, 22, 38, 24, 37, 24, 1, 21, 2, 22, 21, 3, 22, 2, 1, 38, 19, 1, 24, 38, 2, 21, 1, 19, 20, 0, 1, 19, 0 ], + "vertices": [ 130, -123.5, 4.32, -122.66, -30.39, -122.43, -52.11, -115.26, -70.68, -106.8, -86.49, -95.78, -99.85, -82.01, -112.5, -64.36, -121.45, -47.11, -127.88, -28.14, -130, -7.02, -130, 15.37, -124, 39.54, -112.99, 63.72, -99, 82.35, -84, 96.53, -66.56, 108.06, -47.18, 116.73, -21.27, 121.62, 6.78, 123.5, 130, 123.5, -10.42, -121.19, -31.53, -116.39, -50.13, -108.82, -65.97, -98.41, -79.32, -86.84, -91.28, -74, -100.62, -59.14, -107.65, -43.39, -112.82, -24.96, -115.04, -6.54, -114.77, 12.58, -111.34, 34.35, -102.94, 54.15, -89.29, 76.05, -70.69, 94.8, -52.24, 107.25, -30.19, 116.55, -10.09, 121.05 ], + "hull": 21, + "edges": [ 0, 40, 42, 44, 44, 46, 46, 48, 48, 50, 50, 52, 52, 54, 54, 56, 56, 58, 58, 60, 60, 62, 62, 64, 64, 66, 66, 68, 68, 70, 70, 72, 72, 74, 74, 76, 36, 34, 34, 32, 32, 30, 30, 28, 28, 26, 26, 24, 24, 22, 20, 22, 20, 18, 18, 16, 16, 14, 14, 12, 12, 10, 10, 8, 8, 6, 6, 4, 0, 2, 2, 4, 42, 2, 38, 40, 36, 38, 76, 38, 2, 38 ], + "width": 259, + "height": 245 + }, + "coin-invert": { + "type": "mesh", + "uvs": [ 0.61921, 0.00932, 0.70137, 0.03058, 0.76675, 0.06301, 0.82357, 0.10192, 0.86533, 0.14084, 0.90128, 0.1866, 0.92763, 0.22768, 0.95707, 0.28353, 0.97795, 0.33937, 0.99074, 0.38663, 1, 0.45194, 1, 0.50671, 1, 0.56148, 0.98993, 0.62238, 0.97282, 0.6757, 0.95125, 0.73083, 0.91771, 0.78704, 0.88283, 0.83498, 0.84141, 0.87966, 0.79349, 0.91785, 0.73701, 0.95172, 0.65999, 0.98127, 0.60659, 0.991, 0.51662, 0.99661, 0, 1, 0, 0, 0.52609, 1.0E-5, 0.57849, 0.98348, 0.64806, 0.96162, 0.70899, 0.92882, 0.75987, 0.89639, 0.80219, 0.85685, 0.83745, 0.81722, 0.86381, 0.77794, 0.89445, 0.72582, 0.9167, 0.67213, 0.93142, 0.61628, 0.94164, 0.56011, 0.94506, 0.50823, 0.9437, 0.45454, 0.93514, 0.39905, 0.91905, 0.34031, 0.89748, 0.28194, 0.8691, 0.2284, 0.83932, 0.18768, 0.79995, 0.143, 0.76298, 0.10841, 0.71814, 0.07598, 0.66748, 0.04824, 0.61408, 0.0277, 0.5665, 0.01437 ], + "triangles": [ 50, 26, 0, 49, 50, 0, 48, 0, 1, 49, 0, 48, 47, 1, 2, 48, 1, 47, 46, 47, 2, 46, 2, 3, 45, 46, 3, 45, 3, 4, 44, 45, 4, 44, 4, 5, 43, 44, 5, 43, 5, 6, 42, 43, 6, 42, 6, 7, 41, 42, 7, 41, 7, 8, 40, 41, 8, 40, 8, 9, 39, 40, 9, 10, 39, 9, 39, 10, 11, 38, 39, 11, 41, 40, 38, 38, 40, 39, 38, 11, 12, 37, 38, 12, 38, 36, 41, 37, 36, 38, 13, 37, 12, 36, 37, 13, 36, 43, 41, 41, 43, 42, 14, 36, 13, 35, 36, 14, 44, 43, 36, 35, 34, 36, 15, 35, 14, 34, 35, 15, 44, 36, 45, 34, 33, 36, 16, 34, 15, 33, 34, 16, 48, 47, 49, 36, 33, 45, 17, 33, 16, 32, 33, 17, 32, 31, 33, 18, 32, 17, 31, 32, 18, 33, 29, 45, 45, 47, 46, 31, 30, 33, 19, 30, 31, 19, 31, 18, 49, 47, 45, 30, 29, 33, 20, 29, 30, 20, 30, 19, 50, 49, 29, 45, 29, 49, 21, 28, 29, 21, 29, 20, 29, 27, 50, 28, 27, 29, 22, 27, 28, 22, 28, 21, 23, 25, 26, 23, 26, 50, 23, 50, 27, 23, 27, 22, 24, 25, 23 ], + "vertices": [ 42.18, 121.2, 63.54, 115.95, 80.54, 107.94, 95.31, 98.32, 106.17, 88.71, 115.51, 77.41, 122.37, 67.26, 130.02, 53.47, 135.45, 39.68, 138.77, 28, 141.18, 11.87, 141.18, -1.66, 141.18, -15.19, 138.56, -30.23, 134.11, -43.4, 128.51, -57.02, 119.79, -70.9, 110.72, -82.74, 99.95, -93.78, 87.49, -103.21, 72.8, -111.58, 52.78, -118.87, 38.9, -121.28, 15.5, -122.66, -118.82, -123.5, -118.82, 123.5, 17.97, 123.5, 31.59, -119.42, 49.68, -114.02, 65.52, -105.92, 78.75, -97.91, 89.75, -88.14, 98.92, -78.35, 105.77, -68.65, 113.74, -55.78, 119.52, -42.52, 123.35, -28.72, 126.01, -14.85, 126.9, -2.03, 126.54, 11.23, 124.32, 24.94, 120.13, 39.44, 114.53, 53.86, 107.15, 67.09, 99.4, 77.14, 89.17, 88.18, 79.56, 96.72, 67.9, 104.73, 54.73, 111.59, 40.84, 116.66, 28.47, 119.95 ], + "hull": 27, + "edges": [ 46, 52, 46, 54, 54, 56, 56, 58, 58, 60, 60, 62, 62, 64, 64, 66, 66, 68, 68, 70, 70, 72, 72, 74, 74, 76, 76, 78, 78, 80, 80, 82, 82, 84, 84, 86, 86, 88, 88, 90, 90, 92, 92, 94, 94, 96, 96, 98, 98, 100, 100, 52, 52, 0, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 20, 22, 22, 24, 24, 26, 26, 28, 28, 30, 30, 32, 32, 34, 34, 36, 36, 38, 38, 40, 40, 42, 42, 44, 44, 46, 48, 50, 50, 52, 46, 48, 16, 18, 18, 20 ], + "width": 259, + "height": 245 + } + }, + "images/shine": { + "shine": { "width": 72, "height": 245 } + } + } +}, +"animations": { + "rotate": { + "slots": { + "images/coin": { + "attachment": [ + { "time": 0.5, "name": "coin-invert" } + ] + }, + "images/shine": { + "color": [ + { "time": 0, "color": "ffffff00" }, + { "time": 0.2667, "color": "ffffffbc" }, + { "time": 0.5, "color": "ffffff00" }, + { "time": 0.7333, "color": "ffffffbc" }, + { "time": 1, "color": "ffffff00" } + ] + } + }, + "bones": { + "shine": { + "translate": [ + { + "time": 0, + "x": 175.08, + "y": 0, + "curve": [ 0.213, 0.65, 0.931, 0.67 ] + }, + { + "time": 0.5, + "x": -127.2, + "y": 0, + "curve": [ 0.55, 0.09, 0.931, 0.67 ] + }, + { "time": 1, "x": 175.08, "y": 0 } + ], + "scale": [ + { + "time": 0, + "x": 1, + "y": 1, + "curve": [ 0.213, 0.65, 0.931, 0.67 ] + }, + { + "time": 0.5, + "x": 2, + "y": 1, + "curve": [ 0.55, 0.09, 0.931, 0.67 ] + }, + { "time": 1, "x": 1, "y": 1 } + ] + }, + "coin": { + "translate": [ + { "time": 0, "x": 0, "y": 0 }, + { "time": 0.5, "x": 0.93, "y": 0 }, + { "time": 0.5011, "x": -9.18, "y": 0 }, + { "time": 1, "x": 2, "y": 0 } + ] + }, + "clipping": { + "translate": [ + { "time": 0, "x": -0.41, "y": 0 }, + { "time": 0.2667, "x": 1.2, "y": 1.21 }, + { "time": 0.5, "x": 0, "y": 0 }, + { "time": 0.7333, "x": -4.15, "y": 0 }, + { "time": 1, "x": -3.16, "y": 0 } + ], + "scale": [ + { "time": 0, "x": 1, "y": 1 }, + { "time": 0.2667, "x": 0.464, "y": 1.014 }, + { "time": 0.4667, "x": 0.067, "y": 1.002 }, + { "time": 0.5, "x": 0.033, "y": 1 }, + { "time": 0.7333, "x": 0.492, "y": 1.014 }, + { "time": 1, "x": 1, "y": 1 } + ] + } + }, + "deform": { + "default": { + "images/coin": { + "coin": [ + { + "time": 0, + "offset": 4, + "vertices": [ 15.75598, 0, 15.75598, 0, 15.75598, 0, 15.75598, 0, 15.75598, 0, 15.75598, 0, 15.75598, 0, 15.75598, 0, 15.75598, 0, 15.75598, 0, 15.75598, 0, 15.75598, 0, 15.75598, 0, 15.75598, 0, 15.75598, 0, 15.75598, 0, 15.75598 ] + }, + { + "time": 0.2333, + "vertices": [ -57.61087, 0, 1.15225, 0, 15.20888, 0, 24.26007, 0, 31.99586, 0, 38.58396, 0, 44.15197, 0, 49.42246, 0, 53.15465, 0, 55.83239, 0, 56.71656, 0, 56.71656, 0, 54.21722, 0, 49.62682, 0, 43.79747, 0, 37.5494, 0, 30.28123, 0, 22.2055, 0, 11.40953, 0, 0, 0, -57.61087, 0, 8.04186, 0, 17.91416, 0, 26.61125, 0, 34.01835, 0, 40.26029, 0, 45.85036, 0, 50.21972, 0, 53.50714, 0, 55.9207, 0, 56.96101, 0, 56.83617, 0, 55.23131, 0, 51.30379, 0, 44.9216, 0, 36.22496, 0, 27.59846, 0, 17.28874, 0, 7.89076 ] + }, + { + "time": 0.4667, + "vertices": [ -115.22174, 0, 2.3045, 0, 20.08046, 0, 40.51821, 0, 57.98577, 0, 72.86182, 0, 85.43448, 0, 97.33535, 0, 105.76271, 0, 111.80908, 0, 113.80557, 0, 113.80557, 0, 108.16202, 0, 97.7968, 0, 84.63402, 0, 70.52576, 0, 54.11411, 0, 35.87894, 0, 11.50145, 1.74997, 0, 0, -115.22174, 0, 16.08371, 0, 35.82832, 0, 53.2225, 0, 68.0367, 0, 80.52058, 0, 91.70073, 0, 100.43944, 0, 107.01427, 0, 111.84139, 0, 113.92201, 0, 113.67234, 0, 110.46262, 0, 102.60757, 0, 89.84319, 0, 72.44992, 0, 55.19692, 0, 34.57748, 0, 15.78153 ] + }, + { + "time": 0.5, + "vertices": [ -123.45187, 0, 2.46911, 0, 21.49595, 0, 43.40345, 0, 62.12716, 0, 78.07299, 0, 91.54979, 0, 104.3065, 0, 113.33989, 0, 119.82108, 0, 121.96114, 0, 121.96114, 0, 115.91174, 0, 104.80113, 0, 90.69177, 0, 75.56894, 0, 57.97707, 0, 38.43056, 0, 12.3, 0, 0, 0, -123.45187, 0, 17.23255, 0, 38.38749, 0, 57.02411, 0, 72.89646, 0, 86.27205, 0, 98.25078, 0, 107.61369, 0, 114.65815, 0, 119.83006, 0, 122.0593, 0, 121.79179, 0, 118.35281, 0, 109.93669, 0, 96.26056, 0, 77.62492, 0, 59.13956, 0, 37.0473, 0, 16.90878 ] + } + ], + "coin-invert": [ + { + "time": 0.5, + "vertices": [ -23.47706, 1.27002, -43.40744, 0, -59.7846, 0, -74.77602, 0, -85.79382, 0, -95.27632, 0, -102.23021, 0, -109.99683, 0, -115.50598, 0, -118.87909, 0, -121.32259, 0, -121.32259, 0, -121.32258, 0, -118.66653, 0, -114.15101, 0, -108.4615, 0, -99.61115, 0, -90.41013, 0, -79.48267, 0, -66.83928, 0, -51.93813, 0, -31.61855, 0, -19.56224, -1.52396, -12.52719, 0, 120.72772, 0, 120.72777, 0, -14.97203, 0, -28.48602, 0, -46.43241, 0, -62.14667, 0, -75.27165, 0, -86.18799, 0, -95.28229, 0, -102.08092, 0, -109.98608, 0, -115.7252, 0, -119.52184, 0, -122.15746, 0, -123.04041, 0, -122.68725, 0, -120.4799, 0, -116.33008, 0, -110.76754, 0, -103.44593, 0, -95.76433, 0, -85.61052, 0, -76.07477, 0, -64.50826, 0, -51.44074, 0, -37.66688, 0, -25.39402 ] + }, + { + "time": 0.7667, + "vertices": [ -12.2558, 0, -21.82668, 0, -29.4435, 0, -36.06335, 0, -40.92855, 0, -45.1158, 0, -48.18647, 0, -51.61602, 0, -54.04874, 0, -55.53822, 0, -56.61722, 0, -56.61722, 0, -56.61721, 0, -55.44436, 0, -53.45041, 0, -50.93806, 0, -47.02994, 0, -42.967, 0, -38.1417, 0, -32.55868, 0, -25.97868, 0, -17.00604, 0, -10.78498, 0, -5.84602, 0, 56.33961, 0, 56.33963, 0, -6.98695, 0, -13.29348, 0, -21.66846, 0, -29.00178, 0, -35.12677, 0, -40.22107, 0, -44.46507, 0, -47.63776, 0, -51.32684, 0, -54.0051, 0, -55.77686, 0, -57.00682, 0, -57.41886, 0, -57.25405, 0, -56.22396, 0, -54.28737, 0, -51.69152, 0, -48.27477, 0, -44.69002, 0, -39.95158, 0, -35.50156, 0, -30.10386, 0, -24.00568, 0, -17.57788, 0, -11.85054 ] + }, + { + "time": 1, + "vertices": [ -17.76001, 0, -17.76001, 0, -17.76001, 0, -17.76001, 0, -17.76001, 0, -17.76001, 0, -17.76001, 0, -17.76001, 0, -17.76001, 0, -17.76001, 0, -17.76001, 0, -17.76001, 0, -17.76001, 0, -17.76001, 0, -17.76001, 0, -17.76001, 0, -17.76001, 0, -17.76001, 0, -17.76001, 0, -17.76001, 0, -17.76001, 0, -17.76001, 0, -17.76001 ] + } + ] + } + } + } + } +} +} \ No newline at end of file diff --git a/spine-corona/data/coin.png b/spine-corona/data/coin.png new file mode 100644 index 0000000000000000000000000000000000000000..f5ea3ad0dbe9ef29fd7052411cbaf07831fdba3c GIT binary patch literal 24464 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 XMsDcwlkogC+<);*^J&==tC0T!Y__lF literal 0 HcmV?d00001 diff --git a/spine-corona/main.lua b/spine-corona/main.lua index df72a9ecd..a31136587 100644 --- a/spine-corona/main.lua +++ b/spine-corona/main.lua @@ -76,12 +76,13 @@ function loadSkeleton(atlasFile, jsonFile, x, y, scale, animation, skin) end -- table.insert(skeletons, loadSkeleton("test.atlas", "test.json", 240, 300, 0.4, "animation")) -table.insert(skeletons, loadSkeleton("spineboy.atlas", "spineboy.json", 240, 300, 0.4, "walk")) +table.insert(skeletons, loadSkeleton("coin.atlas", "coin.json", 240, 300, 0.4, "rotate")) +--[[table.insert(skeletons, loadSkeleton("spineboy.atlas", "spineboy.json", 240, 300, 0.4, "walk")) table.insert(skeletons, loadSkeleton("raptor.atlas", "raptor.json", 200, 300, 0.25, "walk")) table.insert(skeletons, loadSkeleton("goblins.atlas", "goblins-mesh.json", 240, 300, 0.8, "walk", "goblin")) table.insert(skeletons, loadSkeleton("stretchyman.atlas", "stretchyman.json", 40, 300, 0.5, "sneak")) table.insert(skeletons, loadSkeleton("tank.atlas", "tank.json", 400, 300, 0.2, "drive")) -table.insert(skeletons, loadSkeleton("vine.atlas", "vine.json", 240, 300, 0.3, "animation")) +table.insert(skeletons, loadSkeleton("vine.atlas", "vine.json", 240, 300, 0.3, "animation"))]]-- local triangulator = spine.Triangulator.new() local polygon = { 411, 219, 199, 230, 161, 362, 534, 407, 346, 305, 596, 265 } @@ -109,7 +110,7 @@ Runtime:addEventListener("enterFrame", function (event) state = skeletons[activeSkeleton].state state:update(delta) - state:apply(skeleton) + -- state:apply(skeleton) skeleton:updateWorldTransform() -- uncomment if you want to know how many batches a skeleton renders to diff --git a/spine-corona/spine-corona/spine.lua b/spine-corona/spine-corona/spine.lua index bae4e54a5..8b614f291 100644 --- a/spine-corona/spine-corona/spine.lua +++ b/spine-corona/spine-corona/spine.lua @@ -44,6 +44,7 @@ spine.MeshAttachment = require "spine-lua.attachments.MeshAttachment" spine.VertexAttachment = require "spine-lua.attachments.VertexAttachment" spine.PathAttachment = require "spine-lua.attachments.PathAttachment" spine.PointAttachment = require "spine-lua.attachments.PointAttachment" +spine.ClippingAttachment = require "spine-lua.attachments.ClippingAttachment" spine.Skeleton = require "spine-lua.Skeleton" spine.Bone = require "spine-lua.Bone" spine.Slot = require "spine-lua.Slot" @@ -63,6 +64,7 @@ spine.TextureAtlasRegion = require "spine-lua.TextureAtlasRegion" spine.AtlasAttachmentLoader = require "spine-lua.AtlasAttachmentLoader" spine.Color = require "spine-lua.Color" spine.Triangulator = require "spine-lua.Triangulator" +spine.SkeletonClipping = require "spine-lua.SkeletonClipping" spine.utils.readFile = function (fileName, base) if not base then base = system.ResourceDirectory end @@ -89,6 +91,7 @@ spine.Skeleton.new = function(skeletonData, group) self.premultipliedAlpha = false self.batches = 0 self.tempColor = spine.Color.newWith(1, 1, 1, 1) + self.tempColor2 = spine.Color.newWith(-1, 1, 1, 1) return self end @@ -131,7 +134,8 @@ function spine.Skeleton:updateWorldTransform() local groupIndices = {} local groupUvs = {} local color = self.tempColor - local lastColor = nil + local lastColor = self.tempColor2 + lastColor.r = -1 local texture = nil local lastTexture = nil local blendMode = nil @@ -158,7 +162,7 @@ function spine.Skeleton:updateWorldTransform() if texture and vertices and indices then if not lastTexture then lastTexture = texture end - if not lastColor then lastColor = color end + if lastColor.r == -1 then lastColor:setFrom(color) end if not lastBlendMode then lastBlendMode = blendMode end if (texture ~= lastTexture or not colorEquals(color, lastColor) or blendMode ~= lastBlendMode) then diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/utils/Triangulator.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/utils/Triangulator.java index fa92773e4..2d37136a8 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/utils/Triangulator.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/utils/Triangulator.java @@ -285,6 +285,7 @@ class Triangulator { ShortArray triangles = triangulator.triangulate(polygon); System.out.println(triangles); for (short i: triangles.items) System.out.print((i + 1) + ", "); + System.out.println(); Array polys = triangulator.decompose(polygon, triangles); System.out.println(polys); diff --git a/spine-lua/AtlasAttachmentLoader.lua b/spine-lua/AtlasAttachmentLoader.lua index 7a4234869..a6a7d166f 100644 --- a/spine-lua/AtlasAttachmentLoader.lua +++ b/spine-lua/AtlasAttachmentLoader.lua @@ -36,6 +36,7 @@ local BoundingBoxAttachment = require "spine-lua.attachments.BoundingBoxAttachme local MeshAttachment = require "spine-lua.attachments.MeshAttachment" local PathAttachment = require "spine-lua.attachments.PathAttachment" local PointAttachment = require "spine-lua.attachments.PointAttachment" +local ClippingAttachment = require "spine-lua.attachments.ClippingAttachment" local TextureAtlas = require "spine-lua.TextureAtlas" local AtlasAttachmentLoader = {} @@ -84,4 +85,8 @@ function AtlasAttachmentLoader:newPointAttachment(skin, name) return PointAttachment.new(name) end +function AtlasAttachmentLoader:newClippingAttachment(skin, name) + return ClippingAttachment.new(name) +end + return AtlasAttachmentLoader diff --git a/spine-lua/AttachmentLoader.lua b/spine-lua/AttachmentLoader.lua index 62b771257..405e22e27 100644 --- a/spine-lua/AttachmentLoader.lua +++ b/spine-lua/AttachmentLoader.lua @@ -34,6 +34,7 @@ local BoundingBoxAttachment = require "spine-lua.attachments.BoundingBoxAttachme local MeshAttachment = require "spine-lua.attachments.MeshAttachment" local PathAttachment = require "spine-lua.attachments.PathAttachment" local PointAttachment = require "spine-lua.attachments.PointAttachment" +local ClippingAttachment = require "spine-lua.attachments.ClippingAttachment" local AttachmentLoader = {} function AttachmentLoader.new () @@ -62,6 +63,10 @@ function AttachmentLoader.new () function self:newPointAttachment(skin, name) return PointAttachment.new(name) end + + function self:newClippingAttachment(skin, name) + return ClippingAttachment.new(name) + end return self end diff --git a/spine-lua/SkeletonClipping.lua b/spine-lua/SkeletonClipping.lua new file mode 100644 index 000000000..c74931c3d --- /dev/null +++ b/spine-lua/SkeletonClipping.lua @@ -0,0 +1,56 @@ +------------------------------------------------------------------------------- +-- Spine Runtimes Software License v2.5 +-- +-- Copyright (c) 2013-2016, Esoteric Software +-- All rights reserved. +-- +-- You are granted a perpetual, non-exclusive, non-sublicensable, and +-- non-transferable license to use, install, execute, and perform the Spine +-- Runtimes software and derivative works solely for personal or internal +-- use. Without the written permission of Esoteric Software (see Section 2 of +-- the Spine Software License Agreement), you may not (a) modify, translate, +-- adapt, or develop new applications using the Spine Runtimes or otherwise +-- create derivative works or improvements of the Spine Runtimes or (b) remove, +-- delete, alter, or obscure any trademarks or any copyright, trademark, patent, +-- or other intellectual property or proprietary rights notices on or in the +-- Software, including any copy thereof. Redistributions in binary or source +-- form must include this license and terms. +-- +-- THIS SOFTWARE IS PROVIDED BY ESOTERIC SOFTWARE "AS IS" AND ANY EXPRESS OR +-- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +-- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +-- EVENT SHALL ESOTERIC SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +-- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +-- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, BUSINESS INTERRUPTION, OR LOSS OF +-- USE, DATA, OR PROFITS) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +-- IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +-- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +-- POSSIBILITY OF SUCH DAMAGE. +------------------------------------------------------------------------------- + +local utils = require "spine-lua.utils" + +local setmetatable = setmetatable +local math_min = math.min +local math_max = math.max +local ipairs = ipairs +local table_insert = table.insert +local table_remove = table.remove + +local SkeletonClipping = {} +SkeletonClipping.__index = SkeletonClipping + +function SkeletonClipping.new () + local self = { + convexPolygons = {}, + convexPolygonsIndices = {}, + indicesArray = {}, + isConcaveArray = {}, + triangles = {} + } + setmetatable(self, SkeletonClipping) + + return self +end + +return Triangulator diff --git a/spine-lua/SkeletonJson.lua b/spine-lua/SkeletonJson.lua index d1a9f4274..7c06d6d62 100644 --- a/spine-lua/SkeletonJson.lua +++ b/spine-lua/SkeletonJson.lua @@ -242,7 +242,7 @@ function SkeletonJson.new (attachmentLoader) for slotName,slotMap in pairs(skinMap) do local slotIndex = skeletonData.slotNameIndices[slotName] for attachmentName,attachmentMap in pairs(slotMap) do - local attachment = readAttachment(attachmentMap, skin, slotIndex, attachmentName) + local attachment = readAttachment(attachmentMap, skin, slotIndex, attachmentName, skeletonData) if attachment then skin:addAttachment(slotIndex, attachmentName, attachment) end @@ -286,7 +286,7 @@ function SkeletonJson.new (attachmentLoader) return skeletonData end - readAttachment = function (map, skin, slotIndex, name) + readAttachment = function (map, skin, slotIndex, name, skeletonData) local scale = self.scale name = getValue(map, "name", name) @@ -407,6 +407,26 @@ function SkeletonJson.new (attachmentLoader) end return point + elseif type == AttachmentType.clipping then + local clip = attachmentLoader:newClippingAttachment(skin, name) + if not clip then return nil end + + local _end = getValue(map, "end", nil) + if _end then + local slot = skeletonData:findSlot(_end) + if not slot then error("Clipping end slot not found: " + _end) end + clip.endSlot = slot + end + + readVertices(map, clip, map.vertexCount * 2) + local color = map.color + if color then + clip.color:set(tonumber(color:sub(1, 2), 16) / 255, + tonumber(color:sub(3, 4), 16) / 255, + tonumber(color:sub(5, 6), 16) / 255, + tonumber(color:sub(7, 8), 16) / 255) + end + return clip end error("Unknown attachment type: " .. type .. " (" .. name .. ")") diff --git a/spine-lua/attachments/AttachmentType.lua b/spine-lua/attachments/AttachmentType.lua index b0a95b7e4..6be2eef63 100644 --- a/spine-lua/attachments/AttachmentType.lua +++ b/spine-lua/attachments/AttachmentType.lua @@ -34,6 +34,7 @@ local AttachmentType = { mesh = 2, linkedmesh = 3, path = 4, - point = 5 + point = 5, + clipping = 6 } return AttachmentType diff --git a/spine-lua/attachments/ClippingAttachment.lua b/spine-lua/attachments/ClippingAttachment.lua new file mode 100644 index 000000000..4271a7a7a --- /dev/null +++ b/spine-lua/attachments/ClippingAttachment.lua @@ -0,0 +1,48 @@ +------------------------------------------------------------------------------- +-- Spine Runtimes Software License v2.5 +-- +-- Copyright (c) 2013-2016, Esoteric Software +-- All rights reserved. +-- +-- You are granted a perpetual, non-exclusive, non-sublicensable, and +-- non-transferable license to use, install, execute, and perform the Spine +-- Runtimes software and derivative works solely for personal or internal +-- use. Without the written permission of Esoteric Software (see Section 2 of +-- the Spine Software License Agreement), you may not (a) modify, translate, +-- adapt, or develop new applications using the Spine Runtimes or otherwise +-- create derivative works or improvements of the Spine Runtimes or (b) remove, +-- delete, alter, or obscure any trademarks or any copyright, trademark, patent, +-- or other intellectual property or proprietary rights notices on or in the +-- Software, including any copy thereof. Redistributions in binary or source +-- form must include this license and terms. +-- +-- THIS SOFTWARE IS PROVIDED BY ESOTERIC SOFTWARE "AS IS" AND ANY EXPRESS OR +-- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +-- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +-- EVENT SHALL ESOTERIC SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +-- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +-- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, BUSINESS INTERRUPTION, OR LOSS OF +-- USE, DATA, OR PROFITS) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +-- IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +-- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +-- POSSIBILITY OF SUCH DAMAGE. +------------------------------------------------------------------------------- + +local AttachmentType = require "spine-lua.attachments.AttachmentType" +local VertexAttachment = require "spine-lua.attachments.VertexAttachment" +local Color = require "spine-lua.Color" + +local ClippingAttachment = {} +ClippingAttachment.__index = ClippingAttachment +setmetatable(ClippingAttachment, { __index = VertexAttachment }) + +function ClippingAttachment.new (name) + if not name then error("name cannot be nil", 2) end + + local self = VertexAttachment.new(name, AttachmentType.clipping) + self.color = Color.newWith(0.2275, 0.2275, 0.8078, 1) + self.endSlot = nil + setmetatable(self, ClippingAttachment) + return self +end +return ClippingAttachment