blame | history | patch | commit | commitdiff
Normand Briere
2019-07-23 cf7cfa1c792eebba606a48aa648893f6e4873263 
 CameraPane.java
....@@ -18,7 +18,10 @@
1818 import javax.imageio.ImageIO;
1919 import javax.imageio.ImageWriteParam;
2020 import javax.imageio.ImageWriter;
21
+import javax.imageio.ImageReadParam;
22
+import javax.imageio.ImageReader;
2123 import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
24
+import javax.imageio.stream.ImageInputStream;
2225 import javax.imageio.stream.ImageOutputStream;
2326 import javax.imageio.ImageWriteParam;
2427 
....@@ -30,6 +33,7 @@
3033 import java.nio.*;
3134 
3235 import gleem.linalg.Mat4f;
36
+import javax.imageio.ImageTypeSpecifier;
3337 
3438 class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
3539 {
....@@ -44,6 +48,39 @@
4448     static boolean ABORTED = false;
4549     
4650     static int STEP = 1;
51
+
52
+    private static BufferedImage CreateBim(byte[] bytes, int width, int height)
53
+    {
54
+        int[] pixels = new int[bytes.length/3];
55
+        for (int i=pixels.length; --i>=0;)
56
+        {
57
+            int i3 = i*3;
58
+            pixels[i] = 0xFF;
59
+            pixels[i] <<= 8;
60
+            pixels[i] |= bytes[i3+2] & 0xFF;
61
+            pixels[i] <<= 8;
62
+            pixels[i] |= bytes[i3+1] & 0xFF;
63
+            pixels[i] <<= 8;
64
+            pixels[i] |= bytes[i3] & 0xFF;
65
+        }
66
+        /*
67
+        int r=0,g=0,b=0,a=0;
68
+        for (int i=0; i<width; i++)
69
+        for (int j=0; j<height; j++)
70
+        {
71
+        int index = j*width+i;
72
+        int p = pixels[index];
73
+        a = ((p>>24) & 0xFF);
74
+        r = ((p>>16) & 0xFF);
75
+        g = ((p>>8) & 0xFF);
76
+        b = (p & 0xFF);
77
+        pixels[index] = (a<<24) | (b<<16) | (g<<8) | r;
78
+        }
79
+        /**/
80
+        BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
81
+        rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
82
+        return rendImage;
83
+    }
4784 
4885     /*static*/ private boolean CULLFACE = false; // true;
4986     /*static*/ boolean NEAREST = false; // true;
....@@ -60,7 +97,7 @@
6097     //boolean REDUCETEXTURE = true;
6198     boolean CACHETEXTURE = true;
6299     boolean CLEANCACHE = false; // true;
63
-    boolean MIPMAP = false; // true;
100
+    boolean MIPMAP = false; // true; // never works...
64101     boolean COMPRESSTEXTURE = false;
65102     boolean KOMPACTTEXTURE = false; // true;
66103     boolean RESIZETEXTURE = false;
....@@ -2405,6 +2442,21 @@
24052442         return currentGL;
24062443     }
24072444 
2445
+    static private BufferedImage CreateBim(TextureData texturedata)
2446
+    {
2447
+        Grafreed.Assert(texturedata != null);
2448
+        
2449
+        int width = texturedata.getWidth();
2450
+        int height = texturedata.getHeight();
2451
+        
2452
+        Buffer buffer = texturedata.getBuffer();
2453
+        ByteBuffer bytebuf = (ByteBuffer)buffer;
2454
+        
2455
+        byte[] bytes = bytebuf.array();
2456
+        
2457
+        return CreateBim(bytes, width, height);
2458
+    }
2459
+
24082460     /**/
24092461     class CacheTexture
24102462     {
....@@ -2413,28 +2465,31 @@
24132465         
24142466         int resolution;
24152467         
2416
-        CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
2468
+        CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
24172469         {
2418
-            texture = tex;
2470
+            texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
2471
+            texturedata = texdata;
24192472             resolution = res;
24202473         }
24212474     }
24222475     /**/
24232476     
24242477 // TEXTURE	static Texture texture;
2425
-    static public java.util.Hashtable<String, CacheTexture/*com.sun.opengl.util.texture.Texture*/> textures
2426
-            = new java.util.Hashtable<String, CacheTexture/*com.sun.opengl.util.texture.Texture*/>();
2427
-    static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
2478
+    static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
2479
+    static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
2480
+    static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
2481
+    static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
2482
+    
24282483     int pigmentdepth = 0;
24292484     public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
24302485     int bumpdepth = 0;
24312486     public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
24322487     //public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
24332488     public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2434
-    public static String NOISE_TEXTURE = "WHITE_NOISE";
2489
+    public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
24352490  //   public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
24362491 
2437
-    com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
2492
+    com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
24382493     {
24392494         TextureData texturedata = null;
24402495 
....@@ -2453,13 +2508,34 @@
24532508         if (bump)
24542509             texturedata = ConvertBump(texturedata, false);
24552510             
2456
-        com.sun.opengl.util.texture.Texture texture =
2457
-                com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2511
+//        com.sun.opengl.util.texture.Texture texture =
2512
+//                com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
24582513         
2459
-        texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2460
-        texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2514
+        //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2515
+        //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
24612516         
2462
-        return texture;
2517
+        return texturedata;
2518
+    }
2519
+    
2520
+    com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
2521
+    {
2522
+        TextureData texturedata = null;
2523
+
2524
+        try
2525
+        {
2526
+            texturedata =
2527
+                    com.sun.opengl.util.texture.TextureIO.newTextureData(
2528
+                    bim,
2529
+                    true);
2530
+        } catch (Exception e)
2531
+        {
2532
+            throw new javax.media.opengl.GLException(e);
2533
+        }
2534
+
2535
+        if (bump)
2536
+            texturedata = ConvertBump(texturedata, false);
2537
+                
2538
+        return texturedata;
24632539     }
24642540     
24652541     boolean HUESMOOTH = true; // wrap around bug... true;
....@@ -3532,6 +3608,8 @@
35323608 
35333609             System.out.println("LOADING TEXTURE : " + name);
35343610 
3611
+            Object x = texturedata.getMipmapData(); // .getBuffer();
3612
+            
35353613         // 
35363614         if (false) // compressbit > 0)
35373615         {
....@@ -7930,7 +8008,7 @@
79308008         String pigment = Object3D.GetPigment(tex);
79318009         String bump = Object3D.GetBump(tex);
79328010 
7933
-        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8011
+        //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
79348012         {
79358013         //    System.out.print("RELEASE  +++++++++++++++  pigment = " + pigment);
79368014         //    System.out.println("; bump = " + bump);
....@@ -7945,8 +8023,8 @@
79458023             pigment = null;
79468024         }
79478025         
7948
-        ReleaseTexture(bump, true);
7949
-        ReleaseTexture(pigment, false);
8026
+        ReleaseTexture(tex, true);
8027
+        ReleaseTexture(tex, false);
79508028     }
79518029     
79528030     public void ReleasePigmentTexture(cTexture tex) // INTERFACE
....@@ -7964,7 +8042,7 @@
79648042         
79658043         String pigment = Object3D.GetPigment(tex);
79668044 
7967
-        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8045
+        //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
79688046         {
79698047         //    System.out.print("RELEASE  +++++++++++++++  pigment = " + pigment);
79708048         //    System.out.println("; bump = " + bump);
....@@ -7975,7 +8053,7 @@
79758053             pigment = null;
79768054         }
79778055         
7978
-        ReleaseTexture(pigment, false);
8056
+        ReleaseTexture(tex, false);
79798057     }
79808058     
79818059     public void ReleaseBumpTexture(cTexture tex) // INTERFACE
....@@ -7993,7 +8071,7 @@
79938071         
79948072         String bump = Object3D.GetBump(tex);
79958073 
7996
-        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8074
+        //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
79978075         {
79988076         //    System.out.print("RELEASE  +++++++++++++++  pigment = " + pigment);
79998077         //    System.out.println("; bump = " + bump);
....@@ -8004,10 +8082,10 @@
80048082             bump = null;
80058083         }
80068084         
8007
-        ReleaseTexture(bump, true);
8085
+        ReleaseTexture(tex, true);
80088086     }
80098087     
8010
-    void ReleaseTexture(String tex, boolean bump)
8088
+    void ReleaseTexture(cTexture tex, boolean bump)
80118089     {
80128090         if (// DrawMode() != 0 || /*tex == null ||*/
80138091                 ambientOcclusion ) // || !textureon)
....@@ -8018,7 +8096,7 @@
80188096         CacheTexture/*com.sun.opengl.util.texture.Texture*/ texture = null;
80198097         
80208098         if (tex != null)
8021
-            texture = textures.get(tex);
8099
+            texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
80228100 
80238101 //        //assert( texture != null );
80248102 //        if (texture == null)
....@@ -8112,47 +8190,50 @@
81128190 
81138191     /*boolean*/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
81148192     {
8115
-        if (// DrawMode() != 0 || /*tex == null ||*/
8116
-                ambientOcclusion ) // || !textureon)
8117
-        {
8118
-            return; // false;
8119
-        }
8120
-
8121
-        if (tex == null)
8122
-        {
8123
-            BindTexture(null,false,resolution);
8124
-            BindTexture(null,true,resolution);
8125
-            return;
8126
-        }
8193
+//        if (// DrawMode() != 0 || /*tex == null ||*/
8194
+//                ambientOcclusion ) // || !textureon)
8195
+//        {
8196
+//            return; // false;
8197
+//        }
8198
+//
8199
+//        if (tex == null)
8200
+//        {
8201
+//            BindTexture(null,false,resolution);
8202
+//            BindTexture(null,true,resolution);
8203
+//            return;
8204
+//        }
8205
+//        
8206
+//        String pigment = Object3D.GetPigment(tex);
8207
+//        String bump = Object3D.GetBump(tex);
8208
+//
8209
+//        usedtextures.add(pigment);
8210
+//        usedtextures.add(bump);
8211
+//        
8212
+//        //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8213
+//        {
8214
+//        //    System.out.print("BIND  +++++++++++++++  pigment = " + pigment);
8215
+//        //    System.out.println("; bump = " + bump);
8216
+//        }
8217
+//        
8218
+//        if (bump.equals(""))
8219
+//        {
8220
+//            bump = null;
8221
+//        }
8222
+//        if (pigment.equals(""))
8223
+//        {
8224
+//            pigment = null;
8225
+//        }
8226
+//        
8227
+//        GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8228
+//        BindTexture(pigment, false, resolution);
8229
+//        GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8230
+//        BindTexture(bump, true, resolution);
8231
+//        GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8232
+//            
8233
+//        return; // true;
81278234         
8128
-        String pigment = Object3D.GetPigment(tex);
8129
-        String bump = Object3D.GetBump(tex);
8130
-
8131
-        usedtextures.put(pigment, pigment);
8132
-        usedtextures.put(bump, bump);
8133
-        
8134
-        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8135
-        {
8136
-        //    System.out.print("BIND  +++++++++++++++  pigment = " + pigment);
8137
-        //    System.out.println("; bump = " + bump);
8138
-        }
8139
-        
8140
-        if (bump.equals(""))
8141
-        {
8142
-            bump = null;
8143
-        }
8144
-        if (pigment.equals(""))
8145
-        {
8146
-            pigment = null;
8147
-        }
8148
-        
8149
-        GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8150
-        BindTexture(pigment, false, resolution);
8151
-        GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8152
-        BindTexture(bump, true, resolution);
8153
-        GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8154
-            
8155
-        return; // true;
8235
+        BindPigmentTexture(tex, resolution);
8236
+        BindBumpTexture(tex, resolution);
81568237     }
81578238     
81588239     /*boolean*/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
....@@ -8171,9 +8252,9 @@
81718252         
81728253         String pigment = Object3D.GetPigment(tex);
81738254 
8174
-        usedtextures.put(pigment, pigment);
8255
+        usedtextures.add(tex);
81758256         
8176
-        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8257
+        //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
81778258         {
81788259         //    System.out.print("BIND  +++++++++++++++  pigment = " + pigment);
81798260         //    System.out.println("; bump = " + bump);
....@@ -8185,7 +8266,7 @@
81858266         }
81868267         
81878268         GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8188
-        BindTexture(pigment, false, resolution);
8269
+        BindTexture(tex, false, resolution);
81898270     }
81908271     
81918272     /*boolean*/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
....@@ -8204,9 +8285,9 @@
82048285         
82058286         String bump = Object3D.GetBump(tex);
82068287 
8207
-        usedtextures.put(bump, bump);
8288
+        usedtextures.add(tex);
82088289         
8209
-        if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8290
+        //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
82108291         {
82118292         //    System.out.print("BIND  +++++++++++++++  pigment = " + pigment);
82128293         //    System.out.println("; bump = " + bump);
....@@ -8218,7 +8299,7 @@
82188299         }
82198300         
82208301         GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8221
-        BindTexture(bump, true, resolution);
8302
+        BindTexture(tex, true, resolution);
82228303         GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
82238304     }
82248305     
....@@ -8242,13 +8323,19 @@
82428323         return fileExists;
82438324     }
82448325     
8245
-    CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
8326
+    CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
82468327     {
8247
-        CacheTexture/*com.sun.opengl.util.texture.Texture*/ texture = null;
8328
+        CacheTexture texturecache = null;
82488329         
82498330         if (tex != null)
82508331         {
8251
-            String texname = tex;
8332
+            String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
8333
+            byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
8334
+            
8335
+            if (texname.equals("") && texdata == null)
8336
+            {
8337
+                return null;
8338
+            }
82528339             
82538340             String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
82548341                 
....@@ -8258,19 +8345,46 @@
82588345 //            else
82598346 //                if (!texname.startsWith("/"))
82608347 //                    texname = "/Users/nbriere/Textures/" + texname;
8261
-            if (!FileExists(tex))
8348
+            if (!FileExists(texname))
82628349             {
82638350                     texname = fallbackTextureName;
82648351             }
82658352             
82668353             if (CACHETEXTURE)
8267
-                texture = textures.get(texname); // TEXTURE CACHE
8268
-
8269
-            TextureData texturedata = null;
8270
-            
8271
-            if (texture == null || texture.resolution < resolution)
82728354             {
8273
-                if (tex.equals("DEFAULT_TEXTURE")) // ||*/ tex.equals(""))
8355
+                if (texdata == null)
8356
+                    texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
8357
+                else
8358
+                    texturecache = bimtextures.get(texdata);
8359
+            }
8360
+
8361
+            if (texturecache == null || texturecache.resolution != -1 && texturecache.resolution < resolution)
8362
+            {
8363
+                TextureData texturedata = null;
8364
+            
8365
+                if (texdata != null && textureon)
8366
+                {
8367
+                    BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
8368
+                    
8369
+                            try
8370
+                            {
8371
+                                bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);                                
8372
+                            }
8373
+                            catch (Exception e)
8374
+                            {
8375
+                                bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
8376
+                            }
8377
+                    
8378
+                    texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
8379
+                    bimtextures.put(texdata, texturecache);
8380
+                    
8381
+                    //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
8382
+                            
8383
+                    //Object bim2 = CreateBim(texturecache.texturedata);
8384
+                    //bim2 = bim;
8385
+                }
8386
+                else
8387
+                if (texname.endsWith("DEFAULT_TEXTURE")) // ||*/ tex.equals(""))
82748388                 {
82758389                     assert(!bump);
82768390 //                    if (bump)
....@@ -8281,19 +8395,23 @@
82818395 //                    }
82828396 //                    else
82838397 //                    {
8284
-                        texture = textures.get(tex);
8285
-                        if (texture == null)
8398
+                  //      texturecache = textures.get(texname); // suspicious
8399
+                        if (texturecache == null)
82868400                         {
8287
-                            texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8401
+                            texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
82888402                         }
8403
+                        else
8404
+                            new Exception().printStackTrace();
82898405 //                    }
82908406                 } else
8291
-                if (tex.equals("DEFAULT_TEXTURE_BUMP")) // ||*/ tex.equals(""))
8407
+                if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // ||*/ tex.equals(""))
82928408                 {
82938409                     assert(bump);
8294
-                    texture = textures.get(tex);
8295
-                    if (texture == null)
8296
-                        texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8410
+              //      texturecache = textures.get(texname); // suspicious
8411
+                    if (texturecache == null)
8412
+                        texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8413
+                    else
8414
+                        new Exception().printStackTrace();
82978415                 } else
82988416                 {
82998417                     //if (tex.equals("IMMORTAL"))
....@@ -8301,11 +8419,13 @@
83018419                     //    texture = GetResourceTexture("default.png");
83028420                     //} else
83038421                     //{
8304
-                        if (tex.equals("WHITE_NOISE"))
8422
+                        if (texname.endsWith("WHITE_NOISE"))
83058423                         {
8306
-                            texture = textures.get(tex);
8307
-                            if (texture == null)
8308
-                                texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
8424
+                //            texturecache = textures.get(texname); // suspicious
8425
+                            if (texturecache == null)
8426
+                                texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
8427
+                            else
8428
+                                new Exception().printStackTrace();
83098429                         } else
83108430                         {
83118431                             if (textureon)
....@@ -8364,19 +8484,19 @@
83648484                                 if (texturedata == null)
83658485                                     throw new Exception();
83668486                                     
8367
-                                    texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
8487
+                                    texturecache = new CacheTexture(texturedata,resolution);
83688488         //texture = GetTexture(tex, bump);
83698489                             }
83708490                         }
83718491                     //}
83728492                 }
83738493 
8374
-                if (/*CACHETEXTURE &&*/ texture != null && textureon)
8494
+                if (texdata == null && /*CACHETEXTURE &&*/ texturecache != null && textureon)
83758495                 {
83768496                     //return false;
83778497 
83788498              //       System.out.println("CACHE  +++++++++++++++  TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8379
-                    if (texturedata != null && (texname.endsWith(".jpg") || texname.endsWith(".JPG")))
8499
+                    if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
83808500                     {
83818501 //                        String ext = "_highres";
83828502 //                        if (REDUCETEXTURE)
....@@ -8393,52 +8513,17 @@
83938513                         File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
83948514                         if (!cachefile.exists())
83958515                         {
8396
-                            // cache to disk
8397
-                            Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8398
-                        //buffers[0].
8399
-
8400
-                            ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8401
-                            int[] pixels = new int[bytebuf.capacity()/3];
8402
-                            
8403
-                            // squared size heuristic...
8404
-                            if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
8516
+                            //if (texturedata.getWidth() == texturedata.getHeight())
84058517                             {
8406
-                                for (int i=pixels.length; --i>=0;)
8407
-                                {
8408
-                                    int i3 = i*3;
8409
-                                    pixels[i] = 0xFF;
8410
-                                    pixels[i] <<= 8;
8411
-                                    pixels[i] |= bytebuf.get(i3+2) & 0xFF;
8412
-                                    pixels[i] <<= 8;
8413
-                                    pixels[i] |= bytebuf.get(i3+1) & 0xFF;
8414
-                                    pixels[i] <<= 8;
8415
-                                    pixels[i] |= bytebuf.get(i3) & 0xFF;
8416
-                                }
8417
-
8418
-                /*
8419
-                int r=0,g=0,b=0,a=0;
8420
-                for (int i=0; i<width; i++)
8421
-                for (int j=0; j<height; j++)
8422
-                {
8423
-                int index = j*width+i;
8424
-                int p = pixels[index];
8425
-                a = ((p>>24) & 0xFF);
8426
-                r = ((p>>16) & 0xFF);
8427
-                g = ((p>>8) & 0xFF);
8428
-                b = (p & 0xFF);
8429
-                pixels[index] = (a<<24) | (b<<16) | (g<<8) | r;
8430
-                }
8431
-                /**/
8432
-                                int width = (int)Math.sqrt(pixels.length); // squared
8433
-                                int height = width;
8434
-                                BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8435
-                                rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
8518
+                                BufferedImage rendImage = CreateBim(texturedata);
8519
+                                
84368520                                 ImageWriter writer = null;
84378521                                 Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
84388522                                 if (iter.hasNext()) {
84398523                                     writer = (ImageWriter)iter.next();
84408524                                 }
8441
-                                float compressionQuality = 0.9f;
8525
+                                
8526
+                                float compressionQuality = 0.85f;
84428527                                 try
84438528                                 {
84448529                                     ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
....@@ -8455,18 +8540,20 @@
84558540                             }
84568541                         }
84578542                     }
8458
-                            
8543
+                    
8544
+                    Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
8545
+                    
84598546                     //System.out.println("Texture = " + tex);
8460
-                    if (textures.containsKey(texname))
8547
+                    if (textures.containsKey(tex))
84618548                     {
8462
-                        CacheTexture thetex = textures.get(texname);
8549
+                        CacheTexture thetex = textures.get(tex);
84638550                         thetex.texture.disable();
84648551                         thetex.texture.dispose();
8465
-                        textures.remove(texname);
8552
+                        textures.remove(tex);
84668553                     }
84678554                     
8468
-                    texture.texturedata = texturedata;
8469
-                    textures.put(texname, texture);
8555
+                    //texture.texturedata = texturedata;
8556
+                    textures.put(tex, texturecache);
84708557 
84718558            //         newtex = true;
84728559                 }
....@@ -8482,10 +8569,44 @@
84828569             }
84838570         }
84848571         
8485
-        return texture;
8572
+        return texturecache;
84868573     }
84878574     
8488
-    com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
8575
+    static void EmbedTextures(cTexture tex)
8576
+    {
8577
+        if (tex.pigmentdata == null)
8578
+        {
8579
+            //String texname = Object3D.GetPigment(tex);
8580
+            
8581
+            CacheTexture texturecache = texturepigment.get(tex);
8582
+            
8583
+            if (texturecache != null)
8584
+            {
8585
+                tex.pw = texturecache.texturedata.getWidth();
8586
+                tex.ph = texturecache.texturedata.getHeight();
8587
+                tex.pigmentdata = //CompressJPEG(CreateBim
8588
+                        ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
8589
+                        ;
8590
+                        //, tex.pw, tex.ph), 0.5f);
8591
+            }
8592
+        }
8593
+        
8594
+        if (tex.bumpdata == null)
8595
+        {
8596
+            //String texname = Object3D.GetBump(tex);
8597
+            
8598
+            CacheTexture texturecache = texturebump.get(tex);
8599
+            
8600
+            if (texturecache != null)
8601
+            {
8602
+                tex.bw = texturecache.texturedata.getWidth();
8603
+                tex.bh = texturecache.texturedata.getHeight();
8604
+                tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
8605
+            }
8606
+        }
8607
+    }
8608
+    
8609
+    com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
84898610     {
84908611         CacheTexture texture = GetCacheTexture(tex, bump, resolution);
84918612                 
....@@ -8503,26 +8624,26 @@
85038624         return texture!=null?texture.texture:null;
85048625     }
85058626     
8506
-    public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
8627
+    public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
85078628     {
85088629         CacheTexture texture = GetCacheTexture(tex, bump, resolution);
85098630                 
85108631         return texture!=null?texture.texturedata:null;
85118632     }
85128633     
8513
-    com.sun.opengl.util.texture.Texture BindTexture(String tex, boolean bump, int resolution) throws Exception
8634
+    boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
85148635     {
85158636         if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
85168637         {
85178638             return false;
85188639         }
85198640 
8520
-        boolean newtex = false;
8641
+        //boolean newtex = false;
85218642 
85228643         com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
85238644 
85248645         if (texture == null)
8525
-            return texture;
8646
+            return false;
85268647         /**/
85278648 
85288649         if (textureon || tex.equals("DEFAULT_TEXTURE") || tex.equals("DEFAULT_TEXTURE_BUMP") || tex.equals("WHITE_NOISE")) // || tex.equals("IMMORTAL"))
....@@ -8549,9 +8670,75 @@
85498670         texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
85508671         texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
85518672         
8552
-        return newtex;
8673
+        return true; // Warning: not used.
85538674     }
85548675     
8676
+    public static byte[] CompressJPEG(BufferedImage image, float quality)
8677
+    {
8678
+        try
8679
+        {
8680
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
8681
+            Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
8682
+            ImageWriter writer = writers.next();
8683
+
8684
+            ImageWriteParam param = writer.getDefaultWriteParam();
8685
+            param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
8686
+            param.setCompressionQuality(quality);
8687
+
8688
+            ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
8689
+            writer.setOutput(ios);
8690
+            writer.write(null, new IIOImage(image, null, null), param);
8691
+
8692
+            byte[] data = baos.toByteArray();
8693
+            writer.dispose();
8694
+            return data;
8695
+        }
8696
+        catch (Exception e)
8697
+        {
8698
+            e.printStackTrace();
8699
+            return null;
8700
+        }
8701
+    }
8702
+
8703
+    public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
8704
+    {
8705
+        ByteArrayInputStream baos = new ByteArrayInputStream(image);
8706
+        Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
8707
+        ImageReader reader = writers.next();
8708
+        
8709
+        BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
8710
+        
8711
+        ImageReadParam param = reader.getDefaultReadParam();
8712
+        param.setDestination(bim);
8713
+        //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
8714
+
8715
+        ImageInputStream ios = ImageIO.createImageInputStream(baos);
8716
+        reader.setInput(ios);
8717
+        BufferedImage bim2 = reader.read(0, param);
8718
+        reader.dispose();
8719
+        
8720
+//        WritableRaster raster = bim2.getRaster();
8721
+//        DataBufferByte data   = (DataBufferByte) raster.getDataBuffer();
8722
+//        byte[] bytes = data.getData();
8723
+//        
8724
+//        int[] pixels = new int[bytes.length/3];
8725
+//        for (int i=pixels.length; --i>=0;)
8726
+//        {
8727
+//            int i3 = i*3;
8728
+//            pixels[i] = 0xFF;
8729
+//            pixels[i] <<= 8;
8730
+//            pixels[i] |= bytes[i3+2] & 0xFF;
8731
+//            pixels[i] <<= 8;
8732
+//            pixels[i] |= bytes[i3+1] & 0xFF;
8733
+//            pixels[i] <<= 8;
8734
+//            pixels[i] |= bytes[i3] & 0xFF;
8735
+//        }
8736
+//        
8737
+//        bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
8738
+        
8739
+        return bim;
8740
+    }
8741
+
85558742     ShadowBuffer shadowPBuf;
85568743     AntialiasBuffer antialiasPBuf;
85578744     int MAXSTACK;
....@@ -11297,7 +11484,7 @@
1129711484             }
1129811485         }
1129911486 
11300
-        if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11487
+        if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
1130111488         {
1130211489             //gl.glDepthFunc(GL.GL_LEQUAL);
1130311490             //gl.glClear(gl.GL_COLOR_BUFFER_BIT | gl.GL_DEPTH_BUFFER_BIT);
....@@ -11305,24 +11492,21 @@
1130511492 
1130611493             boolean texon = textureon;
1130711494 
11308
-            if (RENDERPROGRAM > 0)
11309
-            {
11310
-                gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11311
-                textureon = false;
11312
-            }
11495
+            gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11496
+            textureon = false;
11497
+            
1131311498             //gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
1131411499             //System.out.println("ALLO");
1131511500             gl.glColorMask(false, false, false, false);
1131611501             DrawObject(gl);
11317
-            if (RENDERPROGRAM > 0)
11318
-            {
11319
-                gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11320
-                textureon = texon;
11321
-            }
11502
+            
11503
+            gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11504
+            textureon = texon;
11505
+
1132211506             gl.glColorMask(true, true, true, true);
1132311507 
1132411508             gl.glDepthFunc(GL.GL_EQUAL);
11325
-        //gl.glDepthMask(false);
11509
+            gl.glDepthMask(false);
1132611510         }
1132711511 
1132811512         if (false) // DrawMode() == SHADOW)
....@@ -11662,20 +11846,32 @@
1166211846                 ReleaseTextures(DEFAULT_TEXTURES);
1166311847 
1166411848                 if (CLEANCACHE)
11665
-                for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
11849
+                for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
1166611850                 {
11667
-                    String tex = e.nextElement();
11851
+                    cTexture tex = e.nextElement();
1166811852 
1166911853            //     System.out.println("Texture --------- " + tex);
1167011854 
11671
-                    if (tex.equals("WHITE_NOISE"))
11855
+                    if (tex.equals("WHITE_NOISE:"))
1167211856                         continue;
1167311857 
11674
-                    if (!usedtextures.containsKey(tex))
11858
+                    if (!usedtextures.contains(tex))
1167511859                     {
11860
+                        CacheTexture gettex = texturepigment.get(tex);
1167611861                //         System.out.println("DISPOSE  +++++++++++++++  " + tex);
11677
-                        textures.get(tex).texture.dispose();
11678
-                        textures.remove(tex);
11862
+                        if (gettex != null)
11863
+                        {
11864
+                            gettex.texture.dispose();
11865
+                            texturepigment.remove(tex);
11866
+                        }
11867
+                        
11868
+                        gettex = texturebump.get(tex);
11869
+               //         System.out.println("DISPOSE  +++++++++++++++  " + tex);
11870
+                        if (gettex != null)
11871
+                        {
11872
+                            gettex.texture.dispose();
11873
+                            texturebump.remove(tex);
11874
+                        }
1167911875                     }
1168011876                 }
1168111877             }
....@@ -14868,7 +15064,8 @@
1486815064 //                break;
1486915065             case 'T':
1487015066                 CACHETEXTURE ^= true;
14871
-                textures.clear();
15067
+                texturepigment.clear();
15068
+                texturebump.clear();
1487215069             //    repaint();
1487315070                 break;
1487415071             case 'Y':