mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2026-02-24 02:31:24 +08:00
[libgdx] Fixed test skin. Fixed NormalMapTest, spineboy-old export was not updated. Marked owl.spine additive animations as "Layered" so it can be exported with cleaning.
This commit is contained in:
parent
58ac2fa67e
commit
fc180d3a09
@ -79,6 +79,11 @@ echo "Exporting assets..."
|
|||||||
-i ../mix-and-match/images -o ../mix-and-match/export -n mix-and-match -p atlas-0.5.json \
|
-i ../mix-and-match/images -o ../mix-and-match/export -n mix-and-match -p atlas-0.5.json \
|
||||||
-i ../mix-and-match/images -o ../mix-and-match/export -n mix-and-match-pma -p atlas-0.5-pma.json \
|
-i ../mix-and-match/images -o ../mix-and-match/export -n mix-and-match-pma -p atlas-0.5-pma.json \
|
||||||
\
|
\
|
||||||
|
-i ../owl/owl-pro.spine -o ../owl/export -e json.json \
|
||||||
|
-i ../owl/owl-pro.spine -o ../owl/export -e binary.json \
|
||||||
|
-i ../owl/images -o ../owl/export -n owl -p atlas-0.5.json \
|
||||||
|
-i ../owl/images -o ../owl/export -n owl-pma -p atlas-0.5-pma.json \
|
||||||
|
\
|
||||||
-i ../powerup/powerup-ess.spine -o ../powerup/export -e json.json \
|
-i ../powerup/powerup-ess.spine -o ../powerup/export -e json.json \
|
||||||
-i ../powerup/powerup-ess.spine -o ../powerup/export -e binary.json \
|
-i ../powerup/powerup-ess.spine -o ../powerup/export -e binary.json \
|
||||||
-i ../powerup/powerup-pro.spine -o ../powerup/export -e json.json \
|
-i ../powerup/powerup-pro.spine -o ../powerup/export -e json.json \
|
||||||
@ -127,14 +132,10 @@ echo "Exporting assets..."
|
|||||||
-i ../windmill/images -o ../windmill/export -n windmill -p atlas-0.5.json \
|
-i ../windmill/images -o ../windmill/export -n windmill -p atlas-0.5.json \
|
||||||
-i ../windmill/images -o ../windmill/export -n windmill-pma -p atlas-0.5-pma.json
|
-i ../windmill/images -o ../windmill/export -n windmill-pma -p atlas-0.5-pma.json
|
||||||
|
|
||||||
# Owl needs separate export, as cleaning would kill keys in idle animation, which
|
# spineboy-old.spine needs separate export, as its images are in an atlas.
|
||||||
# would lead to incorrect additive animation blending.
|
|
||||||
"$SPINE_EXE" \
|
"$SPINE_EXE" \
|
||||||
-u $version ${@:2} \
|
-u $version ${@:2} \
|
||||||
-i ../owl/owl-pro.spine -o ../owl/export -e json.json \
|
-i ../../spine-libgdx/spine-libgdx-tests/assets/spineboy-old/spineboy-old.spine -o ../../spine-libgdx/spine-libgdx-tests/assets/spineboy-old -e json.json
|
||||||
-i ../owl/owl-pro.spine -o ../owl/export -e binary.json \
|
|
||||||
-i ../owl/images -o ../owl/export -n owl -p atlas-0.5.json \
|
|
||||||
-i ../owl/images -o ../owl/export -n owl-pma -p atlas-0.5-pma.json \
|
|
||||||
|
|
||||||
# Export Unity Assets
|
# Export Unity Assets
|
||||||
UNITY_BASE_DIR=../spine-unity
|
UNITY_BASE_DIR=../spine-unity
|
||||||
|
|||||||
Binary file not shown.
@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
com.badlogic.gdx.graphics.g2d.BitmapFont: { default-font: { file: com/badlogic/gdx/utils/arial-15.fnt } },
|
com.badlogic.gdx.graphics.g2d.BitmapFont: { default-font: { file: com/badlogic/gdx/utils/lsans-15.fnt } },
|
||||||
com.badlogic.gdx.graphics.Color: {
|
com.badlogic.gdx.graphics.Color: {
|
||||||
green: { a: 1, b: 0, g: 1, r: 0 },
|
green: { a: 1, b: 0, g: 1, r: 0 },
|
||||||
white: { a: 1, b: 1, g: 1, r: 1 },
|
white: { a: 1, b: 1, g: 1, r: 1 },
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user