blame | history | patch | commit | commitdiff
Normand Briere
2019-08-17 d5d6485126da83b06645e90e3e4ce66659a56009 
 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     
....@@ -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(0);
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();
....@@ -13383,8 +13428,12 @@
1338313428             program = programmin;
1338413429         }
1338513430         
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 " : ""));
13431
+        if (Globals.DEBUG)
13432
+        {
13433
+            System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13434
+            System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13435
+        }
13436
+        
1338813437         loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1338913438 
1339013439     //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -13431,7 +13480,8 @@
1343113480                 "\n" +
1343213481                 "END\n";
1343313482 
13434
-        System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13483
+        if (Globals.DEBUG)
13484
+            System.out.println("Program shadow #" + 0 + "; length = " + program.length());
1343513485         loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
1343613486 
1343713487     //gl.glNewList(displayListID, GL.GL_COMPILE);
....@@ -14630,11 +14680,17 @@
1463014680     void GoDown(int mod)
1463114681     {
1463214682         MODIFIERS |= COMMAND;
14683
+        boolean isVR = (mouseMode&VR)!=0;
1463314684         /**/
1463414685         if((mod&SHIFT) == SHIFT)
14635
-        manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14686
+        {
14687
+            if (isVR)
14688
+                manipCamera.RotateInterest(0, -speed);
14689
+            else
14690
+                manipCamera.RotatePosition(0, -speed);
14691
+        }
1463614692         else
14637
-        manipCamera.RotatePosition(0, -speed);
14693
+            manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
1463814694         /**/
1463914695         if ((mod & SHIFT) == SHIFT)
1464014696         {
....@@ -14644,6 +14700,8 @@
1464414700             mouseMode |= BACKFORTH;
1464514701         }
1464614702 
14703
+        targetLookAt.set(manipCamera.lookAt);
14704
+        
1464714705         //prevX = X = anchorX;
1464814706         prevY = Y = anchorY - (int) (renderCamera.Distance());
1464914707     }
....@@ -14652,10 +14710,17 @@
1465214710     {
1465314711         MODIFIERS |= COMMAND;
1465414712         /**/
14713
+        boolean isVR = (mouseMode&VR)!=0;
14714
+        
1465514715         if((mod&SHIFT) == SHIFT)
14656
-        manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14716
+        {
14717
+            if (isVR)
14718
+                manipCamera.RotateInterest(0, speed);
14719
+            else
14720
+                manipCamera.RotatePosition(0, speed);
14721
+        }
1465714722         else
14658
-        manipCamera.RotatePosition(0, speed);
14723
+            manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
1465914724         /**/
1466014725         if ((mod & SHIFT) == SHIFT)
1466114726         {
....@@ -14665,6 +14730,8 @@
1466514730             mouseMode |= BACKFORTH;
1466614731         }
1466714732 
14733
+        targetLookAt.set(manipCamera.lookAt);
14734
+        
1466814735         //prevX = X = anchorX;
1466914736         prevY = Y = anchorY + (int) (renderCamera.Distance());
1467014737     }
....@@ -14674,9 +14741,14 @@
1467414741         MODIFIERS |= COMMAND;
1467514742         /**/
1467614743         if((mod&SHIFT) == SHIFT)
14677
-        manipCamera.Translate(speed*delta, 0, getWidth());
14744
+            manipCamera.Translate(speed*delta, 0, getWidth());
1467814745         else
14679
-        manipCamera.RotatePosition(speed, 0);
14746
+        {
14747
+            if ((mouseMode&VR)!=0)
14748
+                manipCamera.RotateInterest(-speed, 0);
14749
+            else
14750
+                manipCamera.RotatePosition(speed, 0);
14751
+        }
1468014752         /**/
1468114753         if ((mod & SHIFT) == SHIFT)
1468214754         {
....@@ -14686,6 +14758,8 @@
1468614758             mouseMode |= ROTATE;
1468714759         } // TRANSLATE;
1468814760 
14761
+        targetLookAt.set(manipCamera.lookAt);
14762
+        
1468914763         prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
1469014764         prevY = Y = anchorY;
1469114765     }
....@@ -14695,9 +14769,15 @@
1469514769         MODIFIERS |= COMMAND;
1469614770         /**/
1469714771         if((mod&SHIFT) == SHIFT)
14698
-        manipCamera.Translate(-speed*delta, 0, getWidth());
14772
+            manipCamera.Translate(-speed*delta, 0, getWidth());
1469914773         else
14700
-        manipCamera.RotatePosition(-speed, 0);
14774
+        {
14775
+            if ((mouseMode&VR)!=0)
14776
+                manipCamera.RotateInterest(speed, 0);
14777
+            else
14778
+                manipCamera.RotatePosition(-speed, 0);
14779
+        }
14780
+        
1470114781         /**/
1470214782         if ((mod & SHIFT) == SHIFT)
1470314783         {
....@@ -14707,6 +14787,8 @@
1470714787             mouseMode |= ROTATE;
1470814788         } // TRANSLATE;
1470914789 
14790
+        targetLookAt.set(manipCamera.lookAt);
14791
+        
1471014792         prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
1471114793         prevY = Y = anchorY;
1471214794     }
....@@ -15209,8 +15291,8 @@
1520915291             case 'K':
1521015292                 KOMPACTTEXTURE ^= true;
1521115293                 //textures.clear();
15212
-                break;
15213
-            case 'P': // Texture Projection macros
15294
+            //    break;
15295
+            //case 'P': // Texture Projection macros
1521415296 //                SAVETEXTURE ^= true;
1521515297                 macromode = true;
1521615298                 Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
....@@ -15331,7 +15413,7 @@
1533115413                 targetLookAt.set(manipCamera.lookAt);
1533215414                 repaint();
1533315415                 break;
15334
-            case 'p':
15416
+            case 'P': // p':
1533515417        // c'est quoi ca au juste?         spherical ^= true;
1533615418                 Skinshader ^= true; programInitialized = false; 
1533715419                 repaint();
....@@ -16091,7 +16173,7 @@
1609116173                     {
1609216174                         switch (hitSomething)
1609316175                         {
16094
-                            case Object3D.hitCenter: gr.setColor(Color.pink);
16176
+                            case Object3D.hitCenter: gr.setColor(Color.white);
1609516177                                 gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
1609616178                                 break;
1609716179                             case Object3D.hitRotate: gr.setColor(Color.yellow);
....@@ -16117,7 +16199,7 @@
1611716199         if (hasMarquee)
1611816200         {
1611916201             gr.setXORMode(Color.white);
16120
-            gr.setColor(Color.red);
16202
+            gr.setColor(Color.white);
1612116203             if (!firstime)
1612216204             {
1612316205                 gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
....@@ -16657,6 +16739,7 @@
1665716739     private void DrawSkyBox(GL gl, float ratio)
1665816740     {
1665916741         if (//envyoff ||
16742
+            WIREFRAME ||
1666016743                 cubemap == null)
1666116744         {
1666216745             gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
....@@ -16755,7 +16838,8 @@
1675516838         gl.glDisable(GL.GL_TEXTURE_GEN_R);
1675616839 
1675716840         cubemap.disable();
16758
-        ////cubemap.unbind();
16841
+        //cubemap.dispose();
16842
+        
1675916843         if (CULLFACE)
1676016844         {
1676116845             gl.glEnable(gl.GL_CULL_FACE);
....@@ -17291,6 +17375,7 @@
1729117375 
1729217376         public void init(GLAutoDrawable drawable)
1729317377         {
17378
+        if (Globals.DEBUG)
1729417379             System.out.println("shadow buffer init");
1729517380 
1729617381             GL gl = drawable.getGL();
....@@ -17519,10 +17604,14 @@
1751917604             gl.glFlush();
1752017605             
1752117606             /**/
17522
-            gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
17607
+            gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
1752317608 
17524
-            float[] pixels = occlusionsizebuffer.array();
17609
+            float[] depths = occlusiondepthbuffer.array();
1752517610 
17611
+            gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
17612
+
17613
+            int[] pixels = selectsizebuffer.array();
17614
+            
1752617615             double r = 0, g = 0, b = 0;
1752717616 
1752817617             double count = 0;
....@@ -17533,7 +17622,7 @@
1753317622             
1753417623             double FACTOR = 1;
1753517624 
17536
-            for (int i = 0; i < pixels.length; i++)
17625
+            for (int i = 0; i < depths.length; i++)
1753717626             {
1753817627                 int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
1753917628                 int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
....@@ -17616,7 +17705,7 @@
1761617705 
1761717706                 double scale = ray.z; // 1; // cos
1761817707 
17619
-                float depth = pixels[newindex];
17708
+                float depth = depths[newindex];
1762017709 
1762117710                 /*
1762217711                 int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
....@@ -17813,11 +17902,14 @@
1781317902     static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
1781417903     static IntBuffer bigAAbuffer;
1781517904     static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17816
-    static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17905
+    //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
1781717906     static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
1781817907     static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
1781917908     //static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17820
-    static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17909
+    static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17910
+    
17911
+    static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17912
+    
1782117913     static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
1782217914     static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
1782317915     static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();