blame | history | patch | commit | commitdiff
Normand Briere
2019-08-16 83d0c2fa0bd2e96448f776144e1a89cdb1bb6998 
 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);
....@@ -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 
....@@ -10841,7 +10861,7 @@
1084110861 
1084210862         if (wait)
1084310863         {
10844
-            Sleep(500);
10864
+            Sleep(200); // blocks everything
1084510865 
1084610866             wait = false;
1084710867         }
....@@ -11064,18 +11084,34 @@
1106411084 //
1106511085 //        newenvy = -1;
1106611086         
11067
-        if (object.skyboxname != null)
11087
+        if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
1106811088         {
11069
-            if (!object.skyboxname.equals(this.loadedskyboxname))
11089
+            if (cubemaprgb == null)
1107011090             {
11071
-                LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
11072
-                loadedskyboxname = object.skyboxname;
11091
+                cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
1107311092             }
11093
+            
11094
+            cubemap = cubemaprgb;
1107411095         }
1107511096         else
1107611097         {
11077
-            cubemap = null;
11078
-            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;
1107911115         }
1108011116         
1108111117         ratio = ((double) getWidth()) / getHeight();
....@@ -11379,7 +11415,7 @@
1137911415 
1138011416 //            if (cam != lightCamera)
1138111417             //for (int count = parentcam.GetTransformCount(); --count>=0;)
11382
-                LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
11418
+                LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
1138311419         }
1138411420         
1138511421         LA.xformDir(lightposition, cam.toScreen, lightposition);
....@@ -12453,7 +12489,7 @@
1245312489 
1245412490         //gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
1245512491 
12456
-        String program0 =
12492
+        String programmin =
1245712493                 // Min shader
1245812494                 "!!ARBfp1.0\n" +
1245912495                 "PARAM zero123      = { 0.0, 1.0, 2, 1.25 };" +
....@@ -12520,7 +12556,7 @@
1252012556                 "MOV result.color, temp;" +
1252112557                 "END";
1252212558         
12523
-        String program =
12559
+        String programmax =
1252412560                 "!!ARBfp1.0\n" +
1252512561                 
1252612562                 //"OPTION ARB_fragment_program_shadow;" +
....@@ -13376,8 +13412,19 @@
1337613412             //once = true;
1337713413         }
1337813414 
13379
-        System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13380
-        System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13415
+        String program = programmax;
13416
+        
13417
+        if (Globals.MINSHADER)
13418
+        {
13419
+            program = programmin;
13420
+        }
13421
+        
13422
+        if (Globals.DEBUG)
13423
+        {
13424
+            System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13425
+            System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13426
+        }
13427
+        
1338113428         loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1338213429 
1338313430     //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -13424,7 +13471,8 @@
1342413471                 "\n" +
1342513472                 "END\n";
1342613473 
13427
-        System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13474
+        if (Globals.DEBUG)
13475
+            System.out.println("Program shadow #" + 0 + "; length = " + program.length());
1342813476         loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1342913477 
1343013478     //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -14623,11 +14671,17 @@
1462314671     void GoDown(int mod)
1462414672     {
1462514673         MODIFIERS |= COMMAND;
14674
+        boolean isVR = (mouseMode&VR)!=0;
1462614675         /**/
1462714676         if((mod&SHIFT) == SHIFT)
14628
-        manipCamera.RotatePosition(0, -speed);
14677
+        {
14678
+            if (isVR)
14679
+                manipCamera.RotateInterest(0, -speed);
14680
+            else
14681
+                manipCamera.RotatePosition(0, -speed);
14682
+        }
1462914683         else
14630
-        manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14684
+            manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
1463114685         /**/
1463214686         if ((mod & SHIFT) == SHIFT)
1463314687         {
....@@ -14637,6 +14691,8 @@
1463714691             mouseMode |= BACKFORTH;
1463814692         }
1463914693 
14694
+        targetLookAt.set(manipCamera.lookAt);
14695
+        
1464014696         //prevX = X = anchorX;
1464114697         prevY = Y = anchorY - (int) (renderCamera.Distance());
1464214698     }
....@@ -14645,10 +14701,17 @@
1464514701     {
1464614702         MODIFIERS |= COMMAND;
1464714703         /**/
14704
+        boolean isVR = (mouseMode&VR)!=0;
14705
+        
1464814706         if((mod&SHIFT) == SHIFT)
14649
-        manipCamera.RotatePosition(0, speed);
14707
+        {
14708
+            if (isVR)
14709
+                manipCamera.RotateInterest(0, speed);
14710
+            else
14711
+                manipCamera.RotatePosition(0, speed);
14712
+        }
1465014713         else
14651
-        manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14714
+            manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
1465214715         /**/
1465314716         if ((mod & SHIFT) == SHIFT)
1465414717         {
....@@ -14658,6 +14721,8 @@
1465814721             mouseMode |= BACKFORTH;
1465914722         }
1466014723 
14724
+        targetLookAt.set(manipCamera.lookAt);
14725
+        
1466114726         //prevX = X = anchorX;
1466214727         prevY = Y = anchorY + (int) (renderCamera.Distance());
1466314728     }
....@@ -14667,9 +14732,14 @@
1466714732         MODIFIERS |= COMMAND;
1466814733         /**/
1466914734         if((mod&SHIFT) == SHIFT)
14670
-        manipCamera.Translate(speed*delta, 0, getWidth());
14735
+            manipCamera.Translate(speed*delta, 0, getWidth());
1467114736         else
14672
-        manipCamera.RotatePosition(speed, 0);
14737
+        {
14738
+            if ((mouseMode&VR)!=0)
14739
+                manipCamera.RotateInterest(-speed, 0);
14740
+            else
14741
+                manipCamera.RotatePosition(speed, 0);
14742
+        }
1467314743         /**/
1467414744         if ((mod & SHIFT) == SHIFT)
1467514745         {
....@@ -14679,6 +14749,8 @@
1467914749             mouseMode |= ROTATE;
1468014750         } // TRANSLATE;
1468114751 
14752
+        targetLookAt.set(manipCamera.lookAt);
14753
+        
1468214754         prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
1468314755         prevY = Y = anchorY;
1468414756     }
....@@ -14688,9 +14760,15 @@
1468814760         MODIFIERS |= COMMAND;
1468914761         /**/
1469014762         if((mod&SHIFT) == SHIFT)
14691
-        manipCamera.Translate(-speed*delta, 0, getWidth());
14763
+            manipCamera.Translate(-speed*delta, 0, getWidth());
1469214764         else
14693
-        manipCamera.RotatePosition(-speed, 0);
14765
+        {
14766
+            if ((mouseMode&VR)!=0)
14767
+                manipCamera.RotateInterest(speed, 0);
14768
+            else
14769
+                manipCamera.RotatePosition(-speed, 0);
14770
+        }
14771
+        
1469414772         /**/
1469514773         if ((mod & SHIFT) == SHIFT)
1469614774         {
....@@ -14700,6 +14778,8 @@
1470014778             mouseMode |= ROTATE;
1470114779         } // TRANSLATE;
1470214780 
14781
+        targetLookAt.set(manipCamera.lookAt);
14782
+        
1470314783         prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
1470414784         prevY = Y = anchorY;
1470514785     }
....@@ -16084,14 +16164,14 @@
1608416164                     {
1608516165                         switch (hitSomething)
1608616166                         {
16087
-                            case Object3D.hitCenter: gr.setColor(Color.pink);
16167
+                            case Object3D.hitCenter: gr.setColor(Color.white);
1608816168                                 gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
1608916169                                 break;
1609016170                             case Object3D.hitRotate: gr.setColor(Color.yellow);
1609116171                                 gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
1609216172                             break;
1609316173                             case Object3D.hitScale: gr.setColor(Color.cyan);
16094
-                                gr.drawLine(X, Y, 0, 0);
16174
+                                gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
1609516175                             break;
1609616176                         }
1609716177 
....@@ -16110,7 +16190,7 @@
1611016190         if (hasMarquee)
1611116191         {
1611216192             gr.setXORMode(Color.white);
16113
-            gr.setColor(Color.red);
16193
+            gr.setColor(Color.white);
1611416194             if (!firstime)
1611516195             {
1611616196                 gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
....@@ -16650,6 +16730,7 @@
1665016730     private void DrawSkyBox(GL gl, float ratio)
1665116731     {
1665216732         if (//envyoff ||
16733
+            WIREFRAME ||
1665316734                 cubemap == null)
1665416735         {
1665516736             gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
....@@ -16667,14 +16748,14 @@
1666716748         gl.glLoadIdentity();
1666816749         gl.glScalef(1,ratio,1);
1666916750 
16670
-        colorV[0] = 2;
16671
-        colorV[1] = 2;
16672
-        colorV[2] = 2;
16673
-        colorV[3] = 1;
16674
-        gl.glDisable(gl.GL_COLOR_MATERIAL);
16675
-        gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
16676
-        
16677
-        gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
16751
+//        colorV[0] = 2;
16752
+//        colorV[1] = 2;
16753
+//        colorV[2] = 2;
16754
+//        colorV[3] = 1;
16755
+//        gl.glDisable(gl.GL_COLOR_MATERIAL);
16756
+//        gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
16757
+//        
16758
+//        gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
1667816759         
1667916760         //gl.glActiveTexture(GL.GL_TEXTURE1);
1668016761         //gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
....@@ -16688,7 +16769,7 @@
1668816769         // GL_NORMAL_MAP texgen mode. Temporarily enabling lighting
1668916770         // causes the normals to be sent down. Thanks to Ken Dyke.
1669016771         //gl.glEnable(GL.GL_LIGHTING);
16691
-        gl.glEnable(GL.GL_LIGHTING);
16772
+        gl.glDisable(GL.GL_LIGHTING);
1669216773 
1669316774         gl.glTexGeni(GL.GL_S, GL.GL_TEXTURE_GEN_MODE, GL.GL_NORMAL_MAP);
1669416775         gl.glTexGeni(GL.GL_T, GL.GL_TEXTURE_GEN_MODE, GL.GL_NORMAL_MAP);
....@@ -16748,7 +16829,8 @@
1674816829         gl.glDisable(GL.GL_TEXTURE_GEN_R);
1674916830 
1675016831         cubemap.disable();
16751
-        ////cubemap.unbind();
16832
+        //cubemap.dispose();
16833
+        
1675216834         if (CULLFACE)
1675316835         {
1675416836             gl.glEnable(gl.GL_CULL_FACE);
....@@ -17284,6 +17366,7 @@
1728417366 
1728517367         public void init(GLAutoDrawable drawable)
1728617368         {
17369
+        if (Globals.DEBUG)
1728717370             System.out.println("shadow buffer init");
1728817371 
1728917372             GL gl = drawable.getGL();
....@@ -17512,10 +17595,14 @@
1751217595             gl.glFlush();
1751317596             
1751417597             /**/
17515
-            gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
17598
+            gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
1751617599 
17517
-            float[] pixels = occlusionsizebuffer.array();
17600
+            float[] depths = occlusiondepthbuffer.array();
1751817601 
17602
+            gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
17603
+
17604
+            int[] pixels = selectsizebuffer.array();
17605
+            
1751917606             double r = 0, g = 0, b = 0;
1752017607 
1752117608             double count = 0;
....@@ -17526,7 +17613,7 @@
1752617613             
1752717614             double FACTOR = 1;
1752817615 
17529
-            for (int i = 0; i < pixels.length; i++)
17616
+            for (int i = 0; i < depths.length; i++)
1753017617             {
1753117618                 int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
1753217619                 int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
....@@ -17609,7 +17696,7 @@
1760917696 
1761017697                 double scale = ray.z; // 1; // cos
1761117698 
17612
-                float depth = pixels[newindex];
17699
+                float depth = depths[newindex];
1761317700 
1761417701                 /*
1761517702                 int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
....@@ -17806,11 +17893,14 @@
1780617893     static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
1780717894     static IntBuffer bigAAbuffer;
1780817895     static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17809
-    static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17896
+    //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
1781017897     static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
1781117898     static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
1781217899     //static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17813
-    static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17900
+    static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17901
+    
17902
+    static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17903
+    
1781417904     static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
1781517905     static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
1781617906     static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();