From b8025984a0fa68d64339add394eb9acf33bf0f42 Mon Sep 17 00:00:00 2001 From: "rem..om" Date: Wed, 27 Jul 2011 17:49:55 +0000 Subject: [PATCH] SDK : - applied changes of the core to scene composer git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7930 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- .../ComposerCameraController.java | 52 +------------------ 1 file changed, 2 insertions(+), 50 deletions(-) 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 7b273542d..08afc87ab 100644 --- 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; } }