parent: c570e1e3 | patch | commit
Normand Briere
2019-07-23 cf7cfa1c792eebba606a48aa648893f6e4873263 
Embed JPEG.
3 files modified
127 ■■■■■ changed files
CameraPane.java 122 ●●●●● patch | view | raw | blame | history
Grafreed.java 4 ●●●●● patch | view | raw | blame | history
ObjEditor.java 1 ●●●●● patch | view | raw | blame | history 
 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 {
....@@ -93,7 +97,7 @@
9397     //boolean REDUCETEXTURE = true;
9498     boolean CACHETEXTURE = true;
9599     boolean CLEANCACHE = false; // true;
96
-    boolean MIPMAP = true; // false; // true;
100
+    boolean MIPMAP = false; // true; // never works...
97101     boolean COMPRESSTEXTURE = false;
98102     boolean KOMPACTTEXTURE = false; // true;
99103     boolean RESIZETEXTURE = false;
....@@ -8358,14 +8362,26 @@
83588362             {
83598363                 TextureData texturedata = null;
83608364             
8361
-                if (texdata != null)
8365
+                if (texdata != null && textureon)
83628366                 {
8363
-                    BufferedImage bim = //new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
8367
+                    BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
83648368                     
8365
-                         CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
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
+                            }
83668377                     
83678378                     texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
83688379                     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;
83698385                 }
83708386                 else
83718387                 if (texname.endsWith("DEFAULT_TEXTURE")) // ||*/ tex.equals(""))
....@@ -8560,29 +8576,32 @@
85608576     {
85618577         if (tex.pigmentdata == null)
85628578         {
8563
-            String texname = Object3D.GetPigment(tex);
8579
+            //String texname = Object3D.GetPigment(tex);
85648580             
85658581             CacheTexture texturecache = texturepigment.get(tex);
85668582             
85678583             if (texturecache != null)
85688584             {
8569
-                tex.pigmentdata = ((ByteBuffer)texturecache.texturedata.getBuffer()).array();
85708585                 tex.pw = texturecache.texturedata.getWidth();
85718586                 tex.ph = texturecache.texturedata.getHeight();
8587
+                tex.pigmentdata = //CompressJPEG(CreateBim
8588
+                        ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
8589
+                        ;
8590
+                        //, tex.pw, tex.ph), 0.5f);
85728591             }
85738592         }
85748593         
85758594         if (tex.bumpdata == null)
85768595         {
8577
-            String texname = Object3D.GetBump(tex);
8596
+            //String texname = Object3D.GetBump(tex);
85788597             
85798598             CacheTexture texturecache = texturebump.get(tex);
85808599             
85818600             if (texturecache != null)
85828601             {
8583
-                tex.bumpdata = ((ByteBuffer)texturecache.texturedata.getBuffer()).array();
85848602                 tex.bw = texturecache.texturedata.getWidth();
85858603                 tex.bh = texturecache.texturedata.getHeight();
8604
+                tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
85868605             }
85878606         }
85888607     }
....@@ -8654,6 +8673,72 @@
86548673         return true; // Warning: not used.
86558674     }
86568675     
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
+
86578742     ShadowBuffer shadowPBuf;
86588743     AntialiasBuffer antialiasPBuf;
86598744     int MAXSTACK;
....@@ -11399,7 +11484,7 @@
1139911484             }
1140011485         }
1140111486 
11402
-        if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11487
+        if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
1140311488         {
1140411489             //gl.glDepthFunc(GL.GL_LEQUAL);
1140511490             //gl.glClear(gl.GL_COLOR_BUFFER_BIT | gl.GL_DEPTH_BUFFER_BIT);
....@@ -11407,24 +11492,21 @@
1140711492 
1140811493             boolean texon = textureon;
1140911494 
11410
-            if (RENDERPROGRAM > 0)
11411
-            {
11412
-                gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11413
-                textureon = false;
11414
-            }
11495
+            gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11496
+            textureon = false;
11497
+            
1141511498             //gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
1141611499             //System.out.println("ALLO");
1141711500             gl.glColorMask(false, false, false, false);
1141811501             DrawObject(gl);
11419
-            if (RENDERPROGRAM > 0)
11420
-            {
11421
-                gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11422
-                textureon = texon;
11423
-            }
11502
+            
11503
+            gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11504
+            textureon = texon;
11505
+
1142411506             gl.glColorMask(true, true, true, true);
1142511507 
1142611508             gl.glDepthFunc(GL.GL_EQUAL);
11427
-        //gl.glDepthMask(false);
11509
+            gl.glDepthMask(false);
1142811510         }
1142911511 
1143011512         if (false) // DrawMode() == SHADOW)


 Grafreed.java
....@@ -626,12 +626,12 @@
626626 
627627                         System.out.println("jarfile = " + jarfile);
628628                         
629
-            String command = javaPath + " -Xmx1024m -Djava.library.path=" + jarpath;
629
+            String command = javaPath + " -Xmx2048m -Djava.library.path=" + jarpath;
630630             
631631             // -Djava.library.path=/Users/nbriere/Projects/shared/lib
632632         if (jarfile.charAt(2) == ':')
633633         {
634
-            command = "\"" + javaPath + "\" -Xmx1024m -Djava.library.path=" + jarpath;
634
+            command = "\"" + javaPath + "\" -Xmx2048m -Djava.library.path=" + jarpath;
635635                 // On Windows systems, the path is /C:/
636636                 jarfile = jarfile.substring(1, jarfile.length());
637637                 System.out.println("jarfile = " + jarfile);


 ObjEditor.java
....@@ -4889,6 +4889,7 @@
48894889                 }
48904890             } catch (ClassCastException e)
48914891             {
4892
+                e.printStackTrace();
48924893                 assert (false);
48934894                 Composite c = (Composite) copy;
48944895                 c.children.clear();