Menu cleanup + transform feedback.

Normand Briere

2019-06-09 c5b599b48b333b34e554b464aefbca0b9bc66275

 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,124 @@
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
+		duplicateItem = menu.add(new MenuItem("Duplicate"));
158
+		duplicateItem.addActionListener(this);
159
+		cloneItem = menu.add(new MenuItem("Clone"));
160
+		cloneItem.addActionListener(this);
161
+        if (Globals.ADVANCED)
162
+        {
163
+		cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
164
+		cloneSupportItem.addActionListener(this);
165
+        }
166
+		menu.add("-");
167
+		cutItem = menu.add(new MenuItem("Cut"));
168
+		cutItem.addActionListener(this);
169
+		copyItem = menu.add(new MenuItem("Copy"));
170
+		copyItem.addActionListener(this);
171
+		pasteItem = menu.add(new MenuItem("Paste"));
172
+		pasteItem.addActionListener(this);
173
+		menu.add("-");
174
+                
175
+		menu.add("-");
176
+		pasteIntoItem = menu.add(new MenuItem("Paste into"));
177
+		pasteIntoItem.addActionListener(this);
178
+		pasteLinkItem = menu.add(new MenuItem("Paste link"));
179
+		pasteLinkItem.addActionListener(this);
180
+		pasteCloneItem = menu.add(new MenuItem("Paste clone"));
181
+		pasteCloneItem.addActionListener(this);
182
+//		pasteExpandItem = menu.add(new MenuItem("Paste expand"));
183
+//		pasteExpandItem.addActionListener(this);
184
+		menu.add("-");
185
+		clearItem = menu.add(new MenuItem("Clear"));
186
+		clearItem.addActionListener(this);
187
+                
188
+        if (Globals.ADVANCED)
189
+        {
190
+                // Deletes the cameras...
191
+		clearAllItem = menu.add(new MenuItem("Clear All"));
192
+		clearAllItem.addActionListener(this);
193
+        }
194
+        
195
+        menuBar.add(cameraMenu = new Menu("View"));
196
+        //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
197
+        //zBufferItem.addActionListener(this);
198
+        //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
199
+        //normalLensItem.addActionListener(this);
200
+        cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
201
+        revertCameraItem.addActionListener(this);
202
+        
203
+        cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
204
+        toggleFullScreenItem.addItemListener(this);
205
+        toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
206
+        cameraMenu.add("-");
207
+        
208
+        cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
209
+        toggleTextureItem.addItemListener(this);
210
+        toggleTextureItem.setState(CameraPane.textureon);
211
+        
212
+        cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
213
+        toggleSwitchItem.addItemListener(this);
214
+        toggleSwitchItem.setState(CameraPane.SWITCH);
215
+        
216
+        cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
217
+        toggleHandleItem.addItemListener(this);
218
+        toggleHandleItem.setState(CameraPane.HANDLES);
219
+        
220
+        cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
221
+        togglePaintItem.addItemListener(this);
222
+        togglePaintItem.setState(CameraPane.PAINTMODE);
223
+        
224
+        if (Globals.ADVANCED)
225
+        {
226
+        cameraMenu.add("-");
227
+                cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
228
+                toggleLiveItem.addItemListener(this);
229
+                toggleLiveItem.setState(Globals.isLIVE());
230
+
231
+                cameraMenu.add(stepItem = new MenuItem("Step"));
232
+                stepItem.addActionListener(this);
233
+        //		cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
234
+        //		toggleDLItem.addItemListener(this);
235
+        //                toggleDLItem.setState(false);
236
+
237
+                cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
238
+                toggleRenderItem.addItemListener(this);
239
+                toggleRenderItem.setState(!CameraPane.frozen);
240
+
241
+                cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
242
+                toggleDebugItem.addItemListener(this);
243
+                toggleDebugItem.setState(CameraPane.DEBUG);
244
+
245
+                cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
246
+                toggleFrustumItem.addItemListener(this);
247
+                toggleFrustumItem.setState(CameraPane.FRUSTUM);
248
+
249
+                cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
250
+                toggleFootContactItem.addItemListener(this);
251
+                toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
252
+                
253
+                cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
254
+                toggleTimelineItem.addItemListener(this);
255
+        }
256
+        
257
+//		cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
258
+//		toggleRootItem.addItemListener(this);
259
+//                    toggleRootItem.setState(false);
260
+//		cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
261
+//		animationItem.addItemListener(this);
262
+//                    animationItem.setState(CameraPane.ANIMATION);
263
+        cameraMenu.add("-");
264
+        cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
265
+        editCameraItem.addActionListener(this);
266
+        
267
+        if (Globals.ADVANCED)
268
+        {
153
269
 		oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
154
270
 		//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
155
271
 		//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..
..
@@ -161,45 +277,17 @@
161
277
 		lookAtItem.addActionListener(this);
162
278
 		//lookFromItem.addActinoListener(this);
163
279
 		//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
-
280
+        }
281
+        
193
282
 		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);
283
+        if (Globals.ADVANCED)
284
+        {
198
285
 		revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199
286
 		revertMeshItem.addActionListener(this);
200
287
 		resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201
288
 		resetreferencesItem.addActionListener(this);
202
289
 		menu.add("-");
290
+        }
203
291
 		overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204
292
 		overwriteGeoItem.addActionListener(this);
205
293
 		overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..
..
@@ -211,19 +299,26 @@
211
299
 		overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212
300
 		overwriteUVItem.addActionListener(this);
213
301
 		menu.add("-");
302
+        if (Globals.ADVANCED)
303
+        {
214
304
 		generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215
305
 		generateMeshItem.addActionListener(this);
216
306
 		poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217
307
 		poseMeshItem.addActionListener(this);
218
308
 		menu.add("-");
309
+        }
219
310
 		resetsupportItem = menu.add(new MenuItem("Reset support"));
220
311
 		resetsupportItem.addActionListener(this);
221
312
 		linkverticesItem = menu.add(new MenuItem("Link to Support"));
222
313
 		linkverticesItem.addActionListener(this);
223
314
 		relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224
315
 		relinkverticesItem.addActionListener(this);
316
+                
317
+        if (Globals.ADVANCED)
318
+        {
225
319
 		setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226
320
 		setMasterItem.addActionListener(this);
321
+        }
227
322
                 
228
323
 		oe.menuBar.add(menu = new Menu("Group"));
229
324
 		grabItem = menu.add(new MenuItem("Grab"));
..
..
@@ -234,7 +329,7 @@
234
329
 		frontItem.addActionListener(this);
235
330
 		compositeItem = menu.add(new MenuItem("Composite"));
236
331
 		compositeItem.addActionListener(this);
237
-		hideItem = menu.add(new MenuItem("Hide"));
332
+		hideItem = menu.add(new MenuItem("Hidden Group"));
238
333
 		hideItem.addActionListener(this);
239
334
 		ungroupItem = menu.add(new MenuItem("Ungroup"));
240
335
 		ungroupItem.addActionListener(this);
..
..
@@ -245,16 +340,21 @@
245
340
 		switchGeoItem.addActionListener(this);
246
341
 		switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
247
342
 		switchTransfoItem.addActionListener(this);
343
+		morphItem = menu.add(new MenuItem("Morph Group"));
344
+		morphItem.addActionListener(this);
345
+                
346
+        if (Globals.ADVANCED)
347
+        {
348
+		menu.add("-");
248
349
 		physicsItem = menu.add(new MenuItem("Physics"));
249
350
 		physicsItem.addActionListener(this);
250
351
 		frameselectorItem = menu.add(new MenuItem("Frame Selector"));
251
352
 		frameselectorItem.addActionListener(this);
252
-		morphItem = menu.add(new MenuItem("Morph"));
253
-		morphItem.addActionListener(this);
254
353
 		scriptNodeItem = menu.add(new MenuItem("Script Node"));
255
354
 		scriptNodeItem.addActionListener(this);
256
355
 		cameraItem = menu.add(new MenuItem("Camera"));
257
356
 		cameraItem.addActionListener(this);
357
+        }
258
358
                 
259
359
 		oe.menuBar.add(menu = new Menu("Object"));
260
360
 		textureItem = menu.add(new MenuItem("Texture"));
..
..
@@ -269,21 +369,29 @@
269
369
 		shadowYItem.addActionListener(this);
270
370
                 shadowZItem = menu.add(new MenuItem("Shadow Z"));
271
371
 		shadowZItem.addActionListener(this);
372
+        if (Globals.ADVANCED)
373
+        {
374
+		menu.add("-");
272
375
 		linkerItem = menu.add(new MenuItem("Linker"));
273
376
 		linkerItem.addActionListener(this);
274
-		templateItem = menu.add(new MenuItem("Template"));
275
-		templateItem.addActionListener(this);
276
377
 		attributeItem = menu.add(new MenuItem("Attribute"));
277
378
 		attributeItem.addActionListener(this);
379
+		templateItem = menu.add(new MenuItem("Template"));
380
+		templateItem.addActionListener(this);
278
381
 		pointflowItem = menu.add(new MenuItem("Point Flow"));
279
382
 		pointflowItem.addActionListener(this);
383
+        }
280
384
 		menu.add("-");
281
385
 		resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282
386
 		resetTransformItem.addActionListener(this);
283
387
 		resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284
388
 		resetCentroidItem.addActionListener(this);
285
-		transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286
-		transformgeometryItem.addActionListener(this);
389
+		resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
390
+		resetCentroidXZItem.addActionListener(this);
391
+		transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
392
+		transformGeometryItem.addActionListener(this);
393
+		transformChildrenItem = menu.add(new MenuItem("Transform Children"));
394
+		transformChildrenItem.addActionListener(this);
287
395
                 
288
396
 		oe.menuBar.add(menu = new Menu("Geometry"));
289
397
 		genUVItem = menu.add(new MenuItem("Generate UV"));
..
..
@@ -294,8 +402,11 @@
294
402
 		genNormalsCADItem.addActionListener(this);
295
403
 		genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296
404
 		genNormalsMESHItem.addActionListener(this);
405
+        if (Globals.ADVANCED)
406
+        {
297
407
 		genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
298
408
 		genNormalsMINEItem.addActionListener(this);
409
+        }
299
410
 		stripifyItem = menu.add(new MenuItem("Stripify"));
300
411
 		stripifyItem.addActionListener(this);
301
412
 		unstripifyItem = menu.add(new MenuItem("Unstripify"));
..
..
@@ -317,23 +428,34 @@
317
428
 		reduce34MeshItem.addActionListener(this);
318
429
 		increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319
430
 		increaseMeshItem.addActionListener(this);
320
-		smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321
-		smoothMeshItem.addActionListener(this);
322
431
 		clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323
432
 		clipMeshItem.addActionListener(this);
433
+                
434
+        if (Globals.ADVANCED)
435
+        {
436
+		smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
437
+		smoothMeshItem.addActionListener(this);
438
+        }
324
439
 
325
440
                 oe.menuBar.add(menu = new Menu("Attributes"));
326
441
 		clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327
442
 		clearMaterialsItem.addActionListener(this);
443
+                resetAllItem = menu.add(new MenuItem("Reset All"));
444
+		resetAllItem.addActionListener(this);
445
+		stepAllItem = menu.add(new MenuItem("Step All"));
446
+		stepAllItem.addActionListener(this);
328
447
 		menu.add("-");
329
448
 		liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330
449
 		liveleavesItem.addActionListener(this);
331
450
 		unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332
451
 		unliveleavesItem.addActionListener(this);
452
+        if (Globals.ADVANCED)
453
+        {
333
454
 		supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334
455
 		supportleavesItem.addActionListener(this);
335
456
 		unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336
457
 		unsupportleavesItem.addActionListener(this);
458
+        }
337
459
 		hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338
460
 		hideleavesItem.addActionListener(this);
339
461
 		showleavesItem = menu.add(new MenuItem("Show Leaves"));
..
..
@@ -377,29 +499,22 @@
377
499
 		sortbynameItem = menu.add(new MenuItem("Sort by name"));
378
500
 		sortbynameItem.addActionListener(this);
379
501
 		menu.add("-");
502
+		shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
503
+		shareGeometriesItem.addActionListener(this);
504
+		mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
505
+		mergeGeometriesItem.addActionListener(this);
506
+        if (Globals.ADVANCED)
507
+        {
508
+            // Pretty much the same as duplicate and clone.
380
509
 		extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381
510
 		extractGeometriesItem.addActionListener(this);
382
511
 		cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383
512
 		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);
513
+        }
388
514
                 
389
515
 		oe.menuBar.add(menu = new Menu("Insert"));
390
516
 		buildCreateMenu(menu);
391
517
                 
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
518
                 oe.menuBar.add(menu = new Menu("Tools"));
404
519
 		buildToolsMenu(menu);
405
520
 	}
..
..
@@ -437,9 +552,13 @@
437
552
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
438
553
                 
439
554
                 oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
440
-                liveCB.setToolTipText("Enabled animation");
555
+                liveCB.setToolTipText("Enable animation");
441
556
                                 liveCB.addItemListener(this);
442
557
 
558
+		oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
559
+                oneStepButton.setToolTipText("Animate one step forward");
560
+		oneStepButton.addActionListener(this);
561
+                
443
562
                 oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
444
563
                 fastCB.setToolTipText("Fast mode");
445
564
                                 fastCB.addItemListener(this);
..
..
@@ -448,7 +567,7 @@
448
567
                 trackCB.setToolTipText("Enable tracking");
449
568
                                 trackCB.addItemListener(this);
450
569
 
451
-		oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
570
+		oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
452
571
                 screenfitButton.setToolTipText("Screen fit");
453
572
 		screenfitButton.addActionListener(this);
454
573
 
..
..
@@ -457,39 +576,39 @@
457
576
 
458
577
                 if (Globals.ADVANCED)
459
578
                 {
460
-                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
579
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
461
580
                         snapobjectButton.addActionListener(this);
462
581
                         snapobjectButton.setToolTipText("Snap Object");
463
582
                 }
464
583
 
465
-		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
584
+		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
466
585
                 flashSelectionButton.setToolTipText("Show selection");
467
586
 		flashSelectionButton.addActionListener(this);
468
587
                 
469
588
 		oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
470
589
                 
471
-		oe.toolbarPanel.add(twoButton = new cButton("|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
590
+		oe.toolbarPanel.add(twoButton = new cButton("|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
472
591
                 twoButton.setToolTipText("Show center view only");
473
592
 		twoButton.addActionListener(this);
474
-		oe.toolbarPanel.add(fourButton = new cButton("+||", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
593
+		oe.toolbarPanel.add(fourButton = new cButton("+||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
475
594
 		fourButton.addActionListener(this);
476
595
                 fourButton.setToolTipText("Show left panel only");
477
-		oe.toolbarPanel.add(sixButton = new cButton("+|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
596
+		oe.toolbarPanel.add(sixButton = new cButton("+|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
478
597
                 sixButton.setToolTipText("2-column layout left");
479
598
 		sixButton.addActionListener(this);
480
-		oe.toolbarPanel.add(threeButton = new cButton("|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
599
+		oe.toolbarPanel.add(threeButton = new cButton("|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
481
600
                 threeButton.setToolTipText("2-column layout right");
482
601
 		threeButton.addActionListener(this);
483
-		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
602
+		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
484
603
                 sevenButton.setToolTipText("3-column layout");
485
604
 		sevenButton.addActionListener(this);
486
605
                 //
487
606
 
488
-		oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
607
+		oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
489
608
                 rootButton.setToolTipText("Edit selection in new tab");
490
609
 		rootButton.addActionListener(this);
491
610
 
492
-                oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
611
+                oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
493
612
                 closeButton.setToolTipText("Close tab");
494
613
 		closeButton.addActionListener(this);
495
614
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..
..
@@ -497,23 +616,23 @@
497
616
                         
498
617
                 cGridBag commandsPanel = new cGridBag();
499
618
                 
500
-		commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
619
+		commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
501
620
                 editButton.setToolTipText("Edit selection");
502
621
 		editButton.addActionListener(this);
503
622
 
504
-		commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
623
+		commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
505
624
                 uneditButton.setToolTipText("Unedit selection");
506
625
 		uneditButton.addActionListener(this);
507
626
 
508
-		commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
627
+		commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
628
+                allParamsButton.setToolTipText("Edit all params");
629
+		allParamsButton.addActionListener(this);
630
+
631
+		commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
509
632
                 clearPanelButton.setToolTipText("Clear edit panel");
510
633
 		clearPanelButton.addActionListener(this);
511
634
 
512
-		commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
513
-                allParamsButton.setToolTipText("All params??");
514
-		allParamsButton.addActionListener(this);
515
-
516
-		commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
635
+		commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
517
636
                 unselectButton.setToolTipText("Unselect");
518
637
 		unselectButton.addActionListener(this);
519
638
 
..
..
@@ -588,8 +707,18 @@
588
707
         
589
708
         void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
590
709
         {
710
+                panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
711
+                boxCB.setToolTipText("Display bounding boxes");
712
+                                boxCB.addItemListener(this);
713
+                                
714
+                panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
715
+                zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
716
+                                zoomBoxCB.addItemListener(this);
717
+
718
+        if (true) // Globals.ADVANCED)
719
+        {
591
720
                 panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
592
-                supportCB.setToolTipText("Enabled rigging");
721
+                supportCB.setToolTipText("Enable rigging");
593
722
                                 supportCB.addItemListener(this);
594
723
 
595
724
         //        panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
..
..
@@ -607,14 +736,6 @@
607
736
                 slowCB.setToolTipText("Smooth interpolation");
608
737
                                 slowCB.addItemListener(this);
609
738
                                 
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
739
 //        	constraints.gridy += 1;
619
740
 //                panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
620
741
 //                                speakerMocapCB.addItemListener(this);
..
..
@@ -645,6 +766,8 @@
645
766
                 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
646
767
                 lookAtCB.setToolTipText("Look-at target");
647
768
                                 lookAtCB.addItemListener(this);
769
+                
770
+        }
648
771
                                 
649
772
                 cGridBag fill = new cGridBag();
650
773
                                 
..
..
@@ -665,6 +788,7 @@
665
788
             buttonGroup.add(radioButton);
666
789
             radioButton.doClick();
667
790
         }
791
+        
668
792
         void SetupViews(ObjEditor oe)
669
793
         {
670
794
             oe.SetupViews();
..
..
@@ -881,7 +1005,9 @@
881
1005
 //                        objEditor.DropFile((java.io.File[]) object, true);
882
1006
 //                        return;
883
1007
 //                    }
884
-                    if (string.charAt(0) == '/')
1008
+                    
1009
+                    // File path for Mac and Windows
1010
+                    if (string.charAt(0) == '/' || string.charAt(1) == ':')
885
1011
                     {
886
1012
                         // file(s)
887
1013
                         String[] names = string.split("\n");
..
..
@@ -908,7 +1034,7 @@
908
1034
                     
909
1035
                     flashIt = false;
910
1036
                     CameraPane pane = (CameraPane) target;
911
-                    pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
1037
+                    pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
912
1038
                     pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
913
1039
                     
914
1040
                     if (group.selection.size() == 1)
..
..
@@ -935,11 +1061,11 @@
935
1061
             {
936
1062
                 loadClipboard(true);
937
1063
                 objEditor.jTree.setSelectionPath(destinationPath);
938
-                pasteInto(false);
1064
+                pasteInto(false, false);
939
1065
             } else {
940
1066
                 loadClipboard(false);
941
1067
                 objEditor.jTree.setSelectionPath(destinationPath);
942
-                pasteInto(false); // true); // ???
1068
+                pasteInto(false, false); // true); // ???
943
1069
             }
944
1070
 	}
945
1071
 	public void	dropActionChanged(DropTargetDragEvent dtde) 
..
..
@@ -1061,27 +1187,33 @@
1061
1187
 		kleinItem.addActionListener(this);
1062
1188
 		particleItem = menu.add(new MenuItem("Particle system"));
1063
1189
 		particleItem.addActionListener(this);
1190
+        if (Globals.ADVANCED)
1191
+        {
1064
1192
 		ragdollItem = menu.add(new MenuItem("Rag Walk"));
1065
1193
 		ragdollItem.addActionListener(this);
1066
1194
 		ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1067
1195
 		ragdoll2Item.addActionListener(this);
1196
+        }
1068
1197
 		menu.add("-");
1069
-		meshItem = menu.add(new MenuItem("Mesh"));
1198
+		meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1070
1199
 		meshItem.addActionListener(this);
1071
1200
 	//	meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1072
1201
 	//	meshGroupItem.addActionListener(this);
1202
+        if (Globals.ADVANCED)
1203
+        {
1073
1204
 		springItem = menu.add(new MenuItem("Spring"));
1074
1205
 		springItem.addActionListener(this);
1075
1206
 		flagItem = menu.add(new MenuItem("Flag"));
1076
1207
 		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
1208
 		blobItem = menu.add(new MenuItem("Blob"));
1082
1209
 		blobItem.addActionListener(this);
1083
1210
 		latheItem = menu.add(new MenuItem("Lathe"));
1084
1211
 		latheItem.addActionListener(this);
1212
+        }
1213
+		bezierItem = menu.add(new MenuItem("Bezier Patch"));
1214
+		bezierItem.addActionListener(this);
1215
+		overlayItem = menu.add(new MenuItem("Overlay"));
1216
+		overlayItem.addActionListener(this);
1085
1217
 		lightItem = menu.add(new MenuItem("Light"));
1086
1218
 		lightItem.addActionListener(this);
1087
1219
 		menu.add("-");
..
..
@@ -1091,8 +1223,11 @@
1091
1223
 		loopItem.addActionListener(this);
1092
1224
 		doubleItem = menu.add(new MenuItem("Fork"));
1093
1225
 		doubleItem.addActionListener(this);
1226
+        if (Globals.ADVANCED)
1227
+        {
1094
1228
 		tripleItem = menu.add(new MenuItem("Trident"));
1095
1229
 		tripleItem.addActionListener(this);
1230
+        }
1096
1231
 	}
1097
1232
         
1098
1233
 	void buildToolsMenu(Menu menu)
..
..
@@ -1106,19 +1241,21 @@
1106
1241
 		parseverticesItem.addActionListener(this);
1107
1242
 		textureFieldItem = menu.add(new MenuItem("Texture Field"));
1108
1243
 		textureFieldItem.addActionListener(this);
1109
-		alignItem = menu.add(new MenuItem("Align"));
1244
+		alignItem = menu.add(new MenuItem("Align Objects"));
1110
1245
 		alignItem.addActionListener(this);
1111
-		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1112
-		mirrorItem.addActionListener(this);
1113
1246
 		reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1114
1247
 		reduceMorphItem.addActionListener(this);
1115
1248
 		reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1116
1249
 		reduce34MorphItem.addActionListener(this);
1117
-                
1250
+		menu.add("-");
1118
1251
 		menu.add(computeAOItem = new MenuItem("Compute AO"));
1119
1252
 		computeAOItem.addActionListener(this);
1120
-		menu.add("-");
1121
1253
                 
1254
+        if (Globals.ADVANCED)
1255
+        {
1256
+		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1257
+		mirrorItem.addActionListener(this);
1258
+		menu.add("-");
1122
1259
 		menu.add(memoryItem = new MenuItem("Memory Usage"));
1123
1260
 		memoryItem.addActionListener(this);
1124
1261
 		menu.add(analyzeItem = new MenuItem("Analyze"));
..
..
@@ -1141,6 +1278,7 @@
1141
1278
 		menu.add("-");
1142
1279
 		menu.add(editScriptItem = new MenuItem("Edit Script..."));
1143
1280
 		editScriptItem.addActionListener(this);
1281
+        }
1144
1282
         }
1145
1283
         
1146
1284
         void ScreenFit()
..
..
@@ -1469,9 +1607,9 @@
1469
1607
     
1470
1608
     void Overwrite(int mask)
1471
1609
     {
1472
-        if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
1610
+        if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
1473
1611
         {
1474
-            Object3D content = GrafreeD.clipboard.get(0);
1612
+            Object3D content = Grafreed.clipboard.get(0);
1475
1613
 
1476
1614
             if (content instanceof cGroup && ((cGroup)content).transientlink )
1477
1615
                 content = ((cGroup)content).get(0);
..
..
@@ -1642,7 +1780,7 @@
1642
1780
 		{
1643
1781
 			makeSomething(new BezierSurface());
1644
1782
 		} else
1645
-		if (source == checkerItem)
1783
+		if (source == overlayItem)
1646
1784
 		{
1647
1785
                     /*
1648
1786
 			Object3D obj = new BezierSurface(5,8);
..
..
@@ -1776,23 +1914,6 @@
1776
1914
                         csg.addChild(child);
1777
1915
                         child.addChild(csg);
1778
1916
 		} 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
1917
 		if (source == computeAOItem)
1797
1918
 		{
1798
1919
                     Globals.drawMode = CameraPane.OCCLUSION;
..
..
@@ -1811,7 +1932,7 @@
1811
1932
 		if (source == invariantsItem)
1812
1933
 		{
1813
1934
                     System.out.println("Invariants:");
1814
-                    GrafreeD.grafreeD.universe.invariants();
1935
+                    Grafreed.grafreeD.universe.invariants();
1815
1936
 		} else
1816
1937
 		if (source == memoryItem)
1817
1938
 		{
..
..
@@ -1829,6 +1950,11 @@
1829
1950
 		if (source == dumpItem)
1830
1951
 		{
1831
1952
                     DumpObject();
1953
+		} else
1954
+		if (source == oneStepButton)
1955
+		{
1956
+                    Globals.ONESTEP = true;
1957
+                    cameraView.repaint();
1832
1958
 		} else
1833
1959
 		if (source == screenfitButton)
1834
1960
 		{
..
..
@@ -1881,10 +2007,10 @@
1881
2007
 		} else
1882
2008
 		if (source == duplicateItem)
1883
2009
 		{
1884
-                    Object3D keep = GrafreeD.clipboard;
2010
+                    Object3D keep = Grafreed.clipboard;
1885
2011
 			loadClipboard(false);
1886
2012
 			paste(false);
1887
-                    GrafreeD.clipboard = keep;
2013
+                    Grafreed.clipboard = keep;
1888
2014
 		} else
1889
2015
 		if (source == cloneItem)
1890
2016
 		{
..
..
@@ -1902,13 +2028,17 @@
1902
2028
 		{
1903
2029
 			paste(false);
1904
2030
 		} else
2031
+		if (source == pasteIntoItem)
2032
+		{
2033
+			pasteInto(true, false);
2034
+		} else
1905
2035
 		if (source == pasteLinkItem)
1906
2036
 		{
1907
-			pasteInto(false);
2037
+			pasteInto(false, false);
1908
2038
 		} else
1909
2039
 		if (source == pasteCloneItem)
1910
2040
 		{
1911
-			pasteInto(true);
2041
+			pasteInto(true, true);
1912
2042
 		} else
1913
2043
 		if (source == pasteExpandItem)
1914
2044
 		{
..
..
@@ -2100,9 +2230,9 @@
2100
2230
 //                        group.selection.get(0).setMasterThis(content); // should be identity
2101
2231
 //		refreshContents();
2102
2232
 //                    }
2103
-                    if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
2233
+                    if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
2104
2234
                     {
2105
-                        Object3D content = GrafreeD.clipboard.get(0);
2235
+                        Object3D content = Grafreed.clipboard.get(0);
2106
2236
                         
2107
2237
                         if (content instanceof cGroup && ((cGroup)content).transientlink )
2108
2238
                             content = ((cGroup)content).get(0);
..
..
@@ -2110,11 +2240,11 @@
2110
2240
             Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2111
2241
                         for (int i=0; i<group.selection.size(); i++)
2112
2242
                         {
2113
-                            boolean random = CameraPane.RANDOM;
2114
-                            CameraPane.RANDOM = false; // parse all random nodes
2243
+                            boolean random = CameraPane.SWITCH;
2244
+                            CameraPane.SWITCH = false; // parse all random nodes
2115
2245
                             group.selection.get(i).linkVerticesThis(content);
2116
2246
                       //      group.selection.get(i).setMasterThis(content); // should be identity
2117
-                            CameraPane.RANDOM = random;
2247
+                            CameraPane.SWITCH = random;
2118
2248
                         }
2119
2249
             Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2120
2250
 		refreshContents();
..
..
@@ -2124,20 +2254,20 @@
2124
2254
 		{
2125
2255
                     for (int i=0; i<group.selection.size(); i++)
2126
2256
                     {
2127
-                        boolean random = CameraPane.RANDOM;
2128
-                        CameraPane.RANDOM = false; // parse all random nodes
2257
+                        boolean random = CameraPane.SWITCH;
2258
+                        CameraPane.SWITCH = false; // parse all random nodes
2129
2259
                         group.selection.get(i).linkVerticesThis(null);
2130
-                        CameraPane.RANDOM = random;
2260
+                        CameraPane.SWITCH = random;
2131
2261
                     }
2132
2262
 
2133
2263
                     refreshContents();
2134
2264
 		} else
2135
2265
 		if (source == relinkverticesItem)
2136
2266
 		{
2137
-                    boolean random = CameraPane.RANDOM;
2138
-                    CameraPane.RANDOM = false; // parse all random nodes
2267
+                    boolean random = CameraPane.SWITCH;
2268
+                    CameraPane.SWITCH = false; // parse all random nodes
2139
2269
                     group.selection.RelinkToSupport();
2140
-                    CameraPane.RANDOM = random;
2270
+                    CameraPane.SWITCH = random;
2141
2271
 
2142
2272
                     refreshContents();
2143
2273
 		} else
..
..
@@ -2152,9 +2282,9 @@
2152
2282
 		} else
2153
2283
 		if (source == setMasterItem)
2154
2284
 		{
2155
-                    if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2285
+                    if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2156
2286
                     {
2157
-                        Object3D content = GrafreeD.clipboard.get(0);
2287
+                        Object3D content = Grafreed.clipboard.get(0);
2158
2288
                         
2159
2289
                         if (content instanceof cGroup && ((cGroup)content).transientlink )
2160
2290
                             content = ((cGroup)content).get(0);
..
..
@@ -2167,9 +2297,9 @@
2167
2297
 		{
2168
2298
                     if (group.selection.size() == 1)
2169
2299
                     {
2170
-                        if (GrafreeD.clipboard.size() == 1)
2300
+                        if (Grafreed.clipboard.size() == 1)
2171
2301
                         {
2172
-                            Object3D content = GrafreeD.clipboard.get(0);
2302
+                            Object3D content = Grafreed.clipboard.get(0);
2173
2303
 
2174
2304
                             if (content instanceof cGroup && ((cGroup)content).transientlink )
2175
2305
                                 content = ((cGroup)content).get(0);
..
..
@@ -2186,7 +2316,7 @@
2186
2316
 		{
2187
2317
 			RevertMeshes();
2188
2318
 		} else
2189
-		if (source == resetMeshItem)
2319
+		if (source == resetAllItem)
2190
2320
 		{
2191
2321
 			ResetAll();
2192
2322
 		} else
..
..
@@ -2524,9 +2654,13 @@
2524
2654
                 {
2525
2655
 			SmoothMesh();
2526
2656
 		} else
2527
-		if (source == transformgeometryItem)
2657
+		if (source == transformGeometryItem)
2528
2658
 		{
2529
2659
                         TransformGeometry();
2660
+		} else
2661
+		if (source == transformChildrenItem)
2662
+		{
2663
+                        TransformChildren();
2530
2664
 		} else
2531
2665
 		if (source == resetTransformItem)
2532
2666
 		{
..
..
@@ -2534,7 +2668,11 @@
2534
2668
 		} else
2535
2669
 		if (source == resetCentroidItem)
2536
2670
 		{
2537
-                        ResetCentroid();
2671
+                        ResetCentroid(true);
2672
+		} else
2673
+		if (source == resetCentroidXZItem)
2674
+		{
2675
+                        ResetCentroid(false);
2538
2676
 		} else
2539
2677
 		if (source == resetParentItem)
2540
2678
 		{
..
..
@@ -2892,7 +3030,7 @@
2892
3030
                                 
2893
3031
                                 child.editWindow = null; // ???????????
2894
3032
 			}
2895
-			objEditor.ctrlPanel.validate();
3033
+			objEditor.ctrlPanel.FlushUI();
2896
3034
 			//objEditor.jTree.clearSelection();
2897
3035
 			//objEditor.ResetSliders();
2898
3036
                     refreshContents(true);
..
..
@@ -2976,7 +3114,9 @@
2976
3114
                         frontView.object = group;
2977
3115
                         sideView.object = group;
2978
3116
                     }
2979
-                    group.editWindow = this;
3117
+                    
3118
+// fix "+" issue                    group.editWindow = this;
3119
+                    
2980
3120
                     /*
2981
3121
                     currentLayout = radio.layout;
2982
3122
                     if (currentLayout == null)
..
..
@@ -2989,7 +3129,20 @@
2989
3129
                     //group.attributes = -1;
2990
3130
                     ResetModel();
2991
3131
                     refreshContents(true);
2992
-                }
3132
+                } else if (event.getSource() == editCameraItem)
3133
+                {
3134
+                    cameraView.ProtectCamera();
3135
+                    cameraView.repaint();
3136
+                    return;
3137
+                } else if (event.getSource() == revertCameraItem)
3138
+                {
3139
+                    cameraView.RevertCamera();
3140
+                    cameraView.repaint();
3141
+                    return;
3142
+        //        } else if (event.getSource() == textureButton)
3143
+        //        {
3144
+        //            return; // true;
3145
+                } 
2993
3146
                 else
2994
3147
                 {
2995
3148
 			//return super.action(event, arg);
..
..
@@ -3050,6 +3203,28 @@
3050
3203
             refreshContents();
3051
3204
         }
3052
3205
         
3206
+        void TransformChildren()
3207
+        {
3208
+            Object3D obj;
3209
+            for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3210
+            {
3211
+                    obj = (Object3D)e.nextElement();
3212
+                    obj.KeepTextureMatrices();
3213
+                    obj.TransformChildren();
3214
+                    obj.RestoreTextureMatrices();
3215
+                                        
3216
+//                    if (obj.parent == null)
3217
+//                    {
3218
+//                        System.out.println("NULL PARENT!");
3219
+//                        new Exception().printStackTrace();
3220
+//                    }
3221
+//                    else
3222
+//                        TouchTransform(obj);
3223
+//                        //obj.parent.Touch();
3224
+            }
3225
+
3226
+            refreshContents();
3227
+        }
3053
3228
         
3054
3229
         void ResetTransform()
3055
3230
         {
..
..
@@ -3162,7 +3337,7 @@
3162
3337
             refreshContents();
3163
3338
         }
3164
3339
         
3165
-        void ResetCentroid()
3340
+        void ResetCentroid(boolean full)
3166
3341
         {
3167
3342
             Object3D obj;
3168
3343
             for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..
..
@@ -3177,12 +3352,16 @@
3177
3352
                     LA.matIdentity(Object3D.mat);
3178
3353
                     obj.getBounds(minima, maxima, false);
3179
3354
                     Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3180
-                    Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3355
+                    if (full)
3356
+                        Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3181
3357
                     Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3182
3358
                     obj.TransformMesh(Object3D.mat);
3359
+                    
3183
3360
                     Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3184
-                    Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3361
+                    if (full)
3362
+                        Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3185
3363
                     Object3D.mat[3][2] = (minima.z + maxima.z)/2;
3364
+                    
3186
3365
                     LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3187
3366
                     //Object3D.mat[3][0] = -Object3D.mat[3][0];
3188
3367
                     //Object3D.mat[3][1] = -Object3D.mat[3][1];
..
..
@@ -3248,9 +3427,9 @@
3248
3427
                     obj = (Object3D)e.nextElement();
3249
3428
                     
3250
3429
                     System.out.println("Object is: " + obj);
3251
-                    GrafreeD.AnalyzeObject(obj);
3430
+                    Grafreed.AnalyzeObject(obj);
3252
3431
                     System.out.println("Boundary rep: " + obj.bRep);
3253
-                    GrafreeD.AnalyzeObject(obj.bRep);
3432
+                    Grafreed.AnalyzeObject(obj.bRep);
3254
3433
                     
3255
3434
 //                    System.err.println((size/1024) + " KB is the size of " + obj);
3256
3435
                 }
..
..
@@ -3464,8 +3643,8 @@
3464
3643
 	
3465
3644
 	void ParseVertices()
3466
3645
 	{
3467
-            boolean epsequal = GrafreeD.epsequal;
3468
-            GrafreeD.epsequal = true;
3646
+            boolean epsequal = Grafreed.epsequal;
3647
+            Grafreed.epsequal = true;
3469
3648
             
3470
3649
             for (int i=0; i<group.selection.size(); i++)
3471
3650
             {
..
..
@@ -3490,7 +3669,7 @@
3490
3669
                                 LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3491
3670
                                 LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3492
3671
 
3493
-                                g.add(GrafreeD.clipboard);
3672
+                                g.add(Grafreed.clipboard);
3494
3673
 
3495
3674
                                 buffer.add(g);
3496
3675
                             }
..
..
@@ -3505,7 +3684,7 @@
3505
3684
                 makeSomething(buffer, i==group.selection.size()-1);
3506
3685
             }
3507
3686
             
3508
-            GrafreeD.epsequal = epsequal;
3687
+            Grafreed.epsequal = epsequal;
3509
3688
             
3510
3689
             refreshContents();
3511
3690
 	}
..
..
@@ -3523,7 +3702,16 @@
3523
3702
                             String pigment = Object3D.GetPigment(tex);
3524
3703
                             //String bump = Object3D.GetBump(tex);
3525
3704
                             
3526
-                            com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3705
+                            com.sun.opengl.util.texture.TextureData texturedata = null;
3706
+                            
3707
+                            try
3708
+                            {
3709
+                                texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3710
+                            }
3711
+                            catch (Exception e)
3712
+                            {
3713
+                                System.err.println("FAIL: " + node);
3714
+                            }
3527
3715
                             
3528
3716
                             double s = v.s;
3529
3717
                             
..
..
@@ -3611,11 +3799,11 @@
3611
3799
 
3612
3800
             SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3613
3801
 
3614
-            boolean random = CameraPane.RANDOM;
3615
-            CameraPane.RANDOM = false; // parse all random nodes
3802
+            boolean random = CameraPane.SWITCH;
3803
+            CameraPane.SWITCH = false; // parse all random nodes
3616
3804
             lowres.linkVerticesThis(null);
3617
3805
             lowres.linkVerticesThis(sn);
3618
-            CameraPane.RANDOM = random;
3806
+            CameraPane.SWITCH = random;
3619
3807
 
3620
3808
             System.err.flush();
3621
3809
 
..
..
@@ -3655,7 +3843,7 @@
3655
3843
                 return;
3656
3844
             
3657
3845
             Object3D poses = group.selection.get(0);
3658
-            Object3D ref = GrafreeD.clipboard.get(0);
3846
+            Object3D ref = Grafreed.clipboard.get(0);
3659
3847
             
3660
3848
             Object3D newgroup = new Object3D("Po:" + poses.name);
3661
3849
             
..
..
@@ -3849,9 +4037,9 @@
3849
4037
 	
3850
4038
 	void ClipMesh()
3851
4039
 	{
3852
-            if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
4040
+            if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
3853
4041
             {
3854
-                Object3D content = GrafreeD.clipboard.get(0);
4042
+                Object3D content = Grafreed.clipboard.get(0);
3855
4043
 
3856
4044
                 if (content instanceof cGroup && ((cGroup)content).transientlink )
3857
4045
                     content = ((cGroup)content).get(0);
..
..
@@ -3860,7 +4048,7 @@
3860
4048
 //                {
3861
4049
 //                    group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3862
4050
 //                }
3863
-                  group.selection.ClipMesh(GrafreeD.clipboard);
4051
+                  group.selection.ClipMesh(Grafreed.clipboard);
3864
4052
             }
3865
4053
 //		group.selection.ClipMesh(GrafreeD.clipboard);
3866
4054
             System.out.println("DONE.");
..
..
@@ -3995,7 +4183,7 @@
3995
4183
                     objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3996
4184
                     
3997
4185
 			Object3D elem = (Object3D)group.selection.elementAt(i);
3998
-                        if(elem != group)
4186
+                        if(elem != group || !newWindow)
3999
4187
                         {
4000
4188
                         //    if (!(elem instanceof Composite))
4001
4189
                         //        newWindow = false;
..
..
@@ -4200,12 +4388,12 @@
4200
4388
 	{
4201
4389
 		if (group.selection.isEmpty())
4202
4390
 			return;
4203
-		GrafreeD.clipboardIsTempGroup = false;
4391
+		Grafreed.clipboardIsTempGroup = false;
4204
4392
 		Composite tGroup = null;
4205
4393
 		if (group.selection.size() > 0) // 1)
4206
4394
 		{
4207
4395
 			tGroup = new cGroup();
4208
-			GrafreeD.clipboardIsTempGroup = true;
4396
+			Grafreed.clipboardIsTempGroup = true;
4209
4397
 		}
4210
4398
                 
4211
4399
 		if (cut)
..
..
@@ -4245,16 +4433,16 @@
4245
4433
 		//System.out.println("cut " + child);
4246
4434
 		//System.out.println("parent = " + child.parent);
4247
4435
                 //                   tmp.addChild(child);
4248
-                                    if (GrafreeD.clipboardIsTempGroup)
4436
+                                    if (Grafreed.clipboardIsTempGroup)
4249
4437
                                             tGroup.add/*Child*/(tmp);
4250
4438
                                     else
4251
-                                            GrafreeD.clipboard = tmp;
4439
+                                            Grafreed.clipboard = tmp;
4252
4440
                                 }
4253
4441
                                 else
4254
-                                    if (GrafreeD.clipboardIsTempGroup)
4442
+                                    if (Grafreed.clipboardIsTempGroup)
4255
4443
                                             tGroup.add/*Child*/(child);
4256
4444
                                     else
4257
-                                            GrafreeD.clipboard = child;
4445
+                                            Grafreed.clipboard = child;
4258
4446
 			}
4259
4447
 			
4260
4448
 			//ResetModel();
..
..
@@ -4286,21 +4474,21 @@
4286
4474
 		//System.out.println("cut " + elem);
4287
4475
 		//System.out.println("parent = " + elem.parent);
4288
4476
                 //                    tmp.addChild(elem);
4289
-                                    if (GrafreeD.clipboardIsTempGroup)
4477
+                                    if (Grafreed.clipboardIsTempGroup)
4290
4478
                                             tGroup.add/*Child*/(tmp);
4291
4479
                                     else
4292
-                                            GrafreeD.clipboard = tmp;
4480
+                                            Grafreed.clipboard = tmp;
4293
4481
                                 }
4294
4482
                                 else
4295
-                                    if (GrafreeD.clipboardIsTempGroup)
4483
+                                    if (Grafreed.clipboardIsTempGroup)
4296
4484
                                             tGroup.add/*Child*/(child);
4297
4485
                                     else
4298
-                                            GrafreeD.clipboard = child;
4486
+                                            Grafreed.clipboard = child;
4299
4487
 			}
4300
4488
 			
4301
4489
 		}
4302
-		if (GrafreeD.clipboardIsTempGroup)
4303
-			GrafreeD.clipboard = tGroup;
4490
+		if (Grafreed.clipboardIsTempGroup)
4491
+			Grafreed.clipboard = tGroup;
4304
4492
 		if (cut)
4305
4493
                 {
4306
4494
                     ResetModel();
..
..
@@ -4314,7 +4502,7 @@
4314
4502
 	//		return;
4315
4503
 		boolean first = true;
4316
4504
 		
4317
-		if (GrafreeD.clipboardIsTempGroup)
4505
+		if (Grafreed.clipboardIsTempGroup)
4318
4506
 		{
4319
4507
 			Composite temp;
4320
4508
 			
..
..
@@ -4325,7 +4513,7 @@
4325
4513
 				temp = (Composite)Applet3D.clipboard.deepCopy();
4326
4514
                          */
4327
4515
 			Object3D elem;
4328
-			for (Enumeration e = /*temp.children*/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4516
+			for (Enumeration e = /*temp.children*/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4329
4517
 			{
4330
4518
 				Object3D child = (Object3D)e.nextElement();
4331
4519
                                 
..
..
@@ -4359,21 +4547,21 @@
4359
4547
 			//Object3D cb = Applet3D.clipboard;
4360
4548
 			//temp.addChild(cb);
4361
4549
 			//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());
4550
+                    assert(Grafreed.clipboard.parent == null);
4551
+                        Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
4552
+                        Grafreed.clipboard.get(0).parent = null; // Avoid copy?
4553
+                        if (LA.isIdentity(Grafreed.clipboard.toParent))
4554
+                            makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4367
4555
                         else
4368
-                            makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4369
-                        GrafreeD.clipboard.get(0).parent = keepparent;
4556
+                            makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
4557
+                        Grafreed.clipboard.get(0).parent = keepparent;
4370
4558
 		}
4371
4559
 		
4372
4560
 		ResetModel();
4373
4561
 		refreshContents();
4374
4562
 	}
4375
4563
 	
4376
-	void pasteInto(boolean copyit)
4564
+	void pasteInto(boolean copyit, boolean clone)
4377
4565
 	{
4378
4566
 //		if (GrafreeD.clipboard == null)
4379
4567
 //			return;
..
..
@@ -4402,15 +4590,22 @@
4402
4590
 		if (copyit)
4403
4591
 		{
4404
4592
 		//	paste(false);
4405
-                    CloneClipboard(false); // sept 2014
4593
+                        if (clone)
4594
+                        {
4595
+                            CloneClipboard(false); // sept 2014
4596
+                        }
4597
+                        else
4598
+                        {
4599
+                            paste(false);
4600
+                        }
4406
4601
 		}
4407
4602
 		else
4408
4603
 		{
4409
4604
 			boolean first = true;
4410
4605
 			
4411
-			if (GrafreeD.clipboardIsTempGroup)
4606
+			if (Grafreed.clipboardIsTempGroup)
4412
4607
 			{
4413
-				Composite temp = (Composite)GrafreeD.clipboard;
4608
+				Composite temp = (Composite)Grafreed.clipboard;
4414
4609
 				Object3D copy;
4415
4610
 				for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4416
4611
 				{
..
..
@@ -4420,7 +4615,7 @@
4420
4615
 				}
4421
4616
 			} else
4422
4617
 			{
4423
-				linkSomething(GrafreeD.clipboard); //.get(0));
4618
+				linkSomething(Grafreed.clipboard); //.get(0));
4424
4619
 			}
4425
4620
 		}
4426
4621
             }
..
..
@@ -4825,21 +5020,6 @@
4825
5020
         }
4826
5021
          */
4827
5022
 
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
5023
         /*
4844
5024
         public void Callback(Object obj)
4845
5025
         {
..
..
@@ -4863,26 +5043,9 @@
4863
5043
         }
4864
5044
          */
4865
5045
 
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
5046
 	String GetFile(String dialogName)
4884
5047
 	{
4885
-		if (GrafreeD.standAlone)
5048
+		if (Grafreed.standAlone)
4886
5049
 		{
4887
5050
 			FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4888
5051
 			browser.show();
..
..
@@ -4946,10 +5109,12 @@
4946
5109
 	cButton flashSelectionButton;
4947
5110
 	cButton editButton;
4948
5111
 	cButton uneditButton;
5112
+	JCheckBox allParamsButton;
4949
5113
 	cButton clearpanelButton;
4950
-	cButton allParamsButton;
4951
5114
 	cButton unselectButton;
4952
5115
 	
5116
+	cButton oneStepButton;
5117
+        
4953
5118
 	cButton screenfitButton;
4954
5119
 	cButton screenfitpointButton;
4955
5120
 	cButton snapobjectButton;
..
..
@@ -4993,7 +5158,7 @@
4993
5158
 	private MenuItem linkverticesItem;
4994
5159
 	private MenuItem relinkverticesItem;
4995
5160
 	private MenuItem setMasterItem;
4996
-	private MenuItem resetMeshItem;
5161
+	private MenuItem resetAllItem;
4997
5162
 	private MenuItem stepAllItem;
4998
5163
 	private MenuItem revertMeshItem;
4999
5164
 	private MenuItem poseMeshItem;
..
..
@@ -5004,6 +5169,7 @@
5004
5169
 	private MenuItem mergeGeometriesItem;
5005
5170
 	private MenuItem copyItem;
5006
5171
 	private MenuItem pasteItem;
5172
+	private MenuItem pasteIntoItem;
5007
5173
 	private MenuItem pasteLinkItem;
5008
5174
 	private MenuItem pasteCloneItem;
5009
5175
 	private MenuItem pasteExpandItem;
..
..
@@ -5053,8 +5219,10 @@
5053
5219
 	private MenuItem panoTexturesItem;
5054
5220
         
5055
5221
 	private MenuItem resetCentroidItem;
5056
-	private MenuItem transformgeometryItem;
5222
+	private MenuItem resetCentroidXZItem;
5057
5223
 	private MenuItem resetTransformItem;
5224
+	private MenuItem transformGeometryItem;
5225
+	private MenuItem transformChildrenItem;
5058
5226
 	private MenuItem hideItem;
5059
5227
 	private MenuItem grabItem;
5060
5228
 	private MenuItem backItem;
..
..
@@ -5101,7 +5269,7 @@
5101
5269
 	private MenuItem blobItem;
5102
5270
 	private MenuItem latheItem;
5103
5271
 	private MenuItem bezierItem;
5104
-	private MenuItem checkerItem;
5272
+	private MenuItem overlayItem;
5105
5273
 	private MenuItem meshItem;
5106
5274
 //	private MenuItem meshGroupItem;
5107
5275
 	private MenuItem springItem;
..
..
@@ -5123,11 +5291,6 @@
5123
5291
 	private MenuItem doubleItem;
5124
5292
 	private MenuItem tripleItem;
5125
5293
         
5126
-	private MenuItem importGFDItem;
5127
-	private MenuItem importVRMLX3DItem;
5128
-	private MenuItem import3DSItem;
5129
-	private MenuItem importOBJItem;
5130
-
5131
5294
 	private MenuItem computeAOItem;
5132
5295
 	private MenuItem recompileItem;
5133
5296
 	private MenuItem editScriptItem;
..
..
@@ -5137,4 +5300,8 @@
5137
5300
 	private MenuItem analyzeItem;
5138
5301
 	private MenuItem dumpItem;
5139
5302
 	//boolean freezemodel = false;
5303
+        
5304
+    Menu cameraMenu;
5305
+    MenuItem editCameraItem;
5306
+    MenuItem revertCameraItem;
5140
5307
 }