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,8 +12446,76 @@
1239912446 
1240012447         //gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
1240112448 
12449
+        String program0 =
12450
+                // Min shader
12451
+                "!!ARBfp1.0\n" +
12452
+                "PARAM zero123      = { 0.0, 1.0, 2, 1.25 };" +
12453
+                "PARAM pow2      = { 0.5, 0.25, 0.125, 0.0 };" +
12454
+                "PARAM one      = { 1.0, 1.0, 1.0, 1.0 };" +
12455
+                "PARAM eps      = { 0.001, 0.001, 0.001, 1.0 };" +
12456
+                "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];" +
12460
+                "TEMP temp;" +
12461
+                "TEMP light;" +
12462
+                "TEMP ndotl;" +
12463
+                "TEMP normal;" +
12464
+                "TEMP depth;" +
12465
+                "TEMP eye;" +
12466
+                "TEMP pos;" +
12467
+                
12468
+                "MAD normal, fragment.color, zero123.z, -zero123.y;" +
12469
+                Normalize("normal") +
12470
+                "MOV light, state.light[0].position;" +
12471
+                "DP3 ndotl.x, light, normal;" +
12472
+
12473
+                // shadow
12474
+                "MOV pos, fragment.texcoord[1];" +
12475
+                "MOV temp, pos;" +
12476
+                ShadowTextureFetch("depth", "temp", "1") +
12477
+                //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
12478
+                "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
12479
+
12480
+                // No shadow when out of frustum
12481
+                //"SGE temp.y, depth.z, zero123.y;" +
12482
+                //"LRP temp.x, temp.y, zero123.y, temp.x;" +
12483
+                
12484
+                "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
12485
+                
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
12504
+                "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
12505
+                "LRP temp, zero123.w, temp, one;" + // texture proportion
12506
+                "MUL temp, temp, ndotl.x;" +
12507
+                
12508
+                "MUL temp, temp, zero123.z;" +
12509
+                
12510
+                //"MUL temp, temp, ndotl.y;" +
12511
+                
12512
+                "MOV temp.w, zero123.y;" + // reset alpha
12513
+                "MOV result.color, temp;" +
12514
+                "END";
12515
+        
1240212516         String program =
1240312517                 "!!ARBfp1.0\n" +
12518
+                
1240412519                 //"OPTION ARB_fragment_program_shadow;" +
1240512520                 "PARAM light2cam0   = program.env[10];" +
1240612521                 "PARAM light2cam1   = program.env[11];" +
....@@ -12515,8 +12630,7 @@
1251512630                 "TEMP shininess;" +
1251612631                 "\n" +
1251712632                 "MOV texSamp, one;" +
12518
-                //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12519
-
12633
+                
1252012634                 "MOV mapgrid.x, one2048th.x;" +
1252112635                 "MOV temp, fragment.texcoord[1];" +
1252212636                 /*
....@@ -12537,20 +12651,20 @@
1253712651                 "MUL temp, floor, mapgrid.x;" +
1253812652                 //"TEX depth0, temp, texture[1], 2D;" +
1253912653                 (((mode & FP_SOFTSHADOW) == 0) ? "" :
12540
-                TextureFetch("depth0", "temp", "1") +
12654
+                ShadowTextureFetch("depth0", "temp", "1") +
1254112655                 "") +
1254212656                 "ADD temp.x, temp.x, mapgrid.x;" +
1254312657                 //"TEX depth1, temp, texture[1], 2D;" +
1254412658                 (((mode & FP_SOFTSHADOW) == 0) ? "" :
12545
-                TextureFetch("depth1", "temp", "1") +
12659
+                ShadowTextureFetch("depth1", "temp", "1") +
1254612660                 "") +
1254712661                 "ADD temp.y, temp.y, mapgrid.x;" +
1254812662                 //"TEX depth2, temp, texture[1], 2D;" +
12549
-                TextureFetch("depth2", "temp", "1") +
12663
+                ShadowTextureFetch("depth2", "temp", "1") +
1255012664                 "SUB temp.x, temp.x, mapgrid.x;" +
1255112665                 //"TEX depth3, temp, texture[1], 2D;" +
1255212666                 (((mode & FP_SOFTSHADOW) == 0) ? "" :
12553
-                TextureFetch("depth3", "temp", "1") +
12667
+                ShadowTextureFetch("depth3", "temp", "1") +
1255412668                 "") +
1255512669                 //"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
1255612670                 //"MOV params, material;" +
....@@ -12921,10 +13035,10 @@
1292113035                 "MAD shadow.x, buffer.x, frac.y, shadow.x;" +
1292213036                 "") +
1292313037 
12924
-           // display shadow only (bump == 0)
13038
+           // display shadow only (fakedepth == 0)
1292513039          "SUB temp.x, half.x, shadow.x;" +
1292613040          "MOV temp.y, -params5.z;" + // params6.x;" +
12927
-         "SLT temp.z, temp.y, -one2048th.x;" +
13041
+         "SLT temp.z, temp.y, -c256i.x;" +
1292813042          "SUB temp.y, one.x, temp.z;" +
1292913043          "MUL temp.x, temp.x, temp.y;" +
1293013044          "KIL temp.x;" +
....@@ -13348,25 +13462,26 @@
1334813462         return out;
1334913463     }
1335013464 
13351
-    String TextureFetch(String dest, String src, String unit)
13465
+    // Also does frustum culling
13466
+    String ShadowTextureFetch(String dest, String src, String unit)
1335213467     {
1335313468         return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
1335413469                 "SGE " + src + ".w, " + src + ".x, eps.x;" +
1335513470                 "SGE " + src + ".z, " + src + ".y, eps.x;" +
13471
+                "SLT " + dest + ".x, " + src + ".x, one.x;" +
13472
+                "SLT " + dest + ".y, " + src + ".y, one.x;" +
1335613473                 "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;" +
13474
+                "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
13475
+                "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
1336113476                 //"SWZ buffer, temp, w,w,w,w;";
13362
-                "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13477
+                //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
1336313478                 "SUB " + src + ".z, " + "one.x, " + src + ".w;" +
1336413479                 //"MUL " + src + ".z, " + src + ".z, infinity.x;" +
1336513480                 //"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13366
-                "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13481
+                //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
1336713482 
13368
-    //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13369
-    //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
13483
+    //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13484
+    "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
1337013485     }
1337113486 
1337213487     String Shadow(String depth, String shadow)
....@@ -13413,7 +13528,7 @@
1341313528                 "SLT temp.x, temp.x, zero.x;" + // shadoweps
1341413529                 "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
1341513530 
13416
-                // No shadow when out of frustrum
13531
+                // No shadow when out of frustum
1341713532                 "SGE temp.x, " + depth + ".z, one.z;" +
1341813533                 "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
1341913534                 "";
....@@ -14211,14 +14326,15 @@
1421114326             drag = false;
1421214327             //System.out.println("Mouse DOWN");
1421314328             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);
14329
+            //ClickInfo info = new ClickInfo();
14330
+            object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14331
+            object.clickInfo.pane = this;
14332
+            object.clickInfo.camera = renderCamera;
14333
+            object.clickInfo.x = x;
14334
+            object.clickInfo.y = y;
14335
+            object.clickInfo.modifiers = modifiersex;
14336
+            editObj = object.doEditClick(//info,
14337
+                    0);
1422214338             if (!editObj)
1422314339             {
1422414340                 hasMarquee = true;
....@@ -14618,15 +14734,16 @@
1461814734             if (editObj)
1461914735             {
1462014736                 drag = true;
14621
-                ClickInfo info = new ClickInfo();
14622
-                info.bounds.setBounds(0, 0,
14737
+                //ClickInfo info = new ClickInfo();
14738
+                object.clickInfo.bounds.setBounds(0, 0,
1462314739                         (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);
14740
+                object.clickInfo.pane = this;
14741
+                object.clickInfo.camera = renderCamera;
14742
+                object.clickInfo.x = x;
14743
+                object.clickInfo.y = y;
14744
+                object //.GetWindow().copy
14745
+                        .doEditDrag(//info,
14746
+                                (modifiers & MouseEvent.BUTTON3_MASK) != 0);
1463014747             } else
1463114748             {
1463214749                 if (x < startX)
....@@ -14775,24 +14892,27 @@
1477514892         }
1477614893     }
1477714894 
14895
+//        ClickInfo clickInfo = new ClickInfo();
14896
+        
1477814897     public void mouseMoved(MouseEvent e)
1477914898     {
1478014899         //System.out.println("mouseMoved: " + e);
1478114900         if (isRenderer)
1478214901             return;
1478314902         
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;
14903
+        // Mouse cursor feedback
14904
+        object.clickInfo.x = e.getX();
14905
+        object.clickInfo.y = e.getY();
14906
+        object.clickInfo.modifiers = e.getModifiersEx();
14907
+        object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14908
+        object.clickInfo.pane = this;
14909
+        object.clickInfo.camera = renderCamera;
1479114910         if (!isRenderer)
1479214911         {
1479314912             //ObjEditor editWindow = object.editWindow;
1479414913             //Object3D copy = editWindow.copy;
14795
-            if (object.doEditClick(ci, 0))
14914
+            if (object.doEditClick(//clickInfo,
14915
+                                0))
1479614916             {
1479714917                 setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
1479814918             } else
....@@ -15248,14 +15368,18 @@
1524815368             case '3':
1524915369             case '4':
1525015370             case '5':
15251
-                newenvy = Character.getNumericValue(key);
15252
-                repaint();
15253
-                break;
1525415371             case '6':
1525515372             case '7':
1525615373             case '8':
1525715374             case '9':
15258
-                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
+                }
1525915383                 repaint();
1526015384                 break;
1526115385             case '!':
....@@ -15818,8 +15942,6 @@
1581815942 
1581915943         int width = getBounds().width;
1582015944         int height = getBounds().height;
15821
-        ClickInfo info = new ClickInfo();
15822
-        info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
1582315945         //Image img = CreateImage(width, height);
1582415946         //System.out.println("width = " + width + "; height = " + height + "\n");
1582515947         
....@@ -15896,31 +16018,37 @@
1589616018         }
1589716019         if (object != null && !hasMarquee)
1589816020         {
16021
+            if (object.clickInfo == null)
16022
+                object.clickInfo = new ClickInfo();
16023
+            ClickInfo info = object.clickInfo;
16024
+            //ClickInfo info = new ClickInfo();
16025
+            info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
16026
+        
1589916027             if (isRenderer)
1590016028             {
15901
-                info.flags++;
16029
+                object.clickInfo.flags++;
1590216030                 double frameAspect = (double) width / (double) height;
1590316031                 if (frameAspect > renderCamera.aspect)
1590416032                 {
1590516033                     int desired = (int) ((double) height * renderCamera.aspect);
15906
-                    info.bounds.width -= width - desired;
15907
-                    info.bounds.x += (width - desired) / 2;
16034
+                    object.clickInfo.bounds.width -= width - desired;
16035
+                    object.clickInfo.bounds.x += (width - desired) / 2;
1590816036                 } else
1590916037                 {
1591016038                     int desired = (int) ((double) width / renderCamera.aspect);
15911
-                    info.bounds.height -= height - desired;
15912
-                    info.bounds.y += (height - desired) / 2;
16039
+                    object.clickInfo.bounds.height -= height - desired;
16040
+                    object.clickInfo.bounds.y += (height - desired) / 2;
1591316041                 }
1591416042             }
1591516043             
15916
-            info.g = gr;
15917
-            info.camera = renderCamera;
16044
+            object.clickInfo.g = gr;
16045
+            object.clickInfo.camera = renderCamera;
1591816046             /* 
1591916047             // Memory intensive (brep.verticescopy)
1592016048             if (!(object instanceof Composite))
1592116049             object.draw(info, 0, false); // SLOW : 
1592216050              */
15923
-            if (!isRenderer)
16051
+            if (!isRenderer) // && drag)
1592416052             {
1592516053                 Grafreed.Assert(object != null);
1592616054                 Grafreed.Assert(object.selection != null);
....@@ -15928,9 +16056,9 @@
1592816056                 {
1592916057                     int hitSomething = object.selection.get(0).hitSomething;
1593016058 
15931
-                    info.DX = 0;
15932
-                    info.DY = 0;
15933
-                    info.W = 1;
16059
+                    object.clickInfo.DX = 0;
16060
+                    object.clickInfo.DY = 0;
16061
+                    object.clickInfo.W = 1;
1593416062                     if (hitSomething == Object3D.hitCenter)
1593516063                     {
1593616064                         info.DX = X;
....@@ -15942,7 +16070,8 @@
1594216070                             info.DY -= info.bounds.height/2;
1594316071                     }
1594416072 
15945
-                    object.drawEditHandles(info, 0);
16073
+                    object.drawEditHandles(//info,
16074
+                                            0);
1594616075 
1594716076                     if (drag && (X != 0 || Y != 0))
1594816077                     {
....@@ -15955,7 +16084,7 @@
1595516084                                 gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
1595616085                             break;
1595716086                             case Object3D.hitScale: gr.setColor(Color.cyan);
15958
-                                gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
16087
+                                gr.drawLine(X, Y, 0, 0);
1595916088                             break;
1596016089                         }
1596116090 
....@@ -16441,6 +16570,8 @@
1644116570     private /*static*/ boolean firstime;
1644216571     private /*static*/ cVector newView = new cVector();
1644316572     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"};
1644416575     private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
1644516576                                              GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
1644616577                                              GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
....@@ -16453,16 +16584,49 @@
1645316584     {
1645416585         com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
1645516586 
16587
+        int usedsuf = 0;
16588
+        
1645616589         for (int i = 0; i < suffixes.length; i++)
1645716590         {
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)
16591
+            String[] suffixe = suffixes;
16592
+            String[] fallback = suffixes2;
16593
+            String[] fallfallback = suffixes3;
16594
+            
16595
+            for (int c=usedsuf; --c>=0;)
1646316596             {
16464
-                throw new IOException("Unable to load texture " + resourceName);
16597
+//                String[] temp = suffixe;
16598
+//                suffixe = fallback;
16599
+//                fallback = fallfallback;
16600
+//                fallfallback = temp;
1646516601             }
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
+            
1646616630             //System.out.println("Target = " + targets[i]);
1646716631             cubemap.updateImage(data, targets[i]);
1646816632         }
....@@ -16473,7 +16637,9 @@
1647316637 
1647416638     float BGcolor = 0.5f;
1647516639     
16476
-    private void DrawSkyBox(GL gl)
16640
+    float ambientLight[] = {1f, 1f, 1f, 1.0f};
16641
+    
16642
+    private void DrawSkyBox(GL gl, float ratio)
1647716643     {
1647816644         if (envyoff || cubemap == null)
1647916645         {
....@@ -16490,7 +16656,17 @@
1649016656         // Compensates for ExaminerViewer's modification of modelview matrix
1649116657         gl.glMatrixMode(GL.GL_MODELVIEW);
1649216658         gl.glLoadIdentity();
16659
+        gl.glScalef(1,ratio,1);
1649316660 
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
+        
1649416670         //gl.glActiveTexture(GL.GL_TEXTURE1);
1649516671         //gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
1649616672 
....@@ -16503,7 +16679,7 @@
1650316679         // GL_NORMAL_MAP texgen mode. Temporarily enabling lighting
1650416680         // causes the normals to be sent down. Thanks to Ken Dyke.
1650516681         //gl.glEnable(GL.GL_LIGHTING);
16506
-        gl.glDisable(GL.GL_LIGHTING);
16682
+        gl.glEnable(GL.GL_LIGHTING);
1650716683 
1650816684         gl.glTexGeni(GL.GL_S, GL.GL_TEXTURE_GEN_MODE, GL.GL_NORMAL_MAP);
1650916685         gl.glTexGeni(GL.GL_T, GL.GL_TEXTURE_GEN_MODE, GL.GL_NORMAL_MAP);
....@@ -16522,6 +16698,7 @@
1652216698         {
1652316699             gl.glScalef(1.0f, -1.0f, 1.0f);
1652416700         }
16701
+        gl.glScalef(-1.0f, 1.0f, 1.0f);
1652516702         gl.glMultMatrixd(viewrot_1, 0);
1652616703         gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance());  // 0.5f);
1652716704         //viewer.updateInverseRotation(gl);
....@@ -16780,7 +16957,7 @@
1678016957             //new Exception().printStackTrace();
1678116958             System.out.println("select buffer init");
1678216959             // Use debug pipeline
16783
-            drawable.setGL(new DebugGL(drawable.getGL()));
16960
+            //drawable.setGL(new DebugGL(drawable.getGL()));
1678416961 
1678516962             GL gl = drawable.getGL();
1678616963