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.
---
Grafreed.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/Grafreed.java b/Grafreed.java
index ed3e880..77a2921 100644
--- a/Grafreed.java
+++ b/Grafreed.java
@@ -62,7 +62,7 @@
static void ParseFileSystem(java.io.File dir, iResourceCallBack callback, String prefix)
{
- callback.CallBack(RemovePrefix(dir.toString(),prefix).split("/"));
+ callback.ResourceCallBack(RemovePrefix(dir.toString(),prefix).split("/"));
File[] listFiles = dir.listFiles();
if (listFiles != null)
{
@@ -75,7 +75,7 @@
static interface iResourceCallBack
{
- void CallBack(String[] path);
+ void ResourceCallBack(String[] path);
}
static void ParseResources(String path, iResourceCallBack callback)
@@ -94,7 +94,7 @@
String name = entries.nextElement().getName();
if (name.startsWith(path + "/"))
- callback.CallBack(RemovePrefix(name, path).split("/"));
+ callback.ResourceCallBack(RemovePrefix(name, path + "/").split("/"));
}
jar.close();
} catch (Exception ex)
@@ -110,7 +110,7 @@
try
{
java.io.File apps = new java.io.File(url.toURI());
- ParseFileSystem(apps, callback, RemovePrefix(url.toString(), "file:"));
+ ParseFileSystem(apps, callback, RemovePrefix(url.toString() + "/", "file:"));
// for (java.io.File app : apps.listFiles())
// {
// //System.out.println(RemovePrefix(app.toString(), RemovePrefix(url.toString(), "file:") + "/"));
@@ -928,6 +928,9 @@
grafreed.universe = new cGroup();
grafreed.universe.name = "Grafreed";
grafreed.universe.material = new cMaterial();
+ grafreed.universe.skyboxname = "cubemaps/penguins-skyboxes/tropic";
+ grafreed.universe.skyboxext = "jpg";
+
// theApplet3D.universe.textures = CameraPane.DEFAULT_TEXTURE;
grafreed.universe.root = true;
@@ -935,6 +938,8 @@
//mon.stop();
//System.out.println(mon);
//timeflow.app.TimeflowAppLauncher.GetTimeFlow();
+
+ javax.swing.ToolTipManager.sharedInstance().setEnabled(Globals.TOOLTIPS);
}
static Object3D materials;
@@ -950,6 +955,8 @@
java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
readobj = (Object3D) p.readObject();
+ p.close();
+ zstream.close();
istream.close();
readobj.ResetDisplayList();
@@ -963,6 +970,7 @@
java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
readobj = (Object3D) p.readObject();
+ p.close();
istream.close();
readobj.ResetDisplayList();
--
Gitblit v1.6.2