Rename Grafreed

Normand Briere

2019-05-05 623dc0fa8cbd9473830a1786f6d49fa808a09439

 GroupEditor.java
..
..
@@ -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
..
..
@@ -150,6 +150,8 @@
150
150
     
151
151
 	void SetupMenu2(ObjEditor oe)
152
152
 	{
153
+        if (Globals.ADVANCED)
154
+        {
153
155
 		oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
154
156
 		//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
155
157
 		//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..
..
@@ -161,17 +163,21 @@
161
163
 		lookAtItem.addActionListener(this);
162
164
 		//lookFromItem.addActinoListener(this);
163
165
 		//switchItem.addActionListener(this);
166
+        }
167
+        
164
168
 		Menu menu;
165
169
 		oe.menuBar.add(menu = new Menu("Edit"));
166
170
 		//editItem = menu.add(new MenuItem("Edit"));
167
171
 		//editItem.addActionListener(this);
168
172
 		duplicateItem = menu.add(new MenuItem("Duplicate"));
169
173
 		duplicateItem.addActionListener(this);
170
-		menu.add("-");
171
174
 		cloneItem = menu.add(new MenuItem("Clone"));
172
175
 		cloneItem.addActionListener(this);
176
+        if (Globals.ADVANCED)
177
+        {
173
178
 		cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174
179
 		cloneSupportItem.addActionListener(this);
180
+        }
175
181
 		menu.add("-");
176
182
 		cutItem = menu.add(new MenuItem("Cut"));
177
183
 		cutItem.addActionListener(this);
..
..
@@ -179,18 +185,31 @@
179
185
 		copyItem.addActionListener(this);
180
186
 		pasteItem = menu.add(new MenuItem("Paste"));
181
187
 		pasteItem.addActionListener(this);
188
+		menu.add("-");
189
+                
190
+		menu.add("-");
191
+		pasteIntoItem = menu.add(new MenuItem("Paste into"));
192
+		pasteIntoItem.addActionListener(this);
182
193
 		pasteLinkItem = menu.add(new MenuItem("Paste link"));
183
194
 		pasteLinkItem.addActionListener(this);
184
195
 		pasteCloneItem = menu.add(new MenuItem("Paste clone"));
185
196
 		pasteCloneItem.addActionListener(this);
186
197
 //		pasteExpandItem = menu.add(new MenuItem("Paste expand"));
187
198
 //		pasteExpandItem.addActionListener(this);
199
+		menu.add("-");
188
200
 		clearItem = menu.add(new MenuItem("Clear"));
189
201
 		clearItem.addActionListener(this);
202
+                
203
+        if (Globals.ADVANCED)
204
+        {
205
+                // Deletes the cameras...
190
206
 		clearAllItem = menu.add(new MenuItem("Clear All"));
191
207
 		clearAllItem.addActionListener(this);
208
+        }
192
209
 
193
210
 		oe.menuBar.add(menu = new Menu("Setting"));
211
+        if (Globals.ADVANCED)
212
+        {
194
213
                 resetMeshItem = menu.add(new MenuItem("Reset All"));
195
214
 		resetMeshItem.addActionListener(this);
196
215
 		stepAllItem = menu.add(new MenuItem("Step All"));
..
..
@@ -200,6 +219,7 @@
200
219
 		resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201
220
 		resetreferencesItem.addActionListener(this);
202
221
 		menu.add("-");
222
+        }
203
223
 		overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204
224
 		overwriteGeoItem.addActionListener(this);
205
225
 		overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..
..
@@ -211,19 +231,26 @@
211
231
 		overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212
232
 		overwriteUVItem.addActionListener(this);
213
233
 		menu.add("-");
234
+        if (Globals.ADVANCED)
235
+        {
214
236
 		generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215
237
 		generateMeshItem.addActionListener(this);
216
238
 		poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217
239
 		poseMeshItem.addActionListener(this);
218
240
 		menu.add("-");
241
+        }
219
242
 		resetsupportItem = menu.add(new MenuItem("Reset support"));
220
243
 		resetsupportItem.addActionListener(this);
221
244
 		linkverticesItem = menu.add(new MenuItem("Link to Support"));
222
245
 		linkverticesItem.addActionListener(this);
223
246
 		relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224
247
 		relinkverticesItem.addActionListener(this);
248
+                
249
+        if (Globals.ADVANCED)
250
+        {
225
251
 		setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226
252
 		setMasterItem.addActionListener(this);
253
+        }
227
254
                 
228
255
 		oe.menuBar.add(menu = new Menu("Group"));
229
256
 		grabItem = menu.add(new MenuItem("Grab"));
..
..
@@ -234,7 +261,7 @@
234
261
 		frontItem.addActionListener(this);
235
262
 		compositeItem = menu.add(new MenuItem("Composite"));
236
263
 		compositeItem.addActionListener(this);
237
-		hideItem = menu.add(new MenuItem("Hide"));
264
+		hideItem = menu.add(new MenuItem("Hidden Group"));
238
265
 		hideItem.addActionListener(this);
239
266
 		ungroupItem = menu.add(new MenuItem("Ungroup"));
240
267
 		ungroupItem.addActionListener(this);
..
..
@@ -245,16 +272,21 @@
245
272
 		switchGeoItem.addActionListener(this);
246
273
 		switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
247
274
 		switchTransfoItem.addActionListener(this);
275
+		morphItem = menu.add(new MenuItem("Morph Group"));
276
+		morphItem.addActionListener(this);
277
+                
278
+        if (Globals.ADVANCED)
279
+        {
280
+		menu.add("-");
248
281
 		physicsItem = menu.add(new MenuItem("Physics"));
249
282
 		physicsItem.addActionListener(this);
250
283
 		frameselectorItem = menu.add(new MenuItem("Frame Selector"));
251
284
 		frameselectorItem.addActionListener(this);
252
-		morphItem = menu.add(new MenuItem("Morph"));
253
-		morphItem.addActionListener(this);
254
285
 		scriptNodeItem = menu.add(new MenuItem("Script Node"));
255
286
 		scriptNodeItem.addActionListener(this);
256
287
 		cameraItem = menu.add(new MenuItem("Camera"));
257
288
 		cameraItem.addActionListener(this);
289
+        }
258
290
                 
259
291
 		oe.menuBar.add(menu = new Menu("Object"));
260
292
 		textureItem = menu.add(new MenuItem("Texture"));
..
..
@@ -269,14 +301,18 @@
269
301
 		shadowYItem.addActionListener(this);
270
302
                 shadowZItem = menu.add(new MenuItem("Shadow Z"));
271
303
 		shadowZItem.addActionListener(this);
304
+        if (Globals.ADVANCED)
305
+        {
306
+		menu.add("-");
272
307
 		linkerItem = menu.add(new MenuItem("Linker"));
273
308
 		linkerItem.addActionListener(this);
274
-		templateItem = menu.add(new MenuItem("Template"));
275
-		templateItem.addActionListener(this);
276
309
 		attributeItem = menu.add(new MenuItem("Attribute"));
277
310
 		attributeItem.addActionListener(this);
311
+		templateItem = menu.add(new MenuItem("Template"));
312
+		templateItem.addActionListener(this);
278
313
 		pointflowItem = menu.add(new MenuItem("Point Flow"));
279
314
 		pointflowItem.addActionListener(this);
315
+        }
280
316
 		menu.add("-");
281
317
 		resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282
318
 		resetTransformItem.addActionListener(this);
..
..
@@ -294,8 +330,11 @@
294
330
 		genNormalsCADItem.addActionListener(this);
295
331
 		genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296
332
 		genNormalsMESHItem.addActionListener(this);
333
+        if (Globals.ADVANCED)
334
+        {
297
335
 		genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
298
336
 		genNormalsMINEItem.addActionListener(this);
337
+        }
299
338
 		stripifyItem = menu.add(new MenuItem("Stripify"));
300
339
 		stripifyItem.addActionListener(this);
301
340
 		unstripifyItem = menu.add(new MenuItem("Unstripify"));
..
..
@@ -317,10 +356,14 @@
317
356
 		reduce34MeshItem.addActionListener(this);
318
357
 		increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319
358
 		increaseMeshItem.addActionListener(this);
320
-		smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321
-		smoothMeshItem.addActionListener(this);
322
359
 		clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323
360
 		clipMeshItem.addActionListener(this);
361
+                
362
+        if (Globals.ADVANCED)
363
+        {
364
+		smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
365
+		smoothMeshItem.addActionListener(this);
366
+        }
324
367
 
325
368
                 oe.menuBar.add(menu = new Menu("Attributes"));
326
369
 		clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
..
..
@@ -330,10 +373,13 @@
330
373
 		liveleavesItem.addActionListener(this);
331
374
 		unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332
375
 		unliveleavesItem.addActionListener(this);
376
+        if (Globals.ADVANCED)
377
+        {
333
378
 		supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334
379
 		supportleavesItem.addActionListener(this);
335
380
 		unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336
381
 		unsupportleavesItem.addActionListener(this);
382
+        }
337
383
 		hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338
384
 		hideleavesItem.addActionListener(this);
339
385
 		showleavesItem = menu.add(new MenuItem("Show Leaves"));
..
..
@@ -376,6 +422,8 @@
376
422
 		sortbysizeItem.addActionListener(this);
377
423
 		sortbynameItem = menu.add(new MenuItem("Sort by name"));
378
424
 		sortbynameItem.addActionListener(this);
425
+        if (Globals.ADVANCED)
426
+        {
379
427
 		menu.add("-");
380
428
 		extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381
429
 		extractGeometriesItem.addActionListener(this);
..
..
@@ -385,20 +433,23 @@
385
433
 		shareGeometriesItem.addActionListener(this);
386
434
 		mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
387
435
 		mergeGeometriesItem.addActionListener(this);
436
+        }
388
437
                 
389
438
 		oe.menuBar.add(menu = new Menu("Insert"));
390
439
 		buildCreateMenu(menu);
391
440
                 
392
-               
393
441
                 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..."));
442
+		importOBJItem = menu.add(new MenuItem("OBJ file..."));
399
443
 		importOBJItem.addActionListener(this);
400
-		import3DSItem = menu.add(new MenuItem("3DS Object..."));
444
+		menu.add("-");
445
+		import3DSItem = menu.add(new MenuItem("3DS file..."));
401
446
 		import3DSItem.addActionListener(this);
447
+		menu.add("-");
448
+		importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
449
+		importVRMLX3DItem.addActionListener(this);
450
+		menu.add("-");
451
+		importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
452
+		importGFDItem.addActionListener(this);
402
453
 
403
454
                 oe.menuBar.add(menu = new Menu("Tools"));
404
455
 		buildToolsMenu(menu);
..
..
@@ -440,6 +491,10 @@
440
491
                 liveCB.setToolTipText("Enabled animation");
441
492
                                 liveCB.addItemListener(this);
442
493
 
494
+		oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
495
+                oneStepButton.setToolTipText("Animate one step forward");
496
+		oneStepButton.addActionListener(this);
497
+                
443
498
                 oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
444
499
                 fastCB.setToolTipText("Fast mode");
445
500
                                 fastCB.addItemListener(this);
..
..
@@ -448,7 +503,7 @@
448
503
                 trackCB.setToolTipText("Enable tracking");
449
504
                                 trackCB.addItemListener(this);
450
505
 
451
-		oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
506
+		oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
452
507
                 screenfitButton.setToolTipText("Screen fit");
453
508
 		screenfitButton.addActionListener(this);
454
509
 
..
..
@@ -457,39 +512,39 @@
457
512
 
458
513
                 if (Globals.ADVANCED)
459
514
                 {
460
-                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
515
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
461
516
                         snapobjectButton.addActionListener(this);
462
517
                         snapobjectButton.setToolTipText("Snap Object");
463
518
                 }
464
519
 
465
-		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
520
+		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
466
521
                 flashSelectionButton.setToolTipText("Show selection");
467
522
 		flashSelectionButton.addActionListener(this);
468
523
                 
469
524
 		oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
470
525
                 
471
-		oe.toolbarPanel.add(twoButton = new cButton("|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
526
+		oe.toolbarPanel.add(twoButton = new cButton("|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
472
527
                 twoButton.setToolTipText("Show center view only");
473
528
 		twoButton.addActionListener(this);
474
-		oe.toolbarPanel.add(fourButton = new cButton("+||", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
529
+		oe.toolbarPanel.add(fourButton = new cButton("+||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
475
530
 		fourButton.addActionListener(this);
476
531
                 fourButton.setToolTipText("Show left panel only");
477
-		oe.toolbarPanel.add(sixButton = new cButton("+|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
532
+		oe.toolbarPanel.add(sixButton = new cButton("+|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
478
533
                 sixButton.setToolTipText("2-column layout left");
479
534
 		sixButton.addActionListener(this);
480
-		oe.toolbarPanel.add(threeButton = new cButton("|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
535
+		oe.toolbarPanel.add(threeButton = new cButton("|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
481
536
                 threeButton.setToolTipText("2-column layout right");
482
537
 		threeButton.addActionListener(this);
483
-		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
538
+		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
484
539
                 sevenButton.setToolTipText("3-column layout");
485
540
 		sevenButton.addActionListener(this);
486
541
                 //
487
542
 
488
-		oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
543
+		oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
489
544
                 rootButton.setToolTipText("Edit selection in new tab");
490
545
 		rootButton.addActionListener(this);
491
546
 
492
-                oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
547
+                oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
493
548
                 closeButton.setToolTipText("Close tab");
494
549
 		closeButton.addActionListener(this);
495
550
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..
..
@@ -497,23 +552,23 @@
497
552
                         
498
553
                 cGridBag commandsPanel = new cGridBag();
499
554
                 
500
-		commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
555
+		commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
501
556
                 editButton.setToolTipText("Edit selection");
502
557
 		editButton.addActionListener(this);
503
558
 
504
-		commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
559
+		commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
505
560
                 uneditButton.setToolTipText("Unedit selection");
506
561
 		uneditButton.addActionListener(this);
507
562
 
508
-		commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
563
+		commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
564
+                allParamsButton.setToolTipText("Edit all params");
565
+		allParamsButton.addActionListener(this);
566
+
567
+		commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
509
568
                 clearPanelButton.setToolTipText("Clear edit panel");
510
569
 		clearPanelButton.addActionListener(this);
511
570
 
512
-		commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
513
-                allParamsButton.setToolTipText("All params??");
514
-		allParamsButton.addActionListener(this);
515
-
516
-		commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
571
+		commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
517
572
                 unselectButton.setToolTipText("Unselect");
518
573
 		unselectButton.addActionListener(this);
519
574
 
..
..
@@ -588,8 +643,18 @@
588
643
         
589
644
         void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
590
645
         {
646
+                panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
647
+                boxCB.setToolTipText("Display bounding boxes");
648
+                                boxCB.addItemListener(this);
649
+                                
650
+                panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
651
+                zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
652
+                                zoomBoxCB.addItemListener(this);
653
+
654
+        if (Globals.ADVANCED)
655
+        {
591
656
                 panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
592
-                supportCB.setToolTipText("Enabled rigging");
657
+                supportCB.setToolTipText("Enable rigging");
593
658
                                 supportCB.addItemListener(this);
594
659
 
595
660
         //        panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
..
..
@@ -607,14 +672,6 @@
607
672
                 slowCB.setToolTipText("Smooth interpolation");
608
673
                                 slowCB.addItemListener(this);
609
674
                                 
610
-                panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
611
-                boxCB.setToolTipText("Display bounding boxes");
612
-                                boxCB.addItemListener(this);
613
-                                
614
-                panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
615
-                zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
616
-                                zoomBoxCB.addItemListener(this);
617
-
618
675
 //        	constraints.gridy += 1;
619
676
 //                panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
620
677
 //                                speakerMocapCB.addItemListener(this);
..
..
@@ -645,6 +702,8 @@
645
702
                 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
646
703
                 lookAtCB.setToolTipText("Look-at target");
647
704
                                 lookAtCB.addItemListener(this);
705
+                
706
+        }
648
707
                                 
649
708
                 cGridBag fill = new cGridBag();
650
709
                                 
..
..
@@ -881,7 +940,9 @@
881
940
 //                        objEditor.DropFile((java.io.File[]) object, true);
882
941
 //                        return;
883
942
 //                    }
884
-                    if (string.charAt(0) == '/')
943
+                    
944
+                    // File path for Mac and Windows
945
+                    if (string.charAt(0) == '/' || string.charAt(1) == ':')
885
946
                     {
886
947
                         // file(s)
887
948
                         String[] names = string.split("\n");
..
..
@@ -908,7 +969,7 @@
908
969
                     
909
970
                     flashIt = false;
910
971
                     CameraPane pane = (CameraPane) target;
911
-                    pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
972
+                    pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
912
973
                     pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
913
974
                     
914
975
                     if (group.selection.size() == 1)
..
..
@@ -935,11 +996,11 @@
935
996
             {
936
997
                 loadClipboard(true);
937
998
                 objEditor.jTree.setSelectionPath(destinationPath);
938
-                pasteInto(false);
999
+                pasteInto(false, false);
939
1000
             } else {
940
1001
                 loadClipboard(false);
941
1002
                 objEditor.jTree.setSelectionPath(destinationPath);
942
-                pasteInto(false); // true); // ???
1003
+                pasteInto(false, false); // true); // ???
943
1004
             }
944
1005
 	}
945
1006
 	public void	dropActionChanged(DropTargetDragEvent dtde) 
..
..
@@ -1061,27 +1122,33 @@
1061
1122
 		kleinItem.addActionListener(this);
1062
1123
 		particleItem = menu.add(new MenuItem("Particle system"));
1063
1124
 		particleItem.addActionListener(this);
1125
+        if (Globals.ADVANCED)
1126
+        {
1064
1127
 		ragdollItem = menu.add(new MenuItem("Rag Walk"));
1065
1128
 		ragdollItem.addActionListener(this);
1066
1129
 		ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1067
1130
 		ragdoll2Item.addActionListener(this);
1131
+        }
1068
1132
 		menu.add("-");
1069
-		meshItem = menu.add(new MenuItem("Mesh"));
1133
+		meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1070
1134
 		meshItem.addActionListener(this);
1071
1135
 	//	meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1072
1136
 	//	meshGroupItem.addActionListener(this);
1137
+        if (Globals.ADVANCED)
1138
+        {
1073
1139
 		springItem = menu.add(new MenuItem("Spring"));
1074
1140
 		springItem.addActionListener(this);
1075
1141
 		flagItem = menu.add(new MenuItem("Flag"));
1076
1142
 		flagItem.addActionListener(this);
1077
-		bezierItem = menu.add(new MenuItem("Patch"));
1078
-		bezierItem.addActionListener(this);
1079
-		checkerItem = menu.add(new MenuItem("Checker"));
1080
-		checkerItem.addActionListener(this);
1081
1143
 		blobItem = menu.add(new MenuItem("Blob"));
1082
1144
 		blobItem.addActionListener(this);
1083
1145
 		latheItem = menu.add(new MenuItem("Lathe"));
1084
1146
 		latheItem.addActionListener(this);
1147
+        }
1148
+		bezierItem = menu.add(new MenuItem("Bezier Patch"));
1149
+		bezierItem.addActionListener(this);
1150
+		overlayItem = menu.add(new MenuItem("Overlay"));
1151
+		overlayItem.addActionListener(this);
1085
1152
 		lightItem = menu.add(new MenuItem("Light"));
1086
1153
 		lightItem.addActionListener(this);
1087
1154
 		menu.add("-");
..
..
@@ -1091,8 +1158,11 @@
1091
1158
 		loopItem.addActionListener(this);
1092
1159
 		doubleItem = menu.add(new MenuItem("Fork"));
1093
1160
 		doubleItem.addActionListener(this);
1161
+        if (Globals.ADVANCED)
1162
+        {
1094
1163
 		tripleItem = menu.add(new MenuItem("Trident"));
1095
1164
 		tripleItem.addActionListener(this);
1165
+        }
1096
1166
 	}
1097
1167
         
1098
1168
 	void buildToolsMenu(Menu menu)
..
..
@@ -1106,19 +1176,21 @@
1106
1176
 		parseverticesItem.addActionListener(this);
1107
1177
 		textureFieldItem = menu.add(new MenuItem("Texture Field"));
1108
1178
 		textureFieldItem.addActionListener(this);
1109
-		alignItem = menu.add(new MenuItem("Align"));
1179
+		alignItem = menu.add(new MenuItem("Align Objects"));
1110
1180
 		alignItem.addActionListener(this);
1111
-		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1112
-		mirrorItem.addActionListener(this);
1113
1181
 		reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1114
1182
 		reduceMorphItem.addActionListener(this);
1115
1183
 		reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1116
1184
 		reduce34MorphItem.addActionListener(this);
1117
-                
1185
+		menu.add("-");
1118
1186
 		menu.add(computeAOItem = new MenuItem("Compute AO"));
1119
1187
 		computeAOItem.addActionListener(this);
1120
-		menu.add("-");
1121
1188
                 
1189
+        if (Globals.ADVANCED)
1190
+        {
1191
+		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1192
+		mirrorItem.addActionListener(this);
1193
+		menu.add("-");
1122
1194
 		menu.add(memoryItem = new MenuItem("Memory Usage"));
1123
1195
 		memoryItem.addActionListener(this);
1124
1196
 		menu.add(analyzeItem = new MenuItem("Analyze"));
..
..
@@ -1141,6 +1213,7 @@
1141
1213
 		menu.add("-");
1142
1214
 		menu.add(editScriptItem = new MenuItem("Edit Script..."));
1143
1215
 		editScriptItem.addActionListener(this);
1216
+        }
1144
1217
         }
1145
1218
         
1146
1219
         void ScreenFit()
..
..
@@ -1469,9 +1542,9 @@
1469
1542
     
1470
1543
     void Overwrite(int mask)
1471
1544
     {
1472
-        if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
1545
+        if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
1473
1546
         {
1474
-            Object3D content = GrafreeD.clipboard.get(0);
1547
+            Object3D content = Grafreed.clipboard.get(0);
1475
1548
 
1476
1549
             if (content instanceof cGroup && ((cGroup)content).transientlink )
1477
1550
                 content = ((cGroup)content).get(0);
..
..
@@ -1642,7 +1715,7 @@
1642
1715
 		{
1643
1716
 			makeSomething(new BezierSurface());
1644
1717
 		} else
1645
-		if (source == checkerItem)
1718
+		if (source == overlayItem)
1646
1719
 		{
1647
1720
                     /*
1648
1721
 			Object3D obj = new BezierSurface(5,8);
..
..
@@ -1791,7 +1864,15 @@
1791
1864
 		} else
1792
1865
 		if (source == importOBJItem)
1793
1866
 		{
1794
-			objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1867
+			//objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1868
+                            FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1869
+                            browser.setVisible(true);
1870
+                            String filename = browser.getFile();
1871
+                            if (filename != null && filename.length() > 0)
1872
+                            {
1873
+                                String fullname = browser.getDirectory() + filename;
1874
+                                makeSomething(ReadOBJ(fullname), true);
1875
+                            }
1795
1876
 		} else
1796
1877
 		if (source == computeAOItem)
1797
1878
 		{
..
..
@@ -1811,7 +1892,7 @@
1811
1892
 		if (source == invariantsItem)
1812
1893
 		{
1813
1894
                     System.out.println("Invariants:");
1814
-                    GrafreeD.grafreeD.universe.invariants();
1895
+                    Grafreed.grafreeD.universe.invariants();
1815
1896
 		} else
1816
1897
 		if (source == memoryItem)
1817
1898
 		{
..
..
@@ -1829,6 +1910,11 @@
1829
1910
 		if (source == dumpItem)
1830
1911
 		{
1831
1912
                     DumpObject();
1913
+		} else
1914
+		if (source == oneStepButton)
1915
+		{
1916
+                    Globals.ONESTEP = true;
1917
+                    cameraView.repaint();
1832
1918
 		} else
1833
1919
 		if (source == screenfitButton)
1834
1920
 		{
..
..
@@ -1881,10 +1967,10 @@
1881
1967
 		} else
1882
1968
 		if (source == duplicateItem)
1883
1969
 		{
1884
-                    Object3D keep = GrafreeD.clipboard;
1970
+                    Object3D keep = Grafreed.clipboard;
1885
1971
 			loadClipboard(false);
1886
1972
 			paste(false);
1887
-                    GrafreeD.clipboard = keep;
1973
+                    Grafreed.clipboard = keep;
1888
1974
 		} else
1889
1975
 		if (source == cloneItem)
1890
1976
 		{
..
..
@@ -1902,13 +1988,17 @@
1902
1988
 		{
1903
1989
 			paste(false);
1904
1990
 		} else
1991
+		if (source == pasteIntoItem)
1992
+		{
1993
+			pasteInto(true, false);
1994
+		} else
1905
1995
 		if (source == pasteLinkItem)
1906
1996
 		{
1907
-			pasteInto(false);
1997
+			pasteInto(false, false);
1908
1998
 		} else
1909
1999
 		if (source == pasteCloneItem)
1910
2000
 		{
1911
-			pasteInto(true);
2001
+			pasteInto(true, true);
1912
2002
 		} else
1913
2003
 		if (source == pasteExpandItem)
1914
2004
 		{
..
..
@@ -2100,9 +2190,9 @@
2100
2190
 //                        group.selection.get(0).setMasterThis(content); // should be identity
2101
2191
 //		refreshContents();
2102
2192
 //                    }
2103
-                    if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
2193
+                    if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
2104
2194
                     {
2105
-                        Object3D content = GrafreeD.clipboard.get(0);
2195
+                        Object3D content = Grafreed.clipboard.get(0);
2106
2196
                         
2107
2197
                         if (content instanceof cGroup && ((cGroup)content).transientlink )
2108
2198
                             content = ((cGroup)content).get(0);
..
..
@@ -2110,11 +2200,11 @@
2110
2200
             Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2111
2201
                         for (int i=0; i<group.selection.size(); i++)
2112
2202
                         {
2113
-                            boolean random = CameraPane.RANDOM;
2114
-                            CameraPane.RANDOM = false; // parse all random nodes
2203
+                            boolean random = CameraPane.SWITCH;
2204
+                            CameraPane.SWITCH = false; // parse all random nodes
2115
2205
                             group.selection.get(i).linkVerticesThis(content);
2116
2206
                       //      group.selection.get(i).setMasterThis(content); // should be identity
2117
-                            CameraPane.RANDOM = random;
2207
+                            CameraPane.SWITCH = random;
2118
2208
                         }
2119
2209
             Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2120
2210
 		refreshContents();
..
..
@@ -2124,20 +2214,20 @@
2124
2214
 		{
2125
2215
                     for (int i=0; i<group.selection.size(); i++)
2126
2216
                     {
2127
-                        boolean random = CameraPane.RANDOM;
2128
-                        CameraPane.RANDOM = false; // parse all random nodes
2217
+                        boolean random = CameraPane.SWITCH;
2218
+                        CameraPane.SWITCH = false; // parse all random nodes
2129
2219
                         group.selection.get(i).linkVerticesThis(null);
2130
-                        CameraPane.RANDOM = random;
2220
+                        CameraPane.SWITCH = random;
2131
2221
                     }
2132
2222
 
2133
2223
                     refreshContents();
2134
2224
 		} else
2135
2225
 		if (source == relinkverticesItem)
2136
2226
 		{
2137
-                    boolean random = CameraPane.RANDOM;
2138
-                    CameraPane.RANDOM = false; // parse all random nodes
2227
+                    boolean random = CameraPane.SWITCH;
2228
+                    CameraPane.SWITCH = false; // parse all random nodes
2139
2229
                     group.selection.RelinkToSupport();
2140
-                    CameraPane.RANDOM = random;
2230
+                    CameraPane.SWITCH = random;
2141
2231
 
2142
2232
                     refreshContents();
2143
2233
 		} else
..
..
@@ -2152,9 +2242,9 @@
2152
2242
 		} else
2153
2243
 		if (source == setMasterItem)
2154
2244
 		{
2155
-                    if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2245
+                    if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2156
2246
                     {
2157
-                        Object3D content = GrafreeD.clipboard.get(0);
2247
+                        Object3D content = Grafreed.clipboard.get(0);
2158
2248
                         
2159
2249
                         if (content instanceof cGroup && ((cGroup)content).transientlink )
2160
2250
                             content = ((cGroup)content).get(0);
..
..
@@ -2167,9 +2257,9 @@
2167
2257
 		{
2168
2258
                     if (group.selection.size() == 1)
2169
2259
                     {
2170
-                        if (GrafreeD.clipboard.size() == 1)
2260
+                        if (Grafreed.clipboard.size() == 1)
2171
2261
                         {
2172
-                            Object3D content = GrafreeD.clipboard.get(0);
2262
+                            Object3D content = Grafreed.clipboard.get(0);
2173
2263
 
2174
2264
                             if (content instanceof cGroup && ((cGroup)content).transientlink )
2175
2265
                                 content = ((cGroup)content).get(0);
..
..
@@ -2892,7 +2982,7 @@
2892
2982
                                 
2893
2983
                                 child.editWindow = null; // ???????????
2894
2984
 			}
2895
-			objEditor.ctrlPanel.validate();
2985
+			objEditor.ctrlPanel.FlushUI();
2896
2986
 			//objEditor.jTree.clearSelection();
2897
2987
 			//objEditor.ResetSliders();
2898
2988
                     refreshContents(true);
..
..
@@ -3248,9 +3338,9 @@
3248
3338
                     obj = (Object3D)e.nextElement();
3249
3339
                     
3250
3340
                     System.out.println("Object is: " + obj);
3251
-                    GrafreeD.AnalyzeObject(obj);
3341
+                    Grafreed.AnalyzeObject(obj);
3252
3342
                     System.out.println("Boundary rep: " + obj.bRep);
3253
-                    GrafreeD.AnalyzeObject(obj.bRep);
3343
+                    Grafreed.AnalyzeObject(obj.bRep);
3254
3344
                     
3255
3345
 //                    System.err.println((size/1024) + " KB is the size of " + obj);
3256
3346
                 }
..
..
@@ -3464,8 +3554,8 @@
3464
3554
 	
3465
3555
 	void ParseVertices()
3466
3556
 	{
3467
-            boolean epsequal = GrafreeD.epsequal;
3468
-            GrafreeD.epsequal = true;
3557
+            boolean epsequal = Grafreed.epsequal;
3558
+            Grafreed.epsequal = true;
3469
3559
             
3470
3560
             for (int i=0; i<group.selection.size(); i++)
3471
3561
             {
..
..
@@ -3490,7 +3580,7 @@
3490
3580
                                 LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3491
3581
                                 LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3492
3582
 
3493
-                                g.add(GrafreeD.clipboard);
3583
+                                g.add(Grafreed.clipboard);
3494
3584
 
3495
3585
                                 buffer.add(g);
3496
3586
                             }
..
..
@@ -3505,7 +3595,7 @@
3505
3595
                 makeSomething(buffer, i==group.selection.size()-1);
3506
3596
             }
3507
3597
             
3508
-            GrafreeD.epsequal = epsequal;
3598
+            Grafreed.epsequal = epsequal;
3509
3599
             
3510
3600
             refreshContents();
3511
3601
 	}
..
..
@@ -3611,11 +3701,11 @@
3611
3701
 
3612
3702
             SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3613
3703
 
3614
-            boolean random = CameraPane.RANDOM;
3615
-            CameraPane.RANDOM = false; // parse all random nodes
3704
+            boolean random = CameraPane.SWITCH;
3705
+            CameraPane.SWITCH = false; // parse all random nodes
3616
3706
             lowres.linkVerticesThis(null);
3617
3707
             lowres.linkVerticesThis(sn);
3618
-            CameraPane.RANDOM = random;
3708
+            CameraPane.SWITCH = random;
3619
3709
 
3620
3710
             System.err.flush();
3621
3711
 
..
..
@@ -3655,7 +3745,7 @@
3655
3745
                 return;
3656
3746
             
3657
3747
             Object3D poses = group.selection.get(0);
3658
-            Object3D ref = GrafreeD.clipboard.get(0);
3748
+            Object3D ref = Grafreed.clipboard.get(0);
3659
3749
             
3660
3750
             Object3D newgroup = new Object3D("Po:" + poses.name);
3661
3751
             
..
..
@@ -3849,9 +3939,9 @@
3849
3939
 	
3850
3940
 	void ClipMesh()
3851
3941
 	{
3852
-            if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
3942
+            if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
3853
3943
             {
3854
-                Object3D content = GrafreeD.clipboard.get(0);
3944
+                Object3D content = Grafreed.clipboard.get(0);
3855
3945
 
3856
3946
                 if (content instanceof cGroup && ((cGroup)content).transientlink )
3857
3947
                     content = ((cGroup)content).get(0);
..
..
@@ -3860,7 +3950,7 @@
3860
3950
 //                {
3861
3951
 //                    group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3862
3952
 //                }
3863
-                  group.selection.ClipMesh(GrafreeD.clipboard);
3953
+                  group.selection.ClipMesh(Grafreed.clipboard);
3864
3954
             }
3865
3955
 //		group.selection.ClipMesh(GrafreeD.clipboard);
3866
3956
             System.out.println("DONE.");
..
..
@@ -4200,12 +4290,12 @@
4200
4290
 	{
4201
4291
 		if (group.selection.isEmpty())
4202
4292
 			return;
4203
-		GrafreeD.clipboardIsTempGroup = false;
4293
+		Grafreed.clipboardIsTempGroup = false;
4204
4294
 		Composite tGroup = null;
4205
4295
 		if (group.selection.size() > 0) // 1)
4206
4296
 		{
4207
4297
 			tGroup = new cGroup();
4208
-			GrafreeD.clipboardIsTempGroup = true;
4298
+			Grafreed.clipboardIsTempGroup = true;
4209
4299
 		}
4210
4300
                 
4211
4301
 		if (cut)
..
..
@@ -4245,16 +4335,16 @@
4245
4335
 		//System.out.println("cut " + child);
4246
4336
 		//System.out.println("parent = " + child.parent);
4247
4337
                 //                   tmp.addChild(child);
4248
-                                    if (GrafreeD.clipboardIsTempGroup)
4338
+                                    if (Grafreed.clipboardIsTempGroup)
4249
4339
                                             tGroup.add/*Child*/(tmp);
4250
4340
                                     else
4251
-                                            GrafreeD.clipboard = tmp;
4341
+                                            Grafreed.clipboard = tmp;
4252
4342
                                 }
4253
4343
                                 else
4254
-                                    if (GrafreeD.clipboardIsTempGroup)
4344
+                                    if (Grafreed.clipboardIsTempGroup)
4255
4345
                                             tGroup.add/*Child*/(child);
4256
4346
                                     else
4257
-                                            GrafreeD.clipboard = child;
4347
+                                            Grafreed.clipboard = child;
4258
4348
 			}
4259
4349
 			
4260
4350
 			//ResetModel();
..
..
@@ -4286,21 +4376,21 @@
4286
4376
 		//System.out.println("cut " + elem);
4287
4377
 		//System.out.println("parent = " + elem.parent);
4288
4378
                 //                    tmp.addChild(elem);
4289
-                                    if (GrafreeD.clipboardIsTempGroup)
4379
+                                    if (Grafreed.clipboardIsTempGroup)
4290
4380
                                             tGroup.add/*Child*/(tmp);
4291
4381
                                     else
4292
-                                            GrafreeD.clipboard = tmp;
4382
+                                            Grafreed.clipboard = tmp;
4293
4383
                                 }
4294
4384
                                 else
4295
-                                    if (GrafreeD.clipboardIsTempGroup)
4385
+                                    if (Grafreed.clipboardIsTempGroup)
4296
4386
                                             tGroup.add/*Child*/(child);
4297
4387
                                     else
4298
-                                            GrafreeD.clipboard = child;
4388
+                                            Grafreed.clipboard = child;
4299
4389
 			}
4300
4390
 			
4301
4391
 		}
4302
-		if (GrafreeD.clipboardIsTempGroup)
4303
-			GrafreeD.clipboard = tGroup;
4392
+		if (Grafreed.clipboardIsTempGroup)
4393
+			Grafreed.clipboard = tGroup;
4304
4394
 		if (cut)
4305
4395
                 {
4306
4396
                     ResetModel();
..
..
@@ -4314,7 +4404,7 @@
4314
4404
 	//		return;
4315
4405
 		boolean first = true;
4316
4406
 		
4317
-		if (GrafreeD.clipboardIsTempGroup)
4407
+		if (Grafreed.clipboardIsTempGroup)
4318
4408
 		{
4319
4409
 			Composite temp;
4320
4410
 			
..
..
@@ -4325,7 +4415,7 @@
4325
4415
 				temp = (Composite)Applet3D.clipboard.deepCopy();
4326
4416
                          */
4327
4417
 			Object3D elem;
4328
-			for (Enumeration e = /*temp.children*/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4418
+			for (Enumeration e = /*temp.children*/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4329
4419
 			{
4330
4420
 				Object3D child = (Object3D)e.nextElement();
4331
4421
                                 
..
..
@@ -4359,21 +4449,21 @@
4359
4449
 			//Object3D cb = Applet3D.clipboard;
4360
4450
 			//temp.addChild(cb);
4361
4451
 			//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4362
-                    assert(GrafreeD.clipboard.parent == null);
4363
-                        Object3D /*Composite*/ keepparent = GrafreeD.clipboard.get(0).parent;
4364
-                        GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4365
-                        if (LA.isIdentity(GrafreeD.clipboard.toParent))
4366
-                            makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
4452
+                    assert(Grafreed.clipboard.parent == null);
4453
+                        Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
4454
+                        Grafreed.clipboard.get(0).parent = null; // Avoid copy?
4455
+                        if (LA.isIdentity(Grafreed.clipboard.toParent))
4456
+                            makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4367
4457
                         else
4368
-                            makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4369
-                        GrafreeD.clipboard.get(0).parent = keepparent;
4458
+                            makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
4459
+                        Grafreed.clipboard.get(0).parent = keepparent;
4370
4460
 		}
4371
4461
 		
4372
4462
 		ResetModel();
4373
4463
 		refreshContents();
4374
4464
 	}
4375
4465
 	
4376
-	void pasteInto(boolean copyit)
4466
+	void pasteInto(boolean copyit, boolean clone)
4377
4467
 	{
4378
4468
 //		if (GrafreeD.clipboard == null)
4379
4469
 //			return;
..
..
@@ -4402,15 +4492,22 @@
4402
4492
 		if (copyit)
4403
4493
 		{
4404
4494
 		//	paste(false);
4405
-                    CloneClipboard(false); // sept 2014
4495
+                        if (clone)
4496
+                        {
4497
+                            CloneClipboard(false); // sept 2014
4498
+                        }
4499
+                        else
4500
+                        {
4501
+                            paste(false);
4502
+                        }
4406
4503
 		}
4407
4504
 		else
4408
4505
 		{
4409
4506
 			boolean first = true;
4410
4507
 			
4411
-			if (GrafreeD.clipboardIsTempGroup)
4508
+			if (Grafreed.clipboardIsTempGroup)
4412
4509
 			{
4413
-				Composite temp = (Composite)GrafreeD.clipboard;
4510
+				Composite temp = (Composite)Grafreed.clipboard;
4414
4511
 				Object3D copy;
4415
4512
 				for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4416
4513
 				{
..
..
@@ -4420,7 +4517,7 @@
4420
4517
 				}
4421
4518
 			} else
4422
4519
 			{
4423
-				linkSomething(GrafreeD.clipboard); //.get(0));
4520
+				linkSomething(Grafreed.clipboard); //.get(0));
4424
4521
 			}
4425
4522
 		}
4426
4523
             }
..
..
@@ -4865,7 +4962,7 @@
4865
4962
 
4866
4963
 	void ImportVRMLX3D()
4867
4964
 	{
4868
-		if (GrafreeD.standAlone)
4965
+		if (Grafreed.standAlone)
4869
4966
 		{
4870
4967
                     /**/
4871
4968
 			FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
..
..
@@ -4882,7 +4979,7 @@
4882
4979
 				
4883
4980
 	String GetFile(String dialogName)
4884
4981
 	{
4885
-		if (GrafreeD.standAlone)
4982
+		if (Grafreed.standAlone)
4886
4983
 		{
4887
4984
 			FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4888
4985
 			browser.show();
..
..
@@ -4946,10 +5043,12 @@
4946
5043
 	cButton flashSelectionButton;
4947
5044
 	cButton editButton;
4948
5045
 	cButton uneditButton;
5046
+	JCheckBox allParamsButton;
4949
5047
 	cButton clearpanelButton;
4950
-	cButton allParamsButton;
4951
5048
 	cButton unselectButton;
4952
5049
 	
5050
+	cButton oneStepButton;
5051
+        
4953
5052
 	cButton screenfitButton;
4954
5053
 	cButton screenfitpointButton;
4955
5054
 	cButton snapobjectButton;
..
..
@@ -5004,6 +5103,7 @@
5004
5103
 	private MenuItem mergeGeometriesItem;
5005
5104
 	private MenuItem copyItem;
5006
5105
 	private MenuItem pasteItem;
5106
+	private MenuItem pasteIntoItem;
5007
5107
 	private MenuItem pasteLinkItem;
5008
5108
 	private MenuItem pasteCloneItem;
5009
5109
 	private MenuItem pasteExpandItem;
..
..
@@ -5101,7 +5201,7 @@
5101
5201
 	private MenuItem blobItem;
5102
5202
 	private MenuItem latheItem;
5103
5203
 	private MenuItem bezierItem;
5104
-	private MenuItem checkerItem;
5204
+	private MenuItem overlayItem;
5105
5205
 	private MenuItem meshItem;
5106
5206
 //	private MenuItem meshGroupItem;
5107
5207
 	private MenuItem springItem;