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
 	}
..
..
@@ -434,110 +549,98 @@
434
549
         oe.radioPanel.add(dummyButton);
435
550
         oe.buttonGroup.add(dummyButton);
436
551
          */
437
-                aConstraints.gridy += 1;
438
-                
439
552
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
440
553
                 
441
-		oe.aConstraints.gridwidth = 1;
442
-        	oe.aConstraints.gridx = 0;
443
-                
444
-                oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
445
-                liveCB.setToolTipText("Enabled animation");
554
+                oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
555
+                liveCB.setToolTipText("Enable animation");
446
556
                                 liveCB.addItemListener(this);
447
557
 
448
-        	oe.aConstraints.gridx += 1;
449
-                oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
558
+		oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
559
+                oneStepButton.setToolTipText("Animate one step forward");
560
+		oneStepButton.addActionListener(this);
561
+                
562
+                oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
563
+                fastCB.setToolTipText("Fast mode");
564
+                                fastCB.addItemListener(this);
565
+                                
566
+                oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
450
567
                 trackCB.setToolTipText("Enable tracking");
451
568
                                 trackCB.addItemListener(this);
452
569
 
453
-        	oe.aConstraints.gridx += 1;
454
-		oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
570
+		oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
455
571
                 screenfitButton.setToolTipText("Screen fit");
456
572
 		screenfitButton.addActionListener(this);
457
-			oe.aConstraints.gridx += 1;
573
+
458
574
 //		oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
459
575
 //		screenfitpointButton.addActionListener(this);
460
-//			oe.aConstraints.gridx += 1;
461
-		oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
462
-		snapobjectButton.addActionListener(this);
463
-                snapobjectButton.setToolTipText("Snap Object");
464
-			oe.aConstraints.gridx += 1;
465
576
 
466
-                //aConstraints.gridx = 0;
467
-                //aConstraints.gridy += 1;
468
-		oe.aConstraints.weighty = 0;
469
-		oe.aConstraints.gridwidth = 1;
470
-		
471
-		oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, 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);
472
585
                 flashSelectionButton.setToolTipText("Show selection");
473
586
 		flashSelectionButton.addActionListener(this);
474
587
                 
475
-		oe.toolbarPanel.add(new cButton("     ", false));
588
+		oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
476
589
                 
477
-		oe.aConstraints.gridx += 1;
478
-		oe.aConstraints.weighty = 0;
479
-		oe.aConstraints.gridwidth = 1;
480
-                
481
-                //
482
-		oe.toolbarPanel.add(twoButton = new cButton(" |+| ")); //, oe.aConstraints);
590
+		oe.toolbarPanel.add(twoButton = new cButton("|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
483
591
                 twoButton.setToolTipText("Show center view only");
484
592
 		twoButton.addActionListener(this);
485
-		oe.toolbarPanel.add(fourButton = new cButton("+|| ")); //, oe.aConstraints);
593
+		oe.toolbarPanel.add(fourButton = new cButton("+||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
486
594
 		fourButton.addActionListener(this);
487
595
                 fourButton.setToolTipText("Show left panel only");
488
-		oe.toolbarPanel.add(sixButton = new cButton("+|+| ")); //, oe.aConstraints);
596
+		oe.toolbarPanel.add(sixButton = new cButton("+|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
489
597
                 sixButton.setToolTipText("2-column layout left");
490
598
 		sixButton.addActionListener(this);
491
-		oe.toolbarPanel.add(threeButton = new cButton(" |+|+")); //, oe.aConstraints);
599
+		oe.toolbarPanel.add(threeButton = new cButton("|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492
600
                 threeButton.setToolTipText("2-column layout right");
493
601
 		threeButton.addActionListener(this);
494
-		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+")); //, oe.aConstraints);
602
+		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
495
603
                 sevenButton.setToolTipText("3-column layout");
496
604
 		sevenButton.addActionListener(this);
497
605
                 //
498
606
 
499
-		oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
500
-                rootButton.setToolTipText("Edit object in new tab");
607
+		oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608
+                rootButton.setToolTipText("Edit selection in new tab");
501
609
 		rootButton.addActionListener(this);
502
-			oe.aConstraints.gridx += 1;
503
-		oe.toolbarPanel.add(closeButton = new cButton("  X  ")); //, oe.aConstraints);
610
+
611
+                oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
504
612
                 closeButton.setToolTipText("Close tab");
505
613
 		closeButton.addActionListener(this);
506
614
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
507
615
 		//clearButton.addActionListener(this);
508
-			oe.aConstraints.gridx += 1;
509
616
                         
510
-		oe.aConstraints.gridx = 1; //
511
-		oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
617
+                cGridBag commandsPanel = new cGridBag();
618
+                
619
+		commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620
+                editButton.setToolTipText("Edit selection");
512
621
 		editButton.addActionListener(this);
513
-		oe.aConstraints.gridx += 1;
514
-		oe.aConstraints.weighty = 0;
515
-		oe.aConstraints.gridwidth = 1;
516
622
 
517
-		oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
623
+		commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624
+                uneditButton.setToolTipText("Unedit selection");
518
625
 		uneditButton.addActionListener(this);
519
626
 
520
-		oe.aConstraints.gridx += 1;
521
-		oe.aConstraints.weighty = 0;
522
-		oe.aConstraints.gridwidth = 1;
523
-                
524
-		oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
525
-		clearPanelButton.addActionListener(this);
526
-
527
-		oe.aConstraints.gridx += 1;
528
-		oe.aConstraints.weighty = 0;
529
-		oe.aConstraints.gridwidth = 1;
530
-                
531
-		oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
627
+		commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
628
+                allParamsButton.setToolTipText("Edit all params");
532
629
 		allParamsButton.addActionListener(this);
533
630
 
534
-		oe.aConstraints.gridx += 1;
535
-		oe.aConstraints.weighty = 0;
536
-		oe.aConstraints.gridwidth = 1;
537
-                
538
-		oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
631
+		commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632
+                clearPanelButton.setToolTipText("Clear edit panel");
633
+		clearPanelButton.addActionListener(this);
634
+
635
+		commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
636
+                unselectButton.setToolTipText("Unselect");
539
637
 		unselectButton.addActionListener(this);
540
638
 
639
+                commandsPanel.preferredHeight = 1;
640
+                
641
+                oe.treePanel.add(commandsPanel);
642
+                oe.treePanel.Return();
643
+                
541
644
 //		oe.aConstraints.gridx += 1;
542
645
 //		oe.aConstraints.weighty = 0;
543
646
 //		oe.aConstraints.gridwidth = 1;
..
..
@@ -549,40 +652,37 @@
549
652
 //		oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
550
653
 //		gcButton.addActionListener(this);
551
654
                 
552
-                oe.aConstraints.gridx = 0;
553
-		oe.aConstraints.gridy += 1;
554
-                
555
-		//ctrlPanel.add(objList = new List(5, true));
556
-		oe.aConstraints.gridwidth = 100;
557
-	//	oe.aConstraints.gridheight = 100;
558
-		oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
559
-		oe.aConstraints.gridheight = 1;
560
-		oe.aConstraints.weighty = 0.5;
561
-		oe.aConstraints.gridx = 0;
562
-		JScrollPane jSP;
655
+                cGridBag jSPPanel = new cGridBag();
656
+
657
+                JScrollPane jSP;
563
658
 		//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
564
-		oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
659
+		jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
565
660
                 ResetModel();
566
-		oe.aConstraints.weighty = 0.5;
567
-		oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
568
-		oe.aConstraints.gridy += 1;
569
-		oe.aConstraints.gridwidth = 1;
661
+                
662
+                oe.treePanel.add(jSPPanel);
663
+                oe.treePanel.Return();
570
664
 
571
-		oe.aConstraints.weighty = 0;
572
-		oe.aConstraints.gridwidth = 2;
573
-
574
-                oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
665
+                cGridBag copyOptionsPanel = new cGridBag();
666
+                
667
+                copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
668
+                colorCB.setToolTipText("Copy color when dropped");
575
669
                 colorCB.addItemListener(this);
576
-                oe.aConstraints.gridx += 2;
577
-                oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
670
+
671
+                copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
672
+                materialCB.setToolTipText("Copy material when dropped");
578
673
                 materialCB.addItemListener(this);
579
-                oe.aConstraints.gridx += 2;
580
-                oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
674
+
675
+                copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
676
+                textureCB.setToolTipText("Copy texture when dropped");
581
677
                 textureCB.addItemListener(this);
582
678
                         
583
-                oe.aConstraints.gridx = 0;
584
-		oe.aConstraints.gridy += 1;
679
+                copyOptionsPanel.preferredHeight = 1;
680
+                oe.treePanel.add(copyOptionsPanel);
681
+                oe.treePanel.Return();
585
682
                 
683
+//        mainPanel.setDividerLocation(0.5); //1.0);
684
+//        mainPanel.setResizeWeight(0.5);
685
+        
586
686
 		//jList.addListSelectionListener(this);
587
687
 		oe.jTree.addTreeSelectionListener(this);
588
688
 		//jTree.setRootVisible(false);
..
..
@@ -607,43 +707,35 @@
607
707
         
608
708
         void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
609
709
         {
610
-        	//constraints.gridx = 0;
611
-        	//constraints.gridy = 0;
612
-                panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
613
-                fastCB.setToolTipText("Fast mode");
614
-                                fastCB.addItemListener(this);
615
-        	//constraints.gridy += 1;
616
-                panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
617
-                supportCB.setToolTipText("Enabled rigging");
618
-                                supportCB.addItemListener(this);
619
-
620
-        //	constraints.gridy += 1;
621
-        //        panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
622
-        //                        localCB.addItemListener(this);
623
-
624
-        	//constraints.gridy += 1;
625
-                panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
626
-                crowdCB.setToolTipText("Used for crowds");
627
-                                crowdCB.addItemListener(this);
628
-
629
-        	//constraints.gridy += 1;
630
-                panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
631
-                smoothCB.setToolTipText("Snapping delay");
632
-                                smoothCB.addItemListener(this);
633
-
634
-        	//constraints.gridy += 1;
635
-                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
636
-                slowCB.setToolTipText("Smooth interpolation");
637
-                                slowCB.addItemListener(this);
638
-        	//constraints.gridy += 1;
639
710
                 panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
640
711
                 boxCB.setToolTipText("Display bounding boxes");
641
712
                                 boxCB.addItemListener(this);
642
-        	//constraints.gridy += 1;
713
+                                
643
714
                 panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
644
715
                 zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
645
716
                                 zoomBoxCB.addItemListener(this);
646
717
 
718
+        if (true) // Globals.ADVANCED)
719
+        {
720
+                panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
721
+                supportCB.setToolTipText("Enable rigging");
722
+                                supportCB.addItemListener(this);
723
+
724
+        //        panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
725
+        //                        localCB.addItemListener(this);
726
+
727
+                panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
728
+                crowdCB.setToolTipText("Used for crowds");
729
+                                crowdCB.addItemListener(this);
730
+
731
+                panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
732
+                smoothCB.setToolTipText("Snapping delay");
733
+                                smoothCB.addItemListener(this);
734
+
735
+                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
736
+                slowCB.setToolTipText("Smooth interpolation");
737
+                                slowCB.addItemListener(this);
738
+                                
647
739
 //        	constraints.gridy += 1;
648
740
 //                panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
649
741
 //                                speakerMocapCB.addItemListener(this);
..
..
@@ -668,14 +760,20 @@
668
760
 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
669
761
 //                debugCB.addItemListener(this);
670
762
 
671
-        	//constraints.gridy += 1;
672
763
                 panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
673
764
                                 oeilCB.addItemListener(this);
674
765
 
675
-        	//constraints.gridy += 1;
676
766
                 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
677
767
                 lookAtCB.setToolTipText("Look-at target");
678
768
                                 lookAtCB.addItemListener(this);
769
+                
770
+        }
771
+                                
772
+                cGridBag fill = new cGridBag();
773
+                                
774
+                fill.preferredHeight = 200;
775
+                
776
+                panel.add(fill);
679
777
 
680
778
         }
681
779
 	
..
..
@@ -690,6 +788,7 @@
690
788
             buttonGroup.add(radioButton);
691
789
             radioButton.doClick();
692
790
         }
791
+        
693
792
         void SetupViews(ObjEditor oe)
694
793
         {
695
794
             oe.SetupViews();
..
..
@@ -906,7 +1005,9 @@
906
1005
 //                        objEditor.DropFile((java.io.File[]) object, true);
907
1006
 //                        return;
908
1007
 //                    }
909
-                    if (string.charAt(0) == '/')
1008
+                    
1009
+                    // File path for Mac and Windows
1010
+                    if (string.charAt(0) == '/' || string.charAt(1) == ':')
910
1011
                     {
911
1012
                         // file(s)
912
1013
                         String[] names = string.split("\n");
..
..
@@ -933,7 +1034,7 @@
933
1034
                     
934
1035
                     flashIt = false;
935
1036
                     CameraPane pane = (CameraPane) target;
936
-                    pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
1037
+                    pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
937
1038
                     pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
938
1039
                     
939
1040
                     if (group.selection.size() == 1)
..
..
@@ -960,11 +1061,11 @@
960
1061
             {
961
1062
                 loadClipboard(true);
962
1063
                 objEditor.jTree.setSelectionPath(destinationPath);
963
-                pasteInto(false);
1064
+                pasteInto(false, false);
964
1065
             } else {
965
1066
                 loadClipboard(false);
966
1067
                 objEditor.jTree.setSelectionPath(destinationPath);
967
-                pasteInto(false); // true); // ???
1068
+                pasteInto(false, false); // true); // ???
968
1069
             }
969
1070
 	}
970
1071
 	public void	dropActionChanged(DropTargetDragEvent dtde) 
..
..
@@ -1086,27 +1187,33 @@
1086
1187
 		kleinItem.addActionListener(this);
1087
1188
 		particleItem = menu.add(new MenuItem("Particle system"));
1088
1189
 		particleItem.addActionListener(this);
1190
+        if (Globals.ADVANCED)
1191
+        {
1089
1192
 		ragdollItem = menu.add(new MenuItem("Rag Walk"));
1090
1193
 		ragdollItem.addActionListener(this);
1091
1194
 		ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1092
1195
 		ragdoll2Item.addActionListener(this);
1196
+        }
1093
1197
 		menu.add("-");
1094
-		meshItem = menu.add(new MenuItem("Mesh"));
1198
+		meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1095
1199
 		meshItem.addActionListener(this);
1096
1200
 	//	meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1097
1201
 	//	meshGroupItem.addActionListener(this);
1202
+        if (Globals.ADVANCED)
1203
+        {
1098
1204
 		springItem = menu.add(new MenuItem("Spring"));
1099
1205
 		springItem.addActionListener(this);
1100
1206
 		flagItem = menu.add(new MenuItem("Flag"));
1101
1207
 		flagItem.addActionListener(this);
1102
-		bezierItem = menu.add(new MenuItem("Patch"));
1103
-		bezierItem.addActionListener(this);
1104
-		checkerItem = menu.add(new MenuItem("Checker"));
1105
-		checkerItem.addActionListener(this);
1106
1208
 		blobItem = menu.add(new MenuItem("Blob"));
1107
1209
 		blobItem.addActionListener(this);
1108
1210
 		latheItem = menu.add(new MenuItem("Lathe"));
1109
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);
1110
1217
 		lightItem = menu.add(new MenuItem("Light"));
1111
1218
 		lightItem.addActionListener(this);
1112
1219
 		menu.add("-");
..
..
@@ -1116,34 +1223,39 @@
1116
1223
 		loopItem.addActionListener(this);
1117
1224
 		doubleItem = menu.add(new MenuItem("Fork"));
1118
1225
 		doubleItem.addActionListener(this);
1226
+        if (Globals.ADVANCED)
1227
+        {
1119
1228
 		tripleItem = menu.add(new MenuItem("Trident"));
1120
1229
 		tripleItem.addActionListener(this);
1230
+        }
1121
1231
 	}
1122
1232
         
1123
1233
 	void buildToolsMenu(Menu menu)
1124
1234
 	{
1125
1235
 		menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1126
1236
 		animationItem.addItemListener(this);
1127
-                animationItem.setState(CameraPane.ANIMATION);
1237
+                animationItem.setState(Globals.ANIMATION);
1128
1238
                 
1129
1239
 		menu.add("-");
1130
1240
 		parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1131
1241
 		parseverticesItem.addActionListener(this);
1132
1242
 		textureFieldItem = menu.add(new MenuItem("Texture Field"));
1133
1243
 		textureFieldItem.addActionListener(this);
1134
-		alignItem = menu.add(new MenuItem("Align"));
1244
+		alignItem = menu.add(new MenuItem("Align Objects"));
1135
1245
 		alignItem.addActionListener(this);
1136
-		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1137
-		mirrorItem.addActionListener(this);
1138
1246
 		reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1139
1247
 		reduceMorphItem.addActionListener(this);
1140
1248
 		reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1141
1249
 		reduce34MorphItem.addActionListener(this);
1142
-                
1250
+		menu.add("-");
1143
1251
 		menu.add(computeAOItem = new MenuItem("Compute AO"));
1144
1252
 		computeAOItem.addActionListener(this);
1145
-		menu.add("-");
1146
1253
                 
1254
+        if (Globals.ADVANCED)
1255
+        {
1256
+		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1257
+		mirrorItem.addActionListener(this);
1258
+		menu.add("-");
1147
1259
 		menu.add(memoryItem = new MenuItem("Memory Usage"));
1148
1260
 		memoryItem.addActionListener(this);
1149
1261
 		menu.add(analyzeItem = new MenuItem("Analyze"));
..
..
@@ -1166,6 +1278,7 @@
1166
1278
 		menu.add("-");
1167
1279
 		menu.add(editScriptItem = new MenuItem("Edit Script..."));
1168
1280
 		editScriptItem.addActionListener(this);
1281
+        }
1169
1282
         }
1170
1283
         
1171
1284
         void ScreenFit()
..
..
@@ -1494,9 +1607,9 @@
1494
1607
     
1495
1608
     void Overwrite(int mask)
1496
1609
     {
1497
-        if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
1610
+        if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
1498
1611
         {
1499
-            Object3D content = GrafreeD.clipboard.get(0);
1612
+            Object3D content = Grafreed.clipboard.get(0);
1500
1613
 
1501
1614
             if (content instanceof cGroup && ((cGroup)content).transientlink )
1502
1615
                 content = ((cGroup)content).get(0);
..
..
@@ -1667,7 +1780,7 @@
1667
1780
 		{
1668
1781
 			makeSomething(new BezierSurface());
1669
1782
 		} else
1670
-		if (source == checkerItem)
1783
+		if (source == overlayItem)
1671
1784
 		{
1672
1785
                     /*
1673
1786
 			Object3D obj = new BezierSurface(5,8);
..
..
@@ -1801,23 +1914,6 @@
1801
1914
                         csg.addChild(child);
1802
1915
                         child.addChild(csg);
1803
1916
 		} else
1804
-                    
1805
-		if (source == importGFDItem)
1806
-		{
1807
-			ImportGFD();
1808
-		} else
1809
-		if (source == importVRMLX3DItem)
1810
-		{
1811
-			ImportVRMLX3D();
1812
-		} else
1813
-		if (source == import3DSItem)
1814
-		{
1815
-			objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1816
-		} else
1817
-		if (source == importOBJItem)
1818
-		{
1819
-			objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1820
-		} else
1821
1917
 		if (source == computeAOItem)
1822
1918
 		{
1823
1919
                     Globals.drawMode = CameraPane.OCCLUSION;
..
..
@@ -1836,7 +1932,7 @@
1836
1932
 		if (source == invariantsItem)
1837
1933
 		{
1838
1934
                     System.out.println("Invariants:");
1839
-                    GrafreeD.grafreeD.universe.invariants();
1935
+                    Grafreed.grafreeD.universe.invariants();
1840
1936
 		} else
1841
1937
 		if (source == memoryItem)
1842
1938
 		{
..
..
@@ -1854,6 +1950,11 @@
1854
1950
 		if (source == dumpItem)
1855
1951
 		{
1856
1952
                     DumpObject();
1953
+		} else
1954
+		if (source == oneStepButton)
1955
+		{
1956
+                    Globals.ONESTEP = true;
1957
+                    cameraView.repaint();
1857
1958
 		} else
1858
1959
 		if (source == screenfitButton)
1859
1960
 		{
..
..
@@ -1906,10 +2007,10 @@
1906
2007
 		} else
1907
2008
 		if (source == duplicateItem)
1908
2009
 		{
1909
-                    Object3D keep = GrafreeD.clipboard;
2010
+                    Object3D keep = Grafreed.clipboard;
1910
2011
 			loadClipboard(false);
1911
2012
 			paste(false);
1912
-                    GrafreeD.clipboard = keep;
2013
+                    Grafreed.clipboard = keep;
1913
2014
 		} else
1914
2015
 		if (source == cloneItem)
1915
2016
 		{
..
..
@@ -1927,13 +2028,17 @@
1927
2028
 		{
1928
2029
 			paste(false);
1929
2030
 		} else
2031
+		if (source == pasteIntoItem)
2032
+		{
2033
+			pasteInto(true, false);
2034
+		} else
1930
2035
 		if (source == pasteLinkItem)
1931
2036
 		{
1932
-			pasteInto(false);
2037
+			pasteInto(false, false);
1933
2038
 		} else
1934
2039
 		if (source == pasteCloneItem)
1935
2040
 		{
1936
-			pasteInto(true);
2041
+			pasteInto(true, true);
1937
2042
 		} else
1938
2043
 		if (source == pasteExpandItem)
1939
2044
 		{
..
..
@@ -2125,9 +2230,9 @@
2125
2230
 //                        group.selection.get(0).setMasterThis(content); // should be identity
2126
2231
 //		refreshContents();
2127
2232
 //                    }
2128
-                    if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
2233
+                    if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
2129
2234
                     {
2130
-                        Object3D content = GrafreeD.clipboard.get(0);
2235
+                        Object3D content = Grafreed.clipboard.get(0);
2131
2236
                         
2132
2237
                         if (content instanceof cGroup && ((cGroup)content).transientlink )
2133
2238
                             content = ((cGroup)content).get(0);
..
..
@@ -2135,11 +2240,11 @@
2135
2240
             Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2136
2241
                         for (int i=0; i<group.selection.size(); i++)
2137
2242
                         {
2138
-                            boolean random = CameraPane.RANDOM;
2139
-                            CameraPane.RANDOM = false; // parse all random nodes
2243
+                            boolean random = CameraPane.SWITCH;
2244
+                            CameraPane.SWITCH = false; // parse all random nodes
2140
2245
                             group.selection.get(i).linkVerticesThis(content);
2141
2246
                       //      group.selection.get(i).setMasterThis(content); // should be identity
2142
-                            CameraPane.RANDOM = random;
2247
+                            CameraPane.SWITCH = random;
2143
2248
                         }
2144
2249
             Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2145
2250
 		refreshContents();
..
..
@@ -2149,20 +2254,20 @@
2149
2254
 		{
2150
2255
                     for (int i=0; i<group.selection.size(); i++)
2151
2256
                     {
2152
-                        boolean random = CameraPane.RANDOM;
2153
-                        CameraPane.RANDOM = false; // parse all random nodes
2257
+                        boolean random = CameraPane.SWITCH;
2258
+                        CameraPane.SWITCH = false; // parse all random nodes
2154
2259
                         group.selection.get(i).linkVerticesThis(null);
2155
-                        CameraPane.RANDOM = random;
2260
+                        CameraPane.SWITCH = random;
2156
2261
                     }
2157
2262
 
2158
2263
                     refreshContents();
2159
2264
 		} else
2160
2265
 		if (source == relinkverticesItem)
2161
2266
 		{
2162
-                    boolean random = CameraPane.RANDOM;
2163
-                    CameraPane.RANDOM = false; // parse all random nodes
2267
+                    boolean random = CameraPane.SWITCH;
2268
+                    CameraPane.SWITCH = false; // parse all random nodes
2164
2269
                     group.selection.RelinkToSupport();
2165
-                    CameraPane.RANDOM = random;
2270
+                    CameraPane.SWITCH = random;
2166
2271
 
2167
2272
                     refreshContents();
2168
2273
 		} else
..
..
@@ -2177,9 +2282,9 @@
2177
2282
 		} else
2178
2283
 		if (source == setMasterItem)
2179
2284
 		{
2180
-                    if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2285
+                    if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2181
2286
                     {
2182
-                        Object3D content = GrafreeD.clipboard.get(0);
2287
+                        Object3D content = Grafreed.clipboard.get(0);
2183
2288
                         
2184
2289
                         if (content instanceof cGroup && ((cGroup)content).transientlink )
2185
2290
                             content = ((cGroup)content).get(0);
..
..
@@ -2192,9 +2297,9 @@
2192
2297
 		{
2193
2298
                     if (group.selection.size() == 1)
2194
2299
                     {
2195
-                        if (GrafreeD.clipboard.size() == 1)
2300
+                        if (Grafreed.clipboard.size() == 1)
2196
2301
                         {
2197
-                            Object3D content = GrafreeD.clipboard.get(0);
2302
+                            Object3D content = Grafreed.clipboard.get(0);
2198
2303
 
2199
2304
                             if (content instanceof cGroup && ((cGroup)content).transientlink )
2200
2305
                                 content = ((cGroup)content).get(0);
..
..
@@ -2211,7 +2316,7 @@
2211
2316
 		{
2212
2317
 			RevertMeshes();
2213
2318
 		} else
2214
-		if (source == resetMeshItem)
2319
+		if (source == resetAllItem)
2215
2320
 		{
2216
2321
 			ResetAll();
2217
2322
 		} else
..
..
@@ -2260,7 +2365,7 @@
2260
2365
                         RandomNode random = new RandomNode();
2261
2366
 			group(random);
2262
2367
                         if (random.size() > 0)
2263
-                            random.name = random.get(0).name + "Rnd";
2368
+                            random.name = random.get(0).name + "Switch";
2264
2369
 		} else
2265
2370
 		if (source == physicsItem)
2266
2371
                 {
..
..
@@ -2549,9 +2654,13 @@
2549
2654
                 {
2550
2655
 			SmoothMesh();
2551
2656
 		} else
2552
-		if (source == transformgeometryItem)
2657
+		if (source == transformGeometryItem)
2553
2658
 		{
2554
2659
                         TransformGeometry();
2660
+		} else
2661
+		if (source == transformChildrenItem)
2662
+		{
2663
+                        TransformChildren();
2555
2664
 		} else
2556
2665
 		if (source == resetTransformItem)
2557
2666
 		{
..
..
@@ -2559,7 +2668,11 @@
2559
2668
 		} else
2560
2669
 		if (source == resetCentroidItem)
2561
2670
 		{
2562
-                        ResetCentroid();
2671
+                        ResetCentroid(true);
2672
+		} else
2673
+		if (source == resetCentroidXZItem)
2674
+		{
2675
+                        ResetCentroid(false);
2563
2676
 		} else
2564
2677
 		if (source == resetParentItem)
2565
2678
 		{
..
..
@@ -2917,7 +3030,7 @@
2917
3030
                                 
2918
3031
                                 child.editWindow = null; // ???????????
2919
3032
 			}
2920
-			objEditor.ctrlPanel.validate();
3033
+			objEditor.ctrlPanel.FlushUI();
2921
3034
 			//objEditor.jTree.clearSelection();
2922
3035
 			//objEditor.ResetSliders();
2923
3036
                     refreshContents(true);
..
..
@@ -3001,7 +3114,9 @@
3001
3114
                         frontView.object = group;
3002
3115
                         sideView.object = group;
3003
3116
                     }
3004
-                    group.editWindow = this;
3117
+                    
3118
+// fix "+" issue                    group.editWindow = this;
3119
+                    
3005
3120
                     /*
3006
3121
                     currentLayout = radio.layout;
3007
3122
                     if (currentLayout == null)
..
..
@@ -3014,7 +3129,20 @@
3014
3129
                     //group.attributes = -1;
3015
3130
                     ResetModel();
3016
3131
                     refreshContents(true);
3017
-                }
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
+                } 
3018
3146
                 else
3019
3147
                 {
3020
3148
 			//return super.action(event, arg);
..
..
@@ -3075,6 +3203,28 @@
3075
3203
             refreshContents();
3076
3204
         }
3077
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
+        }
3078
3228
         
3079
3229
         void ResetTransform()
3080
3230
         {
..
..
@@ -3187,7 +3337,7 @@
3187
3337
             refreshContents();
3188
3338
         }
3189
3339
         
3190
-        void ResetCentroid()
3340
+        void ResetCentroid(boolean full)
3191
3341
         {
3192
3342
             Object3D obj;
3193
3343
             for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..
..
@@ -3202,12 +3352,16 @@
3202
3352
                     LA.matIdentity(Object3D.mat);
3203
3353
                     obj.getBounds(minima, maxima, false);
3204
3354
                     Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3205
-                    Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3355
+                    if (full)
3356
+                        Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3206
3357
                     Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3207
3358
                     obj.TransformMesh(Object3D.mat);
3359
+                    
3208
3360
                     Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3209
-                    Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3361
+                    if (full)
3362
+                        Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3210
3363
                     Object3D.mat[3][2] = (minima.z + maxima.z)/2;
3364
+                    
3211
3365
                     LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3212
3366
                     //Object3D.mat[3][0] = -Object3D.mat[3][0];
3213
3367
                     //Object3D.mat[3][1] = -Object3D.mat[3][1];
..
..
@@ -3273,9 +3427,9 @@
3273
3427
                     obj = (Object3D)e.nextElement();
3274
3428
                     
3275
3429
                     System.out.println("Object is: " + obj);
3276
-                    GrafreeD.AnalyzeObject(obj);
3430
+                    Grafreed.AnalyzeObject(obj);
3277
3431
                     System.out.println("Boundary rep: " + obj.bRep);
3278
-                    GrafreeD.AnalyzeObject(obj.bRep);
3432
+                    Grafreed.AnalyzeObject(obj.bRep);
3279
3433
                     
3280
3434
 //                    System.err.println((size/1024) + " KB is the size of " + obj);
3281
3435
                 }
..
..
@@ -3489,8 +3643,8 @@
3489
3643
 	
3490
3644
 	void ParseVertices()
3491
3645
 	{
3492
-            boolean epsequal = GrafreeD.epsequal;
3493
-            GrafreeD.epsequal = true;
3646
+            boolean epsequal = Grafreed.epsequal;
3647
+            Grafreed.epsequal = true;
3494
3648
             
3495
3649
             for (int i=0; i<group.selection.size(); i++)
3496
3650
             {
..
..
@@ -3515,7 +3669,7 @@
3515
3669
                                 LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3516
3670
                                 LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3517
3671
 
3518
-                                g.add(GrafreeD.clipboard);
3672
+                                g.add(Grafreed.clipboard);
3519
3673
 
3520
3674
                                 buffer.add(g);
3521
3675
                             }
..
..
@@ -3530,7 +3684,7 @@
3530
3684
                 makeSomething(buffer, i==group.selection.size()-1);
3531
3685
             }
3532
3686
             
3533
-            GrafreeD.epsequal = epsequal;
3687
+            Grafreed.epsequal = epsequal;
3534
3688
             
3535
3689
             refreshContents();
3536
3690
 	}
..
..
@@ -3548,7 +3702,16 @@
3548
3702
                             String pigment = Object3D.GetPigment(tex);
3549
3703
                             //String bump = Object3D.GetBump(tex);
3550
3704
                             
3551
-                            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
+                            }
3552
3715
                             
3553
3716
                             double s = v.s;
3554
3717
                             
..
..
@@ -3636,11 +3799,11 @@
3636
3799
 
3637
3800
             SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3638
3801
 
3639
-            boolean random = CameraPane.RANDOM;
3640
-            CameraPane.RANDOM = false; // parse all random nodes
3802
+            boolean random = CameraPane.SWITCH;
3803
+            CameraPane.SWITCH = false; // parse all random nodes
3641
3804
             lowres.linkVerticesThis(null);
3642
3805
             lowres.linkVerticesThis(sn);
3643
-            CameraPane.RANDOM = random;
3806
+            CameraPane.SWITCH = random;
3644
3807
 
3645
3808
             System.err.flush();
3646
3809
 
..
..
@@ -3680,7 +3843,7 @@
3680
3843
                 return;
3681
3844
             
3682
3845
             Object3D poses = group.selection.get(0);
3683
-            Object3D ref = GrafreeD.clipboard.get(0);
3846
+            Object3D ref = Grafreed.clipboard.get(0);
3684
3847
             
3685
3848
             Object3D newgroup = new Object3D("Po:" + poses.name);
3686
3849
             
..
..
@@ -3874,9 +4037,9 @@
3874
4037
 	
3875
4038
 	void ClipMesh()
3876
4039
 	{
3877
-            if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
4040
+            if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
3878
4041
             {
3879
-                Object3D content = GrafreeD.clipboard.get(0);
4042
+                Object3D content = Grafreed.clipboard.get(0);
3880
4043
 
3881
4044
                 if (content instanceof cGroup && ((cGroup)content).transientlink )
3882
4045
                     content = ((cGroup)content).get(0);
..
..
@@ -3885,7 +4048,7 @@
3885
4048
 //                {
3886
4049
 //                    group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3887
4050
 //                }
3888
-                  group.selection.ClipMesh(GrafreeD.clipboard);
4051
+                  group.selection.ClipMesh(Grafreed.clipboard);
3889
4052
             }
3890
4053
 //		group.selection.ClipMesh(GrafreeD.clipboard);
3891
4054
             System.out.println("DONE.");
..
..
@@ -4020,7 +4183,7 @@
4020
4183
                     objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4021
4184
                     
4022
4185
 			Object3D elem = (Object3D)group.selection.elementAt(i);
4023
-                        if(elem != group)
4186
+                        if(elem != group || !newWindow)
4024
4187
                         {
4025
4188
                         //    if (!(elem instanceof Composite))
4026
4189
                         //        newWindow = false;
..
..
@@ -4125,12 +4288,12 @@
4125
4288
             System.err.println("info : " + child.GetPath());
4126
4289
 				}
4127
4290
 			}
4128
-			else
4129
-                        {
4130
-				objEditor.SetMaterial(group); // .GetMaterial());
4131
-				objEditor.AddInfo(group, this, true); // .GetMaterial());
4132
-            System.err.println("info : " + group.GetPath());
4133
-                        }
4291
+//			else
4292
+//                        {
4293
+//				objEditor.SetMaterial(group); // .GetMaterial());
4294
+//				objEditor.AddInfo(group, this, true); // .GetMaterial());
4295
+//            System.err.println("info : " + group.GetPath());
4296
+//                        }
4134
4297
 			
4135
4298
                         objEditor.SetText(); // jan 2014
4136
4299
                         
..
..
@@ -4225,12 +4388,12 @@
4225
4388
 	{
4226
4389
 		if (group.selection.isEmpty())
4227
4390
 			return;
4228
-		GrafreeD.clipboardIsTempGroup = false;
4391
+		Grafreed.clipboardIsTempGroup = false;
4229
4392
 		Composite tGroup = null;
4230
4393
 		if (group.selection.size() > 0) // 1)
4231
4394
 		{
4232
4395
 			tGroup = new cGroup();
4233
-			GrafreeD.clipboardIsTempGroup = true;
4396
+			Grafreed.clipboardIsTempGroup = true;
4234
4397
 		}
4235
4398
                 
4236
4399
 		if (cut)
..
..
@@ -4270,16 +4433,16 @@
4270
4433
 		//System.out.println("cut " + child);
4271
4434
 		//System.out.println("parent = " + child.parent);
4272
4435
                 //                   tmp.addChild(child);
4273
-                                    if (GrafreeD.clipboardIsTempGroup)
4436
+                                    if (Grafreed.clipboardIsTempGroup)
4274
4437
                                             tGroup.add/*Child*/(tmp);
4275
4438
                                     else
4276
-                                            GrafreeD.clipboard = tmp;
4439
+                                            Grafreed.clipboard = tmp;
4277
4440
                                 }
4278
4441
                                 else
4279
-                                    if (GrafreeD.clipboardIsTempGroup)
4442
+                                    if (Grafreed.clipboardIsTempGroup)
4280
4443
                                             tGroup.add/*Child*/(child);
4281
4444
                                     else
4282
-                                            GrafreeD.clipboard = child;
4445
+                                            Grafreed.clipboard = child;
4283
4446
 			}
4284
4447
 			
4285
4448
 			//ResetModel();
..
..
@@ -4311,21 +4474,21 @@
4311
4474
 		//System.out.println("cut " + elem);
4312
4475
 		//System.out.println("parent = " + elem.parent);
4313
4476
                 //                    tmp.addChild(elem);
4314
-                                    if (GrafreeD.clipboardIsTempGroup)
4477
+                                    if (Grafreed.clipboardIsTempGroup)
4315
4478
                                             tGroup.add/*Child*/(tmp);
4316
4479
                                     else
4317
-                                            GrafreeD.clipboard = tmp;
4480
+                                            Grafreed.clipboard = tmp;
4318
4481
                                 }
4319
4482
                                 else
4320
-                                    if (GrafreeD.clipboardIsTempGroup)
4483
+                                    if (Grafreed.clipboardIsTempGroup)
4321
4484
                                             tGroup.add/*Child*/(child);
4322
4485
                                     else
4323
-                                            GrafreeD.clipboard = child;
4486
+                                            Grafreed.clipboard = child;
4324
4487
 			}
4325
4488
 			
4326
4489
 		}
4327
-		if (GrafreeD.clipboardIsTempGroup)
4328
-			GrafreeD.clipboard = tGroup;
4490
+		if (Grafreed.clipboardIsTempGroup)
4491
+			Grafreed.clipboard = tGroup;
4329
4492
 		if (cut)
4330
4493
                 {
4331
4494
                     ResetModel();
..
..
@@ -4339,7 +4502,7 @@
4339
4502
 	//		return;
4340
4503
 		boolean first = true;
4341
4504
 		
4342
-		if (GrafreeD.clipboardIsTempGroup)
4505
+		if (Grafreed.clipboardIsTempGroup)
4343
4506
 		{
4344
4507
 			Composite temp;
4345
4508
 			
..
..
@@ -4350,7 +4513,7 @@
4350
4513
 				temp = (Composite)Applet3D.clipboard.deepCopy();
4351
4514
                          */
4352
4515
 			Object3D elem;
4353
-			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))
4354
4517
 			{
4355
4518
 				Object3D child = (Object3D)e.nextElement();
4356
4519
                                 
..
..
@@ -4384,21 +4547,21 @@
4384
4547
 			//Object3D cb = Applet3D.clipboard;
4385
4548
 			//temp.addChild(cb);
4386
4549
 			//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4387
-                    assert(GrafreeD.clipboard.parent == null);
4388
-                        Object3D /*Composite*/ keepparent = GrafreeD.clipboard.get(0).parent;
4389
-                        GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4390
-                        if (LA.isIdentity(GrafreeD.clipboard.toParent))
4391
-                            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());
4392
4555
                         else
4393
-                            makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4394
-                        GrafreeD.clipboard.get(0).parent = keepparent;
4556
+                            makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
4557
+                        Grafreed.clipboard.get(0).parent = keepparent;
4395
4558
 		}
4396
4559
 		
4397
4560
 		ResetModel();
4398
4561
 		refreshContents();
4399
4562
 	}
4400
4563
 	
4401
-	void pasteInto(boolean copyit)
4564
+	void pasteInto(boolean copyit, boolean clone)
4402
4565
 	{
4403
4566
 //		if (GrafreeD.clipboard == null)
4404
4567
 //			return;
..
..
@@ -4427,15 +4590,22 @@
4427
4590
 		if (copyit)
4428
4591
 		{
4429
4592
 		//	paste(false);
4430
-                    CloneClipboard(false); // sept 2014
4593
+                        if (clone)
4594
+                        {
4595
+                            CloneClipboard(false); // sept 2014
4596
+                        }
4597
+                        else
4598
+                        {
4599
+                            paste(false);
4600
+                        }
4431
4601
 		}
4432
4602
 		else
4433
4603
 		{
4434
4604
 			boolean first = true;
4435
4605
 			
4436
-			if (GrafreeD.clipboardIsTempGroup)
4606
+			if (Grafreed.clipboardIsTempGroup)
4437
4607
 			{
4438
-				Composite temp = (Composite)GrafreeD.clipboard;
4608
+				Composite temp = (Composite)Grafreed.clipboard;
4439
4609
 				Object3D copy;
4440
4610
 				for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4441
4611
 				{
..
..
@@ -4445,7 +4615,7 @@
4445
4615
 				}
4446
4616
 			} else
4447
4617
 			{
4448
-				linkSomething(GrafreeD.clipboard); //.get(0));
4618
+				linkSomething(Grafreed.clipboard); //.get(0));
4449
4619
 			}
4450
4620
 		}
4451
4621
             }
..
..
@@ -4850,21 +5020,6 @@
4850
5020
         }
4851
5021
          */
4852
5022
 
4853
-        void ImportGFD()
4854
-        {
4855
-            FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4856
-            browser.show();
4857
-            String filename = browser.getFile();
4858
-            if (filename != null && filename.length() > 0)
4859
-            {
4860
-                String fullname = browser.getDirectory() + filename;
4861
-
4862
-                //Object3D readobj =
4863
-                        objEditor.ReadGFD(fullname, objEditor);
4864
-                //makeSomething(readobj);
4865
-            }
4866
-        }
4867
-        
4868
5023
         /*
4869
5024
         public void Callback(Object obj)
4870
5025
         {
..
..
@@ -4888,26 +5043,9 @@
4888
5043
         }
4889
5044
          */
4890
5045
 
4891
-	void ImportVRMLX3D()
4892
-	{
4893
-		if (GrafreeD.standAlone)
4894
-		{
4895
-                    /**/
4896
-			FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4897
-			browser.show();
4898
-			String filename = browser.getFile();
4899
-			if (filename != null && filename.length() > 0)
4900
-			{
4901
-				String fullname = browser.getDirectory() + filename;
4902
-                                LoadVRMLX3D(fullname);
4903
-			}
4904
-                     /**/
4905
-		}
4906
-	}
4907
-				
4908
5046
 	String GetFile(String dialogName)
4909
5047
 	{
4910
-		if (GrafreeD.standAlone)
5048
+		if (Grafreed.standAlone)
4911
5049
 		{
4912
5050
 			FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4913
5051
 			browser.show();
..
..
@@ -4971,10 +5109,12 @@
4971
5109
 	cButton flashSelectionButton;
4972
5110
 	cButton editButton;
4973
5111
 	cButton uneditButton;
5112
+	JCheckBox allParamsButton;
4974
5113
 	cButton clearpanelButton;
4975
-	cButton allParamsButton;
4976
5114
 	cButton unselectButton;
4977
5115
 	
5116
+	cButton oneStepButton;
5117
+        
4978
5118
 	cButton screenfitButton;
4979
5119
 	cButton screenfitpointButton;
4980
5120
 	cButton snapobjectButton;
..
..
@@ -5018,7 +5158,7 @@
5018
5158
 	private MenuItem linkverticesItem;
5019
5159
 	private MenuItem relinkverticesItem;
5020
5160
 	private MenuItem setMasterItem;
5021
-	private MenuItem resetMeshItem;
5161
+	private MenuItem resetAllItem;
5022
5162
 	private MenuItem stepAllItem;
5023
5163
 	private MenuItem revertMeshItem;
5024
5164
 	private MenuItem poseMeshItem;
..
..
@@ -5029,6 +5169,7 @@
5029
5169
 	private MenuItem mergeGeometriesItem;
5030
5170
 	private MenuItem copyItem;
5031
5171
 	private MenuItem pasteItem;
5172
+	private MenuItem pasteIntoItem;
5032
5173
 	private MenuItem pasteLinkItem;
5033
5174
 	private MenuItem pasteCloneItem;
5034
5175
 	private MenuItem pasteExpandItem;
..
..
@@ -5078,8 +5219,10 @@
5078
5219
 	private MenuItem panoTexturesItem;
5079
5220
         
5080
5221
 	private MenuItem resetCentroidItem;
5081
-	private MenuItem transformgeometryItem;
5222
+	private MenuItem resetCentroidXZItem;
5082
5223
 	private MenuItem resetTransformItem;
5224
+	private MenuItem transformGeometryItem;
5225
+	private MenuItem transformChildrenItem;
5083
5226
 	private MenuItem hideItem;
5084
5227
 	private MenuItem grabItem;
5085
5228
 	private MenuItem backItem;
..
..
@@ -5126,7 +5269,7 @@
5126
5269
 	private MenuItem blobItem;
5127
5270
 	private MenuItem latheItem;
5128
5271
 	private MenuItem bezierItem;
5129
-	private MenuItem checkerItem;
5272
+	private MenuItem overlayItem;
5130
5273
 	private MenuItem meshItem;
5131
5274
 //	private MenuItem meshGroupItem;
5132
5275
 	private MenuItem springItem;
..
..
@@ -5148,11 +5291,6 @@
5148
5291
 	private MenuItem doubleItem;
5149
5292
 	private MenuItem tripleItem;
5150
5293
         
5151
-	private MenuItem importGFDItem;
5152
-	private MenuItem importVRMLX3DItem;
5153
-	private MenuItem import3DSItem;
5154
-	private MenuItem importOBJItem;
5155
-
5156
5294
 	private MenuItem computeAOItem;
5157
5295
 	private MenuItem recompileItem;
5158
5296
 	private MenuItem editScriptItem;
..
..
@@ -5162,4 +5300,8 @@
5162
5300
 	private MenuItem analyzeItem;
5163
5301
 	private MenuItem dumpItem;
5164
5302
 	//boolean freezemodel = false;
5303
+        
5304
+    Menu cameraMenu;
5305
+    MenuItem editCameraItem;
5306
+    MenuItem revertCameraItem;
5165
5307
 }