More tools.

Normand Briere

2019-06-25 d2f456cf5280f59425084532bd2397ec625f7577

 GroupEditor.java
..
..
@@ -150,6 +150,8 @@
150
150
     
151
151
 	void SetupMenu2(GroupEditor oe)
152
152
 	{
153
+                oe.jTree = new cTree();
154
+
153
155
 		Menu menu;
154
156
 		oe.menuBar.add(menu = new Menu("Edit"));
155
157
 		//editItem = menu.add(new MenuItem("Edit"));
..
..
@@ -160,7 +162,7 @@
160
162
 //		redoItem = menu.add(new MenuItem("Redo"));
161
163
 //		redoItem.addActionListener(this);
162
164
 //		menu.add("-");
163
-		duplicateItem = menu.add(new MenuItem("Duplicate"));
165
+		duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164
166
 		duplicateItem.addActionListener(this);
165
167
 		cloneItem = menu.add(new MenuItem("Clone"));
166
168
 		cloneItem.addActionListener(this);
..
..
@@ -202,21 +204,21 @@
202
204
         //zBufferItem.addActionListener(this);
203
205
         //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
204
206
         //normalLensItem.addActionListener(this);
205
-        cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
206
-        revertCameraItem.addActionListener(this);
207
+        cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
208
+        restoreCameraItem.addActionListener(this);
207
209
         
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);
210
+//        cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
211
+//        toggleFullScreenItem.addItemListener(this);
212
+//        toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
213
+//        cameraMenu.add("-");
214
+//        
215
+//        cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
216
+//        toggleTextureItem.addItemListener(this);
217
+//        toggleTextureItem.setState(CameraPane.textureon);
218
+//        
219
+//        cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
220
+//        toggleSwitchItem.addItemListener(this);
221
+//        toggleSwitchItem.setState(CameraPane.SWITCH);
220
222
         
221
223
         cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
222
224
         toggleHandleItem.addItemListener(this);
..
..
@@ -273,7 +275,7 @@
273
275
         {
274
276
 		oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
275
277
 		//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
276
-		//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
278
+		//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
277
279
 		editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
278
280
 		oe.cameraMenu.add("-");
279
281
 		openWindowItem =  oe.cameraMenu.add(new MenuItem("Edit copy..."));
..
..
@@ -281,7 +283,7 @@
281
283
 		editLeafItem.addActionListener(this);
282
284
 		lookAtItem.addActionListener(this);
283
285
 		//lookFromItem.addActinoListener(this);
284
-		//switchItem.addActionListener(this);
286
+		//switchViewItem.addActionListener(this);
285
287
         }
286
288
         
287
289
 		oe.menuBar.add(menu = new Menu("Setting"));
..
..
@@ -326,21 +328,29 @@
326
328
         }
327
329
                 
328
330
 		oe.menuBar.add(menu = new Menu("Group"));
329
-		grabItem = menu.add(new MenuItem("Grab"));
330
-		grabItem.addActionListener(this);
331
+//		grabItem = menu.add(new MenuItem("Grab"));
332
+//		grabItem.addActionListener(this);
331
333
 		backItem = menu.add(new MenuItem("Back"));
332
334
 		backItem.addActionListener(this);
333
335
 		frontItem = menu.add(new MenuItem("Front"));
334
336
 		frontItem.addActionListener(this);
335
-		compositeItem = menu.add(new MenuItem("Composite"));
336
-		compositeItem.addActionListener(this);
337
+//		compositeItem = menu.add(new MenuItem("Composite"));
338
+//		compositeItem.addActionListener(this);
339
+                
340
+        if (Globals.ADVANCED)
341
+        {
337
342
 		hideItem = menu.add(new MenuItem("Hidden Group"));
338
343
 		hideItem.addActionListener(this);
344
+        }
339
345
 		ungroupItem = menu.add(new MenuItem("Ungroup"));
340
346
 		ungroupItem.addActionListener(this);
341
-		menu.add("-");
342
-		randomItem = menu.add(new MenuItem("Switch node"));
343
-		randomItem.addActionListener(this);
347
+                
348
+//		menu.add("-");
349
+//                
350
+//		switchItem = menu.add(new MenuItem("Switch node"));
351
+//		switchItem.addActionListener(this);
352
+        if (Globals.ADVANCED)
353
+        {
344
354
 		switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
345
355
 		switchGeoItem.addActionListener(this);
346
356
 		switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..
..
@@ -348,8 +358,6 @@
348
358
 		morphItem = menu.add(new MenuItem("Morph Group"));
349
359
 		morphItem.addActionListener(this);
350
360
                 
351
-        if (Globals.ADVANCED)
352
-        {
353
361
 		menu.add("-");
354
362
 		physicsItem = menu.add(new MenuItem("Physics"));
355
363
 		physicsItem.addActionListener(this);
..
..
@@ -357,13 +365,11 @@
357
365
 		frameselectorItem.addActionListener(this);
358
366
 		scriptNodeItem = menu.add(new MenuItem("Script Node"));
359
367
 		scriptNodeItem.addActionListener(this);
360
-		cameraItem = menu.add(new MenuItem("Camera"));
361
-		cameraItem.addActionListener(this);
362
368
         }
363
369
                 
364
370
 		oe.menuBar.add(menu = new Menu("Object"));
365
-		textureItem = menu.add(new MenuItem("Texture"));
366
-		textureItem.addActionListener(this);
371
+//		textureItem = menu.add(new MenuItem("Texture"));
372
+//		textureItem.addActionListener(this);
367
373
 		billboardItem = menu.add(new MenuItem("Billboard"));
368
374
 		billboardItem.addActionListener(this);
369
375
 		csgItem = menu.add(new MenuItem("CSG"));
..
..
@@ -574,6 +580,10 @@
574
580
         oe.radioPanel.add(dummyButton);
575
581
         oe.buttonGroup.add(dummyButton);
576
582
          */
583
+                cGridBag copyOptionsPanel = new cGridBag();
584
+                                        
585
+                copyOptionsPanel.preferredHeight = 2;
586
+                
577
587
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
578
588
                 
579
589
 		//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..
..
@@ -588,37 +598,43 @@
588
598
                 fullButton.setToolTipText("Full-screen window");
589
599
 		fullButton.addActionListener(this);
590
600
                 
591
-		oe.toolbarPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
601
+		oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602
+                restoreCameraButton.setToolTipText("Restore viewpoint");
603
+		restoreCameraButton.addActionListener(this);
604
+                
605
+		copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
592
606
                 undoButton.setToolTipText("Undo changes");
593
607
 		undoButton.addActionListener(this);
594
608
                 
595
-		oe.toolbarPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609
+		copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596
610
                 redoButton.setToolTipText("Redo changes");
597
611
 		redoButton.addActionListener(this);
598
612
                 
599
-		oe.toolbarPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
613
+		copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600
614
                 saveButton.setToolTipText("Save changes");
601
615
 		saveButton.addActionListener(this);
602
616
                 
603
-                oe.toolbarPanel.add(liveCB = GetCheckBox("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
617
+                copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
604
618
                 liveCB.setToolTipText("Enable animation");
605
619
                                 liveCB.addItemListener(this);
606
620
 
607
-                oe.toolbarPanel.add(fastCB = GetCheckBox("icons/runfast.png", CameraPane.FAST)); //, constraints);
608
-                fastCB.setToolTipText("Fast mode");
609
-                                fastCB.addItemListener(this);
610
-                                
611
-		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
621
+		copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
612
622
                 oneStepButton.setToolTipText("Animate one step forward");
613
623
 		oneStepButton.addActionListener(this);
614
624
                 
615
-                oe.toolbarPanel.add(trackCB = GetCheckBox("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
616
-                trackCB.setToolTipText("Enable tracking");
617
-                                trackCB.addItemListener(this);
618
-
619
-		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
625
+                copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
626
+                fastCB.setToolTipText("Fast mode");
627
+                                fastCB.addItemListener(this);
628
+                                
629
+                //oe.toolboxPanel.Return();
630
+                
631
+		copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620
632
                 screenfitButton.setToolTipText("Screen fit");
621
633
 		screenfitButton.addActionListener(this);
634
+
635
+//                copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
636
+//                trackCB.setToolTipText("Enable tracking");
637
+//                                trackCB.addItemListener(this);
622
638
 
623
639
 //		oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
624
640
 //		screenfitpointButton.addActionListener(this);
..
..
@@ -630,15 +646,13 @@
630
646
                         snapobjectButton.setToolTipText("Snap Object");
631
647
                 }
632
648
 
633
-		oe.toolbarPanel.add(flashSelectionButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634
-                flashSelectionButton.setToolTipText("Highlight selection");
635
-		flashSelectionButton.addActionListener(this);
636
-                
637
-		oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
649
+		//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
638
650
                 
639
651
 		oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
640
652
                 twoButton.setToolTipText("Show center view only");
641
653
 		twoButton.addActionListener(this);
654
+                this.fullscreenLayout = twoButton;
655
+                
642
656
 		oe.toolbarPanel.add(fourButton = new cButton("-||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
643
657
 		fourButton.addActionListener(this);
644
658
                 fourButton.setToolTipText("Show left panel only");
..
..
@@ -653,16 +667,83 @@
653
667
 		sevenButton.addActionListener(this);
654
668
                 //
655
669
 
656
-		oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
670
+		oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
657
671
                 rootButton.setToolTipText("Edit selection in new tab");
658
672
 		rootButton.addActionListener(this);
659
673
 
660
-                oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
674
+                oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
661
675
                 closeButton.setToolTipText("Close tab");
662
676
 		closeButton.addActionListener(this);
663
677
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
664
678
 		//clearButton.addActionListener(this);
665
-                        
679
+
680
+                // INSERT
681
+                oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682
+                gridButton.setToolTipText("Create grid");
683
+                                gridButton.addActionListener(this);
684
+
685
+                oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
686
+                boxButton.setToolTipText("Create box");
687
+                                boxButton.addActionListener(this);
688
+
689
+                oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
690
+                sphereButton.setToolTipText("Create sphere");
691
+                                sphereButton.addActionListener(this);
692
+
693
+                oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
694
+                coneButton.setToolTipText("Create cone");
695
+                                coneButton.addActionListener(this);
696
+
697
+                oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
698
+                torusButton.setToolTipText("Create torus");
699
+                                torusButton.addActionListener(this);
700
+
701
+                oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
702
+                superButton.setToolTipText("Create superellipsoid");
703
+                                superButton.addActionListener(this);
704
+
705
+                if (Globals.ADVANCED)
706
+                {
707
+                    oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
708
+                    kleinButton.setToolTipText("Create Klein bottle");
709
+                                    kleinButton.addActionListener(this);
710
+                }
711
+                
712
+                oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
713
+                particlesButton.setToolTipText("Create particle system");
714
+                               particlesButton.addActionListener(this);
715
+
716
+                oe.toolboxPanel.Return();
717
+                
718
+                oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
719
+                groupButton.setToolTipText("Create group");
720
+                               groupButton.addActionListener(this);
721
+
722
+                oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
723
+                compositeButton.setToolTipText("Create composite");
724
+                               compositeButton.addActionListener(this);
725
+
726
+                oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
727
+                switchButton.setToolTipText("Create switch");
728
+                               switchButton.addActionListener(this);
729
+
730
+                oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
731
+                loopButton.setToolTipText("Create loop");
732
+                               loopButton.addActionListener(this);
733
+
734
+                oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
735
+                textureButton.setToolTipText("Create texture");
736
+                               textureButton.addActionListener(this);
737
+
738
+                oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
739
+                overlayButton.setToolTipText("Create overlay");
740
+                               overlayButton.addActionListener(this);
741
+
742
+                oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
743
+                lightButton.setToolTipText("Create light");
744
+                               lightButton.addActionListener(this);
745
+
746
+                // EDIT panel
666
747
 		editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
667
748
                 editButton.setToolTipText("Edit selection");
668
749
 		editButton.addActionListener(this);
..
..
@@ -683,6 +764,10 @@
683
764
                 unselectButton.setToolTipText("Unselect");
684
765
 		unselectButton.addActionListener(this);
685
766
 
767
+		editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
768
+                flashSelectionButton.setToolTipText("Highlight selection");
769
+		flashSelectionButton.addActionListener(this);
770
+                
686
771
                 editCommandsPanel.preferredHeight = 1;
687
772
                 
688
773
 //                oe.treePanel.add(commandsPanel);
..
..
@@ -703,27 +788,12 @@
703
788
 
704
789
                 JScrollPane jSP;
705
790
 		//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
706
-		jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
791
+		jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
707
792
                 ResetModel();
708
793
                 
709
794
                 oe.treePanel.add(jSPPanel);
710
795
                 oe.treePanel.Return();
711
796
 
712
-                cGridBag copyOptionsPanel = new cGridBag();
713
-                
714
-                copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
715
-                colorCB.setToolTipText("Copy color when dropped");
716
-                colorCB.addItemListener(this);
717
-
718
-                copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
719
-                materialCB.setToolTipText("Copy material when dropped");
720
-                materialCB.addItemListener(this);
721
-
722
-                copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
723
-                textureCB.setToolTipText("Copy texture when dropped");
724
-                textureCB.addItemListener(this);
725
-                        
726
-                copyOptionsPanel.preferredHeight = 1;
727
797
                 oe.treePanel.add(copyOptionsPanel);
728
798
                 oe.treePanel.Return();
729
799
                 
..
..
@@ -754,6 +824,20 @@
754
824
         
755
825
         void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
756
826
         {
827
+                panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
828
+                colorCB.setToolTipText("Copy color when dropped");
829
+                colorCB.addItemListener(this);
830
+
831
+                panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
832
+                materialCB.setToolTipText("Copy material when dropped");
833
+                materialCB.addItemListener(this);
834
+
835
+                panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
836
+                textureCB.setToolTipText("Copy texture when dropped");
837
+                textureCB.addItemListener(this);
838
+                
839
+                panel.Return();
840
+                
757
841
                 panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
758
842
                 boxCB.setToolTipText("Display bounding boxes");
759
843
                                 boxCB.addItemListener(this);
..
..
@@ -771,6 +855,8 @@
771
855
         //        panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
772
856
         //                        localCB.addItemListener(this);
773
857
 
858
+                panel.Return();
859
+                
774
860
                 panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
775
861
                 crowdCB.setToolTipText("Used for crowds");
776
862
                                 crowdCB.addItemListener(this);
..
..
@@ -787,6 +873,8 @@
787
873
 //                panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
788
874
 //                                speakerMocapCB.addItemListener(this);
789
875
 
876
+                panel.Return();
877
+                
790
878
             if (false)
791
879
             {
792
880
                 // handled in scripts
..
..
@@ -801,24 +889,39 @@
801
889
         	//constraints.gridy += 1;
802
890
                 panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
803
891
                                 smoothfocusCB.addItemListener(this);
892
+                panel.Return();
804
893
             }
805
894
 
806
895
 //constraints.gridx += 1;
807
896
 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
808
897
 //                debugCB.addItemListener(this);
809
898
 
899
+                panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
900
+                trackCB.setToolTipText("Enable tracking target");
901
+                                trackCB.addItemListener(this);
902
+                                
810
903
                 panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
811
-                oeilCB.setToolTipText("Move camera when tracking target");
904
+                oeilCB.setToolTipText("Move camera when tracking");
812
905
                                 oeilCB.addItemListener(this);
813
906
 
814
907
                 panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
815
908
                 shadowCB.setToolTipText("Compute shadows when live");
816
909
                                 shadowCB.addItemListener(this);
817
910
 
911
+                panel.Return();
912
+                panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
913
+                toggleTextureCB.setToolTipText("Load textures");
914
+                                toggleTextureCB.addItemListener(this);
915
+                                
916
+                panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
917
+                toggleSwitchCB.setToolTipText("Use switch");
918
+                                toggleSwitchCB.addItemListener(this);
919
+                                
818
920
                 panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
819
921
                 autosaveCB.setToolTipText("Auto-save on structure change");
820
922
                                 autosaveCB.addItemListener(this);
821
923
 
924
+                panel.Return();
822
925
             if (Globals.ADVANCED)
823
926
             {
824
927
                 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
..
..
@@ -829,10 +932,15 @@
829
932
         }
830
933
                                 
831
934
                 cGridBag fill = new cGridBag();
832
-                                
833
935
                 fill.preferredHeight = 200;
936
+                cGridBag fill2 = new cGridBag();
937
+                fill2.preferredHeight = 200;
938
+                cGridBag fill3 = new cGridBag();
939
+                fill3.preferredHeight = 200;
834
940
                 
835
941
                 panel.add(fill);
942
+                panel.add(fill2);
943
+                panel.add(fill3);
836
944
 
837
945
         }
838
946
 	
..
..
@@ -868,15 +976,16 @@
868
976
             /*DropTarget dropTarget =*/ new DropTarget(oe.cameraView, this);
869
977
         }
870
978
 
871
-        cCheckBox liveCB;
979
+        cToggleButton liveCB;
872
980
         cCheckBox supportCB;
873
981
         cCheckBox localCB;
874
982
         cCheckBox crowdCB;
875
983
         cCheckBox smoothCB;
876
-        cCheckBox fastCB;
984
+        cToggleButton fastCB;
877
985
         cCheckBox slowCB;
878
986
         cCheckBox boxCB;
879
987
         cCheckBox zoomBoxCB;
988
+        //cToggleButton trackCB;
880
989
         cCheckBox trackCB;
881
990
         cCheckBox smoothfocusCB;
882
991
 //        JCheckBox speakerMocapCB;
..
..
@@ -1014,7 +1123,8 @@
1014
1123
 		
1015
1124
                 /**/
1016
1125
 		//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
1017
-		TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1126
+		//TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1127
+		TreePath path = objEditor.jTree.getSelectionPath();
1018
1128
 		if ((path == null) || (path.getPathCount() <= 1)) {
1019
1129
 		  // We can't move the root node or an empty selection
1020
1130
 		  return;
..
..
@@ -1131,23 +1241,33 @@
1131
1241
                 
1132
1242
                 assert target == objEditor.jTree;
1133
1243
             TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
1244
+            Object3D destinationLeaf;
1134
1245
             try {
1135
-                Object3D dummy = (Composite) destinationPath.getLastPathComponent();
1246
+                destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1136
1247
             } catch (Exception e) {
1137
1248
                 System.out.println("destinationPath : " + destinationPath);
1138
1249
                 return;
1139
1250
             }
1140
1251
 
1141
-            if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1252
+            for (int i=group.selection.size(); --i>=0;) 
1142
1253
             {
1254
+                    Object3D child = (Object3D)group.selection.elementAt(i);
1255
+                    
1256
+                    // Cannot move into itself
1257
+                    if (child == destinationLeaf)
1258
+                        return;
1259
+            }
1260
+                        
1261
+// june 2019            if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1262
+//            {
1143
1263
                 loadClipboard(true);
1144
1264
                 objEditor.jTree.setSelectionPath(destinationPath);
1145
1265
                 pasteInto(false, false);
1146
-            } else {
1147
-                loadClipboard(false);
1148
-                objEditor.jTree.setSelectionPath(destinationPath);
1149
-                pasteInto(false, false); // true); // ???
1150
-            }
1266
+//            } else {
1267
+//                loadClipboard(false);
1268
+//                objEditor.jTree.setSelectionPath(destinationPath);
1269
+//                pasteInto(false, false); // true); // ???
1270
+//            }
1151
1271
 	}
1152
1272
 	public void	dropActionChanged(DropTargetDragEvent dtde) 
1153
1273
 	// Called if the user has modified the current drop gesture
..
..
@@ -1252,22 +1372,30 @@
1252
1372
 	{
1253
1373
 		//heightFieldItem = menu.add(new MenuItem("Height Field"));
1254
1374
 		//heightFieldItem.addActionListener(this);
1255
-		gridItem = menu.add(new MenuItem("Grid"));
1256
-		gridItem.addActionListener(this);
1257
-		rectoidItem = menu.add(new MenuItem("Box"));
1258
-		rectoidItem.addActionListener(this);
1259
-		ellipsoidItem = menu.add(new MenuItem("Sphere"));
1260
-		ellipsoidItem.addActionListener(this);
1261
-		coneItem = menu.add(new MenuItem("Cone"));
1262
-		coneItem.addActionListener(this);
1263
-		torusItem = menu.add(new MenuItem("Torus"));
1264
-		torusItem.addActionListener(this);
1265
-		superItem = menu.add(new MenuItem("Superellipsoid"));
1266
-		superItem.addActionListener(this);
1375
+//		gridItem = menu.add(new MenuItem("Grid"));
1376
+//		gridItem.addActionListener(this);
1377
+//		rectoidItem = menu.add(new MenuItem("Box"));
1378
+//		rectoidItem.addActionListener(this);
1379
+//		ellipsoidItem = menu.add(new MenuItem("Sphere"));
1380
+//		ellipsoidItem.addActionListener(this);
1381
+//		coneItem = menu.add(new MenuItem("Cone"));
1382
+//		coneItem.addActionListener(this);
1383
+//		torusItem = menu.add(new MenuItem("Torus"));
1384
+//		torusItem.addActionListener(this);
1385
+//		superItem = menu.add(new MenuItem("Superellipsoid"));
1386
+//		superItem.addActionListener(this);
1387
+                
1388
+		cameraItem = menu.add(new MenuItem("Camera"));
1389
+		cameraItem.addActionListener(this);
1390
+                
1391
+                if (!Globals.ADVANCED)
1392
+                {
1267
1393
 		kleinItem = menu.add(new MenuItem("Klein Bottle"));
1268
1394
 		kleinItem.addActionListener(this);
1269
-		particleItem = menu.add(new MenuItem("Particle system"));
1270
-		particleItem.addActionListener(this);
1395
+                }
1396
+                
1397
+//		particleItem = menu.add(new MenuItem("Particle system"));
1398
+//		particleItem.addActionListener(this);
1271
1399
         if (Globals.ADVANCED)
1272
1400
         {
1273
1401
 		ragdollItem = menu.add(new MenuItem("Rag Walk"));
..
..
@@ -1293,15 +1421,15 @@
1293
1421
         }
1294
1422
 		bezierItem = menu.add(new MenuItem("Bezier Patch"));
1295
1423
 		bezierItem.addActionListener(this);
1296
-		overlayItem = menu.add(new MenuItem("Overlay"));
1297
-		overlayItem.addActionListener(this);
1298
-		lightItem = menu.add(new MenuItem("Light"));
1299
-		lightItem.addActionListener(this);
1424
+//		overlayItem = menu.add(new MenuItem("Overlay"));
1425
+//		overlayItem.addActionListener(this);
1426
+//		lightItem = menu.add(new MenuItem("Light"));
1427
+//		lightItem.addActionListener(this);
1300
1428
 		menu.add("-");
1301
1429
 		//superLoopItem = menu.add(new MenuItem("Super Loop"));
1302
1430
 		//superLoopItem.addActionListener(this);
1303
-		loopItem = menu.add(new MenuItem("Loop"));
1304
-		loopItem.addActionListener(this);
1431
+//		loopItem = menu.add(new MenuItem("Loop"));
1432
+//		loopItem.addActionListener(this);
1305
1433
 		doubleItem = menu.add(new MenuItem("Fork"));
1306
1434
 		doubleItem.addActionListener(this);
1307
1435
         if (Globals.ADVANCED)
..
..
@@ -1730,7 +1858,7 @@
1730
1858
 		{
1731
1859
                     ScreenFit();
1732
1860
                 } else
1733
-		if (source == switchItem)
1861
+		if (source == switchViewItem)
1734
1862
 		{
1735
1863
 			cVector v1 = new cVector();
1736
1864
 			cVector v2 = new cVector();
..
..
@@ -1739,11 +1867,11 @@
1739
1867
 			objEditor.cameraView.renderCamera.setAim(v2, v1);
1740
1868
 			objEditor.cameraView.repaint();
1741
1869
 		} else
1742
-		if (source == rectoidItem)
1870
+		if (source == rectoidItem || source == boxButton)
1743
1871
 		{
1744
1872
 			makeSomething(new Box());
1745
1873
 		} else
1746
-		if (source == particleItem)
1874
+		if (source == particleItem || source == particlesButton)
1747
1875
 		{
1748
1876
         ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1749
1877
         ParticleController particleController = new ParticleController(particleGeom);
..
..
@@ -1822,27 +1950,27 @@
1822
1950
                     
1823
1951
                     makeSomething(obj);
1824
1952
 		} else
1825
-		if (source == gridItem)
1953
+		if (source == gridItem || source == gridButton)
1826
1954
 		{
1827
1955
 			makeSomething(new Grid());
1828
1956
 		} else
1829
-		if (source == ellipsoidItem)
1957
+		if (source == ellipsoidItem || source == sphereButton)
1830
1958
 		{
1831
1959
 			makeSomething(new Sphere());
1832
1960
 		} else
1833
-		if (source == coneItem)
1961
+		if (source == coneItem || source == coneButton)
1834
1962
 		{
1835
1963
 			makeSomething(new Cone());
1836
1964
 		} else
1837
-		if (source == torusItem)
1965
+		if (source == torusItem || source == torusButton)
1838
1966
 		{
1839
1967
 			makeSomething(new Torus());
1840
1968
 		} else
1841
-		if (source == superItem)
1969
+		if (source == superItem || source == superButton)
1842
1970
 		{
1843
1971
 			makeSomething(new Superellipsoid());
1844
1972
 		} else
1845
-		if (source == kleinItem)
1973
+		if (source == kleinItem || source == kleinButton)
1846
1974
 		{
1847
1975
 			makeSomething(new Klein());
1848
1976
 		} else
..
..
@@ -1862,7 +1990,7 @@
1862
1990
 		{
1863
1991
 			makeSomething(new BezierSurface());
1864
1992
 		} else
1865
-		if (source == overlayItem)
1993
+		if (source == overlayItem || source == overlayButton)
1866
1994
 		{
1867
1995
                     /*
1868
1996
 			Object3D obj = new BezierSurface(5,8);
..
..
@@ -1910,7 +2038,7 @@
1910
2038
                         s.setup();
1911
2039
 			makeSomething(s);
1912
2040
 		} else
1913
-		if (source == lightItem)
2041
+		if (source == lightItem || source == lightButton)
1914
2042
 		{
1915
2043
 			makeSomething(new Light());
1916
2044
 		} else
..
..
@@ -1960,7 +2088,7 @@
1960
2088
                             
1961
2089
 			group(g);
1962
2090
 		} else
1963
-		if (source == loopItem)
2091
+		if (source == loopItem || source == loopButton)
1964
2092
 		{
1965
2093
                         Composite csg = new GroupLeaf();
1966
2094
                         csg.count = 5;
..
..
@@ -2450,9 +2578,9 @@
2450
2578
 		{
2451
2579
 			ClearSelection(true);
2452
2580
 		} else
2453
-		if (source == grabItem)
2581
+		if (source == grabItem || source == groupButton)
2454
2582
 		{
2455
-			group(new cGroup(), true);
2583
+			group(new cGroup(), false); // true);
2456
2584
 		} else
2457
2585
 		if (source == hideItem)
2458
2586
 		{
..
..
@@ -2470,11 +2598,11 @@
2470
2598
 		{
2471
2599
 			makeSomething(new Camera());
2472
2600
 		} else
2473
-		if (source == compositeItem)
2601
+		if (source == compositeItem || source == compositeButton)
2474
2602
 		{
2475
2603
 			group(new Composite());
2476
2604
 		} else
2477
-		if (source == randomItem)
2605
+		if (source == switchItem || source == switchButton)
2478
2606
 		{
2479
2607
                         RandomNode random = new RandomNode();
2480
2608
 			group(random);
..
..
@@ -2576,7 +2704,7 @@
2576
2704
 		{
2577
2705
 			group(new cLinker());
2578
2706
 		} else
2579
-		if (source == textureItem)
2707
+		if (source == textureItem || source == textureButton)
2580
2708
 		{
2581
2709
 			group(new TextureNode());
2582
2710
 		} else
..
..
@@ -2596,7 +2724,7 @@
2596
2724
 		{
2597
2725
 			CastShadow(2);
2598
2726
 		} else
2599
-		if (source == ungroupItem)
2727
+		if (source == ungroupItem || source == ungroupButton)
2600
2728
 		{
2601
2729
 			//ungroup();
2602
2730
                     for (int i=0; i<group.selection.size(); i++)
..
..
@@ -2934,6 +3062,10 @@
2934
3062
 		if (source == twoButton)
2935
3063
 		{
2936
3064
                     radio.layout = twoButton;
3065
+                    
3066
+                    if (CameraPane.FULLSCREEN)
3067
+                        fullscreenLayout = radio.layout;
3068
+                    
2937
3069
                     // bug
2938
3070
                     //gridPanel.setDividerLocation(1.0);
2939
3071
                     //bigPanel.setDividerLocation(0.0);
..
..
@@ -2989,6 +3121,9 @@
2989
3121
 		{
2990
3122
                     radio.layout = threeButton;
2991
3123
                     
3124
+                    if (CameraPane.FULLSCREEN)
3125
+                        fullscreenLayout = radio.layout;
3126
+                    
2992
3127
 //                    bigThree.remove(scenePanel);
2993
3128
 //                    bigThree.remove(centralPanel);
2994
3129
 //                    bigThree.remove(XYZPanel);
..
..
@@ -3027,6 +3162,9 @@
3027
3162
 		{
3028
3163
                     radio.layout = fourButton;
3029
3164
                     
3165
+                    if (CameraPane.FULLSCREEN)
3166
+                        fullscreenLayout = radio.layout;
3167
+                    
3030
3168
 //                    bigThree.remove(scenePanel);
3031
3169
 //                    bigThree.remove(centralPanel);
3032
3170
 //                    bigThree.remove(XYZPanel);
..
..
@@ -3063,6 +3201,9 @@
3063
3201
 		if (source == sixButton)
3064
3202
 		{
3065
3203
                     radio.layout = sixButton;
3204
+                    
3205
+                    if (CameraPane.FULLSCREEN)
3206
+                        fullscreenLayout = radio.layout;
3066
3207
                     
3067
3208
 //                    bigThree.remove(scenePanel);
3068
3209
 //                    bigThree.remove(centralPanel);
..
..
@@ -3101,6 +3242,9 @@
3101
3242
 		if (source == sevenButton)
3102
3243
 		{
3103
3244
                     radio.layout = sevenButton;
3245
+                    
3246
+                    if (CameraPane.FULLSCREEN)
3247
+                        fullscreenLayout = radio.layout;
3104
3248
                     
3105
3249
 //                    bigThree.remove(scenePanel);
3106
3250
 //                    bigThree.remove(centralPanel);
..
..
@@ -3304,7 +3448,7 @@
3304
3448
                     cameraView.ProtectCamera();
3305
3449
                     cameraView.repaint();
3306
3450
                     return;
3307
-                } else if (event.getSource() == revertCameraItem)
3451
+                } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
3308
3452
                 {
3309
3453
                     cameraView.RevertCamera();
3310
3454
                     cameraView.repaint();
..
..
@@ -4369,7 +4513,7 @@
4369
4513
 		{
4370
4514
                     //System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4371
4515
                     //objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4372
-                    objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4516
+                    //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4373
4517
                     
4374
4518
 			Object3D elem = (Object3D)group.selection.elementAt(i);
4375
4519
                         if(elem != group || !newWindow)
..
..
@@ -4507,7 +4651,8 @@
4507
4651
         
4508
4652
         void refreshContents(boolean cp)
4509
4653
         {
4510
-            if (!Globals.MOUSEDRAGGED)
4654
+            if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4655
+            if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
4511
4656
             {
4512
4657
                 objEditor.ClearInfo(); // .GetMaterial());
4513
4658
 
..
..
@@ -5325,6 +5470,8 @@
5325
5470
 	cButton clearpanelButton;
5326
5471
 	cButton unselectButton;
5327
5472
 	
5473
+	cButton restoreCameraButton;
5474
+        
5328
5475
 	cButton minButton;
5329
5476
 	cButton maxButton;
5330
5477
 	cButton fullButton;
..
..
@@ -5332,6 +5479,24 @@
5332
5479
 	cButton redoButton;
5333
5480
 	cButton saveButton;
5334
5481
 	cButton oneStepButton;
5482
+        
5483
+        cButton groupButton;
5484
+        cButton ungroupButton;
5485
+        cButton compositeButton;
5486
+        cButton switchButton;
5487
+        cButton loopButton;
5488
+        cButton textureButton;
5489
+        
5490
+        cButton gridButton;
5491
+        cButton boxButton;
5492
+        cButton sphereButton;
5493
+        cButton coneButton;
5494
+        cButton torusButton;
5495
+        cButton superButton;
5496
+        cButton kleinButton;
5497
+        cButton particlesButton;
5498
+        cButton overlayButton;
5499
+        cButton lightButton;
5335
5500
         
5336
5501
 	cButton screenfitButton;
5337
5502
 	cButton screenfitpointButton;
..
..
@@ -5353,11 +5518,11 @@
5353
5518
 	//JTree jTree;
5354
5519
 	private MenuItem lookAtItem;
5355
5520
 	private MenuItem lookFromItem;
5356
-	private MenuItem switchItem;
5521
+	private MenuItem switchViewItem;
5357
5522
 	private MenuItem cutItem;
5358
5523
 	private MenuItem undoItem;
5359
5524
 	private MenuItem redoItem;
5360
-	private MenuItem duplicateItem;
5525
+	private JMenuItem duplicateItem;
5361
5526
 	private MenuItem cloneItem;
5362
5527
 	private MenuItem cloneSupportItem;
5363
5528
 	private MenuItem overwriteGeoItem;
..
..
@@ -5445,7 +5610,7 @@
5445
5610
 	private MenuItem frontItem;
5446
5611
 	private MenuItem cameraItem;
5447
5612
 	private MenuItem compositeItem;
5448
-	private MenuItem randomItem;
5613
+	private MenuItem switchItem;
5449
5614
 	private MenuItem physicsItem;
5450
5615
 	private MenuItem frameselectorItem;
5451
5616
 	private MenuItem scriptNodeItem;
..
..
@@ -5519,5 +5684,5 @@
5519
5684
         
5520
5685
     Menu cameraMenu;
5521
5686
     MenuItem editCameraItem;
5522
-    MenuItem revertCameraItem;
5687
+    MenuItem restoreCameraItem;
5523
5688
 }