8000 Material Editor overhaul by neph1 · Pull Request #389 · jMonkeyEngine/sdk · GitHub
[go: up one dir, main page]
Skip to content

Material Editor overhaul #389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jan 20, 2023
Merged

Material Editor overhaul #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
602b53c
icons and some ui tweaks for material editor
neph1 Oct 1, 2022
45cfdb6
some layout changes to Material Editor
neph1 Oct 2, 2022
f5d7001
Merge branch 'master' into icons_for_material_editor
neph1 Jan 13, 2023
be16683
tweaked appearance of icons and components
neph1 Jan 13, 2023
ea05ea2
fixing branch..
neph1 Jan 13, 2023
b38a19f
reverting genfiles.properties
neph1 Jan 14, 2023
d7868ed
used two column grid for options. resized panels to fit.
neph1 Jan 16, 2023
ef64596
fixing a bunch of aesthetic issues with the widgets. should be few op…
neph1 Jan 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions jme3-materialeditor/src/com/jme3/gde/materials/multiview/Bundle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
CTL_MaterialEditorAction=MaterialEditor
CTL_MaterialEditorTopComponent=MaterialEditor Window
HINT_MaterialEditorTopComponent=This is a MaterialEditor window
MaterialEditorTopComponent.jLabel1.text=Material Definition
MaterialEditorTopComponent.jScrollPane1.TabConstraints.tabTitle=Source
MaterialEditorTopComponent.jScrollPane2.TabConstraints.tabTitle=Properties
MaterialEditorTopComponent.jPanel4.TabConstraints.tabTitle=Editor
MaterialEditorTopComponent.jLabel3.text=Name
MaterialEditorTopComponent.jScrollPane10.TabConstraints.tabTitle=Additional RenderState
MaterialEditorTopComponent.jCheckBox1.text=save immediately
MaterialEditorTopComponent.jTextField1.text=jTextField1
MaterialEditorTopComponent.jScrollPane3.TabConstraints.tabTitle=Textures & Colors
MaterialEditorTopComponent.jScrollPane9.TabConstraints.tabTitle=Additional RenderState
MaterialEditorTopComponent.jLabel3.text=Name
MaterialEditorTopComponent.jLabel1.text=Material Definition
MaterialEditorTopComponent.jScrollPane2.TabConstraints.tabTitle_1=Options
MaterialEditorTopComponent.jCheckBox1.text=save immediately
MaterialEditorTopComponent.jScrollPane3.TabConstraints.tabTitle=Textures & Colors
MaterialEditorTopComponent.editorPanel.TabConstraints.tabTitle=Editor
MaterialEditorTopComponent.jScrollPane4.TabConstraints.tabTitle=Editor
508 changes: 295 additions & 213 deletions jme3-materialeditor/src/com/jme3/gde/materials/multiview/MaterialEditorTopComponent.form
View file
Open in desktop

Large diffs are not rendered by default.

191 changes: 118 additions & 73 deletions jme3-materialeditor/src/com/jme3/gde/materials/multiview/MaterialEditorTopComponent.java
View file
Open in desktop

Large diffs are not rendered by default.

38 changes: 17 additions & 21 deletions jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/BooleanPanel.form
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
<?xml version="1.0" encoding="UTF-8" ?>

<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
<Properties>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[61, 27]"/>
</Property>
</Properties>
<AuxValues>
<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
<AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
Expand Down Expand Up @@ -28,7 +33,6 @@
<SubComponents>
<Container class="javax.swing.JToolBar" name="jToolBar1">
<Properties>
<Property name="floatable" type="boolean" value="false"/>
<Property name="rollover" type="boolean" value="true"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[81, 27]"/>
Expand All @@ -42,35 +46,27 @@
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="com/jme3/gde/materials/multiview/widgets/Bundle.properties" key="BooleanPanel.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[300, 17]"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[100, 25]"/>
<Dimension value="[150, 25]"/>
</Property>
</Properties>
</Component>
<Container class="javax.swing.JPanel" name="jPanel1">
<Component class="javax.swing.Box$Filler" name="filler1">
<Properties>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[0, 0]"/>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[32767, 0]"/>
</Property>
<Property name="opaque" type="boolean" value="false"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[32767, 23]"/>
<Dimension value="[20, 0]"/>
</Property>
</Properties>

<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<EmptySpace min="0" pref="23" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
</Layout>
</Container>
<AuxValues>
<AuxValue name="classDetails" type="java.lang.String" value="Box.Filler.HorizontalGlue"/>
</AuxValues>
</Component>
<Component class="javax.swing.JCheckBox" name="jCheckBox1">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
Expand Down
25 changes: 5 additions & 20 deletions jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/BooleanPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,33 +34,18 @@ private void initComponents() {

jToolBar1 = new javax.swing.JToolBar();
jLabel1 = new javax.swing.JLabel();
jPanel1 = new javax.swing.JPanel();
filler1 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 0), new java.awt.Dimension(20, 0), new java.awt.Dimension(32767, 0));
jCheckBox1 = new javax.swing.JCheckBox();

jToolBar1.setFloatable(false);
jToolBar1.setRollover(true);
jToolBar1.setPreferredSize(new java.awt.Dimension(81, 27));

org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(BooleanPanel.class, "BooleanPanel.jLabel1.text")); // NOI18N
jLabel1.setPreferredSize(new java.awt.Dimension(100, 25));
jLabel1.setMaximumSize(new java.awt.Dimension(300, 17));
jLabel1.setPreferredSize(new java.awt.Dimension(150, 25));
jToolBar1.add(jLabel1);

jPanel1.setMinimumSize(new java.awt.Dimension(0, 0));
jPanel1.setOpaque(false);
jPanel1.setPreferredSize(new java.awt.Dimension(32767, 23));

javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
jPanel1.setLayout(jPanel1Layout);
jPanel1Layout.setHorizontalGroup(
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGap(0, 0, Short.MAX_VALUE)
);
jPanel1Layout.setVerticalGroup(
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGap(0, 23, Short.MAX_VALUE)
);

jToolBar1.add(jPanel1);
jToolBar1.add(filler1);

org.openide.awt.Mnemonics.setLocalizedText(jCheckBox1, org.openide.util.NbBundle.getMessage(BooleanPanel.class, "BooleanPanel.jCheckBox1.text")); // NOI18N
jCheckBox1.setFocusable(false);
Expand Down Expand Up @@ -114,9 +99,9 @@ public void run() {
});
}
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.Box.Filler filler1;
private javax.swing.JCheckBox jCheckBox1;
private javax.swing.JLabel jLabel1;
private javax.swing.JPanel jPanel1;
private javax.swing.JToolBar jToolBar1;
// End of variables declaration//GEN-END:variables
}
21 changes: 10 additions & 11 deletions jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/Bundle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@ ColorRGBADialog.alphaLabel.text=Alpha:
# To change this template, choose Tools | Templates
# and open the template in the editor.
ColorPanel.jLabel1.text=jLabel1
ColorPanel.jButton1.text=
TexturePanel.jLabel1.text=jLabel1
TexturePanel.jButton1.text=set...
TexturePanel.jButton2.text=
# To change this template, choose Tools | Templates
# and open the template in the editor.
Expand All @@ -36,15 +34,6 @@ MaterialPreviewWidget.sphereButton.toolTipText=Preview material on a sphere
MaterialPreviewWidget.cubeButton.toolTipText=Preview material on a cube
MaterialPreviewWidget.planeButton.toolTipText=Preview material on a plane
MaterialPreviewWidget.previewLabel.text=
ColorPanel.colorPreview.text=
ColorPanel.jLabel2.text=\ r :
ColorPanel.jLabel3.text=\ g :
ColorPanel.jLabel4.text=\ b :
ColorPanel.jLabel5.text=\ a :
ColorPanel.rLabel.text=0.2545
ColorPanel.gLabel.text=0.2545
ColorPanel.bLabel.text=0.2545
ColorPanel.aLabel.text=0.2545
TexturePanel.jButton2.toolTipText=Remove this texture
TexturePanel.texturePreview.text=
TexturePanelSquare.jCheckBox2.text=repeat
Expand All @@ -54,3 +43,13 @@ TexturePanelSquare.text=
MaterialPreviewWidget.jToggleButton1.text=jToggleButton1
MaterialPreviewWidget.togglePbrEnvButton.label=
MaterialPreviewWidget.togglePbrEnvButton.toolTipText=Toggle PBR environment
ColorPanel.gLabel.text=0.2545
ColorPanel.rLabel.text=0.2545
ColorPanel.colorPreview.text=
ColorPanel.jLabel5.text=\ a :
ColorPanel.aLabel.text=0.2545
ColorPanel.jLabel4.text=\ b :
ColorPanel.jLabel3.text=\ g :
ColorPanel.jLabel2.text=\ r :
ColorPanel.bLabel.text=0.2545
TexturePanel.texturePreview.toolTipText=Texture
84 changes: 33 additions & 51 deletions jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/ColorPanel.form
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,14 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0">
<Group type="103" groupAlignment="1" attributes="0">
<Component id="jSeparator1" alignment="1" pref="420" max="32767" attributes="0"/>
<Group type="102" alignment="1" attributes="0">
<Component id="jLabel1" pref="70" max="32767" attributes="0"/>
<Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jSeparator1" alignment="1" max="32767" attributes="0"/>
<Group type="102" attributes="0">
<Component id="jLabel1" min="-2" pref="91" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="jPanel2" min="-2" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="jButton1" min="-2" pref="29" max="-2" attributes="0"/>
<Component id="jPanel2" min="-2" pref="390" max="-2" attributes="0"/>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
Expand All @@ -42,13 +41,13 @@
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="4" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" max="-2" attributes="0">
<Component id="jButton1" max="32767" attributes="1"/>
<Component id="jLabel1" alignment="0" max="32767" attributes="1"/>
<Component id="jPanel2" alignment="0" max="32767" attributes="1"/>
<Component id="jLabel1" max="32767" attributes="1"/>
<Component id="jPanel2" max="32767" attributes="1"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Component id="jSeparator1" pref="9" max="32767" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="jSeparator1" pref="1" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
Expand All @@ -65,14 +64,18 @@
</Properties>
</Component>
<Container class="javax.swing.JPanel" name="jPanel2">
<Properties>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[377, 40]"/>
</Property>
</Properties>

<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="colorPreview" pref="18" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="colorPreview" min="-2" pref="41" max="-2" attributes="0"/>
<EmptySpace pref="51" max="32767" attributes="0"/>
<Component id="jLabel2" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="rLabel" min="-2" pref="46" max="-2" attributes="0"/>
Expand All @@ -93,17 +96,17 @@
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="gLabel" alignment="0" pref="20" max="32767" attributes="1"/>
<Component id="bLabel" alignment="0" pref="20" max="32767" attributes="1"/>
<Component id="jLabel2" alignment="0" max="32767" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="jLabel3" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jLabel3" alignment="3" min="-2" pref="40" max="-2" attributes="0"/>
<Component id="jLabel4" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jLabel5" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jLabel2" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="rLabel" alignment="3" pref="20" max="32767" attributes="1"/>
<Component id="rLabel" alignment="3" max="32767" attributes="1"/>
<Component id="gLabel" alignment="3" min="-2" max="-2" attributes="1"/>
<Component id="bLabel" alignment="3" min="-2" max="-2" attributes="1"/>
<Component id="aLabel" alignment="3" min="-2" max="-2" attributes="1"/>
</Group>
<Component id="colorPreview" alignment="0" pref="20" max="32767" attributes="1"/>
<Component id="aLabel" alignment="0" pref="20" max="32767" attributes="1"/>
<Component id="colorPreview" alignment="0" max="32767" attributes="1"/>
</Group>
</DimensionLayout>
</Layout>
Expand Down Expand Up @@ -199,14 +202,11 @@
<ResourceString bundle="com/jme3/gde/materials/multiview/widgets/Bundle.properties" key="ColorPanel.aLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
<Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
<Color id="Curseur de texte"/>
<Color id="Default Cursor"/>
</Property>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[110, 2147483647]"/>
</Property>
<Property name="nextFocusableComponent" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">
<ComponentRef name="jButton1"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[110, 28]"/>
</Property>
Expand Down Expand Up @@ -241,34 +241,16 @@
</Border>
</Property>
<Property name="opaque" type="boolean" value="true"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[64, 2]"/>
</Property>
</Properties>
<Events>
<EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="colorPreviewMouseClicked"/>
</Events>
</Component>
</SubComponents>
</Container>
<Component class="javax.swing.JButton" name="jButton1">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/com/jme3/gde/materials/multiview/widgets/icons/color_wheel.png"/>
</Property>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="com/jme3/gde/materials/multiview/widgets/Bundle.properties" key="ColorPanel.jButton1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
<Property name="horizontalTextPosition" type="int" value="0"/>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[43, 15]"/>
</Property>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[43, 15]"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[43, 15]"/>
</Property>
<Property name="verticalTextPosition" type="int" value="3"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JSeparator" name="jSeparator1">
</Component>
</SubComponents>
Expand Down
Loading
0