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,27 +329,32 @@
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);
241
336
 		menu.add("-");
242
-		randomItem = menu.add(new MenuItem("Random"));
337
+		randomItem = menu.add(new MenuItem("Switch node"));
243
338
 		randomItem.addActionListener(this);
244
-		physicsItem = menu.add(new MenuItem("Physics"));
245
-		physicsItem.addActionListener(this);
246
-		frameselectorItem = menu.add(new MenuItem("Frame Selector"));
247
-		frameselectorItem.addActionListener(this);
248
339
 		switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249
340
 		switchGeoItem.addActionListener(this);
250
341
 		switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251
342
 		switchTransfoItem.addActionListener(this);
252
-		morphItem = menu.add(new MenuItem("Morph"));
343
+		morphItem = menu.add(new MenuItem("Morph Group"));
253
344
 		morphItem.addActionListener(this);
345
+                
346
+        if (Globals.ADVANCED)
347
+        {
348
+		menu.add("-");
349
+		physicsItem = menu.add(new MenuItem("Physics"));
350
+		physicsItem.addActionListener(this);
351
+		frameselectorItem = menu.add(new MenuItem("Frame Selector"));
352
+		frameselectorItem.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,51 +567,48 @@
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
 
455
574
 //		oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
456
575
 //		screenfitpointButton.addActionListener(this);
457
-//			oe.aConstraints.gridx += 1;
458
-		oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
459
-		snapobjectButton.addActionListener(this);
460
-                snapobjectButton.setToolTipText("Snap Object");
461
-			oe.aConstraints.gridx += 1;
462
576
 
463
-                //aConstraints.gridx = 0;
464
-                //aConstraints.gridy += 1;
465
-		oe.aConstraints.weighty = 0;
466
-		oe.aConstraints.gridwidth = 1;
467
-		
468
-		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
577
+                if (Globals.ADVANCED)
578
+                {
579
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
580
+                        snapobjectButton.addActionListener(this);
581
+                        snapobjectButton.setToolTipText("Snap Object");
582
+                }
583
+
584
+		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
469
585
                 flashSelectionButton.setToolTipText("Show selection");
470
586
 		flashSelectionButton.addActionListener(this);
471
587
                 
472
588
 		oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
473
589
                 
474
-		oe.toolbarPanel.add(twoButton = new cButton("|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
590
+		oe.toolbarPanel.add(twoButton = new cButton("|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
475
591
                 twoButton.setToolTipText("Show center view only");
476
592
 		twoButton.addActionListener(this);
477
-		oe.toolbarPanel.add(fourButton = new cButton("+||", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
593
+		oe.toolbarPanel.add(fourButton = new cButton("+||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
478
594
 		fourButton.addActionListener(this);
479
595
                 fourButton.setToolTipText("Show left panel only");
480
-		oe.toolbarPanel.add(sixButton = new cButton("+|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
596
+		oe.toolbarPanel.add(sixButton = new cButton("+|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
481
597
                 sixButton.setToolTipText("2-column layout left");
482
598
 		sixButton.addActionListener(this);
483
-		oe.toolbarPanel.add(threeButton = new cButton("|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
599
+		oe.toolbarPanel.add(threeButton = new cButton("|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
484
600
                 threeButton.setToolTipText("2-column layout right");
485
601
 		threeButton.addActionListener(this);
486
-		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
602
+		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
487
603
                 sevenButton.setToolTipText("3-column layout");
488
604
 		sevenButton.addActionListener(this);
489
605
                 //
490
606
 
491
-		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);
492
608
                 rootButton.setToolTipText("Edit selection in new tab");
493
609
 		rootButton.addActionListener(this);
494
610
 
495
-                oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
611
+                oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
496
612
                 closeButton.setToolTipText("Close tab");
497
613
 		closeButton.addActionListener(this);
498
614
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..
..
@@ -500,23 +616,23 @@
500
616
                         
501
617
                 cGridBag commandsPanel = new cGridBag();
502
618
                 
503
-		commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
619
+		commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
504
620
                 editButton.setToolTipText("Edit selection");
505
621
 		editButton.addActionListener(this);
506
622
 
507
-		commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
623
+		commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
508
624
                 uneditButton.setToolTipText("Unedit selection");
509
625
 		uneditButton.addActionListener(this);
510
626
 
511
-		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);
512
632
                 clearPanelButton.setToolTipText("Clear edit panel");
513
633
 		clearPanelButton.addActionListener(this);
514
634
 
515
-		commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
516
-                allParamsButton.setToolTipText("All params??");
517
-		allParamsButton.addActionListener(this);
518
-
519
-		commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
635
+		commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
520
636
                 unselectButton.setToolTipText("Unselect");
521
637
 		unselectButton.addActionListener(this);
522
638
 
..
..
@@ -591,8 +707,18 @@
591
707
         
592
708
         void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
593
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
+        {
594
720
                 panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
595
-                supportCB.setToolTipText("Enabled rigging");
721
+                supportCB.setToolTipText("Enable rigging");
596
722
                                 supportCB.addItemListener(this);
597
723
 
598
724
         //        panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
..
..
@@ -610,14 +736,6 @@
610
736
                 slowCB.setToolTipText("Smooth interpolation");
611
737
                                 slowCB.addItemListener(this);
612
738
                                 
613
-                panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
614
-                boxCB.setToolTipText("Display bounding boxes");
615
-                                boxCB.addItemListener(this);
616
-                                
617
-                panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
618
-                zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
619
-                                zoomBoxCB.addItemListener(this);
620
-
621
739
 //        	constraints.gridy += 1;
622
740
 //                panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
623
741
 //                                speakerMocapCB.addItemListener(this);
..
..
@@ -648,6 +766,8 @@
648
766
                 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
649
767
                 lookAtCB.setToolTipText("Look-at target");
650
768
                                 lookAtCB.addItemListener(this);
769
+                
770
+        }
651
771
                                 
652
772
                 cGridBag fill = new cGridBag();
653
773
                                 
..
..
@@ -668,6 +788,7 @@
668
788
             buttonGroup.add(radioButton);
669
789
             radioButton.doClick();
670
790
         }
791
+        
671
792
         void SetupViews(ObjEditor oe)
672
793
         {
673
794
             oe.SetupViews();
..
..
@@ -884,7 +1005,9 @@
884
1005
 //                        objEditor.DropFile((java.io.File[]) object, true);
885
1006
 //                        return;
886
1007
 //                    }
887
-                    if (string.charAt(0) == '/')
1008
+                    
1009
+                    // File path for Mac and Windows
1010
+                    if (string.charAt(0) == '/' || string.charAt(1) == ':')
888
1011
                     {
889
1012
                         // file(s)
890
1013
                         String[] names = string.split("\n");
..
..
@@ -911,7 +1034,7 @@
911
1034
                     
912
1035
                     flashIt = false;
913
1036
                     CameraPane pane = (CameraPane) target;
914
-                    pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
1037
+                    pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
915
1038
                     pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
916
1039
                     
917
1040
                     if (group.selection.size() == 1)
..
..
@@ -938,11 +1061,11 @@
938
1061
             {
939
1062
                 loadClipboard(true);
940
1063
                 objEditor.jTree.setSelectionPath(destinationPath);
941
-                pasteInto(false);
1064
+                pasteInto(false, false);
942
1065
             } else {
943
1066
                 loadClipboard(false);
944
1067
                 objEditor.jTree.setSelectionPath(destinationPath);
945
-                pasteInto(false); // true); // ???
1068
+                pasteInto(false, false); // true); // ???
946
1069
             }
947
1070
 	}
948
1071
 	public void	dropActionChanged(DropTargetDragEvent dtde) 
..
..
@@ -1064,27 +1187,33 @@
1064
1187
 		kleinItem.addActionListener(this);
1065
1188
 		particleItem = menu.add(new MenuItem("Particle system"));
1066
1189
 		particleItem.addActionListener(this);
1190
+        if (Globals.ADVANCED)
1191
+        {
1067
1192
 		ragdollItem = menu.add(new MenuItem("Rag Walk"));
1068
1193
 		ragdollItem.addActionListener(this);
1069
1194
 		ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1070
1195
 		ragdoll2Item.addActionListener(this);
1196
+        }
1071
1197
 		menu.add("-");
1072
-		meshItem = menu.add(new MenuItem("Mesh"));
1198
+		meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1073
1199
 		meshItem.addActionListener(this);
1074
1200
 	//	meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1075
1201
 	//	meshGroupItem.addActionListener(this);
1202
+        if (Globals.ADVANCED)
1203
+        {
1076
1204
 		springItem = menu.add(new MenuItem("Spring"));
1077
1205
 		springItem.addActionListener(this);
1078
1206
 		flagItem = menu.add(new MenuItem("Flag"));
1079
1207
 		flagItem.addActionListener(this);
1080
-		bezierItem = menu.add(new MenuItem("Patch"));
1081
-		bezierItem.addActionListener(this);
1082
-		checkerItem = menu.add(new MenuItem("Checker"));
1083
-		checkerItem.addActionListener(this);
1084
1208
 		blobItem = menu.add(new MenuItem("Blob"));
1085
1209
 		blobItem.addActionListener(this);
1086
1210
 		latheItem = menu.add(new MenuItem("Lathe"));
1087
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);
1088
1217
 		lightItem = menu.add(new MenuItem("Light"));
1089
1218
 		lightItem.addActionListener(this);
1090
1219
 		menu.add("-");
..
..
@@ -1094,8 +1223,11 @@
1094
1223
 		loopItem.addActionListener(this);
1095
1224
 		doubleItem = menu.add(new MenuItem("Fork"));
1096
1225
 		doubleItem.addActionListener(this);
1226
+        if (Globals.ADVANCED)
1227
+        {
1097
1228
 		tripleItem = menu.add(new MenuItem("Trident"));
1098
1229
 		tripleItem.addActionListener(this);
1230
+        }
1099
1231
 	}
1100
1232
         
1101
1233
 	void buildToolsMenu(Menu menu)
..
..
@@ -1109,19 +1241,21 @@
1109
1241
 		parseverticesItem.addActionListener(this);
1110
1242
 		textureFieldItem = menu.add(new MenuItem("Texture Field"));
1111
1243
 		textureFieldItem.addActionListener(this);
1112
-		alignItem = menu.add(new MenuItem("Align"));
1244
+		alignItem = menu.add(new MenuItem("Align Objects"));
1113
1245
 		alignItem.addActionListener(this);
1114
-		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1115
-		mirrorItem.addActionListener(this);
1116
1246
 		reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1117
1247
 		reduceMorphItem.addActionListener(this);
1118
1248
 		reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1119
1249
 		reduce34MorphItem.addActionListener(this);
1120
-                
1250
+		menu.add("-");
1121
1251
 		menu.add(computeAOItem = new MenuItem("Compute AO"));
1122
1252
 		computeAOItem.addActionListener(this);
1123
-		menu.add("-");
1124
1253
                 
1254
+        if (Globals.ADVANCED)
1255
+        {
1256
+		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1257
+		mirrorItem.addActionListener(this);
1258
+		menu.add("-");
1125
1259
 		menu.add(memoryItem = new MenuItem("Memory Usage"));
1126
1260
 		memoryItem.addActionListener(this);
1127
1261
 		menu.add(analyzeItem = new MenuItem("Analyze"));
..
..
@@ -1144,6 +1278,7 @@
1144
1278
 		menu.add("-");
1145
1279
 		menu.add(editScriptItem = new MenuItem("Edit Script..."));
1146
1280
 		editScriptItem.addActionListener(this);
1281
+        }
1147
1282
         }
1148
1283
         
1149
1284
         void ScreenFit()
..
..
@@ -1472,9 +1607,9 @@
1472
1607
     
1473
1608
     void Overwrite(int mask)
1474
1609
     {
1475
-        if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
1610
+        if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
1476
1611
         {
1477
-            Object3D content = GrafreeD.clipboard.get(0);
1612
+            Object3D content = Grafreed.clipboard.get(0);
1478
1613
 
1479
1614
             if (content instanceof cGroup && ((cGroup)content).transientlink )
1480
1615
                 content = ((cGroup)content).get(0);
..
..
@@ -1645,7 +1780,7 @@
1645
1780
 		{
1646
1781
 			makeSomething(new BezierSurface());
1647
1782
 		} else
1648
-		if (source == checkerItem)
1783
+		if (source == overlayItem)
1649
1784
 		{
1650
1785
                     /*
1651
1786
 			Object3D obj = new BezierSurface(5,8);
..
..
@@ -1779,23 +1914,6 @@
1779
1914
                         csg.addChild(child);
1780
1915
                         child.addChild(csg);
1781
1916
 		} else
1782
-                    
1783
-		if (source == importGFDItem)
1784
-		{
1785
-			ImportGFD();
1786
-		} else
1787
-		if (source == importVRMLX3DItem)
1788
-		{
1789
-			ImportVRMLX3D();
1790
-		} else
1791
-		if (source == import3DSItem)
1792
-		{
1793
-			objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1794
-		} else
1795
-		if (source == importOBJItem)
1796
-		{
1797
-			objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1798
-		} else
1799
1917
 		if (source == computeAOItem)
1800
1918
 		{
1801
1919
                     Globals.drawMode = CameraPane.OCCLUSION;
..
..
@@ -1814,7 +1932,7 @@
1814
1932
 		if (source == invariantsItem)
1815
1933
 		{
1816
1934
                     System.out.println("Invariants:");
1817
-                    GrafreeD.grafreeD.universe.invariants();
1935
+                    Grafreed.grafreeD.universe.invariants();
1818
1936
 		} else
1819
1937
 		if (source == memoryItem)
1820
1938
 		{
..
..
@@ -1832,6 +1950,11 @@
1832
1950
 		if (source == dumpItem)
1833
1951
 		{
1834
1952
                     DumpObject();
1953
+		} else
1954
+		if (source == oneStepButton)
1955
+		{
1956
+                    Globals.ONESTEP = true;
1957
+                    cameraView.repaint();
1835
1958
 		} else
1836
1959
 		if (source == screenfitButton)
1837
1960
 		{
..
..
@@ -1884,10 +2007,10 @@
1884
2007
 		} else
1885
2008
 		if (source == duplicateItem)
1886
2009
 		{
1887
-                    Object3D keep = GrafreeD.clipboard;
2010
+                    Object3D keep = Grafreed.clipboard;
1888
2011
 			loadClipboard(false);
1889
2012
 			paste(false);
1890
-                    GrafreeD.clipboard = keep;
2013
+                    Grafreed.clipboard = keep;
1891
2014
 		} else
1892
2015
 		if (source == cloneItem)
1893
2016
 		{
..
..
@@ -1905,13 +2028,17 @@
1905
2028
 		{
1906
2029
 			paste(false);
1907
2030
 		} else
2031
+		if (source == pasteIntoItem)
2032
+		{
2033
+			pasteInto(true, false);
2034
+		} else
1908
2035
 		if (source == pasteLinkItem)
1909
2036
 		{
1910
-			pasteInto(false);
2037
+			pasteInto(false, false);
1911
2038
 		} else
1912
2039
 		if (source == pasteCloneItem)
1913
2040
 		{
1914
-			pasteInto(true);
2041
+			pasteInto(true, true);
1915
2042
 		} else
1916
2043
 		if (source == pasteExpandItem)
1917
2044
 		{
..
..
@@ -2103,9 +2230,9 @@
2103
2230
 //                        group.selection.get(0).setMasterThis(content); // should be identity
2104
2231
 //		refreshContents();
2105
2232
 //                    }
2106
-                    if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
2233
+                    if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
2107
2234
                     {
2108
-                        Object3D content = GrafreeD.clipboard.get(0);
2235
+                        Object3D content = Grafreed.clipboard.get(0);
2109
2236
                         
2110
2237
                         if (content instanceof cGroup && ((cGroup)content).transientlink )
2111
2238
                             content = ((cGroup)content).get(0);
..
..
@@ -2113,11 +2240,11 @@
2113
2240
             Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2114
2241
                         for (int i=0; i<group.selection.size(); i++)
2115
2242
                         {
2116
-                            boolean random = CameraPane.RANDOM;
2117
-                            CameraPane.RANDOM = false; // parse all random nodes
2243
+                            boolean random = CameraPane.SWITCH;
2244
+                            CameraPane.SWITCH = false; // parse all random nodes
2118
2245
                             group.selection.get(i).linkVerticesThis(content);
2119
2246
                       //      group.selection.get(i).setMasterThis(content); // should be identity
2120
-                            CameraPane.RANDOM = random;
2247
+                            CameraPane.SWITCH = random;
2121
2248
                         }
2122
2249
             Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2123
2250
 		refreshContents();
..
..
@@ -2127,20 +2254,20 @@
2127
2254
 		{
2128
2255
                     for (int i=0; i<group.selection.size(); i++)
2129
2256
                     {
2130
-                        boolean random = CameraPane.RANDOM;
2131
-                        CameraPane.RANDOM = false; // parse all random nodes
2257
+                        boolean random = CameraPane.SWITCH;
2258
+                        CameraPane.SWITCH = false; // parse all random nodes
2132
2259
                         group.selection.get(i).linkVerticesThis(null);
2133
-                        CameraPane.RANDOM = random;
2260
+                        CameraPane.SWITCH = random;
2134
2261
                     }
2135
2262
 
2136
2263
                     refreshContents();
2137
2264
 		} else
2138
2265
 		if (source == relinkverticesItem)
2139
2266
 		{
2140
-                    boolean random = CameraPane.RANDOM;
2141
-                    CameraPane.RANDOM = false; // parse all random nodes
2267
+                    boolean random = CameraPane.SWITCH;
2268
+                    CameraPane.SWITCH = false; // parse all random nodes
2142
2269
                     group.selection.RelinkToSupport();
2143
-                    CameraPane.RANDOM = random;
2270
+                    CameraPane.SWITCH = random;
2144
2271
 
2145
2272
                     refreshContents();
2146
2273
 		} else
..
..
@@ -2155,9 +2282,9 @@
2155
2282
 		} else
2156
2283
 		if (source == setMasterItem)
2157
2284
 		{
2158
-                    if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2285
+                    if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2159
2286
                     {
2160
-                        Object3D content = GrafreeD.clipboard.get(0);
2287
+                        Object3D content = Grafreed.clipboard.get(0);
2161
2288
                         
2162
2289
                         if (content instanceof cGroup && ((cGroup)content).transientlink )
2163
2290
                             content = ((cGroup)content).get(0);
..
..
@@ -2170,9 +2297,9 @@
2170
2297
 		{
2171
2298
                     if (group.selection.size() == 1)
2172
2299
                     {
2173
-                        if (GrafreeD.clipboard.size() == 1)
2300
+                        if (Grafreed.clipboard.size() == 1)
2174
2301
                         {
2175
-                            Object3D content = GrafreeD.clipboard.get(0);
2302
+                            Object3D content = Grafreed.clipboard.get(0);
2176
2303
 
2177
2304
                             if (content instanceof cGroup && ((cGroup)content).transientlink )
2178
2305
                                 content = ((cGroup)content).get(0);
..
..
@@ -2189,7 +2316,7 @@
2189
2316
 		{
2190
2317
 			RevertMeshes();
2191
2318
 		} else
2192
-		if (source == resetMeshItem)
2319
+		if (source == resetAllItem)
2193
2320
 		{
2194
2321
 			ResetAll();
2195
2322
 		} else
..
..
@@ -2238,7 +2365,7 @@
2238
2365
                         RandomNode random = new RandomNode();
2239
2366
 			group(random);
2240
2367
                         if (random.size() > 0)
2241
-                            random.name = random.get(0).name + "Rnd";
2368
+                            random.name = random.get(0).name + "Switch";
2242
2369
 		} else
2243
2370
 		if (source == physicsItem)
2244
2371
                 {
..
..
@@ -2527,9 +2654,13 @@
2527
2654
                 {
2528
2655
 			SmoothMesh();
2529
2656
 		} else
2530
-		if (source == transformgeometryItem)
2657
+		if (source == transformGeometryItem)
2531
2658
 		{
2532
2659
                         TransformGeometry();
2660
+		} else
2661
+		if (source == transformChildrenItem)
2662
+		{
2663
+                        TransformChildren();
2533
2664
 		} else
2534
2665
 		if (source == resetTransformItem)
2535
2666
 		{
..
..
@@ -2537,7 +2668,11 @@
2537
2668
 		} else
2538
2669
 		if (source == resetCentroidItem)
2539
2670
 		{
2540
-                        ResetCentroid();
2671
+                        ResetCentroid(true);
2672
+		} else
2673
+		if (source == resetCentroidXZItem)
2674
+		{
2675
+                        ResetCentroid(false);
2541
2676
 		} else
2542
2677
 		if (source == resetParentItem)
2543
2678
 		{
..
..
@@ -2895,7 +3030,7 @@
2895
3030
                                 
2896
3031
                                 child.editWindow = null; // ???????????
2897
3032
 			}
2898
-			objEditor.ctrlPanel.validate();
3033
+			objEditor.ctrlPanel.FlushUI();
2899
3034
 			//objEditor.jTree.clearSelection();
2900
3035
 			//objEditor.ResetSliders();
2901
3036
                     refreshContents(true);
..
..
@@ -2979,7 +3114,9 @@
2979
3114
                         frontView.object = group;
2980
3115
                         sideView.object = group;
2981
3116
                     }
2982
-                    group.editWindow = this;
3117
+                    
3118
+// fix "+" issue                    group.editWindow = this;
3119
+                    
2983
3120
                     /*
2984
3121
                     currentLayout = radio.layout;
2985
3122
                     if (currentLayout == null)
..
..
@@ -2992,7 +3129,20 @@
2992
3129
                     //group.attributes = -1;
2993
3130
                     ResetModel();
2994
3131
                     refreshContents(true);
2995
-                }
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
+                } 
2996
3146
                 else
2997
3147
                 {
2998
3148
 			//return super.action(event, arg);
..
..
@@ -3053,6 +3203,28 @@
3053
3203
             refreshContents();
3054
3204
         }
3055
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
+        }
3056
3228
         
3057
3229
         void ResetTransform()
3058
3230
         {
..
..
@@ -3165,7 +3337,7 @@
3165
3337
             refreshContents();
3166
3338
         }
3167
3339
         
3168
-        void ResetCentroid()
3340
+        void ResetCentroid(boolean full)
3169
3341
         {
3170
3342
             Object3D obj;
3171
3343
             for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..
..
@@ -3180,12 +3352,16 @@
3180
3352
                     LA.matIdentity(Object3D.mat);
3181
3353
                     obj.getBounds(minima, maxima, false);
3182
3354
                     Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3183
-                    Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3355
+                    if (full)
3356
+                        Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3184
3357
                     Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3185
3358
                     obj.TransformMesh(Object3D.mat);
3359
+                    
3186
3360
                     Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3187
-                    Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3361
+                    if (full)
3362
+                        Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3188
3363
                     Object3D.mat[3][2] = (minima.z + maxima.z)/2;
3364
+                    
3189
3365
                     LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3190
3366
                     //Object3D.mat[3][0] = -Object3D.mat[3][0];
3191
3367
                     //Object3D.mat[3][1] = -Object3D.mat[3][1];
..
..
@@ -3251,9 +3427,9 @@
3251
3427
                     obj = (Object3D)e.nextElement();
3252
3428
                     
3253
3429
                     System.out.println("Object is: " + obj);
3254
-                    GrafreeD.AnalyzeObject(obj);
3430
+                    Grafreed.AnalyzeObject(obj);
3255
3431
                     System.out.println("Boundary rep: " + obj.bRep);
3256
-                    GrafreeD.AnalyzeObject(obj.bRep);
3432
+                    Grafreed.AnalyzeObject(obj.bRep);
3257
3433
                     
3258
3434
 //                    System.err.println((size/1024) + " KB is the size of " + obj);
3259
3435
                 }
..
..
@@ -3467,8 +3643,8 @@
3467
3643
 	
3468
3644
 	void ParseVertices()
3469
3645
 	{
3470
-            boolean epsequal = GrafreeD.epsequal;
3471
-            GrafreeD.epsequal = true;
3646
+            boolean epsequal = Grafreed.epsequal;
3647
+            Grafreed.epsequal = true;
3472
3648
             
3473
3649
             for (int i=0; i<group.selection.size(); i++)
3474
3650
             {
..
..
@@ -3493,7 +3669,7 @@
3493
3669
                                 LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3494
3670
                                 LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3495
3671
 
3496
-                                g.add(GrafreeD.clipboard);
3672
+                                g.add(Grafreed.clipboard);
3497
3673
 
3498
3674
                                 buffer.add(g);
3499
3675
                             }
..
..
@@ -3508,7 +3684,7 @@
3508
3684
                 makeSomething(buffer, i==group.selection.size()-1);
3509
3685
             }
3510
3686
             
3511
-            GrafreeD.epsequal = epsequal;
3687
+            Grafreed.epsequal = epsequal;
3512
3688
             
3513
3689
             refreshContents();
3514
3690
 	}
..
..
@@ -3526,7 +3702,16 @@
3526
3702
                             String pigment = Object3D.GetPigment(tex);
3527
3703
                             //String bump = Object3D.GetBump(tex);
3528
3704
                             
3529
-                            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
+                            }
3530
3715
                             
3531
3716
                             double s = v.s;
3532
3717
                             
..
..
@@ -3614,11 +3799,11 @@
3614
3799
 
3615
3800
             SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3616
3801
 
3617
-            boolean random = CameraPane.RANDOM;
3618
-            CameraPane.RANDOM = false; // parse all random nodes
3802
+            boolean random = CameraPane.SWITCH;
3803
+            CameraPane.SWITCH = false; // parse all random nodes
3619
3804
             lowres.linkVerticesThis(null);
3620
3805
             lowres.linkVerticesThis(sn);
3621
-            CameraPane.RANDOM = random;
3806
+            CameraPane.SWITCH = random;
3622
3807
 
3623
3808
             System.err.flush();
3624
3809
 
..
..
@@ -3658,7 +3843,7 @@
3658
3843
                 return;
3659
3844
             
3660
3845
             Object3D poses = group.selection.get(0);
3661
-            Object3D ref = GrafreeD.clipboard.get(0);
3846
+            Object3D ref = Grafreed.clipboard.get(0);
3662
3847
             
3663
3848
             Object3D newgroup = new Object3D("Po:" + poses.name);
3664
3849
             
..
..
@@ -3852,9 +4037,9 @@
3852
4037
 	
3853
4038
 	void ClipMesh()
3854
4039
 	{
3855
-            if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
4040
+            if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
3856
4041
             {
3857
-                Object3D content = GrafreeD.clipboard.get(0);
4042
+                Object3D content = Grafreed.clipboard.get(0);
3858
4043
 
3859
4044
                 if (content instanceof cGroup && ((cGroup)content).transientlink )
3860
4045
                     content = ((cGroup)content).get(0);
..
..
@@ -3863,7 +4048,7 @@
3863
4048
 //                {
3864
4049
 //                    group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3865
4050
 //                }
3866
-                  group.selection.ClipMesh(GrafreeD.clipboard);
4051
+                  group.selection.ClipMesh(Grafreed.clipboard);
3867
4052
             }
3868
4053
 //		group.selection.ClipMesh(GrafreeD.clipboard);
3869
4054
             System.out.println("DONE.");
..
..
@@ -3998,7 +4183,7 @@
3998
4183
                     objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3999
4184
                     
4000
4185
 			Object3D elem = (Object3D)group.selection.elementAt(i);
4001
-                        if(elem != group)
4186
+                        if(elem != group || !newWindow)
4002
4187
                         {
4003
4188
                         //    if (!(elem instanceof Composite))
4004
4189
                         //        newWindow = false;
..
..
@@ -4203,12 +4388,12 @@
4203
4388
 	{
4204
4389
 		if (group.selection.isEmpty())
4205
4390
 			return;
4206
-		GrafreeD.clipboardIsTempGroup = false;
4391
+		Grafreed.clipboardIsTempGroup = false;
4207
4392
 		Composite tGroup = null;
4208
4393
 		if (group.selection.size() > 0) // 1)
4209
4394
 		{
4210
4395
 			tGroup = new cGroup();
4211
-			GrafreeD.clipboardIsTempGroup = true;
4396
+			Grafreed.clipboardIsTempGroup = true;
4212
4397
 		}
4213
4398
                 
4214
4399
 		if (cut)
..
..
@@ -4248,16 +4433,16 @@
4248
4433
 		//System.out.println("cut " + child);
4249
4434
 		//System.out.println("parent = " + child.parent);
4250
4435
                 //                   tmp.addChild(child);
4251
-                                    if (GrafreeD.clipboardIsTempGroup)
4436
+                                    if (Grafreed.clipboardIsTempGroup)
4252
4437
                                             tGroup.add/*Child*/(tmp);
4253
4438
                                     else
4254
-                                            GrafreeD.clipboard = tmp;
4439
+                                            Grafreed.clipboard = tmp;
4255
4440
                                 }
4256
4441
                                 else
4257
-                                    if (GrafreeD.clipboardIsTempGroup)
4442
+                                    if (Grafreed.clipboardIsTempGroup)
4258
4443
                                             tGroup.add/*Child*/(child);
4259
4444
                                     else
4260
-                                            GrafreeD.clipboard = child;
4445
+                                            Grafreed.clipboard = child;
4261
4446
 			}
4262
4447
 			
4263
4448
 			//ResetModel();
..
..
@@ -4289,21 +4474,21 @@
4289
4474
 		//System.out.println("cut " + elem);
4290
4475
 		//System.out.println("parent = " + elem.parent);
4291
4476
                 //                    tmp.addChild(elem);
4292
-                                    if (GrafreeD.clipboardIsTempGroup)
4477
+                                    if (Grafreed.clipboardIsTempGroup)
4293
4478
                                             tGroup.add/*Child*/(tmp);
4294
4479
                                     else
4295
-                                            GrafreeD.clipboard = tmp;
4480
+                                            Grafreed.clipboard = tmp;
4296
4481
                                 }
4297
4482
                                 else
4298
-                                    if (GrafreeD.clipboardIsTempGroup)
4483
+                                    if (Grafreed.clipboardIsTempGroup)
4299
4484
                                             tGroup.add/*Child*/(child);
4300
4485
                                     else
4301
-                                            GrafreeD.clipboard = child;
4486
+                                            Grafreed.clipboard = child;
4302
4487
 			}
4303
4488
 			
4304
4489
 		}
4305
-		if (GrafreeD.clipboardIsTempGroup)
4306
-			GrafreeD.clipboard = tGroup;
4490
+		if (Grafreed.clipboardIsTempGroup)
4491
+			Grafreed.clipboard = tGroup;
4307
4492
 		if (cut)
4308
4493
                 {
4309
4494
                     ResetModel();
..
..
@@ -4317,7 +4502,7 @@
4317
4502
 	//		return;
4318
4503
 		boolean first = true;
4319
4504
 		
4320
-		if (GrafreeD.clipboardIsTempGroup)
4505
+		if (Grafreed.clipboardIsTempGroup)
4321
4506
 		{
4322
4507
 			Composite temp;
4323
4508
 			
..
..
@@ -4328,7 +4513,7 @@
4328
4513
 				temp = (Composite)Applet3D.clipboard.deepCopy();
4329
4514
                          */
4330
4515
 			Object3D elem;
4331
-			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))
4332
4517
 			{
4333
4518
 				Object3D child = (Object3D)e.nextElement();
4334
4519
                                 
..
..
@@ -4362,21 +4547,21 @@
4362
4547
 			//Object3D cb = Applet3D.clipboard;
4363
4548
 			//temp.addChild(cb);
4364
4549
 			//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4365
-                    assert(GrafreeD.clipboard.parent == null);
4366
-                        Object3D /*Composite*/ keepparent = GrafreeD.clipboard.get(0).parent;
4367
-                        GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4368
-                        if (LA.isIdentity(GrafreeD.clipboard.toParent))
4369
-                            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());
4370
4555
                         else
4371
-                            makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4372
-                        GrafreeD.clipboard.get(0).parent = keepparent;
4556
+                            makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
4557
+                        Grafreed.clipboard.get(0).parent = keepparent;
4373
4558
 		}
4374
4559
 		
4375
4560
 		ResetModel();
4376
4561
 		refreshContents();
4377
4562
 	}
4378
4563
 	
4379
-	void pasteInto(boolean copyit)
4564
+	void pasteInto(boolean copyit, boolean clone)
4380
4565
 	{
4381
4566
 //		if (GrafreeD.clipboard == null)
4382
4567
 //			return;
..
..
@@ -4405,15 +4590,22 @@
4405
4590
 		if (copyit)
4406
4591
 		{
4407
4592
 		//	paste(false);
4408
-                    CloneClipboard(false); // sept 2014
4593
+                        if (clone)
4594
+                        {
4595
+                            CloneClipboard(false); // sept 2014
4596
+                        }
4597
+                        else
4598
+                        {
4599
+                            paste(false);
4600
+                        }
4409
4601
 		}
4410
4602
 		else
4411
4603
 		{
4412
4604
 			boolean first = true;
4413
4605
 			
4414
-			if (GrafreeD.clipboardIsTempGroup)
4606
+			if (Grafreed.clipboardIsTempGroup)
4415
4607
 			{
4416
-				Composite temp = (Composite)GrafreeD.clipboard;
4608
+				Composite temp = (Composite)Grafreed.clipboard;
4417
4609
 				Object3D copy;
4418
4610
 				for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4419
4611
 				{
..
..
@@ -4423,7 +4615,7 @@
4423
4615
 				}
4424
4616
 			} else
4425
4617
 			{
4426
-				linkSomething(GrafreeD.clipboard); //.get(0));
4618
+				linkSomething(Grafreed.clipboard); //.get(0));
4427
4619
 			}
4428
4620
 		}
4429
4621
             }
..
..
@@ -4828,21 +5020,6 @@
4828
5020
         }
4829
5021
          */
4830
5022
 
4831
-        void ImportGFD()
4832
-        {
4833
-            FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4834
-            browser.show();
4835
-            String filename = browser.getFile();
4836
-            if (filename != null && filename.length() > 0)
4837
-            {
4838
-                String fullname = browser.getDirectory() + filename;
4839
-
4840
-                //Object3D readobj =
4841
-                        objEditor.ReadGFD(fullname, objEditor);
4842
-                //makeSomething(readobj);
4843
-            }
4844
-        }
4845
-        
4846
5023
         /*
4847
5024
         public void Callback(Object obj)
4848
5025
         {
..
..
@@ -4866,26 +5043,9 @@
4866
5043
         }
4867
5044
          */
4868
5045
 
4869
-	void ImportVRMLX3D()
4870
-	{
4871
-		if (GrafreeD.standAlone)
4872
-		{
4873
-                    /**/
4874
-			FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4875
-			browser.show();
4876
-			String filename = browser.getFile();
4877
-			if (filename != null && filename.length() > 0)
4878
-			{
4879
-				String fullname = browser.getDirectory() + filename;
4880
-                                LoadVRMLX3D(fullname);
4881
-			}
4882
-                     /**/
4883
-		}
4884
-	}
4885
-				
4886
5046
 	String GetFile(String dialogName)
4887
5047
 	{
4888
-		if (GrafreeD.standAlone)
5048
+		if (Grafreed.standAlone)
4889
5049
 		{
4890
5050
 			FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4891
5051
 			browser.show();
..
..
@@ -4949,10 +5109,12 @@
4949
5109
 	cButton flashSelectionButton;
4950
5110
 	cButton editButton;
4951
5111
 	cButton uneditButton;
5112
+	JCheckBox allParamsButton;
4952
5113
 	cButton clearpanelButton;
4953
-	cButton allParamsButton;
4954
5114
 	cButton unselectButton;
4955
5115
 	
5116
+	cButton oneStepButton;
5117
+        
4956
5118
 	cButton screenfitButton;
4957
5119
 	cButton screenfitpointButton;
4958
5120
 	cButton snapobjectButton;
..
..
@@ -4996,7 +5158,7 @@
4996
5158
 	private MenuItem linkverticesItem;
4997
5159
 	private MenuItem relinkverticesItem;
4998
5160
 	private MenuItem setMasterItem;
4999
-	private MenuItem resetMeshItem;
5161
+	private MenuItem resetAllItem;
5000
5162
 	private MenuItem stepAllItem;
5001
5163
 	private MenuItem revertMeshItem;
5002
5164
 	private MenuItem poseMeshItem;
..
..
@@ -5007,6 +5169,7 @@
5007
5169
 	private MenuItem mergeGeometriesItem;
5008
5170
 	private MenuItem copyItem;
5009
5171
 	private MenuItem pasteItem;
5172
+	private MenuItem pasteIntoItem;
5010
5173
 	private MenuItem pasteLinkItem;
5011
5174
 	private MenuItem pasteCloneItem;
5012
5175
 	private MenuItem pasteExpandItem;
..
..
@@ -5056,8 +5219,10 @@
5056
5219
 	private MenuItem panoTexturesItem;
5057
5220
         
5058
5221
 	private MenuItem resetCentroidItem;
5059
-	private MenuItem transformgeometryItem;
5222
+	private MenuItem resetCentroidXZItem;
5060
5223
 	private MenuItem resetTransformItem;
5224
+	private MenuItem transformGeometryItem;
5225
+	private MenuItem transformChildrenItem;
5061
5226
 	private MenuItem hideItem;
5062
5227
 	private MenuItem grabItem;
5063
5228
 	private MenuItem backItem;
..
..
@@ -5104,7 +5269,7 @@
5104
5269
 	private MenuItem blobItem;
5105
5270
 	private MenuItem latheItem;
5106
5271
 	private MenuItem bezierItem;
5107
-	private MenuItem checkerItem;
5272
+	private MenuItem overlayItem;
5108
5273
 	private MenuItem meshItem;
5109
5274
 //	private MenuItem meshGroupItem;
5110
5275
 	private MenuItem springItem;
..
..
@@ -5126,11 +5291,6 @@
5126
5291
 	private MenuItem doubleItem;
5127
5292
 	private MenuItem tripleItem;
5128
5293
         
5129
-	private MenuItem importGFDItem;
5130
-	private MenuItem importVRMLX3DItem;
5131
-	private MenuItem import3DSItem;
5132
-	private MenuItem importOBJItem;
5133
-
5134
5294
 	private MenuItem computeAOItem;
5135
5295
 	private MenuItem recompileItem;
5136
5296
 	private MenuItem editScriptItem;
..
..
@@ -5140,4 +5300,8 @@
5140
5300
 	private MenuItem analyzeItem;
5141
5301
 	private MenuItem dumpItem;
5142
5302
 	//boolean freezemodel = false;
5303
+        
5304
+    Menu cameraMenu;
5305
+    MenuItem editCameraItem;
5306
+    MenuItem revertCameraItem;
5143
5307
 }