diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/EditableMaterialFile.java b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/EditableMaterialFile.java index 1a6ac64fa..0dc03db70 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/EditableMaterialFile.java +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/EditableMaterialFile.java @@ -131,10 +131,15 @@ public class EditableMaterialFile { String name = lines[0].trim(); prop.setName(name); if (additionalRenderStates.get(name) != null) { + prop.setType(additionalRenderStates.get(name).getType()); if (lines.length > 1) { - prop.setValue(lines[lines.length - 1].trim()); - } + String value = ""; + for (int i = 1; i < lines.length; i++) { + value += " " + lines[i]; + } + prop.setValue(value.trim()); + } additionalRenderStates.put(prop.getName(), prop); } } @@ -467,7 +472,7 @@ public class EditableMaterialFile { setMatDefName(mat.getMaterialDef().getAssetName()); createBaseMaterialFile(); materialParameters.clear(); - Collection params=mat.getParams(); + Collection params = mat.getParams(); for (Iterator it = params.iterator(); it.hasNext();) { MatParam matParam = it.next(); materialParameters.put(matParam.getName(), new MaterialProperty(matParam)); diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/FloatPanel.form b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/FloatPanel.form index 5e1e741fa..a4d83b357 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/FloatPanel.form +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/FloatPanel.form @@ -21,7 +21,7 @@ - + @@ -68,12 +68,12 @@ - + - + diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/FloatPanel.java b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/FloatPanel.java index b28ee9cf6..2fc4dd1fa 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/FloatPanel.java +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/FloatPanel.java @@ -21,6 +21,7 @@ public class FloatPanel extends MaterialPropertyWidget { /** Creates new form NumberPanel */ public FloatPanel() { initComponents(); + jSpinner1.setModel(new javax.swing.SpinnerNumberModel(Float.valueOf(0.0f), null, null, Float.valueOf(0.1f))); } /** This method is called from within the constructor to @@ -55,11 +56,11 @@ public class FloatPanel extends MaterialPropertyWidget { jPanel1.setLayout(jPanel1Layout); jPanel1Layout.setHorizontalGroup( jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 50, Short.MAX_VALUE) + .addGap(0, 255, Short.MAX_VALUE) ); jPanel1Layout.setVerticalGroup( jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 28, Short.MAX_VALUE) + .addGap(0, 25, Short.MAX_VALUE) ); jToolBar1.add(jPanel1); @@ -76,7 +77,7 @@ public class FloatPanel extends MaterialPropertyWidget { this.setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jToolBar1, javax.swing.GroupLayout.DEFAULT_SIZE, 168, Short.MAX_VALUE) + .addComponent(jToolBar1, javax.swing.GroupLayout.DEFAULT_SIZE, 543, Short.MAX_VALUE) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/WidgetFactory.java b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/WidgetFactory.java index ea7647e4a..157d3a9b7 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/WidgetFactory.java +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/WidgetFactory.java @@ -16,7 +16,7 @@ import com.jme3.material.RenderState.FaceCullMode; */ public class WidgetFactory { - public static MaterialPropertyWidget getWidget(MaterialProperty prop, ProjectAssetManager manager){ + public static MaterialPropertyWidget getWidget(MaterialProperty prop, ProjectAssetManager manager){ MaterialPropertyWidget widget; if("Texture2D".equals(prop.getType())){ widget=new TexturePanel(manager); @@ -68,7 +68,7 @@ public class WidgetFactory { widget.setProperty(prop); return widget; } - widget = new TextPanel(); + widget = new TextPanel(); widget.setProperty(prop); return widget; }