Transform children

Normand Briere

2019-05-13 f924d3e00db476c06f55f3d5aaef307e17575340

 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
..
..
@@ -318,8 +318,12 @@
318
318
 		resetTransformItem.addActionListener(this);
319
319
 		resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
320
320
 		resetCentroidItem.addActionListener(this);
321
-		transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
322
-		transformgeometryItem.addActionListener(this);
321
+		resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
322
+		resetCentroidXZItem.addActionListener(this);
323
+		transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
324
+		transformGeometryItem.addActionListener(this);
325
+		transformChildrenItem = menu.add(new MenuItem("Transform Children"));
326
+		transformChildrenItem.addActionListener(this);
323
327
                 
324
328
 		oe.menuBar.add(menu = new Menu("Geometry"));
325
329
 		genUVItem = menu.add(new MenuItem("Generate UV"));
..
..
@@ -422,31 +426,35 @@
422
426
 		sortbysizeItem.addActionListener(this);
423
427
 		sortbynameItem = menu.add(new MenuItem("Sort by name"));
424
428
 		sortbynameItem.addActionListener(this);
429
+		menu.add("-");
430
+		shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
431
+		shareGeometriesItem.addActionListener(this);
432
+		mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
433
+		mergeGeometriesItem.addActionListener(this);
425
434
         if (Globals.ADVANCED)
426
435
         {
427
-		menu.add("-");
436
+            // Pretty much the same as duplicate and clone.
428
437
 		extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
429
438
 		extractGeometriesItem.addActionListener(this);
430
439
 		cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
431
440
 		cloneGeometriesItem.addActionListener(this);
432
-		shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
433
-		shareGeometriesItem.addActionListener(this);
434
-		mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
435
-		mergeGeometriesItem.addActionListener(this);
436
441
         }
437
442
                 
438
443
 		oe.menuBar.add(menu = new Menu("Insert"));
439
444
 		buildCreateMenu(menu);
440
445
                 
441
446
                 oe.menuBar.add(menu = new Menu("Include"));
442
-		importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
443
-		importGFDItem.addActionListener(this);
444
-		importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
445
-		importVRMLX3DItem.addActionListener(this);
446
-		importOBJItem = menu.add(new MenuItem("OBJ Object..."));
447
+		importOBJItem = menu.add(new MenuItem("OBJ file..."));
447
448
 		importOBJItem.addActionListener(this);
448
-		import3DSItem = menu.add(new MenuItem("3DS Object..."));
449
+		menu.add("-");
450
+		import3DSItem = menu.add(new MenuItem("3DS file..."));
449
451
 		import3DSItem.addActionListener(this);
452
+		menu.add("-");
453
+		importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
454
+		importVRMLX3DItem.addActionListener(this);
455
+		menu.add("-");
456
+		importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
457
+		importGFDItem.addActionListener(this);
450
458
 
451
459
                 oe.menuBar.add(menu = new Menu("Tools"));
452
460
 		buildToolsMenu(menu);
..
..
@@ -488,7 +496,7 @@
488
496
                 liveCB.setToolTipText("Enabled animation");
489
497
                                 liveCB.addItemListener(this);
490
498
 
491
-		oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
499
+		oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492
500
                 oneStepButton.setToolTipText("Animate one step forward");
493
501
 		oneStepButton.addActionListener(this);
494
502
                 
..
..
@@ -500,7 +508,7 @@
500
508
                 trackCB.setToolTipText("Enable tracking");
501
509
                                 trackCB.addItemListener(this);
502
510
 
503
-		oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
511
+		oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
504
512
                 screenfitButton.setToolTipText("Screen fit");
505
513
 		screenfitButton.addActionListener(this);
506
514
 
..
..
@@ -509,39 +517,39 @@
509
517
 
510
518
                 if (Globals.ADVANCED)
511
519
                 {
512
-                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
520
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
513
521
                         snapobjectButton.addActionListener(this);
514
522
                         snapobjectButton.setToolTipText("Snap Object");
515
523
                 }
516
524
 
517
-		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
525
+		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
518
526
                 flashSelectionButton.setToolTipText("Show selection");
519
527
 		flashSelectionButton.addActionListener(this);
520
528
                 
521
529
 		oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
522
530
                 
523
-		oe.toolbarPanel.add(twoButton = new cButton("|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
531
+		oe.toolbarPanel.add(twoButton = new cButton("|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
524
532
                 twoButton.setToolTipText("Show center view only");
525
533
 		twoButton.addActionListener(this);
526
-		oe.toolbarPanel.add(fourButton = new cButton("+||", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
534
+		oe.toolbarPanel.add(fourButton = new cButton("+||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
527
535
 		fourButton.addActionListener(this);
528
536
                 fourButton.setToolTipText("Show left panel only");
529
-		oe.toolbarPanel.add(sixButton = new cButton("+|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
537
+		oe.toolbarPanel.add(sixButton = new cButton("+|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
530
538
                 sixButton.setToolTipText("2-column layout left");
531
539
 		sixButton.addActionListener(this);
532
-		oe.toolbarPanel.add(threeButton = new cButton("|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
540
+		oe.toolbarPanel.add(threeButton = new cButton("|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
533
541
                 threeButton.setToolTipText("2-column layout right");
534
542
 		threeButton.addActionListener(this);
535
-		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
543
+		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
536
544
                 sevenButton.setToolTipText("3-column layout");
537
545
 		sevenButton.addActionListener(this);
538
546
                 //
539
547
 
540
-		oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
548
+		oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
541
549
                 rootButton.setToolTipText("Edit selection in new tab");
542
550
 		rootButton.addActionListener(this);
543
551
 
544
-                oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
552
+                oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
545
553
                 closeButton.setToolTipText("Close tab");
546
554
 		closeButton.addActionListener(this);
547
555
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..
..
@@ -549,11 +557,11 @@
549
557
                         
550
558
                 cGridBag commandsPanel = new cGridBag();
551
559
                 
552
-		commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
560
+		commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
553
561
                 editButton.setToolTipText("Edit selection");
554
562
 		editButton.addActionListener(this);
555
563
 
556
-		commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
564
+		commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
557
565
                 uneditButton.setToolTipText("Unedit selection");
558
566
 		uneditButton.addActionListener(this);
559
567
 
..
..
@@ -561,11 +569,11 @@
561
569
                 allParamsButton.setToolTipText("Edit all params");
562
570
 		allParamsButton.addActionListener(this);
563
571
 
564
-		commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
572
+		commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565
573
                 clearPanelButton.setToolTipText("Clear edit panel");
566
574
 		clearPanelButton.addActionListener(this);
567
575
 
568
-		commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
576
+		commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569
577
                 unselectButton.setToolTipText("Unselect");
570
578
 		unselectButton.addActionListener(this);
571
579
 
..
..
@@ -648,7 +656,7 @@
648
656
                 zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
649
657
                                 zoomBoxCB.addItemListener(this);
650
658
 
651
-        if (Globals.ADVANCED)
659
+        if (true) // Globals.ADVANCED)
652
660
         {
653
661
                 panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
654
662
                 supportCB.setToolTipText("Enable rigging");
..
..
@@ -937,7 +945,9 @@
937
945
 //                        objEditor.DropFile((java.io.File[]) object, true);
938
946
 //                        return;
939
947
 //                    }
940
-                    if (string.charAt(0) == '/')
948
+                    
949
+                    // File path for Mac and Windows
950
+                    if (string.charAt(0) == '/' || string.charAt(1) == ':')
941
951
                     {
942
952
                         // file(s)
943
953
                         String[] names = string.split("\n");
..
..
@@ -964,7 +974,7 @@
964
974
                     
965
975
                     flashIt = false;
966
976
                     CameraPane pane = (CameraPane) target;
967
-                    pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
977
+                    pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
968
978
                     pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
969
979
                     
970
980
                     if (group.selection.size() == 1)
..
..
@@ -1537,9 +1547,9 @@
1537
1547
     
1538
1548
     void Overwrite(int mask)
1539
1549
     {
1540
-        if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
1550
+        if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
1541
1551
         {
1542
-            Object3D content = GrafreeD.clipboard.get(0);
1552
+            Object3D content = Grafreed.clipboard.get(0);
1543
1553
 
1544
1554
             if (content instanceof cGroup && ((cGroup)content).transientlink )
1545
1555
                 content = ((cGroup)content).get(0);
..
..
@@ -1859,7 +1869,15 @@
1859
1869
 		} else
1860
1870
 		if (source == importOBJItem)
1861
1871
 		{
1862
-			objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1872
+			//objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1873
+                            FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1874
+                            browser.setVisible(true);
1875
+                            String filename = browser.getFile();
1876
+                            if (filename != null && filename.length() > 0)
1877
+                            {
1878
+                                String fullname = browser.getDirectory() + filename;
1879
+                                makeSomething(ReadOBJ(fullname), true);
1880
+                            }
1863
1881
 		} else
1864
1882
 		if (source == computeAOItem)
1865
1883
 		{
..
..
@@ -1879,7 +1897,7 @@
1879
1897
 		if (source == invariantsItem)
1880
1898
 		{
1881
1899
                     System.out.println("Invariants:");
1882
-                    GrafreeD.grafreeD.universe.invariants();
1900
+                    Grafreed.grafreeD.universe.invariants();
1883
1901
 		} else
1884
1902
 		if (source == memoryItem)
1885
1903
 		{
..
..
@@ -1954,10 +1972,10 @@
1954
1972
 		} else
1955
1973
 		if (source == duplicateItem)
1956
1974
 		{
1957
-                    Object3D keep = GrafreeD.clipboard;
1975
+                    Object3D keep = Grafreed.clipboard;
1958
1976
 			loadClipboard(false);
1959
1977
 			paste(false);
1960
-                    GrafreeD.clipboard = keep;
1978
+                    Grafreed.clipboard = keep;
1961
1979
 		} else
1962
1980
 		if (source == cloneItem)
1963
1981
 		{
..
..
@@ -2177,9 +2195,9 @@
2177
2195
 //                        group.selection.get(0).setMasterThis(content); // should be identity
2178
2196
 //		refreshContents();
2179
2197
 //                    }
2180
-                    if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
2198
+                    if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
2181
2199
                     {
2182
-                        Object3D content = GrafreeD.clipboard.get(0);
2200
+                        Object3D content = Grafreed.clipboard.get(0);
2183
2201
                         
2184
2202
                         if (content instanceof cGroup && ((cGroup)content).transientlink )
2185
2203
                             content = ((cGroup)content).get(0);
..
..
@@ -2229,9 +2247,9 @@
2229
2247
 		} else
2230
2248
 		if (source == setMasterItem)
2231
2249
 		{
2232
-                    if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2250
+                    if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2233
2251
                     {
2234
-                        Object3D content = GrafreeD.clipboard.get(0);
2252
+                        Object3D content = Grafreed.clipboard.get(0);
2235
2253
                         
2236
2254
                         if (content instanceof cGroup && ((cGroup)content).transientlink )
2237
2255
                             content = ((cGroup)content).get(0);
..
..
@@ -2244,9 +2262,9 @@
2244
2262
 		{
2245
2263
                     if (group.selection.size() == 1)
2246
2264
                     {
2247
-                        if (GrafreeD.clipboard.size() == 1)
2265
+                        if (Grafreed.clipboard.size() == 1)
2248
2266
                         {
2249
-                            Object3D content = GrafreeD.clipboard.get(0);
2267
+                            Object3D content = Grafreed.clipboard.get(0);
2250
2268
 
2251
2269
                             if (content instanceof cGroup && ((cGroup)content).transientlink )
2252
2270
                                 content = ((cGroup)content).get(0);
..
..
@@ -2601,9 +2619,13 @@
2601
2619
                 {
2602
2620
 			SmoothMesh();
2603
2621
 		} else
2604
-		if (source == transformgeometryItem)
2622
+		if (source == transformGeometryItem)
2605
2623
 		{
2606
2624
                         TransformGeometry();
2625
+		} else
2626
+		if (source == transformChildrenItem)
2627
+		{
2628
+                        TransformChildren();
2607
2629
 		} else
2608
2630
 		if (source == resetTransformItem)
2609
2631
 		{
..
..
@@ -2611,7 +2633,11 @@
2611
2633
 		} else
2612
2634
 		if (source == resetCentroidItem)
2613
2635
 		{
2614
-                        ResetCentroid();
2636
+                        ResetCentroid(true);
2637
+		} else
2638
+		if (source == resetCentroidXZItem)
2639
+		{
2640
+                        ResetCentroid(false);
2615
2641
 		} else
2616
2642
 		if (source == resetParentItem)
2617
2643
 		{
..
..
@@ -3127,6 +3153,28 @@
3127
3153
             refreshContents();
3128
3154
         }
3129
3155
         
3156
+        void TransformChildren()
3157
+        {
3158
+            Object3D obj;
3159
+            for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3160
+            {
3161
+                    obj = (Object3D)e.nextElement();
3162
+                    obj.KeepTextureMatrices();
3163
+                    obj.TransformChildren();
3164
+                    obj.RestoreTextureMatrices();
3165
+                                        
3166
+//                    if (obj.parent == null)
3167
+//                    {
3168
+//                        System.out.println("NULL PARENT!");
3169
+//                        new Exception().printStackTrace();
3170
+//                    }
3171
+//                    else
3172
+//                        TouchTransform(obj);
3173
+//                        //obj.parent.Touch();
3174
+            }
3175
+
3176
+            refreshContents();
3177
+        }
3130
3178
         
3131
3179
         void ResetTransform()
3132
3180
         {
..
..
@@ -3239,7 +3287,7 @@
3239
3287
             refreshContents();
3240
3288
         }
3241
3289
         
3242
-        void ResetCentroid()
3290
+        void ResetCentroid(boolean full)
3243
3291
         {
3244
3292
             Object3D obj;
3245
3293
             for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..
..
@@ -3254,12 +3302,16 @@
3254
3302
                     LA.matIdentity(Object3D.mat);
3255
3303
                     obj.getBounds(minima, maxima, false);
3256
3304
                     Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3257
-                    Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3305
+                    if (full)
3306
+                        Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3258
3307
                     Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3259
3308
                     obj.TransformMesh(Object3D.mat);
3309
+                    
3260
3310
                     Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3261
-                    Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3311
+                    if (full)
3312
+                        Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3262
3313
                     Object3D.mat[3][2] = (minima.z + maxima.z)/2;
3314
+                    
3263
3315
                     LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3264
3316
                     //Object3D.mat[3][0] = -Object3D.mat[3][0];
3265
3317
                     //Object3D.mat[3][1] = -Object3D.mat[3][1];
..
..
@@ -3325,9 +3377,9 @@
3325
3377
                     obj = (Object3D)e.nextElement();
3326
3378
                     
3327
3379
                     System.out.println("Object is: " + obj);
3328
-                    GrafreeD.AnalyzeObject(obj);
3380
+                    Grafreed.AnalyzeObject(obj);
3329
3381
                     System.out.println("Boundary rep: " + obj.bRep);
3330
-                    GrafreeD.AnalyzeObject(obj.bRep);
3382
+                    Grafreed.AnalyzeObject(obj.bRep);
3331
3383
                     
3332
3384
 //                    System.err.println((size/1024) + " KB is the size of " + obj);
3333
3385
                 }
..
..
@@ -3541,8 +3593,8 @@
3541
3593
 	
3542
3594
 	void ParseVertices()
3543
3595
 	{
3544
-            boolean epsequal = GrafreeD.epsequal;
3545
-            GrafreeD.epsequal = true;
3596
+            boolean epsequal = Grafreed.epsequal;
3597
+            Grafreed.epsequal = true;
3546
3598
             
3547
3599
             for (int i=0; i<group.selection.size(); i++)
3548
3600
             {
..
..
@@ -3567,7 +3619,7 @@
3567
3619
                                 LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3568
3620
                                 LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3569
3621
 
3570
-                                g.add(GrafreeD.clipboard);
3622
+                                g.add(Grafreed.clipboard);
3571
3623
 
3572
3624
                                 buffer.add(g);
3573
3625
                             }
..
..
@@ -3582,7 +3634,7 @@
3582
3634
                 makeSomething(buffer, i==group.selection.size()-1);
3583
3635
             }
3584
3636
             
3585
-            GrafreeD.epsequal = epsequal;
3637
+            Grafreed.epsequal = epsequal;
3586
3638
             
3587
3639
             refreshContents();
3588
3640
 	}
..
..
@@ -3732,7 +3784,7 @@
3732
3784
                 return;
3733
3785
             
3734
3786
             Object3D poses = group.selection.get(0);
3735
-            Object3D ref = GrafreeD.clipboard.get(0);
3787
+            Object3D ref = Grafreed.clipboard.get(0);
3736
3788
             
3737
3789
             Object3D newgroup = new Object3D("Po:" + poses.name);
3738
3790
             
..
..
@@ -3926,9 +3978,9 @@
3926
3978
 	
3927
3979
 	void ClipMesh()
3928
3980
 	{
3929
-            if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
3981
+            if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
3930
3982
             {
3931
-                Object3D content = GrafreeD.clipboard.get(0);
3983
+                Object3D content = Grafreed.clipboard.get(0);
3932
3984
 
3933
3985
                 if (content instanceof cGroup && ((cGroup)content).transientlink )
3934
3986
                     content = ((cGroup)content).get(0);
..
..
@@ -3937,7 +3989,7 @@
3937
3989
 //                {
3938
3990
 //                    group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3939
3991
 //                }
3940
-                  group.selection.ClipMesh(GrafreeD.clipboard);
3992
+                  group.selection.ClipMesh(Grafreed.clipboard);
3941
3993
             }
3942
3994
 //		group.selection.ClipMesh(GrafreeD.clipboard);
3943
3995
             System.out.println("DONE.");
..
..
@@ -4277,12 +4329,12 @@
4277
4329
 	{
4278
4330
 		if (group.selection.isEmpty())
4279
4331
 			return;
4280
-		GrafreeD.clipboardIsTempGroup = false;
4332
+		Grafreed.clipboardIsTempGroup = false;
4281
4333
 		Composite tGroup = null;
4282
4334
 		if (group.selection.size() > 0) // 1)
4283
4335
 		{
4284
4336
 			tGroup = new cGroup();
4285
-			GrafreeD.clipboardIsTempGroup = true;
4337
+			Grafreed.clipboardIsTempGroup = true;
4286
4338
 		}
4287
4339
                 
4288
4340
 		if (cut)
..
..
@@ -4322,16 +4374,16 @@
4322
4374
 		//System.out.println("cut " + child);
4323
4375
 		//System.out.println("parent = " + child.parent);
4324
4376
                 //                   tmp.addChild(child);
4325
-                                    if (GrafreeD.clipboardIsTempGroup)
4377
+                                    if (Grafreed.clipboardIsTempGroup)
4326
4378
                                             tGroup.add/*Child*/(tmp);
4327
4379
                                     else
4328
-                                            GrafreeD.clipboard = tmp;
4380
+                                            Grafreed.clipboard = tmp;
4329
4381
                                 }
4330
4382
                                 else
4331
-                                    if (GrafreeD.clipboardIsTempGroup)
4383
+                                    if (Grafreed.clipboardIsTempGroup)
4332
4384
                                             tGroup.add/*Child*/(child);
4333
4385
                                     else
4334
-                                            GrafreeD.clipboard = child;
4386
+                                            Grafreed.clipboard = child;
4335
4387
 			}
4336
4388
 			
4337
4389
 			//ResetModel();
..
..
@@ -4363,21 +4415,21 @@
4363
4415
 		//System.out.println("cut " + elem);
4364
4416
 		//System.out.println("parent = " + elem.parent);
4365
4417
                 //                    tmp.addChild(elem);
4366
-                                    if (GrafreeD.clipboardIsTempGroup)
4418
+                                    if (Grafreed.clipboardIsTempGroup)
4367
4419
                                             tGroup.add/*Child*/(tmp);
4368
4420
                                     else
4369
-                                            GrafreeD.clipboard = tmp;
4421
+                                            Grafreed.clipboard = tmp;
4370
4422
                                 }
4371
4423
                                 else
4372
-                                    if (GrafreeD.clipboardIsTempGroup)
4424
+                                    if (Grafreed.clipboardIsTempGroup)
4373
4425
                                             tGroup.add/*Child*/(child);
4374
4426
                                     else
4375
-                                            GrafreeD.clipboard = child;
4427
+                                            Grafreed.clipboard = child;
4376
4428
 			}
4377
4429
 			
4378
4430
 		}
4379
-		if (GrafreeD.clipboardIsTempGroup)
4380
-			GrafreeD.clipboard = tGroup;
4431
+		if (Grafreed.clipboardIsTempGroup)
4432
+			Grafreed.clipboard = tGroup;
4381
4433
 		if (cut)
4382
4434
                 {
4383
4435
                     ResetModel();
..
..
@@ -4391,7 +4443,7 @@
4391
4443
 	//		return;
4392
4444
 		boolean first = true;
4393
4445
 		
4394
-		if (GrafreeD.clipboardIsTempGroup)
4446
+		if (Grafreed.clipboardIsTempGroup)
4395
4447
 		{
4396
4448
 			Composite temp;
4397
4449
 			
..
..
@@ -4402,7 +4454,7 @@
4402
4454
 				temp = (Composite)Applet3D.clipboard.deepCopy();
4403
4455
                          */
4404
4456
 			Object3D elem;
4405
-			for (Enumeration e = /*temp.children*/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4457
+			for (Enumeration e = /*temp.children*/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4406
4458
 			{
4407
4459
 				Object3D child = (Object3D)e.nextElement();
4408
4460
                                 
..
..
@@ -4436,14 +4488,14 @@
4436
4488
 			//Object3D cb = Applet3D.clipboard;
4437
4489
 			//temp.addChild(cb);
4438
4490
 			//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4439
-                    assert(GrafreeD.clipboard.parent == null);
4440
-                        Object3D /*Composite*/ keepparent = GrafreeD.clipboard.get(0).parent;
4441
-                        GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4442
-                        if (LA.isIdentity(GrafreeD.clipboard.toParent))
4443
-                            makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
4491
+                    assert(Grafreed.clipboard.parent == null);
4492
+                        Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
4493
+                        Grafreed.clipboard.get(0).parent = null; // Avoid copy?
4494
+                        if (LA.isIdentity(Grafreed.clipboard.toParent))
4495
+                            makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4444
4496
                         else
4445
-                            makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4446
-                        GrafreeD.clipboard.get(0).parent = keepparent;
4497
+                            makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
4498
+                        Grafreed.clipboard.get(0).parent = keepparent;
4447
4499
 		}
4448
4500
 		
4449
4501
 		ResetModel();
..
..
@@ -4492,9 +4544,9 @@
4492
4544
 		{
4493
4545
 			boolean first = true;
4494
4546
 			
4495
-			if (GrafreeD.clipboardIsTempGroup)
4547
+			if (Grafreed.clipboardIsTempGroup)
4496
4548
 			{
4497
-				Composite temp = (Composite)GrafreeD.clipboard;
4549
+				Composite temp = (Composite)Grafreed.clipboard;
4498
4550
 				Object3D copy;
4499
4551
 				for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4500
4552
 				{
..
..
@@ -4504,7 +4556,7 @@
4504
4556
 				}
4505
4557
 			} else
4506
4558
 			{
4507
-				linkSomething(GrafreeD.clipboard); //.get(0));
4559
+				linkSomething(Grafreed.clipboard); //.get(0));
4508
4560
 			}
4509
4561
 		}
4510
4562
             }
..
..
@@ -4949,7 +5001,7 @@
4949
5001
 
4950
5002
 	void ImportVRMLX3D()
4951
5003
 	{
4952
-		if (GrafreeD.standAlone)
5004
+		if (Grafreed.standAlone)
4953
5005
 		{
4954
5006
                     /**/
4955
5007
 			FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
..
..
@@ -4966,7 +5018,7 @@
4966
5018
 				
4967
5019
 	String GetFile(String dialogName)
4968
5020
 	{
4969
-		if (GrafreeD.standAlone)
5021
+		if (Grafreed.standAlone)
4970
5022
 		{
4971
5023
 			FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4972
5024
 			browser.show();
..
..
@@ -5140,8 +5192,10 @@
5140
5192
 	private MenuItem panoTexturesItem;
5141
5193
         
5142
5194
 	private MenuItem resetCentroidItem;
5143
-	private MenuItem transformgeometryItem;
5195
+	private MenuItem resetCentroidXZItem;
5144
5196
 	private MenuItem resetTransformItem;
5197
+	private MenuItem transformGeometryItem;
5198
+	private MenuItem transformChildrenItem;
5145
5199
 	private MenuItem hideItem;
5146
5200
 	private MenuItem grabItem;
5147
5201
 	private MenuItem backItem;