sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

terrain editor slider fix for mac

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7650 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
bre..ns 2011-06-17 16:31:30 +00:00
parent 23a65d1caa
commit e46e696838
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/TerrainEditorTopComponent.form
View File

@ -195,7 +195,7 @@
<Property name="value" type="int" value="5"/> <Property name="value" type="int" value="5"/>
</Properties> </Properties>
<Events> <Events>
<EventHandler event="propertyChange" listener="java.beans.PropertyChangeListener" parameters="java.beans.PropertyChangeEvent" handler="radiusSliderPropertyChange"/> <EventHandler event="stateChanged" listener="javax.swing.event.ChangeListener" parameters="javax.swing.event.ChangeEvent" handler="radiusSliderStateChanged"/>
</Events> </Events>
</Component> </Component>
<Component class="javax.swing.JSlider" name="heightSlider"> <Component class="javax.swing.JSlider" name="heightSlider">
@ -205,7 +205,7 @@
<Property name="paintTicks" type="boolean" value="true"/> <Property name="paintTicks" type="boolean" value="true"/>
</Properties> </Properties>
<Events> <Events>
<EventHandler event="propertyChange" listener="java.beans.PropertyChangeListener" parameters="java.beans.PropertyChangeEvent" handler="heightSliderPropertyChange"/> <EventHandler event="stateChanged" listener="javax.swing.event.ChangeListener" parameters="javax.swing.event.ChangeEvent" handler="heightSliderStateChanged"/>
</Events> </Events>
</Component> </Component>
<Component class="javax.swing.JLabel" name="heightLabel"> <Component class="javax.swing.JLabel" name="heightLabel">

32
sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/TerrainEditorTopComponent.java
View File

@ -270,18 +270,18 @@ public final class TerrainEditorTopComponent extends TopComponent implements Sce
radiusSlider.setSnapToTicks(true); radiusSlider.setSnapToTicks(true);
radiusSlider.setToolTipText(org.openide.util.NbBundle.getMessage(TerrainEditorTopComponent.class, "TerrainEditorTopComponent.radiusSlider.toolTipText")); // NOI18N radiusSlider.setToolTipText(org.openide.util.NbBundle.getMessage(TerrainEditorTopComponent.class, "TerrainEditorTopComponent.radiusSlider.toolTipText")); // NOI18N
radiusSlider.setValue(5); radiusSlider.setValue(5);
radiusSlider.addPropertyChangeListener(new java.beans.PropertyChangeListener() { radiusSlider.addChangeListener(new javax.swing.event.ChangeListener() {
public void propertyChange(java.beans.PropertyChangeEvent evt) { public void stateChanged(javax.swing.event.ChangeEvent evt) {
radiusSliderPropertyChange(evt); radiusSliderStateChanged(evt);
} }
}); });
heightSlider.setMajorTickSpacing(20); heightSlider.setMajorTickSpacing(20);
heightSlider.setMaximum(200); heightSlider.setMaximum(200);
heightSlider.setPaintTicks(true); heightSlider.setPaintTicks(true);
heightSlider.addPropertyChangeListener(new java.beans.PropertyChangeListener() { heightSlider.addChangeListener(new javax.swing.event.ChangeListener() {
public void propertyChange(java.beans.PropertyChangeEvent evt) { public void stateChanged(javax.swing.event.ChangeEvent evt) {
heightSliderPropertyChange(evt); heightSliderStateChanged(evt);
} }
}); });
@ -587,16 +587,6 @@ public final class TerrainEditorTopComponent extends TopComponent implements Sce
} }
}//GEN-LAST:event_lowerTerrainButtonActionPerformed }//GEN-LAST:event_lowerTerrainButtonActionPerformed
private void radiusSliderPropertyChange(java.beans.PropertyChangeEvent evt) {//GEN-FIRST:event_radiusSliderPropertyChange
if (toolController != null)
toolController.setHeightToolRadius(radiusSlider.getValue());
}//GEN-LAST:event_radiusSliderPropertyChange
private void heightSliderPropertyChange(java.beans.PropertyChangeEvent evt) {//GEN-FIRST:event_heightSliderPropertyChange
if (toolController != null)
toolController.setHeightToolHeight(heightSlider.getValue()); // should always be values upto and over 100, because it will be divided by 100
}//GEN-LAST:event_heightSliderPropertyChange
private void genEntropiesButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_genEntropiesButtonActionPerformed private void genEntropiesButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_genEntropiesButtonActionPerformed
if (editorController != null) { if (editorController != null) {
setHintText("Run entropy generation when you are finished modifying the terrain's height. It is a slow process but required for some LOD operations."); setHintText("Run entropy generation when you are finished modifying the terrain's height. It is a slow process but required for some LOD operations.");
@ -672,6 +662,16 @@ public final class TerrainEditorTopComponent extends TopComponent implements Sce
} }
}//GEN-LAST:event_levelTerrainButtonActionPerformed }//GEN-LAST:event_levelTerrainButtonActionPerformed
private void radiusSliderStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_radiusSliderStateChanged
if (toolController != null)
toolController.setHeightToolRadius(radiusSlider.getValue());
}//GEN-LAST:event_radiusSliderStateChanged
private void heightSliderStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_heightSliderStateChanged
if (toolController != null)
toolController.setHeightToolHeight(heightSlider.getValue()); // should always be values upto and over 100, because it will be divided by 100
}//GEN-LAST:event_heightSliderStateChanged
// Variables declaration - do not modify//GEN-BEGIN:variables // Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton addTextureButton; private javax.swing.JButton addTextureButton;
private javax.swing.JButton createTerrainButton; private javax.swing.JButton createTerrainButton;