diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/dialog/AddNodeDialog.java b/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/dialog/AddNodeDialog.java index cb9602553..ca185eb4a 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/dialog/AddNodeDialog.java +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/dialog/AddNodeDialog.java @@ -28,7 +28,7 @@ import javax.swing.tree.TreeSelectionModel; /** * - * @author m327836 + * @author Nehon */ public class AddNodeDialog extends javax.swing.JDialog { diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/Bundle.properties b/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/Bundle.properties new file mode 100644 index 000000000..64e6fb8b9 --- /dev/null +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/Bundle.properties @@ -0,0 +1,5 @@ +ShaderEditPanel.closeButton.text= +ShaderEditPanel.shaderEditorPane.text= +ShaderEditPanel.closeButton.toolTipText=Close this panel +ShaderEditPanel.jToggleButton1.text=jToggleButton1 +ShaderEditPanel.headerText.text=jLabel1 diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/Diagram.java b/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/Diagram.java index 4befb01c6..fcd851ed6 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/Diagram.java +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/Diagram.java @@ -134,7 +134,11 @@ public class Diagram extends JPanel implements MouseListener, MouseMotionListene } repaint(); } - + + protected void showEdit(NodePanel node) { + parent.showShaderEditor(node.getName(),node.getType(),node.filePaths); + } + public void notifyMappingCreation(Connection conn) { parent.makeMapping(conn); } diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/DraggablePanel.java b/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/DraggablePanel.java index 73568963b..5ba949c9a 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/DraggablePanel.java +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/DraggablePanel.java @@ -11,7 +11,7 @@ import javax.swing.JPanel; /** * - * @author m327836 + * @author Nehon */ public class DraggablePanel extends JPanel implements MouseListener, MouseMotionListener { @@ -44,7 +44,7 @@ public class DraggablePanel extends JPanel implements MouseListener, MouseMotion svdey = e.getYOnScreen(); e.consume(); } - + @Override public void mouseReleased(MouseEvent e) { } diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/MatDefEditorlElement.form b/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/MatDefEditorlElement.form index 9c82d4931..2cca23230 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/MatDefEditorlElement.form +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/MatDefEditorlElement.form @@ -1,6 +1,6 @@ -