Normand Briere
2019-06-30 cfd7a643cb5a445016ddb15595158ecc59b184fd
GroupEditor.java
....@@ -150,6 +150,8 @@
150150
151151 void SetupMenu2(GroupEditor oe)
152152 {
153
+ oe.jTree = new cTree();
154
+
153155 Menu menu;
154156 oe.menuBar.add(menu = new Menu("Edit"));
155157 //editItem = menu.add(new MenuItem("Edit"));
....@@ -160,7 +162,7 @@
160162 // redoItem = menu.add(new MenuItem("Redo"));
161163 // redoItem.addActionListener(this);
162164 // menu.add("-");
163
- duplicateItem = menu.add(new MenuItem("Duplicate"));
165
+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164166 duplicateItem.addActionListener(this);
165167 cloneItem = menu.add(new MenuItem("Clone"));
166168 cloneItem.addActionListener(this);
....@@ -176,7 +178,6 @@
176178 copyItem.addActionListener(this);
177179 pasteItem = menu.add(new MenuItem("Paste"));
178180 pasteItem.addActionListener(this);
179
- menu.add("-");
180181
181182 menu.add("-");
182183 pasteIntoItem = menu.add(new MenuItem("Paste into"));
....@@ -203,23 +204,23 @@
203204 //zBufferItem.addActionListener(this);
204205 //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
205206 //normalLensItem.addActionListener(this);
206
- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
207
- revertCameraItem.addActionListener(this);
207
+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
208
+ restoreCameraItem.addActionListener(this);
208209
209
- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
210
- toggleFullScreenItem.addItemListener(this);
211
- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
212
- cameraMenu.add("-");
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);
213222
214
- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
215
- toggleTextureItem.addItemListener(this);
216
- toggleTextureItem.setState(CameraPane.textureon);
217
-
218
- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
219
- toggleSwitchItem.addItemListener(this);
220
- toggleSwitchItem.setState(CameraPane.SWITCH);
221
-
222
- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
223
+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
223224 toggleHandleItem.addItemListener(this);
224225 toggleHandleItem.setState(CameraPane.HANDLES);
225226
....@@ -274,7 +275,7 @@
274275 {
275276 oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
276277 //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
277
- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
278
+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
278279 editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
279280 oe.cameraMenu.add("-");
280281 openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
....@@ -282,7 +283,7 @@
282283 editLeafItem.addActionListener(this);
283284 lookAtItem.addActionListener(this);
284285 //lookFromItem.addActinoListener(this);
285
- //switchItem.addActionListener(this);
286
+ //switchViewItem.addActionListener(this);
286287 }
287288
288289 oe.menuBar.add(menu = new Menu("Setting"));
....@@ -327,21 +328,29 @@
327328 }
328329
329330 oe.menuBar.add(menu = new Menu("Group"));
330
- grabItem = menu.add(new MenuItem("Grab"));
331
- grabItem.addActionListener(this);
331
+// grabItem = menu.add(new MenuItem("Grab"));
332
+// grabItem.addActionListener(this);
332333 backItem = menu.add(new MenuItem("Back"));
333334 backItem.addActionListener(this);
334335 frontItem = menu.add(new MenuItem("Front"));
335336 frontItem.addActionListener(this);
336
- compositeItem = menu.add(new MenuItem("Composite"));
337
- compositeItem.addActionListener(this);
337
+// compositeItem = menu.add(new MenuItem("Composite"));
338
+// compositeItem.addActionListener(this);
339
+
340
+ if (Globals.ADVANCED)
341
+ {
338342 hideItem = menu.add(new MenuItem("Hidden Group"));
339343 hideItem.addActionListener(this);
344
+ }
340345 ungroupItem = menu.add(new MenuItem("Ungroup"));
341346 ungroupItem.addActionListener(this);
342
- menu.add("-");
343
- randomItem = menu.add(new MenuItem("Switch node"));
344
- 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
+ {
345354 switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
346355 switchGeoItem.addActionListener(this);
347356 switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
....@@ -349,8 +358,6 @@
349358 morphItem = menu.add(new MenuItem("Morph Group"));
350359 morphItem.addActionListener(this);
351360
352
- if (Globals.ADVANCED)
353
- {
354361 menu.add("-");
355362 physicsItem = menu.add(new MenuItem("Physics"));
356363 physicsItem.addActionListener(this);
....@@ -358,22 +365,20 @@
358365 frameselectorItem.addActionListener(this);
359366 scriptNodeItem = menu.add(new MenuItem("Script Node"));
360367 scriptNodeItem.addActionListener(this);
361
- cameraItem = menu.add(new MenuItem("Camera"));
362
- cameraItem.addActionListener(this);
363368 }
364369
365370 oe.menuBar.add(menu = new Menu("Object"));
366
- textureItem = menu.add(new MenuItem("Texture"));
367
- textureItem.addActionListener(this);
371
+// textureItem = menu.add(new MenuItem("Texture"));
372
+// textureItem.addActionListener(this);
368373 billboardItem = menu.add(new MenuItem("Billboard"));
369374 billboardItem.addActionListener(this);
370375 csgItem = menu.add(new MenuItem("CSG"));
371376 csgItem.addActionListener(this);
372
- shadowXItem = menu.add(new MenuItem("Shadow X"));
377
+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
373378 shadowXItem.addActionListener(this);
374
- shadowYItem = menu.add(new MenuItem("Shadow Y"));
379
+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
375380 shadowYItem.addActionListener(this);
376
- shadowZItem = menu.add(new MenuItem("Shadow Z"));
381
+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
377382 shadowZItem.addActionListener(this);
378383 if (Globals.ADVANCED)
379384 {
....@@ -575,51 +580,66 @@
575580 oe.radioPanel.add(dummyButton);
576581 oe.buttonGroup.add(dummyButton);
577582 */
583
+ cGridBag copyOptionsPanel = new cGridBag();
584
+
585
+ copyOptionsPanel.preferredHeight = 1;
586
+
578587 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
579588
580589 //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
581590 //minButton.setToolTipText("Minimize window");
582591 //minButton.addActionListener(this);
583592
584
- oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585
- maxButton.setToolTipText("Maximize window");
586
- maxButton.addActionListener(this);
593
+ if (Globals.ADVANCED)
594
+ {
595
+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596
+ maxButton.setToolTipText("Maximize window");
597
+ maxButton.addActionListener(this);
598
+ }
587599
588
- oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600
+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
589601 fullButton.setToolTipText("Full-screen window");
590602 fullButton.addActionListener(this);
591603
592
- oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
604
+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
605
+ restoreCameraButton.setToolTipText("Restore viewpoint");
606
+ restoreCameraButton.addActionListener(this);
607
+
608
+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
593609 undoButton.setToolTipText("Undo changes");
594610 undoButton.addActionListener(this);
611
+ undoButton.setEnabled(false);
595612
596
- oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
613
+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597614 redoButton.setToolTipText("Redo changes");
598615 redoButton.addActionListener(this);
616
+ redoButton.setEnabled(false);
599617
600
- oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
618
+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
601619 saveButton.setToolTipText("Save changes");
602620 saveButton.addActionListener(this);
603621
604
- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
622
+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
605623 liveCB.setToolTipText("Enable animation");
606624 liveCB.addItemListener(this);
607625
608
- oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
626
+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609627 oneStepButton.setToolTipText("Animate one step forward");
610628 oneStepButton.addActionListener(this);
611629
612
- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
630
+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
613631 fastCB.setToolTipText("Fast mode");
614632 fastCB.addItemListener(this);
615633
616
- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
617
- trackCB.setToolTipText("Enable tracking");
618
- trackCB.addItemListener(this);
619
-
620
- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634
+ //oe.toolboxPanel.Return();
635
+
636
+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
621637 screenfitButton.setToolTipText("Screen fit");
622638 screenfitButton.addActionListener(this);
639
+
640
+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
641
+// trackCB.setToolTipText("Enable tracking");
642
+// trackCB.addItemListener(this);
623643
624644 // oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
625645 // screenfitpointButton.addActionListener(this);
....@@ -631,65 +651,145 @@
631651 snapobjectButton.setToolTipText("Snap Object");
632652 }
633653
634
- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
635
- flashSelectionButton.setToolTipText("Show selection");
636
- flashSelectionButton.addActionListener(this);
654
+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
637655
638
- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
639
-
640
- oe.toolbarPanel.add(twoButton = new cButton("|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
656
+ oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
641657 twoButton.setToolTipText("Show center view only");
642658 twoButton.addActionListener(this);
643
- oe.toolbarPanel.add(fourButton = new cButton("+||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
659
+ this.fullscreenLayout = twoButton;
660
+
661
+ oe.toolbarPanel.add(fourButton = new cButton("-||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
644662 fourButton.addActionListener(this);
645663 fourButton.setToolTipText("Show left panel only");
646
- oe.toolbarPanel.add(sixButton = new cButton("+|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
664
+ oe.toolbarPanel.add(sixButton = new cButton("-|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
647665 sixButton.setToolTipText("2-column layout left");
648666 sixButton.addActionListener(this);
649
- oe.toolbarPanel.add(threeButton = new cButton("|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
667
+ oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650668 threeButton.setToolTipText("2-column layout right");
651669 threeButton.addActionListener(this);
652
- oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
670
+ oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
653671 sevenButton.setToolTipText("3-column layout");
654672 sevenButton.addActionListener(this);
655673 //
656674
657
- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
675
+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
658676 rootButton.setToolTipText("Edit selection in new tab");
659677 rootButton.addActionListener(this);
660678
661
- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
679
+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662680 closeButton.setToolTipText("Close tab");
663681 closeButton.addActionListener(this);
664682 //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
665683 //clearButton.addActionListener(this);
666
-
667
- cGridBag commandsPanel = new cGridBag();
684
+
685
+ // INSERT
686
+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
687
+ gridButton.setToolTipText("Create grid");
688
+ gridButton.addActionListener(this);
689
+
690
+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
691
+ boxButton.setToolTipText("Create box");
692
+ boxButton.addActionListener(this);
693
+
694
+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
695
+ sphereButton.setToolTipText("Create sphere");
696
+ sphereButton.addActionListener(this);
697
+
698
+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
699
+ coneButton.setToolTipText("Create cone");
700
+ coneButton.addActionListener(this);
701
+
702
+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
703
+ torusButton.setToolTipText("Create torus");
704
+ torusButton.addActionListener(this);
705
+
706
+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
707
+ superButton.setToolTipText("Create superellipsoid");
708
+ superButton.addActionListener(this);
709
+
710
+ if (Globals.ADVANCED)
711
+ {
712
+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
713
+ kleinButton.setToolTipText("Create Klein bottle");
714
+ kleinButton.addActionListener(this);
715
+ }
668716
669
- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
670
- editButton.setToolTipText("Edit selection");
717
+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
718
+ particlesButton.setToolTipText("Create particle system");
719
+ particlesButton.addActionListener(this);
720
+
721
+ oe.toolboxPanel.Return();
722
+
723
+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
724
+ groupButton.setToolTipText("Create group");
725
+ groupButton.addActionListener(this);
726
+
727
+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
728
+ compositeButton.setToolTipText("Create composite");
729
+ compositeButton.addActionListener(this);
730
+
731
+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
732
+ switchButton.setToolTipText("Create item switcher");
733
+ switchButton.addActionListener(this);
734
+
735
+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
736
+ loopButton.setToolTipText("Create loop");
737
+ loopButton.addActionListener(this);
738
+
739
+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
740
+ textureButton.setToolTipText("Create texture");
741
+ textureButton.addActionListener(this);
742
+
743
+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
744
+ overlayButton.setToolTipText("Create overlay");
745
+ overlayButton.addActionListener(this);
746
+
747
+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
748
+ lightButton.setToolTipText("Create light");
749
+ lightButton.addActionListener(this);
750
+
751
+ for (int i=6; --i>=0;)
752
+ {
753
+ oe.toolboxPanel.Return();
754
+ oe.toolboxPanel.add(new cGridBag());
755
+ oe.toolboxPanel.add(new cGridBag());
756
+ oe.toolboxPanel.add(new cGridBag());
757
+ oe.toolboxPanel.add(new cGridBag());
758
+ oe.toolboxPanel.add(new cGridBag());
759
+ oe.toolboxPanel.add(new cGridBag());
760
+ oe.toolboxPanel.add(new cGridBag());
761
+ }
762
+
763
+ // EDIT panel
764
+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
765
+ editButton.setToolTipText("Pin selection controls");
671766 editButton.addActionListener(this);
672767
673
- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
674
- uneditButton.setToolTipText("Unedit selection");
768
+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
769
+ uneditButton.setToolTipText("Remove selection controls");
675770 uneditButton.addActionListener(this);
676771
677
- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
678
- allParamsButton.setToolTipText("Edit all params");
772
+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
773
+ allParamsButton.setToolTipText("Show all controle");
679774 allParamsButton.addActionListener(this);
680775
681
- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
776
+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682777 clearPanelButton.setToolTipText("Clear edit panel");
683778 clearPanelButton.addActionListener(this);
684779
685
- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
780
+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
686781 unselectButton.setToolTipText("Unselect");
687782 unselectButton.addActionListener(this);
688783
689
- commandsPanel.preferredHeight = 1;
784
+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
785
+ flashSelectionButton.setToolTipText("Highlight selection");
786
+ flashSelectionButton.addActionListener(this);
690787
691
- oe.treePanel.add(commandsPanel);
692
- oe.treePanel.Return();
788
+ editCommandsPanel.preferredHeight = 1;
789
+
790
+ SetPinStates(false);
791
+// oe.treePanel.add(commandsPanel);
792
+// oe.treePanel.Return();
693793
694794 // oe.aConstraints.gridx += 1;
695795 // oe.aConstraints.weighty = 0;
....@@ -706,27 +806,12 @@
706806
707807 JScrollPane jSP;
708808 //ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
709
- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
809
+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
710810 ResetModel();
711811
712812 oe.treePanel.add(jSPPanel);
713813 oe.treePanel.Return();
714814
715
- cGridBag copyOptionsPanel = new cGridBag();
716
-
717
- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
718
- colorCB.setToolTipText("Copy color when dropped");
719
- colorCB.addItemListener(this);
720
-
721
- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
722
- materialCB.setToolTipText("Copy material when dropped");
723
- materialCB.addItemListener(this);
724
-
725
- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
726
- textureCB.setToolTipText("Copy texture when dropped");
727
- textureCB.addItemListener(this);
728
-
729
- copyOptionsPanel.preferredHeight = 1;
730815 oe.treePanel.add(copyOptionsPanel);
731816 oe.treePanel.Return();
732817
....@@ -757,23 +842,43 @@
757842
758843 void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
759844 {
845
+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
846
+ colorCB.setToolTipText("Copy color when dropped");
847
+ colorCB.addItemListener(this);
848
+
849
+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
850
+ materialCB.setToolTipText("Copy material when dropped");
851
+ materialCB.addItemListener(this);
852
+
853
+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
854
+ textureCB.setToolTipText("Copy texture when dropped");
855
+ textureCB.addItemListener(this);
856
+
857
+ panel.Return();
858
+
760859 panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
761860 boxCB.setToolTipText("Display bounding boxes");
762861 boxCB.addItemListener(this);
763862
764863 panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
765
- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
864
+ zoomBoxCB.setToolTipText("Display only for wheel");
766865 zoomBoxCB.addItemListener(this);
767866
768867 if (true) // Globals.ADVANCED)
769868 {
770
- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
771
- supportCB.setToolTipText("Enable rigging");
772
- supportCB.addItemListener(this);
869
+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
870
+// supportCB.setToolTipText("Enable rigging");
871
+// supportCB.addItemListener(this);
872
+
873
+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
874
+ freezeCB.setToolTipText("Fast moving camera");
875
+ freezeCB.addItemListener(this);
773876
774877 // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
775878 // localCB.addItemListener(this);
776879
880
+ panel.Return();
881
+
777882 panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
778883 crowdCB.setToolTipText("Used for crowds");
779884 crowdCB.addItemListener(this);
....@@ -790,6 +895,8 @@
790895 // panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
791896 // speakerMocapCB.addItemListener(this);
792897
898
+ panel.Return();
899
+
793900 if (false)
794901 {
795902 // handled in scripts
....@@ -804,32 +911,72 @@
804911 //constraints.gridy += 1;
805912 panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
806913 smoothfocusCB.addItemListener(this);
914
+ panel.Return();
807915 }
808916
809917 //constraints.gridx += 1;
810918 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
811919 // debugCB.addItemListener(this);
812920
921
+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
922
+ trackCB.setToolTipText("Enable tracking target");
923
+ trackCB.addItemListener(this);
924
+
813925 panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
926
+ oeilCB.setToolTipText("Move camera when tracking");
814927 oeilCB.addItemListener(this);
815928
929
+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
930
+ shadowCB.setToolTipText("When live compute shadows");
931
+ shadowCB.addItemListener(this);
932
+
933
+ panel.Return();
934
+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
935
+ toggleTextureCB.setToolTipText("Load textures");
936
+ toggleTextureCB.addItemListener(this);
937
+
938
+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
939
+ toggleSwitchCB.setToolTipText("Choose a single item");
940
+ toggleSwitchCB.addItemListener(this);
941
+
942
+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
943
+ autosaveCB.setToolTipText("On structure change");
944
+ autosaveCB.addItemListener(this);
945
+
946
+ panel.Return();
947
+ if (Globals.ADVANCED)
948
+ {
816949 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
817950 lookAtCB.setToolTipText("Look-at target");
818951 lookAtCB.addItemListener(this);
952
+ }
819953
820954 }
821955
822956 cGridBag fill = new cGridBag();
823
-
824957 fill.preferredHeight = 200;
958
+ cGridBag fill2 = new cGridBag();
959
+ fill2.preferredHeight = 200;
960
+ cGridBag fill3 = new cGridBag();
961
+ fill3.preferredHeight = 200;
825962
826963 panel.add(fill);
964
+ panel.add(fill2);
965
+ panel.add(fill3);
827966
828967 }
829968
830969 void EditObject(Object3D obj)
831970 {
832971 cRadio radioButton = new cRadio(obj.name);
972
+
973
+ // Patch to avoid bug with transparency.
974
+ radioButton.hadMaterial = obj.material != null;
975
+ if (!radioButton.hadMaterial)
976
+ {
977
+ obj.material = new cMaterial();
978
+ }
979
+
833980 radioButton.SetObject(obj);
834981 radioButton.layout = sevenButton;
835982 radioButton.SetCamera(cameraView.renderCamera, false);
....@@ -851,23 +998,28 @@
851998 /*DropTarget dropTarget =*/ new DropTarget(oe.cameraView, this);
852999 }
8531000
854
- JCheckBox liveCB;
855
- JCheckBox supportCB;
856
- JCheckBox localCB;
857
- JCheckBox crowdCB;
858
- JCheckBox smoothCB;
859
- JCheckBox fastCB;
860
- JCheckBox slowCB;
861
- JCheckBox boxCB;
862
- JCheckBox zoomBoxCB;
863
- JCheckBox trackCB;
864
- JCheckBox smoothfocusCB;
1001
+ cToggleButton liveCB;
1002
+ cCheckBox supportCB;
1003
+ cCheckBox localCB;
1004
+ cCheckBox crowdCB;
1005
+ cCheckBox smoothCB;
1006
+ cToggleButton fastCB;
1007
+ cCheckBox slowCB;
1008
+ cCheckBox boxCB;
1009
+ cCheckBox zoomBoxCB;
1010
+ cCheckBox freezeCB;
1011
+ //cToggleButton trackCB;
1012
+ cCheckBox trackCB;
1013
+ cCheckBox smoothfocusCB;
8651014 // JCheckBox speakerMocapCB;
866
- JCheckBox speakerCameraCB;
867
- JCheckBox speakerFocusCB;
868
- JCheckBox debugCB;
869
- JCheckBox oeilCB;
870
- JCheckBox lookAtCB;
1015
+ cCheckBox speakerCameraCB;
1016
+ cCheckBox speakerFocusCB;
1017
+ cCheckBox debugCB;
1018
+
1019
+ cCheckBox oeilCB;
1020
+ cCheckBox shadowCB;
1021
+ cCheckBox autosaveCB;
1022
+ cCheckBox lookAtCB;
8711023
8721024 // static int COLOR = 1;
8731025 // static int MATERIAL = 2;
....@@ -875,9 +1027,9 @@
8751027
8761028 int dropAttributes = Object3D.COLOR | Object3D.MATERIAL;
8771029
878
- JCheckBox colorCB;
879
- JCheckBox materialCB;
880
- JCheckBox textureCB;
1030
+ cCheckBox colorCB;
1031
+ cCheckBox materialCB;
1032
+ cCheckBox textureCB;
8811033
8821034 public void itemStateChanged(ItemEvent e)
8831035 {
....@@ -970,6 +1122,18 @@
9701122 {
9711123 cameraView.ToggleOeil();
9721124 }
1125
+ else if(e.getSource() == shadowCB)
1126
+ {
1127
+ Globals.COMPUTESHADOWWHENLIVE ^= true;
1128
+ }
1129
+ else if(e.getSource() == freezeCB)
1130
+ {
1131
+ Globals.FREEZEONMOVE ^= true;
1132
+ }
1133
+ else if(e.getSource() == autosaveCB)
1134
+ {
1135
+ Globals.SAVEONMAKE ^= true;
1136
+ }
9731137 else if(e.getSource() == lookAtCB)
9741138 {
9751139 cameraView.ToggleLookAt();
....@@ -986,7 +1150,8 @@
9861150
9871151 /**/
9881152 //DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
989
- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1153
+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1154
+ TreePath path = objEditor.jTree.getSelectionPath();
9901155 if ((path == null) || (path.getPathCount() <= 1)) {
9911156 // We can't move the root node or an empty selection
9921157 return;
....@@ -1103,23 +1268,33 @@
11031268
11041269 assert target == objEditor.jTree;
11051270 TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
1271
+ Object3D destinationLeaf;
11061272 try {
1107
- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
1273
+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
11081274 } catch (Exception e) {
11091275 System.out.println("destinationPath : " + destinationPath);
11101276 return;
11111277 }
11121278
1113
- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1279
+ for (int i=group.selection.size(); --i>=0;)
11141280 {
1281
+ Object3D child = (Object3D)group.selection.elementAt(i);
1282
+
1283
+ // Cannot move into itself
1284
+ if (child == destinationLeaf)
1285
+ return;
1286
+ }
1287
+
1288
+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1289
+// {
11151290 loadClipboard(true);
11161291 objEditor.jTree.setSelectionPath(destinationPath);
11171292 pasteInto(false, false);
1118
- } else {
1119
- loadClipboard(false);
1120
- objEditor.jTree.setSelectionPath(destinationPath);
1121
- pasteInto(false, false); // true); // ???
1122
- }
1293
+// } else {
1294
+// loadClipboard(false);
1295
+// objEditor.jTree.setSelectionPath(destinationPath);
1296
+// pasteInto(false, false); // true); // ???
1297
+// }
11231298 }
11241299 public void dropActionChanged(DropTargetDragEvent dtde)
11251300 // Called if the user has modified the current drop gesture
....@@ -1224,22 +1399,30 @@
12241399 {
12251400 //heightFieldItem = menu.add(new MenuItem("Height Field"));
12261401 //heightFieldItem.addActionListener(this);
1227
- gridItem = menu.add(new MenuItem("Grid"));
1228
- gridItem.addActionListener(this);
1229
- rectoidItem = menu.add(new MenuItem("Box"));
1230
- rectoidItem.addActionListener(this);
1231
- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1232
- ellipsoidItem.addActionListener(this);
1233
- coneItem = menu.add(new MenuItem("Cone"));
1234
- coneItem.addActionListener(this);
1235
- torusItem = menu.add(new MenuItem("Torus"));
1236
- torusItem.addActionListener(this);
1237
- superItem = menu.add(new MenuItem("Superellipsoid"));
1238
- superItem.addActionListener(this);
1402
+// gridItem = menu.add(new MenuItem("Grid"));
1403
+// gridItem.addActionListener(this);
1404
+// rectoidItem = menu.add(new MenuItem("Box"));
1405
+// rectoidItem.addActionListener(this);
1406
+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
1407
+// ellipsoidItem.addActionListener(this);
1408
+// coneItem = menu.add(new MenuItem("Cone"));
1409
+// coneItem.addActionListener(this);
1410
+// torusItem = menu.add(new MenuItem("Torus"));
1411
+// torusItem.addActionListener(this);
1412
+// superItem = menu.add(new MenuItem("Superellipsoid"));
1413
+// superItem.addActionListener(this);
1414
+
1415
+ cameraItem = menu.add(new MenuItem("Camera"));
1416
+ cameraItem.addActionListener(this);
1417
+
1418
+ if (!Globals.ADVANCED)
1419
+ {
12391420 kleinItem = menu.add(new MenuItem("Klein Bottle"));
12401421 kleinItem.addActionListener(this);
1241
- particleItem = menu.add(new MenuItem("Particle system"));
1242
- particleItem.addActionListener(this);
1422
+ }
1423
+
1424
+// particleItem = menu.add(new MenuItem("Particle system"));
1425
+// particleItem.addActionListener(this);
12431426 if (Globals.ADVANCED)
12441427 {
12451428 ragdollItem = menu.add(new MenuItem("Rag Walk"));
....@@ -1265,15 +1448,15 @@
12651448 }
12661449 bezierItem = menu.add(new MenuItem("Bezier Patch"));
12671450 bezierItem.addActionListener(this);
1268
- overlayItem = menu.add(new MenuItem("Overlay"));
1269
- overlayItem.addActionListener(this);
1270
- lightItem = menu.add(new MenuItem("Light"));
1271
- lightItem.addActionListener(this);
1451
+// overlayItem = menu.add(new MenuItem("Overlay"));
1452
+// overlayItem.addActionListener(this);
1453
+// lightItem = menu.add(new MenuItem("Light"));
1454
+// lightItem.addActionListener(this);
12721455 menu.add("-");
12731456 //superLoopItem = menu.add(new MenuItem("Super Loop"));
12741457 //superLoopItem.addActionListener(this);
1275
- loopItem = menu.add(new MenuItem("Loop"));
1276
- loopItem.addActionListener(this);
1458
+// loopItem = menu.add(new MenuItem("Loop"));
1459
+// loopItem.addActionListener(this);
12771460 doubleItem = menu.add(new MenuItem("Fork"));
12781461 doubleItem.addActionListener(this);
12791462 if (Globals.ADVANCED)
....@@ -1454,9 +1637,24 @@
14541637 shadow.material = new cMaterial(obj.material);
14551638 shadow.material.diffuse = 0.0001f;
14561639 shadow.material.specular = 0.0001f;
1640
+ //shadow.projectedVertices[1].x = 300;
14571641
14581642 makeSomething(shadow);
14591643 }
1644
+
1645
+ private void ClearUnpinned()
1646
+ {
1647
+ //for (Object3D obj : listUI)
1648
+ for (int i=listUI.size(); --i>=0;)
1649
+ {
1650
+ Object3D obj = listUI.elementAt(i);
1651
+ if (!obj.pinned)
1652
+ {
1653
+ obj.CloseUI();
1654
+ listUI.remove(i);
1655
+ }
1656
+ }
1657
+ }
14601658
14611659 /**
14621660 * applyExample
....@@ -1701,7 +1899,7 @@
17011899 {
17021900 ScreenFit();
17031901 } else
1704
- if (source == switchItem)
1902
+ if (source == switchViewItem)
17051903 {
17061904 cVector v1 = new cVector();
17071905 cVector v2 = new cVector();
....@@ -1710,11 +1908,11 @@
17101908 objEditor.cameraView.renderCamera.setAim(v2, v1);
17111909 objEditor.cameraView.repaint();
17121910 } else
1713
- if (source == rectoidItem)
1911
+ if (source == rectoidItem || source == boxButton)
17141912 {
17151913 makeSomething(new Box());
17161914 } else
1717
- if (source == particleItem)
1915
+ if (source == particleItem || source == particlesButton)
17181916 {
17191917 ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
17201918 ParticleController particleController = new ParticleController(particleGeom);
....@@ -1793,27 +1991,27 @@
17931991
17941992 makeSomething(obj);
17951993 } else
1796
- if (source == gridItem)
1994
+ if (source == gridItem || source == gridButton)
17971995 {
17981996 makeSomething(new Grid());
17991997 } else
1800
- if (source == ellipsoidItem)
1998
+ if (source == ellipsoidItem || source == sphereButton)
18011999 {
18022000 makeSomething(new Sphere());
18032001 } else
1804
- if (source == coneItem)
2002
+ if (source == coneItem || source == coneButton)
18052003 {
18062004 makeSomething(new Cone());
18072005 } else
1808
- if (source == torusItem)
2006
+ if (source == torusItem || source == torusButton)
18092007 {
18102008 makeSomething(new Torus());
18112009 } else
1812
- if (source == superItem)
2010
+ if (source == superItem || source == superButton)
18132011 {
18142012 makeSomething(new Superellipsoid());
18152013 } else
1816
- if (source == kleinItem)
2014
+ if (source == kleinItem || source == kleinButton)
18172015 {
18182016 makeSomething(new Klein());
18192017 } else
....@@ -1833,7 +2031,7 @@
18332031 {
18342032 makeSomething(new BezierSurface());
18352033 } else
1836
- if (source == overlayItem)
2034
+ if (source == overlayItem || source == overlayButton)
18372035 {
18382036 /*
18392037 Object3D obj = new BezierSurface(5,8);
....@@ -1881,7 +2079,7 @@
18812079 s.setup();
18822080 makeSomething(s);
18832081 } else
1884
- if (source == lightItem)
2082
+ if (source == lightItem || source == lightButton)
18852083 {
18862084 makeSomething(new Light());
18872085 } else
....@@ -1931,30 +2129,30 @@
19312129
19322130 group(g);
19332131 } else
1934
- if (source == loopItem)
2132
+ if (source == loopItem || source == loopButton)
19352133 {
19362134 Composite csg = new GroupLeaf();
19372135 csg.count = 5;
19382136 group(csg);
1939
- Composite child = new cGroup();
2137
+ Composite child = new cGroup("Branch");
19402138 csg.addChild(child);
19412139 child.addChild(csg);
19422140 } else
19432141 if (source == doubleItem)
19442142 {
1945
- Composite csg = new GroupLeaf();
2143
+ Composite csg = new GroupLeaf("Fork");
19462144 csg.count = 5;
19472145 group(csg);
1948
- Composite child = new cGroup();
2146
+ Composite child = new cGroup("Branch A");
19492147 csg.addChild(child);
19502148 child.addChild(csg);
1951
- child = new cGroup();
2149
+ child = new cGroup("Branch B");
19522150 csg.addChild(child);
19532151 child.addChild(csg);
19542152 } else
19552153 if (source == tripleItem)
19562154 {
1957
- Composite csg = new GroupLeaf();
2155
+ Composite csg = new GroupLeaf("Trident");
19582156 csg.count = 4;
19592157 group(csg);
19602158 Composite child = new cGroup();
....@@ -2421,9 +2619,9 @@
24212619 {
24222620 ClearSelection(true);
24232621 } else
2424
- if (source == grabItem)
2622
+ if (source == grabItem || source == groupButton)
24252623 {
2426
- group(new cGroup(), true);
2624
+ group(new cGroup(), false); // true);
24272625 } else
24282626 if (source == hideItem)
24292627 {
....@@ -2441,11 +2639,11 @@
24412639 {
24422640 makeSomething(new Camera());
24432641 } else
2444
- if (source == compositeItem)
2642
+ if (source == compositeItem || source == compositeButton)
24452643 {
24462644 group(new Composite());
24472645 } else
2448
- if (source == randomItem)
2646
+ if (source == switchItem || source == switchButton)
24492647 {
24502648 RandomNode random = new RandomNode();
24512649 group(random);
....@@ -2547,7 +2745,7 @@
25472745 {
25482746 group(new cLinker());
25492747 } else
2550
- if (source == textureItem)
2748
+ if (source == textureItem || source == textureButton)
25512749 {
25522750 group(new TextureNode());
25532751 } else
....@@ -2567,17 +2765,30 @@
25672765 {
25682766 CastShadow(2);
25692767 } else
2570
- if (source == ungroupItem)
2768
+ if (source == ungroupItem || source == ungroupButton)
25712769 {
2572
- //ungroup();
2770
+ boolean hasRoot = false;
2771
+
25732772 for (int i=0; i<group.selection.size(); i++)
25742773 {
2575
- Ungroup(group.selection.get(i));
2774
+ if (group.selection.get(i) == group)
2775
+ {
2776
+ hasRoot = true;
2777
+ break;
2778
+ }
25762779 }
25772780
2578
- ClearSelection(false);
2579
-
2580
- refreshContents();
2781
+ if (!hasRoot)
2782
+ {
2783
+ for (int i=0; i<group.selection.size(); i++)
2784
+ {
2785
+ Ungroup(group.selection.get(i));
2786
+ }
2787
+
2788
+ ClearSelection(false);
2789
+
2790
+ refreshContents();
2791
+ }
25812792 } else
25822793 if (source == genUVItem)
25832794 {
....@@ -2905,6 +3116,10 @@
29053116 if (source == twoButton)
29063117 {
29073118 radio.layout = twoButton;
3119
+
3120
+ if (CameraPane.FULLSCREEN)
3121
+ fullscreenLayout = radio.layout;
3122
+
29083123 // bug
29093124 //gridPanel.setDividerLocation(1.0);
29103125 //bigPanel.setDividerLocation(0.0);
....@@ -2960,6 +3175,9 @@
29603175 {
29613176 radio.layout = threeButton;
29623177
3178
+ if (CameraPane.FULLSCREEN)
3179
+ fullscreenLayout = radio.layout;
3180
+
29633181 // bigThree.remove(scenePanel);
29643182 // bigThree.remove(centralPanel);
29653183 // bigThree.remove(XYZPanel);
....@@ -2998,6 +3216,9 @@
29983216 {
29993217 radio.layout = fourButton;
30003218
3219
+ if (CameraPane.FULLSCREEN)
3220
+ fullscreenLayout = radio.layout;
3221
+
30013222 // bigThree.remove(scenePanel);
30023223 // bigThree.remove(centralPanel);
30033224 // bigThree.remove(XYZPanel);
....@@ -3034,6 +3255,9 @@
30343255 if (source == sixButton)
30353256 {
30363257 radio.layout = sixButton;
3258
+
3259
+ if (CameraPane.FULLSCREEN)
3260
+ fullscreenLayout = radio.layout;
30373261
30383262 // bigThree.remove(scenePanel);
30393263 // bigThree.remove(centralPanel);
....@@ -3072,6 +3296,9 @@
30723296 if (source == sevenButton)
30733297 {
30743298 radio.layout = sevenButton;
3299
+
3300
+ if (CameraPane.FULLSCREEN)
3301
+ fullscreenLayout = radio.layout;
30753302
30763303 // bigThree.remove(scenePanel);
30773304 // bigThree.remove(centralPanel);
....@@ -3128,12 +3355,19 @@
31283355 for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
31293356 {
31303357 ab = (cRadio)e.nextElement();
3131
- if(ab.getModel().isSelected() && ab.GetObject() != client)
3358
+ if (ab.getModel().isSelected() && ab.GetObject() != client)
31323359 {
3360
+ // Patch to avoid bug with transparency.
3361
+ if (!ab.hadMaterial)
3362
+ {
3363
+ ab.object.material = null;
3364
+ }
3365
+
31333366 buttonGroup.remove(ab);
31343367 radioPanel.remove(ab);
31353368
3136
- ab.GetObject().editWindow = null;
3369
+ //ab.GetObject().editWindow = null;
3370
+ ab.GetObject().manipWindow = null;
31373371 // ab.GetObject().objectUI = null; // ?????????
31383372
31393373 ((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
....@@ -3146,6 +3380,12 @@
31463380 } else
31473381 if (source == editItem || source == editButton)
31483382 {
3383
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3384
+ {
3385
+ Object3D child = (Object3D)e.nextElement();
3386
+ child.pinned = true;
3387
+ }
3388
+
31493389 EditSelection(false);
31503390 } else
31513391 if (source == uneditButton)
....@@ -3155,6 +3395,7 @@
31553395 Object3D child = (Object3D)e.nextElement();
31563396 if(child.editWindow != null)
31573397 objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3398
+ child.pinned = false;
31583399 child.CloseUI();
31593400 listUI.remove(child);
31603401
....@@ -3171,6 +3412,7 @@
31713412 //copy.ClearUI();
31723413 for (Object3D obj : listUI)
31733414 {
3415
+ obj.pinned = false;
31743416 obj.CloseUI();
31753417 }
31763418 listUI.clear();
....@@ -3180,7 +3422,7 @@
31803422 {
31813423 assert(copy == group);
31823424
3183
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3425
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
31843426
31853427 for (Object3D obj : listUI)
31863428 {
....@@ -3247,6 +3489,7 @@
32473489
32483490 // fix "+" issue
32493491 //group.editWindow = this;
3492
+ group.manipWindow = this;
32503493
32513494 /*
32523495 currentLayout = radio.layout;
....@@ -3254,6 +3497,11 @@
32543497 currentLayout = sevenButton;
32553498 */
32563499 radio.layout.doClick();
3500
+
3501
+ ClearUnpinned();
3502
+ SetPinStates(group.selection.size() > 0);
3503
+ if (group.selection.size() == 1)
3504
+ EditSelection(false);
32573505 keepparent = group.parent;
32583506 // PARENT = NULL or not???
32593507 //group.parent = null; // ROOT
....@@ -3267,7 +3515,7 @@
32673515 cameraView.ProtectCamera();
32683516 cameraView.repaint();
32693517 return;
3270
- } else if (event.getSource() == revertCameraItem)
3518
+ } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
32713519 {
32723520 cameraView.RevertCamera();
32733521 cameraView.repaint();
....@@ -4321,10 +4569,6 @@
43214569 // }
43224570 // }
43234571
4324
- static boolean allparams = true;
4325
-
4326
- static Vector<Object3D> listUI = new Vector<Object3D>();
4327
-
43284572 void EditSelection(boolean newWindow)
43294573 {
43304574 // aConstraints.gridy = 0;
....@@ -4332,7 +4576,7 @@
43324576 {
43334577 //System.out.println("edit : " + objectPanel.indexOfTab("Material"));
43344578 //objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4335
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4579
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
43364580
43374581 Object3D elem = (Object3D)group.selection.elementAt(i);
43384582 if(elem != group || !newWindow)
....@@ -4417,7 +4661,8 @@
44174661 //new Exception().printStackTrace();
44184662
44194663 freezemodel = true;
4420
-
4664
+ ClearUnpinned();
4665
+
44214666 /**/
44224667 //switch (event.id)
44234668 {
....@@ -4450,7 +4695,7 @@
44504695 if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
44514696 // a camera
44524697 {
4453
- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
4698
+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
44544699 {
44554700 CameraPane.camerachangeframe = 0; // don't refuse it
44564701 Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
....@@ -4459,6 +4704,13 @@
44594704 // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
44604705 }
44614706
4707
+ if (tps != null && tps.length == 1)
4708
+ {
4709
+ EditSelection(false);
4710
+ }
4711
+
4712
+ SetPinStates(tps != null && tps.length > 0);
4713
+
44624714 refreshContents();
44634715 //return true;
44644716 }
....@@ -4468,9 +4720,18 @@
44684720 freezemodel = false;
44694721 }
44704722
4723
+ void SetPinStates(boolean enabled)
4724
+ {
4725
+ editButton.setEnabled(enabled);
4726
+ uneditButton.setEnabled(enabled);
4727
+ unselectButton.setEnabled(enabled);
4728
+ flashSelectionButton.setEnabled(enabled);
4729
+ }
4730
+
44714731 void refreshContents(boolean cp)
44724732 {
4473
- if (!Globals.MOUSEDRAGGED)
4733
+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4734
+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
44744735 {
44754736 objEditor.ClearInfo(); // .GetMaterial());
44764737
....@@ -4569,6 +4830,7 @@
45694830
45704831 if (cut)
45714832 {
4833
+ if (Globals.SAVEONMAKE)
45724834 Save();
45734835 //int indices[] = jList.getSelectedIndices();
45744836 //for (int i = indices.length - 1; i >= 0; i--)
....@@ -5287,13 +5549,28 @@
52875549 cButton clearpanelButton;
52885550 cButton unselectButton;
52895551
5290
- cButton minButton;
5291
- cButton maxButton;
5292
- cButton fullButton;
5293
- cButton undoButton;
5294
- cButton redoButton;
5552
+ cButton restoreCameraButton;
5553
+
52955554 cButton saveButton;
52965555 cButton oneStepButton;
5556
+
5557
+ cButton groupButton;
5558
+ cButton ungroupButton;
5559
+ cButton compositeButton;
5560
+ cButton switchButton;
5561
+ cButton loopButton;
5562
+ cButton textureButton;
5563
+
5564
+ cButton gridButton;
5565
+ cButton boxButton;
5566
+ cButton sphereButton;
5567
+ cButton coneButton;
5568
+ cButton torusButton;
5569
+ cButton superButton;
5570
+ cButton kleinButton;
5571
+ cButton particlesButton;
5572
+ cButton overlayButton;
5573
+ cButton lightButton;
52975574
52985575 cButton screenfitButton;
52995576 cButton screenfitpointButton;
....@@ -5315,11 +5592,11 @@
53155592 //JTree jTree;
53165593 private MenuItem lookAtItem;
53175594 private MenuItem lookFromItem;
5318
- private MenuItem switchItem;
5595
+ private MenuItem switchViewItem;
53195596 private MenuItem cutItem;
53205597 private MenuItem undoItem;
53215598 private MenuItem redoItem;
5322
- private MenuItem duplicateItem;
5599
+ private JMenuItem duplicateItem;
53235600 private MenuItem cloneItem;
53245601 private MenuItem cloneSupportItem;
53255602 private MenuItem overwriteGeoItem;
....@@ -5407,7 +5684,7 @@
54075684 private MenuItem frontItem;
54085685 private MenuItem cameraItem;
54095686 private MenuItem compositeItem;
5410
- private MenuItem randomItem;
5687
+ private MenuItem switchItem;
54115688 private MenuItem physicsItem;
54125689 private MenuItem frameselectorItem;
54135690 private MenuItem scriptNodeItem;
....@@ -5481,5 +5758,5 @@
54815758
54825759 Menu cameraMenu;
54835760 MenuItem editCameraItem;
5484
- MenuItem revertCameraItem;
5761
+ MenuItem restoreCameraItem;
54855762 }