Normand Briere
2019-07-30 475f8cbdbd96fdbf8f5b216ffebb31a51f25c2f9
GroupEditor.java
....@@ -28,8 +28,8 @@
2828 {
2929 cButton skyboxButton;
3030 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));
3333 skyboxButton.setToolTipText(s);
3434 skyboxButton.addActionListener(new ActionListener()
3535 {
....@@ -57,11 +57,12 @@
5757 cGridBag row6 = new cGridBag();
5858
5959 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("default", "skycube", row0);
64
+
65
+ AddSkyboxButton("default", "uffizi", row1);
6566 AddSkyboxButton("bridge", "Bridge", row1);
6667 AddSkyboxButton("bridge", "Bridge2", row1);
6768 AddSkyboxButton("urban", "GamlaStan2", row1);
....@@ -73,23 +74,23 @@
7374
7475 AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
7576 AddSkyboxButton("urban", "UnionSquare", row3);
77
+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
7678 AddSkyboxButton("park", "BerzeliiPark", row3);
77
- AddSkyboxButton("park", "Buddha", row3);
7879
80
+ AddSkyboxButton("park", "Buddha", row4);
7981 AddSkyboxButton("park", "CNTower2", row4);
8082 AddSkyboxButton("park", "NiagaraFalls1", row4);
8183 AddSkyboxButton("park", "NiagaraFalls3", row4);
82
- AddSkyboxButton("park", "Park", row4);
8384
85
+ AddSkyboxButton("park", "Park", row5);
8486 AddSkyboxButton("park", "Pond", row5);
8587 AddSkyboxButton("park", "Skansen", row5);
8688 AddSkyboxButton("park", "Skansen2", row5);
87
- AddSkyboxButton("park", "Skansen3", row5);
8889
90
+ AddSkyboxButton("park", "Skansen3", row6);
8991 AddSkyboxButton("park", "Skansen4", row6);
9092 AddSkyboxButton("park", "Skansen5", row6);
9193 AddSkyboxButton("park", "Stairs", row6);
92
- AddSkyboxButton("park", "Tantolunden4", row6);
9394
9495 tab0.add(row0);
9596 tab0.add(row1);
....@@ -140,24 +141,32 @@
140141 AddSkyboxButton("forest", "Langholmen2", row3);
141142 AddSkyboxButton("forest", "Plants", row3);
142143 AddSkyboxButton("mountain", "Maskonaive", row3);
143
- AddSkyboxButton("mountain", "Maskonaive2", row4);
144144
145
+ AddSkyboxButton("mountain", "Maskonaive2", row4);
145146 AddSkyboxButton("mountain", "Maskonaive3", row4);
146147 AddSkyboxButton("mountain", "Ryfjallet", row4);
147
- AddSkyboxButton("mountain", "Teide", row4);
148
+ AddSkyboxButton("mountain", "Teide", row4);
149
+ AddSkyboxButton("park", "Tantolunden4", row4);
148150
151
+ AddSkyboxButton("penguins", "wrath", row5);
152
+ AddSkyboxButton("penguins", "yonder", row5);
149153 AddSkyboxButton("rocky", "Langholmen", row5);
150
- AddSkyboxButton("rocky", "Riddarfjarden", row5);
151154 AddSkyboxButton("rocky", "Skinnarviksberget", row5);
152155 AddSkyboxButton("rocky", "Tantolunden6", row5);
156
+
157
+ AddSkyboxButton("default", "CloudyHills", row6);
158
+ AddSkyboxButton("daz", "Autumn", row6);
159
+ AddSkyboxButton("daz", "Greenlands", row6);
160
+ AddSkyboxButton("daz", "MountainTrail", row6);
161
+ AddSkyboxButton("daz", "Oasis", row6);
153162 /*
154
-Kastellholmen
155
-Langholmen
156
-Riddarfjarden
157
-Skinnarviksberget
158
-Tanto
159
-Tantolunden2
160
-Tantolunden6
163
+Autumn
164
+Greenlands
165
+MountainTrail
166
+Oasis
167
+TheRock
168
+TopOfTheWorld
169
+Winter
161170 */
162171
163172 tab0.add(row0);
....@@ -197,39 +206,33 @@
197206
198207 AddSkyboxButton("urban", "CNTower", row1);
199208 AddSkyboxButton("bridge", "ArstaBridge", row1);
200
- AddSkyboxButton("indoors", "DallasW", row1);
201
- AddSkyboxButton("indoors", "MarriottMadisonWest", row1);
209
+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
210
+ AddSkyboxButton("penguins", "sleepyhollow", row1);
202211
212
+ AddSkyboxButton("penguins", "kenon_star", row2);
213
+ AddSkyboxButton("indoors", "DallasW", row2);
214
+ AddSkyboxButton("indoors", "MarriottMadisonWest", row2);
203215 AddSkyboxButton("indoors", "Vasa", row2);
204
- AddSkyboxButton("winter", "Backyard", row2);
205
- AddSkyboxButton("winter", "Creek", row2);
206
- AddSkyboxButton("winter", "FootballField3", row2);
207216
217
+ AddSkyboxButton("winter", "Backyard", row3);
218
+ AddSkyboxButton("winter", "Creek", row3);
219
+ AddSkyboxButton("winter", "FootballField3", row3);
208220 AddSkyboxButton("winter", "Forest", row3);
209
- AddSkyboxButton("winter", "HornstullsStrand2", row3);
210
- AddSkyboxButton("winter", "House", row3);
211
- AddSkyboxButton("winter", "IceLake", row3);
212221
222
+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
223
+ AddSkyboxButton("winter", "House", row4);
224
+ AddSkyboxButton("winter", "IceLake", row4);
213225 AddSkyboxButton("winter", "IceRiver", row4);
214
- AddSkyboxButton("winter", "Park3", row4);
215
- AddSkyboxButton("winter", "PondWinter", row4);
216226
227
+ AddSkyboxButton("winter", "Park3", row5);
228
+ AddSkyboxButton("winter", "PondWinter", row5);
217229 AddSkyboxButton("winter", "Tantolunden5", row5);
218230 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
- */
231
+
232
+ AddSkyboxButton("daz", "TheRock", row6);
233
+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
234
+ AddSkyboxButton("daz", "Winter", row6);
235
+ AddSkyboxButton("penguins", "desertdawn", row6);
233236
234237 tab0.add(row0);
235238 tab0.add(row1);
....@@ -248,9 +251,9 @@
248251
249252 public void ChangeSkybox(String name)
250253 {
251
- cameraView.envyoff = false;
252
- cameraView.skyboxname = name;
253
- cameraView.skyboxext = "jpg";
254
+ //cameraView.envyoff = false;
255
+ group.skyboxname = name;
256
+ group.skyboxext = "jpg";
254257 cameraView.repaint();
255258 }
256259