From 29d5516687020263d3ae0454ce81879a3a450af0 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Thu, 01 Aug 2019 00:20:18 -0400
Subject: [PATCH] Min shader option.
---
ObjEditor.java | 190 ++++++++++++++++++++++++++++++----------------
1 files changed, 123 insertions(+), 67 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index 6e1560f..3b8dd95 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -41,64 +41,78 @@
JFrame frame;
static ObjEditor theFrame;
+
+ public cGridBag GetSeparator()
+ {
+ cGridBag separator = new cGridBag();
+ separator.add(new JSeparator());
+ separator.preferredHeight = 5;
+ return separator;
+ }
cButton GetButton(String name, boolean border)
{
- try
- {
- ImageIcon icon = GetIcon(name);
- return new cButton(icon, border);
- }
- catch (Exception e)
- {
- return new cButton(name, border);
- }
+ ImageIcon icon = GetIcon(name);
+ return new cButton(icon, border);
+ }
+
+ cLabel GetLabel(String name, boolean border)
+ {
+ //ImageIcon icon = GetIcon(name);
+ return new cLabel(GetImage(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);
- }
+ ImageIcon icon = GetIcon(name);
+ return new cToggleButton(icon, border);
}
cCheckBox GetCheckBox(String name, boolean border)
{
+ ImageIcon icon = GetIcon(name);
+ return new cCheckBox(icon, border);
+ }
+
+ ImageIcon GetIcon(String name)
+ {
try
{
- ImageIcon icon = GetIcon(name);
- return new cCheckBox(icon, border);
+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
+
+// if (image.getWidth() > 48 && image.getHeight() > 48)
+// {
+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
+// Graphics2D g = resized.createGraphics();
+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
+// g.dispose();
+//
+// image = resized;
+// }
+
+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
+ return icon;
}
catch (Exception e)
{
- return new cCheckBox(name, border);
+ return null;
}
}
-
- private ImageIcon GetIcon(String name) throws IOException
+
+ BufferedImage GetImage(String name)
{
- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
-
- if (image.getWidth() != 24 && image.getHeight() != 24)
+ try
{
- BufferedImage resized = new BufferedImage(24, 24, image.getType());
- Graphics2D g = resized.createGraphics();
- g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
- //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
- g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
- g.dispose();
-
- image = resized;
+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
+
+ return image;
}
-
- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
- return icon;
+ catch (Exception e)
+ {
+ return null;
+ }
}
// SCRIPT
@@ -341,8 +355,8 @@
if (copy.versions == null)
{
- copy.versions = new byte[100][];
- copy.versionindex = -1;
+// copy.versions = new byte[100][];
+// copy.versionindex = -1;
}
SetupMenu();
@@ -437,11 +451,12 @@
toolbarPanel = new JPanel();
toolbarPanel.setName("Toolbar");
+
treePanel = new cGridBag();
treePanel.setName("Tree");
editPanel = new cGridBag().setVertical(true);
- editPanel.setName("Edit");
+ //editPanel.setName("Edit");
ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
@@ -449,11 +464,11 @@
editPanel.add(editCommandsPanel);
editPanel.add(ctrlPanel);
- toolboxPanel = new cGridBag().setVertical(false);
- toolboxPanel.setName("Toolbox");
+ toolboxPanel = new cGridBag().setVertical(true);
+ //toolboxPanel.setName("Toolbox");
materialPanel = new cGridBag().setVertical(true);
- materialPanel.setName("Material");
+ //materialPanel.setName("Material");
/*JTextPane*/
infoarea = createTextPane();
@@ -461,6 +476,7 @@
infoarea.setEditable(true);
SetText();
+
// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
// infoarea.setOpaque(false);
// //infoarea.setForeground(textcolor);
@@ -468,7 +484,7 @@
// TEXTAREA infoarea.setWrapStyleWord(true);
infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
infoPanel.setPreferredSize(new Dimension(1, 1));
- infoPanel.setName("Info");
+ //infoPanel.setName("Info");
//infoPanel.setLayout(new BorderLayout());
//infoPanel.add(createTextPane());
@@ -986,7 +1002,7 @@
// NumberSlider vDivsField;
// JCheckBox endcaps;
JCheckBox liveCB;
- JCheckBox selectCB;
+ JCheckBox selectableCB;
JCheckBox hideCB;
JCheckBox link2masterCB;
JCheckBox markCB;
@@ -1198,13 +1214,16 @@
liveCB = AddCheckBox(setupPanel, "Live", copy.live);
liveCB.setToolTipText("Animate object");
- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
- selectCB.setToolTipText("Make object selectable");
+ 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);
setupPanel2 = new cGridBag().setVertical(false);
@@ -1492,6 +1511,7 @@
XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
+ //XYZPanel.setName("XYZ");
/*
gridPanel = new JPanel(); //new BorderLayout());
@@ -1529,16 +1549,29 @@
//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
//tmp.setName("Edit");
objectPanel.add(materialPanel);
+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
+ objectPanel.setToolTipTextAt(0, "Material panel");
+
// JPanel north = new JPanel(new BorderLayout());
// north.setName("Edit");
// north.add(ctrlPanel, BorderLayout.NORTH);
// objectPanel.add(north);
objectPanel.add(editPanel);
+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
+ objectPanel.setToolTipTextAt(1, "Edit panel");
//if (Globals.ADVANCED)
objectPanel.add(infoPanel);
+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
+ objectPanel.setToolTipTextAt(2, "Info panel");
+
+ objectPanel.add(XYZPanel);
+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
+ objectPanel.setToolTipTextAt(3, "XYZ/RGB panel");
objectPanel.add(toolboxPanel);
+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
+ objectPanel.setToolTipTextAt(4, "Objects/backgrounds panel");
/*
aConstraints.gridx = 0;
@@ -1559,7 +1592,7 @@
scrollpane.addMouseWheelListener(this); // Default not fast enough
/*JTabbedPane*/ scenePanel = new cGridBag();
- scenePanel.preferredWidth = 6;
+ scenePanel.preferredWidth = 5;
JTabbedPane tabbedPane = new JTabbedPane();
tabbedPane.add(scrollpane);
@@ -1637,7 +1670,7 @@
bigThree = new cGridBag();
bigThree.addComponent(scenePanel);
bigThree.addComponent(centralPanel);
- bigThree.addComponent(XYZPanel);
+ //bigThree.addComponent(XYZPanel);
// // SIDE EFFECT!!!
// aConstraints.gridx = 0;
@@ -1678,7 +1711,6 @@
frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
frame.addWindowListener(new WindowAdapter()
{
-
public void windowClosing(WindowEvent e)
{
Close();
@@ -1740,27 +1772,48 @@
//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
cGridBag colorSection = new cGridBag().setVertical(true);
+
+ cGridBag huepanel = new cGridBag();
+ cGridBag huelabel = new cGridBag();
+ huelabel.add(GetLabel("icons/hue.png", false));
+ huelabel.preferredWidth = 20;
+ huepanel.add(new cGridBag()); // Label
+ huepanel.add(huelabel); // Field/slider
+
+ huepanel.preferredHeight = 7;
+
+ colorSection.add(huepanel);
cGridBag color = new cGridBag();
- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
+
+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
+
//colorField.preferredWidth = 200;
colorSection.add(color);
cGridBag modulation = new cGridBag();
modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
colorSection.add(modulation);
+ cGridBag opacity = new cGridBag();
+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
+ colorSection.add(opacity);
+
+ colorSection.add(GetSeparator());
+
cGridBag texture = new cGridBag();
texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
colorSection.add(texture);
- panel.add(new JSeparator());
+ panel.add(GetSeparator());
panel.add(colorSection);
@@ -1816,7 +1869,7 @@
shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
diffuseSection.add(shadowbias);
- panel.add(new JSeparator());
+ panel.add(GetSeparator());
panel.add(diffuseSection);
@@ -1879,7 +1932,7 @@
specularSection.add(anisoV);
- panel.add(new JSeparator());
+ panel.add(GetSeparator());
panel.add(specularSection);
@@ -1904,12 +1957,6 @@
backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
colorSection.add(backlit);
-
- cGridBag opacity = new cGridBag();
- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
- colorSection.add(opacity);
//panel.add(new JSeparator());
@@ -1955,7 +2002,7 @@
opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /*10 dec 2013*/)); // , aConstraints);
textureSection.add(opacityPower);
- panel.add(new JSeparator());
+ panel.add(GetSeparator());
panel.add(textureSection);
@@ -3254,7 +3301,7 @@
{
copy.live ^= true;
return;
- } else if (event.getSource() == selectCB)
+ } else if (event.getSource() == selectableCB)
{
copy.dontselect ^= true;
return;
@@ -3645,7 +3692,7 @@
cRadio tab = GetCurrentTab();
- byte[] compress = CompressCopy();
+ byte[] compress = CompressCopy(); // Saved version. No need for "Replace".
boolean thesame = false;
@@ -3712,6 +3759,9 @@
copy.clear();
+ copy.skyboxname = obj.skyboxname;
+ copy.skyboxext = obj.skyboxext;
+
for (int i=0; i<obj.Size(); i++)
{
copy.add(obj.get(i));
@@ -4772,7 +4822,9 @@
readobj.ResetDisplayList();
} catch (Exception e)
{
- //e.printStackTrace();
+ if (!e.toString().contains("GZIP"))
+ e.printStackTrace();
+
try
{
java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
@@ -4852,6 +4904,8 @@
{
//readobj.deepCopySelf(copy);
copy.clear(); // june 2014
+ copy.skyboxname = readobj.skyboxname;
+ copy.skyboxext = readobj.skyboxext;
for (int i = 0; i < readobj.size(); i++)
{
Object3D child = readobj.get(i); // reserve(i);
@@ -4892,6 +4946,7 @@
}
} catch (ClassCastException e)
{
+ e.printStackTrace();
assert (false);
Composite c = (Composite) copy;
c.children.clear();
@@ -5022,6 +5077,7 @@
//ps.print(buffer.toString());
} catch (IOException e)
{
+ e.printStackTrace();
}
}
--
Gitblit v1.6.2