From a434119e65146fe53d612c28e1ee7af532d1b70a Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sun, 28 Jul 2019 15:25:44 -0400
Subject: [PATCH] Skyboxes
---
ObjEditor.java | 47 +++++++++++++++++++++++++++--------------------
1 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index 30d64e6..396ef67 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -66,17 +66,17 @@
{
BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
- if (image.getWidth() != 24 && image.getHeight() != 24)
- {
- 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;
- }
+// if (image.getWidth() != 24 && image.getHeight() != 24)
+// {
+// 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;
+// }
javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
return icon;
@@ -327,8 +327,8 @@
if (copy.versions == null)
{
- copy.versions = new byte[100][];
- copy.versionindex = -1;
+// copy.versions = new byte[100][];
+// copy.versionindex = -1;
}
SetupMenu();
@@ -436,7 +436,7 @@
editPanel.add(editCommandsPanel);
editPanel.add(ctrlPanel);
- toolboxPanel = new cGridBag().setVertical(false);
+ toolboxPanel = new cGridBag().setVertical(true);
//toolboxPanel.setName("Toolbox");
materialPanel = new cGridBag().setVertical(true);
@@ -974,7 +974,7 @@
// NumberSlider vDivsField;
// JCheckBox endcaps;
JCheckBox liveCB;
- JCheckBox selectCB;
+ JCheckBox selectableCB;
JCheckBox hideCB;
JCheckBox link2masterCB;
JCheckBox markCB;
@@ -1186,13 +1186,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);
@@ -1631,8 +1634,8 @@
/**/
bigThree = new cGridBag();
- bigThree.addComponent(scenePanel);
bigThree.addComponent(centralPanel);
+ bigThree.addComponent(scenePanel);
//bigThree.addComponent(XYZPanel);
// // SIDE EFFECT!!!
@@ -3250,7 +3253,7 @@
{
copy.live ^= true;
return;
- } else if (event.getSource() == selectCB)
+ } else if (event.getSource() == selectableCB)
{
copy.dontselect ^= true;
return;
@@ -4768,7 +4771,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);
@@ -4888,6 +4893,7 @@
}
} catch (ClassCastException e)
{
+ e.printStackTrace();
assert (false);
Composite c = (Composite) copy;
c.children.clear();
@@ -5018,6 +5024,7 @@
//ps.print(buffer.toString());
} catch (IOException e)
{
+ e.printStackTrace();
}
}
--
Gitblit v1.6.2