Min shader option.

Normand Briere

2019-08-01 29d5516687020263d3ae0454ce81879a3a450af0

 GroupEditor.java
..
..
@@ -23,6 +23,302 @@
23
23
         DragGestureListener, DragSourceListener, DropTargetListener,
24
24
         ItemListener // ListSelectionListener
25
25
 {
26
+
27
+    public void AddSkyboxButton(String f, String s, cGridBag row)
28
+    {
29
+        cButton skyboxButton;
30
+        final String path = "cubemaps/" + f + "-skyboxes/" + s;
31
+        row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
32
+        //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
33
+        skyboxButton.setToolTipText(s);
34
+        skyboxButton.addActionListener(new ActionListener()
35
+        {
36
+                @Override
37
+                public void actionPerformed(ActionEvent e)
38
+                {
39
+                    ChangeSkybox(path);
40
+                }
41
+        });
42
+    }
43
+
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("penguins", "yonder", 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("persson", "VancouverConventionCentre", 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", "Teide", row4);
148
+        AddSkyboxButton("park", "Tantolunden4", row4);
149
+        
150
+        AddSkyboxButton("park", "Stairs", row5);
151
+        AddSkyboxButton("default", "skycube", row6);
152
+        AddSkyboxButton("rocky", "Langholmen", row5);
153
+        AddSkyboxButton("rocky", "Skinnarviksberget", row5);
154
+        
155
+        AddSkyboxButton("rocky", "Tantolunden6", row5);
156
+        AddSkyboxButton("default", "CloudyHills", row6);
157
+        AddSkyboxButton("daz", "Autumn", row6);
158
+        AddSkyboxButton("daz", "MountainTrail", row6);
159
+        /*
160
+Autumn
161
+Greenlands
162
+MountainTrail
163
+Oasis
164
+TheRock
165
+TopOfTheWorld
166
+Winter
167
+         */
168
+        
169
+        tab0.add(row0);
170
+        tab0.add(row1);
171
+        tab0.add(row2);
172
+        tab0.add(row3);
173
+        tab0.add(row4);
174
+        tab0.add(row5);
175
+        tab0.add(row6);
176
+        
177
+        for (int i=5; --i>=0;)
178
+        {
179
+            //oe.toolboxPanel.Return();
180
+            //tab0.add(new cGridBag());
181
+        }
182
+    }
183
+    
184
+    public void AddSkyboxTab2(JTabbedPane skyboxpanel)
185
+    {
186
+        cGridBag tab0 = new cGridBag().setVertical(true);
187
+        
188
+        tab0.setName("Night");
189
+        skyboxpanel.add(tab0);
190
+
191
+        cGridBag row0 = new cGridBag();
192
+        cGridBag row1 = new cGridBag();
193
+        cGridBag row2 = new cGridBag();
194
+        cGridBag row3 = new cGridBag();
195
+        cGridBag row4 = new cGridBag();
196
+        cGridBag row5 = new cGridBag();
197
+        cGridBag row6 = new cGridBag();
198
+        
199
+        AddSkyboxButton("night", "NightPath", row0);
200
+        AddSkyboxButton("night", "PondNight", row0);
201
+        AddSkyboxButton("night", "Powerlines", row0);
202
+        AddSkyboxButton("night", "SwedishRoyalCastle", row0);
203
+        
204
+        AddSkyboxButton("urban", "CNTower", row1);
205
+        AddSkyboxButton("bridge", "ArstaBridge", row1);
206
+        AddSkyboxButton("rocky", "Riddarfjarden", row1);
207
+        AddSkyboxButton("penguins", "sleepyhollow", row1);
208
+        
209
+        AddSkyboxButton("penguins", "kenon_star", row2);
210
+        AddSkyboxButton("persson", "corona", row2);
211
+        AddSkyboxButton("persson", "spaceskybox", row2);
212
+        AddSkyboxButton("indoors", "Vasa", row2);
213
+        
214
+        AddSkyboxButton("winter", "Backyard", row3);
215
+        AddSkyboxButton("winter", "Creek", row3);
216
+        AddSkyboxButton("winter", "FootballField3", row3);
217
+        AddSkyboxButton("winter", "Forest", row3);
218
+        
219
+        AddSkyboxButton("winter", "HornstullsStrand2", row4);
220
+        AddSkyboxButton("winter", "House", row4);
221
+        AddSkyboxButton("winter", "IceLake", row4);
222
+        AddSkyboxButton("winter", "IceRiver", row4);
223
+        
224
+        AddSkyboxButton("winter", "Park3", row5);
225
+        AddSkyboxButton("winter", "PondWinter", row5);
226
+        AddSkyboxButton("winter", "Tantolunden5", row5);
227
+        AddSkyboxButton("winter", "Vindelalven", row5);
228
+        
229
+        AddSkyboxButton("daz", "TheRock", row6);
230
+        AddSkyboxButton("daz", "TopOfTheWorld", row6);
231
+        AddSkyboxButton("daz", "Winter", row6);
232
+        AddSkyboxButton("mountain", "Ryfjallet", row6);
233
+        
234
+        tab0.add(row0);
235
+        tab0.add(row1);
236
+        tab0.add(row2);
237
+        tab0.add(row3);
238
+        tab0.add(row4);
239
+        tab0.add(row5);
240
+        tab0.add(row6);
241
+        
242
+        for (int i=5; --i>=0;)
243
+        {
244
+            //oe.toolboxPanel.Return();
245
+            //tab0.add(new cGridBag());
246
+        }
247
+    }
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
+        
314
+    public void ChangeSkybox(String name)
315
+    {
316
+        //cameraView.envyoff = false;
317
+        group.skyboxname = name;
318
+        group.skyboxext = "jpg";
319
+        cameraView.repaint();
320
+    }
321
+    
26
322
     //ObjEditor objEditor;
27
323
 	public void closeUI2()
28
324
 	{
..
..
@@ -608,7 +904,7 @@
608
904
          */
609
905
                 cGridBag copyOptionsPanel = new cGridBag();
610
906
                                         
611
-                copyOptionsPanel.preferredHeight = 1;
907
+                copyOptionsPanel.preferredHeight = 2;
612
908
                 
613
909
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
614
910
                 
..
..
@@ -722,28 +1018,30 @@
722
1018
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
723
1019
 		//clearButton.addActionListener(this);
724
1020
 
1021
+                cGridBag row1 = new cGridBag();
1022
+                
725
1023
                 // INSERT
726
-                oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1024
+                row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
727
1025
                 gridButton.setToolTipText("Create grid");
728
1026
                                 gridButton.addActionListener(this);
729
1027
 
730
-                oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1028
+                row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
731
1029
                 boxButton.setToolTipText("Create box");
732
1030
                                 boxButton.addActionListener(this);
733
1031
 
734
-                oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1032
+                row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
735
1033
                 sphereButton.setToolTipText("Create sphere");
736
1034
                                 sphereButton.addActionListener(this);
737
1035
 
738
-                oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1036
+                row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
739
1037
                 coneButton.setToolTipText("Create cone");
740
1038
                                 coneButton.addActionListener(this);
741
1039
 
742
-                oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1040
+                row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
743
1041
                 torusButton.setToolTipText("Create torus");
744
1042
                                 torusButton.addActionListener(this);
745
1043
 
746
-                oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1044
+                row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
747
1045
                 superButton.setToolTipText("Create superellipsoid");
748
1046
                                 superButton.addActionListener(this);
749
1047
 
..
..
@@ -754,51 +1052,57 @@
754
1052
                                     kleinButton.addActionListener(this);
755
1053
                 }
756
1054
                 
757
-                oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1055
+                row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
758
1056
                 particlesButton.setToolTipText("Create particle system");
759
1057
                                particlesButton.addActionListener(this);
760
1058
 
761
-                oe.toolboxPanel.Return();
1059
+                oe.toolboxPanel.add(row1);
762
1060
                 
763
-                oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1061
+                cGridBag row2 = new cGridBag();
1062
+                
1063
+                row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
764
1064
                 groupButton.setToolTipText("Create group");
765
1065
                                groupButton.addActionListener(this);
766
1066
 
767
-                oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1067
+                row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
768
1068
                 compositeButton.setToolTipText("Create composite");
769
1069
                                compositeButton.addActionListener(this);
770
1070
 
771
-                oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1071
+                row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
772
1072
                 switchButton.setToolTipText("Create item switcher");
773
1073
                                switchButton.addActionListener(this);
774
1074
 
775
-                oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1075
+                row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
776
1076
                 loopButton.setToolTipText("Create loop");
777
1077
                                loopButton.addActionListener(this);
778
1078
 
779
-                oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1079
+                row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
780
1080
                 textureButton.setToolTipText("Create texture");
781
1081
                                textureButton.addActionListener(this);
782
1082
 
783
-                oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1083
+                row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
784
1084
                 overlayButton.setToolTipText("Create overlay");
785
1085
                                overlayButton.addActionListener(this);
786
1086
 
787
-                oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1087
+                row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
788
1088
                 lightButton.setToolTipText("Create light");
789
1089
                                lightButton.addActionListener(this);
790
1090
 
791
-                for (int i=6; --i>=0;)
792
-                {
793
-                oe.toolboxPanel.Return();
794
-                oe.toolboxPanel.add(new cGridBag());
795
-                oe.toolboxPanel.add(new cGridBag());
796
-                oe.toolboxPanel.add(new cGridBag());
797
-                oe.toolboxPanel.add(new cGridBag());
798
-                oe.toolboxPanel.add(new cGridBag());
799
-                oe.toolboxPanel.add(new cGridBag());
800
-                oe.toolboxPanel.add(new cGridBag());
801
-                }
1091
+                oe.toolboxPanel.add(row2);
1092
+                
1093
+                // ENVYMAPS
1094
+                cGridBag skyboxpane = new cGridBag();
1095
+                skyboxpane.preferredHeight = 100;
1096
+                
1097
+                oe.toolboxPanel.add(skyboxpane);
1098
+                
1099
+                JTabbedPane skyboxpanel = new JTabbedPane();
1100
+                skyboxpane.add(skyboxpanel);
1101
+                
1102
+                AddSkyboxTab0(skyboxpanel);
1103
+                AddSkyboxTab1(skyboxpanel);
1104
+                AddSkyboxTab2(skyboxpanel);
1105
+                AddSkyboxTab3(skyboxpanel);
802
1106
                 
803
1107
                 // EDIT panel
804
1108
 		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..
..
@@ -858,8 +1162,8 @@
858
1162
             versionSlider = (cNumberSlider)sliderPane.getComponent(1);
859
1163
             sliderPane.preferredHeight = 1;
860
1164
                 
861
-//        mainPanel.setDividerLocation(0.5); //1.0);
862
-//        mainPanel.setResizeWeight(0.5);
1165
+//        mainPanel.setDividerLocation(0.1); //1.0);
1166
+        mainPanel.setResizeWeight(0.4);
863
1167
         
864
1168
 		//jList.addListSelectionListener(this);
865
1169
 		oe.jTree.addTreeSelectionListener(this);
..
..
@@ -867,7 +1171,7 @@
867
1171
 		//jTree.setEditable(true);
868
1172
 		oe.jTree.setDragEnabled(true);
869
1173
 		//jTree.setPreferredSize(new Dimension(10,10));
870
-		jSP.setPreferredSize(new Dimension(100,200));
1174
+		//jSP.setPreferredSize(new Dimension(100,200));
871
1175
 		
872
1176
                 oe.jTree.setCellRenderer(new cTreeModel.Renderer());
873
1177
                 
..
..
@@ -930,9 +1234,12 @@
930
1234
                 smoothCB.setToolTipText("Snapping delay");
931
1235
                                 smoothCB.addItemListener(this);
932
1236
 
933
-                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
934
-                slowCB.setToolTipText("Smooth interpolation");
935
-                                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);
936
1243
                                 
937
1244
 //        	constraints.gridy += 1;
938
1245
 //                panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..
..
@@ -1046,6 +1353,8 @@
1046
1353
         cCheckBox localCB;
1047
1354
         cCheckBox crowdCB;
1048
1355
         cCheckBox smoothCB;
1356
+        cCheckBox minshaderCB;
1357
+        
1049
1358
         cToggleButton fastCB;
1050
1359
         cCheckBox slowCB;
1051
1360
         cCheckBox boxCB;
..
..
@@ -1116,6 +1425,12 @@
1116
1425
             {
1117
1426
                 cameraView.ToggleInertia();
1118
1427
         cameraView.repaint();
1428
+            }
1429
+            else if(e.getSource() == minshaderCB)
1430
+            {
1431
+                Globals.MINSHADER ^= true;
1432
+                cameraView.programInitialized = false;
1433
+                cameraView.repaint();
1119
1434
             }
1120
1435
             else if(e.getSource() == localCB)
1121
1436
             {
..
..
@@ -2139,6 +2454,23 @@
2139
2454
 		{
2140
2455
 			makeSomething(new Light());
2141
2456
 		} else
2457
+//		if (source == skybox1Button ||
2458
+//                    source == skybox2Button ||
2459
+//                    source == skybox3Button ||
2460
+//                    source == skybox4Button ||
2461
+//                    source == skybox5Button ||
2462
+//                    source == skybox6Button ||
2463
+//                    source == skybox7Button ||
2464
+//                    source == skybox11Button ||
2465
+//                    source == skybox12Button ||
2466
+//                    source == skybox13Button ||
2467
+//                    source == skybox14Button ||
2468
+//                    source == skybox15Button ||
2469
+//                    source == skybox16Button ||
2470
+//                    source == skybox17Button)
2471
+//		{
2472
+//                    ChangeSkybox(source);
2473
+//		} else
2142
2474
 		if (source == csgItem)
2143
2475
 		{
2144
2476
 			group(new CSG());
..
..
@@ -2224,7 +2556,7 @@
2224
2556
 		if (source == computeAOItem)
2225
2557
 		{
2226
2558
                     Globals.drawMode = CameraPane.OCCLUSION;
2227
-                    Globals.theRenderer.repaint();
2559
+                    cameraView.repaint();
2228
2560
 		} else
2229
2561
 		if (source == recompileItem)
2230
2562
 		{
..
..
@@ -5676,6 +6008,22 @@
5676
6008
         cButton loopButton;
5677
6009
         cButton textureButton;
5678
6010
         
6011
+        cButton skybox1Button;
6012
+        cButton skybox2Button;
6013
+        cButton skybox3Button;
6014
+        cButton skybox4Button;
6015
+        cButton skybox5Button;
6016
+        cButton skybox6Button;
6017
+        cButton skybox7Button;
6018
+        
6019
+        cButton skybox11Button;
6020
+        cButton skybox12Button;
6021
+        cButton skybox13Button;
6022
+        cButton skybox14Button;
6023
+        cButton skybox15Button;
6024
+        cButton skybox16Button;
6025
+        cButton skybox17Button;
6026
+        
5679
6027
         cButton gridButton;
5680
6028
         cButton boxButton;
5681
6029
         cButton sphereButton;