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

SDK : MoveToll now correctly takes into account selected object's parent's world transforms.

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9594 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
rem..om 2012-07-28 15:28:10 +00:00
parent 3a706d2f42
commit 7756c21d4a
1 changed files with 43 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/tools/MoveTool.java
View File

@ -21,6 +21,7 @@ import com.jme3.scene.Geometry;
import com.jme3.scene.Node; import com.jme3.scene.Node;
import com.jme3.scene.Spatial; import com.jme3.scene.Spatial;
import com.jme3.scene.shape.Quad; import com.jme3.scene.shape.Quad;
import com.jme3.util.TempVars;
import org.openide.loaders.DataObject; import org.openide.loaders.DataObject;
/** /**
@ -35,8 +36,8 @@ import org.openide.loaders.DataObject;
public class MoveTool extends SceneEditTool { public class MoveTool extends SceneEditTool {
private Vector3f pickedPlane; private Vector3f pickedPlane;
private Vector3f startLoc; private Vector3f startLoc = new Vector3f();
private Vector3f lastLoc; private Vector3f lastLoc = new Vector3f();
private boolean wasDragging = false; private boolean wasDragging = false;
private Vector3f offset; private Vector3f offset;
private Node plane; private Node plane;
@ -113,31 +114,59 @@ public class MoveTool extends SceneEditTool {
if (toolController.getSelectedSpatial() == null) if (toolController.getSelectedSpatial() == null)
return; return;
TempVars vars = TempVars.get();
if (pickedPlane == null) { if (pickedPlane == null) {
pickedPlane = pickAxisMarker(camera, screenCoord, axisPickType); pickedPlane = pickAxisMarker(camera, screenCoord, axisPickType);
if (pickedPlane == null) if (pickedPlane == null)
return; return;
startLoc = toolController.getSelectedSpatial().getLocalTranslation().clone(); startLoc = toolController.getSelectedSpatial().getLocalTranslation().clone();
Quaternion rot = vars.quat1.set(toolController.getSelectedSpatial().getWorldRotation());
if (pickedPlane.equals(new Vector3f(1,1,0))) if (pickedPlane.equals(new Vector3f(1,1,0)))
plane.setLocalRotation(XY); plane.setLocalRotation(rot.multLocal(XY));
else if (pickedPlane.equals(new Vector3f(1,0,1))) else if (pickedPlane.equals(new Vector3f(1,0,1)))
plane.setLocalRotation(XZ); plane.setLocalRotation(rot.multLocal(XZ));
else if (pickedPlane.equals(new Vector3f(0,1,1))) else if (pickedPlane.equals(new Vector3f(0,1,1)))
plane.setLocalRotation(YZ); plane.setLocalRotation(rot.multLocal(YZ));
plane.setLocalTranslation(startLoc); plane.setLocalTranslation(startLoc);
} }
Vector3f planeHit = pickWorldLocation(camera, screenCoord, plane, null); Vector3f planeHit = pickWorldLocation(camera, screenCoord, plane, null);
if (planeHit == null) if (planeHit == null){
vars.release();
return; return;
}
Spatial selected = toolController.getSelectedSpatial();
Spatial parent = selected.getParent();
Vector3f newPos =vars.vect1;
if( parent == null ){
//we are moving the root node, move is computed in local translation
if (offset == null){
offset = planeHit.subtract(startLoc); // get the offset when we start so it doesn't jump
}
if (offset == null) newPos.set(planeHit).subtractLocal(offset);
offset = planeHit.subtract(startLoc); // get the offset when we start so it doesn't jump lastLoc.set(newPos);
selected.setLocalTranslation(newPos);
Vector3f newPos = planeHit.subtract(offset); }else{
lastLoc = newPos;
toolController.getSelectedSpatial().setLocalTranslation(newPos); //offset in world space
if (offset == null){
offset = planeHit.subtract(selected.getWorldTranslation()); // get the offset when we start so it doesn't jump
}
newPos = planeHit.subtract(offset);
//computing the inverse world transform to get the new localtranslation
newPos.subtractLocal(selected.getParent().getWorldTranslation());
newPos = selected.getParent().getWorldRotation().inverse().normalizeLocal().multLocal(newPos);
newPos.divideLocal(selected.getWorldScale());
selected.setLocalTranslation(newPos);
lastLoc.set(newPos);
}
vars.release();
RigidBodyControl control = toolController.getSelectedSpatial().getControl(RigidBodyControl.class); RigidBodyControl control = toolController.getSelectedSpatial().getControl(RigidBodyControl.class);
if (control != null) { if (control != null) {
control.setPhysicsLocation(toolController.getSelectedSpatial().getWorldTranslation()); control.setPhysicsLocation(toolController.getSelectedSpatial().getWorldTranslation());