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     
....@@ -8778,10 +8781,12 @@
87788781 
87798782         gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
87808783         MAXSTACK = temp[0];
8781
-        System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8784
+        if (Globals.DEBUG)
8785
+            System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
87828786         gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
87838787         MAXSTACK = temp[0];
8784
-        System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8788
+        if (Globals.DEBUG)
8789
+            System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
87858790 
87868791         // Use debug pipeline
87878792         //drawable.setGL(new DebugGL(gl)); //
....@@ -8789,7 +8794,8 @@
87898794         gl = drawable.getGL(); //
87908795 
87918796         GL gl3 = getGL();
8792
-        System.out.println("INIT GL IS: " + gl.getClass().getName());
8797
+        if (Globals.DEBUG)
8798
+            System.out.println("INIT GL IS: " + gl.getClass().getName());
87938799 
87948800 
87958801         //float pos[] = { 100, 100, 100, 0 };
....@@ -9230,6 +9236,8 @@
92309236 
92319237     void LoadEnvy(int which)
92329238     {
9239
+        assert(false);
9240
+        
92339241         String name;
92349242         String ext;
92359243 
....@@ -11074,18 +11082,32 @@
1107411082 //
1107511083 //        newenvy = -1;
1107611084         
11077
-        if (object.skyboxname != null)
11085
+        if (object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
1107811086         {
11079
-            if (!object.skyboxname.equals(this.loadedskyboxname))
11087
+            if (cubemaprgb == null)
1108011088             {
11081
-                LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
11082
-                loadedskyboxname = object.skyboxname;
11089
+                cubemaprgb = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
1108311090             }
11091
+            
11092
+            cubemap = cubemaprgb;
1108411093         }
1108511094         else
1108611095         {
11087
-            cubemap = null;
11088
-            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;
1108911111         }
1109011112         
1109111113         ratio = ((double) getWidth()) / getHeight();
....@@ -17530,10 +17552,14 @@
1753017552             gl.glFlush();
1753117553             
1753217554             /**/
17533
-            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);
1753417556 
17535
-            float[] pixels = occlusionsizebuffer.array();
17557
+            float[] depths = occlusiondepthbuffer.array();
1753617558 
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
+            
1753717563             double r = 0, g = 0, b = 0;
1753817564 
1753917565             double count = 0;
....@@ -17544,7 +17570,7 @@
1754417570             
1754517571             double FACTOR = 1;
1754617572 
17547
-            for (int i = 0; i < pixels.length; i++)
17573
+            for (int i = 0; i < depths.length; i++)
1754817574             {
1754917575                 int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
1755017576                 int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
....@@ -17627,7 +17653,7 @@
1762717653 
1762817654                 double scale = ray.z; // 1; // cos
1762917655 
17630
-                float depth = pixels[newindex];
17656
+                float depth = depths[newindex];
1763117657 
1763217658                 /*
1763317659                 int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
....@@ -17824,11 +17850,14 @@
1782417850     static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
1782517851     static IntBuffer bigAAbuffer;
1782617852     static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17827
-    static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17853
+    //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
1782817854     static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
1782917855     static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
1783017856     //static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17831
-    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
+    
1783217861     static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
1783317862     static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
1783417863     static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();