Menu cleanup + transform feedback.

Normand Briere

2019-06-09 c5b599b48b333b34e554b464aefbca0b9bc66275

 GroupEditor.java
..
..
@@ -74,7 +74,7 @@
74
74
 		this.copy = this.group = copy;
75
75
 		//selectees = this.group.selectees;
76
76
 		
77
-		SetupMenu2(objEditor);
77
+		SetupMenu2(this); //objEditor);
78
78
 		SetupUI2(objEditor);
79
79
 		objEditor.SetupUI(true);
80
80
 		SetupViews(objEditor);
..
..
@@ -98,14 +98,14 @@
98
98
 
99
99
     void CloneClipboard(boolean supports)
100
100
     {
101
-        assert(GrafreeD.clipboard.parent == null);
102
-        Object3D /*Composite*/ keepparent = GrafreeD.clipboard.get(0).parent;
103
-        GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
104
-        if (LA.isIdentity(GrafreeD.clipboard.toParent))
105
-            makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
101
+        assert(Grafreed.clipboard.parent == null);
102
+        Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
103
+        Grafreed.clipboard.get(0).parent = null; // Avoid copy?
104
+        if (LA.isIdentity(Grafreed.clipboard.toParent))
105
+            makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106
106
         else
107
-            makeSomething(CloneObject(GrafreeD.clipboard, false));
108
-        GrafreeD.clipboard.get(0).parent = keepparent;
107
+            makeSomething(CloneObject(Grafreed.clipboard, false));
108
+        Grafreed.clipboard.get(0).parent = keepparent;
109
109
     }
110
110
     
111
111
     static Object3D CloneObject(Object3D obj, boolean supports)
..
..
@@ -119,7 +119,7 @@
119
119
         //               obj.support = null;
120
120
         if (!supports)
121
121
             obj.SaveSupports();
122
-        Object3D clone = (Object3D)GrafreeD.clone(obj);
122
+        Object3D clone = (Object3D)Grafreed.clone(obj);
123
123
         obj.parent = parent;
124
124
         //               obj.support = support;
125
125
         //               clone.support = support; // aout 2013
..
..
@@ -148,29 +148,22 @@
148
148
         
149
149
     //JTextField nameField;
150
150
     
151
-	void SetupMenu2(ObjEditor oe)
151
+	void SetupMenu2(GroupEditor oe)
152
152
 	{
153
-        if (Globals.ADVANCED)
154
-        {
155
-		oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
156
-		//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
157
-		//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
158
-		editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
159
-		oe.cameraMenu.add("-");
160
-		openWindowItem =  oe.cameraMenu.add(new MenuItem("Edit copy..."));
161
-		openWindowItem.addActionListener(this);
162
-		editLeafItem.addActionListener(this);
163
-		lookAtItem.addActionListener(this);
164
-		//lookFromItem.addActinoListener(this);
165
-		//switchItem.addActionListener(this);
166
-        }
167
-        
168
153
 		Menu menu;
169
154
 		oe.menuBar.add(menu = new Menu("Edit"));
170
155
 		//editItem = menu.add(new MenuItem("Edit"));
171
156
 		//editItem.addActionListener(this);
172
157
 		duplicateItem = menu.add(new MenuItem("Duplicate"));
173
158
 		duplicateItem.addActionListener(this);
159
+		cloneItem = menu.add(new MenuItem("Clone"));
160
+		cloneItem.addActionListener(this);
161
+        if (Globals.ADVANCED)
162
+        {
163
+		cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
164
+		cloneSupportItem.addActionListener(this);
165
+        }
166
+		menu.add("-");
174
167
 		cutItem = menu.add(new MenuItem("Cut"));
175
168
 		cutItem.addActionListener(this);
176
169
 		copyItem = menu.add(new MenuItem("Copy"));
..
..
@@ -178,10 +171,7 @@
178
171
 		pasteItem = menu.add(new MenuItem("Paste"));
179
172
 		pasteItem.addActionListener(this);
180
173
 		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);
174
+                
185
175
 		menu.add("-");
186
176
 		pasteIntoItem = menu.add(new MenuItem("Paste into"));
187
177
 		pasteIntoItem.addActionListener(this);
..
..
@@ -201,14 +191,97 @@
201
191
 		clearAllItem = menu.add(new MenuItem("Clear All"));
202
192
 		clearAllItem.addActionListener(this);
203
193
         }
194
+        
195
+        menuBar.add(cameraMenu = new Menu("View"));
196
+        //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
197
+        //zBufferItem.addActionListener(this);
198
+        //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
199
+        //normalLensItem.addActionListener(this);
200
+        cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
201
+        revertCameraItem.addActionListener(this);
202
+        
203
+        cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
204
+        toggleFullScreenItem.addItemListener(this);
205
+        toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
206
+        cameraMenu.add("-");
207
+        
208
+        cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
209
+        toggleTextureItem.addItemListener(this);
210
+        toggleTextureItem.setState(CameraPane.textureon);
211
+        
212
+        cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
213
+        toggleSwitchItem.addItemListener(this);
214
+        toggleSwitchItem.setState(CameraPane.SWITCH);
215
+        
216
+        cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
217
+        toggleHandleItem.addItemListener(this);
218
+        toggleHandleItem.setState(CameraPane.HANDLES);
219
+        
220
+        cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
221
+        togglePaintItem.addItemListener(this);
222
+        togglePaintItem.setState(CameraPane.PAINTMODE);
223
+        
224
+        if (Globals.ADVANCED)
225
+        {
226
+        cameraMenu.add("-");
227
+                cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
228
+                toggleLiveItem.addItemListener(this);
229
+                toggleLiveItem.setState(Globals.isLIVE());
204
230
 
231
+                cameraMenu.add(stepItem = new MenuItem("Step"));
232
+                stepItem.addActionListener(this);
233
+        //		cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
234
+        //		toggleDLItem.addItemListener(this);
235
+        //                toggleDLItem.setState(false);
236
+
237
+                cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
238
+                toggleRenderItem.addItemListener(this);
239
+                toggleRenderItem.setState(!CameraPane.frozen);
240
+
241
+                cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
242
+                toggleDebugItem.addItemListener(this);
243
+                toggleDebugItem.setState(CameraPane.DEBUG);
244
+
245
+                cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
246
+                toggleFrustumItem.addItemListener(this);
247
+                toggleFrustumItem.setState(CameraPane.FRUSTUM);
248
+
249
+                cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
250
+                toggleFootContactItem.addItemListener(this);
251
+                toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
252
+                
253
+                cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
254
+                toggleTimelineItem.addItemListener(this);
255
+        }
256
+        
257
+//		cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
258
+//		toggleRootItem.addItemListener(this);
259
+//                    toggleRootItem.setState(false);
260
+//		cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
261
+//		animationItem.addItemListener(this);
262
+//                    animationItem.setState(CameraPane.ANIMATION);
263
+        cameraMenu.add("-");
264
+        cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
265
+        editCameraItem.addActionListener(this);
266
+        
267
+        if (Globals.ADVANCED)
268
+        {
269
+		oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
270
+		//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
271
+		//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
272
+		editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
273
+		oe.cameraMenu.add("-");
274
+		openWindowItem =  oe.cameraMenu.add(new MenuItem("Edit copy..."));
275
+		openWindowItem.addActionListener(this);
276
+		editLeafItem.addActionListener(this);
277
+		lookAtItem.addActionListener(this);
278
+		//lookFromItem.addActinoListener(this);
279
+		//switchItem.addActionListener(this);
280
+        }
281
+        
205
282
 		oe.menuBar.add(menu = new Menu("Setting"));
206
283
         if (Globals.ADVANCED)
207
284
         {
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
285
 		revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
213
286
 		revertMeshItem.addActionListener(this);
214
287
 		resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..
..
@@ -272,6 +345,7 @@
272
345
                 
273
346
         if (Globals.ADVANCED)
274
347
         {
348
+		menu.add("-");
275
349
 		physicsItem = menu.add(new MenuItem("Physics"));
276
350
 		physicsItem.addActionListener(this);
277
351
 		frameselectorItem = menu.add(new MenuItem("Frame Selector"));
..
..
@@ -297,6 +371,7 @@
297
371
 		shadowZItem.addActionListener(this);
298
372
         if (Globals.ADVANCED)
299
373
         {
374
+		menu.add("-");
300
375
 		linkerItem = menu.add(new MenuItem("Linker"));
301
376
 		linkerItem.addActionListener(this);
302
377
 		attributeItem = menu.add(new MenuItem("Attribute"));
..
..
@@ -305,14 +380,18 @@
305
380
 		templateItem.addActionListener(this);
306
381
 		pointflowItem = menu.add(new MenuItem("Point Flow"));
307
382
 		pointflowItem.addActionListener(this);
308
-		menu.add("-");
309
383
         }
384
+		menu.add("-");
310
385
 		resetTransformItem = menu.add(new MenuItem("Reset Transform"));
311
386
 		resetTransformItem.addActionListener(this);
312
387
 		resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
313
388
 		resetCentroidItem.addActionListener(this);
314
-		transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
315
-		transformgeometryItem.addActionListener(this);
389
+		resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
390
+		resetCentroidXZItem.addActionListener(this);
391
+		transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
392
+		transformGeometryItem.addActionListener(this);
393
+		transformChildrenItem = menu.add(new MenuItem("Transform Children"));
394
+		transformChildrenItem.addActionListener(this);
316
395
                 
317
396
 		oe.menuBar.add(menu = new Menu("Geometry"));
318
397
 		genUVItem = menu.add(new MenuItem("Generate UV"));
..
..
@@ -361,6 +440,10 @@
361
440
                 oe.menuBar.add(menu = new Menu("Attributes"));
362
441
 		clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
363
442
 		clearMaterialsItem.addActionListener(this);
443
+                resetAllItem = menu.add(new MenuItem("Reset All"));
444
+		resetAllItem.addActionListener(this);
445
+		stepAllItem = menu.add(new MenuItem("Step All"));
446
+		stepAllItem.addActionListener(this);
364
447
 		menu.add("-");
365
448
 		liveleavesItem = menu.add(new MenuItem("Live Leaves"));
366
449
 		liveleavesItem.addActionListener(this);
..
..
@@ -415,32 +498,23 @@
415
498
 		sortbysizeItem.addActionListener(this);
416
499
 		sortbynameItem = menu.add(new MenuItem("Sort by name"));
417
500
 		sortbynameItem.addActionListener(this);
501
+		menu.add("-");
502
+		shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
503
+		shareGeometriesItem.addActionListener(this);
504
+		mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
505
+		mergeGeometriesItem.addActionListener(this);
418
506
         if (Globals.ADVANCED)
419
507
         {
420
-		menu.add("-");
508
+            // Pretty much the same as duplicate and clone.
421
509
 		extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
422
510
 		extractGeometriesItem.addActionListener(this);
423
511
 		cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
424
512
 		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
513
         }
430
514
                 
431
515
 		oe.menuBar.add(menu = new Menu("Insert"));
432
516
 		buildCreateMenu(menu);
433
517
                 
434
-                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..."));
440
-		importOBJItem.addActionListener(this);
441
-		import3DSItem = menu.add(new MenuItem("3DS Object..."));
442
-		import3DSItem.addActionListener(this);
443
-
444
518
                 oe.menuBar.add(menu = new Menu("Tools"));
445
519
 		buildToolsMenu(menu);
446
520
 	}
..
..
@@ -478,10 +552,10 @@
478
552
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
479
553
                 
480
554
                 oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
481
-                liveCB.setToolTipText("Enabled animation");
555
+                liveCB.setToolTipText("Enable animation");
482
556
                                 liveCB.addItemListener(this);
483
557
 
484
-		oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
558
+		oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485
559
                 oneStepButton.setToolTipText("Animate one step forward");
486
560
 		oneStepButton.addActionListener(this);
487
561
                 
..
..
@@ -493,7 +567,7 @@
493
567
                 trackCB.setToolTipText("Enable tracking");
494
568
                                 trackCB.addItemListener(this);
495
569
 
496
-		oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
570
+		oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
497
571
                 screenfitButton.setToolTipText("Screen fit");
498
572
 		screenfitButton.addActionListener(this);
499
573
 
..
..
@@ -502,39 +576,39 @@
502
576
 
503
577
                 if (Globals.ADVANCED)
504
578
                 {
505
-                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
579
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
506
580
                         snapobjectButton.addActionListener(this);
507
581
                         snapobjectButton.setToolTipText("Snap Object");
508
582
                 }
509
583
 
510
-		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
584
+		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
511
585
                 flashSelectionButton.setToolTipText("Show selection");
512
586
 		flashSelectionButton.addActionListener(this);
513
587
                 
514
588
 		oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
515
589
                 
516
-		oe.toolbarPanel.add(twoButton = new cButton("|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
590
+		oe.toolbarPanel.add(twoButton = new cButton("|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
517
591
                 twoButton.setToolTipText("Show center view only");
518
592
 		twoButton.addActionListener(this);
519
-		oe.toolbarPanel.add(fourButton = new cButton("+||", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
593
+		oe.toolbarPanel.add(fourButton = new cButton("+||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
520
594
 		fourButton.addActionListener(this);
521
595
                 fourButton.setToolTipText("Show left panel only");
522
-		oe.toolbarPanel.add(sixButton = new cButton("+|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
596
+		oe.toolbarPanel.add(sixButton = new cButton("+|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
523
597
                 sixButton.setToolTipText("2-column layout left");
524
598
 		sixButton.addActionListener(this);
525
-		oe.toolbarPanel.add(threeButton = new cButton("|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
599
+		oe.toolbarPanel.add(threeButton = new cButton("|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
526
600
                 threeButton.setToolTipText("2-column layout right");
527
601
 		threeButton.addActionListener(this);
528
-		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
602
+		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
529
603
                 sevenButton.setToolTipText("3-column layout");
530
604
 		sevenButton.addActionListener(this);
531
605
                 //
532
606
 
533
-		oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
607
+		oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
534
608
                 rootButton.setToolTipText("Edit selection in new tab");
535
609
 		rootButton.addActionListener(this);
536
610
 
537
-                oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
611
+                oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
538
612
                 closeButton.setToolTipText("Close tab");
539
613
 		closeButton.addActionListener(this);
540
614
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..
..
@@ -542,11 +616,11 @@
542
616
                         
543
617
                 cGridBag commandsPanel = new cGridBag();
544
618
                 
545
-		commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
619
+		commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
546
620
                 editButton.setToolTipText("Edit selection");
547
621
 		editButton.addActionListener(this);
548
622
 
549
-		commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
623
+		commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
550
624
                 uneditButton.setToolTipText("Unedit selection");
551
625
 		uneditButton.addActionListener(this);
552
626
 
..
..
@@ -554,11 +628,11 @@
554
628
                 allParamsButton.setToolTipText("Edit all params");
555
629
 		allParamsButton.addActionListener(this);
556
630
 
557
-		commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
631
+		commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
558
632
                 clearPanelButton.setToolTipText("Clear edit panel");
559
633
 		clearPanelButton.addActionListener(this);
560
634
 
561
-		commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
635
+		commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
562
636
                 unselectButton.setToolTipText("Unselect");
563
637
 		unselectButton.addActionListener(this);
564
638
 
..
..
@@ -641,7 +715,7 @@
641
715
                 zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
642
716
                                 zoomBoxCB.addItemListener(this);
643
717
 
644
-        if (Globals.ADVANCED)
718
+        if (true) // Globals.ADVANCED)
645
719
         {
646
720
                 panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
647
721
                 supportCB.setToolTipText("Enable rigging");
..
..
@@ -714,6 +788,7 @@
714
788
             buttonGroup.add(radioButton);
715
789
             radioButton.doClick();
716
790
         }
791
+        
717
792
         void SetupViews(ObjEditor oe)
718
793
         {
719
794
             oe.SetupViews();
..
..
@@ -930,7 +1005,9 @@
930
1005
 //                        objEditor.DropFile((java.io.File[]) object, true);
931
1006
 //                        return;
932
1007
 //                    }
933
-                    if (string.charAt(0) == '/')
1008
+                    
1009
+                    // File path for Mac and Windows
1010
+                    if (string.charAt(0) == '/' || string.charAt(1) == ':')
934
1011
                     {
935
1012
                         // file(s)
936
1013
                         String[] names = string.split("\n");
..
..
@@ -957,7 +1034,7 @@
957
1034
                     
958
1035
                     flashIt = false;
959
1036
                     CameraPane pane = (CameraPane) target;
960
-                    pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
1037
+                    pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
961
1038
                     pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
962
1039
                     
963
1040
                     if (group.selection.size() == 1)
..
..
@@ -1164,13 +1241,13 @@
1164
1241
 		parseverticesItem.addActionListener(this);
1165
1242
 		textureFieldItem = menu.add(new MenuItem("Texture Field"));
1166
1243
 		textureFieldItem.addActionListener(this);
1167
-		alignItem = menu.add(new MenuItem("Align Object"));
1244
+		alignItem = menu.add(new MenuItem("Align Objects"));
1168
1245
 		alignItem.addActionListener(this);
1169
1246
 		reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1170
1247
 		reduceMorphItem.addActionListener(this);
1171
1248
 		reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1172
1249
 		reduce34MorphItem.addActionListener(this);
1173
-                
1250
+		menu.add("-");
1174
1251
 		menu.add(computeAOItem = new MenuItem("Compute AO"));
1175
1252
 		computeAOItem.addActionListener(this);
1176
1253
                 
..
..
@@ -1530,9 +1607,9 @@
1530
1607
     
1531
1608
     void Overwrite(int mask)
1532
1609
     {
1533
-        if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
1610
+        if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
1534
1611
         {
1535
-            Object3D content = GrafreeD.clipboard.get(0);
1612
+            Object3D content = Grafreed.clipboard.get(0);
1536
1613
 
1537
1614
             if (content instanceof cGroup && ((cGroup)content).transientlink )
1538
1615
                 content = ((cGroup)content).get(0);
..
..
@@ -1837,23 +1914,6 @@
1837
1914
                         csg.addChild(child);
1838
1915
                         child.addChild(csg);
1839
1916
 		} else
1840
-                    
1841
-		if (source == importGFDItem)
1842
-		{
1843
-			ImportGFD();
1844
-		} else
1845
-		if (source == importVRMLX3DItem)
1846
-		{
1847
-			ImportVRMLX3D();
1848
-		} else
1849
-		if (source == import3DSItem)
1850
-		{
1851
-			objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1852
-		} else
1853
-		if (source == importOBJItem)
1854
-		{
1855
-			objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1856
-		} else
1857
1917
 		if (source == computeAOItem)
1858
1918
 		{
1859
1919
                     Globals.drawMode = CameraPane.OCCLUSION;
..
..
@@ -1872,7 +1932,7 @@
1872
1932
 		if (source == invariantsItem)
1873
1933
 		{
1874
1934
                     System.out.println("Invariants:");
1875
-                    GrafreeD.grafreeD.universe.invariants();
1935
+                    Grafreed.grafreeD.universe.invariants();
1876
1936
 		} else
1877
1937
 		if (source == memoryItem)
1878
1938
 		{
..
..
@@ -1947,10 +2007,10 @@
1947
2007
 		} else
1948
2008
 		if (source == duplicateItem)
1949
2009
 		{
1950
-                    Object3D keep = GrafreeD.clipboard;
2010
+                    Object3D keep = Grafreed.clipboard;
1951
2011
 			loadClipboard(false);
1952
2012
 			paste(false);
1953
-                    GrafreeD.clipboard = keep;
2013
+                    Grafreed.clipboard = keep;
1954
2014
 		} else
1955
2015
 		if (source == cloneItem)
1956
2016
 		{
..
..
@@ -2170,9 +2230,9 @@
2170
2230
 //                        group.selection.get(0).setMasterThis(content); // should be identity
2171
2231
 //		refreshContents();
2172
2232
 //                    }
2173
-                    if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
2233
+                    if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
2174
2234
                     {
2175
-                        Object3D content = GrafreeD.clipboard.get(0);
2235
+                        Object3D content = Grafreed.clipboard.get(0);
2176
2236
                         
2177
2237
                         if (content instanceof cGroup && ((cGroup)content).transientlink )
2178
2238
                             content = ((cGroup)content).get(0);
..
..
@@ -2222,9 +2282,9 @@
2222
2282
 		} else
2223
2283
 		if (source == setMasterItem)
2224
2284
 		{
2225
-                    if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2285
+                    if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2226
2286
                     {
2227
-                        Object3D content = GrafreeD.clipboard.get(0);
2287
+                        Object3D content = Grafreed.clipboard.get(0);
2228
2288
                         
2229
2289
                         if (content instanceof cGroup && ((cGroup)content).transientlink )
2230
2290
                             content = ((cGroup)content).get(0);
..
..
@@ -2237,9 +2297,9 @@
2237
2297
 		{
2238
2298
                     if (group.selection.size() == 1)
2239
2299
                     {
2240
-                        if (GrafreeD.clipboard.size() == 1)
2300
+                        if (Grafreed.clipboard.size() == 1)
2241
2301
                         {
2242
-                            Object3D content = GrafreeD.clipboard.get(0);
2302
+                            Object3D content = Grafreed.clipboard.get(0);
2243
2303
 
2244
2304
                             if (content instanceof cGroup && ((cGroup)content).transientlink )
2245
2305
                                 content = ((cGroup)content).get(0);
..
..
@@ -2256,7 +2316,7 @@
2256
2316
 		{
2257
2317
 			RevertMeshes();
2258
2318
 		} else
2259
-		if (source == resetMeshItem)
2319
+		if (source == resetAllItem)
2260
2320
 		{
2261
2321
 			ResetAll();
2262
2322
 		} else
..
..
@@ -2594,9 +2654,13 @@
2594
2654
                 {
2595
2655
 			SmoothMesh();
2596
2656
 		} else
2597
-		if (source == transformgeometryItem)
2657
+		if (source == transformGeometryItem)
2598
2658
 		{
2599
2659
                         TransformGeometry();
2660
+		} else
2661
+		if (source == transformChildrenItem)
2662
+		{
2663
+                        TransformChildren();
2600
2664
 		} else
2601
2665
 		if (source == resetTransformItem)
2602
2666
 		{
..
..
@@ -2604,7 +2668,11 @@
2604
2668
 		} else
2605
2669
 		if (source == resetCentroidItem)
2606
2670
 		{
2607
-                        ResetCentroid();
2671
+                        ResetCentroid(true);
2672
+		} else
2673
+		if (source == resetCentroidXZItem)
2674
+		{
2675
+                        ResetCentroid(false);
2608
2676
 		} else
2609
2677
 		if (source == resetParentItem)
2610
2678
 		{
..
..
@@ -3046,7 +3114,9 @@
3046
3114
                         frontView.object = group;
3047
3115
                         sideView.object = group;
3048
3116
                     }
3049
-                    group.editWindow = this;
3117
+                    
3118
+// fix "+" issue                    group.editWindow = this;
3119
+                    
3050
3120
                     /*
3051
3121
                     currentLayout = radio.layout;
3052
3122
                     if (currentLayout == null)
..
..
@@ -3059,7 +3129,20 @@
3059
3129
                     //group.attributes = -1;
3060
3130
                     ResetModel();
3061
3131
                     refreshContents(true);
3062
-                }
3132
+                } else if (event.getSource() == editCameraItem)
3133
+                {
3134
+                    cameraView.ProtectCamera();
3135
+                    cameraView.repaint();
3136
+                    return;
3137
+                } else if (event.getSource() == revertCameraItem)
3138
+                {
3139
+                    cameraView.RevertCamera();
3140
+                    cameraView.repaint();
3141
+                    return;
3142
+        //        } else if (event.getSource() == textureButton)
3143
+        //        {
3144
+        //            return; // true;
3145
+                } 
3063
3146
                 else
3064
3147
                 {
3065
3148
 			//return super.action(event, arg);
..
..
@@ -3120,6 +3203,28 @@
3120
3203
             refreshContents();
3121
3204
         }
3122
3205
         
3206
+        void TransformChildren()
3207
+        {
3208
+            Object3D obj;
3209
+            for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3210
+            {
3211
+                    obj = (Object3D)e.nextElement();
3212
+                    obj.KeepTextureMatrices();
3213
+                    obj.TransformChildren();
3214
+                    obj.RestoreTextureMatrices();
3215
+                                        
3216
+//                    if (obj.parent == null)
3217
+//                    {
3218
+//                        System.out.println("NULL PARENT!");
3219
+//                        new Exception().printStackTrace();
3220
+//                    }
3221
+//                    else
3222
+//                        TouchTransform(obj);
3223
+//                        //obj.parent.Touch();
3224
+            }
3225
+
3226
+            refreshContents();
3227
+        }
3123
3228
         
3124
3229
         void ResetTransform()
3125
3230
         {
..
..
@@ -3232,7 +3337,7 @@
3232
3337
             refreshContents();
3233
3338
         }
3234
3339
         
3235
-        void ResetCentroid()
3340
+        void ResetCentroid(boolean full)
3236
3341
         {
3237
3342
             Object3D obj;
3238
3343
             for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..
..
@@ -3247,12 +3352,16 @@
3247
3352
                     LA.matIdentity(Object3D.mat);
3248
3353
                     obj.getBounds(minima, maxima, false);
3249
3354
                     Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3250
-                    Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3355
+                    if (full)
3356
+                        Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3251
3357
                     Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3252
3358
                     obj.TransformMesh(Object3D.mat);
3359
+                    
3253
3360
                     Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3254
-                    Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3361
+                    if (full)
3362
+                        Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3255
3363
                     Object3D.mat[3][2] = (minima.z + maxima.z)/2;
3364
+                    
3256
3365
                     LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3257
3366
                     //Object3D.mat[3][0] = -Object3D.mat[3][0];
3258
3367
                     //Object3D.mat[3][1] = -Object3D.mat[3][1];
..
..
@@ -3318,9 +3427,9 @@
3318
3427
                     obj = (Object3D)e.nextElement();
3319
3428
                     
3320
3429
                     System.out.println("Object is: " + obj);
3321
-                    GrafreeD.AnalyzeObject(obj);
3430
+                    Grafreed.AnalyzeObject(obj);
3322
3431
                     System.out.println("Boundary rep: " + obj.bRep);
3323
-                    GrafreeD.AnalyzeObject(obj.bRep);
3432
+                    Grafreed.AnalyzeObject(obj.bRep);
3324
3433
                     
3325
3434
 //                    System.err.println((size/1024) + " KB is the size of " + obj);
3326
3435
                 }
..
..
@@ -3534,8 +3643,8 @@
3534
3643
 	
3535
3644
 	void ParseVertices()
3536
3645
 	{
3537
-            boolean epsequal = GrafreeD.epsequal;
3538
-            GrafreeD.epsequal = true;
3646
+            boolean epsequal = Grafreed.epsequal;
3647
+            Grafreed.epsequal = true;
3539
3648
             
3540
3649
             for (int i=0; i<group.selection.size(); i++)
3541
3650
             {
..
..
@@ -3560,7 +3669,7 @@
3560
3669
                                 LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3561
3670
                                 LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3562
3671
 
3563
-                                g.add(GrafreeD.clipboard);
3672
+                                g.add(Grafreed.clipboard);
3564
3673
 
3565
3674
                                 buffer.add(g);
3566
3675
                             }
..
..
@@ -3575,7 +3684,7 @@
3575
3684
                 makeSomething(buffer, i==group.selection.size()-1);
3576
3685
             }
3577
3686
             
3578
-            GrafreeD.epsequal = epsequal;
3687
+            Grafreed.epsequal = epsequal;
3579
3688
             
3580
3689
             refreshContents();
3581
3690
 	}
..
..
@@ -3593,7 +3702,16 @@
3593
3702
                             String pigment = Object3D.GetPigment(tex);
3594
3703
                             //String bump = Object3D.GetBump(tex);
3595
3704
                             
3596
-                            com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3705
+                            com.sun.opengl.util.texture.TextureData texturedata = null;
3706
+                            
3707
+                            try
3708
+                            {
3709
+                                texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3710
+                            }
3711
+                            catch (Exception e)
3712
+                            {
3713
+                                System.err.println("FAIL: " + node);
3714
+                            }
3597
3715
                             
3598
3716
                             double s = v.s;
3599
3717
                             
..
..
@@ -3725,7 +3843,7 @@
3725
3843
                 return;
3726
3844
             
3727
3845
             Object3D poses = group.selection.get(0);
3728
-            Object3D ref = GrafreeD.clipboard.get(0);
3846
+            Object3D ref = Grafreed.clipboard.get(0);
3729
3847
             
3730
3848
             Object3D newgroup = new Object3D("Po:" + poses.name);
3731
3849
             
..
..
@@ -3919,9 +4037,9 @@
3919
4037
 	
3920
4038
 	void ClipMesh()
3921
4039
 	{
3922
-            if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
4040
+            if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
3923
4041
             {
3924
-                Object3D content = GrafreeD.clipboard.get(0);
4042
+                Object3D content = Grafreed.clipboard.get(0);
3925
4043
 
3926
4044
                 if (content instanceof cGroup && ((cGroup)content).transientlink )
3927
4045
                     content = ((cGroup)content).get(0);
..
..
@@ -3930,7 +4048,7 @@
3930
4048
 //                {
3931
4049
 //                    group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3932
4050
 //                }
3933
-                  group.selection.ClipMesh(GrafreeD.clipboard);
4051
+                  group.selection.ClipMesh(Grafreed.clipboard);
3934
4052
             }
3935
4053
 //		group.selection.ClipMesh(GrafreeD.clipboard);
3936
4054
             System.out.println("DONE.");
..
..
@@ -4065,7 +4183,7 @@
4065
4183
                     objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4066
4184
                     
4067
4185
 			Object3D elem = (Object3D)group.selection.elementAt(i);
4068
-                        if(elem != group)
4186
+                        if(elem != group || !newWindow)
4069
4187
                         {
4070
4188
                         //    if (!(elem instanceof Composite))
4071
4189
                         //        newWindow = false;
..
..
@@ -4270,12 +4388,12 @@
4270
4388
 	{
4271
4389
 		if (group.selection.isEmpty())
4272
4390
 			return;
4273
-		GrafreeD.clipboardIsTempGroup = false;
4391
+		Grafreed.clipboardIsTempGroup = false;
4274
4392
 		Composite tGroup = null;
4275
4393
 		if (group.selection.size() > 0) // 1)
4276
4394
 		{
4277
4395
 			tGroup = new cGroup();
4278
-			GrafreeD.clipboardIsTempGroup = true;
4396
+			Grafreed.clipboardIsTempGroup = true;
4279
4397
 		}
4280
4398
                 
4281
4399
 		if (cut)
..
..
@@ -4315,16 +4433,16 @@
4315
4433
 		//System.out.println("cut " + child);
4316
4434
 		//System.out.println("parent = " + child.parent);
4317
4435
                 //                   tmp.addChild(child);
4318
-                                    if (GrafreeD.clipboardIsTempGroup)
4436
+                                    if (Grafreed.clipboardIsTempGroup)
4319
4437
                                             tGroup.add/*Child*/(tmp);
4320
4438
                                     else
4321
-                                            GrafreeD.clipboard = tmp;
4439
+                                            Grafreed.clipboard = tmp;
4322
4440
                                 }
4323
4441
                                 else
4324
-                                    if (GrafreeD.clipboardIsTempGroup)
4442
+                                    if (Grafreed.clipboardIsTempGroup)
4325
4443
                                             tGroup.add/*Child*/(child);
4326
4444
                                     else
4327
-                                            GrafreeD.clipboard = child;
4445
+                                            Grafreed.clipboard = child;
4328
4446
 			}
4329
4447
 			
4330
4448
 			//ResetModel();
..
..
@@ -4356,21 +4474,21 @@
4356
4474
 		//System.out.println("cut " + elem);
4357
4475
 		//System.out.println("parent = " + elem.parent);
4358
4476
                 //                    tmp.addChild(elem);
4359
-                                    if (GrafreeD.clipboardIsTempGroup)
4477
+                                    if (Grafreed.clipboardIsTempGroup)
4360
4478
                                             tGroup.add/*Child*/(tmp);
4361
4479
                                     else
4362
-                                            GrafreeD.clipboard = tmp;
4480
+                                            Grafreed.clipboard = tmp;
4363
4481
                                 }
4364
4482
                                 else
4365
-                                    if (GrafreeD.clipboardIsTempGroup)
4483
+                                    if (Grafreed.clipboardIsTempGroup)
4366
4484
                                             tGroup.add/*Child*/(child);
4367
4485
                                     else
4368
-                                            GrafreeD.clipboard = child;
4486
+                                            Grafreed.clipboard = child;
4369
4487
 			}
4370
4488
 			
4371
4489
 		}
4372
-		if (GrafreeD.clipboardIsTempGroup)
4373
-			GrafreeD.clipboard = tGroup;
4490
+		if (Grafreed.clipboardIsTempGroup)
4491
+			Grafreed.clipboard = tGroup;
4374
4492
 		if (cut)
4375
4493
                 {
4376
4494
                     ResetModel();
..
..
@@ -4384,7 +4502,7 @@
4384
4502
 	//		return;
4385
4503
 		boolean first = true;
4386
4504
 		
4387
-		if (GrafreeD.clipboardIsTempGroup)
4505
+		if (Grafreed.clipboardIsTempGroup)
4388
4506
 		{
4389
4507
 			Composite temp;
4390
4508
 			
..
..
@@ -4395,7 +4513,7 @@
4395
4513
 				temp = (Composite)Applet3D.clipboard.deepCopy();
4396
4514
                          */
4397
4515
 			Object3D elem;
4398
-			for (Enumeration e = /*temp.children*/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4516
+			for (Enumeration e = /*temp.children*/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4399
4517
 			{
4400
4518
 				Object3D child = (Object3D)e.nextElement();
4401
4519
                                 
..
..
@@ -4429,14 +4547,14 @@
4429
4547
 			//Object3D cb = Applet3D.clipboard;
4430
4548
 			//temp.addChild(cb);
4431
4549
 			//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());
4550
+                    assert(Grafreed.clipboard.parent == null);
4551
+                        Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
4552
+                        Grafreed.clipboard.get(0).parent = null; // Avoid copy?
4553
+                        if (LA.isIdentity(Grafreed.clipboard.toParent))
4554
+                            makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4437
4555
                         else
4438
-                            makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4439
-                        GrafreeD.clipboard.get(0).parent = keepparent;
4556
+                            makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
4557
+                        Grafreed.clipboard.get(0).parent = keepparent;
4440
4558
 		}
4441
4559
 		
4442
4560
 		ResetModel();
..
..
@@ -4485,9 +4603,9 @@
4485
4603
 		{
4486
4604
 			boolean first = true;
4487
4605
 			
4488
-			if (GrafreeD.clipboardIsTempGroup)
4606
+			if (Grafreed.clipboardIsTempGroup)
4489
4607
 			{
4490
-				Composite temp = (Composite)GrafreeD.clipboard;
4608
+				Composite temp = (Composite)Grafreed.clipboard;
4491
4609
 				Object3D copy;
4492
4610
 				for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4493
4611
 				{
..
..
@@ -4497,7 +4615,7 @@
4497
4615
 				}
4498
4616
 			} else
4499
4617
 			{
4500
-				linkSomething(GrafreeD.clipboard); //.get(0));
4618
+				linkSomething(Grafreed.clipboard); //.get(0));
4501
4619
 			}
4502
4620
 		}
4503
4621
             }
..
..
@@ -4902,21 +5020,6 @@
4902
5020
         }
4903
5021
          */
4904
5022
 
4905
-        void ImportGFD()
4906
-        {
4907
-            FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4908
-            browser.show();
4909
-            String filename = browser.getFile();
4910
-            if (filename != null && filename.length() > 0)
4911
-            {
4912
-                String fullname = browser.getDirectory() + filename;
4913
-
4914
-                //Object3D readobj =
4915
-                        objEditor.ReadGFD(fullname, objEditor);
4916
-                //makeSomething(readobj);
4917
-            }
4918
-        }
4919
-        
4920
5023
         /*
4921
5024
         public void Callback(Object obj)
4922
5025
         {
..
..
@@ -4940,26 +5043,9 @@
4940
5043
         }
4941
5044
          */
4942
5045
 
4943
-	void ImportVRMLX3D()
4944
-	{
4945
-		if (GrafreeD.standAlone)
4946
-		{
4947
-                    /**/
4948
-			FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4949
-			browser.show();
4950
-			String filename = browser.getFile();
4951
-			if (filename != null && filename.length() > 0)
4952
-			{
4953
-				String fullname = browser.getDirectory() + filename;
4954
-                                LoadVRMLX3D(fullname);
4955
-			}
4956
-                     /**/
4957
-		}
4958
-	}
4959
-				
4960
5046
 	String GetFile(String dialogName)
4961
5047
 	{
4962
-		if (GrafreeD.standAlone)
5048
+		if (Grafreed.standAlone)
4963
5049
 		{
4964
5050
 			FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4965
5051
 			browser.show();
..
..
@@ -5072,7 +5158,7 @@
5072
5158
 	private MenuItem linkverticesItem;
5073
5159
 	private MenuItem relinkverticesItem;
5074
5160
 	private MenuItem setMasterItem;
5075
-	private MenuItem resetMeshItem;
5161
+	private MenuItem resetAllItem;
5076
5162
 	private MenuItem stepAllItem;
5077
5163
 	private MenuItem revertMeshItem;
5078
5164
 	private MenuItem poseMeshItem;
..
..
@@ -5133,8 +5219,10 @@
5133
5219
 	private MenuItem panoTexturesItem;
5134
5220
         
5135
5221
 	private MenuItem resetCentroidItem;
5136
-	private MenuItem transformgeometryItem;
5222
+	private MenuItem resetCentroidXZItem;
5137
5223
 	private MenuItem resetTransformItem;
5224
+	private MenuItem transformGeometryItem;
5225
+	private MenuItem transformChildrenItem;
5138
5226
 	private MenuItem hideItem;
5139
5227
 	private MenuItem grabItem;
5140
5228
 	private MenuItem backItem;
..
..
@@ -5203,11 +5291,6 @@
5203
5291
 	private MenuItem doubleItem;
5204
5292
 	private MenuItem tripleItem;
5205
5293
         
5206
-	private MenuItem importGFDItem;
5207
-	private MenuItem importVRMLX3DItem;
5208
-	private MenuItem import3DSItem;
5209
-	private MenuItem importOBJItem;
5210
-
5211
5294
 	private MenuItem computeAOItem;
5212
5295
 	private MenuItem recompileItem;
5213
5296
 	private MenuItem editScriptItem;
..
..
@@ -5217,4 +5300,8 @@
5217
5300
 	private MenuItem analyzeItem;
5218
5301
 	private MenuItem dumpItem;
5219
5302
 	//boolean freezemodel = false;
5303
+        
5304
+    Menu cameraMenu;
5305
+    MenuItem editCameraItem;
5306
+    MenuItem revertCameraItem;
5220
5307
 }