https://github.com/soarteam/SuperSpineViewer/issues/6

Aloento · Jan 18, 2021 · b9aab12 · b9aab12
1 parent 799f550
commit b9aab12
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 187 deletions.
diff --git a/src/main/java/com/QYun/Spine/Spine32.java b/src/main/java/com/QYun/Spine/Spine32.java
@@ -2,10 +2,14 @@
 
 import com.QYun.SuperSpineViewer.GUI.Controller;
 import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.files.FileHandle;
 import com.badlogic.gdx.graphics.GL20;
 import com.badlogic.gdx.graphics.OrthographicCamera;
+import com.badlogic.gdx.graphics.Texture;
+import com.badlogic.gdx.graphics.Texture.TextureFilter;
 import com.badlogic.gdx.graphics.g2d.PolygonSpriteBatch;
 import com.badlogic.gdx.graphics.g2d.TextureAtlas;
+import com.badlogic.gdx.graphics.g2d.TextureAtlas.TextureAtlasData;
 import com.badlogic.gdx.utils.Array;
 import com.esotericsoftware.spine32.*;
 import com.esotericsoftware.spine32.AnimationState.TrackEntry;
@@ -31,6 +35,25 @@ private void animates(Array<Animation> animations) {
     }
 
     private boolean loadSkel() {
+        TextureAtlasData atlasData;
+        atlasData = new TextureAtlasData(atlasFile, atlasFile.parent(), false);
+
+        atlas = new TextureAtlas(atlasData) {
+            public AtlasRegion findRegion (String name) {
+                AtlasRegion region = super.findRegion(name);
+                if (region == null) {
+                    FileHandle file = skelFile.sibling(name + ".png");
+                    if (file.exists()) {
+                        Texture texture = new Texture(file);
+                        texture.setFilter(TextureFilter.Linear, TextureFilter.Linear);
+                        region = new AtlasRegion(texture, 0, 0, texture.getWidth(), texture.getHeight());
+                        region.name = name;
+                    }
+                }
+                return region;
+            }
+        };
+
         SkeletonData skeletonData;
         if (isBinary) {
             SkeletonBinary binary = new SkeletonBinary(atlas);
@@ -164,7 +187,6 @@ public void create() {
         renderer = new SkeletonMeshRenderer();
         renderer.setPremultipliedAlpha(true);
 
-        atlas = new TextureAtlas(atlasFile);
         if (loadSkel())
             listeners();
     }

diff --git a/src/main/java/com/QYun/Spine/Standard.java b/src/main/java/com/QYun/Spine/Standard.java
@@ -2,9 +2,13 @@
 
 import com.QYun.SuperSpineViewer.GUI.Controller;
 import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.files.FileHandle;
 import com.badlogic.gdx.graphics.GL20;
 import com.badlogic.gdx.graphics.OrthographicCamera;
+import com.badlogic.gdx.graphics.Texture;
+import com.badlogic.gdx.graphics.Texture.TextureFilter;
 import com.badlogic.gdx.graphics.g2d.TextureAtlas;
+import com.badlogic.gdx.graphics.g2d.TextureAtlas.TextureAtlasData;
 import com.badlogic.gdx.utils.Array;
 import com.esotericsoftware.SpineStandard.*;
 import com.esotericsoftware.SpineStandard.AnimationState.TrackEntry;
@@ -31,6 +35,25 @@ private void animates(Array<Animation> animations) {
     }
 
     private boolean loadSkel() {
+        TextureAtlasData atlasData;
+        atlasData = new TextureAtlasData(atlasFile, atlasFile.parent(), false);
+
+        atlas = new TextureAtlas(atlasData) {
+            public AtlasRegion findRegion (String name) {
+                AtlasRegion region = super.findRegion(name);
+                if (region == null) {
+                    FileHandle file = skelFile.sibling(name + ".png");
+                    if (file.exists()) {
+                        Texture texture = new Texture(file);
+                        texture.setFilter(TextureFilter.Linear, TextureFilter.Linear);
+                        region = new AtlasRegion(texture, 0, 0, texture.getWidth(), texture.getHeight());
+                        region.name = name;
+                    }
+                }
+                return region;
+            }
+        };
+
         SkeletonData skeletonData;
         if (isBinary) {
             SkeletonBinary binary = new SkeletonBinary(atlas);
@@ -171,7 +194,6 @@ public void create() {
         renderer = new SkeletonRenderer();
         renderer.setPremultipliedAlpha(true);
 
-        atlas = new TextureAtlas(atlasFile);
         if (loadSkel())
             listeners();
     }

diff --git a/src/main/java/com/QYun/SuperSpineViewer/RuntimesLoader.java b/src/main/java/com/QYun/SuperSpineViewer/RuntimesLoader.java
@@ -121,26 +121,6 @@ private FileHandle atlasFile(FileHandle skelFile) {
     }
 
     public boolean init(File file) {
-        if (!isLoad.get()) {
-            spineVersion.addListener((observable, oldValue, newValue) -> {
-                if (!newValue.equals(oldValue) && isLoad.get()) {
-                    if (Controller.class.getResource("").getProtocol().equals("jar")) {
-                        new Thread(() -> {
-                            try {
-                                Runtime.getRuntime().exec("cmd /k start "
-                                        + "java -jar "
-                                        + System.getProperty("java.class.path")
-                                        + " " + openPath, null, new File(System.getProperty("user.dir")));
-                            } catch (IOException ignored) {
-                            }
-                            System.out.println("重新加载LibGDX");
-                        }).start();
-                    } else System.out.println("重新加载，从源码启动请自行重启");
-                    System.exit(0);
-                }
-            });
-        }
-
         FileHandle skelFile = new FileHandle(new File(file.getAbsolutePath()));
         spine.setAtlasFile(atlasFile(skelFile));
         spine.setSkelFile(skelFile);

diff --git a/src/main/java/com/esotericsoftware/SpineStandard/utils/SkeletonDataLoader.java b/src/main/java/com/esotericsoftware/SpineStandard/utils/SkeletonDataLoader.java
diff --git a/src/main/java/com/esotericsoftware/SpineStandard/utils/SkeletonDrawable.java b/src/main/java/com/esotericsoftware/SpineStandard/utils/SkeletonDrawable.java