фикс автосинхронизации воркспейса и остановки на паузу рендера при сворачивании окна

Author: JavaSaBr

build-native.xml

@@ -127,7 +127,7 @@
                         name="jME3-SpaceShift-Editor"
                         mainClass="com.ss.editor.Starter"
                         toolkit="fx"
-                        version="0.7.4"
+                        version="0.7.5"
                 />
 
         <mkdir dir="build/classes/META-INF"/>
@@ -140,7 +140,7 @@
             <manifest>
                 <attribute name="Implementation-Vendor" value="spaceshift.ru"/>
                 <attribute name="Implementation-Title" value="jME3 SpaceShift Editor"/>
-                <attribute name="Implementation-Version" value="0.7.4"/>
+                <attribute name="Implementation-Version" value="0.7.5"/>
             </manifest>
         </fx:jar>
 

build/package/linux/control

@@ -1,5 +1,5 @@
 Package: jme3-spaceshift-editor
-Version: 0.7.4
+Version: 0.7.5
 Section: tool
 Maintainer: spaceshift.ru <[email protected]>
 Priority: optional

src/com/ss/editor/Editor.java

@@ -36,6 +36,8 @@
 import com.ss.editor.manager.WorkspaceManager;
 import com.ss.editor.ui.builder.EditorFXSceneBuilder;
 import com.ss.editor.ui.cursor.UbuntuCursorProvider;
+import com.ss.editor.ui.event.FXEventManager;
+import com.ss.editor.ui.event.impl.WindowChangeFocusEvent;
 import com.ss.editor.ui.scene.EditorFXScene;
 import com.ss.editor.ui.util.UIUtils;
 import com.sun.javafx.cursor.CursorType;
@@ -334,6 +336,28 @@ public long trySyncLock() {
         return lock.tryWriteLock();
     }
 
+    @Override
+    public void loseFocus() {
+        super.loseFocus();
+
+        final WindowChangeFocusEvent event = new WindowChangeFocusEvent();
+        event.setFocused(false);
+
+        FXEventManager eventManager = FXEventManager.getInstance();
+        eventManager.notify(event);
+    }
+
+    @Override
+    public void gainFocus() {
+        super.gainFocus();
+
+        final WindowChangeFocusEvent event = new WindowChangeFocusEvent();
+        event.setFocused(true);
+
+        FXEventManager eventManager = FXEventManager.getInstance();
+        eventManager.notify(event);
+    }
+
     @Override
     public void update() {
 

src/com/ss/editor/config/Config.java

@@ -20,7 +20,7 @@ public abstract class Config {
     public static final String CONFIG_RESOURCE_PATH = "/com/ss/editor/config/config.xml";
 
     public static final String TITLE = "jME3 SpaceShift Editor";
-    public static final String VERSION = "v.0.7.4";
+    public static final String VERSION = "v.0.7.5";
 
     public static final String SS_FOLDER_IN_USER_HOME = ".jme3-spaceshift-editor";
 

src/com/ss/editor/config/EditorConfig.java

@@ -304,6 +304,7 @@ public AppSettings getSettings() {
         settings.setFrequency(displayMode.getRefreshRate());
         settings.setGammaCorrection(isGammaCorrection());
         settings.setResizable(true);
+        settings.setFrameRate(90);
         // settings.putBoolean("GraphicsDebug", true);
 
         try {

src/com/ss/editor/manager/ResourceManager.java

@@ -14,6 +14,7 @@
 import com.ss.editor.ui.event.impl.RequestedRefreshAssetEvent;
 import com.ss.editor.util.EditorUtil;
 import com.ss.editor.util.SimpleFileVisitor;
+import com.ss.editor.util.SimpleFolderVisitor;
 
 import java.io.IOException;
 import java.net.URL;
@@ -35,6 +36,7 @@
 import rlib.util.ArrayUtils;
 import rlib.util.FileUtils;
 import rlib.util.StringUtils;
+import rlib.util.Util;
 import rlib.util.array.Array;
 import rlib.util.array.ArrayComparator;
 import rlib.util.array.ArrayFactory;
@@ -100,13 +102,14 @@ public static ResourceManager getInstance() {
     private final Array<String> materialDefinitions;
 
     /**
-     * Ключ для слежения за изменением папок.
+     * Ключи для слежения за изменением папок.
      */
-    private volatile WatchKey watchKey;
+    private final Array<WatchKey> watchKeys;
 
     public ResourceManager() {
         InitializeManager.valid(getClass());
 
+        this.watchKeys = ArrayFactory.newArray(WatchKey.class);
         this.classLoaders = ArrayFactory.newArray(URLClassLoader.class);
         this.resourcesInClasspath = ArrayFactory.newArray(String.class);
         this.materialDefinitionsInClasspath = ArrayFactory.newArray(String.class);
@@ -353,12 +356,9 @@ public Array<String> getAvailableMaterialDefinitions() {
      */
     private synchronized void reload() {
 
-        final WatchKey currentWatchKey = getWatchKey();
-
-        if (currentWatchKey != null) {
-            currentWatchKey.cancel();
-            setWatchKey(null);
-        }
+        final Array<WatchKey> watchKeys = getWatchKeys();
+        watchKeys.forEach(WatchKey::cancel);
+        watchKeys.clear();
 
         final Editor editor = Editor.getInstance();
         final AssetManager assetManager = editor.getAssetManager();
@@ -381,13 +381,19 @@ private synchronized void reload() {
         }
 
         try {
-            final WatchKey watchKey = currentAsset.register(WATCH_SERVICE, ENTRY_CREATE, ENTRY_DELETE);
-            setWatchKey(watchKey);
+            watchKeys.add(currentAsset.register(WATCH_SERVICE, ENTRY_CREATE, ENTRY_DELETE));
+            Files.walkFileTree(currentAsset, (SimpleFolderVisitor) (file, attrs) -> registerFolder(watchKeys, file));
         } catch (IOException e) {
             LOGGER.warning(e);
         }
     }
 
+    private static void registerFolder(final Array<WatchKey> watchKeys, final Path file) {
+        watchKeys.add(Util.safeExecute(file, first -> {
+            return first.register(WATCH_SERVICE, ENTRY_CREATE, ENTRY_DELETE);
+        }));
+    }
+
     /**
      * Обработка файла в папаке asset.
      */
@@ -425,35 +431,71 @@ public void run() {
         while (true) {
             ThreadUtils.sleep(200);
 
-            final WatchKey watchKey = getWatchKey();
-            final List<WatchEvent<?>> watchEvents = watchKey.pollEvents();
+            final Array<WatchKey> watchKeys = getWatchKeys();
+
+            List<WatchEvent<?>> watchEvents = null;
+            WatchKey watchKey = null;
+
+            synchronized (this) {
+                for (final WatchKey key : watchKeys) {
+                    watchKey = key;
+                    watchEvents = key.pollEvents();
+                    if (!watchEvents.isEmpty()) break;
+                }
+            }
 
-            if (watchEvents.isEmpty()) continue;
+            if (watchEvents == null || watchEvents.isEmpty()) continue;
 
             for (final WatchEvent<?> watchEvent : watchEvents) {
 
                 final Path file = (Path) watchEvent.context();
-                final Path realFile = EditorUtil.getRealFile(file);
+                final Path folder = (Path) watchKey.watchable();
+                final Path realFile = folder.resolve(file);
 
                 if (watchEvent.kind() == ENTRY_CREATE) {
 
                     final CreatedFileEvent event = new CreatedFileEvent();
                     event.setFile(realFile);
                     event.setNeedSelect(false);
 
+                    if (Files.isDirectory(realFile)) {
+                        registerWatchKey(realFile);
+                    }
+
                     FX_EVENT_MANAGER.notify(event);
 
                 } else if (watchEvent.kind() == ENTRY_DELETE) {
 
                     final DeletedFileEvent event = new DeletedFileEvent();
                     event.setFile(realFile);
 
+                    removeWatchKeyFor(realFile);
+
                     FX_EVENT_MANAGER.notify(event);
                 }
             }
         }
     }
 
+    private synchronized WatchKey findWatchKey(final Path path) {
+        final Array<WatchKey> watchKeys = getWatchKeys();
+        return watchKeys.search(path, (toCheck, watchKey) -> watchKey.watchable().equals(toCheck));
+    }
+
+    private synchronized void removeWatchKeyFor(final Path path) {
+
+        final WatchKey watchKey = findWatchKey(path);
+
+        if (watchKey != null) {
+            getWatchKeys().fastRemove(watchKey);
+            watchKey.cancel();
+        }
+    }
+
+    private synchronized void registerWatchKey(final Path dir) {
+        Util.safeExecute(() -> getWatchKeys().add(dir.register(WATCH_SERVICE, ENTRY_CREATE, ENTRY_DELETE)));
+    }
+
     /**
      * Обработка обновления Asset.
      */
@@ -469,16 +511,9 @@ private void processChangeAsset() {
     }
 
     /**
-     * @return ключ для слежения за изменением папок.
-     */
-    private WatchKey getWatchKey() {
-        return watchKey;
-    }
-
-    /**
-     * @param watchKey ключ для слежения за изменением папок.
+     * @return ключи для слежения за изменением папок.
      */
-    private void setWatchKey(final WatchKey watchKey) {
-        this.watchKey = watchKey;
+    private Array<WatchKey> getWatchKeys() {
+        return watchKeys;
     }
 }

src/com/ss/editor/ui/event/FXEventManager.java

@@ -1,12 +1,6 @@
 package com.ss.editor.ui.event;
 
-import com.jme3.system.lwjgl.LwjglWindow;
-import com.ss.editor.Editor;
 import com.ss.editor.manager.ExecutorManager;
-import com.ss.editor.ui.event.impl.WindowChangeFocusEvent;
-
-import org.lwjgl.glfw.GLFW;
-import org.lwjgl.glfw.GLFWWindowFocusCallback;
 
 import javafx.application.Platform;
 import javafx.event.Event;
@@ -36,34 +30,8 @@ public static FXEventManager getInstance() {
      */
     private final ObjectDictionary<EventType<? extends Event>, Array<EventHandler<? super Event>>> eventHandlers;
 
-    /**
-     * Слушатель изменения фокуса окна.
-     */
-    private GLFWWindowFocusCallback windowFocusCallback;
-
     public FXEventManager() {
         this.eventHandlers = DictionaryFactory.newObjectDictionary();
-        EXECUTOR_MANAGER.addEditorThreadTask(this::initListener);
-    }
-
-    private void initListener() {
-
-        final Editor editor = Editor.getInstance();
-        final LwjglWindow context = (LwjglWindow) editor.getContext();
-
-        windowFocusCallback = new GLFWWindowFocusCallback() {
-
-            @Override
-            public void invoke(final long window, final boolean focused) {
-
-                final WindowChangeFocusEvent event = new WindowChangeFocusEvent();
-                event.setFocused(focused);
-
-                FXEventManager.this.notify(event);
-            }
-        };
-
-        GLFW.glfwSetWindowFocusCallback(context.getWindowHandle(), windowFocusCallback);
     }
 
     /**

src/com/ss/editor/util/SimpleFolderVisitor.java

@@ -0,0 +1,25 @@
+package com.ss.editor.util;
+
+import java.io.IOException;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Path;
+import java.nio.file.attribute.BasicFileAttributes;
+
+/**
+ * Упрощенная версия визитера по папкам.
+ *
+ * @author Ronn
+ */
+public interface SimpleFolderVisitor extends SimpleFileVisitor {
+
+    @Override
+    public default FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
+        visit(dir, attrs);
+        return FileVisitResult.CONTINUE;
+    }
+
+    @Override
+    public default FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+        return FileVisitResult.CONTINUE;
+    }
+}