Normand Briere
2019-08-08 8294241adc5fe698b70e13ebd6780af46ab83f7e
GroupEditor.java
....@@ -16,6 +16,7 @@
1616 //import buoy.widget.BFileChooser;
1717
1818 class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
19
+ Grafreed.iResourceCallBack,
1920 ObjectUI,
2021 Runnable,
2122 ActionListener,
....@@ -23,6 +24,335 @@
2324 DragGestureListener, DragSourceListener, DropTargetListener,
2425 ItemListener // ListSelectionListener
2526 {
27
+
28
+ public void AddSkyboxButton(String f, String s, cGridBag row)
29
+ {
30
+ cButton skyboxButton;
31
+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
32
+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
33
+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
34
+ skyboxButton.setToolTipText(s);
35
+ skyboxButton.addActionListener(new ActionListener()
36
+ {
37
+ @Override
38
+ public void actionPerformed(ActionEvent e)
39
+ {
40
+ ChangeSkybox(path);
41
+ }
42
+ });
43
+ }
44
+
45
+ public void AddTextureButton(String f, final String t, cGridBag row)
46
+ {
47
+ cButton textureButton;
48
+ final String path = "textures/" + f + "/"; // + t;
49
+ row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
50
+ textureButton.setToolTipText(f + "s");
51
+ textureButton.addActionListener(new ActionListener()
52
+ {
53
+ @Override
54
+ public void actionPerformed(ActionEvent e)
55
+ {
56
+ ChangeTexture(path + t);
57
+ }
58
+ });
59
+ }
60
+
61
+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
62
+ {
63
+ cGridBag tab0 = new cGridBag().setVertical(true);
64
+
65
+ tab0.setName("Urban");
66
+ skyboxpanel.add(tab0);
67
+
68
+ cGridBag row0 = new cGridBag();
69
+ cGridBag row1 = new cGridBag();
70
+ cGridBag row2 = new cGridBag();
71
+ cGridBag row3 = new cGridBag();
72
+ cGridBag row4 = new cGridBag();
73
+ cGridBag row5 = new cGridBag();
74
+ cGridBag row6 = new cGridBag();
75
+
76
+ AddSkyboxButton("default", "rgb", row0);
77
+ //AddSkyboxButton("default", "cornell", row0);
78
+ AddSkyboxButton("penguins", "dust", row0);
79
+ AddSkyboxButton("penguins", "tropic", row0);
80
+ AddSkyboxButton("penguins", "yonder", row0);
81
+
82
+ AddSkyboxButton("default", "uffizi", row1);
83
+ AddSkyboxButton("bridge", "Bridge", row1);
84
+ AddSkyboxButton("bridge", "Bridge2", row1);
85
+ AddSkyboxButton("urban", "GamlaStan2", row1);
86
+
87
+ AddSkyboxButton("urban", "Parliament", row2);
88
+ AddSkyboxButton("urban", "Roundabout", row2);
89
+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
90
+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
91
+
92
+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
93
+ AddSkyboxButton("urban", "UnionSquare", row3);
94
+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
95
+ AddSkyboxButton("park", "BerzeliiPark", row3);
96
+
97
+ AddSkyboxButton("park", "Buddha", row4);
98
+ AddSkyboxButton("park", "CNTower2", row4);
99
+ AddSkyboxButton("park", "NiagaraFalls1", row4);
100
+ AddSkyboxButton("park", "NiagaraFalls3", row4);
101
+
102
+ AddSkyboxButton("park", "Park", row5);
103
+ AddSkyboxButton("park", "Pond", row5);
104
+ AddSkyboxButton("park", "Skansen", row5);
105
+ AddSkyboxButton("park", "Skansen2", row5);
106
+
107
+ AddSkyboxButton("park", "Skansen3", row6);
108
+ AddSkyboxButton("park", "Skansen4", row6);
109
+ AddSkyboxButton("park", "Skansen5", row6);
110
+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
111
+
112
+ tab0.add(row0);
113
+ tab0.add(row1);
114
+ tab0.add(row2);
115
+ tab0.add(row3);
116
+ tab0.add(row4);
117
+ tab0.add(row5);
118
+ tab0.add(row6);
119
+
120
+ for (int i=5; --i>=0;)
121
+ {
122
+ //oe.toolboxPanel.Return();
123
+ //tab0.add(new cGridBag());
124
+ }
125
+ }
126
+
127
+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
128
+ {
129
+ cGridBag tab0 = new cGridBag().setVertical(true);
130
+
131
+ tab0.setName("Nature");
132
+ skyboxpanel.add(tab0);
133
+
134
+ cGridBag row0 = new cGridBag();
135
+ cGridBag row1 = new cGridBag();
136
+ cGridBag row2 = new cGridBag();
137
+ cGridBag row3 = new cGridBag();
138
+ cGridBag row4 = new cGridBag();
139
+ cGridBag row5 = new cGridBag();
140
+ cGridBag row6 = new cGridBag();
141
+
142
+ AddSkyboxButton("beach", "HeartInTheSand", row0);
143
+ AddSkyboxButton("beach", "LarnacaBeach", row0);
144
+ AddSkyboxButton("beach", "PalmTrees", row0);
145
+ AddSkyboxButton("beach", "Tenerife", row0);
146
+
147
+ AddSkyboxButton("beach", "Tenerife2", row1);
148
+ AddSkyboxButton("beach", "Tenerife3", row1);
149
+ AddSkyboxButton("field", "FishPond", row1);
150
+ AddSkyboxButton("field", "Footballfield", row1);
151
+
152
+ AddSkyboxButton("field", "Meadow", row2);
153
+ AddSkyboxButton("field", "Sorsele", row2);
154
+ AddSkyboxButton("field", "Sorsele2", row2);
155
+ AddSkyboxButton("field", "Sorsele3", row2);
156
+
157
+ AddSkyboxButton("forest", "Brudslojan", row3);
158
+ AddSkyboxButton("forest", "Langholmen2", row3);
159
+ AddSkyboxButton("forest", "Plants", row3);
160
+ AddSkyboxButton("mountain", "Maskonaive", row3);
161
+
162
+ AddSkyboxButton("mountain", "Maskonaive2", row4);
163
+ AddSkyboxButton("mountain", "Maskonaive3", row4);
164
+ AddSkyboxButton("mountain", "Teide", row4);
165
+ AddSkyboxButton("park", "Tantolunden4", row4);
166
+
167
+ AddSkyboxButton("park", "Stairs", row5);
168
+ AddSkyboxButton("default", "skycube", row6);
169
+ AddSkyboxButton("rocky", "Langholmen", row5);
170
+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
171
+
172
+ AddSkyboxButton("rocky", "Tantolunden6", row5);
173
+ AddSkyboxButton("default", "CloudyHills", row6);
174
+ AddSkyboxButton("daz", "Autumn", row6);
175
+ AddSkyboxButton("daz", "MountainTrail", row6);
176
+ /*
177
+Autumn
178
+Greenlands
179
+MountainTrail
180
+Oasis
181
+TheRock
182
+TopOfTheWorld
183
+Winter
184
+ */
185
+
186
+ tab0.add(row0);
187
+ tab0.add(row1);
188
+ tab0.add(row2);
189
+ tab0.add(row3);
190
+ tab0.add(row4);
191
+ tab0.add(row5);
192
+ tab0.add(row6);
193
+
194
+ for (int i=5; --i>=0;)
195
+ {
196
+ //oe.toolboxPanel.Return();
197
+ //tab0.add(new cGridBag());
198
+ }
199
+ }
200
+
201
+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
202
+ {
203
+ cGridBag tab0 = new cGridBag().setVertical(true);
204
+
205
+ tab0.setName("Night");
206
+ skyboxpanel.add(tab0);
207
+
208
+ cGridBag row0 = new cGridBag();
209
+ cGridBag row1 = new cGridBag();
210
+ cGridBag row2 = new cGridBag();
211
+ cGridBag row3 = new cGridBag();
212
+ cGridBag row4 = new cGridBag();
213
+ cGridBag row5 = new cGridBag();
214
+ cGridBag row6 = new cGridBag();
215
+
216
+ AddSkyboxButton("night", "NightPath", row0);
217
+ AddSkyboxButton("night", "PondNight", row0);
218
+ AddSkyboxButton("night", "Powerlines", row0);
219
+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
220
+
221
+ AddSkyboxButton("urban", "CNTower", row1);
222
+ AddSkyboxButton("bridge", "ArstaBridge", row1);
223
+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
224
+ AddSkyboxButton("penguins", "sleepyhollow", row1);
225
+
226
+ AddSkyboxButton("penguins", "kenon_star", row2);
227
+ AddSkyboxButton("persson", "corona", row2);
228
+ AddSkyboxButton("persson", "spaceskybox", row2);
229
+ AddSkyboxButton("indoors", "Vasa", row2);
230
+
231
+ AddSkyboxButton("winter", "Backyard", row3);
232
+ AddSkyboxButton("winter", "Creek", row3);
233
+ AddSkyboxButton("winter", "FootballField3", row3);
234
+ AddSkyboxButton("winter", "Forest", row3);
235
+
236
+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
237
+ AddSkyboxButton("winter", "House", row4);
238
+ AddSkyboxButton("winter", "IceLake", row4);
239
+ AddSkyboxButton("winter", "IceRiver", row4);
240
+
241
+ AddSkyboxButton("winter", "Park3", row5);
242
+ AddSkyboxButton("winter", "PondWinter", row5);
243
+ AddSkyboxButton("winter", "Tantolunden5", row5);
244
+ AddSkyboxButton("winter", "Vindelalven", row5);
245
+
246
+ AddSkyboxButton("daz", "TheRock", row6);
247
+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
248
+ AddSkyboxButton("daz", "Winter", row6);
249
+ AddSkyboxButton("mountain", "Ryfjallet", row6);
250
+
251
+ tab0.add(row0);
252
+ tab0.add(row1);
253
+ tab0.add(row2);
254
+ tab0.add(row3);
255
+ tab0.add(row4);
256
+ tab0.add(row5);
257
+ tab0.add(row6);
258
+
259
+ for (int i=5; --i>=0;)
260
+ {
261
+ //oe.toolboxPanel.Return();
262
+ //tab0.add(new cGridBag());
263
+ }
264
+ }
265
+
266
+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
267
+ {
268
+ cGridBag tab0 = new cGridBag().setVertical(true);
269
+
270
+ tab0.setName("Others");
271
+ skyboxpanel.add(tab0);
272
+
273
+ cGridBag row0 = new cGridBag();
274
+ cGridBag row1 = new cGridBag();
275
+ cGridBag row2 = new cGridBag();
276
+ cGridBag row3 = new cGridBag();
277
+ cGridBag row4 = new cGridBag();
278
+ cGridBag row5 = new cGridBag();
279
+ cGridBag row6 = new cGridBag();
280
+
281
+ AddSkyboxButton("mayhem", "afterrain", row0);
282
+ AddSkyboxButton("mayhem", "aqua4", row0);
283
+ AddSkyboxButton("mayhem", "aqua9", row0);
284
+ AddSkyboxButton("mayhem", "flame", row0);
285
+
286
+ AddSkyboxButton("mayhem", "h2s", row1);
287
+ AddSkyboxButton("mayhem", "prehistoric", row1);
288
+ AddSkyboxButton("mayhem", "scorched", row1);
289
+ AddSkyboxButton("penguins", "desertdawn", row1);
290
+
291
+ AddSkyboxButton("persson", "Citadella", row2);
292
+ AddSkyboxButton("persson", "Citadella2", row2);
293
+ AddSkyboxButton("persson", "clouds1", row2);
294
+ AddSkyboxButton("penguins", "wrath", row2);
295
+
296
+ AddSkyboxButton("persson", "FishermansBastion", row3);
297
+ AddSkyboxButton("persson", "HeroesSquare", row3);
298
+ AddSkyboxButton("indoors", "DallasW", row3);
299
+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
300
+
301
+ AddSkyboxButton("persson", "LancellottiChapel", row4);
302
+ AddSkyboxButton("persson", "PereaBeach1", row4);
303
+ AddSkyboxButton("persson", "PereaBeach2", row4);
304
+ AddSkyboxButton("persson", "redeclipse", row4);
305
+
306
+ AddSkyboxButton("daz", "Greenlands", row5);
307
+ AddSkyboxButton("daz", "Oasis", row5);
308
+ AddSkyboxButton("elyvisions", "arch3", row5);
309
+ AddSkyboxButton("elyvisions", "calm_sea", row5);
310
+
311
+ AddSkyboxButton("elyvisions", "rainbow", row6);
312
+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
313
+ AddSkyboxButton("elyvisions", "heaven", row6);
314
+ AddSkyboxButton("elyvisions", "hot", row6);
315
+
316
+ tab0.add(row0);
317
+ tab0.add(row1);
318
+ tab0.add(row2);
319
+ tab0.add(row3);
320
+ tab0.add(row4);
321
+ tab0.add(row5);
322
+ tab0.add(row6);
323
+
324
+ for (int i=5; --i>=0;)
325
+ {
326
+ //oe.toolboxPanel.Return();
327
+ //tab0.add(new cGridBag());
328
+ }
329
+ }
330
+
331
+ public void ChangeSkybox(String skybox)
332
+ {
333
+ //cameraView.envyoff = false;
334
+ group.skyboxname = skybox;
335
+ group.skyboxext = "jpg";
336
+ cameraView.repaint();
337
+ }
338
+
339
+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
340
+ {
341
+ JTabbedPane skyboxpane = new JTabbedPane();
342
+
343
+ AddSkyboxTab0(skyboxpane);
344
+ AddSkyboxTab1(skyboxpane);
345
+ AddSkyboxTab2(skyboxpane);
346
+ AddSkyboxTab3(skyboxpane);
347
+
348
+ skyboxPanel.add(skyboxpane);
349
+ }
350
+
351
+ public void ChangeTexture(String texture)
352
+ {
353
+ cameraView.repaint();
354
+ }
355
+
26356 //ObjEditor objEditor;
27357 public void closeUI2()
28358 {
....@@ -60,9 +390,9 @@
60390 this.copy = this.group = group;
61391 //selectees = this.group.selectees;
62392
63
- if (copy.versions == null)
393
+ if (copy.versionlist == null)
64394 {
65
- copy.versions = new byte[100][];
395
+ copy.versionlist = new Object3D[100];
66396 copy.versionindex = -1;
67397 }
68398
....@@ -80,18 +410,20 @@
80410 this.copy = this.group = copy;
81411 //selectees = this.group.selectees;
82412
83
- if (copy.versions == null)
84
- {
85
- copy.versions = new byte[100][];
86
- copy.versionindex = -1;
87
- }
88
-
89413 SetupMenu2(this); //objEditor);
90414 SetupUI2(objEditor);
91415 objEditor.SetupUI(true);
92416 SetupViews(objEditor);
93417
94418 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
419
+
420
+ if (copy.versionlist == null)
421
+ {
422
+ copy.versionlist = new Object3D[100];
423
+ copy.versionindex = -1;
424
+
425
+ Save(true);
426
+ }
95427 }
96428
97429 void CloneSelection(boolean supports)
....@@ -206,8 +538,8 @@
206538 // pasteExpandItem = menu.add(new MenuItem("Paste expand"));
207539 // pasteExpandItem.addActionListener(this);
208540 menu.add("-");
209
- clearItem = menu.add(new MenuItem("Clear"));
210
- clearItem.addActionListener(this);
541
+ deleteItem = menu.add(new MenuItem("Delete"));
542
+ deleteItem.addActionListener(this);
211543
212544 if (Globals.ADVANCED)
213545 {
....@@ -433,7 +765,7 @@
433765 genNormalsMESHItem.addActionListener(this);
434766 if (Globals.ADVANCED)
435767 {
436
- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
768
+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
437769 genNormalsMINEItem.addActionListener(this);
438770 }
439771 stripifyItem = menu.add(new MenuItem("Stripify"));
....@@ -526,10 +858,15 @@
526858 attachBumpItem.addActionListener(this);
527859 pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
528860 pigmentBumpItem.addActionListener(this);
861
+ //embedTexturesItem
529862 detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
530863 detachPigmentItem.addActionListener(this);
531864 detachBumpItem = menu.add(new MenuItem("Detach Bump"));
532865 detachBumpItem.addActionListener(this);
866
+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
867
+ embedTexturesItem.addActionListener(this);
868
+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
869
+ deEmbedTexturesItem.addActionListener(this);
533870 menu.add("-");
534871 sortbysizeItem = menu.add(new MenuItem("Sort by size"));
535872 sortbysizeItem.addActionListener(this);
....@@ -556,6 +893,67 @@
556893 buildToolsMenu(menu);
557894 }
558895
896
+ JTabbedPane resourcecontainer;
897
+ cGridBag currenttab;
898
+ boolean added; // patch for jar
899
+
900
+ int tabcount = 0;
901
+ int colcount = 0;
902
+ int rowcount = 0;
903
+
904
+ int columns = 5;
905
+ int rows = 7;
906
+
907
+ public void ResourceCallBack(String[] path)
908
+ {
909
+ for (int i = 0; i < path.length; i++)
910
+ System.out.print(path[i] + "/");
911
+ System.out.println();
912
+ if (rowcount == 0)
913
+ {
914
+ currenttab = new cGridBag();
915
+ added = false;
916
+ String tabname = String.valueOf((char)('A'+tabcount));
917
+ currenttab.setName(tabname);
918
+ rowcount = 1;
919
+ }
920
+
921
+ if (path.length > 1 && path[1].toLowerCase().endsWith(".jpg"))
922
+ {
923
+ if (!added)
924
+ {
925
+ added = true;
926
+ resourcecontainer.add(currenttab);
927
+ String tabname = String.valueOf((char)('A'+tabcount));
928
+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
929
+ }
930
+
931
+ AddTextureButton(path[0], path[1], currenttab);
932
+ if (++colcount >= columns)
933
+ {
934
+ colcount = 0;
935
+ currenttab.Return();
936
+
937
+ if (rowcount++ >= rows)
938
+ {
939
+ rowcount = 0;
940
+ }
941
+ }
942
+ }
943
+ else
944
+ {
945
+// if (!path[path.length-1].equals("icons"))
946
+// resourcecontainer.Return();
947
+ }
948
+ }
949
+
950
+ void CreateTexturePanel(cGridBag container)
951
+ {
952
+ resourcecontainer = new JTabbedPane();
953
+ container.add(resourcecontainer);
954
+
955
+ Grafreed.ParseResources("textures", this);
956
+ }
559957
560958 void SetupUI2(ObjEditor oe)
561959 {
....@@ -601,7 +999,7 @@
601999 */
6021000 cGridBag copyOptionsPanel = new cGridBag();
6031001
604
- copyOptionsPanel.preferredHeight = 1;
1002
+ copyOptionsPanel.preferredHeight = 2;
6051003
6061004 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
6071005
....@@ -628,32 +1026,36 @@
6281026 restoreCameraButton.setToolTipText("Restore viewpoint");
6291027 restoreCameraButton.addActionListener(this);
6301028
631
- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632
- saveButton.setToolTipText("New version");
633
- saveButton.addActionListener(this);
1029
+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1030
+ saveVersionButton.setToolTipText("Duplicate current version");
1031
+ saveVersionButton.addActionListener(this);
6341032
635
- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
636
- undoButton.setToolTipText("Previous version");
637
- undoButton.addActionListener(this);
638
- undoButton.setEnabled(false);
1033
+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1034
+ deleteVersionButton.setToolTipText("Delete current version");
1035
+ deleteVersionButton.addActionListener(this);
1036
+
1037
+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1038
+ previousVersionButton.setToolTipText("Previous version");
1039
+ previousVersionButton.addActionListener(this);
1040
+ previousVersionButton.setEnabled(false);
6391041
6401042 cGridBag updown = new cGridBag().setVertical(true);
6411043 updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
642
- restoreButton.setToolTipText("Restore current");
1044
+ restoreButton.setToolTipText("Undo (restore current version)");
6431045 restoreButton.addActionListener(this);
644
- restoreButton.setEnabled(false);
1046
+ //restoreButton.setEnabled(false);
6451047
6461048 updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
647
- replaceButton.setToolTipText("Replace current");
1049
+ replaceButton.setToolTipText("Save (replace current version)");
6481050 replaceButton.addActionListener(this);
649
- replaceButton.setEnabled(false);
1051
+ //replaceButton.setEnabled(false);
6501052
6511053 copyOptionsPanel.add(updown);
6521054
653
- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654
- redoButton.setToolTipText("Next version");
655
- redoButton.addActionListener(this);
656
- redoButton.setEnabled(false);
1055
+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1056
+ nextVersionButton.setToolTipText("Next version");
1057
+ nextVersionButton.addActionListener(this);
1058
+ nextVersionButton.setEnabled(false);
6571059
6581060 oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
6591061 liveCB.setToolTipText("Enable animation");
....@@ -681,31 +1083,32 @@
6811083 oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
6821084 snapobjectButton.addActionListener(this);
6831085 snapobjectButton.setToolTipText("Snap Object");
1086
+
1087
+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1088
+ fourButton.addActionListener(this);
1089
+ fourButton.setToolTipText("Show control panel only");
6841090 }
6851091
6861092 //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
6871093
688
- oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
689
- twoButton.setToolTipText("Show center view only");
1094
+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1095
+ twoButton.setToolTipText("Show 3D view only");
6901096 twoButton.addActionListener(this);
6911097 this.fullscreenLayout = twoButton;
6921098
693
- oe.toolbarPanel.add(fourButton = new cButton("-||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
694
- fourButton.addActionListener(this);
695
- fourButton.setToolTipText("Show left panel only");
696
- oe.toolbarPanel.add(sixButton = new cButton("-|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
697
- sixButton.setToolTipText("2-column layout left");
698
- sixButton.addActionListener(this);
699
- oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
700
- threeButton.setToolTipText("2-column layout right");
1099
+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1100
+ threeButton.setToolTipText("Show controls and 3D view");
7011101 threeButton.addActionListener(this);
702
- oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
703
- sevenButton.setToolTipText("3-column layout");
704
- sevenButton.addActionListener(this);
1102
+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1103
+ sixButton.setToolTipText("Show 3D view and controls");
1104
+ sixButton.addActionListener(this);
1105
+// oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1106
+// sevenButton.setToolTipText("3-column layout");
1107
+// sevenButton.addActionListener(this);
7051108 //
7061109
707
- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
708
- rootButton.setToolTipText("Edit selection in new tab");
1110
+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1111
+ rootButton.setToolTipText("Open selection in new tab");
7091112 rootButton.addActionListener(this);
7101113
7111114 oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
....@@ -714,28 +1117,30 @@
7141117 //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
7151118 //clearButton.addActionListener(this);
7161119
1120
+ cGridBag row1 = new cGridBag();
1121
+
7171122 // INSERT
718
- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1123
+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7191124 gridButton.setToolTipText("Create grid");
7201125 gridButton.addActionListener(this);
7211126
722
- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1127
+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7231128 boxButton.setToolTipText("Create box");
7241129 boxButton.addActionListener(this);
7251130
726
- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1131
+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7271132 sphereButton.setToolTipText("Create sphere");
7281133 sphereButton.addActionListener(this);
7291134
730
- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1135
+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7311136 coneButton.setToolTipText("Create cone");
7321137 coneButton.addActionListener(this);
7331138
734
- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1139
+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7351140 torusButton.setToolTipText("Create torus");
7361141 torusButton.addActionListener(this);
7371142
738
- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1143
+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7391144 superButton.setToolTipText("Create superellipsoid");
7401145 superButton.addActionListener(this);
7411146
....@@ -746,51 +1151,53 @@
7461151 kleinButton.addActionListener(this);
7471152 }
7481153
749
- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1154
+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7501155 particlesButton.setToolTipText("Create particle system");
7511156 particlesButton.addActionListener(this);
7521157
753
- oe.toolboxPanel.Return();
1158
+ oe.toolboxPanel.add(row1);
7541159
755
- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1160
+ cGridBag row2 = new cGridBag();
1161
+
1162
+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7561163 groupButton.setToolTipText("Create group");
7571164 groupButton.addActionListener(this);
7581165
759
- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1166
+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7601167 compositeButton.setToolTipText("Create composite");
7611168 compositeButton.addActionListener(this);
7621169
763
- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1170
+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7641171 switchButton.setToolTipText("Create item switcher");
7651172 switchButton.addActionListener(this);
7661173
767
- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1174
+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7681175 loopButton.setToolTipText("Create loop");
7691176 loopButton.addActionListener(this);
7701177
771
- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1178
+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7721179 textureButton.setToolTipText("Create texture");
7731180 textureButton.addActionListener(this);
7741181
775
- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1182
+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7761183 overlayButton.setToolTipText("Create overlay");
7771184 overlayButton.addActionListener(this);
7781185
779
- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1186
+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7801187 lightButton.setToolTipText("Create light");
7811188 lightButton.addActionListener(this);
7821189
783
- for (int i=6; --i>=0;)
784
- {
785
- oe.toolboxPanel.Return();
786
- oe.toolboxPanel.add(new cGridBag());
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
- }
1190
+ oe.toolboxPanel.add(row2);
1191
+
1192
+ cGridBag textures = new cGridBag();
1193
+
1194
+ CreateTexturePanel(textures);
1195
+
1196
+ oe.toolboxPanel.add(textures);
1197
+
1198
+ textures.preferredHeight = 100;
1199
+
1200
+ CreateSkyboxPanel(oe.skyboxPanel);
7941201
7951202 // EDIT panel
7961203 editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
....@@ -798,20 +1205,20 @@
7981205 editButton.addActionListener(this);
7991206
8001207 editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
801
- uneditButton.setToolTipText("Remove selection controls");
1208
+ uneditButton.setToolTipText("Unpin and remove selection controls");
8021209 uneditButton.addActionListener(this);
8031210
8041211 editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
805
- allParamsButton.setToolTipText("Show all controle");
1212
+ allParamsButton.setToolTipText("Show all controls");
8061213 allParamsButton.addActionListener(this);
8071214
808
- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
809
- clearPanelButton.setToolTipText("Clear edit panel");
1215
+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1216
+ clearPanelButton.setToolTipText("Clear all controls");
8101217 clearPanelButton.addActionListener(this);
8111218
812
- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
813
- unselectButton.setToolTipText("Unselect");
814
- unselectButton.addActionListener(this);
1219
+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1220
+ //unselectButton.setToolTipText("Unselect");
1221
+ //unselectButton.addActionListener(this);
8151222
8161223 editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
8171224 flashSelectionButton.setToolTipText("Highlight selection");
....@@ -850,8 +1257,8 @@
8501257 versionSlider = (cNumberSlider)sliderPane.getComponent(1);
8511258 sliderPane.preferredHeight = 1;
8521259
853
-// mainPanel.setDividerLocation(0.5); //1.0);
854
-// mainPanel.setResizeWeight(0.5);
1260
+// mainPanel.setDividerLocation(0.1); //1.0);
1261
+ mainPanel.setResizeWeight(0.4);
8551262
8561263 //jList.addListSelectionListener(this);
8571264 oe.jTree.addTreeSelectionListener(this);
....@@ -859,7 +1266,7 @@
8591266 //jTree.setEditable(true);
8601267 oe.jTree.setDragEnabled(true);
8611268 //jTree.setPreferredSize(new Dimension(10,10));
862
- jSP.setPreferredSize(new Dimension(100,200));
1269
+ //jSP.setPreferredSize(new Dimension(100,200));
8631270
8641271 oe.jTree.setCellRenderer(new cTreeModel.Renderer());
8651272
....@@ -871,7 +1278,7 @@
8711278 dgr.addDragGestureListener(this);
8721279 }catch(Exception e) {}
8731280 */
874
- radio.layout = sevenButton;
1281
+ radio.layout = threeButton; // sixButton;
8751282 oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
8761283 }
8771284
....@@ -922,9 +1329,12 @@
9221329 smoothCB.setToolTipText("Snapping delay");
9231330 smoothCB.addItemListener(this);
9241331
925
- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
926
- slowCB.setToolTipText("Smooth interpolation");
927
- slowCB.addItemListener(this);
1332
+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1333
+// slowCB.setToolTipText("Smooth interpolation");
1334
+// slowCB.addItemListener(this);
1335
+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
1336
+ minshaderCB.setToolTipText("Minimal fast shader");
1337
+ minshaderCB.addItemListener(this);
9281338
9291339 // constraints.gridy += 1;
9301340 // panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
....@@ -1013,7 +1423,7 @@
10131423 }
10141424
10151425 radioButton.SetObject(obj);
1016
- radioButton.layout = sevenButton;
1426
+ radioButton.layout = threeButton; // sixButton;
10171427 radioButton.SetCamera(cameraView.renderCamera, false);
10181428 radioButton.addActionListener(this);
10191429 radioPanel.add(radioButton);
....@@ -1038,6 +1448,8 @@
10381448 cCheckBox localCB;
10391449 cCheckBox crowdCB;
10401450 cCheckBox smoothCB;
1451
+ cCheckBox minshaderCB;
1452
+
10411453 cToggleButton fastCB;
10421454 cCheckBox slowCB;
10431455 cCheckBox boxCB;
....@@ -1108,6 +1520,12 @@
11081520 {
11091521 cameraView.ToggleInertia();
11101522 cameraView.repaint();
1523
+ }
1524
+ else if(e.getSource() == minshaderCB)
1525
+ {
1526
+ Globals.MINSHADER ^= true;
1527
+ cameraView.programInitialized = false;
1528
+ cameraView.repaint();
11111529 }
11121530 else if(e.getSource() == localCB)
11131531 {
....@@ -1693,6 +2111,16 @@
16932111 }
16942112 }
16952113 }
2114
+
2115
+ private void EditElement(Object3D elem, boolean newWindow)
2116
+ {
2117
+ // if (!(elem instanceof Composite))
2118
+ // newWindow = false;
2119
+ listUI.add(elem);
2120
+ elem.openEditWindow(this, newWindow); //, false);
2121
+ System.out.println("edit : " + elem);
2122
+ elem.editWindow.refreshContents(true); // ? new
2123
+ }
16962124
16972125 /**
16982126 * applyExample
....@@ -2121,6 +2549,23 @@
21212549 {
21222550 makeSomething(new Light());
21232551 } else
2552
+// if (source == skybox1Button ||
2553
+// source == skybox2Button ||
2554
+// source == skybox3Button ||
2555
+// source == skybox4Button ||
2556
+// source == skybox5Button ||
2557
+// source == skybox6Button ||
2558
+// source == skybox7Button ||
2559
+// source == skybox11Button ||
2560
+// source == skybox12Button ||
2561
+// source == skybox13Button ||
2562
+// source == skybox14Button ||
2563
+// source == skybox15Button ||
2564
+// source == skybox16Button ||
2565
+// source == skybox17Button)
2566
+// {
2567
+// ChangeSkybox(source);
2568
+// } else
21242569 if (source == csgItem)
21252570 {
21262571 group(new CSG());
....@@ -2206,7 +2651,7 @@
22062651 if (source == computeAOItem)
22072652 {
22082653 Globals.drawMode = CameraPane.OCCLUSION;
2209
- Globals.theRenderer.repaint();
2654
+ cameraView.repaint();
22102655 } else
22112656 if (source == recompileItem)
22122657 {
....@@ -2221,7 +2666,7 @@
22212666 if (source == invariantsItem)
22222667 {
22232668 System.out.println("Invariants:");
2224
- Grafreed.grafreeD.universe.invariants();
2669
+ Grafreed.grafreed.universe.invariants();
22252670 } else
22262671 if (source == memoryItem)
22272672 {
....@@ -2252,33 +2697,40 @@
22522697 {
22532698 ToggleFullScreen();
22542699 } else
2255
- if (source == undoButton)
2700
+ if (source == previousVersionButton)
22562701 {
22572702 // Go to previous version
22582703 //if (!Undo())
22592704 //java.awt.Toolkit.getDefaultToolkit().beep();
2260
- Undo();
2705
+ PreviousVersion();
22612706 } else
22622707 if (source == restoreButton)
22632708 {
22642709 // Restore current version
22652710 Restore();
2711
+ //restoreButton.setEnabled(false);
22662712 } else
22672713 if (source == replaceButton)
22682714 {
22692715 // Overwrite current version
22702716 Replace();
2717
+ //replaceButton.setEnabled(false);
22712718 } else
2272
- if (source == redoButton)
2719
+ if (source == nextVersionButton)
22732720 {
22742721 // Go to next version
2275
- Redo();
2722
+ NextVersion();
22762723 } else
2277
- if (source == saveButton)
2724
+ if (source == saveVersionButton)
22782725 {
22792726 // Save a new version
22802727 if (!Save(true))
22812728 java.awt.Toolkit.getDefaultToolkit().beep();
2729
+ } else
2730
+ if (source == deleteVersionButton)
2731
+ {
2732
+ // Delete a new version
2733
+ DeleteVersion();
22822734 } else
22832735 if (source == oneStepButton)
22842736 {
....@@ -2333,11 +2785,11 @@
23332785 } else
23342786 if (source == undoItem)
23352787 {
2336
- Undo();
2788
+ PreviousVersion();
23372789 } else
23382790 if (source == redoItem)
23392791 {
2340
- Redo();
2792
+ NextVersion();
23412793 } else
23422794 if (source == duplicateItem)
23432795 {
....@@ -2658,7 +3110,7 @@
26583110 {
26593111 StepAll();
26603112 } else
2661
- if (source == clearItem) // || event.getSource() == clearButton)
3113
+ if (source == deleteItem) // || event.getSource() == clearButton)
26623114 {
26633115 //int indices[] = jList.getSelectedIndices();
26643116 //for (int i = indices.length - 1; i >= 0; i--)
....@@ -3140,7 +3592,7 @@
31403592 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
31413593 {
31423594 obj = (Object3D)e.nextElement();
3143
- obj.SetBumpTexture(null);
3595
+ obj.ResetBumpTexture();
31443596 }
31453597
31463598 refreshContents();
....@@ -3154,6 +3606,31 @@
31543606 obj.SetBumpTexture(obj.GetPigmentTexture());
31553607 }
31563608
3609
+ refreshContents();
3610
+ } else
3611
+ if (source == embedTexturesItem)
3612
+ {
3613
+ Object3D obj;
3614
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3615
+ {
3616
+ obj = (Object3D)e.nextElement();
3617
+ obj.EmbedTextures(true);
3618
+ }
3619
+
3620
+ refreshContents();
3621
+ } else
3622
+ if (source == deEmbedTexturesItem)
3623
+ {
3624
+ Object3D obj;
3625
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3626
+ {
3627
+ obj = (Object3D)e.nextElement();
3628
+ obj.EmbedTextures(false);
3629
+ }
3630
+
3631
+ CameraPane.texturepigment.clear();
3632
+ CameraPane.texturebump.clear();
3633
+
31573634 refreshContents();
31583635 } else
31593636 if (source == flashSelectionButton)
....@@ -3257,8 +3734,8 @@
32573734 // centralPanel.setVisible(true);
32583735 // XYZPanel.setVisible(true);
32593736 bigThree.ClearUI();
3737
+ bigThree.add(scenePanel);
32603738 bigThree.add(centralPanel);
3261
- bigThree.add(XYZPanel);
32623739 bigThree.FlushUI();
32633740
32643741 cameraView.requestFocusInWindow();
....@@ -3338,8 +3815,8 @@
33383815 // centralPanel.setVisible(true);
33393816 // XYZPanel.setVisible(false);
33403817 bigThree.ClearUI();
3341
- bigThree.add(scenePanel);
33423818 bigThree.add(centralPanel);
3819
+ bigThree.add(scenePanel);
33433820 bigThree.FlushUI();
33443821
33453822 cameraView.requestFocusInWindow();
....@@ -3445,10 +3922,10 @@
34453922 {
34463923 Object3D child = (Object3D)e.nextElement();
34473924 if(child.editWindow != null)
3448
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
34493925 child.pinned = false;
34503926 child.CloseUI();
34513927 listUI.remove(child);
3928
+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
34523929
34533930 //child.editWindow = null; // ???????????
34543931 }
....@@ -3467,6 +3944,7 @@
34673944 obj.CloseUI();
34683945 }
34693946 listUI.clear();
3947
+ SetPinStates(group.selection.size() > 0);
34703948 refreshContents(true);
34713949 } else
34723950 if (source == allParamsButton)
....@@ -3553,10 +4031,11 @@
35534031 radio.layout.doClick();
35544032
35554033 ClearUnpinned();
3556
- Grafreed.Assert(group != null);
3557
- Grafreed.Assert(group.selection != null);
3558
- SetPinStates(group.selection.size() > 0);
3559
- if (group.selection.size() == 1)
4034
+
4035
+ //Grafreed.Assert(group != null);
4036
+ //Grafreed.Assert(group.selection != null);
4037
+ SetPinStates(group.selection == null || group.selection.size() > 0);
4038
+ if (group.selection == null || group.selection.size() == 1)
35604039 EditSelection(false);
35614040 keepparent = group.parent;
35624041 // PARENT = NULL or not???
....@@ -3569,11 +4048,13 @@
35694048 } else if (event.getSource() == editCameraItem)
35704049 {
35714050 cameraView.ProtectCamera();
4051
+ cameraView.requestFocusInWindow();
35724052 cameraView.repaint();
35734053 return;
35744054 } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
35754055 {
35764056 cameraView.RevertCamera();
4057
+ cameraView.requestFocusInWindow();
35774058 cameraView.repaint();
35784059 return;
35794060 // } else if (event.getSource() == textureButton)
....@@ -4150,7 +4631,7 @@
41504631
41514632 try
41524633 {
4153
- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
4634
+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
41544635 }
41554636 catch (Exception e)
41564637 {
....@@ -4627,6 +5108,12 @@
46275108
46285109 void EditSelection(boolean newWindow)
46295110 {
5111
+ if (group.selection == null)
5112
+ {
5113
+ EditElement(group, newWindow); // ? new
5114
+ return;
5115
+ }
5116
+
46305117 // aConstraints.gridy = 0;
46315118 for (int i=0; i<group.selection.size(); i++)
46325119 {
....@@ -4637,12 +5124,7 @@
46375124 Object3D elem = (Object3D)group.selection.elementAt(i);
46385125 if(elem != group || !newWindow)
46395126 {
4640
- // if (!(elem instanceof Composite))
4641
- // newWindow = false;
4642
- listUI.add(elem);
4643
- elem.openEditWindow(this, newWindow); //, false);
4644
- System.out.println("edit : " + elem);
4645
- elem.editWindow.refreshContents(true); // ? new
5127
+ EditElement(elem, newWindow); // ? new
46465128 }
46475129 }
46485130 }
....@@ -4705,9 +5187,7 @@
47055187
47065188 freezemodel = false;
47075189 }
4708
-
4709
- boolean flashIt = true;
4710
-
5190
+
47115191 public void valueChanged(TreeSelectionEvent e)
47125192 //public boolean handleEvent(Event event)
47135193 {
....@@ -4780,13 +5260,15 @@
47805260 {
47815261 editButton.setEnabled(enabled);
47825262 uneditButton.setEnabled(enabled);
4783
- unselectButton.setEnabled(enabled);
5263
+ //unselectButton.setEnabled(enabled);
47845264 flashSelectionButton.setEnabled(enabled);
5265
+
5266
+ clearPanelButton.setEnabled(!listUI.isEmpty());
47855267 }
47865268
47875269 void refreshContents(boolean cp)
47885270 {
4789
- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
5271
+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
47905272 if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
47915273 {
47925274 objEditor.ClearInfo(); // .GetMaterial());
....@@ -5622,7 +6104,6 @@
56226104
56236105 cButton restoreCameraButton;
56246106
5625
- cButton saveButton;
56266107 cButton oneStepButton;
56276108
56286109 cButton groupButton;
....@@ -5631,6 +6112,22 @@
56316112 cButton switchButton;
56326113 cButton loopButton;
56336114 cButton textureButton;
6115
+
6116
+ cButton skybox1Button;
6117
+ cButton skybox2Button;
6118
+ cButton skybox3Button;
6119
+ cButton skybox4Button;
6120
+ cButton skybox5Button;
6121
+ cButton skybox6Button;
6122
+ cButton skybox7Button;
6123
+
6124
+ cButton skybox11Button;
6125
+ cButton skybox12Button;
6126
+ cButton skybox13Button;
6127
+ cButton skybox14Button;
6128
+ cButton skybox15Button;
6129
+ cButton skybox16Button;
6130
+ cButton skybox17Button;
56346131
56356132 cButton gridButton;
56366133 cButton boxButton;
....@@ -5695,7 +6192,7 @@
56956192 private MenuItem pasteLinkItem;
56966193 private MenuItem pasteCloneItem;
56976194 private MenuItem pasteExpandItem;
5698
- private MenuItem clearItem;
6195
+ private MenuItem deleteItem;
56996196 private MenuItem clearAllItem;
57006197 private MenuItem genUVItem;
57016198 private MenuItem genNormalsMESHItem;
....@@ -5779,6 +6276,8 @@
57796276 private MenuItem attachBumpItem;
57806277 private MenuItem detachBumpItem;
57816278 private MenuItem pigmentBumpItem;
6279
+ private MenuItem embedTexturesItem;
6280
+ private MenuItem deEmbedTexturesItem;
57826281
57836282 private MenuItem particleItem;
57846283 private MenuItem ragdollItem;