RGB skybox

Normand Briere

2019-08-13 c67de8aca04d988179191ccb52461af00125920e

RGB skybox

 CameraPane.java
..
..
@@ -110,7 +110,9 @@
110
110
     //private Mat4f spotlightTransform = new Mat4f();
111
111
     //private Mat4f spotlightInverseTransform = new Mat4f();
112
112
     static GLContext glcontext = null;
113
-    /*static*/ com.sun.opengl.util.texture.Texture cubemap;
113
+    /*static*/ com.sun.opengl.util.texture.Texture cubemap; // Either custom or rgb
114
+    /*static*/ com.sun.opengl.util.texture.Texture cubemapcustom;
115
+    /*static*/ com.sun.opengl.util.texture.Texture cubemaprgb;
114
116
     boolean reverseUP = false;
115
117
     static boolean frozen = false;
116
118
     boolean enablebackspace = false; // patch for back buffer refresh
..
..
@@ -188,15 +190,16 @@
188
190
     
189
191
     private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
190
192
 
191
-    public void LoadSkybox(String name, String ext, boolean mipmap) throws GLException
193
+    public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
192
194
     {
193
195
         try
194
196
         {
195
-            cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
197
+            return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
196
198
         } catch (IOException e)
197
199
         {
198
200
             System.out.println("NAME = " + name);
199
201
             e.printStackTrace(); // throw new RuntimeException(e);
202
+            return null;
200
203
         }
201
204
     }
202
205
     
..
..
@@ -9233,6 +9236,8 @@
9233
9236
 
9234
9237
     void LoadEnvy(int which)
9235
9238
     {
9239
+        assert(false);
9240
+        
9236
9241
         String name;
9237
9242
         String ext;
9238
9243
 
..
..
@@ -11077,18 +11082,32 @@
11077
11082
 //
11078
11083
 //        newenvy = -1;
11079
11084
         
11080
-        if (object.skyboxname != null)
11085
+        if (object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
11081
11086
         {
11082
-            if (!object.skyboxname.equals(this.loadedskyboxname))
11087
+            if (cubemaprgb == null)
11083
11088
             {
11084
-                LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
11085
-                loadedskyboxname = object.skyboxname;
11089
+                cubemaprgb = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
11086
11090
             }
11091
+            
11092
+            cubemap = cubemaprgb;
11087
11093
         }
11088
11094
         else
11089
11095
         {
11090
-            cubemap = null;
11091
-            loadedskyboxname = null;
11096
+            if (object.skyboxname != null)
11097
+            {
11098
+                if (!object.skyboxname.equals(this.loadedskyboxname))
11099
+                {
11100
+                    cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
11101
+                    loadedskyboxname = object.skyboxname;
11102
+                }
11103
+            }
11104
+            else
11105
+            {
11106
+                cubemapcustom = null;
11107
+                loadedskyboxname = null;
11108
+            }
11109
+            
11110
+            cubemap = cubemapcustom;
11092
11111
         }
11093
11112
         
11094
11113
         ratio = ((double) getWidth()) / getHeight();
 ObjEditor.java
..
..
@@ -433,6 +433,8 @@
433
433
         
434
434
         ChangeListener changeListener = new ChangeListener()
435
435
         {
436
+            String name;
437
+            
436
438
             public void stateChanged(ChangeEvent changeEvent)
437
439
             {
438
440
 //                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..
..
@@ -451,7 +453,36 @@
451
453
 //                        EditSelection(false);
452
454
 //                }
453
455
 
456
+                if (objectPanel.getSelectedIndex() == 4)
457
+                {
458
+                    name = copy.skyboxname;
459
+                    
460
+                    if (name == null)
461
+                    {
462
+                        name = "";
463
+                    }
464
+                    
465
+                    copy.skyboxname = "cubemaps/default-skyboxes/rgb";
466
+                    copy.skyboxext = "jpg";
467
+                }
468
+                else
469
+                {
470
+                    if (name != null)
471
+                    {
472
+                        if (name.equals(""))
473
+                        {
474
+                            copy.skyboxname = null;
475
+                            copy.skyboxext = null;
476
+                        }
477
+                        else
478
+                        {
479
+                            copy.skyboxname = name;
480
+                        }
481
+                    }
482
+                }
483
+                
454
484
 //                refreshContents(false); // To refresh Info tab
485
+                cameraView.repaint();
455
486
             }
456
487
         };
457
488
         objectPanel.addChangeListener(changeListener);