Undo/redo

Normand Briere

2019-06-09 79d0f9a45d36656051a77a7b0837aa0318f81ee5

 GroupEditor.java
..
..
@@ -154,6 +154,11 @@
154
154
 		oe.menuBar.add(menu = new Menu("Edit"));
155
155
 		//editItem = menu.add(new MenuItem("Edit"));
156
156
 		//editItem.addActionListener(this);
157
+		undoItem = menu.add(new MenuItem("Undo"));
158
+		undoItem.addActionListener(this);
159
+		redoItem = menu.add(new MenuItem("Redo"));
160
+		redoItem.addActionListener(this);
161
+		menu.add("-");
157
162
 		duplicateItem = menu.add(new MenuItem("Duplicate"));
158
163
 		duplicateItem.addActionListener(this);
159
164
 		cloneItem = menu.add(new MenuItem("Clone"));
..
..
@@ -197,7 +202,7 @@
197
202
         //zBufferItem.addActionListener(this);
198
203
         //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
199
204
         //normalLensItem.addActionListener(this);
200
-        cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
205
+        cameraMenu.add(revertCameraItem = new MenuItem("Restore Camera"));
201
206
         revertCameraItem.addActionListener(this);
202
207
         
203
208
         cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
..
..
@@ -261,7 +266,7 @@
261
266
 //		animationItem.addItemListener(this);
262
267
 //                    animationItem.setState(CameraPane.ANIMATION);
263
268
         cameraMenu.add("-");
264
-        cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
269
+        cameraMenu.add(editCameraItem = new MenuItem("Save Camera"));
265
270
         editCameraItem.addActionListener(this);
266
271
         
267
272
         if (Globals.ADVANCED)
..
..
@@ -2004,6 +2009,14 @@
2004
2009
 		if (source == cutItem || source == clearButton)
2005
2010
 		{
2006
2011
 			loadClipboard(true);
2012
+		} else
2013
+		if (source == undoItem)
2014
+		{
2015
+			Undo();
2016
+		} else
2017
+		if (source == redoItem)
2018
+		{
2019
+			Redo();
2007
2020
 		} else
2008
2021
 		if (source == duplicateItem)
2009
2022
 		{
..
..
@@ -4297,14 +4310,19 @@
4297
4310
 			
4298
4311
                         objEditor.SetText(); // jan 2014
4299
4312
                         
4300
-			if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
4313
+                        Object3D object = (Object3D) tps[0].getLastPathComponent();
4314
+                        
4315
+			if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(object instanceof Camera))
4301
4316
 				CameraPane.flash = true;
4302
4317
                         
4303
-			if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
4318
+			if (tps != null && tps.length > 0 && object instanceof Camera)
4304
4319
                             // a camera
4305
4320
                         {
4306
-                            CameraPane.camerachangeframe = 0; // don't refuse it
4307
-                            Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4321
+                            if (object != Globals.theRenderer.LightCamera())
4322
+                            {
4323
+                                CameraPane.camerachangeframe = 0; // don't refuse it
4324
+                                Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4325
+                            }
4308
4326
                          //   Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4309
4327
                          //   Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4310
4328
                         }
..
..
@@ -5145,6 +5163,8 @@
5145
5163
 	private MenuItem lookFromItem;
5146
5164
 	private MenuItem switchItem;
5147
5165
 	private MenuItem cutItem;
5166
+	private MenuItem undoItem;
5167
+	private MenuItem redoItem;
5148
5168
 	private MenuItem duplicateItem;
5149
5169
 	private MenuItem cloneItem;
5150
5170
 	private MenuItem cloneSupportItem;