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

SDK SceneComposer : fixed camera transformation type now works for move and scale tool, but act realy weird with rotate tool.

Browse Source
This commit is contained in:
Maselbas 2015-04-28 23:55:05 +02:00
parent a531794c66
commit 8b8425ba68
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/tools/PickManager.java
View File

@ -31,6 +31,7 @@ public class PickManager {
private Quaternion origineRotation; private Quaternion origineRotation;
private final Node plane; private final Node plane;
private Spatial spatial; private Spatial spatial;
private SceneComposerToolController.TransformationType transformationType;
protected static final Quaternion PLANE_XY = new Quaternion().fromAngleAxis(0, new Vector3f(1, 0, 0)); protected static final Quaternion PLANE_XY = new Quaternion().fromAngleAxis(0, new Vector3f(1, 0, 0));
protected static final Quaternion PLANE_YZ = new Quaternion().fromAngleAxis(-FastMath.PI / 2, new Vector3f(0, 1, 0));//YAW090 protected static final Quaternion PLANE_YZ = new Quaternion().fromAngleAxis(-FastMath.PI / 2, new Vector3f(0, 1, 0));//YAW090
@ -64,14 +65,15 @@ public class PickManager {
public void setTransformation(Quaternion planeRotation, SceneComposerToolController.TransformationType type) { public void setTransformation(Quaternion planeRotation, SceneComposerToolController.TransformationType type) {
Quaternion rot = new Quaternion(); Quaternion rot = new Quaternion();
if (type == SceneComposerToolController.TransformationType.local) { transformationType = type;
if (transformationType == SceneComposerToolController.TransformationType.local) {
rot.set(spatial.getWorldRotation()); rot.set(spatial.getWorldRotation());
rot.multLocal(planeRotation); rot.multLocal(planeRotation);
origineRotation = spatial.getWorldRotation().clone(); origineRotation = spatial.getWorldRotation().clone();
} else if (type == SceneComposerToolController.TransformationType.global) { } else if (transformationType == SceneComposerToolController.TransformationType.global) {
rot.set(planeRotation); rot.set(planeRotation);
origineRotation = new Quaternion(Quaternion.IDENTITY); origineRotation = new Quaternion(Quaternion.IDENTITY);
} else if (type == SceneComposerToolController.TransformationType.camera) { } else if (transformationType == SceneComposerToolController.TransformationType.camera) {
rot.set(planeRotation); rot.set(planeRotation);
origineRotation = planeRotation.clone(); origineRotation = planeRotation.clone();
} }
@ -79,6 +81,10 @@ public class PickManager {
} }
public boolean updatePick(Camera camera, Vector2f screenCoord) { public boolean updatePick(Camera camera, Vector2f screenCoord) {
if(transformationType == SceneComposerToolController.TransformationType.camera){
origineRotation = camera.getRotation();
plane.setLocalRotation(camera.getRotation());
}
finalPickLoc = SceneEditTool.pickWorldLocation(camera, screenCoord, plane, null); finalPickLoc = SceneEditTool.pickWorldLocation(camera, screenCoord, plane, null);
return finalPickLoc != null; return finalPickLoc != null;
} }