Procházet zdrojové kódy

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

Nathan Sweet před 3 roky
rodič
revize
afa9a873ad

+ 1 - 4
spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java

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

+ 2 - 6
spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewerUI.java

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