Normand Briere
2019-08-23 60cec91731a350fe67e9b5ffe7a00d70e9026314
GroupEditor.java
....@@ -29,9 +29,9 @@
2929 {
3030 cButton skyboxButton;
3131 final String path = "cubemaps/" + f + "-skyboxes/" + s;
32
- row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
32
+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Globals.NIMBUSLAF));
3333 //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
34
- skyboxButton.setToolTipText(s);
34
+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
3535 skyboxButton.addActionListener(new ActionListener()
3636 {
3737 @Override
....@@ -46,7 +46,7 @@
4646 {
4747 cButton textureButton;
4848 final String path = "textures/" + f + "/" + c + "/"; // + t;
49
- row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
49
+ row.add(textureButton = GetButton(path + "icons/" + t, !Globals.NIMBUSLAF));
5050 textureButton.setToolTipText(c + count);
5151 textureButton.addActionListener(new ActionListener()
5252 {
....@@ -73,7 +73,7 @@
7373 cGridBag row5 = new cGridBag();
7474 cGridBag row6 = new cGridBag();
7575
76
- AddSkyboxButton("default", "rgb", row0);
76
+ AddSkyboxButton("default", "", row0);
7777 //AddSkyboxButton("default", "cornell", row0);
7878 AddSkyboxButton("penguins", "dust", row0);
7979 AddSkyboxButton("penguins", "tropic", row0);
....@@ -330,15 +330,24 @@
330330
331331 public void ChangeSkybox(String skybox)
332332 {
333
- //cameraView.envyoff = false;
334
- group.skyboxname = skybox;
335
- group.skyboxext = "jpg";
336
- cameraView.repaint();
333
+ if (skybox.endsWith("/"))
334
+ {
335
+ group.skyboxname = null;
336
+ group.skyboxext = null;
337
+ cameraView.repaint();
338
+ }
339
+ else
340
+ {
341
+ //cameraView.envyoff = false;
342
+ group.skyboxname = skybox;
343
+ group.skyboxext = "jpg";
344
+ cameraView.repaint();
345
+ }
337346 }
338347
339348 public void CreateSkyboxPanel(cGridBag skyboxPanel)
340349 {
341
- JTabbedPane skyboxpane = new JTabbedPane();
350
+ JTabbedPane skyboxpane = new JTabbedPane(JTabbedPane.LEFT);
342351
343352 AddSkyboxTab0(skyboxpane);
344353 AddSkyboxTab1(skyboxpane);
....@@ -357,6 +366,16 @@
357366 }
358367
359368 refreshContents();
369
+ }
370
+
371
+ public void Show3DView()
372
+ {
373
+ // bug
374
+ //gridPanel.setDividerLocation(1.0);
375
+ //bigPanel.setDividerLocation(0.0);
376
+ bigThree.ClearUI();
377
+ bigThree.add(centralPanel);
378
+ bigThree.FlushUI();
360379 }
361380
362381 //ObjEditor objEditor;
....@@ -396,11 +415,15 @@
396415 this.copy = this.group = group;
397416 //selectees = this.group.selectees;
398417
399
- if (copy.versionlist == null)
400
- {
401
- copy.versionlist = new Object3D[100];
402
- copy.versionindex = -1;
403
- }
418
+ assert(false);
419
+
420
+// if (copy.versionlist == null)
421
+// {
422
+// copy.versionlist = new Object3D[100];
423
+// copy.versionindex = -1;
424
+//
425
+// //Save(true);
426
+// }
404427
405428 if(ui)
406429 SetupUI(objEditor);
....@@ -423,13 +446,13 @@
423446
424447 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
425448
426
- if (copy.versionlist == null)
427
- {
428
- copy.versionlist = new Object3D[100];
429
- copy.versionindex = -1;
430
-
431
- Save(true);
432
- }
449
+// if (copy.versionlist == null)
450
+// {
451
+// copy.versionlist = new Object3D[100];
452
+// copy.versionindex = -1;
453
+//
454
+// //Save(true);
455
+// }
433456 }
434457
435458 void CloneSelection(boolean supports)
....@@ -519,33 +542,35 @@
519542 // menu.add("-");
520543 duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
521544 duplicateItem.addActionListener(this);
522
- cloneItem = menu.add(new MenuItem("Clone"));
545
+
546
+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
523547 cloneItem.addActionListener(this);
524
- if (Globals.ADVANCED)
548
+ //if (Globals.ADVANCED)
525549 {
526550 cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
527551 cloneSupportItem.addActionListener(this);
528552 }
553
+ oe.jTree.popup.addSeparator();
529554 menu.add("-");
530
- cutItem = menu.add(new MenuItem("Cut"));
555
+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
531556 cutItem.addActionListener(this);
532
- copyItem = menu.add(new MenuItem("Copy"));
557
+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
533558 copyItem.addActionListener(this);
534559 pasteItem = menu.add(new MenuItem("Paste"));
535560 pasteItem.addActionListener(this);
536561
537
- menu.add("-");
538
- pasteIntoItem = menu.add(new MenuItem("Paste into"));
562
+ oe.jTree.popup.addSeparator();
563
+ //menu.add("-");
564
+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
539565 pasteIntoItem.addActionListener(this);
540
- pasteLinkItem = menu.add(new MenuItem("Paste link"));
566
+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
541567 pasteLinkItem.addActionListener(this);
542
- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
568
+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
543569 pasteCloneItem.addActionListener(this);
544
-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
570
+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
545571 // pasteExpandItem.addActionListener(this);
546
- menu.add("-");
547
- deleteItem = menu.add(new MenuItem("Delete"));
548
- deleteItem.addActionListener(this);
572
+ //menu.add("-");
573
+ oe.jTree.popup.addSeparator();
549574
550575 if (Globals.ADVANCED)
551576 {
....@@ -631,11 +656,9 @@
631656 oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
632657 //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
633658 //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
634
- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
635659 oe.cameraMenu.add("-");
636660 openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
637661 openWindowItem.addActionListener(this);
638
- editLeafItem.addActionListener(this);
639662 lookAtItem.addActionListener(this);
640663 //lookFromItem.addActinoListener(this);
641664 //switchViewItem.addActionListener(this);
....@@ -682,9 +705,8 @@
682705 setMasterItem.addActionListener(this);
683706 }
684707
685
- oe.menuBar.add(menu = new Menu("Group"));
686
-// grabItem = menu.add(new MenuItem("Grab"));
687
-// grabItem.addActionListener(this);
708
+ oe.menuBar.add(menu = new Menu("Order"));
709
+
688710 backItem = menu.add(new MenuItem("Back"));
689711 backItem.addActionListener(this);
690712 frontItem = menu.add(new MenuItem("Front"));
....@@ -692,13 +714,21 @@
692714 // compositeItem = menu.add(new MenuItem("Composite"));
693715 // compositeItem.addActionListener(this);
694716
717
+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
718
+ grabItem.addActionListener(this);
719
+
695720 if (Globals.ADVANCED)
696721 {
697722 hideItem = menu.add(new MenuItem("Hidden Group"));
698723 hideItem.addActionListener(this);
699724 }
700
- ungroupItem = menu.add(new MenuItem("Ungroup"));
725
+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
701726 ungroupItem.addActionListener(this);
727
+
728
+ oe.jTree.popup.addSeparator();
729
+
730
+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
731
+ deleteItem.addActionListener(this);
702732
703733 // menu.add("-");
704734 //
....@@ -805,6 +835,8 @@
805835 }
806836
807837 oe.menuBar.add(menu = new Menu("Attributes"));
838
+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
839
+ clearVersionsItem.addActionListener(this);
808840 clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
809841 clearMaterialsItem.addActionListener(this);
810842 resetAllItem = menu.add(new MenuItem("Reset All"));
....@@ -827,9 +859,9 @@
827859 hideleavesItem.addActionListener(this);
828860 showleavesItem = menu.add(new MenuItem("Show Leaves"));
829861 showleavesItem.addActionListener(this);
830
- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
862
+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
831863 markleavesItem.addActionListener(this);
832
- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
864
+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
833865 unmarkleavesItem.addActionListener(this);
834866 rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
835867 rewindleavesItem.addActionListener(this);
....@@ -883,6 +915,9 @@
883915 shareGeometriesItem.addActionListener(this);
884916 mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
885917 mergeGeometriesItem.addActionListener(this);
918
+ menu.add("-");
919
+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
920
+ editLeafItem.addActionListener(this);
886921 if (Globals.ADVANCED)
887922 {
888923 // Pretty much the same as duplicate and clone.
....@@ -901,8 +936,10 @@
901936
902937 JTabbedPane resourcecontainer;
903938 cGridBag currenttab;
904
- boolean added; // patch for jar
939
+ //boolean added; // patch for jar
905940
941
+ int totalcount = 0;
942
+
906943 int tabcount = 0;
907944 int colcount = 0;
908945 int rowcount = 0;
....@@ -918,28 +955,30 @@
918955 // System.out.println();
919956
920957 if (//rowcount == 0 ||
921
- path.length == 1)
958
+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
922959 {
923960 currenttab = new cGridBag();
924
- added = false;
925961 String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
926962 currenttab.setName(tabname);
963
+ //added = false;
964
+ resourcecontainer.add(currenttab);
965
+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
927966 rowcount = 1;
928967 colcount = 0;
929968 texturecount = 0;
930969 }
931970
932
- if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
971
+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") || path[2].toLowerCase().endsWith(".png")))
933972 {
934
- if (!added)
973
+ //if (!added)
935974 {
936
- added = true;
937
- resourcecontainer.add(currenttab);
975
+ //added = true;
938976 String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
939
- resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
977
+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
940978 }
941979
942
- AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
980
+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
981
+ totalcount++;
943982
944983 if (++colcount >= columns)
945984 {
....@@ -965,6 +1004,8 @@
9651004 container.add(resourcecontainer);
9661005
9671006 Grafreed.ParseResources("textures", this);
1007
+
1008
+ // 935. System.out.println("Total = " + totalcount);
9681009 }
9691010
9701011 void SetupUI2(ObjEditor oe)
....@@ -984,11 +1025,6 @@
9841025 //new Exception().printStackTrace();
9851026
9861027 oe.radioPanel = new JPanel(new GridBagLayout());
987
- oe.aConstraints.weightx = 1;
988
- oe.aConstraints.weighty = 0;
989
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
990
- oe.aConstraints.gridwidth = 100;
991
- oe.aConstraints.gridheight = 1;
9921028 // oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
9931029
9941030 oe.buttonGroup = new ButtonGroup();
....@@ -1009,9 +1045,9 @@
10091045 oe.radioPanel.add(dummyButton);
10101046 oe.buttonGroup.add(dummyButton);
10111047 */
1012
- cGridBag copyOptionsPanel = new cGridBag();
1048
+ cGridBag versionManagerPanel = new cGridBag();
10131049
1014
- copyOptionsPanel.preferredHeight = 2;
1050
+ versionManagerPanel.preferredHeight = 4;
10151051
10161052 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
10171053
....@@ -1021,62 +1057,102 @@
10211057
10221058 if (Globals.ADVANCED)
10231059 {
1024
- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1025
- maxButton.setToolTipText("Maximize window");
1026
- maxButton.addActionListener(this);
1060
+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1061
+// maxButton.setToolTipText("Maximize window");
1062
+// maxButton.addActionListener(this);
10271063 }
10281064
1029
- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1065
+ cButton gcButton;
1066
+
1067
+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1068
+// gcButton.setToolTipText("Garbage collect");
1069
+// gcButton.addActionListener(new ActionListener()
1070
+// {
1071
+// public void actionPerformed(ActionEvent e)
1072
+// {
1073
+// System.gc();
1074
+// }
1075
+// });
1076
+
1077
+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1078
+ collapseButton.setToolTipText("Collapse toolbar");
1079
+ collapseButton.addActionListener(this);
1080
+
1081
+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1082
+ maximize3DButton.setToolTipText("Maximize 3D view");
1083
+ maximize3DButton.addActionListener(this);
1084
+
1085
+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1086
+ twoButton.setToolTipText("Show 3D view only");
1087
+ twoButton.addActionListener(this);
1088
+ this.fullscreenLayout = twoButton;
1089
+
1090
+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1091
+ threeButton.setToolTipText("Show controls and 3D view");
1092
+ threeButton.addActionListener(this);
1093
+ if (Globals.ADVANCED)
1094
+ {
1095
+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1096
+ sixButton.setToolTipText("Show 3D view and controls");
1097
+ sixButton.addActionListener(this);
1098
+ }
1099
+// oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1100
+// sevenButton.setToolTipText("3-column layout");
1101
+// sevenButton.addActionListener(this);
1102
+ //
1103
+
1104
+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10301105 fullButton.setToolTipText("Full-screen window");
10311106 fullButton.addActionListener(this);
10321107
1033
- oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1108
+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10341109 screenfitButton.setToolTipText("Screen fit");
10351110 screenfitButton.addActionListener(this);
10361111
1037
- oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1112
+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10381113 restoreCameraButton.setToolTipText("Restore viewpoint");
10391114 restoreCameraButton.addActionListener(this);
10401115
1041
- copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1116
+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10421117 saveVersionButton.setToolTipText("Duplicate current version");
10431118 saveVersionButton.addActionListener(this);
10441119
1045
- copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1120
+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10461121 deleteVersionButton.setToolTipText("Delete current version");
10471122 deleteVersionButton.addActionListener(this);
1123
+ deleteVersionButton.setEnabled(false);
10481124
1049
- copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1125
+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10501126 previousVersionButton.setToolTipText("Previous version");
10511127 previousVersionButton.addActionListener(this);
10521128 previousVersionButton.setEnabled(false);
10531129
10541130 cGridBag updown = new cGridBag().setVertical(true);
1055
- updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1131
+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10561132 restoreButton.setToolTipText("Undo (restore current version)");
10571133 restoreButton.addActionListener(this);
1058
- //restoreButton.setEnabled(false);
1134
+ restoreButton.setEnabled(false);
10591135
1060
- updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1136
+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10611137 replaceButton.setToolTipText("Save (replace current version)");
10621138 replaceButton.addActionListener(this);
1063
- //replaceButton.setEnabled(false);
1139
+ replaceButton.setEnabled(false);
10641140
1065
- copyOptionsPanel.add(updown);
1141
+ versionManagerPanel.add(updown);
10661142
1067
- copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1143
+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10681144 nextVersionButton.setToolTipText("Next version");
10691145 nextVersionButton.addActionListener(this);
10701146 nextVersionButton.setEnabled(false);
1147
+
1148
+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1149
+ oneStepButton.setToolTipText("Animate one step forward");
1150
+ oneStepButton.addActionListener(this);
10711151
10721152 oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
10731153 liveCB.setToolTipText("Enable animation");
10741154 liveCB.addItemListener(this);
10751155
1076
- oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1077
- oneStepButton.setToolTipText("Animate one step forward");
1078
- oneStepButton.addActionListener(this);
1079
-
10801156 oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
10811157 fastCB.setToolTipText("Fast mode");
10821158 fastCB.addItemListener(this);
....@@ -1092,38 +1168,23 @@
10921168
10931169 if (Globals.ADVANCED)
10941170 {
1095
- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1171
+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10961172 snapobjectButton.addActionListener(this);
10971173 snapobjectButton.setToolTipText("Snap Object");
10981174
1099
- oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1175
+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11001176 fourButton.addActionListener(this);
11011177 fourButton.setToolTipText("Show control panel only");
11021178 }
11031179
11041180 //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
11051181
1106
- oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1107
- twoButton.setToolTipText("Show 3D view only");
1108
- twoButton.addActionListener(this);
1109
- this.fullscreenLayout = twoButton;
1110
-
1111
- oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1112
- threeButton.setToolTipText("Show controls and 3D view");
1113
- threeButton.addActionListener(this);
1114
- oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1115
- sixButton.setToolTipText("Show 3D view and controls");
1116
- sixButton.addActionListener(this);
1117
-// oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1118
-// sevenButton.setToolTipText("3-column layout");
1119
-// sevenButton.addActionListener(this);
1120
- //
11211182
1122
- oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1183
+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11231184 rootButton.setToolTipText("Open selection in new tab");
11241185 rootButton.addActionListener(this);
11251186
1126
- oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1187
+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11271188 closeButton.setToolTipText("Close tab");
11281189 closeButton.addActionListener(this);
11291190 //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
....@@ -1132,38 +1193,38 @@
11321193 cGridBag row1 = new cGridBag();
11331194
11341195 // INSERT
1135
- row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1136
- gridButton.setToolTipText("Create grid");
1196
+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1197
+ gridButton.setToolTipText("Create ground");
11371198 gridButton.addActionListener(this);
11381199
1139
- row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1200
+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11401201 boxButton.setToolTipText("Create box");
11411202 boxButton.addActionListener(this);
11421203
1143
- row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1144
- sphereButton.setToolTipText("Create sphere");
1145
- sphereButton.addActionListener(this);
1146
-
1147
- row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1148
- coneButton.setToolTipText("Create cone");
1149
- coneButton.addActionListener(this);
1150
-
1151
- row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1152
- torusButton.setToolTipText("Create torus");
1153
- torusButton.addActionListener(this);
1154
-
1155
- row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1204
+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11561205 superButton.setToolTipText("Create superellipsoid");
11571206 superButton.addActionListener(this);
11581207
1208
+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1209
+ sphereButton.setToolTipText("Create sphere");
1210
+ sphereButton.addActionListener(this);
1211
+
1212
+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1213
+ coneButton.setToolTipText("Create cone");
1214
+ coneButton.addActionListener(this);
1215
+
1216
+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1217
+ torusButton.setToolTipText("Create torus");
1218
+ torusButton.addActionListener(this);
1219
+
11591220 if (Globals.ADVANCED)
11601221 {
1161
- oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1222
+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11621223 kleinButton.setToolTipText("Create Klein bottle");
11631224 kleinButton.addActionListener(this);
11641225 }
11651226
1166
- row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1227
+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11671228 particlesButton.setToolTipText("Create particle system");
11681229 particlesButton.addActionListener(this);
11691230
....@@ -1171,31 +1232,31 @@
11711232
11721233 cGridBag row2 = new cGridBag();
11731234
1174
- row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1235
+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11751236 groupButton.setToolTipText("Create group");
11761237 groupButton.addActionListener(this);
11771238
1178
- row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1239
+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11791240 compositeButton.setToolTipText("Create composite");
11801241 compositeButton.addActionListener(this);
11811242
1182
- row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1243
+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11831244 switchButton.setToolTipText("Create item switcher");
11841245 switchButton.addActionListener(this);
11851246
1186
- row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1247
+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11871248 loopButton.setToolTipText("Create loop");
11881249 loopButton.addActionListener(this);
11891250
1190
- row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1251
+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11911252 textureButton.setToolTipText("Create texture");
11921253 textureButton.addActionListener(this);
11931254
1194
- row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1255
+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11951256 overlayButton.setToolTipText("Create overlay");
11961257 overlayButton.addActionListener(this);
11971258
1198
- row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1259
+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11991260 lightButton.setToolTipText("Create light");
12001261 lightButton.addActionListener(this);
12011262
....@@ -1205,6 +1266,11 @@
12051266
12061267 CreateTexturePanel(textures);
12071268
1269
+ int tabCount = resourcecontainer.getTabCount();
1270
+
1271
+ if (tabCount > 0)
1272
+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
1273
+
12081274 oe.toolboxPanel.add(textures);
12091275
12101276 textures.preferredHeight = 100;
....@@ -1212,11 +1278,11 @@
12121278 CreateSkyboxPanel(oe.skyboxPanel);
12131279
12141280 // EDIT panel
1215
- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1281
+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
12161282 editButton.setToolTipText("Pin selection controls");
12171283 editButton.addActionListener(this);
12181284
1219
- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1285
+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
12201286 uneditButton.setToolTipText("Unpin and remove selection controls");
12211287 uneditButton.addActionListener(this);
12221288
....@@ -1224,7 +1290,7 @@
12241290 allParamsButton.setToolTipText("Show all controls");
12251291 allParamsButton.addActionListener(this);
12261292
1227
- editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1293
+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
12281294 clearPanelButton.setToolTipText("Clear all controls");
12291295 clearPanelButton.addActionListener(this);
12301296
....@@ -1232,7 +1298,7 @@
12321298 //unselectButton.setToolTipText("Unselect");
12331299 //unselectButton.addActionListener(this);
12341300
1235
- editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1301
+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
12361302 flashSelectionButton.setToolTipText("Highlight selection");
12371303 flashSelectionButton.addActionListener(this);
12381304
....@@ -1255,6 +1321,8 @@
12551321
12561322 cGridBag jSPPanel = new cGridBag();
12571323
1324
+ jSPPanel.preferredHeight = 20;
1325
+
12581326 JScrollPane jSP;
12591327 //ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
12601328 jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
....@@ -1263,11 +1331,11 @@
12631331 oe.treePanel.add(jSPPanel);
12641332 oe.treePanel.Return();
12651333
1266
- oe.treePanel.add(copyOptionsPanel);
1334
+ oe.treePanel.add(versionManagerPanel);
12671335 oe.treePanel.Return();
1268
- cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1269
- versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1270
- sliderPane.preferredHeight = 1;
1336
+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1337
+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
1338
+ versionSliderPane.preferredHeight = 3;
12711339
12721340 // mainPanel.setDividerLocation(0.1); //1.0);
12731341 mainPanel.setResizeWeight(0.4);
....@@ -1425,6 +1493,14 @@
14251493
14261494 void EditObject(Object3D obj)
14271495 {
1496
+ assert(obj instanceof Composite);
1497
+
1498
+// if (obj.versionlist == null)
1499
+// {
1500
+// obj.versionlist = new Object3D[100];
1501
+// obj.versionindex = -1;
1502
+// }
1503
+
14281504 cRadio radioButton = new cRadio(obj.name);
14291505
14301506 // June 2019. Patch to avoid bug with transparency.
....@@ -1449,6 +1525,7 @@
14491525
14501526 oe.SetupViews();
14511527
1528
+ if (Globals.DEBUG)
14521529 System.out.println("SetupViews");
14531530 DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
14541531 oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
....@@ -1815,7 +1892,12 @@
18151892 TreePath path;
18161893
18171894 public TransferableTreePath(TreePath tp) {
1818
- path = tp;
1895
+ Object[] objs = new Object[tp.getPathCount()];
1896
+ for (int i=0; i<objs.length; i++)
1897
+ {
1898
+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
1899
+ }
1900
+ path = new TreePath(objs);
18191901 }
18201902
18211903 public synchronized DataFlavor[] getTransferDataFlavors() {
....@@ -2047,24 +2129,24 @@
20472129 switch(axis)
20482130 {
20492131 case 0 :
2050
- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2051
- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
2052
- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
2053
- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
2132
+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
2133
+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
2134
+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
2135
+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
20542136 norm = cVector.X;
20552137 break;
20562138 case 1 :
2057
- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2058
- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
2059
- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
2060
- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
2139
+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
2140
+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
2141
+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
2142
+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
20612143 norm = cVector.Y;
20622144 break;
20632145 case 2 :
2064
- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2065
- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
2066
- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
2067
- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
2146
+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
2147
+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
2148
+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
2149
+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
20682150 norm = cVector.Z;
20692151 break;
20702152 }
....@@ -2105,7 +2187,11 @@
21052187 shadow.material = new cMaterial(obj.material);
21062188 shadow.material.diffuse = 0.0001f;
21072189 shadow.material.specular = 0.0001f;
2108
- //shadow.projectedVertices[1].x = 300;
2190
+ shadow.material.opacity = 0.75f;
2191
+
2192
+ AllocProjectedVertices(shadow);
2193
+
2194
+ shadow.projectedVertices[1].x = 300;
21092195
21102196 makeSomething(shadow);
21112197 }
....@@ -2626,27 +2712,35 @@
26262712 } else
26272713 if (source == loopItem || source == loopButton)
26282714 {
2715
+ if (!group.selection.isEmpty())
2716
+ {
26292717 Composite csg = new GroupLeaf();
26302718 csg.count = 5;
2631
- group(csg);
26322719 Composite child = new cGroup("Branch");
26332720 csg.addChild(child);
26342721 child.addChild(csg);
2722
+ group(csg);
2723
+ }
26352724 } else
26362725 if (source == doubleItem)
26372726 {
2727
+ if (!group.selection.isEmpty())
2728
+ {
26382729 Composite csg = new GroupLeaf("Fork");
26392730 csg.count = 5;
2640
- group(csg);
26412731 Composite child = new cGroup("Branch A");
26422732 csg.addChild(child);
26432733 child.addChild(csg);
26442734 child = new cGroup("Branch B");
26452735 csg.addChild(child);
26462736 child.addChild(csg);
2737
+ group(csg);
2738
+ }
26472739 } else
26482740 if (source == tripleItem)
26492741 {
2742
+ if (!group.selection.isEmpty())
2743
+ {
26502744 Composite csg = new GroupLeaf("Trident");
26512745 csg.count = 4;
26522746 group(csg);
....@@ -2659,6 +2753,7 @@
26592753 child = new cGroup();
26602754 csg.addChild(child);
26612755 child.addChild(csg);
2756
+ }
26622757 } else
26632758 if (source == computeAOItem)
26642759 {
....@@ -2708,6 +2803,18 @@
27082803 if (source == fullButton)
27092804 {
27102805 ToggleFullScreen();
2806
+ } else
2807
+ if (source == collapseButton)
2808
+ {
2809
+ this.expandedLayout = radio.layout;
2810
+ CollapseToolbar();
2811
+ } else
2812
+ if (source == maximize3DButton)
2813
+ {
2814
+ this.expandedLayout = radio.layout;
2815
+ radio.layout = twoButton;
2816
+ Show3DView();
2817
+ CollapseToolbar();
27112818 } else
27122819 if (source == previousVersionButton)
27132820 {
....@@ -3282,22 +3389,34 @@
32823389 } else
32833390 if (source == ungroupItem || source == ungroupButton)
32843391 {
3285
- boolean hasRoot = false;
3392
+ boolean canUngroup = true;
32863393
32873394 for (int i=0; i<group.selection.size(); i++)
32883395 {
3289
- if (group.selection.get(i) == group)
3396
+ Object3D selectedItem = group.selection.get(i);
3397
+
3398
+ if (selectedItem.Size() == 0)
32903399 {
3291
- hasRoot = true;
3400
+ // Cannot ungroup leaves
3401
+ canUngroup = false;
3402
+ break;
3403
+ }
3404
+
3405
+ if (selectedItem == group)
3406
+ {
3407
+ // Cannot ungroup root
3408
+ canUngroup = false;
32923409 break;
32933410 }
32943411 }
32953412
3296
- if (!hasRoot)
3413
+ if (canUngroup)
32973414 {
32983415 for (int i=0; i<group.selection.size(); i++)
32993416 {
3300
- Ungroup(group.selection.get(i));
3417
+ Object3D selectedItem = group.selection.get(i);
3418
+
3419
+ Ungroup(selectedItem);
33013420 }
33023421
33033422 ClearSelection(false);
....@@ -3348,6 +3467,10 @@
33483467 if (source == clearMaterialsItem)
33493468 {
33503469 ClearMaterials();
3470
+ } else
3471
+ if (source == clearVersionsItem)
3472
+ {
3473
+ ClearVersions();
33513474 } else
33523475 if (source == liveleavesItem)
33533476 {
....@@ -3660,38 +3783,7 @@
36603783 if (CameraPane.FULLSCREEN)
36613784 fullscreenLayout = radio.layout;
36623785
3663
- // bug
3664
- //gridPanel.setDividerLocation(1.0);
3665
- //bigPanel.setDividerLocation(0.0);
3666
-// bigThree.remove(scenePanel);
3667
-// bigThree.remove(centralPanel);
3668
-// bigThree.remove(XYZPanel);
3669
-// aWindowConstraints.gridx = 0;
3670
-// aWindowConstraints.gridy = 0;
3671
-// aWindowConstraints.gridwidth = 1;
3672
-// // aConstraints.gridheight = 3;
3673
-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3674
-// aWindowConstraints.weightx = 0;
3675
-// aWindowConstraints.weighty = 1;
3676
-// //bigThree.add(jtp, aWindowConstraints);
3677
-// aWindowConstraints.weightx = 1;
3678
-// aWindowConstraints.gridwidth = 3;
3679
-// // aConstraints.gridheight = 3;
3680
-// aWindowConstraints.gridx = 1;
3681
-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3682
-// bigThree.add(centralPanel, aWindowConstraints);
3683
-// aWindowConstraints.weightx = 0;
3684
-// aWindowConstraints.gridx = 4;
3685
-// aWindowConstraints.gridwidth = 1;
3686
-// // aConstraints.gridheight = 3;
3687
-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3688
-// //bigThree.add(XYZPanel, aWindowConstraints);
3689
-// scenePanel.setVisible(false);
3690
-// centralPanel.setVisible(true);
3691
-// XYZPanel.setVisible(false);
3692
- bigThree.ClearUI();
3693
- bigThree.add(centralPanel);
3694
- bigThree.FlushUI();
3786
+ Show3DView();
36953787
36963788 cameraView.requestFocusInWindow();
36973789
....@@ -3877,6 +3969,7 @@
38773969 } else
38783970 if (source == rootButton)
38793971 {
3972
+ Replace();
38803973 Object3D obj;
38813974 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
38823975 {
....@@ -3891,6 +3984,8 @@
38913984 if (source == closeButton)
38923985 {
38933986 //System.out.println("CLOSE: " + buttonGroup.getSelection());
3987
+ Replace();
3988
+
38943989 cRadio ab;
38953990 for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
38963991 {
....@@ -3989,6 +4084,8 @@
39894084 } else
39904085 if(source instanceof cRadio)
39914086 {
4087
+ Replace();
4088
+
39924089 group.parent = keepparent;
39934090 group.attributes = 0;
39944091 //group.editWindow = null;
....@@ -4013,8 +4110,6 @@
40134110
40144111 copy = group;
40154112
4016
- SetUndoStates();
4017
-
40184113 //Globals.theRenderer.object = group;
40194114 if(!useclient)
40204115 {
....@@ -4042,6 +4137,31 @@
40424137 */
40434138 radio.layout.doClick();
40444139
4140
+ assert(copy instanceof Composite);
4141
+
4142
+ if (copy.versionlist == null)
4143
+ {
4144
+ copy.versionindex = -1;
4145
+
4146
+ // Cannot work with loops
4147
+ // To fix this issue, we first mark all nodes above the root,
4148
+ // and check if any of these nodes are reachable below the root.
4149
+ Grafreed.grafreed.universe.TagObjects(copy, true);
4150
+
4151
+ if (copy.versionlist == null && !copy.HasTags())
4152
+ {
4153
+ copy.versionlist = new Object3D[100];
4154
+
4155
+ //Save(true);
4156
+ }
4157
+ else
4158
+ copy.versionindex = -2;
4159
+
4160
+ Grafreed.grafreed.universe.TagObjects(copy, false);
4161
+ }
4162
+
4163
+ SetVersionStates();
4164
+
40454165 ClearUnpinned();
40464166
40474167 //Grafreed.Assert(group != null);
....@@ -4185,7 +4305,7 @@
41854305 TouchTransform(obj);
41864306 continue;
41874307 }
4188
- if ((mask&2) != 0) // Scale
4308
+ if ((mask&2) != 0) // Scale/rotation
41894309 {
41904310 obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
41914311 obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
....@@ -4193,10 +4313,6 @@
41934313 obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
41944314 obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
41954315 obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4196
- }
4197
- if ((mask&4) != 0) // Rotation
4198
- {
4199
- // ?
42004316 }
42014317 if ((mask&1) != 0) // Translation
42024318 {
....@@ -5005,6 +5121,12 @@
50055121 refreshContents();
50065122 }
50075123
5124
+ void ClearVersions()
5125
+ {
5126
+ group.selection.ClearVersions();
5127
+ refreshContents();
5128
+ }
5129
+
50085130 void FlipV(boolean flip)
50095131 {
50105132 group.selection.FlipV(flip);
....@@ -5276,10 +5398,26 @@
52765398 flashSelectionButton.setEnabled(enabled);
52775399
52785400 clearPanelButton.setEnabled(!listUI.isEmpty());
5401
+
5402
+ boolean allComposites = true;
5403
+
5404
+ if (group.selection != null)
5405
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5406
+ {
5407
+ Object next = e.nextElement();
5408
+ if (!(next instanceof Composite)) // || (next instanceof GroupLeaf))
5409
+ {
5410
+ allComposites = false;
5411
+ break;
5412
+ }
5413
+ }
5414
+
5415
+ rootButton.setEnabled(allComposites);
52795416 }
52805417
52815418 void refreshContents(boolean cp)
52825419 {
5420
+ if (Globals.ADVANCED)
52835421 //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
52845422 if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
52855423 {
....@@ -5290,7 +5428,7 @@
52905428 Object3D child = (Object3D) group.selection.get(i);
52915429
52925430 objEditor.AddInfo(child, this, true);
5293
- System.err.println("info : " + child.GetPath());
5431
+// System.err.println("info : " + child.GetPath());
52945432 }
52955433
52965434 objEditor.SetText(); // jan 2014
....@@ -6173,11 +6311,11 @@
61736311 private MenuItem lookAtItem;
61746312 private MenuItem lookFromItem;
61756313 private MenuItem switchViewItem;
6176
- private MenuItem cutItem;
6314
+ private JMenuItem cutItem;
61776315 private MenuItem undoItem;
61786316 private MenuItem redoItem;
61796317 private JMenuItem duplicateItem;
6180
- private MenuItem cloneItem;
6318
+ private JMenuItem cloneItem;
61816319 private MenuItem cloneSupportItem;
61826320 private MenuItem overwriteGeoItem;
61836321 private MenuItem overwriteMatItem;
....@@ -6198,13 +6336,13 @@
61986336 private MenuItem cloneGeometriesItem;
61996337 private MenuItem shareGeometriesItem;
62006338 private MenuItem mergeGeometriesItem;
6201
- private MenuItem copyItem;
6339
+ private JMenuItem copyItem;
62026340 private MenuItem pasteItem;
6203
- private MenuItem pasteIntoItem;
6204
- private MenuItem pasteLinkItem;
6205
- private MenuItem pasteCloneItem;
6206
- private MenuItem pasteExpandItem;
6207
- private MenuItem deleteItem;
6341
+ private JMenuItem pasteIntoItem;
6342
+ private JMenuItem pasteLinkItem;
6343
+ private JMenuItem pasteCloneItem;
6344
+ private JMenuItem pasteExpandItem;
6345
+ private JMenuItem deleteItem;
62086346 private MenuItem clearAllItem;
62096347 private MenuItem genUVItem;
62106348 private MenuItem genNormalsMESHItem;
....@@ -6230,6 +6368,7 @@
62306368 private MenuItem clipMeshItem;
62316369 private MenuItem smoothMeshItem;
62326370 private MenuItem clearMaterialsItem;
6371
+ private MenuItem clearVersionsItem;
62336372
62346373 private MenuItem liveleavesItem;
62356374 private MenuItem unliveleavesItem;
....@@ -6259,7 +6398,7 @@
62596398 private MenuItem transformGeometryItem;
62606399 private MenuItem transformChildrenItem;
62616400 private MenuItem hideItem;
6262
- private MenuItem grabItem;
6401
+ private JMenuItem grabItem;
62636402 private MenuItem backItem;
62646403 private MenuItem frontItem;
62656404 private MenuItem cameraItem;
....@@ -6272,7 +6411,7 @@
62726411 private MenuItem switchTransfoItem;
62736412 private MenuItem morphItem;
62746413 private MenuItem linkerItem;
6275
- private MenuItem ungroupItem;
6414
+ private JMenuItem ungroupItem;
62766415 private MenuItem editItem;
62776416 private MenuItem openWindowItem;
62786417 private MenuItem editLeafItem;