强制终止/SuperSpine

Aloento · Mar 25, 2021 · f8a3e68 · f8a3e68
1 parent 7ee668b
commit f8a3e68
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 16 deletions.
diff --git a/src/main/java/com/QYun/SuperSpineViewer/Controller/Exporter.java b/src/main/java/com/QYun/SuperSpineViewer/Controller/Exporter.java
@@ -1,6 +1,5 @@
 package com.QYun.SuperSpineViewer.Controller;
 
-import com.QYun.Spine.SuperSpine;
 import com.QYun.SuperSpineViewer.Loader;
 import com.QYun.SuperSpineViewer.Main;
 import com.QYun.SuperSpineViewer.RecordFX;
@@ -19,9 +18,6 @@
 import java.util.ResourceBundle;
 
 public class Exporter extends Main implements Initializable {
-    private final SuperSpine spine = new SuperSpine();
-    private final RecordFX record = new RecordFX();
-
     @FXML
     private Label L_Version;
     @FXML
@@ -44,7 +40,7 @@ void B_Export() {
             spine.setSpeed(quality);
             spine.setIsPlay(true);
             System.out.println("请求：开始录制");
-            record.startRecording(spine.getProjectName() + "_" + spine.getAnimate());
+            recordFX.Start(spine.getProjectName() + "_" + spine.getAnimate());
         }
     }
 
@@ -141,9 +137,9 @@ public void initialize(URL location, ResourceBundle resources) {
         FPS = L_FPS;
         Skel = L_Skel;
         Atlas = L_Atlas;
-        recordFX = record;
         progressBar = P_Export;
         T_Path.setText(outPath);
+        recordFX = new RecordFX();
         spine.spineVersionProperty().addListener((observable, oldValue, newValue) -> Platform.runLater(() -> L_Version.setText("Version : " + newValue)));
 
         System.out.println("SuperSpineViewer已启动");

diff --git a/src/main/java/com/QYun/SuperSpineViewer/Controller/Spine.java b/src/main/java/com/QYun/SuperSpineViewer/Controller/Spine.java
@@ -1,6 +1,5 @@
 package com.QYun.SuperSpineViewer.Controller;
 
-import com.QYun.Spine.SuperSpine;
 import com.QYun.Spine.Universal;
 import com.QYun.SuperSpineViewer.Loader;
 import com.QYun.SuperSpineViewer.Main;
@@ -67,7 +66,6 @@ public class Spine extends Main implements Initializable {
 
     @Override
     public void initialize(URL location, ResourceBundle resources) {
-        SuperSpine spine = new SuperSpine();
         ImageView spineLogo = new ImageView();
         spineLogo.setImage(new Image("/UI/SpineLogo.png", 138, 0, true, true, false));
 

diff --git a/src/main/java/com/QYun/SuperSpineViewer/Loader.java b/src/main/java/com/QYun/SuperSpineViewer/Loader.java
@@ -1,6 +1,5 @@
 package com.QYun.SuperSpineViewer;
 
-import com.QYun.Spine.SuperSpine;
 import com.QYun.Spine.Universal;
 import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration;
 import com.badlogic.gdx.backends.lwjgl.LwjglFXApplication;
@@ -19,7 +18,6 @@ public class Loader extends Main {
     private final String[] dataSuffixes = {".json", ".skel"};
     private final String[] endSuffixes = {"", ".txt", ".bytes"};
     private final String[] atlasSuffixes = {".atlas", "-pma.atlas"};
-    private final SuperSpine spine = new SuperSpine();
     private final Universal universal = new Universal();
 
     private void whichVersion(String skel) {

diff --git a/src/main/java/com/QYun/SuperSpineViewer/Main.java b/src/main/java/com/QYun/SuperSpineViewer/Main.java
@@ -1,5 +1,6 @@
 package com.QYun.SuperSpineViewer;
 
+import com.QYun.Spine.SuperSpine;
 import com.QYun.SuperSpineViewer.Controller.Launcher;
 import com.QYun.SuperSpineViewer.Controller.Spine;
 import com.jfoenix.controls.JFXProgressBar;
@@ -11,6 +12,8 @@
 import java.util.prefs.Preferences;
 
 public class Main {
+    public static final SuperSpine spine = new SuperSpine();
+    public static final Preferences Pref = Preferences.userRoot().node("/com/QYun/SuperSpineViewer");
     public static RecordFX recordFX;
     public static Spine spineController;
     public static JFXProgressBar progressBar;
@@ -21,13 +24,12 @@ public class Main {
     public static int width;
     public static int height;
     public static byte perform = 6;
-    public static byte sequence = 0;
+    public static byte sequence;
     public static float quality = 0.5f;
     public static boolean isLoad = false;
     public static boolean preA = true;
     public static boolean recording = false;
-    public static String openPath = null;
-    public static Preferences Pref = Preferences.userRoot().node("/com/QYun/SuperSpineViewer");
+    public static String openPath;
     public static String outPath = Pref.get("lastSave", System.getProperty("user.home"));
 
     public static void main(String[] args) {

diff --git a/src/main/java/com/QYun/SuperSpineViewer/RecordFX.java b/src/main/java/com/QYun/SuperSpineViewer/RecordFX.java
@@ -1,6 +1,5 @@
 package com.QYun.SuperSpineViewer;
 
-import com.QYun.Spine.SuperSpine;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.Pixmap;
 import com.badlogic.gdx.graphics.PixmapIO;
@@ -26,7 +25,6 @@ public class RecordFX extends Main {
             })) {{
         allowCoreThreadTimeOut(true);
     }};
-    private final SuperSpine spine = new SuperSpine();
     private String fileName = null;
     private short counter;
     private short items;
@@ -43,7 +41,7 @@ public void recorderFX(WritableImage image) {
         }
     }
 
-    public void startRecording(String fileName) {
+    public void Start(String fileName) {
         if (!recording) {
             while (spine.getPercent() == 2)
                 Thread.onSpinWait();
@@ -54,6 +52,19 @@ public void startRecording(String fileName) {
         }
     }
 
+    public void Exit() {
+        recording = false;
+        savePool.shutdownNow();
+        savePool.setCorePoolSize(0);
+        savePool.setMaximumPoolSize(1);
+        spine.setSpeed(1);
+        spine.setIsPlay(false);
+        counter = 0;
+        items = 0;
+        System.out.println("强制停止");
+        System.gc();
+    }
+
     private void ffmpegFX() {
         try {
             System.out.println("FFmpeg处理开始");

diff --git a/src/main/java/com/badlogic/gdx/backends/lwjgl/LwjglToJavaFX.java b/src/main/java/com/badlogic/gdx/backends/lwjgl/LwjglToJavaFX.java
@@ -136,6 +136,9 @@ public void process(final int width, final int height, final ByteBuffer data, fi
                             recordFX.recorderFX(new WritableImage(width, height) {{
                                 getPixelWriter().setPixels(0, 0, width, height, javafx.scene.image.PixelFormat.getByteBgraPreInstance(), data, stride);
                             }});
+                    } catch (OutOfMemoryError ignored) {
+                        recordFX.Exit();
+                        System.out.println("内存不足，导出终止");
                     } finally {
                         // Notify the render thread that we're done processing
                         signal.release();