SDK :

- applied changes of the core to scene composer

git-svn-id: http://jmonkeyengine.googlecode.com/svn/trunk@7930 75d07b2b-3a1a-0410-a2c5-0572b91ccdca

diff --git a/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/ComposerCameraController.java b/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/ComposerCameraController.java
index 7b27354..08afc87 100644 (file)
--- a/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/ComposerCameraController.java
+++ b/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/ComposerCameraController.java
@@ -113,55 +113,7 @@ public class ComposerCameraController extends AbstractCameraController {
     }
 
     @Override
-    public void onAnalog(String string, float f1, float f) {
-        if ("MouseAxisX".equals(string)) {
-            moved = true;
-            movedR = true;
-            if (isToolUsesCameraControls() || forceCameraControls) {
-                if (buttonDownL) {
-                    rotateCamera(Vector3f.UNIT_Y, -f1 * 2.5f);
-                }
-                if (buttonDownR) {
-                    panCamera(f1 * 2.5f, 0);
-                }
-            }
-        } else if ("MouseAxisY".equals(string)) {
-            moved = true;
-            movedR = true;
-            if (isToolUsesCameraControls() || forceCameraControls) {
-                if (buttonDownL) {
-                    rotateCamera(cam.getLeft(), -f1 * 2.5f);
-                }
-                if (buttonDownR) {
-                    panCamera(0, -f1 * 2.5f);
-                }
-            }
-        } else if ("MouseAxisX-".equals(string)) {
-            moved = true;
-            movedR = true;
-            if (isToolUsesCameraControls() || forceCameraControls) {
-                if (buttonDownL) {
-                    rotateCamera(Vector3f.UNIT_Y, f1 * 2.5f);
-                }
-                if (buttonDownR) {
-                    panCamera(-f1 * 2.5f, 0);
-                }
-            }
-        } else if ("MouseAxisY-".equals(string)) {
-            moved = true;
-            movedR = true;
-            if (isToolUsesCameraControls() || forceCameraControls) {
-                if (buttonDownL) {
-                    rotateCamera(cam.getLeft(), f1 * 2.5f);
-                }
-                if (buttonDownR) {
-                    panCamera(0, f1 * 2.5f);
-                }
-            }
-        } else if ("MouseWheel".equals(string)) {
-            zoomCamera(.1f);
-        } else if ("MouseWheel-".equals(string)) {
-            zoomCamera(-.1f);
-        }
+    public boolean useCameraControls() {
+        return isToolUsesCameraControls() || forceCameraControls;
     }
 }