Fix "+" issue

Normand Briere

2019-06-09 3ae9b1de47e51e7c150412f2bb14383cb6a5f8f8

 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
..
..
@@ -171,6 +171,14 @@
171
171
 		//editItem.addActionListener(this);
172
172
 		duplicateItem = menu.add(new MenuItem("Duplicate"));
173
173
 		duplicateItem.addActionListener(this);
174
+		cloneItem = menu.add(new MenuItem("Clone"));
175
+		cloneItem.addActionListener(this);
176
+        if (Globals.ADVANCED)
177
+        {
178
+		cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
179
+		cloneSupportItem.addActionListener(this);
180
+        }
181
+		menu.add("-");
174
182
 		cutItem = menu.add(new MenuItem("Cut"));
175
183
 		cutItem.addActionListener(this);
176
184
 		copyItem = menu.add(new MenuItem("Copy"));
..
..
@@ -178,10 +186,7 @@
178
186
 		pasteItem = menu.add(new MenuItem("Paste"));
179
187
 		pasteItem.addActionListener(this);
180
188
 		menu.add("-");
181
-		cloneItem = menu.add(new MenuItem("Clone"));
182
-		cloneItem.addActionListener(this);
183
-		cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
184
-		cloneSupportItem.addActionListener(this);
189
+                
185
190
 		menu.add("-");
186
191
 		pasteIntoItem = menu.add(new MenuItem("Paste into"));
187
192
 		pasteIntoItem.addActionListener(this);
..
..
@@ -205,10 +210,6 @@
205
210
 		oe.menuBar.add(menu = new Menu("Setting"));
206
211
         if (Globals.ADVANCED)
207
212
         {
208
-                resetMeshItem = menu.add(new MenuItem("Reset All"));
209
-		resetMeshItem.addActionListener(this);
210
-		stepAllItem = menu.add(new MenuItem("Step All"));
211
-		stepAllItem.addActionListener(this);
212
213
 		revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
213
214
 		revertMeshItem.addActionListener(this);
214
215
 		resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..
..
@@ -272,6 +273,7 @@
272
273
                 
273
274
         if (Globals.ADVANCED)
274
275
         {
276
+		menu.add("-");
275
277
 		physicsItem = menu.add(new MenuItem("Physics"));
276
278
 		physicsItem.addActionListener(this);
277
279
 		frameselectorItem = menu.add(new MenuItem("Frame Selector"));
..
..
@@ -297,6 +299,7 @@
297
299
 		shadowZItem.addActionListener(this);
298
300
         if (Globals.ADVANCED)
299
301
         {
302
+		menu.add("-");
300
303
 		linkerItem = menu.add(new MenuItem("Linker"));
301
304
 		linkerItem.addActionListener(this);
302
305
 		attributeItem = menu.add(new MenuItem("Attribute"));
..
..
@@ -305,14 +308,18 @@
305
308
 		templateItem.addActionListener(this);
306
309
 		pointflowItem = menu.add(new MenuItem("Point Flow"));
307
310
 		pointflowItem.addActionListener(this);
308
-		menu.add("-");
309
311
         }
312
+		menu.add("-");
310
313
 		resetTransformItem = menu.add(new MenuItem("Reset Transform"));
311
314
 		resetTransformItem.addActionListener(this);
312
315
 		resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
313
316
 		resetCentroidItem.addActionListener(this);
314
-		transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
315
-		transformgeometryItem.addActionListener(this);
317
+		resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
318
+		resetCentroidXZItem.addActionListener(this);
319
+		transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
320
+		transformGeometryItem.addActionListener(this);
321
+		transformChildrenItem = menu.add(new MenuItem("Transform Children"));
322
+		transformChildrenItem.addActionListener(this);
316
323
                 
317
324
 		oe.menuBar.add(menu = new Menu("Geometry"));
318
325
 		genUVItem = menu.add(new MenuItem("Generate UV"));
..
..
@@ -361,6 +368,10 @@
361
368
                 oe.menuBar.add(menu = new Menu("Attributes"));
362
369
 		clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
363
370
 		clearMaterialsItem.addActionListener(this);
371
+                resetAllItem = menu.add(new MenuItem("Reset All"));
372
+		resetAllItem.addActionListener(this);
373
+		stepAllItem = menu.add(new MenuItem("Step All"));
374
+		stepAllItem.addActionListener(this);
364
375
 		menu.add("-");
365
376
 		liveleavesItem = menu.add(new MenuItem("Live Leaves"));
366
377
 		liveleavesItem.addActionListener(this);
..
..
@@ -415,31 +426,35 @@
415
426
 		sortbysizeItem.addActionListener(this);
416
427
 		sortbynameItem = menu.add(new MenuItem("Sort by name"));
417
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);
418
434
         if (Globals.ADVANCED)
419
435
         {
420
-		menu.add("-");
436
+            // Pretty much the same as duplicate and clone.
421
437
 		extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
422
438
 		extractGeometriesItem.addActionListener(this);
423
439
 		cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
424
440
 		cloneGeometriesItem.addActionListener(this);
425
-		shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
426
-		shareGeometriesItem.addActionListener(this);
427
-		mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
428
-		mergeGeometriesItem.addActionListener(this);
429
441
         }
430
442
                 
431
443
 		oe.menuBar.add(menu = new Menu("Insert"));
432
444
 		buildCreateMenu(menu);
433
445
                 
434
446
                 oe.menuBar.add(menu = new Menu("Include"));
435
-		importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
436
-		importGFDItem.addActionListener(this);
437
-		importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
438
-		importVRMLX3DItem.addActionListener(this);
439
-		importOBJItem = menu.add(new MenuItem("OBJ Object..."));
447
+		importOBJItem = menu.add(new MenuItem("OBJ file..."));
440
448
 		importOBJItem.addActionListener(this);
441
-		import3DSItem = menu.add(new MenuItem("3DS Object..."));
449
+		menu.add("-");
450
+		import3DSItem = menu.add(new MenuItem("3DS file..."));
442
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);
443
458
 
444
459
                 oe.menuBar.add(menu = new Menu("Tools"));
445
460
 		buildToolsMenu(menu);
..
..
@@ -478,10 +493,10 @@
478
493
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
479
494
                 
480
495
                 oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
481
-                liveCB.setToolTipText("Enabled animation");
496
+                liveCB.setToolTipText("Enable animation");
482
497
                                 liveCB.addItemListener(this);
483
498
 
484
-		oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
499
+		oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485
500
                 oneStepButton.setToolTipText("Animate one step forward");
486
501
 		oneStepButton.addActionListener(this);
487
502
                 
..
..
@@ -493,7 +508,7 @@
493
508
                 trackCB.setToolTipText("Enable tracking");
494
509
                                 trackCB.addItemListener(this);
495
510
 
496
-		oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
511
+		oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
497
512
                 screenfitButton.setToolTipText("Screen fit");
498
513
 		screenfitButton.addActionListener(this);
499
514
 
..
..
@@ -502,39 +517,39 @@
502
517
 
503
518
                 if (Globals.ADVANCED)
504
519
                 {
505
-                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
520
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
506
521
                         snapobjectButton.addActionListener(this);
507
522
                         snapobjectButton.setToolTipText("Snap Object");
508
523
                 }
509
524
 
510
-		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
525
+		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
511
526
                 flashSelectionButton.setToolTipText("Show selection");
512
527
 		flashSelectionButton.addActionListener(this);
513
528
                 
514
529
 		oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
515
530
                 
516
-		oe.toolbarPanel.add(twoButton = new cButton("|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
531
+		oe.toolbarPanel.add(twoButton = new cButton("|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
517
532
                 twoButton.setToolTipText("Show center view only");
518
533
 		twoButton.addActionListener(this);
519
-		oe.toolbarPanel.add(fourButton = new cButton("+||", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
534
+		oe.toolbarPanel.add(fourButton = new cButton("+||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
520
535
 		fourButton.addActionListener(this);
521
536
                 fourButton.setToolTipText("Show left panel only");
522
-		oe.toolbarPanel.add(sixButton = new cButton("+|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
537
+		oe.toolbarPanel.add(sixButton = new cButton("+|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
523
538
                 sixButton.setToolTipText("2-column layout left");
524
539
 		sixButton.addActionListener(this);
525
-		oe.toolbarPanel.add(threeButton = new cButton("|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
540
+		oe.toolbarPanel.add(threeButton = new cButton("|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
526
541
                 threeButton.setToolTipText("2-column layout right");
527
542
 		threeButton.addActionListener(this);
528
-		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
543
+		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
529
544
                 sevenButton.setToolTipText("3-column layout");
530
545
 		sevenButton.addActionListener(this);
531
546
                 //
532
547
 
533
-		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);
534
549
                 rootButton.setToolTipText("Edit selection in new tab");
535
550
 		rootButton.addActionListener(this);
536
551
 
537
-                oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
552
+                oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
538
553
                 closeButton.setToolTipText("Close tab");
539
554
 		closeButton.addActionListener(this);
540
555
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..
..
@@ -542,11 +557,11 @@
542
557
                         
543
558
                 cGridBag commandsPanel = new cGridBag();
544
559
                 
545
-		commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
560
+		commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
546
561
                 editButton.setToolTipText("Edit selection");
547
562
 		editButton.addActionListener(this);
548
563
 
549
-		commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
564
+		commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
550
565
                 uneditButton.setToolTipText("Unedit selection");
551
566
 		uneditButton.addActionListener(this);
552
567
 
..
..
@@ -554,11 +569,11 @@
554
569
                 allParamsButton.setToolTipText("Edit all params");
555
570
 		allParamsButton.addActionListener(this);
556
571
 
557
-		commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
572
+		commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
558
573
                 clearPanelButton.setToolTipText("Clear edit panel");
559
574
 		clearPanelButton.addActionListener(this);
560
575
 
561
-		commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
576
+		commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
562
577
                 unselectButton.setToolTipText("Unselect");
563
578
 		unselectButton.addActionListener(this);
564
579
 
..
..
@@ -641,7 +656,7 @@
641
656
                 zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
642
657
                                 zoomBoxCB.addItemListener(this);
643
658
 
644
-        if (Globals.ADVANCED)
659
+        if (true) // Globals.ADVANCED)
645
660
         {
646
661
                 panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
647
662
                 supportCB.setToolTipText("Enable rigging");
..
..
@@ -714,6 +729,7 @@
714
729
             buttonGroup.add(radioButton);
715
730
             radioButton.doClick();
716
731
         }
732
+        
717
733
         void SetupViews(ObjEditor oe)
718
734
         {
719
735
             oe.SetupViews();
..
..
@@ -930,7 +946,9 @@
930
946
 //                        objEditor.DropFile((java.io.File[]) object, true);
931
947
 //                        return;
932
948
 //                    }
933
-                    if (string.charAt(0) == '/')
949
+                    
950
+                    // File path for Mac and Windows
951
+                    if (string.charAt(0) == '/' || string.charAt(1) == ':')
934
952
                     {
935
953
                         // file(s)
936
954
                         String[] names = string.split("\n");
..
..
@@ -957,7 +975,7 @@
957
975
                     
958
976
                     flashIt = false;
959
977
                     CameraPane pane = (CameraPane) target;
960
-                    pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
978
+                    pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
961
979
                     pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
962
980
                     
963
981
                     if (group.selection.size() == 1)
..
..
@@ -1164,13 +1182,13 @@
1164
1182
 		parseverticesItem.addActionListener(this);
1165
1183
 		textureFieldItem = menu.add(new MenuItem("Texture Field"));
1166
1184
 		textureFieldItem.addActionListener(this);
1167
-		alignItem = menu.add(new MenuItem("Align Object"));
1185
+		alignItem = menu.add(new MenuItem("Align Objects"));
1168
1186
 		alignItem.addActionListener(this);
1169
1187
 		reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1170
1188
 		reduceMorphItem.addActionListener(this);
1171
1189
 		reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1172
1190
 		reduce34MorphItem.addActionListener(this);
1173
-                
1191
+		menu.add("-");
1174
1192
 		menu.add(computeAOItem = new MenuItem("Compute AO"));
1175
1193
 		computeAOItem.addActionListener(this);
1176
1194
                 
..
..
@@ -1530,9 +1548,9 @@
1530
1548
     
1531
1549
     void Overwrite(int mask)
1532
1550
     {
1533
-        if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
1551
+        if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
1534
1552
         {
1535
-            Object3D content = GrafreeD.clipboard.get(0);
1553
+            Object3D content = Grafreed.clipboard.get(0);
1536
1554
 
1537
1555
             if (content instanceof cGroup && ((cGroup)content).transientlink )
1538
1556
                 content = ((cGroup)content).get(0);
..
..
@@ -1852,7 +1870,15 @@
1852
1870
 		} else
1853
1871
 		if (source == importOBJItem)
1854
1872
 		{
1855
-			objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1873
+			//objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1874
+                            FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1875
+                            browser.setVisible(true);
1876
+                            String filename = browser.getFile();
1877
+                            if (filename != null && filename.length() > 0)
1878
+                            {
1879
+                                String fullname = browser.getDirectory() + filename;
1880
+                                makeSomething(ReadOBJ(fullname), true);
1881
+                            }
1856
1882
 		} else
1857
1883
 		if (source == computeAOItem)
1858
1884
 		{
..
..
@@ -1872,7 +1898,7 @@
1872
1898
 		if (source == invariantsItem)
1873
1899
 		{
1874
1900
                     System.out.println("Invariants:");
1875
-                    GrafreeD.grafreeD.universe.invariants();
1901
+                    Grafreed.grafreeD.universe.invariants();
1876
1902
 		} else
1877
1903
 		if (source == memoryItem)
1878
1904
 		{
..
..
@@ -1947,10 +1973,10 @@
1947
1973
 		} else
1948
1974
 		if (source == duplicateItem)
1949
1975
 		{
1950
-                    Object3D keep = GrafreeD.clipboard;
1976
+                    Object3D keep = Grafreed.clipboard;
1951
1977
 			loadClipboard(false);
1952
1978
 			paste(false);
1953
-                    GrafreeD.clipboard = keep;
1979
+                    Grafreed.clipboard = keep;
1954
1980
 		} else
1955
1981
 		if (source == cloneItem)
1956
1982
 		{
..
..
@@ -2170,9 +2196,9 @@
2170
2196
 //                        group.selection.get(0).setMasterThis(content); // should be identity
2171
2197
 //		refreshContents();
2172
2198
 //                    }
2173
-                    if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
2199
+                    if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
2174
2200
                     {
2175
-                        Object3D content = GrafreeD.clipboard.get(0);
2201
+                        Object3D content = Grafreed.clipboard.get(0);
2176
2202
                         
2177
2203
                         if (content instanceof cGroup && ((cGroup)content).transientlink )
2178
2204
                             content = ((cGroup)content).get(0);
..
..
@@ -2222,9 +2248,9 @@
2222
2248
 		} else
2223
2249
 		if (source == setMasterItem)
2224
2250
 		{
2225
-                    if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2251
+                    if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2226
2252
                     {
2227
-                        Object3D content = GrafreeD.clipboard.get(0);
2253
+                        Object3D content = Grafreed.clipboard.get(0);
2228
2254
                         
2229
2255
                         if (content instanceof cGroup && ((cGroup)content).transientlink )
2230
2256
                             content = ((cGroup)content).get(0);
..
..
@@ -2237,9 +2263,9 @@
2237
2263
 		{
2238
2264
                     if (group.selection.size() == 1)
2239
2265
                     {
2240
-                        if (GrafreeD.clipboard.size() == 1)
2266
+                        if (Grafreed.clipboard.size() == 1)
2241
2267
                         {
2242
-                            Object3D content = GrafreeD.clipboard.get(0);
2268
+                            Object3D content = Grafreed.clipboard.get(0);
2243
2269
 
2244
2270
                             if (content instanceof cGroup && ((cGroup)content).transientlink )
2245
2271
                                 content = ((cGroup)content).get(0);
..
..
@@ -2256,7 +2282,7 @@
2256
2282
 		{
2257
2283
 			RevertMeshes();
2258
2284
 		} else
2259
-		if (source == resetMeshItem)
2285
+		if (source == resetAllItem)
2260
2286
 		{
2261
2287
 			ResetAll();
2262
2288
 		} else
..
..
@@ -2594,9 +2620,13 @@
2594
2620
                 {
2595
2621
 			SmoothMesh();
2596
2622
 		} else
2597
-		if (source == transformgeometryItem)
2623
+		if (source == transformGeometryItem)
2598
2624
 		{
2599
2625
                         TransformGeometry();
2626
+		} else
2627
+		if (source == transformChildrenItem)
2628
+		{
2629
+                        TransformChildren();
2600
2630
 		} else
2601
2631
 		if (source == resetTransformItem)
2602
2632
 		{
..
..
@@ -2604,7 +2634,11 @@
2604
2634
 		} else
2605
2635
 		if (source == resetCentroidItem)
2606
2636
 		{
2607
-                        ResetCentroid();
2637
+                        ResetCentroid(true);
2638
+		} else
2639
+		if (source == resetCentroidXZItem)
2640
+		{
2641
+                        ResetCentroid(false);
2608
2642
 		} else
2609
2643
 		if (source == resetParentItem)
2610
2644
 		{
..
..
@@ -3046,7 +3080,9 @@
3046
3080
                         frontView.object = group;
3047
3081
                         sideView.object = group;
3048
3082
                     }
3049
-                    group.editWindow = this;
3083
+                    
3084
+// fix "+" issue                    group.editWindow = this;
3085
+                    
3050
3086
                     /*
3051
3087
                     currentLayout = radio.layout;
3052
3088
                     if (currentLayout == null)
..
..
@@ -3120,6 +3156,28 @@
3120
3156
             refreshContents();
3121
3157
         }
3122
3158
         
3159
+        void TransformChildren()
3160
+        {
3161
+            Object3D obj;
3162
+            for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3163
+            {
3164
+                    obj = (Object3D)e.nextElement();
3165
+                    obj.KeepTextureMatrices();
3166
+                    obj.TransformChildren();
3167
+                    obj.RestoreTextureMatrices();
3168
+                                        
3169
+//                    if (obj.parent == null)
3170
+//                    {
3171
+//                        System.out.println("NULL PARENT!");
3172
+//                        new Exception().printStackTrace();
3173
+//                    }
3174
+//                    else
3175
+//                        TouchTransform(obj);
3176
+//                        //obj.parent.Touch();
3177
+            }
3178
+
3179
+            refreshContents();
3180
+        }
3123
3181
         
3124
3182
         void ResetTransform()
3125
3183
         {
..
..
@@ -3232,7 +3290,7 @@
3232
3290
             refreshContents();
3233
3291
         }
3234
3292
         
3235
-        void ResetCentroid()
3293
+        void ResetCentroid(boolean full)
3236
3294
         {
3237
3295
             Object3D obj;
3238
3296
             for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..
..
@@ -3247,12 +3305,16 @@
3247
3305
                     LA.matIdentity(Object3D.mat);
3248
3306
                     obj.getBounds(minima, maxima, false);
3249
3307
                     Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3250
-                    Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3308
+                    if (full)
3309
+                        Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3251
3310
                     Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3252
3311
                     obj.TransformMesh(Object3D.mat);
3312
+                    
3253
3313
                     Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3254
-                    Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3314
+                    if (full)
3315
+                        Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3255
3316
                     Object3D.mat[3][2] = (minima.z + maxima.z)/2;
3317
+                    
3256
3318
                     LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3257
3319
                     //Object3D.mat[3][0] = -Object3D.mat[3][0];
3258
3320
                     //Object3D.mat[3][1] = -Object3D.mat[3][1];
..
..
@@ -3318,9 +3380,9 @@
3318
3380
                     obj = (Object3D)e.nextElement();
3319
3381
                     
3320
3382
                     System.out.println("Object is: " + obj);
3321
-                    GrafreeD.AnalyzeObject(obj);
3383
+                    Grafreed.AnalyzeObject(obj);
3322
3384
                     System.out.println("Boundary rep: " + obj.bRep);
3323
-                    GrafreeD.AnalyzeObject(obj.bRep);
3385
+                    Grafreed.AnalyzeObject(obj.bRep);
3324
3386
                     
3325
3387
 //                    System.err.println((size/1024) + " KB is the size of " + obj);
3326
3388
                 }
..
..
@@ -3534,8 +3596,8 @@
3534
3596
 	
3535
3597
 	void ParseVertices()
3536
3598
 	{
3537
-            boolean epsequal = GrafreeD.epsequal;
3538
-            GrafreeD.epsequal = true;
3599
+            boolean epsequal = Grafreed.epsequal;
3600
+            Grafreed.epsequal = true;
3539
3601
             
3540
3602
             for (int i=0; i<group.selection.size(); i++)
3541
3603
             {
..
..
@@ -3560,7 +3622,7 @@
3560
3622
                                 LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3561
3623
                                 LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3562
3624
 
3563
-                                g.add(GrafreeD.clipboard);
3625
+                                g.add(Grafreed.clipboard);
3564
3626
 
3565
3627
                                 buffer.add(g);
3566
3628
                             }
..
..
@@ -3575,7 +3637,7 @@
3575
3637
                 makeSomething(buffer, i==group.selection.size()-1);
3576
3638
             }
3577
3639
             
3578
-            GrafreeD.epsequal = epsequal;
3640
+            Grafreed.epsequal = epsequal;
3579
3641
             
3580
3642
             refreshContents();
3581
3643
 	}
..
..
@@ -3593,7 +3655,16 @@
3593
3655
                             String pigment = Object3D.GetPigment(tex);
3594
3656
                             //String bump = Object3D.GetBump(tex);
3595
3657
                             
3596
-                            com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3658
+                            com.sun.opengl.util.texture.TextureData texturedata = null;
3659
+                            
3660
+                            try
3661
+                            {
3662
+                                texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3663
+                            }
3664
+                            catch (Exception e)
3665
+                            {
3666
+                                System.err.println("FAIL: " + node);
3667
+                            }
3597
3668
                             
3598
3669
                             double s = v.s;
3599
3670
                             
..
..
@@ -3725,7 +3796,7 @@
3725
3796
                 return;
3726
3797
             
3727
3798
             Object3D poses = group.selection.get(0);
3728
-            Object3D ref = GrafreeD.clipboard.get(0);
3799
+            Object3D ref = Grafreed.clipboard.get(0);
3729
3800
             
3730
3801
             Object3D newgroup = new Object3D("Po:" + poses.name);
3731
3802
             
..
..
@@ -3919,9 +3990,9 @@
3919
3990
 	
3920
3991
 	void ClipMesh()
3921
3992
 	{
3922
-            if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
3993
+            if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
3923
3994
             {
3924
-                Object3D content = GrafreeD.clipboard.get(0);
3995
+                Object3D content = Grafreed.clipboard.get(0);
3925
3996
 
3926
3997
                 if (content instanceof cGroup && ((cGroup)content).transientlink )
3927
3998
                     content = ((cGroup)content).get(0);
..
..
@@ -3930,7 +4001,7 @@
3930
4001
 //                {
3931
4002
 //                    group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3932
4003
 //                }
3933
-                  group.selection.ClipMesh(GrafreeD.clipboard);
4004
+                  group.selection.ClipMesh(Grafreed.clipboard);
3934
4005
             }
3935
4006
 //		group.selection.ClipMesh(GrafreeD.clipboard);
3936
4007
             System.out.println("DONE.");
..
..
@@ -4065,7 +4136,7 @@
4065
4136
                     objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4066
4137
                     
4067
4138
 			Object3D elem = (Object3D)group.selection.elementAt(i);
4068
-                        if(elem != group)
4139
+                        if(elem != group || !newWindow)
4069
4140
                         {
4070
4141
                         //    if (!(elem instanceof Composite))
4071
4142
                         //        newWindow = false;
..
..
@@ -4270,12 +4341,12 @@
4270
4341
 	{
4271
4342
 		if (group.selection.isEmpty())
4272
4343
 			return;
4273
-		GrafreeD.clipboardIsTempGroup = false;
4344
+		Grafreed.clipboardIsTempGroup = false;
4274
4345
 		Composite tGroup = null;
4275
4346
 		if (group.selection.size() > 0) // 1)
4276
4347
 		{
4277
4348
 			tGroup = new cGroup();
4278
-			GrafreeD.clipboardIsTempGroup = true;
4349
+			Grafreed.clipboardIsTempGroup = true;
4279
4350
 		}
4280
4351
                 
4281
4352
 		if (cut)
..
..
@@ -4315,16 +4386,16 @@
4315
4386
 		//System.out.println("cut " + child);
4316
4387
 		//System.out.println("parent = " + child.parent);
4317
4388
                 //                   tmp.addChild(child);
4318
-                                    if (GrafreeD.clipboardIsTempGroup)
4389
+                                    if (Grafreed.clipboardIsTempGroup)
4319
4390
                                             tGroup.add/*Child*/(tmp);
4320
4391
                                     else
4321
-                                            GrafreeD.clipboard = tmp;
4392
+                                            Grafreed.clipboard = tmp;
4322
4393
                                 }
4323
4394
                                 else
4324
-                                    if (GrafreeD.clipboardIsTempGroup)
4395
+                                    if (Grafreed.clipboardIsTempGroup)
4325
4396
                                             tGroup.add/*Child*/(child);
4326
4397
                                     else
4327
-                                            GrafreeD.clipboard = child;
4398
+                                            Grafreed.clipboard = child;
4328
4399
 			}
4329
4400
 			
4330
4401
 			//ResetModel();
..
..
@@ -4356,21 +4427,21 @@
4356
4427
 		//System.out.println("cut " + elem);
4357
4428
 		//System.out.println("parent = " + elem.parent);
4358
4429
                 //                    tmp.addChild(elem);
4359
-                                    if (GrafreeD.clipboardIsTempGroup)
4430
+                                    if (Grafreed.clipboardIsTempGroup)
4360
4431
                                             tGroup.add/*Child*/(tmp);
4361
4432
                                     else
4362
-                                            GrafreeD.clipboard = tmp;
4433
+                                            Grafreed.clipboard = tmp;
4363
4434
                                 }
4364
4435
                                 else
4365
-                                    if (GrafreeD.clipboardIsTempGroup)
4436
+                                    if (Grafreed.clipboardIsTempGroup)
4366
4437
                                             tGroup.add/*Child*/(child);
4367
4438
                                     else
4368
-                                            GrafreeD.clipboard = child;
4439
+                                            Grafreed.clipboard = child;
4369
4440
 			}
4370
4441
 			
4371
4442
 		}
4372
-		if (GrafreeD.clipboardIsTempGroup)
4373
-			GrafreeD.clipboard = tGroup;
4443
+		if (Grafreed.clipboardIsTempGroup)
4444
+			Grafreed.clipboard = tGroup;
4374
4445
 		if (cut)
4375
4446
                 {
4376
4447
                     ResetModel();
..
..
@@ -4384,7 +4455,7 @@
4384
4455
 	//		return;
4385
4456
 		boolean first = true;
4386
4457
 		
4387
-		if (GrafreeD.clipboardIsTempGroup)
4458
+		if (Grafreed.clipboardIsTempGroup)
4388
4459
 		{
4389
4460
 			Composite temp;
4390
4461
 			
..
..
@@ -4395,7 +4466,7 @@
4395
4466
 				temp = (Composite)Applet3D.clipboard.deepCopy();
4396
4467
                          */
4397
4468
 			Object3D elem;
4398
-			for (Enumeration e = /*temp.children*/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4469
+			for (Enumeration e = /*temp.children*/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4399
4470
 			{
4400
4471
 				Object3D child = (Object3D)e.nextElement();
4401
4472
                                 
..
..
@@ -4429,14 +4500,14 @@
4429
4500
 			//Object3D cb = Applet3D.clipboard;
4430
4501
 			//temp.addChild(cb);
4431
4502
 			//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4432
-                    assert(GrafreeD.clipboard.parent == null);
4433
-                        Object3D /*Composite*/ keepparent = GrafreeD.clipboard.get(0).parent;
4434
-                        GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4435
-                        if (LA.isIdentity(GrafreeD.clipboard.toParent))
4436
-                            makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
4503
+                    assert(Grafreed.clipboard.parent == null);
4504
+                        Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
4505
+                        Grafreed.clipboard.get(0).parent = null; // Avoid copy?
4506
+                        if (LA.isIdentity(Grafreed.clipboard.toParent))
4507
+                            makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4437
4508
                         else
4438
-                            makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4439
-                        GrafreeD.clipboard.get(0).parent = keepparent;
4509
+                            makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
4510
+                        Grafreed.clipboard.get(0).parent = keepparent;
4440
4511
 		}
4441
4512
 		
4442
4513
 		ResetModel();
..
..
@@ -4485,9 +4556,9 @@
4485
4556
 		{
4486
4557
 			boolean first = true;
4487
4558
 			
4488
-			if (GrafreeD.clipboardIsTempGroup)
4559
+			if (Grafreed.clipboardIsTempGroup)
4489
4560
 			{
4490
-				Composite temp = (Composite)GrafreeD.clipboard;
4561
+				Composite temp = (Composite)Grafreed.clipboard;
4491
4562
 				Object3D copy;
4492
4563
 				for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4493
4564
 				{
..
..
@@ -4497,7 +4568,7 @@
4497
4568
 				}
4498
4569
 			} else
4499
4570
 			{
4500
-				linkSomething(GrafreeD.clipboard); //.get(0));
4571
+				linkSomething(Grafreed.clipboard); //.get(0));
4501
4572
 			}
4502
4573
 		}
4503
4574
             }
..
..
@@ -4942,7 +5013,7 @@
4942
5013
 
4943
5014
 	void ImportVRMLX3D()
4944
5015
 	{
4945
-		if (GrafreeD.standAlone)
5016
+		if (Grafreed.standAlone)
4946
5017
 		{
4947
5018
                     /**/
4948
5019
 			FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
..
..
@@ -4959,7 +5030,7 @@
4959
5030
 				
4960
5031
 	String GetFile(String dialogName)
4961
5032
 	{
4962
-		if (GrafreeD.standAlone)
5033
+		if (Grafreed.standAlone)
4963
5034
 		{
4964
5035
 			FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4965
5036
 			browser.show();
..
..
@@ -5072,7 +5143,7 @@
5072
5143
 	private MenuItem linkverticesItem;
5073
5144
 	private MenuItem relinkverticesItem;
5074
5145
 	private MenuItem setMasterItem;
5075
-	private MenuItem resetMeshItem;
5146
+	private MenuItem resetAllItem;
5076
5147
 	private MenuItem stepAllItem;
5077
5148
 	private MenuItem revertMeshItem;
5078
5149
 	private MenuItem poseMeshItem;
..
..
@@ -5133,8 +5204,10 @@
5133
5204
 	private MenuItem panoTexturesItem;
5134
5205
         
5135
5206
 	private MenuItem resetCentroidItem;
5136
-	private MenuItem transformgeometryItem;
5207
+	private MenuItem resetCentroidXZItem;
5137
5208
 	private MenuItem resetTransformItem;
5209
+	private MenuItem transformGeometryItem;
5210
+	private MenuItem transformChildrenItem;
5138
5211
 	private MenuItem hideItem;
5139
5212
 	private MenuItem grabItem;
5140
5213
 	private MenuItem backItem;