Min shader option.

Normand Briere

2019-08-01 29d5516687020263d3ae0454ce81879a3a450af0

 GroupEditor.java
..
..
@@ -28,8 +28,8 @@
28
28
     {
29
29
         cButton skyboxButton;
30
30
         final String path = "cubemaps/" + f + "-skyboxes/" + s;
31
-        //row.add(skyboxButton = GetButton(path + "/" + s + ".jpg", !Grafreed.NIMBUSLAF));
32
-        row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
31
+        row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
32
+        //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
33
33
         skyboxButton.setToolTipText(s);
34
34
         skyboxButton.addActionListener(new ActionListener()
35
35
         {
..
..
@@ -57,11 +57,12 @@
57
57
         cGridBag row6 = new cGridBag();
58
58
         
59
59
         AddSkyboxButton("default", "rgb", row0);
60
-        AddSkyboxButton("default", "cornell", row0);
61
-        AddSkyboxButton("default", "uffizi", row0);
62
-        AddSkyboxButton("default", "CloudyHills", row0);
63
-        
64
-        AddSkyboxButton("default", "skycube", row1);
60
+        //AddSkyboxButton("default", "cornell", row0);
61
+        AddSkyboxButton("penguins", "dust", row0);
62
+        AddSkyboxButton("penguins", "tropic", row0);
63
+        AddSkyboxButton("penguins", "yonder", row0);
64
+
65
+        AddSkyboxButton("default", "uffizi", row1);
65
66
         AddSkyboxButton("bridge", "Bridge", row1);
66
67
         AddSkyboxButton("bridge", "Bridge2", row1);
67
68
         AddSkyboxButton("urban", "GamlaStan2", row1);
..
..
@@ -73,23 +74,23 @@
73
74
         
74
75
         AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
75
76
         AddSkyboxButton("urban", "UnionSquare", row3);
77
+        AddSkyboxButton("urban", "Medborgarplatsen", row3);
76
78
         AddSkyboxButton("park", "BerzeliiPark", row3);
77
-        AddSkyboxButton("park", "Buddha", row3);
78
79
         
80
+        AddSkyboxButton("park", "Buddha", row4);
79
81
         AddSkyboxButton("park", "CNTower2", row4);
80
82
         AddSkyboxButton("park", "NiagaraFalls1", row4);
81
83
         AddSkyboxButton("park", "NiagaraFalls3", row4);
82
-        AddSkyboxButton("park", "Park", row4);
83
84
         
85
+        AddSkyboxButton("park", "Park", row5);
84
86
         AddSkyboxButton("park", "Pond", row5);
85
87
         AddSkyboxButton("park", "Skansen", row5);
86
88
         AddSkyboxButton("park", "Skansen2", row5);
87
-        AddSkyboxButton("park", "Skansen3", row5);
88
89
         
90
+        AddSkyboxButton("park", "Skansen3", row6);
89
91
         AddSkyboxButton("park", "Skansen4", row6);
90
92
         AddSkyboxButton("park", "Skansen5", row6);
91
-        AddSkyboxButton("park", "Stairs", row6);
92
-        AddSkyboxButton("park", "Tantolunden4", row6);
93
+        AddSkyboxButton("persson", "VancouverConventionCentre", row6);
93
94
         
94
95
         tab0.add(row0);
95
96
         tab0.add(row1);
..
..
@@ -140,24 +141,29 @@
140
141
         AddSkyboxButton("forest", "Langholmen2", row3);
141
142
         AddSkyboxButton("forest", "Plants", row3);
142
143
         AddSkyboxButton("mountain", "Maskonaive", row3);
144
+        
143
145
         AddSkyboxButton("mountain", "Maskonaive2", row4);
144
-        
145
146
         AddSkyboxButton("mountain", "Maskonaive3", row4);
146
-        AddSkyboxButton("mountain", "Ryfjallet", row4);
147
-        AddSkyboxButton("mountain", "Teide", row4);        
147
+        AddSkyboxButton("mountain", "Teide", row4);
148
+        AddSkyboxButton("park", "Tantolunden4", row4);
148
149
         
150
+        AddSkyboxButton("park", "Stairs", row5);
151
+        AddSkyboxButton("default", "skycube", row6);
149
152
         AddSkyboxButton("rocky", "Langholmen", row5);
150
-        AddSkyboxButton("rocky", "Riddarfjarden", row5);
151
153
         AddSkyboxButton("rocky", "Skinnarviksberget", row5);
154
+        
152
155
         AddSkyboxButton("rocky", "Tantolunden6", row5);
156
+        AddSkyboxButton("default", "CloudyHills", row6);
157
+        AddSkyboxButton("daz", "Autumn", row6);
158
+        AddSkyboxButton("daz", "MountainTrail", row6);
153
159
         /*
154
-Kastellholmen
155
-Langholmen
156
-Riddarfjarden
157
-Skinnarviksberget
158
-Tanto
159
-Tantolunden2
160
-Tantolunden6
160
+Autumn
161
+Greenlands
162
+MountainTrail
163
+Oasis
164
+TheRock
165
+TopOfTheWorld
166
+Winter
161
167
          */
162
168
         
163
169
         tab0.add(row0);
..
..
@@ -197,39 +203,33 @@
197
203
         
198
204
         AddSkyboxButton("urban", "CNTower", row1);
199
205
         AddSkyboxButton("bridge", "ArstaBridge", row1);
200
-        AddSkyboxButton("indoors", "DallasW", row1);
201
-        AddSkyboxButton("indoors", "MarriottMadisonWest", row1);
206
+        AddSkyboxButton("rocky", "Riddarfjarden", row1);
207
+        AddSkyboxButton("penguins", "sleepyhollow", row1);
202
208
         
209
+        AddSkyboxButton("penguins", "kenon_star", row2);
210
+        AddSkyboxButton("persson", "corona", row2);
211
+        AddSkyboxButton("persson", "spaceskybox", row2);
203
212
         AddSkyboxButton("indoors", "Vasa", row2);
204
-        AddSkyboxButton("winter", "Backyard", row2);
205
-        AddSkyboxButton("winter", "Creek", row2);
206
-        AddSkyboxButton("winter", "FootballField3", row2);
207
213
         
214
+        AddSkyboxButton("winter", "Backyard", row3);
215
+        AddSkyboxButton("winter", "Creek", row3);
216
+        AddSkyboxButton("winter", "FootballField3", row3);
208
217
         AddSkyboxButton("winter", "Forest", row3);
209
-        AddSkyboxButton("winter", "HornstullsStrand2", row3);
210
-        AddSkyboxButton("winter", "House", row3);
211
-        AddSkyboxButton("winter", "IceLake", row3);
212
218
         
219
+        AddSkyboxButton("winter", "HornstullsStrand2", row4);
220
+        AddSkyboxButton("winter", "House", row4);
221
+        AddSkyboxButton("winter", "IceLake", row4);
213
222
         AddSkyboxButton("winter", "IceRiver", row4);
214
-        AddSkyboxButton("winter", "Park3", row4);
215
-        AddSkyboxButton("winter", "PondWinter", row4);
216
223
         
224
+        AddSkyboxButton("winter", "Park3", row5);
225
+        AddSkyboxButton("winter", "PondWinter", row5);
217
226
         AddSkyboxButton("winter", "Tantolunden5", row5);
218
227
         AddSkyboxButton("winter", "Vindelalven", row5);
219
-        /*
220
-Backyard
221
-Creek
222
-FootballField3
223
-Forest
224
-HornstullsStrand2
225
-House
226
-IceLake
227
-IceRiver
228
-Park3
229
-PondWinter
230
-Tantolunden5
231
-Vindelalven         * 
232
-         */
228
+        
229
+        AddSkyboxButton("daz", "TheRock", row6);
230
+        AddSkyboxButton("daz", "TopOfTheWorld", row6);
231
+        AddSkyboxButton("daz", "Winter", row6);
232
+        AddSkyboxButton("mountain", "Ryfjallet", row6);
233
233
         
234
234
         tab0.add(row0);
235
235
         tab0.add(row1);
..
..
@@ -245,12 +245,77 @@
245
245
             //tab0.add(new cGridBag());
246
246
         }
247
247
     }
248
-    
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
+        
249
314
     public void ChangeSkybox(String name)
250
315
     {
251
-        cameraView.envyoff = false;
252
-        cameraView.skyboxname = name;
253
-        cameraView.skyboxext = "jpg";
316
+        //cameraView.envyoff = false;
317
+        group.skyboxname = name;
318
+        group.skyboxext = "jpg";
254
319
         cameraView.repaint();
255
320
     }
256
321
     
..
..
@@ -1037,6 +1102,7 @@
1037
1102
                 AddSkyboxTab0(skyboxpanel);
1038
1103
                 AddSkyboxTab1(skyboxpanel);
1039
1104
                 AddSkyboxTab2(skyboxpanel);
1105
+                AddSkyboxTab3(skyboxpanel);
1040
1106
                 
1041
1107
                 // EDIT panel
1042
1108
 		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..
..
@@ -1168,9 +1234,12 @@
1168
1234
                 smoothCB.setToolTipText("Snapping delay");
1169
1235
                                 smoothCB.addItemListener(this);
1170
1236
 
1171
-                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1172
-                slowCB.setToolTipText("Smooth interpolation");
1173
-                                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);
1174
1243
                                 
1175
1244
 //        	constraints.gridy += 1;
1176
1245
 //                panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..
..
@@ -1284,6 +1353,8 @@
1284
1353
         cCheckBox localCB;
1285
1354
         cCheckBox crowdCB;
1286
1355
         cCheckBox smoothCB;
1356
+        cCheckBox minshaderCB;
1357
+        
1287
1358
         cToggleButton fastCB;
1288
1359
         cCheckBox slowCB;
1289
1360
         cCheckBox boxCB;
..
..
@@ -1355,6 +1426,12 @@
1355
1426
                 cameraView.ToggleInertia();
1356
1427
         cameraView.repaint();
1357
1428
             }
1429
+            else if(e.getSource() == minshaderCB)
1430
+            {
1431
+                Globals.MINSHADER ^= true;
1432
+                cameraView.programInitialized = false;
1433
+                cameraView.repaint();
1434
+            }
1358
1435
             else if(e.getSource() == localCB)
1359
1436
             {
1360
1437
                 cameraView.ToggleLocal();