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.
---
CameraPane.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/CameraPane.java b/CameraPane.java
index 778fb13..ebdca60 100644
--- a/CameraPane.java
+++ b/CameraPane.java
@@ -113,6 +113,8 @@
/*static*/ com.sun.opengl.util.texture.Texture cubemap; // Either custom or rgb
/*static*/ com.sun.opengl.util.texture.Texture cubemapcustom;
/*static*/ com.sun.opengl.util.texture.Texture cubemaprgb;
+ boolean transformMode;
+
boolean reverseUP = false;
static boolean frozen = false;
boolean enablebackspace = false; // patch for back buffer refresh
@@ -2515,7 +2517,7 @@
com.sun.opengl.util.texture.TextureIO.newTextureData(
getClass().getClassLoader().getResourceAsStream(name),
true,
- com.sun.opengl.util.texture.TextureIO.PNG);
+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
} catch (java.io.IOException e)
{
throw new javax.media.opengl.GLException(e);
@@ -11082,11 +11084,11 @@
//
// newenvy = -1;
- if (object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
{
if (cubemaprgb == null)
{
- cubemaprgb = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb" + "/", "jpg", false);
}
cubemap = cubemaprgb;
@@ -11097,6 +11099,8 @@
{
if (!object.skyboxname.equals(this.loadedskyboxname))
{
+ if (cubemap != null && cubemap != cubemaprgb)
+ cubemap.dispose();
cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
loadedskyboxname = object.skyboxname;
}
@@ -16788,7 +16792,8 @@
gl.glDisable(GL.GL_TEXTURE_GEN_R);
cubemap.disable();
- ////cubemap.unbind();
+ //cubemap.dispose();
+
if (CULLFACE)
{
gl.glEnable(gl.GL_CULL_FACE);
--
Gitblit v1.6.2