blame | history | patch | commit | commitdiff
Normand Briere
2019-08-06 b3ae4e889872ca0b9ca76f1d17b2f0b961226729 
 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,12 @@
92809314     static double[] model = new double[16];
92819315     double[] camera2light = new double[16];
92829316     double[] light2camera = new double[16];
9283
-    int newenvy = -1;
9284
-    boolean envyoff = true; // false;
9317
+    
9318
+    //int newenvy = -1;
9319
+    //boolean envyoff = false;
9320
+    
9321
+    String loadedskyboxname;
9322
+    
92859323     cVector light0 = new cVector(0, 0, 0); // 1,3,2);
92869324     //float[] light0 = { 0,0,0 };
92879325     cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
....@@ -9699,7 +9737,7 @@
96999737         
97009738         if (renderCamera != lightCamera)
97019739         //for (int count = parentcam.GetTransformCount(); --count>=0;)
9702
-            LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9740
+            LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
97039741         
97049742 //            LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
97059743             
....@@ -9715,7 +9753,7 @@
97159753             
97169754         if (renderCamera != lightCamera)
97179755         //for (int count = parentcam.GetTransformCount(); --count>=0;)
9718
-            LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9756
+            LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
97199757 
97209758 //            LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
97219759             
....@@ -9761,10 +9799,12 @@
97619799                 rati = 1 / rati;
97629800                 gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
97639801             }
9764
-            assert (newenvy == -1);
9802
+            
9803
+            //assert (newenvy == -1);
9804
+            
97659805             gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
97669806             gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9767
-            DrawSkyBox(gl);
9807
+            DrawSkyBox(gl, (float)rati);
97689808             gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
97699809             gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
97709810             accPerspective(gl, renderCamera.shaper_fovy / ratio,
....@@ -10916,7 +10956,7 @@
1091610956 //        if (parentcam != renderCamera) // not a light
1091710957         if (cam != lightCamera)
1091810958             //for (int count = parentcam.GetTransformCount(); --count>=0;)
10919
-                LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
10959
+                LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
1092010960             
1092110961             for (int j = 0; j < 4; j++)
1092210962             {
....@@ -10931,7 +10971,7 @@
1093110971 //        if (parentcam != renderCamera) // not a light
1093210972         if (cam != lightCamera)
1093310973             //for (int count = parentcam.GetTransformCount(); --count>=0;)
10934
-                LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
10974
+                LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
1093510975         
1093610976             //LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
1093710977             
....@@ -11017,13 +11057,27 @@
1101711057             gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
1101811058         }
1101911059 
11020
-        if (newenvy > -1)
11060
+//        if (newenvy > -1)
11061
+//        {
11062
+//            LoadEnvy(newenvy);
11063
+//        }
11064
+//
11065
+//        newenvy = -1;
11066
+        
11067
+        if (object.skyboxname != null)
1102111068         {
11022
-            LoadEnvy(newenvy);
11069
+            if (!object.skyboxname.equals(this.loadedskyboxname))
11070
+            {
11071
+                LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
11072
+                loadedskyboxname = object.skyboxname;
11073
+            }
1102311074         }
11024
-
11025
-        newenvy = -1;
11026
-
11075
+        else
11076
+        {
11077
+            cubemap = null;
11078
+            loadedskyboxname = null;
11079
+        }
11080
+        
1102711081         ratio = ((double) getWidth()) / getHeight();
1102811082         //System.out.println("ratio = " + ratio);
1102911083 
....@@ -11039,7 +11093,7 @@
1103911093 
1104011094             if (!IsFrozen() && !ambientOcclusion)
1104111095             {
11042
-                DrawSkyBox(gl);
11096
+                DrawSkyBox(gl, (float)ratio);
1104311097             }
1104411098 
1104511099             //if (selection_view == -1)
....@@ -11325,7 +11379,7 @@
1132511379 
1132611380 //            if (cam != lightCamera)
1132711381             //for (int count = parentcam.GetTransformCount(); --count>=0;)
11328
-                LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
11382
+                LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
1132911383         }
1133011384         
1133111385         LA.xformDir(lightposition, cam.toScreen, lightposition);
....@@ -12399,8 +12453,76 @@
1239912453 
1240012454         //gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
1240112455 
12402
-        String program =
12456
+        String programmin =
12457
+                // Min shader
1240312458                 "!!ARBfp1.0\n" +
12459
+                "PARAM zero123      = { 0.0, 1.0, 2, 1.25 };" +
12460
+                "PARAM pow2      = { 0.5, 0.25, 0.125, 0.0 };" +
12461
+                "PARAM one      = { 1.0, 1.0, 1.0, 1.0 };" +
12462
+                "PARAM eps      = { 0.001, 0.001, 0.001, 1.0 };" +
12463
+                "PARAM infinity  = { 100000000, 100000000, 100000000, 1.0 };" +
12464
+                "PARAM light2cam0   = program.env[10];" +
12465
+                "PARAM light2cam1   = program.env[11];" +
12466
+                "PARAM light2cam2   = program.env[12];" +
12467
+                "TEMP temp;" +
12468
+                "TEMP light;" +
12469
+                "TEMP ndotl;" +
12470
+                "TEMP normal;" +
12471
+                "TEMP depth;" +
12472
+                "TEMP eye;" +
12473
+                "TEMP pos;" +
12474
+                
12475
+                "MAD normal, fragment.color, zero123.z, -zero123.y;" +
12476
+                Normalize("normal") +
12477
+                "MOV light, state.light[0].position;" +
12478
+                "DP3 ndotl.x, light, normal;" +
12479
+
12480
+                // shadow
12481
+                "MOV pos, fragment.texcoord[1];" +
12482
+                "MOV temp, pos;" +
12483
+                ShadowTextureFetch("depth", "temp", "1") +
12484
+                //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
12485
+                "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
12486
+
12487
+                // No shadow when out of frustum
12488
+                //"SGE temp.y, depth.z, zero123.y;" +
12489
+                //"LRP temp.x, temp.y, zero123.y, temp.x;" +
12490
+                
12491
+                "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
12492
+                
12493
+                // Backlit
12494
+                "MOV pos.w, zero123.y;" +
12495
+                "DP4 eye.x, pos, light2cam0;" +
12496
+                "DP4 eye.y, pos, light2cam1;" +
12497
+                "DP4 eye.z, pos, light2cam2;" +
12498
+                Normalize("eye") +
12499
+                
12500
+                "DP3 ndotl.y, -eye, normal;" +
12501
+                //"MUL ndotl.y, ndotl.y, pow2.x;" +
12502
+                "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
12503
+                "SUB ndotl.y, zero123.y, ndotl.y;" +
12504
+                //"SUB ndotl.y, zero123.y, ndotl.y;" +
12505
+                //"MUL ndotl.y, ndotl.y, pow2.z;" +
12506
+                
12507
+                //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
12508
+                //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
12509
+                
12510
+                // Pigment
12511
+                "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
12512
+                "LRP temp, zero123.w, temp, one;" + // texture proportion
12513
+                "MUL temp, temp, ndotl.x;" +
12514
+                
12515
+                "MUL temp, temp, zero123.z;" +
12516
+                
12517
+                //"MUL temp, temp, ndotl.y;" +
12518
+                
12519
+                "MOV temp.w, zero123.y;" + // reset alpha
12520
+                "MOV result.color, temp;" +
12521
+                "END";
12522
+        
12523
+        String programmax =
12524
+                "!!ARBfp1.0\n" +
12525
+                
1240412526                 //"OPTION ARB_fragment_program_shadow;" +
1240512527                 "PARAM light2cam0   = program.env[10];" +
1240612528                 "PARAM light2cam1   = program.env[11];" +
....@@ -12515,8 +12637,7 @@
1251512637                 "TEMP shininess;" +
1251612638                 "\n" +
1251712639                 "MOV texSamp, one;" +
12518
-                //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12519
-
12640
+                
1252012641                 "MOV mapgrid.x, one2048th.x;" +
1252112642                 "MOV temp, fragment.texcoord[1];" +
1252212643                 /*
....@@ -12537,20 +12658,20 @@
1253712658                 "MUL temp, floor, mapgrid.x;" +
1253812659                 //"TEX depth0, temp, texture[1], 2D;" +
1253912660                 (((mode & FP_SOFTSHADOW) == 0) ? "" :
12540
-                TextureFetch("depth0", "temp", "1") +
12661
+                ShadowTextureFetch("depth0", "temp", "1") +
1254112662                 "") +
1254212663                 "ADD temp.x, temp.x, mapgrid.x;" +
1254312664                 //"TEX depth1, temp, texture[1], 2D;" +
1254412665                 (((mode & FP_SOFTSHADOW) == 0) ? "" :
12545
-                TextureFetch("depth1", "temp", "1") +
12666
+                ShadowTextureFetch("depth1", "temp", "1") +
1254612667                 "") +
1254712668                 "ADD temp.y, temp.y, mapgrid.x;" +
1254812669                 //"TEX depth2, temp, texture[1], 2D;" +
12549
-                TextureFetch("depth2", "temp", "1") +
12670
+                ShadowTextureFetch("depth2", "temp", "1") +
1255012671                 "SUB temp.x, temp.x, mapgrid.x;" +
1255112672                 //"TEX depth3, temp, texture[1], 2D;" +
1255212673                 (((mode & FP_SOFTSHADOW) == 0) ? "" :
12553
-                TextureFetch("depth3", "temp", "1") +
12674
+                ShadowTextureFetch("depth3", "temp", "1") +
1255412675                 "") +
1255512676                 //"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
1255612677                 //"MOV params, material;" +
....@@ -12921,10 +13042,10 @@
1292113042                 "MAD shadow.x, buffer.x, frac.y, shadow.x;" +
1292213043                 "") +
1292313044 
12924
-           // display shadow only (bump == 0)
13045
+           // display shadow only (fakedepth == 0)
1292513046          "SUB temp.x, half.x, shadow.x;" +
1292613047          "MOV temp.y, -params5.z;" + // params6.x;" +
12927
-         "SLT temp.z, temp.y, -one2048th.x;" +
13048
+         "SLT temp.z, temp.y, -c256i.x;" +
1292813049          "SUB temp.y, one.x, temp.z;" +
1292913050          "MUL temp.x, temp.x, temp.y;" +
1293013051          "KIL temp.x;" +
....@@ -13255,6 +13376,13 @@
1325513376             //once = true;
1325613377         }
1325713378 
13379
+        String program = programmax;
13380
+        
13381
+        if (Globals.MINSHADER)
13382
+        {
13383
+            program = programmin;
13384
+        }
13385
+        
1325813386         System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
1325913387         System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
1326013388         loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
....@@ -13348,25 +13476,26 @@
1334813476         return out;
1334913477     }
1335013478 
13351
-    String TextureFetch(String dest, String src, String unit)
13479
+    // Also does frustum culling
13480
+    String ShadowTextureFetch(String dest, String src, String unit)
1335213481     {
1335313482         return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
1335413483                 "SGE " + src + ".w, " + src + ".x, eps.x;" +
1335513484                 "SGE " + src + ".z, " + src + ".y, eps.x;" +
13485
+                "SLT " + dest + ".x, " + src + ".x, one.x;" +
13486
+                "SLT " + dest + ".y, " + src + ".y, one.x;" +
1335613487                 "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13357
-                "SLT " + src + ".z, " + src + ".x, one.x;" +
13358
-                "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13359
-                "SLT " + src + ".z, " + src + ".y, one.x;" +
13360
-                "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13488
+                "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
13489
+                "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
1336113490                 //"SWZ buffer, temp, w,w,w,w;";
13362
-                "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13491
+                //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
1336313492                 "SUB " + src + ".z, " + "one.x, " + src + ".w;" +
1336413493                 //"MUL " + src + ".z, " + src + ".z, infinity.x;" +
1336513494                 //"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13366
-                "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13495
+                //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
1336713496 
13368
-    //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13369
-    //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
13497
+    //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13498
+    "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
1337013499     }
1337113500 
1337213501     String Shadow(String depth, String shadow)
....@@ -13413,7 +13542,7 @@
1341313542                 "SLT temp.x, temp.x, zero.x;" + // shadoweps
1341413543                 "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
1341513544 
13416
-                // No shadow when out of frustrum
13545
+                // No shadow when out of frustum
1341713546                 "SGE temp.x, " + depth + ".z, one.z;" +
1341813547                 "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
1341913548                 "";
....@@ -14211,14 +14340,15 @@
1421114340             drag = false;
1421214341             //System.out.println("Mouse DOWN");
1421314342             editObj = false;
14214
-            ClickInfo info = new ClickInfo();
14215
-            info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14216
-            info.pane = this;
14217
-            info.camera = renderCamera;
14218
-            info.x = x;
14219
-            info.y = y;
14220
-            info.modifiers = modifiersex;
14221
-            editObj = object.doEditClick(info, 0);
14343
+            //ClickInfo info = new ClickInfo();
14344
+            object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14345
+            object.clickInfo.pane = this;
14346
+            object.clickInfo.camera = renderCamera;
14347
+            object.clickInfo.x = x;
14348
+            object.clickInfo.y = y;
14349
+            object.clickInfo.modifiers = modifiersex;
14350
+            editObj = object.doEditClick(//info,
14351
+                    0);
1422214352             if (!editObj)
1422314353             {
1422414354                 hasMarquee = true;
....@@ -14502,9 +14632,9 @@
1450214632         MODIFIERS |= COMMAND;
1450314633         /**/
1450414634         if((mod&SHIFT) == SHIFT)
14505
-        manipCamera.RotatePosition(0, -speed);
14506
-        else
1450714635         manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14636
+        else
14637
+        manipCamera.RotatePosition(0, -speed);
1450814638         /**/
1450914639         if ((mod & SHIFT) == SHIFT)
1451014640         {
....@@ -14523,9 +14653,9 @@
1452314653         MODIFIERS |= COMMAND;
1452414654         /**/
1452514655         if((mod&SHIFT) == SHIFT)
14526
-        manipCamera.RotatePosition(0, speed);
14527
-        else
1452814656         manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14657
+        else
14658
+        manipCamera.RotatePosition(0, speed);
1452914659         /**/
1453014660         if ((mod & SHIFT) == SHIFT)
1453114661         {
....@@ -14618,15 +14748,16 @@
1461814748             if (editObj)
1461914749             {
1462014750                 drag = true;
14621
-                ClickInfo info = new ClickInfo();
14622
-                info.bounds.setBounds(0, 0,
14751
+                //ClickInfo info = new ClickInfo();
14752
+                object.clickInfo.bounds.setBounds(0, 0,
1462314753                         (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14624
-                info.pane = this;
14625
-                info.camera = renderCamera;
14626
-                info.x = x;
14627
-                info.y = y;
14628
-                object.GetWindow().copy
14629
-                        .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14754
+                object.clickInfo.pane = this;
14755
+                object.clickInfo.camera = renderCamera;
14756
+                object.clickInfo.x = x;
14757
+                object.clickInfo.y = y;
14758
+                object //.GetWindow().copy
14759
+                        .doEditDrag(//info,
14760
+                                (modifiers & MouseEvent.BUTTON3_MASK) != 0);
1463014761             } else
1463114762             {
1463214763                 if (x < startX)
....@@ -14775,24 +14906,27 @@
1477514906         }
1477614907     }
1477714908 
14909
+//        ClickInfo clickInfo = new ClickInfo();
14910
+        
1477814911     public void mouseMoved(MouseEvent e)
1477914912     {
1478014913         //System.out.println("mouseMoved: " + e);
1478114914         if (isRenderer)
1478214915             return;
1478314916         
14784
-        ClickInfo ci = new ClickInfo();
14785
-        ci.x = e.getX();
14786
-        ci.y = e.getY();
14787
-        ci.modifiers = e.getModifiersEx();
14788
-        ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14789
-        ci.pane = this;
14790
-        ci.camera = renderCamera;
14917
+        // Mouse cursor feedback
14918
+        object.clickInfo.x = e.getX();
14919
+        object.clickInfo.y = e.getY();
14920
+        object.clickInfo.modifiers = e.getModifiersEx();
14921
+        object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14922
+        object.clickInfo.pane = this;
14923
+        object.clickInfo.camera = renderCamera;
1479114924         if (!isRenderer)
1479214925         {
1479314926             //ObjEditor editWindow = object.editWindow;
1479414927             //Object3D copy = editWindow.copy;
14795
-            if (object.doEditClick(ci, 0))
14928
+            if (object.doEditClick(//clickInfo,
14929
+                                0))
1479614930             {
1479714931                 setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
1479814932             } else
....@@ -15242,20 +15376,24 @@
1524215376                 OCCLUSION_CULLING ^= true;
1524315377                 System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
1524415378                 break;
15245
-            case '0': envyoff ^= true; repaint(); break;
15379
+            //case '0': envyoff ^= true; repaint(); break;
1524615380             case '1':
1524715381             case '2':
1524815382             case '3':
1524915383             case '4':
1525015384             case '5':
15251
-                newenvy = Character.getNumericValue(key);
15252
-                repaint();
15253
-                break;
1525415385             case '6':
1525515386             case '7':
1525615387             case '8':
1525715388             case '9':
15258
-                BGcolor = (key - '6')/3.f;
15389
+                if (true) // envyoff)
15390
+                {
15391
+                    BGcolor = (key - '1')/8.f;
15392
+                }
15393
+                else
15394
+                {
15395
+                    //newenvy = Character.getNumericValue(key);
15396
+                }
1525915397                 repaint();
1526015398                 break;
1526115399             case '!':
....@@ -15818,8 +15956,6 @@
1581815956 
1581915957         int width = getBounds().width;
1582015958         int height = getBounds().height;
15821
-        ClickInfo info = new ClickInfo();
15822
-        info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
1582315959         //Image img = CreateImage(width, height);
1582415960         //System.out.println("width = " + width + "; height = " + height + "\n");
1582515961         
....@@ -15896,31 +16032,37 @@
1589616032         }
1589716033         if (object != null && !hasMarquee)
1589816034         {
16035
+            if (object.clickInfo == null)
16036
+                object.clickInfo = new ClickInfo();
16037
+            ClickInfo info = object.clickInfo;
16038
+            //ClickInfo info = new ClickInfo();
16039
+            info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
16040
+        
1589916041             if (isRenderer)
1590016042             {
15901
-                info.flags++;
16043
+                object.clickInfo.flags++;
1590216044                 double frameAspect = (double) width / (double) height;
1590316045                 if (frameAspect > renderCamera.aspect)
1590416046                 {
1590516047                     int desired = (int) ((double) height * renderCamera.aspect);
15906
-                    info.bounds.width -= width - desired;
15907
-                    info.bounds.x += (width - desired) / 2;
16048
+                    object.clickInfo.bounds.width -= width - desired;
16049
+                    object.clickInfo.bounds.x += (width - desired) / 2;
1590816050                 } else
1590916051                 {
1591016052                     int desired = (int) ((double) width / renderCamera.aspect);
15911
-                    info.bounds.height -= height - desired;
15912
-                    info.bounds.y += (height - desired) / 2;
16053
+                    object.clickInfo.bounds.height -= height - desired;
16054
+                    object.clickInfo.bounds.y += (height - desired) / 2;
1591316055                 }
1591416056             }
1591516057             
15916
-            info.g = gr;
15917
-            info.camera = renderCamera;
16058
+            object.clickInfo.g = gr;
16059
+            object.clickInfo.camera = renderCamera;
1591816060             /* 
1591916061             // Memory intensive (brep.verticescopy)
1592016062             if (!(object instanceof Composite))
1592116063             object.draw(info, 0, false); // SLOW : 
1592216064              */
15923
-            if (!isRenderer)
16065
+            if (!isRenderer) // && drag)
1592416066             {
1592516067                 Grafreed.Assert(object != null);
1592616068                 Grafreed.Assert(object.selection != null);
....@@ -15928,9 +16070,9 @@
1592816070                 {
1592916071                     int hitSomething = object.selection.get(0).hitSomething;
1593016072 
15931
-                    info.DX = 0;
15932
-                    info.DY = 0;
15933
-                    info.W = 1;
16073
+                    object.clickInfo.DX = 0;
16074
+                    object.clickInfo.DY = 0;
16075
+                    object.clickInfo.W = 1;
1593416076                     if (hitSomething == Object3D.hitCenter)
1593516077                     {
1593616078                         info.DX = X;
....@@ -15942,7 +16084,8 @@
1594216084                             info.DY -= info.bounds.height/2;
1594316085                     }
1594416086 
15945
-                    object.drawEditHandles(info, 0);
16087
+                    object.drawEditHandles(//info,
16088
+                                            0);
1594616089 
1594716090                     if (drag && (X != 0 || Y != 0))
1594816091                     {
....@@ -16441,6 +16584,8 @@
1644116584     private /*static*/ boolean firstime;
1644216585     private /*static*/ cVector newView = new cVector();
1644316586     private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
16587
+    private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
16588
+    private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
1644416589     private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
1644516590                                              GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
1644616591                                              GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
....@@ -16453,29 +16598,66 @@
1645316598     {
1645416599         com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
1645516600 
16601
+        int usedsuf = 0;
16602
+        
1645616603         for (int i = 0; i < suffixes.length; i++)
1645716604         {
16458
-            String resourceName = basename + suffixes[i] + "." + suffix;
16459
-            TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16460
-                    mipmapped,
16461
-                    FileUtil.getFileSuffix(resourceName));
16462
-            if (data == null)
16605
+            String[] suffixe = suffixes;
16606
+            String[] fallback = suffixes2;
16607
+            String[] fallfallback = suffixes3;
16608
+            
16609
+            for (int c=usedsuf; --c>=0;)
1646316610             {
16464
-                throw new IOException("Unable to load texture " + resourceName);
16611
+//                String[] temp = suffixe;
16612
+//                suffixe = fallback;
16613
+//                fallback = fallfallback;
16614
+//                fallfallback = temp;
1646516615             }
16616
+            
16617
+            String resourceName = basename + suffixe[i] + "." + suffix;
16618
+            TextureData data;
16619
+            
16620
+            try
16621
+            {
16622
+                data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16623
+                        mipmapped,
16624
+                        FileUtil.getFileSuffix(resourceName));
16625
+            }
16626
+            catch (Exception e)
16627
+            {
16628
+                try
16629
+                {
16630
+                    resourceName = basename + fallback[i] + "." + suffix;
16631
+                    data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16632
+                            mipmapped,
16633
+                            FileUtil.getFileSuffix(resourceName));
16634
+                }
16635
+                catch (Exception e2)
16636
+                {
16637
+                    resourceName = basename + fallfallback[i] + "." + suffix;
16638
+                    data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16639
+                            mipmapped,
16640
+                            FileUtil.getFileSuffix(resourceName));
16641
+                }
16642
+            }
16643
+            
1646616644             //System.out.println("Target = " + targets[i]);
1646716645             cubemap.updateImage(data, targets[i]);
1646816646         }
1646916647 
1647016648         return cubemap;
1647116649     }
16650
+    
1647216651     int bigsphere = -1;
1647316652 
1647416653     float BGcolor = 0.5f;
1647516654     
16476
-    private void DrawSkyBox(GL gl)
16655
+    float ambientLight[] = {1f, 1f, 1f, 1.0f};
16656
+    
16657
+    private void DrawSkyBox(GL gl, float ratio)
1647716658     {
16478
-        if (envyoff || cubemap == null)
16659
+        if (//envyoff ||
16660
+                cubemap == null)
1647916661         {
1648016662             gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
1648116663             gl.glClear(gl.GL_COLOR_BUFFER_BIT);
....@@ -16490,7 +16672,17 @@
1649016672         // Compensates for ExaminerViewer's modification of modelview matrix
1649116673         gl.glMatrixMode(GL.GL_MODELVIEW);
1649216674         gl.glLoadIdentity();
16675
+        gl.glScalef(1,ratio,1);
1649316676 
16677
+//        colorV[0] = 2;
16678
+//        colorV[1] = 2;
16679
+//        colorV[2] = 2;
16680
+//        colorV[3] = 1;
16681
+//        gl.glDisable(gl.GL_COLOR_MATERIAL);
16682
+//        gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
16683
+//        
16684
+//        gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
16685
+        
1649416686         //gl.glActiveTexture(GL.GL_TEXTURE1);
1649516687         //gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
1649616688 
....@@ -16522,6 +16714,7 @@
1652216714         {
1652316715             gl.glScalef(1.0f, -1.0f, 1.0f);
1652416716         }
16717
+        gl.glScalef(-1.0f, 1.0f, 1.0f);
1652516718         gl.glMultMatrixd(viewrot_1, 0);
1652616719         gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance());  // 0.5f);
1652716720         //viewer.updateInverseRotation(gl);
....@@ -16780,7 +16973,7 @@
1678016973             //new Exception().printStackTrace();
1678116974             System.out.println("select buffer init");
1678216975             // Use debug pipeline
16783
-            drawable.setGL(new DebugGL(drawable.getGL()));
16976
+            //drawable.setGL(new DebugGL(drawable.getGL()));
1678416977 
1678516978             GL gl = drawable.getGL();
1678616979