From f78dd18c66d607b693c0bf5937fc59181bf5a26b Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Wed, 26 Jun 2019 20:39:14 -0400
Subject: [PATCH] Fix multiple selection
---
GroupEditor.java | 730 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 543 insertions(+), 187 deletions(-)
diff --git a/GroupEditor.java b/GroupEditor.java
index 7bbf24b..aa482be 100644
--- a/GroupEditor.java
+++ b/GroupEditor.java
@@ -150,6 +150,8 @@
void SetupMenu2(GroupEditor oe)
{
+ oe.jTree = new cTree();
+
Menu menu;
oe.menuBar.add(menu = new Menu("Edit"));
//editItem = menu.add(new MenuItem("Edit"));
@@ -160,7 +162,7 @@
// redoItem = menu.add(new MenuItem("Redo"));
// redoItem.addActionListener(this);
// menu.add("-");
- duplicateItem = menu.add(new MenuItem("Duplicate"));
+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
duplicateItem.addActionListener(this);
cloneItem = menu.add(new MenuItem("Clone"));
cloneItem.addActionListener(this);
@@ -176,7 +178,6 @@
copyItem.addActionListener(this);
pasteItem = menu.add(new MenuItem("Paste"));
pasteItem.addActionListener(this);
- menu.add("-");
menu.add("-");
pasteIntoItem = menu.add(new MenuItem("Paste into"));
@@ -203,21 +204,21 @@
//zBufferItem.addActionListener(this);
//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
//normalLensItem.addActionListener(this);
- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
- revertCameraItem.addActionListener(this);
+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
+ restoreCameraItem.addActionListener(this);
- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
- toggleFullScreenItem.addItemListener(this);
- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
- cameraMenu.add("-");
-
- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
- toggleTextureItem.addItemListener(this);
- toggleTextureItem.setState(CameraPane.textureon);
-
- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
- toggleSwitchItem.addItemListener(this);
- toggleSwitchItem.setState(CameraPane.SWITCH);
+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
+// toggleFullScreenItem.addItemListener(this);
+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
+// cameraMenu.add("-");
+//
+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
+// toggleTextureItem.addItemListener(this);
+// toggleTextureItem.setState(CameraPane.textureon);
+//
+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
+// toggleSwitchItem.addItemListener(this);
+// toggleSwitchItem.setState(CameraPane.SWITCH);
cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
toggleHandleItem.addItemListener(this);
@@ -246,7 +247,7 @@
cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
toggleDebugItem.addItemListener(this);
- toggleDebugItem.setState(CameraPane.DEBUG);
+ toggleDebugItem.setState(Globals.DEBUG);
cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
toggleFrustumItem.addItemListener(this);
@@ -274,7 +275,7 @@
{
oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
+ //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..."));
@@ -282,7 +283,7 @@
editLeafItem.addActionListener(this);
lookAtItem.addActionListener(this);
//lookFromItem.addActinoListener(this);
- //switchItem.addActionListener(this);
+ //switchViewItem.addActionListener(this);
}
oe.menuBar.add(menu = new Menu("Setting"));
@@ -327,21 +328,29 @@
}
oe.menuBar.add(menu = new Menu("Group"));
- grabItem = menu.add(new MenuItem("Grab"));
- grabItem.addActionListener(this);
+// grabItem = menu.add(new MenuItem("Grab"));
+// grabItem.addActionListener(this);
backItem = menu.add(new MenuItem("Back"));
backItem.addActionListener(this);
frontItem = menu.add(new MenuItem("Front"));
frontItem.addActionListener(this);
- compositeItem = menu.add(new MenuItem("Composite"));
- compositeItem.addActionListener(this);
+// compositeItem = menu.add(new MenuItem("Composite"));
+// compositeItem.addActionListener(this);
+
+ if (Globals.ADVANCED)
+ {
hideItem = menu.add(new MenuItem("Hidden Group"));
hideItem.addActionListener(this);
+ }
ungroupItem = menu.add(new MenuItem("Ungroup"));
ungroupItem.addActionListener(this);
- menu.add("-");
- randomItem = menu.add(new MenuItem("Switch node"));
- randomItem.addActionListener(this);
+
+// menu.add("-");
+//
+// switchItem = menu.add(new MenuItem("Switch node"));
+// switchItem.addActionListener(this);
+ if (Globals.ADVANCED)
+ {
switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
switchGeoItem.addActionListener(this);
switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
@@ -349,8 +358,6 @@
morphItem = menu.add(new MenuItem("Morph Group"));
morphItem.addActionListener(this);
- if (Globals.ADVANCED)
- {
menu.add("-");
physicsItem = menu.add(new MenuItem("Physics"));
physicsItem.addActionListener(this);
@@ -358,22 +365,20 @@
frameselectorItem.addActionListener(this);
scriptNodeItem = menu.add(new MenuItem("Script Node"));
scriptNodeItem.addActionListener(this);
- cameraItem = menu.add(new MenuItem("Camera"));
- cameraItem.addActionListener(this);
}
oe.menuBar.add(menu = new Menu("Object"));
- textureItem = menu.add(new MenuItem("Texture"));
- textureItem.addActionListener(this);
+// textureItem = menu.add(new MenuItem("Texture"));
+// textureItem.addActionListener(this);
billboardItem = menu.add(new MenuItem("Billboard"));
billboardItem.addActionListener(this);
csgItem = menu.add(new MenuItem("CSG"));
csgItem.addActionListener(this);
- shadowXItem = menu.add(new MenuItem("Shadow X"));
+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
shadowXItem.addActionListener(this);
- shadowYItem = menu.add(new MenuItem("Shadow Y"));
+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
shadowYItem.addActionListener(this);
- shadowZItem = menu.add(new MenuItem("Shadow Z"));
+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
shadowZItem.addActionListener(this);
if (Globals.ADVANCED)
{
@@ -470,6 +475,14 @@
markleavesItem.addActionListener(this);
unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
unmarkleavesItem.addActionListener(this);
+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
+ rewindleavesItem.addActionListener(this);
+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
+ unrewindleavesItem.addActionListener(this);
+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
+ randomleavesItem.addActionListener(this);
+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
+ unrandomleavesItem.addActionListener(this);
menu.add("-");
flipVItem = menu.add(new MenuItem("Flip V"));
flipVItem.addActionListener(this);
@@ -527,6 +540,18 @@
void SetupUI2(ObjEditor oe)
{
+ // June 2019
+ if (oe == null)
+ {
+ //super.SetupUI2(this);
+ //return;
+ }
+
+ if (copy != group)
+ {
+ //super.SetupUI2(this);
+ }
+
//new Exception().printStackTrace();
oe.radioPanel = new JPanel(new GridBagLayout());
@@ -555,39 +580,63 @@
oe.radioPanel.add(dummyButton);
oe.buttonGroup.add(dummyButton);
*/
+ cGridBag copyOptionsPanel = new cGridBag();
+
+ copyOptionsPanel.preferredHeight = 2;
+
//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
- oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ //minButton.setToolTipText("Minimize window");
+ //minButton.addActionListener(this);
+
+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ maxButton.setToolTipText("Maximize window");
+ maxButton.addActionListener(this);
+
+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ fullButton.setToolTipText("Full-screen window");
+ fullButton.addActionListener(this);
+
+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ restoreCameraButton.setToolTipText("Restore viewpoint");
+ restoreCameraButton.addActionListener(this);
+
+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
undoButton.setToolTipText("Undo changes");
undoButton.addActionListener(this);
+ undoButton.setEnabled(false);
- oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
redoButton.setToolTipText("Redo changes");
redoButton.addActionListener(this);
+ redoButton.setEnabled(false);
- oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
saveButton.setToolTipText("Save changes");
saveButton.addActionListener(this);
- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
liveCB.setToolTipText("Enable animation");
liveCB.addItemListener(this);
- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
oneStepButton.setToolTipText("Animate one step forward");
oneStepButton.addActionListener(this);
- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
fastCB.setToolTipText("Fast mode");
fastCB.addItemListener(this);
- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
- trackCB.setToolTipText("Enable tracking");
- trackCB.addItemListener(this);
-
- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ //oe.toolboxPanel.Return();
+
+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
screenfitButton.setToolTipText("Screen fit");
screenfitButton.addActionListener(this);
+
+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
+// trackCB.setToolTipText("Enable tracking");
+// trackCB.addItemListener(this);
// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
// screenfitpointButton.addActionListener(this);
@@ -599,65 +648,145 @@
snapobjectButton.setToolTipText("Snap Object");
}
- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
- flashSelectionButton.setToolTipText("Show selection");
- flashSelectionButton.addActionListener(this);
+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
-
- oe.toolbarPanel.add(twoButton = new cButton("|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
twoButton.setToolTipText("Show center view only");
twoButton.addActionListener(this);
- oe.toolbarPanel.add(fourButton = new cButton("+||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ this.fullscreenLayout = twoButton;
+
+ oe.toolbarPanel.add(fourButton = new cButton("-||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
fourButton.addActionListener(this);
fourButton.setToolTipText("Show left panel only");
- oe.toolbarPanel.add(sixButton = new cButton("+|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ oe.toolbarPanel.add(sixButton = new cButton("-|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
sixButton.setToolTipText("2-column layout left");
sixButton.addActionListener(this);
- oe.toolbarPanel.add(threeButton = new cButton("|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
threeButton.setToolTipText("2-column layout right");
threeButton.addActionListener(this);
- oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
sevenButton.setToolTipText("3-column layout");
sevenButton.addActionListener(this);
//
- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
rootButton.setToolTipText("Edit selection in new tab");
rootButton.addActionListener(this);
- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
closeButton.setToolTipText("Close tab");
closeButton.addActionListener(this);
//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
//clearButton.addActionListener(this);
-
- cGridBag commandsPanel = new cGridBag();
+
+ // INSERT
+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ gridButton.setToolTipText("Create grid");
+ gridButton.addActionListener(this);
+
+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ boxButton.setToolTipText("Create box");
+ boxButton.addActionListener(this);
+
+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ sphereButton.setToolTipText("Create sphere");
+ sphereButton.addActionListener(this);
+
+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ coneButton.setToolTipText("Create cone");
+ coneButton.addActionListener(this);
+
+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ torusButton.setToolTipText("Create torus");
+ torusButton.addActionListener(this);
+
+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ superButton.setToolTipText("Create superellipsoid");
+ superButton.addActionListener(this);
+
+ if (Globals.ADVANCED)
+ {
+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ kleinButton.setToolTipText("Create Klein bottle");
+ kleinButton.addActionListener(this);
+ }
- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
- editButton.setToolTipText("Edit selection");
+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ particlesButton.setToolTipText("Create particle system");
+ particlesButton.addActionListener(this);
+
+ oe.toolboxPanel.Return();
+
+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ groupButton.setToolTipText("Create group");
+ groupButton.addActionListener(this);
+
+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ compositeButton.setToolTipText("Create composite");
+ compositeButton.addActionListener(this);
+
+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ switchButton.setToolTipText("Create switch");
+ switchButton.addActionListener(this);
+
+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ loopButton.setToolTipText("Create loop");
+ loopButton.addActionListener(this);
+
+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ textureButton.setToolTipText("Create texture");
+ textureButton.addActionListener(this);
+
+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ overlayButton.setToolTipText("Create overlay");
+ overlayButton.addActionListener(this);
+
+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ lightButton.setToolTipText("Create light");
+ lightButton.addActionListener(this);
+
+ for (int i=6; --i>=0;)
+ {
+ oe.toolboxPanel.Return();
+ oe.toolboxPanel.add(new cGridBag());
+ oe.toolboxPanel.add(new cGridBag());
+ oe.toolboxPanel.add(new cGridBag());
+ oe.toolboxPanel.add(new cGridBag());
+ oe.toolboxPanel.add(new cGridBag());
+ oe.toolboxPanel.add(new cGridBag());
+ oe.toolboxPanel.add(new cGridBag());
+ }
+
+ // EDIT panel
+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ editButton.setToolTipText("Pin selection controls");
editButton.addActionListener(this);
- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
- uneditButton.setToolTipText("Unedit selection");
+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ uneditButton.setToolTipText("Remove selection controls");
uneditButton.addActionListener(this);
- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
- allParamsButton.setToolTipText("Edit all params");
+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
+ allParamsButton.setToolTipText("Show all controle");
allParamsButton.addActionListener(this);
- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
clearPanelButton.setToolTipText("Clear edit panel");
clearPanelButton.addActionListener(this);
- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
unselectButton.setToolTipText("Unselect");
unselectButton.addActionListener(this);
- commandsPanel.preferredHeight = 1;
+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ flashSelectionButton.setToolTipText("Highlight selection");
+ flashSelectionButton.addActionListener(this);
- oe.treePanel.add(commandsPanel);
- oe.treePanel.Return();
+ editCommandsPanel.preferredHeight = 1;
+
+ SetPinStates(false);
+// oe.treePanel.add(commandsPanel);
+// oe.treePanel.Return();
// oe.aConstraints.gridx += 1;
// oe.aConstraints.weighty = 0;
@@ -674,27 +803,12 @@
JScrollPane jSP;
//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
ResetModel();
oe.treePanel.add(jSPPanel);
oe.treePanel.Return();
- cGridBag copyOptionsPanel = new cGridBag();
-
- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
- colorCB.setToolTipText("Copy color when dropped");
- colorCB.addItemListener(this);
-
- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
- materialCB.setToolTipText("Copy material when dropped");
- materialCB.addItemListener(this);
-
- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
- textureCB.setToolTipText("Copy texture when dropped");
- textureCB.addItemListener(this);
-
- copyOptionsPanel.preferredHeight = 1;
oe.treePanel.add(copyOptionsPanel);
oe.treePanel.Return();
@@ -725,12 +839,26 @@
void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
{
+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
+ colorCB.setToolTipText("Copy color when dropped");
+ colorCB.addItemListener(this);
+
+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
+ materialCB.setToolTipText("Copy material when dropped");
+ materialCB.addItemListener(this);
+
+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
+ textureCB.setToolTipText("Copy texture when dropped");
+ textureCB.addItemListener(this);
+
+ panel.Return();
+
panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
boxCB.setToolTipText("Display bounding boxes");
boxCB.addItemListener(this);
panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
+ zoomBoxCB.setToolTipText("Display only for wheel");
zoomBoxCB.addItemListener(this);
if (true) // Globals.ADVANCED)
@@ -742,6 +870,8 @@
// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
// localCB.addItemListener(this);
+ panel.Return();
+
panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
crowdCB.setToolTipText("Used for crowds");
crowdCB.addItemListener(this);
@@ -758,6 +888,8 @@
// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
// speakerMocapCB.addItemListener(this);
+ panel.Return();
+
if (false)
{
// handled in scripts
@@ -772,32 +904,72 @@
//constraints.gridy += 1;
panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
smoothfocusCB.addItemListener(this);
+ panel.Return();
}
//constraints.gridx += 1;
//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
// debugCB.addItemListener(this);
+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
+ trackCB.setToolTipText("Enable tracking target");
+ trackCB.addItemListener(this);
+
panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
+ oeilCB.setToolTipText("Move camera when tracking");
oeilCB.addItemListener(this);
+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
+ shadowCB.setToolTipText("When live compute shadows");
+ shadowCB.addItemListener(this);
+
+ panel.Return();
+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
+ toggleTextureCB.setToolTipText("Load textures");
+ toggleTextureCB.addItemListener(this);
+
+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
+ toggleSwitchCB.setToolTipText("Use switch");
+ toggleSwitchCB.addItemListener(this);
+
+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
+ autosaveCB.setToolTipText("On structure change");
+ autosaveCB.addItemListener(this);
+
+ panel.Return();
+ if (Globals.ADVANCED)
+ {
panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
lookAtCB.setToolTipText("Look-at target");
lookAtCB.addItemListener(this);
+ }
}
cGridBag fill = new cGridBag();
-
fill.preferredHeight = 200;
+ cGridBag fill2 = new cGridBag();
+ fill2.preferredHeight = 200;
+ cGridBag fill3 = new cGridBag();
+ fill3.preferredHeight = 200;
panel.add(fill);
+ panel.add(fill2);
+ panel.add(fill3);
}
void EditObject(Object3D obj)
{
cRadio radioButton = new cRadio(obj.name);
+
+ // Patch to avoid bug with transparency.
+ radioButton.hadMaterial = obj.material != null;
+ if (!radioButton.hadMaterial)
+ {
+ obj.material = new cMaterial();
+ }
+
radioButton.SetObject(obj);
radioButton.layout = sevenButton;
radioButton.SetCamera(cameraView.renderCamera, false);
@@ -809,6 +981,8 @@
void SetupViews(ObjEditor oe)
{
+ theFrame = this;
+
oe.SetupViews();
System.out.println("SetupViews");
@@ -817,23 +991,27 @@
/*DropTarget dropTarget =*/ new DropTarget(oe.cameraView, this);
}
- JCheckBox liveCB;
- JCheckBox supportCB;
- JCheckBox localCB;
- JCheckBox crowdCB;
- JCheckBox smoothCB;
- JCheckBox fastCB;
- JCheckBox slowCB;
- JCheckBox boxCB;
- JCheckBox zoomBoxCB;
- JCheckBox trackCB;
- JCheckBox smoothfocusCB;
+ cToggleButton liveCB;
+ cCheckBox supportCB;
+ cCheckBox localCB;
+ cCheckBox crowdCB;
+ cCheckBox smoothCB;
+ cToggleButton fastCB;
+ cCheckBox slowCB;
+ cCheckBox boxCB;
+ cCheckBox zoomBoxCB;
+ //cToggleButton trackCB;
+ cCheckBox trackCB;
+ cCheckBox smoothfocusCB;
// JCheckBox speakerMocapCB;
- JCheckBox speakerCameraCB;
- JCheckBox speakerFocusCB;
- JCheckBox debugCB;
- JCheckBox oeilCB;
- JCheckBox lookAtCB;
+ cCheckBox speakerCameraCB;
+ cCheckBox speakerFocusCB;
+ cCheckBox debugCB;
+
+ cCheckBox oeilCB;
+ cCheckBox shadowCB;
+ cCheckBox autosaveCB;
+ cCheckBox lookAtCB;
// static int COLOR = 1;
// static int MATERIAL = 2;
@@ -841,9 +1019,9 @@
int dropAttributes = Object3D.COLOR | Object3D.MATERIAL;
- JCheckBox colorCB;
- JCheckBox materialCB;
- JCheckBox textureCB;
+ cCheckBox colorCB;
+ cCheckBox materialCB;
+ cCheckBox textureCB;
public void itemStateChanged(ItemEvent e)
{
@@ -936,6 +1114,14 @@
{
cameraView.ToggleOeil();
}
+ else if(e.getSource() == shadowCB)
+ {
+ Globals.COMPUTESHADOWWHENLIVE ^= true;
+ }
+ else if(e.getSource() == autosaveCB)
+ {
+ Globals.SAVEONMAKE ^= true;
+ }
else if(e.getSource() == lookAtCB)
{
cameraView.ToggleLookAt();
@@ -952,7 +1138,8 @@
/**/
//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
+ TreePath path = objEditor.jTree.getSelectionPath();
if ((path == null) || (path.getPathCount() <= 1)) {
// We can't move the root node or an empty selection
return;
@@ -1069,23 +1256,33 @@
assert target == objEditor.jTree;
TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
+ Object3D destinationLeaf;
try {
- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
} catch (Exception e) {
System.out.println("destinationPath : " + destinationPath);
return;
}
- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
+ for (int i=group.selection.size(); --i>=0;)
{
+ Object3D child = (Object3D)group.selection.elementAt(i);
+
+ // Cannot move into itself
+ if (child == destinationLeaf)
+ return;
+ }
+
+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
+// {
loadClipboard(true);
objEditor.jTree.setSelectionPath(destinationPath);
pasteInto(false, false);
- } else {
- loadClipboard(false);
- objEditor.jTree.setSelectionPath(destinationPath);
- pasteInto(false, false); // true); // ???
- }
+// } else {
+// loadClipboard(false);
+// objEditor.jTree.setSelectionPath(destinationPath);
+// pasteInto(false, false); // true); // ???
+// }
}
public void dropActionChanged(DropTargetDragEvent dtde)
// Called if the user has modified the current drop gesture
@@ -1190,22 +1387,30 @@
{
//heightFieldItem = menu.add(new MenuItem("Height Field"));
//heightFieldItem.addActionListener(this);
- gridItem = menu.add(new MenuItem("Grid"));
- gridItem.addActionListener(this);
- rectoidItem = menu.add(new MenuItem("Box"));
- rectoidItem.addActionListener(this);
- ellipsoidItem = menu.add(new MenuItem("Sphere"));
- ellipsoidItem.addActionListener(this);
- coneItem = menu.add(new MenuItem("Cone"));
- coneItem.addActionListener(this);
- torusItem = menu.add(new MenuItem("Torus"));
- torusItem.addActionListener(this);
- superItem = menu.add(new MenuItem("Superellipsoid"));
- superItem.addActionListener(this);
+// gridItem = menu.add(new MenuItem("Grid"));
+// gridItem.addActionListener(this);
+// rectoidItem = menu.add(new MenuItem("Box"));
+// rectoidItem.addActionListener(this);
+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
+// ellipsoidItem.addActionListener(this);
+// coneItem = menu.add(new MenuItem("Cone"));
+// coneItem.addActionListener(this);
+// torusItem = menu.add(new MenuItem("Torus"));
+// torusItem.addActionListener(this);
+// superItem = menu.add(new MenuItem("Superellipsoid"));
+// superItem.addActionListener(this);
+
+ cameraItem = menu.add(new MenuItem("Camera"));
+ cameraItem.addActionListener(this);
+
+ if (!Globals.ADVANCED)
+ {
kleinItem = menu.add(new MenuItem("Klein Bottle"));
kleinItem.addActionListener(this);
- particleItem = menu.add(new MenuItem("Particle system"));
- particleItem.addActionListener(this);
+ }
+
+// particleItem = menu.add(new MenuItem("Particle system"));
+// particleItem.addActionListener(this);
if (Globals.ADVANCED)
{
ragdollItem = menu.add(new MenuItem("Rag Walk"));
@@ -1231,15 +1436,15 @@
}
bezierItem = menu.add(new MenuItem("Bezier Patch"));
bezierItem.addActionListener(this);
- overlayItem = menu.add(new MenuItem("Overlay"));
- overlayItem.addActionListener(this);
- lightItem = menu.add(new MenuItem("Light"));
- lightItem.addActionListener(this);
+// overlayItem = menu.add(new MenuItem("Overlay"));
+// overlayItem.addActionListener(this);
+// lightItem = menu.add(new MenuItem("Light"));
+// lightItem.addActionListener(this);
menu.add("-");
//superLoopItem = menu.add(new MenuItem("Super Loop"));
//superLoopItem.addActionListener(this);
- loopItem = menu.add(new MenuItem("Loop"));
- loopItem.addActionListener(this);
+// loopItem = menu.add(new MenuItem("Loop"));
+// loopItem.addActionListener(this);
doubleItem = menu.add(new MenuItem("Fork"));
doubleItem.addActionListener(this);
if (Globals.ADVANCED)
@@ -1420,9 +1625,24 @@
shadow.material = new cMaterial(obj.material);
shadow.material.diffuse = 0.0001f;
shadow.material.specular = 0.0001f;
+ //shadow.projectedVertices[1].x = 300;
makeSomething(shadow);
}
+
+ private void ClearUnpinned()
+ {
+ //for (Object3D obj : listUI)
+ for (int i=listUI.size(); --i>=0;)
+ {
+ Object3D obj = listUI.elementAt(i);
+ if (!obj.pinned)
+ {
+ obj.CloseUI();
+ listUI.remove(i);
+ }
+ }
+ }
/**
* applyExample
@@ -1667,7 +1887,7 @@
{
ScreenFit();
} else
- if (source == switchItem)
+ if (source == switchViewItem)
{
cVector v1 = new cVector();
cVector v2 = new cVector();
@@ -1676,11 +1896,11 @@
objEditor.cameraView.renderCamera.setAim(v2, v1);
objEditor.cameraView.repaint();
} else
- if (source == rectoidItem)
+ if (source == rectoidItem || source == boxButton)
{
makeSomething(new Box());
} else
- if (source == particleItem)
+ if (source == particleItem || source == particlesButton)
{
ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
ParticleController particleController = new ParticleController(particleGeom);
@@ -1759,27 +1979,27 @@
makeSomething(obj);
} else
- if (source == gridItem)
+ if (source == gridItem || source == gridButton)
{
makeSomething(new Grid());
} else
- if (source == ellipsoidItem)
+ if (source == ellipsoidItem || source == sphereButton)
{
makeSomething(new Sphere());
} else
- if (source == coneItem)
+ if (source == coneItem || source == coneButton)
{
makeSomething(new Cone());
} else
- if (source == torusItem)
+ if (source == torusItem || source == torusButton)
{
makeSomething(new Torus());
} else
- if (source == superItem)
+ if (source == superItem || source == superButton)
{
makeSomething(new Superellipsoid());
} else
- if (source == kleinItem)
+ if (source == kleinItem || source == kleinButton)
{
makeSomething(new Klein());
} else
@@ -1799,7 +2019,7 @@
{
makeSomething(new BezierSurface());
} else
- if (source == overlayItem)
+ if (source == overlayItem || source == overlayButton)
{
/*
Object3D obj = new BezierSurface(5,8);
@@ -1847,7 +2067,7 @@
s.setup();
makeSomething(s);
} else
- if (source == lightItem)
+ if (source == lightItem || source == lightButton)
{
makeSomething(new Light());
} else
@@ -1897,7 +2117,7 @@
group(g);
} else
- if (source == loopItem)
+ if (source == loopItem || source == loopButton)
{
Composite csg = new GroupLeaf();
csg.count = 5;
@@ -1969,6 +2189,18 @@
if (source == dumpItem)
{
DumpObject();
+ } else
+ if (source == minButton)
+ {
+ Minimize();
+ } else
+ if (source == maxButton)
+ {
+ Maximize();
+ } else
+ if (source == fullButton)
+ {
+ ToggleFullScreen();
} else
if (source == undoButton)
{
@@ -2375,9 +2607,9 @@
{
ClearSelection(true);
} else
- if (source == grabItem)
+ if (source == grabItem || source == groupButton)
{
- group(new cGroup(), true);
+ group(new cGroup(), false); // true);
} else
if (source == hideItem)
{
@@ -2395,11 +2627,11 @@
{
makeSomething(new Camera());
} else
- if (source == compositeItem)
+ if (source == compositeItem || source == compositeButton)
{
group(new Composite());
} else
- if (source == randomItem)
+ if (source == switchItem || source == switchButton)
{
RandomNode random = new RandomNode();
group(random);
@@ -2501,7 +2733,7 @@
{
group(new cLinker());
} else
- if (source == textureItem)
+ if (source == textureItem || source == textureButton)
{
group(new TextureNode());
} else
@@ -2521,7 +2753,7 @@
{
CastShadow(2);
} else
- if (source == ungroupItem)
+ if (source == ungroupItem || source == ungroupButton)
{
//ungroup();
for (int i=0; i<group.selection.size(); i++)
@@ -2608,6 +2840,22 @@
if (source == unmarkleavesItem)
{
MarkLeaves(false);
+ } else
+ if (source == rewindleavesItem)
+ {
+ RewindLeaves(true);
+ } else
+ if (source == unrewindleavesItem)
+ {
+ RewindLeaves(false);
+ } else
+ if (source == randomleavesItem)
+ {
+ RandomLeaves(true);
+ } else
+ if (source == unrandomleavesItem)
+ {
+ RandomLeaves(false);
} else
if (source == flipVItem)
{
@@ -2843,6 +3091,10 @@
if (source == twoButton)
{
radio.layout = twoButton;
+
+ if (CameraPane.FULLSCREEN)
+ fullscreenLayout = radio.layout;
+
// bug
//gridPanel.setDividerLocation(1.0);
//bigPanel.setDividerLocation(0.0);
@@ -2875,10 +3127,31 @@
bigThree.ClearUI();
bigThree.add(centralPanel);
bigThree.FlushUI();
+
+ cameraView.requestFocusInWindow();
+
+// refreshContents(true);
+//
+// try
+// {
+// java.awt.Robot bot = new java.awt.Robot();
+// int mask = InputEvent.BUTTON1_MASK;
+// bot.mouseMove(100, 100);
+// bot.mousePress(mask);
+// bot.mouseRelease(mask);
+// }
+// catch (Exception e)
+// {
+//
+// }
+
} else
if (source == threeButton)
{
radio.layout = threeButton;
+
+ if (CameraPane.FULLSCREEN)
+ fullscreenLayout = radio.layout;
// bigThree.remove(scenePanel);
// bigThree.remove(centralPanel);
@@ -2911,10 +3184,15 @@
bigThree.add(centralPanel);
bigThree.add(XYZPanel);
bigThree.FlushUI();
+
+ cameraView.requestFocusInWindow();
} else
if (source == fourButton)
{
radio.layout = fourButton;
+
+ if (CameraPane.FULLSCREEN)
+ fullscreenLayout = radio.layout;
// bigThree.remove(scenePanel);
// bigThree.remove(centralPanel);
@@ -2946,10 +3224,15 @@
bigThree.ClearUI();
bigThree.add(scenePanel);
bigThree.FlushUI();
+
+ cameraView.requestFocusInWindow();
} else
if (source == sixButton)
{
radio.layout = sixButton;
+
+ if (CameraPane.FULLSCREEN)
+ fullscreenLayout = radio.layout;
// bigThree.remove(scenePanel);
// bigThree.remove(centralPanel);
@@ -2982,10 +3265,15 @@
bigThree.add(scenePanel);
bigThree.add(centralPanel);
bigThree.FlushUI();
+
+ cameraView.requestFocusInWindow();
} else
if (source == sevenButton)
{
radio.layout = sevenButton;
+
+ if (CameraPane.FULLSCREEN)
+ fullscreenLayout = radio.layout;
// bigThree.remove(scenePanel);
// bigThree.remove(centralPanel);
@@ -3019,6 +3307,8 @@
bigThree.add(centralPanel);
bigThree.add(XYZPanel);
bigThree.FlushUI();
+
+ cameraView.requestFocusInWindow();
} else
if (source == rootButton)
{
@@ -3030,6 +3320,7 @@
EditObject(obj);
}
+ cameraView.requestFocusInWindow();
refreshContents(true);
} else
if (source == closeButton)
@@ -3039,22 +3330,37 @@
for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
{
ab = (cRadio)e.nextElement();
- if(ab.getModel().isSelected() && ab.GetObject() != client)
+ if (ab.getModel().isSelected() && ab.GetObject() != client)
{
+ // Patch to avoid bug with transparency.
+ if (!ab.hadMaterial)
+ {
+ ab.object.material = null;
+ }
+
buttonGroup.remove(ab);
radioPanel.remove(ab);
- ab.GetObject().editWindow = null;
+ //ab.GetObject().editWindow = null;
+ ab.GetObject().manipWindow = null;
// ab.GetObject().objectUI = null; // ?????????
((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
break;
}
}
+
+ cameraView.requestFocusInWindow();
refreshContents(true);
} else
if (source == editItem || source == editButton)
{
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
+ {
+ Object3D child = (Object3D)e.nextElement();
+ child.pinned = true;
+ }
+
EditSelection(false);
} else
if (source == uneditButton)
@@ -3064,6 +3370,7 @@
Object3D child = (Object3D)e.nextElement();
if(child.editWindow != null)
objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
+ child.pinned = false;
child.CloseUI();
listUI.remove(child);
@@ -3080,6 +3387,7 @@
//copy.ClearUI();
for (Object3D obj : listUI)
{
+ obj.pinned = false;
obj.CloseUI();
}
listUI.clear();
@@ -3089,7 +3397,7 @@
{
assert(copy == group);
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
for (Object3D obj : listUI)
{
@@ -3155,7 +3463,8 @@
}
// fix "+" issue
- group.editWindow = this;
+ //group.editWindow = this;
+ group.manipWindow = this;
/*
currentLayout = radio.layout;
@@ -3163,18 +3472,25 @@
currentLayout = sevenButton;
*/
radio.layout.doClick();
+
+ ClearUnpinned();
+ SetPinStates(group.selection.size() > 0);
+ if (group.selection.size() == 1)
+ EditSelection(false);
keepparent = group.parent;
// PARENT = NULL or not???
//group.parent = null; // ROOT
//group.attributes = -1;
ResetModel();
+
+ cameraView.requestFocusInWindow();
refreshContents(true);
} else if (event.getSource() == editCameraItem)
{
cameraView.ProtectCamera();
cameraView.repaint();
return;
- } else if (event.getSource() == revertCameraItem)
+ } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
{
cameraView.RevertCamera();
cameraView.repaint();
@@ -3191,7 +3507,6 @@
}
boolean useclient = false;
- cRadio radio;
void ToggleRoot()
{
@@ -4146,6 +4461,18 @@
refreshContents();
}
+ void RewindLeaves(boolean hide)
+ {
+ group.selection.RewindLeaves(hide);
+ refreshContents();
+ }
+
+ void RandomLeaves(boolean hide)
+ {
+ group.selection.RandomLeaves(hide);
+ refreshContents();
+ }
+
void SetTexRes(int tr)
{
group.selection.SetTexRes(tr);
@@ -4217,10 +4544,6 @@
// }
// }
- static boolean allparams = true;
-
- static Vector<Object3D> listUI = new Vector<Object3D>();
-
void EditSelection(boolean newWindow)
{
// aConstraints.gridy = 0;
@@ -4228,7 +4551,7 @@
{
//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
Object3D elem = (Object3D)group.selection.elementAt(i);
if(elem != group || !newWindow)
@@ -4313,7 +4636,8 @@
//new Exception().printStackTrace();
freezemodel = true;
-
+ ClearUnpinned();
+
/**/
//switch (event.id)
{
@@ -4329,6 +4653,7 @@
//if (child.parent != null)
//child.parent.addSelectee(child);
+ objEditor.SetMaterial(child);
group.addSelectee(child);
}
}
@@ -4345,7 +4670,7 @@
if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
// a camera
{
- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
{
CameraPane.camerachangeframe = 0; // don't refuse it
Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
@@ -4354,6 +4679,13 @@
// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
}
+ if (tps != null && tps.length == 1)
+ {
+ EditSelection(false);
+ }
+
+ SetPinStates(tps != null && tps.length > 0);
+
refreshContents();
//return true;
}
@@ -4363,21 +4695,27 @@
freezemodel = false;
}
+ void SetPinStates(boolean enabled)
+ {
+ editButton.setEnabled(enabled);
+ uneditButton.setEnabled(enabled);
+ unselectButton.setEnabled(enabled);
+ flashSelectionButton.setEnabled(enabled);
+ }
+
void refreshContents(boolean cp)
{
- if (!Globals.MOUSEDRAGGED)
+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
{
objEditor.ClearInfo(); // .GetMaterial());
- for (int i=0; i < group.selection.size(); i++)
+ for (int i=0; i < group.selection.Size(); i++)
{
- Object3D child = (Object3D) group.selection.reserve(i);
+ Object3D child = (Object3D) group.selection.get(i);
- objEditor.SetMaterial(child);
objEditor.AddInfo(child, this, true);
System.err.println("info : " + child.GetPath());
-
- group.selection.release(i);
}
objEditor.SetText(); // jan 2014
@@ -4467,6 +4805,7 @@
if (cut)
{
+ if (Globals.SAVEONMAKE)
Save();
//int indices[] = jList.getSelectedIndices();
//for (int i = indices.length - 1; i >= 0; i--)
@@ -5185,10 +5524,31 @@
cButton clearpanelButton;
cButton unselectButton;
+ cButton restoreCameraButton;
+
+ cButton minButton;
+ cButton maxButton;
+ cButton fullButton;
cButton saveButton;
- cButton undoButton;
- cButton redoButton;
cButton oneStepButton;
+
+ cButton groupButton;
+ cButton ungroupButton;
+ cButton compositeButton;
+ cButton switchButton;
+ cButton loopButton;
+ cButton textureButton;
+
+ cButton gridButton;
+ cButton boxButton;
+ cButton sphereButton;
+ cButton coneButton;
+ cButton torusButton;
+ cButton superButton;
+ cButton kleinButton;
+ cButton particlesButton;
+ cButton overlayButton;
+ cButton lightButton;
cButton screenfitButton;
cButton screenfitpointButton;
@@ -5201,14 +5561,6 @@
cButton setsupportButton;
- cButton twoButton;
- cButton sixButton;
- cButton threeButton;
- cButton sevenButton;
- cButton fourButton; // full panel
- cButton oneButton; // full XYZ
- //cButton currentLayout;
-
//
//Composite
Object3D // to do !!
@@ -5218,11 +5570,11 @@
//JTree jTree;
private MenuItem lookAtItem;
private MenuItem lookFromItem;
- private MenuItem switchItem;
+ private MenuItem switchViewItem;
private MenuItem cutItem;
private MenuItem undoItem;
private MenuItem redoItem;
- private MenuItem duplicateItem;
+ private JMenuItem duplicateItem;
private MenuItem cloneItem;
private MenuItem cloneSupportItem;
private MenuItem overwriteGeoItem;
@@ -5285,6 +5637,10 @@
private MenuItem showleavesItem;
private MenuItem markleavesItem;
private MenuItem unmarkleavesItem;
+ private MenuItem rewindleavesItem;
+ private MenuItem unrewindleavesItem;
+ private MenuItem randomleavesItem;
+ private MenuItem unrandomleavesItem;
private MenuItem flipVItem;
private MenuItem unflipVItem;
@@ -5306,7 +5662,7 @@
private MenuItem frontItem;
private MenuItem cameraItem;
private MenuItem compositeItem;
- private MenuItem randomItem;
+ private MenuItem switchItem;
private MenuItem physicsItem;
private MenuItem frameselectorItem;
private MenuItem scriptNodeItem;
@@ -5380,5 +5736,5 @@
Menu cameraMenu;
MenuItem editCameraItem;
- MenuItem revertCameraItem;
+ MenuItem restoreCameraItem;
}
--
Gitblit v1.6.2