.. | .. |
---|
16 | 16 | //import buoy.widget.BFileChooser; |
---|
17 | 17 | |
---|
18 | 18 | class GroupEditor extends ObjEditor implements //iParse, //iCallBack, |
---|
| 19 | + Grafreed.iResourceCallBack, |
---|
19 | 20 | ObjectUI, |
---|
20 | 21 | Runnable, |
---|
21 | 22 | ActionListener, |
---|
.. | .. |
---|
41 | 42 | }); |
---|
42 | 43 | } |
---|
43 | 44 | |
---|
| 45 | + public void AddTextureButton(String f, final String t, cGridBag row) |
---|
| 46 | + { |
---|
| 47 | + cButton textureButton; |
---|
| 48 | + final String path = "textures/" + f + "/"; // + t; |
---|
| 49 | + row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF)); |
---|
| 50 | + textureButton.setToolTipText(f + "s"); |
---|
| 51 | + textureButton.addActionListener(new ActionListener() |
---|
| 52 | + { |
---|
| 53 | + @Override |
---|
| 54 | + public void actionPerformed(ActionEvent e) |
---|
| 55 | + { |
---|
| 56 | + ChangeTexture(path + t); |
---|
| 57 | + } |
---|
| 58 | + }); |
---|
| 59 | + } |
---|
| 60 | + |
---|
44 | 61 | public void AddSkyboxTab0(JTabbedPane skyboxpanel) |
---|
45 | 62 | { |
---|
46 | 63 | cGridBag tab0 = new cGridBag().setVertical(true); |
---|
.. | .. |
---|
311 | 328 | } |
---|
312 | 329 | } |
---|
313 | 330 | |
---|
314 | | - public void ChangeSkybox(String name) |
---|
| 331 | + public void ChangeSkybox(String skybox) |
---|
315 | 332 | { |
---|
316 | 333 | //cameraView.envyoff = false; |
---|
317 | | - group.skyboxname = name; |
---|
| 334 | + group.skyboxname = skybox; |
---|
318 | 335 | group.skyboxext = "jpg"; |
---|
319 | 336 | cameraView.repaint(); |
---|
320 | 337 | } |
---|
| 338 | + |
---|
| 339 | + public void CreateSkyboxPanel(cGridBag skyboxPanel) |
---|
| 340 | + { |
---|
| 341 | + JTabbedPane skyboxpane = new JTabbedPane(); |
---|
| 342 | + |
---|
| 343 | + AddSkyboxTab0(skyboxpane); |
---|
| 344 | + AddSkyboxTab1(skyboxpane); |
---|
| 345 | + AddSkyboxTab2(skyboxpane); |
---|
| 346 | + AddSkyboxTab3(skyboxpane); |
---|
| 347 | + |
---|
| 348 | + skyboxPanel.add(skyboxpane); |
---|
| 349 | + } |
---|
321 | 350 | |
---|
| 351 | + public void ChangeTexture(String texture) |
---|
| 352 | + { |
---|
| 353 | + cameraView.repaint(); |
---|
| 354 | + } |
---|
| 355 | + |
---|
322 | 356 | //ObjEditor objEditor; |
---|
323 | 357 | public void closeUI2() |
---|
324 | 358 | { |
---|
.. | .. |
---|
356 | 390 | this.copy = this.group = group; |
---|
357 | 391 | //selectees = this.group.selectees; |
---|
358 | 392 | |
---|
359 | | - if (copy.versions == null) |
---|
| 393 | + if (copy.versionlist == null) |
---|
360 | 394 | { |
---|
361 | | - copy.versions = new Object3D[100]; |
---|
| 395 | + copy.versionlist = new Object3D[100]; |
---|
362 | 396 | copy.versionindex = -1; |
---|
363 | 397 | } |
---|
364 | 398 | |
---|
.. | .. |
---|
383 | 417 | |
---|
384 | 418 | ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true); |
---|
385 | 419 | |
---|
386 | | - if (copy.versions == null) |
---|
| 420 | + if (copy.versionlist == null) |
---|
387 | 421 | { |
---|
388 | | - copy.versions = new Object3D[100]; |
---|
| 422 | + copy.versionlist = new Object3D[100]; |
---|
389 | 423 | copy.versionindex = -1; |
---|
390 | 424 | |
---|
391 | 425 | Save(true); |
---|
.. | .. |
---|
859 | 893 | buildToolsMenu(menu); |
---|
860 | 894 | } |
---|
861 | 895 | |
---|
| 896 | + JTabbedPane resourcecontainer; |
---|
| 897 | + cGridBag currenttab; |
---|
| 898 | + boolean added; // patch for jar |
---|
| 899 | + |
---|
| 900 | + int tabcount = 0; |
---|
| 901 | + int colcount = 0; |
---|
| 902 | + int rowcount = 0; |
---|
| 903 | + |
---|
| 904 | + int columns = 5; |
---|
| 905 | + int rows = 7; |
---|
| 906 | + |
---|
| 907 | + public void ResourceCallBack(String[] path) |
---|
| 908 | + { |
---|
| 909 | + for (int i = 0; i < path.length; i++) |
---|
| 910 | + System.out.print(path[i] + "/"); |
---|
| 911 | + System.out.println(); |
---|
| 912 | + if (rowcount == 0) |
---|
| 913 | + { |
---|
| 914 | + currenttab = new cGridBag(); |
---|
| 915 | + added = false; |
---|
| 916 | + String tabname = String.valueOf((char)('A'+tabcount)); |
---|
| 917 | + currenttab.setName(tabname); |
---|
| 918 | + rowcount = 1; |
---|
| 919 | + } |
---|
| 920 | + |
---|
| 921 | + if (path.length > 1 && path[1].toLowerCase().endsWith(".jpg")) |
---|
| 922 | + { |
---|
| 923 | + if (!added) |
---|
| 924 | + { |
---|
| 925 | + added = true; |
---|
| 926 | + resourcecontainer.add(currenttab); |
---|
| 927 | + String tabname = String.valueOf((char)('A'+tabcount)); |
---|
| 928 | + resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname); |
---|
| 929 | + } |
---|
| 930 | + |
---|
| 931 | + AddTextureButton(path[0], path[1], currenttab); |
---|
| 932 | + if (++colcount >= columns) |
---|
| 933 | + { |
---|
| 934 | + colcount = 0; |
---|
| 935 | + currenttab.Return(); |
---|
| 936 | + |
---|
| 937 | + if (rowcount++ >= rows) |
---|
| 938 | + { |
---|
| 939 | + rowcount = 0; |
---|
| 940 | + } |
---|
| 941 | + } |
---|
| 942 | + } |
---|
| 943 | + else |
---|
| 944 | + { |
---|
| 945 | +// if (!path[path.length-1].equals("icons")) |
---|
| 946 | +// resourcecontainer.Return(); |
---|
| 947 | + } |
---|
| 948 | + } |
---|
| 949 | + |
---|
| 950 | + void CreateTexturePanel(cGridBag container) |
---|
| 951 | + { |
---|
| 952 | + resourcecontainer = new JTabbedPane(); |
---|
| 953 | + container.add(resourcecontainer); |
---|
| 954 | + |
---|
| 955 | + Grafreed.ParseResources("textures", this); |
---|
| 956 | + } |
---|
862 | 957 | |
---|
863 | 958 | void SetupUI2(ObjEditor oe) |
---|
864 | 959 | { |
---|
.. | .. |
---|
931 | 1026 | restoreCameraButton.setToolTipText("Restore viewpoint"); |
---|
932 | 1027 | restoreCameraButton.addActionListener(this); |
---|
933 | 1028 | |
---|
934 | | - copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
935 | | - saveButton.setToolTipText("Duplicate current version"); |
---|
936 | | - saveButton.addActionListener(this); |
---|
| 1029 | + copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
| 1030 | + saveVersionButton.setToolTipText("Duplicate current version"); |
---|
| 1031 | + saveVersionButton.addActionListener(this); |
---|
937 | 1032 | |
---|
938 | | - copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
939 | | - undoButton.setToolTipText("Previous version"); |
---|
940 | | - undoButton.addActionListener(this); |
---|
941 | | - undoButton.setEnabled(false); |
---|
| 1033 | + copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
| 1034 | + deleteVersionButton.setToolTipText("Delete current version"); |
---|
| 1035 | + deleteVersionButton.addActionListener(this); |
---|
| 1036 | + |
---|
| 1037 | + copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
| 1038 | + previousVersionButton.setToolTipText("Previous version"); |
---|
| 1039 | + previousVersionButton.addActionListener(this); |
---|
| 1040 | + previousVersionButton.setEnabled(false); |
---|
942 | 1041 | |
---|
943 | 1042 | cGridBag updown = new cGridBag().setVertical(true); |
---|
944 | 1043 | updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
945 | | - restoreButton.setToolTipText("Restore current version (undo latest change)"); |
---|
| 1044 | + restoreButton.setToolTipText("Undo (restore current version)"); |
---|
946 | 1045 | restoreButton.addActionListener(this); |
---|
947 | | - restoreButton.setEnabled(false); |
---|
| 1046 | + //restoreButton.setEnabled(false); |
---|
948 | 1047 | |
---|
949 | 1048 | updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
950 | | - replaceButton.setToolTipText("Replace current version (save latest change)"); |
---|
| 1049 | + replaceButton.setToolTipText("Save (replace current version)"); |
---|
951 | 1050 | replaceButton.addActionListener(this); |
---|
952 | | - replaceButton.setEnabled(false); |
---|
| 1051 | + //replaceButton.setEnabled(false); |
---|
953 | 1052 | |
---|
954 | 1053 | copyOptionsPanel.add(updown); |
---|
955 | 1054 | |
---|
956 | | - copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
957 | | - redoButton.setToolTipText("Next version"); |
---|
958 | | - redoButton.addActionListener(this); |
---|
959 | | - redoButton.setEnabled(false); |
---|
| 1055 | + copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
| 1056 | + nextVersionButton.setToolTipText("Next version"); |
---|
| 1057 | + nextVersionButton.addActionListener(this); |
---|
| 1058 | + nextVersionButton.setEnabled(false); |
---|
960 | 1059 | |
---|
961 | 1060 | oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints); |
---|
962 | 1061 | liveCB.setToolTipText("Enable animation"); |
---|
.. | .. |
---|
1090 | 1189 | |
---|
1091 | 1190 | oe.toolboxPanel.add(row2); |
---|
1092 | 1191 | |
---|
1093 | | - // ENVYMAPS |
---|
1094 | | - cGridBag skyboxpane = new cGridBag(); |
---|
1095 | | - skyboxpane.preferredHeight = 100; |
---|
| 1192 | + cGridBag textures = new cGridBag(); |
---|
1096 | 1193 | |
---|
1097 | | - oe.toolboxPanel.add(skyboxpane); |
---|
| 1194 | + CreateTexturePanel(textures); |
---|
1098 | 1195 | |
---|
1099 | | - JTabbedPane skyboxpanel = new JTabbedPane(); |
---|
1100 | | - skyboxpane.add(skyboxpanel); |
---|
| 1196 | + oe.toolboxPanel.add(textures); |
---|
1101 | 1197 | |
---|
1102 | | - AddSkyboxTab0(skyboxpanel); |
---|
1103 | | - AddSkyboxTab1(skyboxpanel); |
---|
1104 | | - AddSkyboxTab2(skyboxpanel); |
---|
1105 | | - AddSkyboxTab3(skyboxpanel); |
---|
| 1198 | + textures.preferredHeight = 100; |
---|
| 1199 | + |
---|
| 1200 | + CreateSkyboxPanel(oe.skyboxPanel); |
---|
1106 | 1201 | |
---|
1107 | 1202 | // EDIT panel |
---|
1108 | 1203 | editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
.. | .. |
---|
1110 | 1205 | editButton.addActionListener(this); |
---|
1111 | 1206 | |
---|
1112 | 1207 | editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
1113 | | - uneditButton.setToolTipText("Remove selection controls"); |
---|
| 1208 | + uneditButton.setToolTipText("Unpin and remove selection controls"); |
---|
1114 | 1209 | uneditButton.addActionListener(this); |
---|
1115 | 1210 | |
---|
1116 | 1211 | editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints); |
---|
1117 | | - allParamsButton.setToolTipText("Show all controle"); |
---|
| 1212 | + allParamsButton.setToolTipText("Show all controls"); |
---|
1118 | 1213 | allParamsButton.addActionListener(this); |
---|
1119 | 1214 | |
---|
1120 | | - editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
1121 | | - clearPanelButton.setToolTipText("Clear edit panel"); |
---|
| 1215 | + editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
| 1216 | + clearPanelButton.setToolTipText("Clear all controls"); |
---|
1122 | 1217 | clearPanelButton.addActionListener(this); |
---|
1123 | 1218 | |
---|
1124 | | - editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
1125 | | - unselectButton.setToolTipText("Unselect"); |
---|
1126 | | - unselectButton.addActionListener(this); |
---|
| 1219 | + //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
| 1220 | + //unselectButton.setToolTipText("Unselect"); |
---|
| 1221 | + //unselectButton.addActionListener(this); |
---|
1127 | 1222 | |
---|
1128 | 1223 | editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
1129 | 1224 | flashSelectionButton.setToolTipText("Highlight selection"); |
---|
.. | .. |
---|
2571 | 2666 | if (source == invariantsItem) |
---|
2572 | 2667 | { |
---|
2573 | 2668 | System.out.println("Invariants:"); |
---|
2574 | | - Grafreed.grafreeD.universe.invariants(); |
---|
| 2669 | + Grafreed.grafreed.universe.invariants(); |
---|
2575 | 2670 | } else |
---|
2576 | 2671 | if (source == memoryItem) |
---|
2577 | 2672 | { |
---|
.. | .. |
---|
2602 | 2697 | { |
---|
2603 | 2698 | ToggleFullScreen(); |
---|
2604 | 2699 | } else |
---|
2605 | | - if (source == undoButton) |
---|
| 2700 | + if (source == previousVersionButton) |
---|
2606 | 2701 | { |
---|
2607 | 2702 | // Go to previous version |
---|
2608 | 2703 | //if (!Undo()) |
---|
2609 | 2704 | //java.awt.Toolkit.getDefaultToolkit().beep(); |
---|
2610 | | - Undo(); |
---|
| 2705 | + PreviousVersion(); |
---|
2611 | 2706 | } else |
---|
2612 | 2707 | if (source == restoreButton) |
---|
2613 | 2708 | { |
---|
2614 | 2709 | // Restore current version |
---|
2615 | 2710 | Restore(); |
---|
| 2711 | + //restoreButton.setEnabled(false); |
---|
2616 | 2712 | } else |
---|
2617 | 2713 | if (source == replaceButton) |
---|
2618 | 2714 | { |
---|
2619 | 2715 | // Overwrite current version |
---|
2620 | 2716 | Replace(); |
---|
| 2717 | + //replaceButton.setEnabled(false); |
---|
2621 | 2718 | } else |
---|
2622 | | - if (source == redoButton) |
---|
| 2719 | + if (source == nextVersionButton) |
---|
2623 | 2720 | { |
---|
2624 | 2721 | // Go to next version |
---|
2625 | | - Redo(); |
---|
| 2722 | + NextVersion(); |
---|
2626 | 2723 | } else |
---|
2627 | | - if (source == saveButton) |
---|
| 2724 | + if (source == saveVersionButton) |
---|
2628 | 2725 | { |
---|
2629 | 2726 | // Save a new version |
---|
2630 | 2727 | if (!Save(true)) |
---|
2631 | 2728 | java.awt.Toolkit.getDefaultToolkit().beep(); |
---|
| 2729 | + } else |
---|
| 2730 | + if (source == deleteVersionButton) |
---|
| 2731 | + { |
---|
| 2732 | + // Delete a new version |
---|
| 2733 | + DeleteVersion(); |
---|
2632 | 2734 | } else |
---|
2633 | 2735 | if (source == oneStepButton) |
---|
2634 | 2736 | { |
---|
.. | .. |
---|
2683 | 2785 | } else |
---|
2684 | 2786 | if (source == undoItem) |
---|
2685 | 2787 | { |
---|
2686 | | - Undo(); |
---|
| 2788 | + PreviousVersion(); |
---|
2687 | 2789 | } else |
---|
2688 | 2790 | if (source == redoItem) |
---|
2689 | 2791 | { |
---|
2690 | | - Redo(); |
---|
| 2792 | + NextVersion(); |
---|
2691 | 2793 | } else |
---|
2692 | 2794 | if (source == duplicateItem) |
---|
2693 | 2795 | { |
---|
.. | .. |
---|
3820 | 3922 | { |
---|
3821 | 3923 | Object3D child = (Object3D)e.nextElement(); |
---|
3822 | 3924 | if(child.editWindow != null) |
---|
3823 | | - objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit")); |
---|
3824 | 3925 | child.pinned = false; |
---|
3825 | 3926 | child.CloseUI(); |
---|
3826 | 3927 | listUI.remove(child); |
---|
| 3928 | +// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit")); |
---|
3827 | 3929 | |
---|
3828 | 3930 | //child.editWindow = null; // ??????????? |
---|
3829 | 3931 | } |
---|
.. | .. |
---|
3842 | 3944 | obj.CloseUI(); |
---|
3843 | 3945 | } |
---|
3844 | 3946 | listUI.clear(); |
---|
| 3947 | + SetPinStates(group.selection.size() > 0); |
---|
3845 | 3948 | refreshContents(true); |
---|
3846 | 3949 | } else |
---|
3847 | 3950 | if (source == allParamsButton) |
---|
.. | .. |
---|
3928 | 4031 | radio.layout.doClick(); |
---|
3929 | 4032 | |
---|
3930 | 4033 | ClearUnpinned(); |
---|
| 4034 | + |
---|
3931 | 4035 | //Grafreed.Assert(group != null); |
---|
3932 | 4036 | //Grafreed.Assert(group.selection != null); |
---|
3933 | 4037 | SetPinStates(group.selection == null || group.selection.size() > 0); |
---|
.. | .. |
---|
5083 | 5187 | |
---|
5084 | 5188 | freezemodel = false; |
---|
5085 | 5189 | } |
---|
5086 | | - |
---|
5087 | | - boolean flashIt = true; |
---|
5088 | | - |
---|
| 5190 | + |
---|
5089 | 5191 | public void valueChanged(TreeSelectionEvent e) |
---|
5090 | 5192 | //public boolean handleEvent(Event event) |
---|
5091 | 5193 | { |
---|
.. | .. |
---|
5158 | 5260 | { |
---|
5159 | 5261 | editButton.setEnabled(enabled); |
---|
5160 | 5262 | uneditButton.setEnabled(enabled); |
---|
5161 | | - unselectButton.setEnabled(enabled); |
---|
| 5263 | + //unselectButton.setEnabled(enabled); |
---|
5162 | 5264 | flashSelectionButton.setEnabled(enabled); |
---|
| 5265 | + |
---|
| 5266 | + clearPanelButton.setEnabled(!listUI.isEmpty()); |
---|
5163 | 5267 | } |
---|
5164 | 5268 | |
---|
5165 | 5269 | void refreshContents(boolean cp) |
---|
5166 | 5270 | { |
---|
5167 | | - if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info")) |
---|
| 5271 | + //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info")) |
---|
5168 | 5272 | if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING) |
---|
5169 | 5273 | { |
---|
5170 | 5274 | objEditor.ClearInfo(); // .GetMaterial()); |
---|
.. | .. |
---|
6000 | 6104 | |
---|
6001 | 6105 | cButton restoreCameraButton; |
---|
6002 | 6106 | |
---|
6003 | | - cButton saveButton; |
---|
6004 | 6107 | cButton oneStepButton; |
---|
6005 | 6108 | |
---|
6006 | 6109 | cButton groupButton; |
---|