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

Merge pull request #256 from Dokthar/scenecomposer/master

Browse Source 
Fix issue #255 - scenecomposer : forcedCamera
This commit is contained in:
normen 2015-04-13 17:06:10 +02:00
commit 60ed6b7620
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/ComposerCameraController.java
View File

@ -79,26 +79,24 @@ public class ComposerCameraController extends AbstractCameraController {
@Override @Override
public void checkClick(int button, boolean pressed) { public void checkClick(int button, boolean pressed) {
if (button == 0) { if (!forceCameraControls || !pressed) { // dont call toolController while forceCam but on button release (for UndoRedo)
if (isEditButtonEnabled() && !forceCameraControls) { if (button == 0) {
toolController.doEditToolActivatedPrimary(new Vector2f(mouseX, mouseY), pressed, cam); toolController.doEditToolActivatedPrimary(new Vector2f(mouseX, mouseY), pressed, cam);
} }
} if (button == 1) {
if (button == 1) {
if (isEditButtonEnabled() && !forceCameraControls) {
toolController.doEditToolActivatedSecondary(new Vector2f(mouseX, mouseY), pressed, cam); toolController.doEditToolActivatedSecondary(new Vector2f(mouseX, mouseY), pressed, cam);
} }
} }
} }
@Override @Override
protected void checkDragged(int button, boolean pressed) { protected void checkDragged(int button, boolean pressed) {
if (button == 0) { if (!forceCameraControls || !pressed) {
toolController.doEditToolDraggedPrimary(new Vector2f(mouseX, mouseY), pressed, cam); if (button == 0) {
} else if (button == 1) { toolController.doEditToolDraggedPrimary(new Vector2f(mouseX, mouseY), pressed, cam);
toolController.doEditToolDraggedSecondary(new Vector2f(mouseX, mouseY), pressed, cam); } else if (button == 1) {
toolController.doEditToolDraggedSecondary(new Vector2f(mouseX, mouseY), pressed, cam);
}
} }
} }