Call list issue.

Normand Briere

2019-08-01 abb71c81c8a351cda9a2918dcaa7ee61e6c125c5

 GroupEditor.java
..
..
@@ -60,7 +60,7 @@
60
60
         //AddSkyboxButton("default", "cornell", row0);
61
61
         AddSkyboxButton("penguins", "dust", row0);
62
62
         AddSkyboxButton("penguins", "tropic", row0);
63
-        AddSkyboxButton("default", "skycube", row0);
63
+        AddSkyboxButton("penguins", "yonder", row0);
64
64
 
65
65
         AddSkyboxButton("default", "uffizi", row1);
66
66
         AddSkyboxButton("bridge", "Bridge", row1);
..
..
@@ -90,7 +90,7 @@
90
90
         AddSkyboxButton("park", "Skansen3", row6);
91
91
         AddSkyboxButton("park", "Skansen4", row6);
92
92
         AddSkyboxButton("park", "Skansen5", row6);
93
-        AddSkyboxButton("park", "Stairs", row6);
93
+        AddSkyboxButton("persson", "VancouverConventionCentre", row6);
94
94
         
95
95
         tab0.add(row0);
96
96
         tab0.add(row1);
..
..
@@ -144,21 +144,18 @@
144
144
         
145
145
         AddSkyboxButton("mountain", "Maskonaive2", row4);
146
146
         AddSkyboxButton("mountain", "Maskonaive3", row4);
147
-        AddSkyboxButton("mountain", "Ryfjallet", row4);
148
147
         AddSkyboxButton("mountain", "Teide", row4);
149
148
         AddSkyboxButton("park", "Tantolunden4", row4);
150
149
         
151
-        AddSkyboxButton("penguins", "wrath", row5);
152
-        AddSkyboxButton("penguins", "yonder", row5);
150
+        AddSkyboxButton("park", "Stairs", row5);
151
+        AddSkyboxButton("default", "skycube", row6);
153
152
         AddSkyboxButton("rocky", "Langholmen", row5);
154
153
         AddSkyboxButton("rocky", "Skinnarviksberget", row5);
155
-        AddSkyboxButton("rocky", "Tantolunden6", row5);
156
154
         
155
+        AddSkyboxButton("rocky", "Tantolunden6", row5);
157
156
         AddSkyboxButton("default", "CloudyHills", row6);
158
157
         AddSkyboxButton("daz", "Autumn", row6);
159
-        AddSkyboxButton("daz", "Greenlands", row6);
160
158
         AddSkyboxButton("daz", "MountainTrail", row6);
161
-        AddSkyboxButton("daz", "Oasis", row6);
162
159
         /*
163
160
 Autumn
164
161
 Greenlands
..
..
@@ -210,8 +207,8 @@
210
207
         AddSkyboxButton("penguins", "sleepyhollow", row1);
211
208
         
212
209
         AddSkyboxButton("penguins", "kenon_star", row2);
213
-        AddSkyboxButton("indoors", "DallasW", row2);
214
-        AddSkyboxButton("indoors", "MarriottMadisonWest", row2);
210
+        AddSkyboxButton("persson", "corona", row2);
211
+        AddSkyboxButton("persson", "spaceskybox", row2);
215
212
         AddSkyboxButton("indoors", "Vasa", row2);
216
213
         
217
214
         AddSkyboxButton("winter", "Backyard", row3);
..
..
@@ -232,7 +229,7 @@
232
229
         AddSkyboxButton("daz", "TheRock", row6);
233
230
         AddSkyboxButton("daz", "TopOfTheWorld", row6);
234
231
         AddSkyboxButton("daz", "Winter", row6);
235
-        AddSkyboxButton("penguins", "desertdawn", row6);
232
+        AddSkyboxButton("mountain", "Ryfjallet", row6);
236
233
         
237
234
         tab0.add(row0);
238
235
         tab0.add(row1);
..
..
@@ -248,7 +245,72 @@
248
245
             //tab0.add(new cGridBag());
249
246
         }
250
247
     }
251
-    
248
+
249
+    public void AddSkyboxTab3(JTabbedPane skyboxpanel)
250
+    {
251
+        cGridBag tab0 = new cGridBag().setVertical(true);
252
+        
253
+        tab0.setName("Others");
254
+        skyboxpanel.add(tab0);
255
+
256
+        cGridBag row0 = new cGridBag();
257
+        cGridBag row1 = new cGridBag();
258
+        cGridBag row2 = new cGridBag();
259
+        cGridBag row3 = new cGridBag();
260
+        cGridBag row4 = new cGridBag();
261
+        cGridBag row5 = new cGridBag();
262
+        cGridBag row6 = new cGridBag();
263
+        
264
+        AddSkyboxButton("mayhem", "afterrain", row0);
265
+        AddSkyboxButton("mayhem", "aqua4", row0);
266
+        AddSkyboxButton("mayhem", "aqua9", row0);
267
+        AddSkyboxButton("mayhem", "flame", row0);
268
+        
269
+        AddSkyboxButton("mayhem", "h2s", row1);
270
+        AddSkyboxButton("mayhem", "prehistoric", row1);
271
+        AddSkyboxButton("mayhem", "scorched", row1);
272
+        AddSkyboxButton("penguins", "desertdawn", row1);
273
+        
274
+        AddSkyboxButton("persson", "Citadella", row2);
275
+        AddSkyboxButton("persson", "Citadella2", row2);
276
+        AddSkyboxButton("persson", "clouds1", row2);
277
+        AddSkyboxButton("penguins", "wrath", row2);
278
+        
279
+        AddSkyboxButton("persson", "FishermansBastion", row3);
280
+        AddSkyboxButton("persson", "HeroesSquare", row3);
281
+        AddSkyboxButton("indoors", "DallasW", row3);
282
+        AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
283
+        
284
+        AddSkyboxButton("persson", "LancellottiChapel", row4);
285
+        AddSkyboxButton("persson", "PereaBeach1", row4);
286
+        AddSkyboxButton("persson", "PereaBeach2", row4);
287
+        AddSkyboxButton("persson", "redeclipse", row4);
288
+        
289
+        AddSkyboxButton("daz", "Greenlands", row5);
290
+        AddSkyboxButton("daz", "Oasis", row5);
291
+        AddSkyboxButton("elyvisions", "arch3", row5);
292
+        AddSkyboxButton("elyvisions", "calm_sea", row5);
293
+        
294
+        AddSkyboxButton("elyvisions", "rainbow", row6);
295
+        AddSkyboxButton("elyvisions", "distant_sunset", row6);
296
+        AddSkyboxButton("elyvisions", "heaven", row6);
297
+        AddSkyboxButton("elyvisions", "hot", row6);
298
+        
299
+        tab0.add(row0);
300
+        tab0.add(row1);
301
+        tab0.add(row2);
302
+        tab0.add(row3);
303
+        tab0.add(row4);
304
+        tab0.add(row5);
305
+        tab0.add(row6);
306
+        
307
+        for (int i=5; --i>=0;)
308
+        {
309
+            //oe.toolboxPanel.Return();
310
+            //tab0.add(new cGridBag());
311
+        }
312
+    }
313
+        
252
314
     public void ChangeSkybox(String name)
253
315
     {
254
316
         //cameraView.envyoff = false;
..
..
@@ -1040,6 +1102,7 @@
1040
1102
                 AddSkyboxTab0(skyboxpanel);
1041
1103
                 AddSkyboxTab1(skyboxpanel);
1042
1104
                 AddSkyboxTab2(skyboxpanel);
1105
+                AddSkyboxTab3(skyboxpanel);
1043
1106
                 
1044
1107
                 // EDIT panel
1045
1108
 		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..
..
@@ -1171,9 +1234,12 @@
1171
1234
                 smoothCB.setToolTipText("Snapping delay");
1172
1235
                                 smoothCB.addItemListener(this);
1173
1236
 
1174
-                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1175
-                slowCB.setToolTipText("Smooth interpolation");
1176
-                                slowCB.addItemListener(this);
1237
+//                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1238
+//                slowCB.setToolTipText("Smooth interpolation");
1239
+//                                slowCB.addItemListener(this);
1240
+                panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
1241
+                minshaderCB.setToolTipText("Minimal fast shader");
1242
+                                minshaderCB.addItemListener(this);
1177
1243
                                 
1178
1244
 //        	constraints.gridy += 1;
1179
1245
 //                panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..
..
@@ -1287,6 +1353,8 @@
1287
1353
         cCheckBox localCB;
1288
1354
         cCheckBox crowdCB;
1289
1355
         cCheckBox smoothCB;
1356
+        cCheckBox minshaderCB;
1357
+        
1290
1358
         cToggleButton fastCB;
1291
1359
         cCheckBox slowCB;
1292
1360
         cCheckBox boxCB;
..
..
@@ -1358,6 +1426,12 @@
1358
1426
                 cameraView.ToggleInertia();
1359
1427
         cameraView.repaint();
1360
1428
             }
1429
+            else if(e.getSource() == minshaderCB)
1430
+            {
1431
+                Globals.MINSHADER ^= true;
1432
+                cameraView.programInitialized = false;
1433
+                cameraView.repaint();
1434
+            }
1361
1435
             else if(e.getSource() == localCB)
1362
1436
             {
1363
1437
                 cameraView.ToggleLocal();