diff --git a/spine-android/app/src/main/assets/celestial-circus-pma.png b/spine-android/app/src/main/assets/celestial-circus-pma.png deleted file mode 100644 index da9f98083..000000000 Binary files a/spine-android/app/src/main/assets/celestial-circus-pma.png and /dev/null differ diff --git a/spine-android/app/src/main/assets/celestial-circus-pma.atlas b/spine-android/app/src/main/assets/celestial-circus.atlas similarity index 98% rename from spine-android/app/src/main/assets/celestial-circus-pma.atlas rename to spine-android/app/src/main/assets/celestial-circus.atlas index 614022925..17f32b2a3 100644 --- a/spine-android/app/src/main/assets/celestial-circus-pma.atlas +++ b/spine-android/app/src/main/assets/celestial-circus.atlas @@ -1,7 +1,6 @@ -celestial-circus-pma.png +celestial-circus.png size: 1024, 1024 filter: Linear, Linear - pma: true scale: 0.4 arm-back-down bounds: 324, 401, 38, 82 diff --git a/spine-android/app/src/main/assets/celestial-circus.png b/spine-android/app/src/main/assets/celestial-circus.png new file mode 100644 index 000000000..a5c26ccf2 Binary files /dev/null and b/spine-android/app/src/main/assets/celestial-circus.png differ diff --git a/spine-android/app/src/main/assets/mix-and-match-pma.png b/spine-android/app/src/main/assets/mix-and-match-pma.png deleted file mode 100644 index 0f60ebf9a..000000000 Binary files a/spine-android/app/src/main/assets/mix-and-match-pma.png and /dev/null differ diff --git a/spine-android/app/src/main/assets/mix-and-match-pma.atlas b/spine-android/app/src/main/assets/mix-and-match.atlas similarity index 99% rename from spine-android/app/src/main/assets/mix-and-match-pma.atlas rename to spine-android/app/src/main/assets/mix-and-match.atlas index b4cc35fa9..b8047722c 100644 --- a/spine-android/app/src/main/assets/mix-and-match-pma.atlas +++ b/spine-android/app/src/main/assets/mix-and-match.atlas @@ -1,7 +1,6 @@ -mix-and-match-pma.png +mix-and-match.png size: 1024, 512 filter: Linear, Linear - pma: true scale: 0.5 base-head bounds: 118, 70, 95, 73 diff --git a/spine-android/app/src/main/assets/mix-and-match.png b/spine-android/app/src/main/assets/mix-and-match.png new file mode 100644 index 000000000..634a1e230 Binary files /dev/null and b/spine-android/app/src/main/assets/mix-and-match.png differ diff --git a/spine-android/app/src/main/assets/spineboy-copy.webp b/spine-android/app/src/main/assets/spineboy-copy.webp deleted file mode 100644 index b5bef489a..000000000 Binary files a/spine-android/app/src/main/assets/spineboy-copy.webp and /dev/null differ diff --git a/spine-android/app/src/main/assets/spineboy.mesh b/spine-android/app/src/main/assets/spineboy.mesh deleted file mode 100644 index 2eb9d274b..000000000 --- a/spine-android/app/src/main/assets/spineboy.mesh +++ /dev/null @@ -1,2411 +0,0 @@ -276 -1029 -42.879013 --297.047607 -6.236506 --281.006226 --28.653503 --360.703705 -7.989008 --376.745087 -62.652306 --268.730927 -11.352795 --246.272964 --17.521706 --312.229492 -33.777809 --334.687439 -229.816147 --154.047729 -25.090149 --107.279572 --20.119045 --305.181427 -184.606964 --351.949554 -55.973713 --50.431744 -60.000725 --45.838646 -63.459427 --41.895344 -67.670807 --40.684006 -72.906685 --39.176933 -88.494637 --34.689171 -113.775513 --13.848475 -113.528633 -2.136607 -62.500793 -1.265033 -35.758568 -0.943742 -0.551171 -0.417753 -1.076124 --34.735672 -16.845055 --59.338657 -48.578522 --58.865547 -43.379440 --162.329895 --11.614739 --161.529526 --12.982636 --255.519562 -42.011539 --256.319916 -65.043198 --11.982086 --9.951412 --12.882217 --7.815128 --190.869385 -67.179474 --189.969254 --3.026524 --370.122864 --37.433113 --359.531067 --49.496010 --398.716339 --15.089422 --409.308167 --22.821608 --380.509888 -17.435993 --362.172028 -18.170435 --357.714722 -29.042627 --291.733337 -29.693506 --287.783203 -22.567608 --284.760193 -29.863823 --257.309418 -16.866358 --227.740295 --9.695295 --223.363510 --31.426403 --219.782776 --50.997978 --258.157837 --57.465271 --273.560638 --64.414291 --290.107788 --73.625572 --312.043945 --77.089432 --333.065277 --81.286545 --358.537018 --72.989655 --395.361450 --60.091599 --397.486786 --8.700058 --355.176208 -0.127717 --323.098633 -14.998151 --285.877106 --2.462405 --291.598358 --23.514177 --333.334900 --52.957638 --339.976227 --41.758320 --299.855865 --25.460911 --258.150757 --56.479904 --367.056519 --30.831459 --368.242188 -4.588335 --268.304260 -13.812860 --276.573578 --47.665607 --321.018127 --11.210316 --308.941681 --34.052513 --280.136780 --26.962830 --349.786926 --5.811657 --276.585388 --51.092575 --268.483643 --68.176712 --363.967316 --22.895794 --372.069061 --41.517307 --678.262756 -4.756733 --662.967102 -27.035517 --631.043701 -21.181705 --665.676025 -44.648727 --654.730042 -66.348602 --613.574951 -63.094486 --595.710632 -60.145405 --579.537415 -48.342926 --566.127686 -47.067940 --524.576538 -50.305164 --495.177551 -76.461578 --507.918457 -86.074051 --488.016388 -82.666870 --476.777222 -68.601036 --467.543640 -76.467094 --456.328857 -64.882347 --418.107849 --1.124334 --383.302216 --68.765465 --396.801880 --88.752258 --400.786804 --121.365784 --423.613708 --150.618195 --444.090759 --174.983337 --490.293304 --182.793427 --554.658447 --153.730392 --590.830017 --92.385025 --624.156860 --101.022026 --642.420532 --131.935181 --651.167725 --93.884949 --671.229187 -22.045732 --610.792419 -4.060351 --577.345825 --24.378452 --602.536499 --35.769398 --645.546875 --92.140846 --658.155212 --92.876022 --594.650452 --137.738342 --558.649292 -0.035936 --572.425293 --42.157799 --569.496704 --85.525314 --562.776550 --117.991913 --552.428101 --0.445878 --570.610779 --41.981926 --567.314148 --84.644432 --560.175903 --117.190552 --547.730408 -51.034946 --578.638794 --57.058067 --443.197510 --77.297791 --458.759583 --95.078400 --463.162659 --110.531441 --452.958221 --114.658646 --435.820129 --106.326714 --420.266724 --87.203674 --408.095825 --70.355499 --409.597839 --53.781849 --422.371063 --45.719143 --448.175842 --97.368286 --477.148438 --126.345207 --449.629730 --48.403282 --421.397003 -65.129303 --459.058716 -56.715298 --456.420074 -37.337090 --472.026398 --81.100037 --442.776611 --103.435188 --439.148804 -56.140377 --488.318420 --13.882811 --427.133514 --72.438599 --494.144257 --2.415684 --555.328430 --9.752207 --133.299133 --53.597122 --143.429474 --28.383848 --252.554596 -15.461065 --242.424255 -0.280756 --45.509258 -3.817970 --40.700172 -7.250431 --36.034451 -10.562510 --35.046749 -16.135471 --33.386559 -21.410233 --31.814659 -51.100018 --12.496605 -50.862698 -7.939594 -7.424946 -7.435127 --15.988001 -7.130658 --75.103821 -6.607407 --74.704819 --35.344917 --51.963093 --62.175610 --11.707943 --61.792732 --4.850842 --178.681305 -3.297174 --165.704422 -3.263706 --149.529526 --4.766674 --132.281067 --14.226085 --123.686310 --14.779051 --115.977768 --15.510324 --105.783768 --15.629786 --94.454346 --9.939468 --72.033401 --2.601040 --51.485832 --0.615288 --45.925728 --14.924071 --28.016983 --33.008259 --5.382965 --57.001526 --5.432617 --79.034515 --5.478195 --78.791306 --12.632462 --77.848518 --40.365326 --76.570442 --77.960693 --71.999954 --106.402145 --63.270332 --130.782532 --54.491909 --145.303955 --53.917458 --161.935043 --47.619102 --178.553772 --34.960701 --189.387360 --20.812759 --189.358093 --45.230839 --56.986832 --45.453281 --88.667320 --45.129532 --105.946686 --40.050804 --124.656250 --51.398773 --138.215729 --37.589401 --131.131165 --25.341869 --65.153694 --29.029552 --92.377365 --29.576653 --106.346527 --27.344521 --120.292831 --24.884426 --127.082634 --55.947918 --128.850571 --63.272888 --106.272240 --65.339859 --81.652481 --63.969269 --48.097580 --37.311478 --144.065002 --29.954123 --156.316788 --29.362101 --169.851608 --36.529163 --181.428452 --19.561584 --136.273285 --11.209936 --152.048019 --7.510107 --168.396408 --13.406410 --180.816635 --41.929737 --160.853561 --58.138187 --12.392563 --35.415283 --15.545456 --17.216610 --36.189270 -59.851063 --426.057495 --22.414417 --382.681976 --49.933273 --434.870422 -32.333668 --478.247375 --71.253433 --569.188293 --17.546474 --575.142944 -39.032654 --572.722046 -49.985153 --582.050476 -69.749718 --561.091187 -67.134560 --542.310364 -55.744041 --525.135559 -63.388222 --499.740784 -47.547886 --476.782471 -46.784439 --451.506104 -14.528856 --446.019623 --15.556076 --440.891754 --44.274376 --450.349915 --68.898865 --446.637878 --88.967331 --458.249664 --109.572525 --437.958740 --100.400833 --420.669861 --111.548637 --405.734772 --173.281952 --462.488678 --188.633789 --491.601959 --175.587204 --508.105988 --154.378281 --512.934448 --133.983353 --517.571655 --126.570023 --543.502441 --117.953842 --552.279785 --45.517567 --460.661987 --67.649040 --483.031342 --82.742340 --511.720032 --74.425705 --531.700500 --46.103344 --537.426453 --6.433783 --537.497681 -33.053020 --530.199219 -47.890587 --522.756897 -51.820316 --545.348450 --5.725768 --551.145752 --47.459347 --552.656006 --78.592064 --551.894775 --106.722252 --547.885376 --108.586868 --523.697815 --101.043076 --503.968384 --73.456360 --474.797241 --50.950211 --456.127899 --85.674408 --464.526978 --125.814529 --495.315521 --152.884552 --479.553986 --33.213146 --515.003784 --56.159058 --515.149109 --39.806046 --495.741577 -2.324126 --504.425873 -30.676798 --501.983337 -4.470346 --535.486511 --5.209473 --233.373047 --62.302799 --223.157776 --76.392807 --301.907196 --19.299480 --312.122467 -39.466541 --181.314575 --34.361038 --168.105194 --48.803307 --248.823334 -25.024269 --262.032715 -0.807617 -0.531250 -0.807617 -0.609375 -0.764648 -0.609375 -0.764648 -0.531250 -0.833984 -0.191406 -0.806641 -0.191406 -0.806641 -0.050781 -0.833984 -0.050781 -0.438477 -0.054688 -0.438477 -0.464844 -0.338867 -0.464844 -0.338867 -0.054688 -0.729650 -0.388398 -0.731862 -0.380333 -0.733762 -0.373411 -0.734321 -0.365086 -0.735017 -0.354732 -0.737090 -0.323886 -0.747074 -0.273438 -0.754883 -0.273438 -0.754849 -0.374010 -0.754883 -0.426712 -0.754883 -0.496094 -0.737714 -0.496094 -0.725586 -0.465744 -0.725586 -0.403209 -0.791992 -0.800781 -0.764648 -0.800781 -0.764648 -0.617188 -0.791992 -0.617188 -0.207031 -0.402344 -0.169922 -0.402344 -0.169922 -0.054688 -0.207031 -0.054688 -0.804688 -0.113281 -0.787109 -0.113281 -0.787109 -0.031250 -0.804688 -0.031250 -0.150029 -0.095333 -0.167969 -0.143456 -0.167969 -0.152279 -0.167969 -0.282887 -0.167969 -0.290706 -0.164296 -0.294269 -0.165632 -0.349487 -0.157022 -0.402344 -0.143878 -0.402344 -0.133124 -0.402344 -0.126741 -0.322175 -0.124848 -0.290443 -0.122814 -0.256342 -0.120117 -0.211144 -0.120117 -0.169533 -0.120117 -0.119112 -0.127038 -0.050781 -0.133421 -0.050781 -0.154821 -0.148639 -0.156528 -0.213260 -0.160737 -0.289713 -0.152779 -0.273143 -0.145950 -0.186026 -0.132292 -0.163877 -0.134503 -0.244751 -0.139044 -0.330298 -0.132745 -0.110571 -0.145196 -0.116431 -0.154327 -0.320273 -0.159428 -0.307266 -0.133337 -0.202093 -0.149942 -0.236942 -0.136650 -0.285200 -0.145595 -0.153225 -0.625977 -0.210938 -0.603516 -0.210938 -0.603516 -0.019531 -0.625977 -0.019531 -0.178955 -0.445703 -0.195521 -0.514296 -0.197887 -0.589749 -0.203266 -0.524585 -0.210938 -0.564884 -0.210938 -0.655771 -0.205444 -0.683669 -0.200469 -0.708931 -0.192287 -0.721366 -0.182234 -0.791999 -0.176917 -0.845739 -0.191170 -0.847560 -0.190788 -0.890704 -0.186740 -0.907022 -0.178530 -0.910159 -0.179377 -0.936707 -0.165616 -0.992188 -0.129041 -0.992188 -0.102801 -0.907234 -0.095048 -0.882130 -0.086127 -0.812974 -0.078125 -0.750945 -0.078125 -0.648911 -0.089454 -0.530587 -0.110323 -0.494576 -0.144531 -0.492861 -0.144961 -0.453419 -0.133559 -0.410156 -0.154643 -0.410156 -0.191094 -0.620193 -0.175651 -0.661630 -0.169076 -0.592162 -0.173969 -0.507459 -0.152409 -0.434334 -0.137577 -0.543412 -0.109901 -0.564740 -0.172783 -0.666458 -0.153819 -0.633071 -0.133479 -0.605199 -0.117039 -0.593478 -0.172158 -0.669171 -0.153398 -0.637012 -0.133269 -0.610470 -0.116313 -0.602326 -0.196312 -0.702200 -0.118485 -0.837731 -0.113268 -0.792404 -0.106566 -0.768593 -0.097532 -0.772144 -0.091826 -0.797999 -0.091881 -0.832460 -0.097390 -0.870913 -0.105037 -0.883669 -0.115143 -0.876705 -0.124539 -0.839463 -0.108769 -0.742339 -0.089916 -0.763488 -0.117252 -0.883290 -0.175086 -0.921663 -0.170835 -0.918551 -0.166001 -0.873925 -0.107965 -0.816554 -0.097452 -0.802473 -0.601562 -0.183594 -0.555664 -0.183594 -0.555664 -0.007812 -0.601562 -0.007812 -0.758789 -0.265625 -0.736328 -0.265625 -0.736328 -0.046875 -0.758789 -0.046875 -0.697459 -0.349872 -0.699822 -0.342882 -0.702112 -0.336108 -0.702579 -0.329642 -0.703368 -0.318739 -0.704114 -0.308412 -0.713507 -0.250000 -0.723633 -0.250000 -0.723633 -0.334860 -0.723632 -0.380619 -0.723633 -0.496094 -0.702850 -0.496094 -0.689453 -0.452177 -0.689453 -0.373550 -0.114172 -0.063757 -0.118164 -0.089070 -0.118164 -0.120661 -0.114260 -0.154382 -0.109650 -0.171207 -0.109388 -0.186265 -0.109041 -0.206178 -0.108994 -0.228306 -0.111795 -0.272074 -0.115399 -0.312176 -0.116375 -0.323028 -0.109406 -0.358064 -0.100599 -0.402344 -0.088883 -0.402344 -0.078125 -0.402344 -0.078237 -0.388370 -0.078669 -0.334200 -0.079255 -0.260767 -0.081458 -0.205199 -0.085696 -0.157545 -0.089967 -0.129148 -0.090231 -0.096663 -0.093290 -0.064179 -0.099460 -0.042969 -0.106368 -0.042969 -0.094579 -0.301605 -0.094438 -0.239730 -0.094579 -0.205980 -0.097040 -0.169417 -0.091485 -0.142979 -0.098235 -0.156761 -0.104282 -0.285573 -0.102454 -0.232417 -0.102172 -0.205136 -0.103248 -0.177888 -0.104443 -0.164617 -0.089273 -0.161289 -0.085719 -0.205417 -0.084735 -0.253511 -0.085438 -0.319042 -0.098358 -0.131498 -0.101938 -0.107539 -0.102213 -0.081102 -0.098702 -0.058520 -0.107032 -0.146645 -0.111094 -0.115801 -0.112884 -0.083856 -0.109993 -0.059621 -0.096086 -0.098727 -0.088321 -0.388755 -0.099413 -0.382505 -0.108278 -0.342111 -0.793945 -0.808594 -0.793945 -0.992188 -0.764648 -0.992188 -0.764648 -0.808594 -0.277623 -0.091463 -0.302273 -0.130116 -0.326254 -0.185839 -0.333136 -0.179700 -0.336914 -0.233922 -0.331484 -0.263999 -0.322618 -0.283290 -0.320127 -0.334136 -0.308007 -0.359383 -0.301897 -0.402344 -0.286655 -0.382445 -0.272438 -0.363885 -0.262149 -0.321377 -0.250622 -0.305352 -0.244575 -0.267005 -0.231001 -0.283295 -0.231025 -0.321520 -0.222776 -0.337169 -0.208984 -0.182861 -0.208984 -0.118573 -0.218416 -0.101934 -0.228715 -0.112926 -0.238620 -0.123496 -0.247764 -0.085440 -0.253507 -0.078125 -0.263967 -0.302431 -0.259486 -0.243611 -0.259501 -0.180292 -0.267676 -0.153336 -0.281266 -0.169258 -0.298485 -0.205271 -0.313937 -0.253864 -0.318669 -0.280252 -0.325537 -0.244797 -0.301911 -0.182351 -0.284161 -0.141703 -0.270486 -0.114661 -0.257371 -0.095961 -0.251034 -0.136051 -0.249794 -0.177011 -0.255085 -0.252551 -0.260575 -0.305313 -0.247438 -0.259162 -0.237073 -0.169394 -0.221730 -0.171963 -0.281729 -0.219745 -0.271811 -0.198592 -0.274465 -0.247020 -0.294720 -0.270399 -0.306455 -0.300457 -0.302752 -0.218690 -0.820312 -0.355469 -0.791992 -0.355469 -0.791992 -0.199219 -0.820312 -0.199219 -0.825195 -0.523438 -0.788086 -0.523438 -0.788086 -0.363281 -0.825195 -0.363281 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 --1 -0 -1 -2 -2 -3 -0 -4 -5 -6 -6 -7 -4 -8 -9 -10 -10 -11 -8 -20 -15 -16 -20 -16 -17 -20 -17 -18 -20 -18 -19 -23 -13 -22 -15 -21 -14 -14 -22 -13 -24 -25 -12 -12 -23 -24 -13 -23 -12 -14 -21 -22 -15 -20 -21 -26 -27 -28 -28 -29 -26 -30 -31 -32 -32 -33 -30 -34 -35 -36 -36 -37 -34 -56 -39 -40 -57 -40 -41 -56 -38 -39 -61 -53 -64 -65 -64 -54 -52 -53 -61 -53 -54 -64 -55 -65 -54 -51 -52 -61 -38 -65 -55 -51 -61 -68 -49 -50 -62 -59 -69 -57 -50 -51 -68 -62 -60 -69 -69 -60 -57 -50 -68 -62 -70 -62 -69 -62 -68 -60 -41 -58 -57 -70 -69 -59 -49 -62 -70 -42 -43 -41 -46 -66 -45 -45 -67 -44 -45 -66 -67 -47 -63 -46 -46 -63 -66 -47 -48 -63 -67 -43 -44 -48 -70 -63 -63 -59 -66 -63 -70 -59 -48 -49 -70 -66 -59 -67 -67 -58 -43 -67 -59 -58 -43 -58 -41 -58 -59 -57 -71 -64 -65 -60 -56 -57 -57 -56 -40 -71 -65 -56 -68 -61 -60 -60 -71 -56 -61 -71 -60 -71 -61 -64 -65 -38 -56 -72 -73 -74 -74 -75 -72 -126 -125 -138 -110 -101 -107 -115 -111 -110 -114 -115 -110 -113 -114 -110 -118 -115 -114 -119 -115 -118 -108 -78 -107 -107 -113 -110 -118 -114 -113 -117 -118 -113 -119 -98 -115 -106 -107 -105 -112 -113 -107 -106 -112 -107 -116 -117 -113 -112 -116 -113 -112 -106 -120 -131 -98 -119 -131 -124 -132 -123 -124 -131 -122 -131 -130 -118 -131 -119 -123 -131 -122 -138 -125 -124 -137 -123 -122 -138 -124 -123 -137 -138 -123 -122 -130 -121 -118 -117 -131 -137 -122 -121 -131 -117 -130 -137 -127 -126 -137 -126 -138 -136 -117 -116 -130 -117 -136 -129 -137 -121 -128 -127 -137 -133 -129 -121 -133 -121 -130 -129 -128 -137 -128 -95 -127 -133 -94 -128 -133 -128 -129 -93 -130 -136 -133 -130 -93 -94 -133 -93 -95 -126 -127 -109 -103 -104 -102 -103 -109 -76 -109 -104 -108 -109 -76 -108 -76 -77 -109 -101 -102 -109 -108 -101 -107 -101 -108 -78 -108 -77 -78 -79 -80 -105 -107 -78 -78 -80 -81 -105 -78 -81 -82 -105 -81 -106 -105 -82 -120 -106 -82 -94 -95 -128 -125 -132 -124 -110 -100 -101 -111 -99 -100 -111 -100 -110 -115 -98 -111 -98 -99 -111 -83 -120 -82 -84 -112 -120 -116 -112 -84 -84 -120 -83 -132 -97 -98 -131 -132 -98 -85 -116 -84 -96 -97 -132 -96 -132 -125 -85 -136 -116 -86 -136 -85 -96 -126 -95 -88 -86 -87 -89 -86 -88 -90 -136 -86 -89 -90 -86 -135 -136 -90 -134 -135 -90 -134 -90 -91 -92 -93 -136 -135 -92 -136 -91 -92 -135 -91 -135 -134 -96 -125 -126 -140 -142 -139 -140 -141 -142 -143 -144 -145 -145 -146 -143 -155 -156 -150 -151 -155 -150 -152 -155 -151 -153 -155 -152 -155 -153 -154 -158 -148 -157 -147 -159 -160 -147 -158 -159 -147 -148 -158 -156 -149 -150 -148 -149 -157 -156 -157 -149 -185 -161 -208 -204 -184 -185 -208 -204 -185 -204 -183 -184 -203 -204 -208 -207 -208 -161 -203 -208 -207 -207 -161 -162 -209 -183 -204 -209 -204 -203 -182 -183 -209 -202 -209 -203 -206 -203 -207 -202 -203 -206 -207 -162 -163 -206 -207 -163 -201 -209 -202 -209 -181 -182 -190 -209 -201 -190 -181 -209 -205 -202 -206 -201 -202 -205 -164 -206 -163 -205 -206 -164 -191 -190 -201 -196 -191 -201 -197 -180 -181 -197 -181 -190 -205 -196 -201 -189 -190 -191 -165 -205 -164 -196 -205 -165 -195 -191 -196 -166 -196 -165 -195 -189 -191 -194 -189 -195 -198 -180 -197 -179 -180 -198 -188 -190 -189 -188 -189 -194 -197 -190 -188 -198 -197 -188 -166 -195 -196 -167 -195 -166 -194 -195 -167 -167 -193 -194 -168 -193 -167 -187 -198 -188 -199 -179 -198 -199 -198 -187 -178 -179 -199 -192 -193 -168 -192 -168 -169 -193 -186 -187 -199 -187 -186 -188 -194 -193 -193 -187 -188 -200 -199 -186 -178 -199 -200 -177 -178 -200 -212 -192 -169 -212 -169 -170 -172 -212 -170 -172 -170 -171 -192 -211 -186 -192 -186 -193 -211 -192 -212 -210 -200 -186 -210 -186 -211 -176 -177 -200 -210 -176 -200 -174 -210 -211 -175 -176 -210 -174 -175 -210 -173 -211 -212 -173 -212 -172 -174 -211 -173 -214 -216 -213 -214 -215 -216 -235 -261 -232 -238 -236 -237 -234 -235 -232 -261 -236 -238 -219 -220 -221 -235 -236 -261 -219 -250 -251 -250 -219 -221 -222 -250 -221 -222 -223 -250 -224 -249 -223 -248 -267 -250 -249 -248 -250 -223 -249 -250 -248 -266 -267 -266 -248 -249 -266 -249 -224 -225 -266 -224 -250 -267 -251 -234 -232 -233 -226 -265 -225 -266 -265 -267 -267 -265 -262 -264 -262 -265 -267 -262 -247 -262 -264 -263 -262 -263 -246 -247 -262 -246 -247 -246 -251 -247 -251 -267 -264 -243 -263 -242 -227 -228 -229 -242 -228 -258 -229 -259 -259 -261 -260 -260 -238 -239 -258 -257 -242 -258 -259 -257 -246 -252 -251 -257 -243 -242 -242 -243 -264 -254 -241 -217 -253 -254 -217 -259 -260 -256 -259 -256 -257 -245 -255 -253 -257 -256 -243 -245 -244 -255 -243 -256 -244 -254 -255 -240 -256 -260 -255 -255 -254 -253 -244 -256 -255 -260 -239 -255 -254 -240 -241 -239 -240 -255 -253 -217 -252 -245 -253 -252 -246 -245 -252 -244 -245 -263 -243 -244 -263 -252 -217 -218 -251 -252 -218 -229 -258 -242 -264 -227 -242 -261 -238 -260 -259 -231 -261 -231 -232 -261 -230 -231 -259 -229 -230 -259 -263 -245 -246 -264 -265 -227 -265 -226 -227 -266 -225 -265 -219 -251 -218 -268 -269 -270 -270 -271 -268 -272 -273 -274 -274 -275 -272 diff --git a/spine-android/app/src/main/java/com/esotericsoftware/spine/DressUp.kt b/spine-android/app/src/main/java/com/esotericsoftware/spine/DressUp.kt index 033f58b8f..facb13639 100644 --- a/spine-android/app/src/main/java/com/esotericsoftware/spine/DressUp.kt +++ b/spine-android/app/src/main/java/com/esotericsoftware/spine/DressUp.kt @@ -50,7 +50,7 @@ fun DressUp(nav: NavHostController) { val drawable = remember { AndroidSkeletonDrawable.fromAsset( - "mix-and-match-pma.atlas", + "mix-and-match.atlas", "mix-and-match-pro.skel", context ) diff --git a/spine-android/app/src/main/java/com/esotericsoftware/spine/Physics.kt b/spine-android/app/src/main/java/com/esotericsoftware/spine/Physics.kt index 83745b70b..7113047fb 100644 --- a/spine-android/app/src/main/java/com/esotericsoftware/spine/Physics.kt +++ b/spine-android/app/src/main/java/com/esotericsoftware/spine/Physics.kt @@ -102,6 +102,10 @@ fun Physics(nav: NavHostController) { invertedYDragPosition ) }, + onDragEnd = { -> + mousePosition.value = null; + lastMousePosition.value = null; + } ) } ) { @@ -109,7 +113,7 @@ fun Physics(nav: NavHostController) { factory = { ctx -> SpineView(ctx).apply { loadFromAsset( - "celestial-circus-pma.atlas", + "celestial-circus.atlas", "celestial-circus-pro.skel", controller ) diff --git a/spine-android/spine-android/src/main/java/com/esotericsoftware/spine/android/AndroidTexture.java b/spine-android/spine-android/src/main/java/com/esotericsoftware/spine/android/AndroidTexture.java index 30a46958c..2eeca999a 100644 --- a/spine-android/spine-android/src/main/java/com/esotericsoftware/spine/android/AndroidTexture.java +++ b/spine-android/spine-android/src/main/java/com/esotericsoftware/spine/android/AndroidTexture.java @@ -57,7 +57,7 @@ public class AndroidTexture extends Texture { paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_OVER)); break; case multiply: - paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.MULTIPLY)); + paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_OVER)); break; case additive: paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.ADD)); diff --git a/spine-android/spine-android/src/main/java/com/esotericsoftware/spine/android/SkeletonRenderer.java b/spine-android/spine-android/src/main/java/com/esotericsoftware/spine/android/SkeletonRenderer.java index b5a6acb56..e0d71c549 100644 --- a/spine-android/spine-android/src/main/java/com/esotericsoftware/spine/android/SkeletonRenderer.java +++ b/spine-android/spine-android/src/main/java/com/esotericsoftware/spine/android/SkeletonRenderer.java @@ -102,12 +102,13 @@ public class SkeletonRenderer { if (attachment == null) { continue; } + if (attachment instanceof RegionAttachment) { RegionAttachment region = (RegionAttachment)attachment; verticesLength = vertexSize << 2; + if (region.getSequence() != null) region.getSequence().apply(slot, region); AndroidTexture texture = (AndroidTexture)region.getRegion().getTexture(); BlendMode blendMode = slot.getData().getBlendMode(); - if (command.blendMode == null && command.texture == null) { command.blendMode = blendMode; command.texture = texture; @@ -126,10 +127,10 @@ public class SkeletonRenderer { uvs = region.getUVs(); indices = quadTriangles; color = region.getColor(); - } else if (attachment instanceof MeshAttachment) { MeshAttachment mesh = (MeshAttachment)attachment; verticesLength = mesh.getWorldVerticesLength(); + if (mesh.getSequence() != null) mesh.getSequence().apply(slot, mesh); AndroidTexture texture = (AndroidTexture)mesh.getRegion().getTexture(); BlendMode blendMode = slot.getData().getBlendMode(); @@ -208,12 +209,6 @@ public class SkeletonRenderer { public void render (Canvas canvas, Array commands) { for (int i = 0; i < commands.size; i++) { RenderCommand command = commands.get(i); - - // TODO Fix issue with dressup rendering - if (command.blendMode == null) { - continue; - } - canvas.drawVertices(Canvas.VertexMode.TRIANGLES, command.vertices.size, command.vertices.items, 0, command.uvs.items, 0, command.colors.items, 0, command.indices.items, 0, command.indices.size, command.texture.getPaint(command.blendMode)); }