Normand Briere
2019-07-01 9079880942d022ee32fd3a543843e132e52deb1a
GroupEditor.java
....@@ -150,11 +150,19 @@
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"));
156158 //editItem.addActionListener(this);
157
- duplicateItem = menu.add(new MenuItem("Duplicate"));
159
+
160
+// undoItem = menu.add(new MenuItem("Undo"));
161
+// undoItem.addActionListener(this);
162
+// redoItem = menu.add(new MenuItem("Redo"));
163
+// redoItem.addActionListener(this);
164
+// menu.add("-");
165
+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
158166 duplicateItem.addActionListener(this);
159167 cloneItem = menu.add(new MenuItem("Clone"));
160168 cloneItem.addActionListener(this);
....@@ -170,7 +178,6 @@
170178 copyItem.addActionListener(this);
171179 pasteItem = menu.add(new MenuItem("Paste"));
172180 pasteItem.addActionListener(this);
173
- menu.add("-");
174181
175182 menu.add("-");
176183 pasteIntoItem = menu.add(new MenuItem("Paste into"));
....@@ -197,23 +204,23 @@
197204 //zBufferItem.addActionListener(this);
198205 //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
199206 //normalLensItem.addActionListener(this);
200
- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
201
- revertCameraItem.addActionListener(this);
207
+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
208
+ restoreCameraItem.addActionListener(this);
202209
203
- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
204
- toggleFullScreenItem.addItemListener(this);
205
- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
206
- 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);
207222
208
- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
209
- toggleTextureItem.addItemListener(this);
210
- toggleTextureItem.setState(CameraPane.textureon);
211
-
212
- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
213
- toggleSwitchItem.addItemListener(this);
214
- toggleSwitchItem.setState(CameraPane.SWITCH);
215
-
216
- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
223
+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
217224 toggleHandleItem.addItemListener(this);
218225 toggleHandleItem.setState(CameraPane.HANDLES);
219226
....@@ -240,7 +247,7 @@
240247
241248 cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
242249 toggleDebugItem.addItemListener(this);
243
- toggleDebugItem.setState(CameraPane.DEBUG);
250
+ toggleDebugItem.setState(Globals.DEBUG);
244251
245252 cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
246253 toggleFrustumItem.addItemListener(this);
....@@ -261,14 +268,14 @@
261268 // animationItem.addItemListener(this);
262269 // animationItem.setState(CameraPane.ANIMATION);
263270 cameraMenu.add("-");
264
- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
271
+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
265272 editCameraItem.addActionListener(this);
266273
267274 if (Globals.ADVANCED)
268275 {
269276 oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
270277 //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
271
- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
278
+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
272279 editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
273280 oe.cameraMenu.add("-");
274281 openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
....@@ -276,7 +283,7 @@
276283 editLeafItem.addActionListener(this);
277284 lookAtItem.addActionListener(this);
278285 //lookFromItem.addActinoListener(this);
279
- //switchItem.addActionListener(this);
286
+ //switchViewItem.addActionListener(this);
280287 }
281288
282289 oe.menuBar.add(menu = new Menu("Setting"));
....@@ -321,21 +328,29 @@
321328 }
322329
323330 oe.menuBar.add(menu = new Menu("Group"));
324
- grabItem = menu.add(new MenuItem("Grab"));
325
- grabItem.addActionListener(this);
331
+// grabItem = menu.add(new MenuItem("Grab"));
332
+// grabItem.addActionListener(this);
326333 backItem = menu.add(new MenuItem("Back"));
327334 backItem.addActionListener(this);
328335 frontItem = menu.add(new MenuItem("Front"));
329336 frontItem.addActionListener(this);
330
- compositeItem = menu.add(new MenuItem("Composite"));
331
- compositeItem.addActionListener(this);
337
+// compositeItem = menu.add(new MenuItem("Composite"));
338
+// compositeItem.addActionListener(this);
339
+
340
+ if (Globals.ADVANCED)
341
+ {
332342 hideItem = menu.add(new MenuItem("Hidden Group"));
333343 hideItem.addActionListener(this);
344
+ }
334345 ungroupItem = menu.add(new MenuItem("Ungroup"));
335346 ungroupItem.addActionListener(this);
336
- menu.add("-");
337
- randomItem = menu.add(new MenuItem("Switch node"));
338
- 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
+ {
339354 switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
340355 switchGeoItem.addActionListener(this);
341356 switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
....@@ -343,8 +358,6 @@
343358 morphItem = menu.add(new MenuItem("Morph Group"));
344359 morphItem.addActionListener(this);
345360
346
- if (Globals.ADVANCED)
347
- {
348361 menu.add("-");
349362 physicsItem = menu.add(new MenuItem("Physics"));
350363 physicsItem.addActionListener(this);
....@@ -352,22 +365,20 @@
352365 frameselectorItem.addActionListener(this);
353366 scriptNodeItem = menu.add(new MenuItem("Script Node"));
354367 scriptNodeItem.addActionListener(this);
355
- cameraItem = menu.add(new MenuItem("Camera"));
356
- cameraItem.addActionListener(this);
357368 }
358369
359370 oe.menuBar.add(menu = new Menu("Object"));
360
- textureItem = menu.add(new MenuItem("Texture"));
361
- textureItem.addActionListener(this);
371
+// textureItem = menu.add(new MenuItem("Texture"));
372
+// textureItem.addActionListener(this);
362373 billboardItem = menu.add(new MenuItem("Billboard"));
363374 billboardItem.addActionListener(this);
364375 csgItem = menu.add(new MenuItem("CSG"));
365376 csgItem.addActionListener(this);
366
- shadowXItem = menu.add(new MenuItem("Shadow X"));
377
+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
367378 shadowXItem.addActionListener(this);
368
- shadowYItem = menu.add(new MenuItem("Shadow Y"));
379
+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
369380 shadowYItem.addActionListener(this);
370
- shadowZItem = menu.add(new MenuItem("Shadow Z"));
381
+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
371382 shadowZItem.addActionListener(this);
372383 if (Globals.ADVANCED)
373384 {
....@@ -464,6 +475,14 @@
464475 markleavesItem.addActionListener(this);
465476 unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
466477 unmarkleavesItem.addActionListener(this);
478
+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
479
+ rewindleavesItem.addActionListener(this);
480
+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
481
+ unrewindleavesItem.addActionListener(this);
482
+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
483
+ randomleavesItem.addActionListener(this);
484
+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
485
+ unrandomleavesItem.addActionListener(this);
467486 menu.add("-");
468487 flipVItem = menu.add(new MenuItem("Flip V"));
469488 flipVItem.addActionListener(this);
....@@ -521,6 +540,18 @@
521540
522541 void SetupUI2(ObjEditor oe)
523542 {
543
+ // June 2019
544
+ if (oe == null)
545
+ {
546
+ //super.SetupUI2(this);
547
+ //return;
548
+ }
549
+
550
+ if (copy != group)
551
+ {
552
+ //super.SetupUI2(this);
553
+ }
554
+
524555 //new Exception().printStackTrace();
525556
526557 oe.radioPanel = new JPanel(new GridBagLayout());
....@@ -549,27 +580,66 @@
549580 oe.radioPanel.add(dummyButton);
550581 oe.buttonGroup.add(dummyButton);
551582 */
583
+ cGridBag copyOptionsPanel = new cGridBag();
584
+
585
+ copyOptionsPanel.preferredHeight = 1;
586
+
552587 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
553588
554
- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
589
+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
590
+ //minButton.setToolTipText("Minimize window");
591
+ //minButton.addActionListener(this);
592
+
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
+ }
599
+
600
+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
601
+ fullButton.setToolTipText("Full-screen window");
602
+ fullButton.addActionListener(this);
603
+
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);
609
+ undoButton.setToolTipText("Undo changes");
610
+ undoButton.addActionListener(this);
611
+ undoButton.setEnabled(false);
612
+
613
+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
614
+ redoButton.setToolTipText("Redo changes");
615
+ redoButton.addActionListener(this);
616
+ redoButton.setEnabled(false);
617
+
618
+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
619
+ saveButton.setToolTipText("Save changes");
620
+ saveButton.addActionListener(this);
621
+
622
+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
555623 liveCB.setToolTipText("Enable animation");
556624 liveCB.addItemListener(this);
557625
558
- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
626
+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
559627 oneStepButton.setToolTipText("Animate one step forward");
560628 oneStepButton.addActionListener(this);
561629
562
- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
630
+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
563631 fastCB.setToolTipText("Fast mode");
564632 fastCB.addItemListener(this);
565633
566
- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
567
- trackCB.setToolTipText("Enable tracking");
568
- trackCB.addItemListener(this);
569
-
570
- 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);
571637 screenfitButton.setToolTipText("Screen fit");
572638 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);
573643
574644 // oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
575645 // screenfitpointButton.addActionListener(this);
....@@ -581,65 +651,145 @@
581651 snapobjectButton.setToolTipText("Snap Object");
582652 }
583653
584
- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585
- flashSelectionButton.setToolTipText("Show selection");
586
- flashSelectionButton.addActionListener(this);
654
+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
587655
588
- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
589
-
590
- oe.toolbarPanel.add(twoButton = new cButton("|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
656
+ oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
591657 twoButton.setToolTipText("Show center view only");
592658 twoButton.addActionListener(this);
593
- 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);
594662 fourButton.addActionListener(this);
595663 fourButton.setToolTipText("Show left panel only");
596
- oe.toolbarPanel.add(sixButton = new cButton("+|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
664
+ oe.toolbarPanel.add(sixButton = new cButton("-|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597665 sixButton.setToolTipText("2-column layout left");
598666 sixButton.addActionListener(this);
599
- oe.toolbarPanel.add(threeButton = new cButton("|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
667
+ oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600668 threeButton.setToolTipText("2-column layout right");
601669 threeButton.addActionListener(this);
602
- oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
670
+ oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603671 sevenButton.setToolTipText("3-column layout");
604672 sevenButton.addActionListener(this);
605673 //
606674
607
- 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);
608676 rootButton.setToolTipText("Edit selection in new tab");
609677 rootButton.addActionListener(this);
610678
611
- 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);
612680 closeButton.setToolTipText("Close tab");
613681 closeButton.addActionListener(this);
614682 //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
615683 //clearButton.addActionListener(this);
616
-
617
- 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
+ }
618716
619
- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620
- 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");
621766 editButton.addActionListener(this);
622767
623
- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624
- uneditButton.setToolTipText("Unedit selection");
768
+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
769
+ uneditButton.setToolTipText("Remove selection controls");
625770 uneditButton.addActionListener(this);
626771
627
- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
628
- allParamsButton.setToolTipText("Edit all params");
772
+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
773
+ allParamsButton.setToolTipText("Show all controle");
629774 allParamsButton.addActionListener(this);
630775
631
- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
776
+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632777 clearPanelButton.setToolTipText("Clear edit panel");
633778 clearPanelButton.addActionListener(this);
634779
635
- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
780
+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
636781 unselectButton.setToolTipText("Unselect");
637782 unselectButton.addActionListener(this);
638783
639
- 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);
640787
641
- oe.treePanel.add(commandsPanel);
642
- oe.treePanel.Return();
788
+ editCommandsPanel.preferredHeight = 1;
789
+
790
+ SetPinStates(false);
791
+// oe.treePanel.add(commandsPanel);
792
+// oe.treePanel.Return();
643793
644794 // oe.aConstraints.gridx += 1;
645795 // oe.aConstraints.weighty = 0;
....@@ -656,27 +806,12 @@
656806
657807 JScrollPane jSP;
658808 //ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
659
- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
809
+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
660810 ResetModel();
661811
662812 oe.treePanel.add(jSPPanel);
663813 oe.treePanel.Return();
664814
665
- cGridBag copyOptionsPanel = new cGridBag();
666
-
667
- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
668
- colorCB.setToolTipText("Copy color when dropped");
669
- colorCB.addItemListener(this);
670
-
671
- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
672
- materialCB.setToolTipText("Copy material when dropped");
673
- materialCB.addItemListener(this);
674
-
675
- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
676
- textureCB.setToolTipText("Copy texture when dropped");
677
- textureCB.addItemListener(this);
678
-
679
- copyOptionsPanel.preferredHeight = 1;
680815 oe.treePanel.add(copyOptionsPanel);
681816 oe.treePanel.Return();
682817
....@@ -707,23 +842,43 @@
707842
708843 void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
709844 {
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
+
710859 panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
711860 boxCB.setToolTipText("Display bounding boxes");
712861 boxCB.addItemListener(this);
713862
714863 panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
715
- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
864
+ zoomBoxCB.setToolTipText("Display only for wheel");
716865 zoomBoxCB.addItemListener(this);
717866
718867 if (true) // Globals.ADVANCED)
719868 {
720
- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
721
- supportCB.setToolTipText("Enable rigging");
722
- 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);
723876
724877 // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
725878 // localCB.addItemListener(this);
726879
880
+ panel.Return();
881
+
727882 panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
728883 crowdCB.setToolTipText("Used for crowds");
729884 crowdCB.addItemListener(this);
....@@ -740,6 +895,8 @@
740895 // panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
741896 // speakerMocapCB.addItemListener(this);
742897
898
+ panel.Return();
899
+
743900 if (false)
744901 {
745902 // handled in scripts
....@@ -754,32 +911,72 @@
754911 //constraints.gridy += 1;
755912 panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
756913 smoothfocusCB.addItemListener(this);
914
+ panel.Return();
757915 }
758916
759917 //constraints.gridx += 1;
760918 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
761919 // debugCB.addItemListener(this);
762920
921
+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
922
+ trackCB.setToolTipText("Enable tracking target");
923
+ trackCB.addItemListener(this);
924
+
763925 panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
926
+ oeilCB.setToolTipText("Move camera when tracking");
764927 oeilCB.addItemListener(this);
765928
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
+ {
766949 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
767950 lookAtCB.setToolTipText("Look-at target");
768951 lookAtCB.addItemListener(this);
952
+ }
769953
770954 }
771955
772956 cGridBag fill = new cGridBag();
773
-
774957 fill.preferredHeight = 200;
958
+ cGridBag fill2 = new cGridBag();
959
+ fill2.preferredHeight = 200;
960
+ cGridBag fill3 = new cGridBag();
961
+ fill3.preferredHeight = 200;
775962
776963 panel.add(fill);
964
+ panel.add(fill2);
965
+ panel.add(fill3);
777966
778967 }
779968
780969 void EditObject(Object3D obj)
781970 {
782971 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
+
783980 radioButton.SetObject(obj);
784981 radioButton.layout = sevenButton;
785982 radioButton.SetCamera(cameraView.renderCamera, false);
....@@ -791,6 +988,8 @@
791988
792989 void SetupViews(ObjEditor oe)
793990 {
991
+ theFrame = this;
992
+
794993 oe.SetupViews();
795994
796995 System.out.println("SetupViews");
....@@ -799,23 +998,28 @@
799998 /*DropTarget dropTarget =*/ new DropTarget(oe.cameraView, this);
800999 }
8011000
802
- JCheckBox liveCB;
803
- JCheckBox supportCB;
804
- JCheckBox localCB;
805
- JCheckBox crowdCB;
806
- JCheckBox smoothCB;
807
- JCheckBox fastCB;
808
- JCheckBox slowCB;
809
- JCheckBox boxCB;
810
- JCheckBox zoomBoxCB;
811
- JCheckBox trackCB;
812
- 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;
8131014 // JCheckBox speakerMocapCB;
814
- JCheckBox speakerCameraCB;
815
- JCheckBox speakerFocusCB;
816
- JCheckBox debugCB;
817
- JCheckBox oeilCB;
818
- JCheckBox lookAtCB;
1015
+ cCheckBox speakerCameraCB;
1016
+ cCheckBox speakerFocusCB;
1017
+ cCheckBox debugCB;
1018
+
1019
+ cCheckBox oeilCB;
1020
+ cCheckBox shadowCB;
1021
+ cCheckBox autosaveCB;
1022
+ cCheckBox lookAtCB;
8191023
8201024 // static int COLOR = 1;
8211025 // static int MATERIAL = 2;
....@@ -823,9 +1027,9 @@
8231027
8241028 int dropAttributes = Object3D.COLOR | Object3D.MATERIAL;
8251029
826
- JCheckBox colorCB;
827
- JCheckBox materialCB;
828
- JCheckBox textureCB;
1030
+ cCheckBox colorCB;
1031
+ cCheckBox materialCB;
1032
+ cCheckBox textureCB;
8291033
8301034 public void itemStateChanged(ItemEvent e)
8311035 {
....@@ -853,6 +1057,7 @@
8531057 } else if(e.getSource() == liveCB)
8541058 {
8551059 cameraView.ToggleLive();
1060
+ refreshContents(false);
8561061 }
8571062 else if(e.getSource() == supportCB)
8581063 {
....@@ -917,6 +1122,18 @@
9171122 {
9181123 cameraView.ToggleOeil();
9191124 }
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
+ }
9201137 else if(e.getSource() == lookAtCB)
9211138 {
9221139 cameraView.ToggleLookAt();
....@@ -933,7 +1150,8 @@
9331150
9341151 /**/
9351152 //DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
936
- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1153
+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1154
+ TreePath path = objEditor.jTree.getSelectionPath();
9371155 if ((path == null) || (path.getPathCount() <= 1)) {
9381156 // We can't move the root node or an empty selection
9391157 return;
....@@ -1050,23 +1268,33 @@
10501268
10511269 assert target == objEditor.jTree;
10521270 TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
1271
+ Object3D destinationLeaf;
10531272 try {
1054
- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
1273
+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
10551274 } catch (Exception e) {
10561275 System.out.println("destinationPath : " + destinationPath);
10571276 return;
10581277 }
10591278
1060
- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1279
+ for (int i=group.selection.size(); --i>=0;)
10611280 {
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
+// {
10621290 loadClipboard(true);
10631291 objEditor.jTree.setSelectionPath(destinationPath);
10641292 pasteInto(false, false);
1065
- } else {
1066
- loadClipboard(false);
1067
- objEditor.jTree.setSelectionPath(destinationPath);
1068
- pasteInto(false, false); // true); // ???
1069
- }
1293
+// } else {
1294
+// loadClipboard(false);
1295
+// objEditor.jTree.setSelectionPath(destinationPath);
1296
+// pasteInto(false, false); // true); // ???
1297
+// }
10701298 }
10711299 public void dropActionChanged(DropTargetDragEvent dtde)
10721300 // Called if the user has modified the current drop gesture
....@@ -1171,22 +1399,30 @@
11711399 {
11721400 //heightFieldItem = menu.add(new MenuItem("Height Field"));
11731401 //heightFieldItem.addActionListener(this);
1174
- gridItem = menu.add(new MenuItem("Grid"));
1175
- gridItem.addActionListener(this);
1176
- rectoidItem = menu.add(new MenuItem("Box"));
1177
- rectoidItem.addActionListener(this);
1178
- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1179
- ellipsoidItem.addActionListener(this);
1180
- coneItem = menu.add(new MenuItem("Cone"));
1181
- coneItem.addActionListener(this);
1182
- torusItem = menu.add(new MenuItem("Torus"));
1183
- torusItem.addActionListener(this);
1184
- superItem = menu.add(new MenuItem("Superellipsoid"));
1185
- 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
+ {
11861420 kleinItem = menu.add(new MenuItem("Klein Bottle"));
11871421 kleinItem.addActionListener(this);
1188
- particleItem = menu.add(new MenuItem("Particle system"));
1189
- particleItem.addActionListener(this);
1422
+ }
1423
+
1424
+// particleItem = menu.add(new MenuItem("Particle system"));
1425
+// particleItem.addActionListener(this);
11901426 if (Globals.ADVANCED)
11911427 {
11921428 ragdollItem = menu.add(new MenuItem("Rag Walk"));
....@@ -1212,15 +1448,15 @@
12121448 }
12131449 bezierItem = menu.add(new MenuItem("Bezier Patch"));
12141450 bezierItem.addActionListener(this);
1215
- overlayItem = menu.add(new MenuItem("Overlay"));
1216
- overlayItem.addActionListener(this);
1217
- lightItem = menu.add(new MenuItem("Light"));
1218
- 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);
12191455 menu.add("-");
12201456 //superLoopItem = menu.add(new MenuItem("Super Loop"));
12211457 //superLoopItem.addActionListener(this);
1222
- loopItem = menu.add(new MenuItem("Loop"));
1223
- loopItem.addActionListener(this);
1458
+// loopItem = menu.add(new MenuItem("Loop"));
1459
+// loopItem.addActionListener(this);
12241460 doubleItem = menu.add(new MenuItem("Fork"));
12251461 doubleItem.addActionListener(this);
12261462 if (Globals.ADVANCED)
....@@ -1235,6 +1471,9 @@
12351471 menu.add(animationItem = new CheckboxMenuItem("Animation..."));
12361472 animationItem.addItemListener(this);
12371473 animationItem.setState(Globals.ANIMATION);
1474
+
1475
+ menu.add(archiveItem = new CheckboxMenuItem("Archive3D..."));
1476
+ archiveItem.addItemListener(this);
12381477
12391478 menu.add("-");
12401479 parseverticesItem = menu.add(new MenuItem("Multiplicity"));
....@@ -1260,7 +1499,7 @@
12601499 memoryItem.addActionListener(this);
12611500 menu.add(analyzeItem = new MenuItem("Analyze"));
12621501 analyzeItem.addActionListener(this);
1263
- menu.add(dumpItem = new MenuItem("Dump"));
1502
+ menu.add(dumpItem = new MenuItem("Print"));
12641503 dumpItem.addActionListener(this);
12651504 // menu.add(pathItem = new MenuItem("From-to path"));
12661505 // pathItem.addActionListener(this);
....@@ -1401,9 +1640,24 @@
14011640 shadow.material = new cMaterial(obj.material);
14021641 shadow.material.diffuse = 0.0001f;
14031642 shadow.material.specular = 0.0001f;
1643
+ //shadow.projectedVertices[1].x = 300;
14041644
14051645 makeSomething(shadow);
14061646 }
1647
+
1648
+ private void ClearUnpinned()
1649
+ {
1650
+ //for (Object3D obj : listUI)
1651
+ for (int i=listUI.size(); --i>=0;)
1652
+ {
1653
+ Object3D obj = listUI.elementAt(i);
1654
+ if (!obj.pinned)
1655
+ {
1656
+ obj.CloseUI();
1657
+ listUI.remove(i);
1658
+ }
1659
+ }
1660
+ }
14071661
14081662 /**
14091663 * applyExample
....@@ -1648,7 +1902,7 @@
16481902 {
16491903 ScreenFit();
16501904 } else
1651
- if (source == switchItem)
1905
+ if (source == switchViewItem)
16521906 {
16531907 cVector v1 = new cVector();
16541908 cVector v2 = new cVector();
....@@ -1657,11 +1911,11 @@
16571911 objEditor.cameraView.renderCamera.setAim(v2, v1);
16581912 objEditor.cameraView.repaint();
16591913 } else
1660
- if (source == rectoidItem)
1914
+ if (source == rectoidItem || source == boxButton)
16611915 {
16621916 makeSomething(new Box());
16631917 } else
1664
- if (source == particleItem)
1918
+ if (source == particleItem || source == particlesButton)
16651919 {
16661920 ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
16671921 ParticleController particleController = new ParticleController(particleGeom);
....@@ -1740,27 +1994,27 @@
17401994
17411995 makeSomething(obj);
17421996 } else
1743
- if (source == gridItem)
1997
+ if (source == gridItem || source == gridButton)
17441998 {
17451999 makeSomething(new Grid());
17462000 } else
1747
- if (source == ellipsoidItem)
2001
+ if (source == ellipsoidItem || source == sphereButton)
17482002 {
17492003 makeSomething(new Sphere());
17502004 } else
1751
- if (source == coneItem)
2005
+ if (source == coneItem || source == coneButton)
17522006 {
17532007 makeSomething(new Cone());
17542008 } else
1755
- if (source == torusItem)
2009
+ if (source == torusItem || source == torusButton)
17562010 {
17572011 makeSomething(new Torus());
17582012 } else
1759
- if (source == superItem)
2013
+ if (source == superItem || source == superButton)
17602014 {
17612015 makeSomething(new Superellipsoid());
17622016 } else
1763
- if (source == kleinItem)
2017
+ if (source == kleinItem || source == kleinButton)
17642018 {
17652019 makeSomething(new Klein());
17662020 } else
....@@ -1780,7 +2034,7 @@
17802034 {
17812035 makeSomething(new BezierSurface());
17822036 } else
1783
- if (source == overlayItem)
2037
+ if (source == overlayItem || source == overlayButton)
17842038 {
17852039 /*
17862040 Object3D obj = new BezierSurface(5,8);
....@@ -1828,7 +2082,7 @@
18282082 s.setup();
18292083 makeSomething(s);
18302084 } else
1831
- if (source == lightItem)
2085
+ if (source == lightItem || source == lightButton)
18322086 {
18332087 makeSomething(new Light());
18342088 } else
....@@ -1878,30 +2132,30 @@
18782132
18792133 group(g);
18802134 } else
1881
- if (source == loopItem)
2135
+ if (source == loopItem || source == loopButton)
18822136 {
18832137 Composite csg = new GroupLeaf();
18842138 csg.count = 5;
18852139 group(csg);
1886
- Composite child = new cGroup();
2140
+ Composite child = new cGroup("Branch");
18872141 csg.addChild(child);
18882142 child.addChild(csg);
18892143 } else
18902144 if (source == doubleItem)
18912145 {
1892
- Composite csg = new GroupLeaf();
2146
+ Composite csg = new GroupLeaf("Fork");
18932147 csg.count = 5;
18942148 group(csg);
1895
- Composite child = new cGroup();
2149
+ Composite child = new cGroup("Branch A");
18962150 csg.addChild(child);
18972151 child.addChild(csg);
1898
- child = new cGroup();
2152
+ child = new cGroup("Branch B");
18992153 csg.addChild(child);
19002154 child.addChild(csg);
19012155 } else
19022156 if (source == tripleItem)
19032157 {
1904
- Composite csg = new GroupLeaf();
2158
+ Composite csg = new GroupLeaf("Trident");
19052159 csg.count = 4;
19062160 group(csg);
19072161 Composite child = new cGroup();
....@@ -1950,6 +2204,30 @@
19502204 if (source == dumpItem)
19512205 {
19522206 DumpObject();
2207
+ } else
2208
+ if (source == minButton)
2209
+ {
2210
+ Minimize();
2211
+ } else
2212
+ if (source == maxButton)
2213
+ {
2214
+ Maximize();
2215
+ } else
2216
+ if (source == fullButton)
2217
+ {
2218
+ ToggleFullScreen();
2219
+ } else
2220
+ if (source == undoButton)
2221
+ {
2222
+ Undo();
2223
+ } else
2224
+ if (source == redoButton)
2225
+ {
2226
+ Redo();
2227
+ } else
2228
+ if (source == saveButton)
2229
+ {
2230
+ Save();
19532231 } else
19542232 if (source == oneStepButton)
19552233 {
....@@ -2004,6 +2282,14 @@
20042282 if (source == cutItem || source == clearButton)
20052283 {
20062284 loadClipboard(true);
2285
+ } else
2286
+ if (source == undoItem)
2287
+ {
2288
+ Undo();
2289
+ } else
2290
+ if (source == redoItem)
2291
+ {
2292
+ Redo();
20072293 } else
20082294 if (source == duplicateItem)
20092295 {
....@@ -2336,9 +2622,9 @@
23362622 {
23372623 ClearSelection(true);
23382624 } else
2339
- if (source == grabItem)
2625
+ if (source == grabItem || source == groupButton)
23402626 {
2341
- group(new cGroup(), true);
2627
+ group(new cGroup(), false); // true);
23422628 } else
23432629 if (source == hideItem)
23442630 {
....@@ -2356,11 +2642,11 @@
23562642 {
23572643 makeSomething(new Camera());
23582644 } else
2359
- if (source == compositeItem)
2645
+ if (source == compositeItem || source == compositeButton)
23602646 {
23612647 group(new Composite());
23622648 } else
2363
- if (source == randomItem)
2649
+ if (source == switchItem || source == switchButton)
23642650 {
23652651 RandomNode random = new RandomNode();
23662652 group(random);
....@@ -2462,7 +2748,7 @@
24622748 {
24632749 group(new cLinker());
24642750 } else
2465
- if (source == textureItem)
2751
+ if (source == textureItem || source == textureButton)
24662752 {
24672753 group(new TextureNode());
24682754 } else
....@@ -2482,17 +2768,30 @@
24822768 {
24832769 CastShadow(2);
24842770 } else
2485
- if (source == ungroupItem)
2771
+ if (source == ungroupItem || source == ungroupButton)
24862772 {
2487
- //ungroup();
2773
+ boolean hasRoot = false;
2774
+
24882775 for (int i=0; i<group.selection.size(); i++)
24892776 {
2490
- Ungroup(group.selection.get(i));
2777
+ if (group.selection.get(i) == group)
2778
+ {
2779
+ hasRoot = true;
2780
+ break;
2781
+ }
24912782 }
24922783
2493
- ClearSelection(false);
2494
-
2495
- refreshContents();
2784
+ if (!hasRoot)
2785
+ {
2786
+ for (int i=0; i<group.selection.size(); i++)
2787
+ {
2788
+ Ungroup(group.selection.get(i));
2789
+ }
2790
+
2791
+ ClearSelection(false);
2792
+
2793
+ refreshContents();
2794
+ }
24962795 } else
24972796 if (source == genUVItem)
24982797 {
....@@ -2504,7 +2803,7 @@
25042803 } else
25052804 if (source == genNormalsMESHItem)
25062805 {
2507
- GenNormals(true); // TODO
2806
+ GenNormalsMESH();
25082807 } else
25092808 if (source == genNormalsORGANItem)
25102809 {
....@@ -2569,6 +2868,22 @@
25692868 if (source == unmarkleavesItem)
25702869 {
25712870 MarkLeaves(false);
2871
+ } else
2872
+ if (source == rewindleavesItem)
2873
+ {
2874
+ RewindLeaves(true);
2875
+ } else
2876
+ if (source == unrewindleavesItem)
2877
+ {
2878
+ RewindLeaves(false);
2879
+ } else
2880
+ if (source == randomleavesItem)
2881
+ {
2882
+ RandomLeaves(true);
2883
+ } else
2884
+ if (source == unrandomleavesItem)
2885
+ {
2886
+ RandomLeaves(false);
25722887 } else
25732888 if (source == flipVItem)
25742889 {
....@@ -2804,6 +3119,10 @@
28043119 if (source == twoButton)
28053120 {
28063121 radio.layout = twoButton;
3122
+
3123
+ if (CameraPane.FULLSCREEN)
3124
+ fullscreenLayout = radio.layout;
3125
+
28073126 // bug
28083127 //gridPanel.setDividerLocation(1.0);
28093128 //bigPanel.setDividerLocation(0.0);
....@@ -2836,10 +3155,31 @@
28363155 bigThree.ClearUI();
28373156 bigThree.add(centralPanel);
28383157 bigThree.FlushUI();
3158
+
3159
+ cameraView.requestFocusInWindow();
3160
+
3161
+// refreshContents(true);
3162
+//
3163
+// try
3164
+// {
3165
+// java.awt.Robot bot = new java.awt.Robot();
3166
+// int mask = InputEvent.BUTTON1_MASK;
3167
+// bot.mouseMove(100, 100);
3168
+// bot.mousePress(mask);
3169
+// bot.mouseRelease(mask);
3170
+// }
3171
+// catch (Exception e)
3172
+// {
3173
+//
3174
+// }
3175
+
28393176 } else
28403177 if (source == threeButton)
28413178 {
28423179 radio.layout = threeButton;
3180
+
3181
+ if (CameraPane.FULLSCREEN)
3182
+ fullscreenLayout = radio.layout;
28433183
28443184 // bigThree.remove(scenePanel);
28453185 // bigThree.remove(centralPanel);
....@@ -2872,10 +3212,15 @@
28723212 bigThree.add(centralPanel);
28733213 bigThree.add(XYZPanel);
28743214 bigThree.FlushUI();
3215
+
3216
+ cameraView.requestFocusInWindow();
28753217 } else
28763218 if (source == fourButton)
28773219 {
28783220 radio.layout = fourButton;
3221
+
3222
+ if (CameraPane.FULLSCREEN)
3223
+ fullscreenLayout = radio.layout;
28793224
28803225 // bigThree.remove(scenePanel);
28813226 // bigThree.remove(centralPanel);
....@@ -2907,10 +3252,15 @@
29073252 bigThree.ClearUI();
29083253 bigThree.add(scenePanel);
29093254 bigThree.FlushUI();
3255
+
3256
+ cameraView.requestFocusInWindow();
29103257 } else
29113258 if (source == sixButton)
29123259 {
29133260 radio.layout = sixButton;
3261
+
3262
+ if (CameraPane.FULLSCREEN)
3263
+ fullscreenLayout = radio.layout;
29143264
29153265 // bigThree.remove(scenePanel);
29163266 // bigThree.remove(centralPanel);
....@@ -2943,10 +3293,15 @@
29433293 bigThree.add(scenePanel);
29443294 bigThree.add(centralPanel);
29453295 bigThree.FlushUI();
3296
+
3297
+ cameraView.requestFocusInWindow();
29463298 } else
29473299 if (source == sevenButton)
29483300 {
29493301 radio.layout = sevenButton;
3302
+
3303
+ if (CameraPane.FULLSCREEN)
3304
+ fullscreenLayout = radio.layout;
29503305
29513306 // bigThree.remove(scenePanel);
29523307 // bigThree.remove(centralPanel);
....@@ -2980,6 +3335,8 @@
29803335 bigThree.add(centralPanel);
29813336 bigThree.add(XYZPanel);
29823337 bigThree.FlushUI();
3338
+
3339
+ cameraView.requestFocusInWindow();
29833340 } else
29843341 if (source == rootButton)
29853342 {
....@@ -2991,6 +3348,7 @@
29913348 EditObject(obj);
29923349 }
29933350
3351
+ cameraView.requestFocusInWindow();
29943352 refreshContents(true);
29953353 } else
29963354 if (source == closeButton)
....@@ -3000,22 +3358,37 @@
30003358 for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
30013359 {
30023360 ab = (cRadio)e.nextElement();
3003
- if(ab.getModel().isSelected() && ab.GetObject() != client)
3361
+ if (ab.getModel().isSelected() && ab.GetObject() != client)
30043362 {
3363
+ // Patch to avoid bug with transparency.
3364
+ if (!ab.hadMaterial)
3365
+ {
3366
+ ab.object.material = null;
3367
+ }
3368
+
30053369 buttonGroup.remove(ab);
30063370 radioPanel.remove(ab);
30073371
3008
- ab.GetObject().editWindow = null;
3372
+ //ab.GetObject().editWindow = null;
3373
+ ab.GetObject().manipWindow = null;
30093374 // ab.GetObject().objectUI = null; // ?????????
30103375
30113376 ((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
30123377 break;
30133378 }
30143379 }
3380
+
3381
+ cameraView.requestFocusInWindow();
30153382 refreshContents(true);
30163383 } else
30173384 if (source == editItem || source == editButton)
30183385 {
3386
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3387
+ {
3388
+ Object3D child = (Object3D)e.nextElement();
3389
+ child.pinned = true;
3390
+ }
3391
+
30193392 EditSelection(false);
30203393 } else
30213394 if (source == uneditButton)
....@@ -3025,10 +3398,11 @@
30253398 Object3D child = (Object3D)e.nextElement();
30263399 if(child.editWindow != null)
30273400 objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3401
+ child.pinned = false;
30283402 child.CloseUI();
30293403 listUI.remove(child);
30303404
3031
- child.editWindow = null; // ???????????
3405
+ //child.editWindow = null; // ???????????
30323406 }
30333407 objEditor.ctrlPanel.FlushUI();
30343408 //objEditor.jTree.clearSelection();
....@@ -3041,6 +3415,7 @@
30413415 //copy.ClearUI();
30423416 for (Object3D obj : listUI)
30433417 {
3418
+ obj.pinned = false;
30443419 obj.CloseUI();
30453420 }
30463421 listUI.clear();
....@@ -3050,7 +3425,7 @@
30503425 {
30513426 assert(copy == group);
30523427
3053
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3428
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
30543429
30553430 for (Object3D obj : listUI)
30563431 {
....@@ -3115,7 +3490,9 @@
31153490 sideView.object = group;
31163491 }
31173492
3118
-// fix "+" issue group.editWindow = this;
3493
+// fix "+" issue
3494
+ //group.editWindow = this;
3495
+ group.manipWindow = this;
31193496
31203497 /*
31213498 currentLayout = radio.layout;
....@@ -3123,18 +3500,25 @@
31233500 currentLayout = sevenButton;
31243501 */
31253502 radio.layout.doClick();
3503
+
3504
+ ClearUnpinned();
3505
+ SetPinStates(group.selection.size() > 0);
3506
+ if (group.selection.size() == 1)
3507
+ EditSelection(false);
31263508 keepparent = group.parent;
31273509 // PARENT = NULL or not???
31283510 //group.parent = null; // ROOT
31293511 //group.attributes = -1;
31303512 ResetModel();
3513
+
3514
+ cameraView.requestFocusInWindow();
31313515 refreshContents(true);
31323516 } else if (event.getSource() == editCameraItem)
31333517 {
31343518 cameraView.ProtectCamera();
31353519 cameraView.repaint();
31363520 return;
3137
- } else if (event.getSource() == revertCameraItem)
3521
+ } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
31383522 {
31393523 cameraView.RevertCamera();
31403524 cameraView.repaint();
....@@ -3151,7 +3535,6 @@
31513535 }
31523536
31533537 boolean useclient = false;
3154
- cRadio radio;
31553538
31563539 void ToggleRoot()
31573540 {
....@@ -3390,7 +3773,8 @@
33903773
33913774 int size = obj.MemorySize();
33923775
3393
- System.err.println((size/1024) + " KB is the size of " + obj);
3776
+ //System.err.println((size/1024) + " KB is the size of " + obj);
3777
+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
33943778 }
33953779 }
33963780 catch (Exception e)
....@@ -3471,6 +3855,13 @@
34713855 void GenNormals(boolean crease)
34723856 {
34733857 group.GenNormalsS(crease);
3858
+
3859
+ refreshContents();
3860
+ }
3861
+
3862
+ void GenNormalsMESH()
3863
+ {
3864
+ group.GenNormalsMeshS();
34743865
34753866 refreshContents();
34763867 }
....@@ -4098,6 +4489,18 @@
40984489 refreshContents();
40994490 }
41004491
4492
+ void RewindLeaves(boolean hide)
4493
+ {
4494
+ group.selection.RewindLeaves(hide);
4495
+ refreshContents();
4496
+ }
4497
+
4498
+ void RandomLeaves(boolean hide)
4499
+ {
4500
+ group.selection.RandomLeaves(hide);
4501
+ refreshContents();
4502
+ }
4503
+
41014504 void SetTexRes(int tr)
41024505 {
41034506 group.selection.SetTexRes(tr);
....@@ -4169,10 +4572,6 @@
41694572 // }
41704573 // }
41714574
4172
- static boolean allparams = true;
4173
-
4174
- static Vector<Object3D> listUI = new Vector<Object3D>();
4175
-
41764575 void EditSelection(boolean newWindow)
41774576 {
41784577 // aConstraints.gridy = 0;
....@@ -4180,7 +4579,7 @@
41804579 {
41814580 //System.out.println("edit : " + objectPanel.indexOfTab("Material"));
41824581 //objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4183
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4582
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
41844583
41854584 Object3D elem = (Object3D)group.selection.elementAt(i);
41864585 if(elem != group || !newWindow)
....@@ -4265,7 +4664,8 @@
42654664 //new Exception().printStackTrace();
42664665
42674666 freezemodel = true;
4268
-
4667
+ ClearUnpinned();
4668
+
42694669 /**/
42704670 //switch (event.id)
42714671 {
....@@ -4273,7 +4673,6 @@
42734673 //case 702: // Event.LIST_DESELECT
42744674 group.deselectAll();
42754675 TreePath tps[] = objEditor.jTree.getSelectionPaths();
4276
- objEditor.ClearInfo(); // .GetMaterial());
42774676 if (tps != null)
42784677 {
42794678 for (int i=0; i < tps.length; i++)
....@@ -4282,10 +4681,8 @@
42824681
42834682 //if (child.parent != null)
42844683 //child.parent.addSelectee(child);
4684
+ objEditor.SetMaterial(child);
42854685 group.addSelectee(child);
4286
- objEditor.SetMaterial(child); // .GetMaterial());
4287
- objEditor.AddInfo(child, this, true); // .GetMaterial());
4288
- System.err.println("info : " + child.GetPath());
42894686 }
42904687 }
42914688 // else
....@@ -4295,20 +4692,28 @@
42954692 // System.err.println("info : " + group.GetPath());
42964693 // }
42974694
4298
- objEditor.SetText(); // jan 2014
4299
-
4300
- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
4695
+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
43014696 CameraPane.flash = true;
43024697
4303
- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
4698
+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
43044699 // a camera
43054700 {
4306
- CameraPane.camerachangeframe = 0; // don't refuse it
4307
- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4701
+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4702
+ {
4703
+ CameraPane.camerachangeframe = 0; // don't refuse it
4704
+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4705
+ }
43084706 // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
43094707 // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
43104708 }
43114709
4710
+ if (tps != null && tps.length == 1)
4711
+ {
4712
+ EditSelection(false);
4713
+ }
4714
+
4715
+ SetPinStates(tps != null && tps.length > 0);
4716
+
43124717 refreshContents();
43134718 //return true;
43144719 }
....@@ -4317,6 +4722,35 @@
43174722
43184723 freezemodel = false;
43194724 }
4725
+
4726
+ void SetPinStates(boolean enabled)
4727
+ {
4728
+ editButton.setEnabled(enabled);
4729
+ uneditButton.setEnabled(enabled);
4730
+ unselectButton.setEnabled(enabled);
4731
+ flashSelectionButton.setEnabled(enabled);
4732
+ }
4733
+
4734
+ void refreshContents(boolean cp)
4735
+ {
4736
+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4737
+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
4738
+ {
4739
+ objEditor.ClearInfo(); // .GetMaterial());
4740
+
4741
+ for (int i=0; i < group.selection.Size(); i++)
4742
+ {
4743
+ Object3D child = (Object3D) group.selection.get(i);
4744
+
4745
+ objEditor.AddInfo(child, this, true);
4746
+ System.err.println("info : " + child.GetPath());
4747
+ }
4748
+
4749
+ objEditor.SetText(); // jan 2014
4750
+ }
4751
+
4752
+ super.refreshContents(cp);
4753
+ }
43204754
43214755 void linkSomething(Object3D thing)
43224756 {
....@@ -4388,6 +4822,7 @@
43884822 {
43894823 if (group.selection.isEmpty())
43904824 return;
4825
+
43914826 Grafreed.clipboardIsTempGroup = false;
43924827 Composite tGroup = null;
43934828 if (group.selection.size() > 0) // 1)
....@@ -4398,6 +4833,8 @@
43984833
43994834 if (cut)
44004835 {
4836
+ if (Globals.SAVEONMAKE)
4837
+ Save();
44014838 //int indices[] = jList.getSelectedIndices();
44024839 //for (int i = indices.length - 1; i >= 0; i--)
44034840 //jList.remove(indices[i]);
....@@ -4487,8 +4924,10 @@
44874924 }
44884925
44894926 }
4927
+
44904928 if (Grafreed.clipboardIsTempGroup)
44914929 Grafreed.clipboard = tGroup;
4930
+
44924931 if (cut)
44934932 {
44944933 ResetModel();
....@@ -5113,7 +5552,28 @@
51135552 cButton clearpanelButton;
51145553 cButton unselectButton;
51155554
5555
+ cButton restoreCameraButton;
5556
+
5557
+ cButton saveButton;
51165558 cButton oneStepButton;
5559
+
5560
+ cButton groupButton;
5561
+ cButton ungroupButton;
5562
+ cButton compositeButton;
5563
+ cButton switchButton;
5564
+ cButton loopButton;
5565
+ cButton textureButton;
5566
+
5567
+ cButton gridButton;
5568
+ cButton boxButton;
5569
+ cButton sphereButton;
5570
+ cButton coneButton;
5571
+ cButton torusButton;
5572
+ cButton superButton;
5573
+ cButton kleinButton;
5574
+ cButton particlesButton;
5575
+ cButton overlayButton;
5576
+ cButton lightButton;
51175577
51185578 cButton screenfitButton;
51195579 cButton screenfitpointButton;
....@@ -5126,14 +5586,6 @@
51265586
51275587 cButton setsupportButton;
51285588
5129
- cButton twoButton;
5130
- cButton sixButton;
5131
- cButton threeButton;
5132
- cButton sevenButton;
5133
- cButton fourButton; // full panel
5134
- cButton oneButton; // full XYZ
5135
- //cButton currentLayout;
5136
-
51375589 //
51385590 //Composite
51395591 Object3D // to do !!
....@@ -5143,9 +5595,11 @@
51435595 //JTree jTree;
51445596 private MenuItem lookAtItem;
51455597 private MenuItem lookFromItem;
5146
- private MenuItem switchItem;
5598
+ private MenuItem switchViewItem;
51475599 private MenuItem cutItem;
5148
- private MenuItem duplicateItem;
5600
+ private MenuItem undoItem;
5601
+ private MenuItem redoItem;
5602
+ private JMenuItem duplicateItem;
51495603 private MenuItem cloneItem;
51505604 private MenuItem cloneSupportItem;
51515605 private MenuItem overwriteGeoItem;
....@@ -5208,6 +5662,10 @@
52085662 private MenuItem showleavesItem;
52095663 private MenuItem markleavesItem;
52105664 private MenuItem unmarkleavesItem;
5665
+ private MenuItem rewindleavesItem;
5666
+ private MenuItem unrewindleavesItem;
5667
+ private MenuItem randomleavesItem;
5668
+ private MenuItem unrandomleavesItem;
52115669
52125670 private MenuItem flipVItem;
52135671 private MenuItem unflipVItem;
....@@ -5229,7 +5687,7 @@
52295687 private MenuItem frontItem;
52305688 private MenuItem cameraItem;
52315689 private MenuItem compositeItem;
5232
- private MenuItem randomItem;
5690
+ private MenuItem switchItem;
52335691 private MenuItem physicsItem;
52345692 private MenuItem frameselectorItem;
52355693 private MenuItem scriptNodeItem;
....@@ -5303,5 +5761,5 @@
53035761
53045762 Menu cameraMenu;
53055763 MenuItem editCameraItem;
5306
- MenuItem revertCameraItem;
5764
+ MenuItem restoreCameraItem;
53075765 }