From d5d6485126da83b06645e90e3e4ce66659a56009 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sat, 17 Aug 2019 13:56:24 -0400
Subject: [PATCH] Reset transform, fix loop versioning.
---
GroupEditor.java | 424 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 276 insertions(+), 148 deletions(-)
diff --git a/GroupEditor.java b/GroupEditor.java
index 074be71..b37d3ac 100644
--- a/GroupEditor.java
+++ b/GroupEditor.java
@@ -31,7 +31,7 @@
final String path = "cubemaps/" + f + "-skyboxes/" + s;
row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
//row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
- skyboxButton.setToolTipText(s);
+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
skyboxButton.addActionListener(new ActionListener()
{
@Override
@@ -42,12 +42,12 @@
});
}
- public void AddTextureButton(String f, final String t, cGridBag row)
+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
{
cButton textureButton;
- final String path = "textures/" + f + "/"; // + t;
+ final String path = "textures/" + f + "/" + c + "/"; // + t;
row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
- textureButton.setToolTipText(f + "s");
+ textureButton.setToolTipText(c + count);
textureButton.addActionListener(new ActionListener()
{
@Override
@@ -73,7 +73,7 @@
cGridBag row5 = new cGridBag();
cGridBag row6 = new cGridBag();
- AddSkyboxButton("default", "rgb", row0);
+ AddSkyboxButton("default", "", row0);
//AddSkyboxButton("default", "cornell", row0);
AddSkyboxButton("penguins", "dust", row0);
AddSkyboxButton("penguins", "tropic", row0);
@@ -330,10 +330,19 @@
public void ChangeSkybox(String skybox)
{
- //cameraView.envyoff = false;
- group.skyboxname = skybox;
- group.skyboxext = "jpg";
- cameraView.repaint();
+ if (skybox.endsWith("/"))
+ {
+ group.skyboxname = null;
+ group.skyboxext = null;
+ cameraView.repaint();
+ }
+ else
+ {
+ //cameraView.envyoff = false;
+ group.skyboxname = skybox;
+ group.skyboxext = "jpg";
+ cameraView.repaint();
+ }
}
public void CreateSkyboxPanel(cGridBag skyboxPanel)
@@ -350,7 +359,23 @@
public void ChangeTexture(String texture)
{
- cameraView.repaint();
+ for (int i=0; i<group.selection.size(); i++)
+ {
+ Object3D obj = group.selection.get(i);
+ obj.SetPigmentTexture("@" + texture);
+ }
+
+ refreshContents();
+ }
+
+ public void Show3DView()
+ {
+ // bug
+ //gridPanel.setDividerLocation(1.0);
+ //bigPanel.setDividerLocation(0.0);
+ bigThree.ClearUI();
+ bigThree.add(centralPanel);
+ bigThree.FlushUI();
}
//ObjEditor objEditor;
@@ -390,10 +415,14 @@
this.copy = this.group = group;
//selectees = this.group.selectees;
+ assert(false);
+
if (copy.versionlist == null)
{
copy.versionlist = new Object3D[100];
copy.versionindex = -1;
+
+ //Save(true);
}
if(ui)
@@ -422,7 +451,7 @@
copy.versionlist = new Object3D[100];
copy.versionindex = -1;
- Save(true);
+ //Save(true);
}
}
@@ -513,33 +542,35 @@
// menu.add("-");
duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
duplicateItem.addActionListener(this);
- cloneItem = menu.add(new MenuItem("Clone"));
+
+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
cloneItem.addActionListener(this);
- if (Globals.ADVANCED)
+ //if (Globals.ADVANCED)
{
cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
cloneSupportItem.addActionListener(this);
}
+ oe.jTree.popup.addSeparator();
menu.add("-");
- cutItem = menu.add(new MenuItem("Cut"));
+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
cutItem.addActionListener(this);
- copyItem = menu.add(new MenuItem("Copy"));
+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
copyItem.addActionListener(this);
pasteItem = menu.add(new MenuItem("Paste"));
pasteItem.addActionListener(this);
- menu.add("-");
- pasteIntoItem = menu.add(new MenuItem("Paste into"));
+ oe.jTree.popup.addSeparator();
+ //menu.add("-");
+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
pasteIntoItem.addActionListener(this);
- pasteLinkItem = menu.add(new MenuItem("Paste link"));
+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
pasteLinkItem.addActionListener(this);
- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
pasteCloneItem.addActionListener(this);
-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
// pasteExpandItem.addActionListener(this);
- menu.add("-");
- deleteItem = menu.add(new MenuItem("Delete"));
- deleteItem.addActionListener(this);
+ //menu.add("-");
+ oe.jTree.popup.addSeparator();
if (Globals.ADVANCED)
{
@@ -625,11 +656,9 @@
oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
oe.cameraMenu.add("-");
openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
openWindowItem.addActionListener(this);
- editLeafItem.addActionListener(this);
lookAtItem.addActionListener(this);
//lookFromItem.addActinoListener(this);
//switchViewItem.addActionListener(this);
@@ -676,9 +705,8 @@
setMasterItem.addActionListener(this);
}
- oe.menuBar.add(menu = new Menu("Group"));
-// grabItem = menu.add(new MenuItem("Grab"));
-// grabItem.addActionListener(this);
+ oe.menuBar.add(menu = new Menu("Order"));
+
backItem = menu.add(new MenuItem("Back"));
backItem.addActionListener(this);
frontItem = menu.add(new MenuItem("Front"));
@@ -686,13 +714,21 @@
// compositeItem = menu.add(new MenuItem("Composite"));
// compositeItem.addActionListener(this);
+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
+ grabItem.addActionListener(this);
+
if (Globals.ADVANCED)
{
hideItem = menu.add(new MenuItem("Hidden Group"));
hideItem.addActionListener(this);
}
- ungroupItem = menu.add(new MenuItem("Ungroup"));
+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
ungroupItem.addActionListener(this);
+
+ oe.jTree.popup.addSeparator();
+
+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
+ deleteItem.addActionListener(this);
// menu.add("-");
//
@@ -877,6 +913,9 @@
shareGeometriesItem.addActionListener(this);
mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
mergeGeometriesItem.addActionListener(this);
+ menu.add("-");
+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
+ editLeafItem.addActionListener(this);
if (Globals.ADVANCED)
{
// Pretty much the same as duplicate and clone.
@@ -895,40 +934,47 @@
JTabbedPane resourcecontainer;
cGridBag currenttab;
- boolean added; // patch for jar
+ //boolean added; // patch for jar
int tabcount = 0;
int colcount = 0;
int rowcount = 0;
+ int texturecount = 0;
int columns = 5;
int rows = 7;
public void ResourceCallBack(String[] path)
{
- for (int i = 0; i < path.length; i++)
- System.out.print(path[i] + "/");
- System.out.println();
- if (rowcount == 0)
+// for (int i = 0; i < path.length; i++)
+// System.out.print(path[i] + "/");
+// System.out.println();
+
+ if (//rowcount == 0 ||
+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
{
currenttab = new cGridBag();
- added = false;
- String tabname = String.valueOf((char)('A'+tabcount));
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
currenttab.setName(tabname);
+ //added = false;
+ resourcecontainer.add(currenttab);
+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
rowcount = 1;
+ colcount = 0;
+ texturecount = 0;
}
- if (path.length > 1 && path[1].toLowerCase().endsWith(".jpg"))
+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
{
- if (!added)
+ //if (!added)
{
- added = true;
- resourcecontainer.add(currenttab);
- String tabname = String.valueOf((char)('A'+tabcount));
- resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
+ //added = true;
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
}
- AddTextureButton(path[0], path[1], currenttab);
+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
+
if (++colcount >= columns)
{
colcount = 0;
@@ -949,7 +995,7 @@
void CreateTexturePanel(cGridBag container)
{
- resourcecontainer = new JTabbedPane();
+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
container.add(resourcecontainer);
Grafreed.ParseResources("textures", this);
@@ -972,11 +1018,6 @@
//new Exception().printStackTrace();
oe.radioPanel = new JPanel(new GridBagLayout());
- oe.aConstraints.weightx = 1;
- oe.aConstraints.weighty = 0;
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
- oe.aConstraints.gridwidth = 100;
- oe.aConstraints.gridheight = 1;
// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
oe.buttonGroup = new ButtonGroup();
@@ -997,9 +1038,9 @@
oe.radioPanel.add(dummyButton);
oe.buttonGroup.add(dummyButton);
*/
- cGridBag copyOptionsPanel = new cGridBag();
+ cGridBag versionManagerPanel = new cGridBag();
- copyOptionsPanel.preferredHeight = 2;
+ versionManagerPanel.preferredHeight = 4;
//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
@@ -1009,10 +1050,49 @@
if (Globals.ADVANCED)
{
- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
- maxButton.setToolTipText("Maximize window");
- maxButton.addActionListener(this);
+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+// maxButton.setToolTipText("Maximize window");
+// maxButton.addActionListener(this);
}
+
+ cButton gcButton;
+
+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+// gcButton.setToolTipText("Garbage collect");
+// gcButton.addActionListener(new ActionListener()
+// {
+// public void actionPerformed(ActionEvent e)
+// {
+// System.gc();
+// }
+// });
+
+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ collapseButton.setToolTipText("Collapse toolbar");
+ collapseButton.addActionListener(this);
+
+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ maximize3DButton.setToolTipText("Maximize 3D view");
+ maximize3DButton.addActionListener(this);
+
+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ twoButton.setToolTipText("Show 3D view only");
+ twoButton.addActionListener(this);
+ this.fullscreenLayout = twoButton;
+
+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ threeButton.setToolTipText("Show controls and 3D view");
+ threeButton.addActionListener(this);
+ if (Globals.ADVANCED)
+ {
+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ sixButton.setToolTipText("Show 3D view and controls");
+ sixButton.addActionListener(this);
+ }
+// oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+// sevenButton.setToolTipText("3-column layout");
+// sevenButton.addActionListener(this);
+ //
oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
fullButton.setToolTipText("Full-screen window");
@@ -1026,15 +1106,16 @@
restoreCameraButton.setToolTipText("Restore viewpoint");
restoreCameraButton.addActionListener(this);
- copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
saveVersionButton.setToolTipText("Duplicate current version");
saveVersionButton.addActionListener(this);
- copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
deleteVersionButton.setToolTipText("Delete current version");
deleteVersionButton.addActionListener(this);
+ deleteVersionButton.setEnabled(false);
- copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
previousVersionButton.setToolTipText("Previous version");
previousVersionButton.addActionListener(this);
previousVersionButton.setEnabled(false);
@@ -1043,28 +1124,28 @@
updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
restoreButton.setToolTipText("Undo (restore current version)");
restoreButton.addActionListener(this);
- //restoreButton.setEnabled(false);
+ restoreButton.setEnabled(false);
updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
replaceButton.setToolTipText("Save (replace current version)");
replaceButton.addActionListener(this);
- //replaceButton.setEnabled(false);
+ replaceButton.setEnabled(false);
- copyOptionsPanel.add(updown);
+ versionManagerPanel.add(updown);
- copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
nextVersionButton.setToolTipText("Next version");
nextVersionButton.addActionListener(this);
nextVersionButton.setEnabled(false);
+
+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ oneStepButton.setToolTipText("Animate one step forward");
+ oneStepButton.addActionListener(this);
oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
liveCB.setToolTipText("Enable animation");
liveCB.addItemListener(this);
- oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
- oneStepButton.setToolTipText("Animate one step forward");
- oneStepButton.addActionListener(this);
-
oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
fastCB.setToolTipText("Fast mode");
fastCB.addItemListener(this);
@@ -1091,21 +1172,6 @@
//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
- oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
- twoButton.setToolTipText("Show 3D view only");
- twoButton.addActionListener(this);
- this.fullscreenLayout = twoButton;
-
- oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
- threeButton.setToolTipText("Show controls and 3D view");
- threeButton.addActionListener(this);
- oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
- sixButton.setToolTipText("Show 3D view and controls");
- sixButton.addActionListener(this);
-// oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
-// sevenButton.setToolTipText("3-column layout");
-// sevenButton.addActionListener(this);
- //
oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
rootButton.setToolTipText("Open selection in new tab");
@@ -1121,12 +1187,16 @@
// INSERT
row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
- gridButton.setToolTipText("Create grid");
+ gridButton.setToolTipText("Create ground");
gridButton.addActionListener(this);
row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
boxButton.setToolTipText("Create box");
boxButton.addActionListener(this);
+
+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ superButton.setToolTipText("Create superellipsoid");
+ superButton.addActionListener(this);
row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
sphereButton.setToolTipText("Create sphere");
@@ -1139,10 +1209,6 @@
row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
torusButton.setToolTipText("Create torus");
torusButton.addActionListener(this);
-
- row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
- superButton.setToolTipText("Create superellipsoid");
- superButton.addActionListener(this);
if (Globals.ADVANCED)
{
@@ -1192,6 +1258,8 @@
cGridBag textures = new cGridBag();
CreateTexturePanel(textures);
+
+ resourcecontainer.setSelectedIndex((int)(Math.random() * resourcecontainer.getTabCount()));
oe.toolboxPanel.add(textures);
@@ -1243,6 +1311,8 @@
cGridBag jSPPanel = new cGridBag();
+ jSPPanel.preferredHeight = 20;
+
JScrollPane jSP;
//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
@@ -1251,11 +1321,11 @@
oe.treePanel.add(jSPPanel);
oe.treePanel.Return();
- oe.treePanel.add(copyOptionsPanel);
+ oe.treePanel.add(versionManagerPanel);
oe.treePanel.Return();
- cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
- versionSlider = (cNumberSlider)sliderPane.getComponent(1);
- sliderPane.preferredHeight = 1;
+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
+ versionSliderPane.preferredHeight = 3;
// mainPanel.setDividerLocation(0.1); //1.0);
mainPanel.setResizeWeight(0.4);
@@ -1413,6 +1483,14 @@
void EditObject(Object3D obj)
{
+ assert(obj instanceof Composite);
+
+// if (obj.versionlist == null)
+// {
+// obj.versionlist = new Object3D[100];
+// obj.versionindex = -1;
+// }
+
cRadio radioButton = new cRadio(obj.name);
// June 2019. Patch to avoid bug with transparency.
@@ -1437,6 +1515,7 @@
oe.SetupViews();
+ if (Globals.DEBUG)
System.out.println("SetupViews");
DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
@@ -1803,7 +1882,12 @@
TreePath path;
public TransferableTreePath(TreePath tp) {
- path = tp;
+ Object[] objs = new Object[tp.getPathCount()];
+ for (int i=0; i<objs.length; i++)
+ {
+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
+ }
+ path = new TreePath(objs);
}
public synchronized DataFlavor[] getTransferDataFlavors() {
@@ -2093,7 +2177,11 @@
shadow.material = new cMaterial(obj.material);
shadow.material.diffuse = 0.0001f;
shadow.material.specular = 0.0001f;
- //shadow.projectedVertices[1].x = 300;
+ shadow.material.opacity = 0.75f;
+
+ AllocProjectedVertices(shadow);
+
+ shadow.projectedVertices[1].x = 300;
makeSomething(shadow);
}
@@ -2614,27 +2702,35 @@
} else
if (source == loopItem || source == loopButton)
{
+ if (!group.selection.isEmpty())
+ {
Composite csg = new GroupLeaf();
csg.count = 5;
- group(csg);
Composite child = new cGroup("Branch");
csg.addChild(child);
child.addChild(csg);
+ group(csg);
+ }
} else
if (source == doubleItem)
{
+ if (!group.selection.isEmpty())
+ {
Composite csg = new GroupLeaf("Fork");
csg.count = 5;
- group(csg);
Composite child = new cGroup("Branch A");
csg.addChild(child);
child.addChild(csg);
child = new cGroup("Branch B");
csg.addChild(child);
child.addChild(csg);
+ group(csg);
+ }
} else
if (source == tripleItem)
{
+ if (!group.selection.isEmpty())
+ {
Composite csg = new GroupLeaf("Trident");
csg.count = 4;
group(csg);
@@ -2647,6 +2743,7 @@
child = new cGroup();
csg.addChild(child);
child.addChild(csg);
+ }
} else
if (source == computeAOItem)
{
@@ -2696,6 +2793,18 @@
if (source == fullButton)
{
ToggleFullScreen();
+ } else
+ if (source == collapseButton)
+ {
+ this.expandedLayout = radio.layout;
+ CollapseToolbar();
+ } else
+ if (source == maximize3DButton)
+ {
+ this.expandedLayout = radio.layout;
+ radio.layout = twoButton;
+ Show3DView();
+ CollapseToolbar();
} else
if (source == previousVersionButton)
{
@@ -3270,22 +3379,34 @@
} else
if (source == ungroupItem || source == ungroupButton)
{
- boolean hasRoot = false;
+ boolean canUngroup = true;
for (int i=0; i<group.selection.size(); i++)
{
- if (group.selection.get(i) == group)
+ Object3D selectedItem = group.selection.get(i);
+
+ if (selectedItem.Size() == 0)
{
- hasRoot = true;
+ // Cannot ungroup leaves
+ canUngroup = false;
+ break;
+ }
+
+ if (selectedItem == group)
+ {
+ // Cannot ungroup root
+ canUngroup = false;
break;
}
}
- if (!hasRoot)
+ if (canUngroup)
{
for (int i=0; i<group.selection.size(); i++)
{
- Ungroup(group.selection.get(i));
+ Object3D selectedItem = group.selection.get(i);
+
+ Ungroup(selectedItem);
}
ClearSelection(false);
@@ -3648,38 +3769,7 @@
if (CameraPane.FULLSCREEN)
fullscreenLayout = radio.layout;
- // bug
- //gridPanel.setDividerLocation(1.0);
- //bigPanel.setDividerLocation(0.0);
-// bigThree.remove(scenePanel);
-// bigThree.remove(centralPanel);
-// bigThree.remove(XYZPanel);
-// aWindowConstraints.gridx = 0;
-// aWindowConstraints.gridy = 0;
-// aWindowConstraints.gridwidth = 1;
-// // aConstraints.gridheight = 3;
-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
-// aWindowConstraints.weightx = 0;
-// aWindowConstraints.weighty = 1;
-// //bigThree.add(jtp, aWindowConstraints);
-// aWindowConstraints.weightx = 1;
-// aWindowConstraints.gridwidth = 3;
-// // aConstraints.gridheight = 3;
-// aWindowConstraints.gridx = 1;
-// aWindowConstraints.fill = GridBagConstraints.BOTH;
-// bigThree.add(centralPanel, aWindowConstraints);
-// aWindowConstraints.weightx = 0;
-// aWindowConstraints.gridx = 4;
-// aWindowConstraints.gridwidth = 1;
-// // aConstraints.gridheight = 3;
-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
-// //bigThree.add(XYZPanel, aWindowConstraints);
-// scenePanel.setVisible(false);
-// centralPanel.setVisible(true);
-// XYZPanel.setVisible(false);
- bigThree.ClearUI();
- bigThree.add(centralPanel);
- bigThree.FlushUI();
+ Show3DView();
cameraView.requestFocusInWindow();
@@ -3865,6 +3955,7 @@
} else
if (source == rootButton)
{
+ Replace();
Object3D obj;
for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
{
@@ -3879,6 +3970,8 @@
if (source == closeButton)
{
//System.out.println("CLOSE: " + buttonGroup.getSelection());
+ Replace();
+
cRadio ab;
for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
{
@@ -3977,6 +4070,8 @@
} else
if(source instanceof cRadio)
{
+ Replace();
+
group.parent = keepparent;
group.attributes = 0;
//group.editWindow = null;
@@ -4001,8 +4096,6 @@
copy = group;
- SetUndoStates();
-
//Globals.theRenderer.object = group;
if(!useclient)
{
@@ -4030,6 +4123,29 @@
*/
radio.layout.doClick();
+ assert(copy instanceof Composite);
+
+ if (copy.versionlist == null)
+ {
+ copy.versionindex = -1;
+
+ // Cannot work with loops
+ // To fix this issue, we first mark all nodes above the root,
+ // and check if any of these nodes are reachable below the root.
+ Grafreed.grafreed.universe.TagObjects(copy, true);
+
+ if (!copy.HasTags())
+ {
+ copy.versionlist = new Object3D[100];
+
+ Save(true);
+ }
+
+ Grafreed.grafreed.universe.TagObjects(copy, false);
+ }
+
+ SetVersionStates();
+
ClearUnpinned();
//Grafreed.Assert(group != null);
@@ -4173,7 +4289,7 @@
TouchTransform(obj);
continue;
}
- if ((mask&2) != 0) // Scale
+ if ((mask&2) != 0) // Scale/rotation
{
obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
@@ -4181,10 +4297,6 @@
obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
- }
- if ((mask&4) != 0) // Rotation
- {
- // ?
}
if ((mask&1) != 0) // Translation
{
@@ -5264,10 +5376,26 @@
flashSelectionButton.setEnabled(enabled);
clearPanelButton.setEnabled(!listUI.isEmpty());
+
+ boolean allComposites = true;
+
+ if (group.selection != null)
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
+ {
+ Object next = e.nextElement();
+ if (!(next instanceof Composite)) // || (next instanceof GroupLeaf))
+ {
+ allComposites = false;
+ break;
+ }
+ }
+
+ rootButton.setEnabled(allComposites);
}
void refreshContents(boolean cp)
{
+ if (false)
//if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
{
@@ -5278,7 +5406,7 @@
Object3D child = (Object3D) group.selection.get(i);
objEditor.AddInfo(child, this, true);
- System.err.println("info : " + child.GetPath());
+// System.err.println("info : " + child.GetPath());
}
objEditor.SetText(); // jan 2014
@@ -6161,11 +6289,11 @@
private MenuItem lookAtItem;
private MenuItem lookFromItem;
private MenuItem switchViewItem;
- private MenuItem cutItem;
+ private JMenuItem cutItem;
private MenuItem undoItem;
private MenuItem redoItem;
private JMenuItem duplicateItem;
- private MenuItem cloneItem;
+ private JMenuItem cloneItem;
private MenuItem cloneSupportItem;
private MenuItem overwriteGeoItem;
private MenuItem overwriteMatItem;
@@ -6186,13 +6314,13 @@
private MenuItem cloneGeometriesItem;
private MenuItem shareGeometriesItem;
private MenuItem mergeGeometriesItem;
- private MenuItem copyItem;
+ private JMenuItem copyItem;
private MenuItem pasteItem;
- private MenuItem pasteIntoItem;
- private MenuItem pasteLinkItem;
- private MenuItem pasteCloneItem;
- private MenuItem pasteExpandItem;
- private MenuItem deleteItem;
+ private JMenuItem pasteIntoItem;
+ private JMenuItem pasteLinkItem;
+ private JMenuItem pasteCloneItem;
+ private JMenuItem pasteExpandItem;
+ private JMenuItem deleteItem;
private MenuItem clearAllItem;
private MenuItem genUVItem;
private MenuItem genNormalsMESHItem;
@@ -6247,7 +6375,7 @@
private MenuItem transformGeometryItem;
private MenuItem transformChildrenItem;
private MenuItem hideItem;
- private MenuItem grabItem;
+ private JMenuItem grabItem;
private MenuItem backItem;
private MenuItem frontItem;
private MenuItem cameraItem;
@@ -6260,7 +6388,7 @@
private MenuItem switchTransfoItem;
private MenuItem morphItem;
private MenuItem linkerItem;
- private MenuItem ungroupItem;
+ private JMenuItem ungroupItem;
private MenuItem editItem;
private MenuItem openWindowItem;
private MenuItem editLeafItem;
--
Gitblit v1.6.2