Merge remote-tracking branch 'jMonkeyEngine/master' into feature/issue-611

Author: tonihele

.gitignore

@@ -25,6 +25,7 @@ netbeans/*
 */nbproject/private/*
 ant-jme/dist
 dist/
+/.nb-gradle/MATERIAL_EDITOR_CHANGES.md
 /.nb-gradle/
 jdks/downloads/
 installers/downloads/
@@ -33,5 +34,4 @@ installers/linux-x64/jdk-x64_linux.tar.gz
 installers/macos-x64/jdk-x64_macos.tar.gz
 installers/windows-x64/jdk-x64_windows.zip
 installers/macos-aarch64/jdk-aarch64_macos.tar.gz
-
 installers/linux-aarch64/jdk-aarch64_linux.tar.gz

gradlew

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2009-2023 jMonkeyEngine
+ *  Copyright (c) 2009-2025 jMonkeyEngine
  *  All rights reserved.
  * 
  *  Redistribution and use in source and binary forms, with or without
@@ -154,11 +154,6 @@ public String getAssetName() {
         return assetNameLabel.getText();
     }
 
-    @Override
-    public void setAssetName(String name) {
-        assetNameLabel.setText(name);
-    }
-
     public void setEditable(boolean editable) {
         this.editable = editable;
     }

jme3-assetbrowser/src/com/jme3/gde/assetbrowser/widgets/AssetPreviewWidget.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2009-2010 jMonkeyEngine
+ *  Copyright (c) 2009-2025 jMonkeyEngine
  *  All rights reserved.
  * 
  *  Redistribution and use in source and binary forms, with or without
@@ -32,6 +32,7 @@
 package com.jme3.gde.core.assets;
 
 import com.jme3.asset.AssetKey;
+import com.jme3.gde.core.dnd.AssetNameHolder;
 import com.jme3.gde.core.util.PropertyUtils;
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Field;
@@ -48,7 +49,7 @@
  * @author normenhansen
  */
 @SuppressWarnings({"unchecked", "rawtypes"})
-public class AssetDataNode extends DataNode {
+public class AssetDataNode extends DataNode implements AssetNameHolder {
 
     public AssetDataNode(DataObject obj, Children ch) {
         super(obj, ch);
@@ -69,7 +70,7 @@ protected Sheet createSheet() {
         if (key == null) {
             return sheet;
         }
-        
+
         Sheet.Set set = Sheet.createPropertiesSet();
         set.setName("AssetKey");
         set.setDisplayName("Conversion Settings");
@@ -89,4 +90,14 @@ protected Sheet createSheet() {
         sheet.put(set);
         return sheet;
     }
+
+    @Override
+    public String getAssetName() {
+        AssetData data = getLookup().lookup(AssetData.class);
+        if (data != null && data.getAssetKey() != null) {
+            return data.getAssetKey().getName();
+        }
+        return null;
+    }
+
 }

jme3-core/src/com/jme3/gde/core/assets/AssetDataNode.java

@@ -1,6 +1,33 @@
 /*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ *  Copyright (c) 2009-2025 jMonkeyEngine
+ *  All rights reserved.
+ * 
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ * 
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 
+ *  * Neither the name of 'jMonkeyEngine' nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ *  TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ *  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ *  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ *  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.jme3.gde.core.dnd;
 
@@ -11,6 +38,4 @@
 public interface AssetNameHolder {
 
     String getAssetName();
-
-    void setAssetName(String name);
 }

jme3-core/src/com/jme3/gde/core/dnd/AssetNameHolder.java

@@ -1,9 +1,37 @@
 /*
- * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
- * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ *  Copyright (c) 2009-2025 jMonkeyEngine
+ *  All rights reserved.
+ * 
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ * 
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 
+ *  * Neither the name of 'jMonkeyEngine' nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ *  TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ *  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ *  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ *  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.jme3.gde.core.dnd;
 
+import com.jme3.gde.core.assets.AssetDataNode;
 import com.jme3.gde.core.sceneviewer.SceneViewerTopComponent;
 import com.jme3.math.Vector2f;
 import java.awt.Cursor;
@@ -19,8 +47,9 @@
 import java.util.logging.Logger;
 
 /**
- * Handles dropping Materials or Spatial from the AssetBrowser to the
- * SceneViewer
+ * Handles dropping Materials or Spatial from the AssetBrowser and Projects tab
+ * to the SceneViewer
+ *
  * @author rickard
  */
 public class SceneViewerDropTargetListener implements DropTargetListener {
@@ -57,8 +86,7 @@ public void dragExit(final DropTargetEvent dte) {
     @Override
     public void drop(final DropTargetDropEvent dtde) {
         this.rootPanel.setCursor(Cursor.getDefaultCursor());
-
-        AssetNameHolder transferableObj = null;
+        String assetKey = null;
         Transferable transferable = null;
         DataFlavor flavor = null;
 
@@ -69,26 +97,51 @@ public void drop(final DropTargetDropEvent dtde) {
             flavor = flavors[0];
             // What does the Transferable support
             if (transferable.isDataFlavorSupported(flavor)) {
-                transferableObj = (AssetNameHolder) dtde.getTransferable().getTransferData(flavor);
+                Object o = dtde.getTransferable().getTransferData(flavor);
+                if (o instanceof AssetNameHolder assetNameHolder) {
+                    assetKey = assetNameHolder.getAssetName();
+                } else if (o instanceof AssetDataNode assetDataNode) {
+                    assetKey = assetDataNode.getAssetName();
+                }
             }
 
         } catch (UnsupportedFlavorException | IOException ex) {
             Logger.getLogger(SceneViewerDropTargetListener.class.getName()).log(Level.WARNING, "Non-supported flavor {0}", transferable);
         }
 
-        if (transferable == null || transferableObj == null) {
+        if (transferable == null || assetKey == null) {
             return;
         }
 
         final int dropYLoc = dtde.getLocation().y;
         final int dropXLoc = dtde.getLocation().x;
 
-        if (flavor instanceof SpatialDataFlavor) {
-            rootPanel.addModel(transferableObj.getAssetName(), new Vector2f(dropXLoc, dropYLoc));
-        } else if (flavor instanceof MaterialDataFlavor) {
-            rootPanel.applyMaterial(transferableObj.getAssetName(), new Vector2f(dropXLoc, dropYLoc));
+        if (flavor instanceof SpatialDataFlavor || isModelExtension(assetKey)) {
+            rootPanel.addModel(assetKey, new Vector2f(dropXLoc, dropYLoc));
+        } else if (flavor instanceof MaterialDataFlavor || isMaterialExtension(assetKey)) {
+            rootPanel.applyMaterial(assetKey, new Vector2f(dropXLoc, dropYLoc));
         }
 
     }
 
+    /**
+     * Determines if the asset key represents a model/spatial asset by checking its file extension.
+     *
+     * @param assetKey The asset key (typically a filename or path); this method checks if it ends with the model file extension.
+     * @return true if the asset key is for model files
+     */
+    private boolean isModelExtension(String assetKey) {
+        return assetKey.endsWith("j3o");
+    }
+
+    /**
+     * Determines if the asset key represents a material asset by checking its file extension.
+     *
+     * @param assetKey The asset key (typically a filename or path); this method checks if it ends with the material file extension.
+     * @return true if the asset key is for material files
+     */
+    private boolean isMaterialExtension(String assetKey) {
+        return assetKey.endsWith("j3m");
+    }
+
 }

jme3-core/src/com/jme3/gde/core/dnd/SceneViewerDropTargetListener.java

@@ -55,10 +55,13 @@ public void reindent() throws BadLocationException {
         context.setCaretOffset(1);
         final Document doc = context.document();
         int indentModifier = 0;
+        
+        int startOffset = context.startOffset();
+        int startOffsetBounded = Math.max(startOffset - 1, 0);
 
         //Check if previous line ends with a {
-        int previousLineLength = context.startOffset() - 1 - context.lineStartOffset(context.startOffset() - 1);
-        String previousLine = doc.getText(context.lineStartOffset(context.startOffset() - 1), previousLineLength);
+        int previousLineLength = Math.max(startOffsetBounded - context.lineStartOffset(startOffsetBounded), 0);
+        String previousLine = doc.getText(context.lineStartOffset(startOffsetBounded), previousLineLength);
 
         //Hook other reasons for changes in indentation into this for loop
         for (int i = previousLineLength - 1; i >= 0; i--) {
@@ -69,8 +72,8 @@ public void reindent() throws BadLocationException {
                 break;
             }
         }
-        int previousLineIndent = context.lineIndent(context.lineStartOffset(context.startOffset() - 1));
-        context.modifyIndent(context.startOffset(), previousLineIndent + indentModifier);
+        int previousLineIndent = context.lineIndent(context.lineStartOffset(startOffsetBounded));
+        context.modifyIndent(startOffset, previousLineIndent + indentModifier);
     }
 
     @Override

jme3-glsl-highlighter/src/com/jme3/gde/glsl/highlighter/editor/GlslIndentTask.java

@@ -0,0 +1,15 @@
+MaterialDef ${name} {
+
+    MaterialParameters {
+    }
+
+    Technique {
+        VertexShader GLSL100: ${name}.vert
+        FragmentShader GLSL100: ${name}.frag
+
+        WorldParameters {
+            WorldViewProjectionMatrix
+        }
+    }
+
+}

jme3-materialeditor/src/com/jme3/gde/materialdefinition/CodeBasedMatDef.j3md

@@ -52,6 +52,7 @@
 public class MatPanel extends JPanel implements MouseListener, ComponentListener {
     private final MaterialPreviewRenderer renderer;
     private Material mat;
+    private boolean animationEnabled = false;
     /**
      * Creates new form PreviewPanel
      */
@@ -64,6 +65,7 @@ public MatPanel() {
     }
 
     public void cleanup() {
+        animationTimer.stop();
         renderer.cleanUp();        
     }
 
@@ -366,6 +368,15 @@ public void actionPerformed(ActionEvent e) {
         }
     });
 
+    private final Timer animationTimer = new Timer(20, new ActionListener() {
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            if (animationEnabled && mat != null) {
+                renderer.refreshOnly();
+            }
+        }
+    });
+    
     @Override
     public void mouseExited(MouseEvent e) {
         t.restart();
@@ -399,4 +410,24 @@ private void refresh() {
             renderer.showMaterial(mat);
         }
     }
+    
+    /**
+     * Enable or disable animation rendering
+     * @param enabled true to enable continuous rendering, false to disable
+     */
+    public void setAnimationEnabled(boolean enabled) {
+        this.animationEnabled = enabled;
+        if (enabled) {
+            animationTimer.start();
+        } else {
+            animationTimer.stop();
+        }
+    }
+    
+    /**
+     * @return true if animation rendering is enabled
+     */
+    public boolean isAnimationEnabled() {
+        return animationEnabled;
+    }
 }

jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/MatPanel.java

@@ -29,7 +29,12 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-@TemplateRegistration(folder = "Material", content = "MatDef.j3md", displayName="Material Definition Template")
+@TemplateRegistrations({
+    @TemplateRegistration(folder = "Material", content = "MatDef.j3md", displayName="Material Definition Template (Shader Nodes)"),
+    @TemplateRegistration(folder = "Material", content = "CodeBasedMatDef.j3md", displayName="Material Definition Template (Code Based)", 
+                         position = 100, scriptEngine = "freemarker"),
+})
 package com.jme3.gde.materialdefinition;
 
 import org.netbeans.api.templates.TemplateRegistration;
+import org.netbeans.api.templates.TemplateRegistrations;