Multi-tab undo.

Normand Briere

2019-06-09 8558ae86e65457c512a26339d3660d79eee16ae6

 GroupEditor.java
..
..
@@ -74,7 +74,7 @@
74
74
 		this.copy = this.group = copy;
75
75
 		//selectees = this.group.selectees;
76
76
 		
77
-		SetupMenu2(objEditor);
77
+		SetupMenu2(this); //objEditor);
78
78
 		SetupUI2(objEditor);
79
79
 		objEditor.SetupUI(true);
80
80
 		SetupViews(objEditor);
..
..
@@ -98,14 +98,14 @@
98
98
 
99
99
     void CloneClipboard(boolean supports)
100
100
     {
101
-        assert(GrafreeD.clipboard.parent == null);
102
-        Object3D /*Composite*/ keepparent = GrafreeD.clipboard.get(0).parent;
103
-        GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
104
-        if (LA.isIdentity(GrafreeD.clipboard.toParent))
105
-            makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
101
+        assert(Grafreed.clipboard.parent == null);
102
+        Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
103
+        Grafreed.clipboard.get(0).parent = null; // Avoid copy?
104
+        if (LA.isIdentity(Grafreed.clipboard.toParent))
105
+            makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106
106
         else
107
-            makeSomething(CloneObject(GrafreeD.clipboard, false));
108
-        GrafreeD.clipboard.get(0).parent = keepparent;
107
+            makeSomething(CloneObject(Grafreed.clipboard, false));
108
+        Grafreed.clipboard.get(0).parent = keepparent;
109
109
     }
110
110
     
111
111
     static Object3D CloneObject(Object3D obj, boolean supports)
..
..
@@ -119,7 +119,7 @@
119
119
         //               obj.support = null;
120
120
         if (!supports)
121
121
             obj.SaveSupports();
122
-        Object3D clone = (Object3D)GrafreeD.clone(obj);
122
+        Object3D clone = (Object3D)Grafreed.clone(obj);
123
123
         obj.parent = parent;
124
124
         //               obj.support = support;
125
125
         //               clone.support = support; // aout 2013
..
..
@@ -148,8 +148,129 @@
148
148
         
149
149
     //JTextField nameField;
150
150
     
151
-	void SetupMenu2(ObjEditor oe)
151
+	void SetupMenu2(GroupEditor oe)
152
152
 	{
153
+		Menu menu;
154
+		oe.menuBar.add(menu = new Menu("Edit"));
155
+		//editItem = menu.add(new MenuItem("Edit"));
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("-");
162
+		duplicateItem = menu.add(new MenuItem("Duplicate"));
163
+		duplicateItem.addActionListener(this);
164
+		cloneItem = menu.add(new MenuItem("Clone"));
165
+		cloneItem.addActionListener(this);
166
+        if (Globals.ADVANCED)
167
+        {
168
+		cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
169
+		cloneSupportItem.addActionListener(this);
170
+        }
171
+		menu.add("-");
172
+		cutItem = menu.add(new MenuItem("Cut"));
173
+		cutItem.addActionListener(this);
174
+		copyItem = menu.add(new MenuItem("Copy"));
175
+		copyItem.addActionListener(this);
176
+		pasteItem = menu.add(new MenuItem("Paste"));
177
+		pasteItem.addActionListener(this);
178
+		menu.add("-");
179
+                
180
+		menu.add("-");
181
+		pasteIntoItem = menu.add(new MenuItem("Paste into"));
182
+		pasteIntoItem.addActionListener(this);
183
+		pasteLinkItem = menu.add(new MenuItem("Paste link"));
184
+		pasteLinkItem.addActionListener(this);
185
+		pasteCloneItem = menu.add(new MenuItem("Paste clone"));
186
+		pasteCloneItem.addActionListener(this);
187
+//		pasteExpandItem = menu.add(new MenuItem("Paste expand"));
188
+//		pasteExpandItem.addActionListener(this);
189
+		menu.add("-");
190
+		clearItem = menu.add(new MenuItem("Clear"));
191
+		clearItem.addActionListener(this);
192
+                
193
+        if (Globals.ADVANCED)
194
+        {
195
+                // Deletes the cameras...
196
+		clearAllItem = menu.add(new MenuItem("Clear All"));
197
+		clearAllItem.addActionListener(this);
198
+        }
199
+        
200
+        menuBar.add(cameraMenu = new Menu("View"));
201
+        //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
202
+        //zBufferItem.addActionListener(this);
203
+        //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
204
+        //normalLensItem.addActionListener(this);
205
+        cameraMenu.add(revertCameraItem = new MenuItem("Restore Camera"));
206
+        revertCameraItem.addActionListener(this);
207
+        
208
+        cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
209
+        toggleFullScreenItem.addItemListener(this);
210
+        toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
211
+        cameraMenu.add("-");
212
+        
213
+        cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
214
+        toggleTextureItem.addItemListener(this);
215
+        toggleTextureItem.setState(CameraPane.textureon);
216
+        
217
+        cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
218
+        toggleSwitchItem.addItemListener(this);
219
+        toggleSwitchItem.setState(CameraPane.SWITCH);
220
+        
221
+        cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
222
+        toggleHandleItem.addItemListener(this);
223
+        toggleHandleItem.setState(CameraPane.HANDLES);
224
+        
225
+        cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
226
+        togglePaintItem.addItemListener(this);
227
+        togglePaintItem.setState(CameraPane.PAINTMODE);
228
+        
229
+        if (Globals.ADVANCED)
230
+        {
231
+        cameraMenu.add("-");
232
+                cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
233
+                toggleLiveItem.addItemListener(this);
234
+                toggleLiveItem.setState(Globals.isLIVE());
235
+
236
+                cameraMenu.add(stepItem = new MenuItem("Step"));
237
+                stepItem.addActionListener(this);
238
+        //		cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
239
+        //		toggleDLItem.addItemListener(this);
240
+        //                toggleDLItem.setState(false);
241
+
242
+                cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
243
+                toggleRenderItem.addItemListener(this);
244
+                toggleRenderItem.setState(!CameraPane.frozen);
245
+
246
+                cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
247
+                toggleDebugItem.addItemListener(this);
248
+                toggleDebugItem.setState(CameraPane.DEBUG);
249
+
250
+                cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
251
+                toggleFrustumItem.addItemListener(this);
252
+                toggleFrustumItem.setState(CameraPane.FRUSTUM);
253
+
254
+                cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
255
+                toggleFootContactItem.addItemListener(this);
256
+                toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
257
+                
258
+                cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
259
+                toggleTimelineItem.addItemListener(this);
260
+        }
261
+        
262
+//		cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
263
+//		toggleRootItem.addItemListener(this);
264
+//                    toggleRootItem.setState(false);
265
+//		cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
266
+//		animationItem.addItemListener(this);
267
+//                    animationItem.setState(CameraPane.ANIMATION);
268
+        cameraMenu.add("-");
269
+        cameraMenu.add(editCameraItem = new MenuItem("Save Camera"));
270
+        editCameraItem.addActionListener(this);
271
+        
272
+        if (Globals.ADVANCED)
273
+        {
153
274
 		oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
154
275
 		//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
155
276
 		//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..
..
@@ -161,45 +282,17 @@
161
282
 		lookAtItem.addActionListener(this);
162
283
 		//lookFromItem.addActinoListener(this);
163
284
 		//switchItem.addActionListener(this);
164
-		Menu menu;
165
-		oe.menuBar.add(menu = new Menu("Edit"));
166
-		//editItem = menu.add(new MenuItem("Edit"));
167
-		//editItem.addActionListener(this);
168
-		duplicateItem = menu.add(new MenuItem("Duplicate"));
169
-		duplicateItem.addActionListener(this);
170
-		menu.add("-");
171
-		cloneItem = menu.add(new MenuItem("Clone"));
172
-		cloneItem.addActionListener(this);
173
-		cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174
-		cloneSupportItem.addActionListener(this);
175
-		menu.add("-");
176
-		cutItem = menu.add(new MenuItem("Cut"));
177
-		cutItem.addActionListener(this);
178
-		copyItem = menu.add(new MenuItem("Copy"));
179
-		copyItem.addActionListener(this);
180
-		pasteItem = menu.add(new MenuItem("Paste"));
181
-		pasteItem.addActionListener(this);
182
-		pasteLinkItem = menu.add(new MenuItem("Paste link"));
183
-		pasteLinkItem.addActionListener(this);
184
-		pasteCloneItem = menu.add(new MenuItem("Paste clone"));
185
-		pasteCloneItem.addActionListener(this);
186
-//		pasteExpandItem = menu.add(new MenuItem("Paste expand"));
187
-//		pasteExpandItem.addActionListener(this);
188
-		clearItem = menu.add(new MenuItem("Clear"));
189
-		clearItem.addActionListener(this);
190
-		clearAllItem = menu.add(new MenuItem("Clear All"));
191
-		clearAllItem.addActionListener(this);
192
-
285
+        }
286
+        
193
287
 		oe.menuBar.add(menu = new Menu("Setting"));
194
-                resetMeshItem = menu.add(new MenuItem("Reset All"));
195
-		resetMeshItem.addActionListener(this);
196
-		stepAllItem = menu.add(new MenuItem("Step All"));
197
-		stepAllItem.addActionListener(this);
288
+        if (Globals.ADVANCED)
289
+        {
198
290
 		revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199
291
 		revertMeshItem.addActionListener(this);
200
292
 		resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201
293
 		resetreferencesItem.addActionListener(this);
202
294
 		menu.add("-");
295
+        }
203
296
 		overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204
297
 		overwriteGeoItem.addActionListener(this);
205
298
 		overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..
..
@@ -211,19 +304,26 @@
211
304
 		overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212
305
 		overwriteUVItem.addActionListener(this);
213
306
 		menu.add("-");
307
+        if (Globals.ADVANCED)
308
+        {
214
309
 		generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215
310
 		generateMeshItem.addActionListener(this);
216
311
 		poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217
312
 		poseMeshItem.addActionListener(this);
218
313
 		menu.add("-");
314
+        }
219
315
 		resetsupportItem = menu.add(new MenuItem("Reset support"));
220
316
 		resetsupportItem.addActionListener(this);
221
317
 		linkverticesItem = menu.add(new MenuItem("Link to Support"));
222
318
 		linkverticesItem.addActionListener(this);
223
319
 		relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224
320
 		relinkverticesItem.addActionListener(this);
321
+                
322
+        if (Globals.ADVANCED)
323
+        {
225
324
 		setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226
325
 		setMasterItem.addActionListener(this);
326
+        }
227
327
                 
228
328
 		oe.menuBar.add(menu = new Menu("Group"));
229
329
 		grabItem = menu.add(new MenuItem("Grab"));
..
..
@@ -234,7 +334,7 @@
234
334
 		frontItem.addActionListener(this);
235
335
 		compositeItem = menu.add(new MenuItem("Composite"));
236
336
 		compositeItem.addActionListener(this);
237
-		hideItem = menu.add(new MenuItem("Hide"));
337
+		hideItem = menu.add(new MenuItem("Hidden Group"));
238
338
 		hideItem.addActionListener(this);
239
339
 		ungroupItem = menu.add(new MenuItem("Ungroup"));
240
340
 		ungroupItem.addActionListener(this);
..
..
@@ -245,16 +345,21 @@
245
345
 		switchGeoItem.addActionListener(this);
246
346
 		switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
247
347
 		switchTransfoItem.addActionListener(this);
348
+		morphItem = menu.add(new MenuItem("Morph Group"));
349
+		morphItem.addActionListener(this);
350
+                
351
+        if (Globals.ADVANCED)
352
+        {
353
+		menu.add("-");
248
354
 		physicsItem = menu.add(new MenuItem("Physics"));
249
355
 		physicsItem.addActionListener(this);
250
356
 		frameselectorItem = menu.add(new MenuItem("Frame Selector"));
251
357
 		frameselectorItem.addActionListener(this);
252
-		morphItem = menu.add(new MenuItem("Morph"));
253
-		morphItem.addActionListener(this);
254
358
 		scriptNodeItem = menu.add(new MenuItem("Script Node"));
255
359
 		scriptNodeItem.addActionListener(this);
256
360
 		cameraItem = menu.add(new MenuItem("Camera"));
257
361
 		cameraItem.addActionListener(this);
362
+        }
258
363
                 
259
364
 		oe.menuBar.add(menu = new Menu("Object"));
260
365
 		textureItem = menu.add(new MenuItem("Texture"));
..
..
@@ -269,21 +374,29 @@
269
374
 		shadowYItem.addActionListener(this);
270
375
                 shadowZItem = menu.add(new MenuItem("Shadow Z"));
271
376
 		shadowZItem.addActionListener(this);
377
+        if (Globals.ADVANCED)
378
+        {
379
+		menu.add("-");
272
380
 		linkerItem = menu.add(new MenuItem("Linker"));
273
381
 		linkerItem.addActionListener(this);
274
-		templateItem = menu.add(new MenuItem("Template"));
275
-		templateItem.addActionListener(this);
276
382
 		attributeItem = menu.add(new MenuItem("Attribute"));
277
383
 		attributeItem.addActionListener(this);
384
+		templateItem = menu.add(new MenuItem("Template"));
385
+		templateItem.addActionListener(this);
278
386
 		pointflowItem = menu.add(new MenuItem("Point Flow"));
279
387
 		pointflowItem.addActionListener(this);
388
+        }
280
389
 		menu.add("-");
281
390
 		resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282
391
 		resetTransformItem.addActionListener(this);
283
392
 		resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284
393
 		resetCentroidItem.addActionListener(this);
285
-		transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286
-		transformgeometryItem.addActionListener(this);
394
+		resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
395
+		resetCentroidXZItem.addActionListener(this);
396
+		transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
397
+		transformGeometryItem.addActionListener(this);
398
+		transformChildrenItem = menu.add(new MenuItem("Transform Children"));
399
+		transformChildrenItem.addActionListener(this);
287
400
                 
288
401
 		oe.menuBar.add(menu = new Menu("Geometry"));
289
402
 		genUVItem = menu.add(new MenuItem("Generate UV"));
..
..
@@ -294,8 +407,11 @@
294
407
 		genNormalsCADItem.addActionListener(this);
295
408
 		genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296
409
 		genNormalsMESHItem.addActionListener(this);
410
+        if (Globals.ADVANCED)
411
+        {
297
412
 		genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
298
413
 		genNormalsMINEItem.addActionListener(this);
414
+        }
299
415
 		stripifyItem = menu.add(new MenuItem("Stripify"));
300
416
 		stripifyItem.addActionListener(this);
301
417
 		unstripifyItem = menu.add(new MenuItem("Unstripify"));
..
..
@@ -317,23 +433,34 @@
317
433
 		reduce34MeshItem.addActionListener(this);
318
434
 		increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319
435
 		increaseMeshItem.addActionListener(this);
320
-		smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321
-		smoothMeshItem.addActionListener(this);
322
436
 		clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323
437
 		clipMeshItem.addActionListener(this);
438
+                
439
+        if (Globals.ADVANCED)
440
+        {
441
+		smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
442
+		smoothMeshItem.addActionListener(this);
443
+        }
324
444
 
325
445
                 oe.menuBar.add(menu = new Menu("Attributes"));
326
446
 		clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327
447
 		clearMaterialsItem.addActionListener(this);
448
+                resetAllItem = menu.add(new MenuItem("Reset All"));
449
+		resetAllItem.addActionListener(this);
450
+		stepAllItem = menu.add(new MenuItem("Step All"));
451
+		stepAllItem.addActionListener(this);
328
452
 		menu.add("-");
329
453
 		liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330
454
 		liveleavesItem.addActionListener(this);
331
455
 		unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332
456
 		unliveleavesItem.addActionListener(this);
457
+        if (Globals.ADVANCED)
458
+        {
333
459
 		supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334
460
 		supportleavesItem.addActionListener(this);
335
461
 		unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336
462
 		unsupportleavesItem.addActionListener(this);
463
+        }
337
464
 		hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338
465
 		hideleavesItem.addActionListener(this);
339
466
 		showleavesItem = menu.add(new MenuItem("Show Leaves"));
..
..
@@ -377,29 +504,22 @@
377
504
 		sortbynameItem = menu.add(new MenuItem("Sort by name"));
378
505
 		sortbynameItem.addActionListener(this);
379
506
 		menu.add("-");
507
+		shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
508
+		shareGeometriesItem.addActionListener(this);
509
+		mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
510
+		mergeGeometriesItem.addActionListener(this);
511
+        if (Globals.ADVANCED)
512
+        {
513
+            // Pretty much the same as duplicate and clone.
380
514
 		extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381
515
 		extractGeometriesItem.addActionListener(this);
382
516
 		cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383
517
 		cloneGeometriesItem.addActionListener(this);
384
-		shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
385
-		shareGeometriesItem.addActionListener(this);
386
-		mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
387
-		mergeGeometriesItem.addActionListener(this);
518
+        }
388
519
                 
389
520
 		oe.menuBar.add(menu = new Menu("Insert"));
390
521
 		buildCreateMenu(menu);
391
522
                 
392
-               
393
-                oe.menuBar.add(menu = new Menu("Include"));
394
-		importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
395
-		importGFDItem.addActionListener(this);
396
-		importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
397
-		importVRMLX3DItem.addActionListener(this);
398
-		importOBJItem = menu.add(new MenuItem("OBJ Object..."));
399
-		importOBJItem.addActionListener(this);
400
-		import3DSItem = menu.add(new MenuItem("3DS Object..."));
401
-		import3DSItem.addActionListener(this);
402
-
403
523
                 oe.menuBar.add(menu = new Menu("Tools"));
404
524
 		buildToolsMenu(menu);
405
525
 	}
..
..
@@ -437,9 +557,13 @@
437
557
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
438
558
                 
439
559
                 oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
440
-                liveCB.setToolTipText("Enabled animation");
560
+                liveCB.setToolTipText("Enable animation");
441
561
                                 liveCB.addItemListener(this);
442
562
 
563
+		oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
564
+                oneStepButton.setToolTipText("Animate one step forward");
565
+		oneStepButton.addActionListener(this);
566
+                
443
567
                 oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
444
568
                 fastCB.setToolTipText("Fast mode");
445
569
                                 fastCB.addItemListener(this);
..
..
@@ -448,7 +572,7 @@
448
572
                 trackCB.setToolTipText("Enable tracking");
449
573
                                 trackCB.addItemListener(this);
450
574
 
451
-		oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
575
+		oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
452
576
                 screenfitButton.setToolTipText("Screen fit");
453
577
 		screenfitButton.addActionListener(this);
454
578
 
..
..
@@ -457,39 +581,39 @@
457
581
 
458
582
                 if (Globals.ADVANCED)
459
583
                 {
460
-                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
584
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
461
585
                         snapobjectButton.addActionListener(this);
462
586
                         snapobjectButton.setToolTipText("Snap Object");
463
587
                 }
464
588
 
465
-		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
589
+		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
466
590
                 flashSelectionButton.setToolTipText("Show selection");
467
591
 		flashSelectionButton.addActionListener(this);
468
592
                 
469
593
 		oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
470
594
                 
471
-		oe.toolbarPanel.add(twoButton = new cButton("|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
595
+		oe.toolbarPanel.add(twoButton = new cButton("|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
472
596
                 twoButton.setToolTipText("Show center view only");
473
597
 		twoButton.addActionListener(this);
474
-		oe.toolbarPanel.add(fourButton = new cButton("+||", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
598
+		oe.toolbarPanel.add(fourButton = new cButton("+||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
475
599
 		fourButton.addActionListener(this);
476
600
                 fourButton.setToolTipText("Show left panel only");
477
-		oe.toolbarPanel.add(sixButton = new cButton("+|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
601
+		oe.toolbarPanel.add(sixButton = new cButton("+|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
478
602
                 sixButton.setToolTipText("2-column layout left");
479
603
 		sixButton.addActionListener(this);
480
-		oe.toolbarPanel.add(threeButton = new cButton("|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
604
+		oe.toolbarPanel.add(threeButton = new cButton("|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
481
605
                 threeButton.setToolTipText("2-column layout right");
482
606
 		threeButton.addActionListener(this);
483
-		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
607
+		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
484
608
                 sevenButton.setToolTipText("3-column layout");
485
609
 		sevenButton.addActionListener(this);
486
610
                 //
487
611
 
488
-		oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
612
+		oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
489
613
                 rootButton.setToolTipText("Edit selection in new tab");
490
614
 		rootButton.addActionListener(this);
491
615
 
492
-                oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
616
+                oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
493
617
                 closeButton.setToolTipText("Close tab");
494
618
 		closeButton.addActionListener(this);
495
619
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..
..
@@ -497,11 +621,11 @@
497
621
                         
498
622
                 cGridBag commandsPanel = new cGridBag();
499
623
                 
500
-		commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
624
+		commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
501
625
                 editButton.setToolTipText("Edit selection");
502
626
 		editButton.addActionListener(this);
503
627
 
504
-		commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
628
+		commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
505
629
                 uneditButton.setToolTipText("Unedit selection");
506
630
 		uneditButton.addActionListener(this);
507
631
 
..
..
@@ -509,11 +633,11 @@
509
633
                 allParamsButton.setToolTipText("Edit all params");
510
634
 		allParamsButton.addActionListener(this);
511
635
 
512
-		commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
636
+		commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
513
637
                 clearPanelButton.setToolTipText("Clear edit panel");
514
638
 		clearPanelButton.addActionListener(this);
515
639
 
516
-		commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
640
+		commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
517
641
                 unselectButton.setToolTipText("Unselect");
518
642
 		unselectButton.addActionListener(this);
519
643
 
..
..
@@ -588,8 +712,18 @@
588
712
         
589
713
         void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
590
714
         {
715
+                panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
716
+                boxCB.setToolTipText("Display bounding boxes");
717
+                                boxCB.addItemListener(this);
718
+                                
719
+                panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
720
+                zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
721
+                                zoomBoxCB.addItemListener(this);
722
+
723
+        if (true) // Globals.ADVANCED)
724
+        {
591
725
                 panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
592
-                supportCB.setToolTipText("Enabled rigging");
726
+                supportCB.setToolTipText("Enable rigging");
593
727
                                 supportCB.addItemListener(this);
594
728
 
595
729
         //        panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
..
..
@@ -607,14 +741,6 @@
607
741
                 slowCB.setToolTipText("Smooth interpolation");
608
742
                                 slowCB.addItemListener(this);
609
743
                                 
610
-                panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
611
-                boxCB.setToolTipText("Display bounding boxes");
612
-                                boxCB.addItemListener(this);
613
-                                
614
-                panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
615
-                zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
616
-                                zoomBoxCB.addItemListener(this);
617
-
618
744
 //        	constraints.gridy += 1;
619
745
 //                panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
620
746
 //                                speakerMocapCB.addItemListener(this);
..
..
@@ -645,6 +771,8 @@
645
771
                 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
646
772
                 lookAtCB.setToolTipText("Look-at target");
647
773
                                 lookAtCB.addItemListener(this);
774
+                
775
+        }
648
776
                                 
649
777
                 cGridBag fill = new cGridBag();
650
778
                                 
..
..
@@ -665,6 +793,7 @@
665
793
             buttonGroup.add(radioButton);
666
794
             radioButton.doClick();
667
795
         }
796
+        
668
797
         void SetupViews(ObjEditor oe)
669
798
         {
670
799
             oe.SetupViews();
..
..
@@ -881,7 +1010,9 @@
881
1010
 //                        objEditor.DropFile((java.io.File[]) object, true);
882
1011
 //                        return;
883
1012
 //                    }
884
-                    if (string.charAt(0) == '/')
1013
+                    
1014
+                    // File path for Mac and Windows
1015
+                    if (string.charAt(0) == '/' || string.charAt(1) == ':')
885
1016
                     {
886
1017
                         // file(s)
887
1018
                         String[] names = string.split("\n");
..
..
@@ -908,7 +1039,7 @@
908
1039
                     
909
1040
                     flashIt = false;
910
1041
                     CameraPane pane = (CameraPane) target;
911
-                    pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
1042
+                    pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
912
1043
                     pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
913
1044
                     
914
1045
                     if (group.selection.size() == 1)
..
..
@@ -935,11 +1066,11 @@
935
1066
             {
936
1067
                 loadClipboard(true);
937
1068
                 objEditor.jTree.setSelectionPath(destinationPath);
938
-                pasteInto(false);
1069
+                pasteInto(false, false);
939
1070
             } else {
940
1071
                 loadClipboard(false);
941
1072
                 objEditor.jTree.setSelectionPath(destinationPath);
942
-                pasteInto(false); // true); // ???
1073
+                pasteInto(false, false); // true); // ???
943
1074
             }
944
1075
 	}
945
1076
 	public void	dropActionChanged(DropTargetDragEvent dtde) 
..
..
@@ -1061,27 +1192,33 @@
1061
1192
 		kleinItem.addActionListener(this);
1062
1193
 		particleItem = menu.add(new MenuItem("Particle system"));
1063
1194
 		particleItem.addActionListener(this);
1195
+        if (Globals.ADVANCED)
1196
+        {
1064
1197
 		ragdollItem = menu.add(new MenuItem("Rag Walk"));
1065
1198
 		ragdollItem.addActionListener(this);
1066
1199
 		ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1067
1200
 		ragdoll2Item.addActionListener(this);
1201
+        }
1068
1202
 		menu.add("-");
1069
-		meshItem = menu.add(new MenuItem("Mesh"));
1203
+		meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1070
1204
 		meshItem.addActionListener(this);
1071
1205
 	//	meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1072
1206
 	//	meshGroupItem.addActionListener(this);
1207
+        if (Globals.ADVANCED)
1208
+        {
1073
1209
 		springItem = menu.add(new MenuItem("Spring"));
1074
1210
 		springItem.addActionListener(this);
1075
1211
 		flagItem = menu.add(new MenuItem("Flag"));
1076
1212
 		flagItem.addActionListener(this);
1077
-		bezierItem = menu.add(new MenuItem("Patch"));
1078
-		bezierItem.addActionListener(this);
1079
-		checkerItem = menu.add(new MenuItem("Checker"));
1080
-		checkerItem.addActionListener(this);
1081
1213
 		blobItem = menu.add(new MenuItem("Blob"));
1082
1214
 		blobItem.addActionListener(this);
1083
1215
 		latheItem = menu.add(new MenuItem("Lathe"));
1084
1216
 		latheItem.addActionListener(this);
1217
+        }
1218
+		bezierItem = menu.add(new MenuItem("Bezier Patch"));
1219
+		bezierItem.addActionListener(this);
1220
+		overlayItem = menu.add(new MenuItem("Overlay"));
1221
+		overlayItem.addActionListener(this);
1085
1222
 		lightItem = menu.add(new MenuItem("Light"));
1086
1223
 		lightItem.addActionListener(this);
1087
1224
 		menu.add("-");
..
..
@@ -1091,8 +1228,11 @@
1091
1228
 		loopItem.addActionListener(this);
1092
1229
 		doubleItem = menu.add(new MenuItem("Fork"));
1093
1230
 		doubleItem.addActionListener(this);
1231
+        if (Globals.ADVANCED)
1232
+        {
1094
1233
 		tripleItem = menu.add(new MenuItem("Trident"));
1095
1234
 		tripleItem.addActionListener(this);
1235
+        }
1096
1236
 	}
1097
1237
         
1098
1238
 	void buildToolsMenu(Menu menu)
..
..
@@ -1106,19 +1246,21 @@
1106
1246
 		parseverticesItem.addActionListener(this);
1107
1247
 		textureFieldItem = menu.add(new MenuItem("Texture Field"));
1108
1248
 		textureFieldItem.addActionListener(this);
1109
-		alignItem = menu.add(new MenuItem("Align"));
1249
+		alignItem = menu.add(new MenuItem("Align Objects"));
1110
1250
 		alignItem.addActionListener(this);
1111
-		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1112
-		mirrorItem.addActionListener(this);
1113
1251
 		reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1114
1252
 		reduceMorphItem.addActionListener(this);
1115
1253
 		reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1116
1254
 		reduce34MorphItem.addActionListener(this);
1117
-                
1255
+		menu.add("-");
1118
1256
 		menu.add(computeAOItem = new MenuItem("Compute AO"));
1119
1257
 		computeAOItem.addActionListener(this);
1120
-		menu.add("-");
1121
1258
                 
1259
+        if (Globals.ADVANCED)
1260
+        {
1261
+		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1262
+		mirrorItem.addActionListener(this);
1263
+		menu.add("-");
1122
1264
 		menu.add(memoryItem = new MenuItem("Memory Usage"));
1123
1265
 		memoryItem.addActionListener(this);
1124
1266
 		menu.add(analyzeItem = new MenuItem("Analyze"));
..
..
@@ -1141,6 +1283,7 @@
1141
1283
 		menu.add("-");
1142
1284
 		menu.add(editScriptItem = new MenuItem("Edit Script..."));
1143
1285
 		editScriptItem.addActionListener(this);
1286
+        }
1144
1287
         }
1145
1288
         
1146
1289
         void ScreenFit()
..
..
@@ -1469,9 +1612,9 @@
1469
1612
     
1470
1613
     void Overwrite(int mask)
1471
1614
     {
1472
-        if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
1615
+        if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
1473
1616
         {
1474
-            Object3D content = GrafreeD.clipboard.get(0);
1617
+            Object3D content = Grafreed.clipboard.get(0);
1475
1618
 
1476
1619
             if (content instanceof cGroup && ((cGroup)content).transientlink )
1477
1620
                 content = ((cGroup)content).get(0);
..
..
@@ -1642,7 +1785,7 @@
1642
1785
 		{
1643
1786
 			makeSomething(new BezierSurface());
1644
1787
 		} else
1645
-		if (source == checkerItem)
1788
+		if (source == overlayItem)
1646
1789
 		{
1647
1790
                     /*
1648
1791
 			Object3D obj = new BezierSurface(5,8);
..
..
@@ -1776,23 +1919,6 @@
1776
1919
                         csg.addChild(child);
1777
1920
                         child.addChild(csg);
1778
1921
 		} else
1779
-                    
1780
-		if (source == importGFDItem)
1781
-		{
1782
-			ImportGFD();
1783
-		} else
1784
-		if (source == importVRMLX3DItem)
1785
-		{
1786
-			ImportVRMLX3D();
1787
-		} else
1788
-		if (source == import3DSItem)
1789
-		{
1790
-			objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1791
-		} else
1792
-		if (source == importOBJItem)
1793
-		{
1794
-			objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1795
-		} else
1796
1922
 		if (source == computeAOItem)
1797
1923
 		{
1798
1924
                     Globals.drawMode = CameraPane.OCCLUSION;
..
..
@@ -1811,7 +1937,7 @@
1811
1937
 		if (source == invariantsItem)
1812
1938
 		{
1813
1939
                     System.out.println("Invariants:");
1814
-                    GrafreeD.grafreeD.universe.invariants();
1940
+                    Grafreed.grafreeD.universe.invariants();
1815
1941
 		} else
1816
1942
 		if (source == memoryItem)
1817
1943
 		{
..
..
@@ -1829,6 +1955,11 @@
1829
1955
 		if (source == dumpItem)
1830
1956
 		{
1831
1957
                     DumpObject();
1958
+		} else
1959
+		if (source == oneStepButton)
1960
+		{
1961
+                    Globals.ONESTEP = true;
1962
+                    cameraView.repaint();
1832
1963
 		} else
1833
1964
 		if (source == screenfitButton)
1834
1965
 		{
..
..
@@ -1879,12 +2010,20 @@
1879
2010
 		{
1880
2011
 			loadClipboard(true);
1881
2012
 		} else
2013
+		if (source == undoItem)
2014
+		{
2015
+			Undo();
2016
+		} else
2017
+		if (source == redoItem)
2018
+		{
2019
+			Redo();
2020
+		} else
1882
2021
 		if (source == duplicateItem)
1883
2022
 		{
1884
-                    Object3D keep = GrafreeD.clipboard;
2023
+                    Object3D keep = Grafreed.clipboard;
1885
2024
 			loadClipboard(false);
1886
2025
 			paste(false);
1887
-                    GrafreeD.clipboard = keep;
2026
+                    Grafreed.clipboard = keep;
1888
2027
 		} else
1889
2028
 		if (source == cloneItem)
1890
2029
 		{
..
..
@@ -1902,13 +2041,17 @@
1902
2041
 		{
1903
2042
 			paste(false);
1904
2043
 		} else
2044
+		if (source == pasteIntoItem)
2045
+		{
2046
+			pasteInto(true, false);
2047
+		} else
1905
2048
 		if (source == pasteLinkItem)
1906
2049
 		{
1907
-			pasteInto(false);
2050
+			pasteInto(false, false);
1908
2051
 		} else
1909
2052
 		if (source == pasteCloneItem)
1910
2053
 		{
1911
-			pasteInto(true);
2054
+			pasteInto(true, true);
1912
2055
 		} else
1913
2056
 		if (source == pasteExpandItem)
1914
2057
 		{
..
..
@@ -2100,9 +2243,9 @@
2100
2243
 //                        group.selection.get(0).setMasterThis(content); // should be identity
2101
2244
 //		refreshContents();
2102
2245
 //                    }
2103
-                    if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
2246
+                    if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
2104
2247
                     {
2105
-                        Object3D content = GrafreeD.clipboard.get(0);
2248
+                        Object3D content = Grafreed.clipboard.get(0);
2106
2249
                         
2107
2250
                         if (content instanceof cGroup && ((cGroup)content).transientlink )
2108
2251
                             content = ((cGroup)content).get(0);
..
..
@@ -2110,11 +2253,11 @@
2110
2253
             Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2111
2254
                         for (int i=0; i<group.selection.size(); i++)
2112
2255
                         {
2113
-                            boolean random = CameraPane.RANDOM;
2114
-                            CameraPane.RANDOM = false; // parse all random nodes
2256
+                            boolean random = CameraPane.SWITCH;
2257
+                            CameraPane.SWITCH = false; // parse all random nodes
2115
2258
                             group.selection.get(i).linkVerticesThis(content);
2116
2259
                       //      group.selection.get(i).setMasterThis(content); // should be identity
2117
-                            CameraPane.RANDOM = random;
2260
+                            CameraPane.SWITCH = random;
2118
2261
                         }
2119
2262
             Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2120
2263
 		refreshContents();
..
..
@@ -2124,20 +2267,20 @@
2124
2267
 		{
2125
2268
                     for (int i=0; i<group.selection.size(); i++)
2126
2269
                     {
2127
-                        boolean random = CameraPane.RANDOM;
2128
-                        CameraPane.RANDOM = false; // parse all random nodes
2270
+                        boolean random = CameraPane.SWITCH;
2271
+                        CameraPane.SWITCH = false; // parse all random nodes
2129
2272
                         group.selection.get(i).linkVerticesThis(null);
2130
-                        CameraPane.RANDOM = random;
2273
+                        CameraPane.SWITCH = random;
2131
2274
                     }
2132
2275
 
2133
2276
                     refreshContents();
2134
2277
 		} else
2135
2278
 		if (source == relinkverticesItem)
2136
2279
 		{
2137
-                    boolean random = CameraPane.RANDOM;
2138
-                    CameraPane.RANDOM = false; // parse all random nodes
2280
+                    boolean random = CameraPane.SWITCH;
2281
+                    CameraPane.SWITCH = false; // parse all random nodes
2139
2282
                     group.selection.RelinkToSupport();
2140
-                    CameraPane.RANDOM = random;
2283
+                    CameraPane.SWITCH = random;
2141
2284
 
2142
2285
                     refreshContents();
2143
2286
 		} else
..
..
@@ -2152,9 +2295,9 @@
2152
2295
 		} else
2153
2296
 		if (source == setMasterItem)
2154
2297
 		{
2155
-                    if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2298
+                    if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2156
2299
                     {
2157
-                        Object3D content = GrafreeD.clipboard.get(0);
2300
+                        Object3D content = Grafreed.clipboard.get(0);
2158
2301
                         
2159
2302
                         if (content instanceof cGroup && ((cGroup)content).transientlink )
2160
2303
                             content = ((cGroup)content).get(0);
..
..
@@ -2167,9 +2310,9 @@
2167
2310
 		{
2168
2311
                     if (group.selection.size() == 1)
2169
2312
                     {
2170
-                        if (GrafreeD.clipboard.size() == 1)
2313
+                        if (Grafreed.clipboard.size() == 1)
2171
2314
                         {
2172
-                            Object3D content = GrafreeD.clipboard.get(0);
2315
+                            Object3D content = Grafreed.clipboard.get(0);
2173
2316
 
2174
2317
                             if (content instanceof cGroup && ((cGroup)content).transientlink )
2175
2318
                                 content = ((cGroup)content).get(0);
..
..
@@ -2186,7 +2329,7 @@
2186
2329
 		{
2187
2330
 			RevertMeshes();
2188
2331
 		} else
2189
-		if (source == resetMeshItem)
2332
+		if (source == resetAllItem)
2190
2333
 		{
2191
2334
 			ResetAll();
2192
2335
 		} else
..
..
@@ -2524,9 +2667,13 @@
2524
2667
                 {
2525
2668
 			SmoothMesh();
2526
2669
 		} else
2527
-		if (source == transformgeometryItem)
2670
+		if (source == transformGeometryItem)
2528
2671
 		{
2529
2672
                         TransformGeometry();
2673
+		} else
2674
+		if (source == transformChildrenItem)
2675
+		{
2676
+                        TransformChildren();
2530
2677
 		} else
2531
2678
 		if (source == resetTransformItem)
2532
2679
 		{
..
..
@@ -2534,7 +2681,11 @@
2534
2681
 		} else
2535
2682
 		if (source == resetCentroidItem)
2536
2683
 		{
2537
-                        ResetCentroid();
2684
+                        ResetCentroid(true);
2685
+		} else
2686
+		if (source == resetCentroidXZItem)
2687
+		{
2688
+                        ResetCentroid(false);
2538
2689
 		} else
2539
2690
 		if (source == resetParentItem)
2540
2691
 		{
..
..
@@ -2890,7 +3041,7 @@
2890
3041
 				child.CloseUI();
2891
3042
                                 listUI.remove(child);
2892
3043
                                 
2893
-                                child.editWindow = null; // ???????????
3044
+                                //child.editWindow = null; // ???????????
2894
3045
 			}
2895
3046
 			objEditor.ctrlPanel.FlushUI();
2896
3047
 			//objEditor.jTree.clearSelection();
..
..
@@ -2976,7 +3127,9 @@
2976
3127
                         frontView.object = group;
2977
3128
                         sideView.object = group;
2978
3129
                     }
2979
-                    group.editWindow = this;
3130
+                    
3131
+// fix "+" issue                    group.editWindow = this;
3132
+                    
2980
3133
                     /*
2981
3134
                     currentLayout = radio.layout;
2982
3135
                     if (currentLayout == null)
..
..
@@ -2989,7 +3142,20 @@
2989
3142
                     //group.attributes = -1;
2990
3143
                     ResetModel();
2991
3144
                     refreshContents(true);
2992
-                }
3145
+                } else if (event.getSource() == editCameraItem)
3146
+                {
3147
+                    cameraView.ProtectCamera();
3148
+                    cameraView.repaint();
3149
+                    return;
3150
+                } else if (event.getSource() == revertCameraItem)
3151
+                {
3152
+                    cameraView.RevertCamera();
3153
+                    cameraView.repaint();
3154
+                    return;
3155
+        //        } else if (event.getSource() == textureButton)
3156
+        //        {
3157
+        //            return; // true;
3158
+                } 
2993
3159
                 else
2994
3160
                 {
2995
3161
 			//return super.action(event, arg);
..
..
@@ -3050,6 +3216,28 @@
3050
3216
             refreshContents();
3051
3217
         }
3052
3218
         
3219
+        void TransformChildren()
3220
+        {
3221
+            Object3D obj;
3222
+            for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3223
+            {
3224
+                    obj = (Object3D)e.nextElement();
3225
+                    obj.KeepTextureMatrices();
3226
+                    obj.TransformChildren();
3227
+                    obj.RestoreTextureMatrices();
3228
+                                        
3229
+//                    if (obj.parent == null)
3230
+//                    {
3231
+//                        System.out.println("NULL PARENT!");
3232
+//                        new Exception().printStackTrace();
3233
+//                    }
3234
+//                    else
3235
+//                        TouchTransform(obj);
3236
+//                        //obj.parent.Touch();
3237
+            }
3238
+
3239
+            refreshContents();
3240
+        }
3053
3241
         
3054
3242
         void ResetTransform()
3055
3243
         {
..
..
@@ -3162,7 +3350,7 @@
3162
3350
             refreshContents();
3163
3351
         }
3164
3352
         
3165
-        void ResetCentroid()
3353
+        void ResetCentroid(boolean full)
3166
3354
         {
3167
3355
             Object3D obj;
3168
3356
             for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..
..
@@ -3177,12 +3365,16 @@
3177
3365
                     LA.matIdentity(Object3D.mat);
3178
3366
                     obj.getBounds(minima, maxima, false);
3179
3367
                     Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3180
-                    Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3368
+                    if (full)
3369
+                        Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3181
3370
                     Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3182
3371
                     obj.TransformMesh(Object3D.mat);
3372
+                    
3183
3373
                     Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3184
-                    Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3374
+                    if (full)
3375
+                        Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3185
3376
                     Object3D.mat[3][2] = (minima.z + maxima.z)/2;
3377
+                    
3186
3378
                     LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3187
3379
                     //Object3D.mat[3][0] = -Object3D.mat[3][0];
3188
3380
                     //Object3D.mat[3][1] = -Object3D.mat[3][1];
..
..
@@ -3248,9 +3440,9 @@
3248
3440
                     obj = (Object3D)e.nextElement();
3249
3441
                     
3250
3442
                     System.out.println("Object is: " + obj);
3251
-                    GrafreeD.AnalyzeObject(obj);
3443
+                    Grafreed.AnalyzeObject(obj);
3252
3444
                     System.out.println("Boundary rep: " + obj.bRep);
3253
-                    GrafreeD.AnalyzeObject(obj.bRep);
3445
+                    Grafreed.AnalyzeObject(obj.bRep);
3254
3446
                     
3255
3447
 //                    System.err.println((size/1024) + " KB is the size of " + obj);
3256
3448
                 }
..
..
@@ -3464,8 +3656,8 @@
3464
3656
 	
3465
3657
 	void ParseVertices()
3466
3658
 	{
3467
-            boolean epsequal = GrafreeD.epsequal;
3468
-            GrafreeD.epsequal = true;
3659
+            boolean epsequal = Grafreed.epsequal;
3660
+            Grafreed.epsequal = true;
3469
3661
             
3470
3662
             for (int i=0; i<group.selection.size(); i++)
3471
3663
             {
..
..
@@ -3490,7 +3682,7 @@
3490
3682
                                 LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3491
3683
                                 LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3492
3684
 
3493
-                                g.add(GrafreeD.clipboard);
3685
+                                g.add(Grafreed.clipboard);
3494
3686
 
3495
3687
                                 buffer.add(g);
3496
3688
                             }
..
..
@@ -3505,7 +3697,7 @@
3505
3697
                 makeSomething(buffer, i==group.selection.size()-1);
3506
3698
             }
3507
3699
             
3508
-            GrafreeD.epsequal = epsequal;
3700
+            Grafreed.epsequal = epsequal;
3509
3701
             
3510
3702
             refreshContents();
3511
3703
 	}
..
..
@@ -3523,7 +3715,16 @@
3523
3715
                             String pigment = Object3D.GetPigment(tex);
3524
3716
                             //String bump = Object3D.GetBump(tex);
3525
3717
                             
3526
-                            com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3718
+                            com.sun.opengl.util.texture.TextureData texturedata = null;
3719
+                            
3720
+                            try
3721
+                            {
3722
+                                texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3723
+                            }
3724
+                            catch (Exception e)
3725
+                            {
3726
+                                System.err.println("FAIL: " + node);
3727
+                            }
3527
3728
                             
3528
3729
                             double s = v.s;
3529
3730
                             
..
..
@@ -3611,11 +3812,11 @@
3611
3812
 
3612
3813
             SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3613
3814
 
3614
-            boolean random = CameraPane.RANDOM;
3615
-            CameraPane.RANDOM = false; // parse all random nodes
3815
+            boolean random = CameraPane.SWITCH;
3816
+            CameraPane.SWITCH = false; // parse all random nodes
3616
3817
             lowres.linkVerticesThis(null);
3617
3818
             lowres.linkVerticesThis(sn);
3618
-            CameraPane.RANDOM = random;
3819
+            CameraPane.SWITCH = random;
3619
3820
 
3620
3821
             System.err.flush();
3621
3822
 
..
..
@@ -3655,7 +3856,7 @@
3655
3856
                 return;
3656
3857
             
3657
3858
             Object3D poses = group.selection.get(0);
3658
-            Object3D ref = GrafreeD.clipboard.get(0);
3859
+            Object3D ref = Grafreed.clipboard.get(0);
3659
3860
             
3660
3861
             Object3D newgroup = new Object3D("Po:" + poses.name);
3661
3862
             
..
..
@@ -3849,9 +4050,9 @@
3849
4050
 	
3850
4051
 	void ClipMesh()
3851
4052
 	{
3852
-            if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
4053
+            if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
3853
4054
             {
3854
-                Object3D content = GrafreeD.clipboard.get(0);
4055
+                Object3D content = Grafreed.clipboard.get(0);
3855
4056
 
3856
4057
                 if (content instanceof cGroup && ((cGroup)content).transientlink )
3857
4058
                     content = ((cGroup)content).get(0);
..
..
@@ -3860,7 +4061,7 @@
3860
4061
 //                {
3861
4062
 //                    group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3862
4063
 //                }
3863
-                  group.selection.ClipMesh(GrafreeD.clipboard);
4064
+                  group.selection.ClipMesh(Grafreed.clipboard);
3864
4065
             }
3865
4066
 //		group.selection.ClipMesh(GrafreeD.clipboard);
3866
4067
             System.out.println("DONE.");
..
..
@@ -3995,7 +4196,7 @@
3995
4196
                     objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3996
4197
                     
3997
4198
 			Object3D elem = (Object3D)group.selection.elementAt(i);
3998
-                        if(elem != group)
4199
+                        if(elem != group || !newWindow)
3999
4200
                         {
4000
4201
                         //    if (!(elem instanceof Composite))
4001
4202
                         //        newWindow = false;
..
..
@@ -4109,14 +4310,17 @@
4109
4310
 			
4110
4311
                         objEditor.SetText(); // jan 2014
4111
4312
                         
4112
-			if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
4313
+			if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4113
4314
 				CameraPane.flash = true;
4114
4315
                         
4115
-			if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
4316
+			if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4116
4317
                             // a camera
4117
4318
                         {
4118
-                            CameraPane.camerachangeframe = 0; // don't refuse it
4119
-                            Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4319
+                            if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
4320
+                            {
4321
+                                CameraPane.camerachangeframe = 0; // don't refuse it
4322
+                                Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4323
+                            }
4120
4324
                          //   Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4121
4325
                          //   Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4122
4326
                         }
..
..
@@ -4200,12 +4404,12 @@
4200
4404
 	{
4201
4405
 		if (group.selection.isEmpty())
4202
4406
 			return;
4203
-		GrafreeD.clipboardIsTempGroup = false;
4407
+		Grafreed.clipboardIsTempGroup = false;
4204
4408
 		Composite tGroup = null;
4205
4409
 		if (group.selection.size() > 0) // 1)
4206
4410
 		{
4207
4411
 			tGroup = new cGroup();
4208
-			GrafreeD.clipboardIsTempGroup = true;
4412
+			Grafreed.clipboardIsTempGroup = true;
4209
4413
 		}
4210
4414
                 
4211
4415
 		if (cut)
..
..
@@ -4245,16 +4449,16 @@
4245
4449
 		//System.out.println("cut " + child);
4246
4450
 		//System.out.println("parent = " + child.parent);
4247
4451
                 //                   tmp.addChild(child);
4248
-                                    if (GrafreeD.clipboardIsTempGroup)
4452
+                                    if (Grafreed.clipboardIsTempGroup)
4249
4453
                                             tGroup.add/*Child*/(tmp);
4250
4454
                                     else
4251
-                                            GrafreeD.clipboard = tmp;
4455
+                                            Grafreed.clipboard = tmp;
4252
4456
                                 }
4253
4457
                                 else
4254
-                                    if (GrafreeD.clipboardIsTempGroup)
4458
+                                    if (Grafreed.clipboardIsTempGroup)
4255
4459
                                             tGroup.add/*Child*/(child);
4256
4460
                                     else
4257
-                                            GrafreeD.clipboard = child;
4461
+                                            Grafreed.clipboard = child;
4258
4462
 			}
4259
4463
 			
4260
4464
 			//ResetModel();
..
..
@@ -4286,21 +4490,21 @@
4286
4490
 		//System.out.println("cut " + elem);
4287
4491
 		//System.out.println("parent = " + elem.parent);
4288
4492
                 //                    tmp.addChild(elem);
4289
-                                    if (GrafreeD.clipboardIsTempGroup)
4493
+                                    if (Grafreed.clipboardIsTempGroup)
4290
4494
                                             tGroup.add/*Child*/(tmp);
4291
4495
                                     else
4292
-                                            GrafreeD.clipboard = tmp;
4496
+                                            Grafreed.clipboard = tmp;
4293
4497
                                 }
4294
4498
                                 else
4295
-                                    if (GrafreeD.clipboardIsTempGroup)
4499
+                                    if (Grafreed.clipboardIsTempGroup)
4296
4500
                                             tGroup.add/*Child*/(child);
4297
4501
                                     else
4298
-                                            GrafreeD.clipboard = child;
4502
+                                            Grafreed.clipboard = child;
4299
4503
 			}
4300
4504
 			
4301
4505
 		}
4302
-		if (GrafreeD.clipboardIsTempGroup)
4303
-			GrafreeD.clipboard = tGroup;
4506
+		if (Grafreed.clipboardIsTempGroup)
4507
+			Grafreed.clipboard = tGroup;
4304
4508
 		if (cut)
4305
4509
                 {
4306
4510
                     ResetModel();
..
..
@@ -4314,7 +4518,7 @@
4314
4518
 	//		return;
4315
4519
 		boolean first = true;
4316
4520
 		
4317
-		if (GrafreeD.clipboardIsTempGroup)
4521
+		if (Grafreed.clipboardIsTempGroup)
4318
4522
 		{
4319
4523
 			Composite temp;
4320
4524
 			
..
..
@@ -4325,7 +4529,7 @@
4325
4529
 				temp = (Composite)Applet3D.clipboard.deepCopy();
4326
4530
                          */
4327
4531
 			Object3D elem;
4328
-			for (Enumeration e = /*temp.children*/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4532
+			for (Enumeration e = /*temp.children*/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4329
4533
 			{
4330
4534
 				Object3D child = (Object3D)e.nextElement();
4331
4535
                                 
..
..
@@ -4359,21 +4563,21 @@
4359
4563
 			//Object3D cb = Applet3D.clipboard;
4360
4564
 			//temp.addChild(cb);
4361
4565
 			//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4362
-                    assert(GrafreeD.clipboard.parent == null);
4363
-                        Object3D /*Composite*/ keepparent = GrafreeD.clipboard.get(0).parent;
4364
-                        GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4365
-                        if (LA.isIdentity(GrafreeD.clipboard.toParent))
4366
-                            makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
4566
+                    assert(Grafreed.clipboard.parent == null);
4567
+                        Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
4568
+                        Grafreed.clipboard.get(0).parent = null; // Avoid copy?
4569
+                        if (LA.isIdentity(Grafreed.clipboard.toParent))
4570
+                            makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4367
4571
                         else
4368
-                            makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4369
-                        GrafreeD.clipboard.get(0).parent = keepparent;
4572
+                            makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
4573
+                        Grafreed.clipboard.get(0).parent = keepparent;
4370
4574
 		}
4371
4575
 		
4372
4576
 		ResetModel();
4373
4577
 		refreshContents();
4374
4578
 	}
4375
4579
 	
4376
-	void pasteInto(boolean copyit)
4580
+	void pasteInto(boolean copyit, boolean clone)
4377
4581
 	{
4378
4582
 //		if (GrafreeD.clipboard == null)
4379
4583
 //			return;
..
..
@@ -4402,15 +4606,22 @@
4402
4606
 		if (copyit)
4403
4607
 		{
4404
4608
 		//	paste(false);
4405
-                    CloneClipboard(false); // sept 2014
4609
+                        if (clone)
4610
+                        {
4611
+                            CloneClipboard(false); // sept 2014
4612
+                        }
4613
+                        else
4614
+                        {
4615
+                            paste(false);
4616
+                        }
4406
4617
 		}
4407
4618
 		else
4408
4619
 		{
4409
4620
 			boolean first = true;
4410
4621
 			
4411
-			if (GrafreeD.clipboardIsTempGroup)
4622
+			if (Grafreed.clipboardIsTempGroup)
4412
4623
 			{
4413
-				Composite temp = (Composite)GrafreeD.clipboard;
4624
+				Composite temp = (Composite)Grafreed.clipboard;
4414
4625
 				Object3D copy;
4415
4626
 				for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4416
4627
 				{
..
..
@@ -4420,7 +4631,7 @@
4420
4631
 				}
4421
4632
 			} else
4422
4633
 			{
4423
-				linkSomething(GrafreeD.clipboard); //.get(0));
4634
+				linkSomething(Grafreed.clipboard); //.get(0));
4424
4635
 			}
4425
4636
 		}
4426
4637
             }
..
..
@@ -4825,21 +5036,6 @@
4825
5036
         }
4826
5037
          */
4827
5038
 
4828
-        void ImportGFD()
4829
-        {
4830
-            FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4831
-            browser.show();
4832
-            String filename = browser.getFile();
4833
-            if (filename != null && filename.length() > 0)
4834
-            {
4835
-                String fullname = browser.getDirectory() + filename;
4836
-
4837
-                //Object3D readobj =
4838
-                        objEditor.ReadGFD(fullname, objEditor);
4839
-                //makeSomething(readobj);
4840
-            }
4841
-        }
4842
-        
4843
5039
         /*
4844
5040
         public void Callback(Object obj)
4845
5041
         {
..
..
@@ -4863,26 +5059,9 @@
4863
5059
         }
4864
5060
          */
4865
5061
 
4866
-	void ImportVRMLX3D()
4867
-	{
4868
-		if (GrafreeD.standAlone)
4869
-		{
4870
-                    /**/
4871
-			FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4872
-			browser.show();
4873
-			String filename = browser.getFile();
4874
-			if (filename != null && filename.length() > 0)
4875
-			{
4876
-				String fullname = browser.getDirectory() + filename;
4877
-                                LoadVRMLX3D(fullname);
4878
-			}
4879
-                     /**/
4880
-		}
4881
-	}
4882
-				
4883
5062
 	String GetFile(String dialogName)
4884
5063
 	{
4885
-		if (GrafreeD.standAlone)
5064
+		if (Grafreed.standAlone)
4886
5065
 		{
4887
5066
 			FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4888
5067
 			browser.show();
..
..
@@ -4950,6 +5129,8 @@
4950
5129
 	cButton clearpanelButton;
4951
5130
 	cButton unselectButton;
4952
5131
 	
5132
+	cButton oneStepButton;
5133
+        
4953
5134
 	cButton screenfitButton;
4954
5135
 	cButton screenfitpointButton;
4955
5136
 	cButton snapobjectButton;
..
..
@@ -4980,6 +5161,8 @@
4980
5161
 	private MenuItem lookFromItem;
4981
5162
 	private MenuItem switchItem;
4982
5163
 	private MenuItem cutItem;
5164
+	private MenuItem undoItem;
5165
+	private MenuItem redoItem;
4983
5166
 	private MenuItem duplicateItem;
4984
5167
 	private MenuItem cloneItem;
4985
5168
 	private MenuItem cloneSupportItem;
..
..
@@ -4993,7 +5176,7 @@
4993
5176
 	private MenuItem linkverticesItem;
4994
5177
 	private MenuItem relinkverticesItem;
4995
5178
 	private MenuItem setMasterItem;
4996
-	private MenuItem resetMeshItem;
5179
+	private MenuItem resetAllItem;
4997
5180
 	private MenuItem stepAllItem;
4998
5181
 	private MenuItem revertMeshItem;
4999
5182
 	private MenuItem poseMeshItem;
..
..
@@ -5004,6 +5187,7 @@
5004
5187
 	private MenuItem mergeGeometriesItem;
5005
5188
 	private MenuItem copyItem;
5006
5189
 	private MenuItem pasteItem;
5190
+	private MenuItem pasteIntoItem;
5007
5191
 	private MenuItem pasteLinkItem;
5008
5192
 	private MenuItem pasteCloneItem;
5009
5193
 	private MenuItem pasteExpandItem;
..
..
@@ -5053,8 +5237,10 @@
5053
5237
 	private MenuItem panoTexturesItem;
5054
5238
         
5055
5239
 	private MenuItem resetCentroidItem;
5056
-	private MenuItem transformgeometryItem;
5240
+	private MenuItem resetCentroidXZItem;
5057
5241
 	private MenuItem resetTransformItem;
5242
+	private MenuItem transformGeometryItem;
5243
+	private MenuItem transformChildrenItem;
5058
5244
 	private MenuItem hideItem;
5059
5245
 	private MenuItem grabItem;
5060
5246
 	private MenuItem backItem;
..
..
@@ -5101,7 +5287,7 @@
5101
5287
 	private MenuItem blobItem;
5102
5288
 	private MenuItem latheItem;
5103
5289
 	private MenuItem bezierItem;
5104
-	private MenuItem checkerItem;
5290
+	private MenuItem overlayItem;
5105
5291
 	private MenuItem meshItem;
5106
5292
 //	private MenuItem meshGroupItem;
5107
5293
 	private MenuItem springItem;
..
..
@@ -5123,11 +5309,6 @@
5123
5309
 	private MenuItem doubleItem;
5124
5310
 	private MenuItem tripleItem;
5125
5311
         
5126
-	private MenuItem importGFDItem;
5127
-	private MenuItem importVRMLX3DItem;
5128
-	private MenuItem import3DSItem;
5129
-	private MenuItem importOBJItem;
5130
-
5131
5312
 	private MenuItem computeAOItem;
5132
5313
 	private MenuItem recompileItem;
5133
5314
 	private MenuItem editScriptItem;
..
..
@@ -5137,4 +5318,8 @@
5137
5318
 	private MenuItem analyzeItem;
5138
5319
 	private MenuItem dumpItem;
5139
5320
 	//boolean freezemodel = false;
5321
+        
5322
+    Menu cameraMenu;
5323
+    MenuItem editCameraItem;
5324
+    MenuItem revertCameraItem;
5140
5325
 }