blame | history | patch | commit | commitdiff
Normand Briere
2019-08-20 564f4d12d93813b5d680fc24d4f118c3886d96ed 
 CameraPane.java
....@@ -110,7 +110,11 @@
110110     //private Mat4f spotlightTransform = new Mat4f();
111111     //private Mat4f spotlightInverseTransform = new Mat4f();
112112     static GLContext glcontext = null;
113
-    /*static*/ com.sun.opengl.util.texture.Texture cubemap;
113
+    /*static*/ com.sun.opengl.util.texture.Texture cubemap; // Either custom or rgb
114
+    /*static*/ com.sun.opengl.util.texture.Texture cubemapcustom;
115
+    /*static*/ com.sun.opengl.util.texture.Texture cubemaprgb;
116
+    boolean transformMode;
117
+    
114118     boolean reverseUP = false;
115119     static boolean frozen = false;
116120     boolean enablebackspace = false; // patch for back buffer refresh
....@@ -164,7 +168,7 @@
164168 
165169     
166170     // OPTIONS
167
-    boolean Skinshader = true;
171
+    boolean Skinshader = false; // true;
168172     boolean cameraLight = false;
169173     boolean UVdebug = false;
170174     boolean Udebug = false;
....@@ -173,7 +177,7 @@
173177     static boolean doublesided = false; // true; // reversed normals are awful for conformance
174178     boolean anisotropy = true;
175179     boolean softshadow = true; // slower but better false;
176
-    boolean opacityhalo = false;
180
+    boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
177181     
178182     boolean macromode = false;
179183     
....@@ -188,15 +192,16 @@
188192     
189193     private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
190194 
191
-    public void LoadSkybox(String name, String ext, boolean mipmap) throws GLException
195
+    public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
192196     {
193197         try
194198         {
195
-            cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
199
+            return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
196200         } catch (IOException e)
197201         {
198202             System.out.println("NAME = " + name);
199203             e.printStackTrace(); // throw new RuntimeException(e);
204
+            return null;
200205         }
201206     }
202207     
....@@ -1814,7 +1819,7 @@
18141819 
18151820         display.modelParams7[0] = 0;
18161821         display.modelParams7[1] = 1000;
1817
-        display.modelParams7[2] = 0;
1822
+        display.modelParams7[2] = material.parallax;
18181823         display.modelParams7[3] = 0;
18191824 
18201825         //display.modelParams6[0] = 100; // criss de bug de bump
....@@ -2047,9 +2052,9 @@
20472052         switch(viewcode)
20482053         {
20492054             case 0: return "main";
2050
-            case 1: return "one";
2051
-            case 2: return "two";
2052
-            case 3: return "three";
2055
+            case 1: return "Red";
2056
+            case 2: return "Green";
2057
+            case 3: return "Blue";
20532058             case 4: return "light";
20542059         }
20552060         
....@@ -2512,7 +2517,7 @@
25122517                     com.sun.opengl.util.texture.TextureIO.newTextureData(
25132518                     getClass().getClassLoader().getResourceAsStream(name),
25142519                     true,
2515
-                    com.sun.opengl.util.texture.TextureIO.PNG);
2520
+                    GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
25162521         } catch (java.io.IOException e)
25172522         {
25182523             throw new javax.media.opengl.GLException(e);
....@@ -8358,7 +8363,7 @@
83588363 //            else
83598364 //                if (!texname.startsWith("/"))
83608365 //                    texname = "/Users/nbriere/Textures/" + texname;
8361
-            if (!FileExists(texname))
8366
+            if (!FileExists(texname) && !texname.startsWith("@"))
83628367             {
83638368                     texname = fallbackTextureName;
83648369             }
....@@ -8441,6 +8446,15 @@
84418446                                 new Exception().printStackTrace();
84428447                         } else
84438448                         {
8449
+                        if (texname.startsWith("@"))
8450
+                        {
8451
+                //            texturecache = textures.get(texname); // suspicious
8452
+                            if (texturecache == null)
8453
+                                texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
8454
+                            else
8455
+                                new Exception().printStackTrace();
8456
+                        } else
8457
+                        {
84448458                             if (textureon)
84458459                             {
84468460                                 String cachename = texname;
....@@ -8500,6 +8514,7 @@
85008514                                     texturecache = new CacheTexture(texturedata,resolution);
85018515         //texture = GetTexture(tex, bump);
85028516                             }
8517
+                        }
85038518                         }
85048519                     //}
85058520                 }
....@@ -8768,10 +8783,12 @@
87688783 
87698784         gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
87708785         MAXSTACK = temp[0];
8771
-        System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8786
+        if (Globals.DEBUG)
8787
+            System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
87728788         gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
87738789         MAXSTACK = temp[0];
8774
-        System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8790
+        if (Globals.DEBUG)
8791
+            System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
87758792 
87768793         // Use debug pipeline
87778794         //drawable.setGL(new DebugGL(gl)); //
....@@ -8779,7 +8796,8 @@
87798796         gl = drawable.getGL(); //
87808797 
87818798         GL gl3 = getGL();
8782
-        System.out.println("INIT GL IS: " + gl.getClass().getName());
8799
+        if (Globals.DEBUG)
8800
+            System.out.println("INIT GL IS: " + gl.getClass().getName());
87838801 
87848802 
87858803         //float pos[] = { 100, 100, 100, 0 };
....@@ -9220,6 +9238,8 @@
92209238 
92219239     void LoadEnvy(int which)
92229240     {
9241
+        assert(false);
9242
+        
92239243         String name;
92249244         String ext;
92259245 
....@@ -10670,9 +10690,18 @@
1067010690     static boolean init = false;
1067110691     
1067210692     double[][] matrix = LA.newMatrix();
10693
+    
10694
+    // This is to refresh the UI of the material panel.
10695
+    ObjEditor patchMaterial;
1067310696 
1067410697     public void display(GLAutoDrawable drawable)
1067510698     {
10699
+        if (patchMaterial.patchMaterial)
10700
+        {
10701
+            patchMaterial.patchMaterial = false;
10702
+            patchMaterial.objectPanel.setSelectedIndex(1);
10703
+        }
10704
+        
1067610705         if (Grafreed.savesound && Grafreed.hassound)
1067710706         {
1067810707             Grafreed.wav.save();
....@@ -10841,7 +10870,7 @@
1084110870 
1084210871         if (wait)
1084310872         {
10844
-            Sleep(500);
10873
+            Sleep(200); // blocks everything
1084510874 
1084610875             wait = false;
1084710876         }
....@@ -11064,18 +11093,34 @@
1106411093 //
1106511094 //        newenvy = -1;
1106611095         
11067
-        if (object.skyboxname != null)
11096
+        if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
1106811097         {
11069
-            if (!object.skyboxname.equals(this.loadedskyboxname))
11098
+            if (cubemaprgb == null)
1107011099             {
11071
-                LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
11072
-                loadedskyboxname = object.skyboxname;
11100
+                cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
1107311101             }
11102
+            
11103
+            cubemap = cubemaprgb;
1107411104         }
1107511105         else
1107611106         {
11077
-            cubemap = null;
11078
-            loadedskyboxname = null;
11107
+            if (object.skyboxname != null)
11108
+            {
11109
+                if (!object.skyboxname.equals(this.loadedskyboxname))
11110
+                {
11111
+                    if (cubemap != null && cubemap != cubemaprgb)
11112
+                        cubemap.dispose();
11113
+                    cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
11114
+                    loadedskyboxname = object.skyboxname;
11115
+                }
11116
+            }
11117
+            else
11118
+            {
11119
+                cubemapcustom = null;
11120
+                loadedskyboxname = null;
11121
+            }
11122
+            
11123
+            cubemap = cubemapcustom;
1107911124         }
1108011125         
1108111126         ratio = ((double) getWidth()) / getHeight();
....@@ -12548,7 +12593,7 @@
1254812593                 "PARAM params4   = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
1254912594                 "PARAM params5   = program.env[5];" + // texture, opacity, fakedepth, shadowbias
1255012595                 "PARAM params6   = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12551
-                "PARAM params7   = program.env[7];" + // noise power, opacity power
12596
+                "PARAM params7   = program.env[7];" + // noise power, opacity power, parallax
1255212597                 "PARAM options0   = program.env[63];" + // fog density, intensity, elevation
1255312598                 "PARAM options1   = program.env[62];" + // fog rgb color
1255412599                 "PARAM options2   = program.env[61];" + // image intensity, subsurface, lightsheen
....@@ -12793,7 +12838,7 @@
1279312838        "POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
1279412839 // mar 2013 ???                "KIL alpha.a;" +
1279512840                 "MOV alpha, texSamp.aaaa;" + // y;" +
12796
-         "KIL alpha.a;" +
12841
+         "KIL alpha.a;" + // not sure with parallax mapping
1279712842                 /*
1279812843                 "MUL temp.xy, temp, two;" +
1279912844                 "TXB bump, temp, texture[0], 2D;" +
....@@ -12879,11 +12924,6 @@
1287912924                 "SUB bump0, bump0, half;" +
1288012925                 "ADD bump, bump, bump0;" +
1288112926                 
12882
-                "MOV temp.x, texSamp.a;" +
12883
-                "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12884
-                //"LRP texSamp0, params5.x, texSamp0, one;" +
12885
-                "MOV texSamp.a, temp.x;" +
12886
-
1288712927                 // double-sided
1288812928                 /**/
1288912929 (doublesided?"DP3 temp.z, normal, eye;" +
....@@ -12913,6 +12953,41 @@
1291312953                 Normalize("U") +
1291412954                 
1291512955 // parallax mapping
12956
+
12957
+                "DP3 temp2.x, V, eye;" +
12958
+                "DP3 temp2.y, U, eye;" +
12959
+                "DP3 temp2.z, normal, eye;" +
12960
+                "RCP temp2.z, temp2.z;" +
12961
+                
12962
+                "DP3 temp2.w, texSamp, texSamp;" + // Height
12963
+                "RSQ temp2.w, temp2.w;" +
12964
+                "RCP temp2.w, temp2.w;" +
12965
+                
12966
+                "SUB temp2.w, temp2.w, half;" +
12967
+//                "SGE temp.x, temp2.w, eps.x;" +
12968
+//                "MUL temp2.w, temp2.w, temp.x;" +
12969
+                
12970
+                //"MOV texSamp, U;" +
12971
+                
12972
+                "MUL temp2.z, temp2.z, temp2.w;" +
12973
+                "MUL temp2.z, temp2.z, params7.z;" + // parallax
12974
+                
12975
+                "MUL temp2, temp2, temp2.z;" +
12976
+                
12977
+                "MOV temp, fragment.texcoord[0];" +
12978
+                
12979
+                "SUB temp, temp, temp2;" +
12980
+                
12981
+                "TEX texSamp, temp, texture[0], 2D;" +
12982
+                "POW texSamp.a, texSamp.a, params6.w;" + // punch through
12983
+                "MOV alpha, texSamp.aaaa;" +
12984
+                
12985
+// parallax mapping
12986
+                
12987
+                "MOV temp.x, texSamp.a;" +
12988
+                "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12989
+                //"LRP texSamp0, params5.x, texSamp0, one;" +
12990
+                "MOV texSamp.a, temp.x;" +
1291612991 
1291712992 //"MOV temp, fragment.texcoord[0];" +
1291812993 //                
....@@ -13383,8 +13458,12 @@
1338313458             program = programmin;
1338413459         }
1338513460         
13386
-        System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13387
-        System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13461
+        if (Globals.DEBUG)
13462
+        {
13463
+            System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13464
+            System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13465
+        }
13466
+        
1338813467         loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1338913468 
1339013469     //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -13431,7 +13510,8 @@
1343113510                 "\n" +
1343213511                 "END\n";
1343313512 
13434
-        System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13513
+        if (Globals.DEBUG)
13514
+            System.out.println("Program shadow #" + 0 + "; length = " + program.length());
1343513515         loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1343613516 
1343713517     //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -13689,7 +13769,7 @@
1368913769     /*static*/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
1369013770     /*static*/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
1369113771     /*static*/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13692
-    /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13772
+    /*static*/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
1369313773     
1369413774     //Object3D.cVector2[] vector2buffer;
1369513775 
....@@ -14630,11 +14710,17 @@
1463014710     void GoDown(int mod)
1463114711     {
1463214712         MODIFIERS |= COMMAND;
14713
+        boolean isVR = (mouseMode&VR)!=0;
1463314714         /**/
1463414715         if((mod&SHIFT) == SHIFT)
14635
-        manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14716
+        {
14717
+            if (isVR)
14718
+                manipCamera.RotateInterest(0, -speed);
14719
+            else
14720
+                manipCamera.RotatePosition(0, -speed);
14721
+        }
1463614722         else
14637
-        manipCamera.RotatePosition(0, -speed);
14723
+            manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
1463814724         /**/
1463914725         if ((mod & SHIFT) == SHIFT)
1464014726         {
....@@ -14644,6 +14730,8 @@
1464414730             mouseMode |= BACKFORTH;
1464514731         }
1464614732 
14733
+        targetLookAt.set(manipCamera.lookAt);
14734
+        
1464714735         //prevX = X = anchorX;
1464814736         prevY = Y = anchorY - (int) (renderCamera.Distance());
1464914737     }
....@@ -14652,10 +14740,17 @@
1465214740     {
1465314741         MODIFIERS |= COMMAND;
1465414742         /**/
14743
+        boolean isVR = (mouseMode&VR)!=0;
14744
+        
1465514745         if((mod&SHIFT) == SHIFT)
14656
-        manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14746
+        {
14747
+            if (isVR)
14748
+                manipCamera.RotateInterest(0, speed);
14749
+            else
14750
+                manipCamera.RotatePosition(0, speed);
14751
+        }
1465714752         else
14658
-        manipCamera.RotatePosition(0, speed);
14753
+            manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
1465914754         /**/
1466014755         if ((mod & SHIFT) == SHIFT)
1466114756         {
....@@ -14665,6 +14760,8 @@
1466514760             mouseMode |= BACKFORTH;
1466614761         }
1466714762 
14763
+        targetLookAt.set(manipCamera.lookAt);
14764
+        
1466814765         //prevX = X = anchorX;
1466914766         prevY = Y = anchorY + (int) (renderCamera.Distance());
1467014767     }
....@@ -14674,9 +14771,14 @@
1467414771         MODIFIERS |= COMMAND;
1467514772         /**/
1467614773         if((mod&SHIFT) == SHIFT)
14677
-        manipCamera.Translate(speed*delta, 0, getWidth());
14774
+            manipCamera.Translate(speed*delta, 0, getWidth());
1467814775         else
14679
-        manipCamera.RotatePosition(speed, 0);
14776
+        {
14777
+            if ((mouseMode&VR)!=0)
14778
+                manipCamera.RotateInterest(-speed, 0);
14779
+            else
14780
+                manipCamera.RotatePosition(speed, 0);
14781
+        }
1468014782         /**/
1468114783         if ((mod & SHIFT) == SHIFT)
1468214784         {
....@@ -14686,6 +14788,8 @@
1468614788             mouseMode |= ROTATE;
1468714789         } // TRANSLATE;
1468814790 
14791
+        targetLookAt.set(manipCamera.lookAt);
14792
+        
1468914793         prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
1469014794         prevY = Y = anchorY;
1469114795     }
....@@ -14695,9 +14799,15 @@
1469514799         MODIFIERS |= COMMAND;
1469614800         /**/
1469714801         if((mod&SHIFT) == SHIFT)
14698
-        manipCamera.Translate(-speed*delta, 0, getWidth());
14802
+            manipCamera.Translate(-speed*delta, 0, getWidth());
1469914803         else
14700
-        manipCamera.RotatePosition(-speed, 0);
14804
+        {
14805
+            if ((mouseMode&VR)!=0)
14806
+                manipCamera.RotateInterest(speed, 0);
14807
+            else
14808
+                manipCamera.RotatePosition(-speed, 0);
14809
+        }
14810
+        
1470114811         /**/
1470214812         if ((mod & SHIFT) == SHIFT)
1470314813         {
....@@ -14707,6 +14817,8 @@
1470714817             mouseMode |= ROTATE;
1470814818         } // TRANSLATE;
1470914819 
14820
+        targetLookAt.set(manipCamera.lookAt);
14821
+        
1471014822         prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
1471114823         prevY = Y = anchorY;
1471214824     }
....@@ -15209,8 +15321,8 @@
1520915321             case 'K':
1521015322                 KOMPACTTEXTURE ^= true;
1521115323                 //textures.clear();
15212
-                break;
15213
-            case 'P': // Texture Projection macros
15324
+            //    break;
15325
+            //case 'P': // Texture Projection macros
1521415326 //                SAVETEXTURE ^= true;
1521515327                 macromode = true;
1521615328                 Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
....@@ -15331,7 +15443,7 @@
1533115443                 targetLookAt.set(manipCamera.lookAt);
1533215444                 repaint();
1533315445                 break;
15334
-            case 'p':
15446
+            case 'P': // p':
1533515447        // c'est quoi ca au juste?         spherical ^= true;
1533615448                 Skinshader ^= true; programInitialized = false; 
1533715449                 repaint();
....@@ -16091,7 +16203,7 @@
1609116203                     {
1609216204                         switch (hitSomething)
1609316205                         {
16094
-                            case Object3D.hitCenter: gr.setColor(Color.pink);
16206
+                            case Object3D.hitCenter: gr.setColor(Color.white);
1609516207                                 gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
1609616208                                 break;
1609716209                             case Object3D.hitRotate: gr.setColor(Color.yellow);
....@@ -16117,7 +16229,7 @@
1611716229         if (hasMarquee)
1611816230         {
1611916231             gr.setXORMode(Color.white);
16120
-            gr.setColor(Color.red);
16232
+            gr.setColor(Color.white);
1612116233             if (!firstime)
1612216234             {
1612316235                 gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
....@@ -16657,6 +16769,7 @@
1665716769     private void DrawSkyBox(GL gl, float ratio)
1665816770     {
1665916771         if (//envyoff ||
16772
+            WIREFRAME ||
1666016773                 cubemap == null)
1666116774         {
1666216775             gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
....@@ -16755,7 +16868,8 @@
1675516868         gl.glDisable(GL.GL_TEXTURE_GEN_R);
1675616869 
1675716870         cubemap.disable();
16758
-        ////cubemap.unbind();
16871
+        //cubemap.dispose();
16872
+        
1675916873         if (CULLFACE)
1676016874         {
1676116875             gl.glEnable(gl.GL_CULL_FACE);
....@@ -17291,6 +17405,7 @@
1729117405 
1729217406         public void init(GLAutoDrawable drawable)
1729317407         {
17408
+        if (Globals.DEBUG)
1729417409             System.out.println("shadow buffer init");
1729517410 
1729617411             GL gl = drawable.getGL();
....@@ -17519,10 +17634,14 @@
1751917634             gl.glFlush();
1752017635             
1752117636             /**/
17522
-            gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
17637
+            gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
1752317638 
17524
-            float[] pixels = occlusionsizebuffer.array();
17639
+            float[] depths = occlusiondepthbuffer.array();
1752517640 
17641
+            gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
17642
+
17643
+            int[] pixels = selectsizebuffer.array();
17644
+            
1752617645             double r = 0, g = 0, b = 0;
1752717646 
1752817647             double count = 0;
....@@ -17533,7 +17652,7 @@
1753317652             
1753417653             double FACTOR = 1;
1753517654 
17536
-            for (int i = 0; i < pixels.length; i++)
17655
+            for (int i = 0; i < depths.length; i++)
1753717656             {
1753817657                 int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
1753917658                 int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
....@@ -17616,7 +17735,7 @@
1761617735 
1761717736                 double scale = ray.z; // 1; // cos
1761817737 
17619
-                float depth = pixels[newindex];
17738
+                float depth = depths[newindex];
1762017739 
1762117740                 /*
1762217741                 int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
....@@ -17813,11 +17932,14 @@
1781317932     static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
1781417933     static IntBuffer bigAAbuffer;
1781517934     static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17816
-    static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17935
+    //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
1781717936     static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
1781817937     static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
1781917938     //static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17820
-    static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17939
+    static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17940
+    
17941
+    static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17942
+    
1782117943     static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
1782217944     static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
1782317945     static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();