Normand Briere
2019-07-30 475f8cbdbd96fdbf8f5b216ffebb31a51f25c2f9
GroupEditor.java
....@@ -24,11 +24,12 @@
2424 ItemListener // ListSelectionListener
2525 {
2626
27
- public void AddSkyboxButton(String f, String s, cGridBag row3)
27
+ public void AddSkyboxButton(String f, String s, cGridBag row)
2828 {
2929 cButton skyboxButton;
3030 final String path = "cubemaps/" + f + "-skyboxes/" + s;
31
- row3.add(skyboxButton = GetButton(path + "/" + s + ".jpg", !Grafreed.NIMBUSLAF));
31
+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
32
+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
3233 skyboxButton.setToolTipText(s);
3334 skyboxButton.addActionListener(new ActionListener()
3435 {
....@@ -40,11 +41,219 @@
4041 });
4142 }
4243
44
+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
45
+ {
46
+ cGridBag tab0 = new cGridBag().setVertical(true);
47
+
48
+ tab0.setName("Urban");
49
+ skyboxpanel.add(tab0);
50
+
51
+ cGridBag row0 = new cGridBag();
52
+ cGridBag row1 = new cGridBag();
53
+ cGridBag row2 = new cGridBag();
54
+ cGridBag row3 = new cGridBag();
55
+ cGridBag row4 = new cGridBag();
56
+ cGridBag row5 = new cGridBag();
57
+ cGridBag row6 = new cGridBag();
58
+
59
+ AddSkyboxButton("default", "rgb", row0);
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);
66
+ AddSkyboxButton("bridge", "Bridge", row1);
67
+ AddSkyboxButton("bridge", "Bridge2", row1);
68
+ AddSkyboxButton("urban", "GamlaStan2", row1);
69
+
70
+ AddSkyboxButton("urban", "Parliament", row2);
71
+ AddSkyboxButton("urban", "Roundabout", row2);
72
+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
73
+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
74
+
75
+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
76
+ AddSkyboxButton("urban", "UnionSquare", row3);
77
+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
78
+ AddSkyboxButton("park", "BerzeliiPark", row3);
79
+
80
+ AddSkyboxButton("park", "Buddha", row4);
81
+ AddSkyboxButton("park", "CNTower2", row4);
82
+ AddSkyboxButton("park", "NiagaraFalls1", row4);
83
+ AddSkyboxButton("park", "NiagaraFalls3", row4);
84
+
85
+ AddSkyboxButton("park", "Park", row5);
86
+ AddSkyboxButton("park", "Pond", row5);
87
+ AddSkyboxButton("park", "Skansen", row5);
88
+ AddSkyboxButton("park", "Skansen2", row5);
89
+
90
+ AddSkyboxButton("park", "Skansen3", row6);
91
+ AddSkyboxButton("park", "Skansen4", row6);
92
+ AddSkyboxButton("park", "Skansen5", row6);
93
+ AddSkyboxButton("park", "Stairs", row6);
94
+
95
+ tab0.add(row0);
96
+ tab0.add(row1);
97
+ tab0.add(row2);
98
+ tab0.add(row3);
99
+ tab0.add(row4);
100
+ tab0.add(row5);
101
+ tab0.add(row6);
102
+
103
+ for (int i=5; --i>=0;)
104
+ {
105
+ //oe.toolboxPanel.Return();
106
+ //tab0.add(new cGridBag());
107
+ }
108
+ }
109
+
110
+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
111
+ {
112
+ cGridBag tab0 = new cGridBag().setVertical(true);
113
+
114
+ tab0.setName("Nature");
115
+ skyboxpanel.add(tab0);
116
+
117
+ cGridBag row0 = new cGridBag();
118
+ cGridBag row1 = new cGridBag();
119
+ cGridBag row2 = new cGridBag();
120
+ cGridBag row3 = new cGridBag();
121
+ cGridBag row4 = new cGridBag();
122
+ cGridBag row5 = new cGridBag();
123
+ cGridBag row6 = new cGridBag();
124
+
125
+ AddSkyboxButton("beach", "HeartInTheSand", row0);
126
+ AddSkyboxButton("beach", "LarnacaBeach", row0);
127
+ AddSkyboxButton("beach", "PalmTrees", row0);
128
+ AddSkyboxButton("beach", "Tenerife", row0);
129
+
130
+ AddSkyboxButton("beach", "Tenerife2", row1);
131
+ AddSkyboxButton("beach", "Tenerife3", row1);
132
+ AddSkyboxButton("field", "FishPond", row1);
133
+ AddSkyboxButton("field", "Footballfield", row1);
134
+
135
+ AddSkyboxButton("field", "Meadow", row2);
136
+ AddSkyboxButton("field", "Sorsele", row2);
137
+ AddSkyboxButton("field", "Sorsele2", row2);
138
+ AddSkyboxButton("field", "Sorsele3", row2);
139
+
140
+ AddSkyboxButton("forest", "Brudslojan", row3);
141
+ AddSkyboxButton("forest", "Langholmen2", row3);
142
+ AddSkyboxButton("forest", "Plants", row3);
143
+ AddSkyboxButton("mountain", "Maskonaive", row3);
144
+
145
+ AddSkyboxButton("mountain", "Maskonaive2", row4);
146
+ AddSkyboxButton("mountain", "Maskonaive3", row4);
147
+ AddSkyboxButton("mountain", "Ryfjallet", row4);
148
+ AddSkyboxButton("mountain", "Teide", row4);
149
+ AddSkyboxButton("park", "Tantolunden4", row4);
150
+
151
+ AddSkyboxButton("penguins", "wrath", row5);
152
+ AddSkyboxButton("penguins", "yonder", row5);
153
+ AddSkyboxButton("rocky", "Langholmen", row5);
154
+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
155
+ 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);
162
+ /*
163
+Autumn
164
+Greenlands
165
+MountainTrail
166
+Oasis
167
+TheRock
168
+TopOfTheWorld
169
+Winter
170
+ */
171
+
172
+ tab0.add(row0);
173
+ tab0.add(row1);
174
+ tab0.add(row2);
175
+ tab0.add(row3);
176
+ tab0.add(row4);
177
+ tab0.add(row5);
178
+ tab0.add(row6);
179
+
180
+ for (int i=5; --i>=0;)
181
+ {
182
+ //oe.toolboxPanel.Return();
183
+ //tab0.add(new cGridBag());
184
+ }
185
+ }
186
+
187
+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
188
+ {
189
+ cGridBag tab0 = new cGridBag().setVertical(true);
190
+
191
+ tab0.setName("Night");
192
+ skyboxpanel.add(tab0);
193
+
194
+ cGridBag row0 = new cGridBag();
195
+ cGridBag row1 = new cGridBag();
196
+ cGridBag row2 = new cGridBag();
197
+ cGridBag row3 = new cGridBag();
198
+ cGridBag row4 = new cGridBag();
199
+ cGridBag row5 = new cGridBag();
200
+ cGridBag row6 = new cGridBag();
201
+
202
+ AddSkyboxButton("night", "NightPath", row0);
203
+ AddSkyboxButton("night", "PondNight", row0);
204
+ AddSkyboxButton("night", "Powerlines", row0);
205
+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
206
+
207
+ AddSkyboxButton("urban", "CNTower", row1);
208
+ AddSkyboxButton("bridge", "ArstaBridge", row1);
209
+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
210
+ AddSkyboxButton("penguins", "sleepyhollow", row1);
211
+
212
+ AddSkyboxButton("penguins", "kenon_star", row2);
213
+ AddSkyboxButton("indoors", "DallasW", row2);
214
+ AddSkyboxButton("indoors", "MarriottMadisonWest", row2);
215
+ AddSkyboxButton("indoors", "Vasa", row2);
216
+
217
+ AddSkyboxButton("winter", "Backyard", row3);
218
+ AddSkyboxButton("winter", "Creek", row3);
219
+ AddSkyboxButton("winter", "FootballField3", row3);
220
+ AddSkyboxButton("winter", "Forest", row3);
221
+
222
+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
223
+ AddSkyboxButton("winter", "House", row4);
224
+ AddSkyboxButton("winter", "IceLake", row4);
225
+ AddSkyboxButton("winter", "IceRiver", row4);
226
+
227
+ AddSkyboxButton("winter", "Park3", row5);
228
+ AddSkyboxButton("winter", "PondWinter", row5);
229
+ AddSkyboxButton("winter", "Tantolunden5", row5);
230
+ AddSkyboxButton("winter", "Vindelalven", row5);
231
+
232
+ AddSkyboxButton("daz", "TheRock", row6);
233
+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
234
+ AddSkyboxButton("daz", "Winter", row6);
235
+ AddSkyboxButton("penguins", "desertdawn", row6);
236
+
237
+ tab0.add(row0);
238
+ tab0.add(row1);
239
+ tab0.add(row2);
240
+ tab0.add(row3);
241
+ tab0.add(row4);
242
+ tab0.add(row5);
243
+ tab0.add(row6);
244
+
245
+ for (int i=5; --i>=0;)
246
+ {
247
+ //oe.toolboxPanel.Return();
248
+ //tab0.add(new cGridBag());
249
+ }
250
+ }
251
+
43252 public void ChangeSkybox(String name)
44253 {
45
- cameraView.envyoff = false;
46
- cameraView.skyboxname = name;
47
- cameraView.skyboxext = "jpg";
254
+ //cameraView.envyoff = false;
255
+ group.skyboxname = name;
256
+ group.skyboxext = "jpg";
48257 cameraView.repaint();
49258 }
50259
....@@ -820,106 +1029,17 @@
8201029 oe.toolboxPanel.add(row2);
8211030
8221031 // ENVYMAPS
823
- cGridBag row3 = new cGridBag();
824
- row3.preferredHeight = 20;
1032
+ cGridBag skyboxpane = new cGridBag();
1033
+ skyboxpane.preferredHeight = 100;
8251034
826
- AddSkyboxButton("default", "rgb", row3);
827
- AddSkyboxButton("default", "cornell", row3);
828
- AddSkyboxButton("default", "uffizi", row3);
829
- AddSkyboxButton("default", "CloudyHills", row3);
830
- AddSkyboxButton("default", "skycube", row3);
831
-
832
- oe.toolboxPanel.add(row3);
833
-
834
- cGridBag row4 = new cGridBag();
835
- row4.preferredHeight = 20;
1035
+ oe.toolboxPanel.add(skyboxpane);
8361036
837
- AddSkyboxButton("bridge", "Bridge2", row4);
838
- AddSkyboxButton("urban", "GamlaStan2", row4);
839
- AddSkyboxButton("urban", "Parliament", row4);
840
- AddSkyboxButton("urban", "Roundabout", row4);
1037
+ JTabbedPane skyboxpanel = new JTabbedPane();
1038
+ skyboxpane.add(skyboxpanel);
8411039
842
- oe.toolboxPanel.add(row4);
843
-
844
- cGridBag row5 = new cGridBag();
845
- row5.preferredHeight = 20;
846
-
847
- AddSkyboxButton("urban", "SaintLazarusChurch", row5);
848
- AddSkyboxButton("urban", "SaintLazarusChurch2", row5);
849
- AddSkyboxButton("urban", "SaintLazarusChurch3", row5);
850
- AddSkyboxButton("urban", "UnionSquare", row5);
851
-
852
- oe.toolboxPanel.add(row5);
853
-
854
- cGridBag row6 = new cGridBag();
855
- row6.preferredHeight = 20;
856
-
857
- AddSkyboxButton("park", "BerzeliiPark", row6);
858
- AddSkyboxButton("park", "Buddha", row6);
859
- AddSkyboxButton("park", "CNTower2", row6);
860
- //AddSkyboxButton("park", "Fatbursparken", row6);
861
- AddSkyboxButton("park", "NiagaraFalls1", row6);
862
-
863
- oe.toolboxPanel.add(row6);
864
-
865
- cGridBag row7 = new cGridBag();
866
- row7.preferredHeight = 20;
867
-
868
- AddSkyboxButton("park", "NiagaraFalls3", row7);
869
- AddSkyboxButton("park", "Park", row7);
870
- //AddSkyboxButton("park", "Park2", row6);
871
- //AddSkyboxButton("park", "Path", row6);
872
- AddSkyboxButton("park", "Pond", row7);
873
- AddSkyboxButton("park", "Skansen", row7);
874
-
875
- oe.toolboxPanel.add(row7);
876
-
877
- cGridBag row8 = new cGridBag();
878
- row8.preferredHeight = 20;
879
-
880
- AddSkyboxButton("park", "Skansen2", row8);
881
- AddSkyboxButton("park", "Skansen3", row8);
882
- AddSkyboxButton("park", "Skansen4", row8);
883
- AddSkyboxButton("park", "Skansen5", row8);
884
-
885
- oe.toolboxPanel.add(row8);
886
-
887
- cGridBag row9 = new cGridBag();
888
- row9.preferredHeight = 20;
889
-
890
- AddSkyboxButton("park", "Stairs", row9);
891
- //AddSkyboxButton("park", "Tantolunden", row6);
892
- //AddSkyboxButton("park", "Tantolunden3", row6);
893
- AddSkyboxButton("park", "Tantolunden4", row9);
894
-
895
- oe.toolboxPanel.add(row9);
896
-/*
897
-BerzeliiPark
898
-Buddha
899
-CNTower2
900
-Fatbursparken
901
-NiagaraFalls1
902
-NiagaraFalls3
903
-Park
904
-Park2
905
-Path
906
-Pond
907
-Skansen
908
-Skansen2
909
-Skansen3
910
-Skansen4
911
-Skansen5
912
-Stairs
913
-Tantolunden
914
-Tantolunden3
915
-Tantolunden4
916
- */
917
-
918
- for (int i=1; --i>=0;)
919
- {
920
- //oe.toolboxPanel.Return();
921
- oe.toolboxPanel.add(new cGridBag());
922
- }
1040
+ AddSkyboxTab0(skyboxpanel);
1041
+ AddSkyboxTab1(skyboxpanel);
1042
+ AddSkyboxTab2(skyboxpanel);
9231043
9241044 // EDIT panel
9251045 editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);