blame | history | patch | commit | commitdiff
Normand Briere
2019-07-29 c6c3f0948bd31603547ef8ce47a7784a9a4d55c2 
 CameraPane.java
....@@ -187,6 +187,18 @@
187187     }
188188     
189189     private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
190
+
191
+    public void LoadSkybox(String name, String ext, boolean mipmap) throws GLException
192
+    {
193
+        try
194
+        {
195
+            cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
196
+        } catch (IOException e)
197
+        {
198
+            System.out.println("NAME = " + name);
199
+            e.printStackTrace(); // throw new RuntimeException(e);
200
+        }
201
+    }
190202     
191203     void SetAsGLRenderer(boolean b)
192204     {
....@@ -206,7 +218,8 @@
206218 
207219         SetCamera(cam);
208220 
209
-        SetLight(new Camera(new cVector(10, 10, -20)));
221
+        // Warning: not used.
222
+        SetLight(new Camera(new cVector(15, 10, -20)));
210223 
211224         object = o;
212225 
....@@ -1484,6 +1497,8 @@
14841497         gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
14851498     }
14861499     
1500
+    float[] colorV = new float[4];
1501
+        
14871502     void SetColor(Object3D obj, Vertex p0)
14881503     {
14891504         CameraPane display = this;
....@@ -1551,8 +1566,6 @@
15511566         {
15521567             return;
15531568         }
1554
-        
1555
-        float[] colorV = new float[3];
15561569         
15571570         if (false) // marked)
15581571         {
....@@ -8931,7 +8944,7 @@
89318944 
89328945         if (cubemap == null)
89338946         {
8934
-            LoadEnvy(5);
8947
+            //LoadEnvy(1);
89358948         }
89368949 
89378950         //cubemap.enable();
....@@ -9218,37 +9231,58 @@
92189231                 cubemap = null;
92199232                 return;
92209233             case 1:
9221
-                name = "cubemaps/box_";
9222
-                ext = "png";
9234
+                name = "cubemaps/rgb/";
9235
+                ext = "jpg";
92239236                 reverseUP = false;
92249237                 break;
92259238             case 2:
9226
-                name = "cubemaps/uffizi_";
9227
-                ext = "png";
9228
-                break; // reverseUP = true; break;
9239
+                name = "cubemaps/uffizi/";
9240
+                ext = "jpg";
9241
+                reverseUP = false;
9242
+                break;
92299243             case 3:
9230
-                name = "cubemaps/CloudyHills_";
9231
-                ext = "tga";
9244
+                name = "cubemaps/CloudyHills/";
9245
+                ext = "jpg";
92329246                 reverseUP = false;
92339247                 break;
92349248             case 4:
9235
-                name = "cubemaps/cornell_";
9249
+                name = "cubemaps/cornell/";
92369250                 ext = "png";
92379251                 reverseUP = false;
92389252                 break;
9253
+            case 5:
9254
+                name = "cubemaps/skycube/";
9255
+                ext = "jpg";
9256
+                reverseUP = false;
9257
+                break;
9258
+            case 6:
9259
+                name = "cubemaps/SaintLazarusChurch3/";
9260
+                ext = "jpg";
9261
+                reverseUP = false;
9262
+                break;
9263
+            case 7:
9264
+                name = "cubemaps/Sodermalmsallen/";
9265
+                ext = "jpg";
9266
+                reverseUP = false;
9267
+                break;
9268
+            case 8:
9269
+                name = "cubemaps/Sodermalmsallen2/";
9270
+                ext = "jpg";
9271
+                reverseUP = false;
9272
+                break;
9273
+            case 9:
9274
+                name = "cubemaps/UnionSquare/";
9275
+                ext = "jpg";
9276
+                reverseUP = false;
9277
+                break;
92399278             default:
9240
-                name = "cubemaps/rgb_";
9241
-                ext = "png"; /*mipmap = true;*/ reverseUP = false;
9279
+                name = "cubemaps/box/";
9280
+                ext = "png"; /*mipmap = true;*/
9281
+                reverseUP = false;
92429282                 break;
92439283         }
9244
-
9245
-        try
9246
-        {
9247
-            cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9248
-        } catch (IOException e)
9249
-        {
9250
-            throw new RuntimeException(e);
9251
-        }
9284
+        
9285
+        LoadSkybox(name, ext, mipmap);
92529286     }
92539287 
92549288     public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
....@@ -9280,8 +9314,13 @@
92809314     static double[] model = new double[16];
92819315     double[] camera2light = new double[16];
92829316     double[] light2camera = new double[16];
9283
-    int newenvy = -1;
9317
+    
9318
+    //int newenvy = -1;
92849319     boolean envyoff = true; // false;
9320
+    String skyboxname = "";
9321
+    String skyboxext;
9322
+    String loadedskyboxname = "";
9323
+    
92859324     cVector light0 = new cVector(0, 0, 0); // 1,3,2);
92869325     //float[] light0 = { 0,0,0 };
92879326     cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
....@@ -9699,7 +9738,7 @@
96999738         
97009739         if (renderCamera != lightCamera)
97019740         //for (int count = parentcam.GetTransformCount(); --count>=0;)
9702
-            LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9741
+            LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
97039742         
97049743 //            LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
97059744             
....@@ -9715,7 +9754,7 @@
97159754             
97169755         if (renderCamera != lightCamera)
97179756         //for (int count = parentcam.GetTransformCount(); --count>=0;)
9718
-            LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9757
+            LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
97199758 
97209759 //            LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
97219760             
....@@ -9761,10 +9800,12 @@
97619800                 rati = 1 / rati;
97629801                 gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
97639802             }
9764
-            assert (newenvy == -1);
9803
+            
9804
+            //assert (newenvy == -1);
9805
+            
97659806             gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
97669807             gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9767
-            DrawSkyBox(gl);
9808
+            DrawSkyBox(gl, (float)rati);
97689809             gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
97699810             gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
97709811             accPerspective(gl, renderCamera.shaper_fovy / ratio,
....@@ -10916,7 +10957,7 @@
1091610957 //        if (parentcam != renderCamera) // not a light
1091710958         if (cam != lightCamera)
1091810959             //for (int count = parentcam.GetTransformCount(); --count>=0;)
10919
-                LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10960
+                LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
1092010961             
1092110962             for (int j = 0; j < 4; j++)
1092210963             {
....@@ -10931,7 +10972,7 @@
1093110972 //        if (parentcam != renderCamera) // not a light
1093210973         if (cam != lightCamera)
1093310974             //for (int count = parentcam.GetTransformCount(); --count>=0;)
10934
-                LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10975
+                LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
1093510976         
1093610977             //LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
1093710978             
....@@ -11017,13 +11058,19 @@
1101711058             gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
1101811059         }
1101911060 
11020
-        if (newenvy > -1)
11061
+//        if (newenvy > -1)
11062
+//        {
11063
+//            LoadEnvy(newenvy);
11064
+//        }
11065
+//
11066
+//        newenvy = -1;
11067
+        
11068
+        if (!skyboxname.equals(this.loadedskyboxname))
1102111069         {
11022
-            LoadEnvy(newenvy);
11070
+            LoadSkybox(skyboxname + "/", skyboxext, false);
11071
+            loadedskyboxname = skyboxname;
1102311072         }
11024
-
11025
-        newenvy = -1;
11026
-
11073
+        
1102711074         ratio = ((double) getWidth()) / getHeight();
1102811075         //System.out.println("ratio = " + ratio);
1102911076 
....@@ -11039,7 +11086,7 @@
1103911086 
1104011087             if (!IsFrozen() && !ambientOcclusion)
1104111088             {
11042
-                DrawSkyBox(gl);
11089
+                DrawSkyBox(gl, (float)ratio);
1104311090             }
1104411091 
1104511092             //if (selection_view == -1)
....@@ -12399,51 +12446,74 @@
1239912446 
1240012447         //gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
1240112448 
12402
-        String program =
12449
+        String program0 =
1240312450                 // Min shader
1240412451                 "!!ARBfp1.0\n" +
12405
-                "PARAM zero123      = { 0.0, 1.0, 2.0, 1.25 };" +
12452
+                "PARAM zero123      = { 0.0, 1.0, 2, 1.25 };" +
1240612453                 "PARAM pow2      = { 0.5, 0.25, 0.125, 0.0 };" +
1240712454                 "PARAM one      = { 1.0, 1.0, 1.0, 1.0 };" +
1240812455                 "PARAM eps      = { 0.001, 0.001, 0.001, 1.0 };" +
1240912456                 "PARAM infinity  = { 100000000, 100000000, 100000000, 1.0 };" +
12457
+                "PARAM light2cam0   = program.env[10];" +
12458
+                "PARAM light2cam1   = program.env[11];" +
12459
+                "PARAM light2cam2   = program.env[12];" +
1241012460                 "TEMP temp;" +
1241112461                 "TEMP light;" +
1241212462                 "TEMP ndotl;" +
1241312463                 "TEMP normal;" +
1241412464                 "TEMP depth;" +
12465
+                "TEMP eye;" +
12466
+                "TEMP pos;" +
1241512467                 
1241612468                 "MAD normal, fragment.color, zero123.z, -zero123.y;" +
12417
-                
12469
+                Normalize("normal") +
1241812470                 "MOV light, state.light[0].position;" +
1241912471                 "DP3 ndotl.x, light, normal;" +
1242012472 
1242112473                 // shadow
12422
-                "MOV temp, fragment.texcoord[1];" +
12423
-                TextureFetch("depth", "temp", "1") +
12474
+                "MOV pos, fragment.texcoord[1];" +
12475
+                "MOV temp, pos;" +
12476
+                ShadowTextureFetch("depth", "temp", "1") +
1242412477                 //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
12425
-                "SLT temp.x, fragment.texcoord[1].z, depth.z;" +
12426
-                
12478
+                "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
1242712479 
1242812480                 // No shadow when out of frustum
1242912481                 //"SGE temp.y, depth.z, zero123.y;" +
1243012482                 //"LRP temp.x, temp.y, zero123.y, temp.x;" +
1243112483                 
12432
-                "MUL ndotl.x, ndotl.x, temp.x;" +
12433
-                "MAX ndotl.x, ndotl.x, pow2.y;" +
12484
+                "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
1243412485                 
12486
+                // Backlit
12487
+                "MOV pos.w, zero123.y;" +
12488
+                "DP4 eye.x, pos, light2cam0;" +
12489
+                "DP4 eye.y, pos, light2cam1;" +
12490
+                "DP4 eye.z, pos, light2cam2;" +
12491
+                Normalize("eye") +
12492
+                
12493
+                "DP3 ndotl.y, -eye, normal;" +
12494
+                //"MUL ndotl.y, ndotl.y, pow2.x;" +
12495
+                "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
12496
+                "SUB ndotl.y, zero123.y, ndotl.y;" +
12497
+                //"SUB ndotl.y, zero123.y, ndotl.y;" +
12498
+                //"MUL ndotl.y, ndotl.y, pow2.z;" +
12499
+                
12500
+                //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
12501
+                //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
12502
+                
12503
+                // Pigment
1243512504                 "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
1243612505                 "LRP temp, zero123.w, temp, one;" + // texture proportion
1243712506                 "MUL temp, temp, ndotl.x;" +
1243812507                 
1243912508                 "MUL temp, temp, zero123.z;" +
1244012509                 
12441
-                "MOV temp.w, zero123.y;" + // reset alpha
12510
+                //"MUL temp, temp, ndotl.y;" +
1244212511                 
12512
+                "MOV temp.w, zero123.y;" + // reset alpha
1244312513                 "MOV result.color, temp;" +
1244412514                 "END";
1244512515         
12446
-        String program2 =
12516
+        String program =
1244712517                 "!!ARBfp1.0\n" +
1244812518                 
1244912519                 //"OPTION ARB_fragment_program_shadow;" +
....@@ -12581,20 +12651,20 @@
1258112651                 "MUL temp, floor, mapgrid.x;" +
1258212652                 //"TEX depth0, temp, texture[1], 2D;" +
1258312653                 (((mode & FP_SOFTSHADOW) == 0) ? "" :
12584
-                TextureFetch("depth0", "temp", "1") +
12654
+                ShadowTextureFetch("depth0", "temp", "1") +
1258512655                 "") +
1258612656                 "ADD temp.x, temp.x, mapgrid.x;" +
1258712657                 //"TEX depth1, temp, texture[1], 2D;" +
1258812658                 (((mode & FP_SOFTSHADOW) == 0) ? "" :
12589
-                TextureFetch("depth1", "temp", "1") +
12659
+                ShadowTextureFetch("depth1", "temp", "1") +
1259012660                 "") +
1259112661                 "ADD temp.y, temp.y, mapgrid.x;" +
1259212662                 //"TEX depth2, temp, texture[1], 2D;" +
12593
-                TextureFetch("depth2", "temp", "1") +
12663
+                ShadowTextureFetch("depth2", "temp", "1") +
1259412664                 "SUB temp.x, temp.x, mapgrid.x;" +
1259512665                 //"TEX depth3, temp, texture[1], 2D;" +
1259612666                 (((mode & FP_SOFTSHADOW) == 0) ? "" :
12597
-                TextureFetch("depth3", "temp", "1") +
12667
+                ShadowTextureFetch("depth3", "temp", "1") +
1259812668                 "") +
1259912669                 //"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
1260012670                 //"MOV params, material;" +
....@@ -12968,7 +13038,7 @@
1296813038            // display shadow only (fakedepth == 0)
1296913039          "SUB temp.x, half.x, shadow.x;" +
1297013040          "MOV temp.y, -params5.z;" + // params6.x;" +
12971
-         "SLT temp.z, temp.y, -one2048th.x;" +
13041
+         "SLT temp.z, temp.y, -c256i.x;" +
1297213042          "SUB temp.y, one.x, temp.z;" +
1297313043          "MUL temp.x, temp.x, temp.y;" +
1297413044          "KIL temp.x;" +
....@@ -13392,7 +13462,8 @@
1339213462         return out;
1339313463     }
1339413464 
13395
-    String TextureFetch(String dest, String src, String unit)
13465
+    // Also does frustum culling
13466
+    String ShadowTextureFetch(String dest, String src, String unit)
1339613467     {
1339713468         return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
1339813469                 "SGE " + src + ".w, " + src + ".x, eps.x;" +
....@@ -15297,14 +15368,18 @@
1529715368             case '3':
1529815369             case '4':
1529915370             case '5':
15300
-                newenvy = Character.getNumericValue(key);
15301
-                repaint();
15302
-                break;
1530315371             case '6':
1530415372             case '7':
1530515373             case '8':
1530615374             case '9':
15307
-                BGcolor = (key - '6')/3.f;
15375
+                if (envyoff)
15376
+                {
15377
+                    BGcolor = (key - '1')/8.f;
15378
+                }
15379
+                else
15380
+                {
15381
+                    //newenvy = Character.getNumericValue(key);
15382
+                }
1530815383                 repaint();
1530915384                 break;
1531015385             case '!':
....@@ -16495,6 +16570,8 @@
1649516570     private /*static*/ boolean firstime;
1649616571     private /*static*/ cVector newView = new cVector();
1649716572     private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
16573
+    private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
16574
+    private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
1649816575     private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
1649916576                                              GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
1650016577                                              GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
....@@ -16507,16 +16584,49 @@
1650716584     {
1650816585         com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
1650916586 
16587
+        int usedsuf = 0;
16588
+        
1651016589         for (int i = 0; i < suffixes.length; i++)
1651116590         {
16512
-            String resourceName = basename + suffixes[i] + "." + suffix;
16513
-            TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16514
-                    mipmapped,
16515
-                    FileUtil.getFileSuffix(resourceName));
16516
-            if (data == null)
16591
+            String[] suffixe = suffixes;
16592
+            String[] fallback = suffixes2;
16593
+            String[] fallfallback = suffixes3;
16594
+            
16595
+            for (int c=usedsuf; --c>=0;)
1651716596             {
16518
-                throw new IOException("Unable to load texture " + resourceName);
16597
+//                String[] temp = suffixe;
16598
+//                suffixe = fallback;
16599
+//                fallback = fallfallback;
16600
+//                fallfallback = temp;
1651916601             }
16602
+            
16603
+            String resourceName = basename + suffixe[i] + "." + suffix;
16604
+            TextureData data;
16605
+            
16606
+            try
16607
+            {
16608
+                data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16609
+                        mipmapped,
16610
+                        FileUtil.getFileSuffix(resourceName));
16611
+            }
16612
+            catch (Exception e)
16613
+            {
16614
+                try
16615
+                {
16616
+                    resourceName = basename + fallback[i] + "." + suffix;
16617
+                    data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16618
+                            mipmapped,
16619
+                            FileUtil.getFileSuffix(resourceName));
16620
+                }
16621
+                catch (Exception e2)
16622
+                {
16623
+                    resourceName = basename + fallfallback[i] + "." + suffix;
16624
+                    data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16625
+                            mipmapped,
16626
+                            FileUtil.getFileSuffix(resourceName));
16627
+                }
16628
+            }
16629
+            
1652016630             //System.out.println("Target = " + targets[i]);
1652116631             cubemap.updateImage(data, targets[i]);
1652216632         }
....@@ -16527,7 +16637,9 @@
1652716637 
1652816638     float BGcolor = 0.5f;
1652916639     
16530
-    private void DrawSkyBox(GL gl)
16640
+    float ambientLight[] = {1f, 1f, 1f, 1.0f};
16641
+    
16642
+    private void DrawSkyBox(GL gl, float ratio)
1653116643     {
1653216644         if (envyoff || cubemap == null)
1653316645         {
....@@ -16544,7 +16656,17 @@
1654416656         // Compensates for ExaminerViewer's modification of modelview matrix
1654516657         gl.glMatrixMode(GL.GL_MODELVIEW);
1654616658         gl.glLoadIdentity();
16659
+        gl.glScalef(1,ratio,1);
1654716660 
16661
+        colorV[0] = 2;
16662
+        colorV[1] = 2;
16663
+        colorV[2] = 2;
16664
+        colorV[3] = 1;
16665
+        gl.glDisable(gl.GL_COLOR_MATERIAL);
16666
+        gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
16667
+        
16668
+        gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
16669
+        
1654816670         //gl.glActiveTexture(GL.GL_TEXTURE1);
1654916671         //gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
1655016672 
....@@ -16557,7 +16679,7 @@
1655716679         // GL_NORMAL_MAP texgen mode. Temporarily enabling lighting
1655816680         // causes the normals to be sent down. Thanks to Ken Dyke.
1655916681         //gl.glEnable(GL.GL_LIGHTING);
16560
-        gl.glDisable(GL.GL_LIGHTING);
16682
+        gl.glEnable(GL.GL_LIGHTING);
1656116683 
1656216684         gl.glTexGeni(GL.GL_S, GL.GL_TEXTURE_GEN_MODE, GL.GL_NORMAL_MAP);
1656316685         gl.glTexGeni(GL.GL_T, GL.GL_TEXTURE_GEN_MODE, GL.GL_NORMAL_MAP);
....@@ -16576,6 +16698,7 @@
1657616698         {
1657716699             gl.glScalef(1.0f, -1.0f, 1.0f);
1657816700         }
16701
+        gl.glScalef(-1.0f, 1.0f, 1.0f);
1657916702         gl.glMultMatrixd(viewrot_1, 0);
1658016703         gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance());  // 0.5f);
1658116704         //viewer.updateInverseRotation(gl);
....@@ -16834,7 +16957,7 @@
1683416957             //new Exception().printStackTrace();
1683516958             System.out.println("select buffer init");
1683616959             // Use debug pipeline
16837
-            drawable.setGL(new DebugGL(drawable.getGL()));
16960
+            //drawable.setGL(new DebugGL(drawable.getGL()));
1683816961 
1683916962             GL gl = drawable.getGL();
1684016963