From 1807e7752960ac229cddd34b100e92cadbac9459 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Wed, 26 Jun 2019 21:39:11 -0400
Subject: [PATCH] Fix perfo Venice (shadow).
---
ObjEditor.java | 152 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 131 insertions(+), 21 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index a1683f8..559d8de 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -15,6 +15,9 @@
//import javax.swing.plaf.ColorUIResource;
//import javax.swing.plaf.metal.DefaultMetalTheme;
+import javax.swing.plaf.basic.BasicSplitPaneDivider;
+import javax.swing.plaf.basic.BasicSplitPaneUI;
+
//import javax.media.opengl.GLCanvas;
import //weka.core.
@@ -49,6 +52,19 @@
catch (Exception e)
{
return new cButton(name, border);
+ }
+ }
+
+ cToggleButton GetToggleButton(String name, boolean border)
+ {
+ try
+ {
+ ImageIcon icon = GetIcon(name);
+ return new cToggleButton(icon, border);
+ }
+ catch (Exception e)
+ {
+ return new cToggleButton(name, border);
}
}
@@ -194,7 +210,7 @@
objEditor.ctrlPanel.remove(namePanel);
- if (!GroupEditor.allparams)
+ if (!allparams)
return;
// objEditor.ctrlPanel.remove(liveCB);
@@ -324,6 +340,11 @@
return frame.action(event, obj);
}
+ // Cannot work without static
+ static boolean allparams = true;
+
+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
+
void SetupMenu()
{
frame.setMenuBar(menuBar = new MenuBar());
@@ -370,6 +391,32 @@
closeItem.addActionListener(this);
objectPanel = new JTabbedPane();
+
+ ChangeListener changeListener = new ChangeListener()
+ {
+ public void stateChanged(ChangeEvent changeEvent)
+ {
+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
+// {
+// if (latestObject != null)
+// {
+// refreshContents(true);
+// SetMaterial(latestObject);
+// }
+//
+// materialFlushed = true;
+// }
+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
+// {
+// if (listUI.size() == 0)
+// EditSelection(false);
+// }
+
+ refreshContents(false); // To refresh Info tab
+ }
+ };
+ objectPanel.addChangeListener(changeListener);
+
toolbarPanel = new JPanel();
toolbarPanel.setName("Toolbar");
treePanel = new cGridBag();
@@ -384,9 +431,12 @@
editPanel.add(editCommandsPanel);
editPanel.add(ctrlPanel);
- materialPanel = new cGridBag().setVertical(true);
+ toolboxPanel = new cGridBag().setVertical(false);
+ toolboxPanel.setName("Toolbox");
+ materialPanel = new cGridBag().setVertical(true);
materialPanel.setName("Material");
+
/*JTextPane*/
infoarea = createTextPane();
doc = infoarea.getStyledDocument();
@@ -411,7 +461,14 @@
mainPanel.setDividerSize(9);
mainPanel.setDividerLocation(0.5); //1.0);
mainPanel.setResizeWeight(0.5);
-
+
+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
+ divider.setDividerSize(15);
+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
+
+ mainPanel.setUI(new BasicSplitPaneUI());
+
//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
//mainPanel.setLayout(new GridBagLayout());
toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
@@ -659,6 +716,8 @@
boolean maximized;
+ cButton fullscreenLayout;
+
void Minimize()
{
frame.setState(Frame.ICONIFIED);
@@ -684,7 +743,9 @@
void ToggleFullScreen()
{
- if (CameraPane.FULLSCREEN)
+ cameraView.ToggleFullScreen();
+
+ if (!CameraPane.FULLSCREEN)
{
device.setFullScreenWindow(null);
//frame.setVisible(false);
@@ -720,12 +781,10 @@
// X frame.getContentPane().add(/*"Center",*/bigThree);
framePanel.setDividerLocation(0);
- radio.layout = twoButton;
+ radio.layout = fullscreenLayout;
radio.layout.doClick();
//frame.setVisible(true);
}
-
- cameraView.ToggleFullScreen();
}
private JTextPane createTextPane()
@@ -866,7 +925,12 @@
JCheckBox speedupCB;
JCheckBox rewindCB;
JCheckBox flipVCB;
+
+ cCheckBox toggleTextureCB;
+ cCheckBox toggleSwitchCB;
+
JComboBox texresMenu;
+
JButton resetButton;
JButton stepButton;
JButton stepAllButton;
@@ -1058,7 +1122,7 @@
oe.ctrlPanel.Return();
- if (!GroupEditor.allparams)
+ if (!allparams)
return;
setupPanel = new cGridBag().setVertical(false);
@@ -1071,7 +1135,7 @@
hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
hideCB.setToolTipText("Hide object");
markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
- markCB.setToolTipText("Set the animation target transform");
+ markCB.setToolTipText("As animation target transform");
setupPanel2 = new cGridBag().setVertical(false);
@@ -1079,7 +1143,7 @@
rewindCB.setToolTipText("Rewind animation");
randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
if (Globals.ADVANCED)
{
@@ -1401,6 +1465,7 @@
// objectPanel.add(north);
objectPanel.add(editPanel);
objectPanel.add(infoPanel);
+ objectPanel.add(toolboxPanel);
/*
aConstraints.gridx = 0;
@@ -1409,7 +1474,7 @@
aConstraints.gridy += 1;
aConstraints.gridwidth = 1;
mainPanel.add(objectPanel, aConstraints);
- */
+ */
scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
VERTICAL_SCROLLBAR_AS_NEEDED,
@@ -1426,9 +1491,7 @@
JTabbedPane tabbedPane = new JTabbedPane();
tabbedPane.add(scrollpane);
- tabbedPane.add(FSPane = new cFileSystemPane(this));
-
- optionsPanel = new cGridBag().setVertical(true);
+ optionsPanel = new cGridBag().setVertical(false);
optionsPanel.setName("Options");
@@ -1436,6 +1499,8 @@
tabbedPane.add(optionsPanel);
+ tabbedPane.add(FSPane = new cFileSystemPane(this));
+
scenePanel.add(tabbedPane);
/*
@@ -1528,6 +1593,8 @@
// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
frame.setSize(1280, 860);
+
+ frame.validate();
frame.setVisible(true);
cameraView.requestFocusInWindow();
@@ -2847,6 +2914,8 @@
void SetMaterial(Object3D object)
{
+ latestObject = object;
+
cMaterial mat = object.material;
if (mat == null)
@@ -2958,12 +3027,17 @@
// }
/**/
- if (deselect)
+ if (deselect || child == null)
{
//group.deselectAll();
//freeze = true;
GetTree().clearSelection();
//freeze = false;
+
+ if (child == null)
+ {
+ return;
+ }
}
//group.addSelectee(child);
@@ -3032,7 +3106,7 @@
cameraView.ToggleDL();
cameraView.repaint();
return;
- } else if (event.getSource() == toggleTextureItem)
+ } else if (event.getSource() == toggleTextureItem || event.getSource() == toggleTextureCB)
{
cameraView.ToggleTexture();
// june 2013 copy.HardTouch();
@@ -3071,7 +3145,7 @@
frame.validate();
return;
- } else if (event.getSource() == toggleSwitchItem)
+ } else if (event.getSource() == toggleSwitchItem || event.getSource() == toggleSwitchCB)
{
cameraView.ToggleSwitch();
cameraView.repaint();
@@ -3478,6 +3552,8 @@
tab.graphs[i] = null;
}
+ SetUndoStates();
+
// test save
if (false)
{
@@ -3500,6 +3576,8 @@
void CopyChanged(Object3D obj)
{
+ SetUndoStates();
+
boolean temp = CameraPane.SWITCH;
CameraPane.SWITCH = false;
@@ -3537,6 +3615,17 @@
}
refreshContents();
+ }
+
+ cButton undoButton;
+ cButton redoButton;
+
+ void SetUndoStates()
+ {
+ cRadio tab = GetCurrentTab();
+
+ undoButton.setEnabled(tab.undoindex > 0);
+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
}
public void Undo()
@@ -3726,7 +3815,7 @@
assert false;
}
- void EditSelection()
+ void EditSelection(boolean newWindow)
{
}
@@ -4221,7 +4310,7 @@
void makeSomething(Object3D thing, boolean resetmodel) // deselect)
{
- if (Globals.SAVEONMAKE)
+ if (Globals.SAVEONMAKE) // && resetmodel)
Save();
//Tween.set(thing, 0).target(1).start(tweenManager);
//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
@@ -4309,6 +4398,12 @@
{
ResetModel();
Select(thing.GetTreePath(), true, false); // unselect... false);
+
+ if (thing.Size() == 0)
+ {
+ //EditSelection(false);
+ }
+
refreshContents();
}
@@ -4710,6 +4805,8 @@
String filename = browser.getFile();
if (filename != null && filename.length() > 0)
{
+ if (!filename.endsWith(".gfd"))
+ filename += ".gfd";
lastname = browser.getDirectory() + filename;
save();
}
@@ -4903,18 +5000,31 @@
CheckboxMenuItem togglePaintItem;
JSplitPane mainPanel;
JScrollPane scrollpane;
+
JPanel toolbarPanel;
+
cGridBag treePanel;
+
JPanel radioPanel;
ButtonGroup buttonGroup;
- cGridBag ctrlPanel;
+
+ cGridBag toolboxPanel;
cGridBag materialPanel;
+ cGridBag ctrlPanel;
+
JScrollPane infoPanel;
+
cGridBag optionsPanel;
+
JTabbedPane objectPanel;
+ boolean materialFlushed;
+ Object3D latestObject;
+
cGridBag XYZPanel;
+
JSplitPane gridPanel;
JSplitPane bigPanel;
+
cGridBag bigThree;
cGridBag scenePanel;
cGridBag centralPanel;
@@ -5029,7 +5139,7 @@
cNumberSlider fogField;
JLabel opacityPowerLabel;
cNumberSlider opacityPowerField;
- JTree jTree;
+ cTree jTree;
//ObjectUI parent;
cNumberSlider normalpushField;
--
Gitblit v1.6.2