Normand Briere
2019-08-18 480ad70047e54b2b92f974e6c2ac5a6c0bdc5a5c
GroupEditor.java
....@@ -16,6 +16,7 @@
1616 //import buoy.widget.BFileChooser;
1717
1818 class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
19
+ Grafreed.iResourceCallBack,
1920 ObjectUI,
2021 Runnable,
2122 ActionListener,
....@@ -28,9 +29,9 @@
2829 {
2930 cButton skyboxButton;
3031 final String path = "cubemaps/" + f + "-skyboxes/" + s;
31
- row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
32
+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Globals.NIMBUSLAF));
3233 //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
33
- skyboxButton.setToolTipText(s);
34
+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
3435 skyboxButton.addActionListener(new ActionListener()
3536 {
3637 @Override
....@@ -41,6 +42,22 @@
4142 });
4243 }
4344
45
+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
46
+ {
47
+ cButton textureButton;
48
+ final String path = "textures/" + f + "/" + c + "/"; // + t;
49
+ row.add(textureButton = GetButton(path + "icons/" + t, !Globals.NIMBUSLAF));
50
+ textureButton.setToolTipText(c + count);
51
+ textureButton.addActionListener(new ActionListener()
52
+ {
53
+ @Override
54
+ public void actionPerformed(ActionEvent e)
55
+ {
56
+ ChangeTexture(path + t);
57
+ }
58
+ });
59
+ }
60
+
4461 public void AddSkyboxTab0(JTabbedPane skyboxpanel)
4562 {
4663 cGridBag tab0 = new cGridBag().setVertical(true);
....@@ -56,7 +73,7 @@
5673 cGridBag row5 = new cGridBag();
5774 cGridBag row6 = new cGridBag();
5875
59
- AddSkyboxButton("default", "rgb", row0);
76
+ AddSkyboxButton("default", "", row0);
6077 //AddSkyboxButton("default", "cornell", row0);
6178 AddSkyboxButton("penguins", "dust", row0);
6279 AddSkyboxButton("penguins", "tropic", row0);
....@@ -311,14 +328,56 @@
311328 }
312329 }
313330
314
- public void ChangeSkybox(String name)
331
+ public void ChangeSkybox(String skybox)
315332 {
316
- //cameraView.envyoff = false;
317
- group.skyboxname = name;
318
- group.skyboxext = "jpg";
319
- 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
+ }
346
+ }
347
+
348
+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
349
+ {
350
+ JTabbedPane skyboxpane = new JTabbedPane(JTabbedPane.LEFT);
351
+
352
+ AddSkyboxTab0(skyboxpane);
353
+ AddSkyboxTab1(skyboxpane);
354
+ AddSkyboxTab2(skyboxpane);
355
+ AddSkyboxTab3(skyboxpane);
356
+
357
+ skyboxPanel.add(skyboxpane);
320358 }
321359
360
+ public void ChangeTexture(String texture)
361
+ {
362
+ for (int i=0; i<group.selection.size(); i++)
363
+ {
364
+ Object3D obj = group.selection.get(i);
365
+ obj.SetPigmentTexture("@" + texture);
366
+ }
367
+
368
+ 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();
379
+ }
380
+
322381 //ObjEditor objEditor;
323382 public void closeUI2()
324383 {
....@@ -356,10 +415,14 @@
356415 this.copy = this.group = group;
357416 //selectees = this.group.selectees;
358417
359
- if (copy.versions == null)
418
+ assert(false);
419
+
420
+ if (copy.versionlist == null)
360421 {
361
- copy.versions = new Object3D[100];
422
+ copy.versionlist = new Object3D[100];
362423 copy.versionindex = -1;
424
+
425
+ //Save(true);
363426 }
364427
365428 if(ui)
....@@ -383,12 +446,12 @@
383446
384447 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
385448
386
- if (copy.versions == null)
449
+ if (copy.versionlist == null)
387450 {
388
- copy.versions = new Object3D[100];
451
+ copy.versionlist = new Object3D[100];
389452 copy.versionindex = -1;
390453
391
- Save(true);
454
+ //Save(true);
392455 }
393456 }
394457
....@@ -479,33 +542,35 @@
479542 // menu.add("-");
480543 duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
481544 duplicateItem.addActionListener(this);
482
- cloneItem = menu.add(new MenuItem("Clone"));
545
+
546
+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
483547 cloneItem.addActionListener(this);
484
- if (Globals.ADVANCED)
548
+ //if (Globals.ADVANCED)
485549 {
486550 cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
487551 cloneSupportItem.addActionListener(this);
488552 }
553
+ oe.jTree.popup.addSeparator();
489554 menu.add("-");
490
- cutItem = menu.add(new MenuItem("Cut"));
555
+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
491556 cutItem.addActionListener(this);
492
- copyItem = menu.add(new MenuItem("Copy"));
557
+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
493558 copyItem.addActionListener(this);
494559 pasteItem = menu.add(new MenuItem("Paste"));
495560 pasteItem.addActionListener(this);
496561
497
- menu.add("-");
498
- 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"));
499565 pasteIntoItem.addActionListener(this);
500
- pasteLinkItem = menu.add(new MenuItem("Paste link"));
566
+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
501567 pasteLinkItem.addActionListener(this);
502
- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
568
+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
503569 pasteCloneItem.addActionListener(this);
504
-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
570
+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
505571 // pasteExpandItem.addActionListener(this);
506
- menu.add("-");
507
- deleteItem = menu.add(new MenuItem("Delete"));
508
- deleteItem.addActionListener(this);
572
+ //menu.add("-");
573
+ oe.jTree.popup.addSeparator();
509574
510575 if (Globals.ADVANCED)
511576 {
....@@ -591,11 +656,9 @@
591656 oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
592657 //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
593658 //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
594
- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
595659 oe.cameraMenu.add("-");
596660 openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
597661 openWindowItem.addActionListener(this);
598
- editLeafItem.addActionListener(this);
599662 lookAtItem.addActionListener(this);
600663 //lookFromItem.addActinoListener(this);
601664 //switchViewItem.addActionListener(this);
....@@ -642,9 +705,8 @@
642705 setMasterItem.addActionListener(this);
643706 }
644707
645
- oe.menuBar.add(menu = new Menu("Group"));
646
-// grabItem = menu.add(new MenuItem("Grab"));
647
-// grabItem.addActionListener(this);
708
+ oe.menuBar.add(menu = new Menu("Order"));
709
+
648710 backItem = menu.add(new MenuItem("Back"));
649711 backItem.addActionListener(this);
650712 frontItem = menu.add(new MenuItem("Front"));
....@@ -652,13 +714,21 @@
652714 // compositeItem = menu.add(new MenuItem("Composite"));
653715 // compositeItem.addActionListener(this);
654716
717
+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
718
+ grabItem.addActionListener(this);
719
+
655720 if (Globals.ADVANCED)
656721 {
657722 hideItem = menu.add(new MenuItem("Hidden Group"));
658723 hideItem.addActionListener(this);
659724 }
660
- ungroupItem = menu.add(new MenuItem("Ungroup"));
725
+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
661726 ungroupItem.addActionListener(this);
727
+
728
+ oe.jTree.popup.addSeparator();
729
+
730
+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
731
+ deleteItem.addActionListener(this);
662732
663733 // menu.add("-");
664734 //
....@@ -787,9 +857,9 @@
787857 hideleavesItem.addActionListener(this);
788858 showleavesItem = menu.add(new MenuItem("Show Leaves"));
789859 showleavesItem.addActionListener(this);
790
- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
860
+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
791861 markleavesItem.addActionListener(this);
792
- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
862
+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
793863 unmarkleavesItem.addActionListener(this);
794864 rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
795865 rewindleavesItem.addActionListener(this);
....@@ -843,6 +913,9 @@
843913 shareGeometriesItem.addActionListener(this);
844914 mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
845915 mergeGeometriesItem.addActionListener(this);
916
+ menu.add("-");
917
+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
918
+ editLeafItem.addActionListener(this);
846919 if (Globals.ADVANCED)
847920 {
848921 // Pretty much the same as duplicate and clone.
....@@ -859,6 +932,74 @@
859932 buildToolsMenu(menu);
860933 }
861934
935
+ JTabbedPane resourcecontainer;
936
+ cGridBag currenttab;
937
+ //boolean added; // patch for jar
938
+
939
+ int tabcount = 0;
940
+ int colcount = 0;
941
+ int rowcount = 0;
942
+ int texturecount = 0;
943
+
944
+ int columns = 5;
945
+ int rows = 7;
946
+
947
+ public void ResourceCallBack(String[] path)
948
+ {
949
+// for (int i = 0; i < path.length; i++)
950
+// System.out.print(path[i] + "/");
951
+// System.out.println();
952
+
953
+ if (//rowcount == 0 ||
954
+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
955
+ {
956
+ currenttab = new cGridBag();
957
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
958
+ currenttab.setName(tabname);
959
+ //added = false;
960
+ resourcecontainer.add(currenttab);
961
+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
962
+ rowcount = 1;
963
+ colcount = 0;
964
+ texturecount = 0;
965
+ }
966
+
967
+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
968
+ {
969
+ //if (!added)
970
+ {
971
+ //added = true;
972
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
973
+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
974
+ }
975
+
976
+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
977
+
978
+ if (++colcount >= columns)
979
+ {
980
+ colcount = 0;
981
+ currenttab.Return();
982
+
983
+ if (rowcount++ >= rows)
984
+ {
985
+ rowcount = 0;
986
+ }
987
+ }
988
+ }
989
+ else
990
+ {
991
+// if (!path[path.length-1].equals("icons"))
992
+// resourcecontainer.Return();
993
+ }
994
+ }
995
+
996
+ void CreateTexturePanel(cGridBag container)
997
+ {
998
+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
999
+ container.add(resourcecontainer);
1000
+
1001
+ Grafreed.ParseResources("textures", this);
1002
+ }
8621003
8631004 void SetupUI2(ObjEditor oe)
8641005 {
....@@ -877,11 +1018,6 @@
8771018 //new Exception().printStackTrace();
8781019
8791020 oe.radioPanel = new JPanel(new GridBagLayout());
880
- oe.aConstraints.weightx = 1;
881
- oe.aConstraints.weighty = 0;
882
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
883
- oe.aConstraints.gridwidth = 100;
884
- oe.aConstraints.gridheight = 1;
8851021 // oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
8861022
8871023 oe.buttonGroup = new ButtonGroup();
....@@ -902,9 +1038,9 @@
9021038 oe.radioPanel.add(dummyButton);
9031039 oe.buttonGroup.add(dummyButton);
9041040 */
905
- cGridBag copyOptionsPanel = new cGridBag();
1041
+ cGridBag versionManagerPanel = new cGridBag();
9061042
907
- copyOptionsPanel.preferredHeight = 2;
1043
+ versionManagerPanel.preferredHeight = 4;
9081044
9091045 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
9101046
....@@ -914,58 +1050,102 @@
9141050
9151051 if (Globals.ADVANCED)
9161052 {
917
- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
918
- maxButton.setToolTipText("Maximize window");
919
- maxButton.addActionListener(this);
1053
+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1054
+// maxButton.setToolTipText("Maximize window");
1055
+// maxButton.addActionListener(this);
9201056 }
9211057
922
- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1058
+ cButton gcButton;
1059
+
1060
+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1061
+// gcButton.setToolTipText("Garbage collect");
1062
+// gcButton.addActionListener(new ActionListener()
1063
+// {
1064
+// public void actionPerformed(ActionEvent e)
1065
+// {
1066
+// System.gc();
1067
+// }
1068
+// });
1069
+
1070
+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1071
+ collapseButton.setToolTipText("Collapse toolbar");
1072
+ collapseButton.addActionListener(this);
1073
+
1074
+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1075
+ maximize3DButton.setToolTipText("Maximize 3D view");
1076
+ maximize3DButton.addActionListener(this);
1077
+
1078
+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1079
+ twoButton.setToolTipText("Show 3D view only");
1080
+ twoButton.addActionListener(this);
1081
+ this.fullscreenLayout = twoButton;
1082
+
1083
+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1084
+ threeButton.setToolTipText("Show controls and 3D view");
1085
+ threeButton.addActionListener(this);
1086
+ if (Globals.ADVANCED)
1087
+ {
1088
+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1089
+ sixButton.setToolTipText("Show 3D view and controls");
1090
+ sixButton.addActionListener(this);
1091
+ }
1092
+// oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1093
+// sevenButton.setToolTipText("3-column layout");
1094
+// sevenButton.addActionListener(this);
1095
+ //
1096
+
1097
+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9231098 fullButton.setToolTipText("Full-screen window");
9241099 fullButton.addActionListener(this);
9251100
926
- oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1101
+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9271102 screenfitButton.setToolTipText("Screen fit");
9281103 screenfitButton.addActionListener(this);
9291104
930
- oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1105
+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9311106 restoreCameraButton.setToolTipText("Restore viewpoint");
9321107 restoreCameraButton.addActionListener(this);
9331108
934
- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
935
- saveButton.setToolTipText("Duplicate current version");
936
- saveButton.addActionListener(this);
1109
+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1110
+ saveVersionButton.setToolTipText("Duplicate current version");
1111
+ saveVersionButton.addActionListener(this);
9371112
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);
1113
+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1114
+ deleteVersionButton.setToolTipText("Delete current version");
1115
+ deleteVersionButton.addActionListener(this);
1116
+ deleteVersionButton.setEnabled(false);
1117
+
1118
+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1119
+ previousVersionButton.setToolTipText("Previous version");
1120
+ previousVersionButton.addActionListener(this);
1121
+ previousVersionButton.setEnabled(false);
9421122
9431123 cGridBag updown = new cGridBag().setVertical(true);
944
- updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
945
- restoreButton.setToolTipText("Restore current version (undo latest change)");
1124
+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1125
+ restoreButton.setToolTipText("Undo (restore current version)");
9461126 restoreButton.addActionListener(this);
9471127 restoreButton.setEnabled(false);
9481128
949
- updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
950
- replaceButton.setToolTipText("Replace current version (save latest change)");
1129
+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1130
+ replaceButton.setToolTipText("Save (replace current version)");
9511131 replaceButton.addActionListener(this);
9521132 replaceButton.setEnabled(false);
9531133
954
- copyOptionsPanel.add(updown);
1134
+ versionManagerPanel.add(updown);
9551135
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);
1136
+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1137
+ nextVersionButton.setToolTipText("Next version");
1138
+ nextVersionButton.addActionListener(this);
1139
+ nextVersionButton.setEnabled(false);
1140
+
1141
+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1142
+ oneStepButton.setToolTipText("Animate one step forward");
1143
+ oneStepButton.addActionListener(this);
9601144
9611145 oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
9621146 liveCB.setToolTipText("Enable animation");
9631147 liveCB.addItemListener(this);
9641148
965
- oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
966
- oneStepButton.setToolTipText("Animate one step forward");
967
- oneStepButton.addActionListener(this);
968
-
9691149 oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
9701150 fastCB.setToolTipText("Fast mode");
9711151 fastCB.addItemListener(this);
....@@ -981,38 +1161,23 @@
9811161
9821162 if (Globals.ADVANCED)
9831163 {
984
- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1164
+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9851165 snapobjectButton.addActionListener(this);
9861166 snapobjectButton.setToolTipText("Snap Object");
9871167
988
- oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1168
+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
9891169 fourButton.addActionListener(this);
9901170 fourButton.setToolTipText("Show control panel only");
9911171 }
9921172
9931173 //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
9941174
995
- oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
996
- twoButton.setToolTipText("Show 3D view only");
997
- twoButton.addActionListener(this);
998
- this.fullscreenLayout = twoButton;
999
-
1000
- oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1001
- threeButton.setToolTipText("Show controls and 3D view");
1002
- threeButton.addActionListener(this);
1003
- oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1004
- sixButton.setToolTipText("Show 3D view and controls");
1005
- sixButton.addActionListener(this);
1006
-// oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1007
-// sevenButton.setToolTipText("3-column layout");
1008
-// sevenButton.addActionListener(this);
1009
- //
10101175
1011
- oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1176
+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10121177 rootButton.setToolTipText("Open selection in new tab");
10131178 rootButton.addActionListener(this);
10141179
1015
- oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1180
+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10161181 closeButton.setToolTipText("Close tab");
10171182 closeButton.addActionListener(this);
10181183 //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
....@@ -1021,38 +1186,38 @@
10211186 cGridBag row1 = new cGridBag();
10221187
10231188 // INSERT
1024
- row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1025
- gridButton.setToolTipText("Create grid");
1189
+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1190
+ gridButton.setToolTipText("Create ground");
10261191 gridButton.addActionListener(this);
10271192
1028
- row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1193
+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10291194 boxButton.setToolTipText("Create box");
10301195 boxButton.addActionListener(this);
10311196
1032
- row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1033
- sphereButton.setToolTipText("Create sphere");
1034
- sphereButton.addActionListener(this);
1035
-
1036
- row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1037
- coneButton.setToolTipText("Create cone");
1038
- coneButton.addActionListener(this);
1039
-
1040
- row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1041
- torusButton.setToolTipText("Create torus");
1042
- torusButton.addActionListener(this);
1043
-
1044
- row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1197
+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10451198 superButton.setToolTipText("Create superellipsoid");
10461199 superButton.addActionListener(this);
10471200
1201
+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1202
+ sphereButton.setToolTipText("Create sphere");
1203
+ sphereButton.addActionListener(this);
1204
+
1205
+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1206
+ coneButton.setToolTipText("Create cone");
1207
+ coneButton.addActionListener(this);
1208
+
1209
+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1210
+ torusButton.setToolTipText("Create torus");
1211
+ torusButton.addActionListener(this);
1212
+
10481213 if (Globals.ADVANCED)
10491214 {
1050
- oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1215
+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10511216 kleinButton.setToolTipText("Create Klein bottle");
10521217 kleinButton.addActionListener(this);
10531218 }
10541219
1055
- row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1220
+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10561221 particlesButton.setToolTipText("Create particle system");
10571222 particlesButton.addActionListener(this);
10581223
....@@ -1060,72 +1225,70 @@
10601225
10611226 cGridBag row2 = new cGridBag();
10621227
1063
- row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1228
+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10641229 groupButton.setToolTipText("Create group");
10651230 groupButton.addActionListener(this);
10661231
1067
- row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1232
+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10681233 compositeButton.setToolTipText("Create composite");
10691234 compositeButton.addActionListener(this);
10701235
1071
- row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1236
+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10721237 switchButton.setToolTipText("Create item switcher");
10731238 switchButton.addActionListener(this);
10741239
1075
- row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1240
+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10761241 loopButton.setToolTipText("Create loop");
10771242 loopButton.addActionListener(this);
10781243
1079
- row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1244
+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10801245 textureButton.setToolTipText("Create texture");
10811246 textureButton.addActionListener(this);
10821247
1083
- row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1248
+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10841249 overlayButton.setToolTipText("Create overlay");
10851250 overlayButton.addActionListener(this);
10861251
1087
- row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1252
+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
10881253 lightButton.setToolTipText("Create light");
10891254 lightButton.addActionListener(this);
10901255
10911256 oe.toolboxPanel.add(row2);
10921257
1093
- // ENVYMAPS
1094
- cGridBag skyboxpane = new cGridBag();
1095
- skyboxpane.preferredHeight = 100;
1258
+ cGridBag textures = new cGridBag();
10961259
1097
- oe.toolboxPanel.add(skyboxpane);
1260
+ CreateTexturePanel(textures);
10981261
1099
- JTabbedPane skyboxpanel = new JTabbedPane();
1100
- skyboxpane.add(skyboxpanel);
1262
+ resourcecontainer.setSelectedIndex((int)(Math.random() * resourcecontainer.getTabCount()));
11011263
1102
- AddSkyboxTab0(skyboxpanel);
1103
- AddSkyboxTab1(skyboxpanel);
1104
- AddSkyboxTab2(skyboxpanel);
1105
- AddSkyboxTab3(skyboxpanel);
1264
+ oe.toolboxPanel.add(textures);
1265
+
1266
+ textures.preferredHeight = 100;
1267
+
1268
+ CreateSkyboxPanel(oe.skyboxPanel);
11061269
11071270 // EDIT panel
1108
- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1271
+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11091272 editButton.setToolTipText("Pin selection controls");
11101273 editButton.addActionListener(this);
11111274
1112
- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1113
- uneditButton.setToolTipText("Remove selection controls");
1275
+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1276
+ uneditButton.setToolTipText("Unpin and remove selection controls");
11141277 uneditButton.addActionListener(this);
11151278
11161279 editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1117
- allParamsButton.setToolTipText("Show all controle");
1280
+ allParamsButton.setToolTipText("Show all controls");
11181281 allParamsButton.addActionListener(this);
11191282
1120
- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1121
- clearPanelButton.setToolTipText("Clear edit panel");
1283
+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1284
+ clearPanelButton.setToolTipText("Clear all controls");
11221285 clearPanelButton.addActionListener(this);
11231286
1124
- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1125
- unselectButton.setToolTipText("Unselect");
1126
- unselectButton.addActionListener(this);
1287
+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1288
+ //unselectButton.setToolTipText("Unselect");
1289
+ //unselectButton.addActionListener(this);
11271290
1128
- editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1291
+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
11291292 flashSelectionButton.setToolTipText("Highlight selection");
11301293 flashSelectionButton.addActionListener(this);
11311294
....@@ -1148,6 +1311,8 @@
11481311
11491312 cGridBag jSPPanel = new cGridBag();
11501313
1314
+ jSPPanel.preferredHeight = 20;
1315
+
11511316 JScrollPane jSP;
11521317 //ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
11531318 jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
....@@ -1156,11 +1321,11 @@
11561321 oe.treePanel.add(jSPPanel);
11571322 oe.treePanel.Return();
11581323
1159
- oe.treePanel.add(copyOptionsPanel);
1324
+ oe.treePanel.add(versionManagerPanel);
11601325 oe.treePanel.Return();
1161
- cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1162
- versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1163
- sliderPane.preferredHeight = 1;
1326
+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1327
+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
1328
+ versionSliderPane.preferredHeight = 3;
11641329
11651330 // mainPanel.setDividerLocation(0.1); //1.0);
11661331 mainPanel.setResizeWeight(0.4);
....@@ -1318,6 +1483,14 @@
13181483
13191484 void EditObject(Object3D obj)
13201485 {
1486
+ assert(obj instanceof Composite);
1487
+
1488
+// if (obj.versionlist == null)
1489
+// {
1490
+// obj.versionlist = new Object3D[100];
1491
+// obj.versionindex = -1;
1492
+// }
1493
+
13211494 cRadio radioButton = new cRadio(obj.name);
13221495
13231496 // June 2019. Patch to avoid bug with transparency.
....@@ -1342,6 +1515,7 @@
13421515
13431516 oe.SetupViews();
13441517
1518
+ if (Globals.DEBUG)
13451519 System.out.println("SetupViews");
13461520 DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
13471521 oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
....@@ -1708,7 +1882,12 @@
17081882 TreePath path;
17091883
17101884 public TransferableTreePath(TreePath tp) {
1711
- path = tp;
1885
+ Object[] objs = new Object[tp.getPathCount()];
1886
+ for (int i=0; i<objs.length; i++)
1887
+ {
1888
+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
1889
+ }
1890
+ path = new TreePath(objs);
17121891 }
17131892
17141893 public synchronized DataFlavor[] getTransferDataFlavors() {
....@@ -1998,7 +2177,11 @@
19982177 shadow.material = new cMaterial(obj.material);
19992178 shadow.material.diffuse = 0.0001f;
20002179 shadow.material.specular = 0.0001f;
2001
- //shadow.projectedVertices[1].x = 300;
2180
+ shadow.material.opacity = 0.75f;
2181
+
2182
+ AllocProjectedVertices(shadow);
2183
+
2184
+ shadow.projectedVertices[1].x = 300;
20022185
20032186 makeSomething(shadow);
20042187 }
....@@ -2519,27 +2702,35 @@
25192702 } else
25202703 if (source == loopItem || source == loopButton)
25212704 {
2705
+ if (!group.selection.isEmpty())
2706
+ {
25222707 Composite csg = new GroupLeaf();
25232708 csg.count = 5;
2524
- group(csg);
25252709 Composite child = new cGroup("Branch");
25262710 csg.addChild(child);
25272711 child.addChild(csg);
2712
+ group(csg);
2713
+ }
25282714 } else
25292715 if (source == doubleItem)
25302716 {
2717
+ if (!group.selection.isEmpty())
2718
+ {
25312719 Composite csg = new GroupLeaf("Fork");
25322720 csg.count = 5;
2533
- group(csg);
25342721 Composite child = new cGroup("Branch A");
25352722 csg.addChild(child);
25362723 child.addChild(csg);
25372724 child = new cGroup("Branch B");
25382725 csg.addChild(child);
25392726 child.addChild(csg);
2727
+ group(csg);
2728
+ }
25402729 } else
25412730 if (source == tripleItem)
25422731 {
2732
+ if (!group.selection.isEmpty())
2733
+ {
25432734 Composite csg = new GroupLeaf("Trident");
25442735 csg.count = 4;
25452736 group(csg);
....@@ -2552,6 +2743,7 @@
25522743 child = new cGroup();
25532744 csg.addChild(child);
25542745 child.addChild(csg);
2746
+ }
25552747 } else
25562748 if (source == computeAOItem)
25572749 {
....@@ -2571,7 +2763,7 @@
25712763 if (source == invariantsItem)
25722764 {
25732765 System.out.println("Invariants:");
2574
- Grafreed.grafreeD.universe.invariants();
2766
+ Grafreed.grafreed.universe.invariants();
25752767 } else
25762768 if (source == memoryItem)
25772769 {
....@@ -2602,33 +2794,52 @@
26022794 {
26032795 ToggleFullScreen();
26042796 } else
2605
- if (source == undoButton)
2797
+ if (source == collapseButton)
2798
+ {
2799
+ this.expandedLayout = radio.layout;
2800
+ CollapseToolbar();
2801
+ } else
2802
+ if (source == maximize3DButton)
2803
+ {
2804
+ this.expandedLayout = radio.layout;
2805
+ radio.layout = twoButton;
2806
+ Show3DView();
2807
+ CollapseToolbar();
2808
+ } else
2809
+ if (source == previousVersionButton)
26062810 {
26072811 // Go to previous version
26082812 //if (!Undo())
26092813 //java.awt.Toolkit.getDefaultToolkit().beep();
2610
- Undo();
2814
+ PreviousVersion();
26112815 } else
26122816 if (source == restoreButton)
26132817 {
26142818 // Restore current version
26152819 Restore();
2820
+ //restoreButton.setEnabled(false);
26162821 } else
26172822 if (source == replaceButton)
26182823 {
26192824 // Overwrite current version
26202825 Replace();
2826
+ //replaceButton.setEnabled(false);
26212827 } else
2622
- if (source == redoButton)
2828
+ if (source == nextVersionButton)
26232829 {
26242830 // Go to next version
2625
- Redo();
2831
+ NextVersion();
26262832 } else
2627
- if (source == saveButton)
2833
+ if (source == saveVersionButton)
26282834 {
26292835 // Save a new version
26302836 if (!Save(true))
26312837 java.awt.Toolkit.getDefaultToolkit().beep();
2838
+ } else
2839
+ if (source == deleteVersionButton)
2840
+ {
2841
+ // Delete a new version
2842
+ DeleteVersion();
26322843 } else
26332844 if (source == oneStepButton)
26342845 {
....@@ -2683,11 +2894,11 @@
26832894 } else
26842895 if (source == undoItem)
26852896 {
2686
- Undo();
2897
+ PreviousVersion();
26872898 } else
26882899 if (source == redoItem)
26892900 {
2690
- Redo();
2901
+ NextVersion();
26912902 } else
26922903 if (source == duplicateItem)
26932904 {
....@@ -3168,22 +3379,34 @@
31683379 } else
31693380 if (source == ungroupItem || source == ungroupButton)
31703381 {
3171
- boolean hasRoot = false;
3382
+ boolean canUngroup = true;
31723383
31733384 for (int i=0; i<group.selection.size(); i++)
31743385 {
3175
- if (group.selection.get(i) == group)
3386
+ Object3D selectedItem = group.selection.get(i);
3387
+
3388
+ if (selectedItem.Size() == 0)
31763389 {
3177
- hasRoot = true;
3390
+ // Cannot ungroup leaves
3391
+ canUngroup = false;
3392
+ break;
3393
+ }
3394
+
3395
+ if (selectedItem == group)
3396
+ {
3397
+ // Cannot ungroup root
3398
+ canUngroup = false;
31783399 break;
31793400 }
31803401 }
31813402
3182
- if (!hasRoot)
3403
+ if (canUngroup)
31833404 {
31843405 for (int i=0; i<group.selection.size(); i++)
31853406 {
3186
- Ungroup(group.selection.get(i));
3407
+ Object3D selectedItem = group.selection.get(i);
3408
+
3409
+ Ungroup(selectedItem);
31873410 }
31883411
31893412 ClearSelection(false);
....@@ -3546,38 +3769,7 @@
35463769 if (CameraPane.FULLSCREEN)
35473770 fullscreenLayout = radio.layout;
35483771
3549
- // bug
3550
- //gridPanel.setDividerLocation(1.0);
3551
- //bigPanel.setDividerLocation(0.0);
3552
-// bigThree.remove(scenePanel);
3553
-// bigThree.remove(centralPanel);
3554
-// bigThree.remove(XYZPanel);
3555
-// aWindowConstraints.gridx = 0;
3556
-// aWindowConstraints.gridy = 0;
3557
-// aWindowConstraints.gridwidth = 1;
3558
-// // aConstraints.gridheight = 3;
3559
-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3560
-// aWindowConstraints.weightx = 0;
3561
-// aWindowConstraints.weighty = 1;
3562
-// //bigThree.add(jtp, aWindowConstraints);
3563
-// aWindowConstraints.weightx = 1;
3564
-// aWindowConstraints.gridwidth = 3;
3565
-// // aConstraints.gridheight = 3;
3566
-// aWindowConstraints.gridx = 1;
3567
-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3568
-// bigThree.add(centralPanel, aWindowConstraints);
3569
-// aWindowConstraints.weightx = 0;
3570
-// aWindowConstraints.gridx = 4;
3571
-// aWindowConstraints.gridwidth = 1;
3572
-// // aConstraints.gridheight = 3;
3573
-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3574
-// //bigThree.add(XYZPanel, aWindowConstraints);
3575
-// scenePanel.setVisible(false);
3576
-// centralPanel.setVisible(true);
3577
-// XYZPanel.setVisible(false);
3578
- bigThree.ClearUI();
3579
- bigThree.add(centralPanel);
3580
- bigThree.FlushUI();
3772
+ Show3DView();
35813773
35823774 cameraView.requestFocusInWindow();
35833775
....@@ -3763,6 +3955,7 @@
37633955 } else
37643956 if (source == rootButton)
37653957 {
3958
+ Replace();
37663959 Object3D obj;
37673960 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
37683961 {
....@@ -3777,6 +3970,8 @@
37773970 if (source == closeButton)
37783971 {
37793972 //System.out.println("CLOSE: " + buttonGroup.getSelection());
3973
+ Replace();
3974
+
37803975 cRadio ab;
37813976 for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
37823977 {
....@@ -3820,10 +4015,10 @@
38204015 {
38214016 Object3D child = (Object3D)e.nextElement();
38224017 if(child.editWindow != null)
3823
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
38244018 child.pinned = false;
38254019 child.CloseUI();
38264020 listUI.remove(child);
4021
+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
38274022
38284023 //child.editWindow = null; // ???????????
38294024 }
....@@ -3842,6 +4037,7 @@
38424037 obj.CloseUI();
38434038 }
38444039 listUI.clear();
4040
+ SetPinStates(group.selection.size() > 0);
38454041 refreshContents(true);
38464042 } else
38474043 if (source == allParamsButton)
....@@ -3874,6 +4070,8 @@
38744070 } else
38754071 if(source instanceof cRadio)
38764072 {
4073
+ Replace();
4074
+
38774075 group.parent = keepparent;
38784076 group.attributes = 0;
38794077 //group.editWindow = null;
....@@ -3898,8 +4096,6 @@
38984096
38994097 copy = group;
39004098
3901
- SetUndoStates();
3902
-
39034099 //Globals.theRenderer.object = group;
39044100 if(!useclient)
39054101 {
....@@ -3927,7 +4123,31 @@
39274123 */
39284124 radio.layout.doClick();
39294125
4126
+ assert(copy instanceof Composite);
4127
+
4128
+ if (copy.versionlist == null)
4129
+ {
4130
+ copy.versionindex = -1;
4131
+
4132
+ // Cannot work with loops
4133
+ // To fix this issue, we first mark all nodes above the root,
4134
+ // and check if any of these nodes are reachable below the root.
4135
+ Grafreed.grafreed.universe.TagObjects(copy, true);
4136
+
4137
+ if (!copy.HasTags())
4138
+ {
4139
+ copy.versionlist = new Object3D[100];
4140
+
4141
+ Save(true);
4142
+ }
4143
+
4144
+ Grafreed.grafreed.universe.TagObjects(copy, false);
4145
+ }
4146
+
4147
+ SetVersionStates();
4148
+
39304149 ClearUnpinned();
4150
+
39314151 //Grafreed.Assert(group != null);
39324152 //Grafreed.Assert(group.selection != null);
39334153 SetPinStates(group.selection == null || group.selection.size() > 0);
....@@ -4069,7 +4289,7 @@
40694289 TouchTransform(obj);
40704290 continue;
40714291 }
4072
- if ((mask&2) != 0) // Scale
4292
+ if ((mask&2) != 0) // Scale/rotation
40734293 {
40744294 obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
40754295 obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
....@@ -4077,10 +4297,6 @@
40774297 obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
40784298 obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
40794299 obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4080
- }
4081
- if ((mask&4) != 0) // Rotation
4082
- {
4083
- // ?
40844300 }
40854301 if ((mask&1) != 0) // Translation
40864302 {
....@@ -5083,9 +5299,7 @@
50835299
50845300 freezemodel = false;
50855301 }
5086
-
5087
- boolean flashIt = true;
5088
-
5302
+
50895303 public void valueChanged(TreeSelectionEvent e)
50905304 //public boolean handleEvent(Event event)
50915305 {
....@@ -5158,13 +5372,31 @@
51585372 {
51595373 editButton.setEnabled(enabled);
51605374 uneditButton.setEnabled(enabled);
5161
- unselectButton.setEnabled(enabled);
5375
+ //unselectButton.setEnabled(enabled);
51625376 flashSelectionButton.setEnabled(enabled);
5377
+
5378
+ clearPanelButton.setEnabled(!listUI.isEmpty());
5379
+
5380
+ boolean allComposites = true;
5381
+
5382
+ if (group.selection != null)
5383
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5384
+ {
5385
+ Object next = e.nextElement();
5386
+ if (!(next instanceof Composite)) // || (next instanceof GroupLeaf))
5387
+ {
5388
+ allComposites = false;
5389
+ break;
5390
+ }
5391
+ }
5392
+
5393
+ rootButton.setEnabled(allComposites);
51635394 }
51645395
51655396 void refreshContents(boolean cp)
51665397 {
5167
- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5398
+ if (Globals.ADVANCED)
5399
+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
51685400 if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
51695401 {
51705402 objEditor.ClearInfo(); // .GetMaterial());
....@@ -5174,7 +5406,7 @@
51745406 Object3D child = (Object3D) group.selection.get(i);
51755407
51765408 objEditor.AddInfo(child, this, true);
5177
- System.err.println("info : " + child.GetPath());
5409
+// System.err.println("info : " + child.GetPath());
51785410 }
51795411
51805412 objEditor.SetText(); // jan 2014
....@@ -6000,7 +6232,6 @@
60006232
60016233 cButton restoreCameraButton;
60026234
6003
- cButton saveButton;
60046235 cButton oneStepButton;
60056236
60066237 cButton groupButton;
....@@ -6058,11 +6289,11 @@
60586289 private MenuItem lookAtItem;
60596290 private MenuItem lookFromItem;
60606291 private MenuItem switchViewItem;
6061
- private MenuItem cutItem;
6292
+ private JMenuItem cutItem;
60626293 private MenuItem undoItem;
60636294 private MenuItem redoItem;
60646295 private JMenuItem duplicateItem;
6065
- private MenuItem cloneItem;
6296
+ private JMenuItem cloneItem;
60666297 private MenuItem cloneSupportItem;
60676298 private MenuItem overwriteGeoItem;
60686299 private MenuItem overwriteMatItem;
....@@ -6083,13 +6314,13 @@
60836314 private MenuItem cloneGeometriesItem;
60846315 private MenuItem shareGeometriesItem;
60856316 private MenuItem mergeGeometriesItem;
6086
- private MenuItem copyItem;
6317
+ private JMenuItem copyItem;
60876318 private MenuItem pasteItem;
6088
- private MenuItem pasteIntoItem;
6089
- private MenuItem pasteLinkItem;
6090
- private MenuItem pasteCloneItem;
6091
- private MenuItem pasteExpandItem;
6092
- private MenuItem deleteItem;
6319
+ private JMenuItem pasteIntoItem;
6320
+ private JMenuItem pasteLinkItem;
6321
+ private JMenuItem pasteCloneItem;
6322
+ private JMenuItem pasteExpandItem;
6323
+ private JMenuItem deleteItem;
60936324 private MenuItem clearAllItem;
60946325 private MenuItem genUVItem;
60956326 private MenuItem genNormalsMESHItem;
....@@ -6144,7 +6375,7 @@
61446375 private MenuItem transformGeometryItem;
61456376 private MenuItem transformChildrenItem;
61466377 private MenuItem hideItem;
6147
- private MenuItem grabItem;
6378
+ private JMenuItem grabItem;
61486379 private MenuItem backItem;
61496380 private MenuItem frontItem;
61506381 private MenuItem cameraItem;
....@@ -6157,7 +6388,7 @@
61576388 private MenuItem switchTransfoItem;
61586389 private MenuItem morphItem;
61596390 private MenuItem linkerItem;
6160
- private MenuItem ungroupItem;
6391
+ private JMenuItem ungroupItem;
61616392 private MenuItem editItem;
61626393 private MenuItem openWindowItem;
61636394 private MenuItem editLeafItem;