Normand Briere
2019-08-16 83d0c2fa0bd2e96448f776144e1a89cdb1bb6998
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,360 @@
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.equals("") ? "No background" : 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, String c, final String t, int count, cGridBag row)
46
+ {
47
+ cButton textureButton;
48
+ final String path = "textures/" + f + "/" + c + "/"; // + t;
49
+ row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
50
+ textureButton.setToolTipText(c + count);
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", "", 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
+ if (skybox.endsWith("/"))
334
+ {
335
+ group.skyboxname = null;
336
+ group.skyboxext = null;
337
+ cameraView.repaint();
338
+ }
339
+ else
340
+ {
341
+ //cameraView.envyoff = false;
342
+ group.skyboxname = skybox;
343
+ group.skyboxext = "jpg";
344
+ cameraView.repaint();
345
+ }
346
+ }
347
+
348
+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
349
+ {
350
+ JTabbedPane skyboxpane = new JTabbedPane();
351
+
352
+ AddSkyboxTab0(skyboxpane);
353
+ AddSkyboxTab1(skyboxpane);
354
+ AddSkyboxTab2(skyboxpane);
355
+ AddSkyboxTab3(skyboxpane);
356
+
357
+ skyboxPanel.add(skyboxpane);
358
+ }
359
+
360
+ public void ChangeTexture(String texture)
361
+ {
362
+ for (int i=0; i<group.selection.size(); i++)
363
+ {
364
+ Object3D obj = group.selection.get(i);
365
+ obj.SetPigmentTexture("@" + texture);
366
+ }
367
+
368
+ refreshContents();
369
+ }
370
+
371
+ public void Show3DView()
372
+ {
373
+ // bug
374
+ //gridPanel.setDividerLocation(1.0);
375
+ //bigPanel.setDividerLocation(0.0);
376
+ bigThree.ClearUI();
377
+ bigThree.add(centralPanel);
378
+ bigThree.FlushUI();
379
+ }
380
+
26381 //ObjEditor objEditor;
27382 public void closeUI2()
28383 {
....@@ -60,10 +415,14 @@
60415 this.copy = this.group = group;
61416 //selectees = this.group.selectees;
62417
63
- if (copy.versions == null)
418
+ assert(false);
419
+
420
+ if (copy.versionlist == null)
64421 {
65
- copy.versions = new byte[100][];
422
+ copy.versionlist = new Object3D[100];
66423 copy.versionindex = -1;
424
+
425
+ //Save(true);
67426 }
68427
69428 if(ui)
....@@ -80,18 +439,20 @@
80439 this.copy = this.group = copy;
81440 //selectees = this.group.selectees;
82441
83
- if (copy.versions == null)
84
- {
85
- copy.versions = new byte[100][];
86
- copy.versionindex = -1;
87
- }
88
-
89442 SetupMenu2(this); //objEditor);
90443 SetupUI2(objEditor);
91444 objEditor.SetupUI(true);
92445 SetupViews(objEditor);
93446
94447 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
448
+
449
+ if (copy.versionlist == null)
450
+ {
451
+ copy.versionlist = new Object3D[100];
452
+ copy.versionindex = -1;
453
+
454
+ //Save(true);
455
+ }
95456 }
96457
97458 void CloneSelection(boolean supports)
....@@ -181,33 +542,35 @@
181542 // menu.add("-");
182543 duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
183544 duplicateItem.addActionListener(this);
184
- cloneItem = menu.add(new MenuItem("Clone"));
545
+
546
+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
185547 cloneItem.addActionListener(this);
186
- if (Globals.ADVANCED)
548
+ //if (Globals.ADVANCED)
187549 {
188550 cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
189551 cloneSupportItem.addActionListener(this);
190552 }
553
+ oe.jTree.popup.addSeparator();
191554 menu.add("-");
192
- cutItem = menu.add(new MenuItem("Cut"));
555
+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
193556 cutItem.addActionListener(this);
194
- copyItem = menu.add(new MenuItem("Copy"));
557
+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
195558 copyItem.addActionListener(this);
196559 pasteItem = menu.add(new MenuItem("Paste"));
197560 pasteItem.addActionListener(this);
198561
199
- menu.add("-");
200
- pasteIntoItem = menu.add(new MenuItem("Paste into"));
562
+ oe.jTree.popup.addSeparator();
563
+ //menu.add("-");
564
+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
201565 pasteIntoItem.addActionListener(this);
202
- pasteLinkItem = menu.add(new MenuItem("Paste link"));
566
+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
203567 pasteLinkItem.addActionListener(this);
204
- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
568
+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
205569 pasteCloneItem.addActionListener(this);
206
-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
570
+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
207571 // pasteExpandItem.addActionListener(this);
208
- menu.add("-");
209
- clearItem = menu.add(new MenuItem("Clear"));
210
- clearItem.addActionListener(this);
572
+ //menu.add("-");
573
+ oe.jTree.popup.addSeparator();
211574
212575 if (Globals.ADVANCED)
213576 {
....@@ -293,11 +656,9 @@
293656 oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
294657 //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
295658 //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
296
- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
297659 oe.cameraMenu.add("-");
298660 openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
299661 openWindowItem.addActionListener(this);
300
- editLeafItem.addActionListener(this);
301662 lookAtItem.addActionListener(this);
302663 //lookFromItem.addActinoListener(this);
303664 //switchViewItem.addActionListener(this);
....@@ -344,9 +705,8 @@
344705 setMasterItem.addActionListener(this);
345706 }
346707
347
- oe.menuBar.add(menu = new Menu("Group"));
348
-// grabItem = menu.add(new MenuItem("Grab"));
349
-// grabItem.addActionListener(this);
708
+ oe.menuBar.add(menu = new Menu("Order"));
709
+
350710 backItem = menu.add(new MenuItem("Back"));
351711 backItem.addActionListener(this);
352712 frontItem = menu.add(new MenuItem("Front"));
....@@ -354,13 +714,21 @@
354714 // compositeItem = menu.add(new MenuItem("Composite"));
355715 // compositeItem.addActionListener(this);
356716
717
+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
718
+ grabItem.addActionListener(this);
719
+
357720 if (Globals.ADVANCED)
358721 {
359722 hideItem = menu.add(new MenuItem("Hidden Group"));
360723 hideItem.addActionListener(this);
361724 }
362
- ungroupItem = menu.add(new MenuItem("Ungroup"));
725
+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
363726 ungroupItem.addActionListener(this);
727
+
728
+ oe.jTree.popup.addSeparator();
729
+
730
+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
731
+ deleteItem.addActionListener(this);
364732
365733 // menu.add("-");
366734 //
....@@ -433,7 +801,7 @@
433801 genNormalsMESHItem.addActionListener(this);
434802 if (Globals.ADVANCED)
435803 {
436
- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
804
+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
437805 genNormalsMINEItem.addActionListener(this);
438806 }
439807 stripifyItem = menu.add(new MenuItem("Stripify"));
....@@ -526,10 +894,15 @@
526894 attachBumpItem.addActionListener(this);
527895 pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
528896 pigmentBumpItem.addActionListener(this);
897
+ //embedTexturesItem
529898 detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
530899 detachPigmentItem.addActionListener(this);
531900 detachBumpItem = menu.add(new MenuItem("Detach Bump"));
532901 detachBumpItem.addActionListener(this);
902
+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
903
+ embedTexturesItem.addActionListener(this);
904
+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
905
+ deEmbedTexturesItem.addActionListener(this);
533906 menu.add("-");
534907 sortbysizeItem = menu.add(new MenuItem("Sort by size"));
535908 sortbysizeItem.addActionListener(this);
....@@ -540,6 +913,9 @@
540913 shareGeometriesItem.addActionListener(this);
541914 mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
542915 mergeGeometriesItem.addActionListener(this);
916
+ menu.add("-");
917
+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
918
+ editLeafItem.addActionListener(this);
543919 if (Globals.ADVANCED)
544920 {
545921 // Pretty much the same as duplicate and clone.
....@@ -556,6 +932,74 @@
556932 buildToolsMenu(menu);
557933 }
558934
935
+ JTabbedPane resourcecontainer;
936
+ cGridBag currenttab;
937
+ //boolean added; // patch for jar
938
+
939
+ int tabcount = 0;
940
+ int colcount = 0;
941
+ int rowcount = 0;
942
+ int texturecount = 0;
943
+
944
+ int columns = 5;
945
+ int rows = 7;
946
+
947
+ public void ResourceCallBack(String[] path)
948
+ {
949
+// for (int i = 0; i < path.length; i++)
950
+// System.out.print(path[i] + "/");
951
+// System.out.println();
952
+
953
+ if (//rowcount == 0 ||
954
+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
955
+ {
956
+ currenttab = new cGridBag();
957
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
958
+ currenttab.setName(tabname);
959
+ //added = false;
960
+ resourcecontainer.add(currenttab);
961
+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
962
+ rowcount = 1;
963
+ colcount = 0;
964
+ texturecount = 0;
965
+ }
966
+
967
+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
968
+ {
969
+ //if (!added)
970
+ {
971
+ //added = true;
972
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
973
+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
974
+ }
975
+
976
+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
977
+
978
+ if (++colcount >= columns)
979
+ {
980
+ colcount = 0;
981
+ currenttab.Return();
982
+
983
+ if (rowcount++ >= rows)
984
+ {
985
+ rowcount = 0;
986
+ }
987
+ }
988
+ }
989
+ else
990
+ {
991
+// if (!path[path.length-1].equals("icons"))
992
+// resourcecontainer.Return();
993
+ }
994
+ }
995
+
996
+ void CreateTexturePanel(cGridBag container)
997
+ {
998
+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
999
+ container.add(resourcecontainer);
1000
+
1001
+ Grafreed.ParseResources("textures", this);
1002
+ }
5591003
5601004 void SetupUI2(ObjEditor oe)
5611005 {
....@@ -574,11 +1018,6 @@
5741018 //new Exception().printStackTrace();
5751019
5761020 oe.radioPanel = new JPanel(new GridBagLayout());
577
- oe.aConstraints.weightx = 1;
578
- oe.aConstraints.weighty = 0;
579
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
580
- oe.aConstraints.gridwidth = 100;
581
- oe.aConstraints.gridheight = 1;
5821021 // oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
5831022
5841023 oe.buttonGroup = new ButtonGroup();
....@@ -601,7 +1040,7 @@
6011040 */
6021041 cGridBag copyOptionsPanel = new cGridBag();
6031042
604
- copyOptionsPanel.preferredHeight = 1;
1043
+ copyOptionsPanel.preferredHeight = 2;
6051044
6061045 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
6071046
....@@ -611,10 +1050,49 @@
6111050
6121051 if (Globals.ADVANCED)
6131052 {
614
- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
615
- maxButton.setToolTipText("Maximize window");
616
- maxButton.addActionListener(this);
1053
+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1054
+// maxButton.setToolTipText("Maximize window");
1055
+// maxButton.addActionListener(this);
6171056 }
1057
+
1058
+ cButton gcButton;
1059
+
1060
+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1061
+// gcButton.setToolTipText("Garbage collect");
1062
+// gcButton.addActionListener(new ActionListener()
1063
+// {
1064
+// public void actionPerformed(ActionEvent e)
1065
+// {
1066
+// System.gc();
1067
+// }
1068
+// });
1069
+
1070
+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1071
+ collapseButton.setToolTipText("Collapse toolbar");
1072
+ collapseButton.addActionListener(this);
1073
+
1074
+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/empty.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1075
+ maximize3DButton.setToolTipText("Maximize 3D view");
1076
+ maximize3DButton.addActionListener(this);
1077
+
1078
+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1079
+ twoButton.setToolTipText("Show 3D view only");
1080
+ twoButton.addActionListener(this);
1081
+ this.fullscreenLayout = twoButton;
1082
+
1083
+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1084
+ threeButton.setToolTipText("Show controls and 3D view");
1085
+ threeButton.addActionListener(this);
1086
+ if (Globals.ADVANCED)
1087
+ {
1088
+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1089
+ sixButton.setToolTipText("Show 3D view and controls");
1090
+ sixButton.addActionListener(this);
1091
+ }
1092
+// oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1093
+// sevenButton.setToolTipText("3-column layout");
1094
+// sevenButton.addActionListener(this);
1095
+ //
6181096
6191097 oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
6201098 fullButton.setToolTipText("Full-screen window");
....@@ -628,41 +1106,46 @@
6281106 restoreCameraButton.setToolTipText("Restore viewpoint");
6291107 restoreCameraButton.addActionListener(this);
6301108
631
- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632
- saveButton.setToolTipText("New version");
633
- saveButton.addActionListener(this);
1109
+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1110
+ saveVersionButton.setToolTipText("Duplicate current version");
1111
+ saveVersionButton.addActionListener(this);
6341112
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);
1113
+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1114
+ deleteVersionButton.setToolTipText("Delete current version");
1115
+ deleteVersionButton.addActionListener(this);
1116
+ deleteVersionButton.setEnabled(false);
1117
+
1118
+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1119
+ previousVersionButton.setToolTipText("Previous version");
1120
+ previousVersionButton.addActionListener(this);
1121
+ previousVersionButton.setEnabled(false);
6391122
6401123 cGridBag updown = new cGridBag().setVertical(true);
6411124 updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
642
- restoreButton.setToolTipText("Restore current");
1125
+ restoreButton.setToolTipText("Undo (restore current version)");
6431126 restoreButton.addActionListener(this);
6441127 restoreButton.setEnabled(false);
6451128
6461129 updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
647
- replaceButton.setToolTipText("Replace current");
1130
+ replaceButton.setToolTipText("Save (replace current version)");
6481131 replaceButton.addActionListener(this);
6491132 replaceButton.setEnabled(false);
6501133
6511134 copyOptionsPanel.add(updown);
6521135
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);
1136
+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1137
+ nextVersionButton.setToolTipText("Next version");
1138
+ nextVersionButton.addActionListener(this);
1139
+ nextVersionButton.setEnabled(false);
1140
+
1141
+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1142
+ oneStepButton.setToolTipText("Animate one step forward");
1143
+ oneStepButton.addActionListener(this);
6571144
6581145 oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
6591146 liveCB.setToolTipText("Enable animation");
6601147 liveCB.addItemListener(this);
6611148
662
- oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
663
- oneStepButton.setToolTipText("Animate one step forward");
664
- oneStepButton.addActionListener(this);
665
-
6661149 oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
6671150 fastCB.setToolTipText("Fast mode");
6681151 fastCB.addItemListener(this);
....@@ -681,31 +1164,17 @@
6811164 oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
6821165 snapobjectButton.addActionListener(this);
6831166 snapobjectButton.setToolTipText("Snap Object");
1167
+
1168
+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1169
+ fourButton.addActionListener(this);
1170
+ fourButton.setToolTipText("Show control panel only");
6841171 }
6851172
6861173 //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
6871174
688
- oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
689
- twoButton.setToolTipText("Show center view only");
690
- twoButton.addActionListener(this);
691
- this.fullscreenLayout = twoButton;
692
-
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");
701
- threeButton.addActionListener(this);
702
- oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
703
- sevenButton.setToolTipText("3-column layout");
704
- sevenButton.addActionListener(this);
705
- //
7061175
707
- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
708
- rootButton.setToolTipText("Edit selection in new tab");
1176
+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1177
+ rootButton.setToolTipText("Open selection in new tab");
7091178 rootButton.addActionListener(this);
7101179
7111180 oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
....@@ -714,30 +1183,32 @@
7141183 //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
7151184 //clearButton.addActionListener(this);
7161185
1186
+ cGridBag row1 = new cGridBag();
1187
+
7171188 // INSERT
718
- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
719
- gridButton.setToolTipText("Create grid");
1189
+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1190
+ gridButton.setToolTipText("Create ground");
7201191 gridButton.addActionListener(this);
7211192
722
- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1193
+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7231194 boxButton.setToolTipText("Create box");
7241195 boxButton.addActionListener(this);
7251196
726
- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1197
+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1198
+ superButton.setToolTipText("Create superellipsoid");
1199
+ superButton.addActionListener(this);
1200
+
1201
+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7271202 sphereButton.setToolTipText("Create sphere");
7281203 sphereButton.addActionListener(this);
7291204
730
- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1205
+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7311206 coneButton.setToolTipText("Create cone");
7321207 coneButton.addActionListener(this);
7331208
734
- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1209
+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7351210 torusButton.setToolTipText("Create torus");
7361211 torusButton.addActionListener(this);
737
-
738
- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
739
- superButton.setToolTipText("Create superellipsoid");
740
- superButton.addActionListener(this);
7411212
7421213 if (Globals.ADVANCED)
7431214 {
....@@ -746,51 +1217,53 @@
7461217 kleinButton.addActionListener(this);
7471218 }
7481219
749
- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1220
+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7501221 particlesButton.setToolTipText("Create particle system");
7511222 particlesButton.addActionListener(this);
7521223
753
- oe.toolboxPanel.Return();
1224
+ oe.toolboxPanel.add(row1);
7541225
755
- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1226
+ cGridBag row2 = new cGridBag();
1227
+
1228
+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7561229 groupButton.setToolTipText("Create group");
7571230 groupButton.addActionListener(this);
7581231
759
- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1232
+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7601233 compositeButton.setToolTipText("Create composite");
7611234 compositeButton.addActionListener(this);
7621235
763
- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1236
+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7641237 switchButton.setToolTipText("Create item switcher");
7651238 switchButton.addActionListener(this);
7661239
767
- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1240
+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7681241 loopButton.setToolTipText("Create loop");
7691242 loopButton.addActionListener(this);
7701243
771
- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1244
+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7721245 textureButton.setToolTipText("Create texture");
7731246 textureButton.addActionListener(this);
7741247
775
- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1248
+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7761249 overlayButton.setToolTipText("Create overlay");
7771250 overlayButton.addActionListener(this);
7781251
779
- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1252
+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7801253 lightButton.setToolTipText("Create light");
7811254 lightButton.addActionListener(this);
7821255
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
- }
1256
+ oe.toolboxPanel.add(row2);
1257
+
1258
+ cGridBag textures = new cGridBag();
1259
+
1260
+ CreateTexturePanel(textures);
1261
+
1262
+ oe.toolboxPanel.add(textures);
1263
+
1264
+ textures.preferredHeight = 100;
1265
+
1266
+ CreateSkyboxPanel(oe.skyboxPanel);
7941267
7951268 // EDIT panel
7961269 editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
....@@ -798,20 +1271,20 @@
7981271 editButton.addActionListener(this);
7991272
8001273 editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
801
- uneditButton.setToolTipText("Remove selection controls");
1274
+ uneditButton.setToolTipText("Unpin and remove selection controls");
8021275 uneditButton.addActionListener(this);
8031276
8041277 editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
805
- allParamsButton.setToolTipText("Show all controle");
1278
+ allParamsButton.setToolTipText("Show all controls");
8061279 allParamsButton.addActionListener(this);
8071280
808
- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
809
- clearPanelButton.setToolTipText("Clear edit panel");
1281
+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1282
+ clearPanelButton.setToolTipText("Clear all controls");
8101283 clearPanelButton.addActionListener(this);
8111284
812
- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
813
- unselectButton.setToolTipText("Unselect");
814
- unselectButton.addActionListener(this);
1285
+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1286
+ //unselectButton.setToolTipText("Unselect");
1287
+ //unselectButton.addActionListener(this);
8151288
8161289 editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
8171290 flashSelectionButton.setToolTipText("Highlight selection");
....@@ -850,8 +1323,8 @@
8501323 versionSlider = (cNumberSlider)sliderPane.getComponent(1);
8511324 sliderPane.preferredHeight = 1;
8521325
853
-// mainPanel.setDividerLocation(0.5); //1.0);
854
-// mainPanel.setResizeWeight(0.5);
1326
+// mainPanel.setDividerLocation(0.1); //1.0);
1327
+ mainPanel.setResizeWeight(0.4);
8551328
8561329 //jList.addListSelectionListener(this);
8571330 oe.jTree.addTreeSelectionListener(this);
....@@ -859,7 +1332,7 @@
8591332 //jTree.setEditable(true);
8601333 oe.jTree.setDragEnabled(true);
8611334 //jTree.setPreferredSize(new Dimension(10,10));
862
- jSP.setPreferredSize(new Dimension(100,200));
1335
+ //jSP.setPreferredSize(new Dimension(100,200));
8631336
8641337 oe.jTree.setCellRenderer(new cTreeModel.Renderer());
8651338
....@@ -871,7 +1344,7 @@
8711344 dgr.addDragGestureListener(this);
8721345 }catch(Exception e) {}
8731346 */
874
- radio.layout = sevenButton;
1347
+ radio.layout = threeButton; // sixButton;
8751348 oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
8761349 }
8771350
....@@ -922,9 +1395,12 @@
9221395 smoothCB.setToolTipText("Snapping delay");
9231396 smoothCB.addItemListener(this);
9241397
925
- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
926
- slowCB.setToolTipText("Smooth interpolation");
927
- slowCB.addItemListener(this);
1398
+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1399
+// slowCB.setToolTipText("Smooth interpolation");
1400
+// slowCB.addItemListener(this);
1401
+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
1402
+ minshaderCB.setToolTipText("Minimal fast shader");
1403
+ minshaderCB.addItemListener(this);
9281404
9291405 // constraints.gridy += 1;
9301406 // panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
....@@ -1003,6 +1479,14 @@
10031479
10041480 void EditObject(Object3D obj)
10051481 {
1482
+ assert(obj instanceof Composite);
1483
+
1484
+// if (obj.versionlist == null)
1485
+// {
1486
+// obj.versionlist = new Object3D[100];
1487
+// obj.versionindex = -1;
1488
+// }
1489
+
10061490 cRadio radioButton = new cRadio(obj.name);
10071491
10081492 // June 2019. Patch to avoid bug with transparency.
....@@ -1013,7 +1497,7 @@
10131497 }
10141498
10151499 radioButton.SetObject(obj);
1016
- radioButton.layout = sevenButton;
1500
+ radioButton.layout = threeButton; // sixButton;
10171501 radioButton.SetCamera(cameraView.renderCamera, false);
10181502 radioButton.addActionListener(this);
10191503 radioPanel.add(radioButton);
....@@ -1027,6 +1511,7 @@
10271511
10281512 oe.SetupViews();
10291513
1514
+ if (Globals.DEBUG)
10301515 System.out.println("SetupViews");
10311516 DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
10321517 oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
....@@ -1038,6 +1523,8 @@
10381523 cCheckBox localCB;
10391524 cCheckBox crowdCB;
10401525 cCheckBox smoothCB;
1526
+ cCheckBox minshaderCB;
1527
+
10411528 cToggleButton fastCB;
10421529 cCheckBox slowCB;
10431530 cCheckBox boxCB;
....@@ -1108,6 +1595,12 @@
11081595 {
11091596 cameraView.ToggleInertia();
11101597 cameraView.repaint();
1598
+ }
1599
+ else if(e.getSource() == minshaderCB)
1600
+ {
1601
+ Globals.MINSHADER ^= true;
1602
+ cameraView.programInitialized = false;
1603
+ cameraView.repaint();
11111604 }
11121605 else if(e.getSource() == localCB)
11131606 {
....@@ -1385,7 +1878,12 @@
13851878 TreePath path;
13861879
13871880 public TransferableTreePath(TreePath tp) {
1388
- path = tp;
1881
+ Object[] objs = new Object[tp.getPathCount()];
1882
+ for (int i=0; i<objs.length; i++)
1883
+ {
1884
+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
1885
+ }
1886
+ path = new TreePath(objs);
13891887 }
13901888
13911889 public synchronized DataFlavor[] getTransferDataFlavors() {
....@@ -1675,7 +2173,11 @@
16752173 shadow.material = new cMaterial(obj.material);
16762174 shadow.material.diffuse = 0.0001f;
16772175 shadow.material.specular = 0.0001f;
1678
- //shadow.projectedVertices[1].x = 300;
2176
+ shadow.material.opacity = 0.75f;
2177
+
2178
+ AllocProjectedVertices(shadow);
2179
+
2180
+ shadow.projectedVertices[1].x = 300;
16792181
16802182 makeSomething(shadow);
16812183 }
....@@ -1692,6 +2194,16 @@
16922194 listUI.remove(i);
16932195 }
16942196 }
2197
+ }
2198
+
2199
+ private void EditElement(Object3D elem, boolean newWindow)
2200
+ {
2201
+ // if (!(elem instanceof Composite))
2202
+ // newWindow = false;
2203
+ listUI.add(elem);
2204
+ elem.openEditWindow(this, newWindow); //, false);
2205
+ System.out.println("edit : " + elem);
2206
+ elem.editWindow.refreshContents(true); // ? new
16952207 }
16962208
16972209 /**
....@@ -2121,6 +2633,23 @@
21212633 {
21222634 makeSomething(new Light());
21232635 } else
2636
+// if (source == skybox1Button ||
2637
+// source == skybox2Button ||
2638
+// source == skybox3Button ||
2639
+// source == skybox4Button ||
2640
+// source == skybox5Button ||
2641
+// source == skybox6Button ||
2642
+// source == skybox7Button ||
2643
+// source == skybox11Button ||
2644
+// source == skybox12Button ||
2645
+// source == skybox13Button ||
2646
+// source == skybox14Button ||
2647
+// source == skybox15Button ||
2648
+// source == skybox16Button ||
2649
+// source == skybox17Button)
2650
+// {
2651
+// ChangeSkybox(source);
2652
+// } else
21242653 if (source == csgItem)
21252654 {
21262655 group(new CSG());
....@@ -2169,27 +2698,35 @@
21692698 } else
21702699 if (source == loopItem || source == loopButton)
21712700 {
2701
+ if (!group.selection.isEmpty())
2702
+ {
21722703 Composite csg = new GroupLeaf();
21732704 csg.count = 5;
2174
- group(csg);
21752705 Composite child = new cGroup("Branch");
21762706 csg.addChild(child);
21772707 child.addChild(csg);
2708
+ group(csg);
2709
+ }
21782710 } else
21792711 if (source == doubleItem)
21802712 {
2713
+ if (!group.selection.isEmpty())
2714
+ {
21812715 Composite csg = new GroupLeaf("Fork");
21822716 csg.count = 5;
2183
- group(csg);
21842717 Composite child = new cGroup("Branch A");
21852718 csg.addChild(child);
21862719 child.addChild(csg);
21872720 child = new cGroup("Branch B");
21882721 csg.addChild(child);
21892722 child.addChild(csg);
2723
+ group(csg);
2724
+ }
21902725 } else
21912726 if (source == tripleItem)
21922727 {
2728
+ if (!group.selection.isEmpty())
2729
+ {
21932730 Composite csg = new GroupLeaf("Trident");
21942731 csg.count = 4;
21952732 group(csg);
....@@ -2202,11 +2739,12 @@
22022739 child = new cGroup();
22032740 csg.addChild(child);
22042741 child.addChild(csg);
2742
+ }
22052743 } else
22062744 if (source == computeAOItem)
22072745 {
22082746 Globals.drawMode = CameraPane.OCCLUSION;
2209
- Globals.theRenderer.repaint();
2747
+ cameraView.repaint();
22102748 } else
22112749 if (source == recompileItem)
22122750 {
....@@ -2221,7 +2759,7 @@
22212759 if (source == invariantsItem)
22222760 {
22232761 System.out.println("Invariants:");
2224
- Grafreed.grafreeD.universe.invariants();
2762
+ Grafreed.grafreed.universe.invariants();
22252763 } else
22262764 if (source == memoryItem)
22272765 {
....@@ -2252,33 +2790,52 @@
22522790 {
22532791 ToggleFullScreen();
22542792 } else
2255
- if (source == undoButton)
2793
+ if (source == collapseButton)
2794
+ {
2795
+ this.expandedLayout = radio.layout;
2796
+ CollapseToolbar();
2797
+ } else
2798
+ if (source == maximize3DButton)
2799
+ {
2800
+ this.expandedLayout = radio.layout;
2801
+ radio.layout = twoButton;
2802
+ Show3DView();
2803
+ CollapseToolbar();
2804
+ } else
2805
+ if (source == previousVersionButton)
22562806 {
22572807 // Go to previous version
22582808 //if (!Undo())
22592809 //java.awt.Toolkit.getDefaultToolkit().beep();
2260
- Undo();
2810
+ PreviousVersion();
22612811 } else
22622812 if (source == restoreButton)
22632813 {
22642814 // Restore current version
22652815 Restore();
2816
+ //restoreButton.setEnabled(false);
22662817 } else
22672818 if (source == replaceButton)
22682819 {
22692820 // Overwrite current version
22702821 Replace();
2822
+ //replaceButton.setEnabled(false);
22712823 } else
2272
- if (source == redoButton)
2824
+ if (source == nextVersionButton)
22732825 {
22742826 // Go to next version
2275
- Redo();
2827
+ NextVersion();
22762828 } else
2277
- if (source == saveButton)
2829
+ if (source == saveVersionButton)
22782830 {
22792831 // Save a new version
22802832 if (!Save(true))
22812833 java.awt.Toolkit.getDefaultToolkit().beep();
2834
+ } else
2835
+ if (source == deleteVersionButton)
2836
+ {
2837
+ // Delete a new version
2838
+ DeleteVersion();
22822839 } else
22832840 if (source == oneStepButton)
22842841 {
....@@ -2333,11 +2890,11 @@
23332890 } else
23342891 if (source == undoItem)
23352892 {
2336
- Undo();
2893
+ PreviousVersion();
23372894 } else
23382895 if (source == redoItem)
23392896 {
2340
- Redo();
2897
+ NextVersion();
23412898 } else
23422899 if (source == duplicateItem)
23432900 {
....@@ -2658,7 +3215,7 @@
26583215 {
26593216 StepAll();
26603217 } else
2661
- if (source == clearItem) // || event.getSource() == clearButton)
3218
+ if (source == deleteItem) // || event.getSource() == clearButton)
26623219 {
26633220 //int indices[] = jList.getSelectedIndices();
26643221 //for (int i = indices.length - 1; i >= 0; i--)
....@@ -2818,22 +3375,34 @@
28183375 } else
28193376 if (source == ungroupItem || source == ungroupButton)
28203377 {
2821
- boolean hasRoot = false;
3378
+ boolean canUngroup = true;
28223379
28233380 for (int i=0; i<group.selection.size(); i++)
28243381 {
2825
- if (group.selection.get(i) == group)
3382
+ Object3D selectedItem = group.selection.get(i);
3383
+
3384
+ if (selectedItem.Size() == 0)
28263385 {
2827
- hasRoot = true;
3386
+ // Cannot ungroup leaves
3387
+ canUngroup = false;
3388
+ break;
3389
+ }
3390
+
3391
+ if (selectedItem == group)
3392
+ {
3393
+ // Cannot ungroup root
3394
+ canUngroup = false;
28283395 break;
28293396 }
28303397 }
28313398
2832
- if (!hasRoot)
3399
+ if (canUngroup)
28333400 {
28343401 for (int i=0; i<group.selection.size(); i++)
28353402 {
2836
- Ungroup(group.selection.get(i));
3403
+ Object3D selectedItem = group.selection.get(i);
3404
+
3405
+ Ungroup(selectedItem);
28373406 }
28383407
28393408 ClearSelection(false);
....@@ -3140,7 +3709,7 @@
31403709 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
31413710 {
31423711 obj = (Object3D)e.nextElement();
3143
- obj.SetBumpTexture(null);
3712
+ obj.ResetBumpTexture();
31443713 }
31453714
31463715 refreshContents();
....@@ -3154,6 +3723,31 @@
31543723 obj.SetBumpTexture(obj.GetPigmentTexture());
31553724 }
31563725
3726
+ refreshContents();
3727
+ } else
3728
+ if (source == embedTexturesItem)
3729
+ {
3730
+ Object3D obj;
3731
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3732
+ {
3733
+ obj = (Object3D)e.nextElement();
3734
+ obj.EmbedTextures(true);
3735
+ }
3736
+
3737
+ refreshContents();
3738
+ } else
3739
+ if (source == deEmbedTexturesItem)
3740
+ {
3741
+ Object3D obj;
3742
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3743
+ {
3744
+ obj = (Object3D)e.nextElement();
3745
+ obj.EmbedTextures(false);
3746
+ }
3747
+
3748
+ CameraPane.texturepigment.clear();
3749
+ CameraPane.texturebump.clear();
3750
+
31573751 refreshContents();
31583752 } else
31593753 if (source == flashSelectionButton)
....@@ -3171,38 +3765,7 @@
31713765 if (CameraPane.FULLSCREEN)
31723766 fullscreenLayout = radio.layout;
31733767
3174
- // bug
3175
- //gridPanel.setDividerLocation(1.0);
3176
- //bigPanel.setDividerLocation(0.0);
3177
-// bigThree.remove(scenePanel);
3178
-// bigThree.remove(centralPanel);
3179
-// bigThree.remove(XYZPanel);
3180
-// aWindowConstraints.gridx = 0;
3181
-// aWindowConstraints.gridy = 0;
3182
-// aWindowConstraints.gridwidth = 1;
3183
-// // aConstraints.gridheight = 3;
3184
-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3185
-// aWindowConstraints.weightx = 0;
3186
-// aWindowConstraints.weighty = 1;
3187
-// //bigThree.add(jtp, aWindowConstraints);
3188
-// aWindowConstraints.weightx = 1;
3189
-// aWindowConstraints.gridwidth = 3;
3190
-// // aConstraints.gridheight = 3;
3191
-// aWindowConstraints.gridx = 1;
3192
-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3193
-// bigThree.add(centralPanel, aWindowConstraints);
3194
-// aWindowConstraints.weightx = 0;
3195
-// aWindowConstraints.gridx = 4;
3196
-// aWindowConstraints.gridwidth = 1;
3197
-// // aConstraints.gridheight = 3;
3198
-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3199
-// //bigThree.add(XYZPanel, aWindowConstraints);
3200
-// scenePanel.setVisible(false);
3201
-// centralPanel.setVisible(true);
3202
-// XYZPanel.setVisible(false);
3203
- bigThree.ClearUI();
3204
- bigThree.add(centralPanel);
3205
- bigThree.FlushUI();
3768
+ Show3DView();
32063769
32073770 cameraView.requestFocusInWindow();
32083771
....@@ -3257,8 +3820,8 @@
32573820 // centralPanel.setVisible(true);
32583821 // XYZPanel.setVisible(true);
32593822 bigThree.ClearUI();
3823
+ bigThree.add(scenePanel);
32603824 bigThree.add(centralPanel);
3261
- bigThree.add(XYZPanel);
32623825 bigThree.FlushUI();
32633826
32643827 cameraView.requestFocusInWindow();
....@@ -3338,8 +3901,8 @@
33383901 // centralPanel.setVisible(true);
33393902 // XYZPanel.setVisible(false);
33403903 bigThree.ClearUI();
3341
- bigThree.add(scenePanel);
33423904 bigThree.add(centralPanel);
3905
+ bigThree.add(scenePanel);
33433906 bigThree.FlushUI();
33443907
33453908 cameraView.requestFocusInWindow();
....@@ -3388,6 +3951,7 @@
33883951 } else
33893952 if (source == rootButton)
33903953 {
3954
+ Replace();
33913955 Object3D obj;
33923956 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
33933957 {
....@@ -3445,10 +4009,10 @@
34454009 {
34464010 Object3D child = (Object3D)e.nextElement();
34474011 if(child.editWindow != null)
3448
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
34494012 child.pinned = false;
34504013 child.CloseUI();
34514014 listUI.remove(child);
4015
+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
34524016
34534017 //child.editWindow = null; // ???????????
34544018 }
....@@ -3467,6 +4031,7 @@
34674031 obj.CloseUI();
34684032 }
34694033 listUI.clear();
4034
+ SetPinStates(group.selection.size() > 0);
34704035 refreshContents(true);
34714036 } else
34724037 if (source == allParamsButton)
....@@ -3523,8 +4088,6 @@
35234088
35244089 copy = group;
35254090
3526
- SetUndoStates();
3527
-
35284091 //Globals.theRenderer.object = group;
35294092 if(!useclient)
35304093 {
....@@ -3552,11 +4115,27 @@
35524115 */
35534116 radio.layout.doClick();
35544117
4118
+ assert(copy instanceof Composite);
4119
+
4120
+ if (copy.versionlist == null)
4121
+ {
4122
+ copy.versionlist = new Object3D[100];
4123
+ copy.versionindex = -1;
4124
+
4125
+ // Cannot work with loops
4126
+ // To fix this issue, first mark all nodes above the root,
4127
+ // and check if any of these nodes are reachable below the root.
4128
+ //Save(true);
4129
+ }
4130
+
4131
+ SetVersionStates();
4132
+
35554133 ClearUnpinned();
3556
- Grafreed.Assert(group != null);
3557
- Grafreed.Assert(group.selection != null);
3558
- SetPinStates(group.selection.size() > 0);
3559
- if (group.selection.size() == 1)
4134
+
4135
+ //Grafreed.Assert(group != null);
4136
+ //Grafreed.Assert(group.selection != null);
4137
+ SetPinStates(group.selection == null || group.selection.size() > 0);
4138
+ if (group.selection == null || group.selection.size() == 1)
35604139 EditSelection(false);
35614140 keepparent = group.parent;
35624141 // PARENT = NULL or not???
....@@ -3569,11 +4148,13 @@
35694148 } else if (event.getSource() == editCameraItem)
35704149 {
35714150 cameraView.ProtectCamera();
4151
+ cameraView.requestFocusInWindow();
35724152 cameraView.repaint();
35734153 return;
35744154 } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
35754155 {
35764156 cameraView.RevertCamera();
4157
+ cameraView.requestFocusInWindow();
35774158 cameraView.repaint();
35784159 return;
35794160 // } else if (event.getSource() == textureButton)
....@@ -4150,7 +4731,7 @@
41504731
41514732 try
41524733 {
4153
- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
4734
+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
41544735 }
41554736 catch (Exception e)
41564737 {
....@@ -4627,6 +5208,12 @@
46275208
46285209 void EditSelection(boolean newWindow)
46295210 {
5211
+ if (group.selection == null)
5212
+ {
5213
+ EditElement(group, newWindow); // ? new
5214
+ return;
5215
+ }
5216
+
46305217 // aConstraints.gridy = 0;
46315218 for (int i=0; i<group.selection.size(); i++)
46325219 {
....@@ -4637,12 +5224,7 @@
46375224 Object3D elem = (Object3D)group.selection.elementAt(i);
46385225 if(elem != group || !newWindow)
46395226 {
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
5227
+ EditElement(elem, newWindow); // ? new
46465228 }
46475229 }
46485230 }
....@@ -4705,9 +5287,7 @@
47055287
47065288 freezemodel = false;
47075289 }
4708
-
4709
- boolean flashIt = true;
4710
-
5290
+
47115291 public void valueChanged(TreeSelectionEvent e)
47125292 //public boolean handleEvent(Event event)
47135293 {
....@@ -4780,13 +5360,30 @@
47805360 {
47815361 editButton.setEnabled(enabled);
47825362 uneditButton.setEnabled(enabled);
4783
- unselectButton.setEnabled(enabled);
5363
+ //unselectButton.setEnabled(enabled);
47845364 flashSelectionButton.setEnabled(enabled);
5365
+
5366
+ clearPanelButton.setEnabled(!listUI.isEmpty());
5367
+
5368
+ boolean allComposites = true;
5369
+
5370
+ if (group.selection != null)
5371
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5372
+ {
5373
+ Object next = e.nextElement();
5374
+ if (!(next instanceof Composite)) // || (next instanceof GroupLeaf))
5375
+ {
5376
+ allComposites = false;
5377
+ break;
5378
+ }
5379
+ }
5380
+
5381
+ rootButton.setEnabled(allComposites);
47855382 }
47865383
47875384 void refreshContents(boolean cp)
47885385 {
4789
- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
5386
+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
47905387 if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
47915388 {
47925389 objEditor.ClearInfo(); // .GetMaterial());
....@@ -4796,7 +5393,7 @@
47965393 Object3D child = (Object3D) group.selection.get(i);
47975394
47985395 objEditor.AddInfo(child, this, true);
4799
- System.err.println("info : " + child.GetPath());
5396
+// System.err.println("info : " + child.GetPath());
48005397 }
48015398
48025399 objEditor.SetText(); // jan 2014
....@@ -5622,7 +6219,6 @@
56226219
56236220 cButton restoreCameraButton;
56246221
5625
- cButton saveButton;
56266222 cButton oneStepButton;
56276223
56286224 cButton groupButton;
....@@ -5631,6 +6227,22 @@
56316227 cButton switchButton;
56326228 cButton loopButton;
56336229 cButton textureButton;
6230
+
6231
+ cButton skybox1Button;
6232
+ cButton skybox2Button;
6233
+ cButton skybox3Button;
6234
+ cButton skybox4Button;
6235
+ cButton skybox5Button;
6236
+ cButton skybox6Button;
6237
+ cButton skybox7Button;
6238
+
6239
+ cButton skybox11Button;
6240
+ cButton skybox12Button;
6241
+ cButton skybox13Button;
6242
+ cButton skybox14Button;
6243
+ cButton skybox15Button;
6244
+ cButton skybox16Button;
6245
+ cButton skybox17Button;
56346246
56356247 cButton gridButton;
56366248 cButton boxButton;
....@@ -5664,11 +6276,11 @@
56646276 private MenuItem lookAtItem;
56656277 private MenuItem lookFromItem;
56666278 private MenuItem switchViewItem;
5667
- private MenuItem cutItem;
6279
+ private JMenuItem cutItem;
56686280 private MenuItem undoItem;
56696281 private MenuItem redoItem;
56706282 private JMenuItem duplicateItem;
5671
- private MenuItem cloneItem;
6283
+ private JMenuItem cloneItem;
56726284 private MenuItem cloneSupportItem;
56736285 private MenuItem overwriteGeoItem;
56746286 private MenuItem overwriteMatItem;
....@@ -5689,13 +6301,13 @@
56896301 private MenuItem cloneGeometriesItem;
56906302 private MenuItem shareGeometriesItem;
56916303 private MenuItem mergeGeometriesItem;
5692
- private MenuItem copyItem;
6304
+ private JMenuItem copyItem;
56936305 private MenuItem pasteItem;
5694
- private MenuItem pasteIntoItem;
5695
- private MenuItem pasteLinkItem;
5696
- private MenuItem pasteCloneItem;
5697
- private MenuItem pasteExpandItem;
5698
- private MenuItem clearItem;
6306
+ private JMenuItem pasteIntoItem;
6307
+ private JMenuItem pasteLinkItem;
6308
+ private JMenuItem pasteCloneItem;
6309
+ private JMenuItem pasteExpandItem;
6310
+ private JMenuItem deleteItem;
56996311 private MenuItem clearAllItem;
57006312 private MenuItem genUVItem;
57016313 private MenuItem genNormalsMESHItem;
....@@ -5750,7 +6362,7 @@
57506362 private MenuItem transformGeometryItem;
57516363 private MenuItem transformChildrenItem;
57526364 private MenuItem hideItem;
5753
- private MenuItem grabItem;
6365
+ private JMenuItem grabItem;
57546366 private MenuItem backItem;
57556367 private MenuItem frontItem;
57566368 private MenuItem cameraItem;
....@@ -5763,7 +6375,7 @@
57636375 private MenuItem switchTransfoItem;
57646376 private MenuItem morphItem;
57656377 private MenuItem linkerItem;
5766
- private MenuItem ungroupItem;
6378
+ private JMenuItem ungroupItem;
57676379 private MenuItem editItem;
57686380 private MenuItem openWindowItem;
57696381 private MenuItem editLeafItem;
....@@ -5779,6 +6391,8 @@
57796391 private MenuItem attachBumpItem;
57806392 private MenuItem detachBumpItem;
57816393 private MenuItem pigmentBumpItem;
6394
+ private MenuItem embedTexturesItem;
6395
+ private MenuItem deEmbedTexturesItem;
57826396
57836397 private MenuItem particleItem;
57846398 private MenuItem ragdollItem;