Normand Briere
2019-07-30 475f8cbdbd96fdbf8f5b216ffebb31a51f25c2f9
ObjEditor.java
....@@ -60,23 +60,23 @@
6060 return new cCheckBox(icon, border);
6161 }
6262
63
- private ImageIcon GetIcon(String name)
63
+ ImageIcon GetIcon(String name)
6464 {
6565 try
6666 {
6767 BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
6868
69
- if (image.getWidth() != 24 && image.getHeight() != 24)
70
- {
71
- BufferedImage resized = new BufferedImage(24, 24, image.getType());
72
- Graphics2D g = resized.createGraphics();
73
- g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
74
- //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
75
- g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
76
- g.dispose();
77
-
78
- image = resized;
79
- }
69
+// if (image.getWidth() > 48 && image.getHeight() > 48)
70
+// {
71
+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
72
+// Graphics2D g = resized.createGraphics();
73
+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
74
+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
75
+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
76
+// g.dispose();
77
+//
78
+// image = resized;
79
+// }
8080
8181 javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
8282 return icon;
....@@ -436,7 +436,7 @@
436436 editPanel.add(editCommandsPanel);
437437 editPanel.add(ctrlPanel);
438438
439
- toolboxPanel = new cGridBag().setVertical(false);
439
+ toolboxPanel = new cGridBag().setVertical(true);
440440 //toolboxPanel.setName("Toolbox");
441441
442442 materialPanel = new cGridBag().setVertical(true);
....@@ -1195,6 +1195,8 @@
11951195 markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
11961196 markCB.setToolTipText("As animation target transform");
11971197
1198
+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1199
+
11981200 setupPanel2 = new cGridBag().setVertical(false);
11991201
12001202 rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
....@@ -1632,8 +1634,8 @@
16321634 /**/
16331635
16341636 bigThree = new cGridBag();
1635
- bigThree.addComponent(scenePanel);
16361637 bigThree.addComponent(centralPanel);
1638
+ bigThree.addComponent(scenePanel);
16371639 //bigThree.addComponent(XYZPanel);
16381640
16391641 // // SIDE EFFECT!!!
....@@ -4769,7 +4771,9 @@
47694771 readobj.ResetDisplayList();
47704772 } catch (Exception e)
47714773 {
4772
- //e.printStackTrace();
4774
+ if (!e.toString().contains("GZIP"))
4775
+ e.printStackTrace();
4776
+
47734777 try
47744778 {
47754779 java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
....@@ -4849,6 +4853,8 @@
48494853 {
48504854 //readobj.deepCopySelf(copy);
48514855 copy.clear(); // june 2014
4856
+ copy.skyboxname = readobj.skyboxname;
4857
+ copy.skyboxext = readobj.skyboxext;
48524858 for (int i = 0; i < readobj.size(); i++)
48534859 {
48544860 Object3D child = readobj.get(i); // reserve(i);
....@@ -4889,6 +4895,7 @@
48894895 }
48904896 } catch (ClassCastException e)
48914897 {
4898
+ e.printStackTrace();
48924899 assert (false);
48934900 Composite c = (Composite) copy;
48944901 c.children.clear();
....@@ -5019,6 +5026,7 @@
50195026 //ps.print(buffer.toString());
50205027 } catch (IOException e)
50215028 {
5029
+ e.printStackTrace();
50225030 }
50235031 }
50245032