Save skybox.

Normand Briere

2019-07-30 475f8cbdbd96fdbf8f5b216ffebb31a51f25c2f9

Save skybox.

 CameraPane.java
..
..
@@ -9316,10 +9316,9 @@
9316
9316
     double[] light2camera = new double[16];
9317
9317
     
9318
9318
     //int newenvy = -1;
9319
-    boolean envyoff = true; // false;
9320
-    String skyboxname = "";
9321
-    String skyboxext;
9322
-    String loadedskyboxname = "";
9319
+    //boolean envyoff = false;
9320
+    
9321
+    String loadedskyboxname;
9323
9322
     
9324
9323
     cVector light0 = new cVector(0, 0, 0); // 1,3,2);
9325
9324
     //float[] light0 = { 0,0,0 };
..
..
@@ -11065,10 +11064,18 @@
11065
11064
 //
11066
11065
 //        newenvy = -1;
11067
11066
         
11068
-        if (!skyboxname.equals(this.loadedskyboxname))
11067
+        if (object.skyboxname != null)
11069
11068
         {
11070
-            LoadSkybox(skyboxname + "/", skyboxext, false);
11071
-            loadedskyboxname = skyboxname;
11069
+            if (!object.skyboxname.equals(this.loadedskyboxname))
11070
+            {
11071
+                LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
11072
+                loadedskyboxname = object.skyboxname;
11073
+            }
11074
+        }
11075
+        else
11076
+        {
11077
+            cubemap = null;
11078
+            loadedskyboxname = null;
11072
11079
         }
11073
11080
         
11074
11081
         ratio = ((double) getWidth()) / getHeight();
..
..
@@ -15362,7 +15369,7 @@
15362
15369
                 OCCLUSION_CULLING ^= true;
15363
15370
                 System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
15364
15371
                 break;
15365
-            case '0': envyoff ^= true; repaint(); break;
15372
+            //case '0': envyoff ^= true; repaint(); break;
15366
15373
             case '1':
15367
15374
             case '2':
15368
15375
             case '3':
..
..
@@ -15372,7 +15379,7 @@
15372
15379
             case '7':
15373
15380
             case '8':
15374
15381
             case '9':
15375
-                if (envyoff)
15382
+                if (true) // envyoff)
15376
15383
                 {
15377
15384
                     BGcolor = (key - '1')/8.f;
15378
15385
                 }
..
..
@@ -16633,6 +16640,7 @@
16633
16640
 
16634
16641
         return cubemap;
16635
16642
     }
16643
+    
16636
16644
     int bigsphere = -1;
16637
16645
 
16638
16646
     float BGcolor = 0.5f;
..
..
@@ -16641,7 +16649,8 @@
16641
16649
     
16642
16650
     private void DrawSkyBox(GL gl, float ratio)
16643
16651
     {
16644
-        if (envyoff || cubemap == null)
16652
+        if (//envyoff ||
16653
+                cubemap == null)
16645
16654
         {
16646
16655
             gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16647
16656
             gl.glClear(gl.GL_COLOR_BUFFER_BIT);
 GroupEditor.java
..
..
@@ -251,9 +251,9 @@
251
251
     
252
252
     public void ChangeSkybox(String name)
253
253
     {
254
-        cameraView.envyoff = false;
255
-        cameraView.skyboxname = name;
256
-        cameraView.skyboxext = "jpg";
254
+        //cameraView.envyoff = false;
255
+        group.skyboxname = name;
256
+        group.skyboxext = "jpg";
257
257
         cameraView.repaint();
258
258
     }
259
259
     
 ObjEditor.java
..
..
@@ -4853,6 +4853,8 @@
4853
4853
             {
4854
4854
                 //readobj.deepCopySelf(copy);
4855
4855
                 copy.clear(); // june 2014
4856
+                copy.skyboxname = readobj.skyboxname;
4857
+                copy.skyboxext = readobj.skyboxext;
4856
4858
                 for (int i = 0; i < readobj.size(); i++)
4857
4859
                 {
4858
4860
                     Object3D child = readobj.get(i); // reserve(i);
 Object3D.java
..
..
@@ -29,6 +29,9 @@
29
29
     Object3D saveskeleton;
30
30
     //
31
31
     
32
+    String skyboxname;
33
+    String skyboxext;
34
+    
32
35
     byte[] versions[];
33
36
     int versionindex = -1;    
34
37