From 77633b188d01228383ced79c26b41ebb2989624c Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sun, 07 Jul 2019 10:19:34 -0400
Subject: [PATCH] New 3ds loader.
---
GroupEditor.java | 95 ++++++++++++++++++++++++++++++-----------------
1 files changed, 60 insertions(+), 35 deletions(-)
diff --git a/GroupEditor.java b/GroupEditor.java
index aa482be..84ed69e 100644
--- a/GroupEditor.java
+++ b/GroupEditor.java
@@ -220,7 +220,7 @@
// toggleSwitchItem.addItemListener(this);
// toggleSwitchItem.setState(CameraPane.SWITCH);
- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
toggleHandleItem.addItemListener(this);
toggleHandleItem.setState(CameraPane.HANDLES);
@@ -380,6 +380,7 @@
shadowYItem.addActionListener(this);
shadowZItem = menu.add(new MenuItem("Shadow Blue"));
shadowZItem.addActionListener(this);
+
if (Globals.ADVANCED)
{
menu.add("-");
@@ -582,7 +583,7 @@
*/
cGridBag copyOptionsPanel = new cGridBag();
- copyOptionsPanel.preferredHeight = 2;
+ copyOptionsPanel.preferredHeight = 1;
//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
@@ -590,14 +591,21 @@
//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);
+ 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(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
fullButton.setToolTipText("Full-screen window");
fullButton.addActionListener(this);
+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ screenfitButton.setToolTipText("Screen fit");
+ screenfitButton.addActionListener(this);
+
oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
restoreCameraButton.setToolTipText("Restore viewpoint");
restoreCameraButton.addActionListener(this);
@@ -630,10 +638,6 @@
//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);
@@ -726,7 +730,7 @@
compositeButton.addActionListener(this);
oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
- switchButton.setToolTipText("Create switch");
+ switchButton.setToolTipText("Create item switcher");
switchButton.addActionListener(this);
oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
@@ -863,9 +867,13 @@
if (true) // Globals.ADVANCED)
{
- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
- supportCB.setToolTipText("Enable rigging");
- supportCB.addItemListener(this);
+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
+// supportCB.setToolTipText("Enable rigging");
+// supportCB.addItemListener(this);
+
+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
+ freezeCB.setToolTipText("Fast moving camera");
+ freezeCB.addItemListener(this);
// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
// localCB.addItemListener(this);
@@ -929,7 +937,7 @@
toggleTextureCB.addItemListener(this);
panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
- toggleSwitchCB.setToolTipText("Use switch");
+ toggleSwitchCB.setToolTipText("Choose a single item");
toggleSwitchCB.addItemListener(this);
panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
@@ -1000,6 +1008,7 @@
cCheckBox slowCB;
cCheckBox boxCB;
cCheckBox zoomBoxCB;
+ cCheckBox freezeCB;
//cToggleButton trackCB;
cCheckBox trackCB;
cCheckBox smoothfocusCB;
@@ -1118,6 +1127,10 @@
{
Globals.COMPUTESHADOWWHENLIVE ^= true;
}
+ else if(e.getSource() == freezeCB)
+ {
+ Globals.FREEZEONMOVE ^= true;
+ }
else if(e.getSource() == autosaveCB)
{
Globals.SAVEONMAKE ^= true;
@@ -1202,8 +1215,6 @@
}
}
- String string = (String) object;
-
System.out.println("Transfer = " + object + "; drop : " + target);
// if( object instanceof java.io.File[])
// {
@@ -1211,6 +1222,8 @@
// objEditor.DropFile((java.io.File[]) object, true);
// return;
// }
+
+ String string = (String) object;
// File path for Mac and Windows
if (string.charAt(0) == '/' || string.charAt(1) == ':')
@@ -1459,6 +1472,9 @@
menu.add(animationItem = new CheckboxMenuItem("Animation..."));
animationItem.addItemListener(this);
animationItem.setState(Globals.ANIMATION);
+
+ menu.add(archiveItem = new MenuItem("Archive3D..."));
+ archiveItem.addActionListener(this);
menu.add("-");
parseverticesItem = menu.add(new MenuItem("Multiplicity"));
@@ -2122,25 +2138,25 @@
Composite csg = new GroupLeaf();
csg.count = 5;
group(csg);
- Composite child = new cGroup();
+ Composite child = new cGroup("Branch");
csg.addChild(child);
child.addChild(csg);
} else
if (source == doubleItem)
{
- Composite csg = new GroupLeaf();
+ Composite csg = new GroupLeaf("Fork");
csg.count = 5;
group(csg);
- Composite child = new cGroup();
+ Composite child = new cGroup("Branch A");
csg.addChild(child);
child.addChild(csg);
- child = new cGroup();
+ child = new cGroup("Branch B");
csg.addChild(child);
child.addChild(csg);
} else
if (source == tripleItem)
{
- Composite csg = new GroupLeaf();
+ Composite csg = new GroupLeaf("Trident");
csg.count = 4;
group(csg);
Composite child = new cGroup();
@@ -2204,7 +2220,8 @@
} else
if (source == undoButton)
{
- Undo();
+ if (!Undo())
+ java.awt.Toolkit.getDefaultToolkit().beep();
} else
if (source == redoButton)
{
@@ -2212,7 +2229,8 @@
} else
if (source == saveButton)
{
- Save();
+ if (!Save(true))
+ java.awt.Toolkit.getDefaultToolkit().beep();
} else
if (source == oneStepButton)
{
@@ -2221,17 +2239,14 @@
} else
if (source == screenfitButton)
{
- //Reload(lastConverter, lastFilename, true);
ScreenFit();
} else
if (source == screenfitpointButton)
{
- //Reload(lastConverter, lastFilename, true);
ScreenFitPoint();
} else
if (source == snapobjectButton)
{
- //Reload(lastConverter, lastFilename, true);
SnapObject();
} else
// if (event.getSource() == recompileButton)
@@ -2755,15 +2770,28 @@
} else
if (source == ungroupItem || source == ungroupButton)
{
- //ungroup();
+ boolean hasRoot = false;
+
for (int i=0; i<group.selection.size(); i++)
{
- Ungroup(group.selection.get(i));
+ if (group.selection.get(i) == group)
+ {
+ hasRoot = true;
+ break;
+ }
}
- ClearSelection(false);
-
- refreshContents();
+ if (!hasRoot)
+ {
+ for (int i=0; i<group.selection.size(); i++)
+ {
+ Ungroup(group.selection.get(i));
+ }
+
+ ClearSelection(false);
+
+ refreshContents();
+ }
} else
if (source == genUVItem)
{
@@ -4706,7 +4734,7 @@
void refreshContents(boolean cp)
{
if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
- if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
{
objEditor.ClearInfo(); // .GetMaterial());
@@ -5526,9 +5554,6 @@
cButton restoreCameraButton;
- cButton minButton;
- cButton maxButton;
- cButton fullButton;
cButton saveButton;
cButton oneStepButton;
--
Gitblit v1.6.2