blame | history | patch | commit | commitdiff
Normand Briere
2019-08-13 c67de8aca04d988179191ccb52461af00125920e 
 CameraPane.java
....@@ -110,7 +110,9 @@
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;
114116     boolean reverseUP = false;
115117     static boolean frozen = false;
116118     boolean enablebackspace = false; // patch for back buffer refresh
....@@ -173,7 +175,7 @@
173175     static boolean doublesided = false; // true; // reversed normals are awful for conformance
174176     boolean anisotropy = true;
175177     boolean softshadow = true; // slower but better false;
176
-    boolean opacityhalo = false;
178
+    boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
177179     
178180     boolean macromode = false;
179181     
....@@ -188,15 +190,16 @@
188190     
189191     private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
190192 
191
-    public void LoadSkybox(String name, String ext, boolean mipmap) throws GLException
193
+    public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
192194     {
193195         try
194196         {
195
-            cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
197
+            return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
196198         } catch (IOException e)
197199         {
198200             System.out.println("NAME = " + name);
199201             e.printStackTrace(); // throw new RuntimeException(e);
202
+            return null;
200203         }
201204     }
202205     
....@@ -9233,6 +9236,8 @@
92339236 
92349237     void LoadEnvy(int which)
92359238     {
9239
+        assert(false);
9240
+        
92369241         String name;
92379242         String ext;
92389243 
....@@ -11077,18 +11082,32 @@
1107711082 //
1107811083 //        newenvy = -1;
1107911084         
11080
-        if (object.skyboxname != null)
11085
+        if (object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
1108111086         {
11082
-            if (!object.skyboxname.equals(this.loadedskyboxname))
11087
+            if (cubemaprgb == null)
1108311088             {
11084
-                LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
11085
-                loadedskyboxname = object.skyboxname;
11089
+                cubemaprgb = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
1108611090             }
11091
+            
11092
+            cubemap = cubemaprgb;
1108711093         }
1108811094         else
1108911095         {
11090
-            cubemap = null;
11091
-            loadedskyboxname = null;
11096
+            if (object.skyboxname != null)
11097
+            {
11098
+                if (!object.skyboxname.equals(this.loadedskyboxname))
11099
+                {
11100
+                    cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
11101
+                    loadedskyboxname = object.skyboxname;
11102
+                }
11103
+            }
11104
+            else
11105
+            {
11106
+                cubemapcustom = null;
11107
+                loadedskyboxname = null;
11108
+            }
11109
+            
11110
+            cubemap = cubemapcustom;
1109211111         }
1109311112         
1109411113         ratio = ((double) getWidth()) / getHeight();
....@@ -17533,10 +17552,14 @@
1753317552             gl.glFlush();
1753417553             
1753517554             /**/
17536
-            gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
17555
+            gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
1753717556 
17538
-            float[] pixels = occlusionsizebuffer.array();
17557
+            float[] depths = occlusiondepthbuffer.array();
1753917558 
17559
+            gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
17560
+
17561
+            int[] pixels = selectsizebuffer.array();
17562
+            
1754017563             double r = 0, g = 0, b = 0;
1754117564 
1754217565             double count = 0;
....@@ -17547,7 +17570,7 @@
1754717570             
1754817571             double FACTOR = 1;
1754917572 
17550
-            for (int i = 0; i < pixels.length; i++)
17573
+            for (int i = 0; i < depths.length; i++)
1755117574             {
1755217575                 int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
1755317576                 int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
....@@ -17630,7 +17653,7 @@
1763017653 
1763117654                 double scale = ray.z; // 1; // cos
1763217655 
17633
-                float depth = pixels[newindex];
17656
+                float depth = depths[newindex];
1763417657 
1763517658                 /*
1763617659                 int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
....@@ -17827,11 +17850,14 @@
1782717850     static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
1782817851     static IntBuffer bigAAbuffer;
1782917852     static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17830
-    static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17853
+    //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
1783117854     static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
1783217855     static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
1783317856     //static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17834
-    static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17857
+    static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17858
+    
17859
+    static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17860
+    
1783517861     static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
1783617862     static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
1783717863     static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();