Other skybox types.

Normand Briere

2019-07-29 c6c3f0948bd31603547ef8ce47a7784a9a4d55c2

 GroupEditor.java
..
..
@@ -23,6 +23,240 @@
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("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
+    
252
+    public void ChangeSkybox(String name)
253
+    {
254
+        cameraView.envyoff = false;
255
+        cameraView.skyboxname = name;
256
+        cameraView.skyboxext = "jpg";
257
+        cameraView.repaint();
258
+    }
259
+    
26
260
     //ObjEditor objEditor;
27
261
 	public void closeUI2()
28
262
 	{
..
..
@@ -80,18 +314,20 @@
80
314
 		this.copy = this.group = copy;
81
315
 		//selectees = this.group.selectees;
82
316
 		
83
-        if (copy.versions == null)
84
-        {
85
-            copy.versions = new byte[100][];
86
-            copy.versionindex = -1;
87
-        }
88
-        
89
317
 		SetupMenu2(this); //objEditor);
90
318
 		SetupUI2(objEditor);
91
319
 		objEditor.SetupUI(true);
92
320
 		SetupViews(objEditor);
93
321
                 
94
322
                 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
323
+                
324
+        if (copy.versions == null)
325
+        {
326
+            copy.versions = new byte[100][];
327
+            copy.versionindex = -1;
328
+            
329
+            Save(true);
330
+        }
95
331
 	}
96
332
 
97
333
     void CloneSelection(boolean supports)
..
..
@@ -526,10 +762,15 @@
526
762
 		attachBumpItem.addActionListener(this);
527
763
 		pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
528
764
 		pigmentBumpItem.addActionListener(this);
765
+                //embedTexturesItem
529
766
 		detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
530
767
 		detachPigmentItem.addActionListener(this);
531
768
 		detachBumpItem = menu.add(new MenuItem("Detach Bump"));
532
769
 		detachBumpItem.addActionListener(this);
770
+		embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
771
+		embedTexturesItem.addActionListener(this);
772
+		deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
773
+		deEmbedTexturesItem.addActionListener(this);
533
774
 		menu.add("-");
534
775
 		sortbysizeItem = menu.add(new MenuItem("Sort by size"));
535
776
 		sortbysizeItem.addActionListener(this);
..
..
@@ -601,7 +842,7 @@
601
842
          */
602
843
                 cGridBag copyOptionsPanel = new cGridBag();
603
844
                                         
604
-                copyOptionsPanel.preferredHeight = 1;
845
+                copyOptionsPanel.preferredHeight = 2;
605
846
                 
606
847
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
607
848
                 
..
..
@@ -681,25 +922,25 @@
681
922
                         oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682
923
                         snapobjectButton.addActionListener(this);
683
924
                         snapobjectButton.setToolTipText("Snap Object");
925
+                        
926
+		oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
927
+		fourButton.addActionListener(this);
928
+                fourButton.setToolTipText("Show control panel only");
684
929
                 }
685
930
 
686
931
 		//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
687
932
                 
688
-		oe.toolbarPanel.add(fourButton = new cButton("-||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
689
-		fourButton.addActionListener(this);
690
-                fourButton.setToolTipText("Show left panel only");
691
-                
692
-		oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
693
-                twoButton.setToolTipText("Show right view only");
933
+		oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
934
+                twoButton.setToolTipText("Show 3D view only");
694
935
 		twoButton.addActionListener(this);
695
936
                 this.fullscreenLayout = twoButton;
696
937
                 
697
-		oe.toolbarPanel.add(sixButton = new cButton("-|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
698
-                sixButton.setToolTipText("Show left and right");
938
+		oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
939
+                threeButton.setToolTipText("Show controls and 3D view");
940
+		threeButton.addActionListener(this);
941
+		oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
942
+                sixButton.setToolTipText("Show 3D view and controls");
699
943
 		sixButton.addActionListener(this);
700
-//		oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
701
-//                threeButton.setToolTipText("2-column layout right");
702
-//		threeButton.addActionListener(this);
703
944
 //		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
704
945
 //                sevenButton.setToolTipText("3-column layout");
705
946
 //		sevenButton.addActionListener(this);
..
..
@@ -715,28 +956,30 @@
715
956
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
716
957
 		//clearButton.addActionListener(this);
717
958
 
959
+                cGridBag row1 = new cGridBag();
960
+                
718
961
                 // INSERT
719
-                oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
962
+                row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
720
963
                 gridButton.setToolTipText("Create grid");
721
964
                                 gridButton.addActionListener(this);
722
965
 
723
-                oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
966
+                row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
724
967
                 boxButton.setToolTipText("Create box");
725
968
                                 boxButton.addActionListener(this);
726
969
 
727
-                oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
970
+                row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
728
971
                 sphereButton.setToolTipText("Create sphere");
729
972
                                 sphereButton.addActionListener(this);
730
973
 
731
-                oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
974
+                row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
732
975
                 coneButton.setToolTipText("Create cone");
733
976
                                 coneButton.addActionListener(this);
734
977
 
735
-                oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
978
+                row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
736
979
                 torusButton.setToolTipText("Create torus");
737
980
                                 torusButton.addActionListener(this);
738
981
 
739
-                oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
982
+                row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
740
983
                 superButton.setToolTipText("Create superellipsoid");
741
984
                                 superButton.addActionListener(this);
742
985
 
..
..
@@ -747,51 +990,56 @@
747
990
                                     kleinButton.addActionListener(this);
748
991
                 }
749
992
                 
750
-                oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
993
+                row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
751
994
                 particlesButton.setToolTipText("Create particle system");
752
995
                                particlesButton.addActionListener(this);
753
996
 
754
-                oe.toolboxPanel.Return();
997
+                oe.toolboxPanel.add(row1);
755
998
                 
756
-                oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
999
+                cGridBag row2 = new cGridBag();
1000
+                
1001
+                row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
757
1002
                 groupButton.setToolTipText("Create group");
758
1003
                                groupButton.addActionListener(this);
759
1004
 
760
-                oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1005
+                row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
761
1006
                 compositeButton.setToolTipText("Create composite");
762
1007
                                compositeButton.addActionListener(this);
763
1008
 
764
-                oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1009
+                row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
765
1010
                 switchButton.setToolTipText("Create item switcher");
766
1011
                                switchButton.addActionListener(this);
767
1012
 
768
-                oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1013
+                row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
769
1014
                 loopButton.setToolTipText("Create loop");
770
1015
                                loopButton.addActionListener(this);
771
1016
 
772
-                oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1017
+                row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
773
1018
                 textureButton.setToolTipText("Create texture");
774
1019
                                textureButton.addActionListener(this);
775
1020
 
776
-                oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1021
+                row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
777
1022
                 overlayButton.setToolTipText("Create overlay");
778
1023
                                overlayButton.addActionListener(this);
779
1024
 
780
-                oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1025
+                row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
781
1026
                 lightButton.setToolTipText("Create light");
782
1027
                                lightButton.addActionListener(this);
783
1028
 
784
-                for (int i=6; --i>=0;)
785
-                {
786
-                oe.toolboxPanel.Return();
787
-                oe.toolboxPanel.add(new cGridBag());
788
-                oe.toolboxPanel.add(new cGridBag());
789
-                oe.toolboxPanel.add(new cGridBag());
790
-                oe.toolboxPanel.add(new cGridBag());
791
-                oe.toolboxPanel.add(new cGridBag());
792
-                oe.toolboxPanel.add(new cGridBag());
793
-                oe.toolboxPanel.add(new cGridBag());
794
-                }
1029
+                oe.toolboxPanel.add(row2);
1030
+                
1031
+                // ENVYMAPS
1032
+                cGridBag skyboxpane = new cGridBag();
1033
+                skyboxpane.preferredHeight = 100;
1034
+                
1035
+                oe.toolboxPanel.add(skyboxpane);
1036
+                
1037
+                JTabbedPane skyboxpanel = new JTabbedPane();
1038
+                skyboxpane.add(skyboxpanel);
1039
+                
1040
+                AddSkyboxTab0(skyboxpanel);
1041
+                AddSkyboxTab1(skyboxpanel);
1042
+                AddSkyboxTab2(skyboxpanel);
795
1043
                 
796
1044
                 // EDIT panel
797
1045
 		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..
..
@@ -851,8 +1099,8 @@
851
1099
             versionSlider = (cNumberSlider)sliderPane.getComponent(1);
852
1100
             sliderPane.preferredHeight = 1;
853
1101
                 
854
-//        mainPanel.setDividerLocation(0.5); //1.0);
855
-//        mainPanel.setResizeWeight(0.5);
1102
+//        mainPanel.setDividerLocation(0.1); //1.0);
1103
+        mainPanel.setResizeWeight(0.4);
856
1104
         
857
1105
 		//jList.addListSelectionListener(this);
858
1106
 		oe.jTree.addTreeSelectionListener(this);
..
..
@@ -860,7 +1108,7 @@
860
1108
 		//jTree.setEditable(true);
861
1109
 		oe.jTree.setDragEnabled(true);
862
1110
 		//jTree.setPreferredSize(new Dimension(10,10));
863
-		jSP.setPreferredSize(new Dimension(100,200));
1111
+		//jSP.setPreferredSize(new Dimension(100,200));
864
1112
 		
865
1113
                 oe.jTree.setCellRenderer(new cTreeModel.Renderer());
866
1114
                 
..
..
@@ -2132,6 +2380,23 @@
2132
2380
 		{
2133
2381
 			makeSomething(new Light());
2134
2382
 		} else
2383
+//		if (source == skybox1Button ||
2384
+//                    source == skybox2Button ||
2385
+//                    source == skybox3Button ||
2386
+//                    source == skybox4Button ||
2387
+//                    source == skybox5Button ||
2388
+//                    source == skybox6Button ||
2389
+//                    source == skybox7Button ||
2390
+//                    source == skybox11Button ||
2391
+//                    source == skybox12Button ||
2392
+//                    source == skybox13Button ||
2393
+//                    source == skybox14Button ||
2394
+//                    source == skybox15Button ||
2395
+//                    source == skybox16Button ||
2396
+//                    source == skybox17Button)
2397
+//		{
2398
+//                    ChangeSkybox(source);
2399
+//		} else
2135
2400
 		if (source == csgItem)
2136
2401
 		{
2137
2402
 			group(new CSG());
..
..
@@ -2217,7 +2482,7 @@
2217
2482
 		if (source == computeAOItem)
2218
2483
 		{
2219
2484
                     Globals.drawMode = CameraPane.OCCLUSION;
2220
-                    Globals.theRenderer.repaint();
2485
+                    cameraView.repaint();
2221
2486
 		} else
2222
2487
 		if (source == recompileItem)
2223
2488
 		{
..
..
@@ -3151,7 +3416,7 @@
3151
3416
 			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3152
3417
 			{
3153
3418
 				obj = (Object3D)e.nextElement();
3154
-                                obj.SetBumpTexture(null);
3419
+                                obj.ResetBumpTexture();
3155
3420
 			}
3156
3421
 			
3157
3422
 			refreshContents();
..
..
@@ -3165,6 +3430,31 @@
3165
3430
                                 obj.SetBumpTexture(obj.GetPigmentTexture());
3166
3431
 			}
3167
3432
 			
3433
+			refreshContents();
3434
+		} else
3435
+		if (source == embedTexturesItem)
3436
+		{
3437
+			Object3D obj;
3438
+			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3439
+			{
3440
+				obj = (Object3D)e.nextElement();
3441
+                                obj.EmbedTextures(true);
3442
+			}
3443
+			
3444
+			refreshContents();
3445
+		} else
3446
+		if (source == deEmbedTexturesItem)
3447
+		{
3448
+			Object3D obj;
3449
+			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3450
+			{
3451
+				obj = (Object3D)e.nextElement();
3452
+                                obj.EmbedTextures(false);
3453
+			}
3454
+			
3455
+                CameraPane.texturepigment.clear();
3456
+                CameraPane.texturebump.clear();
3457
+                
3168
3458
 			refreshContents();
3169
3459
 		} else
3170
3460
 		if (source == flashSelectionButton)
..
..
@@ -3268,8 +3558,8 @@
3268
3558
 //                    centralPanel.setVisible(true);
3269
3559
 //                    XYZPanel.setVisible(true);
3270
3560
                     bigThree.ClearUI();
3561
+                    bigThree.add(scenePanel);
3271
3562
                     bigThree.add(centralPanel);
3272
-                    bigThree.add(XYZPanel);
3273
3563
                     bigThree.FlushUI();
3274
3564
                     
3275
3565
                     cameraView.requestFocusInWindow();
..
..
@@ -3349,8 +3639,8 @@
3349
3639
 //                    centralPanel.setVisible(true);
3350
3640
 //                    XYZPanel.setVisible(false);
3351
3641
                     bigThree.ClearUI();
3352
-                    bigThree.add(scenePanel);
3353
3642
                     bigThree.add(centralPanel);
3643
+                    bigThree.add(scenePanel);
3354
3644
                     bigThree.FlushUI();
3355
3645
                     
3356
3646
                     cameraView.requestFocusInWindow();
..
..
@@ -4161,7 +4451,7 @@
4161
4451
                             
4162
4452
                             try
4163
4453
                             {
4164
-                                texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
4454
+                                texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4165
4455
                             }
4166
4456
                             catch (Exception e)
4167
4457
                             {
..
..
@@ -4798,7 +5088,7 @@
4798
5088
 
4799
5089
         void refreshContents(boolean cp)
4800
5090
         {
4801
-            if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
5091
+            if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4802
5092
             if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4803
5093
             {
4804
5094
                 objEditor.ClearInfo(); // .GetMaterial());
..
..
@@ -5644,6 +5934,22 @@
5644
5934
         cButton loopButton;
5645
5935
         cButton textureButton;
5646
5936
         
5937
+        cButton skybox1Button;
5938
+        cButton skybox2Button;
5939
+        cButton skybox3Button;
5940
+        cButton skybox4Button;
5941
+        cButton skybox5Button;
5942
+        cButton skybox6Button;
5943
+        cButton skybox7Button;
5944
+        
5945
+        cButton skybox11Button;
5946
+        cButton skybox12Button;
5947
+        cButton skybox13Button;
5948
+        cButton skybox14Button;
5949
+        cButton skybox15Button;
5950
+        cButton skybox16Button;
5951
+        cButton skybox17Button;
5952
+        
5647
5953
         cButton gridButton;
5648
5954
         cButton boxButton;
5649
5955
         cButton sphereButton;
..
..
@@ -5791,6 +6097,8 @@
5791
6097
 	private MenuItem attachBumpItem;
5792
6098
 	private MenuItem detachBumpItem;
5793
6099
 	private MenuItem pigmentBumpItem;
6100
+	private MenuItem embedTexturesItem;
6101
+	private MenuItem deEmbedTexturesItem;
5794
6102
 
5795
6103
 	private MenuItem particleItem;
5796
6104
 	private MenuItem ragdollItem;