Normand Briere
2019-06-30 cfd7a643cb5a445016ddb15595158ecc59b184fd
GroupEditor.java
....@@ -74,7 +74,7 @@
7474 this.copy = this.group = copy;
7575 //selectees = this.group.selectees;
7676
77
- SetupMenu2(objEditor);
77
+ SetupMenu2(this); //objEditor);
7878 SetupUI2(objEditor);
7979 objEditor.SetupUI(true);
8080 SetupViews(objEditor);
....@@ -148,28 +148,21 @@
148148
149149 //JTextField nameField;
150150
151
- void SetupMenu2(ObjEditor oe)
151
+ void SetupMenu2(GroupEditor oe)
152152 {
153
- if (Globals.ADVANCED)
154
- {
155
- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
156
- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
157
- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
158
- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
159
- oe.cameraMenu.add("-");
160
- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
161
- openWindowItem.addActionListener(this);
162
- editLeafItem.addActionListener(this);
163
- lookAtItem.addActionListener(this);
164
- //lookFromItem.addActinoListener(this);
165
- //switchItem.addActionListener(this);
166
- }
167
-
153
+ oe.jTree = new cTree();
154
+
168155 Menu menu;
169156 oe.menuBar.add(menu = new Menu("Edit"));
170157 //editItem = menu.add(new MenuItem("Edit"));
171158 //editItem.addActionListener(this);
172
- 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"));
173166 duplicateItem.addActionListener(this);
174167 cloneItem = menu.add(new MenuItem("Clone"));
175168 cloneItem.addActionListener(this);
....@@ -185,7 +178,6 @@
185178 copyItem.addActionListener(this);
186179 pasteItem = menu.add(new MenuItem("Paste"));
187180 pasteItem.addActionListener(this);
188
- menu.add("-");
189181
190182 menu.add("-");
191183 pasteIntoItem = menu.add(new MenuItem("Paste into"));
....@@ -206,7 +198,94 @@
206198 clearAllItem = menu.add(new MenuItem("Clear All"));
207199 clearAllItem.addActionListener(this);
208200 }
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("Show 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());
209237
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
+
210289 oe.menuBar.add(menu = new Menu("Setting"));
211290 if (Globals.ADVANCED)
212291 {
....@@ -249,21 +328,29 @@
249328 }
250329
251330 oe.menuBar.add(menu = new Menu("Group"));
252
- grabItem = menu.add(new MenuItem("Grab"));
253
- grabItem.addActionListener(this);
331
+// grabItem = menu.add(new MenuItem("Grab"));
332
+// grabItem.addActionListener(this);
254333 backItem = menu.add(new MenuItem("Back"));
255334 backItem.addActionListener(this);
256335 frontItem = menu.add(new MenuItem("Front"));
257336 frontItem.addActionListener(this);
258
- compositeItem = menu.add(new MenuItem("Composite"));
259
- compositeItem.addActionListener(this);
337
+// compositeItem = menu.add(new MenuItem("Composite"));
338
+// compositeItem.addActionListener(this);
339
+
340
+ if (Globals.ADVANCED)
341
+ {
260342 hideItem = menu.add(new MenuItem("Hidden Group"));
261343 hideItem.addActionListener(this);
344
+ }
262345 ungroupItem = menu.add(new MenuItem("Ungroup"));
263346 ungroupItem.addActionListener(this);
264
- menu.add("-");
265
- randomItem = menu.add(new MenuItem("Switch node"));
266
- randomItem.addActionListener(this);
347
+
348
+// menu.add("-");
349
+//
350
+// switchItem = menu.add(new MenuItem("Switch node"));
351
+// switchItem.addActionListener(this);
352
+ if (Globals.ADVANCED)
353
+ {
267354 switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
268355 switchGeoItem.addActionListener(this);
269356 switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
....@@ -271,8 +358,6 @@
271358 morphItem = menu.add(new MenuItem("Morph Group"));
272359 morphItem.addActionListener(this);
273360
274
- if (Globals.ADVANCED)
275
- {
276361 menu.add("-");
277362 physicsItem = menu.add(new MenuItem("Physics"));
278363 physicsItem.addActionListener(this);
....@@ -280,22 +365,20 @@
280365 frameselectorItem.addActionListener(this);
281366 scriptNodeItem = menu.add(new MenuItem("Script Node"));
282367 scriptNodeItem.addActionListener(this);
283
- cameraItem = menu.add(new MenuItem("Camera"));
284
- cameraItem.addActionListener(this);
285368 }
286369
287370 oe.menuBar.add(menu = new Menu("Object"));
288
- textureItem = menu.add(new MenuItem("Texture"));
289
- textureItem.addActionListener(this);
371
+// textureItem = menu.add(new MenuItem("Texture"));
372
+// textureItem.addActionListener(this);
290373 billboardItem = menu.add(new MenuItem("Billboard"));
291374 billboardItem.addActionListener(this);
292375 csgItem = menu.add(new MenuItem("CSG"));
293376 csgItem.addActionListener(this);
294
- shadowXItem = menu.add(new MenuItem("Shadow X"));
377
+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
295378 shadowXItem.addActionListener(this);
296
- shadowYItem = menu.add(new MenuItem("Shadow Y"));
379
+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
297380 shadowYItem.addActionListener(this);
298
- shadowZItem = menu.add(new MenuItem("Shadow Z"));
381
+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
299382 shadowZItem.addActionListener(this);
300383 if (Globals.ADVANCED)
301384 {
....@@ -392,6 +475,14 @@
392475 markleavesItem.addActionListener(this);
393476 unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
394477 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);
395486 menu.add("-");
396487 flipVItem = menu.add(new MenuItem("Flip V"));
397488 flipVItem.addActionListener(this);
....@@ -443,25 +534,24 @@
443534 oe.menuBar.add(menu = new Menu("Insert"));
444535 buildCreateMenu(menu);
445536
446
- oe.menuBar.add(menu = new Menu("Include"));
447
- importOBJItem = menu.add(new MenuItem("OBJ file..."));
448
- importOBJItem.addActionListener(this);
449
- menu.add("-");
450
- import3DSItem = menu.add(new MenuItem("3DS file..."));
451
- import3DSItem.addActionListener(this);
452
- menu.add("-");
453
- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
454
- importVRMLX3DItem.addActionListener(this);
455
- menu.add("-");
456
- importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
457
- importGFDItem.addActionListener(this);
458
-
459537 oe.menuBar.add(menu = new Menu("Tools"));
460538 buildToolsMenu(menu);
461539 }
462540
463541 void SetupUI2(ObjEditor oe)
464542 {
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
+
465555 //new Exception().printStackTrace();
466556
467557 oe.radioPanel = new JPanel(new GridBagLayout());
....@@ -490,27 +580,66 @@
490580 oe.radioPanel.add(dummyButton);
491581 oe.buttonGroup.add(dummyButton);
492582 */
583
+ cGridBag copyOptionsPanel = new cGridBag();
584
+
585
+ copyOptionsPanel.preferredHeight = 1;
586
+
493587 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
494588
495
- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
589
+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
590
+ //minButton.setToolTipText("Minimize window");
591
+ //minButton.addActionListener(this);
592
+
593
+ if (Globals.ADVANCED)
594
+ {
595
+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596
+ maxButton.setToolTipText("Maximize window");
597
+ maxButton.addActionListener(this);
598
+ }
599
+
600
+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
601
+ fullButton.setToolTipText("Full-screen window");
602
+ fullButton.addActionListener(this);
603
+
604
+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
605
+ restoreCameraButton.setToolTipText("Restore viewpoint");
606
+ restoreCameraButton.addActionListener(this);
607
+
608
+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609
+ undoButton.setToolTipText("Undo changes");
610
+ undoButton.addActionListener(this);
611
+ undoButton.setEnabled(false);
612
+
613
+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
614
+ redoButton.setToolTipText("Redo changes");
615
+ redoButton.addActionListener(this);
616
+ redoButton.setEnabled(false);
617
+
618
+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
619
+ saveButton.setToolTipText("Save changes");
620
+ saveButton.addActionListener(this);
621
+
622
+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
496623 liveCB.setToolTipText("Enable animation");
497624 liveCB.addItemListener(this);
498625
499
- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
626
+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
500627 oneStepButton.setToolTipText("Animate one step forward");
501628 oneStepButton.addActionListener(this);
502629
503
- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
630
+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
504631 fastCB.setToolTipText("Fast mode");
505632 fastCB.addItemListener(this);
506633
507
- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
508
- trackCB.setToolTipText("Enable tracking");
509
- trackCB.addItemListener(this);
510
-
511
- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634
+ //oe.toolboxPanel.Return();
635
+
636
+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
512637 screenfitButton.setToolTipText("Screen fit");
513638 screenfitButton.addActionListener(this);
639
+
640
+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
641
+// trackCB.setToolTipText("Enable tracking");
642
+// trackCB.addItemListener(this);
514643
515644 // oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
516645 // screenfitpointButton.addActionListener(this);
....@@ -522,65 +651,145 @@
522651 snapobjectButton.setToolTipText("Snap Object");
523652 }
524653
525
- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
526
- flashSelectionButton.setToolTipText("Show selection");
527
- flashSelectionButton.addActionListener(this);
654
+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
528655
529
- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
530
-
531
- oe.toolbarPanel.add(twoButton = new cButton("|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
656
+ oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
532657 twoButton.setToolTipText("Show center view only");
533658 twoButton.addActionListener(this);
534
- oe.toolbarPanel.add(fourButton = new cButton("+||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
659
+ this.fullscreenLayout = twoButton;
660
+
661
+ oe.toolbarPanel.add(fourButton = new cButton("-||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
535662 fourButton.addActionListener(this);
536663 fourButton.setToolTipText("Show left panel only");
537
- oe.toolbarPanel.add(sixButton = new cButton("+|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
664
+ oe.toolbarPanel.add(sixButton = new cButton("-|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
538665 sixButton.setToolTipText("2-column layout left");
539666 sixButton.addActionListener(this);
540
- oe.toolbarPanel.add(threeButton = new cButton("|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
667
+ oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
541668 threeButton.setToolTipText("2-column layout right");
542669 threeButton.addActionListener(this);
543
- oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
670
+ oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
544671 sevenButton.setToolTipText("3-column layout");
545672 sevenButton.addActionListener(this);
546673 //
547674
548
- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
675
+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
549676 rootButton.setToolTipText("Edit selection in new tab");
550677 rootButton.addActionListener(this);
551678
552
- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
679
+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
553680 closeButton.setToolTipText("Close tab");
554681 closeButton.addActionListener(this);
555682 //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
556683 //clearButton.addActionListener(this);
557
-
558
- cGridBag commandsPanel = new cGridBag();
684
+
685
+ // INSERT
686
+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
687
+ gridButton.setToolTipText("Create grid");
688
+ gridButton.addActionListener(this);
689
+
690
+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
691
+ boxButton.setToolTipText("Create box");
692
+ boxButton.addActionListener(this);
693
+
694
+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
695
+ sphereButton.setToolTipText("Create sphere");
696
+ sphereButton.addActionListener(this);
697
+
698
+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
699
+ coneButton.setToolTipText("Create cone");
700
+ coneButton.addActionListener(this);
701
+
702
+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
703
+ torusButton.setToolTipText("Create torus");
704
+ torusButton.addActionListener(this);
705
+
706
+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
707
+ superButton.setToolTipText("Create superellipsoid");
708
+ superButton.addActionListener(this);
709
+
710
+ if (Globals.ADVANCED)
711
+ {
712
+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
713
+ kleinButton.setToolTipText("Create Klein bottle");
714
+ kleinButton.addActionListener(this);
715
+ }
559716
560
- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561
- editButton.setToolTipText("Edit selection");
717
+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
718
+ particlesButton.setToolTipText("Create particle system");
719
+ particlesButton.addActionListener(this);
720
+
721
+ oe.toolboxPanel.Return();
722
+
723
+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
724
+ groupButton.setToolTipText("Create group");
725
+ groupButton.addActionListener(this);
726
+
727
+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
728
+ compositeButton.setToolTipText("Create composite");
729
+ compositeButton.addActionListener(this);
730
+
731
+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
732
+ switchButton.setToolTipText("Create item switcher");
733
+ switchButton.addActionListener(this);
734
+
735
+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
736
+ loopButton.setToolTipText("Create loop");
737
+ loopButton.addActionListener(this);
738
+
739
+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
740
+ textureButton.setToolTipText("Create texture");
741
+ textureButton.addActionListener(this);
742
+
743
+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
744
+ overlayButton.setToolTipText("Create overlay");
745
+ overlayButton.addActionListener(this);
746
+
747
+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
748
+ lightButton.setToolTipText("Create light");
749
+ lightButton.addActionListener(this);
750
+
751
+ for (int i=6; --i>=0;)
752
+ {
753
+ oe.toolboxPanel.Return();
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
+ oe.toolboxPanel.add(new cGridBag());
759
+ oe.toolboxPanel.add(new cGridBag());
760
+ oe.toolboxPanel.add(new cGridBag());
761
+ }
762
+
763
+ // EDIT panel
764
+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
765
+ editButton.setToolTipText("Pin selection controls");
562766 editButton.addActionListener(this);
563767
564
- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565
- uneditButton.setToolTipText("Unedit selection");
768
+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
769
+ uneditButton.setToolTipText("Remove selection controls");
566770 uneditButton.addActionListener(this);
567771
568
- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
569
- allParamsButton.setToolTipText("Edit all params");
772
+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
773
+ allParamsButton.setToolTipText("Show all controle");
570774 allParamsButton.addActionListener(this);
571775
572
- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
776
+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
573777 clearPanelButton.setToolTipText("Clear edit panel");
574778 clearPanelButton.addActionListener(this);
575779
576
- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
780
+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577781 unselectButton.setToolTipText("Unselect");
578782 unselectButton.addActionListener(this);
579783
580
- commandsPanel.preferredHeight = 1;
784
+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
785
+ flashSelectionButton.setToolTipText("Highlight selection");
786
+ flashSelectionButton.addActionListener(this);
581787
582
- oe.treePanel.add(commandsPanel);
583
- oe.treePanel.Return();
788
+ editCommandsPanel.preferredHeight = 1;
789
+
790
+ SetPinStates(false);
791
+// oe.treePanel.add(commandsPanel);
792
+// oe.treePanel.Return();
584793
585794 // oe.aConstraints.gridx += 1;
586795 // oe.aConstraints.weighty = 0;
....@@ -597,27 +806,12 @@
597806
598807 JScrollPane jSP;
599808 //ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
600
- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
809
+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
601810 ResetModel();
602811
603812 oe.treePanel.add(jSPPanel);
604813 oe.treePanel.Return();
605814
606
- cGridBag copyOptionsPanel = new cGridBag();
607
-
608
- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
609
- colorCB.setToolTipText("Copy color when dropped");
610
- colorCB.addItemListener(this);
611
-
612
- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
613
- materialCB.setToolTipText("Copy material when dropped");
614
- materialCB.addItemListener(this);
615
-
616
- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
617
- textureCB.setToolTipText("Copy texture when dropped");
618
- textureCB.addItemListener(this);
619
-
620
- copyOptionsPanel.preferredHeight = 1;
621815 oe.treePanel.add(copyOptionsPanel);
622816 oe.treePanel.Return();
623817
....@@ -648,23 +842,43 @@
648842
649843 void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
650844 {
845
+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
846
+ colorCB.setToolTipText("Copy color when dropped");
847
+ colorCB.addItemListener(this);
848
+
849
+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
850
+ materialCB.setToolTipText("Copy material when dropped");
851
+ materialCB.addItemListener(this);
852
+
853
+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
854
+ textureCB.setToolTipText("Copy texture when dropped");
855
+ textureCB.addItemListener(this);
856
+
857
+ panel.Return();
858
+
651859 panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
652860 boxCB.setToolTipText("Display bounding boxes");
653861 boxCB.addItemListener(this);
654862
655863 panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
656
- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
864
+ zoomBoxCB.setToolTipText("Display only for wheel");
657865 zoomBoxCB.addItemListener(this);
658866
659867 if (true) // Globals.ADVANCED)
660868 {
661
- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
662
- supportCB.setToolTipText("Enable rigging");
663
- supportCB.addItemListener(this);
869
+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
870
+// supportCB.setToolTipText("Enable rigging");
871
+// supportCB.addItemListener(this);
872
+
873
+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
874
+ freezeCB.setToolTipText("Fast moving camera");
875
+ freezeCB.addItemListener(this);
664876
665877 // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
666878 // localCB.addItemListener(this);
667879
880
+ panel.Return();
881
+
668882 panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
669883 crowdCB.setToolTipText("Used for crowds");
670884 crowdCB.addItemListener(this);
....@@ -681,6 +895,8 @@
681895 // panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
682896 // speakerMocapCB.addItemListener(this);
683897
898
+ panel.Return();
899
+
684900 if (false)
685901 {
686902 // handled in scripts
....@@ -695,32 +911,72 @@
695911 //constraints.gridy += 1;
696912 panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
697913 smoothfocusCB.addItemListener(this);
914
+ panel.Return();
698915 }
699916
700917 //constraints.gridx += 1;
701918 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
702919 // debugCB.addItemListener(this);
703920
921
+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
922
+ trackCB.setToolTipText("Enable tracking target");
923
+ trackCB.addItemListener(this);
924
+
704925 panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
926
+ oeilCB.setToolTipText("Move camera when tracking");
705927 oeilCB.addItemListener(this);
706928
929
+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
930
+ shadowCB.setToolTipText("When live compute shadows");
931
+ shadowCB.addItemListener(this);
932
+
933
+ panel.Return();
934
+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
935
+ toggleTextureCB.setToolTipText("Load textures");
936
+ toggleTextureCB.addItemListener(this);
937
+
938
+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
939
+ toggleSwitchCB.setToolTipText("Choose a single item");
940
+ toggleSwitchCB.addItemListener(this);
941
+
942
+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
943
+ autosaveCB.setToolTipText("On structure change");
944
+ autosaveCB.addItemListener(this);
945
+
946
+ panel.Return();
947
+ if (Globals.ADVANCED)
948
+ {
707949 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
708950 lookAtCB.setToolTipText("Look-at target");
709951 lookAtCB.addItemListener(this);
952
+ }
710953
711954 }
712955
713956 cGridBag fill = new cGridBag();
714
-
715957 fill.preferredHeight = 200;
958
+ cGridBag fill2 = new cGridBag();
959
+ fill2.preferredHeight = 200;
960
+ cGridBag fill3 = new cGridBag();
961
+ fill3.preferredHeight = 200;
716962
717963 panel.add(fill);
964
+ panel.add(fill2);
965
+ panel.add(fill3);
718966
719967 }
720968
721969 void EditObject(Object3D obj)
722970 {
723971 cRadio radioButton = new cRadio(obj.name);
972
+
973
+ // Patch to avoid bug with transparency.
974
+ radioButton.hadMaterial = obj.material != null;
975
+ if (!radioButton.hadMaterial)
976
+ {
977
+ obj.material = new cMaterial();
978
+ }
979
+
724980 radioButton.SetObject(obj);
725981 radioButton.layout = sevenButton;
726982 radioButton.SetCamera(cameraView.renderCamera, false);
....@@ -732,6 +988,8 @@
732988
733989 void SetupViews(ObjEditor oe)
734990 {
991
+ theFrame = this;
992
+
735993 oe.SetupViews();
736994
737995 System.out.println("SetupViews");
....@@ -740,23 +998,28 @@
740998 /*DropTarget dropTarget =*/ new DropTarget(oe.cameraView, this);
741999 }
7421000
743
- JCheckBox liveCB;
744
- JCheckBox supportCB;
745
- JCheckBox localCB;
746
- JCheckBox crowdCB;
747
- JCheckBox smoothCB;
748
- JCheckBox fastCB;
749
- JCheckBox slowCB;
750
- JCheckBox boxCB;
751
- JCheckBox zoomBoxCB;
752
- JCheckBox trackCB;
753
- JCheckBox smoothfocusCB;
1001
+ cToggleButton liveCB;
1002
+ cCheckBox supportCB;
1003
+ cCheckBox localCB;
1004
+ cCheckBox crowdCB;
1005
+ cCheckBox smoothCB;
1006
+ cToggleButton fastCB;
1007
+ cCheckBox slowCB;
1008
+ cCheckBox boxCB;
1009
+ cCheckBox zoomBoxCB;
1010
+ cCheckBox freezeCB;
1011
+ //cToggleButton trackCB;
1012
+ cCheckBox trackCB;
1013
+ cCheckBox smoothfocusCB;
7541014 // JCheckBox speakerMocapCB;
755
- JCheckBox speakerCameraCB;
756
- JCheckBox speakerFocusCB;
757
- JCheckBox debugCB;
758
- JCheckBox oeilCB;
759
- JCheckBox lookAtCB;
1015
+ cCheckBox speakerCameraCB;
1016
+ cCheckBox speakerFocusCB;
1017
+ cCheckBox debugCB;
1018
+
1019
+ cCheckBox oeilCB;
1020
+ cCheckBox shadowCB;
1021
+ cCheckBox autosaveCB;
1022
+ cCheckBox lookAtCB;
7601023
7611024 // static int COLOR = 1;
7621025 // static int MATERIAL = 2;
....@@ -764,9 +1027,9 @@
7641027
7651028 int dropAttributes = Object3D.COLOR | Object3D.MATERIAL;
7661029
767
- JCheckBox colorCB;
768
- JCheckBox materialCB;
769
- JCheckBox textureCB;
1030
+ cCheckBox colorCB;
1031
+ cCheckBox materialCB;
1032
+ cCheckBox textureCB;
7701033
7711034 public void itemStateChanged(ItemEvent e)
7721035 {
....@@ -794,6 +1057,7 @@
7941057 } else if(e.getSource() == liveCB)
7951058 {
7961059 cameraView.ToggleLive();
1060
+ refreshContents(false);
7971061 }
7981062 else if(e.getSource() == supportCB)
7991063 {
....@@ -858,6 +1122,18 @@
8581122 {
8591123 cameraView.ToggleOeil();
8601124 }
1125
+ else if(e.getSource() == shadowCB)
1126
+ {
1127
+ Globals.COMPUTESHADOWWHENLIVE ^= true;
1128
+ }
1129
+ else if(e.getSource() == freezeCB)
1130
+ {
1131
+ Globals.FREEZEONMOVE ^= true;
1132
+ }
1133
+ else if(e.getSource() == autosaveCB)
1134
+ {
1135
+ Globals.SAVEONMAKE ^= true;
1136
+ }
8611137 else if(e.getSource() == lookAtCB)
8621138 {
8631139 cameraView.ToggleLookAt();
....@@ -874,7 +1150,8 @@
8741150
8751151 /**/
8761152 //DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
877
- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1153
+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1154
+ TreePath path = objEditor.jTree.getSelectionPath();
8781155 if ((path == null) || (path.getPathCount() <= 1)) {
8791156 // We can't move the root node or an empty selection
8801157 return;
....@@ -991,23 +1268,33 @@
9911268
9921269 assert target == objEditor.jTree;
9931270 TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
1271
+ Object3D destinationLeaf;
9941272 try {
995
- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
1273
+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
9961274 } catch (Exception e) {
9971275 System.out.println("destinationPath : " + destinationPath);
9981276 return;
9991277 }
10001278
1001
- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1279
+ for (int i=group.selection.size(); --i>=0;)
10021280 {
1281
+ Object3D child = (Object3D)group.selection.elementAt(i);
1282
+
1283
+ // Cannot move into itself
1284
+ if (child == destinationLeaf)
1285
+ return;
1286
+ }
1287
+
1288
+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1289
+// {
10031290 loadClipboard(true);
10041291 objEditor.jTree.setSelectionPath(destinationPath);
10051292 pasteInto(false, false);
1006
- } else {
1007
- loadClipboard(false);
1008
- objEditor.jTree.setSelectionPath(destinationPath);
1009
- pasteInto(false, false); // true); // ???
1010
- }
1293
+// } else {
1294
+// loadClipboard(false);
1295
+// objEditor.jTree.setSelectionPath(destinationPath);
1296
+// pasteInto(false, false); // true); // ???
1297
+// }
10111298 }
10121299 public void dropActionChanged(DropTargetDragEvent dtde)
10131300 // Called if the user has modified the current drop gesture
....@@ -1112,22 +1399,30 @@
11121399 {
11131400 //heightFieldItem = menu.add(new MenuItem("Height Field"));
11141401 //heightFieldItem.addActionListener(this);
1115
- gridItem = menu.add(new MenuItem("Grid"));
1116
- gridItem.addActionListener(this);
1117
- rectoidItem = menu.add(new MenuItem("Box"));
1118
- rectoidItem.addActionListener(this);
1119
- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1120
- ellipsoidItem.addActionListener(this);
1121
- coneItem = menu.add(new MenuItem("Cone"));
1122
- coneItem.addActionListener(this);
1123
- torusItem = menu.add(new MenuItem("Torus"));
1124
- torusItem.addActionListener(this);
1125
- superItem = menu.add(new MenuItem("Superellipsoid"));
1126
- superItem.addActionListener(this);
1402
+// gridItem = menu.add(new MenuItem("Grid"));
1403
+// gridItem.addActionListener(this);
1404
+// rectoidItem = menu.add(new MenuItem("Box"));
1405
+// rectoidItem.addActionListener(this);
1406
+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
1407
+// ellipsoidItem.addActionListener(this);
1408
+// coneItem = menu.add(new MenuItem("Cone"));
1409
+// coneItem.addActionListener(this);
1410
+// torusItem = menu.add(new MenuItem("Torus"));
1411
+// torusItem.addActionListener(this);
1412
+// superItem = menu.add(new MenuItem("Superellipsoid"));
1413
+// superItem.addActionListener(this);
1414
+
1415
+ cameraItem = menu.add(new MenuItem("Camera"));
1416
+ cameraItem.addActionListener(this);
1417
+
1418
+ if (!Globals.ADVANCED)
1419
+ {
11271420 kleinItem = menu.add(new MenuItem("Klein Bottle"));
11281421 kleinItem.addActionListener(this);
1129
- particleItem = menu.add(new MenuItem("Particle system"));
1130
- particleItem.addActionListener(this);
1422
+ }
1423
+
1424
+// particleItem = menu.add(new MenuItem("Particle system"));
1425
+// particleItem.addActionListener(this);
11311426 if (Globals.ADVANCED)
11321427 {
11331428 ragdollItem = menu.add(new MenuItem("Rag Walk"));
....@@ -1153,15 +1448,15 @@
11531448 }
11541449 bezierItem = menu.add(new MenuItem("Bezier Patch"));
11551450 bezierItem.addActionListener(this);
1156
- overlayItem = menu.add(new MenuItem("Overlay"));
1157
- overlayItem.addActionListener(this);
1158
- lightItem = menu.add(new MenuItem("Light"));
1159
- lightItem.addActionListener(this);
1451
+// overlayItem = menu.add(new MenuItem("Overlay"));
1452
+// overlayItem.addActionListener(this);
1453
+// lightItem = menu.add(new MenuItem("Light"));
1454
+// lightItem.addActionListener(this);
11601455 menu.add("-");
11611456 //superLoopItem = menu.add(new MenuItem("Super Loop"));
11621457 //superLoopItem.addActionListener(this);
1163
- loopItem = menu.add(new MenuItem("Loop"));
1164
- loopItem.addActionListener(this);
1458
+// loopItem = menu.add(new MenuItem("Loop"));
1459
+// loopItem.addActionListener(this);
11651460 doubleItem = menu.add(new MenuItem("Fork"));
11661461 doubleItem.addActionListener(this);
11671462 if (Globals.ADVANCED)
....@@ -1201,7 +1496,7 @@
12011496 memoryItem.addActionListener(this);
12021497 menu.add(analyzeItem = new MenuItem("Analyze"));
12031498 analyzeItem.addActionListener(this);
1204
- menu.add(dumpItem = new MenuItem("Dump"));
1499
+ menu.add(dumpItem = new MenuItem("Print"));
12051500 dumpItem.addActionListener(this);
12061501 // menu.add(pathItem = new MenuItem("From-to path"));
12071502 // pathItem.addActionListener(this);
....@@ -1342,9 +1637,24 @@
13421637 shadow.material = new cMaterial(obj.material);
13431638 shadow.material.diffuse = 0.0001f;
13441639 shadow.material.specular = 0.0001f;
1640
+ //shadow.projectedVertices[1].x = 300;
13451641
13461642 makeSomething(shadow);
13471643 }
1644
+
1645
+ private void ClearUnpinned()
1646
+ {
1647
+ //for (Object3D obj : listUI)
1648
+ for (int i=listUI.size(); --i>=0;)
1649
+ {
1650
+ Object3D obj = listUI.elementAt(i);
1651
+ if (!obj.pinned)
1652
+ {
1653
+ obj.CloseUI();
1654
+ listUI.remove(i);
1655
+ }
1656
+ }
1657
+ }
13481658
13491659 /**
13501660 * applyExample
....@@ -1589,7 +1899,7 @@
15891899 {
15901900 ScreenFit();
15911901 } else
1592
- if (source == switchItem)
1902
+ if (source == switchViewItem)
15931903 {
15941904 cVector v1 = new cVector();
15951905 cVector v2 = new cVector();
....@@ -1598,11 +1908,11 @@
15981908 objEditor.cameraView.renderCamera.setAim(v2, v1);
15991909 objEditor.cameraView.repaint();
16001910 } else
1601
- if (source == rectoidItem)
1911
+ if (source == rectoidItem || source == boxButton)
16021912 {
16031913 makeSomething(new Box());
16041914 } else
1605
- if (source == particleItem)
1915
+ if (source == particleItem || source == particlesButton)
16061916 {
16071917 ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
16081918 ParticleController particleController = new ParticleController(particleGeom);
....@@ -1681,27 +1991,27 @@
16811991
16821992 makeSomething(obj);
16831993 } else
1684
- if (source == gridItem)
1994
+ if (source == gridItem || source == gridButton)
16851995 {
16861996 makeSomething(new Grid());
16871997 } else
1688
- if (source == ellipsoidItem)
1998
+ if (source == ellipsoidItem || source == sphereButton)
16891999 {
16902000 makeSomething(new Sphere());
16912001 } else
1692
- if (source == coneItem)
2002
+ if (source == coneItem || source == coneButton)
16932003 {
16942004 makeSomething(new Cone());
16952005 } else
1696
- if (source == torusItem)
2006
+ if (source == torusItem || source == torusButton)
16972007 {
16982008 makeSomething(new Torus());
16992009 } else
1700
- if (source == superItem)
2010
+ if (source == superItem || source == superButton)
17012011 {
17022012 makeSomething(new Superellipsoid());
17032013 } else
1704
- if (source == kleinItem)
2014
+ if (source == kleinItem || source == kleinButton)
17052015 {
17062016 makeSomething(new Klein());
17072017 } else
....@@ -1721,7 +2031,7 @@
17212031 {
17222032 makeSomething(new BezierSurface());
17232033 } else
1724
- if (source == overlayItem)
2034
+ if (source == overlayItem || source == overlayButton)
17252035 {
17262036 /*
17272037 Object3D obj = new BezierSurface(5,8);
....@@ -1769,7 +2079,7 @@
17692079 s.setup();
17702080 makeSomething(s);
17712081 } else
1772
- if (source == lightItem)
2082
+ if (source == lightItem || source == lightButton)
17732083 {
17742084 makeSomething(new Light());
17752085 } else
....@@ -1819,30 +2129,30 @@
18192129
18202130 group(g);
18212131 } else
1822
- if (source == loopItem)
2132
+ if (source == loopItem || source == loopButton)
18232133 {
18242134 Composite csg = new GroupLeaf();
18252135 csg.count = 5;
18262136 group(csg);
1827
- Composite child = new cGroup();
2137
+ Composite child = new cGroup("Branch");
18282138 csg.addChild(child);
18292139 child.addChild(csg);
18302140 } else
18312141 if (source == doubleItem)
18322142 {
1833
- Composite csg = new GroupLeaf();
2143
+ Composite csg = new GroupLeaf("Fork");
18342144 csg.count = 5;
18352145 group(csg);
1836
- Composite child = new cGroup();
2146
+ Composite child = new cGroup("Branch A");
18372147 csg.addChild(child);
18382148 child.addChild(csg);
1839
- child = new cGroup();
2149
+ child = new cGroup("Branch B");
18402150 csg.addChild(child);
18412151 child.addChild(csg);
18422152 } else
18432153 if (source == tripleItem)
18442154 {
1845
- Composite csg = new GroupLeaf();
2155
+ Composite csg = new GroupLeaf("Trident");
18462156 csg.count = 4;
18472157 group(csg);
18482158 Composite child = new cGroup();
....@@ -1854,31 +2164,6 @@
18542164 child = new cGroup();
18552165 csg.addChild(child);
18562166 child.addChild(csg);
1857
- } else
1858
-
1859
- if (source == importGFDItem)
1860
- {
1861
- ImportGFD();
1862
- } else
1863
- if (source == importVRMLX3DItem)
1864
- {
1865
- ImportVRMLX3D();
1866
- } else
1867
- if (source == import3DSItem)
1868
- {
1869
- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1870
- } else
1871
- if (source == importOBJItem)
1872
- {
1873
- //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1874
- FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1875
- browser.setVisible(true);
1876
- String filename = browser.getFile();
1877
- if (filename != null && filename.length() > 0)
1878
- {
1879
- String fullname = browser.getDirectory() + filename;
1880
- makeSomething(ReadOBJ(fullname), true);
1881
- }
18822167 } else
18832168 if (source == computeAOItem)
18842169 {
....@@ -1916,6 +2201,30 @@
19162201 if (source == dumpItem)
19172202 {
19182203 DumpObject();
2204
+ } else
2205
+ if (source == minButton)
2206
+ {
2207
+ Minimize();
2208
+ } else
2209
+ if (source == maxButton)
2210
+ {
2211
+ Maximize();
2212
+ } else
2213
+ if (source == fullButton)
2214
+ {
2215
+ ToggleFullScreen();
2216
+ } else
2217
+ if (source == undoButton)
2218
+ {
2219
+ Undo();
2220
+ } else
2221
+ if (source == redoButton)
2222
+ {
2223
+ Redo();
2224
+ } else
2225
+ if (source == saveButton)
2226
+ {
2227
+ Save();
19192228 } else
19202229 if (source == oneStepButton)
19212230 {
....@@ -1970,6 +2279,14 @@
19702279 if (source == cutItem || source == clearButton)
19712280 {
19722281 loadClipboard(true);
2282
+ } else
2283
+ if (source == undoItem)
2284
+ {
2285
+ Undo();
2286
+ } else
2287
+ if (source == redoItem)
2288
+ {
2289
+ Redo();
19732290 } else
19742291 if (source == duplicateItem)
19752292 {
....@@ -2302,9 +2619,9 @@
23022619 {
23032620 ClearSelection(true);
23042621 } else
2305
- if (source == grabItem)
2622
+ if (source == grabItem || source == groupButton)
23062623 {
2307
- group(new cGroup(), true);
2624
+ group(new cGroup(), false); // true);
23082625 } else
23092626 if (source == hideItem)
23102627 {
....@@ -2322,11 +2639,11 @@
23222639 {
23232640 makeSomething(new Camera());
23242641 } else
2325
- if (source == compositeItem)
2642
+ if (source == compositeItem || source == compositeButton)
23262643 {
23272644 group(new Composite());
23282645 } else
2329
- if (source == randomItem)
2646
+ if (source == switchItem || source == switchButton)
23302647 {
23312648 RandomNode random = new RandomNode();
23322649 group(random);
....@@ -2428,7 +2745,7 @@
24282745 {
24292746 group(new cLinker());
24302747 } else
2431
- if (source == textureItem)
2748
+ if (source == textureItem || source == textureButton)
24322749 {
24332750 group(new TextureNode());
24342751 } else
....@@ -2448,17 +2765,30 @@
24482765 {
24492766 CastShadow(2);
24502767 } else
2451
- if (source == ungroupItem)
2768
+ if (source == ungroupItem || source == ungroupButton)
24522769 {
2453
- //ungroup();
2770
+ boolean hasRoot = false;
2771
+
24542772 for (int i=0; i<group.selection.size(); i++)
24552773 {
2456
- Ungroup(group.selection.get(i));
2774
+ if (group.selection.get(i) == group)
2775
+ {
2776
+ hasRoot = true;
2777
+ break;
2778
+ }
24572779 }
24582780
2459
- ClearSelection(false);
2460
-
2461
- refreshContents();
2781
+ if (!hasRoot)
2782
+ {
2783
+ for (int i=0; i<group.selection.size(); i++)
2784
+ {
2785
+ Ungroup(group.selection.get(i));
2786
+ }
2787
+
2788
+ ClearSelection(false);
2789
+
2790
+ refreshContents();
2791
+ }
24622792 } else
24632793 if (source == genUVItem)
24642794 {
....@@ -2470,7 +2800,7 @@
24702800 } else
24712801 if (source == genNormalsMESHItem)
24722802 {
2473
- GenNormals(true); // TODO
2803
+ GenNormalsMESH();
24742804 } else
24752805 if (source == genNormalsORGANItem)
24762806 {
....@@ -2535,6 +2865,22 @@
25352865 if (source == unmarkleavesItem)
25362866 {
25372867 MarkLeaves(false);
2868
+ } else
2869
+ if (source == rewindleavesItem)
2870
+ {
2871
+ RewindLeaves(true);
2872
+ } else
2873
+ if (source == unrewindleavesItem)
2874
+ {
2875
+ RewindLeaves(false);
2876
+ } else
2877
+ if (source == randomleavesItem)
2878
+ {
2879
+ RandomLeaves(true);
2880
+ } else
2881
+ if (source == unrandomleavesItem)
2882
+ {
2883
+ RandomLeaves(false);
25382884 } else
25392885 if (source == flipVItem)
25402886 {
....@@ -2770,6 +3116,10 @@
27703116 if (source == twoButton)
27713117 {
27723118 radio.layout = twoButton;
3119
+
3120
+ if (CameraPane.FULLSCREEN)
3121
+ fullscreenLayout = radio.layout;
3122
+
27733123 // bug
27743124 //gridPanel.setDividerLocation(1.0);
27753125 //bigPanel.setDividerLocation(0.0);
....@@ -2802,10 +3152,31 @@
28023152 bigThree.ClearUI();
28033153 bigThree.add(centralPanel);
28043154 bigThree.FlushUI();
3155
+
3156
+ cameraView.requestFocusInWindow();
3157
+
3158
+// refreshContents(true);
3159
+//
3160
+// try
3161
+// {
3162
+// java.awt.Robot bot = new java.awt.Robot();
3163
+// int mask = InputEvent.BUTTON1_MASK;
3164
+// bot.mouseMove(100, 100);
3165
+// bot.mousePress(mask);
3166
+// bot.mouseRelease(mask);
3167
+// }
3168
+// catch (Exception e)
3169
+// {
3170
+//
3171
+// }
3172
+
28053173 } else
28063174 if (source == threeButton)
28073175 {
28083176 radio.layout = threeButton;
3177
+
3178
+ if (CameraPane.FULLSCREEN)
3179
+ fullscreenLayout = radio.layout;
28093180
28103181 // bigThree.remove(scenePanel);
28113182 // bigThree.remove(centralPanel);
....@@ -2838,10 +3209,15 @@
28383209 bigThree.add(centralPanel);
28393210 bigThree.add(XYZPanel);
28403211 bigThree.FlushUI();
3212
+
3213
+ cameraView.requestFocusInWindow();
28413214 } else
28423215 if (source == fourButton)
28433216 {
28443217 radio.layout = fourButton;
3218
+
3219
+ if (CameraPane.FULLSCREEN)
3220
+ fullscreenLayout = radio.layout;
28453221
28463222 // bigThree.remove(scenePanel);
28473223 // bigThree.remove(centralPanel);
....@@ -2873,10 +3249,15 @@
28733249 bigThree.ClearUI();
28743250 bigThree.add(scenePanel);
28753251 bigThree.FlushUI();
3252
+
3253
+ cameraView.requestFocusInWindow();
28763254 } else
28773255 if (source == sixButton)
28783256 {
28793257 radio.layout = sixButton;
3258
+
3259
+ if (CameraPane.FULLSCREEN)
3260
+ fullscreenLayout = radio.layout;
28803261
28813262 // bigThree.remove(scenePanel);
28823263 // bigThree.remove(centralPanel);
....@@ -2909,10 +3290,15 @@
29093290 bigThree.add(scenePanel);
29103291 bigThree.add(centralPanel);
29113292 bigThree.FlushUI();
3293
+
3294
+ cameraView.requestFocusInWindow();
29123295 } else
29133296 if (source == sevenButton)
29143297 {
29153298 radio.layout = sevenButton;
3299
+
3300
+ if (CameraPane.FULLSCREEN)
3301
+ fullscreenLayout = radio.layout;
29163302
29173303 // bigThree.remove(scenePanel);
29183304 // bigThree.remove(centralPanel);
....@@ -2946,6 +3332,8 @@
29463332 bigThree.add(centralPanel);
29473333 bigThree.add(XYZPanel);
29483334 bigThree.FlushUI();
3335
+
3336
+ cameraView.requestFocusInWindow();
29493337 } else
29503338 if (source == rootButton)
29513339 {
....@@ -2957,6 +3345,7 @@
29573345 EditObject(obj);
29583346 }
29593347
3348
+ cameraView.requestFocusInWindow();
29603349 refreshContents(true);
29613350 } else
29623351 if (source == closeButton)
....@@ -2966,22 +3355,37 @@
29663355 for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
29673356 {
29683357 ab = (cRadio)e.nextElement();
2969
- if(ab.getModel().isSelected() && ab.GetObject() != client)
3358
+ if (ab.getModel().isSelected() && ab.GetObject() != client)
29703359 {
3360
+ // Patch to avoid bug with transparency.
3361
+ if (!ab.hadMaterial)
3362
+ {
3363
+ ab.object.material = null;
3364
+ }
3365
+
29713366 buttonGroup.remove(ab);
29723367 radioPanel.remove(ab);
29733368
2974
- ab.GetObject().editWindow = null;
3369
+ //ab.GetObject().editWindow = null;
3370
+ ab.GetObject().manipWindow = null;
29753371 // ab.GetObject().objectUI = null; // ?????????
29763372
29773373 ((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
29783374 break;
29793375 }
29803376 }
3377
+
3378
+ cameraView.requestFocusInWindow();
29813379 refreshContents(true);
29823380 } else
29833381 if (source == editItem || source == editButton)
29843382 {
3383
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3384
+ {
3385
+ Object3D child = (Object3D)e.nextElement();
3386
+ child.pinned = true;
3387
+ }
3388
+
29853389 EditSelection(false);
29863390 } else
29873391 if (source == uneditButton)
....@@ -2991,10 +3395,11 @@
29913395 Object3D child = (Object3D)e.nextElement();
29923396 if(child.editWindow != null)
29933397 objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3398
+ child.pinned = false;
29943399 child.CloseUI();
29953400 listUI.remove(child);
29963401
2997
- child.editWindow = null; // ???????????
3402
+ //child.editWindow = null; // ???????????
29983403 }
29993404 objEditor.ctrlPanel.FlushUI();
30003405 //objEditor.jTree.clearSelection();
....@@ -3007,6 +3412,7 @@
30073412 //copy.ClearUI();
30083413 for (Object3D obj : listUI)
30093414 {
3415
+ obj.pinned = false;
30103416 obj.CloseUI();
30113417 }
30123418 listUI.clear();
....@@ -3016,7 +3422,7 @@
30163422 {
30173423 assert(copy == group);
30183424
3019
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3425
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
30203426
30213427 for (Object3D obj : listUI)
30223428 {
....@@ -3081,7 +3487,9 @@
30813487 sideView.object = group;
30823488 }
30833489
3084
-// fix "+" issue group.editWindow = this;
3490
+// fix "+" issue
3491
+ //group.editWindow = this;
3492
+ group.manipWindow = this;
30853493
30863494 /*
30873495 currentLayout = radio.layout;
....@@ -3089,13 +3497,33 @@
30893497 currentLayout = sevenButton;
30903498 */
30913499 radio.layout.doClick();
3500
+
3501
+ ClearUnpinned();
3502
+ SetPinStates(group.selection.size() > 0);
3503
+ if (group.selection.size() == 1)
3504
+ EditSelection(false);
30923505 keepparent = group.parent;
30933506 // PARENT = NULL or not???
30943507 //group.parent = null; // ROOT
30953508 //group.attributes = -1;
30963509 ResetModel();
3510
+
3511
+ cameraView.requestFocusInWindow();
30973512 refreshContents(true);
3098
- }
3513
+ } else if (event.getSource() == editCameraItem)
3514
+ {
3515
+ cameraView.ProtectCamera();
3516
+ cameraView.repaint();
3517
+ return;
3518
+ } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
3519
+ {
3520
+ cameraView.RevertCamera();
3521
+ cameraView.repaint();
3522
+ return;
3523
+ // } else if (event.getSource() == textureButton)
3524
+ // {
3525
+ // return; // true;
3526
+ }
30993527 else
31003528 {
31013529 //return super.action(event, arg);
....@@ -3104,7 +3532,6 @@
31043532 }
31053533
31063534 boolean useclient = false;
3107
- cRadio radio;
31083535
31093536 void ToggleRoot()
31103537 {
....@@ -3343,7 +3770,8 @@
33433770
33443771 int size = obj.MemorySize();
33453772
3346
- System.err.println((size/1024) + " KB is the size of " + obj);
3773
+ //System.err.println((size/1024) + " KB is the size of " + obj);
3774
+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
33473775 }
33483776 }
33493777 catch (Exception e)
....@@ -3424,6 +3852,13 @@
34243852 void GenNormals(boolean crease)
34253853 {
34263854 group.GenNormalsS(crease);
3855
+
3856
+ refreshContents();
3857
+ }
3858
+
3859
+ void GenNormalsMESH()
3860
+ {
3861
+ group.GenNormalsMeshS();
34273862
34283863 refreshContents();
34293864 }
....@@ -4051,6 +4486,18 @@
40514486 refreshContents();
40524487 }
40534488
4489
+ void RewindLeaves(boolean hide)
4490
+ {
4491
+ group.selection.RewindLeaves(hide);
4492
+ refreshContents();
4493
+ }
4494
+
4495
+ void RandomLeaves(boolean hide)
4496
+ {
4497
+ group.selection.RandomLeaves(hide);
4498
+ refreshContents();
4499
+ }
4500
+
40544501 void SetTexRes(int tr)
40554502 {
40564503 group.selection.SetTexRes(tr);
....@@ -4122,10 +4569,6 @@
41224569 // }
41234570 // }
41244571
4125
- static boolean allparams = true;
4126
-
4127
- static Vector<Object3D> listUI = new Vector<Object3D>();
4128
-
41294572 void EditSelection(boolean newWindow)
41304573 {
41314574 // aConstraints.gridy = 0;
....@@ -4133,7 +4576,7 @@
41334576 {
41344577 //System.out.println("edit : " + objectPanel.indexOfTab("Material"));
41354578 //objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4136
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4579
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
41374580
41384581 Object3D elem = (Object3D)group.selection.elementAt(i);
41394582 if(elem != group || !newWindow)
....@@ -4218,7 +4661,8 @@
42184661 //new Exception().printStackTrace();
42194662
42204663 freezemodel = true;
4221
-
4664
+ ClearUnpinned();
4665
+
42224666 /**/
42234667 //switch (event.id)
42244668 {
....@@ -4226,7 +4670,6 @@
42264670 //case 702: // Event.LIST_DESELECT
42274671 group.deselectAll();
42284672 TreePath tps[] = objEditor.jTree.getSelectionPaths();
4229
- objEditor.ClearInfo(); // .GetMaterial());
42304673 if (tps != null)
42314674 {
42324675 for (int i=0; i < tps.length; i++)
....@@ -4235,10 +4678,8 @@
42354678
42364679 //if (child.parent != null)
42374680 //child.parent.addSelectee(child);
4681
+ objEditor.SetMaterial(child);
42384682 group.addSelectee(child);
4239
- objEditor.SetMaterial(child); // .GetMaterial());
4240
- objEditor.AddInfo(child, this, true); // .GetMaterial());
4241
- System.err.println("info : " + child.GetPath());
42424683 }
42434684 }
42444685 // else
....@@ -4248,20 +4689,28 @@
42484689 // System.err.println("info : " + group.GetPath());
42494690 // }
42504691
4251
- objEditor.SetText(); // jan 2014
4252
-
4253
- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
4692
+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
42544693 CameraPane.flash = true;
42554694
4256
- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
4695
+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
42574696 // a camera
42584697 {
4259
- CameraPane.camerachangeframe = 0; // don't refuse it
4260
- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4698
+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4699
+ {
4700
+ CameraPane.camerachangeframe = 0; // don't refuse it
4701
+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4702
+ }
42614703 // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
42624704 // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
42634705 }
42644706
4707
+ if (tps != null && tps.length == 1)
4708
+ {
4709
+ EditSelection(false);
4710
+ }
4711
+
4712
+ SetPinStates(tps != null && tps.length > 0);
4713
+
42654714 refreshContents();
42664715 //return true;
42674716 }
....@@ -4270,6 +4719,35 @@
42704719
42714720 freezemodel = false;
42724721 }
4722
+
4723
+ void SetPinStates(boolean enabled)
4724
+ {
4725
+ editButton.setEnabled(enabled);
4726
+ uneditButton.setEnabled(enabled);
4727
+ unselectButton.setEnabled(enabled);
4728
+ flashSelectionButton.setEnabled(enabled);
4729
+ }
4730
+
4731
+ void refreshContents(boolean cp)
4732
+ {
4733
+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4734
+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
4735
+ {
4736
+ objEditor.ClearInfo(); // .GetMaterial());
4737
+
4738
+ for (int i=0; i < group.selection.Size(); i++)
4739
+ {
4740
+ Object3D child = (Object3D) group.selection.get(i);
4741
+
4742
+ objEditor.AddInfo(child, this, true);
4743
+ System.err.println("info : " + child.GetPath());
4744
+ }
4745
+
4746
+ objEditor.SetText(); // jan 2014
4747
+ }
4748
+
4749
+ super.refreshContents(cp);
4750
+ }
42734751
42744752 void linkSomething(Object3D thing)
42754753 {
....@@ -4341,6 +4819,7 @@
43414819 {
43424820 if (group.selection.isEmpty())
43434821 return;
4822
+
43444823 Grafreed.clipboardIsTempGroup = false;
43454824 Composite tGroup = null;
43464825 if (group.selection.size() > 0) // 1)
....@@ -4351,6 +4830,8 @@
43514830
43524831 if (cut)
43534832 {
4833
+ if (Globals.SAVEONMAKE)
4834
+ Save();
43544835 //int indices[] = jList.getSelectedIndices();
43554836 //for (int i = indices.length - 1; i >= 0; i--)
43564837 //jList.remove(indices[i]);
....@@ -4440,8 +4921,10 @@
44404921 }
44414922
44424923 }
4924
+
44434925 if (Grafreed.clipboardIsTempGroup)
44444926 Grafreed.clipboard = tGroup;
4927
+
44454928 if (cut)
44464929 {
44474930 ResetModel();
....@@ -4973,21 +5456,6 @@
49735456 }
49745457 */
49755458
4976
- void ImportGFD()
4977
- {
4978
- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4979
- browser.show();
4980
- String filename = browser.getFile();
4981
- if (filename != null && filename.length() > 0)
4982
- {
4983
- String fullname = browser.getDirectory() + filename;
4984
-
4985
- //Object3D readobj =
4986
- objEditor.ReadGFD(fullname, objEditor);
4987
- //makeSomething(readobj);
4988
- }
4989
- }
4990
-
49915459 /*
49925460 public void Callback(Object obj)
49935461 {
....@@ -5011,23 +5479,6 @@
50115479 }
50125480 */
50135481
5014
- void ImportVRMLX3D()
5015
- {
5016
- if (Grafreed.standAlone)
5017
- {
5018
- /**/
5019
- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
5020
- browser.show();
5021
- String filename = browser.getFile();
5022
- if (filename != null && filename.length() > 0)
5023
- {
5024
- String fullname = browser.getDirectory() + filename;
5025
- LoadVRMLX3D(fullname);
5026
- }
5027
- /**/
5028
- }
5029
- }
5030
-
50315482 String GetFile(String dialogName)
50325483 {
50335484 if (Grafreed.standAlone)
....@@ -5098,7 +5549,28 @@
50985549 cButton clearpanelButton;
50995550 cButton unselectButton;
51005551
5552
+ cButton restoreCameraButton;
5553
+
5554
+ cButton saveButton;
51015555 cButton oneStepButton;
5556
+
5557
+ cButton groupButton;
5558
+ cButton ungroupButton;
5559
+ cButton compositeButton;
5560
+ cButton switchButton;
5561
+ cButton loopButton;
5562
+ cButton textureButton;
5563
+
5564
+ cButton gridButton;
5565
+ cButton boxButton;
5566
+ cButton sphereButton;
5567
+ cButton coneButton;
5568
+ cButton torusButton;
5569
+ cButton superButton;
5570
+ cButton kleinButton;
5571
+ cButton particlesButton;
5572
+ cButton overlayButton;
5573
+ cButton lightButton;
51025574
51035575 cButton screenfitButton;
51045576 cButton screenfitpointButton;
....@@ -5111,14 +5583,6 @@
51115583
51125584 cButton setsupportButton;
51135585
5114
- cButton twoButton;
5115
- cButton sixButton;
5116
- cButton threeButton;
5117
- cButton sevenButton;
5118
- cButton fourButton; // full panel
5119
- cButton oneButton; // full XYZ
5120
- //cButton currentLayout;
5121
-
51225586 //
51235587 //Composite
51245588 Object3D // to do !!
....@@ -5128,9 +5592,11 @@
51285592 //JTree jTree;
51295593 private MenuItem lookAtItem;
51305594 private MenuItem lookFromItem;
5131
- private MenuItem switchItem;
5595
+ private MenuItem switchViewItem;
51325596 private MenuItem cutItem;
5133
- private MenuItem duplicateItem;
5597
+ private MenuItem undoItem;
5598
+ private MenuItem redoItem;
5599
+ private JMenuItem duplicateItem;
51345600 private MenuItem cloneItem;
51355601 private MenuItem cloneSupportItem;
51365602 private MenuItem overwriteGeoItem;
....@@ -5193,6 +5659,10 @@
51935659 private MenuItem showleavesItem;
51945660 private MenuItem markleavesItem;
51955661 private MenuItem unmarkleavesItem;
5662
+ private MenuItem rewindleavesItem;
5663
+ private MenuItem unrewindleavesItem;
5664
+ private MenuItem randomleavesItem;
5665
+ private MenuItem unrandomleavesItem;
51965666
51975667 private MenuItem flipVItem;
51985668 private MenuItem unflipVItem;
....@@ -5214,7 +5684,7 @@
52145684 private MenuItem frontItem;
52155685 private MenuItem cameraItem;
52165686 private MenuItem compositeItem;
5217
- private MenuItem randomItem;
5687
+ private MenuItem switchItem;
52185688 private MenuItem physicsItem;
52195689 private MenuItem frameselectorItem;
52205690 private MenuItem scriptNodeItem;
....@@ -5276,11 +5746,6 @@
52765746 private MenuItem doubleItem;
52775747 private MenuItem tripleItem;
52785748
5279
- private MenuItem importGFDItem;
5280
- private MenuItem importVRMLX3DItem;
5281
- private MenuItem import3DSItem;
5282
- private MenuItem importOBJItem;
5283
-
52845749 private MenuItem computeAOItem;
52855750 private MenuItem recompileItem;
52865751 private MenuItem editScriptItem;
....@@ -5290,4 +5755,8 @@
52905755 private MenuItem analyzeItem;
52915756 private MenuItem dumpItem;
52925757 //boolean freezemodel = false;
5758
+
5759
+ Menu cameraMenu;
5760
+ MenuItem editCameraItem;
5761
+ MenuItem restoreCameraItem;
52935762 }