blame | history | patch | commit | commitdiff
Normand Briere
2019-06-03 e24558ddeacfc945b9e9ba0a32b552d04e2ed4dd 
 CameraPane.java
....@@ -8022,7 +8022,7 @@
80228022         }
80238023     }
80248024 
8025
-    /*boolean*/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
8025
+    /*boolean*/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
80268026     {
80278027         if (// DrawMode() != 0 || /*tex == null ||*/
80288028                 ambientOcclusion ) // || !textureon)
....@@ -8067,7 +8067,7 @@
80678067         return; // true;
80688068     }
80698069     
8070
-    CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
8070
+    CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
80718071     {
80728072         CacheTexture/*com.sun.opengl.util.texture.Texture*/ texture = null;
80738073         
....@@ -8184,7 +8184,9 @@
81848184                                 texturedata = GetFileTexture(cachename, processbump, resolution);                                
81858185                                 
81868186                                 
8187
-                                if (texturedata != null)
8187
+                                if (texturedata == null)
8188
+                                    throw new Exception();
8189
+                                    
81888190                                     texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
81898191         //texture = GetTexture(tex, bump);
81908192                             }
....@@ -8306,7 +8308,7 @@
83068308         return texture;
83078309     }
83088310     
8309
-    com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
8311
+    com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
83108312     {
83118313         CacheTexture texture = GetCacheTexture(tex, bump, resolution);
83128314                 
....@@ -8324,14 +8326,14 @@
83248326         return texture!=null?texture.texture:null;
83258327     }
83268328     
8327
-    public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
8329
+    public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
83288330     {
83298331         CacheTexture texture = GetCacheTexture(tex, bump, resolution);
83308332                 
83318333         return texture!=null?texture.texturedata:null;
83328334     }
83338335     
8334
-    boolean BindTexture(String tex, boolean bump, int resolution)
8336
+    boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
83358337     {
83368338         if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
83378339         {
....@@ -10798,7 +10800,16 @@
1079810800             // Bump noise
1079910801             gl.glActiveTexture(GL.GL_TEXTURE6);
1080010802             //gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10801
-            BindTexture(NOISE_TEXTURE, false, 2);
10803
+            
10804
+    try
10805
+    {
10806
+        BindTexture(NOISE_TEXTURE, false, 2);
10807
+    }
10808
+    catch (Exception e)
10809
+    {
10810
+        System.err.println("FAILED: " + NOISE_TEXTURE);
10811
+    }
10812
+           
1080210813 
1080310814             gl.glActiveTexture(GL.GL_TEXTURE0);
1080410815             gl.glEnable(GL.GL_TEXTURE_2D);
....@@ -11354,7 +11365,14 @@
1135411365 
1135511366                 usedtextures.clear();
1135611367             
11357
-                BindTextures(DEFAULT_TEXTURES, 2);
11368
+    try
11369
+    {
11370
+        BindTextures(DEFAULT_TEXTURES, 2);
11371
+    }
11372
+    catch (Exception e)
11373
+    {
11374
+        System.err.println("FAILED: " + DEFAULT_TEXTURES);
11375
+    }
1135811376             }
1135911377             //System.out.println("--> " + stackdepth);
1136011378 //            GrafreeD.traceon();
....@@ -11445,7 +11463,14 @@
1144511463             if (checker != null && DrawMode() == DEFAULT)
1144611464             {
1144711465                 //BindTexture(IMMORTAL_TEXTURE);
11448
-                BindTextures(checker.GetTextures(), checker.texres);
11466
+    try
11467
+    {
11468
+        BindTextures(checker.GetTextures(), checker.texres);
11469
+    }
11470
+    catch (Exception e)
11471
+    {
11472
+        System.err.println("FAILED: " + checker.GetTextures());
11473
+    }
1144911474                 // NEAREST
1145011475                 GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
1145111476                 DrawChecker(gl);
....@@ -14870,7 +14895,7 @@
1487014895                 //RESIZETEXTURE ^= true;
1487114896                 //break;
1487214897             case 'z':
14873
-                RENDERSHADOW ^= true;
14898
+                Globals.RENDERSHADOW ^= true;
1487414899                 Globals.lighttouched = true;
1487514900                 repaint();
1487614901                 break;
....@@ -16592,7 +16617,7 @@
1659216617                 gl.glDisable(gl.GL_CULL_FACE);
1659316618             }
1659416619 
16595
-            if (!RENDERSHADOW)
16620
+            if (!Globals.RENDERSHADOW)
1659616621                 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1659716622 
1659816623             // SB gl.glPolygonOffset(2.5f, 10);
....@@ -16602,7 +16627,7 @@
1660216627             //gl.glColorMask(false, false, false, false);
1660316628 
1660416629             //render_scene_from_light_view(gl, drawable, 0, 0);
16605
-            if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
16630
+            if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera || !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
1660616631             {
1660716632                 gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
1660816633