Merge branch 'develop' into feature/updating_physics

Author: JavaSaBr

README.md

@@ -1,4 +1,4 @@
-# jMonkeyBuilder 1.6.0 #
+# jMonkeyBuilder 1.6.1 #
 ### It's 3D Editor to prepare/work/create graphics content for jMonkeyEngine 3.2 ###
 
 [![Join the chat at https://gitter.im/jME3-SpaceShift-Editor/Lobby](https://badges.gitter.im/jME3-SpaceShift-Editor/Lobby.svg)](https://gitter.im/jME3-SpaceShift-Editor/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

app.version

@@ -1 +1 @@
-1.6.0
+1.6.1

build.gradle

@@ -13,7 +13,7 @@ apply plugin: 'idea'
 apply plugin: 'org.junit.platform.gradle.plugin'
 
 group = 'com.spaceshift'
-version = '1.6.0'
+version = '1.6.1'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8

src/main/java/com/ss/editor/JmeApplication.java

@@ -413,7 +413,9 @@ public void update() {
             //System.out.println(cam.getRotation());
             //System.out.println(cam.getLocation());
 
-            super.update();
+            if (Config.ENABLE_3D) {
+                super.update();
+            }
 
         } catch (final AssetNotFoundException | RendererException | AssertionError | ArrayIndexOutOfBoundsException |
                 NullPointerException | StackOverflowError | IllegalStateException | UnsupportedOperationException e) {

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

@@ -42,7 +42,7 @@ public final class Config {
      * The editor's version.
      */
     @NotNull
-    public static final Version APP_VERSION = new Version("1.6.0");
+    public static final Version APP_VERSION = new Version("1.6.1");
 
     /**
      * The string version.
@@ -114,6 +114,11 @@ public final class Config {
      */
     public static boolean ENABLE_PBR;
 
+    /**
+     * The flag to enable 3D part of this editor.
+     */
+    public static boolean ENABLE_3D;
+
     static {
 
         final GraphicsEnvironment graphicsEnvironment = GraphicsEnvironment.getLocalGraphicsEnvironment();
@@ -128,6 +133,7 @@ public final class Config {
         DEV_DEBUG_JFX_KEY_INPUT = vars.getBoolean("Dev.jfxKeyInput", false);
         DEV_DEBUG_JFX = vars.getBoolean("Dev.debugJFX", false);
         ENABLE_PBR = vars.getBoolean("Graphics.enablePBR", true);
+        ENABLE_3D = vars.getBoolean("Graphics.enable3D", true);
 
         GRAPHICS_DEVICE = device;
         OPERATING_SYSTEM = new OperatingSystem();

src/main/java/com/ss/editor/ui/component/asset/tree/ResourceTree.java

@@ -5,18 +5,15 @@
 import static com.ss.editor.ui.util.UiUtils.hasFileInClipboard;
 import static com.ss.rlib.util.ObjectUtils.notNull;
 import com.ss.editor.annotation.BackgroundThread;
-import com.ss.editor.annotation.FxThread;
 import com.ss.editor.annotation.FromAnyThread;
+import com.ss.editor.annotation.FxThread;
 import com.ss.editor.config.EditorConfig;
 import com.ss.editor.manager.ExecutorManager;
 import com.ss.editor.ui.FXConstants;
 import com.ss.editor.ui.component.asset.tree.context.menu.action.*;
 import com.ss.editor.ui.component.asset.tree.context.menu.filler.AssetTreeMultiContextMenuFiller;
 import com.ss.editor.ui.component.asset.tree.context.menu.filler.AssetTreeSingleContextMenuFiller;
-import com.ss.editor.ui.component.asset.tree.resource.FileResourceElement;
-import com.ss.editor.ui.component.asset.tree.resource.FolderResourceElement;
-import com.ss.editor.ui.component.asset.tree.resource.LoadingResourceElement;
-import com.ss.editor.ui.component.asset.tree.resource.ResourceElement;
+import com.ss.editor.ui.component.asset.tree.resource.*;
 import com.ss.editor.ui.util.UiUtils;
 import com.ss.rlib.function.IntObjectConsumer;
 import com.ss.rlib.util.StringUtils;
@@ -67,13 +64,17 @@ public class ResourceTree extends TreeView<ResourceElement> {
         final int firstLevel = getLevel(first);
         final int secondLevel = getLevel(second);
 
-        if (firstLevel != secondLevel) return firstLevel - secondLevel;
+        if (firstLevel != secondLevel) {
+            return firstLevel - secondLevel;
+        }
 
         final Path firstFile = notNull(first).getFile();
-        final String firstName = firstFile.getFileName().toString();
+        final Path firstFileFileName = firstFile.getFileName();
+        final String firstName = firstFileFileName == null ? firstFile.toString() : firstFileFileName.toString();
 
         final Path secondFile = notNull(second).getFile();
-        final String secondName = secondFile.getFileName().toString();
+        final Path secondFileName = secondFile.getFileName();
+        final String secondName = secondFileName == null ? secondFile.toString() : secondFileName.toString();
 
         return StringUtils.compareIgnoreCase(firstName, secondName);
     };
@@ -239,7 +240,10 @@ private void processChangedExpands(@NotNull final Number newValue) {
         }
 
         final IntObjectConsumer<ResourceTree> expandHandler = getExpandHandler();
-        if (expandHandler == null) return;
+        if (expandHandler == null) {
+            return;
+        }
+
         expandHandler.accept(newValue.intValue(), this);
     }
 
@@ -269,7 +273,7 @@ private void lazyLoadChildren() {
      */
     @BackgroundThread
     private void lazyLoadChildren(@NotNull final TreeItem<ResourceElement> treeItem,
-                                  @Nullable final Consumer<@NotNull TreeItem<ResourceElement>> callback) {
+                                  @Nullable final Consumer<TreeItem<ResourceElement>> callback) {
 
         final ResourceElement element = treeItem.getValue();
         final Array<ResourceElement> children = element.getChildren(extensionFilter, isOnlyFolders());
@@ -288,10 +292,11 @@ private void lazyLoadChildren(@NotNull final TreeItem<ResourceElement> treeItem,
     @FxThread
     private void lazyLoadChildren(@NotNull final TreeItem<ResourceElement> treeItem,
                                   @NotNull final Array<ResourceElement> children,
-                                  @Nullable final Consumer<@NotNull TreeItem<ResourceElement>> callback) {
+                                  @Nullable final Consumer<TreeItem<ResourceElement>> callback) {
 
         final ObservableList<TreeItem<ResourceElement>> items = treeItem.getChildren();
         if (items.size() != 1 || items.get(0).getValue() != LoadingResourceElement.getInstance()) {
+            if (callback != null) callback.accept(treeItem);
             return;
         }
 
@@ -397,7 +402,10 @@ private boolean isReadOnly() {
      */
     @FxThread
     protected @Nullable ContextMenu getContextMenu(@NotNull final ResourceElement element) {
-        if (isReadOnly()) return null;
+
+        if (isReadOnly()) {
+            return null;
+        }
 
         final ContextMenu contextMenu = new ContextMenu();
         final ObservableList<MenuItem> items = contextMenu.getItems();
@@ -432,28 +440,57 @@ private boolean isReadOnly() {
             }
         }
 
-        if (items.isEmpty()) return null;
+        if (items.isEmpty()) {
+            return null;
+        }
 
         return contextMenu;
     }
 
     /**
-     * Fill the tree using the asset folder.
+     * Fill the tree using the root folder.
      *
-     * @param assetFolder the asset folder.
+     * @param rootFolder the root folder.
      */
     @FxThread
-    public void fill(@NotNull final Path assetFolder) {
+    public void fill(@NotNull final Path rootFolder) {
 
         final Consumer<Boolean> onLoadHandler = getOnLoadHandler();
-        if (onLoadHandler != null) onLoadHandler.accept(Boolean.FALSE);
+        if (onLoadHandler != null) {
+            onLoadHandler.accept(Boolean.FALSE);
+        }
+
+        final TreeItem<ResourceElement> currentRoot = getRoot();
+        if (currentRoot != null) {
+            setRoot(null);
+        }
+
+        showLoading();
+
+        EXECUTOR_MANAGER.addBackgroundTask(() -> startBackgroundFill(rootFolder));
+    }
+
+    /**
+     * Fill the tree using the list of root folders.
+     *
+     * @param rootFolders the list of root folder.
+     */
+    @FxThread
+    public void fill(@NotNull final Array<Path> rootFolders) {
+
+        final Consumer<Boolean> onLoadHandler = getOnLoadHandler();
+        if (onLoadHandler != null) {
+            onLoadHandler.accept(Boolean.FALSE);
+        }
 
         final TreeItem<ResourceElement> currentRoot = getRoot();
-        if (currentRoot != null) setRoot(null);
+        if (currentRoot != null) {
+            setRoot(null);
+        }
 
         showLoading();
 
-        EXECUTOR_MANAGER.addBackgroundTask(() -> startBackgroundFill(assetFolder));
+        EXECUTOR_MANAGER.addBackgroundTask(() -> startBackgroundFill(rootFolders));
     }
 
     /**
@@ -554,9 +591,9 @@ private void showLoading() {
      * Start the background process of filling.
      */
     @BackgroundThread
-    private void startBackgroundFill(@NotNull final Path assetFolder) {
+    private void startBackgroundFill(@NotNull final Path path) {
 
-        final ResourceElement rootElement = createFor(assetFolder);
+        final ResourceElement rootElement = createFor(path);
         final TreeItem<ResourceElement> newRoot = new TreeItem<>(rootElement);
         newRoot.setExpanded(true);
 
@@ -570,7 +607,34 @@ private void startBackgroundFill(@NotNull final Path assetFolder) {
             setRoot(newRoot);
 
             final Consumer<Boolean> onLoadHandler = getOnLoadHandler();
-            if (onLoadHandler != null) onLoadHandler.accept(Boolean.TRUE);
+            if (onLoadHandler != null) {
+                onLoadHandler.accept(Boolean.TRUE);
+            }
+        });
+    }
+
+    /**
+     * Start the background process of filling.
+     */
+    @BackgroundThread
+    private void startBackgroundFill(@NotNull final Array<Path> paths) {
+
+        final ResourceElement rootElement = new FoldersResourceElement(paths);
+        final TreeItem<ResourceElement> newRoot = new TreeItem<>(rootElement);
+        newRoot.setExpanded(true);
+
+        fill(newRoot);
+
+        if (!isLazyMode() && isNeedCleanup()) {
+            cleanup(newRoot);
+        }
+
+        EXECUTOR_MANAGER.addFxTask(() -> {
+            setRoot(newRoot);
+            final Consumer<Boolean> onLoadHandler = getOnLoadHandler();
+            if (onLoadHandler != null) {
+                onLoadHandler.accept(Boolean.TRUE);
+            }
         });
     }
 
@@ -594,7 +658,9 @@ private void startBackgroundRefresh(@NotNull final Path assetFolder) {
             expandedElements.forEach(element -> {
 
                 final TreeItem<ResourceElement> item = findItemForValue(newRoot, element);
-                if (item == null) return;
+                if (item == null) {
+                    return;
+                }
 
                 item.setExpanded(true);
             });
@@ -610,7 +676,9 @@ private void startBackgroundRefresh(@NotNull final Path assetFolder) {
             restoreSelection();
 
             final Consumer<Boolean> onLoadHandler = getOnLoadHandler();
-            if (onLoadHandler != null) onLoadHandler.accept(Boolean.TRUE);
+            if (onLoadHandler != null) {
+                onLoadHandler.accept(Boolean.TRUE);
+            }
         });
     }
 
@@ -649,7 +717,9 @@ private void fill(@NotNull final TreeItem<ResourceElement> treeItem) {
 
         final ResourceElement element = treeItem.getValue();
         final Array<String> extensionFilter = getExtensionFilter();
-        if (!element.hasChildren(extensionFilter, isOnlyFolders())) return;
+        if (!element.hasChildren(extensionFilter, isOnlyFolders())) {
+            return;
+        }
 
         final ObservableList<TreeItem<ResourceElement>> items = treeItem.getChildren();
 
@@ -957,7 +1027,6 @@ public void expandTo(@NotNull final Path file, final boolean needSelect) {
         if (isLazyMode()) {
 
             final TreeItem<ResourceElement> targetItem = findItemForValue(getRoot(), file);
-
             if (targetItem == null) {
 
                 TreeItem<ResourceElement> parentItem = null;
@@ -968,11 +1037,12 @@ public void expandTo(@NotNull final Path file, final boolean needSelect) {
                     if (parentItem != null) {
                         break;
                     }
+
                     parent = parent.getParent();
                 }
 
                 if (parentItem == null) {
-                    return;
+                    parentItem = getRoot();
                 }
 
                 final TreeItem<ResourceElement> toLoad = parentItem;

src/main/java/com/ss/editor/ui/component/asset/tree/ResourceTreeCell.java

@@ -141,7 +141,7 @@ protected void updateItem(@Nullable final ResourceElement item, boolean empty) {
 
         icon.setImage(ICON_MANAGER.getIcon(file, folder, true, DEFAULT_FILE_ICON_SIZE));
 
-        setText(fileName.toString());
+        setText(fileName == null ? file.toString() : fileName.toString());
         setGraphic(icon);
         createToolTip();
     }

src/main/java/com/ss/editor/ui/component/asset/tree/resource/FolderResourceElement.java

@@ -93,4 +93,11 @@ public boolean hasChildren(@NotNull final Array<String> extensionFilter, final b
 
         return false;
     }
+
+    @Override
+    public String toString() {
+        return "FolderResourceElement{" +
+                "file=" + file +
+                '}';
+    }
 }