Parcourir la source

[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.

Nathan Sweet il y a 3 ans
Parent
commit
fc180d3a09

+ 7 - 6
examples/export/export.sh

@@ -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-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 binary.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-pma -p atlas-0.5-pma.json
 
-# Owl needs separate export, as cleaning would kill keys in idle animation, which
-# would lead to incorrect additive animation blending.
+# spineboy-old.spine needs separate export, as its images are in an atlas.
 "$SPINE_EXE" \
 -u $version ${@:2} \
--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 ../../spine-libgdx/spine-libgdx-tests/assets/spineboy-old/spineboy-old.spine -o ../../spine-libgdx/spine-libgdx-tests/assets/spineboy-old -e json.json
 
 # Export Unity Assets
 UNITY_BASE_DIR=../spine-unity

BIN
examples/owl/owl-pro.spine


+ 1 - 1
spine-libgdx/spine-libgdx-tests/assets/skin/skin.json

@@ -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: {
 	green: { a: 1, b: 0, g: 1, r: 0 },
 	white: { a: 1, b: 1, g: 1, r: 1 },

Fichier diff supprimé car celui-ci est trop grand
+ 385 - 310
spine-libgdx/spine-libgdx-tests/assets/spineboy-old/spineboy-old.json


Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff