blame | history | patch | commit | commitdiff
Normand Briere
2019-07-28 a434119e65146fe53d612c28e1ee7af532d1b70a 
 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     {
....@@ -1485,6 +1497,8 @@
14851497         gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
14861498     }
14871499     
1500
+    float[] colorV = new float[4];
1501
+        
14881502     void SetColor(Object3D obj, Vertex p0)
14891503     {
14901504         CameraPane display = this;
....@@ -1552,8 +1566,6 @@
15521566         {
15531567             return;
15541568         }
1555
-        
1556
-        float[] colorV = new float[3];
15571569         
15581570         if (false) // marked)
15591571         {
....@@ -8932,7 +8944,7 @@
89328944 
89338945         if (cubemap == null)
89348946         {
8935
-            LoadEnvy(5);
8947
+            //LoadEnvy(1);
89368948         }
89378949 
89388950         //cubemap.enable();
....@@ -9219,37 +9231,58 @@
92199231                 cubemap = null;
92209232                 return;
92219233             case 1:
9222
-                name = "cubemaps/box_";
9223
-                ext = "png";
9234
+                name = "cubemaps/rgb/";
9235
+                ext = "jpg";
92249236                 reverseUP = false;
92259237                 break;
92269238             case 2:
9227
-                name = "cubemaps/uffizi_";
9228
-                ext = "png";
9229
-                break; // reverseUP = true; break;
9239
+                name = "cubemaps/uffizi/";
9240
+                ext = "jpg";
9241
+                reverseUP = false;
9242
+                break;
92309243             case 3:
9231
-                name = "cubemaps/CloudyHills_";
9232
-                ext = "tga";
9244
+                name = "cubemaps/CloudyHills/";
9245
+                ext = "jpg";
92339246                 reverseUP = false;
92349247                 break;
92359248             case 4:
9236
-                name = "cubemaps/cornell_";
9249
+                name = "cubemaps/cornell/";
92379250                 ext = "png";
92389251                 reverseUP = false;
92399252                 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;
92409278             default:
9241
-                name = "cubemaps/rgb_";
9242
-                ext = "png"; /*mipmap = true;*/ reverseUP = false;
9279
+                name = "cubemaps/box/";
9280
+                ext = "png"; /*mipmap = true;*/
9281
+                reverseUP = false;
92439282                 break;
92449283         }
9245
-
9246
-        try
9247
-        {
9248
-            cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9249
-        } catch (IOException e)
9250
-        {
9251
-            throw new RuntimeException(e);
9252
-        }
9284
+        
9285
+        LoadSkybox(name, ext, mipmap);
92539286     }
92549287 
92559288     public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
....@@ -9281,8 +9314,13 @@
92819314     static double[] model = new double[16];
92829315     double[] camera2light = new double[16];
92839316     double[] light2camera = new double[16];
9284
-    int newenvy = -1;
9317
+    
9318
+    //int newenvy = -1;
92859319     boolean envyoff = true; // false;
9320
+    String skyboxname = "";
9321
+    String skyboxext;
9322
+    String loadedskyboxname = "";
9323
+    
92869324     cVector light0 = new cVector(0, 0, 0); // 1,3,2);
92879325     //float[] light0 = { 0,0,0 };
92889326     cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
....@@ -9762,10 +9800,12 @@
97629800                 rati = 1 / rati;
97639801                 gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
97649802             }
9765
-            assert (newenvy == -1);
9803
+            
9804
+            //assert (newenvy == -1);
9805
+            
97669806             gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
97679807             gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9768
-            DrawSkyBox(gl);
9808
+            DrawSkyBox(gl, (float)rati);
97699809             gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
97709810             gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
97719811             accPerspective(gl, renderCamera.shaper_fovy / ratio,
....@@ -11018,13 +11058,19 @@
1101811058             gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
1101911059         }
1102011060 
11021
-        if (newenvy > -1)
11061
+//        if (newenvy > -1)
11062
+//        {
11063
+//            LoadEnvy(newenvy);
11064
+//        }
11065
+//
11066
+//        newenvy = -1;
11067
+        
11068
+        if (!skyboxname.equals(this.loadedskyboxname))
1102211069         {
11023
-            LoadEnvy(newenvy);
11070
+            LoadSkybox(skyboxname + "/", skyboxext, false);
11071
+            loadedskyboxname = skyboxname;
1102411072         }
11025
-
11026
-        newenvy = -1;
11027
-
11073
+        
1102811074         ratio = ((double) getWidth()) / getHeight();
1102911075         //System.out.println("ratio = " + ratio);
1103011076 
....@@ -11040,7 +11086,7 @@
1104011086 
1104111087             if (!IsFrozen() && !ambientOcclusion)
1104211088             {
11043
-                DrawSkyBox(gl);
11089
+                DrawSkyBox(gl, (float)ratio);
1104411090             }
1104511091 
1104611092             //if (selection_view == -1)
....@@ -12400,7 +12446,7 @@
1240012446 
1240112447         //gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
1240212448 
12403
-        String program =
12449
+        String program0 =
1240412450                 // Min shader
1240512451                 "!!ARBfp1.0\n" +
1240612452                 "PARAM zero123      = { 0.0, 1.0, 2, 1.25 };" +
....@@ -12451,7 +12497,8 @@
1245112497                 //"SUB ndotl.y, zero123.y, ndotl.y;" +
1245212498                 //"MUL ndotl.y, ndotl.y, pow2.z;" +
1245312499                 
12454
-                "MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
12500
+                //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
12501
+                //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
1245512502                 
1245612503                 // Pigment
1245712504                 "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
....@@ -12466,7 +12513,7 @@
1246612513                 "MOV result.color, temp;" +
1246712514                 "END";
1246812515         
12469
-        String program2 =
12516
+        String program =
1247012517                 "!!ARBfp1.0\n" +
1247112518                 
1247212519                 //"OPTION ARB_fragment_program_shadow;" +
....@@ -15321,14 +15368,18 @@
1532115368             case '3':
1532215369             case '4':
1532315370             case '5':
15324
-                newenvy = Character.getNumericValue(key);
15325
-                repaint();
15326
-                break;
1532715371             case '6':
1532815372             case '7':
1532915373             case '8':
1533015374             case '9':
15331
-                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
+                }
1533215383                 repaint();
1533315384                 break;
1533415385             case '!':
....@@ -16551,7 +16602,9 @@
1655116602 
1655216603     float BGcolor = 0.5f;
1655316604     
16554
-    private void DrawSkyBox(GL gl)
16605
+    float ambientLight[] = {1f, 1f, 1f, 1.0f};
16606
+    
16607
+    private void DrawSkyBox(GL gl, float ratio)
1655516608     {
1655616609         if (envyoff || cubemap == null)
1655716610         {
....@@ -16568,7 +16621,17 @@
1656816621         // Compensates for ExaminerViewer's modification of modelview matrix
1656916622         gl.glMatrixMode(GL.GL_MODELVIEW);
1657016623         gl.glLoadIdentity();
16624
+        gl.glScalef(1,ratio,1);
1657116625 
16626
+        colorV[0] = 2;
16627
+        colorV[1] = 2;
16628
+        colorV[2] = 2;
16629
+        colorV[3] = 1;
16630
+        gl.glDisable(gl.GL_COLOR_MATERIAL);
16631
+        gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
16632
+        
16633
+        gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
16634
+        
1657216635         //gl.glActiveTexture(GL.GL_TEXTURE1);
1657316636         //gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
1657416637 
....@@ -16581,7 +16644,7 @@
1658116644         // GL_NORMAL_MAP texgen mode. Temporarily enabling lighting
1658216645         // causes the normals to be sent down. Thanks to Ken Dyke.
1658316646         //gl.glEnable(GL.GL_LIGHTING);
16584
-        gl.glDisable(GL.GL_LIGHTING);
16647
+        gl.glEnable(GL.GL_LIGHTING);
1658516648 
1658616649         gl.glTexGeni(GL.GL_S, GL.GL_TEXTURE_GEN_MODE, GL.GL_NORMAL_MAP);
1658716650         gl.glTexGeni(GL.GL_T, GL.GL_TEXTURE_GEN_MODE, GL.GL_NORMAL_MAP);
....@@ -16858,7 +16921,7 @@
1685816921             //new Exception().printStackTrace();
1685916922             System.out.println("select buffer init");
1686016923             // Use debug pipeline
16861
-            drawable.setGL(new DebugGL(drawable.getGL()));
16924
+            //drawable.setGL(new DebugGL(drawable.getGL()));
1686216925 
1686316926             GL gl = drawable.getGL();
1686416927