diff --git a/examples/export/runtimes.sh b/examples/export/runtimes.sh index fb82e5e2a..d42047f05 100755 --- a/examples/export/runtimes.sh +++ b/examples/export/runtimes.sh @@ -521,34 +521,32 @@ UNITY_SOURCE_DIR=../spine-unity # to the unity assets directories. This requires to change the png file reference line in the atlas file. UNITY_TARGET_DIR="$ROOT/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon" cp -f ../dragon/export/dragon-ess.json "$UNITY_TARGET_DIR/dragon.json" -cp -f ../dragon/export/dragon-pma.atlas "$UNITY_TARGET_DIR/dragon.atlas.txt" -$sed -i "s/dragon-pma.png/dragon.png/g" "$UNITY_TARGET_DIR/dragon.atlas.txt" -$sed -i "s/dragon-pma_2.png/dragon2.png/g" "$UNITY_TARGET_DIR/dragon.atlas.txt" -$sed -i "s/dragon-pma_3.png/dragon3.png/g" "$UNITY_TARGET_DIR/dragon.atlas.txt" -$sed -i "s/dragon-pma_4.png/dragon4.png/g" "$UNITY_TARGET_DIR/dragon.atlas.txt" -$sed -i "s/dragon-pma_5.png/dragon5.png/g" "$UNITY_TARGET_DIR/dragon.atlas.txt" -cp -f ../dragon/export/dragon-pma.png "$UNITY_TARGET_DIR/dragon.png" -cp -f ../dragon/export/dragon-pma_2.png "$UNITY_TARGET_DIR/dragon2.png" -cp -f ../dragon/export/dragon-pma_3.png "$UNITY_TARGET_DIR/dragon3.png" -cp -f ../dragon/export/dragon-pma_4.png "$UNITY_TARGET_DIR/dragon4.png" -cp -f ../dragon/export/dragon-pma_5.png "$UNITY_TARGET_DIR/dragon5.png" +cp -f ../dragon/export/dragon.atlas "$UNITY_TARGET_DIR/dragon.atlas.txt" +$sed -i "s/dragon_2.png/dragon2.png/g" "$UNITY_TARGET_DIR/dragon.atlas.txt" +$sed -i "s/dragon_3.png/dragon3.png/g" "$UNITY_TARGET_DIR/dragon.atlas.txt" +$sed -i "s/dragon_4.png/dragon4.png/g" "$UNITY_TARGET_DIR/dragon.atlas.txt" +$sed -i "s/dragon_5.png/dragon5.png/g" "$UNITY_TARGET_DIR/dragon.atlas.txt" +cp -f ../dragon/export/dragon.png "$UNITY_TARGET_DIR/dragon.png" +cp -f ../dragon/export/dragon_2.png "$UNITY_TARGET_DIR/dragon2.png" +cp -f ../dragon/export/dragon_3.png "$UNITY_TARGET_DIR/dragon3.png" +cp -f ../dragon/export/dragon_4.png "$UNITY_TARGET_DIR/dragon4.png" +cp -f ../dragon/export/dragon_5.png "$UNITY_TARGET_DIR/dragon5.png" UNITY_TARGET_DIR="$ROOT/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Goblins" cp -f ../goblins/export/goblins-pro.json "$UNITY_TARGET_DIR/goblins.json" -cp -f ../goblins/export/goblins-pma.atlas "$UNITY_TARGET_DIR/goblins.atlas.txt" -$sed -i 's/goblins-pma.png/goblins.png/g' "$UNITY_TARGET_DIR/goblins.atlas.txt" -cp -f ../goblins/export/goblins-pma.png "$UNITY_TARGET_DIR/goblins.png" +cp -f ../goblins/export/goblins.atlas "$UNITY_TARGET_DIR/goblins.atlas.txt" +cp -f ../goblins/export/goblins.png "$UNITY_TARGET_DIR/goblins.png" UNITY_TARGET_DIR="$ROOT/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Hero" cp -f ../hero/export/hero-pro.json "$UNITY_TARGET_DIR/" -cp -f ../hero/export/hero-pma.atlas "$UNITY_TARGET_DIR/hero-pro.atlas.txt" -$sed -i 's/hero-pma.png/hero-pro.png/g' "$UNITY_TARGET_DIR/hero-pro.atlas.txt" -cp -f ../hero/export/hero-pma.png "$UNITY_TARGET_DIR/hero-pro.png" +cp -f ../hero/export/hero.atlas "$UNITY_TARGET_DIR/hero-pro.atlas.txt" +$sed -i 's/hero.png/hero-pro.png/g' "$UNITY_TARGET_DIR/hero-pro.atlas.txt" +cp -f ../hero/export/hero.png "$UNITY_TARGET_DIR/hero-pro.png" UNITY_TARGET_DIR="$ROOT/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask" cp -f ../raptor/export/raptor-pro.json "$UNITY_TARGET_DIR/raptor-pro.json" -cp -f ../raptor/export/raptor-pma.atlas "$UNITY_TARGET_DIR/raptor-pma.atlas.txt" -cp -f ../raptor/export/raptor-pma.png "$UNITY_TARGET_DIR/raptor-pma.png" +cp -f ../raptor/export/raptor.atlas "$UNITY_TARGET_DIR/raptor.atlas.txt" +cp -f ../raptor/export/raptor.png "$UNITY_TARGET_DIR/raptor.png" # URP packages UNITY_TARGET_DIR="$ROOT/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Samples~/Examples/2D/Spine Skeletons/RaptorURP" @@ -567,22 +565,22 @@ cp -f ../raptor/export/raptor.png "$UNITY_TARGET_DIR/" UNITY_TARGET_DIR="$ROOT/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-pro" cp -f ../spineboy/export/spineboy-pro.json "$UNITY_TARGET_DIR/spineboy-pro.json" -cp -f ../spineboy/export/spineboy-pma.atlas "$UNITY_TARGET_DIR/spineboy-pro.atlas.txt" -$sed -i 's/spineboy-pma.png/spineboy-pro.png/g' "$UNITY_TARGET_DIR/spineboy-pro.atlas.txt" -cp -f ../spineboy/export/spineboy-pma.png "$UNITY_TARGET_DIR/spineboy-pro.png" +cp -f ../spineboy/export/spineboy.atlas "$UNITY_TARGET_DIR/spineboy-pro.atlas.txt" +$sed -i 's/spineboy.png/spineboy-pro.png/g' "$UNITY_TARGET_DIR/spineboy-pro.atlas.txt" +cp -f ../spineboy/export/spineboy.png "$UNITY_TARGET_DIR/spineboy-pro.png" UNITY_TARGET_DIR="$ROOT/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match" cp -f ../mix-and-match/export/mix-and-match-pro.json "$UNITY_TARGET_DIR/" -cp -f ../mix-and-match/export/mix-and-match-pma.atlas "$UNITY_TARGET_DIR/mix-and-match-pma.atlas.txt" -cp -f ../mix-and-match/export/mix-and-match-pma.png "$UNITY_TARGET_DIR/" +cp -f ../mix-and-match/export/mix-and-match.atlas "$UNITY_TARGET_DIR/mix-and-match.atlas.txt" +cp -f ../mix-and-match/export/mix-and-match.png "$UNITY_TARGET_DIR/" UNITY_TARGET_DIR="$ROOT/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman" cp -f ../stretchyman/export/stretchyman-pro.json "$UNITY_TARGET_DIR/stretchyman.json" # Note: normalmap and emissionmap need to be created manually. Thus we use a separately prepared # atlas and diffuse map here so that the maps always match. These atlas textures are copied to the target dir. -cp -f ../stretchyman/manual-maps/stretchyman-pma.atlas "$UNITY_TARGET_DIR/stretchyman-diffuse-pma.atlas.txt" -$sed -i 's/stretchyman-pma.png/stretchyman-diffuse-pma.png/g' "$UNITY_TARGET_DIR/stretchyman-diffuse-pma.atlas.txt" -cp -f ../stretchyman/manual-maps/stretchyman-pma.png "$UNITY_TARGET_DIR/stretchyman-diffuse-pma.png" +cp -f ../stretchyman/manual-maps/stretchyman.atlas "$UNITY_TARGET_DIR/stretchyman-diffuse.atlas.txt" +$sed -i 's/stretchyman.png/stretchyman-diffuse.png/g' "$UNITY_TARGET_DIR/stretchyman-diffuse.atlas.txt" +cp -f ../stretchyman/manual-maps/stretchyman.png "$UNITY_TARGET_DIR/stretchyman-diffuse.png" cp -f ../stretchyman/manual-maps/stretchyman-normals.png "$UNITY_TARGET_DIR/" cp -f ../stretchyman/manual-maps/stretchyman-emission.png "$UNITY_TARGET_DIR/" @@ -603,79 +601,77 @@ cp -f ../stretchyman/manual-maps/stretchyman-emission.png "$UNITY_TARGET_DIR/" UNITY_TARGET_DIR="$ROOT/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Eyes" cp -f $UNITY_SOURCE_DIR/eyes/export/eyes.json "$UNITY_TARGET_DIR/eyes.json" -cp -f $UNITY_SOURCE_DIR/eyes/export/eyes-pma.atlas "$UNITY_TARGET_DIR/eyes.atlas.txt" -$sed -i 's/eyes-pma.png/eyes.png/g' "$UNITY_TARGET_DIR/eyes.atlas.txt" -cp -f $UNITY_SOURCE_DIR/eyes/export/eyes-pma.png "$UNITY_TARGET_DIR/eyes.png" +cp -f $UNITY_SOURCE_DIR/eyes/export/eyes.atlas "$UNITY_TARGET_DIR/eyes.atlas.txt" +cp -f $UNITY_SOURCE_DIR/eyes/export/eyes.png "$UNITY_TARGET_DIR/eyes.png" UNITY_TARGET_DIR="$ROOT/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/FootSoldier" cp -f $UNITY_SOURCE_DIR/footsoldier/export/footsoldier.json "$UNITY_TARGET_DIR/FootSoldier.json" -cp -f $UNITY_SOURCE_DIR/footsoldier/export/footsoldier-pma.atlas "$UNITY_TARGET_DIR/FS_White.atlas.txt" -$sed -i 's/footsoldier-pma.png/FS_White.png/g' "$UNITY_TARGET_DIR/FS_White.atlas.txt" -cp -f $UNITY_SOURCE_DIR/footsoldier/export/footsoldier-pma.png "$UNITY_TARGET_DIR/FS_White.png" +cp -f $UNITY_SOURCE_DIR/footsoldier/export/footsoldier.atlas "$UNITY_TARGET_DIR/FS_White.atlas.txt" +$sed -i 's/footsoldier.png/FS_White.png/g' "$UNITY_TARGET_DIR/FS_White.atlas.txt" +cp -f $UNITY_SOURCE_DIR/footsoldier/export/footsoldier.png "$UNITY_TARGET_DIR/FS_White.png" UNITY_TARGET_DIR="$ROOT/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Gauge" cp -f $UNITY_SOURCE_DIR/gauge/export/gauge.json "$UNITY_TARGET_DIR/Gauge.json" -cp -f $UNITY_SOURCE_DIR/gauge/export/gauge-pma.atlas "$UNITY_TARGET_DIR/Gauge.atlas.txt" -$sed -i 's/gauge-pma.png/Gauge.png/g' "$UNITY_TARGET_DIR/Gauge.atlas.txt" -cp -f $UNITY_SOURCE_DIR/gauge/export/gauge-pma.png "$UNITY_TARGET_DIR/Gauge.png" +cp -f $UNITY_SOURCE_DIR/gauge/export/gauge.atlas "$UNITY_TARGET_DIR/Gauge.atlas.txt" +$sed -i 's/gauge.png/Gauge.png/g' "$UNITY_TARGET_DIR/Gauge.atlas.txt" +cp -f $UNITY_SOURCE_DIR/gauge/export/gauge.png "$UNITY_TARGET_DIR/Gauge.png" UNITY_TARGET_DIR="$ROOT/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raptor" cp -f $UNITY_SOURCE_DIR/raptor/export/raptor.json "$UNITY_TARGET_DIR/raptor.json" -cp -f $UNITY_SOURCE_DIR/raptor/export/raptor-pma.atlas "$UNITY_TARGET_DIR/raptor.atlas.txt" -$sed -i 's/raptor-pma.png/raptor.png/g' "$UNITY_TARGET_DIR/raptor.atlas.txt" -cp -f $UNITY_SOURCE_DIR/raptor/export/raptor-pma.png "$UNITY_TARGET_DIR/raptor.png" +cp -f $UNITY_SOURCE_DIR/raptor/export/raptor.atlas "$UNITY_TARGET_DIR/raptor.atlas.txt" +cp -f $UNITY_SOURCE_DIR/raptor/export/raptor.png "$UNITY_TARGET_DIR/raptor.png" UNITY_TARGET_DIR="$ROOT/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raggedy Spineboy" cp -f $UNITY_SOURCE_DIR/raggedyspineboy/export/raggedyspineboy.json "$UNITY_TARGET_DIR/raggedy spineboy.json" -cp -f $UNITY_SOURCE_DIR/raggedyspineboy/export/raggedyspineboy-pma.atlas "$UNITY_TARGET_DIR/Raggedy Spineboy.atlas.txt" -$sed -i 's/raggedyspineboy-pma.png/Raggedy Spineboy.png/g' "$UNITY_TARGET_DIR/Raggedy Spineboy.atlas.txt" -cp -f $UNITY_SOURCE_DIR/raggedyspineboy/export/raggedyspineboy-pma.png "$UNITY_TARGET_DIR/Raggedy Spineboy.png" +cp -f $UNITY_SOURCE_DIR/raggedyspineboy/export/raggedyspineboy.atlas "$UNITY_TARGET_DIR/Raggedy Spineboy.atlas.txt" +$sed -i 's/raggedyspineboy.png/Raggedy Spineboy.png/g' "$UNITY_TARGET_DIR/Raggedy Spineboy.atlas.txt" +cp -f $UNITY_SOURCE_DIR/raggedyspineboy/export/raggedyspineboy.png "$UNITY_TARGET_DIR/Raggedy Spineboy.png" UNITY_TARGET_DIR="$ROOT/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-pro" cp -f $UNITY_SOURCE_DIR/spineboy-pro/export/spineboy-pro.json "$UNITY_TARGET_DIR/spineboy-pro.json" -cp -f $UNITY_SOURCE_DIR/spineboy-pro/export/spineboy-pma.atlas "$UNITY_TARGET_DIR/spineboy-pro.atlas.txt" -$sed -i 's/spineboy-pma.png/spineboy-pro.png/g' "$UNITY_TARGET_DIR/spineboy-pro.atlas.txt" -cp -f $UNITY_SOURCE_DIR/spineboy-pro/export/spineboy-pma.png "$UNITY_TARGET_DIR/spineboy-pro.png" +cp -f $UNITY_SOURCE_DIR/spineboy-pro/export/spineboy.atlas "$UNITY_TARGET_DIR/spineboy-pro.atlas.txt" +$sed -i 's/spineboy.png/spineboy-pro.png/g' "$UNITY_TARGET_DIR/spineboy-pro.atlas.txt" +cp -f $UNITY_SOURCE_DIR/spineboy-pro/export/spineboy.png "$UNITY_TARGET_DIR/spineboy-pro.png" UNITY_TARGET_DIR="$ROOT/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-unity" cp -f $UNITY_SOURCE_DIR/spineboy-unity/export/spineboy-unity.json "$UNITY_TARGET_DIR/spineboy-unity.json" -cp -f $UNITY_SOURCE_DIR/spineboy-unity/export/spineboy-pma.atlas "$UNITY_TARGET_DIR/spineboy.atlas.txt" -$sed -i 's/spineboy-pma.png/spineboy.png/g' "$UNITY_TARGET_DIR/spineboy.atlas.txt" -cp -f $UNITY_SOURCE_DIR/spineboy-unity/export/spineboy-pma.png "$UNITY_TARGET_DIR/spineboy.png" +cp -f $UNITY_SOURCE_DIR/spineboy-unity/export/spineboy.atlas "$UNITY_TARGET_DIR/spineboy.atlas.txt" +cp -f $UNITY_SOURCE_DIR/spineboy-unity/export/spineboy.png "$UNITY_TARGET_DIR/spineboy.png" UNITY_TARGET_DIR="$ROOT/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Spineunitygirl" cp -f $UNITY_SOURCE_DIR/spineunitygirl/export/doi.json "$UNITY_TARGET_DIR/Doi.json" -cp -f $UNITY_SOURCE_DIR/spineunitygirl/export/doi-pma.atlas "$UNITY_TARGET_DIR/Doi.atlas.txt" -$sed -i 's/doi-pma.png/Doi.png/g' "$UNITY_TARGET_DIR/Doi.atlas.txt" -cp -f $UNITY_SOURCE_DIR/spineunitygirl/export/doi-pma.png "$UNITY_TARGET_DIR/Doi.png" +cp -f $UNITY_SOURCE_DIR/spineunitygirl/export/doi.atlas "$UNITY_TARGET_DIR/Doi.atlas.txt" +$sed -i 's/doi.png/Doi.png/g' "$UNITY_TARGET_DIR/Doi.atlas.txt" +cp -f $UNITY_SOURCE_DIR/spineunitygirl/export/doi.png "$UNITY_TARGET_DIR/Doi.png" UNITY_TARGET_DIR="$ROOT/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Whirlyblendmodes" cp -f $UNITY_SOURCE_DIR/whirlyblendmodes/export/whirlyblendmodes.json "$UNITY_TARGET_DIR/whirlyblendmodes.json" -cp -f $UNITY_SOURCE_DIR/whirlyblendmodes/export/whirlyblendmodes-pma.atlas "$UNITY_TARGET_DIR/whirlyblendmodes.atlas.txt" -$sed -i 's/whirlyblendmodes-pma.png/whirlyblendmodes.png/g' "$UNITY_TARGET_DIR/whirlyblendmodes.atlas.txt" -cp -f $UNITY_SOURCE_DIR/whirlyblendmodes/export/whirlyblendmodes-pma.png "$UNITY_TARGET_DIR/whirlyblendmodes.png" +cp -f $UNITY_SOURCE_DIR/whirlyblendmodes/export/whirlyblendmodes.atlas "$UNITY_TARGET_DIR/whirlyblendmodes.atlas.txt" +cp -f $UNITY_SOURCE_DIR/whirlyblendmodes/export/whirlyblendmodes.png "$UNITY_TARGET_DIR/whirlyblendmodes.png" UNITY_TARGET_DIR="$ROOT/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus" cp -f ../celestial-circus/export/celestial-circus-pro.json "$UNITY_TARGET_DIR/" -cp -f ../celestial-circus/export/celestial-circus-pma.atlas "$UNITY_TARGET_DIR/celestial-circus-pma.atlas.txt" -cp -f ../celestial-circus/export/celestial-circus-pma*.png "$UNITY_TARGET_DIR/" +cp -f ../celestial-circus/export/celestial-circus.atlas "$UNITY_TARGET_DIR/celestial-circus.atlas.txt" +cp -f ../celestial-circus/export/celestial-circus.png "$UNITY_TARGET_DIR/" UNITY_TARGET_DIR="$ROOT/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe" cp -f ../snowglobe/export/snowglobe-pro.skel "$UNITY_TARGET_DIR/snowglobe-pro.skel.bytes" -cp -f ../snowglobe/export/snowglobe-pma.atlas "$UNITY_TARGET_DIR/snowglobe-pma.atlas.txt" -cp -f ../snowglobe/export/snowglobe-pma*.png "$UNITY_TARGET_DIR/" +cp -f ../snowglobe/export/snowglobe.atlas "$UNITY_TARGET_DIR/snowglobe.atlas.txt" +cp -f ../snowglobe/export/snowglobe.png "$UNITY_TARGET_DIR/" +cp -f ../snowglobe/export/snowglobe_2.png "$UNITY_TARGET_DIR/" +cp -f ../snowglobe/export/snowglobe_3.png "$UNITY_TARGET_DIR/" UNITY_TARGET_DIR="$ROOT/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot" cp -f ../cloud-pot/export/cloud-pot.skel "$UNITY_TARGET_DIR/cloud-pot.skel.bytes" -cp -f ../cloud-pot/export/cloud-pot-pma.atlas "$UNITY_TARGET_DIR/cloud-pot-pma.atlas.txt" -cp -f ../cloud-pot/export/cloud-pot-pma.png "$UNITY_TARGET_DIR/" +cp -f ../cloud-pot/export/cloud-pot.atlas "$UNITY_TARGET_DIR/cloud-pot.atlas.txt" +cp -f ../cloud-pot/export/cloud-pot.png "$UNITY_TARGET_DIR/" UNITY_TARGET_DIR="$ROOT/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack" cp -f ../7-anticipation/export/sack-pro.skel "$UNITY_TARGET_DIR/sack-pro.skel.bytes" -cp -f ../7-anticipation/export/7-anticipation-pma.atlas "$UNITY_TARGET_DIR/sack-pma.atlas.txt" -$sed -i 's/7-anticipation-pma.png/sack-pma.png/g' "$UNITY_TARGET_DIR/sack-pma.atlas.txt" -cp -f ../7-anticipation/export/7-anticipation-pma.png "$UNITY_TARGET_DIR/sack-pma.png" +cp -f ../7-anticipation/export/7-anticipation.atlas "$UNITY_TARGET_DIR/sack.atlas.txt" +$sed -i 's/7-anticipation.png/sack.png/g' "$UNITY_TARGET_DIR/sack.atlas.txt" +cp -f ../7-anticipation/export/7-anticipation.png "$UNITY_TARGET_DIR/sack.png" echo "--" echo "Note regarding spine-xna and spine-unity:" diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon.atlas.txt b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon.atlas.txt index 484270f41..d7fff69bc 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon.atlas.txt +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon.atlas.txt @@ -1,7 +1,6 @@ dragon.png size: 1024, 1024 filter: Linear, Linear - pma: true front-toe-a bounds: 300, 929, 29, 50 front-toe-b @@ -32,7 +31,6 @@ thiagobrayner dragon2.png size: 1024, 1024 filter: Linear, Linear - pma: true back bounds: 647, 57, 190, 185 chin @@ -60,7 +58,6 @@ tail05 dragon3.png size: 1024, 1024 filter: Linear, Linear - pma: true chest bounds: 858, 299, 136, 122 left-front-thigh @@ -93,7 +90,6 @@ tail02 dragon4.png size: 1024, 1024 filter: Linear, Linear - pma: true left-wing03 bounds: 2, 2, 264, 589 rotate: 90 @@ -107,7 +103,6 @@ left-wing06 dragon5.png size: 1024, 1024 filter: Linear, Linear - pma: true left-wing01 bounds: 268, 2, 264, 589 left-wing02 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Eyes/eyes.atlas.txt b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Eyes/eyes.atlas.txt index 91ff9cccc..4ed2c7f5f 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Eyes/eyes.atlas.txt +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Eyes/eyes.atlas.txt @@ -1,7 +1,6 @@ eyes.png size: 1024, 512 filter: Linear, Linear - pma: true EyeLines bounds: 2, 2, 868, 322 EyeWhite diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/FootSoldier/FS_White.atlas.txt b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/FootSoldier/FS_White.atlas.txt index 265450112..19c08a246 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/FootSoldier/FS_White.atlas.txt +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/FootSoldier/FS_White.atlas.txt @@ -1,7 +1,6 @@ FS_White.png size: 256, 512 filter: Linear, Linear - pma: true White/arm bounds: 143, 151, 111, 98 rotate: 90 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Gauge/Gauge.atlas.txt b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Gauge/Gauge.atlas.txt index 30bae0698..d0c203a56 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Gauge/Gauge.atlas.txt +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Gauge/Gauge.atlas.txt @@ -1,7 +1,6 @@ Gauge.png size: 1024, 64 filter: Linear, Linear - pma: true Background bounds: 480, 30, 224, 32 Bar diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Goblins/goblins.atlas.txt b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Goblins/goblins.atlas.txt index 91613b6b7..67b24a2eb 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Goblins/goblins.atlas.txt +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Goblins/goblins.atlas.txt @@ -1,7 +1,6 @@ goblins.png size: 1024, 128 filter: Linear, Linear - pma: true dagger bounds: 372, 99, 26, 108 rotate: 90 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Hero/hero-pro.atlas.txt b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Hero/hero-pro.atlas.txt index f00aec4f9..3e52a5bda 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Hero/hero-pro.atlas.txt +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Hero/hero-pro.atlas.txt @@ -1,7 +1,6 @@ hero-pro.png size: 1024, 256 filter: Linear, Linear - pma: true body bounds: 742, 77, 97, 95 rotate: 90 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy.atlas.txt b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy.atlas.txt index 10b8bb6b0..cece6e763 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy.atlas.txt +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy.atlas.txt @@ -1,7 +1,6 @@ Raggedy Spineboy.png size: 256, 256 filter: Linear, Linear - pma: true arm bounds: 140, 17, 71, 75 head diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raptor/raptor.atlas.txt b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raptor/raptor.atlas.txt index 9f42383c4..2e521454a 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raptor/raptor.atlas.txt +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raptor/raptor.atlas.txt @@ -1,7 +1,6 @@ raptor.png size: 1024, 1024 filter: Linear, Linear - pma: true back_arm bounds: 407, 496, 46, 29 back_bracer diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Spineunitygirl/Doi.atlas.txt b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Spineunitygirl/Doi.atlas.txt index 0b98c0873..373b55881 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Spineunitygirl/Doi.atlas.txt +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Spineunitygirl/Doi.atlas.txt @@ -1,7 +1,6 @@ Doi.png size: 1024, 512 filter: Linear, Linear - pma: true armL bounds: 502, 178, 163, 133 rotate: 90 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma.atlas.txt b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse.atlas.txt similarity index 95% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma.atlas.txt rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse.atlas.txt index 657453187..41a322d11 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma.atlas.txt +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse.atlas.txt @@ -1,5 +1,5 @@ -stretchyman-diffuse-pma.png +stretchyman-diffuse.png size: 1024,256 format: RGBA8888 filter: Linear,Linear diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma.atlas.txt.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse.atlas.txt.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma.atlas.txt.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse.atlas.txt.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma.png b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse.png similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma.png rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse.png diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse.png.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma.png.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse.png.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma_Atlas.asset b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse_Atlas.asset similarity index 93% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma_Atlas.asset rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse_Atlas.asset index 835776a52..56901c5bf 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma_Atlas.asset +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse_Atlas.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} - m_Name: stretchyman-diffuse-pma_Atlas + m_Name: stretchyman-diffuse_Atlas m_EditorClassIdentifier: textureLoadingMode: 0 onDemandTextureLoader: {fileID: 0} diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma_Atlas.asset.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse_Atlas.asset.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma_Atlas.asset.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse_Atlas.asset.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma_Material.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse_Material.mat similarity index 98% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma_Material.mat rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse_Material.mat index 7f1914bed..61487960d 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma_Material.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse_Material.mat @@ -6,7 +6,7 @@ Material: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: stretchyman-diffuse-pma_Material + m_Name: stretchyman-diffuse_Material m_Shader: {fileID: 4800000, guid: 2ce511398fb980f41b7d316c51534590, type: 3} m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION _FIXED_NORMALS _FIXED_NORMALS_VIEWSPACE _NORMALMAP diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma_Material.mat.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse_Material.mat.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma_Material.mat.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse_Material.mat.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pro_SkeletonData.asset b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pro_SkeletonData.asset index 6a61f5d26..ab91bae15 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pro_SkeletonData.asset +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pro_SkeletonData.asset @@ -22,7 +22,7 @@ MonoBehaviour: applyAdditiveMaterial: 0 additiveMaterials: [] multiplyMaterials: - - pageName: celestial-circus-pma.png + - pageName: celestial-circus.png material: {fileID: 2100000, guid: 51ea24e83c232c34994854424cd89413, type: 2} screenMaterials: [] skeletonDataModifiers: [] diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pma.atlas.txt b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus.atlas.txt similarity index 98% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pma.atlas.txt rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus.atlas.txt index f24c49957..f83235e9a 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pma.atlas.txt +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus.atlas.txt @@ -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: 971, 683, 38, 82 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pma.atlas.txt.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus.atlas.txt.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pma.atlas.txt.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus.atlas.txt.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus.png b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus.png new file mode 100644 index 000000000..5ef26b368 Binary files /dev/null and b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus.png differ diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pma.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus.png.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pma.png.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus.png.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pma_Atlas.asset b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus_Atlas.asset similarity index 94% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pma_Atlas.asset rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus_Atlas.asset index 60c3d42c2..461d3951e 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pma_Atlas.asset +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus_Atlas.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} - m_Name: celestial-circus-pma_Atlas + m_Name: celestial-circus_Atlas m_EditorClassIdentifier: textureLoadingMode: 0 onDemandTextureLoader: {fileID: 0} diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pma_Atlas.asset.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus_Atlas.asset.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pma_Atlas.asset.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus_Atlas.asset.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pma_Material.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus_Material.mat similarity index 97% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pma_Material.mat rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus_Material.mat index de33a1d7e..12d110b25 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pma_Material.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus_Material.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: celestial-circus-pma_Material + m_Name: celestial-circus_Material m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pma_Material.mat.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus_Material.mat.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pma_Material.mat.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus_Material.mat.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pma_celestial-circus-pma-Multiply.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus_celestial-circus-Multiply.mat similarity index 95% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pma_celestial-circus-pma-Multiply.mat rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus_celestial-circus-Multiply.mat index e5e9ba7bf..364e81ce1 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pma_celestial-circus-pma-Multiply.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus_celestial-circus-Multiply.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: celestial-circus-pma_celestial-circus-pma-Multiply + m_Name: celestial-circus_celestial-circus-Multiply m_Shader: {fileID: 4800000, guid: 8bdcdc7ee298e594a9c20c61d25c33b6, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pma_celestial-circus-pma-Multiply.mat.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus_celestial-circus-Multiply.mat.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pma_celestial-circus-pma-Multiply.mat.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus_celestial-circus-Multiply.mat.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot-pma.atlas.txt b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot.atlas.txt similarity index 98% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot-pma.atlas.txt rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot.atlas.txt index 1e1727cac..7d1aac690 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot-pma.atlas.txt +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot.atlas.txt @@ -1,7 +1,6 @@ -cloud-pot-pma.png +cloud-pot.png size: 1024, 512 filter: Linear, Linear - pma: true scale: 0.5 cloud-base-1 bounds: 548, 129, 233, 210 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot-pma.atlas.txt.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot.atlas.txt.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot-pma.atlas.txt.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot.atlas.txt.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot-pma.png b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot.png similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot-pma.png rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot.png diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot-pma.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot.png.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot-pma.png.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot.png.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot-pma_Atlas.asset b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot_Atlas.asset similarity index 95% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot-pma_Atlas.asset rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot_Atlas.asset index 4e54dcb14..7a047e53f 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot-pma_Atlas.asset +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot_Atlas.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} - m_Name: cloud-pot-pma_Atlas + m_Name: cloud-pot_Atlas m_EditorClassIdentifier: textureLoadingMode: 0 onDemandTextureLoader: {fileID: 0} diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot-pma_Atlas.asset.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot_Atlas.asset.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot-pma_Atlas.asset.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot_Atlas.asset.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot-pma_Material.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot_Material.mat similarity index 97% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot-pma_Material.mat rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot_Material.mat index ae4cf71a8..e290e8f3f 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot-pma_Material.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot_Material.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: cloud-pot-pma_Material + m_Name: cloud-pot_Material m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot-pma_Material.mat.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot_Material.mat.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot-pma_Material.mat.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot_Material.mat.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma.atlas.txt b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match.atlas.txt similarity index 99% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma.atlas.txt rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match.atlas.txt index 575662c01..2a8f1fcda 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma.atlas.txt +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match.atlas.txt @@ -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: 185, 123, 95, 73 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma.atlas.txt.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match.atlas.txt.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma.atlas.txt.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match.atlas.txt.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma.png b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match.png similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma.png rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match.png diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match.png.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma.png.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match.png.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma_Atlas.asset b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match_Atlas.asset similarity index 94% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma_Atlas.asset rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match_Atlas.asset index 745119ea0..447ade9a7 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma_Atlas.asset +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match_Atlas.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} - m_Name: mix-and-match-pma_Atlas + m_Name: mix-and-match_Atlas m_EditorClassIdentifier: textureLoadingMode: 0 onDemandTextureLoader: {fileID: 0} diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma_Atlas.asset.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match_Atlas.asset.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma_Atlas.asset.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match_Atlas.asset.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma_Material.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match_Material.mat similarity index 97% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma_Material.mat rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match_Material.mat index 912ff54f2..f26013cbe 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma_Material.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match_Material.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: mix-and-match-pma_Material + m_Name: mix-and-match_Material m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma_Material.mat.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match_Material.mat.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma_Material.mat.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match_Material.mat.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma.atlas.txt b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor.atlas.txt similarity index 98% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma.atlas.txt rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor.atlas.txt index 8bedc6a6f..69ed03ea6 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma.atlas.txt +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor.atlas.txt @@ -1,7 +1,6 @@ -raptor-pma.png +raptor.png size: 1024, 512 filter: Linear, Linear - pma: true scale: 0.5 back-arm bounds: 130, 32, 46, 25 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma.atlas.txt.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor.atlas.txt.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma.atlas.txt.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor.atlas.txt.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma.png b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor.png similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma.png rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor.png diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor.png.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma.png.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor.png.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_Atlas.asset b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_Atlas.asset similarity index 95% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_Atlas.asset rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_Atlas.asset index c938e729c..d1825d3be 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_Atlas.asset +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_Atlas.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} - m_Name: raptor-pma_Atlas + m_Name: raptor_Atlas m_EditorClassIdentifier: textureLoadingMode: 0 onDemandTextureLoader: {fileID: 0} diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_Atlas.asset.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_Atlas.asset.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_Atlas.asset.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_Atlas.asset.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_Material.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_Material.mat similarity index 97% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_Material.mat rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_Material.mat index c05b2a55e..5dc962d91 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_Material.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_Material.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: raptor-pma_Material + m_Name: raptor_Material m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_Material.mat.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_Material.mat.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_Material.mat.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_Material.mat.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_MaterialOutline.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_MaterialOutline.mat similarity index 96% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_MaterialOutline.mat rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_MaterialOutline.mat index 6180b736d..dc6cf2944 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_MaterialOutline.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_MaterialOutline.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: raptor-pma_MaterialOutline + m_Name: raptor_MaterialOutline m_Shader: {fileID: 4800000, guid: 28b5cf4804845fe4b868531fd0bb81d5, type: 3} m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_MaterialOutline.mat.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_MaterialOutline.mat.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_MaterialOutline.mat.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_MaterialOutline.mat.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_MaterialOutline_OutsideMask.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_MaterialOutline_OutsideMask.mat similarity index 96% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_MaterialOutline_OutsideMask.mat rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_MaterialOutline_OutsideMask.mat index 08fa4c4fd..b6f50f67f 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_MaterialOutline_OutsideMask.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_MaterialOutline_OutsideMask.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: raptor-pma_MaterialOutline_OutsideMask + m_Name: raptor_MaterialOutline_OutsideMask m_Shader: {fileID: 4800000, guid: 28b5cf4804845fe4b868531fd0bb81d5, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_MaterialOutline_OutsideMask.mat.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_MaterialOutline_OutsideMask.mat.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_MaterialOutline_OutsideMask.mat.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_MaterialOutline_OutsideMask.mat.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_MaterialTint.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_MaterialTint.mat similarity index 97% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_MaterialTint.mat rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_MaterialTint.mat index 5ba4aa988..6f9f88e58 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_MaterialTint.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_MaterialTint.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: raptor-pma_MaterialTint + m_Name: raptor_MaterialTint m_Shader: {fileID: 4800000, guid: 522f03282fd79be47b306e2ef4b593fd, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_MaterialTint.mat.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_MaterialTint.mat.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_MaterialTint.mat.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_MaterialTint.mat.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_MaterialTint_OutsideMask.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_MaterialTint_OutsideMask.mat similarity index 96% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_MaterialTint_OutsideMask.mat rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_MaterialTint_OutsideMask.mat index bace13940..260bc7eca 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_MaterialTint_OutsideMask.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_MaterialTint_OutsideMask.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: raptor-pma_MaterialTint_OutsideMask + m_Name: raptor_MaterialTint_OutsideMask m_Shader: {fileID: 4800000, guid: 522f03282fd79be47b306e2ef4b593fd, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_MaterialTint_OutsideMask.mat.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_MaterialTint_OutsideMask.mat.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_MaterialTint_OutsideMask.mat.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_MaterialTint_OutsideMask.mat.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_Material_InsideMask.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_Material_InsideMask.mat similarity index 94% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_Material_InsideMask.mat rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_Material_InsideMask.mat index f30739111..e86e083fe 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_Material_InsideMask.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_Material_InsideMask.mat @@ -6,7 +6,7 @@ Material: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: raptor-pma_Material_InsideMask + m_Name: raptor_Material_InsideMask m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_Material_InsideMask.mat.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_Material_InsideMask.mat.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_Material_InsideMask.mat.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_Material_InsideMask.mat.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_Material_OutsideMask.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_Material_OutsideMask.mat similarity index 94% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_Material_OutsideMask.mat rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_Material_OutsideMask.mat index fec20bfa6..5f7757c18 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_Material_OutsideMask.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_Material_OutsideMask.mat @@ -6,7 +6,7 @@ Material: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: raptor-pma_Material_OutsideMask + m_Name: raptor_Material_OutsideMask m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_Material_OutsideMask.mat.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_Material_OutsideMask.mat.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_Material_OutsideMask.mat.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_Material_OutsideMask.mat.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack-pma.atlas.txt b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack.atlas.txt similarity index 87% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack-pma.atlas.txt rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack.atlas.txt index ddfef162d..bcda0b0f4 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack-pma.atlas.txt +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack.atlas.txt @@ -1,7 +1,6 @@ -sack-pma.png +sack.png size: 512, 512 filter: Linear, Linear - pma: true scale: 0.5 cape-back bounds: 229, 149, 260, 260 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack-pma.atlas.txt.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack.atlas.txt.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack-pma.atlas.txt.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack.atlas.txt.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack-pma.png b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack.png similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack-pma.png rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack.png diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack-pma.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack.png.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack-pma.png.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack.png.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack-pma_Atlas.asset b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack_Atlas.asset similarity index 96% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack-pma_Atlas.asset rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack_Atlas.asset index b3cea9bad..eec206779 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack-pma_Atlas.asset +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack_Atlas.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} - m_Name: sack-pma_Atlas + m_Name: sack_Atlas m_EditorClassIdentifier: textureLoadingMode: 0 onDemandTextureLoader: {fileID: 0} diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack-pma_Atlas.asset.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack_Atlas.asset.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack-pma_Atlas.asset.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack_Atlas.asset.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack-pma_Material.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack_Material.mat similarity index 97% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack-pma_Material.mat rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack_Material.mat index 9391e0a92..7c0f16c1e 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack-pma_Material.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack_Material.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: sack-pma_Material + m_Name: sack_Material m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack-pma_Material.mat.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack_Material.mat.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack-pma_Material.mat.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack_Material.mat.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pro_SkeletonData.asset b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pro_SkeletonData.asset index c406207de..8f545213e 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pro_SkeletonData.asset +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pro_SkeletonData.asset @@ -22,9 +22,9 @@ MonoBehaviour: applyAdditiveMaterial: 0 additiveMaterials: [] multiplyMaterials: - - pageName: snowglobe-pma_4.png + - pageName: snowglobe_4.png material: {fileID: 2100000, guid: 457f3020c684d35468371a3d1f701bf5, type: 2} - - pageName: snowglobe-pma.png + - pageName: snowglobe.png material: {fileID: 2100000, guid: 8fe6588f222e36643befb8dc4dd42d31, type: 2} screenMaterials: [] skeletonDataModifiers: [] diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma.atlas.txt b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe.atlas.txt similarity index 97% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma.atlas.txt rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe.atlas.txt index 95066b05d..a545a34b6 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma.atlas.txt +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe.atlas.txt @@ -1,7 +1,6 @@ -snowglobe-pma.png +snowglobe.png size: 1024, 1024 filter: Linear, Linear - pma: true scale: 0.5 blue-present-decoration bounds: 905, 377, 41, 40 @@ -58,10 +57,9 @@ snow string bounds: 2, 968, 5, 53 -snowglobe-pma_2.png +snowglobe_2.png size: 1024, 1024 filter: Linear, Linear - pma: true scale: 0.5 arm-down-l bounds: 80, 8, 56, 54 @@ -192,10 +190,9 @@ shoe-l shoe-r bounds: 2, 521, 44, 93 -snowglobe-pma_3.png +snowglobe_3.png size: 1024, 512 filter: Linear, Linear - pma: true scale: 0.5 globe-base-back bounds: 2, 2, 606, 258 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma.atlas.txt.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe.atlas.txt.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma.atlas.txt.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe.atlas.txt.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma.png b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe.png similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma.png rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe.png diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe.png.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma.png.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe.png.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_2.png b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_2.png similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_2.png rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_2.png diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_2.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_2.png.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_2.png.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_2.png.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_3.png b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_3.png similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_3.png rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_3.png diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_3.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_3.png.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_3.png.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_3.png.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_4.png b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_4.png similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_4.png rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_4.png diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_4.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_4.png.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_4.png.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_4.png.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_5.png b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_5.png similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_5.png rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_5.png diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_5.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_5.png.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_5.png.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_5.png.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_Atlas.asset b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_Atlas.asset similarity index 96% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_Atlas.asset rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_Atlas.asset index cb71bd334..b798776b5 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_Atlas.asset +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_Atlas.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} - m_Name: snowglobe-pma_Atlas + m_Name: snowglobe_Atlas m_EditorClassIdentifier: textureLoadingMode: 0 onDemandTextureLoader: {fileID: 0} diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_Atlas.asset.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_Atlas.asset.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_Atlas.asset.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_Atlas.asset.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma-Multiply.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe-Multiply.mat similarity index 97% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma-Multiply.mat rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe-Multiply.mat index 7cc50e29c..bdf764b2e 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma-Multiply.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe-Multiply.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: snowglobe-pma_snowglobe-pma-Multiply + m_Name: snowglobe_snowglobe-Multiply m_Shader: {fileID: 4800000, guid: 8bdcdc7ee298e594a9c20c61d25c33b6, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma-Multiply.mat.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe-Multiply.mat.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma-Multiply.mat.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe-Multiply.mat.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe.mat similarity index 97% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma.mat rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe.mat index d17f1492e..c1b439da4 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: snowglobe-pma_snowglobe-pma + m_Name: snowglobe_snowglobe m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma.mat.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe.mat.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma.mat.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe.mat.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_2.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe_2.mat similarity index 97% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_2.mat rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe_2.mat index c1e947cc8..8b9307cab 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_2.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe_2.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: snowglobe-pma_snowglobe-pma_2 + m_Name: snowglobe_snowglobe_2 m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_2.mat.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe_2.mat.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_2.mat.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe_2.mat.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_3.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe_3.mat similarity index 97% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_3.mat rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe_3.mat index 9a59c3bd7..854f36b6f 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_3.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe_3.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: snowglobe-pma_snowglobe-pma_3 + m_Name: snowglobe_snowglobe_3 m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_3.mat.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe_3.mat.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_3.mat.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe_3.mat.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_4-Multiply.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe_4-Multiply.mat similarity index 96% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_4-Multiply.mat rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe_4-Multiply.mat index c7664cc5b..d57df783a 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_4-Multiply.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe_4-Multiply.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: snowglobe-pma_snowglobe-pma_4-Multiply + m_Name: snowglobe_snowglobe_4-Multiply m_Shader: {fileID: 4800000, guid: 8bdcdc7ee298e594a9c20c61d25c33b6, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_4-Multiply.mat.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe_4-Multiply.mat.meta similarity index 100% rename from spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_4-Multiply.mat.meta rename to spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe_4-Multiply.mat.meta diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro.atlas.txt b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro.atlas.txt index fc6a9615a..441308271 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro.atlas.txt +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro.atlas.txt @@ -1,7 +1,6 @@ spineboy-pro.png size: 2048, 1024 filter: Linear, Linear - pma: true crosshair bounds: 538, 418, 89, 89 dust01 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-unity/spineboy.atlas.txt b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-unity/spineboy.atlas.txt index 1868339c1..8c020d3ee 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-unity/spineboy.atlas.txt +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-unity/spineboy.atlas.txt @@ -1,7 +1,6 @@ spineboy.png size: 1024, 1024 filter: Linear, Linear - pma: true eye_indifferent bounds: 747, 451, 93, 89 eye_surprised diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.atlas.txt b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.atlas.txt index 46f71923e..d45879f2b 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.atlas.txt +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.atlas.txt @@ -1,6 +1,5 @@ whirlyblendmodes.png size: 512, 512 filter: Linear, Linear - pma: true whirly bounds: 2, 2, 256, 256