Compact toolbar.

Normand Briere

2019-08-12 b1d79b74514041a059b454a9f6fc3970773c0cb8

 CameraPane.java
..
..
@@ -8358,7 +8358,7 @@
8358
8358
 //            else
8359
8359
 //                if (!texname.startsWith("/"))
8360
8360
 //                    texname = "/Users/nbriere/Textures/" + texname;
8361
-            if (!FileExists(texname))
8361
+            if (!FileExists(texname) && !texname.startsWith("@"))
8362
8362
             {
8363
8363
                     texname = fallbackTextureName;
8364
8364
             }
..
..
@@ -8441,6 +8441,15 @@
8441
8441
                                 new Exception().printStackTrace();
8442
8442
                         } else
8443
8443
                         {
8444
+                        if (texname.startsWith("@"))
8445
+                        {
8446
+                //            texturecache = textures.get(texname); // suspicious
8447
+                            if (texturecache == null)
8448
+                                texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
8449
+                            else
8450
+                                new Exception().printStackTrace();
8451
+                        } else
8452
+                        {
8444
8453
                             if (textureon)
8445
8454
                             {
8446
8455
                                 String cachename = texname;
..
..
@@ -8500,6 +8509,7 @@
8500
8509
                                     texturecache = new CacheTexture(texturedata,resolution);
8501
8510
         //texture = GetTexture(tex, bump);
8502
8511
                             }
8512
+                        }
8503
8513
                         }
8504
8514
                     //}
8505
8515
                 }
..
..
@@ -16657,6 +16667,7 @@
16657
16667
     private void DrawSkyBox(GL gl, float ratio)
16658
16668
     {
16659
16669
         if (//envyoff ||
16670
+            WIREFRAME ||
16660
16671
                 cubemap == null)
16661
16672
         {
16662
16673
             gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);