diff --git a/examples/export/runtimes.sh b/examples/export/runtimes.sh index 063dbdf34..9beca0c98 100755 --- a/examples/export/runtimes.sh +++ b/examples/export/runtimes.sh @@ -449,11 +449,10 @@ 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" -UNITY_TARGET_DIR="$ROOT/spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor" -cp -f ../raptor/export/raptor-pro.json "$UNITY_TARGET_DIR/raptor.json" -cp -f ../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 ../raptor/export/raptor-pma.png "$UNITY_TARGET_DIR/raptor.png" +UNITY_TARGET_DIR="$ROOT/spine-unity/Assets/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" UNITY_TARGET_DIR="$ROOT/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro" cp -f ../spineboy/export/spineboy-pro.json "$UNITY_TARGET_DIR/spineboy-pro.json" @@ -463,10 +462,10 @@ cp -f ../spineboy/export/spineboy-pma.png "$UNITY_TARGET_DIR/spineboy-pro.png" UNITY_TARGET_DIR="$ROOT/spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman" cp -f ../stretchyman/export/stretchyman-pro.json "$UNITY_TARGET_DIR/stretchyman.json" -cp -f ../stretchyman/export/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/export/stretchyman-pma.png "$UNITY_TARGET_DIR/stretchyman-diffuse-pma.png" -# Note: normalmap and emissionmap have been created manually, a recreated version is copied to the target dir. +# 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 $UNITY_SOURCE_DIR/stretchyman/stretchyman-diffuse-pma.atlas.txt "$UNITY_TARGET_DIR/stretchyman-diffuse-pma.atlas.txt" +cp -f $UNITY_SOURCE_DIR/stretchyman/stretchyman-diffuse-pma.png "$UNITY_TARGET_DIR/stretchyman-diffuse-pma.png" cp -f $UNITY_SOURCE_DIR/stretchyman/stretchyman-normals.png "$UNITY_TARGET_DIR/" cp -f $UNITY_SOURCE_DIR/stretchyman/stretchyman-emission.png "$UNITY_TARGET_DIR/" diff --git a/examples/spine-unity/stretchyman/stretchyman-diffuse-pma.atlas.txt b/examples/spine-unity/stretchyman/stretchyman-diffuse-pma.atlas.txt new file mode 100644 index 000000000..657453187 --- /dev/null +++ b/examples/spine-unity/stretchyman/stretchyman-diffuse-pma.atlas.txt @@ -0,0 +1,41 @@ + +stretchyman-diffuse-pma.png +size: 1024,256 +format: RGBA8888 +filter: Linear,Linear +repeat: none +back-arm + rotate: true + xy: 679, 173 + size: 72, 202 + orig: 72, 202 + offset: 0, 0 + index: -1 +back-leg + rotate: true + xy: 2, 2 + size: 100, 318 + orig: 100, 318 + offset: 0, 0 + index: -1 +body + rotate: true + xy: 2, 104 + size: 141, 452 + orig: 141, 452 + offset: 0, 0 + index: -1 +front-arm + rotate: true + xy: 456, 100 + size: 145, 221 + orig: 145, 221 + offset: 0, 0 + index: -1 +head + rotate: true + xy: 322, 15 + size: 87, 102 + orig: 87, 102 + offset: 0, 0 + index: -1 diff --git a/examples/spine-unity/stretchyman/stretchyman-diffuse-pma.png b/examples/spine-unity/stretchyman/stretchyman-diffuse-pma.png new file mode 100644 index 000000000..0456a30de Binary files /dev/null and b/examples/spine-unity/stretchyman/stretchyman-diffuse-pma.png differ