Normand Briere
2019-08-26 6266c8a4b2485b29a7d5bcb217460d7aad3e1c4a
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", !Globals.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, !Globals.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(JTabbedPane.LEFT);
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,6 +415,16 @@
60415 this.copy = this.group = group;
61416 //selectees = this.group.selectees;
62417
418
+ assert(false);
419
+
420
+// if (copy.versionlist == null)
421
+// {
422
+// copy.versionlist = new Object3D[100];
423
+// copy.versionindex = -1;
424
+//
425
+// //Save(true);
426
+// }
427
+
63428 if(ui)
64429 SetupUI(objEditor);
65430 }
....@@ -80,10 +445,22 @@
80445 SetupViews(objEditor);
81446
82447 ((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
+// }
83456 }
84457
85458 void CloneSelection(boolean supports)
86459 {
460
+ if (Globals.REPLACEONMAKE)
461
+ Save();
462
+ boolean keep = Globals.REPLACEONMAKE;
463
+ Globals.REPLACEONMAKE = false;
87464 // Object3D keep = GrafreeD.clipboard;
88465 //Object3D obj;
89466 for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -94,6 +471,7 @@
94471
95472 makeSomething(clone, i==group.selection.size()-1);
96473 }
474
+ Globals.REPLACEONMAKE = keep;
97475 }
98476
99477 void CloneClipboard(boolean supports)
....@@ -164,33 +542,35 @@
164542 // menu.add("-");
165543 duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
166544 duplicateItem.addActionListener(this);
167
- cloneItem = menu.add(new MenuItem("Clone"));
545
+
546
+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
168547 cloneItem.addActionListener(this);
169
- if (Globals.ADVANCED)
548
+ //if (Globals.ADVANCED)
170549 {
171550 cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
172551 cloneSupportItem.addActionListener(this);
173552 }
553
+ oe.jTree.popup.addSeparator();
174554 menu.add("-");
175
- cutItem = menu.add(new MenuItem("Cut"));
555
+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
176556 cutItem.addActionListener(this);
177
- copyItem = menu.add(new MenuItem("Copy"));
557
+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
178558 copyItem.addActionListener(this);
179559 pasteItem = menu.add(new MenuItem("Paste"));
180560 pasteItem.addActionListener(this);
181561
182
- menu.add("-");
183
- 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"));
184565 pasteIntoItem.addActionListener(this);
185
- pasteLinkItem = menu.add(new MenuItem("Paste link"));
566
+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
186567 pasteLinkItem.addActionListener(this);
187
- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
568
+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
188569 pasteCloneItem.addActionListener(this);
189
-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
570
+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
190571 // pasteExpandItem.addActionListener(this);
191
- menu.add("-");
192
- clearItem = menu.add(new MenuItem("Clear"));
193
- clearItem.addActionListener(this);
572
+ //menu.add("-");
573
+ oe.jTree.popup.addSeparator();
194574
195575 if (Globals.ADVANCED)
196576 {
....@@ -276,11 +656,9 @@
276656 oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
277657 //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
278658 //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
279
- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
280659 oe.cameraMenu.add("-");
281660 openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
282661 openWindowItem.addActionListener(this);
283
- editLeafItem.addActionListener(this);
284662 lookAtItem.addActionListener(this);
285663 //lookFromItem.addActinoListener(this);
286664 //switchViewItem.addActionListener(this);
....@@ -327,9 +705,8 @@
327705 setMasterItem.addActionListener(this);
328706 }
329707
330
- oe.menuBar.add(menu = new Menu("Group"));
331
-// grabItem = menu.add(new MenuItem("Grab"));
332
-// grabItem.addActionListener(this);
708
+ oe.menuBar.add(menu = new Menu("Order"));
709
+
333710 backItem = menu.add(new MenuItem("Back"));
334711 backItem.addActionListener(this);
335712 frontItem = menu.add(new MenuItem("Front"));
....@@ -337,13 +714,21 @@
337714 // compositeItem = menu.add(new MenuItem("Composite"));
338715 // compositeItem.addActionListener(this);
339716
717
+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
718
+ grabItem.addActionListener(this);
719
+
340720 if (Globals.ADVANCED)
341721 {
342722 hideItem = menu.add(new MenuItem("Hidden Group"));
343723 hideItem.addActionListener(this);
344724 }
345
- ungroupItem = menu.add(new MenuItem("Ungroup"));
725
+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
346726 ungroupItem.addActionListener(this);
727
+
728
+ oe.jTree.popup.addSeparator();
729
+
730
+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
731
+ deleteItem.addActionListener(this);
347732
348733 // menu.add("-");
349734 //
....@@ -380,24 +765,32 @@
380765 shadowYItem.addActionListener(this);
381766 shadowZItem = menu.add(new MenuItem("Shadow Blue"));
382767 shadowZItem.addActionListener(this);
768
+
383769 if (Globals.ADVANCED)
384770 {
771
+ attributeItem = menu.add(new MenuItem("Attribute"));
772
+ attributeItem.addActionListener(this);
385773 menu.add("-");
386774 linkerItem = menu.add(new MenuItem("Linker"));
387775 linkerItem.addActionListener(this);
388
- attributeItem = menu.add(new MenuItem("Attribute"));
389
- attributeItem.addActionListener(this);
390776 templateItem = menu.add(new MenuItem("Template"));
391777 templateItem.addActionListener(this);
392778 pointflowItem = menu.add(new MenuItem("Point Flow"));
393779 pointflowItem.addActionListener(this);
394780 }
395781 menu.add("-");
782
+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
783
+ textureRatioRItem.addActionListener(this);
784
+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
785
+ textureRatioGItem.addActionListener(this);
786
+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
787
+ textureRatioBItem.addActionListener(this);
788
+ menu.add("-");
396789 resetTransformItem = menu.add(new MenuItem("Reset Transform"));
397790 resetTransformItem.addActionListener(this);
398791 resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
399792 resetCentroidItem.addActionListener(this);
400
- resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
793
+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
401794 resetCentroidXZItem.addActionListener(this);
402795 transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
403796 transformGeometryItem.addActionListener(this);
....@@ -415,7 +808,7 @@
415808 genNormalsMESHItem.addActionListener(this);
416809 if (Globals.ADVANCED)
417810 {
418
- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
811
+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
419812 genNormalsMINEItem.addActionListener(this);
420813 }
421814 stripifyItem = menu.add(new MenuItem("Stripify"));
....@@ -449,6 +842,8 @@
449842 }
450843
451844 oe.menuBar.add(menu = new Menu("Attributes"));
845
+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
846
+ clearVersionsItem.addActionListener(this);
452847 clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
453848 clearMaterialsItem.addActionListener(this);
454849 resetAllItem = menu.add(new MenuItem("Reset All"));
....@@ -471,9 +866,9 @@
471866 hideleavesItem.addActionListener(this);
472867 showleavesItem = menu.add(new MenuItem("Show Leaves"));
473868 showleavesItem.addActionListener(this);
474
- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
869
+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
475870 markleavesItem.addActionListener(this);
476
- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
871
+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
477872 unmarkleavesItem.addActionListener(this);
478873 rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
479874 rewindleavesItem.addActionListener(this);
....@@ -508,10 +903,15 @@
508903 attachBumpItem.addActionListener(this);
509904 pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
510905 pigmentBumpItem.addActionListener(this);
906
+ //embedTexturesItem
511907 detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
512908 detachPigmentItem.addActionListener(this);
513909 detachBumpItem = menu.add(new MenuItem("Detach Bump"));
514910 detachBumpItem.addActionListener(this);
911
+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
912
+ embedTexturesItem.addActionListener(this);
913
+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
914
+ deEmbedTexturesItem.addActionListener(this);
515915 menu.add("-");
516916 sortbysizeItem = menu.add(new MenuItem("Sort by size"));
517917 sortbysizeItem.addActionListener(this);
....@@ -522,6 +922,9 @@
522922 shareGeometriesItem.addActionListener(this);
523923 mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
524924 mergeGeometriesItem.addActionListener(this);
925
+ menu.add("-");
926
+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
927
+ editLeafItem.addActionListener(this);
525928 if (Globals.ADVANCED)
526929 {
527930 // Pretty much the same as duplicate and clone.
....@@ -538,6 +941,80 @@
538941 buildToolsMenu(menu);
539942 }
540943
944
+ JTabbedPane resourcecontainer;
945
+ cGridBag currenttab;
946
+ //boolean added; // patch for jar
947
+
948
+ int totalcount = 0;
949
+
950
+ int tabcount = 0;
951
+ int colcount = 0;
952
+ int rowcount = 0;
953
+ int texturecount = 0;
954
+
955
+ int columns = 5;
956
+ int rows = 7;
957
+
958
+ public void ResourceCallBack(String[] path)
959
+ {
960
+// for (int i = 0; i < path.length; i++)
961
+// System.out.print(path[i] + "/");
962
+// System.out.println();
963
+
964
+ if (//rowcount == 0 ||
965
+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
966
+ {
967
+ currenttab = new cGridBag();
968
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
969
+ currenttab.setName(tabname);
970
+ //added = false;
971
+ resourcecontainer.add(currenttab);
972
+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
973
+ rowcount = 1;
974
+ colcount = 0;
975
+ texturecount = 0;
976
+ }
977
+
978
+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") || path[2].toLowerCase().endsWith(".png")))
979
+ {
980
+ //if (!added)
981
+ {
982
+ //added = true;
983
+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
984
+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
985
+ }
986
+
987
+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
988
+ totalcount++;
989
+
990
+ if (++colcount >= columns)
991
+ {
992
+ colcount = 0;
993
+ currenttab.Return();
994
+
995
+ if (rowcount++ >= rows)
996
+ {
997
+ rowcount = 0;
998
+ }
999
+ }
1000
+ }
1001
+ else
1002
+ {
1003
+// if (!path[path.length-1].equals("icons"))
1004
+// resourcecontainer.Return();
1005
+ }
1006
+ }
1007
+
1008
+ void CreateTexturePanel(cGridBag container)
1009
+ {
1010
+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
1011
+ container.add(resourcecontainer);
1012
+
1013
+ Grafreed.ParseResources("textures", this);
1014
+
1015
+ // 935. System.out.println("Total = " + totalcount);
1016
+ }
1017
+
5411018 void SetupUI2(ObjEditor oe)
5421019 {
5431020 // June 2019
....@@ -555,11 +1032,6 @@
5551032 //new Exception().printStackTrace();
5561033
5571034 oe.radioPanel = new JPanel(new GridBagLayout());
558
- oe.aConstraints.weightx = 1;
559
- oe.aConstraints.weighty = 0;
560
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
561
- oe.aConstraints.gridwidth = 100;
562
- oe.aConstraints.gridheight = 1;
5631035 // oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
5641036
5651037 oe.buttonGroup = new ButtonGroup();
....@@ -580,9 +1052,9 @@
5801052 oe.radioPanel.add(dummyButton);
5811053 oe.buttonGroup.add(dummyButton);
5821054 */
583
- cGridBag copyOptionsPanel = new cGridBag();
1055
+ cGridBag versionManagerPanel = new cGridBag();
5841056
585
- copyOptionsPanel.preferredHeight = 1;
1057
+ versionManagerPanel.preferredHeight = 4;
5861058
5871059 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
5881060
....@@ -590,50 +1062,110 @@
5901062 //minButton.setToolTipText("Minimize window");
5911063 //minButton.addActionListener(this);
5921064
593
- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594
- maxButton.setToolTipText("Maximize window");
595
- maxButton.addActionListener(this);
1065
+ if (Globals.ADVANCED)
1066
+ {
1067
+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1068
+// maxButton.setToolTipText("Maximize window");
1069
+// maxButton.addActionListener(this);
1070
+ }
5961071
597
- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1072
+ cButton gcButton;
1073
+
1074
+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1075
+// gcButton.setToolTipText("Garbage collect");
1076
+// gcButton.addActionListener(new ActionListener()
1077
+// {
1078
+// public void actionPerformed(ActionEvent e)
1079
+// {
1080
+// System.gc();
1081
+// }
1082
+// });
1083
+
1084
+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1085
+ collapseButton.setToolTipText("Collapse toolbar");
1086
+ collapseButton.addActionListener(this);
1087
+
1088
+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1089
+ maximize3DButton.setToolTipText("Maximize 3D view");
1090
+ maximize3DButton.addActionListener(this);
1091
+
1092
+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1093
+ twoButton.setToolTipText("Show 3D view only");
1094
+ twoButton.addActionListener(this);
1095
+ this.fullscreenLayout = twoButton;
1096
+
1097
+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1098
+ threeButton.setToolTipText("Show controls and 3D view");
1099
+ threeButton.addActionListener(this);
1100
+ if (Globals.ADVANCED)
1101
+ {
1102
+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1103
+ sixButton.setToolTipText("Show 3D view and controls");
1104
+ sixButton.addActionListener(this);
1105
+ }
1106
+// oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1107
+// sevenButton.setToolTipText("3-column layout");
1108
+// sevenButton.addActionListener(this);
1109
+ //
1110
+
1111
+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
5981112 fullButton.setToolTipText("Full-screen window");
5991113 fullButton.addActionListener(this);
6001114
601
- oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1115
+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1116
+ screenfitButton.setToolTipText("Screen fit");
1117
+ screenfitButton.addActionListener(this);
1118
+
1119
+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
6021120 restoreCameraButton.setToolTipText("Restore viewpoint");
6031121 restoreCameraButton.addActionListener(this);
6041122
605
- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
606
- undoButton.setToolTipText("Undo changes");
607
- undoButton.addActionListener(this);
608
- undoButton.setEnabled(false);
1123
+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1124
+ saveVersionButton.setToolTipText("Duplicate current version");
1125
+ saveVersionButton.addActionListener(this);
1126
+
1127
+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1128
+ deleteVersionButton.setToolTipText("Delete current version");
1129
+ deleteVersionButton.addActionListener(this);
1130
+ deleteVersionButton.setEnabled(false);
1131
+
1132
+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1133
+ previousVersionButton.setToolTipText("Previous version");
1134
+ previousVersionButton.addActionListener(this);
1135
+ previousVersionButton.setEnabled(false);
6091136
610
- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
611
- redoButton.setToolTipText("Redo changes");
612
- redoButton.addActionListener(this);
613
- redoButton.setEnabled(false);
1137
+ cGridBag updown = new cGridBag().setVertical(true);
1138
+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1139
+ restoreButton.setToolTipText("Undo (restore current version)");
1140
+ restoreButton.addActionListener(this);
1141
+ restoreButton.setEnabled(false);
6141142
615
- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
616
- saveButton.setToolTipText("Save changes");
617
- saveButton.addActionListener(this);
1143
+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1144
+ replaceButton.setToolTipText("Save (replace current version)");
1145
+ replaceButton.addActionListener(this);
1146
+ replaceButton.setEnabled(false);
6181147
619
- copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
620
- liveCB.setToolTipText("Enable animation");
621
- liveCB.addItemListener(this);
622
-
623
- copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1148
+ versionManagerPanel.add(updown);
1149
+
1150
+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1151
+ nextVersionButton.setToolTipText("Next version");
1152
+ nextVersionButton.addActionListener(this);
1153
+ nextVersionButton.setEnabled(false);
1154
+
1155
+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
6241156 oneStepButton.setToolTipText("Animate one step forward");
6251157 oneStepButton.addActionListener(this);
6261158
627
- copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
1159
+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
1160
+ liveCB.setToolTipText("Enable animation");
1161
+ liveCB.addItemListener(this);
1162
+
1163
+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
6281164 fastCB.setToolTipText("Fast mode");
6291165 fastCB.addItemListener(this);
6301166
6311167 //oe.toolboxPanel.Return();
6321168
633
- copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634
- screenfitButton.setToolTipText("Screen fit");
635
- screenfitButton.addActionListener(this);
636
-
6371169 // copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
6381170 // trackCB.setToolTipText("Enable tracking");
6391171 // trackCB.addItemListener(this);
....@@ -643,142 +1175,137 @@
6431175
6441176 if (Globals.ADVANCED)
6451177 {
646
- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1178
+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
6471179 snapobjectButton.addActionListener(this);
6481180 snapobjectButton.setToolTipText("Snap Object");
1181
+
1182
+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1183
+ fourButton.addActionListener(this);
1184
+ fourButton.setToolTipText("Show control panel only");
6491185 }
6501186
6511187 //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
6521188
653
- oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654
- twoButton.setToolTipText("Show center view only");
655
- twoButton.addActionListener(this);
656
- this.fullscreenLayout = twoButton;
657
-
658
- oe.toolbarPanel.add(fourButton = new cButton("-||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
659
- fourButton.addActionListener(this);
660
- fourButton.setToolTipText("Show left panel only");
661
- oe.toolbarPanel.add(sixButton = new cButton("-|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662
- sixButton.setToolTipText("2-column layout left");
663
- sixButton.addActionListener(this);
664
- oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
665
- threeButton.setToolTipText("2-column layout right");
666
- threeButton.addActionListener(this);
667
- oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
668
- sevenButton.setToolTipText("3-column layout");
669
- sevenButton.addActionListener(this);
670
- //
6711189
672
- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
673
- rootButton.setToolTipText("Edit selection in new tab");
1190
+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1191
+ rootButton.setToolTipText("Open selection in new tab");
6741192 rootButton.addActionListener(this);
6751193
676
- oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1194
+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
6771195 closeButton.setToolTipText("Close tab");
6781196 closeButton.addActionListener(this);
6791197 //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
6801198 //clearButton.addActionListener(this);
6811199
1200
+ cGridBag row1 = new cGridBag();
1201
+
6821202 // INSERT
683
- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
684
- gridButton.setToolTipText("Create grid");
1203
+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1204
+ gridButton.setToolTipText("Create ground");
6851205 gridButton.addActionListener(this);
6861206
687
- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1207
+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
6881208 boxButton.setToolTipText("Create box");
6891209 boxButton.addActionListener(this);
6901210
691
- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
692
- sphereButton.setToolTipText("Create sphere");
693
- sphereButton.addActionListener(this);
694
-
695
- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
696
- coneButton.setToolTipText("Create cone");
697
- coneButton.addActionListener(this);
698
-
699
- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
700
- torusButton.setToolTipText("Create torus");
701
- torusButton.addActionListener(this);
702
-
703
- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1211
+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7041212 superButton.setToolTipText("Create superellipsoid");
7051213 superButton.addActionListener(this);
7061214
707
- if (Globals.ADVANCED)
1215
+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1216
+ sphereButton.setToolTipText("Create sphere");
1217
+ sphereButton.addActionListener(this);
1218
+
1219
+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1220
+ coneButton.setToolTipText("Create cone");
1221
+ coneButton.addActionListener(this);
1222
+
1223
+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1224
+ torusButton.setToolTipText("Create torus");
1225
+ torusButton.addActionListener(this);
1226
+
1227
+ if (false) //Globals.ADVANCED)
7081228 {
709
- oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1229
+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7101230 kleinButton.setToolTipText("Create Klein bottle");
7111231 kleinButton.addActionListener(this);
7121232 }
7131233
714
- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1234
+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7151235 particlesButton.setToolTipText("Create particle system");
7161236 particlesButton.addActionListener(this);
7171237
718
- oe.toolboxPanel.Return();
1238
+ oe.toolboxPanel.add(row1);
7191239
720
- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1240
+ cGridBag row2 = new cGridBag();
1241
+
1242
+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7211243 groupButton.setToolTipText("Create group");
7221244 groupButton.addActionListener(this);
7231245
724
- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1246
+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7251247 compositeButton.setToolTipText("Create composite");
7261248 compositeButton.addActionListener(this);
7271249
728
- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1250
+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7291251 switchButton.setToolTipText("Create item switcher");
7301252 switchButton.addActionListener(this);
7311253
732
- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1254
+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7331255 loopButton.setToolTipText("Create loop");
7341256 loopButton.addActionListener(this);
7351257
736
- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1258
+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7371259 textureButton.setToolTipText("Create texture");
7381260 textureButton.addActionListener(this);
7391261
740
- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1262
+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7411263 overlayButton.setToolTipText("Create overlay");
7421264 overlayButton.addActionListener(this);
7431265
744
- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1266
+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7451267 lightButton.setToolTipText("Create light");
7461268 lightButton.addActionListener(this);
7471269
748
- for (int i=6; --i>=0;)
749
- {
750
- oe.toolboxPanel.Return();
751
- oe.toolboxPanel.add(new cGridBag());
752
- oe.toolboxPanel.add(new cGridBag());
753
- oe.toolboxPanel.add(new cGridBag());
754
- oe.toolboxPanel.add(new cGridBag());
755
- oe.toolboxPanel.add(new cGridBag());
756
- oe.toolboxPanel.add(new cGridBag());
757
- oe.toolboxPanel.add(new cGridBag());
758
- }
1270
+ oe.toolboxPanel.add(row2);
1271
+
1272
+ cGridBag textures = new cGridBag();
1273
+
1274
+ CreateTexturePanel(textures);
1275
+
1276
+ int tabCount = resourcecontainer.getTabCount();
1277
+
1278
+ if (tabCount > 0)
1279
+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
1280
+
1281
+ oe.toolboxPanel.add(textures);
1282
+
1283
+ textures.preferredHeight = 100;
1284
+
1285
+ CreateSkyboxPanel(oe.skyboxPanel);
7591286
7601287 // EDIT panel
761
- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1288
+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7621289 editButton.setToolTipText("Pin selection controls");
7631290 editButton.addActionListener(this);
7641291
765
- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
766
- uneditButton.setToolTipText("Remove selection controls");
1292
+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1293
+ uneditButton.setToolTipText("Unpin and remove selection controls");
7671294 uneditButton.addActionListener(this);
7681295
7691296 editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
770
- allParamsButton.setToolTipText("Show all controle");
1297
+ allParamsButton.setToolTipText("Show all controls");
7711298 allParamsButton.addActionListener(this);
7721299
773
- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
774
- clearPanelButton.setToolTipText("Clear edit panel");
1300
+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1301
+ clearPanelButton.setToolTipText("Clear all controls");
7751302 clearPanelButton.addActionListener(this);
7761303
777
- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
778
- unselectButton.setToolTipText("Unselect");
779
- unselectButton.addActionListener(this);
1304
+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1305
+ //unselectButton.setToolTipText("Unselect");
1306
+ //unselectButton.addActionListener(this);
7801307
781
- editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1308
+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
7821309 flashSelectionButton.setToolTipText("Highlight selection");
7831310 flashSelectionButton.addActionListener(this);
7841311
....@@ -801,6 +1328,8 @@
8011328
8021329 cGridBag jSPPanel = new cGridBag();
8031330
1331
+ jSPPanel.preferredHeight = 20;
1332
+
8041333 JScrollPane jSP;
8051334 //ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
8061335 jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
....@@ -809,11 +1338,14 @@
8091338 oe.treePanel.add(jSPPanel);
8101339 oe.treePanel.Return();
8111340
812
- oe.treePanel.add(copyOptionsPanel);
1341
+ oe.treePanel.add(versionManagerPanel);
8131342 oe.treePanel.Return();
1343
+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1344
+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
1345
+ versionSliderPane.preferredHeight = 3;
8141346
815
-// mainPanel.setDividerLocation(0.5); //1.0);
816
-// mainPanel.setResizeWeight(0.5);
1347
+// mainPanel.setDividerLocation(0.1); //1.0);
1348
+ mainPanel.setResizeWeight(0.4);
8171349
8181350 //jList.addListSelectionListener(this);
8191351 oe.jTree.addTreeSelectionListener(this);
....@@ -821,7 +1353,7 @@
8211353 //jTree.setEditable(true);
8221354 oe.jTree.setDragEnabled(true);
8231355 //jTree.setPreferredSize(new Dimension(10,10));
824
- jSP.setPreferredSize(new Dimension(100,200));
1356
+ //jSP.setPreferredSize(new Dimension(100,200));
8251357
8261358 oe.jTree.setCellRenderer(new cTreeModel.Renderer());
8271359
....@@ -833,7 +1365,7 @@
8331365 dgr.addDragGestureListener(this);
8341366 }catch(Exception e) {}
8351367 */
836
- radio.layout = sevenButton;
1368
+ radio.layout = threeButton; // sixButton;
8371369 oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
8381370 }
8391371
....@@ -884,9 +1416,12 @@
8841416 smoothCB.setToolTipText("Snapping delay");
8851417 smoothCB.addItemListener(this);
8861418
887
- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
888
- slowCB.setToolTipText("Smooth interpolation");
889
- slowCB.addItemListener(this);
1419
+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1420
+// slowCB.setToolTipText("Smooth interpolation");
1421
+// slowCB.addItemListener(this);
1422
+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
1423
+ minshaderCB.setToolTipText("Minimal fast shader");
1424
+ minshaderCB.addItemListener(this);
8901425
8911426 // constraints.gridy += 1;
8921427 // panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
....@@ -936,9 +1471,9 @@
9361471 toggleSwitchCB.setToolTipText("Choose a single item");
9371472 toggleSwitchCB.addItemListener(this);
9381473
939
- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
940
- autosaveCB.setToolTipText("On structure change");
941
- autosaveCB.addItemListener(this);
1474
+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
1475
+ autokeepCB.setToolTipText("On structure change");
1476
+ autokeepCB.addItemListener(this);
9421477
9431478 panel.Return();
9441479 if (Globals.ADVANCED)
....@@ -965,9 +1500,17 @@
9651500
9661501 void EditObject(Object3D obj)
9671502 {
1503
+ //assert(obj instanceof Composite);
1504
+
1505
+// if (obj.versionlist == null)
1506
+// {
1507
+// obj.versionlist = new Object3D[100];
1508
+// obj.versionindex = -1;
1509
+// }
1510
+
9681511 cRadio radioButton = new cRadio(obj.name);
9691512
970
- // Patch to avoid bug with transparency.
1513
+ // June 2019. Patch to avoid bug with transparency.
9711514 radioButton.hadMaterial = obj.material != null;
9721515 if (!radioButton.hadMaterial)
9731516 {
....@@ -975,7 +1518,7 @@
9751518 }
9761519
9771520 radioButton.SetObject(obj);
978
- radioButton.layout = sevenButton;
1521
+ radioButton.layout = threeButton; // sixButton;
9791522 radioButton.SetCamera(cameraView.renderCamera, false);
9801523 radioButton.addActionListener(this);
9811524 radioPanel.add(radioButton);
....@@ -989,6 +1532,7 @@
9891532
9901533 oe.SetupViews();
9911534
1535
+ if (Globals.DEBUG)
9921536 System.out.println("SetupViews");
9931537 DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
9941538 oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
....@@ -1000,6 +1544,8 @@
10001544 cCheckBox localCB;
10011545 cCheckBox crowdCB;
10021546 cCheckBox smoothCB;
1547
+ cCheckBox minshaderCB;
1548
+
10031549 cToggleButton fastCB;
10041550 cCheckBox slowCB;
10051551 cCheckBox boxCB;
....@@ -1015,7 +1561,7 @@
10151561
10161562 cCheckBox oeilCB;
10171563 cCheckBox shadowCB;
1018
- cCheckBox autosaveCB;
1564
+ cCheckBox autokeepCB;
10191565 cCheckBox lookAtCB;
10201566
10211567 // static int COLOR = 1;
....@@ -1070,6 +1616,12 @@
10701616 {
10711617 cameraView.ToggleInertia();
10721618 cameraView.repaint();
1619
+ }
1620
+ else if(e.getSource() == minshaderCB)
1621
+ {
1622
+ Globals.MINSHADER ^= true;
1623
+ cameraView.programInitialized = false;
1624
+ cameraView.repaint();
10731625 }
10741626 else if(e.getSource() == localCB)
10751627 {
....@@ -1127,9 +1679,9 @@
11271679 {
11281680 Globals.FREEZEONMOVE ^= true;
11291681 }
1130
- else if(e.getSource() == autosaveCB)
1682
+ else if(e.getSource() == autokeepCB)
11311683 {
1132
- Globals.SAVEONMAKE ^= true;
1684
+ Globals.REPLACEONMAKE ^= true;
11331685 }
11341686 else if(e.getSource() == lookAtCB)
11351687 {
....@@ -1211,8 +1763,6 @@
12111763 }
12121764 }
12131765
1214
- String string = (String) object;
1215
-
12161766 System.out.println("Transfer = " + object + "; drop : " + target);
12171767 // if( object instanceof java.io.File[])
12181768 // {
....@@ -1220,6 +1770,8 @@
12201770 // objEditor.DropFile((java.io.File[]) object, true);
12211771 // return;
12221772 // }
1773
+
1774
+ String string = object.toString();
12231775
12241776 // File path for Mac and Windows
12251777 if (string.charAt(0) == '/' || string.charAt(1) == ':')
....@@ -1347,7 +1899,12 @@
13471899 TreePath path;
13481900
13491901 public TransferableTreePath(TreePath tp) {
1350
- path = tp;
1902
+ Object[] objs = new Object[tp.getPathCount()];
1903
+ for (int i=0; i<objs.length; i++)
1904
+ {
1905
+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
1906
+ }
1907
+ path = new TreePath(objs);
13511908 }
13521909
13531910 public synchronized DataFlavor[] getTransferDataFlavors() {
....@@ -1469,6 +2026,9 @@
14692026 animationItem.addItemListener(this);
14702027 animationItem.setState(Globals.ANIMATION);
14712028
2029
+ menu.add(archiveItem = new MenuItem("Archive3D..."));
2030
+ archiveItem.addActionListener(this);
2031
+
14722032 menu.add("-");
14732033 parseverticesItem = menu.add(new MenuItem("Multiplicity"));
14742034 parseverticesItem.addActionListener(this);
....@@ -1481,6 +2041,8 @@
14812041 reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
14822042 reduce34MorphItem.addActionListener(this);
14832043 menu.add("-");
2044
+ menu.add(memoryItem = new MenuItem("Memory Usage"));
2045
+ memoryItem.addActionListener(this);
14842046 menu.add(computeAOItem = new MenuItem("Compute AO"));
14852047 computeAOItem.addActionListener(this);
14862048
....@@ -1489,8 +2051,6 @@
14892051 mirrorItem = menu.add(new MenuItem("Mirror Poses"));
14902052 mirrorItem.addActionListener(this);
14912053 menu.add("-");
1492
- menu.add(memoryItem = new MenuItem("Memory Usage"));
1493
- memoryItem.addActionListener(this);
14942054 menu.add(analyzeItem = new MenuItem("Analyze"));
14952055 analyzeItem.addActionListener(this);
14962056 menu.add(dumpItem = new MenuItem("Print"));
....@@ -1576,24 +2136,24 @@
15762136 switch(axis)
15772137 {
15782138 case 0 :
1579
- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1580
- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1581
- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1582
- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
2139
+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
2140
+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
2141
+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
2142
+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
15832143 norm = cVector.X;
15842144 break;
15852145 case 1 :
1586
- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1587
- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1588
- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1589
- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
2146
+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
2147
+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
2148
+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
2149
+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
15902150 norm = cVector.Y;
15912151 break;
15922152 case 2 :
1593
- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1594
- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1595
- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1596
- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
2153
+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
2154
+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
2155
+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
2156
+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
15972157 norm = cVector.Z;
15982158 break;
15992159 }
....@@ -1634,7 +2194,11 @@
16342194 shadow.material = new cMaterial(obj.material);
16352195 shadow.material.diffuse = 0.0001f;
16362196 shadow.material.specular = 0.0001f;
1637
- //shadow.projectedVertices[1].x = 300;
2197
+ shadow.material.opacity = 0.75f;
2198
+
2199
+ AllocProjectedVertices(shadow);
2200
+
2201
+ shadow.projectedVertices[1].x = 300;
16382202
16392203 makeSomething(shadow);
16402204 }
....@@ -1651,6 +2215,16 @@
16512215 listUI.remove(i);
16522216 }
16532217 }
2218
+ }
2219
+
2220
+ private void EditElement(Object3D elem, boolean newWindow)
2221
+ {
2222
+ // if (!(elem instanceof Composite))
2223
+ // newWindow = false;
2224
+ listUI.add(elem);
2225
+ elem.openEditWindow(this, newWindow); //, false);
2226
+ System.out.println("edit : " + elem);
2227
+ elem.editWindow.refreshContents(true); // ? new
16542228 }
16552229
16562230 /**
....@@ -2080,6 +2654,23 @@
20802654 {
20812655 makeSomething(new Light());
20822656 } else
2657
+// if (source == skybox1Button ||
2658
+// source == skybox2Button ||
2659
+// source == skybox3Button ||
2660
+// source == skybox4Button ||
2661
+// source == skybox5Button ||
2662
+// source == skybox6Button ||
2663
+// source == skybox7Button ||
2664
+// source == skybox11Button ||
2665
+// source == skybox12Button ||
2666
+// source == skybox13Button ||
2667
+// source == skybox14Button ||
2668
+// source == skybox15Button ||
2669
+// source == skybox16Button ||
2670
+// source == skybox17Button)
2671
+// {
2672
+// ChangeSkybox(source);
2673
+// } else
20832674 if (source == csgItem)
20842675 {
20852676 group(new CSG());
....@@ -2128,27 +2719,35 @@
21282719 } else
21292720 if (source == loopItem || source == loopButton)
21302721 {
2722
+ if (!group.selection.isEmpty())
2723
+ {
21312724 Composite csg = new GroupLeaf();
21322725 csg.count = 5;
2133
- group(csg);
21342726 Composite child = new cGroup("Branch");
21352727 csg.addChild(child);
21362728 child.addChild(csg);
2729
+ group(csg);
2730
+ }
21372731 } else
21382732 if (source == doubleItem)
21392733 {
2734
+ if (!group.selection.isEmpty())
2735
+ {
21402736 Composite csg = new GroupLeaf("Fork");
21412737 csg.count = 5;
2142
- group(csg);
21432738 Composite child = new cGroup("Branch A");
21442739 csg.addChild(child);
21452740 child.addChild(csg);
21462741 child = new cGroup("Branch B");
21472742 csg.addChild(child);
21482743 child.addChild(csg);
2744
+ group(csg);
2745
+ }
21492746 } else
21502747 if (source == tripleItem)
21512748 {
2749
+ if (!group.selection.isEmpty())
2750
+ {
21522751 Composite csg = new GroupLeaf("Trident");
21532752 csg.count = 4;
21542753 group(csg);
....@@ -2161,11 +2760,12 @@
21612760 child = new cGroup();
21622761 csg.addChild(child);
21632762 child.addChild(csg);
2763
+ }
21642764 } else
21652765 if (source == computeAOItem)
21662766 {
21672767 Globals.drawMode = CameraPane.OCCLUSION;
2168
- Globals.theRenderer.repaint();
2768
+ cameraView.repaint();
21692769 } else
21702770 if (source == recompileItem)
21712771 {
....@@ -2180,7 +2780,7 @@
21802780 if (source == invariantsItem)
21812781 {
21822782 System.out.println("Invariants:");
2183
- Grafreed.grafreeD.universe.invariants();
2783
+ Grafreed.grafreed.universe.invariants();
21842784 } else
21852785 if (source == memoryItem)
21862786 {
....@@ -2211,17 +2811,52 @@
22112811 {
22122812 ToggleFullScreen();
22132813 } else
2214
- if (source == undoButton)
2814
+ if (source == collapseButton)
22152815 {
2216
- Undo();
2816
+ this.expandedLayout = radio.layout;
2817
+ CollapseToolbar();
22172818 } else
2218
- if (source == redoButton)
2819
+ if (source == maximize3DButton)
22192820 {
2220
- Redo();
2821
+ this.expandedLayout = radio.layout;
2822
+ radio.layout = twoButton;
2823
+ Show3DView();
2824
+ CollapseToolbar();
22212825 } else
2222
- if (source == saveButton)
2826
+ if (source == previousVersionButton)
22232827 {
2224
- Save();
2828
+ // Go to previous version
2829
+ //if (!Undo())
2830
+ //java.awt.Toolkit.getDefaultToolkit().beep();
2831
+ PreviousVersion();
2832
+ } else
2833
+ if (source == restoreButton)
2834
+ {
2835
+ // Restore current version
2836
+ Restore();
2837
+ //restoreButton.setEnabled(false);
2838
+ } else
2839
+ if (source == replaceButton)
2840
+ {
2841
+ // Overwrite current version
2842
+ Replace();
2843
+ //replaceButton.setEnabled(false);
2844
+ } else
2845
+ if (source == nextVersionButton)
2846
+ {
2847
+ // Go to next version
2848
+ NextVersion();
2849
+ } else
2850
+ if (source == saveVersionButton)
2851
+ {
2852
+ // Save a new version
2853
+ if (!Save(true))
2854
+ java.awt.Toolkit.getDefaultToolkit().beep();
2855
+ } else
2856
+ if (source == deleteVersionButton)
2857
+ {
2858
+ // Delete a new version
2859
+ DeleteVersion();
22252860 } else
22262861 if (source == oneStepButton)
22272862 {
....@@ -2230,17 +2865,14 @@
22302865 } else
22312866 if (source == screenfitButton)
22322867 {
2233
- //Reload(lastConverter, lastFilename, true);
22342868 ScreenFit();
22352869 } else
22362870 if (source == screenfitpointButton)
22372871 {
2238
- //Reload(lastConverter, lastFilename, true);
22392872 ScreenFitPoint();
22402873 } else
22412874 if (source == snapobjectButton)
22422875 {
2243
- //Reload(lastConverter, lastFilename, true);
22442876 SnapObject();
22452877 } else
22462878 // if (event.getSource() == recompileButton)
....@@ -2279,11 +2911,11 @@
22792911 } else
22802912 if (source == undoItem)
22812913 {
2282
- Undo();
2914
+ PreviousVersion();
22832915 } else
22842916 if (source == redoItem)
22852917 {
2286
- Redo();
2918
+ NextVersion();
22872919 } else
22882920 if (source == duplicateItem)
22892921 {
....@@ -2604,7 +3236,7 @@
26043236 {
26053237 StepAll();
26063238 } else
2607
- if (source == clearItem) // || event.getSource() == clearButton)
3239
+ if (source == deleteItem) // || event.getSource() == clearButton)
26083240 {
26093241 //int indices[] = jList.getSelectedIndices();
26103242 //for (int i = indices.length - 1; i >= 0; i--)
....@@ -2764,22 +3396,34 @@
27643396 } else
27653397 if (source == ungroupItem || source == ungroupButton)
27663398 {
2767
- boolean hasRoot = false;
3399
+ boolean canUngroup = true;
27683400
27693401 for (int i=0; i<group.selection.size(); i++)
27703402 {
2771
- if (group.selection.get(i) == group)
3403
+ Object3D selectedItem = group.selection.get(i);
3404
+
3405
+ if (selectedItem.Size() == 0)
27723406 {
2773
- hasRoot = true;
3407
+ // Cannot ungroup leaves
3408
+ canUngroup = false;
3409
+ break;
3410
+ }
3411
+
3412
+ if (selectedItem == group)
3413
+ {
3414
+ // Cannot ungroup root
3415
+ canUngroup = false;
27743416 break;
27753417 }
27763418 }
27773419
2778
- if (!hasRoot)
3420
+ if (canUngroup)
27793421 {
27803422 for (int i=0; i<group.selection.size(); i++)
27813423 {
2782
- Ungroup(group.selection.get(i));
3424
+ Object3D selectedItem = group.selection.get(i);
3425
+
3426
+ Ungroup(selectedItem);
27833427 }
27843428
27853429 ClearSelection(false);
....@@ -2830,6 +3474,10 @@
28303474 if (source == clearMaterialsItem)
28313475 {
28323476 ClearMaterials();
3477
+ } else
3478
+ if (source == clearVersionsItem)
3479
+ {
3480
+ ClearVersions();
28333481 } else
28343482 if (source == liveleavesItem)
28353483 {
....@@ -2971,6 +3619,18 @@
29713619 {
29723620 TransformChildren();
29733621 } else
3622
+ if (source == textureRatioRItem)
3623
+ {
3624
+ TextureRatio(0);
3625
+ } else
3626
+ if (source == textureRatioGItem)
3627
+ {
3628
+ TextureRatio(1);
3629
+ } else
3630
+ if (source == textureRatioBItem)
3631
+ {
3632
+ TextureRatio(2);
3633
+ } else
29743634 if (source == resetTransformItem)
29753635 {
29763636 ResetTransform();
....@@ -3086,7 +3746,7 @@
30863746 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
30873747 {
30883748 obj = (Object3D)e.nextElement();
3089
- obj.SetBumpTexture(null);
3749
+ obj.ResetBumpTexture();
30903750 }
30913751
30923752 refreshContents();
....@@ -3100,6 +3760,31 @@
31003760 obj.SetBumpTexture(obj.GetPigmentTexture());
31013761 }
31023762
3763
+ refreshContents();
3764
+ } else
3765
+ if (source == embedTexturesItem)
3766
+ {
3767
+ Object3D obj;
3768
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3769
+ {
3770
+ obj = (Object3D)e.nextElement();
3771
+ obj.EmbedTextures(true);
3772
+ }
3773
+
3774
+ refreshContents();
3775
+ } else
3776
+ if (source == deEmbedTexturesItem)
3777
+ {
3778
+ Object3D obj;
3779
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3780
+ {
3781
+ obj = (Object3D)e.nextElement();
3782
+ obj.EmbedTextures(false);
3783
+ }
3784
+
3785
+ CameraPane.texturepigment.clear();
3786
+ CameraPane.texturebump.clear();
3787
+
31033788 refreshContents();
31043789 } else
31053790 if (source == flashSelectionButton)
....@@ -3117,38 +3802,7 @@
31173802 if (CameraPane.FULLSCREEN)
31183803 fullscreenLayout = radio.layout;
31193804
3120
- // bug
3121
- //gridPanel.setDividerLocation(1.0);
3122
- //bigPanel.setDividerLocation(0.0);
3123
-// bigThree.remove(scenePanel);
3124
-// bigThree.remove(centralPanel);
3125
-// bigThree.remove(XYZPanel);
3126
-// aWindowConstraints.gridx = 0;
3127
-// aWindowConstraints.gridy = 0;
3128
-// aWindowConstraints.gridwidth = 1;
3129
-// // aConstraints.gridheight = 3;
3130
-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3131
-// aWindowConstraints.weightx = 0;
3132
-// aWindowConstraints.weighty = 1;
3133
-// //bigThree.add(jtp, aWindowConstraints);
3134
-// aWindowConstraints.weightx = 1;
3135
-// aWindowConstraints.gridwidth = 3;
3136
-// // aConstraints.gridheight = 3;
3137
-// aWindowConstraints.gridx = 1;
3138
-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3139
-// bigThree.add(centralPanel, aWindowConstraints);
3140
-// aWindowConstraints.weightx = 0;
3141
-// aWindowConstraints.gridx = 4;
3142
-// aWindowConstraints.gridwidth = 1;
3143
-// // aConstraints.gridheight = 3;
3144
-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3145
-// //bigThree.add(XYZPanel, aWindowConstraints);
3146
-// scenePanel.setVisible(false);
3147
-// centralPanel.setVisible(true);
3148
-// XYZPanel.setVisible(false);
3149
- bigThree.ClearUI();
3150
- bigThree.add(centralPanel);
3151
- bigThree.FlushUI();
3805
+ Show3DView();
31523806
31533807 cameraView.requestFocusInWindow();
31543808
....@@ -3203,8 +3857,8 @@
32033857 // centralPanel.setVisible(true);
32043858 // XYZPanel.setVisible(true);
32053859 bigThree.ClearUI();
3860
+ bigThree.add(scenePanel);
32063861 bigThree.add(centralPanel);
3207
- bigThree.add(XYZPanel);
32083862 bigThree.FlushUI();
32093863
32103864 cameraView.requestFocusInWindow();
....@@ -3284,8 +3938,8 @@
32843938 // centralPanel.setVisible(true);
32853939 // XYZPanel.setVisible(false);
32863940 bigThree.ClearUI();
3287
- bigThree.add(scenePanel);
32883941 bigThree.add(centralPanel);
3942
+ bigThree.add(scenePanel);
32893943 bigThree.FlushUI();
32903944
32913945 cameraView.requestFocusInWindow();
....@@ -3334,6 +3988,7 @@
33343988 } else
33353989 if (source == rootButton)
33363990 {
3991
+ Replace();
33373992 Object3D obj;
33383993 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
33393994 {
....@@ -3348,6 +4003,9 @@
33484003 if (source == closeButton)
33494004 {
33504005 //System.out.println("CLOSE: " + buttonGroup.getSelection());
4006
+ if (copy.versionlist != null)
4007
+ Replace();
4008
+
33514009 cRadio ab;
33524010 for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
33534011 {
....@@ -3391,10 +4049,10 @@
33914049 {
33924050 Object3D child = (Object3D)e.nextElement();
33934051 if(child.editWindow != null)
3394
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
33954052 child.pinned = false;
33964053 child.CloseUI();
33974054 listUI.remove(child);
4055
+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
33984056
33994057 //child.editWindow = null; // ???????????
34004058 }
....@@ -3413,6 +4071,7 @@
34134071 obj.CloseUI();
34144072 }
34154073 listUI.clear();
4074
+ SetPinStates(group.selection.size() > 0);
34164075 refreshContents(true);
34174076 } else
34184077 if (source == allParamsButton)
....@@ -3445,6 +4104,9 @@
34454104 } else
34464105 if(source instanceof cRadio)
34474106 {
4107
+ if (copy.versionlist != null)
4108
+ Replace();
4109
+
34484110 group.parent = keepparent;
34494111 group.attributes = 0;
34504112 //group.editWindow = null;
....@@ -3468,6 +4130,7 @@
34684130 }
34694131
34704132 copy = group;
4133
+
34714134 //Globals.theRenderer.object = group;
34724135 if(!useclient)
34734136 {
....@@ -3495,9 +4158,37 @@
34954158 */
34964159 radio.layout.doClick();
34974160
4161
+ //assert(copy instanceof Composite);
4162
+
4163
+ if (copy.versionlist == null)
4164
+ {
4165
+ copy.versionindex = -1;
4166
+
4167
+ // Cannot work with loops
4168
+ // To fix this issue, we first mark all nodes above the root,
4169
+ // and check if any of these nodes are reachable below the root.
4170
+ Grafreed.grafreed.universe.TagObjects(copy, true);
4171
+
4172
+ if (copy instanceof Composite && copy.versionlist == null && !copy.HasTags())
4173
+ {
4174
+ copy.versionlist = new Object3D[100];
4175
+
4176
+ //Save(true);
4177
+ }
4178
+ else
4179
+ copy.versionindex = -2;
4180
+
4181
+ Grafreed.grafreed.universe.TagObjects(copy, false);
4182
+ }
4183
+
4184
+ SetVersionStates();
4185
+
34984186 ClearUnpinned();
3499
- SetPinStates(group.selection.size() > 0);
3500
- if (group.selection.size() == 1)
4187
+
4188
+ //Grafreed.Assert(group != null);
4189
+ //Grafreed.Assert(group.selection != null);
4190
+ SetPinStates(group.selection == null || group.selection.size() > 0);
4191
+ if (group.selection == null || group.selection.size() == 1)
35014192 EditSelection(false);
35024193 keepparent = group.parent;
35034194 // PARENT = NULL or not???
....@@ -3510,11 +4201,13 @@
35104201 } else if (event.getSource() == editCameraItem)
35114202 {
35124203 cameraView.ProtectCamera();
4204
+ cameraView.requestFocusInWindow();
35134205 cameraView.repaint();
35144206 return;
35154207 } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
35164208 {
35174209 cameraView.RevertCamera();
4210
+ cameraView.requestFocusInWindow();
35184211 cameraView.repaint();
35194212 return;
35204213 // } else if (event.getSource() == textureButton)
....@@ -3603,6 +4296,18 @@
36034296 refreshContents();
36044297 }
36054298
4299
+ void TextureRatio(int axis)
4300
+ {
4301
+ Object3D obj;
4302
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
4303
+ {
4304
+ obj = (Object3D)e.nextElement();
4305
+ obj.TextureRatio(axis);
4306
+ }
4307
+
4308
+ refreshContents();
4309
+ }
4310
+
36064311 void ResetTransform()
36074312 {
36084313 ResetTransform(-1);
....@@ -3618,42 +4323,8 @@
36184323 if (obj.toParent == null)
36194324 continue;
36204325
3621
- if (mask == -1)
3622
- {
3623
- if (obj instanceof Camera) // jan 2014
3624
- {
3625
- LA.matIdentity(obj.toParent);
3626
- LA.matIdentity(obj.fromParent);
3627
- }
3628
- else
3629
- {
3630
- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
3631
- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
3632
- }
3633
- TouchTransform(obj);
3634
- continue;
3635
- }
3636
- if ((mask&2) != 0) // Scale
3637
- {
3638
- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3639
- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
3640
- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
3641
- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3642
- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3643
- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3644
- }
3645
- if ((mask&4) != 0) // Rotation
3646
- {
3647
- // ?
3648
- }
3649
- if ((mask&1) != 0) // Translation
3650
- {
3651
- if (obj.toParent != null)
3652
- {
3653
- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
3654
- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
3655
- }
3656
- }
4326
+ obj.ResetTransform(mask);
4327
+
36574328 if (obj.parent == null)
36584329 {
36594330 System.out.println("NULL PARENT!");
....@@ -4091,7 +4762,7 @@
40914762
40924763 try
40934764 {
4094
- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
4765
+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
40954766 }
40964767 catch (Exception e)
40974768 {
....@@ -4161,6 +4832,12 @@
41614832 for (int i=0; i<group.selection.size(); i++)
41624833 {
41634834 Object3D obj = group.selection.get(i);
4835
+
4836
+ if (obj.toParent == null)
4837
+ {
4838
+ obj.toParent = LA.newMatrix();
4839
+ obj.fromParent = LA.newMatrix();
4840
+ }
41644841
41654842 LA.matTranslate(obj.toParent, i * scale, 0, 0);
41664843 LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
....@@ -4453,6 +5130,12 @@
44535130 refreshContents();
44545131 }
44555132
5133
+ void ClearVersions()
5134
+ {
5135
+ group.selection.ClearVersions();
5136
+ refreshContents();
5137
+ }
5138
+
44565139 void FlipV(boolean flip)
44575140 {
44585141 group.selection.FlipV(flip);
....@@ -4568,6 +5251,12 @@
45685251
45695252 void EditSelection(boolean newWindow)
45705253 {
5254
+ if (group.selection == null)
5255
+ {
5256
+ EditElement(group, newWindow); // ? new
5257
+ return;
5258
+ }
5259
+
45715260 // aConstraints.gridy = 0;
45725261 for (int i=0; i<group.selection.size(); i++)
45735262 {
....@@ -4578,12 +5267,7 @@
45785267 Object3D elem = (Object3D)group.selection.elementAt(i);
45795268 if(elem != group || !newWindow)
45805269 {
4581
- // if (!(elem instanceof Composite))
4582
- // newWindow = false;
4583
- listUI.add(elem);
4584
- elem.openEditWindow(this, newWindow); //, false);
4585
- System.out.println("edit : " + elem);
4586
- elem.editWindow.refreshContents(true); // ? new
5270
+ EditElement(elem, newWindow); // ? new
45875271 }
45885272 }
45895273 }
....@@ -4646,9 +5330,7 @@
46465330
46475331 freezemodel = false;
46485332 }
4649
-
4650
- boolean flashIt = true;
4651
-
5333
+
46525334 public void valueChanged(TreeSelectionEvent e)
46535335 //public boolean handleEvent(Event event)
46545336 {
....@@ -4721,14 +5403,32 @@
47215403 {
47225404 editButton.setEnabled(enabled);
47235405 uneditButton.setEnabled(enabled);
4724
- unselectButton.setEnabled(enabled);
5406
+ //unselectButton.setEnabled(enabled);
47255407 flashSelectionButton.setEnabled(enabled);
5408
+
5409
+ clearPanelButton.setEnabled(!listUI.isEmpty());
5410
+
5411
+ boolean allComposites = true;
5412
+
5413
+ if (group.selection != null)
5414
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5415
+ {
5416
+ Object next = e.nextElement();
5417
+ if (!(next instanceof Composite)) // || (next instanceof GroupLeaf))
5418
+ {
5419
+ allComposites = false;
5420
+ break;
5421
+ }
5422
+ }
5423
+
5424
+ rootButton.setEnabled(true); // allComposites);
47265425 }
47275426
47285427 void refreshContents(boolean cp)
47295428 {
4730
- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4731
- if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
5429
+ if (Globals.ADVANCED)
5430
+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5431
+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
47325432 {
47335433 objEditor.ClearInfo(); // .GetMaterial());
47345434
....@@ -4737,7 +5437,7 @@
47375437 Object3D child = (Object3D) group.selection.get(i);
47385438
47395439 objEditor.AddInfo(child, this, true);
4740
- System.err.println("info : " + child.GetPath());
5440
+// System.err.println("info : " + child.GetPath());
47415441 }
47425442
47435443 objEditor.SetText(); // jan 2014
....@@ -4827,8 +5527,8 @@
48275527
48285528 if (cut)
48295529 {
4830
- if (Globals.SAVEONMAKE)
4831
- Save();
5530
+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
5531
+// Save();
48325532 //int indices[] = jList.getSelectedIndices();
48335533 //for (int i = indices.length - 1; i >= 0; i--)
48345534 //jList.remove(indices[i]);
....@@ -4931,6 +5631,10 @@
49315631
49325632 void paste(boolean expand)
49335633 {
5634
+ if (Globals.REPLACEONMAKE)
5635
+ Save();
5636
+ boolean keep = Globals.REPLACEONMAKE;
5637
+ Globals.REPLACEONMAKE = false;
49345638 // if (GrafreeD.clipboard == null)
49355639 // return;
49365640 boolean first = true;
....@@ -4990,6 +5694,7 @@
49905694 Grafreed.clipboard.get(0).parent = keepparent;
49915695 }
49925696
5697
+ Globals.REPLACEONMAKE = keep;
49935698 ResetModel();
49945699 refreshContents();
49955700 }
....@@ -5125,6 +5830,10 @@
51255830
51265831 void group(Object3D csg, boolean grab)
51275832 {
5833
+ if (Globals.REPLACEONMAKE)
5834
+ Save();
5835
+ boolean keep = Globals.REPLACEONMAKE;
5836
+ Globals.REPLACEONMAKE = false;
51285837 if (//false) // why??
51295838 !group.selection.isEmpty())
51305839 {
....@@ -5238,10 +5947,15 @@
52385947 //node.add(csg);
52395948 //makeSomething(node);
52405949 makeSomething(csg);
5950
+ Globals.REPLACEONMAKE = keep;
52415951 }
52425952
52435953 void Ungroup(Object3D g)
52445954 {
5955
+ if (Globals.REPLACEONMAKE)
5956
+ Save();
5957
+ boolean keep = Globals.REPLACEONMAKE;
5958
+ Globals.REPLACEONMAKE = false;
52455959 if (g instanceof HiddenObject)
52465960 {
52475961 HiddenObject h = (HiddenObject) g;
....@@ -5258,6 +5972,7 @@
52585972 objEditor.makeSomething(g.get(i), false);
52595973 }
52605974 }
5975
+ Globals.REPLACEONMAKE = keep;
52615976 }
52625977
52635978 void ungroup()
....@@ -5548,7 +6263,6 @@
55486263
55496264 cButton restoreCameraButton;
55506265
5551
- cButton saveButton;
55526266 cButton oneStepButton;
55536267
55546268 cButton groupButton;
....@@ -5557,6 +6271,22 @@
55576271 cButton switchButton;
55586272 cButton loopButton;
55596273 cButton textureButton;
6274
+
6275
+ cButton skybox1Button;
6276
+ cButton skybox2Button;
6277
+ cButton skybox3Button;
6278
+ cButton skybox4Button;
6279
+ cButton skybox5Button;
6280
+ cButton skybox6Button;
6281
+ cButton skybox7Button;
6282
+
6283
+ cButton skybox11Button;
6284
+ cButton skybox12Button;
6285
+ cButton skybox13Button;
6286
+ cButton skybox14Button;
6287
+ cButton skybox15Button;
6288
+ cButton skybox16Button;
6289
+ cButton skybox17Button;
55606290
55616291 cButton gridButton;
55626292 cButton boxButton;
....@@ -5590,11 +6320,11 @@
55906320 private MenuItem lookAtItem;
55916321 private MenuItem lookFromItem;
55926322 private MenuItem switchViewItem;
5593
- private MenuItem cutItem;
6323
+ private JMenuItem cutItem;
55946324 private MenuItem undoItem;
55956325 private MenuItem redoItem;
55966326 private JMenuItem duplicateItem;
5597
- private MenuItem cloneItem;
6327
+ private JMenuItem cloneItem;
55986328 private MenuItem cloneSupportItem;
55996329 private MenuItem overwriteGeoItem;
56006330 private MenuItem overwriteMatItem;
....@@ -5615,13 +6345,13 @@
56156345 private MenuItem cloneGeometriesItem;
56166346 private MenuItem shareGeometriesItem;
56176347 private MenuItem mergeGeometriesItem;
5618
- private MenuItem copyItem;
6348
+ private JMenuItem copyItem;
56196349 private MenuItem pasteItem;
5620
- private MenuItem pasteIntoItem;
5621
- private MenuItem pasteLinkItem;
5622
- private MenuItem pasteCloneItem;
5623
- private MenuItem pasteExpandItem;
5624
- private MenuItem clearItem;
6350
+ private JMenuItem pasteIntoItem;
6351
+ private JMenuItem pasteLinkItem;
6352
+ private JMenuItem pasteCloneItem;
6353
+ private JMenuItem pasteExpandItem;
6354
+ private JMenuItem deleteItem;
56256355 private MenuItem clearAllItem;
56266356 private MenuItem genUVItem;
56276357 private MenuItem genNormalsMESHItem;
....@@ -5647,6 +6377,7 @@
56476377 private MenuItem clipMeshItem;
56486378 private MenuItem smoothMeshItem;
56496379 private MenuItem clearMaterialsItem;
6380
+ private MenuItem clearVersionsItem;
56506381
56516382 private MenuItem liveleavesItem;
56526383 private MenuItem unliveleavesItem;
....@@ -5670,13 +6401,16 @@
56706401 private MenuItem maxTexturesItem;
56716402 private MenuItem panoTexturesItem;
56726403
6404
+ private MenuItem textureRatioRItem;
6405
+ private MenuItem textureRatioGItem;
6406
+ private MenuItem textureRatioBItem;
56736407 private MenuItem resetCentroidItem;
56746408 private MenuItem resetCentroidXZItem;
56756409 private MenuItem resetTransformItem;
56766410 private MenuItem transformGeometryItem;
56776411 private MenuItem transformChildrenItem;
56786412 private MenuItem hideItem;
5679
- private MenuItem grabItem;
6413
+ private JMenuItem grabItem;
56806414 private MenuItem backItem;
56816415 private MenuItem frontItem;
56826416 private MenuItem cameraItem;
....@@ -5689,7 +6423,7 @@
56896423 private MenuItem switchTransfoItem;
56906424 private MenuItem morphItem;
56916425 private MenuItem linkerItem;
5692
- private MenuItem ungroupItem;
6426
+ private JMenuItem ungroupItem;
56936427 private MenuItem editItem;
56946428 private MenuItem openWindowItem;
56956429 private MenuItem editLeafItem;
....@@ -5705,6 +6439,8 @@
57056439 private MenuItem attachBumpItem;
57066440 private MenuItem detachBumpItem;
57076441 private MenuItem pigmentBumpItem;
6442
+ private MenuItem embedTexturesItem;
6443
+ private MenuItem deEmbedTexturesItem;
57086444
57096445 private MenuItem particleItem;
57106446 private MenuItem ragdollItem;