From 64e20f390e4b8e58bd0006dde8fa10fba1dac1d5 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Fri, 16 Aug 2019 13:25:19 -0400
Subject: [PATCH] Fix box and VR keys.
---
ObjEditor.java | 349 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 263 insertions(+), 86 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index c2efc4b..8e35dec 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -34,6 +34,7 @@
iSendInfo
//KeyListener
{
+ public cToggleButton pinButton;
boolean timeline;
boolean wasFullScreen;
@@ -41,6 +42,35 @@
JFrame frame;
static ObjEditor theFrame;
+
+ public void AllocProjectedVertices(Object3D object)
+ {
+ assert (object.projectedVertices != null);
+
+ if (object.projectedVertices.length <= 2)
+ {
+ // Side effect...
+ Object3D.cVector2[] keep = object.projectedVertices;
+ object.projectedVertices = new Object3D.cVector2[3];
+ for (int i = 0; i < 3; i++)
+ {
+ if (i < keep.length)
+ {
+ object.projectedVertices[i] = keep[i];
+ } else
+ {
+ object.projectedVertices[i] = new Object3D.cVector2();
+ }
+ /*
+ if(keep.length == 0)
+ object.projectedVertices[0] = new Object3D.cVector2();
+ else
+ object.projectedVertices[0] = keep[0];
+ object.projectedVertices[1] = new Object3D.cVector2();
+ */
+ }
+ }
+ }
public cGridBag GetSeparator()
{
@@ -74,8 +104,16 @@
return new cCheckBox(icon, border);
}
+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
+
ImageIcon GetIcon(String name)
{
+ javax.swing.ImageIcon iconCache = icons.get(name);
+ if (iconCache != null)
+ {
+ return iconCache;
+ }
+
try
{
BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
@@ -93,10 +131,14 @@
// }
javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
+
+ icons.put(name, icon);
+
return icon;
}
catch (Exception e)
{
+ //icons.put(name, null);
return null;
}
}
@@ -296,11 +338,13 @@
client = inClient;
copy = client;
- if (copy.versionlist == null)
- {
- copy.versionlist = new Object3D[100];
- copy.versionindex = -1;
- }
+// if (copy.versionlist == null)
+// {
+// copy.versionlist = new Object3D[100];
+// copy.versionindex = -1;
+//
+// callee.Save(true);
+// }
// "this" is not called: SetupUI2(objEditor);
}
@@ -319,6 +363,8 @@
{
copy.versionlist = new Object3D[100];
copy.versionindex = -1;
+
+// Save(true);
}
SetupUI2(callee.GetEditor());
@@ -342,7 +388,8 @@
//parent = p;
GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
+ if (Globals.DEBUG)
+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
//gd.setFullScreenWindow(this);
//setResizable(false);
//if (!isDisplayable())
@@ -353,11 +400,13 @@
copy = localCopy;
copy.editWindow = this;
- if (copy.versionlist == null)
- {
-// copy.versions = new byte[100][];
+// if (copy.versionlist == null)
+// {
+// copy.versionlist = new Object3D[100];
// copy.versionindex = -1;
- }
+//
+// Save(true);
+// }
SetupMenu();
@@ -426,6 +475,8 @@
ChangeListener changeListener = new ChangeListener()
{
+ //String name;
+
public void stateChanged(ChangeEvent changeEvent)
{
// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
@@ -444,7 +495,37 @@
// EditSelection(false);
// }
- refreshContents(false); // To refresh Info tab
+// if (objectPanel.getSelectedIndex() == 4)
+// {
+// name = copy.skyboxname;
+//
+// if (name == null)
+// {
+// name = "";
+// }
+//
+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
+// copy.skyboxext = "jpg";
+// }
+// else
+// {
+// if (name != null)
+// {
+// if (name.equals(""))
+// {
+// copy.skyboxname = null;
+// copy.skyboxext = null;
+// }
+// else
+// {
+// copy.skyboxname = name;
+// }
+// }
+// }
+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
+
+// refreshContents(false); // To refresh Info tab
+ cameraView.repaint();
}
};
objectPanel.addChangeListener(changeListener);
@@ -466,6 +547,8 @@
toolboxPanel = new cGridBag().setVertical(true);
//toolboxPanel.setName("Toolbox");
+
+ skyboxPanel = new cGridBag().setVertical(true);
materialPanel = new cGridBag().setVertical(false);
//materialPanel.setName("Material");
@@ -751,6 +834,7 @@
boolean maximized;
cButton fullscreenLayout;
+ cButton expandedLayout;
void Minimize()
{
@@ -790,10 +874,12 @@
cButton minButton;
cButton maxButton;
cButton fullButton;
+ cButton collapseButton;
+ cButton maximize3DButton;
void ToggleFullScreen()
{
-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
cameraView.ToggleFullScreen();
@@ -814,13 +900,13 @@
// X frame.getContentPane().remove(/*"Center",*/bigThree);
// X framePanel.add(bigThree);
// X frame.getContentPane().add(/*"Center",*/framePanel);
- framePanel.setDividerLocation(46);
+// framePanel.setDividerLocation(46); // icons are 24x24
//frame.setVisible(true);
- radio.layout = keepButton;
+// radio.layout = keepButton;
//theFrame = null;
keepButton = null;
- radio.layout.doClick();
+// radio.layout.doClick();
} else
{
@@ -841,10 +927,10 @@
// X frame.getContentPane().remove(/*"Center",*/framePanel);
// X framePanel.remove(bigThree);
// X frame.getContentPane().add(/*"Center",*/bigThree);
- framePanel.setDividerLocation(0);
+// framePanel.setDividerLocation(0);
- radio.layout = fullscreenLayout;
- radio.layout.doClick();
+// radio.layout = fullscreenLayout;
+// radio.layout.doClick();
//frame.setVisible(true);
}
frame.validate();
@@ -852,23 +938,31 @@
cameraView.requestFocusInWindow();
}
- private Object3D CompressCopy()
+ void CollapseToolbar()
+ {
+ framePanel.setDividerLocation(0);
+ //frame.validate();
+
+ cameraView.requestFocusInWindow();
+ }
+
+ private Object3D Duplicate(Object3D object)
{
boolean temp = CameraPane.SWITCH;
CameraPane.SWITCH = false;
- copy.ExtractBigData(versiontable);
+ object.ExtractBigData(versiontable);
// if (copy == client)
- Object3D versions[] = copy.versionlist;
- copy.versionlist = null;
+ Object3D versions[] = object.versionlist;
+ object.versionlist = null;
//byte[] compress = Compress(copy);
- Object3D compress = (Object3D)Grafreed.clone(copy);
+ Object3D compress = (Object3D)Grafreed.clone(object);
- copy.versionlist = versions;
+ object.versionlist = versions;
- copy.RestoreBigData(versiontable);
+ object.RestoreBigData(versiontable);
CameraPane.SWITCH = temp;
@@ -1205,6 +1299,18 @@
namePanel = new cGridBag();
+ //if (copy.pinned)
+ {
+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
+ pinButton.setSelected(copy.pinned);
+ cGridBag t = new cGridBag();
+ t.preferredWidth = 2;
+ t.add(pinButton);
+ namePanel.add(t);
+
+ pinButton.addItemListener(this);
+ }
+
nameField = AddText(namePanel, copy.GetName());
namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
oe.ctrlPanel.add(namePanel);
@@ -1218,14 +1324,14 @@
liveCB = AddCheckBox(setupPanel, "Live", copy.live);
liveCB.setToolTipText("Animate object");
+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
+ markCB.setToolTipText("Set target transform");
selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
selectableCB.setToolTipText("Make object selectable");
// Return();
hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
hideCB.setToolTipText("Hide object");
- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
- markCB.setToolTipText("As animation target transform");
ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
@@ -1427,6 +1533,7 @@
if (cam == null || !(copy.get(0) instanceof cGroup))
{
+ if (Globals.DEBUG)
System.out.println("CREATE CAMERAS");
cams = new cTemplate();
cams.name = "Cameras";
@@ -1558,20 +1665,19 @@
objectPanel.add(toolboxPanel);
objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
- objectPanel.setToolTipTextAt(1, "Objects & backgrounds");
+ objectPanel.setToolTipTextAt(1, "Objects & textures");
+ objectPanel.add(skyboxPanel);
+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
+ objectPanel.setToolTipTextAt(2, "Backgrounds");
+
// JPanel north = new JPanel(new BorderLayout());
// north.setName("Edit");
// north.add(ctrlPanel, BorderLayout.NORTH);
// objectPanel.add(north);
objectPanel.add(editPanel);
- objectPanel.setIconAt(2, GetIcon("icons/write.png"));
- objectPanel.setToolTipTextAt(2, "Edit controls");
-
- //if (Globals.ADVANCED)
- objectPanel.add(infoPanel);
- objectPanel.setIconAt(3, GetIcon("icons/info.png"));
- objectPanel.setToolTipTextAt(3, "Information");
+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
+ objectPanel.setToolTipTextAt(3, "Edit controls");
objectPanel.add(XYZPanel);
objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
@@ -1613,6 +1719,11 @@
scenePanel.add(tabbedPane);
+ //if (Globals.ADVANCED)
+// tabbedPane.add(infoPanel);
+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
+// tabbedPane.setToolTipTextAt(3, "Information");
+
/*
cTree jTree = new cTree(null);
ToolTipManager.sharedInstance().registerComponent(jTree);
@@ -1683,6 +1794,23 @@
// aConstraints.gridheight = 1;
framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
+
+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
+ new java.beans.PropertyChangeListener()
+ {
+ public void propertyChange(java.beans.PropertyChangeEvent pce)
+ {
+ if ((Integer)pce.getOldValue() == 1)
+ {
+ if (radio.layout != expandedLayout)
+ {
+ radio.layout = expandedLayout;
+ radio.layout.doClick();
+ }
+ }
+ }
+ });
+
framePanel.setContinuousLayout(false);
framePanel.setOneTouchExpandable(false);
//.setDividerLocation(0.8);
@@ -1692,7 +1820,7 @@
frame.getContentPane().setLayout(new BorderLayout());
/**/
- JTabbedPane worldPane = new JTabbedPane();
+ //JTabbedPane worldPane = new JTabbedPane();
//worldPane.add(bigPanel);
//worldPane.add(worldPanel);
/**/
@@ -2063,6 +2191,21 @@
});
presetpanel.add(bump0);
+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
+ borderShader.setToolTipText("Border fade");
+ borderShader.addMouseListener(new MouseAdapter()
+ {
+ public void mouseClicked(MouseEvent e)
+ {
+ borderfadeField.setFloat(0.5);
+ opacityField.setFloat(0.75);
+
+ materialtouched = true;
+ applySelf();
+ }
+ });
+ presetpanel.add(borderShader);
+
cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
halo.setToolTipText("Halo");
halo.addMouseListener(new MouseAdapter()
@@ -2101,6 +2244,25 @@
}
});
presetpanel.add(candle);
+
+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
+ shadowShader.setToolTipText("Shadow");
+ shadowShader.addMouseListener(new MouseAdapter()
+ {
+ public void mouseClicked(MouseEvent e)
+ {
+ diffuseField.setFloat(0.001);
+ ambientField.setFloat(0.001);
+ cameraField.setFloat(0.001);
+ specularField.setFloat(0.001);
+ fakedepthField.setFloat(0.001);
+ opacityField.setFloat(0.6);
+
+ materialtouched = true;
+ applySelf();
+ }
+ });
+ presetpanel.add(shadowShader);
cGridBag panel = new cGridBag().setVertical(true);
@@ -2151,9 +2313,20 @@
cGridBag huepanel = new cGridBag();
cGridBag huelabel = new cGridBag();
- skin = GetLabel("icons/hue.png", false);
- skin.fit = true;
- huelabel.add(skin);
+ cLabel hue = GetLabel("icons/hue.png", false);
+ hue.fit = true;
+
+ hue.addMouseListener(new MouseAdapter()
+ {
+ public void mousePressed(MouseEvent e)
+ {
+ int x = e.getX();
+
+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
+ }
+ });
+
+ huelabel.add(hue);
huelabel.preferredWidth = 20;
huepanel.add(new cGridBag()); // Label
huepanel.add(huelabel); // Field/slider
@@ -3429,32 +3602,8 @@
if (multiplyToggle != null)
multiplyToggle.setSelected(mat.multiply);
-
- assert (object.projectedVertices != null);
-
- if (object.projectedVertices.length <= 2)
- {
- // Side effect...
- Object3D.cVector2[] keep = object.projectedVertices;
- object.projectedVertices = new Object3D.cVector2[3];
- for (int i = 0; i < 3; i++)
- {
- if (i < keep.length)
- {
- object.projectedVertices[i] = keep[i];
- } else
- {
- object.projectedVertices[i] = new Object3D.cVector2();
- }
- /*
- if(keep.length == 0)
- object.projectedVertices[0] = new Object3D.cVector2();
- else
- object.projectedVertices[0] = keep[0];
- object.projectedVertices[1] = new Object3D.cVector2();
- */
- }
- }
+
+ AllocProjectedVertices(object);
SetMaterial(mat, object.projectedVertices);
}
@@ -3574,6 +3723,17 @@
public void itemStateChanged(ItemEvent event)
{
// System.out.println("Propagate = " + propagate);
+ if (event.getSource() == pinButton)
+ {
+ copy.pinned ^= true;
+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
+ {
+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
+ copy.CloseUI();
+ //copy.editWindow.refreshContents();
+ }
+ }
+ else
if (event.getSource() == propagateToggle)
{
propagate ^= true;
@@ -4046,7 +4206,7 @@
{
//Save(true);
Replace();
- SetUndoStates();
+ SetVersionStates();
}
private boolean Equal(byte[] compress, byte[] name)
@@ -4076,17 +4236,17 @@
CopyChanged();
- SetUndoStates();
+ SetVersionStates();
}
public boolean Save(boolean user)
{
System.err.println("Save");
- //Replace();
+ Replace();
- cRadio tab = GetCurrentTab();
+ //cRadio tab = GetCurrentTab();
- Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
boolean thesame = false;
@@ -4122,7 +4282,7 @@
// copy.versionlist[i] = null;
// }
- SetUndoStates();
+ SetVersionStates();
// test save
if (false)
@@ -4180,9 +4340,9 @@
void CopyChanged()
{
- Object3D obj = copy.versionlist[copy.versionindex];
+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
- SetUndoStates();
+ SetVersionStates();
boolean temp = CameraPane.SWITCH;
CameraPane.SWITCH = false;
@@ -4249,12 +4409,15 @@
return count;
}
- void SetUndoStates()
+ void SetVersionStates()
{
- cRadio tab = GetCurrentTab();
+ //if (true)
+ // return;
+
+ //cRadio tab = GetCurrentTab();
- restoreButton.setEnabled(true); // copy.versionindex != -1);
- replaceButton.setEnabled(true); // copy.versionindex != -1);
+ restoreButton.setEnabled(copy.versionindex != -1);
+ replaceButton.setEnabled(copy.versionindex != -1);
previousVersionButton.setEnabled(copy.versionindex > 0);
nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
@@ -4263,8 +4426,10 @@
copy.versionlist[copy.versionindex + 1] != null);
muteSlider = true;
+ versionSlider.setMinimum(0);
versionSlider.setMaximum(VersionCount() - 1);
versionSlider.setInteger(copy.versionindex);
+ versionSlider.setEnabled(copy.versionindex != -1);
muteSlider = false;
}
@@ -4275,7 +4440,7 @@
System.err.println("Undo");
- cRadio tab = GetCurrentTab();
+ //cRadio tab = GetCurrentTab();
if (copy.versionindex == 0)
{
@@ -4307,7 +4472,7 @@
{
System.err.println("Restore");
- cRadio tab = GetCurrentTab();
+ //cRadio tab = GetCurrentTab();
if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
{
@@ -4325,7 +4490,7 @@
{
System.err.println("Replace");
- cRadio tab = GetCurrentTab();
+ //cRadio tab = GetCurrentTab();
if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
{
@@ -4333,7 +4498,7 @@
return false;
}
- copy.versionlist[copy.versionindex] = CompressCopy();
+ copy.versionlist[copy.versionindex] = Duplicate(copy);
return true;
}
@@ -4343,7 +4508,7 @@
// Option?
Replace();
- cRadio tab = GetCurrentTab();
+ //cRadio tab = GetCurrentTab();
if (copy.versionlist[copy.versionindex + 1] == null)
{
@@ -4662,9 +4827,11 @@
if (muteSlider)
return;
+ Replace();
+
int version = versionSlider.getInteger();
- if (copy.versionlist[version] != null)
+ if (version != -1 && copy.versionlist[version] != null)
{
copy.versionindex = version;
CopyChanged();
@@ -4708,7 +4875,7 @@
//System.out.println("stateChanged = " + this);
materialtouched = true;
- if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
{
saturationField.setFloat(1);
}
@@ -5023,7 +5190,9 @@
}
if (previousVersionButton != null && copy.versionlist != null)
- SetUndoStates();
+ SetVersionStates();
+
+ cameraView.requestFocusInWindow();
}
static TweenManager tweenManager = new TweenManager();
@@ -5055,7 +5224,7 @@
// group = (Composite) group.get(0);
// }
- System.out.println("makeSomething of " + thing);
+ //System.out.println("makeSomething of " + thing);
/*
if (deselect && jList != null)
@@ -5412,8 +5581,11 @@
if (copy.versionlist == null)
{
+ // Backward compatibility
copy.versionlist = new Object3D[100];
copy.versionindex = -1;
+
+ //Save(true);
}
//? SetUndoStates();
@@ -5505,6 +5677,8 @@
void save()
{
+ Replace();
+
if (lastname == null)
{
return;
@@ -5747,6 +5921,7 @@
ButtonGroup buttonGroup;
cGridBag toolboxPanel;
+ cGridBag skyboxPanel;
cGridBag materialPanel;
cGridBag ctrlPanel;
@@ -5851,6 +6026,7 @@
cNumberSlider anisoField;
JLabel anisoVLabel;
cNumberSlider anisoVField;
+
JLabel cameraLabel;
cNumberSlider cameraField;
JLabel selfshadowLabel;
@@ -5865,6 +6041,7 @@
cNumberSlider fakedepthField;
JLabel shadowbiasLabel;
cNumberSlider shadowbiasField;
+
JLabel bumpLabel;
cNumberSlider bumpField;
JLabel noiseLabel;
--
Gitblit v1.6.2