Compute shadow when live option.

Normand Briere

2019-06-24 c67da2e5d8655704601d6d06e8bc60aabe212253

 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);
..
..
@@ -148,27 +148,18 @@
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);
157
+                
158
+//		undoItem = menu.add(new MenuItem("Undo"));
159
+//		undoItem.addActionListener(this);
160
+//		redoItem = menu.add(new MenuItem("Redo"));
161
+//		redoItem.addActionListener(this);
162
+//		menu.add("-");
172
163
 		duplicateItem = menu.add(new MenuItem("Duplicate"));
173
164
 		duplicateItem.addActionListener(this);
174
165
 		cloneItem = menu.add(new MenuItem("Clone"));
..
..
@@ -185,7 +176,6 @@
185
176
 		copyItem.addActionListener(this);
186
177
 		pasteItem = menu.add(new MenuItem("Paste"));
187
178
 		pasteItem.addActionListener(this);
188
-		menu.add("-");
189
179
                 
190
180
 		menu.add("-");
191
181
 		pasteIntoItem = menu.add(new MenuItem("Paste into"));
..
..
@@ -206,14 +196,97 @@
206
196
 		clearAllItem = menu.add(new MenuItem("Clear All"));
207
197
 		clearAllItem.addActionListener(this);
208
198
         }
199
+        
200
+        menuBar.add(cameraMenu = new Menu("View"));
201
+        //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
202
+        //zBufferItem.addActionListener(this);
203
+        //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
204
+        //normalLensItem.addActionListener(this);
205
+        cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
206
+        revertCameraItem.addActionListener(this);
207
+        
208
+        cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
209
+        toggleFullScreenItem.addItemListener(this);
210
+        toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
211
+        cameraMenu.add("-");
212
+        
213
+        cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
214
+        toggleTextureItem.addItemListener(this);
215
+        toggleTextureItem.setState(CameraPane.textureon);
216
+        
217
+        cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
218
+        toggleSwitchItem.addItemListener(this);
219
+        toggleSwitchItem.setState(CameraPane.SWITCH);
220
+        
221
+        cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
222
+        toggleHandleItem.addItemListener(this);
223
+        toggleHandleItem.setState(CameraPane.HANDLES);
224
+        
225
+        cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
226
+        togglePaintItem.addItemListener(this);
227
+        togglePaintItem.setState(CameraPane.PAINTMODE);
228
+        
229
+        if (Globals.ADVANCED)
230
+        {
231
+        cameraMenu.add("-");
232
+                cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
233
+                toggleLiveItem.addItemListener(this);
234
+                toggleLiveItem.setState(Globals.isLIVE());
209
235
 
236
+                cameraMenu.add(stepItem = new MenuItem("Step"));
237
+                stepItem.addActionListener(this);
238
+        //		cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
239
+        //		toggleDLItem.addItemListener(this);
240
+        //                toggleDLItem.setState(false);
241
+
242
+                cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
243
+                toggleRenderItem.addItemListener(this);
244
+                toggleRenderItem.setState(!CameraPane.frozen);
245
+
246
+                cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
247
+                toggleDebugItem.addItemListener(this);
248
+                toggleDebugItem.setState(Globals.DEBUG);
249
+
250
+                cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
251
+                toggleFrustumItem.addItemListener(this);
252
+                toggleFrustumItem.setState(CameraPane.FRUSTUM);
253
+
254
+                cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
255
+                toggleFootContactItem.addItemListener(this);
256
+                toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
257
+                
258
+                cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
259
+                toggleTimelineItem.addItemListener(this);
260
+        }
261
+        
262
+//		cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
263
+//		toggleRootItem.addItemListener(this);
264
+//                    toggleRootItem.setState(false);
265
+//		cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
266
+//		animationItem.addItemListener(this);
267
+//                    animationItem.setState(CameraPane.ANIMATION);
268
+        cameraMenu.add("-");
269
+        cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
270
+        editCameraItem.addActionListener(this);
271
+        
272
+        if (Globals.ADVANCED)
273
+        {
274
+		oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
275
+		//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
276
+		//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
277
+		editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
278
+		oe.cameraMenu.add("-");
279
+		openWindowItem =  oe.cameraMenu.add(new MenuItem("Edit copy..."));
280
+		openWindowItem.addActionListener(this);
281
+		editLeafItem.addActionListener(this);
282
+		lookAtItem.addActionListener(this);
283
+		//lookFromItem.addActinoListener(this);
284
+		//switchItem.addActionListener(this);
285
+        }
286
+        
210
287
 		oe.menuBar.add(menu = new Menu("Setting"));
211
288
         if (Globals.ADVANCED)
212
289
         {
213
-                resetMeshItem = menu.add(new MenuItem("Reset All"));
214
-		resetMeshItem.addActionListener(this);
215
-		stepAllItem = menu.add(new MenuItem("Step All"));
216
-		stepAllItem.addActionListener(this);
217
290
 		revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
218
291
 		revertMeshItem.addActionListener(this);
219
292
 		resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..
..
@@ -295,11 +368,11 @@
295
368
 		billboardItem.addActionListener(this);
296
369
 		csgItem = menu.add(new MenuItem("CSG"));
297
370
 		csgItem.addActionListener(this);
298
-                shadowXItem = menu.add(new MenuItem("Shadow X"));
371
+                shadowXItem = menu.add(new MenuItem("Shadow Red"));
299
372
 		shadowXItem.addActionListener(this);
300
-                shadowYItem = menu.add(new MenuItem("Shadow Y"));
373
+                shadowYItem = menu.add(new MenuItem("Shadow Green"));
301
374
 		shadowYItem.addActionListener(this);
302
-                shadowZItem = menu.add(new MenuItem("Shadow Z"));
375
+                shadowZItem = menu.add(new MenuItem("Shadow Blue"));
303
376
 		shadowZItem.addActionListener(this);
304
377
         if (Globals.ADVANCED)
305
378
         {
..
..
@@ -318,8 +391,12 @@
318
391
 		resetTransformItem.addActionListener(this);
319
392
 		resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
320
393
 		resetCentroidItem.addActionListener(this);
321
-		transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
322
-		transformgeometryItem.addActionListener(this);
394
+		resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
395
+		resetCentroidXZItem.addActionListener(this);
396
+		transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
397
+		transformGeometryItem.addActionListener(this);
398
+		transformChildrenItem = menu.add(new MenuItem("Transform Children"));
399
+		transformChildrenItem.addActionListener(this);
323
400
                 
324
401
 		oe.menuBar.add(menu = new Menu("Geometry"));
325
402
 		genUVItem = menu.add(new MenuItem("Generate UV"));
..
..
@@ -368,6 +445,10 @@
368
445
                 oe.menuBar.add(menu = new Menu("Attributes"));
369
446
 		clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
370
447
 		clearMaterialsItem.addActionListener(this);
448
+                resetAllItem = menu.add(new MenuItem("Reset All"));
449
+		resetAllItem.addActionListener(this);
450
+		stepAllItem = menu.add(new MenuItem("Step All"));
451
+		stepAllItem.addActionListener(this);
371
452
 		menu.add("-");
372
453
 		liveleavesItem = menu.add(new MenuItem("Live Leaves"));
373
454
 		liveleavesItem.addActionListener(this);
..
..
@@ -388,6 +469,14 @@
388
469
 		markleavesItem.addActionListener(this);
389
470
 		unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
390
471
 		unmarkleavesItem.addActionListener(this);
472
+		rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
473
+		rewindleavesItem.addActionListener(this);
474
+		unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
475
+		unrewindleavesItem.addActionListener(this);
476
+		randomleavesItem = menu.add(new MenuItem("Random Leaves"));
477
+		randomleavesItem.addActionListener(this);
478
+		unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
479
+		unrandomleavesItem.addActionListener(this);
391
480
 		menu.add("-");
392
481
 		flipVItem = menu.add(new MenuItem("Flip V"));
393
482
 		flipVItem.addActionListener(this);
..
..
@@ -422,41 +511,41 @@
422
511
 		sortbysizeItem.addActionListener(this);
423
512
 		sortbynameItem = menu.add(new MenuItem("Sort by name"));
424
513
 		sortbynameItem.addActionListener(this);
514
+		menu.add("-");
515
+		shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
516
+		shareGeometriesItem.addActionListener(this);
517
+		mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
518
+		mergeGeometriesItem.addActionListener(this);
425
519
         if (Globals.ADVANCED)
426
520
         {
427
-		menu.add("-");
521
+            // Pretty much the same as duplicate and clone.
428
522
 		extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
429
523
 		extractGeometriesItem.addActionListener(this);
430
524
 		cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
431
525
 		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
526
         }
437
527
                 
438
528
 		oe.menuBar.add(menu = new Menu("Insert"));
439
529
 		buildCreateMenu(menu);
440
530
                 
441
-                oe.menuBar.add(menu = new Menu("Include"));
442
-		importOBJItem = menu.add(new MenuItem("OBJ file..."));
443
-		importOBJItem.addActionListener(this);
444
-		menu.add("-");
445
-		import3DSItem = menu.add(new MenuItem("3DS file..."));
446
-		import3DSItem.addActionListener(this);
447
-		menu.add("-");
448
-		importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
449
-		importVRMLX3DItem.addActionListener(this);
450
-		menu.add("-");
451
-		importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
452
-		importGFDItem.addActionListener(this);
453
-
454
531
                 oe.menuBar.add(menu = new Menu("Tools"));
455
532
 		buildToolsMenu(menu);
456
533
 	}
457
534
 	
458
535
 	void SetupUI2(ObjEditor oe)
459
536
 	{
537
+            // June 2019
538
+            if (oe == null)
539
+            {
540
+                //super.SetupUI2(this);
541
+                //return;
542
+            }
543
+            
544
+            if (copy != group)
545
+            {
546
+                //super.SetupUI2(this);
547
+            }
548
+            
460
549
             //new Exception().printStackTrace();
461
550
                 
462
551
         oe.radioPanel = new JPanel(new GridBagLayout());
..
..
@@ -487,11 +576,35 @@
487
576
          */
488
577
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
489
578
                 
579
+		//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
580
+                //minButton.setToolTipText("Minimize window");
581
+		//minButton.addActionListener(this);
582
+                
583
+		oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
584
+                maxButton.setToolTipText("Maximize window");
585
+		maxButton.addActionListener(this);
586
+                
587
+		oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
588
+                fullButton.setToolTipText("Full-screen window");
589
+		fullButton.addActionListener(this);
590
+                
591
+		oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
592
+                undoButton.setToolTipText("Undo changes");
593
+		undoButton.addActionListener(this);
594
+                
595
+		oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596
+                redoButton.setToolTipText("Redo changes");
597
+		redoButton.addActionListener(this);
598
+                
599
+		oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600
+                saveButton.setToolTipText("Save changes");
601
+		saveButton.addActionListener(this);
602
+                
490
603
                 oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
491
-                liveCB.setToolTipText("Enabled animation");
604
+                liveCB.setToolTipText("Enable animation");
492
605
                                 liveCB.addItemListener(this);
493
606
 
494
-		oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
607
+		oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
495
608
                 oneStepButton.setToolTipText("Animate one step forward");
496
609
 		oneStepButton.addActionListener(this);
497
610
                 
..
..
@@ -499,7 +612,7 @@
499
612
                 fastCB.setToolTipText("Fast mode");
500
613
                                 fastCB.addItemListener(this);
501
614
                                 
502
-                oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
615
+                oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
503
616
                 trackCB.setToolTipText("Enable tracking");
504
617
                                 trackCB.addItemListener(this);
505
618
 
..
..
@@ -523,19 +636,19 @@
523
636
                 
524
637
 		oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
525
638
                 
526
-		oe.toolbarPanel.add(twoButton = new cButton("|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
639
+		oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
527
640
                 twoButton.setToolTipText("Show center view only");
528
641
 		twoButton.addActionListener(this);
529
-		oe.toolbarPanel.add(fourButton = new cButton("+||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
642
+		oe.toolbarPanel.add(fourButton = new cButton("-||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
530
643
 		fourButton.addActionListener(this);
531
644
                 fourButton.setToolTipText("Show left panel only");
532
-		oe.toolbarPanel.add(sixButton = new cButton("+|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
645
+		oe.toolbarPanel.add(sixButton = new cButton("-|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
533
646
                 sixButton.setToolTipText("2-column layout left");
534
647
 		sixButton.addActionListener(this);
535
-		oe.toolbarPanel.add(threeButton = new cButton("|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
648
+		oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
536
649
                 threeButton.setToolTipText("2-column layout right");
537
650
 		threeButton.addActionListener(this);
538
-		oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
651
+		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
539
652
                 sevenButton.setToolTipText("3-column layout");
540
653
 		sevenButton.addActionListener(this);
541
654
                 //
..
..
@@ -550,32 +663,30 @@
550
663
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
551
664
 		//clearButton.addActionListener(this);
552
665
                         
553
-                cGridBag commandsPanel = new cGridBag();
554
-                
555
-		commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
666
+		editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
556
667
                 editButton.setToolTipText("Edit selection");
557
668
 		editButton.addActionListener(this);
558
669
 
559
-		commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
670
+		editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
560
671
                 uneditButton.setToolTipText("Unedit selection");
561
672
 		uneditButton.addActionListener(this);
562
673
 
563
-		commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
674
+		editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
564
675
                 allParamsButton.setToolTipText("Edit all params");
565
676
 		allParamsButton.addActionListener(this);
566
677
 
567
-		commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
678
+		editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
568
679
                 clearPanelButton.setToolTipText("Clear edit panel");
569
680
 		clearPanelButton.addActionListener(this);
570
681
 
571
-		commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682
+		editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
572
683
                 unselectButton.setToolTipText("Unselect");
573
684
 		unselectButton.addActionListener(this);
574
685
 
575
-                commandsPanel.preferredHeight = 1;
686
+                editCommandsPanel.preferredHeight = 1;
576
687
                 
577
-                oe.treePanel.add(commandsPanel);
578
-                oe.treePanel.Return();
688
+//                oe.treePanel.add(commandsPanel);
689
+//                oe.treePanel.Return();
579
690
                 
580
691
 //		oe.aConstraints.gridx += 1;
581
692
 //		oe.aConstraints.weighty = 0;
..
..
@@ -651,7 +762,7 @@
651
762
                 zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
652
763
                                 zoomBoxCB.addItemListener(this);
653
764
 
654
-        if (Globals.ADVANCED)
765
+        if (true) // Globals.ADVANCED)
655
766
         {
656
767
                 panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
657
768
                 supportCB.setToolTipText("Enable rigging");
..
..
@@ -697,11 +808,19 @@
697
808
 //                debugCB.addItemListener(this);
698
809
 
699
810
                 panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
811
+                oeilCB.setToolTipText("Move camera when tracking target");
700
812
                                 oeilCB.addItemListener(this);
701
813
 
814
+                panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
815
+                shadowCB.setToolTipText("Compute shadows when live");
816
+                                shadowCB.addItemListener(this);
817
+
818
+            if (Globals.ADVANCED)
819
+            {
702
820
                 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
703
821
                 lookAtCB.setToolTipText("Look-at target");
704
822
                                 lookAtCB.addItemListener(this);
823
+            }
705
824
                 
706
825
         }
707
826
                                 
..
..
@@ -716,6 +835,14 @@
716
835
         void EditObject(Object3D obj)
717
836
         {
718
837
             cRadio radioButton = new cRadio(obj.name);
838
+            
839
+            // Patch to avoid bug with transparency.
840
+            radioButton.hadMaterial = obj.material != null;
841
+            if (!radioButton.hadMaterial)
842
+            {
843
+                obj.material = new cMaterial();
844
+            }
845
+            
719
846
             radioButton.SetObject(obj);
720
847
             radioButton.layout = sevenButton;
721
848
             radioButton.SetCamera(cameraView.renderCamera, false);
..
..
@@ -724,8 +851,11 @@
724
851
             buttonGroup.add(radioButton);
725
852
             radioButton.doClick();
726
853
         }
854
+        
727
855
         void SetupViews(ObjEditor oe)
728
856
         {
857
+                    theFrame = this;
858
+                    
729
859
             oe.SetupViews();
730
860
             
731
861
 		System.out.println("SetupViews");
..
..
@@ -749,7 +879,9 @@
749
879
         JCheckBox speakerCameraCB;
750
880
         JCheckBox speakerFocusCB;
751
881
         JCheckBox debugCB;
882
+        
752
883
         JCheckBox oeilCB;
884
+        JCheckBox shadowCB;
753
885
         JCheckBox lookAtCB;
754
886
         
755
887
 //        static int COLOR = 1;
..
..
@@ -788,6 +920,7 @@
788
920
             } else if(e.getSource() == liveCB)
789
921
             {
790
922
                 cameraView.ToggleLive();
923
+                refreshContents(false);
791
924
             }
792
925
             else if(e.getSource() == supportCB)
793
926
             {
..
..
@@ -851,6 +984,10 @@
851
984
             else if(e.getSource() == oeilCB)
852
985
             {
853
986
                 cameraView.ToggleOeil();
987
+            }
988
+            else if(e.getSource() == shadowCB)
989
+            {
990
+                Globals.COMPUTESHADOWWHENLIVE ^= true;
854
991
             }
855
992
             else if(e.getSource() == lookAtCB)
856
993
             {
..
..
@@ -1195,7 +1332,7 @@
1195
1332
 		memoryItem.addActionListener(this);
1196
1333
 		menu.add(analyzeItem = new MenuItem("Analyze"));
1197
1334
 		analyzeItem.addActionListener(this);
1198
-		menu.add(dumpItem = new MenuItem("Dump"));
1335
+		menu.add(dumpItem = new MenuItem("Print"));
1199
1336
 		dumpItem.addActionListener(this);
1200
1337
 //		menu.add(pathItem = new MenuItem("From-to path"));
1201
1338
 //		pathItem.addActionListener(this);
..
..
@@ -1336,6 +1473,7 @@
1336
1473
             shadow.material = new cMaterial(obj.material);
1337
1474
             shadow.material.diffuse = 0.0001f;
1338
1475
             shadow.material.specular = 0.0001f;
1476
+            //shadow.projectedVertices[1].x = 300;
1339
1477
             
1340
1478
             makeSomething(shadow);
1341
1479
         }
..
..
@@ -1849,31 +1987,6 @@
1849
1987
                         csg.addChild(child);
1850
1988
                         child.addChild(csg);
1851
1989
 		} else
1852
-                    
1853
-		if (source == importGFDItem)
1854
-		{
1855
-			ImportGFD();
1856
-		} else
1857
-		if (source == importVRMLX3DItem)
1858
-		{
1859
-			ImportVRMLX3D();
1860
-		} else
1861
-		if (source == import3DSItem)
1862
-		{
1863
-			objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1864
-		} else
1865
-		if (source == importOBJItem)
1866
-		{
1867
-			//objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1868
-                            FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1869
-                            browser.setVisible(true);
1870
-                            String filename = browser.getFile();
1871
-                            if (filename != null && filename.length() > 0)
1872
-                            {
1873
-                                String fullname = browser.getDirectory() + filename;
1874
-                                makeSomething(ReadOBJ(fullname), true);
1875
-                            }
1876
-		} else
1877
1990
 		if (source == computeAOItem)
1878
1991
 		{
1879
1992
                     Globals.drawMode = CameraPane.OCCLUSION;
..
..
@@ -1910,6 +2023,30 @@
1910
2023
 		if (source == dumpItem)
1911
2024
 		{
1912
2025
                     DumpObject();
2026
+		} else
2027
+		if (source == minButton)
2028
+		{
2029
+			Minimize();
2030
+		} else
2031
+		if (source == maxButton)
2032
+		{
2033
+			Maximize();
2034
+		} else
2035
+		if (source == fullButton)
2036
+		{
2037
+			ToggleFullScreen();
2038
+		} else
2039
+		if (source == undoButton)
2040
+		{
2041
+			Undo();
2042
+		} else
2043
+		if (source == redoButton)
2044
+		{
2045
+			Redo();
2046
+		} else
2047
+		if (source == saveButton)
2048
+		{
2049
+			Save();
1913
2050
 		} else
1914
2051
 		if (source == oneStepButton)
1915
2052
 		{
..
..
@@ -1964,6 +2101,14 @@
1964
2101
 		if (source == cutItem || source == clearButton)
1965
2102
 		{
1966
2103
 			loadClipboard(true);
2104
+		} else
2105
+		if (source == undoItem)
2106
+		{
2107
+			Undo();
2108
+		} else
2109
+		if (source == redoItem)
2110
+		{
2111
+			Redo();
1967
2112
 		} else
1968
2113
 		if (source == duplicateItem)
1969
2114
 		{
..
..
@@ -2276,7 +2421,7 @@
2276
2421
 		{
2277
2422
 			RevertMeshes();
2278
2423
 		} else
2279
-		if (source == resetMeshItem)
2424
+		if (source == resetAllItem)
2280
2425
 		{
2281
2426
 			ResetAll();
2282
2427
 		} else
..
..
@@ -2464,7 +2609,7 @@
2464
2609
 		} else
2465
2610
 		if (source == genNormalsMESHItem)
2466
2611
                 {
2467
-			GenNormals(true); // TODO
2612
+			GenNormalsMESH();
2468
2613
 		} else
2469
2614
 		if (source == genNormalsORGANItem)
2470
2615
                 {
..
..
@@ -2529,6 +2674,22 @@
2529
2674
 		if (source == unmarkleavesItem)
2530
2675
                 {
2531
2676
 			MarkLeaves(false);
2677
+		} else
2678
+		if (source == rewindleavesItem)
2679
+                {
2680
+			RewindLeaves(true);
2681
+		} else
2682
+		if (source == unrewindleavesItem)
2683
+                {
2684
+			RewindLeaves(false);
2685
+		} else
2686
+		if (source == randomleavesItem)
2687
+                {
2688
+			RandomLeaves(true);
2689
+		} else
2690
+		if (source == unrandomleavesItem)
2691
+                {
2692
+			RandomLeaves(false);
2532
2693
 		} else
2533
2694
 		if (source == flipVItem)
2534
2695
                 {
..
..
@@ -2614,9 +2775,13 @@
2614
2775
                 {
2615
2776
 			SmoothMesh();
2616
2777
 		} else
2617
-		if (source == transformgeometryItem)
2778
+		if (source == transformGeometryItem)
2618
2779
 		{
2619
2780
                         TransformGeometry();
2781
+		} else
2782
+		if (source == transformChildrenItem)
2783
+		{
2784
+                        TransformChildren();
2620
2785
 		} else
2621
2786
 		if (source == resetTransformItem)
2622
2787
 		{
..
..
@@ -2624,7 +2789,11 @@
2624
2789
 		} else
2625
2790
 		if (source == resetCentroidItem)
2626
2791
 		{
2627
-                        ResetCentroid();
2792
+                        ResetCentroid(true);
2793
+		} else
2794
+		if (source == resetCentroidXZItem)
2795
+		{
2796
+                        ResetCentroid(false);
2628
2797
 		} else
2629
2798
 		if (source == resetParentItem)
2630
2799
 		{
..
..
@@ -2788,6 +2957,24 @@
2788
2957
                     bigThree.ClearUI();
2789
2958
                     bigThree.add(centralPanel);
2790
2959
                     bigThree.FlushUI();
2960
+                    
2961
+                    cameraView.requestFocusInWindow();
2962
+                    
2963
+//                    refreshContents(true);
2964
+//                    
2965
+//                    try
2966
+//                    {
2967
+//                        java.awt.Robot bot = new java.awt.Robot();
2968
+//                        int mask = InputEvent.BUTTON1_MASK;
2969
+//                        bot.mouseMove(100, 100);           
2970
+//                        bot.mousePress(mask);     
2971
+//                        bot.mouseRelease(mask);                    
2972
+//                    }
2973
+//                    catch (Exception e)
2974
+//                    {
2975
+//                        
2976
+//                    }
2977
+                    
2791
2978
                 } else
2792
2979
 		if (source == threeButton)
2793
2980
 		{
..
..
@@ -2824,6 +3011,8 @@
2824
3011
                     bigThree.add(centralPanel);
2825
3012
                     bigThree.add(XYZPanel);
2826
3013
                     bigThree.FlushUI();
3014
+                    
3015
+                    cameraView.requestFocusInWindow();
2827
3016
                 } else
2828
3017
 		if (source == fourButton)
2829
3018
 		{
..
..
@@ -2859,6 +3048,8 @@
2859
3048
                     bigThree.ClearUI();
2860
3049
                     bigThree.add(scenePanel);
2861
3050
                     bigThree.FlushUI();
3051
+                    
3052
+                    cameraView.requestFocusInWindow();
2862
3053
                 } else
2863
3054
 		if (source == sixButton)
2864
3055
 		{
..
..
@@ -2895,6 +3086,8 @@
2895
3086
                     bigThree.add(scenePanel);
2896
3087
                     bigThree.add(centralPanel);
2897
3088
                     bigThree.FlushUI();
3089
+                    
3090
+                    cameraView.requestFocusInWindow();
2898
3091
                 } else
2899
3092
 		if (source == sevenButton)
2900
3093
 		{
..
..
@@ -2932,6 +3125,8 @@
2932
3125
                     bigThree.add(centralPanel);
2933
3126
                     bigThree.add(XYZPanel);
2934
3127
                     bigThree.FlushUI();
3128
+                    
3129
+                    cameraView.requestFocusInWindow();
2935
3130
                 } else
2936
3131
 		if (source == rootButton)
2937
3132
 		{
..
..
@@ -2943,6 +3138,7 @@
2943
3138
                                 EditObject(obj);
2944
3139
                     }
2945
3140
 
3141
+                    cameraView.requestFocusInWindow();
2946
3142
                     refreshContents(true);
2947
3143
 		} else
2948
3144
 		if (source == closeButton)
..
..
@@ -2952,8 +3148,14 @@
2952
3148
                     for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2953
3149
                     {
2954
3150
                             ab = (cRadio)e.nextElement();
2955
-                            if(ab.getModel().isSelected() && ab.GetObject() != client)
3151
+                            if (ab.getModel().isSelected() && ab.GetObject() != client)
2956
3152
                             {
3153
+                                // Patch to avoid bug with transparency.
3154
+                                if (!ab.hadMaterial)
3155
+                                {
3156
+                                    ab.object.material = null;
3157
+                                }
3158
+                                
2957
3159
                                 buttonGroup.remove(ab);
2958
3160
                                 radioPanel.remove(ab);
2959
3161
                                 
..
..
@@ -2964,6 +3166,8 @@
2964
3166
                                 break;
2965
3167
                             }
2966
3168
                     }
3169
+                    
3170
+                    cameraView.requestFocusInWindow();
2967
3171
                     refreshContents(true);
2968
3172
 		} else
2969
3173
 		if (source == editItem || source == editButton)
..
..
@@ -2980,7 +3184,7 @@
2980
3184
 				child.CloseUI();
2981
3185
                                 listUI.remove(child);
2982
3186
                                 
2983
-                                child.editWindow = null; // ???????????
3187
+                                //child.editWindow = null; // ???????????
2984
3188
 			}
2985
3189
 			objEditor.ctrlPanel.FlushUI();
2986
3190
 			//objEditor.jTree.clearSelection();
..
..
@@ -3066,7 +3270,10 @@
3066
3270
                         frontView.object = group;
3067
3271
                         sideView.object = group;
3068
3272
                     }
3069
-                    group.editWindow = this;
3273
+                    
3274
+// fix "+" issue
3275
+                    //group.editWindow = this;
3276
+                    
3070
3277
                     /*
3071
3278
                     currentLayout = radio.layout;
3072
3279
                     if (currentLayout == null)
..
..
@@ -3078,8 +3285,23 @@
3078
3285
                     //group.parent = null; // ROOT
3079
3286
                     //group.attributes = -1;
3080
3287
                     ResetModel();
3288
+                    
3289
+                    cameraView.requestFocusInWindow();
3081
3290
                     refreshContents(true);
3082
-                }
3291
+                } else if (event.getSource() == editCameraItem)
3292
+                {
3293
+                    cameraView.ProtectCamera();
3294
+                    cameraView.repaint();
3295
+                    return;
3296
+                } else if (event.getSource() == revertCameraItem)
3297
+                {
3298
+                    cameraView.RevertCamera();
3299
+                    cameraView.repaint();
3300
+                    return;
3301
+        //        } else if (event.getSource() == textureButton)
3302
+        //        {
3303
+        //            return; // true;
3304
+                } 
3083
3305
                 else
3084
3306
                 {
3085
3307
 			//return super.action(event, arg);
..
..
@@ -3088,7 +3310,6 @@
3088
3310
 	}
3089
3311
         
3090
3312
         boolean useclient = false;
3091
-        cRadio radio;
3092
3313
         
3093
3314
         void ToggleRoot()
3094
3315
         {
..
..
@@ -3140,6 +3361,28 @@
3140
3361
             refreshContents();
3141
3362
         }
3142
3363
         
3364
+        void TransformChildren()
3365
+        {
3366
+            Object3D obj;
3367
+            for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3368
+            {
3369
+                    obj = (Object3D)e.nextElement();
3370
+                    obj.KeepTextureMatrices();
3371
+                    obj.TransformChildren();
3372
+                    obj.RestoreTextureMatrices();
3373
+                                        
3374
+//                    if (obj.parent == null)
3375
+//                    {
3376
+//                        System.out.println("NULL PARENT!");
3377
+//                        new Exception().printStackTrace();
3378
+//                    }
3379
+//                    else
3380
+//                        TouchTransform(obj);
3381
+//                        //obj.parent.Touch();
3382
+            }
3383
+
3384
+            refreshContents();
3385
+        }
3143
3386
         
3144
3387
         void ResetTransform()
3145
3388
         {
..
..
@@ -3252,7 +3495,7 @@
3252
3495
             refreshContents();
3253
3496
         }
3254
3497
         
3255
-        void ResetCentroid()
3498
+        void ResetCentroid(boolean full)
3256
3499
         {
3257
3500
             Object3D obj;
3258
3501
             for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..
..
@@ -3267,12 +3510,16 @@
3267
3510
                     LA.matIdentity(Object3D.mat);
3268
3511
                     obj.getBounds(minima, maxima, false);
3269
3512
                     Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3270
-                    Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3513
+                    if (full)
3514
+                        Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3271
3515
                     Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3272
3516
                     obj.TransformMesh(Object3D.mat);
3517
+                    
3273
3518
                     Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3274
-                    Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3519
+                    if (full)
3520
+                        Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3275
3521
                     Object3D.mat[3][2] = (minima.z + maxima.z)/2;
3522
+                    
3276
3523
                     LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3277
3524
                     //Object3D.mat[3][0] = -Object3D.mat[3][0];
3278
3525
                     //Object3D.mat[3][1] = -Object3D.mat[3][1];
..
..
@@ -3301,7 +3548,8 @@
3301
3548
                     
3302
3549
                     int size = obj.MemorySize();
3303
3550
                     
3304
-                    System.err.println((size/1024) + " KB is the size of " + obj);
3551
+                    //System.err.println((size/1024) + " KB is the size of " + obj);
3552
+                    System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3305
3553
                 }
3306
3554
             }
3307
3555
             catch (Exception e)
..
..
@@ -3382,6 +3630,13 @@
3382
3630
 	void GenNormals(boolean crease)
3383
3631
 	{
3384
3632
 		group.GenNormalsS(crease);
3633
+		
3634
+		refreshContents();
3635
+	}
3636
+	
3637
+	void GenNormalsMESH()
3638
+	{
3639
+		group.GenNormalsMeshS();
3385
3640
 		
3386
3641
 		refreshContents();
3387
3642
 	}
..
..
@@ -3613,7 +3868,16 @@
3613
3868
                             String pigment = Object3D.GetPigment(tex);
3614
3869
                             //String bump = Object3D.GetBump(tex);
3615
3870
                             
3616
-                            com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3871
+                            com.sun.opengl.util.texture.TextureData texturedata = null;
3872
+                            
3873
+                            try
3874
+                            {
3875
+                                texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3876
+                            }
3877
+                            catch (Exception e)
3878
+                            {
3879
+                                System.err.println("FAIL: " + node);
3880
+                            }
3617
3881
                             
3618
3882
                             double s = v.s;
3619
3883
                             
..
..
@@ -4000,6 +4264,18 @@
4000
4264
 		refreshContents();
4001
4265
 	}
4002
4266
 	
4267
+	void RewindLeaves(boolean hide)
4268
+	{
4269
+		group.selection.RewindLeaves(hide);
4270
+		refreshContents();
4271
+	}
4272
+	
4273
+	void RandomLeaves(boolean hide)
4274
+	{
4275
+		group.selection.RandomLeaves(hide);
4276
+		refreshContents();
4277
+	}
4278
+	
4003
4279
 	void SetTexRes(int tr)
4004
4280
 	{
4005
4281
 		group.selection.SetTexRes(tr);
..
..
@@ -4085,7 +4361,7 @@
4085
4361
                     objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4086
4362
                     
4087
4363
 			Object3D elem = (Object3D)group.selection.elementAt(i);
4088
-                        if(elem != group)
4364
+                        if(elem != group || !newWindow)
4089
4365
                         {
4090
4366
                         //    if (!(elem instanceof Composite))
4091
4367
                         //        newWindow = false;
..
..
@@ -4175,7 +4451,6 @@
4175
4451
 			//case 702: // Event.LIST_DESELECT
4176
4452
 			group.deselectAll();
4177
4453
 			TreePath tps[] = objEditor.jTree.getSelectionPaths();
4178
-			objEditor.ClearInfo(); // .GetMaterial());
4179
4454
 			if (tps != null)
4180
4455
 			{
4181
4456
 				for (int i=0; i < tps.length; i++)
..
..
@@ -4184,10 +4459,8 @@
4184
4459
 					
4185
4460
 					//if (child.parent != null)
4186
4461
 						//child.parent.addSelectee(child);
4462
+                    objEditor.SetMaterial(child);
4187
4463
 					group.addSelectee(child);
4188
-					objEditor.SetMaterial(child); // .GetMaterial());
4189
-					objEditor.AddInfo(child, this, true); // .GetMaterial());
4190
-            System.err.println("info : " + child.GetPath());
4191
4464
 				}
4192
4465
 			}
4193
4466
 //			else
..
..
@@ -4197,16 +4470,17 @@
4197
4470
 //            System.err.println("info : " + group.GetPath());
4198
4471
 //                        }
4199
4472
 			
4200
-                        objEditor.SetText(); // jan 2014
4201
-                        
4202
-			if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
4473
+			if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4203
4474
 				CameraPane.flash = true;
4204
4475
                         
4205
-			if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
4476
+			if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4206
4477
                             // a camera
4207
4478
                         {
4208
-                            CameraPane.camerachangeframe = 0; // don't refuse it
4209
-                            Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4479
+                            if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
4480
+                            {
4481
+                                CameraPane.camerachangeframe = 0; // don't refuse it
4482
+                                Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4483
+                            }
4210
4484
                          //   Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4211
4485
                          //   Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4212
4486
                         }
..
..
@@ -4219,6 +4493,26 @@
4219
4493
 		
4220
4494
 		freezemodel = false;
4221
4495
 	}
4496
+        
4497
+        void refreshContents(boolean cp)
4498
+        {
4499
+            if (!Globals.MOUSEDRAGGED)
4500
+            {
4501
+                objEditor.ClearInfo(); // .GetMaterial());
4502
+
4503
+                for (int i=0; i < group.selection.Size(); i++)
4504
+                {
4505
+                    Object3D child = (Object3D) group.selection.get(i);
4506
+
4507
+                    objEditor.AddInfo(child, this, true);
4508
+    System.err.println("info : " + child.GetPath());
4509
+                }
4510
+
4511
+                objEditor.SetText(); // jan 2014
4512
+            }
4513
+                        
4514
+            super.refreshContents(cp);
4515
+        }
4222
4516
 	
4223
4517
 	void linkSomething(Object3D thing)
4224
4518
 	{
..
..
@@ -4290,6 +4584,7 @@
4290
4584
 	{
4291
4585
 		if (group.selection.isEmpty())
4292
4586
 			return;
4587
+                
4293
4588
 		Grafreed.clipboardIsTempGroup = false;
4294
4589
 		Composite tGroup = null;
4295
4590
 		if (group.selection.size() > 0) // 1)
..
..
@@ -4300,6 +4595,7 @@
4300
4595
                 
4301
4596
 		if (cut)
4302
4597
 		{
4598
+                    Save();
4303
4599
 			//int indices[] = jList.getSelectedIndices();
4304
4600
 			//for (int i = indices.length - 1; i >= 0; i--)
4305
4601
 			//jList.remove(indices[i]);
..
..
@@ -4389,8 +4685,10 @@
4389
4685
 			}
4390
4686
 			
4391
4687
 		}
4688
+                
4392
4689
 		if (Grafreed.clipboardIsTempGroup)
4393
4690
 			Grafreed.clipboard = tGroup;
4691
+                
4394
4692
 		if (cut)
4395
4693
                 {
4396
4694
                     ResetModel();
..
..
@@ -4922,21 +5220,6 @@
4922
5220
         }
4923
5221
          */
4924
5222
 
4925
-        void ImportGFD()
4926
-        {
4927
-            FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4928
-            browser.show();
4929
-            String filename = browser.getFile();
4930
-            if (filename != null && filename.length() > 0)
4931
-            {
4932
-                String fullname = browser.getDirectory() + filename;
4933
-
4934
-                //Object3D readobj =
4935
-                        objEditor.ReadGFD(fullname, objEditor);
4936
-                //makeSomething(readobj);
4937
-            }
4938
-        }
4939
-        
4940
5223
         /*
4941
5224
         public void Callback(Object obj)
4942
5225
         {
..
..
@@ -4960,23 +5243,6 @@
4960
5243
         }
4961
5244
          */
4962
5245
 
4963
-	void ImportVRMLX3D()
4964
-	{
4965
-		if (Grafreed.standAlone)
4966
-		{
4967
-                    /**/
4968
-			FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4969
-			browser.show();
4970
-			String filename = browser.getFile();
4971
-			if (filename != null && filename.length() > 0)
4972
-			{
4973
-				String fullname = browser.getDirectory() + filename;
4974
-                                LoadVRMLX3D(fullname);
4975
-			}
4976
-                     /**/
4977
-		}
4978
-	}
4979
-				
4980
5246
 	String GetFile(String dialogName)
4981
5247
 	{
4982
5248
 		if (Grafreed.standAlone)
..
..
@@ -5047,6 +5313,12 @@
5047
5313
 	cButton clearpanelButton;
5048
5314
 	cButton unselectButton;
5049
5315
 	
5316
+	cButton minButton;
5317
+	cButton maxButton;
5318
+	cButton fullButton;
5319
+	cButton undoButton;
5320
+	cButton redoButton;
5321
+	cButton saveButton;
5050
5322
 	cButton oneStepButton;
5051
5323
         
5052
5324
 	cButton screenfitButton;
..
..
@@ -5060,14 +5332,6 @@
5060
5332
 
5061
5333
 	cButton setsupportButton;
5062
5334
         
5063
-	cButton twoButton;
5064
-	cButton sixButton;
5065
-	cButton threeButton;
5066
-	cButton sevenButton;
5067
-	cButton fourButton; // full panel
5068
-	cButton oneButton; // full XYZ
5069
-        //cButton currentLayout;
5070
-        
5071
5335
 	//
5072
5336
         //Composite
5073
5337
         Object3D // to do !!
..
..
@@ -5079,6 +5343,8 @@
5079
5343
 	private MenuItem lookFromItem;
5080
5344
 	private MenuItem switchItem;
5081
5345
 	private MenuItem cutItem;
5346
+	private MenuItem undoItem;
5347
+	private MenuItem redoItem;
5082
5348
 	private MenuItem duplicateItem;
5083
5349
 	private MenuItem cloneItem;
5084
5350
 	private MenuItem cloneSupportItem;
..
..
@@ -5092,7 +5358,7 @@
5092
5358
 	private MenuItem linkverticesItem;
5093
5359
 	private MenuItem relinkverticesItem;
5094
5360
 	private MenuItem setMasterItem;
5095
-	private MenuItem resetMeshItem;
5361
+	private MenuItem resetAllItem;
5096
5362
 	private MenuItem stepAllItem;
5097
5363
 	private MenuItem revertMeshItem;
5098
5364
 	private MenuItem poseMeshItem;
..
..
@@ -5142,6 +5408,10 @@
5142
5408
 	private MenuItem showleavesItem;
5143
5409
 	private MenuItem markleavesItem;
5144
5410
 	private MenuItem unmarkleavesItem;
5411
+	private MenuItem rewindleavesItem;
5412
+	private MenuItem unrewindleavesItem;
5413
+	private MenuItem randomleavesItem;
5414
+	private MenuItem unrandomleavesItem;
5145
5415
         
5146
5416
 	private MenuItem flipVItem;
5147
5417
 	private MenuItem unflipVItem;
..
..
@@ -5153,8 +5423,10 @@
5153
5423
 	private MenuItem panoTexturesItem;
5154
5424
         
5155
5425
 	private MenuItem resetCentroidItem;
5156
-	private MenuItem transformgeometryItem;
5426
+	private MenuItem resetCentroidXZItem;
5157
5427
 	private MenuItem resetTransformItem;
5428
+	private MenuItem transformGeometryItem;
5429
+	private MenuItem transformChildrenItem;
5158
5430
 	private MenuItem hideItem;
5159
5431
 	private MenuItem grabItem;
5160
5432
 	private MenuItem backItem;
..
..
@@ -5223,11 +5495,6 @@
5223
5495
 	private MenuItem doubleItem;
5224
5496
 	private MenuItem tripleItem;
5225
5497
         
5226
-	private MenuItem importGFDItem;
5227
-	private MenuItem importVRMLX3DItem;
5228
-	private MenuItem import3DSItem;
5229
-	private MenuItem importOBJItem;
5230
-
5231
5498
 	private MenuItem computeAOItem;
5232
5499
 	private MenuItem recompileItem;
5233
5500
 	private MenuItem editScriptItem;
..
..
@@ -5237,4 +5504,8 @@
5237
5504
 	private MenuItem analyzeItem;
5238
5505
 	private MenuItem dumpItem;
5239
5506
 	//boolean freezemodel = false;
5507
+        
5508
+    Menu cameraMenu;
5509
+    MenuItem editCameraItem;
5510
+    MenuItem revertCameraItem;
5240
5511
 }