From 24a2a946b35279605e645349bd6b82e9e60aac88 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Wed, 14 Aug 2019 23:35:34 -0400
Subject: [PATCH] Fix textures in jar.
---
ObjEditor.java | 81 ++++++++++++++++++++++++----------------
1 files changed, 48 insertions(+), 33 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index 4b4a90a..9f18912 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -75,8 +75,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));
@@ -94,10 +102,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;
}
}
@@ -433,7 +445,7 @@
ChangeListener changeListener = new ChangeListener()
{
- String name;
+ //String name;
public void stateChanged(ChangeEvent changeEvent)
{
@@ -453,33 +465,34 @@
// EditSelection(false);
// }
- 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;
- }
- }
- }
+// 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();
@@ -1676,9 +1689,9 @@
scenePanel.add(tabbedPane);
//if (Globals.ADVANCED)
- tabbedPane.add(infoPanel);
- tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
- tabbedPane.setToolTipTextAt(3, "Information");
+// tabbedPane.add(infoPanel);
+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
+// tabbedPane.setToolTipTextAt(3, "Information");
/*
cTree jTree = new cTree(null);
@@ -1776,7 +1789,7 @@
frame.getContentPane().setLayout(new BorderLayout());
/**/
- JTabbedPane worldPane = new JTabbedPane();
+ //JTabbedPane worldPane = new JTabbedPane();
//worldPane.add(bigPanel);
//worldPane.add(worldPanel);
/**/
@@ -4781,6 +4794,8 @@
if (muteSlider)
return;
+ Replace();
+
int version = versionSlider.getInteger();
if (version != -1 && copy.versionlist[version] != null)
@@ -5535,7 +5550,7 @@
copy.versionlist = new Object3D[100];
copy.versionindex = -1;
- Save(true);
+ //Save(true);
}
//? SetUndoStates();
--
Gitblit v1.6.2