blame | history | patch | commit | commitdiff
Normand Briere
2019-08-15 33504fc9a180903aace77613264550754fba5706 
 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
....@@ -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     
....@@ -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);
....@@ -9233,6 +9238,8 @@
92339238 
92349239     void LoadEnvy(int which)
92359240     {
9241
+        assert(false);
9242
+        
92369243         String name;
92379244         String ext;
92389245 
....@@ -11077,18 +11084,34 @@
1107711084 //
1107811085 //        newenvy = -1;
1107911086         
11080
-        if (object.skyboxname != null)
11087
+        if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
1108111088         {
11082
-            if (!object.skyboxname.equals(this.loadedskyboxname))
11089
+            if (cubemaprgb == null)
1108311090             {
11084
-                LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
11085
-                loadedskyboxname = object.skyboxname;
11091
+                cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb" + "/", "jpg", false);
1108611092             }
11093
+            
11094
+            cubemap = cubemaprgb;
1108711095         }
1108811096         else
1108911097         {
11090
-            cubemap = null;
11091
-            loadedskyboxname = null;
11098
+            if (object.skyboxname != null)
11099
+            {
11100
+                if (!object.skyboxname.equals(this.loadedskyboxname))
11101
+                {
11102
+                    if (cubemap != null && cubemap != cubemaprgb)
11103
+                        cubemap.dispose();
11104
+                    cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
11105
+                    loadedskyboxname = object.skyboxname;
11106
+                }
11107
+            }
11108
+            else
11109
+            {
11110
+                cubemapcustom = null;
11111
+                loadedskyboxname = null;
11112
+            }
11113
+            
11114
+            cubemap = cubemapcustom;
1109211115         }
1109311116         
1109411117         ratio = ((double) getWidth()) / getHeight();
....@@ -16769,7 +16792,8 @@
1676916792         gl.glDisable(GL.GL_TEXTURE_GEN_R);
1677016793 
1677116794         cubemap.disable();
16772
-        ////cubemap.unbind();
16795
+        //cubemap.dispose();
16796
+        
1677316797         if (CULLFACE)
1677416798         {
1677516799             gl.glEnable(gl.GL_CULL_FACE);
....@@ -17533,10 +17557,14 @@
1753317557             gl.glFlush();
1753417558             
1753517559             /**/
17536
-            gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
17560
+            gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
1753717561 
17538
-            float[] pixels = occlusionsizebuffer.array();
17562
+            float[] depths = occlusiondepthbuffer.array();
1753917563 
17564
+            gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
17565
+
17566
+            int[] pixels = selectsizebuffer.array();
17567
+            
1754017568             double r = 0, g = 0, b = 0;
1754117569 
1754217570             double count = 0;
....@@ -17547,7 +17575,7 @@
1754717575             
1754817576             double FACTOR = 1;
1754917577 
17550
-            for (int i = 0; i < pixels.length; i++)
17578
+            for (int i = 0; i < depths.length; i++)
1755117579             {
1755217580                 int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
1755317581                 int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
....@@ -17630,7 +17658,7 @@
1763017658 
1763117659                 double scale = ray.z; // 1; // cos
1763217660 
17633
-                float depth = pixels[newindex];
17661
+                float depth = depths[newindex];
1763417662 
1763517663                 /*
1763617664                 int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
....@@ -17827,11 +17855,14 @@
1782717855     static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
1782817856     static IntBuffer bigAAbuffer;
1782917857     static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17830
-    static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17858
+    //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
1783117859     static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
1783217860     static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
1783317861     //static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17834
-    static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17862
+    static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17863
+    
17864
+    static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17865
+    
1783517866     static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
1783617867     static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
1783717868     static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();