Rewind all.

Normand Briere

2019-06-21 15123b19e7bc8da2869429b07f0fbaa0598e945e

 GroupEditor.java
..
..
@@ -154,11 +154,12 @@
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
+                
158
+//		undoItem = menu.add(new MenuItem("Undo"));
159
+//		undoItem.addActionListener(this);
160
+//		redoItem = menu.add(new MenuItem("Redo"));
161
+//		redoItem.addActionListener(this);
162
+//		menu.add("-");
162
163
 		duplicateItem = menu.add(new MenuItem("Duplicate"));
163
164
 		duplicateItem.addActionListener(this);
164
165
 		cloneItem = menu.add(new MenuItem("Clone"));
..
..
@@ -202,7 +203,7 @@
202
203
         //zBufferItem.addActionListener(this);
203
204
         //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
204
205
         //normalLensItem.addActionListener(this);
205
-        cameraMenu.add(revertCameraItem = new MenuItem("Restore Camera"));
206
+        cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
206
207
         revertCameraItem.addActionListener(this);
207
208
         
208
209
         cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
..
..
@@ -266,7 +267,7 @@
266
267
 //		animationItem.addItemListener(this);
267
268
 //                    animationItem.setState(CameraPane.ANIMATION);
268
269
         cameraMenu.add("-");
269
-        cameraMenu.add(editCameraItem = new MenuItem("Save Camera"));
270
+        cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
270
271
         editCameraItem.addActionListener(this);
271
272
         
272
273
         if (Globals.ADVANCED)
..
..
@@ -469,6 +470,14 @@
469
470
 		markleavesItem.addActionListener(this);
470
471
 		unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
471
472
 		unmarkleavesItem.addActionListener(this);
473
+		rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
474
+		rewindleavesItem.addActionListener(this);
475
+		unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
476
+		unrewindleavesItem.addActionListener(this);
477
+		randomleavesItem = menu.add(new MenuItem("Random Leaves"));
478
+		randomleavesItem.addActionListener(this);
479
+		unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
480
+		unrandomleavesItem.addActionListener(this);
472
481
 		menu.add("-");
473
482
 		flipVItem = menu.add(new MenuItem("Flip V"));
474
483
 		flipVItem.addActionListener(this);
..
..
@@ -555,6 +564,18 @@
555
564
         oe.buttonGroup.add(dummyButton);
556
565
          */
557
566
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
567
+                
568
+		oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569
+                undoButton.setToolTipText("Undo changes");
570
+		undoButton.addActionListener(this);
571
+                
572
+		oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
573
+                redoButton.setToolTipText("Redo changes");
574
+		redoButton.addActionListener(this);
575
+                
576
+		oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577
+                saveButton.setToolTipText("Save changes");
578
+		saveButton.addActionListener(this);
558
579
                 
559
580
                 oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
560
581
                 liveCB.setToolTipText("Enable animation");
..
..
@@ -858,6 +879,7 @@
858
879
             } else if(e.getSource() == liveCB)
859
880
             {
860
881
                 cameraView.ToggleLive();
882
+                refreshContents(false);
861
883
             }
862
884
             else if(e.getSource() == supportCB)
863
885
             {
..
..
@@ -1265,7 +1287,7 @@
1265
1287
 		memoryItem.addActionListener(this);
1266
1288
 		menu.add(analyzeItem = new MenuItem("Analyze"));
1267
1289
 		analyzeItem.addActionListener(this);
1268
-		menu.add(dumpItem = new MenuItem("Dump"));
1290
+		menu.add(dumpItem = new MenuItem("Print"));
1269
1291
 		dumpItem.addActionListener(this);
1270
1292
 //		menu.add(pathItem = new MenuItem("From-to path"));
1271
1293
 //		pathItem.addActionListener(this);
..
..
@@ -1956,6 +1978,18 @@
1956
1978
 		{
1957
1979
                     DumpObject();
1958
1980
 		} else
1981
+		if (source == undoButton)
1982
+		{
1983
+			Undo();
1984
+		} else
1985
+		if (source == redoButton)
1986
+		{
1987
+			Redo();
1988
+		} else
1989
+		if (source == saveButton)
1990
+		{
1991
+			Save();
1992
+		} else
1959
1993
 		if (source == oneStepButton)
1960
1994
 		{
1961
1995
                     Globals.ONESTEP = true;
..
..
@@ -2517,7 +2551,7 @@
2517
2551
 		} else
2518
2552
 		if (source == genNormalsMESHItem)
2519
2553
                 {
2520
-			GenNormals(true); // TODO
2554
+			GenNormalsMESH();
2521
2555
 		} else
2522
2556
 		if (source == genNormalsORGANItem)
2523
2557
                 {
..
..
@@ -2582,6 +2616,22 @@
2582
2616
 		if (source == unmarkleavesItem)
2583
2617
                 {
2584
2618
 			MarkLeaves(false);
2619
+		} else
2620
+		if (source == rewindleavesItem)
2621
+                {
2622
+			RewindLeaves(true);
2623
+		} else
2624
+		if (source == unrewindleavesItem)
2625
+                {
2626
+			RewindLeaves(false);
2627
+		} else
2628
+		if (source == randomleavesItem)
2629
+                {
2630
+			RandomLeaves(true);
2631
+		} else
2632
+		if (source == unrandomleavesItem)
2633
+                {
2634
+			RandomLeaves(false);
2585
2635
 		} else
2586
2636
 		if (source == flipVItem)
2587
2637
                 {
..
..
@@ -3128,7 +3178,8 @@
3128
3178
                         sideView.object = group;
3129
3179
                     }
3130
3180
                     
3131
-// fix "+" issue                    group.editWindow = this;
3181
+// fix "+" issue
3182
+                    group.editWindow = this;
3132
3183
                     
3133
3184
                     /*
3134
3185
                     currentLayout = radio.layout;
..
..
@@ -3403,7 +3454,8 @@
3403
3454
                     
3404
3455
                     int size = obj.MemorySize();
3405
3456
                     
3406
-                    System.err.println((size/1024) + " KB is the size of " + obj);
3457
+                    //System.err.println((size/1024) + " KB is the size of " + obj);
3458
+                    System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3407
3459
                 }
3408
3460
             }
3409
3461
             catch (Exception e)
..
..
@@ -3484,6 +3536,13 @@
3484
3536
 	void GenNormals(boolean crease)
3485
3537
 	{
3486
3538
 		group.GenNormalsS(crease);
3539
+		
3540
+		refreshContents();
3541
+	}
3542
+	
3543
+	void GenNormalsMESH()
3544
+	{
3545
+		group.GenNormalsMeshS();
3487
3546
 		
3488
3547
 		refreshContents();
3489
3548
 	}
..
..
@@ -4111,6 +4170,18 @@
4111
4170
 		refreshContents();
4112
4171
 	}
4113
4172
 	
4173
+	void RewindLeaves(boolean hide)
4174
+	{
4175
+		group.selection.RewindLeaves(hide);
4176
+		refreshContents();
4177
+	}
4178
+	
4179
+	void RandomLeaves(boolean hide)
4180
+	{
4181
+		group.selection.RandomLeaves(hide);
4182
+		refreshContents();
4183
+	}
4184
+	
4114
4185
 	void SetTexRes(int tr)
4115
4186
 	{
4116
4187
 		group.selection.SetTexRes(tr);
..
..
@@ -4286,7 +4357,6 @@
4286
4357
 			//case 702: // Event.LIST_DESELECT
4287
4358
 			group.deselectAll();
4288
4359
 			TreePath tps[] = objEditor.jTree.getSelectionPaths();
4289
-			objEditor.ClearInfo(); // .GetMaterial());
4290
4360
 			if (tps != null)
4291
4361
 			{
4292
4362
 				for (int i=0; i < tps.length; i++)
..
..
@@ -4295,10 +4365,8 @@
4295
4365
 					
4296
4366
 					//if (child.parent != null)
4297
4367
 						//child.parent.addSelectee(child);
4368
+                    objEditor.SetMaterial(child);
4298
4369
 					group.addSelectee(child);
4299
-					objEditor.SetMaterial(child); // .GetMaterial());
4300
-					objEditor.AddInfo(child, this, true); // .GetMaterial());
4301
-            System.err.println("info : " + child.GetPath());
4302
4370
 				}
4303
4371
 			}
4304
4372
 //			else
..
..
@@ -4308,8 +4376,6 @@
4308
4376
 //            System.err.println("info : " + group.GetPath());
4309
4377
 //                        }
4310
4378
 			
4311
-                        objEditor.SetText(); // jan 2014
4312
-                        
4313
4379
 			if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4314
4380
 				CameraPane.flash = true;
4315
4381
                         
..
..
@@ -4333,6 +4399,26 @@
4333
4399
 		
4334
4400
 		freezemodel = false;
4335
4401
 	}
4402
+        
4403
+        void refreshContents(boolean cp)
4404
+        {
4405
+            if (!Globals.MOUSEDRAGGED)
4406
+            {
4407
+                objEditor.ClearInfo(); // .GetMaterial());
4408
+
4409
+                for (int i=0; i < group.selection.Size(); i++)
4410
+                {
4411
+                    Object3D child = (Object3D) group.selection.get(i);
4412
+
4413
+                    objEditor.AddInfo(child, this, true);
4414
+    System.err.println("info : " + child.GetPath());
4415
+                }
4416
+
4417
+                objEditor.SetText(); // jan 2014
4418
+            }
4419
+                        
4420
+            super.refreshContents(cp);
4421
+        }
4336
4422
 	
4337
4423
 	void linkSomething(Object3D thing)
4338
4424
 	{
..
..
@@ -4404,6 +4490,7 @@
4404
4490
 	{
4405
4491
 		if (group.selection.isEmpty())
4406
4492
 			return;
4493
+                
4407
4494
 		Grafreed.clipboardIsTempGroup = false;
4408
4495
 		Composite tGroup = null;
4409
4496
 		if (group.selection.size() > 0) // 1)
..
..
@@ -4414,6 +4501,7 @@
4414
4501
                 
4415
4502
 		if (cut)
4416
4503
 		{
4504
+                    Save();
4417
4505
 			//int indices[] = jList.getSelectedIndices();
4418
4506
 			//for (int i = indices.length - 1; i >= 0; i--)
4419
4507
 			//jList.remove(indices[i]);
..
..
@@ -4503,8 +4591,10 @@
4503
4591
 			}
4504
4592
 			
4505
4593
 		}
4594
+                
4506
4595
 		if (Grafreed.clipboardIsTempGroup)
4507
4596
 			Grafreed.clipboard = tGroup;
4597
+                
4508
4598
 		if (cut)
4509
4599
                 {
4510
4600
                     ResetModel();
..
..
@@ -5129,6 +5219,9 @@
5129
5219
 	cButton clearpanelButton;
5130
5220
 	cButton unselectButton;
5131
5221
 	
5222
+	cButton saveButton;
5223
+	cButton undoButton;
5224
+	cButton redoButton;
5132
5225
 	cButton oneStepButton;
5133
5226
         
5134
5227
 	cButton screenfitButton;
..
..
@@ -5226,6 +5319,10 @@
5226
5319
 	private MenuItem showleavesItem;
5227
5320
 	private MenuItem markleavesItem;
5228
5321
 	private MenuItem unmarkleavesItem;
5322
+	private MenuItem rewindleavesItem;
5323
+	private MenuItem unrewindleavesItem;
5324
+	private MenuItem randomleavesItem;
5325
+	private MenuItem unrandomleavesItem;
5229
5326
         
5230
5327
 	private MenuItem flipVItem;
5231
5328
 	private MenuItem unflipVItem;