Restore bind texture

Normand Briere

2019-07-21 5a546232b84ce65d8779d29e9171e7e2df013614

Restore bind texture

 CameraPane.java
..
..
@@ -7930,7 +7930,7 @@
7930
7930
         String pigment = Object3D.GetPigment(tex);
7931
7931
         String bump = Object3D.GetBump(tex);
7932
7932
 
7933
-        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7933
+        //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7934
7934
         {
7935
7935
         //    System.out.print("RELEASE  +++++++++++++++  pigment = " + pigment);
7936
7936
         //    System.out.println("; bump = " + bump);
..
..
@@ -7964,7 +7964,7 @@
7964
7964
         
7965
7965
         String pigment = Object3D.GetPigment(tex);
7966
7966
 
7967
-        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7967
+        //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7968
7968
         {
7969
7969
         //    System.out.print("RELEASE  +++++++++++++++  pigment = " + pigment);
7970
7970
         //    System.out.println("; bump = " + bump);
..
..
@@ -7993,7 +7993,7 @@
7993
7993
         
7994
7994
         String bump = Object3D.GetBump(tex);
7995
7995
 
7996
-        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7996
+        //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7997
7997
         {
7998
7998
         //    System.out.print("RELEASE  +++++++++++++++  pigment = " + pigment);
7999
7999
         //    System.out.println("; bump = " + bump);
..
..
@@ -8131,7 +8131,7 @@
8131
8131
         usedtextures.put(pigment, pigment);
8132
8132
         usedtextures.put(bump, bump);
8133
8133
         
8134
-        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8134
+        //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8135
8135
         {
8136
8136
         //    System.out.print("BIND  +++++++++++++++  pigment = " + pigment);
8137
8137
         //    System.out.println("; bump = " + bump);
..
..
@@ -8173,7 +8173,7 @@
8173
8173
 
8174
8174
         usedtextures.put(pigment, pigment);
8175
8175
         
8176
-        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8176
+        //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8177
8177
         {
8178
8178
         //    System.out.print("BIND  +++++++++++++++  pigment = " + pigment);
8179
8179
         //    System.out.println("; bump = " + bump);
..
..
@@ -8206,7 +8206,7 @@
8206
8206
 
8207
8207
         usedtextures.put(bump, bump);
8208
8208
         
8209
-        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8209
+        //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8210
8210
         {
8211
8211
         //    System.out.print("BIND  +++++++++++++++  pigment = " + pigment);
8212
8212
         //    System.out.println("; bump = " + bump);
..
..
@@ -8510,19 +8510,19 @@
8510
8510
         return texture!=null?texture.texturedata:null;
8511
8511
     }
8512
8512
     
8513
-    com.sun.opengl.util.texture.Texture BindTexture(String tex, boolean bump, int resolution) throws Exception
8513
+    boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
8514
8514
     {
8515
8515
         if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
8516
8516
         {
8517
8517
             return false;
8518
8518
         }
8519
8519
 
8520
-        boolean newtex = false;
8520
+        //boolean newtex = false;
8521
8521
 
8522
8522
         com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8523
8523
 
8524
8524
         if (texture == null)
8525
-            return texture;
8525
+            return false;
8526
8526
         /**/
8527
8527
 
8528
8528
         if (textureon || tex.equals("DEFAULT_TEXTURE") || tex.equals("DEFAULT_TEXTURE_BUMP") || tex.equals("WHITE_NOISE")) // || tex.equals("IMMORTAL"))
..
..
@@ -8549,7 +8549,7 @@
8549
8549
         texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8550
8550
         texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8551
8551
         
8552
-        return newtex;
8552
+        return true; // Warning: not used.
8553
8553
     }
8554
8554
     
8555
8555
     ShadowBuffer shadowPBuf;
 ObjEditor.java
..
..
@@ -4769,7 +4769,7 @@
4769
4769
             readobj.ResetDisplayList();
4770
4770
         } catch (Exception e)
4771
4771
         {
4772
-            //e.printStackTrace();
4772
+            e.printStackTrace();
4773
4773
             try
4774
4774
             {
4775
4775
                 java.io.FileInputStream istream = new java.io.FileInputStream(fullname);