Previews for matparams #334

neph1 · 2022-05-16T20:12:51Z

This is both preview of shader node outputs, editing them and some general refactoring and fixes made along the way.

I'm afraid this is going to be a big one, so I'm creating a draft in case anyone wants to tag along :)

Edit: I'm unsure as to why it replaces some whole files. Because line endings were wrong?

AssetManager static hack to load textures in preview...

Updatable floats and colors

Updatable floats and colors (SDK Core project)

jme3-materialeditor/src/com/jme3/gde/materialdefinition/EditableMatDefFile.java

neph1 · 2022-05-16T20:17:09Z

jme3-materialeditor/src/com/jme3/gde/materialdefinition/EditableMatDefFile.java

+    private MatDefBlock matDefStructure;
+    private TechniqueBlock currentTechnique;
+    private MaterialDef materialDef;
+    private static ProjectAssetManager assetManager;


Sorry, this was the best I could do at the time. Will try to find a better way

neph1 · 2022-05-16T20:19:18Z

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

@@ -721,6 +728,9 @@ private void initData(TechniqueBlock technique, ProjectAssetManager manager, Lis

        for (MatParamBlock matParamBlock : matDef.getMatParams()) {
            ShaderNodeVariable var = new ShaderNodeVariable("", "MatParam", matParamBlock.getName());
+            if(matParamBlock.getDefaultValue() != null){


This allows for the creation of previews for the nodes

neph1 · 2022-05-16T20:22:21Z

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

                break;
            case MatParam:
                header.setIcon(Icons.mat);
-                setNameAndTitle("MatParam");
+                name = "MatParam";
+                setTitle(outputLabels.get(0).getText());
                break;


Separating name and title for single output nodes. It allows for having the param name in the header.

…vecs and bools.

# Conflicts: # jme3-core/src/com/jme3/gde/core/editor/nodes/NodePanel.java

This reverts commit 2d4920e, reversing changes made to bed7dea.

# Conflicts: # jme3-core/src/com/jme3/gde/core/editor/nodes/NodePanel.java

neph1 · 2022-05-20T14:57:35Z

This PR adds both previews and editors for values for the shader nodes. I'd still like to explore it a bit further and see if i can pass down MatParams all the way to the nodes, that would make some things easier to formalize.

neph1 · 2022-05-22T16:08:23Z

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

-        if (evt.getPropertyName().equals("name")) {
+        if(evt.getSource() instanceof BasePreview && evt.getNewValue() instanceof String){
+            diagram.updateDefaultValue(evt.getPropertyName(), (String) evt.getNewValue());
+        } else if (evt.getPropertyName().equals("name")) {


This block listens for changes to default values and passes them on.

…apping

…n preview..." This reverts commit d08c87f.

neph1 · 2022-05-25T19:04:45Z

I tried breaking out the live updates for materials into its own, but it's too nestled in with the rest.

neph1 · 2022-05-25T19:27:39Z

jme3-core/src/com/jme3/gde/core/editor/nodes/NodePanel.java

+/**
+ * The NodePanel is the actual implementation of a Node.
+ * @author Nehon
+ */


All changes to this class are about making nodes more compact and work better with the preview/editor panels. I made them opaque for that reason

neph1 · 2022-05-25T19:31:15Z

jme3-materialeditor/src/com/jme3/gde/materialdefinition/EditableMatDefFile.java

-        this.loaded = loaded;
-    }
-
-    private class MatStructChangeListener implements PropertyChangeListener {


Moved this to its own class

neph1 · 2022-05-25T19:35:17Z

jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/ShaderNodeBlock.java

-        }
-        return 0;
-    }
-


Handled by Comparator in ShaderNodesBlock now

neph1 · 2022-05-25T19:52:00Z

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

@@ -42,6 +42,7 @@
 import javax.swing.JList;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.JToggleButton;


Added a new button for toggling live updates. Should find an icon for that..

# Conflicts: # jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/ShaderNodePanel.java

Conflicts: jme3-materialeditor/src/com/jme3/gde/materialdefinition/EditableMatDefFile.java

# Conflicts: # jme3-core/src/com/jme3/gde/core/editor/nodes/Diagram.java # jme3-materialeditor/src/com/jme3/gde/materialdefinition/EditableMatDefFile.java # jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/Bundle.properties # jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/MatDefEditorToolBar.form # jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/MatDefEditorToolBar.java # jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/ShaderNodeDiagram.java # jme3-materialeditor/src/com/jme3/gde/materials/MaterialPreviewRenderer.java

neph1 · 2022-06-07T20:26:42Z

Getting there... This last merge was really messy. Cause: Line endings updated on other PR's but not this one. One more "lesser" pr to go before i'll finish this one up.

…rams

neph1 · 2022-08-23T12:50:02Z

Note to self: Still line ending issue with MatDefNode https://github.com/jMonkeyEngine/sdk/pull/334/files#diff-8a908aef5dc64b9e3bf08da756c62262ce21cc6bc19307bce81d0261cf22ca58

# Conflicts: # jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/ShaderNodesBlock.java

…eviews_for_matparams

neph1 · 2022-08-25T19:02:46Z

I think this PR deserves a squash commit.
I'll request an inverse review; Unless someone complains loudly, I'll merge this in a couple of days time.

neph1 added 3 commits May 16, 2022 22:04

Immediate updates

c0498ac

AssetManager static hack to load textures in preview...

Previews for all matparams(?)

5b1a2f5

Updatable floats and colors

Previews for all matparams(?)

f7dcb9b

Updatable floats and colors (SDK Core project)

neph1 added ShaderNodes/PBR ShaderEditor labels May 16, 2022

neph1 commented May 16, 2022

View reviewed changes

jme3-materialeditor/src/com/jme3/gde/materialdefinition/EditableMatDefFile.java Outdated Show resolved Hide resolved

neph1 commented May 16, 2022

View reviewed changes

neph1 added 8 commits May 18, 2022 21:12

Rich editors for colors, texture and float nodes. Simple editors for …

bed7dea

…vecs and bools.

Merge branch 'master' into previews_for_matparams

2d4920e

# Conflicts: # jme3-core/src/com/jme3/gde/core/editor/nodes/NodePanel.java

Revert "Merge branch 'master' into previews_for_matparams"

fd67681

This reverts commit 2d4920e, reversing changes made to bed7dea.

Merge branch 'master' into HEAD

9eb3c29

# Conflicts: # jme3-core/src/com/jme3/gde/core/editor/nodes/NodePanel.java

fixing disastreous merge commit

e9fda45

one more file

522bb17

mending

5296192

mending

c66913b

neph1 mentioned this pull request May 20, 2022

adding block statements to Technique to retain any added Defines #331

Merged

neph1 added 2 commits May 22, 2022 14:19

sorting for shadernodeblock. inclusive?

04c479e

live updates for backpanel

f01b26f

neph1 commented May 22, 2022

View reviewed changes

neph1 added 4 commits May 23, 2022 21:00

clean up

a62691c

fixes jMonkeyEngine#339 Attribute nodes are expected to be named "Attr"

e1a2cec

fixes jMonkeyEngine#335 properly. better sorting and sorting on new m…

9cc1417

…apping

Revert "Immediate updates AssetManager static hack to load textures i…

07345da

…n preview..." This reverts commit d08c87f.

a0665c6

neph1 commented May 25, 2022

View reviewed changes

Clean up and documentation

bb2af09

neph1 commented May 25, 2022

View reviewed changes

Reverted some unnecessary changes

0b984ee

neph1 marked this pull request as ready for review May 25, 2022 20:00

neph1 marked this pull request as draft May 26, 2022 05:47

neph1 added 10 commits May 26, 2022 21:01

Merge branch 'master' of github.com:neph1/sdk

73aa6bd

Merge branch 'master' into previews_for_matparams

2bbd5bb

# Conflicts: # jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/ShaderNodePanel.java

Merge origin/master

388ae05

Merge branch 'master' into previews_for_matparams

42cb86a

Merge origin/master

0f521a3

Merge branch 'master' into previews_for_matparams

acdf7a5

Merge origin/master

601de21

Conflicts: jme3-materialeditor/src/com/jme3/gde/materialdefinition/EditableMatDefFile.java

fixing line endings

860ae66

fixing line endings

f2337be

neph1 added 4 commits August 7, 2022 09:05

Merge branch 'master' of github.com:neph1/sdk into previews_for_matpa…

cfdde48

…rams

Merge branch 'master' of github.com:neph1/sdk

e8045b8

Merge origin/master

0bf8e42

Merge branch 'master' into previews_for_matparams

cb43359

neph1 marked this pull request as ready for review August 7, 2022 15:05

neph1 added 4 commits August 25, 2022 20:54

line endings

410a239

Merge branch 'master' of github.com:neph1/sdk

c39bed7

Merge branch 'master' into previews_for_matparams

f28ecd7

# Conflicts: # jme3-materialeditor/src/com/jme3/gde/materialdefinition/fileStructure/ShaderNodesBlock.java

Merge branch 'previews_for_matparams' of github.com:neph1/sdk into pr…

1a0139d

…eviews_for_matparams

neph1 merged commit 33831b7 into jMonkeyEngine:master Sep 12, 2022

neph1 deleted the previews_for_matparams branch May 6, 2023 07:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Previews for matparams #334

Previews for matparams #334

neph1 commented May 16, 2022 •

edited

Loading

neph1 May 16, 2022

neph1 May 16, 2022 •

edited

Loading

neph1 May 16, 2022

neph1 commented May 20, 2022

neph1 May 22, 2022

neph1 commented May 25, 2022

neph1 May 25, 2022

neph1 May 25, 2022

neph1 May 25, 2022

neph1 May 25, 2022

neph1 commented Jun 7, 2022

neph1 commented Aug 23, 2022

neph1 commented Aug 25, 2022

Previews for matparams #334

Previews for matparams #334

Conversation

neph1 commented May 16, 2022 • edited Loading

neph1 May 16, 2022

Choose a reason for hiding this comment

neph1 May 16, 2022 • edited Loading

Choose a reason for hiding this comment

neph1 May 16, 2022

Choose a reason for hiding this comment

neph1 commented May 20, 2022

neph1 May 22, 2022

Choose a reason for hiding this comment

neph1 commented May 25, 2022

neph1 May 25, 2022

Choose a reason for hiding this comment

neph1 May 25, 2022

Choose a reason for hiding this comment

neph1 May 25, 2022

Choose a reason for hiding this comment

neph1 May 25, 2022

Choose a reason for hiding this comment

neph1 commented Jun 7, 2022

neph1 commented Aug 23, 2022

neph1 commented Aug 25, 2022

neph1 commented May 16, 2022 •

edited

Loading

neph1 May 16, 2022 •

edited

Loading