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

SDK SceneComposer : added UndoRedo for the MoveShortcut

Browse Source
This commit is contained in:
Maselbas 2015-05-15 17:57:47 +02:00
parent fb44f5fb7b
commit 6ef33e4c10
1 changed files with 55 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/tools/shortcuts/MoveShortcut.java
View File

@ -6,8 +6,11 @@
package com.jme3.gde.scenecomposer.tools.shortcuts; package com.jme3.gde.scenecomposer.tools.shortcuts;
import com.jme3.asset.AssetManager; import com.jme3.asset.AssetManager;
import com.jme3.bullet.control.CharacterControl;
import com.jme3.bullet.control.RigidBodyControl;
import com.jme3.gde.core.sceneexplorer.nodes.JmeNode; import com.jme3.gde.core.sceneexplorer.nodes.JmeNode;
import com.jme3.gde.core.sceneexplorer.nodes.JmeSpatial; import com.jme3.gde.core.sceneexplorer.nodes.JmeSpatial;
import com.jme3.gde.core.undoredo.AbstractUndoableSceneEdit;
import com.jme3.gde.scenecomposer.SceneComposerToolController; import com.jme3.gde.scenecomposer.SceneComposerToolController;
import com.jme3.gde.scenecomposer.tools.PickManager; import com.jme3.gde.scenecomposer.tools.PickManager;
import com.jme3.input.KeyInput; import com.jme3.input.KeyInput;
@ -29,7 +32,6 @@ public class MoveShortcut extends ShortcutTool {
private Vector3f currentAxis; private Vector3f currentAxis;
private StringBuilder numberBuilder; private StringBuilder numberBuilder;
private Spatial spatial; private Spatial spatial;
private Vector3f finalLocation;
private PickManager pickManager; private PickManager pickManager;
private boolean pickEnabled; private boolean pickEnabled;
private Vector3f startPosition; private Vector3f startPosition;
@ -48,7 +50,7 @@ public class MoveShortcut extends ShortcutTool {
} }
private void apply() { private void apply() {
// TODO creat UNDO/REDO actionPerformed(new MoveUndo(toolController.getSelectedSpatial(), startPosition, finalPosition));
terminate(); terminate();
} }
@ -110,8 +112,8 @@ public class MoveShortcut extends ShortcutTool {
//update transformation //update transformation
float number = ShortcutManager.getNumberkey(numberBuilder); float number = ShortcutManager.getNumberkey(numberBuilder);
Vector3f translation = currentAxis.mult(number); Vector3f translation = currentAxis.mult(number);
finalLocation = startPosition.add(translation); finalPosition = startPosition.add(translation);
spatial.setLocalTranslation(finalLocation); spatial.setLocalTranslation(finalPosition);
} }
@ -171,7 +173,9 @@ public class MoveShortcut extends ShortcutTool {
@Override @Override
public void draggedPrimary(Vector2f screenCoord, boolean pressed, JmeNode rootNode, DataObject currentDataObject) { public void draggedPrimary(Vector2f screenCoord, boolean pressed, JmeNode rootNode, DataObject currentDataObject) {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. if (pressed) {
apply();
}
} }
@Override @Override
@ -181,4 +185,50 @@ public class MoveShortcut extends ShortcutTool {
} }
} }
private class MoveUndo extends AbstractUndoableSceneEdit {
private Spatial spatial;
private Vector3f before = new Vector3f(), after = new Vector3f();
MoveUndo(Spatial spatial, Vector3f before, Vector3f after) {
this.spatial = spatial;
this.before.set(before);
if (after != null) {
this.after.set(after);
}
}
@Override
public void sceneUndo() {
spatial.setLocalTranslation(before);
RigidBodyControl control = spatial.getControl(RigidBodyControl.class);
if (control != null) {
control.setPhysicsLocation(spatial.getWorldTranslation());
}
CharacterControl character = spatial.getControl(CharacterControl.class);
if (character != null) {
character.setPhysicsLocation(spatial.getWorldTranslation());
}
// toolController.selectedSpatialTransformed();
}
@Override
public void sceneRedo() {
spatial.setLocalTranslation(after);
RigidBodyControl control = spatial.getControl(RigidBodyControl.class);
if (control != null) {
control.setPhysicsLocation(spatial.getWorldTranslation());
}
CharacterControl character = spatial.getControl(CharacterControl.class);
if (character != null) {
character.setPhysicsLocation(spatial.getWorldTranslation());
}
//toolController.selectedSpatialTransformed();
}
public void setAfter(Vector3f after) {
this.after.set(after);
}
}
} }