Normand Briere
2019-06-26 89b25e7cc97f6fe221dfd41c4d463500f8a31bc1
GroupEditor.java
....@@ -12,6 +12,7 @@
1212 import com.jme.math.Vector3f;
1313 import com.jme.renderer.ColorRGBA;
1414
15
+import grafeme.ui.*;
1516 //import buoy.widget.BFileChooser;
1617
1718 class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
....@@ -73,7 +74,7 @@
7374 this.copy = this.group = copy;
7475 //selectees = this.group.selectees;
7576
76
- SetupMenu2(objEditor);
77
+ SetupMenu2(this); //objEditor);
7778 SetupUI2(objEditor);
7879 objEditor.SetupUI(true);
7980 SetupViews(objEditor);
....@@ -97,14 +98,14 @@
9798
9899 void CloneClipboard(boolean supports)
99100 {
100
- assert(GrafreeD.clipboard.parent == null);
101
- Object3D /*Composite*/ keepparent = GrafreeD.clipboard.get(0).parent;
102
- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
103
- if (LA.isIdentity(GrafreeD.clipboard.toParent))
104
- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
101
+ assert(Grafreed.clipboard.parent == null);
102
+ Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
103
+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
104
+ if (LA.isIdentity(Grafreed.clipboard.toParent))
105
+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105106 else
106
- makeSomething(CloneObject(GrafreeD.clipboard, false));
107
- GrafreeD.clipboard.get(0).parent = keepparent;
107
+ makeSomething(CloneObject(Grafreed.clipboard, false));
108
+ Grafreed.clipboard.get(0).parent = keepparent;
108109 }
109110
110111 static Object3D CloneObject(Object3D obj, boolean supports)
....@@ -118,7 +119,7 @@
118119 // obj.support = null;
119120 if (!supports)
120121 obj.SaveSupports();
121
- Object3D clone = (Object3D)GrafreeD.clone(obj);
122
+ Object3D clone = (Object3D)Grafreed.clone(obj);
122123 obj.parent = parent;
123124 // obj.support = support;
124125 // clone.support = support; // aout 2013
....@@ -147,30 +148,29 @@
147148
148149 //JTextField nameField;
149150
150
- void SetupMenu2(ObjEditor oe)
151
+ void SetupMenu2(GroupEditor oe)
151152 {
152
- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153
- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154
- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
155
- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
156
- oe.cameraMenu.add("-");
157
- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
158
- openWindowItem.addActionListener(this);
159
- editLeafItem.addActionListener(this);
160
- lookAtItem.addActionListener(this);
161
- //lookFromItem.addActinoListener(this);
162
- //switchItem.addActionListener(this);
153
+ oe.jTree = new cTree();
154
+
163155 Menu menu;
164156 oe.menuBar.add(menu = new Menu("Edit"));
165157 //editItem = menu.add(new MenuItem("Edit"));
166158 //editItem.addActionListener(this);
167
- duplicateItem = menu.add(new MenuItem("Duplicate"));
159
+
160
+// undoItem = menu.add(new MenuItem("Undo"));
161
+// undoItem.addActionListener(this);
162
+// redoItem = menu.add(new MenuItem("Redo"));
163
+// redoItem.addActionListener(this);
164
+// menu.add("-");
165
+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168166 duplicateItem.addActionListener(this);
169
- menu.add("-");
170167 cloneItem = menu.add(new MenuItem("Clone"));
171168 cloneItem.addActionListener(this);
169
+ if (Globals.ADVANCED)
170
+ {
172171 cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173172 cloneSupportItem.addActionListener(this);
173
+ }
174174 menu.add("-");
175175 cutItem = menu.add(new MenuItem("Cut"));
176176 cutItem.addActionListener(this);
....@@ -178,27 +178,123 @@
178178 copyItem.addActionListener(this);
179179 pasteItem = menu.add(new MenuItem("Paste"));
180180 pasteItem.addActionListener(this);
181
+
182
+ menu.add("-");
183
+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
184
+ pasteIntoItem.addActionListener(this);
181185 pasteLinkItem = menu.add(new MenuItem("Paste link"));
182186 pasteLinkItem.addActionListener(this);
183187 pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184188 pasteCloneItem.addActionListener(this);
185189 // pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186190 // pasteExpandItem.addActionListener(this);
191
+ menu.add("-");
187192 clearItem = menu.add(new MenuItem("Clear"));
188193 clearItem.addActionListener(this);
194
+
195
+ if (Globals.ADVANCED)
196
+ {
197
+ // Deletes the cameras...
189198 clearAllItem = menu.add(new MenuItem("Clear All"));
190199 clearAllItem.addActionListener(this);
200
+ }
201
+
202
+ menuBar.add(cameraMenu = new Menu("View"));
203
+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
204
+ //zBufferItem.addActionListener(this);
205
+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
206
+ //normalLensItem.addActionListener(this);
207
+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
208
+ restoreCameraItem.addActionListener(this);
209
+
210
+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
211
+// toggleFullScreenItem.addItemListener(this);
212
+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
213
+// cameraMenu.add("-");
214
+//
215
+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
216
+// toggleTextureItem.addItemListener(this);
217
+// toggleTextureItem.setState(CameraPane.textureon);
218
+//
219
+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
220
+// toggleSwitchItem.addItemListener(this);
221
+// toggleSwitchItem.setState(CameraPane.SWITCH);
222
+
223
+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
224
+ toggleHandleItem.addItemListener(this);
225
+ toggleHandleItem.setState(CameraPane.HANDLES);
226
+
227
+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
228
+ togglePaintItem.addItemListener(this);
229
+ togglePaintItem.setState(CameraPane.PAINTMODE);
230
+
231
+ if (Globals.ADVANCED)
232
+ {
233
+ cameraMenu.add("-");
234
+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
235
+ toggleLiveItem.addItemListener(this);
236
+ toggleLiveItem.setState(Globals.isLIVE());
191237
238
+ cameraMenu.add(stepItem = new MenuItem("Step"));
239
+ stepItem.addActionListener(this);
240
+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
241
+ // toggleDLItem.addItemListener(this);
242
+ // toggleDLItem.setState(false);
243
+
244
+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
245
+ toggleRenderItem.addItemListener(this);
246
+ toggleRenderItem.setState(!CameraPane.frozen);
247
+
248
+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
249
+ toggleDebugItem.addItemListener(this);
250
+ toggleDebugItem.setState(Globals.DEBUG);
251
+
252
+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
253
+ toggleFrustumItem.addItemListener(this);
254
+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
255
+
256
+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
257
+ toggleFootContactItem.addItemListener(this);
258
+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
259
+
260
+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
261
+ toggleTimelineItem.addItemListener(this);
262
+ }
263
+
264
+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
265
+// toggleRootItem.addItemListener(this);
266
+// toggleRootItem.setState(false);
267
+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
268
+// animationItem.addItemListener(this);
269
+// animationItem.setState(CameraPane.ANIMATION);
270
+ cameraMenu.add("-");
271
+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
272
+ editCameraItem.addActionListener(this);
273
+
274
+ if (Globals.ADVANCED)
275
+ {
276
+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
277
+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
278
+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
279
+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
280
+ oe.cameraMenu.add("-");
281
+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
282
+ openWindowItem.addActionListener(this);
283
+ editLeafItem.addActionListener(this);
284
+ lookAtItem.addActionListener(this);
285
+ //lookFromItem.addActinoListener(this);
286
+ //switchViewItem.addActionListener(this);
287
+ }
288
+
192289 oe.menuBar.add(menu = new Menu("Setting"));
193
- resetMeshItem = menu.add(new MenuItem("Reset All"));
194
- resetMeshItem.addActionListener(this);
195
- stepAllItem = menu.add(new MenuItem("Step All"));
196
- stepAllItem.addActionListener(this);
290
+ if (Globals.ADVANCED)
291
+ {
197292 revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198293 revertMeshItem.addActionListener(this);
199294 resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200295 resetreferencesItem.addActionListener(this);
201296 menu.add("-");
297
+ }
202298 overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203299 overwriteGeoItem.addActionListener(this);
204300 overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
....@@ -210,79 +306,103 @@
210306 overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211307 overwriteUVItem.addActionListener(this);
212308 menu.add("-");
309
+ if (Globals.ADVANCED)
310
+ {
213311 generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214312 generateMeshItem.addActionListener(this);
215313 poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216314 poseMeshItem.addActionListener(this);
217315 menu.add("-");
316
+ }
218317 resetsupportItem = menu.add(new MenuItem("Reset support"));
219318 resetsupportItem.addActionListener(this);
220319 linkverticesItem = menu.add(new MenuItem("Link to Support"));
221320 linkverticesItem.addActionListener(this);
222321 relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223322 relinkverticesItem.addActionListener(this);
323
+
324
+ if (Globals.ADVANCED)
325
+ {
224326 setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225327 setMasterItem.addActionListener(this);
328
+ }
226329
227330 oe.menuBar.add(menu = new Menu("Group"));
228
- grabItem = menu.add(new MenuItem("Grab"));
229
- grabItem.addActionListener(this);
331
+// grabItem = menu.add(new MenuItem("Grab"));
332
+// grabItem.addActionListener(this);
230333 backItem = menu.add(new MenuItem("Back"));
231334 backItem.addActionListener(this);
232335 frontItem = menu.add(new MenuItem("Front"));
233336 frontItem.addActionListener(this);
234
- compositeItem = menu.add(new MenuItem("Composite"));
235
- compositeItem.addActionListener(this);
236
- hideItem = menu.add(new MenuItem("Hide"));
337
+// compositeItem = menu.add(new MenuItem("Composite"));
338
+// compositeItem.addActionListener(this);
339
+
340
+ if (Globals.ADVANCED)
341
+ {
342
+ hideItem = menu.add(new MenuItem("Hidden Group"));
237343 hideItem.addActionListener(this);
344
+ }
238345 ungroupItem = menu.add(new MenuItem("Ungroup"));
239346 ungroupItem.addActionListener(this);
240
- menu.add("-");
241
- randomItem = menu.add(new MenuItem("Random"));
242
- randomItem.addActionListener(this);
243
- physicsItem = menu.add(new MenuItem("Physics"));
244
- physicsItem.addActionListener(this);
245
- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
246
- frameselectorItem.addActionListener(this);
347
+
348
+// menu.add("-");
349
+//
350
+// switchItem = menu.add(new MenuItem("Switch node"));
351
+// switchItem.addActionListener(this);
352
+ if (Globals.ADVANCED)
353
+ {
247354 switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248355 switchGeoItem.addActionListener(this);
249356 switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250357 switchTransfoItem.addActionListener(this);
251
- morphItem = menu.add(new MenuItem("Morph"));
358
+ morphItem = menu.add(new MenuItem("Morph Group"));
252359 morphItem.addActionListener(this);
360
+
361
+ menu.add("-");
362
+ physicsItem = menu.add(new MenuItem("Physics"));
363
+ physicsItem.addActionListener(this);
364
+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
365
+ frameselectorItem.addActionListener(this);
253366 scriptNodeItem = menu.add(new MenuItem("Script Node"));
254367 scriptNodeItem.addActionListener(this);
255
- cameraItem = menu.add(new MenuItem("Camera"));
256
- cameraItem.addActionListener(this);
368
+ }
257369
258370 oe.menuBar.add(menu = new Menu("Object"));
259
- textureItem = menu.add(new MenuItem("Texture"));
260
- textureItem.addActionListener(this);
371
+// textureItem = menu.add(new MenuItem("Texture"));
372
+// textureItem.addActionListener(this);
261373 billboardItem = menu.add(new MenuItem("Billboard"));
262374 billboardItem.addActionListener(this);
263375 csgItem = menu.add(new MenuItem("CSG"));
264376 csgItem.addActionListener(this);
265
- shadowXItem = menu.add(new MenuItem("Shadow X"));
377
+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
266378 shadowXItem.addActionListener(this);
267
- shadowYItem = menu.add(new MenuItem("Shadow Y"));
379
+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
268380 shadowYItem.addActionListener(this);
269
- shadowZItem = menu.add(new MenuItem("Shadow Z"));
381
+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
270382 shadowZItem.addActionListener(this);
383
+ if (Globals.ADVANCED)
384
+ {
385
+ menu.add("-");
271386 linkerItem = menu.add(new MenuItem("Linker"));
272387 linkerItem.addActionListener(this);
273
- templateItem = menu.add(new MenuItem("Template"));
274
- templateItem.addActionListener(this);
275388 attributeItem = menu.add(new MenuItem("Attribute"));
276389 attributeItem.addActionListener(this);
390
+ templateItem = menu.add(new MenuItem("Template"));
391
+ templateItem.addActionListener(this);
277392 pointflowItem = menu.add(new MenuItem("Point Flow"));
278393 pointflowItem.addActionListener(this);
394
+ }
279395 menu.add("-");
280396 resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281397 resetTransformItem.addActionListener(this);
282398 resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283399 resetCentroidItem.addActionListener(this);
284
- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285
- transformgeometryItem.addActionListener(this);
400
+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
401
+ resetCentroidXZItem.addActionListener(this);
402
+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
403
+ transformGeometryItem.addActionListener(this);
404
+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
405
+ transformChildrenItem.addActionListener(this);
286406
287407 oe.menuBar.add(menu = new Menu("Geometry"));
288408 genUVItem = menu.add(new MenuItem("Generate UV"));
....@@ -293,8 +413,11 @@
293413 genNormalsCADItem.addActionListener(this);
294414 genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295415 genNormalsMESHItem.addActionListener(this);
416
+ if (Globals.ADVANCED)
417
+ {
296418 genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
297419 genNormalsMINEItem.addActionListener(this);
420
+ }
298421 stripifyItem = menu.add(new MenuItem("Stripify"));
299422 stripifyItem.addActionListener(this);
300423 unstripifyItem = menu.add(new MenuItem("Unstripify"));
....@@ -316,23 +439,34 @@
316439 reduce34MeshItem.addActionListener(this);
317440 increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318441 increaseMeshItem.addActionListener(this);
319
- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320
- smoothMeshItem.addActionListener(this);
321442 clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322443 clipMeshItem.addActionListener(this);
444
+
445
+ if (Globals.ADVANCED)
446
+ {
447
+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
448
+ smoothMeshItem.addActionListener(this);
449
+ }
323450
324451 oe.menuBar.add(menu = new Menu("Attributes"));
325452 clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326453 clearMaterialsItem.addActionListener(this);
454
+ resetAllItem = menu.add(new MenuItem("Reset All"));
455
+ resetAllItem.addActionListener(this);
456
+ stepAllItem = menu.add(new MenuItem("Step All"));
457
+ stepAllItem.addActionListener(this);
327458 menu.add("-");
328459 liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329460 liveleavesItem.addActionListener(this);
330461 unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331462 unliveleavesItem.addActionListener(this);
463
+ if (Globals.ADVANCED)
464
+ {
332465 supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333466 supportleavesItem.addActionListener(this);
334467 unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335468 unsupportleavesItem.addActionListener(this);
469
+ }
336470 hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337471 hideleavesItem.addActionListener(this);
338472 showleavesItem = menu.add(new MenuItem("Show Leaves"));
....@@ -341,6 +475,14 @@
341475 markleavesItem.addActionListener(this);
342476 unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
343477 unmarkleavesItem.addActionListener(this);
478
+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
479
+ rewindleavesItem.addActionListener(this);
480
+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
481
+ unrewindleavesItem.addActionListener(this);
482
+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
483
+ randomleavesItem.addActionListener(this);
484
+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
485
+ unrandomleavesItem.addActionListener(this);
344486 menu.add("-");
345487 flipVItem = menu.add(new MenuItem("Flip V"));
346488 flipVItem.addActionListener(this);
....@@ -376,35 +518,40 @@
376518 sortbynameItem = menu.add(new MenuItem("Sort by name"));
377519 sortbynameItem.addActionListener(this);
378520 menu.add("-");
521
+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
522
+ shareGeometriesItem.addActionListener(this);
523
+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
524
+ mergeGeometriesItem.addActionListener(this);
525
+ if (Globals.ADVANCED)
526
+ {
527
+ // Pretty much the same as duplicate and clone.
379528 extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380529 extractGeometriesItem.addActionListener(this);
381530 cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382531 cloneGeometriesItem.addActionListener(this);
383
- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
384
- shareGeometriesItem.addActionListener(this);
385
- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
386
- mergeGeometriesItem.addActionListener(this);
532
+ }
387533
388534 oe.menuBar.add(menu = new Menu("Insert"));
389535 buildCreateMenu(menu);
390536
391
-
392
- oe.menuBar.add(menu = new Menu("Include"));
393
- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
394
- importGFDItem.addActionListener(this);
395
- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
396
- importVRMLX3DItem.addActionListener(this);
397
- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
398
- importOBJItem.addActionListener(this);
399
- import3DSItem = menu.add(new MenuItem("3DS Object..."));
400
- import3DSItem.addActionListener(this);
401
-
402537 oe.menuBar.add(menu = new Menu("Tools"));
403538 buildToolsMenu(menu);
404539 }
405540
406541 void SetupUI2(ObjEditor oe)
407542 {
543
+ // June 2019
544
+ if (oe == null)
545
+ {
546
+ //super.SetupUI2(this);
547
+ //return;
548
+ }
549
+
550
+ if (copy != group)
551
+ {
552
+ //super.SetupUI2(this);
553
+ }
554
+
408555 //new Exception().printStackTrace();
409556
410557 oe.radioPanel = new JPanel(new GridBagLayout());
....@@ -433,150 +580,213 @@
433580 oe.radioPanel.add(dummyButton);
434581 oe.buttonGroup.add(dummyButton);
435582 */
436
- aConstraints.gridy += 1;
437
- oe.aConstraints.gridwidth = 1;
438
- oe.aConstraints.gridx = 0;
583
+ cGridBag copyOptionsPanel = new cGridBag();
584
+
585
+ copyOptionsPanel.preferredHeight = 2;
439586
440
- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
587
+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
588
+
589
+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
590
+ //minButton.setToolTipText("Minimize window");
591
+ //minButton.addActionListener(this);
592
+
593
+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594
+ maxButton.setToolTipText("Maximize window");
595
+ maxButton.addActionListener(this);
596
+
597
+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
598
+ fullButton.setToolTipText("Full-screen window");
599
+ fullButton.addActionListener(this);
600
+
601
+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602
+ restoreCameraButton.setToolTipText("Restore viewpoint");
603
+ restoreCameraButton.addActionListener(this);
604
+
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);
609
+
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);
614
+
615
+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
616
+ saveButton.setToolTipText("Save changes");
617
+ saveButton.addActionListener(this);
618
+
619
+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
620
+ liveCB.setToolTipText("Enable animation");
441621 liveCB.addItemListener(this);
442622
443
- oe.aConstraints.gridx += 1;
444
- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
445
- supportCB.addItemListener(this);
446
-
447
- // oe.aConstraints.gridx += 1;
448
- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
449
- // localCB.addItemListener(this);
450
-
451
- oe.aConstraints.gridx += 1;
452
- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
453
- crowdCB.addItemListener(this);
454
-
455
- oe.aConstraints.gridx += 1;
456
- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
457
- smoothCB.addItemListener(this);
458
-
459
- oe.aConstraints.gridx += 1;
460
- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
623
+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624
+ oneStepButton.setToolTipText("Animate one step forward");
625
+ oneStepButton.addActionListener(this);
626
+
627
+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
628
+ fastCB.setToolTipText("Fast mode");
461629 fastCB.addItemListener(this);
462
- oe.aConstraints.gridx += 1;
463
- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
464
- slowCB.addItemListener(this);
465
- oe.aConstraints.gridx += 1;
466
- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
467
- boxCB.addItemListener(this);
468
-
469
-// oe.aConstraints.gridx += 1;
470
-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
471
-// speakerMocapCB.addItemListener(this);
472
-
473
- if (false)
474
- {
475
- // handled in scripts
476
- oe.aConstraints.gridx += 1;
477
- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
478
- speakerCameraCB.addItemListener(this);
479
-
480
- oe.aConstraints.gridx += 1;
481
- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
482
- speakerFocusCB.addItemListener(this);
483
-
484
- oe.aConstraints.gridx += 1;
485
- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
486
- smoothfocusCB.addItemListener(this);
487
- }
488
-
489
-//oe.aConstraints.gridx += 1;
490
-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
491
-// debugCB.addItemListener(this);
492
-
493
- oe.aConstraints.gridx += 1;
494
- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
495
- oeilCB.addItemListener(this);
496
-
497
- oe.aConstraints.gridx += 1;
498
- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
499
- lookAtCB.addItemListener(this);
500
-
501
- oe.aConstraints.gridx += 1;
502
- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
503
- trackCB.addItemListener(this);
504
-
505
- oe.aConstraints.gridx += 1;
506
- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
630
+
631
+ //oe.toolboxPanel.Return();
632
+
633
+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634
+ screenfitButton.setToolTipText("Screen fit");
507635 screenfitButton.addActionListener(this);
508
- oe.aConstraints.gridx += 1;
636
+
637
+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
638
+// trackCB.setToolTipText("Enable tracking");
639
+// trackCB.addItemListener(this);
640
+
509641 // oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
510642 // screenfitpointButton.addActionListener(this);
511
-// oe.aConstraints.gridx += 1;
512
- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
513
- snapobjectButton.addActionListener(this);
514
- oe.aConstraints.gridx += 1;
515643
516
- //aConstraints.gridx = 0;
517
- //aConstraints.gridy += 1;
518
- oe.aConstraints.weighty = 0;
519
- oe.aConstraints.gridwidth = 1;
520
-
521
- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
522
- flashSelectionButton.addActionListener(this);
523
- oe.aConstraints.gridx += 1;
524
- oe.aConstraints.weighty = 0;
525
- oe.aConstraints.gridwidth = 1;
644
+ if (Globals.ADVANCED)
645
+ {
646
+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
647
+ snapobjectButton.addActionListener(this);
648
+ snapobjectButton.setToolTipText("Snap Object");
649
+ }
650
+
651
+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
526652
527
- //
528
- oe.toolbarPanel.add(twoButton = new cButton(" |+| ")); //, oe.aConstraints);
653
+ oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654
+ twoButton.setToolTipText("Show center view only");
529655 twoButton.addActionListener(this);
530
- oe.toolbarPanel.add(fourButton = new cButton("+|| ")); //, oe.aConstraints);
656
+ this.fullscreenLayout = twoButton;
657
+
658
+ oe.toolbarPanel.add(fourButton = new cButton("-||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
531659 fourButton.addActionListener(this);
532
- oe.toolbarPanel.add(sixButton = new cButton("+|+| ")); //, oe.aConstraints);
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");
533663 sixButton.addActionListener(this);
534
- oe.toolbarPanel.add(threeButton = new cButton(" |+|+")); //, oe.aConstraints);
664
+ oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
665
+ threeButton.setToolTipText("2-column layout right");
535666 threeButton.addActionListener(this);
536
- oe.toolbarPanel.add(sevenButton = new cButton("+|+|+")); //, oe.aConstraints);
667
+ oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
668
+ sevenButton.setToolTipText("3-column layout");
537669 sevenButton.addActionListener(this);
538670 //
539671
540
- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
672
+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
673
+ rootButton.setToolTipText("Edit selection in new tab");
541674 rootButton.addActionListener(this);
542
- oe.aConstraints.gridx += 1;
543
- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
675
+
676
+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
677
+ closeButton.setToolTipText("Close tab");
544678 closeButton.addActionListener(this);
545679 //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
546680 //clearButton.addActionListener(this);
547
- oe.aConstraints.gridx += 1;
548
-
549
- oe.aConstraints.gridx = 1; //
550
- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
551
- editButton.addActionListener(this);
552
- oe.aConstraints.gridx += 1;
553
- oe.aConstraints.weighty = 0;
554
- oe.aConstraints.gridwidth = 1;
555681
556
- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
682
+ // INSERT
683
+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
684
+ gridButton.setToolTipText("Create grid");
685
+ gridButton.addActionListener(this);
686
+
687
+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
688
+ boxButton.setToolTipText("Create box");
689
+ boxButton.addActionListener(this);
690
+
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);
704
+ superButton.setToolTipText("Create superellipsoid");
705
+ superButton.addActionListener(this);
706
+
707
+ if (Globals.ADVANCED)
708
+ {
709
+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
710
+ kleinButton.setToolTipText("Create Klein bottle");
711
+ kleinButton.addActionListener(this);
712
+ }
713
+
714
+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
715
+ particlesButton.setToolTipText("Create particle system");
716
+ particlesButton.addActionListener(this);
717
+
718
+ oe.toolboxPanel.Return();
719
+
720
+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
721
+ groupButton.setToolTipText("Create group");
722
+ groupButton.addActionListener(this);
723
+
724
+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
725
+ compositeButton.setToolTipText("Create composite");
726
+ compositeButton.addActionListener(this);
727
+
728
+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
729
+ switchButton.setToolTipText("Create switch");
730
+ switchButton.addActionListener(this);
731
+
732
+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
733
+ loopButton.setToolTipText("Create loop");
734
+ loopButton.addActionListener(this);
735
+
736
+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
737
+ textureButton.setToolTipText("Create texture");
738
+ textureButton.addActionListener(this);
739
+
740
+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
741
+ overlayButton.setToolTipText("Create overlay");
742
+ overlayButton.addActionListener(this);
743
+
744
+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
745
+ lightButton.setToolTipText("Create light");
746
+ lightButton.addActionListener(this);
747
+
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
+ }
759
+
760
+ // EDIT panel
761
+ editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
762
+ editButton.setToolTipText("Edit selection");
763
+ editButton.addActionListener(this);
764
+
765
+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
766
+ uneditButton.setToolTipText("Unedit selection");
557767 uneditButton.addActionListener(this);
558768
559
- oe.aConstraints.gridx += 1;
560
- oe.aConstraints.weighty = 0;
561
- oe.aConstraints.gridwidth = 1;
562
-
563
- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
564
- clearPanelButton.addActionListener(this);
565
-
566
- oe.aConstraints.gridx += 1;
567
- oe.aConstraints.weighty = 0;
568
- oe.aConstraints.gridwidth = 1;
569
-
570
- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
769
+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
770
+ allParamsButton.setToolTipText("Edit all params");
571771 allParamsButton.addActionListener(this);
572772
573
- oe.aConstraints.gridx += 1;
574
- oe.aConstraints.weighty = 0;
575
- oe.aConstraints.gridwidth = 1;
576
-
577
- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
773
+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
774
+ clearPanelButton.setToolTipText("Clear edit panel");
775
+ clearPanelButton.addActionListener(this);
776
+
777
+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
778
+ unselectButton.setToolTipText("Unselect");
578779 unselectButton.addActionListener(this);
579780
781
+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
782
+ flashSelectionButton.setToolTipText("Highlight selection");
783
+ flashSelectionButton.addActionListener(this);
784
+
785
+ editCommandsPanel.preferredHeight = 1;
786
+
787
+// oe.treePanel.add(commandsPanel);
788
+// oe.treePanel.Return();
789
+
580790 // oe.aConstraints.gridx += 1;
581791 // oe.aConstraints.weighty = 0;
582792 // oe.aConstraints.gridwidth = 1;
....@@ -588,40 +798,22 @@
588798 // oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
589799 // gcButton.addActionListener(this);
590800
591
- oe.aConstraints.gridx = 0;
592
- oe.aConstraints.gridy += 1;
593
-
594
- //ctrlPanel.add(objList = new List(5, true));
595
- oe.aConstraints.gridwidth = 100;
596
- // oe.aConstraints.gridheight = 100;
597
- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
598
- oe.aConstraints.gridheight = 1;
599
- oe.aConstraints.weighty = 0.5;
600
- oe.aConstraints.gridx = 0;
601
- JScrollPane jSP;
801
+ cGridBag jSPPanel = new cGridBag();
802
+
803
+ JScrollPane jSP;
602804 //ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
603
- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
805
+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
604806 ResetModel();
605
- oe.aConstraints.weighty = 0.5;
606
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
607
- oe.aConstraints.gridy += 1;
608
- oe.aConstraints.gridwidth = 1;
609
-
610
- oe.aConstraints.weighty = 0;
611
- oe.aConstraints.gridwidth = 2;
612
-
613
- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
614
- colorCB.addItemListener(this);
615
- oe.aConstraints.gridx += 2;
616
- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
617
- materialCB.addItemListener(this);
618
- oe.aConstraints.gridx += 2;
619
- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
620
- textureCB.addItemListener(this);
621
-
622
- oe.aConstraints.gridx = 0;
623
- oe.aConstraints.gridy += 1;
624807
808
+ oe.treePanel.add(jSPPanel);
809
+ oe.treePanel.Return();
810
+
811
+ oe.treePanel.add(copyOptionsPanel);
812
+ oe.treePanel.Return();
813
+
814
+// mainPanel.setDividerLocation(0.5); //1.0);
815
+// mainPanel.setResizeWeight(0.5);
816
+
625817 //jList.addListSelectionListener(this);
626818 oe.jTree.addTreeSelectionListener(this);
627819 //jTree.setRootVisible(false);
....@@ -643,20 +835,153 @@
643835 radio.layout = sevenButton;
644836 oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
645837 }
838
+
839
+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
840
+ {
841
+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
842
+ colorCB.setToolTipText("Copy color when dropped");
843
+ colorCB.addItemListener(this);
844
+
845
+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
846
+ materialCB.setToolTipText("Copy material when dropped");
847
+ materialCB.addItemListener(this);
848
+
849
+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
850
+ textureCB.setToolTipText("Copy texture when dropped");
851
+ textureCB.addItemListener(this);
852
+
853
+ panel.Return();
854
+
855
+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
856
+ boxCB.setToolTipText("Display bounding boxes");
857
+ boxCB.addItemListener(this);
858
+
859
+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
860
+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
861
+ zoomBoxCB.addItemListener(this);
862
+
863
+ if (true) // Globals.ADVANCED)
864
+ {
865
+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
866
+ supportCB.setToolTipText("Enable rigging");
867
+ supportCB.addItemListener(this);
868
+
869
+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
870
+ // localCB.addItemListener(this);
871
+
872
+ panel.Return();
873
+
874
+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
875
+ crowdCB.setToolTipText("Used for crowds");
876
+ crowdCB.addItemListener(this);
877
+
878
+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
879
+ smoothCB.setToolTipText("Snapping delay");
880
+ smoothCB.addItemListener(this);
881
+
882
+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
883
+ slowCB.setToolTipText("Smooth interpolation");
884
+ slowCB.addItemListener(this);
885
+
886
+// constraints.gridy += 1;
887
+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
888
+// speakerMocapCB.addItemListener(this);
889
+
890
+ panel.Return();
891
+
892
+ if (false)
893
+ {
894
+ // handled in scripts
895
+ //constraints.gridy += 1;
896
+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
897
+ speakerCameraCB.addItemListener(this);
898
+
899
+ //constraints.gridy += 1;
900
+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
901
+ speakerFocusCB.addItemListener(this);
902
+
903
+ //constraints.gridy += 1;
904
+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
905
+ smoothfocusCB.addItemListener(this);
906
+ panel.Return();
907
+ }
908
+
909
+//constraints.gridx += 1;
910
+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
911
+// debugCB.addItemListener(this);
912
+
913
+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
914
+ trackCB.setToolTipText("Enable tracking target");
915
+ trackCB.addItemListener(this);
916
+
917
+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
918
+ oeilCB.setToolTipText("Move camera when tracking");
919
+ oeilCB.addItemListener(this);
920
+
921
+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
922
+ shadowCB.setToolTipText("Compute shadows when live");
923
+ shadowCB.addItemListener(this);
924
+
925
+ panel.Return();
926
+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
927
+ toggleTextureCB.setToolTipText("Load textures");
928
+ toggleTextureCB.addItemListener(this);
929
+
930
+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
931
+ toggleSwitchCB.setToolTipText("Use switch");
932
+ toggleSwitchCB.addItemListener(this);
933
+
934
+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
935
+ autosaveCB.setToolTipText("Auto-save on structure change");
936
+ autosaveCB.addItemListener(this);
937
+
938
+ panel.Return();
939
+ if (Globals.ADVANCED)
940
+ {
941
+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
942
+ lookAtCB.setToolTipText("Look-at target");
943
+ lookAtCB.addItemListener(this);
944
+ }
945
+
946
+ }
947
+
948
+ cGridBag fill = new cGridBag();
949
+ fill.preferredHeight = 200;
950
+ cGridBag fill2 = new cGridBag();
951
+ fill2.preferredHeight = 200;
952
+ cGridBag fill3 = new cGridBag();
953
+ fill3.preferredHeight = 200;
954
+
955
+ panel.add(fill);
956
+ panel.add(fill2);
957
+ panel.add(fill3);
958
+
959
+ }
646960
647961 void EditObject(Object3D obj)
648962 {
649
- cRadio dummyButton = new cRadio(obj.name);
650
- dummyButton.SetObject(obj);
651
- dummyButton.layout = sevenButton;
652
- dummyButton.SetCamera(cameraView.renderCamera, false);
653
- dummyButton.addActionListener(this);
654
- radioPanel.add(dummyButton);
655
- buttonGroup.add(dummyButton);
656
- dummyButton.doClick();
963
+ cRadio radioButton = new cRadio(obj.name);
964
+
965
+ // Patch to avoid bug with transparency.
966
+ radioButton.hadMaterial = obj.material != null;
967
+ if (!radioButton.hadMaterial)
968
+ {
969
+ obj.material = new cMaterial();
970
+ }
971
+
972
+ radioButton.SetObject(obj);
973
+ radioButton.layout = sevenButton;
974
+ radioButton.SetCamera(cameraView.renderCamera, false);
975
+ radioButton.addActionListener(this);
976
+ radioPanel.add(radioButton);
977
+ buttonGroup.add(radioButton);
978
+ radioButton.doClick();
657979 }
980
+
658981 void SetupViews(ObjEditor oe)
659982 {
983
+ theFrame = this;
984
+
660985 oe.SetupViews();
661986
662987 System.out.println("SetupViews");
....@@ -665,22 +990,27 @@
665990 /*DropTarget dropTarget =*/ new DropTarget(oe.cameraView, this);
666991 }
667992
668
- JCheckBox liveCB;
669
- JCheckBox supportCB;
670
- JCheckBox localCB;
671
- JCheckBox crowdCB;
672
- JCheckBox smoothCB;
673
- JCheckBox fastCB;
674
- JCheckBox slowCB;
675
- JCheckBox boxCB;
676
- JCheckBox trackCB;
677
- JCheckBox smoothfocusCB;
993
+ cToggleButton liveCB;
994
+ cCheckBox supportCB;
995
+ cCheckBox localCB;
996
+ cCheckBox crowdCB;
997
+ cCheckBox smoothCB;
998
+ cToggleButton fastCB;
999
+ cCheckBox slowCB;
1000
+ cCheckBox boxCB;
1001
+ cCheckBox zoomBoxCB;
1002
+ //cToggleButton trackCB;
1003
+ cCheckBox trackCB;
1004
+ cCheckBox smoothfocusCB;
6781005 // JCheckBox speakerMocapCB;
679
- JCheckBox speakerCameraCB;
680
- JCheckBox speakerFocusCB;
681
- JCheckBox debugCB;
682
- JCheckBox oeilCB;
683
- JCheckBox lookAtCB;
1006
+ cCheckBox speakerCameraCB;
1007
+ cCheckBox speakerFocusCB;
1008
+ cCheckBox debugCB;
1009
+
1010
+ cCheckBox oeilCB;
1011
+ cCheckBox shadowCB;
1012
+ cCheckBox autosaveCB;
1013
+ cCheckBox lookAtCB;
6841014
6851015 // static int COLOR = 1;
6861016 // static int MATERIAL = 2;
....@@ -688,9 +1018,9 @@
6881018
6891019 int dropAttributes = Object3D.COLOR | Object3D.MATERIAL;
6901020
691
- JCheckBox colorCB;
692
- JCheckBox materialCB;
693
- JCheckBox textureCB;
1021
+ cCheckBox colorCB;
1022
+ cCheckBox materialCB;
1023
+ cCheckBox textureCB;
6941024
6951025 public void itemStateChanged(ItemEvent e)
6961026 {
....@@ -715,10 +1045,10 @@
7151045 dropAttributes |= Object3D.TEXTURE;
7161046 else
7171047 dropAttributes &= ~Object3D.TEXTURE;
718
- }
719
- else if(e.getSource() == liveCB)
1048
+ } else if(e.getSource() == liveCB)
7201049 {
7211050 cameraView.ToggleLive();
1051
+ refreshContents(false);
7221052 }
7231053 else if(e.getSource() == supportCB)
7241054 {
....@@ -754,6 +1084,10 @@
7541084 cameraView.repaint();
7551085 // refreshContents();
7561086 }
1087
+ else if(e.getSource() == zoomBoxCB)
1088
+ {
1089
+ cameraView.ToggleZoomBoxMode();
1090
+ }
7571091 else if(e.getSource() == smoothfocusCB)
7581092 {
7591093 cameraView.ToggleSmoothFocus();
....@@ -779,6 +1113,14 @@
7791113 {
7801114 cameraView.ToggleOeil();
7811115 }
1116
+ else if(e.getSource() == shadowCB)
1117
+ {
1118
+ Globals.COMPUTESHADOWWHENLIVE ^= true;
1119
+ }
1120
+ else if(e.getSource() == autosaveCB)
1121
+ {
1122
+ Globals.SAVEONMAKE ^= true;
1123
+ }
7821124 else if(e.getSource() == lookAtCB)
7831125 {
7841126 cameraView.ToggleLookAt();
....@@ -795,7 +1137,8 @@
7951137
7961138 /**/
7971139 //DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
798
- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1140
+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1141
+ TreePath path = objEditor.jTree.getSelectionPath();
7991142 if ((path == null) || (path.getPathCount() <= 1)) {
8001143 // We can't move the root node or an empty selection
8011144 return;
....@@ -867,7 +1210,9 @@
8671210 // objEditor.DropFile((java.io.File[]) object, true);
8681211 // return;
8691212 // }
870
- if (string.charAt(0) == '/')
1213
+
1214
+ // File path for Mac and Windows
1215
+ if (string.charAt(0) == '/' || string.charAt(1) == ':')
8711216 {
8721217 // file(s)
8731218 String[] names = string.split("\n");
....@@ -894,7 +1239,7 @@
8941239
8951240 flashIt = false;
8961241 CameraPane pane = (CameraPane) target;
897
- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
1242
+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
8981243 pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
8991244
9001245 if (group.selection.size() == 1)
....@@ -910,23 +1255,33 @@
9101255
9111256 assert target == objEditor.jTree;
9121257 TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
1258
+ Object3D destinationLeaf;
9131259 try {
914
- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
1260
+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
9151261 } catch (Exception e) {
9161262 System.out.println("destinationPath : " + destinationPath);
9171263 return;
9181264 }
9191265
920
- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1266
+ for (int i=group.selection.size(); --i>=0;)
9211267 {
1268
+ Object3D child = (Object3D)group.selection.elementAt(i);
1269
+
1270
+ // Cannot move into itself
1271
+ if (child == destinationLeaf)
1272
+ return;
1273
+ }
1274
+
1275
+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1276
+// {
9221277 loadClipboard(true);
9231278 objEditor.jTree.setSelectionPath(destinationPath);
924
- pasteInto(false);
925
- } else {
926
- loadClipboard(false);
927
- objEditor.jTree.setSelectionPath(destinationPath);
928
- pasteInto(false); // true); // ???
929
- }
1279
+ pasteInto(false, false);
1280
+// } else {
1281
+// loadClipboard(false);
1282
+// objEditor.jTree.setSelectionPath(destinationPath);
1283
+// pasteInto(false, false); // true); // ???
1284
+// }
9301285 }
9311286 public void dropActionChanged(DropTargetDragEvent dtde)
9321287 // Called if the user has modified the current drop gesture
....@@ -1031,85 +1386,104 @@
10311386 {
10321387 //heightFieldItem = menu.add(new MenuItem("Height Field"));
10331388 //heightFieldItem.addActionListener(this);
1034
- gridItem = menu.add(new MenuItem("Grid"));
1035
- gridItem.addActionListener(this);
1036
- rectoidItem = menu.add(new MenuItem("Box"));
1037
- rectoidItem.addActionListener(this);
1038
- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1039
- ellipsoidItem.addActionListener(this);
1040
- coneItem = menu.add(new MenuItem("Cone"));
1041
- coneItem.addActionListener(this);
1042
- torusItem = menu.add(new MenuItem("Torus"));
1043
- torusItem.addActionListener(this);
1044
- superItem = menu.add(new MenuItem("Superellipsoid"));
1045
- superItem.addActionListener(this);
1389
+// gridItem = menu.add(new MenuItem("Grid"));
1390
+// gridItem.addActionListener(this);
1391
+// rectoidItem = menu.add(new MenuItem("Box"));
1392
+// rectoidItem.addActionListener(this);
1393
+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
1394
+// ellipsoidItem.addActionListener(this);
1395
+// coneItem = menu.add(new MenuItem("Cone"));
1396
+// coneItem.addActionListener(this);
1397
+// torusItem = menu.add(new MenuItem("Torus"));
1398
+// torusItem.addActionListener(this);
1399
+// superItem = menu.add(new MenuItem("Superellipsoid"));
1400
+// superItem.addActionListener(this);
1401
+
1402
+ cameraItem = menu.add(new MenuItem("Camera"));
1403
+ cameraItem.addActionListener(this);
1404
+
1405
+ if (!Globals.ADVANCED)
1406
+ {
10461407 kleinItem = menu.add(new MenuItem("Klein Bottle"));
10471408 kleinItem.addActionListener(this);
1048
- particleItem = menu.add(new MenuItem("Particle system"));
1049
- particleItem.addActionListener(this);
1409
+ }
1410
+
1411
+// particleItem = menu.add(new MenuItem("Particle system"));
1412
+// particleItem.addActionListener(this);
1413
+ if (Globals.ADVANCED)
1414
+ {
10501415 ragdollItem = menu.add(new MenuItem("Rag Walk"));
10511416 ragdollItem.addActionListener(this);
10521417 ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
10531418 ragdoll2Item.addActionListener(this);
1419
+ }
10541420 menu.add("-");
1055
- meshItem = menu.add(new MenuItem("Mesh"));
1421
+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
10561422 meshItem.addActionListener(this);
10571423 // meshGroupItem = menu.add(new MenuItem("Mesh Group"));
10581424 // meshGroupItem.addActionListener(this);
1425
+ if (Globals.ADVANCED)
1426
+ {
10591427 springItem = menu.add(new MenuItem("Spring"));
10601428 springItem.addActionListener(this);
10611429 flagItem = menu.add(new MenuItem("Flag"));
10621430 flagItem.addActionListener(this);
1063
- bezierItem = menu.add(new MenuItem("Patch"));
1064
- bezierItem.addActionListener(this);
1065
- checkerItem = menu.add(new MenuItem("Checker"));
1066
- checkerItem.addActionListener(this);
10671431 blobItem = menu.add(new MenuItem("Blob"));
10681432 blobItem.addActionListener(this);
10691433 latheItem = menu.add(new MenuItem("Lathe"));
10701434 latheItem.addActionListener(this);
1071
- lightItem = menu.add(new MenuItem("Light"));
1072
- lightItem.addActionListener(this);
1435
+ }
1436
+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
1437
+ bezierItem.addActionListener(this);
1438
+// overlayItem = menu.add(new MenuItem("Overlay"));
1439
+// overlayItem.addActionListener(this);
1440
+// lightItem = menu.add(new MenuItem("Light"));
1441
+// lightItem.addActionListener(this);
10731442 menu.add("-");
10741443 //superLoopItem = menu.add(new MenuItem("Super Loop"));
10751444 //superLoopItem.addActionListener(this);
1076
- loopItem = menu.add(new MenuItem("Loop"));
1077
- loopItem.addActionListener(this);
1445
+// loopItem = menu.add(new MenuItem("Loop"));
1446
+// loopItem.addActionListener(this);
10781447 doubleItem = menu.add(new MenuItem("Fork"));
10791448 doubleItem.addActionListener(this);
1449
+ if (Globals.ADVANCED)
1450
+ {
10801451 tripleItem = menu.add(new MenuItem("Trident"));
10811452 tripleItem.addActionListener(this);
1453
+ }
10821454 }
10831455
10841456 void buildToolsMenu(Menu menu)
10851457 {
10861458 menu.add(animationItem = new CheckboxMenuItem("Animation..."));
10871459 animationItem.addItemListener(this);
1088
- animationItem.setState(CameraPane.ANIMATION);
1460
+ animationItem.setState(Globals.ANIMATION);
10891461
10901462 menu.add("-");
10911463 parseverticesItem = menu.add(new MenuItem("Multiplicity"));
10921464 parseverticesItem.addActionListener(this);
10931465 textureFieldItem = menu.add(new MenuItem("Texture Field"));
10941466 textureFieldItem.addActionListener(this);
1095
- alignItem = menu.add(new MenuItem("Align"));
1467
+ alignItem = menu.add(new MenuItem("Align Objects"));
10961468 alignItem.addActionListener(this);
1097
- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1098
- mirrorItem.addActionListener(this);
10991469 reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
11001470 reduceMorphItem.addActionListener(this);
11011471 reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
11021472 reduce34MorphItem.addActionListener(this);
1103
-
1473
+ menu.add("-");
11041474 menu.add(computeAOItem = new MenuItem("Compute AO"));
11051475 computeAOItem.addActionListener(this);
1106
- menu.add("-");
11071476
1477
+ if (Globals.ADVANCED)
1478
+ {
1479
+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1480
+ mirrorItem.addActionListener(this);
1481
+ menu.add("-");
11081482 menu.add(memoryItem = new MenuItem("Memory Usage"));
11091483 memoryItem.addActionListener(this);
11101484 menu.add(analyzeItem = new MenuItem("Analyze"));
11111485 analyzeItem.addActionListener(this);
1112
- menu.add(dumpItem = new MenuItem("Dump"));
1486
+ menu.add(dumpItem = new MenuItem("Print"));
11131487 dumpItem.addActionListener(this);
11141488 // menu.add(pathItem = new MenuItem("From-to path"));
11151489 // pathItem.addActionListener(this);
....@@ -1118,6 +1492,8 @@
11181492 resetParentItem.addActionListener(this);
11191493 repairParentItem = menu.add(new MenuItem("Repair Parent"));
11201494 repairParentItem.addActionListener(this);
1495
+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
1496
+ repairShadowItem.addActionListener(this);
11211497 menu.add(invariantsItem = new MenuItem("Invariants"));
11221498 invariantsItem.addActionListener(this);
11231499 menu.add(recompileItem = new MenuItem("Recompile"));
....@@ -1125,6 +1501,7 @@
11251501 menu.add("-");
11261502 menu.add(editScriptItem = new MenuItem("Edit Script..."));
11271503 editScriptItem.addActionListener(this);
1504
+ }
11281505 }
11291506
11301507 void ScreenFit()
....@@ -1247,6 +1624,7 @@
12471624 shadow.material = new cMaterial(obj.material);
12481625 shadow.material.diffuse = 0.0001f;
12491626 shadow.material.specular = 0.0001f;
1627
+ //shadow.projectedVertices[1].x = 300;
12501628
12511629 makeSomething(shadow);
12521630 }
....@@ -1453,9 +1831,9 @@
14531831
14541832 void Overwrite(int mask)
14551833 {
1456
- if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
1834
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
14571835 {
1458
- Object3D content = GrafreeD.clipboard.get(0);
1836
+ Object3D content = Grafreed.clipboard.get(0);
14591837
14601838 if (content instanceof cGroup && ((cGroup)content).transientlink )
14611839 content = ((cGroup)content).get(0);
....@@ -1478,6 +1856,7 @@
14781856 //
14791857 public void actionPerformed(ActionEvent event) // , Object arg)
14801858 {
1859
+ Object source = event.getSource();
14811860 /*
14821861 if (event.getSource() == nameField)
14831862 {
....@@ -1489,11 +1868,11 @@
14891868 }
14901869 else
14911870 */
1492
- if (event.getSource() == lookAtItem || event.getSource() == lookFromItem)
1871
+ if (source == lookAtItem || source == lookFromItem)
14931872 {
14941873 ScreenFit();
14951874 } else
1496
- if (event.getSource() == switchItem)
1875
+ if (source == switchViewItem)
14971876 {
14981877 cVector v1 = new cVector();
14991878 cVector v2 = new cVector();
....@@ -1502,11 +1881,11 @@
15021881 objEditor.cameraView.renderCamera.setAim(v2, v1);
15031882 objEditor.cameraView.repaint();
15041883 } else
1505
- if (event.getSource() == rectoidItem)
1884
+ if (source == rectoidItem || source == boxButton)
15061885 {
15071886 makeSomething(new Box());
15081887 } else
1509
- if (event.getSource() == particleItem)
1888
+ if (source == particleItem || source == particlesButton)
15101889 {
15111890 ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
15121891 ParticleController particleController = new ParticleController(particleGeom);
....@@ -1527,9 +1906,9 @@
15271906 applyExample(particleGeom, "SMOKE");
15281907 makeSomething(particleGeom);
15291908 } else
1530
- if (event.getSource() == ragdollItem || event.getSource() == ragdoll2Item)
1909
+ if (source == ragdollItem || source == ragdoll2Item)
15311910 {
1532
- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
1911
+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
15331912
15341913 ragdoll.toParent = LA.newMatrix();
15351914 ragdoll.fromParent = LA.newMatrix();
....@@ -1547,7 +1926,7 @@
15471926 } else
15481927 /*
15491928 */
1550
- if (event.getSource() == heightFieldItem)
1929
+ if (source == heightFieldItem)
15511930 {
15521931 Object3D obj = new Object3D();
15531932
....@@ -1585,31 +1964,31 @@
15851964
15861965 makeSomething(obj);
15871966 } else
1588
- if (event.getSource() == gridItem)
1967
+ if (source == gridItem || source == gridButton)
15891968 {
15901969 makeSomething(new Grid());
15911970 } else
1592
- if (event.getSource() == ellipsoidItem)
1971
+ if (source == ellipsoidItem || source == sphereButton)
15931972 {
15941973 makeSomething(new Sphere());
15951974 } else
1596
- if (event.getSource() == coneItem)
1975
+ if (source == coneItem || source == coneButton)
15971976 {
15981977 makeSomething(new Cone());
15991978 } else
1600
- if (event.getSource() == torusItem)
1979
+ if (source == torusItem || source == torusButton)
16011980 {
16021981 makeSomething(new Torus());
16031982 } else
1604
- if (event.getSource() == superItem)
1983
+ if (source == superItem || source == superButton)
16051984 {
16061985 makeSomething(new Superellipsoid());
16071986 } else
1608
- if (event.getSource() == kleinItem)
1987
+ if (source == kleinItem || source == kleinButton)
16091988 {
16101989 makeSomething(new Klein());
16111990 } else
1612
- if (event.getSource() == blobItem)
1991
+ if (source == blobItem)
16131992 {
16141993 Blob blob = new Blob();
16151994 BlobComponent comp = new BlobComponent();
....@@ -1617,15 +1996,15 @@
16171996 //blob.retile();
16181997 makeSomething(blob);
16191998 } else
1620
- if (event.getSource() == latheItem)
1999
+ if (source == latheItem)
16212000 {
16222001 makeSomething(new Lathe());
16232002 } else
1624
- if (event.getSource() == bezierItem)
2003
+ if (source == bezierItem)
16252004 {
16262005 makeSomething(new BezierSurface());
16272006 } else
1628
- if (event.getSource() == checkerItem)
2007
+ if (source == overlayItem || source == overlayButton)
16292008 {
16302009 /*
16312010 Object3D obj = new BezierSurface(5,8);
....@@ -1640,7 +2019,7 @@
16402019 */
16412020 makeSomething(new Checker());
16422021 } else
1643
- if (event.getSource() == meshItem)
2022
+ if (source == meshItem)
16442023 {
16452024 Object3D itemtomake = new Object3D();
16462025 Object3D child;
....@@ -1661,35 +2040,35 @@
16612040 makeSomething(child);
16622041 }
16632042 } else
1664
- if (event.getSource() == springItem)
2043
+ if (source == springItem)
16652044 {
16662045 cSpring s = new cSpring();
16672046 s.setup();
16682047 makeSomething(s);
16692048 } else
1670
- if (event.getSource() == flagItem)
2049
+ if (source == flagItem)
16712050 {
16722051 cSpring s = new cFlag();
16732052 s.setup();
16742053 makeSomething(s);
16752054 } else
1676
- if (event.getSource() == lightItem)
2055
+ if (source == lightItem || source == lightButton)
16772056 {
16782057 makeSomething(new Light());
16792058 } else
1680
- if (event.getSource() == csgItem)
2059
+ if (source == csgItem)
16812060 {
16822061 group(new CSG());
16832062 } else
1684
- if (event.getSource() == templateItem)
2063
+ if (source == templateItem)
16852064 {
16862065 group(new cTemplate());
16872066 } else
1688
- if (event.getSource() == attributeItem)
2067
+ if (source == attributeItem)
16892068 {
16902069 makeSomething(new Attribute());
16912070 } else
1692
- if (event.getSource() == pointflowItem)
2071
+ if (source == pointflowItem)
16932072 {
16942073 makeSomething(new PointFlow());
16952074 } else
....@@ -1701,7 +2080,7 @@
17012080 } else
17022081 */
17032082
1704
- if (event.getSource() == superLoopItem)
2083
+ if (source == superLoopItem)
17052084 {
17062085 Composite g = new cGroup();
17072086 for (int i=0; i<15; i++)
....@@ -1723,7 +2102,7 @@
17232102
17242103 group(g);
17252104 } else
1726
- if (event.getSource() == loopItem)
2105
+ if (source == loopItem || source == loopButton)
17272106 {
17282107 Composite csg = new GroupLeaf();
17292108 csg.count = 5;
....@@ -1732,7 +2111,7 @@
17322111 csg.addChild(child);
17332112 child.addChild(csg);
17342113 } else
1735
- if (event.getSource() == doubleItem)
2114
+ if (source == doubleItem)
17362115 {
17372116 Composite csg = new GroupLeaf();
17382117 csg.count = 5;
....@@ -1744,7 +2123,7 @@
17442123 csg.addChild(child);
17452124 child.addChild(csg);
17462125 } else
1747
- if (event.getSource() == tripleItem)
2126
+ if (source == tripleItem)
17482127 {
17492128 Composite csg = new GroupLeaf();
17502129 csg.count = 4;
....@@ -1759,71 +2138,83 @@
17592138 csg.addChild(child);
17602139 child.addChild(csg);
17612140 } else
1762
-
1763
- if (event.getSource() == importGFDItem)
2141
+ if (source == computeAOItem)
17642142 {
1765
- ImportGFD();
2143
+ Globals.drawMode = CameraPane.OCCLUSION;
2144
+ Globals.theRenderer.repaint();
17662145 } else
1767
- if (event.getSource() == importVRMLX3DItem)
1768
- {
1769
- ImportVRMLX3D();
1770
- } else
1771
- if (event.getSource() == import3DSItem)
1772
- {
1773
- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1774
- } else
1775
- if (event.getSource() == importOBJItem)
1776
- {
1777
- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1778
- } else
1779
- if (event.getSource() == computeAOItem)
1780
- {
1781
- CameraPane.drawMode = CameraPane.OCCLUSION;
1782
- CameraPane.theRenderer.repaint();
1783
- } else
1784
- if (event.getSource() == recompileItem)
2146
+ if (source == recompileItem)
17852147 {
17862148 Recompile();
17872149 refreshContents();
17882150 } else
1789
- if (event.getSource() == editScriptItem)
2151
+ if (source == editScriptItem)
17902152 {
17912153 OpenDialog();
17922154 refreshContents();
17932155 } else
1794
- if (event.getSource() == invariantsItem)
2156
+ if (source == invariantsItem)
17952157 {
17962158 System.out.println("Invariants:");
1797
- GrafreeD.grafreeD.universe.invariants();
2159
+ Grafreed.grafreeD.universe.invariants();
17982160 } else
1799
- if (event.getSource() == memoryItem)
2161
+ if (source == memoryItem)
18002162 {
18012163 //System.out.println("Invariants:");
18022164 PrintMemory();
18032165 } else
1804
- if (event.getSource() == pathItem)
2166
+ if (source == pathItem)
18052167 {
18062168 PrintPath();
18072169 } else
1808
- if (event.getSource() == analyzeItem)
2170
+ if (source == analyzeItem)
18092171 {
18102172 AnalyzeObject();
18112173 } else
1812
- if (event.getSource() == dumpItem)
2174
+ if (source == dumpItem)
18132175 {
18142176 DumpObject();
18152177 } else
1816
- if (event.getSource() == screenfitButton)
2178
+ if (source == minButton)
2179
+ {
2180
+ Minimize();
2181
+ } else
2182
+ if (source == maxButton)
2183
+ {
2184
+ Maximize();
2185
+ } else
2186
+ if (source == fullButton)
2187
+ {
2188
+ ToggleFullScreen();
2189
+ } else
2190
+ if (source == undoButton)
2191
+ {
2192
+ Undo();
2193
+ } else
2194
+ if (source == redoButton)
2195
+ {
2196
+ Redo();
2197
+ } else
2198
+ if (source == saveButton)
2199
+ {
2200
+ Save();
2201
+ } else
2202
+ if (source == oneStepButton)
2203
+ {
2204
+ Globals.ONESTEP = true;
2205
+ cameraView.repaint();
2206
+ } else
2207
+ if (source == screenfitButton)
18172208 {
18182209 //Reload(lastConverter, lastFilename, true);
18192210 ScreenFit();
18202211 } else
1821
- if (event.getSource() == screenfitpointButton)
2212
+ if (source == screenfitpointButton)
18222213 {
18232214 //Reload(lastConverter, lastFilename, true);
18242215 ScreenFitPoint();
18252216 } else
1826
- if (event.getSource() == snapobjectButton)
2217
+ if (source == snapobjectButton)
18272218 {
18282219 //Reload(lastConverter, lastFilename, true);
18292220 SnapObject();
....@@ -1834,13 +2225,13 @@
18342225 // Recompile();
18352226 // refreshContents();
18362227 // } else
1837
- if (event.getSource() == gcButton)
2228
+ if (source == gcButton)
18382229 {
18392230 System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
18402231 System.gc();
18412232 System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
18422233 } else
1843
- if (event.getSource() == editLeafItem)
2234
+ if (source == editLeafItem)
18442235 {
18452236 Object3D obj;
18462237 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -1854,62 +2245,74 @@
18542245 }
18552246 refreshContents(true);
18562247 } else
1857
- if (event.getSource() == openWindowItem)
2248
+ if (source == openWindowItem)
18582249 {
18592250 EditSelection(true);
18602251 } else
1861
- if (event.getSource() == cutItem || event.getSource() == clearButton)
2252
+ if (source == cutItem || source == clearButton)
18622253 {
18632254 loadClipboard(true);
18642255 } else
1865
- if (event.getSource() == duplicateItem)
2256
+ if (source == undoItem)
18662257 {
1867
- Object3D keep = GrafreeD.clipboard;
2258
+ Undo();
2259
+ } else
2260
+ if (source == redoItem)
2261
+ {
2262
+ Redo();
2263
+ } else
2264
+ if (source == duplicateItem)
2265
+ {
2266
+ Object3D keep = Grafreed.clipboard;
18682267 loadClipboard(false);
18692268 paste(false);
1870
- GrafreeD.clipboard = keep;
2269
+ Grafreed.clipboard = keep;
18712270 } else
1872
- if (event.getSource() == cloneItem)
2271
+ if (source == cloneItem)
18732272 {
18742273 CloneSelection(false);
18752274 } else
1876
- if (event.getSource() == cloneSupportItem)
2275
+ if (source == cloneSupportItem)
18772276 {
18782277 CloneSelection(true);
18792278 } else
1880
- if (event.getSource() == copyItem)
2279
+ if (source == copyItem)
18812280 {
18822281 loadClipboard(false);
18832282 } else
1884
- if (event.getSource() == pasteItem)
2283
+ if (source == pasteItem)
18852284 {
18862285 paste(false);
18872286 } else
1888
- if (event.getSource() == pasteLinkItem)
2287
+ if (source == pasteIntoItem)
18892288 {
1890
- pasteInto(false);
2289
+ pasteInto(true, false);
18912290 } else
1892
- if (event.getSource() == pasteCloneItem)
2291
+ if (source == pasteLinkItem)
18932292 {
1894
- pasteInto(true);
2293
+ pasteInto(false, false);
18952294 } else
1896
- if (event.getSource() == pasteExpandItem)
2295
+ if (source == pasteCloneItem)
2296
+ {
2297
+ pasteInto(true, true);
2298
+ } else
2299
+ if (source == pasteExpandItem)
18972300 {
18982301 paste(true);
18992302 } else
1900
- if (event.getSource() == synchronizeItem)
2303
+ if (source == synchronizeItem)
19012304 {
19022305 Overwrite(Object3D.TRANSFORM);
19032306 } else
1904
- if (event.getSource() == overwriteNameItem)
2307
+ if (source == overwriteNameItem)
19052308 {
19062309 Overwrite(Object3D.NAME);
19072310 } else
1908
- if (event.getSource() == overwriteUVItem)
2311
+ if (source == overwriteUVItem)
19092312 {
19102313 Overwrite(Object3D.UV);
19112314 } else
1912
- if (event.getSource() == overwriteMatItem)
2315
+ if (source == overwriteMatItem)
19132316 {
19142317 /* july 2015
19152318 if ((dropAttributes & Object3D.TEXTURE) == 0)
....@@ -1929,7 +2332,7 @@
19292332
19302333 Overwrite(dropAttributes);
19312334 }
1932
- if (event.getSource() == overwriteGeoItem)
2335
+ if (source == overwriteGeoItem)
19332336 {
19342337 Overwrite(Object3D.GEOMETRY);
19352338 // if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
....@@ -1946,7 +2349,7 @@
19462349 // refreshContents();
19472350 // }
19482351 } else
1949
- if (event.getSource() == generateMeshItem)
2352
+ if (source == generateMeshItem)
19502353 {
19512354 //if (group.selection.size() == 1)
19522355 // for (int i=0; i<group.selection.size(); i++)
....@@ -1957,7 +2360,7 @@
19572360 ResetModel();
19582361 refreshContents();
19592362 } else
1960
- if (event.getSource() == extractGeometriesItem)
2363
+ if (source == extractGeometriesItem)
19612364 {
19622365 boolean one = false;
19632366
....@@ -1984,7 +2387,7 @@
19842387 ResetModel();
19852388 refreshContents();
19862389 } else
1987
- if (event.getSource() == cloneGeometriesItem)
2390
+ if (source == cloneGeometriesItem)
19882391 {
19892392 boolean one = false;
19902393
....@@ -2010,7 +2413,7 @@
20102413 ResetModel();
20112414 refreshContents();
20122415 } else
2013
- if (event.getSource() == shareGeometriesItem)
2416
+ if (source == shareGeometriesItem)
20142417 {
20152418 boolean one = false;
20162419
....@@ -2040,7 +2443,7 @@
20402443 refreshContents();
20412444 }
20422445 } else
2043
- if (event.getSource() == mergeGeometriesItem)
2446
+ if (source == mergeGeometriesItem)
20442447 {
20452448 boolean one = false;
20462449
....@@ -2070,7 +2473,7 @@
20702473 ResetModel();
20712474 refreshContents();
20722475 } else
2073
- if (event.getSource() == linkverticesItem)
2476
+ if (source == linkverticesItem)
20742477 {
20752478 // if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
20762479 // {
....@@ -2083,48 +2486,48 @@
20832486 // group.selection.get(0).setMasterThis(content); // should be identity
20842487 // refreshContents();
20852488 // }
2086
- if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
2489
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
20872490 {
2088
- Object3D content = GrafreeD.clipboard.get(0);
2491
+ Object3D content = Grafreed.clipboard.get(0);
20892492
20902493 if (content instanceof cGroup && ((cGroup)content).transientlink )
20912494 content = ((cGroup)content).get(0);
20922495
2093
- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2496
+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
20942497 for (int i=0; i<group.selection.size(); i++)
20952498 {
2096
- boolean random = CameraPane.RANDOM;
2097
- CameraPane.RANDOM = false; // parse all random nodes
2499
+ boolean random = CameraPane.SWITCH;
2500
+ CameraPane.SWITCH = false; // parse all random nodes
20982501 group.selection.get(i).linkVerticesThis(content);
20992502 // group.selection.get(i).setMasterThis(content); // should be identity
2100
- CameraPane.RANDOM = random;
2503
+ CameraPane.SWITCH = random;
21012504 }
2102
- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2505
+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
21032506 refreshContents();
21042507 }
21052508 } else
2106
- if (event.getSource() == resetsupportItem)
2509
+ if (source == resetsupportItem)
21072510 {
21082511 for (int i=0; i<group.selection.size(); i++)
21092512 {
2110
- boolean random = CameraPane.RANDOM;
2111
- CameraPane.RANDOM = false; // parse all random nodes
2513
+ boolean random = CameraPane.SWITCH;
2514
+ CameraPane.SWITCH = false; // parse all random nodes
21122515 group.selection.get(i).linkVerticesThis(null);
2113
- CameraPane.RANDOM = random;
2516
+ CameraPane.SWITCH = random;
21142517 }
21152518
21162519 refreshContents();
21172520 } else
2118
- if (event.getSource() == relinkverticesItem)
2521
+ if (source == relinkverticesItem)
21192522 {
2120
- boolean random = CameraPane.RANDOM;
2121
- CameraPane.RANDOM = false; // parse all random nodes
2523
+ boolean random = CameraPane.SWITCH;
2524
+ CameraPane.SWITCH = false; // parse all random nodes
21222525 group.selection.RelinkToSupport();
2123
- CameraPane.RANDOM = random;
2526
+ CameraPane.SWITCH = random;
21242527
21252528 refreshContents();
21262529 } else
2127
- if (event.getSource() == resetreferencesItem)
2530
+ if (source == resetreferencesItem)
21282531 {
21292532 for (int i=0; i<group.selection.size(); i++)
21302533 {
....@@ -2133,11 +2536,11 @@
21332536
21342537 refreshContents();
21352538 } else
2136
- if (event.getSource() == setMasterItem)
2539
+ if (source == setMasterItem)
21372540 {
2138
- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2541
+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
21392542 {
2140
- Object3D content = GrafreeD.clipboard.get(0);
2543
+ Object3D content = Grafreed.clipboard.get(0);
21412544
21422545 if (content instanceof cGroup && ((cGroup)content).transientlink )
21432546 content = ((cGroup)content).get(0);
....@@ -2146,13 +2549,13 @@
21462549 refreshContents();
21472550 }
21482551 } else
2149
- if (event.getSource() == poseMeshItem)
2552
+ if (source == poseMeshItem)
21502553 {
21512554 if (group.selection.size() == 1)
21522555 {
2153
- if (GrafreeD.clipboard.size() == 1)
2556
+ if (Grafreed.clipboard.size() == 1)
21542557 {
2155
- Object3D content = GrafreeD.clipboard.get(0);
2558
+ Object3D content = Grafreed.clipboard.get(0);
21562559
21572560 if (content instanceof cGroup && ((cGroup)content).transientlink )
21582561 content = ((cGroup)content).get(0);
....@@ -2165,19 +2568,19 @@
21652568 }
21662569
21672570 } else
2168
- if (event.getSource() == revertMeshItem)
2571
+ if (source == revertMeshItem)
21692572 {
21702573 RevertMeshes();
21712574 } else
2172
- if (event.getSource() == resetMeshItem)
2575
+ if (source == resetAllItem)
21732576 {
21742577 ResetAll();
21752578 } else
2176
- if (event.getSource() == stepAllItem)
2579
+ if (source == stepAllItem)
21772580 {
21782581 StepAll();
21792582 } else
2180
- if (event.getSource() == clearItem) // || event.getSource() == clearButton)
2583
+ if (source == clearItem) // || event.getSource() == clearButton)
21812584 {
21822585 //int indices[] = jList.getSelectedIndices();
21832586 //for (int i = indices.length - 1; i >= 0; i--)
....@@ -2185,46 +2588,46 @@
21852588
21862589 ClearSelection(false);
21872590 } else
2188
- if (event.getSource() == clearAllItem)
2591
+ if (source == clearAllItem)
21892592 {
21902593 ClearSelection(true);
21912594 } else
2192
- if (event.getSource() == grabItem)
2595
+ if (source == grabItem || source == groupButton)
21932596 {
2194
- group(new cGroup(), true);
2597
+ group(new cGroup(), false); // true);
21952598 } else
2196
- if (event.getSource() == hideItem)
2599
+ if (source == hideItem)
21972600 {
21982601 group(new HiddenObject());
21992602 } else
2200
- if (event.getSource() == frontItem)
2603
+ if (source == frontItem)
22012604 {
22022605 front();
22032606 } else
2204
- if (event.getSource() == backItem)
2607
+ if (source == backItem)
22052608 {
22062609 back();
22072610 } else
2208
- if (event.getSource() == cameraItem)
2611
+ if (source == cameraItem)
22092612 {
22102613 makeSomething(new Camera());
22112614 } else
2212
- if (event.getSource() == compositeItem)
2615
+ if (source == compositeItem || source == compositeButton)
22132616 {
22142617 group(new Composite());
22152618 } else
2216
- if (event.getSource() == randomItem)
2619
+ if (source == switchItem || source == switchButton)
22172620 {
22182621 RandomNode random = new RandomNode();
22192622 group(random);
22202623 if (random.size() > 0)
2221
- random.name = random.get(0).name + "Rnd";
2624
+ random.name = random.get(0).name + "Switch";
22222625 } else
2223
- if (event.getSource() == physicsItem)
2626
+ if (source == physicsItem)
22242627 {
22252628 group(new PhysicsNode());
22262629 } else
2227
- if (event.getSource() == frameselectorItem)
2630
+ if (source == frameselectorItem)
22282631 {
22292632 for (int i=0; i<group.selection.size(); i++)
22302633 {
....@@ -2236,7 +2639,7 @@
22362639 ResetModel();
22372640 refreshContents();
22382641 } else
2239
- if (event.getSource() == switchGeoItem)
2642
+ if (source == switchGeoItem)
22402643 {
22412644 for (int i=0; i<group.selection.size(); i++)
22422645 {
....@@ -2248,7 +2651,7 @@
22482651 ResetModel();
22492652 refreshContents();
22502653 } else
2251
- if (event.getSource() == switchTransfoItem)
2654
+ if (source == switchTransfoItem)
22522655 {
22532656 for (int i=0; i<group.selection.size(); i++)
22542657 {
....@@ -2260,7 +2663,7 @@
22602663 ResetModel();
22612664 refreshContents();
22622665 } else
2263
- if (event.getSource() == morphItem)
2666
+ if (source == morphItem)
22642667 {
22652668 for (int i=0; i<group.selection.size(); i++)
22662669 {
....@@ -2272,7 +2675,7 @@
22722675 ResetModel();
22732676 refreshContents();
22742677 } else
2275
- if (event.getSource() == scriptNodeItem)
2678
+ if (source == scriptNodeItem)
22762679 {
22772680 boolean atleastone = false;
22782681
....@@ -2311,31 +2714,31 @@
23112714 }
23122715 }
23132716 } else
2314
- if (event.getSource() == linkerItem)
2717
+ if (source == linkerItem)
23152718 {
23162719 group(new cLinker());
23172720 } else
2318
- if (event.getSource() == textureItem)
2721
+ if (source == textureItem || source == textureButton)
23192722 {
23202723 group(new TextureNode());
23212724 } else
2322
- if (event.getSource() == billboardItem)
2725
+ if (source == billboardItem)
23232726 {
23242727 group(new BillboardNode());
23252728 } else
2326
- if (event.getSource() == shadowXItem)
2729
+ if (source == shadowXItem)
23272730 {
23282731 CastShadow(0);
23292732 } else
2330
- if (event.getSource() == shadowYItem)
2733
+ if (source == shadowYItem)
23312734 {
23322735 CastShadow(1);
23332736 } else
2334
- if (event.getSource() == shadowZItem)
2737
+ if (source == shadowZItem)
23352738 {
23362739 CastShadow(2);
23372740 } else
2338
- if (event.getSource() == ungroupItem)
2741
+ if (source == ungroupItem || source == ungroupButton)
23392742 {
23402743 //ungroup();
23412744 for (int i=0; i<group.selection.size(); i++)
....@@ -2347,179 +2750,203 @@
23472750
23482751 refreshContents();
23492752 } else
2350
- if (event.getSource() == genUVItem)
2753
+ if (source == genUVItem)
23512754 {
23522755 GenUV();
23532756 } else
2354
- if (event.getSource() == genNormalsCADItem)
2757
+ if (source == genNormalsCADItem)
23552758 {
23562759 GenNormals(true);
23572760 } else
2358
- if (event.getSource() == genNormalsMESHItem)
2761
+ if (source == genNormalsMESHItem)
23592762 {
2360
- GenNormals(true); // TODO
2763
+ GenNormalsMESH();
23612764 } else
2362
- if (event.getSource() == genNormalsORGANItem)
2765
+ if (source == genNormalsORGANItem)
23632766 {
23642767 GenNormals(false);
23652768 } else
2366
- if (event.getSource() == genNormalsMINEItem)
2769
+ if (source == genNormalsMINEItem)
23672770 {
23682771 GenNormalsMINE();
23692772 } else
2370
- if (event.getSource() == stripifyItem)
2773
+ if (source == stripifyItem)
23712774 {
23722775 Stripify();
23732776 } else
2374
- if (event.getSource() == unstripifyItem)
2777
+ if (source == unstripifyItem)
23752778 {
23762779 Unstripify();
23772780 } else
2378
- if (event.getSource() == trimItem)
2781
+ if (source == trimItem)
23792782 {
23802783 Trim();
23812784 } else
2382
- if (event.getSource() == untrimItem)
2785
+ if (source == untrimItem)
23832786 {
23842787 Untrim();
23852788 } else
2386
- if (event.getSource() == clearColorsItem)
2789
+ if (source == clearColorsItem)
23872790 {
23882791 ClearColors();
23892792 } else
2390
- if (event.getSource() == clearMaterialsItem)
2793
+ if (source == clearMaterialsItem)
23912794 {
23922795 ClearMaterials();
23932796 } else
2394
- if (event.getSource() == liveleavesItem)
2797
+ if (source == liveleavesItem)
23952798 {
23962799 LiveLeaves(true);
23972800 } else
2398
- if (event.getSource() == unliveleavesItem)
2801
+ if (source == unliveleavesItem)
23992802 {
24002803 LiveLeaves(false);
24012804 } else
2402
- if (event.getSource() == supportleavesItem)
2805
+ if (source == supportleavesItem)
24032806 {
24042807 SupportLeaves(true);
24052808 } else
2406
- if (event.getSource() == unsupportleavesItem)
2809
+ if (source == unsupportleavesItem)
24072810 {
24082811 SupportLeaves(false);
24092812 } else
2410
- if (event.getSource() == hideleavesItem)
2813
+ if (source == hideleavesItem)
24112814 {
24122815 HideLeaves(true);
24132816 } else
2414
- if (event.getSource() == showleavesItem)
2817
+ if (source == showleavesItem)
24152818 {
24162819 HideLeaves(false);
24172820 } else
2418
- if (event.getSource() == markleavesItem)
2821
+ if (source == markleavesItem)
24192822 {
24202823 MarkLeaves(true);
24212824 } else
2422
- if (event.getSource() == unmarkleavesItem)
2825
+ if (source == unmarkleavesItem)
24232826 {
24242827 MarkLeaves(false);
24252828 } else
2426
- if (event.getSource() == flipVItem)
2829
+ if (source == rewindleavesItem)
2830
+ {
2831
+ RewindLeaves(true);
2832
+ } else
2833
+ if (source == unrewindleavesItem)
2834
+ {
2835
+ RewindLeaves(false);
2836
+ } else
2837
+ if (source == randomleavesItem)
2838
+ {
2839
+ RandomLeaves(true);
2840
+ } else
2841
+ if (source == unrandomleavesItem)
2842
+ {
2843
+ RandomLeaves(false);
2844
+ } else
2845
+ if (source == flipVItem)
24272846 {
24282847 FlipV(true);
24292848 } else
2430
- if (event.getSource() == unflipVItem)
2849
+ if (source == unflipVItem)
24312850 {
24322851 FlipV(false);
24332852 } else
2434
- if (event.getSource() == lowTexturesItem)
2853
+ if (source == lowTexturesItem)
24352854 {
24362855 SetTexRes(0);
24372856 } else
2438
- if (event.getSource() == normalTexturesItem)
2857
+ if (source == normalTexturesItem)
24392858 {
24402859 SetTexRes(1);
24412860 } else
2442
- if (event.getSource() == highTexturesItem)
2861
+ if (source == highTexturesItem)
24432862 {
24442863 SetTexRes(2);
24452864 } else
2446
- if (event.getSource() == veryhighTexturesItem)
2865
+ if (source == veryhighTexturesItem)
24472866 {
24482867 SetTexRes(3);
24492868 } else
2450
- if (event.getSource() == maxTexturesItem)
2869
+ if (source == maxTexturesItem)
24512870 {
24522871 SetTexRes(4);
24532872 } else
2454
- if (event.getSource() == panoTexturesItem)
2873
+ if (source == panoTexturesItem)
24552874 {
24562875 SetTexRes(5);
24572876 } else
2458
- if (event.getSource() == reverseNormalsItem)
2877
+ if (source == reverseNormalsItem)
24592878 {
24602879 ReverseNormals();
24612880 } else
2462
- if (event.getSource() == parseverticesItem)
2881
+ if (source == parseverticesItem)
24632882 {
24642883 ParseVertices();
24652884 } else
2466
- if (event.getSource() == textureFieldItem)
2885
+ if (source == textureFieldItem)
24672886 {
24682887 TextureVertices();
24692888 } else
2470
- if (event.getSource() == alignItem)
2889
+ if (source == alignItem)
24712890 {
24722891 Align();
24732892 } else
2474
- if (event.getSource() == mirrorItem)
2893
+ if (source == mirrorItem)
24752894 {
24762895 MirrorPoses();
24772896 } else
2478
- if (event.getSource() == reduceMorphItem)
2897
+ if (source == reduceMorphItem)
24792898 {
24802899 MeshReduction(false);
24812900 } else
2482
- if (event.getSource() == reduce34MorphItem)
2901
+ if (source == reduce34MorphItem)
24832902 {
24842903 MeshReduction(true);
24852904 } else
2486
- if (event.getSource() == reverseTrianglesItem)
2905
+ if (source == reverseTrianglesItem)
24872906 {
24882907 ReverseTriangles();
24892908 } else
2490
- if (event.getSource() == reduceMeshItem)
2909
+ if (source == reduceMeshItem)
24912910 {
24922911 ReduceMesh(false);
24932912 } else
2494
- if (event.getSource() == reduce34MeshItem)
2913
+ if (source == reduce34MeshItem)
24952914 {
24962915 ReduceMesh(true);
24972916 } else
2498
- if (event.getSource() == increaseMeshItem)
2917
+ if (source == increaseMeshItem)
24992918 {
25002919 IncreaseMesh();
25012920 } else
2502
- if (event.getSource() == clipMeshItem)
2921
+ if (source == clipMeshItem)
25032922 {
25042923 ClipMesh();
25052924 } else
2506
- if (event.getSource() == smoothMeshItem)
2925
+ if (source == smoothMeshItem)
25072926 {
25082927 SmoothMesh();
25092928 } else
2510
- if (event.getSource() == transformgeometryItem)
2929
+ if (source == transformGeometryItem)
25112930 {
25122931 TransformGeometry();
25132932 } else
2514
- if (event.getSource() == resetTransformItem)
2933
+ if (source == transformChildrenItem)
2934
+ {
2935
+ TransformChildren();
2936
+ } else
2937
+ if (source == resetTransformItem)
25152938 {
25162939 ResetTransform();
25172940 } else
2518
- if (event.getSource() == resetCentroidItem)
2941
+ if (source == resetCentroidItem)
25192942 {
2520
- ResetCentroid();
2943
+ ResetCentroid(true);
25212944 } else
2522
- if (event.getSource() == resetParentItem)
2945
+ if (source == resetCentroidXZItem)
2946
+ {
2947
+ ResetCentroid(false);
2948
+ } else
2949
+ if (source == resetParentItem)
25232950 {
25242951 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
25252952 {
....@@ -2529,7 +2956,7 @@
25292956
25302957 refreshContents();
25312958 } else
2532
- if (event.getSource() == repairParentItem)
2959
+ if (source == repairParentItem)
25332960 {
25342961 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
25352962 {
....@@ -2543,7 +2970,21 @@
25432970
25442971 refreshContents();
25452972 } else
2546
- if (event.getSource() == sortbysizeItem)
2973
+ if (source == repairShadowItem)
2974
+ {
2975
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2976
+ {
2977
+ Object3D obj = (Object3D)e.nextElement();
2978
+ obj.RepairShadow();
2979
+// for (int i=0; i<obj.size(); i++)
2980
+// {
2981
+// obj.get(i).parent = obj;
2982
+// }
2983
+ }
2984
+
2985
+ refreshContents();
2986
+ } else
2987
+ if (source == sortbysizeItem)
25472988 {
25482989 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
25492990 {
....@@ -2555,7 +2996,7 @@
25552996 ResetModel();
25562997 refreshContents();
25572998 } else
2558
- if (event.getSource() == sortbynameItem)
2999
+ if (source == sortbynameItem)
25593000 {
25603001 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
25613002 {
....@@ -2567,7 +3008,7 @@
25673008 ResetModel();
25683009 refreshContents();
25693010 } else
2570
- if (event.getSource() == attachPigmentItem)
3011
+ if (source == attachPigmentItem)
25713012 {
25723013 String texture = GetFile("Attach pigment");
25733014 Object3D obj;
....@@ -2579,7 +3020,7 @@
25793020
25803021 refreshContents();
25813022 } else
2582
- if (event.getSource() == detachPigmentItem)
3023
+ if (source == detachPigmentItem)
25833024 {
25843025 Object3D obj;
25853026 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -2590,7 +3031,7 @@
25903031
25913032 refreshContents();
25923033 } else
2593
- if (event.getSource() == attachBumpItem)
3034
+ if (source == attachBumpItem)
25943035 {
25953036 String texture = GetFile("Attach bump");
25963037 Object3D obj;
....@@ -2602,7 +3043,7 @@
26023043
26033044 refreshContents();
26043045 } else
2605
- if (event.getSource() == detachBumpItem)
3046
+ if (source == detachBumpItem)
26063047 {
26073048 Object3D obj;
26083049 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -2613,7 +3054,7 @@
26133054
26143055 refreshContents();
26153056 } else
2616
- if (event.getSource() == pigmentBumpItem)
3057
+ if (source == pigmentBumpItem)
26173058 {
26183059 Object3D obj;
26193060 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -2624,158 +3065,237 @@
26243065
26253066 refreshContents();
26263067 } else
2627
- if (event.getSource() == flashSelectionButton)
3068
+ if (source == flashSelectionButton)
26283069 {
26293070 CameraPane.flash = true;
26303071 refreshContents();
26313072 } else
2632
- if (event.getSource() == oneButton)
3073
+ if (source == oneButton)
26333074 {
26343075 } else
2635
- if (event.getSource() == twoButton)
3076
+ if (source == twoButton)
26363077 {
26373078 radio.layout = twoButton;
3079
+
3080
+ if (CameraPane.FULLSCREEN)
3081
+ fullscreenLayout = radio.layout;
3082
+
26383083 // bug
26393084 //gridPanel.setDividerLocation(1.0);
26403085 //bigPanel.setDividerLocation(0.0);
2641
- bigThree.remove(scenePanel);
2642
- bigThree.remove(cameraPanel);
2643
- bigThree.remove(XYZPanel);
2644
- aWindowConstraints.gridx = 0;
2645
- aWindowConstraints.gridy = 0;
2646
- aWindowConstraints.gridwidth = 1;
2647
- // aConstraints.gridheight = 3;
2648
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2649
- aWindowConstraints.weightx = 0;
2650
- aWindowConstraints.weighty = 1;
2651
- //bigThree.add(jtp, aWindowConstraints);
2652
- aWindowConstraints.weightx = 1;
2653
- aWindowConstraints.gridwidth = 3;
2654
- // aConstraints.gridheight = 3;
2655
- aWindowConstraints.gridx = 1;
2656
- aWindowConstraints.fill = GridBagConstraints.BOTH;
2657
- bigThree.add(cameraPanel, aWindowConstraints);
2658
- aWindowConstraints.weightx = 0;
2659
- aWindowConstraints.gridx = 4;
2660
- aWindowConstraints.gridwidth = 1;
2661
- // aConstraints.gridheight = 3;
2662
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2663
- //bigThree.add(XYZPanel, aWindowConstraints);
2664
- bigThree.revalidate();
3086
+// bigThree.remove(scenePanel);
3087
+// bigThree.remove(centralPanel);
3088
+// bigThree.remove(XYZPanel);
3089
+// aWindowConstraints.gridx = 0;
3090
+// aWindowConstraints.gridy = 0;
3091
+// aWindowConstraints.gridwidth = 1;
3092
+// // aConstraints.gridheight = 3;
3093
+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3094
+// aWindowConstraints.weightx = 0;
3095
+// aWindowConstraints.weighty = 1;
3096
+// //bigThree.add(jtp, aWindowConstraints);
3097
+// aWindowConstraints.weightx = 1;
3098
+// aWindowConstraints.gridwidth = 3;
3099
+// // aConstraints.gridheight = 3;
3100
+// aWindowConstraints.gridx = 1;
3101
+// aWindowConstraints.fill = GridBagConstraints.BOTH;
3102
+// bigThree.add(centralPanel, aWindowConstraints);
3103
+// aWindowConstraints.weightx = 0;
3104
+// aWindowConstraints.gridx = 4;
3105
+// aWindowConstraints.gridwidth = 1;
3106
+// // aConstraints.gridheight = 3;
3107
+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3108
+// //bigThree.add(XYZPanel, aWindowConstraints);
3109
+// scenePanel.setVisible(false);
3110
+// centralPanel.setVisible(true);
3111
+// XYZPanel.setVisible(false);
3112
+ bigThree.ClearUI();
3113
+ bigThree.add(centralPanel);
3114
+ bigThree.FlushUI();
3115
+
3116
+ cameraView.requestFocusInWindow();
3117
+
3118
+// refreshContents(true);
3119
+//
3120
+// try
3121
+// {
3122
+// java.awt.Robot bot = new java.awt.Robot();
3123
+// int mask = InputEvent.BUTTON1_MASK;
3124
+// bot.mouseMove(100, 100);
3125
+// bot.mousePress(mask);
3126
+// bot.mouseRelease(mask);
3127
+// }
3128
+// catch (Exception e)
3129
+// {
3130
+//
3131
+// }
3132
+
26653133 } else
2666
- if (event.getSource() == threeButton)
3134
+ if (source == threeButton)
26673135 {
26683136 radio.layout = threeButton;
2669
- bigThree.remove(scenePanel);
2670
- bigThree.remove(cameraPanel);
2671
- bigThree.remove(XYZPanel);
2672
- aWindowConstraints.gridx = 0;
2673
- aWindowConstraints.gridy = 0;
2674
- aWindowConstraints.gridwidth = 1;
2675
- // aConstraints.gridheight = 3;
2676
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2677
- aWindowConstraints.weightx = 0;
2678
- aWindowConstraints.weighty = 1;
2679
- //bigThree.add(jtp, aWindowConstraints);
2680
- aWindowConstraints.weightx = 1;
2681
- aWindowConstraints.gridwidth = 3;
2682
- // aConstraints.gridheight = 3;
2683
- aWindowConstraints.gridx = 1;
2684
- aWindowConstraints.fill = GridBagConstraints.BOTH;
2685
- bigThree.add(cameraPanel, aWindowConstraints);
2686
- aWindowConstraints.weightx = 0;
2687
- aWindowConstraints.gridx = 4;
2688
- aWindowConstraints.gridwidth = 1;
2689
- // aConstraints.gridheight = 3;
2690
- aConstraints.fill = GridBagConstraints.VERTICAL;
2691
- bigThree.add(XYZPanel, aWindowConstraints);
2692
- bigThree.revalidate();
3137
+
3138
+ if (CameraPane.FULLSCREEN)
3139
+ fullscreenLayout = radio.layout;
3140
+
3141
+// bigThree.remove(scenePanel);
3142
+// bigThree.remove(centralPanel);
3143
+// bigThree.remove(XYZPanel);
3144
+// aWindowConstraints.gridx = 0;
3145
+// aWindowConstraints.gridy = 0;
3146
+// aWindowConstraints.gridwidth = 1;
3147
+// // aConstraints.gridheight = 3;
3148
+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3149
+// aWindowConstraints.weightx = 0;
3150
+// aWindowConstraints.weighty = 1;
3151
+// //bigThree.add(jtp, aWindowConstraints);
3152
+// aWindowConstraints.weightx = 1;
3153
+// aWindowConstraints.gridwidth = 3;
3154
+// // aConstraints.gridheight = 3;
3155
+// aWindowConstraints.gridx = 1;
3156
+// aWindowConstraints.fill = GridBagConstraints.BOTH;
3157
+// bigThree.add(centralPanel, aWindowConstraints);
3158
+// aWindowConstraints.weightx = 0;
3159
+// aWindowConstraints.gridx = 4;
3160
+// aWindowConstraints.gridwidth = 1;
3161
+// // aConstraints.gridheight = 3;
3162
+// aConstraints.fill = GridBagConstraints.VERTICAL;
3163
+// bigThree.add(XYZPanel, aWindowConstraints);
3164
+// bigThree.validate();
3165
+// scenePanel.setVisible(false);
3166
+// centralPanel.setVisible(true);
3167
+// XYZPanel.setVisible(true);
3168
+ bigThree.ClearUI();
3169
+ bigThree.add(centralPanel);
3170
+ bigThree.add(XYZPanel);
3171
+ bigThree.FlushUI();
3172
+
3173
+ cameraView.requestFocusInWindow();
26933174 } else
2694
- if (event.getSource() == fourButton)
3175
+ if (source == fourButton)
26953176 {
26963177 radio.layout = fourButton;
2697
- bigThree.remove(scenePanel);
2698
- bigThree.remove(cameraPanel);
2699
- bigThree.remove(XYZPanel);
2700
- aWindowConstraints.gridx = 0;
2701
- aWindowConstraints.gridy = 0;
2702
- aWindowConstraints.gridwidth = 1;
2703
- // aWindowConstraints.gridheight = 3;
2704
- aWindowConstraints.fill = GridBagConstraints.BOTH;
2705
- aWindowConstraints.weightx = 1;
2706
- aWindowConstraints.weighty = 1;
2707
- bigThree.add(scenePanel, aWindowConstraints);
2708
- aWindowConstraints.weightx = 1;
2709
- aWindowConstraints.gridwidth = 3;
2710
- // aConstraints.gridheight = 3;
2711
- aWindowConstraints.gridx = 1;
2712
- aWindowConstraints.fill = GridBagConstraints.BOTH;
2713
- //bigThree.add(cameraPanel, aWindowConstraints);
2714
- aWindowConstraints.weightx = 0;
2715
- aWindowConstraints.gridx = 4;
2716
- aWindowConstraints.gridwidth = 1;
2717
- // aWindowConstraints.gridheight = 3;
2718
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2719
- //bigThree.add(XYZPanel, aWindowConstraints);
2720
- bigThree.revalidate();
3178
+
3179
+ if (CameraPane.FULLSCREEN)
3180
+ fullscreenLayout = radio.layout;
3181
+
3182
+// bigThree.remove(scenePanel);
3183
+// bigThree.remove(centralPanel);
3184
+// bigThree.remove(XYZPanel);
3185
+// aWindowConstraints.gridx = 0;
3186
+// aWindowConstraints.gridy = 0;
3187
+// aWindowConstraints.gridwidth = 1;
3188
+// // aWindowConstraints.gridheight = 3;
3189
+// aWindowConstraints.fill = GridBagConstraints.BOTH;
3190
+// aWindowConstraints.weightx = 1;
3191
+// aWindowConstraints.weighty = 1;
3192
+// bigThree.add(scenePanel, aWindowConstraints);
3193
+// aWindowConstraints.weightx = 1;
3194
+// aWindowConstraints.gridwidth = 3;
3195
+// // aConstraints.gridheight = 3;
3196
+// aWindowConstraints.gridx = 1;
3197
+// aWindowConstraints.fill = GridBagConstraints.BOTH;
3198
+// //bigThree.add(cameraPanel, aWindowConstraints);
3199
+// aWindowConstraints.weightx = 0;
3200
+// aWindowConstraints.gridx = 4;
3201
+// aWindowConstraints.gridwidth = 1;
3202
+// // aWindowConstraints.gridheight = 3;
3203
+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3204
+// //bigThree.add(XYZPanel, aWindowConstraints);
3205
+// bigThree.validate();
3206
+// scenePanel.setVisible(true);
3207
+// centralPanel.setVisible(false);
3208
+// XYZPanel.setVisible(false);
3209
+ bigThree.ClearUI();
3210
+ bigThree.add(scenePanel);
3211
+ bigThree.FlushUI();
3212
+
3213
+ cameraView.requestFocusInWindow();
27213214 } else
2722
- if (event.getSource() == sixButton)
3215
+ if (source == sixButton)
27233216 {
27243217 radio.layout = sixButton;
2725
- bigThree.remove(scenePanel);
2726
- bigThree.remove(cameraPanel);
2727
- bigThree.remove(XYZPanel);
2728
- aWindowConstraints.gridx = 0;
2729
- aWindowConstraints.gridy = 0;
2730
- aWindowConstraints.gridwidth = 1;
2731
- // aConstraints.gridheight = 3;
2732
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2733
- aWindowConstraints.weightx = 0;
2734
- aWindowConstraints.weighty = 1;
2735
- bigThree.add(scenePanel, aWindowConstraints);
2736
- aWindowConstraints.weightx = 1;
2737
- aWindowConstraints.gridwidth = 3;
2738
- // aWindowConstraints.gridheight = 3;
2739
- aWindowConstraints.gridx = 1;
2740
- aWindowConstraints.fill = GridBagConstraints.BOTH;
2741
- bigThree.add(cameraPanel, aWindowConstraints);
2742
- aWindowConstraints.weightx = 0;
2743
- aWindowConstraints.gridx = 4;
2744
- aWindowConstraints.gridwidth = 1;
2745
- // aWindowConstraints.gridheight = 3;
2746
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2747
- //bigThree.add(XYZPanel, aConstraints);
2748
- bigThree.revalidate();
3218
+
3219
+ if (CameraPane.FULLSCREEN)
3220
+ fullscreenLayout = radio.layout;
3221
+
3222
+// bigThree.remove(scenePanel);
3223
+// bigThree.remove(centralPanel);
3224
+// bigThree.remove(XYZPanel);
3225
+// aWindowConstraints.gridx = 0;
3226
+// aWindowConstraints.gridy = 0;
3227
+// aWindowConstraints.gridwidth = 1;
3228
+// // aConstraints.gridheight = 3;
3229
+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3230
+// aWindowConstraints.weightx = 0;
3231
+// aWindowConstraints.weighty = 1;
3232
+// bigThree.add(scenePanel, aWindowConstraints);
3233
+// aWindowConstraints.weightx = 1;
3234
+// aWindowConstraints.gridwidth = 3;
3235
+// // aWindowConstraints.gridheight = 3;
3236
+// aWindowConstraints.gridx = 1;
3237
+// aWindowConstraints.fill = GridBagConstraints.BOTH;
3238
+// bigThree.add(centralPanel, aWindowConstraints);
3239
+// aWindowConstraints.weightx = 0;
3240
+// aWindowConstraints.gridx = 4;
3241
+// aWindowConstraints.gridwidth = 1;
3242
+// // aWindowConstraints.gridheight = 3;
3243
+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3244
+// //bigThree.add(XYZPanel, aConstraints);
3245
+// bigThree.validate();
3246
+// scenePanel.setVisible(true);
3247
+// centralPanel.setVisible(true);
3248
+// XYZPanel.setVisible(false);
3249
+ bigThree.ClearUI();
3250
+ bigThree.add(scenePanel);
3251
+ bigThree.add(centralPanel);
3252
+ bigThree.FlushUI();
3253
+
3254
+ cameraView.requestFocusInWindow();
27493255 } else
2750
- if (event.getSource() == sevenButton)
3256
+ if (source == sevenButton)
27513257 {
27523258 radio.layout = sevenButton;
2753
- bigThree.remove(scenePanel);
2754
- bigThree.remove(cameraPanel);
2755
- bigThree.remove(XYZPanel);
2756
- aWindowConstraints.gridx = 0;
2757
- aWindowConstraints.gridy = 0;
2758
- aWindowConstraints.gridwidth = 1;
2759
- // aWindowConstraints.gridheight = 3;
2760
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2761
- aWindowConstraints.weightx = 0;
2762
- aWindowConstraints.weighty = 1;
2763
- bigThree.add(scenePanel, aWindowConstraints);
2764
- aWindowConstraints.weightx = 1;
2765
- aWindowConstraints.gridwidth = 3;
2766
- // aWindowConstraints.gridheight = 3;
2767
- aWindowConstraints.gridx = 1;
2768
- aWindowConstraints.fill = GridBagConstraints.BOTH;
2769
- bigThree.add(cameraPanel, aWindowConstraints);
2770
- aWindowConstraints.weightx = 0;
2771
- aWindowConstraints.gridx = 4;
2772
- aWindowConstraints.gridwidth = 1;
2773
- // aConstraints.gridheight = 3;
2774
- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2775
- bigThree.add(XYZPanel, aWindowConstraints);
2776
- bigThree.revalidate();
3259
+
3260
+ if (CameraPane.FULLSCREEN)
3261
+ fullscreenLayout = radio.layout;
3262
+
3263
+// bigThree.remove(scenePanel);
3264
+// bigThree.remove(centralPanel);
3265
+// bigThree.remove(XYZPanel);
3266
+// aWindowConstraints.gridx = 0;
3267
+// aWindowConstraints.gridy = 0;
3268
+// aWindowConstraints.gridwidth = 1;
3269
+// // aWindowConstraints.gridheight = 3;
3270
+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3271
+// aWindowConstraints.weightx = 0;
3272
+// aWindowConstraints.weighty = 1;
3273
+// bigThree.add(scenePanel, aWindowConstraints);
3274
+// aWindowConstraints.weightx = 1;
3275
+// aWindowConstraints.gridwidth = 3;
3276
+// // aWindowConstraints.gridheight = 3;
3277
+// aWindowConstraints.gridx = 1;
3278
+// aWindowConstraints.fill = GridBagConstraints.BOTH;
3279
+// bigThree.add(centralPanel, aWindowConstraints);
3280
+// aWindowConstraints.weightx = 0;
3281
+// aWindowConstraints.gridx = 4;
3282
+// aWindowConstraints.gridwidth = 1;
3283
+// // aConstraints.gridheight = 3;
3284
+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3285
+// bigThree.add(XYZPanel, aWindowConstraints);
3286
+// bigThree.validate();
3287
+// scenePanel.setVisible(true);
3288
+// centralPanel.setVisible(true);
3289
+// XYZPanel.setVisible(true);
3290
+ bigThree.ClearUI();
3291
+ bigThree.add(scenePanel);
3292
+ bigThree.add(centralPanel);
3293
+ bigThree.add(XYZPanel);
3294
+ bigThree.FlushUI();
3295
+
3296
+ cameraView.requestFocusInWindow();
27773297 } else
2778
- if (event.getSource() == rootButton)
3298
+ if (source == rootButton)
27793299 {
27803300 Object3D obj;
27813301 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -2785,66 +3305,84 @@
27853305 EditObject(obj);
27863306 }
27873307
3308
+ cameraView.requestFocusInWindow();
27883309 refreshContents(true);
27893310 } else
2790
- if (event.getSource() == closeButton)
3311
+ if (source == closeButton)
27913312 {
27923313 //System.out.println("CLOSE: " + buttonGroup.getSelection());
27933314 cRadio ab;
27943315 for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
27953316 {
27963317 ab = (cRadio)e.nextElement();
2797
- if(ab.getModel().isSelected() && ab.GetObject() != client)
3318
+ if (ab.getModel().isSelected() && ab.GetObject() != client)
27983319 {
3320
+ // Patch to avoid bug with transparency.
3321
+ if (!ab.hadMaterial)
3322
+ {
3323
+ ab.object.material = null;
3324
+ }
3325
+
27993326 buttonGroup.remove(ab);
28003327 radioPanel.remove(ab);
28013328
2802
- ab.GetObject().editWindow = null;
3329
+ //ab.GetObject().editWindow = null;
3330
+ ab.GetObject().manipWindow = null;
28033331 // ab.GetObject().objectUI = null; // ?????????
28043332
28053333 ((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
28063334 break;
28073335 }
28083336 }
3337
+
3338
+ cameraView.requestFocusInWindow();
28093339 refreshContents(true);
28103340 } else
2811
- if (event.getSource() == editItem || event.getSource() == editButton)
3341
+ if (source == editItem || source == editButton)
28123342 {
3343
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3344
+ {
3345
+ Object3D child = (Object3D)e.nextElement();
3346
+ child.pinned = true;
3347
+ }
3348
+
28133349 EditSelection(false);
28143350 } else
2815
- if (event.getSource() == uneditButton)
3351
+ if (source == uneditButton)
28163352 {
28173353 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
28183354 {
28193355 Object3D child = (Object3D)e.nextElement();
28203356 if(child.editWindow != null)
28213357 objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3358
+ child.pinned = false;
28223359 child.CloseUI();
28233360 listUI.remove(child);
28243361
2825
- child.editWindow = null; // ???????????
3362
+ //child.editWindow = null; // ???????????
28263363 }
2827
- objEditor.ctrlPanel.revalidate();
3364
+ objEditor.ctrlPanel.FlushUI();
28283365 //objEditor.jTree.clearSelection();
28293366 //objEditor.ResetSliders();
28303367 refreshContents(true);
28313368 } else
2832
- if (event.getSource() == clearPanelButton)
3369
+ if (source == clearPanelButton)
28333370 {
28343371 assert(copy == group);
28353372 //copy.ClearUI();
28363373 for (Object3D obj : listUI)
28373374 {
3375
+ obj.pinned = true;
28383376 obj.CloseUI();
28393377 }
28403378 listUI.clear();
28413379 refreshContents(true);
28423380 } else
2843
- if (event.getSource() == allParamsButton)
3381
+ if (source == allParamsButton)
28443382 {
28453383 assert(copy == group);
28463384
2847
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3385
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
28483386
28493387 for (Object3D obj : listUI)
28503388 {
....@@ -2861,19 +3399,19 @@
28613399
28623400 refreshContents(true);
28633401 } else
2864
- if (event.getSource() == unselectButton)
3402
+ if (source == unselectButton)
28653403 {
28663404 objEditor.jTree.clearSelection();
28673405 // ?? oct 2012 GrafreeD.clipboard.clear();
28683406 objEditor.ResetSliders();
28693407 refreshContents(true);
28703408 } else
2871
- if(event.getSource() instanceof cRadio)
3409
+ if(source instanceof cRadio)
28723410 {
28733411 group.parent = keepparent;
28743412 group.attributes = 0;
28753413 //group.editWindow = null;
2876
- /*cRadio*/ radio = (cRadio)event.getSource();
3414
+ /*cRadio*/ radio = (cRadio)source;
28773415 Object3D obj = radio.GetObject();
28783416 System.out.println("Edit " + obj);
28793417 if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
....@@ -2893,7 +3431,7 @@
28933431 }
28943432
28953433 copy = group;
2896
- //CameraPane.theRenderer.object = group;
3434
+ //Globals.theRenderer.object = group;
28973435 if(!useclient)
28983436 {
28993437 cameraView.renderCamera = radio.camera;
....@@ -2902,12 +3440,17 @@
29023440 cameraView.cameras[cameraView.cameracount] = radio.camera;
29033441 cameraView.targetLookAt.set(radio.camera.lookAt);
29043442 cameraView.object = group;
2905
- cameraView.lighttouched = true;
3443
+ //cameraView.lighttouched = true;
3444
+ Globals.lighttouched = true;
29063445 topView.object = group;
29073446 frontView.object = group;
29083447 sideView.object = group;
29093448 }
2910
- group.editWindow = this;
3449
+
3450
+// fix "+" issue
3451
+ //group.editWindow = this;
3452
+ group.manipWindow = this;
3453
+
29113454 /*
29123455 currentLayout = radio.layout;
29133456 if (currentLayout == null)
....@@ -2919,8 +3462,23 @@
29193462 //group.parent = null; // ROOT
29203463 //group.attributes = -1;
29213464 ResetModel();
3465
+
3466
+ cameraView.requestFocusInWindow();
29223467 refreshContents(true);
2923
- }
3468
+ } else if (event.getSource() == editCameraItem)
3469
+ {
3470
+ cameraView.ProtectCamera();
3471
+ cameraView.repaint();
3472
+ return;
3473
+ } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
3474
+ {
3475
+ cameraView.RevertCamera();
3476
+ cameraView.repaint();
3477
+ return;
3478
+ // } else if (event.getSource() == textureButton)
3479
+ // {
3480
+ // return; // true;
3481
+ }
29243482 else
29253483 {
29263484 //return super.action(event, arg);
....@@ -2929,7 +3487,6 @@
29293487 }
29303488
29313489 boolean useclient = false;
2932
- cRadio radio;
29333490
29343491 void ToggleRoot()
29353492 {
....@@ -2938,7 +3495,7 @@
29383495 if (useclient)
29393496 {
29403497 cameraView.object = client;
2941
- cameraView.lighttouched = true;
3498
+ Globals.lighttouched = true;
29423499 //topView.object = client;
29433500 //frontView.object = client;
29443501 //sideView.object = client;
....@@ -2946,7 +3503,7 @@
29463503 else
29473504 {
29483505 cameraView.object = group;
2949
- cameraView.lighttouched = true;
3506
+ Globals.lighttouched = true;
29503507 //topView.object = group;
29513508 //frontView.object = group;
29523509 //sideView.object = group;
....@@ -2981,6 +3538,28 @@
29813538 refreshContents();
29823539 }
29833540
3541
+ void TransformChildren()
3542
+ {
3543
+ Object3D obj;
3544
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3545
+ {
3546
+ obj = (Object3D)e.nextElement();
3547
+ obj.KeepTextureMatrices();
3548
+ obj.TransformChildren();
3549
+ obj.RestoreTextureMatrices();
3550
+
3551
+// if (obj.parent == null)
3552
+// {
3553
+// System.out.println("NULL PARENT!");
3554
+// new Exception().printStackTrace();
3555
+// }
3556
+// else
3557
+// TouchTransform(obj);
3558
+// //obj.parent.Touch();
3559
+ }
3560
+
3561
+ refreshContents();
3562
+ }
29843563
29853564 void ResetTransform()
29863565 {
....@@ -3093,7 +3672,7 @@
30933672 refreshContents();
30943673 }
30953674
3096
- void ResetCentroid()
3675
+ void ResetCentroid(boolean full)
30973676 {
30983677 Object3D obj;
30993678 for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -3108,12 +3687,16 @@
31083687 LA.matIdentity(Object3D.mat);
31093688 obj.getBounds(minima, maxima, false);
31103689 Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3111
- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3690
+ if (full)
3691
+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
31123692 Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
31133693 obj.TransformMesh(Object3D.mat);
3694
+
31143695 Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3115
- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3696
+ if (full)
3697
+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
31163698 Object3D.mat[3][2] = (minima.z + maxima.z)/2;
3699
+
31173700 LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
31183701 //Object3D.mat[3][0] = -Object3D.mat[3][0];
31193702 //Object3D.mat[3][1] = -Object3D.mat[3][1];
....@@ -3142,7 +3725,8 @@
31423725
31433726 int size = obj.MemorySize();
31443727
3145
- System.err.println((size/1024) + " KB is the size of " + obj);
3728
+ //System.err.println((size/1024) + " KB is the size of " + obj);
3729
+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
31463730 }
31473731 }
31483732 catch (Exception e)
....@@ -3179,9 +3763,9 @@
31793763 obj = (Object3D)e.nextElement();
31803764
31813765 System.out.println("Object is: " + obj);
3182
- GrafreeD.AnalyzeObject(obj);
3766
+ Grafreed.AnalyzeObject(obj);
31833767 System.out.println("Boundary rep: " + obj.bRep);
3184
- GrafreeD.AnalyzeObject(obj.bRep);
3768
+ Grafreed.AnalyzeObject(obj.bRep);
31853769
31863770 // System.err.println((size/1024) + " KB is the size of " + obj);
31873771 }
....@@ -3223,6 +3807,13 @@
32233807 void GenNormals(boolean crease)
32243808 {
32253809 group.GenNormalsS(crease);
3810
+
3811
+ refreshContents();
3812
+ }
3813
+
3814
+ void GenNormalsMESH()
3815
+ {
3816
+ group.GenNormalsMeshS();
32263817
32273818 refreshContents();
32283819 }
....@@ -3395,8 +3986,8 @@
33953986
33963987 void ParseVertices()
33973988 {
3398
- boolean epsequal = GrafreeD.epsequal;
3399
- GrafreeD.epsequal = true;
3989
+ boolean epsequal = Grafreed.epsequal;
3990
+ Grafreed.epsequal = true;
34003991
34013992 for (int i=0; i<group.selection.size(); i++)
34023993 {
....@@ -3421,7 +4012,7 @@
34214012 LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
34224013 LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
34234014
3424
- g.add(GrafreeD.clipboard);
4015
+ g.add(Grafreed.clipboard);
34254016
34264017 buffer.add(g);
34274018 }
....@@ -3436,7 +4027,7 @@
34364027 makeSomething(buffer, i==group.selection.size()-1);
34374028 }
34384029
3439
- GrafreeD.epsequal = epsequal;
4030
+ Grafreed.epsequal = epsequal;
34404031
34414032 refreshContents();
34424033 }
....@@ -3454,7 +4045,16 @@
34544045 String pigment = Object3D.GetPigment(tex);
34554046 //String bump = Object3D.GetBump(tex);
34564047
3457
- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
4048
+ com.sun.opengl.util.texture.TextureData texturedata = null;
4049
+
4050
+ try
4051
+ {
4052
+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
4053
+ }
4054
+ catch (Exception e)
4055
+ {
4056
+ System.err.println("FAIL: " + node);
4057
+ }
34584058
34594059 double s = v.s;
34604060
....@@ -3542,11 +4142,11 @@
35424142
35434143 SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
35444144
3545
- boolean random = CameraPane.RANDOM;
3546
- CameraPane.RANDOM = false; // parse all random nodes
4145
+ boolean random = CameraPane.SWITCH;
4146
+ CameraPane.SWITCH = false; // parse all random nodes
35474147 lowres.linkVerticesThis(null);
35484148 lowres.linkVerticesThis(sn);
3549
- CameraPane.RANDOM = random;
4149
+ CameraPane.SWITCH = random;
35504150
35514151 System.err.flush();
35524152
....@@ -3586,7 +4186,7 @@
35864186 return;
35874187
35884188 Object3D poses = group.selection.get(0);
3589
- Object3D ref = GrafreeD.clipboard.get(0);
4189
+ Object3D ref = Grafreed.clipboard.get(0);
35904190
35914191 Object3D newgroup = new Object3D("Po:" + poses.name);
35924192
....@@ -3755,7 +4355,7 @@
37554355 group.selection.RelinkToSupport(); // july 2014
37564356 System.out.println("DONE.");
37574357 refreshContents();
3758
- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
4358
+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
37594359 }
37604360
37614361 void ReduceMesh(boolean reduction34)
....@@ -3780,9 +4380,9 @@
37804380
37814381 void ClipMesh()
37824382 {
3783
- if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
4383
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
37844384 {
3785
- Object3D content = GrafreeD.clipboard.get(0);
4385
+ Object3D content = Grafreed.clipboard.get(0);
37864386
37874387 if (content instanceof cGroup && ((cGroup)content).transientlink )
37884388 content = ((cGroup)content).get(0);
....@@ -3791,7 +4391,7 @@
37914391 // {
37924392 // group.selection.get(i).ClipMesh(GrafreeD.clipboard);
37934393 // }
3794
- group.selection.ClipMesh(GrafreeD.clipboard);
4394
+ group.selection.ClipMesh(Grafreed.clipboard);
37954395 }
37964396 // group.selection.ClipMesh(GrafreeD.clipboard);
37974397 System.out.println("DONE.");
....@@ -3838,6 +4438,18 @@
38384438 void MarkLeaves(boolean hide)
38394439 {
38404440 group.selection.MarkLeaves(hide);
4441
+ refreshContents();
4442
+ }
4443
+
4444
+ void RewindLeaves(boolean hide)
4445
+ {
4446
+ group.selection.RewindLeaves(hide);
4447
+ refreshContents();
4448
+ }
4449
+
4450
+ void RandomLeaves(boolean hide)
4451
+ {
4452
+ group.selection.RandomLeaves(hide);
38414453 refreshContents();
38424454 }
38434455
....@@ -3912,10 +4524,6 @@
39124524 // }
39134525 // }
39144526
3915
- static boolean allparams = true;
3916
-
3917
- static Vector<Object3D> listUI = new Vector<Object3D>();
3918
-
39194527 void EditSelection(boolean newWindow)
39204528 {
39214529 // aConstraints.gridy = 0;
....@@ -3923,10 +4531,10 @@
39234531 {
39244532 //System.out.println("edit : " + objectPanel.indexOfTab("Material"));
39254533 //objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3926
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4534
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
39274535
39284536 Object3D elem = (Object3D)group.selection.elementAt(i);
3929
- if(elem != group)
4537
+ if(elem != group || !newWindow)
39304538 {
39314539 // if (!(elem instanceof Composite))
39324540 // newWindow = false;
....@@ -4009,6 +4617,17 @@
40094617
40104618 freezemodel = true;
40114619
4620
+ //for (Object3D obj : listUI)
4621
+ for (int i=listUI.size(); --i>=0;)
4622
+ {
4623
+ Object3D obj = listUI.elementAt(i);
4624
+ if (!obj.pinned)
4625
+ {
4626
+ obj.CloseUI();
4627
+ listUI.remove(i);
4628
+ }
4629
+ }
4630
+
40124631 /**/
40134632 //switch (event.id)
40144633 {
....@@ -4016,7 +4635,6 @@
40164635 //case 702: // Event.LIST_DESELECT
40174636 group.deselectAll();
40184637 TreePath tps[] = objEditor.jTree.getSelectionPaths();
4019
- objEditor.ClearInfo(); // .GetMaterial());
40204638 if (tps != null)
40214639 {
40224640 for (int i=0; i < tps.length; i++)
....@@ -4025,33 +4643,39 @@
40254643
40264644 //if (child.parent != null)
40274645 //child.parent.addSelectee(child);
4646
+ objEditor.SetMaterial(child);
40284647 group.addSelectee(child);
4029
- objEditor.SetMaterial(child); // .GetMaterial());
4030
- objEditor.AddInfo(child, this, true); // .GetMaterial());
4031
- System.err.println("info : " + child.GetPath());
40324648 }
40334649 }
4034
- else
4035
- {
4036
- objEditor.SetMaterial(group); // .GetMaterial());
4037
- objEditor.AddInfo(group, this, true); // .GetMaterial());
4038
- System.err.println("info : " + group.GetPath());
4039
- }
4650
+// else
4651
+// {
4652
+// objEditor.SetMaterial(group); // .GetMaterial());
4653
+// objEditor.AddInfo(group, this, true); // .GetMaterial());
4654
+// System.err.println("info : " + group.GetPath());
4655
+// }
40404656
4041
- objEditor.SetText(); // jan 2014
4042
-
4043
- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
4657
+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
40444658 CameraPane.flash = true;
40454659
4046
- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
4660
+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
40474661 // a camera
40484662 {
4049
- CameraPane.camerachangeframe = 0; // don't refuse it
4050
- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4051
- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
4052
- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
4663
+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4664
+ {
4665
+ CameraPane.camerachangeframe = 0; // don't refuse it
4666
+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4667
+ }
4668
+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4669
+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
40534670 }
40544671
4672
+ if (tps != null && tps.length == 1)
4673
+ {
4674
+ EditSelection(false);
4675
+ }
4676
+
4677
+ SetPinStates(tps != null && tps.length > 0);
4678
+
40554679 refreshContents();
40564680 //return true;
40574681 }
....@@ -4060,6 +4684,33 @@
40604684
40614685 freezemodel = false;
40624686 }
4687
+
4688
+ void SetPinStates(boolean enabled)
4689
+ {
4690
+ editButton.setEnabled(enabled);
4691
+ uneditButton.setEnabled(enabled);
4692
+ }
4693
+
4694
+ void refreshContents(boolean cp)
4695
+ {
4696
+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4697
+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
4698
+ {
4699
+ objEditor.ClearInfo(); // .GetMaterial());
4700
+
4701
+ for (int i=0; i < group.selection.Size(); i++)
4702
+ {
4703
+ Object3D child = (Object3D) group.selection.get(i);
4704
+
4705
+ objEditor.AddInfo(child, this, true);
4706
+ System.err.println("info : " + child.GetPath());
4707
+ }
4708
+
4709
+ objEditor.SetText(); // jan 2014
4710
+ }
4711
+
4712
+ super.refreshContents(cp);
4713
+ }
40634714
40644715 void linkSomething(Object3D thing)
40654716 {
....@@ -4131,16 +4782,19 @@
41314782 {
41324783 if (group.selection.isEmpty())
41334784 return;
4134
- GrafreeD.clipboardIsTempGroup = false;
4785
+
4786
+ Grafreed.clipboardIsTempGroup = false;
41354787 Composite tGroup = null;
41364788 if (group.selection.size() > 0) // 1)
41374789 {
41384790 tGroup = new cGroup();
4139
- GrafreeD.clipboardIsTempGroup = true;
4791
+ Grafreed.clipboardIsTempGroup = true;
41404792 }
41414793
41424794 if (cut)
41434795 {
4796
+ if (Globals.SAVEONMAKE)
4797
+ Save();
41444798 //int indices[] = jList.getSelectedIndices();
41454799 //for (int i = indices.length - 1; i >= 0; i--)
41464800 //jList.remove(indices[i]);
....@@ -4176,16 +4830,16 @@
41764830 //System.out.println("cut " + child);
41774831 //System.out.println("parent = " + child.parent);
41784832 // tmp.addChild(child);
4179
- if (GrafreeD.clipboardIsTempGroup)
4833
+ if (Grafreed.clipboardIsTempGroup)
41804834 tGroup.add/*Child*/(tmp);
41814835 else
4182
- GrafreeD.clipboard = tmp;
4836
+ Grafreed.clipboard = tmp;
41834837 }
41844838 else
4185
- if (GrafreeD.clipboardIsTempGroup)
4839
+ if (Grafreed.clipboardIsTempGroup)
41864840 tGroup.add/*Child*/(child);
41874841 else
4188
- GrafreeD.clipboard = child;
4842
+ Grafreed.clipboard = child;
41894843 }
41904844
41914845 //ResetModel();
....@@ -4217,21 +4871,23 @@
42174871 //System.out.println("cut " + elem);
42184872 //System.out.println("parent = " + elem.parent);
42194873 // tmp.addChild(elem);
4220
- if (GrafreeD.clipboardIsTempGroup)
4874
+ if (Grafreed.clipboardIsTempGroup)
42214875 tGroup.add/*Child*/(tmp);
42224876 else
4223
- GrafreeD.clipboard = tmp;
4877
+ Grafreed.clipboard = tmp;
42244878 }
42254879 else
4226
- if (GrafreeD.clipboardIsTempGroup)
4880
+ if (Grafreed.clipboardIsTempGroup)
42274881 tGroup.add/*Child*/(child);
42284882 else
4229
- GrafreeD.clipboard = child;
4883
+ Grafreed.clipboard = child;
42304884 }
42314885
42324886 }
4233
- if (GrafreeD.clipboardIsTempGroup)
4234
- GrafreeD.clipboard = tGroup;
4887
+
4888
+ if (Grafreed.clipboardIsTempGroup)
4889
+ Grafreed.clipboard = tGroup;
4890
+
42354891 if (cut)
42364892 {
42374893 ResetModel();
....@@ -4245,7 +4901,7 @@
42454901 // return;
42464902 boolean first = true;
42474903
4248
- if (GrafreeD.clipboardIsTempGroup)
4904
+ if (Grafreed.clipboardIsTempGroup)
42494905 {
42504906 Composite temp;
42514907
....@@ -4256,7 +4912,7 @@
42564912 temp = (Composite)Applet3D.clipboard.deepCopy();
42574913 */
42584914 Object3D elem;
4259
- for (Enumeration e = /*temp.children*/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4915
+ for (Enumeration e = /*temp.children*/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
42604916 {
42614917 Object3D child = (Object3D)e.nextElement();
42624918
....@@ -4290,21 +4946,21 @@
42904946 //Object3D cb = Applet3D.clipboard;
42914947 //temp.addChild(cb);
42924948 //makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4293
- assert(GrafreeD.clipboard.parent == null);
4294
- Object3D /*Composite*/ keepparent = GrafreeD.clipboard.get(0).parent;
4295
- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4296
- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4297
- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
4949
+ assert(Grafreed.clipboard.parent == null);
4950
+ Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
4951
+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
4952
+ if (LA.isIdentity(Grafreed.clipboard.toParent))
4953
+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
42984954 else
4299
- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4300
- GrafreeD.clipboard.get(0).parent = keepparent;
4955
+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
4956
+ Grafreed.clipboard.get(0).parent = keepparent;
43014957 }
43024958
43034959 ResetModel();
43044960 refreshContents();
43054961 }
43064962
4307
- void pasteInto(boolean copyit)
4963
+ void pasteInto(boolean copyit, boolean clone)
43084964 {
43094965 // if (GrafreeD.clipboard == null)
43104966 // return;
....@@ -4333,15 +4989,22 @@
43334989 if (copyit)
43344990 {
43354991 // paste(false);
4336
- CloneClipboard(false); // sept 2014
4992
+ if (clone)
4993
+ {
4994
+ CloneClipboard(false); // sept 2014
4995
+ }
4996
+ else
4997
+ {
4998
+ paste(false);
4999
+ }
43375000 }
43385001 else
43395002 {
43405003 boolean first = true;
43415004
4342
- if (GrafreeD.clipboardIsTempGroup)
5005
+ if (Grafreed.clipboardIsTempGroup)
43435006 {
4344
- Composite temp = (Composite)GrafreeD.clipboard;
5007
+ Composite temp = (Composite)Grafreed.clipboard;
43455008 Object3D copy;
43465009 for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
43475010 {
....@@ -4351,7 +5014,7 @@
43515014 }
43525015 } else
43535016 {
4354
- linkSomething(GrafreeD.clipboard); //.get(0));
5017
+ linkSomething(Grafreed.clipboard); //.get(0));
43555018 }
43565019 }
43575020 }
....@@ -4756,21 +5419,6 @@
47565419 }
47575420 */
47585421
4759
- void ImportGFD()
4760
- {
4761
- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4762
- browser.show();
4763
- String filename = browser.getFile();
4764
- if (filename != null && filename.length() > 0)
4765
- {
4766
- String fullname = browser.getDirectory() + filename;
4767
-
4768
- //Object3D readobj =
4769
- objEditor.ReadGFD(fullname, objEditor);
4770
- //makeSomething(readobj);
4771
- }
4772
- }
4773
-
47745422 /*
47755423 public void Callback(Object obj)
47765424 {
....@@ -4794,26 +5442,9 @@
47945442 }
47955443 */
47965444
4797
- void ImportVRMLX3D()
4798
- {
4799
- if (GrafreeD.standAlone)
4800
- {
4801
- /**/
4802
- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4803
- browser.show();
4804
- String filename = browser.getFile();
4805
- if (filename != null && filename.length() > 0)
4806
- {
4807
- String fullname = browser.getDirectory() + filename;
4808
- LoadVRMLX3D(fullname);
4809
- }
4810
- /**/
4811
- }
4812
- }
4813
-
48145445 String GetFile(String dialogName)
48155446 {
4816
- if (GrafreeD.standAlone)
5447
+ if (Grafreed.standAlone)
48175448 {
48185449 FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
48195450 browser.show();
....@@ -4877,10 +5508,36 @@
48775508 cButton flashSelectionButton;
48785509 cButton editButton;
48795510 cButton uneditButton;
5511
+ JCheckBox allParamsButton;
48805512 cButton clearpanelButton;
4881
- cButton allParamsButton;
48825513 cButton unselectButton;
48835514
5515
+ cButton restoreCameraButton;
5516
+
5517
+ cButton minButton;
5518
+ cButton maxButton;
5519
+ cButton fullButton;
5520
+ cButton saveButton;
5521
+ cButton oneStepButton;
5522
+
5523
+ cButton groupButton;
5524
+ cButton ungroupButton;
5525
+ cButton compositeButton;
5526
+ cButton switchButton;
5527
+ cButton loopButton;
5528
+ cButton textureButton;
5529
+
5530
+ cButton gridButton;
5531
+ cButton boxButton;
5532
+ cButton sphereButton;
5533
+ cButton coneButton;
5534
+ cButton torusButton;
5535
+ cButton superButton;
5536
+ cButton kleinButton;
5537
+ cButton particlesButton;
5538
+ cButton overlayButton;
5539
+ cButton lightButton;
5540
+
48845541 cButton screenfitButton;
48855542 cButton screenfitpointButton;
48865543 cButton snapobjectButton;
....@@ -4892,14 +5549,6 @@
48925549
48935550 cButton setsupportButton;
48945551
4895
- cButton twoButton;
4896
- cButton sixButton;
4897
- cButton threeButton;
4898
- cButton sevenButton;
4899
- cButton fourButton; // full panel
4900
- cButton oneButton; // full XYZ
4901
- //cButton currentLayout;
4902
-
49035552 //
49045553 //Composite
49055554 Object3D // to do !!
....@@ -4909,9 +5558,11 @@
49095558 //JTree jTree;
49105559 private MenuItem lookAtItem;
49115560 private MenuItem lookFromItem;
4912
- private MenuItem switchItem;
5561
+ private MenuItem switchViewItem;
49135562 private MenuItem cutItem;
4914
- private MenuItem duplicateItem;
5563
+ private MenuItem undoItem;
5564
+ private MenuItem redoItem;
5565
+ private JMenuItem duplicateItem;
49155566 private MenuItem cloneItem;
49165567 private MenuItem cloneSupportItem;
49175568 private MenuItem overwriteGeoItem;
....@@ -4924,7 +5575,7 @@
49245575 private MenuItem linkverticesItem;
49255576 private MenuItem relinkverticesItem;
49265577 private MenuItem setMasterItem;
4927
- private MenuItem resetMeshItem;
5578
+ private MenuItem resetAllItem;
49285579 private MenuItem stepAllItem;
49295580 private MenuItem revertMeshItem;
49305581 private MenuItem poseMeshItem;
....@@ -4935,6 +5586,7 @@
49355586 private MenuItem mergeGeometriesItem;
49365587 private MenuItem copyItem;
49375588 private MenuItem pasteItem;
5589
+ private MenuItem pasteIntoItem;
49385590 private MenuItem pasteLinkItem;
49395591 private MenuItem pasteCloneItem;
49405592 private MenuItem pasteExpandItem;
....@@ -4973,6 +5625,10 @@
49735625 private MenuItem showleavesItem;
49745626 private MenuItem markleavesItem;
49755627 private MenuItem unmarkleavesItem;
5628
+ private MenuItem rewindleavesItem;
5629
+ private MenuItem unrewindleavesItem;
5630
+ private MenuItem randomleavesItem;
5631
+ private MenuItem unrandomleavesItem;
49765632
49775633 private MenuItem flipVItem;
49785634 private MenuItem unflipVItem;
....@@ -4984,15 +5640,17 @@
49845640 private MenuItem panoTexturesItem;
49855641
49865642 private MenuItem resetCentroidItem;
4987
- private MenuItem transformgeometryItem;
5643
+ private MenuItem resetCentroidXZItem;
49885644 private MenuItem resetTransformItem;
5645
+ private MenuItem transformGeometryItem;
5646
+ private MenuItem transformChildrenItem;
49895647 private MenuItem hideItem;
49905648 private MenuItem grabItem;
49915649 private MenuItem backItem;
49925650 private MenuItem frontItem;
49935651 private MenuItem cameraItem;
49945652 private MenuItem compositeItem;
4995
- private MenuItem randomItem;
5653
+ private MenuItem switchItem;
49965654 private MenuItem physicsItem;
49975655 private MenuItem frameselectorItem;
49985656 private MenuItem scriptNodeItem;
....@@ -5007,6 +5665,7 @@
50075665
50085666 private MenuItem resetParentItem;
50095667 private MenuItem repairParentItem;
5668
+ private MenuItem repairShadowItem;
50105669 private MenuItem sortbysizeItem;
50115670 private MenuItem sortbynameItem;
50125671
....@@ -5031,7 +5690,7 @@
50315690 private MenuItem blobItem;
50325691 private MenuItem latheItem;
50335692 private MenuItem bezierItem;
5034
- private MenuItem checkerItem;
5693
+ private MenuItem overlayItem;
50355694 private MenuItem meshItem;
50365695 // private MenuItem meshGroupItem;
50375696 private MenuItem springItem;
....@@ -5053,11 +5712,6 @@
50535712 private MenuItem doubleItem;
50545713 private MenuItem tripleItem;
50555714
5056
- private MenuItem importGFDItem;
5057
- private MenuItem importVRMLX3DItem;
5058
- private MenuItem import3DSItem;
5059
- private MenuItem importOBJItem;
5060
-
50615715 private MenuItem computeAOItem;
50625716 private MenuItem recompileItem;
50635717 private MenuItem editScriptItem;
....@@ -5067,4 +5721,8 @@
50675721 private MenuItem analyzeItem;
50685722 private MenuItem dumpItem;
50695723 //boolean freezemodel = false;
5724
+
5725
+ Menu cameraMenu;
5726
+ MenuItem editCameraItem;
5727
+ MenuItem restoreCameraItem;
50705728 }