From 8088590686a45e71278f9a52bb9cc37943dc0c37 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sun, 23 Jun 2019 08:18:35 -0400
Subject: [PATCH] Full-screen mode.
---
GroupEditor.java | 681 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 473 insertions(+), 208 deletions(-)
diff --git a/GroupEditor.java b/GroupEditor.java
index 56e3aff..14b61ed 100644
--- a/GroupEditor.java
+++ b/GroupEditor.java
@@ -74,7 +74,7 @@
this.copy = this.group = copy;
//selectees = this.group.selectees;
- SetupMenu2(objEditor);
+ SetupMenu2(this); //objEditor);
SetupUI2(objEditor);
objEditor.SetupUI(true);
SetupViews(objEditor);
@@ -98,14 +98,14 @@
void CloneClipboard(boolean supports)
{
- assert(GrafreeD.clipboard.parent == null);
- Object3D /*Composite*/ keepparent = GrafreeD.clipboard.get(0).parent;
- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
- if (LA.isIdentity(GrafreeD.clipboard.toParent))
- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
+ assert(Grafreed.clipboard.parent == null);
+ Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
+ if (LA.isIdentity(Grafreed.clipboard.toParent))
+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
else
- makeSomething(CloneObject(GrafreeD.clipboard, false));
- GrafreeD.clipboard.get(0).parent = keepparent;
+ makeSomething(CloneObject(Grafreed.clipboard, false));
+ Grafreed.clipboard.get(0).parent = keepparent;
}
static Object3D CloneObject(Object3D obj, boolean supports)
@@ -119,7 +119,7 @@
// obj.support = null;
if (!supports)
obj.SaveSupports();
- Object3D clone = (Object3D)GrafreeD.clone(obj);
+ Object3D clone = (Object3D)Grafreed.clone(obj);
obj.parent = parent;
// obj.support = support;
// clone.support = support; // aout 2013
@@ -148,29 +148,28 @@
//JTextField nameField;
- void SetupMenu2(ObjEditor oe)
+ void SetupMenu2(GroupEditor oe)
{
- if (Globals.ADVANCED)
- {
- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
- //cameraMenu.add(switchItem = 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);
- //switchItem.addActionListener(this);
- }
-
Menu menu;
oe.menuBar.add(menu = new Menu("Edit"));
//editItem = menu.add(new MenuItem("Edit"));
//editItem.addActionListener(this);
+
+// undoItem = menu.add(new MenuItem("Undo"));
+// undoItem.addActionListener(this);
+// redoItem = menu.add(new MenuItem("Redo"));
+// redoItem.addActionListener(this);
+// menu.add("-");
duplicateItem = menu.add(new MenuItem("Duplicate"));
duplicateItem.addActionListener(this);
+ cloneItem = menu.add(new MenuItem("Clone"));
+ cloneItem.addActionListener(this);
+ if (Globals.ADVANCED)
+ {
+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
+ cloneSupportItem.addActionListener(this);
+ }
+ menu.add("-");
cutItem = menu.add(new MenuItem("Cut"));
cutItem.addActionListener(this);
copyItem = menu.add(new MenuItem("Copy"));
@@ -178,10 +177,7 @@
pasteItem = menu.add(new MenuItem("Paste"));
pasteItem.addActionListener(this);
menu.add("-");
- cloneItem = menu.add(new MenuItem("Clone"));
- cloneItem.addActionListener(this);
- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
- cloneSupportItem.addActionListener(this);
+
menu.add("-");
pasteIntoItem = menu.add(new MenuItem("Paste into"));
pasteIntoItem.addActionListener(this);
@@ -201,14 +197,97 @@
clearAllItem = menu.add(new MenuItem("Clear All"));
clearAllItem.addActionListener(this);
}
+
+ menuBar.add(cameraMenu = new Menu("View"));
+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
+ //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(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);
+ toggleHandleItem.setState(CameraPane.HANDLES);
+
+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
+ togglePaintItem.addItemListener(this);
+ togglePaintItem.setState(CameraPane.PAINTMODE);
+
+ if (Globals.ADVANCED)
+ {
+ cameraMenu.add("-");
+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
+ toggleLiveItem.addItemListener(this);
+ toggleLiveItem.setState(Globals.isLIVE());
+ cameraMenu.add(stepItem = new MenuItem("Step"));
+ stepItem.addActionListener(this);
+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
+ // toggleDLItem.addItemListener(this);
+ // toggleDLItem.setState(false);
+
+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
+ toggleRenderItem.addItemListener(this);
+ toggleRenderItem.setState(!CameraPane.frozen);
+
+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
+ toggleDebugItem.addItemListener(this);
+ toggleDebugItem.setState(Globals.DEBUG);
+
+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
+ toggleFrustumItem.addItemListener(this);
+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
+
+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
+ toggleFootContactItem.addItemListener(this);
+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
+
+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
+ toggleTimelineItem.addItemListener(this);
+ }
+
+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
+// toggleRootItem.addItemListener(this);
+// toggleRootItem.setState(false);
+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
+// animationItem.addItemListener(this);
+// animationItem.setState(CameraPane.ANIMATION);
+ cameraMenu.add("-");
+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
+ editCameraItem.addActionListener(this);
+
+ if (Globals.ADVANCED)
+ {
+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
+ //cameraMenu.add(switchItem = 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);
+ //switchItem.addActionListener(this);
+ }
+
oe.menuBar.add(menu = new Menu("Setting"));
if (Globals.ADVANCED)
{
- resetMeshItem = menu.add(new MenuItem("Reset All"));
- resetMeshItem.addActionListener(this);
- stepAllItem = menu.add(new MenuItem("Step All"));
- stepAllItem.addActionListener(this);
revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
revertMeshItem.addActionListener(this);
resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
@@ -272,6 +351,7 @@
if (Globals.ADVANCED)
{
+ menu.add("-");
physicsItem = menu.add(new MenuItem("Physics"));
physicsItem.addActionListener(this);
frameselectorItem = menu.add(new MenuItem("Frame Selector"));
@@ -297,6 +377,7 @@
shadowZItem.addActionListener(this);
if (Globals.ADVANCED)
{
+ menu.add("-");
linkerItem = menu.add(new MenuItem("Linker"));
linkerItem.addActionListener(this);
attributeItem = menu.add(new MenuItem("Attribute"));
@@ -305,14 +386,18 @@
templateItem.addActionListener(this);
pointflowItem = menu.add(new MenuItem("Point Flow"));
pointflowItem.addActionListener(this);
- menu.add("-");
}
+ menu.add("-");
resetTransformItem = menu.add(new MenuItem("Reset Transform"));
resetTransformItem.addActionListener(this);
resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
resetCentroidItem.addActionListener(this);
- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
- transformgeometryItem.addActionListener(this);
+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
+ resetCentroidXZItem.addActionListener(this);
+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
+ transformGeometryItem.addActionListener(this);
+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
+ transformChildrenItem.addActionListener(this);
oe.menuBar.add(menu = new Menu("Geometry"));
genUVItem = menu.add(new MenuItem("Generate UV"));
@@ -361,6 +446,10 @@
oe.menuBar.add(menu = new Menu("Attributes"));
clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
clearMaterialsItem.addActionListener(this);
+ resetAllItem = menu.add(new MenuItem("Reset All"));
+ resetAllItem.addActionListener(this);
+ stepAllItem = menu.add(new MenuItem("Step All"));
+ stepAllItem.addActionListener(this);
menu.add("-");
liveleavesItem = menu.add(new MenuItem("Live Leaves"));
liveleavesItem.addActionListener(this);
@@ -381,6 +470,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);
@@ -415,38 +512,41 @@
sortbysizeItem.addActionListener(this);
sortbynameItem = menu.add(new MenuItem("Sort by name"));
sortbynameItem.addActionListener(this);
+ menu.add("-");
+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
+ shareGeometriesItem.addActionListener(this);
+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
+ mergeGeometriesItem.addActionListener(this);
if (Globals.ADVANCED)
{
- menu.add("-");
+ // Pretty much the same as duplicate and clone.
extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
extractGeometriesItem.addActionListener(this);
cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
cloneGeometriesItem.addActionListener(this);
- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
- shareGeometriesItem.addActionListener(this);
- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
- mergeGeometriesItem.addActionListener(this);
}
oe.menuBar.add(menu = new Menu("Insert"));
buildCreateMenu(menu);
- oe.menuBar.add(menu = new Menu("Include"));
- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
- importGFDItem.addActionListener(this);
- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
- importVRMLX3DItem.addActionListener(this);
- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
- importOBJItem.addActionListener(this);
- import3DSItem = menu.add(new MenuItem("3DS Object..."));
- import3DSItem.addActionListener(this);
-
oe.menuBar.add(menu = new Menu("Tools"));
buildToolsMenu(menu);
}
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());
@@ -477,11 +577,35 @@
*/
//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ //minButton.setToolTipText("Minimize window");
+ //minButton.addActionListener(this);
+
+ oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ maxButton.setToolTipText("Maximize window");
+ maxButton.addActionListener(this);
+
+ oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ fullButton.setToolTipText("Full-screen window");
+ fullButton.addActionListener(this);
+
+ oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ undoButton.setToolTipText("Undo changes");
+ undoButton.addActionListener(this);
+
+ oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ redoButton.setToolTipText("Redo changes");
+ redoButton.addActionListener(this);
+
+ oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ saveButton.setToolTipText("Save changes");
+ saveButton.addActionListener(this);
+
oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
- liveCB.setToolTipText("Enabled animation");
+ liveCB.setToolTipText("Enable animation");
liveCB.addItemListener(this);
- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
+ oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
oneStepButton.setToolTipText("Animate one step forward");
oneStepButton.addActionListener(this);
@@ -489,11 +613,11 @@
fastCB.setToolTipText("Fast mode");
fastCB.addItemListener(this);
- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
+ oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
trackCB.setToolTipText("Enable tracking");
trackCB.addItemListener(this);
- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
screenfitButton.setToolTipText("Screen fit");
screenfitButton.addActionListener(this);
@@ -502,39 +626,39 @@
if (Globals.ADVANCED)
{
- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
snapobjectButton.addActionListener(this);
snapobjectButton.setToolTipText("Snap Object");
}
- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
+ 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(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);
+ 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 = new cButton("o o o", !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 = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
closeButton.setToolTipText("Close tab");
closeButton.addActionListener(this);
//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
@@ -542,11 +666,11 @@
cGridBag commandsPanel = new cGridBag();
- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
editButton.setToolTipText("Edit selection");
editButton.addActionListener(this);
- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
uneditButton.setToolTipText("Unedit selection");
uneditButton.addActionListener(this);
@@ -554,11 +678,11 @@
allParamsButton.setToolTipText("Edit all params");
allParamsButton.addActionListener(this);
- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
+ commandsPanel.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);
+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
unselectButton.setToolTipText("Unselect");
unselectButton.addActionListener(this);
@@ -641,7 +765,7 @@
zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
zoomBoxCB.addItemListener(this);
- if (Globals.ADVANCED)
+ if (true) // Globals.ADVANCED)
{
panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
supportCB.setToolTipText("Enable rigging");
@@ -714,8 +838,11 @@
buttonGroup.add(radioButton);
radioButton.doClick();
}
+
void SetupViews(ObjEditor oe)
{
+ theFrame = this;
+
oe.SetupViews();
System.out.println("SetupViews");
@@ -778,6 +905,7 @@
} else if(e.getSource() == liveCB)
{
cameraView.ToggleLive();
+ refreshContents(false);
}
else if(e.getSource() == supportCB)
{
@@ -930,7 +1058,9 @@
// objEditor.DropFile((java.io.File[]) object, true);
// return;
// }
- if (string.charAt(0) == '/')
+
+ // File path for Mac and Windows
+ if (string.charAt(0) == '/' || string.charAt(1) == ':')
{
// file(s)
String[] names = string.split("\n");
@@ -957,7 +1087,7 @@
flashIt = false;
CameraPane pane = (CameraPane) target;
- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
if (group.selection.size() == 1)
@@ -1164,13 +1294,13 @@
parseverticesItem.addActionListener(this);
textureFieldItem = menu.add(new MenuItem("Texture Field"));
textureFieldItem.addActionListener(this);
- alignItem = menu.add(new MenuItem("Align Object"));
+ alignItem = menu.add(new MenuItem("Align Objects"));
alignItem.addActionListener(this);
reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
reduceMorphItem.addActionListener(this);
reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
reduce34MorphItem.addActionListener(this);
-
+ menu.add("-");
menu.add(computeAOItem = new MenuItem("Compute AO"));
computeAOItem.addActionListener(this);
@@ -1183,7 +1313,7 @@
memoryItem.addActionListener(this);
menu.add(analyzeItem = new MenuItem("Analyze"));
analyzeItem.addActionListener(this);
- menu.add(dumpItem = new MenuItem("Dump"));
+ menu.add(dumpItem = new MenuItem("Print"));
dumpItem.addActionListener(this);
// menu.add(pathItem = new MenuItem("From-to path"));
// pathItem.addActionListener(this);
@@ -1530,9 +1660,9 @@
void Overwrite(int mask)
{
- if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
{
- Object3D content = GrafreeD.clipboard.get(0);
+ Object3D content = Grafreed.clipboard.get(0);
if (content instanceof cGroup && ((cGroup)content).transientlink )
content = ((cGroup)content).get(0);
@@ -1837,23 +1967,6 @@
csg.addChild(child);
child.addChild(csg);
} else
-
- if (source == importGFDItem)
- {
- ImportGFD();
- } else
- if (source == importVRMLX3DItem)
- {
- ImportVRMLX3D();
- } else
- if (source == import3DSItem)
- {
- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
- } else
- if (source == importOBJItem)
- {
- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
- } else
if (source == computeAOItem)
{
Globals.drawMode = CameraPane.OCCLUSION;
@@ -1872,7 +1985,7 @@
if (source == invariantsItem)
{
System.out.println("Invariants:");
- GrafreeD.grafreeD.universe.invariants();
+ Grafreed.grafreeD.universe.invariants();
} else
if (source == memoryItem)
{
@@ -1890,6 +2003,30 @@
if (source == dumpItem)
{
DumpObject();
+ } else
+ if (source == minButton)
+ {
+ Minimize();
+ } else
+ if (source == maxButton)
+ {
+ Maximize();
+ } else
+ if (source == fullButton)
+ {
+ ToggleFullScreen();
+ } else
+ if (source == undoButton)
+ {
+ Undo();
+ } else
+ if (source == redoButton)
+ {
+ Redo();
+ } else
+ if (source == saveButton)
+ {
+ Save();
} else
if (source == oneStepButton)
{
@@ -1945,12 +2082,20 @@
{
loadClipboard(true);
} else
+ if (source == undoItem)
+ {
+ Undo();
+ } else
+ if (source == redoItem)
+ {
+ Redo();
+ } else
if (source == duplicateItem)
{
- Object3D keep = GrafreeD.clipboard;
+ Object3D keep = Grafreed.clipboard;
loadClipboard(false);
paste(false);
- GrafreeD.clipboard = keep;
+ Grafreed.clipboard = keep;
} else
if (source == cloneItem)
{
@@ -2170,9 +2315,9 @@
// group.selection.get(0).setMasterThis(content); // should be identity
// refreshContents();
// }
- if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
{
- Object3D content = GrafreeD.clipboard.get(0);
+ Object3D content = Grafreed.clipboard.get(0);
if (content instanceof cGroup && ((cGroup)content).transientlink )
content = ((cGroup)content).get(0);
@@ -2222,9 +2367,9 @@
} else
if (source == setMasterItem)
{
- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
{
- Object3D content = GrafreeD.clipboard.get(0);
+ Object3D content = Grafreed.clipboard.get(0);
if (content instanceof cGroup && ((cGroup)content).transientlink )
content = ((cGroup)content).get(0);
@@ -2237,9 +2382,9 @@
{
if (group.selection.size() == 1)
{
- if (GrafreeD.clipboard.size() == 1)
+ if (Grafreed.clipboard.size() == 1)
{
- Object3D content = GrafreeD.clipboard.get(0);
+ Object3D content = Grafreed.clipboard.get(0);
if (content instanceof cGroup && ((cGroup)content).transientlink )
content = ((cGroup)content).get(0);
@@ -2256,7 +2401,7 @@
{
RevertMeshes();
} else
- if (source == resetMeshItem)
+ if (source == resetAllItem)
{
ResetAll();
} else
@@ -2444,7 +2589,7 @@
} else
if (source == genNormalsMESHItem)
{
- GenNormals(true); // TODO
+ GenNormalsMESH();
} else
if (source == genNormalsORGANItem)
{
@@ -2509,6 +2654,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)
{
@@ -2594,9 +2755,13 @@
{
SmoothMesh();
} else
- if (source == transformgeometryItem)
+ if (source == transformGeometryItem)
{
TransformGeometry();
+ } else
+ if (source == transformChildrenItem)
+ {
+ TransformChildren();
} else
if (source == resetTransformItem)
{
@@ -2604,7 +2769,11 @@
} else
if (source == resetCentroidItem)
{
- ResetCentroid();
+ ResetCentroid(true);
+ } else
+ if (source == resetCentroidXZItem)
+ {
+ ResetCentroid(false);
} else
if (source == resetParentItem)
{
@@ -2768,6 +2937,24 @@
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)
{
@@ -2804,6 +2991,8 @@
bigThree.add(centralPanel);
bigThree.add(XYZPanel);
bigThree.FlushUI();
+
+ cameraView.requestFocusInWindow();
} else
if (source == fourButton)
{
@@ -2839,6 +3028,8 @@
bigThree.ClearUI();
bigThree.add(scenePanel);
bigThree.FlushUI();
+
+ cameraView.requestFocusInWindow();
} else
if (source == sixButton)
{
@@ -2875,6 +3066,8 @@
bigThree.add(scenePanel);
bigThree.add(centralPanel);
bigThree.FlushUI();
+
+ cameraView.requestFocusInWindow();
} else
if (source == sevenButton)
{
@@ -2912,6 +3105,8 @@
bigThree.add(centralPanel);
bigThree.add(XYZPanel);
bigThree.FlushUI();
+
+ cameraView.requestFocusInWindow();
} else
if (source == rootButton)
{
@@ -2923,6 +3118,7 @@
EditObject(obj);
}
+ cameraView.requestFocusInWindow();
refreshContents(true);
} else
if (source == closeButton)
@@ -2944,6 +3140,8 @@
break;
}
}
+
+ cameraView.requestFocusInWindow();
refreshContents(true);
} else
if (source == editItem || source == editButton)
@@ -2960,7 +3158,7 @@
child.CloseUI();
listUI.remove(child);
- child.editWindow = null; // ???????????
+ //child.editWindow = null; // ???????????
}
objEditor.ctrlPanel.FlushUI();
//objEditor.jTree.clearSelection();
@@ -3046,7 +3244,10 @@
frontView.object = group;
sideView.object = group;
}
- group.editWindow = this;
+
+// fix "+" issue
+ //group.editWindow = this;
+
/*
currentLayout = radio.layout;
if (currentLayout == null)
@@ -3058,8 +3259,23 @@
//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)
+ {
+ cameraView.RevertCamera();
+ cameraView.repaint();
+ return;
+ // } else if (event.getSource() == textureButton)
+ // {
+ // return; // true;
+ }
else
{
//return super.action(event, arg);
@@ -3068,7 +3284,6 @@
}
boolean useclient = false;
- cRadio radio;
void ToggleRoot()
{
@@ -3120,6 +3335,28 @@
refreshContents();
}
+ void TransformChildren()
+ {
+ Object3D obj;
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
+ {
+ obj = (Object3D)e.nextElement();
+ obj.KeepTextureMatrices();
+ obj.TransformChildren();
+ obj.RestoreTextureMatrices();
+
+// if (obj.parent == null)
+// {
+// System.out.println("NULL PARENT!");
+// new Exception().printStackTrace();
+// }
+// else
+// TouchTransform(obj);
+// //obj.parent.Touch();
+ }
+
+ refreshContents();
+ }
void ResetTransform()
{
@@ -3232,7 +3469,7 @@
refreshContents();
}
- void ResetCentroid()
+ void ResetCentroid(boolean full)
{
Object3D obj;
for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
@@ -3247,12 +3484,16 @@
LA.matIdentity(Object3D.mat);
obj.getBounds(minima, maxima, false);
Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
+ if (full)
+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
obj.TransformMesh(Object3D.mat);
+
Object3D.mat[3][0] = (minima.x + maxima.x)/2;
- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
+ if (full)
+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
Object3D.mat[3][2] = (minima.z + maxima.z)/2;
+
LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
//Object3D.mat[3][0] = -Object3D.mat[3][0];
//Object3D.mat[3][1] = -Object3D.mat[3][1];
@@ -3281,7 +3522,8 @@
int size = obj.MemorySize();
- System.err.println((size/1024) + " KB is the size of " + obj);
+ //System.err.println((size/1024) + " KB is the size of " + obj);
+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
}
}
catch (Exception e)
@@ -3318,9 +3560,9 @@
obj = (Object3D)e.nextElement();
System.out.println("Object is: " + obj);
- GrafreeD.AnalyzeObject(obj);
+ Grafreed.AnalyzeObject(obj);
System.out.println("Boundary rep: " + obj.bRep);
- GrafreeD.AnalyzeObject(obj.bRep);
+ Grafreed.AnalyzeObject(obj.bRep);
// System.err.println((size/1024) + " KB is the size of " + obj);
}
@@ -3362,6 +3604,13 @@
void GenNormals(boolean crease)
{
group.GenNormalsS(crease);
+
+ refreshContents();
+ }
+
+ void GenNormalsMESH()
+ {
+ group.GenNormalsMeshS();
refreshContents();
}
@@ -3534,8 +3783,8 @@
void ParseVertices()
{
- boolean epsequal = GrafreeD.epsequal;
- GrafreeD.epsequal = true;
+ boolean epsequal = Grafreed.epsequal;
+ Grafreed.epsequal = true;
for (int i=0; i<group.selection.size(); i++)
{
@@ -3560,7 +3809,7 @@
LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
- g.add(GrafreeD.clipboard);
+ g.add(Grafreed.clipboard);
buffer.add(g);
}
@@ -3575,7 +3824,7 @@
makeSomething(buffer, i==group.selection.size()-1);
}
- GrafreeD.epsequal = epsequal;
+ Grafreed.epsequal = epsequal;
refreshContents();
}
@@ -3593,7 +3842,16 @@
String pigment = Object3D.GetPigment(tex);
//String bump = Object3D.GetBump(tex);
- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
+ com.sun.opengl.util.texture.TextureData texturedata = null;
+
+ try
+ {
+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
+ }
+ catch (Exception e)
+ {
+ System.err.println("FAIL: " + node);
+ }
double s = v.s;
@@ -3725,7 +3983,7 @@
return;
Object3D poses = group.selection.get(0);
- Object3D ref = GrafreeD.clipboard.get(0);
+ Object3D ref = Grafreed.clipboard.get(0);
Object3D newgroup = new Object3D("Po:" + poses.name);
@@ -3919,9 +4177,9 @@
void ClipMesh()
{
- if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
{
- Object3D content = GrafreeD.clipboard.get(0);
+ Object3D content = Grafreed.clipboard.get(0);
if (content instanceof cGroup && ((cGroup)content).transientlink )
content = ((cGroup)content).get(0);
@@ -3930,7 +4188,7 @@
// {
// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
// }
- group.selection.ClipMesh(GrafreeD.clipboard);
+ group.selection.ClipMesh(Grafreed.clipboard);
}
// group.selection.ClipMesh(GrafreeD.clipboard);
System.out.println("DONE.");
@@ -3977,6 +4235,18 @@
void MarkLeaves(boolean hide)
{
group.selection.MarkLeaves(hide);
+ refreshContents();
+ }
+
+ void RewindLeaves(boolean hide)
+ {
+ group.selection.RewindLeaves(hide);
+ refreshContents();
+ }
+
+ void RandomLeaves(boolean hide)
+ {
+ group.selection.RandomLeaves(hide);
refreshContents();
}
@@ -4065,7 +4335,7 @@
objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
Object3D elem = (Object3D)group.selection.elementAt(i);
- if(elem != group)
+ if(elem != group || !newWindow)
{
// if (!(elem instanceof Composite))
// newWindow = false;
@@ -4155,7 +4425,6 @@
//case 702: // Event.LIST_DESELECT
group.deselectAll();
TreePath tps[] = objEditor.jTree.getSelectionPaths();
- objEditor.ClearInfo(); // .GetMaterial());
if (tps != null)
{
for (int i=0; i < tps.length; i++)
@@ -4164,10 +4433,8 @@
//if (child.parent != null)
//child.parent.addSelectee(child);
+ objEditor.SetMaterial(child);
group.addSelectee(child);
- objEditor.SetMaterial(child); // .GetMaterial());
- objEditor.AddInfo(child, this, true); // .GetMaterial());
- System.err.println("info : " + child.GetPath());
}
}
// else
@@ -4177,16 +4444,17 @@
// System.err.println("info : " + group.GetPath());
// }
- objEditor.SetText(); // jan 2014
-
- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
CameraPane.flash = true;
- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
// a camera
{
- CameraPane.camerachangeframe = 0; // don't refuse it
- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
+ {
+ CameraPane.camerachangeframe = 0; // don't refuse it
+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
+ }
// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
}
@@ -4199,6 +4467,26 @@
freezemodel = false;
}
+
+ void refreshContents(boolean cp)
+ {
+ if (!Globals.MOUSEDRAGGED)
+ {
+ objEditor.ClearInfo(); // .GetMaterial());
+
+ for (int i=0; i < group.selection.Size(); i++)
+ {
+ Object3D child = (Object3D) group.selection.get(i);
+
+ objEditor.AddInfo(child, this, true);
+ System.err.println("info : " + child.GetPath());
+ }
+
+ objEditor.SetText(); // jan 2014
+ }
+
+ super.refreshContents(cp);
+ }
void linkSomething(Object3D thing)
{
@@ -4270,16 +4558,18 @@
{
if (group.selection.isEmpty())
return;
- GrafreeD.clipboardIsTempGroup = false;
+
+ Grafreed.clipboardIsTempGroup = false;
Composite tGroup = null;
if (group.selection.size() > 0) // 1)
{
tGroup = new cGroup();
- GrafreeD.clipboardIsTempGroup = true;
+ Grafreed.clipboardIsTempGroup = true;
}
if (cut)
{
+ Save();
//int indices[] = jList.getSelectedIndices();
//for (int i = indices.length - 1; i >= 0; i--)
//jList.remove(indices[i]);
@@ -4315,16 +4605,16 @@
//System.out.println("cut " + child);
//System.out.println("parent = " + child.parent);
// tmp.addChild(child);
- if (GrafreeD.clipboardIsTempGroup)
+ if (Grafreed.clipboardIsTempGroup)
tGroup.add/*Child*/(tmp);
else
- GrafreeD.clipboard = tmp;
+ Grafreed.clipboard = tmp;
}
else
- if (GrafreeD.clipboardIsTempGroup)
+ if (Grafreed.clipboardIsTempGroup)
tGroup.add/*Child*/(child);
else
- GrafreeD.clipboard = child;
+ Grafreed.clipboard = child;
}
//ResetModel();
@@ -4356,21 +4646,23 @@
//System.out.println("cut " + elem);
//System.out.println("parent = " + elem.parent);
// tmp.addChild(elem);
- if (GrafreeD.clipboardIsTempGroup)
+ if (Grafreed.clipboardIsTempGroup)
tGroup.add/*Child*/(tmp);
else
- GrafreeD.clipboard = tmp;
+ Grafreed.clipboard = tmp;
}
else
- if (GrafreeD.clipboardIsTempGroup)
+ if (Grafreed.clipboardIsTempGroup)
tGroup.add/*Child*/(child);
else
- GrafreeD.clipboard = child;
+ Grafreed.clipboard = child;
}
}
- if (GrafreeD.clipboardIsTempGroup)
- GrafreeD.clipboard = tGroup;
+
+ if (Grafreed.clipboardIsTempGroup)
+ Grafreed.clipboard = tGroup;
+
if (cut)
{
ResetModel();
@@ -4384,7 +4676,7 @@
// return;
boolean first = true;
- if (GrafreeD.clipboardIsTempGroup)
+ if (Grafreed.clipboardIsTempGroup)
{
Composite temp;
@@ -4395,7 +4687,7 @@
temp = (Composite)Applet3D.clipboard.deepCopy();
*/
Object3D elem;
- for (Enumeration e = /*temp.children*/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
+ for (Enumeration e = /*temp.children*/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
{
Object3D child = (Object3D)e.nextElement();
@@ -4429,14 +4721,14 @@
//Object3D cb = Applet3D.clipboard;
//temp.addChild(cb);
//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
- assert(GrafreeD.clipboard.parent == null);
- Object3D /*Composite*/ keepparent = GrafreeD.clipboard.get(0).parent;
- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
- if (LA.isIdentity(GrafreeD.clipboard.toParent))
- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
+ assert(Grafreed.clipboard.parent == null);
+ Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
+ if (LA.isIdentity(Grafreed.clipboard.toParent))
+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
else
- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
- GrafreeD.clipboard.get(0).parent = keepparent;
+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
+ Grafreed.clipboard.get(0).parent = keepparent;
}
ResetModel();
@@ -4485,9 +4777,9 @@
{
boolean first = true;
- if (GrafreeD.clipboardIsTempGroup)
+ if (Grafreed.clipboardIsTempGroup)
{
- Composite temp = (Composite)GrafreeD.clipboard;
+ Composite temp = (Composite)Grafreed.clipboard;
Object3D copy;
for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
{
@@ -4497,7 +4789,7 @@
}
} else
{
- linkSomething(GrafreeD.clipboard); //.get(0));
+ linkSomething(Grafreed.clipboard); //.get(0));
}
}
}
@@ -4902,21 +5194,6 @@
}
*/
- void ImportGFD()
- {
- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
- browser.show();
- String filename = browser.getFile();
- if (filename != null && filename.length() > 0)
- {
- String fullname = browser.getDirectory() + filename;
-
- //Object3D readobj =
- objEditor.ReadGFD(fullname, objEditor);
- //makeSomething(readobj);
- }
- }
-
/*
public void Callback(Object obj)
{
@@ -4940,26 +5217,9 @@
}
*/
- void ImportVRMLX3D()
- {
- if (GrafreeD.standAlone)
- {
- /**/
- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
- browser.show();
- String filename = browser.getFile();
- if (filename != null && filename.length() > 0)
- {
- String fullname = browser.getDirectory() + filename;
- LoadVRMLX3D(fullname);
- }
- /**/
- }
- }
-
String GetFile(String dialogName)
{
- if (GrafreeD.standAlone)
+ if (Grafreed.standAlone)
{
FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
browser.show();
@@ -5027,6 +5287,12 @@
cButton clearpanelButton;
cButton unselectButton;
+ cButton minButton;
+ cButton maxButton;
+ cButton fullButton;
+ cButton undoButton;
+ cButton redoButton;
+ cButton saveButton;
cButton oneStepButton;
cButton screenfitButton;
@@ -5040,14 +5306,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 !!
@@ -5059,6 +5317,8 @@
private MenuItem lookFromItem;
private MenuItem switchItem;
private MenuItem cutItem;
+ private MenuItem undoItem;
+ private MenuItem redoItem;
private MenuItem duplicateItem;
private MenuItem cloneItem;
private MenuItem cloneSupportItem;
@@ -5072,7 +5332,7 @@
private MenuItem linkverticesItem;
private MenuItem relinkverticesItem;
private MenuItem setMasterItem;
- private MenuItem resetMeshItem;
+ private MenuItem resetAllItem;
private MenuItem stepAllItem;
private MenuItem revertMeshItem;
private MenuItem poseMeshItem;
@@ -5122,6 +5382,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;
@@ -5133,8 +5397,10 @@
private MenuItem panoTexturesItem;
private MenuItem resetCentroidItem;
- private MenuItem transformgeometryItem;
+ private MenuItem resetCentroidXZItem;
private MenuItem resetTransformItem;
+ private MenuItem transformGeometryItem;
+ private MenuItem transformChildrenItem;
private MenuItem hideItem;
private MenuItem grabItem;
private MenuItem backItem;
@@ -5203,11 +5469,6 @@
private MenuItem doubleItem;
private MenuItem tripleItem;
- private MenuItem importGFDItem;
- private MenuItem importVRMLX3DItem;
- private MenuItem import3DSItem;
- private MenuItem importOBJItem;
-
private MenuItem computeAOItem;
private MenuItem recompileItem;
private MenuItem editScriptItem;
@@ -5217,4 +5478,8 @@
private MenuItem analyzeItem;
private MenuItem dumpItem;
//boolean freezemodel = false;
+
+ Menu cameraMenu;
+ MenuItem editCameraItem;
+ MenuItem revertCameraItem;
}
--
Gitblit v1.6.2