From 23a65d1caaffd992c4d5a036c0712d11dea5e854 Mon Sep 17 00:00:00 2001
From: "bre..ns" <brentowens@gmail.com>
Date: Fri, 17 Jun 2011 15:58:03 +0000
Subject: [PATCH] added level-terrain tool moved hint text to resource bundle

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7649 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
---
 .../jme3/gde/terraineditor/Bundle.properties  |   6 +
 .../TerrainCameraController.java              |  20 +-
 .../TerrainEditorController.java              | 190 +++++++++++++-----
 .../TerrainEditorTopComponent.form            |  16 ++
 .../TerrainEditorTopComponent.java            |  49 ++++-
 .../terraineditor/TerrainToolController.java  |  91 +++++++--
 .../gde/terraineditor/icon_terrain-level.png  | Bin 0 -> 2971 bytes
 7 files changed, 292 insertions(+), 80 deletions(-)
 create mode 100644 sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/icon_terrain-level.png

diff --git a/sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/Bundle.properties b/sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/Bundle.properties
index 2c9f3ac9e..95dc6d25b 100644
--- a/sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/Bundle.properties
+++ b/sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/Bundle.properties
@@ -98,3 +98,9 @@ TerrainEditorTopComponent.paintingPanel.border.title=Painting
 TerrainEditorTopComponent.triPlanarCheckBox.toolTipText=Enable if you have a lot of vertical surfaces. It will look nice but lower performance
 TerrainEditorTopComponent.triPlanarCheckBox.text=Tri-planar mapping
 TerrainEditorTopComponent.jButton1.text=Create Skybox
+TerrainEditorTopComponent.levelTerrainButton.text=
+
+TerrainEditorTopComponent.toolHint.none=
+TerrainEditorTopComponent.toolHint.default=Switch between camera and tool controls by holding down SHIFT
+TerrainEditorTopComponent.toolHint.smooth=
+TerrainEditorTopComponent.toolHint.level=Right click to set desired height value, left click to adjust height to that desired value.
diff --git a/sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/TerrainCameraController.java b/sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/TerrainCameraController.java
index 350cf9cff..1f596d1bf 100644
--- a/sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/TerrainCameraController.java
+++ b/sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/TerrainCameraController.java
@@ -107,7 +107,7 @@ public class TerrainCameraController extends AbstractCameraController {
             movedR = true;
             if (isTerrainEditButtonEnabled() && !forceCameraControls) {
                 if (leftMouse)
-                    terrainEditToolActivated = true;//toolController.doTerrainEditToolActivated();
+                    terrainEditToolActivated = true;
             }
             else {
                 if (leftMouse) {
@@ -122,7 +122,7 @@ public class TerrainCameraController extends AbstractCameraController {
             movedR = true;
             if (isTerrainEditButtonEnabled() && !forceCameraControls) {
                 if (leftMouse)
-                    terrainEditToolActivated = true;//toolController.doTerrainEditToolActivated();
+                    terrainEditToolActivated = true;
             }
             else {
                 if (leftMouse) {
@@ -137,7 +137,7 @@ public class TerrainCameraController extends AbstractCameraController {
             movedR = true;
             if (isTerrainEditButtonEnabled() && !forceCameraControls) {
                 if (leftMouse)
-                    terrainEditToolActivated = true;//toolController.doTerrainEditToolActivated();
+                    terrainEditToolActivated = true;
             }
             else {
                 if (leftMouse) {
@@ -152,7 +152,7 @@ public class TerrainCameraController extends AbstractCameraController {
             movedR = true;
             if (isTerrainEditButtonEnabled() && !forceCameraControls) {
                 if (leftMouse)
-                    terrainEditToolActivated = true;//toolController.doTerrainEditToolActivated();
+                    terrainEditToolActivated = true;
             }
             else {
                 if (leftMouse) {
@@ -181,7 +181,12 @@ public class TerrainCameraController extends AbstractCameraController {
         if (button == 0) {
             if (isTerrainEditButtonEnabled() && !forceCameraControls) {
                 if (leftMouse)
-                    terrainEditToolActivated = true;//toolController.doTerrainEditToolActivated();
+                    terrainEditToolActivated = true;
+            }
+        }
+        if (button == 1) {
+            if (isTerrainEditButtonEnabled() && !forceCameraControls) {
+                toolController.doTerrainEditToolAlternateActivated();
             }
         }
     }
@@ -199,7 +204,8 @@ public class TerrainCameraController extends AbstractCameraController {
             if (lastModifyTime >= toolModifyRate) {
                 
                 lastModifyTime = 0;
-                toolController.doTerrainEditToolActivated();
+                if (terrainEditToolActivated)
+                    toolController.doTerrainEditToolActivated();
                 terrainEditToolActivated = false;
                 lastModifyTime = app.getContext().getTimer().getTime();
             }
@@ -222,7 +228,7 @@ public class TerrainCameraController extends AbstractCameraController {
     /**
      * Find where on the terrain the mouse intersects.
      */
-    private Vector3f getTerrainCollisionPoint() {
+    protected Vector3f getTerrainCollisionPoint() {
 
         if (editorController.getTerrain(null) == null)
             return null;
diff --git a/sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/TerrainEditorController.java b/sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/TerrainEditorController.java
index 3e5b47787..048a816f5 100644
--- a/sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/TerrainEditorController.java
+++ b/sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/TerrainEditorController.java
@@ -88,8 +88,11 @@ public class TerrainEditorController {
     private final int BASE_TEXTURE_COUNT = NUM_ALPHA_TEXTURES; // add any others here, like a global specular map
     protected final int MAX_TEXTURE_LAYERS = 7-BASE_TEXTURE_COUNT; // 16 max, minus the ones we are reserving
 
+    // level terrain settings
+    private Vector3f levelTerrainDesiredHeight;
+    private float levelTerrainSnapThreshold = 0.01f;
 
-    //private DataObjectSaveNode alphaDataObject;
+    
 
     protected SaveCookie terrainSaveCookie = new SaveCookie() {
       public void save() throws IOException {
@@ -177,38 +180,38 @@ public class TerrainEditorController {
         float zStepAmount = ((Node)terrain).getLocalScale().z;
 
         for (int z=-radiusStepsZ; z<radiusStepsZ; z++) {
-			for (int x=-radiusStepsZ; x<radiusStepsX; x++) {
+            for (int x=-radiusStepsZ; x<radiusStepsX; x++) {
 
                 float locX = worldLoc.x + (x*xStepAmount);
                 float locZ = worldLoc.z + (z*zStepAmount);
 
-				if (isInRadius(locX-worldLoc.x,locZ-worldLoc.z,radius)) {
-                    // see if it is in the radius of the tool
-					float h = calculateHeight(radius, heightFactor, locX-worldLoc.x, locZ-worldLoc.z);
-
-					// increase the height
-					terrain.adjustHeight(new Vector2f(locX, locZ), h);
-				}
-			}
-		}
+                // see if it is in the radius of the tool
+                if (isInRadius(locX-worldLoc.x,locZ-worldLoc.z,radius)) {
+                    // adjust height based on radius of the tool
+                    float h = calculateHeight(radius, heightFactor, locX-worldLoc.x, locZ-worldLoc.z);
+                    // increase the height
+                    terrain.adjustHeight(new Vector2f(locX, locZ), h);
+                }
+            }
+        }
 
         ((Node)terrain).updateModelBound(); // or else we won't collide with it where we just edited
         
     }
 
     /**
-	 * See if the X,Y coordinate is in the radius of the circle. It is assumed
-	 * that the "grid" being tested is located at 0,0 and its dimensions are 2*radius.
-	 * @param x
-	 * @param z
-	 * @param radius
-	 * @return
-	 */
-	private boolean isInRadius(float x, float y, float radius) {
-		Vector2f point = new Vector2f(x,y);
-		// return true if the distance is less than equal to the radius
-		return Math.abs(point.length()) <= radius;
-	}
+     * See if the X,Y coordinate is in the radius of the circle. It is assumed
+     * that the "grid" being tested is located at 0,0 and its dimensions are 2*radius.
+     * @param x
+     * @param z
+     * @param radius
+     * @return
+     */
+    private boolean isInRadius(float x, float y, float radius) {
+        Vector2f point = new Vector2f(x,y);
+        // return true if the distance is less than equal to the radius
+        return Math.abs(point.length()) <= radius;
+    }
 
     /**
      * Interpolate the height value based on its distance from the center (how far along
@@ -222,18 +225,21 @@ public class TerrainEditorController {
      * @return the adjusted height value
      */
     private float calculateHeight(float radius, float heightFactor, float x, float z) {
-        // find percentage for each 'unit' in radius
+        float val = calculateRadiusPercent(radius, x, z);
+        return heightFactor * val;
+    }
+
+    private float calculateRadiusPercent(float radius, float x, float z) {
+         // find percentage for each 'unit' in radius
         Vector2f point = new Vector2f(x,z);
         float val = Math.abs(point.length()) / radius;
-        val = 1 - val;
-        return heightFactor * val;
-	}
+        val = 1f - val;
+        return val;
+    }
 
     public void cleanup() {
-        final Node node = jmeRootNode.getLookup().lookup(Node.class);
         terrainNode = null;
         rootNode = null;
-//        alphaDataObject = null;
     }
 
     /**
@@ -410,17 +416,6 @@ public class TerrainEditorController {
         */
     }
 
-    /*private void doSetAlphaTexture(int layer, Texture tex) {
-        int alphaIdx = layer/4; // 4 = rgba = 4 textures
-
-        Terrain terrain = (Terrain) getTerrain(null);
-        if (terrain == null)
-            return;
-        if (alphaIdx == 0)
-            terrain.getMaterial().setTexture("AlphaMap", tex);
-        else
-            terrain.getMaterial().setTexture("AlphaMap_"+alphaIdx, tex);
-    }*/
 
     /**
      * Set the diffuse texture at the specified layer.
@@ -760,21 +755,12 @@ public class TerrainEditorController {
 
         parent.attachChild(terrain);
 
-//        doCreateAlphaSaveDataObject();
-
         setNeedsSave(true);
 
         return terrain;
     }
 
-    public void saveAlphaImages(final Terrain terrain) {
-        SceneApplication.getApplication().enqueue(new Callable<Object>() {
-            public Object call() throws Exception {
-                doSaveAlphaImages(terrain);
-                return null;
-            }
-        });
-    }
+    
 
     /**
      * Save the terrain's alpha maps to disk, in the Textures/terrain-alpha/ directory
@@ -1195,6 +1181,110 @@ public class TerrainEditorController {
         setNeedsSave(true);
     }
 
+    /**
+     * Level the terrain to the desired height.
+     * It will pull down or raise terrain towards the desired height, still
+     * using the radius of the tool and the weight. There are some slight rounding
+     * errors that are coorected with float epsilon testing.
+     * @param markerLocation
+     * @param heightToolRadius
+     * @param heightAmount
+     */
+    protected void doLevelTerrain(Vector3f worldLoc, float radius, float heightWeight) {
+        if (levelTerrainDesiredHeight == null)
+            return;
+
+        float desiredHeight = levelTerrainDesiredHeight.y;
+
+        Terrain terrain = (Terrain) getTerrain(null);
+        if (terrain == null)
+            return;
+
+        setNeedsSave(true);
+
+        int radiusStepsX = (int)(radius / ((Node)terrain).getLocalScale().x);
+        int radiusStepsZ = (int)(radius / ((Node)terrain).getLocalScale().z);
+
+        float xStepAmount = ((Node)terrain).getLocalScale().x;
+        float zStepAmount = ((Node)terrain).getLocalScale().z;
+
+        List<Vector2f> locs = new ArrayList<Vector2f>();
+        List<Float> heights = new ArrayList<Float>();
+
+        for (int z=-radiusStepsZ; z<radiusStepsZ; z++) {
+            for (int x=-radiusStepsZ; x<radiusStepsX; x++) {
+
+                float locX = worldLoc.x + (x*xStepAmount);
+                float locZ = worldLoc.z + (z*zStepAmount);
+                
+                // see if it is in the radius of the tool
+                if (isInRadius(locX-worldLoc.x,locZ-worldLoc.z,radius)) {
+
+                    Vector2f terrainLoc = new Vector2f(locX, locZ);
+                    // adjust height based on radius of the tool
+                    float terrainHeightAtLoc = terrain.getHeightmapHeight(terrainLoc)*terrain.getSpatial().getWorldScale().y;
+                    float radiusWeight = calculateRadiusPercent(radius, locX-worldLoc.x, locZ-worldLoc.z);
+
+                    float epsilon = 0.1f*heightWeight; // rounding error for snapping
+                    
+                    float adj = 0;
+                    if (terrainHeightAtLoc < desiredHeight)
+                        adj = 1;
+                    else if (terrainHeightAtLoc > desiredHeight)
+                        adj = -1;
+                            
+                    adj *= radiusWeight * heightWeight;
+
+                    // test if adjusting too far and then cap it
+                    if (adj > 0 && floatGreaterThan((terrainHeightAtLoc + adj), desiredHeight, epsilon))
+                        adj = desiredHeight - terrainHeightAtLoc;
+                    else if (adj < 0 && floatLessThan((terrainHeightAtLoc + adj), desiredHeight, epsilon))
+                        adj = terrainHeightAtLoc - desiredHeight;
+  
+                    if (!floatEquals(adj, 0, 0.001f)) {
+                        locs.add(terrainLoc);
+                        heights.add(adj);
+                    }
+                    
+                }
+            }
+        }
+        // do the actual height adjustment
+        terrain.adjustHeight(locs, heights);
+        
+        ((Node)terrain).updateModelBound(); // or else we won't collide with it where we just edited
+
+    }
+
+    private int compareFloat(float a, float b, float epsilon) {
+        if (floatEquals(a, b, epsilon))
+            return 0;
+        else if (floatLessThan(a, b, epsilon))
+            return -1;
+        else
+            return 1;
+    }
+
+    private boolean floatEquals(float a, float b, float epsilon) {
+        return a == b ? true : Math.abs(a - b) < epsilon;
+    }
+
+    private boolean floatLessThan(float a, float b, float epsilon) {
+        return b - a > epsilon;
+    }
+
+    private boolean floatGreaterThan(float a, float b, float epsilon) {
+        return a - b > epsilon;
+    }
+
+    protected void doSetLevelTerrainDesiredHeight(Vector3f point) {
+        this.levelTerrainDesiredHeight = point;
+    }
+
+    public Vector3f doGetLevelTerrainDesiredHeight() {
+        return levelTerrainDesiredHeight;
+    }
+
 
 
 
diff --git a/sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/TerrainEditorTopComponent.form b/sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/TerrainEditorTopComponent.form
index 59c555ca7..da18ec695 100644
--- a/sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/TerrainEditorTopComponent.form
+++ b/sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/TerrainEditorTopComponent.form
@@ -536,6 +536,22 @@
                 <Property name="enabled" type="boolean" value="false"/>
               </Properties>
             </Component>
+            <Component class="javax.swing.JToggleButton" name="levelTerrainButton">
+              <Properties>
+                <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+                  <Image iconType="3" name="/com/jme3/gde/terraineditor/icon_terrain-level.png"/>
+                </Property>
+                <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+                  <ResourceString bundle="com/jme3/gde/terraineditor/Bundle.properties" key="TerrainEditorTopComponent.levelTerrainButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                </Property>
+                <Property name="focusable" type="boolean" value="false"/>
+                <Property name="horizontalTextPosition" type="int" value="0"/>
+                <Property name="verticalTextPosition" type="int" value="3"/>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="levelTerrainButtonActionPerformed"/>
+              </Events>
+            </Component>
             <Component class="javax.swing.JToolBar$Separator" name="jSeparator2">
             </Component>
             <Component class="javax.swing.JToggleButton" name="paintButton">
diff --git a/sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/TerrainEditorTopComponent.java b/sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/TerrainEditorTopComponent.java
index 6a30eb3d0..744f1d505 100644
--- a/sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/TerrainEditorTopComponent.java
+++ b/sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/TerrainEditorTopComponent.java
@@ -179,9 +179,13 @@ public final class TerrainEditorTopComponent extends TopComponent implements Sce
 
     private void setHintText(TerrainEditButton terrainEditButton) {
         if (TerrainEditButton.none.equals(terrainEditButton) )
-            hintTextArea.setText("");
+            hintTextArea.setText(org.openide.util.NbBundle.getMessage(TerrainEditorTopComponent.class, "TerrainEditorTopComponent.toolHint.none"));
+        else if (TerrainEditButton.levelTerrain.equals(terrainEditButton) )
+            hintTextArea.setText(org.openide.util.NbBundle.getMessage(TerrainEditorTopComponent.class, "TerrainEditorTopComponent.toolHint.level"));
+        else if (TerrainEditButton.smoothTerrain.equals(terrainEditButton) )
+            hintTextArea.setText(org.openide.util.NbBundle.getMessage(TerrainEditorTopComponent.class, "TerrainEditorTopComponent.toolHint.smooth"));
         else
-            hintTextArea.setText("Switch between camera and tool controls by holding down SHIFT");
+            hintTextArea.setText(org.openide.util.NbBundle.getMessage(TerrainEditorTopComponent.class, "TerrainEditorTopComponent.toolHint.default"));
     }
 
 
@@ -222,6 +226,7 @@ public final class TerrainEditorTopComponent extends TopComponent implements Sce
         lowerTerrainButton = new javax.swing.JToggleButton();
         smoothTerrainButton = new javax.swing.JToggleButton();
         roughTerrainButton = new javax.swing.JToggleButton();
+        levelTerrainButton = new javax.swing.JToggleButton();
         jSeparator2 = new javax.swing.JToolBar.Separator();
         paintButton = new javax.swing.JToggleButton();
         eraseButton = new javax.swing.JToggleButton();
@@ -247,11 +252,11 @@ public final class TerrainEditorTopComponent extends TopComponent implements Sce
         hintPanel.setLayout(hintPanelLayout);
         hintPanelLayout.setHorizontalGroup(
             hintPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 189, Short.MAX_VALUE)
+            .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 283, Short.MAX_VALUE)
         );
         hintPanelLayout.setVerticalGroup(
             hintPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 131, Short.MAX_VALUE)
+            .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 151, Short.MAX_VALUE)
         );
 
         toolSettingsPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(org.openide.util.NbBundle.getMessage(TerrainEditorTopComponent.class, "TerrainEditorTopComponent.toolSettingsPanel.border.title"))); // NOI18N
@@ -306,7 +311,7 @@ public final class TerrainEditorTopComponent extends TopComponent implements Sce
                 .addGroup(toolSettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addComponent(heightLabel)
                     .addComponent(heightSlider, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addContainerGap(56, Short.MAX_VALUE))
+                .addContainerGap(76, Short.MAX_VALUE))
         );
 
         paintingPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(org.openide.util.NbBundle.getMessage(TerrainEditorTopComponent.class, "TerrainEditorTopComponent.paintingPanel.border.title"))); // NOI18N
@@ -357,7 +362,7 @@ public final class TerrainEditorTopComponent extends TopComponent implements Sce
             .addGroup(paintingPanelLayout.createSequentialGroup()
                 .addGroup(paintingPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, paintingPanelLayout.createSequentialGroup()
-                        .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 277, Short.MAX_VALUE)
+                        .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 425, Short.MAX_VALUE)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                         .addGroup(paintingPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
                             .addComponent(removeTextureButton, 0, 0, Short.MAX_VALUE)
@@ -366,7 +371,7 @@ public final class TerrainEditorTopComponent extends TopComponent implements Sce
                         .addComponent(remainingTexTitleLabel)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                         .addComponent(remainingTexturesLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 24, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 78, Short.MAX_VALUE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 228, Short.MAX_VALUE)
                         .addComponent(triPlanarCheckBox)))
                 .addContainerGap())
         );
@@ -378,7 +383,7 @@ public final class TerrainEditorTopComponent extends TopComponent implements Sce
                         .addComponent(addTextureButton)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addComponent(removeTextureButton))
-                    .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 106, Short.MAX_VALUE))
+                    .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 126, Short.MAX_VALUE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(paintingPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(remainingTexTitleLabel)
@@ -419,7 +424,7 @@ public final class TerrainEditorTopComponent extends TopComponent implements Sce
                 .addComponent(genEntropiesButton)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(jButton1)
-                .addContainerGap(79, Short.MAX_VALUE))
+                .addContainerGap(99, Short.MAX_VALUE))
         );
 
         jToolBar1.setFloatable(false);
@@ -475,6 +480,18 @@ public final class TerrainEditorTopComponent extends TopComponent implements Sce
         roughTerrainButton.setActionCommand(org.openide.util.NbBundle.getMessage(TerrainEditorTopComponent.class, "TerrainEditorTopComponent.roughTerrainButton.actionCommand")); // NOI18N
         roughTerrainButton.setEnabled(false);
         jToolBar1.add(roughTerrainButton);
+
+        levelTerrainButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/jme3/gde/terraineditor/icon_terrain-level.png"))); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(levelTerrainButton, org.openide.util.NbBundle.getMessage(TerrainEditorTopComponent.class, "TerrainEditorTopComponent.levelTerrainButton.text")); // NOI18N
+        levelTerrainButton.setFocusable(false);
+        levelTerrainButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+        levelTerrainButton.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
+        levelTerrainButton.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                levelTerrainButtonActionPerformed(evt);
+            }
+        });
+        jToolBar1.add(levelTerrainButton);
         jToolBar1.add(jSeparator2);
 
         terrainModButtonGroup.add(paintButton);
@@ -517,7 +534,7 @@ public final class TerrainEditorTopComponent extends TopComponent implements Sce
                 .addComponent(terrainOpsPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(hintPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
-            .addComponent(jToolBar1, javax.swing.GroupLayout.DEFAULT_SIZE, 1019, Short.MAX_VALUE)
+            .addComponent(jToolBar1, javax.swing.GroupLayout.DEFAULT_SIZE, 1261, Short.MAX_VALUE)
         );
         jPanel1Layout.setVerticalGroup(
             jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -645,6 +662,16 @@ public final class TerrainEditorTopComponent extends TopComponent implements Sce
         addSpatial("Skybox");
     }//GEN-LAST:event_jButton1ActionPerformed
 
+    private void levelTerrainButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_levelTerrainButtonActionPerformed
+        if (levelTerrainButton.isSelected()) {
+            toolController.setTerrainEditButtonState(TerrainEditButton.levelTerrain);
+            setHintText(TerrainEditButton.levelTerrain);
+        } else {
+            toolController.setTerrainEditButtonState(TerrainEditButton.none);
+            setHintText(TerrainEditButton.none);
+        }
+    }//GEN-LAST:event_levelTerrainButtonActionPerformed
+
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JButton addTextureButton;
     private javax.swing.JButton createTerrainButton;
@@ -661,6 +688,7 @@ public final class TerrainEditorTopComponent extends TopComponent implements Sce
     private javax.swing.JToolBar.Separator jSeparator1;
     private javax.swing.JToolBar.Separator jSeparator2;
     private javax.swing.JToolBar jToolBar1;
+    private javax.swing.JToggleButton levelTerrainButton;
     private javax.swing.JToggleButton lowerTerrainButton;
     private javax.swing.JToggleButton paintButton;
     private javax.swing.JPanel paintingPanel;
@@ -997,6 +1025,7 @@ public final class TerrainEditorTopComponent extends TopComponent implements Sce
             camController.setToolController(toolController);
             camController.setEditorController(editorController);
             toolController.setEditorController(editorController);
+            toolController.setCameraController(camController);
             editorController.setToolController(toolController);
 
             toolController.setHeightToolRadius(radiusSlider.getValue());
diff --git a/sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/TerrainToolController.java b/sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/TerrainToolController.java
index 2c45bbeb6..fc5a66228 100644
--- a/sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/TerrainToolController.java
+++ b/sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/TerrainToolController.java
@@ -63,13 +63,22 @@ public class TerrainToolController extends SceneToolController {
     private JmeSpatial jmeRootNode;
     private TerrainEditButton currentEditButtonState = TerrainEditButton.none;
     private Geometry marker;
+    private Geometry markerSmall;
     private TerrainEditorController editorController;
+    private TerrainCameraController cameraController;
     private float heightToolRadius;
-    private float heightToolHeight;
     private float heightAmount;
+    private float levelAmount;
     private float paintAmount;
     private int selectedTextureIndex = -1;
 
+    private final ColorRGBA terrainHeightColor = ColorRGBA.Green;
+    private final ColorRGBA terrainPaintColor = ColorRGBA.Yellow;
+    private final ColorRGBA terrainEraseColor = ColorRGBA.Cyan;
+    private final ColorRGBA terrainSmoothColor = ColorRGBA.Brown;
+    private final ColorRGBA terrainLevelColor = ColorRGBA.Orange;
+    private final ColorRGBA terrainLevelMarkColor = ColorRGBA.Red;
+
     public TerrainToolController(Node toolsNode, AssetManager manager, JmeNode rootNode) {
         super(toolsNode, manager);
         this.jmeRootNode = rootNode;
@@ -79,12 +88,16 @@ public class TerrainToolController extends SceneToolController {
         this.editorController = editorController;
     }
 
+    public void setCameraController(TerrainCameraController cameraController) {
+        this.cameraController = cameraController;
+    }
+
     /**
      * assumes [0,200]
      */
     public void setHeightToolHeight(float heightToolHeight) {
-        this.heightToolHeight = heightToolHeight;
         this.heightAmount = heightToolHeight/100f;
+        this.levelAmount = heightToolHeight/200f;
         this.paintAmount = heightToolHeight/200f;
     }
 
@@ -107,9 +120,18 @@ public class TerrainToolController extends SceneToolController {
         marker.setMesh(m);
         Material mat = new Material(manager, "Common/MatDefs/Misc/Unshaded.j3md");
         mat.getAdditionalRenderState().setWireframe(true);
-        mat.setColor("Color", ColorRGBA.Green);
+        mat.setColor("Color", ColorRGBA.LightGray);
         marker.setMaterial(mat);
         marker.setLocalTranslation(0,0,0);
+
+        markerSmall = new Geometry("edit marker");
+        Mesh m2 = new Sphere(8, 8, 0.5f);
+        markerSmall.setMesh(m2);
+        Material mat2 = new Material(manager, "Common/MatDefs/Misc/Unshaded.j3md");
+        mat2.getAdditionalRenderState().setWireframe(false);
+        mat2.setColor("Color", ColorRGBA.Red);
+        markerSmall.setMaterial(mat2);
+        markerSmall.setLocalTranslation(0,0,0);
     }
 
     protected void setMarkerRadius(float radius) {
@@ -121,16 +143,18 @@ public class TerrainToolController extends SceneToolController {
     }
 
     public void setTerrainEditButtonState(final TerrainEditButton state) {
-
+        Logger.getLogger(this.getClass().getName()).info("Edit button state set: "+state);
         currentEditButtonState = state;
         if (state == TerrainEditButton.none) {
             hideEditTool();
         } else if (state == TerrainEditButton.raiseTerrain || state == TerrainEditButton.lowerTerrain) {
             showEditTool(state);
-            Logger.getLogger(TerrainEditorTopComponent.class.getName()).info("TERRAIN HEIGHT state");
+        } else if (state == TerrainEditButton.levelTerrain) {
+            showEditTool(state);
+        } else if (state == TerrainEditButton.smoothTerrain) {
+            showEditTool(state);
         } else if (state == TerrainEditButton.paintTerrain || state == TerrainEditButton.eraseTerrain) {
             showEditTool(state);
-            Logger.getLogger(TerrainEditorTopComponent.class.getName()).info("PAINT TERRAIN state");
         }
     }
 
@@ -147,6 +171,8 @@ public class TerrainToolController extends SceneToolController {
 
     private void doHideEditTool() {
         marker.removeFromParent();
+        markerSmall.removeFromParent();
+        editorController.doSetLevelTerrainDesiredHeight(null);
     }
 
     public void showEditTool(final TerrainEditButton terrainEditButton) {
@@ -160,12 +186,28 @@ public class TerrainToolController extends SceneToolController {
         
     }
 
-    private void doShowEditTool(TerrainEditButton terrainEditButton) {
-        //TODO show different tool marker depending on terrainEditButton type
+    /**
+     * show different tool marker depending on terrainEditButton type
+     * @param state
+     */
+    private void doShowEditTool(TerrainEditButton state) {
         
         toolsNode.attachChild(marker);
+        markerSmall.removeFromParent(); // reset, turn it off
+        editorController.doSetLevelTerrainDesiredHeight(null); // disable the level marker height
 
-        
+        if (state == TerrainEditButton.raiseTerrain || state == TerrainEditButton.lowerTerrain) {
+            marker.getMaterial().setColor("Color", terrainHeightColor);
+        } else if (state == TerrainEditButton.paintTerrain) {
+            marker.getMaterial().setColor("Color", terrainPaintColor);
+        } else if (state == TerrainEditButton.eraseTerrain) {
+            marker.getMaterial().setColor("Color", terrainEraseColor);
+        } else if (state == TerrainEditButton.levelTerrain) {
+            toolsNode.attachChild(markerSmall);
+            marker.getMaterial().setColor("Color", terrainLevelColor);
+        } else if (state == TerrainEditButton.smoothTerrain) {
+            marker.getMaterial().setColor("Color", terrainSmoothColor);
+        }
     }
 
     public void setEditToolSize(final float size) {
@@ -203,25 +245,48 @@ public class TerrainToolController extends SceneToolController {
     }
 
     /**
+     * Primary mouse button hit.
      * raise/lower/paint the terrain
      */
     public void doTerrainEditToolActivated() {
 
         if (TerrainEditButton.raiseTerrain == getCurrentEditButtonState() ) {
             editorController.doModifyTerrainHeight(getMarkerLocation(), heightToolRadius, heightAmount);
-            Logger.getLogger(TerrainEditorTopComponent.class.getName()).info("terrain raise height");
         }
         else if (TerrainEditButton.lowerTerrain == getCurrentEditButtonState() ) {
             editorController.doModifyTerrainHeight(getMarkerLocation(), heightToolRadius, -heightAmount);
-            Logger.getLogger(TerrainEditorTopComponent.class.getName()).info("terrain lower height");
+        }
+        else if (TerrainEditButton.smoothTerrain == getCurrentEditButtonState() ) {
+
+        }
+        else if (TerrainEditButton.levelTerrain == getCurrentEditButtonState() ) {
+            if (editorController.doGetLevelTerrainDesiredHeight() == null) {
+                Vector3f point = cameraController.getTerrainCollisionPoint();
+                if (point != null)
+                     editorController.doSetLevelTerrainDesiredHeight(point);
+            }
+            editorController.doLevelTerrain(getMarkerLocation(), heightToolRadius, levelAmount);
         }
         else if(TerrainEditButton.paintTerrain == getCurrentEditButtonState()) {
             editorController.doPaintTexture(selectedTextureIndex, getMarkerLocation(), heightToolRadius, paintAmount);
-            Logger.getLogger(TerrainEditorTopComponent.class.getName()).info("terrain paint");
         }
         else if (TerrainEditButton.eraseTerrain == getCurrentEditButtonState() ) {
             editorController.doPaintTexture(selectedTextureIndex, getMarkerLocation(), heightToolRadius, -paintAmount);
-            Logger.getLogger(TerrainEditorTopComponent.class.getName()).info("terrain erase");
+        }
+    }
+
+    /**
+     * Alternate mouse button hit.
+     */
+    public void doTerrainEditToolAlternateActivated() {
+        Logger.getLogger(this.getClass().getName()).info("Alternate tool activated ");
+        if (TerrainEditButton.levelTerrain == getCurrentEditButtonState() ) {
+            
+            Vector3f point = cameraController.getTerrainCollisionPoint();
+            if (point != null) {
+                editorController.doSetLevelTerrainDesiredHeight(point);
+                markerSmall.setLocalTranslation(point);
+            }
         }
     }
 }
diff --git a/sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/icon_terrain-level.png b/sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/icon_terrain-level.png
new file mode 100644
index 0000000000000000000000000000000000000000..b106e08f3eff5c0d4f3e81b167bbd424b7718d8e
GIT binary patch
literal 2971
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
RCsqIe002ovPDHLkV1jUofZG57

literal 0
HcmV?d00001