UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-04 14:24:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

SkeletonViewer, don't show "Reloaded" if the loading failed.

Browse Source
This commit is contained in:
Nathan Sweet 2021-09-12 18:15:35 -06:00
parent dc9a6ebe7f
commit afa9a873ad
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java
View File

@ -237,10 +237,7 @@ public class SkeletonViewer extends ApplicationAdapter {
} }
} else { } else {
reloadTimer -= delta; reloadTimer -= delta;
if (reloadTimer <= 0) { if (reloadTimer <= 0 && loadSkeleton(skeletonFile)) ui.toast("Reloaded.");
loadSkeleton(skeletonFile);
ui.toast("Reloaded.");
}
} }
// Pose and render skeleton. // Pose and render skeleton.

8
spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewerUI.java
View File

@ -374,10 +374,7 @@ class SkeletonViewerUI {
loadScaleSlider.addListener(new ChangeListener() { loadScaleSlider.addListener(new ChangeListener() {
public void changed (ChangeEvent event, Actor actor) { public void changed (ChangeEvent event, Actor actor) {
loadScaleLabel.setText(Integer.toString((int)(loadScaleSlider.getValue() * 100)) + "%"); loadScaleLabel.setText(Integer.toString((int)(loadScaleSlider.getValue() * 100)) + "%");
if (!loadScaleSlider.isDragging()) { if (!loadScaleSlider.isDragging() && viewer.loadSkeleton(viewer.skeletonFile)) toast("Reloaded.");
viewer.loadSkeleton(viewer.skeletonFile);
toast("Reloaded.");
}
loadScaleResetButton.setText(loadScaleSlider.getValue() == 1 ? "Reload" : "Reset"); loadScaleResetButton.setText(loadScaleSlider.getValue() == 1 ? "Reload" : "Reset");
} }
}); });
@ -385,8 +382,7 @@ class SkeletonViewerUI {
public void changed (ChangeEvent event, Actor actor) { public void changed (ChangeEvent event, Actor actor) {
viewer.resetCameraPosition(); viewer.resetCameraPosition();
if (loadScaleSlider.getValue() == 1) { if (loadScaleSlider.getValue() == 1) {
viewer.loadSkeleton(viewer.skeletonFile); if (viewer.loadSkeleton(viewer.skeletonFile)) toast("Reloaded.");
toast("Reloaded.");
} else } else
loadScaleSlider.setValue(1); loadScaleSlider.setValue(1);
loadScaleResetButton.setText("Reload"); loadScaleResetButton.setText("Reload");