Three tabs

Normand Briere

2019-07-28 d7fd07756f4095cb87dc25d89fcffcbda092e2cf

 GroupEditor.java
..
..
@@ -23,6 +23,237 @@
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 + "/" + s + ".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("default", "uffizi", row0);
62
+        AddSkyboxButton("default", "CloudyHills", row0);
63
+        
64
+        AddSkyboxButton("default", "skycube", row1);
65
+        AddSkyboxButton("bridge", "Bridge", row1);
66
+        AddSkyboxButton("bridge", "Bridge2", row1);
67
+        AddSkyboxButton("urban", "GamlaStan2", row1);
68
+        
69
+        AddSkyboxButton("urban", "Parliament", row2);
70
+        AddSkyboxButton("urban", "Roundabout", row2);
71
+        AddSkyboxButton("urban", "SaintLazarusChurch", row2);
72
+        AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
73
+        
74
+        AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
75
+        AddSkyboxButton("urban", "UnionSquare", row3);
76
+        AddSkyboxButton("park", "BerzeliiPark", row3);
77
+        AddSkyboxButton("park", "Buddha", row3);
78
+        
79
+        AddSkyboxButton("park", "CNTower2", row4);
80
+        AddSkyboxButton("park", "NiagaraFalls1", row4);
81
+        AddSkyboxButton("park", "NiagaraFalls3", row4);
82
+        AddSkyboxButton("park", "Park", row4);
83
+        
84
+        AddSkyboxButton("park", "Pond", row5);
85
+        AddSkyboxButton("park", "Skansen", row5);
86
+        AddSkyboxButton("park", "Skansen2", row5);
87
+        AddSkyboxButton("park", "Skansen3", row5);
88
+        
89
+        AddSkyboxButton("park", "Skansen4", row6);
90
+        AddSkyboxButton("park", "Skansen5", row6);
91
+        AddSkyboxButton("park", "Stairs", row6);
92
+        AddSkyboxButton("park", "Tantolunden4", row6);
93
+        
94
+        tab0.add(row0);
95
+        tab0.add(row1);
96
+        tab0.add(row2);
97
+        tab0.add(row3);
98
+        tab0.add(row4);
99
+        tab0.add(row5);
100
+        tab0.add(row6);
101
+        
102
+        for (int i=5; --i>=0;)
103
+        {
104
+            //oe.toolboxPanel.Return();
105
+            //tab0.add(new cGridBag());
106
+        }
107
+    }
108
+
109
+    public void AddSkyboxTab1(JTabbedPane skyboxpanel)
110
+    {
111
+        cGridBag tab0 = new cGridBag().setVertical(true);
112
+        
113
+        tab0.setName("Nature");
114
+        skyboxpanel.add(tab0);
115
+
116
+        cGridBag row0 = new cGridBag();
117
+        cGridBag row1 = new cGridBag();
118
+        cGridBag row2 = new cGridBag();
119
+        cGridBag row3 = new cGridBag();
120
+        cGridBag row4 = new cGridBag();
121
+        cGridBag row5 = new cGridBag();
122
+        cGridBag row6 = new cGridBag();
123
+        
124
+        AddSkyboxButton("beach", "HeartInTheSand", row0);
125
+        AddSkyboxButton("beach", "LarnacaBeach", row0);
126
+        AddSkyboxButton("beach", "PalmTrees", row0);
127
+        AddSkyboxButton("beach", "Tenerife", row0);
128
+        
129
+        AddSkyboxButton("beach", "Tenerife2", row1);
130
+        AddSkyboxButton("beach", "Tenerife3", row1);
131
+        AddSkyboxButton("field", "FishPond", row1);
132
+        AddSkyboxButton("field", "Footballfield", row1);
133
+
134
+        AddSkyboxButton("field", "Meadow", row2);
135
+        AddSkyboxButton("field", "Sorsele", row2);
136
+        AddSkyboxButton("field", "Sorsele2", row2);
137
+        AddSkyboxButton("field", "Sorsele3", row2);
138
+        
139
+        AddSkyboxButton("forest", "Brudslojan", row3);
140
+        AddSkyboxButton("forest", "Langholmen2", row3);
141
+        AddSkyboxButton("forest", "Plants", row3);
142
+        AddSkyboxButton("mountain", "Maskonaive", row3);
143
+        AddSkyboxButton("mountain", "Maskonaive2", row4);
144
+        
145
+        AddSkyboxButton("mountain", "Maskonaive3", row4);
146
+        AddSkyboxButton("mountain", "Ryfjallet", row4);
147
+        AddSkyboxButton("mountain", "Teide", row4);        
148
+        
149
+        AddSkyboxButton("rocky", "Langholmen", row5);
150
+        AddSkyboxButton("rocky", "Riddarfjarden", row5);
151
+        AddSkyboxButton("rocky", "Skinnarviksberget", row5);
152
+        AddSkyboxButton("rocky", "Tantolunden6", row5);
153
+        /*
154
+Kastellholmen
155
+Langholmen
156
+Riddarfjarden
157
+Skinnarviksberget
158
+Tanto
159
+Tantolunden2
160
+Tantolunden6
161
+         */
162
+        
163
+        tab0.add(row0);
164
+        tab0.add(row1);
165
+        tab0.add(row2);
166
+        tab0.add(row3);
167
+        tab0.add(row4);
168
+        tab0.add(row5);
169
+        tab0.add(row6);
170
+        
171
+        for (int i=5; --i>=0;)
172
+        {
173
+            //oe.toolboxPanel.Return();
174
+            //tab0.add(new cGridBag());
175
+        }
176
+    }
177
+    
178
+    public void AddSkyboxTab2(JTabbedPane skyboxpanel)
179
+    {
180
+        cGridBag tab0 = new cGridBag().setVertical(true);
181
+        
182
+        tab0.setName("Night");
183
+        skyboxpanel.add(tab0);
184
+
185
+        cGridBag row0 = new cGridBag();
186
+        cGridBag row1 = new cGridBag();
187
+        cGridBag row2 = new cGridBag();
188
+        cGridBag row3 = new cGridBag();
189
+        cGridBag row4 = new cGridBag();
190
+        cGridBag row5 = new cGridBag();
191
+        cGridBag row6 = new cGridBag();
192
+        
193
+        AddSkyboxButton("night", "NightPath", row0);
194
+        AddSkyboxButton("night", "PondNight", row0);
195
+        AddSkyboxButton("night", "Powerlines", row0);
196
+        AddSkyboxButton("night", "SwedishRoyalCastle", row0);
197
+        
198
+        AddSkyboxButton("urban", "CNTower", row1);
199
+        AddSkyboxButton("bridge", "ArstaBridge", row1);
200
+        AddSkyboxButton("indoors", "DallasW", row1);
201
+        AddSkyboxButton("indoors", "MarriottMadisonWest", row1);
202
+        
203
+        AddSkyboxButton("indoors", "Vasa", row2);
204
+        AddSkyboxButton("winter", "Backyard", row2);
205
+        AddSkyboxButton("winter", "Creek", row2);
206
+        AddSkyboxButton("winter", "FootballField3", row2);
207
+        
208
+        AddSkyboxButton("winter", "Forest", row3);
209
+        AddSkyboxButton("winter", "HornstullsStrand2", row3);
210
+        AddSkyboxButton("winter", "House", row3);
211
+        AddSkyboxButton("winter", "IceLake", row3);
212
+        
213
+        AddSkyboxButton("winter", "IceRiver", row4);
214
+        AddSkyboxButton("winter", "Park3", row4);
215
+        AddSkyboxButton("winter", "PondWinter", row4);
216
+        
217
+        AddSkyboxButton("winter", "Tantolunden5", row5);
218
+        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
+         */
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 ChangeSkybox(String name)
250
+    {
251
+        cameraView.envyoff = false;
252
+        cameraView.skyboxname = name;
253
+        cameraView.skyboxext = "jpg";
254
+        cameraView.repaint();
255
+    }
256
+    
26
257
     //ObjEditor objEditor;
27
258
 	public void closeUI2()
28
259
 	{
..
..
@@ -528,10 +759,15 @@
528
759
 		attachBumpItem.addActionListener(this);
529
760
 		pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
530
761
 		pigmentBumpItem.addActionListener(this);
762
+                //embedTexturesItem
531
763
 		detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
532
764
 		detachPigmentItem.addActionListener(this);
533
765
 		detachBumpItem = menu.add(new MenuItem("Detach Bump"));
534
766
 		detachBumpItem.addActionListener(this);
767
+		embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
768
+		embedTexturesItem.addActionListener(this);
769
+		deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
770
+		deEmbedTexturesItem.addActionListener(this);
535
771
 		menu.add("-");
536
772
 		sortbysizeItem = menu.add(new MenuItem("Sort by size"));
537
773
 		sortbysizeItem.addActionListener(this);
..
..
@@ -603,7 +839,7 @@
603
839
          */
604
840
                 cGridBag copyOptionsPanel = new cGridBag();
605
841
                                         
606
-                copyOptionsPanel.preferredHeight = 1;
842
+                copyOptionsPanel.preferredHeight = 2;
607
843
                 
608
844
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
609
845
                 
..
..
@@ -683,25 +919,25 @@
683
919
                         oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
684
920
                         snapobjectButton.addActionListener(this);
685
921
                         snapobjectButton.setToolTipText("Snap Object");
922
+                        
923
+		oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
924
+		fourButton.addActionListener(this);
925
+                fourButton.setToolTipText("Show control panel only");
686
926
                 }
687
927
 
688
928
 		//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
689
929
                 
690
-		oe.toolbarPanel.add(fourButton = new cButton("-||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
691
-		fourButton.addActionListener(this);
692
-                fourButton.setToolTipText("Show left panel only");
693
-                
694
-		oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
695
-                twoButton.setToolTipText("Show right view only");
930
+		oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
931
+                twoButton.setToolTipText("Show 3D view only");
696
932
 		twoButton.addActionListener(this);
697
933
                 this.fullscreenLayout = twoButton;
698
934
                 
699
-		oe.toolbarPanel.add(sixButton = new cButton("-|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
700
-                sixButton.setToolTipText("Show left and right");
935
+		oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
936
+                threeButton.setToolTipText("Show controls and 3D view");
937
+		threeButton.addActionListener(this);
938
+		oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
939
+                sixButton.setToolTipText("Show 3D view and controls");
701
940
 		sixButton.addActionListener(this);
702
-//		oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
703
-//                threeButton.setToolTipText("2-column layout right");
704
-//		threeButton.addActionListener(this);
705
941
 //		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
706
942
 //                sevenButton.setToolTipText("3-column layout");
707
943
 //		sevenButton.addActionListener(this);
..
..
@@ -717,28 +953,30 @@
717
953
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
718
954
 		//clearButton.addActionListener(this);
719
955
 
956
+                cGridBag row1 = new cGridBag();
957
+                
720
958
                 // INSERT
721
-                oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
959
+                row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
722
960
                 gridButton.setToolTipText("Create grid");
723
961
                                 gridButton.addActionListener(this);
724
962
 
725
-                oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
963
+                row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
726
964
                 boxButton.setToolTipText("Create box");
727
965
                                 boxButton.addActionListener(this);
728
966
 
729
-                oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
967
+                row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
730
968
                 sphereButton.setToolTipText("Create sphere");
731
969
                                 sphereButton.addActionListener(this);
732
970
 
733
-                oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
971
+                row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
734
972
                 coneButton.setToolTipText("Create cone");
735
973
                                 coneButton.addActionListener(this);
736
974
 
737
-                oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
975
+                row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
738
976
                 torusButton.setToolTipText("Create torus");
739
977
                                 torusButton.addActionListener(this);
740
978
 
741
-                oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
979
+                row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
742
980
                 superButton.setToolTipText("Create superellipsoid");
743
981
                                 superButton.addActionListener(this);
744
982
 
..
..
@@ -749,51 +987,56 @@
749
987
                                     kleinButton.addActionListener(this);
750
988
                 }
751
989
                 
752
-                oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
990
+                row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
753
991
                 particlesButton.setToolTipText("Create particle system");
754
992
                                particlesButton.addActionListener(this);
755
993
 
756
-                oe.toolboxPanel.Return();
994
+                oe.toolboxPanel.add(row1);
757
995
                 
758
-                oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
996
+                cGridBag row2 = new cGridBag();
997
+                
998
+                row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
759
999
                 groupButton.setToolTipText("Create group");
760
1000
                                groupButton.addActionListener(this);
761
1001
 
762
-                oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1002
+                row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
763
1003
                 compositeButton.setToolTipText("Create composite");
764
1004
                                compositeButton.addActionListener(this);
765
1005
 
766
-                oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1006
+                row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
767
1007
                 switchButton.setToolTipText("Create item switcher");
768
1008
                                switchButton.addActionListener(this);
769
1009
 
770
-                oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1010
+                row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
771
1011
                 loopButton.setToolTipText("Create loop");
772
1012
                                loopButton.addActionListener(this);
773
1013
 
774
-                oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1014
+                row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
775
1015
                 textureButton.setToolTipText("Create texture");
776
1016
                                textureButton.addActionListener(this);
777
1017
 
778
-                oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1018
+                row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
779
1019
                 overlayButton.setToolTipText("Create overlay");
780
1020
                                overlayButton.addActionListener(this);
781
1021
 
782
-                oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1022
+                row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
783
1023
                 lightButton.setToolTipText("Create light");
784
1024
                                lightButton.addActionListener(this);
785
1025
 
786
-                for (int i=6; --i>=0;)
787
-                {
788
-                oe.toolboxPanel.Return();
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
-                oe.toolboxPanel.add(new cGridBag());
795
-                oe.toolboxPanel.add(new cGridBag());
796
-                }
1026
+                oe.toolboxPanel.add(row2);
1027
+                
1028
+                // ENVYMAPS
1029
+                cGridBag skyboxpane = new cGridBag();
1030
+                skyboxpane.preferredHeight = 100;
1031
+                
1032
+                oe.toolboxPanel.add(skyboxpane);
1033
+                
1034
+                JTabbedPane skyboxpanel = new JTabbedPane();
1035
+                skyboxpane.add(skyboxpanel);
1036
+                
1037
+                AddSkyboxTab0(skyboxpanel);
1038
+                AddSkyboxTab1(skyboxpanel);
1039
+                AddSkyboxTab2(skyboxpanel);
797
1040
                 
798
1041
                 // EDIT panel
799
1042
 		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..
..
@@ -853,8 +1096,8 @@
853
1096
             versionSlider = (cNumberSlider)sliderPane.getComponent(1);
854
1097
             sliderPane.preferredHeight = 1;
855
1098
                 
856
-//        mainPanel.setDividerLocation(0.5); //1.0);
857
-//        mainPanel.setResizeWeight(0.5);
1099
+//        mainPanel.setDividerLocation(0.1); //1.0);
1100
+        mainPanel.setResizeWeight(0.4);
858
1101
         
859
1102
 		//jList.addListSelectionListener(this);
860
1103
 		oe.jTree.addTreeSelectionListener(this);
..
..
@@ -862,7 +1105,7 @@
862
1105
 		//jTree.setEditable(true);
863
1106
 		oe.jTree.setDragEnabled(true);
864
1107
 		//jTree.setPreferredSize(new Dimension(10,10));
865
-		jSP.setPreferredSize(new Dimension(100,200));
1108
+		//jSP.setPreferredSize(new Dimension(100,200));
866
1109
 		
867
1110
                 oe.jTree.setCellRenderer(new cTreeModel.Renderer());
868
1111
                 
..
..
@@ -2134,6 +2377,23 @@
2134
2377
 		{
2135
2378
 			makeSomething(new Light());
2136
2379
 		} else
2380
+//		if (source == skybox1Button ||
2381
+//                    source == skybox2Button ||
2382
+//                    source == skybox3Button ||
2383
+//                    source == skybox4Button ||
2384
+//                    source == skybox5Button ||
2385
+//                    source == skybox6Button ||
2386
+//                    source == skybox7Button ||
2387
+//                    source == skybox11Button ||
2388
+//                    source == skybox12Button ||
2389
+//                    source == skybox13Button ||
2390
+//                    source == skybox14Button ||
2391
+//                    source == skybox15Button ||
2392
+//                    source == skybox16Button ||
2393
+//                    source == skybox17Button)
2394
+//		{
2395
+//                    ChangeSkybox(source);
2396
+//		} else
2137
2397
 		if (source == csgItem)
2138
2398
 		{
2139
2399
 			group(new CSG());
..
..
@@ -2219,7 +2479,7 @@
2219
2479
 		if (source == computeAOItem)
2220
2480
 		{
2221
2481
                     Globals.drawMode = CameraPane.OCCLUSION;
2222
-                    Globals.theRenderer.repaint();
2482
+                    cameraView.repaint();
2223
2483
 		} else
2224
2484
 		if (source == recompileItem)
2225
2485
 		{
..
..
@@ -3153,7 +3413,7 @@
3153
3413
 			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3154
3414
 			{
3155
3415
 				obj = (Object3D)e.nextElement();
3156
-                                obj.SetBumpTexture(null);
3416
+                                obj.ResetBumpTexture();
3157
3417
 			}
3158
3418
 			
3159
3419
 			refreshContents();
..
..
@@ -3167,6 +3427,31 @@
3167
3427
                                 obj.SetBumpTexture(obj.GetPigmentTexture());
3168
3428
 			}
3169
3429
 			
3430
+			refreshContents();
3431
+		} else
3432
+		if (source == embedTexturesItem)
3433
+		{
3434
+			Object3D obj;
3435
+			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3436
+			{
3437
+				obj = (Object3D)e.nextElement();
3438
+                                obj.EmbedTextures(true);
3439
+			}
3440
+			
3441
+			refreshContents();
3442
+		} else
3443
+		if (source == deEmbedTexturesItem)
3444
+		{
3445
+			Object3D obj;
3446
+			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3447
+			{
3448
+				obj = (Object3D)e.nextElement();
3449
+                                obj.EmbedTextures(false);
3450
+			}
3451
+			
3452
+                CameraPane.texturepigment.clear();
3453
+                CameraPane.texturebump.clear();
3454
+                
3170
3455
 			refreshContents();
3171
3456
 		} else
3172
3457
 		if (source == flashSelectionButton)
..
..
@@ -3270,8 +3555,8 @@
3270
3555
 //                    centralPanel.setVisible(true);
3271
3556
 //                    XYZPanel.setVisible(true);
3272
3557
                     bigThree.ClearUI();
3558
+                    bigThree.add(scenePanel);
3273
3559
                     bigThree.add(centralPanel);
3274
-                    bigThree.add(XYZPanel);
3275
3560
                     bigThree.FlushUI();
3276
3561
                     
3277
3562
                     cameraView.requestFocusInWindow();
..
..
@@ -3351,8 +3636,8 @@
3351
3636
 //                    centralPanel.setVisible(true);
3352
3637
 //                    XYZPanel.setVisible(false);
3353
3638
                     bigThree.ClearUI();
3354
-                    bigThree.add(scenePanel);
3355
3639
                     bigThree.add(centralPanel);
3640
+                    bigThree.add(scenePanel);
3356
3641
                     bigThree.FlushUI();
3357
3642
                     
3358
3643
                     cameraView.requestFocusInWindow();
..
..
@@ -4163,7 +4448,7 @@
4163
4448
                             
4164
4449
                             try
4165
4450
                             {
4166
-                                texturedata = Globals.theRenderer.GetTextureData(tex.pigmenttexture, pigment, false, node.texres);
4451
+                                texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4167
4452
                             }
4168
4453
                             catch (Exception e)
4169
4454
                             {
..
..
@@ -5646,6 +5931,22 @@
5646
5931
         cButton loopButton;
5647
5932
         cButton textureButton;
5648
5933
         
5934
+        cButton skybox1Button;
5935
+        cButton skybox2Button;
5936
+        cButton skybox3Button;
5937
+        cButton skybox4Button;
5938
+        cButton skybox5Button;
5939
+        cButton skybox6Button;
5940
+        cButton skybox7Button;
5941
+        
5942
+        cButton skybox11Button;
5943
+        cButton skybox12Button;
5944
+        cButton skybox13Button;
5945
+        cButton skybox14Button;
5946
+        cButton skybox15Button;
5947
+        cButton skybox16Button;
5948
+        cButton skybox17Button;
5949
+        
5649
5950
         cButton gridButton;
5650
5951
         cButton boxButton;
5651
5952
         cButton sphereButton;
..
..
@@ -5793,6 +6094,8 @@
5793
6094
 	private MenuItem attachBumpItem;
5794
6095
 	private MenuItem detachBumpItem;
5795
6096
 	private MenuItem pigmentBumpItem;
6097
+	private MenuItem embedTexturesItem;
6098
+	private MenuItem deEmbedTexturesItem;
5796
6099
 
5797
6100
 	private MenuItem particleItem;
5798
6101
 	private MenuItem ragdollItem;