Normand Briere
2019-08-16 64e20f390e4b8e58bd0006dde8fa10fba1dac1d5
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,12 @@
60415 this.copy = this.group = group;
61416 //selectees = this.group.selectees;
62417
63
- if (copy.versions == null)
418
+ if (copy.versionlist == null)
64419 {
65
- copy.versions = new byte[100][];
420
+ copy.versionlist = new Object3D[100];
66421 copy.versionindex = -1;
422
+
423
+ Save(true);
67424 }
68425
69426 if(ui)
....@@ -80,18 +437,20 @@
80437 this.copy = this.group = copy;
81438 //selectees = this.group.selectees;
82439
83
- if (copy.versions == null)
84
- {
85
- copy.versions = new byte[100][];
86
- copy.versionindex = -1;
87
- }
88
-
89440 SetupMenu2(this); //objEditor);
90441 SetupUI2(objEditor);
91442 objEditor.SetupUI(true);
92443 SetupViews(objEditor);
93444
94445 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
446
+
447
+ if (copy.versionlist == null)
448
+ {
449
+ copy.versionlist = new Object3D[100];
450
+ copy.versionindex = -1;
451
+
452
+ Save(true);
453
+ }
95454 }
96455
97456 void CloneSelection(boolean supports)
....@@ -181,33 +540,35 @@
181540 // menu.add("-");
182541 duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
183542 duplicateItem.addActionListener(this);
184
- cloneItem = menu.add(new MenuItem("Clone"));
543
+
544
+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
185545 cloneItem.addActionListener(this);
186
- if (Globals.ADVANCED)
546
+ //if (Globals.ADVANCED)
187547 {
188548 cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
189549 cloneSupportItem.addActionListener(this);
190550 }
551
+ oe.jTree.popup.addSeparator();
191552 menu.add("-");
192
- cutItem = menu.add(new MenuItem("Cut"));
553
+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
193554 cutItem.addActionListener(this);
194
- copyItem = menu.add(new MenuItem("Copy"));
555
+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
195556 copyItem.addActionListener(this);
196557 pasteItem = menu.add(new MenuItem("Paste"));
197558 pasteItem.addActionListener(this);
198559
199
- menu.add("-");
200
- pasteIntoItem = menu.add(new MenuItem("Paste into"));
560
+ oe.jTree.popup.addSeparator();
561
+ //menu.add("-");
562
+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
201563 pasteIntoItem.addActionListener(this);
202
- pasteLinkItem = menu.add(new MenuItem("Paste link"));
564
+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
203565 pasteLinkItem.addActionListener(this);
204
- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
566
+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
205567 pasteCloneItem.addActionListener(this);
206
-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
568
+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
207569 // pasteExpandItem.addActionListener(this);
208
- menu.add("-");
209
- deleteItem = menu.add(new MenuItem("Delete"));
210
- deleteItem.addActionListener(this);
570
+ //menu.add("-");
571
+ oe.jTree.popup.addSeparator();
211572
212573 if (Globals.ADVANCED)
213574 {
....@@ -293,11 +654,9 @@
293654 oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
294655 //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
295656 //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
296
- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
297657 oe.cameraMenu.add("-");
298658 openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
299659 openWindowItem.addActionListener(this);
300
- editLeafItem.addActionListener(this);
301660 lookAtItem.addActionListener(this);
302661 //lookFromItem.addActinoListener(this);
303662 //switchViewItem.addActionListener(this);
....@@ -344,9 +703,8 @@
344703 setMasterItem.addActionListener(this);
345704 }
346705
347
- oe.menuBar.add(menu = new Menu("Group"));
348
-// grabItem = menu.add(new MenuItem("Grab"));
349
-// grabItem.addActionListener(this);
706
+ oe.menuBar.add(menu = new Menu("Order"));
707
+
350708 backItem = menu.add(new MenuItem("Back"));
351709 backItem.addActionListener(this);
352710 frontItem = menu.add(new MenuItem("Front"));
....@@ -354,13 +712,21 @@
354712 // compositeItem = menu.add(new MenuItem("Composite"));
355713 // compositeItem.addActionListener(this);
356714
715
+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
716
+ grabItem.addActionListener(this);
717
+
357718 if (Globals.ADVANCED)
358719 {
359720 hideItem = menu.add(new MenuItem("Hidden Group"));
360721 hideItem.addActionListener(this);
361722 }
362
- ungroupItem = menu.add(new MenuItem("Ungroup"));
723
+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
363724 ungroupItem.addActionListener(this);
725
+
726
+ oe.jTree.popup.addSeparator();
727
+
728
+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
729
+ deleteItem.addActionListener(this);
364730
365731 // menu.add("-");
366732 //
....@@ -526,10 +892,15 @@
526892 attachBumpItem.addActionListener(this);
527893 pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
528894 pigmentBumpItem.addActionListener(this);
895
+ //embedTexturesItem
529896 detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
530897 detachPigmentItem.addActionListener(this);
531898 detachBumpItem = menu.add(new MenuItem("Detach Bump"));
532899 detachBumpItem.addActionListener(this);
900
+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
901
+ embedTexturesItem.addActionListener(this);
902
+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
903
+ deEmbedTexturesItem.addActionListener(this);
533904 menu.add("-");
534905 sortbysizeItem = menu.add(new MenuItem("Sort by size"));
535906 sortbysizeItem.addActionListener(this);
....@@ -540,6 +911,9 @@
540911 shareGeometriesItem.addActionListener(this);
541912 mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
542913 mergeGeometriesItem.addActionListener(this);
914
+ menu.add("-");
915
+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
916
+ editLeafItem.addActionListener(this);
543917 if (Globals.ADVANCED)
544918 {
545919 // Pretty much the same as duplicate and clone.
....@@ -556,6 +930,74 @@
556930 buildToolsMenu(menu);
557931 }
558932
933
+ JTabbedPane resourcecontainer;
934
+ cGridBag currenttab;
935
+ //boolean added; // patch for jar
936
+
937
+ int tabcount = 0;
938
+ int colcount = 0;
939
+ int rowcount = 0;
940
+ int texturecount = 0;
941
+
942
+ int columns = 5;
943
+ int rows = 7;
944
+
945
+ public void ResourceCallBack(String[] path)
946
+ {
947
+// for (int i = 0; i < path.length; i++)
948
+// System.out.print(path[i] + "/");
949
+// System.out.println();
950
+
951
+ if (//rowcount == 0 ||
952
+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
953
+ {
954
+ currenttab = new cGridBag();
955
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
956
+ currenttab.setName(tabname);
957
+ //added = false;
958
+ resourcecontainer.add(currenttab);
959
+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
960
+ rowcount = 1;
961
+ colcount = 0;
962
+ texturecount = 0;
963
+ }
964
+
965
+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
966
+ {
967
+ //if (!added)
968
+ {
969
+ //added = true;
970
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
971
+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
972
+ }
973
+
974
+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
975
+
976
+ if (++colcount >= columns)
977
+ {
978
+ colcount = 0;
979
+ currenttab.Return();
980
+
981
+ if (rowcount++ >= rows)
982
+ {
983
+ rowcount = 0;
984
+ }
985
+ }
986
+ }
987
+ else
988
+ {
989
+// if (!path[path.length-1].equals("icons"))
990
+// resourcecontainer.Return();
991
+ }
992
+ }
993
+
994
+ void CreateTexturePanel(cGridBag container)
995
+ {
996
+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
997
+ container.add(resourcecontainer);
998
+
999
+ Grafreed.ParseResources("textures", this);
1000
+ }
5591001
5601002 void SetupUI2(ObjEditor oe)
5611003 {
....@@ -574,11 +1016,6 @@
5741016 //new Exception().printStackTrace();
5751017
5761018 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;
5821019 // oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
5831020
5841021 oe.buttonGroup = new ButtonGroup();
....@@ -601,7 +1038,7 @@
6011038 */
6021039 cGridBag copyOptionsPanel = new cGridBag();
6031040
604
- copyOptionsPanel.preferredHeight = 1;
1041
+ copyOptionsPanel.preferredHeight = 2;
6051042
6061043 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
6071044
....@@ -611,10 +1048,49 @@
6111048
6121049 if (Globals.ADVANCED)
6131050 {
614
- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
615
- maxButton.setToolTipText("Maximize window");
616
- maxButton.addActionListener(this);
1051
+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1052
+// maxButton.setToolTipText("Maximize window");
1053
+// maxButton.addActionListener(this);
6171054 }
1055
+
1056
+ cButton gcButton;
1057
+
1058
+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1059
+// gcButton.setToolTipText("Garbage collect");
1060
+// gcButton.addActionListener(new ActionListener()
1061
+// {
1062
+// public void actionPerformed(ActionEvent e)
1063
+// {
1064
+// System.gc();
1065
+// }
1066
+// });
1067
+
1068
+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1069
+ collapseButton.setToolTipText("Collapse toolbar");
1070
+ collapseButton.addActionListener(this);
1071
+
1072
+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/empty.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1073
+ maximize3DButton.setToolTipText("Maximize 3D view");
1074
+ maximize3DButton.addActionListener(this);
1075
+
1076
+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1077
+ twoButton.setToolTipText("Show 3D view only");
1078
+ twoButton.addActionListener(this);
1079
+ this.fullscreenLayout = twoButton;
1080
+
1081
+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1082
+ threeButton.setToolTipText("Show controls and 3D view");
1083
+ threeButton.addActionListener(this);
1084
+ if (Globals.ADVANCED)
1085
+ {
1086
+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1087
+ sixButton.setToolTipText("Show 3D view and controls");
1088
+ sixButton.addActionListener(this);
1089
+ }
1090
+// oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1091
+// sevenButton.setToolTipText("3-column layout");
1092
+// sevenButton.addActionListener(this);
1093
+ //
6181094
6191095 oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
6201096 fullButton.setToolTipText("Full-screen window");
....@@ -628,41 +1104,45 @@
6281104 restoreCameraButton.setToolTipText("Restore viewpoint");
6291105 restoreCameraButton.addActionListener(this);
6301106
631
- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632
- saveButton.setToolTipText("New version");
633
- saveButton.addActionListener(this);
1107
+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1108
+ saveVersionButton.setToolTipText("Duplicate current version");
1109
+ saveVersionButton.addActionListener(this);
6341110
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);
1111
+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1112
+ deleteVersionButton.setToolTipText("Delete current version");
1113
+ deleteVersionButton.addActionListener(this);
1114
+
1115
+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1116
+ previousVersionButton.setToolTipText("Previous version");
1117
+ previousVersionButton.addActionListener(this);
1118
+ previousVersionButton.setEnabled(false);
6391119
6401120 cGridBag updown = new cGridBag().setVertical(true);
6411121 updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
642
- restoreButton.setToolTipText("Restore current");
1122
+ restoreButton.setToolTipText("Undo (restore current version)");
6431123 restoreButton.addActionListener(this);
644
- restoreButton.setEnabled(false);
1124
+ //restoreButton.setEnabled(false);
6451125
6461126 updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
647
- replaceButton.setToolTipText("Replace current");
1127
+ replaceButton.setToolTipText("Save (replace current version)");
6481128 replaceButton.addActionListener(this);
649
- replaceButton.setEnabled(false);
1129
+ //replaceButton.setEnabled(false);
6501130
6511131 copyOptionsPanel.add(updown);
6521132
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);
1133
+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1134
+ nextVersionButton.setToolTipText("Next version");
1135
+ nextVersionButton.addActionListener(this);
1136
+ nextVersionButton.setEnabled(false);
1137
+
1138
+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1139
+ oneStepButton.setToolTipText("Animate one step forward");
1140
+ oneStepButton.addActionListener(this);
6571141
6581142 oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
6591143 liveCB.setToolTipText("Enable animation");
6601144 liveCB.addItemListener(this);
6611145
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
-
6661146 oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
6671147 fastCB.setToolTipText("Fast mode");
6681148 fastCB.addItemListener(this);
....@@ -681,29 +1161,14 @@
6811161 oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
6821162 snapobjectButton.addActionListener(this);
6831163 snapobjectButton.setToolTipText("Snap Object");
1164
+
1165
+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1166
+ fourButton.addActionListener(this);
1167
+ fourButton.setToolTipText("Show control panel only");
6841168 }
6851169
6861170 //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
6871171
688
- oe.toolbarPanel.add(fourButton = new cButton("-||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
689
- fourButton.addActionListener(this);
690
- fourButton.setToolTipText("Show left panel only");
691
-
692
- oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
693
- twoButton.setToolTipText("Show right view only");
694
- twoButton.addActionListener(this);
695
- this.fullscreenLayout = twoButton;
696
-
697
- oe.toolbarPanel.add(sixButton = new cButton("-|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
698
- sixButton.setToolTipText("Show left and right");
699
- sixButton.addActionListener(this);
700
-// oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
701
-// threeButton.setToolTipText("2-column layout right");
702
-// threeButton.addActionListener(this);
703
-// oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
704
-// sevenButton.setToolTipText("3-column layout");
705
-// sevenButton.addActionListener(this);
706
- //
7071172
7081173 oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7091174 rootButton.setToolTipText("Open selection in new tab");
....@@ -715,30 +1180,32 @@
7151180 //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
7161181 //clearButton.addActionListener(this);
7171182
1183
+ cGridBag row1 = new cGridBag();
1184
+
7181185 // INSERT
719
- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
720
- gridButton.setToolTipText("Create grid");
1186
+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1187
+ gridButton.setToolTipText("Create ground");
7211188 gridButton.addActionListener(this);
7221189
723
- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1190
+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7241191 boxButton.setToolTipText("Create box");
7251192 boxButton.addActionListener(this);
7261193
727
- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1194
+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1195
+ superButton.setToolTipText("Create superellipsoid");
1196
+ superButton.addActionListener(this);
1197
+
1198
+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7281199 sphereButton.setToolTipText("Create sphere");
7291200 sphereButton.addActionListener(this);
7301201
731
- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1202
+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7321203 coneButton.setToolTipText("Create cone");
7331204 coneButton.addActionListener(this);
7341205
735
- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1206
+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7361207 torusButton.setToolTipText("Create torus");
7371208 torusButton.addActionListener(this);
738
-
739
- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
740
- superButton.setToolTipText("Create superellipsoid");
741
- superButton.addActionListener(this);
7421209
7431210 if (Globals.ADVANCED)
7441211 {
....@@ -747,51 +1214,53 @@
7471214 kleinButton.addActionListener(this);
7481215 }
7491216
750
- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1217
+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7511218 particlesButton.setToolTipText("Create particle system");
7521219 particlesButton.addActionListener(this);
7531220
754
- oe.toolboxPanel.Return();
1221
+ oe.toolboxPanel.add(row1);
7551222
756
- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1223
+ cGridBag row2 = new cGridBag();
1224
+
1225
+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7571226 groupButton.setToolTipText("Create group");
7581227 groupButton.addActionListener(this);
7591228
760
- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1229
+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7611230 compositeButton.setToolTipText("Create composite");
7621231 compositeButton.addActionListener(this);
7631232
764
- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1233
+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7651234 switchButton.setToolTipText("Create item switcher");
7661235 switchButton.addActionListener(this);
7671236
768
- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1237
+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7691238 loopButton.setToolTipText("Create loop");
7701239 loopButton.addActionListener(this);
7711240
772
- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1241
+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7731242 textureButton.setToolTipText("Create texture");
7741243 textureButton.addActionListener(this);
7751244
776
- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1245
+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7771246 overlayButton.setToolTipText("Create overlay");
7781247 overlayButton.addActionListener(this);
7791248
780
- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1249
+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
7811250 lightButton.setToolTipText("Create light");
7821251 lightButton.addActionListener(this);
7831252
784
- for (int i=6; --i>=0;)
785
- {
786
- oe.toolboxPanel.Return();
787
- oe.toolboxPanel.add(new cGridBag());
788
- oe.toolboxPanel.add(new cGridBag());
789
- oe.toolboxPanel.add(new cGridBag());
790
- oe.toolboxPanel.add(new cGridBag());
791
- oe.toolboxPanel.add(new cGridBag());
792
- oe.toolboxPanel.add(new cGridBag());
793
- oe.toolboxPanel.add(new cGridBag());
794
- }
1253
+ oe.toolboxPanel.add(row2);
1254
+
1255
+ cGridBag textures = new cGridBag();
1256
+
1257
+ CreateTexturePanel(textures);
1258
+
1259
+ oe.toolboxPanel.add(textures);
1260
+
1261
+ textures.preferredHeight = 100;
1262
+
1263
+ CreateSkyboxPanel(oe.skyboxPanel);
7951264
7961265 // EDIT panel
7971266 editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
....@@ -799,20 +1268,20 @@
7991268 editButton.addActionListener(this);
8001269
8011270 editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
802
- uneditButton.setToolTipText("Remove selection controls");
1271
+ uneditButton.setToolTipText("Unpin and remove selection controls");
8031272 uneditButton.addActionListener(this);
8041273
8051274 editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
806
- allParamsButton.setToolTipText("Show all controle");
1275
+ allParamsButton.setToolTipText("Show all controls");
8071276 allParamsButton.addActionListener(this);
8081277
809
- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
810
- clearPanelButton.setToolTipText("Clear edit panel");
1278
+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1279
+ clearPanelButton.setToolTipText("Clear all controls");
8111280 clearPanelButton.addActionListener(this);
8121281
813
- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
814
- unselectButton.setToolTipText("Unselect");
815
- unselectButton.addActionListener(this);
1282
+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1283
+ //unselectButton.setToolTipText("Unselect");
1284
+ //unselectButton.addActionListener(this);
8161285
8171286 editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
8181287 flashSelectionButton.setToolTipText("Highlight selection");
....@@ -851,8 +1320,8 @@
8511320 versionSlider = (cNumberSlider)sliderPane.getComponent(1);
8521321 sliderPane.preferredHeight = 1;
8531322
854
-// mainPanel.setDividerLocation(0.5); //1.0);
855
-// mainPanel.setResizeWeight(0.5);
1323
+// mainPanel.setDividerLocation(0.1); //1.0);
1324
+ mainPanel.setResizeWeight(0.4);
8561325
8571326 //jList.addListSelectionListener(this);
8581327 oe.jTree.addTreeSelectionListener(this);
....@@ -860,7 +1329,7 @@
8601329 //jTree.setEditable(true);
8611330 oe.jTree.setDragEnabled(true);
8621331 //jTree.setPreferredSize(new Dimension(10,10));
863
- jSP.setPreferredSize(new Dimension(100,200));
1332
+ //jSP.setPreferredSize(new Dimension(100,200));
8641333
8651334 oe.jTree.setCellRenderer(new cTreeModel.Renderer());
8661335
....@@ -872,7 +1341,7 @@
8721341 dgr.addDragGestureListener(this);
8731342 }catch(Exception e) {}
8741343 */
875
- radio.layout = sixButton; // sevenButton;
1344
+ radio.layout = threeButton; // sixButton;
8761345 oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
8771346 }
8781347
....@@ -923,9 +1392,12 @@
9231392 smoothCB.setToolTipText("Snapping delay");
9241393 smoothCB.addItemListener(this);
9251394
926
- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
927
- slowCB.setToolTipText("Smooth interpolation");
928
- slowCB.addItemListener(this);
1395
+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1396
+// slowCB.setToolTipText("Smooth interpolation");
1397
+// slowCB.addItemListener(this);
1398
+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
1399
+ minshaderCB.setToolTipText("Minimal fast shader");
1400
+ minshaderCB.addItemListener(this);
9291401
9301402 // constraints.gridy += 1;
9311403 // panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
....@@ -1004,6 +1476,14 @@
10041476
10051477 void EditObject(Object3D obj)
10061478 {
1479
+ assert(obj instanceof Composite);
1480
+
1481
+// if (obj.versionlist == null)
1482
+// {
1483
+// obj.versionlist = new Object3D[100];
1484
+// obj.versionindex = -1;
1485
+// }
1486
+
10071487 cRadio radioButton = new cRadio(obj.name);
10081488
10091489 // June 2019. Patch to avoid bug with transparency.
....@@ -1014,7 +1494,7 @@
10141494 }
10151495
10161496 radioButton.SetObject(obj);
1017
- radioButton.layout = sixButton; // sevenButton;
1497
+ radioButton.layout = threeButton; // sixButton;
10181498 radioButton.SetCamera(cameraView.renderCamera, false);
10191499 radioButton.addActionListener(this);
10201500 radioPanel.add(radioButton);
....@@ -1028,6 +1508,7 @@
10281508
10291509 oe.SetupViews();
10301510
1511
+ if (Globals.DEBUG)
10311512 System.out.println("SetupViews");
10321513 DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
10331514 oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
....@@ -1039,6 +1520,8 @@
10391520 cCheckBox localCB;
10401521 cCheckBox crowdCB;
10411522 cCheckBox smoothCB;
1523
+ cCheckBox minshaderCB;
1524
+
10421525 cToggleButton fastCB;
10431526 cCheckBox slowCB;
10441527 cCheckBox boxCB;
....@@ -1109,6 +1592,12 @@
11091592 {
11101593 cameraView.ToggleInertia();
11111594 cameraView.repaint();
1595
+ }
1596
+ else if(e.getSource() == minshaderCB)
1597
+ {
1598
+ Globals.MINSHADER ^= true;
1599
+ cameraView.programInitialized = false;
1600
+ cameraView.repaint();
11121601 }
11131602 else if(e.getSource() == localCB)
11141603 {
....@@ -1386,7 +1875,12 @@
13861875 TreePath path;
13871876
13881877 public TransferableTreePath(TreePath tp) {
1389
- path = tp;
1878
+ Object[] objs = new Object[tp.getPathCount()];
1879
+ for (int i=0; i<objs.length; i++)
1880
+ {
1881
+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
1882
+ }
1883
+ path = new TreePath(objs);
13901884 }
13911885
13921886 public synchronized DataFlavor[] getTransferDataFlavors() {
....@@ -1676,7 +2170,11 @@
16762170 shadow.material = new cMaterial(obj.material);
16772171 shadow.material.diffuse = 0.0001f;
16782172 shadow.material.specular = 0.0001f;
1679
- //shadow.projectedVertices[1].x = 300;
2173
+ shadow.material.opacity = 0.75f;
2174
+
2175
+ AllocProjectedVertices(shadow);
2176
+
2177
+ shadow.projectedVertices[1].x = 300;
16802178
16812179 makeSomething(shadow);
16822180 }
....@@ -2132,6 +2630,23 @@
21322630 {
21332631 makeSomething(new Light());
21342632 } else
2633
+// if (source == skybox1Button ||
2634
+// source == skybox2Button ||
2635
+// source == skybox3Button ||
2636
+// source == skybox4Button ||
2637
+// source == skybox5Button ||
2638
+// source == skybox6Button ||
2639
+// source == skybox7Button ||
2640
+// source == skybox11Button ||
2641
+// source == skybox12Button ||
2642
+// source == skybox13Button ||
2643
+// source == skybox14Button ||
2644
+// source == skybox15Button ||
2645
+// source == skybox16Button ||
2646
+// source == skybox17Button)
2647
+// {
2648
+// ChangeSkybox(source);
2649
+// } else
21352650 if (source == csgItem)
21362651 {
21372652 group(new CSG());
....@@ -2180,27 +2695,35 @@
21802695 } else
21812696 if (source == loopItem || source == loopButton)
21822697 {
2698
+ if (!group.selection.isEmpty())
2699
+ {
21832700 Composite csg = new GroupLeaf();
21842701 csg.count = 5;
2185
- group(csg);
21862702 Composite child = new cGroup("Branch");
21872703 csg.addChild(child);
21882704 child.addChild(csg);
2705
+ group(csg);
2706
+ }
21892707 } else
21902708 if (source == doubleItem)
21912709 {
2710
+ if (!group.selection.isEmpty())
2711
+ {
21922712 Composite csg = new GroupLeaf("Fork");
21932713 csg.count = 5;
2194
- group(csg);
21952714 Composite child = new cGroup("Branch A");
21962715 csg.addChild(child);
21972716 child.addChild(csg);
21982717 child = new cGroup("Branch B");
21992718 csg.addChild(child);
22002719 child.addChild(csg);
2720
+ group(csg);
2721
+ }
22012722 } else
22022723 if (source == tripleItem)
22032724 {
2725
+ if (!group.selection.isEmpty())
2726
+ {
22042727 Composite csg = new GroupLeaf("Trident");
22052728 csg.count = 4;
22062729 group(csg);
....@@ -2213,11 +2736,12 @@
22132736 child = new cGroup();
22142737 csg.addChild(child);
22152738 child.addChild(csg);
2739
+ }
22162740 } else
22172741 if (source == computeAOItem)
22182742 {
22192743 Globals.drawMode = CameraPane.OCCLUSION;
2220
- Globals.theRenderer.repaint();
2744
+ cameraView.repaint();
22212745 } else
22222746 if (source == recompileItem)
22232747 {
....@@ -2232,7 +2756,7 @@
22322756 if (source == invariantsItem)
22332757 {
22342758 System.out.println("Invariants:");
2235
- Grafreed.grafreeD.universe.invariants();
2759
+ Grafreed.grafreed.universe.invariants();
22362760 } else
22372761 if (source == memoryItem)
22382762 {
....@@ -2263,33 +2787,52 @@
22632787 {
22642788 ToggleFullScreen();
22652789 } else
2266
- if (source == undoButton)
2790
+ if (source == collapseButton)
2791
+ {
2792
+ this.expandedLayout = radio.layout;
2793
+ CollapseToolbar();
2794
+ } else
2795
+ if (source == maximize3DButton)
2796
+ {
2797
+ this.expandedLayout = radio.layout;
2798
+ radio.layout = twoButton;
2799
+ Show3DView();
2800
+ CollapseToolbar();
2801
+ } else
2802
+ if (source == previousVersionButton)
22672803 {
22682804 // Go to previous version
22692805 //if (!Undo())
22702806 //java.awt.Toolkit.getDefaultToolkit().beep();
2271
- Undo();
2807
+ PreviousVersion();
22722808 } else
22732809 if (source == restoreButton)
22742810 {
22752811 // Restore current version
22762812 Restore();
2813
+ //restoreButton.setEnabled(false);
22772814 } else
22782815 if (source == replaceButton)
22792816 {
22802817 // Overwrite current version
22812818 Replace();
2819
+ //replaceButton.setEnabled(false);
22822820 } else
2283
- if (source == redoButton)
2821
+ if (source == nextVersionButton)
22842822 {
22852823 // Go to next version
2286
- Redo();
2824
+ NextVersion();
22872825 } else
2288
- if (source == saveButton)
2826
+ if (source == saveVersionButton)
22892827 {
22902828 // Save a new version
22912829 if (!Save(true))
22922830 java.awt.Toolkit.getDefaultToolkit().beep();
2831
+ } else
2832
+ if (source == deleteVersionButton)
2833
+ {
2834
+ // Delete a new version
2835
+ DeleteVersion();
22932836 } else
22942837 if (source == oneStepButton)
22952838 {
....@@ -2344,11 +2887,11 @@
23442887 } else
23452888 if (source == undoItem)
23462889 {
2347
- Undo();
2890
+ PreviousVersion();
23482891 } else
23492892 if (source == redoItem)
23502893 {
2351
- Redo();
2894
+ NextVersion();
23522895 } else
23532896 if (source == duplicateItem)
23542897 {
....@@ -2829,22 +3372,34 @@
28293372 } else
28303373 if (source == ungroupItem || source == ungroupButton)
28313374 {
2832
- boolean hasRoot = false;
3375
+ boolean canUngroup = true;
28333376
28343377 for (int i=0; i<group.selection.size(); i++)
28353378 {
2836
- if (group.selection.get(i) == group)
3379
+ Object3D selectedItem = group.selection.get(i);
3380
+
3381
+ if (selectedItem.Size() == 0)
28373382 {
2838
- hasRoot = true;
3383
+ // Cannot ungroup leaves
3384
+ canUngroup = false;
3385
+ break;
3386
+ }
3387
+
3388
+ if (selectedItem == group)
3389
+ {
3390
+ // Cannot ungroup root
3391
+ canUngroup = false;
28393392 break;
28403393 }
28413394 }
28423395
2843
- if (!hasRoot)
3396
+ if (canUngroup)
28443397 {
28453398 for (int i=0; i<group.selection.size(); i++)
28463399 {
2847
- Ungroup(group.selection.get(i));
3400
+ Object3D selectedItem = group.selection.get(i);
3401
+
3402
+ Ungroup(selectedItem);
28483403 }
28493404
28503405 ClearSelection(false);
....@@ -3151,7 +3706,7 @@
31513706 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
31523707 {
31533708 obj = (Object3D)e.nextElement();
3154
- obj.SetBumpTexture(null);
3709
+ obj.ResetBumpTexture();
31553710 }
31563711
31573712 refreshContents();
....@@ -3165,6 +3720,31 @@
31653720 obj.SetBumpTexture(obj.GetPigmentTexture());
31663721 }
31673722
3723
+ refreshContents();
3724
+ } else
3725
+ if (source == embedTexturesItem)
3726
+ {
3727
+ Object3D obj;
3728
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3729
+ {
3730
+ obj = (Object3D)e.nextElement();
3731
+ obj.EmbedTextures(true);
3732
+ }
3733
+
3734
+ refreshContents();
3735
+ } else
3736
+ if (source == deEmbedTexturesItem)
3737
+ {
3738
+ Object3D obj;
3739
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3740
+ {
3741
+ obj = (Object3D)e.nextElement();
3742
+ obj.EmbedTextures(false);
3743
+ }
3744
+
3745
+ CameraPane.texturepigment.clear();
3746
+ CameraPane.texturebump.clear();
3747
+
31683748 refreshContents();
31693749 } else
31703750 if (source == flashSelectionButton)
....@@ -3182,38 +3762,7 @@
31823762 if (CameraPane.FULLSCREEN)
31833763 fullscreenLayout = radio.layout;
31843764
3185
- // bug
3186
- //gridPanel.setDividerLocation(1.0);
3187
- //bigPanel.setDividerLocation(0.0);
3188
-// bigThree.remove(scenePanel);
3189
-// bigThree.remove(centralPanel);
3190
-// bigThree.remove(XYZPanel);
3191
-// aWindowConstraints.gridx = 0;
3192
-// aWindowConstraints.gridy = 0;
3193
-// aWindowConstraints.gridwidth = 1;
3194
-// // aConstraints.gridheight = 3;
3195
-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3196
-// aWindowConstraints.weightx = 0;
3197
-// aWindowConstraints.weighty = 1;
3198
-// //bigThree.add(jtp, aWindowConstraints);
3199
-// aWindowConstraints.weightx = 1;
3200
-// aWindowConstraints.gridwidth = 3;
3201
-// // aConstraints.gridheight = 3;
3202
-// aWindowConstraints.gridx = 1;
3203
-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3204
-// bigThree.add(centralPanel, aWindowConstraints);
3205
-// aWindowConstraints.weightx = 0;
3206
-// aWindowConstraints.gridx = 4;
3207
-// aWindowConstraints.gridwidth = 1;
3208
-// // aConstraints.gridheight = 3;
3209
-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3210
-// //bigThree.add(XYZPanel, aWindowConstraints);
3211
-// scenePanel.setVisible(false);
3212
-// centralPanel.setVisible(true);
3213
-// XYZPanel.setVisible(false);
3214
- bigThree.ClearUI();
3215
- bigThree.add(centralPanel);
3216
- bigThree.FlushUI();
3765
+ Show3DView();
32173766
32183767 cameraView.requestFocusInWindow();
32193768
....@@ -3268,8 +3817,8 @@
32683817 // centralPanel.setVisible(true);
32693818 // XYZPanel.setVisible(true);
32703819 bigThree.ClearUI();
3820
+ bigThree.add(scenePanel);
32713821 bigThree.add(centralPanel);
3272
- bigThree.add(XYZPanel);
32733822 bigThree.FlushUI();
32743823
32753824 cameraView.requestFocusInWindow();
....@@ -3349,8 +3898,8 @@
33493898 // centralPanel.setVisible(true);
33503899 // XYZPanel.setVisible(false);
33513900 bigThree.ClearUI();
3352
- bigThree.add(scenePanel);
33533901 bigThree.add(centralPanel);
3902
+ bigThree.add(scenePanel);
33543903 bigThree.FlushUI();
33553904
33563905 cameraView.requestFocusInWindow();
....@@ -3399,6 +3948,7 @@
33993948 } else
34003949 if (source == rootButton)
34013950 {
3951
+ Replace();
34023952 Object3D obj;
34033953 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
34043954 {
....@@ -3456,10 +4006,10 @@
34564006 {
34574007 Object3D child = (Object3D)e.nextElement();
34584008 if(child.editWindow != null)
3459
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
34604009 child.pinned = false;
34614010 child.CloseUI();
34624011 listUI.remove(child);
4012
+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
34634013
34644014 //child.editWindow = null; // ???????????
34654015 }
....@@ -3478,6 +4028,7 @@
34784028 obj.CloseUI();
34794029 }
34804030 listUI.clear();
4031
+ SetPinStates(group.selection.size() > 0);
34814032 refreshContents(true);
34824033 } else
34834034 if (source == allParamsButton)
....@@ -3534,8 +4085,6 @@
35344085
35354086 copy = group;
35364087
3537
- SetUndoStates();
3538
-
35394088 //Globals.theRenderer.object = group;
35404089 if(!useclient)
35414090 {
....@@ -3563,7 +4112,23 @@
35634112 */
35644113 radio.layout.doClick();
35654114
4115
+ assert(copy instanceof Composite);
4116
+
4117
+ if (copy.versionlist == null)
4118
+ {
4119
+ copy.versionlist = new Object3D[100];
4120
+ copy.versionindex = -1;
4121
+
4122
+ // Cannot work with loops
4123
+ // To fix this issue, first mark all nodes above the root,
4124
+ // and check if any of these nodes are reachable below the root.
4125
+ //Save(true);
4126
+ }
4127
+
4128
+ SetVersionStates();
4129
+
35664130 ClearUnpinned();
4131
+
35674132 //Grafreed.Assert(group != null);
35684133 //Grafreed.Assert(group.selection != null);
35694134 SetPinStates(group.selection == null || group.selection.size() > 0);
....@@ -3580,11 +4145,13 @@
35804145 } else if (event.getSource() == editCameraItem)
35814146 {
35824147 cameraView.ProtectCamera();
4148
+ cameraView.requestFocusInWindow();
35834149 cameraView.repaint();
35844150 return;
35854151 } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
35864152 {
35874153 cameraView.RevertCamera();
4154
+ cameraView.requestFocusInWindow();
35884155 cameraView.repaint();
35894156 return;
35904157 // } else if (event.getSource() == textureButton)
....@@ -4161,7 +4728,7 @@
41614728
41624729 try
41634730 {
4164
- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
4731
+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
41654732 }
41664733 catch (Exception e)
41674734 {
....@@ -4717,9 +5284,7 @@
47175284
47185285 freezemodel = false;
47195286 }
4720
-
4721
- boolean flashIt = true;
4722
-
5287
+
47235288 public void valueChanged(TreeSelectionEvent e)
47245289 //public boolean handleEvent(Event event)
47255290 {
....@@ -4792,13 +5357,30 @@
47925357 {
47935358 editButton.setEnabled(enabled);
47945359 uneditButton.setEnabled(enabled);
4795
- unselectButton.setEnabled(enabled);
5360
+ //unselectButton.setEnabled(enabled);
47965361 flashSelectionButton.setEnabled(enabled);
5362
+
5363
+ clearPanelButton.setEnabled(!listUI.isEmpty());
5364
+
5365
+ boolean allComposites = true;
5366
+
5367
+ if (group.selection != null)
5368
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5369
+ {
5370
+ Object next = e.nextElement();
5371
+ if (!(next instanceof Composite)) // || (next instanceof GroupLeaf))
5372
+ {
5373
+ allComposites = false;
5374
+ break;
5375
+ }
5376
+ }
5377
+
5378
+ rootButton.setEnabled(allComposites);
47975379 }
47985380
47995381 void refreshContents(boolean cp)
48005382 {
4801
- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
5383
+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
48025384 if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
48035385 {
48045386 objEditor.ClearInfo(); // .GetMaterial());
....@@ -4808,7 +5390,7 @@
48085390 Object3D child = (Object3D) group.selection.get(i);
48095391
48105392 objEditor.AddInfo(child, this, true);
4811
- System.err.println("info : " + child.GetPath());
5393
+// System.err.println("info : " + child.GetPath());
48125394 }
48135395
48145396 objEditor.SetText(); // jan 2014
....@@ -5634,7 +6216,6 @@
56346216
56356217 cButton restoreCameraButton;
56366218
5637
- cButton saveButton;
56386219 cButton oneStepButton;
56396220
56406221 cButton groupButton;
....@@ -5643,6 +6224,22 @@
56436224 cButton switchButton;
56446225 cButton loopButton;
56456226 cButton textureButton;
6227
+
6228
+ cButton skybox1Button;
6229
+ cButton skybox2Button;
6230
+ cButton skybox3Button;
6231
+ cButton skybox4Button;
6232
+ cButton skybox5Button;
6233
+ cButton skybox6Button;
6234
+ cButton skybox7Button;
6235
+
6236
+ cButton skybox11Button;
6237
+ cButton skybox12Button;
6238
+ cButton skybox13Button;
6239
+ cButton skybox14Button;
6240
+ cButton skybox15Button;
6241
+ cButton skybox16Button;
6242
+ cButton skybox17Button;
56466243
56476244 cButton gridButton;
56486245 cButton boxButton;
....@@ -5676,11 +6273,11 @@
56766273 private MenuItem lookAtItem;
56776274 private MenuItem lookFromItem;
56786275 private MenuItem switchViewItem;
5679
- private MenuItem cutItem;
6276
+ private JMenuItem cutItem;
56806277 private MenuItem undoItem;
56816278 private MenuItem redoItem;
56826279 private JMenuItem duplicateItem;
5683
- private MenuItem cloneItem;
6280
+ private JMenuItem cloneItem;
56846281 private MenuItem cloneSupportItem;
56856282 private MenuItem overwriteGeoItem;
56866283 private MenuItem overwriteMatItem;
....@@ -5701,13 +6298,13 @@
57016298 private MenuItem cloneGeometriesItem;
57026299 private MenuItem shareGeometriesItem;
57036300 private MenuItem mergeGeometriesItem;
5704
- private MenuItem copyItem;
6301
+ private JMenuItem copyItem;
57056302 private MenuItem pasteItem;
5706
- private MenuItem pasteIntoItem;
5707
- private MenuItem pasteLinkItem;
5708
- private MenuItem pasteCloneItem;
5709
- private MenuItem pasteExpandItem;
5710
- private MenuItem deleteItem;
6303
+ private JMenuItem pasteIntoItem;
6304
+ private JMenuItem pasteLinkItem;
6305
+ private JMenuItem pasteCloneItem;
6306
+ private JMenuItem pasteExpandItem;
6307
+ private JMenuItem deleteItem;
57116308 private MenuItem clearAllItem;
57126309 private MenuItem genUVItem;
57136310 private MenuItem genNormalsMESHItem;
....@@ -5762,7 +6359,7 @@
57626359 private MenuItem transformGeometryItem;
57636360 private MenuItem transformChildrenItem;
57646361 private MenuItem hideItem;
5765
- private MenuItem grabItem;
6362
+ private JMenuItem grabItem;
57666363 private MenuItem backItem;
57676364 private MenuItem frontItem;
57686365 private MenuItem cameraItem;
....@@ -5775,7 +6372,7 @@
57756372 private MenuItem switchTransfoItem;
57766373 private MenuItem morphItem;
57776374 private MenuItem linkerItem;
5778
- private MenuItem ungroupItem;
6375
+ private JMenuItem ungroupItem;
57796376 private MenuItem editItem;
57806377 private MenuItem openWindowItem;
57816378 private MenuItem editLeafItem;
....@@ -5791,6 +6388,8 @@
57916388 private MenuItem attachBumpItem;
57926389 private MenuItem detachBumpItem;
57936390 private MenuItem pigmentBumpItem;
6391
+ private MenuItem embedTexturesItem;
6392
+ private MenuItem deEmbedTexturesItem;
57946393
57956394 private MenuItem particleItem;
57966395 private MenuItem ragdollItem;