Browse Source

Merge pull request #333 from Dokthar/sdk_scenecomposer

SDK scenecomposer : fix issue #332 and added line width to the cursor
normen 10 years ago
parent
commit
3ad3623084

+ 3 - 0
sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneEditTool.java

@@ -453,6 +453,9 @@ public abstract class SceneEditTool {
         Geometry arrowX = new Geometry("arrowX", new Arrow(new Vector3f(arrowSize, 0, 0)));
         Geometry arrowY = new Geometry("arrowY", new Arrow(new Vector3f(0, arrowSize, 0)));
         Geometry arrowZ = new Geometry("arrowZ", new Arrow(new Vector3f(0, 0, arrowSize)));
+        arrowX.getMesh().setLineWidth(2f);
+        arrowY.getMesh().setLineWidth(2f);
+        arrowZ.getMesh().setLineWidth(2f);   
         axis.attachChild(arrowX);
         axis.attachChild(arrowY);
         axis.attachChild(arrowZ);

+ 16 - 3
sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/tools/SelectTool.java

@@ -10,6 +10,7 @@ import com.jme3.gde.core.sceneexplorer.nodes.JmeSpatial;
 import com.jme3.gde.core.sceneviewer.SceneViewerTopComponent;
 import com.jme3.gde.scenecomposer.SceneEditTool;
 import com.jme3.math.Vector2f;
+import com.jme3.math.Vector3f;
 import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
 import com.jme3.terrain.Terrain;
@@ -33,7 +34,7 @@ import org.openide.loaders.DataObject;
  */
 public class SelectTool extends SceneEditTool {
 
-    private boolean wasDraggingR = false;
+    private boolean wasDraggingR, wasDraggingL = false;
     private boolean wasDownR = false;
 
     /**
@@ -52,13 +53,24 @@ public class SelectTool extends SceneEditTool {
      */
     @Override
     public void actionPrimary(Vector2f screenCoord, boolean pressed, final JmeNode rootNode, DataObject dataObject) {
-
+        if (!pressed){
+            if (!wasDraggingL) {
+                Vector3f result = pickWorldLocation(getCamera(), screenCoord, rootNode);
+                if (result != null) {
+                    if (toolController.isSnapToGrid()) {
+                        result.set(Math.round(result.x), result.y, Math.round(result.z));
+                    }
+                    toolController.doSetCursorLocation(result);
+                }
+            }
+            wasDraggingL = false;
+        }        
     }
 
     @Override
     public void actionSecondary(final Vector2f screenCoord, boolean pressed, final JmeNode rootNode, DataObject dataObject) {
         if (pressed) {
-            Spatial selected = toolController.getSelectedSpatial();
+            Spatial selected;// = toolController.getSelectedSpatial();
             // mouse down
 
             if (!wasDraggingR && !wasDownR) { // wasn't dragging and was not down already
@@ -137,6 +149,7 @@ public class SelectTool extends SceneEditTool {
 
     @Override
     public void draggedPrimary(Vector2f screenCoord, boolean pressed, JmeNode rootNode, DataObject currentDataObject) {
+        wasDraggingL = pressed;
     }
 
     @Override