Normand Briere
2019-06-27 f78dd18c66d607b693c0bf5937fc59181bf5a26b
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("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,63 @@
490580 oe.radioPanel.add(dummyButton);
491581 oe.buttonGroup.add(dummyButton);
492582 */
583
+ cGridBag copyOptionsPanel = new cGridBag();
584
+
585
+ copyOptionsPanel.preferredHeight = 2;
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
+ 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);
496620 liveCB.setToolTipText("Enable animation");
497621 liveCB.addItemListener(this);
498622
499
- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
623
+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
500624 oneStepButton.setToolTipText("Animate one step forward");
501625 oneStepButton.addActionListener(this);
502626
503
- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
627
+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
504628 fastCB.setToolTipText("Fast mode");
505629 fastCB.addItemListener(this);
506630
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);
631
+ //oe.toolboxPanel.Return();
632
+
633
+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
512634 screenfitButton.setToolTipText("Screen fit");
513635 screenfitButton.addActionListener(this);
636
+
637
+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
638
+// trackCB.setToolTipText("Enable tracking");
639
+// trackCB.addItemListener(this);
514640
515641 // oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
516642 // screenfitpointButton.addActionListener(this);
....@@ -522,65 +648,145 @@
522648 snapobjectButton.setToolTipText("Snap Object");
523649 }
524650
525
- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
526
- flashSelectionButton.setToolTipText("Show selection");
527
- flashSelectionButton.addActionListener(this);
651
+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
528652
529
- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
530
-
531
- oe.toolbarPanel.add(twoButton = new cButton("|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
653
+ oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
532654 twoButton.setToolTipText("Show center view only");
533655 twoButton.addActionListener(this);
534
- oe.toolbarPanel.add(fourButton = new cButton("+||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
656
+ this.fullscreenLayout = twoButton;
657
+
658
+ oe.toolbarPanel.add(fourButton = new cButton("-||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
535659 fourButton.addActionListener(this);
536660 fourButton.setToolTipText("Show left panel only");
537
- oe.toolbarPanel.add(sixButton = new cButton("+|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
661
+ oe.toolbarPanel.add(sixButton = new cButton("-|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
538662 sixButton.setToolTipText("2-column layout left");
539663 sixButton.addActionListener(this);
540
- oe.toolbarPanel.add(threeButton = new cButton("|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
664
+ oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
541665 threeButton.setToolTipText("2-column layout right");
542666 threeButton.addActionListener(this);
543
- oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
667
+ oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
544668 sevenButton.setToolTipText("3-column layout");
545669 sevenButton.addActionListener(this);
546670 //
547671
548
- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
672
+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
549673 rootButton.setToolTipText("Edit selection in new tab");
550674 rootButton.addActionListener(this);
551675
552
- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
676
+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
553677 closeButton.setToolTipText("Close tab");
554678 closeButton.addActionListener(this);
555679 //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
556680 //clearButton.addActionListener(this);
557
-
558
- cGridBag commandsPanel = new cGridBag();
681
+
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
+ }
559713
560
- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561
- editButton.setToolTipText("Edit selection");
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 = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
762
+ editButton.setToolTipText("Pin selection controls");
562763 editButton.addActionListener(this);
563764
564
- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565
- uneditButton.setToolTipText("Unedit selection");
765
+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
766
+ uneditButton.setToolTipText("Remove selection controls");
566767 uneditButton.addActionListener(this);
567768
568
- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
569
- allParamsButton.setToolTipText("Edit all params");
769
+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
770
+ allParamsButton.setToolTipText("Show all controle");
570771 allParamsButton.addActionListener(this);
571772
572
- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
773
+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
573774 clearPanelButton.setToolTipText("Clear edit panel");
574775 clearPanelButton.addActionListener(this);
575776
576
- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
777
+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577778 unselectButton.setToolTipText("Unselect");
578779 unselectButton.addActionListener(this);
579780
580
- commandsPanel.preferredHeight = 1;
781
+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
782
+ flashSelectionButton.setToolTipText("Highlight selection");
783
+ flashSelectionButton.addActionListener(this);
581784
582
- oe.treePanel.add(commandsPanel);
583
- oe.treePanel.Return();
785
+ editCommandsPanel.preferredHeight = 1;
786
+
787
+ SetPinStates(false);
788
+// oe.treePanel.add(commandsPanel);
789
+// oe.treePanel.Return();
584790
585791 // oe.aConstraints.gridx += 1;
586792 // oe.aConstraints.weighty = 0;
....@@ -597,27 +803,12 @@
597803
598804 JScrollPane jSP;
599805 //ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
600
- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
806
+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
601807 ResetModel();
602808
603809 oe.treePanel.add(jSPPanel);
604810 oe.treePanel.Return();
605811
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;
621812 oe.treePanel.add(copyOptionsPanel);
622813 oe.treePanel.Return();
623814
....@@ -648,12 +839,26 @@
648839
649840 void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
650841 {
842
+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
843
+ colorCB.setToolTipText("Copy color when dropped");
844
+ colorCB.addItemListener(this);
845
+
846
+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
847
+ materialCB.setToolTipText("Copy material when dropped");
848
+ materialCB.addItemListener(this);
849
+
850
+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
851
+ textureCB.setToolTipText("Copy texture when dropped");
852
+ textureCB.addItemListener(this);
853
+
854
+ panel.Return();
855
+
651856 panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
652857 boxCB.setToolTipText("Display bounding boxes");
653858 boxCB.addItemListener(this);
654859
655860 panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
656
- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
861
+ zoomBoxCB.setToolTipText("Display only for wheel");
657862 zoomBoxCB.addItemListener(this);
658863
659864 if (true) // Globals.ADVANCED)
....@@ -665,6 +870,8 @@
665870 // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
666871 // localCB.addItemListener(this);
667872
873
+ panel.Return();
874
+
668875 panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
669876 crowdCB.setToolTipText("Used for crowds");
670877 crowdCB.addItemListener(this);
....@@ -681,6 +888,8 @@
681888 // panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
682889 // speakerMocapCB.addItemListener(this);
683890
891
+ panel.Return();
892
+
684893 if (false)
685894 {
686895 // handled in scripts
....@@ -695,32 +904,72 @@
695904 //constraints.gridy += 1;
696905 panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
697906 smoothfocusCB.addItemListener(this);
907
+ panel.Return();
698908 }
699909
700910 //constraints.gridx += 1;
701911 //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
702912 // debugCB.addItemListener(this);
703913
914
+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
915
+ trackCB.setToolTipText("Enable tracking target");
916
+ trackCB.addItemListener(this);
917
+
704918 panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
919
+ oeilCB.setToolTipText("Move camera when tracking");
705920 oeilCB.addItemListener(this);
706921
922
+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
923
+ shadowCB.setToolTipText("When live compute shadows");
924
+ shadowCB.addItemListener(this);
925
+
926
+ panel.Return();
927
+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
928
+ toggleTextureCB.setToolTipText("Load textures");
929
+ toggleTextureCB.addItemListener(this);
930
+
931
+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
932
+ toggleSwitchCB.setToolTipText("Use switch");
933
+ toggleSwitchCB.addItemListener(this);
934
+
935
+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
936
+ autosaveCB.setToolTipText("On structure change");
937
+ autosaveCB.addItemListener(this);
938
+
939
+ panel.Return();
940
+ if (Globals.ADVANCED)
941
+ {
707942 panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
708943 lookAtCB.setToolTipText("Look-at target");
709944 lookAtCB.addItemListener(this);
945
+ }
710946
711947 }
712948
713949 cGridBag fill = new cGridBag();
714
-
715950 fill.preferredHeight = 200;
951
+ cGridBag fill2 = new cGridBag();
952
+ fill2.preferredHeight = 200;
953
+ cGridBag fill3 = new cGridBag();
954
+ fill3.preferredHeight = 200;
716955
717956 panel.add(fill);
957
+ panel.add(fill2);
958
+ panel.add(fill3);
718959
719960 }
720961
721962 void EditObject(Object3D obj)
722963 {
723964 cRadio radioButton = new cRadio(obj.name);
965
+
966
+ // Patch to avoid bug with transparency.
967
+ radioButton.hadMaterial = obj.material != null;
968
+ if (!radioButton.hadMaterial)
969
+ {
970
+ obj.material = new cMaterial();
971
+ }
972
+
724973 radioButton.SetObject(obj);
725974 radioButton.layout = sevenButton;
726975 radioButton.SetCamera(cameraView.renderCamera, false);
....@@ -732,6 +981,8 @@
732981
733982 void SetupViews(ObjEditor oe)
734983 {
984
+ theFrame = this;
985
+
735986 oe.SetupViews();
736987
737988 System.out.println("SetupViews");
....@@ -740,23 +991,27 @@
740991 /*DropTarget dropTarget =*/ new DropTarget(oe.cameraView, this);
741992 }
742993
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;
994
+ cToggleButton liveCB;
995
+ cCheckBox supportCB;
996
+ cCheckBox localCB;
997
+ cCheckBox crowdCB;
998
+ cCheckBox smoothCB;
999
+ cToggleButton fastCB;
1000
+ cCheckBox slowCB;
1001
+ cCheckBox boxCB;
1002
+ cCheckBox zoomBoxCB;
1003
+ //cToggleButton trackCB;
1004
+ cCheckBox trackCB;
1005
+ cCheckBox smoothfocusCB;
7541006 // JCheckBox speakerMocapCB;
755
- JCheckBox speakerCameraCB;
756
- JCheckBox speakerFocusCB;
757
- JCheckBox debugCB;
758
- JCheckBox oeilCB;
759
- JCheckBox lookAtCB;
1007
+ cCheckBox speakerCameraCB;
1008
+ cCheckBox speakerFocusCB;
1009
+ cCheckBox debugCB;
1010
+
1011
+ cCheckBox oeilCB;
1012
+ cCheckBox shadowCB;
1013
+ cCheckBox autosaveCB;
1014
+ cCheckBox lookAtCB;
7601015
7611016 // static int COLOR = 1;
7621017 // static int MATERIAL = 2;
....@@ -764,9 +1019,9 @@
7641019
7651020 int dropAttributes = Object3D.COLOR | Object3D.MATERIAL;
7661021
767
- JCheckBox colorCB;
768
- JCheckBox materialCB;
769
- JCheckBox textureCB;
1022
+ cCheckBox colorCB;
1023
+ cCheckBox materialCB;
1024
+ cCheckBox textureCB;
7701025
7711026 public void itemStateChanged(ItemEvent e)
7721027 {
....@@ -794,6 +1049,7 @@
7941049 } else if(e.getSource() == liveCB)
7951050 {
7961051 cameraView.ToggleLive();
1052
+ refreshContents(false);
7971053 }
7981054 else if(e.getSource() == supportCB)
7991055 {
....@@ -858,6 +1114,14 @@
8581114 {
8591115 cameraView.ToggleOeil();
8601116 }
1117
+ else if(e.getSource() == shadowCB)
1118
+ {
1119
+ Globals.COMPUTESHADOWWHENLIVE ^= true;
1120
+ }
1121
+ else if(e.getSource() == autosaveCB)
1122
+ {
1123
+ Globals.SAVEONMAKE ^= true;
1124
+ }
8611125 else if(e.getSource() == lookAtCB)
8621126 {
8631127 cameraView.ToggleLookAt();
....@@ -874,7 +1138,8 @@
8741138
8751139 /**/
8761140 //DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
877
- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1141
+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
1142
+ TreePath path = objEditor.jTree.getSelectionPath();
8781143 if ((path == null) || (path.getPathCount() <= 1)) {
8791144 // We can't move the root node or an empty selection
8801145 return;
....@@ -991,23 +1256,33 @@
9911256
9921257 assert target == objEditor.jTree;
9931258 TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
1259
+ Object3D destinationLeaf;
9941260 try {
995
- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
1261
+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
9961262 } catch (Exception e) {
9971263 System.out.println("destinationPath : " + destinationPath);
9981264 return;
9991265 }
10001266
1001
- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1267
+ for (int i=group.selection.size(); --i>=0;)
10021268 {
1269
+ Object3D child = (Object3D)group.selection.elementAt(i);
1270
+
1271
+ // Cannot move into itself
1272
+ if (child == destinationLeaf)
1273
+ return;
1274
+ }
1275
+
1276
+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1277
+// {
10031278 loadClipboard(true);
10041279 objEditor.jTree.setSelectionPath(destinationPath);
10051280 pasteInto(false, false);
1006
- } else {
1007
- loadClipboard(false);
1008
- objEditor.jTree.setSelectionPath(destinationPath);
1009
- pasteInto(false, false); // true); // ???
1010
- }
1281
+// } else {
1282
+// loadClipboard(false);
1283
+// objEditor.jTree.setSelectionPath(destinationPath);
1284
+// pasteInto(false, false); // true); // ???
1285
+// }
10111286 }
10121287 public void dropActionChanged(DropTargetDragEvent dtde)
10131288 // Called if the user has modified the current drop gesture
....@@ -1112,22 +1387,30 @@
11121387 {
11131388 //heightFieldItem = menu.add(new MenuItem("Height Field"));
11141389 //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);
1390
+// gridItem = menu.add(new MenuItem("Grid"));
1391
+// gridItem.addActionListener(this);
1392
+// rectoidItem = menu.add(new MenuItem("Box"));
1393
+// rectoidItem.addActionListener(this);
1394
+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
1395
+// ellipsoidItem.addActionListener(this);
1396
+// coneItem = menu.add(new MenuItem("Cone"));
1397
+// coneItem.addActionListener(this);
1398
+// torusItem = menu.add(new MenuItem("Torus"));
1399
+// torusItem.addActionListener(this);
1400
+// superItem = menu.add(new MenuItem("Superellipsoid"));
1401
+// superItem.addActionListener(this);
1402
+
1403
+ cameraItem = menu.add(new MenuItem("Camera"));
1404
+ cameraItem.addActionListener(this);
1405
+
1406
+ if (!Globals.ADVANCED)
1407
+ {
11271408 kleinItem = menu.add(new MenuItem("Klein Bottle"));
11281409 kleinItem.addActionListener(this);
1129
- particleItem = menu.add(new MenuItem("Particle system"));
1130
- particleItem.addActionListener(this);
1410
+ }
1411
+
1412
+// particleItem = menu.add(new MenuItem("Particle system"));
1413
+// particleItem.addActionListener(this);
11311414 if (Globals.ADVANCED)
11321415 {
11331416 ragdollItem = menu.add(new MenuItem("Rag Walk"));
....@@ -1153,15 +1436,15 @@
11531436 }
11541437 bezierItem = menu.add(new MenuItem("Bezier Patch"));
11551438 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);
1439
+// overlayItem = menu.add(new MenuItem("Overlay"));
1440
+// overlayItem.addActionListener(this);
1441
+// lightItem = menu.add(new MenuItem("Light"));
1442
+// lightItem.addActionListener(this);
11601443 menu.add("-");
11611444 //superLoopItem = menu.add(new MenuItem("Super Loop"));
11621445 //superLoopItem.addActionListener(this);
1163
- loopItem = menu.add(new MenuItem("Loop"));
1164
- loopItem.addActionListener(this);
1446
+// loopItem = menu.add(new MenuItem("Loop"));
1447
+// loopItem.addActionListener(this);
11651448 doubleItem = menu.add(new MenuItem("Fork"));
11661449 doubleItem.addActionListener(this);
11671450 if (Globals.ADVANCED)
....@@ -1201,7 +1484,7 @@
12011484 memoryItem.addActionListener(this);
12021485 menu.add(analyzeItem = new MenuItem("Analyze"));
12031486 analyzeItem.addActionListener(this);
1204
- menu.add(dumpItem = new MenuItem("Dump"));
1487
+ menu.add(dumpItem = new MenuItem("Print"));
12051488 dumpItem.addActionListener(this);
12061489 // menu.add(pathItem = new MenuItem("From-to path"));
12071490 // pathItem.addActionListener(this);
....@@ -1342,9 +1625,24 @@
13421625 shadow.material = new cMaterial(obj.material);
13431626 shadow.material.diffuse = 0.0001f;
13441627 shadow.material.specular = 0.0001f;
1628
+ //shadow.projectedVertices[1].x = 300;
13451629
13461630 makeSomething(shadow);
13471631 }
1632
+
1633
+ private void ClearUnpinned()
1634
+ {
1635
+ //for (Object3D obj : listUI)
1636
+ for (int i=listUI.size(); --i>=0;)
1637
+ {
1638
+ Object3D obj = listUI.elementAt(i);
1639
+ if (!obj.pinned)
1640
+ {
1641
+ obj.CloseUI();
1642
+ listUI.remove(i);
1643
+ }
1644
+ }
1645
+ }
13481646
13491647 /**
13501648 * applyExample
....@@ -1589,7 +1887,7 @@
15891887 {
15901888 ScreenFit();
15911889 } else
1592
- if (source == switchItem)
1890
+ if (source == switchViewItem)
15931891 {
15941892 cVector v1 = new cVector();
15951893 cVector v2 = new cVector();
....@@ -1598,11 +1896,11 @@
15981896 objEditor.cameraView.renderCamera.setAim(v2, v1);
15991897 objEditor.cameraView.repaint();
16001898 } else
1601
- if (source == rectoidItem)
1899
+ if (source == rectoidItem || source == boxButton)
16021900 {
16031901 makeSomething(new Box());
16041902 } else
1605
- if (source == particleItem)
1903
+ if (source == particleItem || source == particlesButton)
16061904 {
16071905 ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
16081906 ParticleController particleController = new ParticleController(particleGeom);
....@@ -1681,27 +1979,27 @@
16811979
16821980 makeSomething(obj);
16831981 } else
1684
- if (source == gridItem)
1982
+ if (source == gridItem || source == gridButton)
16851983 {
16861984 makeSomething(new Grid());
16871985 } else
1688
- if (source == ellipsoidItem)
1986
+ if (source == ellipsoidItem || source == sphereButton)
16891987 {
16901988 makeSomething(new Sphere());
16911989 } else
1692
- if (source == coneItem)
1990
+ if (source == coneItem || source == coneButton)
16931991 {
16941992 makeSomething(new Cone());
16951993 } else
1696
- if (source == torusItem)
1994
+ if (source == torusItem || source == torusButton)
16971995 {
16981996 makeSomething(new Torus());
16991997 } else
1700
- if (source == superItem)
1998
+ if (source == superItem || source == superButton)
17011999 {
17022000 makeSomething(new Superellipsoid());
17032001 } else
1704
- if (source == kleinItem)
2002
+ if (source == kleinItem || source == kleinButton)
17052003 {
17062004 makeSomething(new Klein());
17072005 } else
....@@ -1721,7 +2019,7 @@
17212019 {
17222020 makeSomething(new BezierSurface());
17232021 } else
1724
- if (source == overlayItem)
2022
+ if (source == overlayItem || source == overlayButton)
17252023 {
17262024 /*
17272025 Object3D obj = new BezierSurface(5,8);
....@@ -1769,7 +2067,7 @@
17692067 s.setup();
17702068 makeSomething(s);
17712069 } else
1772
- if (source == lightItem)
2070
+ if (source == lightItem || source == lightButton)
17732071 {
17742072 makeSomething(new Light());
17752073 } else
....@@ -1819,7 +2117,7 @@
18192117
18202118 group(g);
18212119 } else
1822
- if (source == loopItem)
2120
+ if (source == loopItem || source == loopButton)
18232121 {
18242122 Composite csg = new GroupLeaf();
18252123 csg.count = 5;
....@@ -1854,31 +2152,6 @@
18542152 child = new cGroup();
18552153 csg.addChild(child);
18562154 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
- }
18822155 } else
18832156 if (source == computeAOItem)
18842157 {
....@@ -1916,6 +2189,30 @@
19162189 if (source == dumpItem)
19172190 {
19182191 DumpObject();
2192
+ } else
2193
+ if (source == minButton)
2194
+ {
2195
+ Minimize();
2196
+ } else
2197
+ if (source == maxButton)
2198
+ {
2199
+ Maximize();
2200
+ } else
2201
+ if (source == fullButton)
2202
+ {
2203
+ ToggleFullScreen();
2204
+ } else
2205
+ if (source == undoButton)
2206
+ {
2207
+ Undo();
2208
+ } else
2209
+ if (source == redoButton)
2210
+ {
2211
+ Redo();
2212
+ } else
2213
+ if (source == saveButton)
2214
+ {
2215
+ Save();
19192216 } else
19202217 if (source == oneStepButton)
19212218 {
....@@ -1970,6 +2267,14 @@
19702267 if (source == cutItem || source == clearButton)
19712268 {
19722269 loadClipboard(true);
2270
+ } else
2271
+ if (source == undoItem)
2272
+ {
2273
+ Undo();
2274
+ } else
2275
+ if (source == redoItem)
2276
+ {
2277
+ Redo();
19732278 } else
19742279 if (source == duplicateItem)
19752280 {
....@@ -2302,9 +2607,9 @@
23022607 {
23032608 ClearSelection(true);
23042609 } else
2305
- if (source == grabItem)
2610
+ if (source == grabItem || source == groupButton)
23062611 {
2307
- group(new cGroup(), true);
2612
+ group(new cGroup(), false); // true);
23082613 } else
23092614 if (source == hideItem)
23102615 {
....@@ -2322,11 +2627,11 @@
23222627 {
23232628 makeSomething(new Camera());
23242629 } else
2325
- if (source == compositeItem)
2630
+ if (source == compositeItem || source == compositeButton)
23262631 {
23272632 group(new Composite());
23282633 } else
2329
- if (source == randomItem)
2634
+ if (source == switchItem || source == switchButton)
23302635 {
23312636 RandomNode random = new RandomNode();
23322637 group(random);
....@@ -2428,7 +2733,7 @@
24282733 {
24292734 group(new cLinker());
24302735 } else
2431
- if (source == textureItem)
2736
+ if (source == textureItem || source == textureButton)
24322737 {
24332738 group(new TextureNode());
24342739 } else
....@@ -2448,7 +2753,7 @@
24482753 {
24492754 CastShadow(2);
24502755 } else
2451
- if (source == ungroupItem)
2756
+ if (source == ungroupItem || source == ungroupButton)
24522757 {
24532758 //ungroup();
24542759 for (int i=0; i<group.selection.size(); i++)
....@@ -2470,7 +2775,7 @@
24702775 } else
24712776 if (source == genNormalsMESHItem)
24722777 {
2473
- GenNormals(true); // TODO
2778
+ GenNormalsMESH();
24742779 } else
24752780 if (source == genNormalsORGANItem)
24762781 {
....@@ -2535,6 +2840,22 @@
25352840 if (source == unmarkleavesItem)
25362841 {
25372842 MarkLeaves(false);
2843
+ } else
2844
+ if (source == rewindleavesItem)
2845
+ {
2846
+ RewindLeaves(true);
2847
+ } else
2848
+ if (source == unrewindleavesItem)
2849
+ {
2850
+ RewindLeaves(false);
2851
+ } else
2852
+ if (source == randomleavesItem)
2853
+ {
2854
+ RandomLeaves(true);
2855
+ } else
2856
+ if (source == unrandomleavesItem)
2857
+ {
2858
+ RandomLeaves(false);
25382859 } else
25392860 if (source == flipVItem)
25402861 {
....@@ -2770,6 +3091,10 @@
27703091 if (source == twoButton)
27713092 {
27723093 radio.layout = twoButton;
3094
+
3095
+ if (CameraPane.FULLSCREEN)
3096
+ fullscreenLayout = radio.layout;
3097
+
27733098 // bug
27743099 //gridPanel.setDividerLocation(1.0);
27753100 //bigPanel.setDividerLocation(0.0);
....@@ -2802,10 +3127,31 @@
28023127 bigThree.ClearUI();
28033128 bigThree.add(centralPanel);
28043129 bigThree.FlushUI();
3130
+
3131
+ cameraView.requestFocusInWindow();
3132
+
3133
+// refreshContents(true);
3134
+//
3135
+// try
3136
+// {
3137
+// java.awt.Robot bot = new java.awt.Robot();
3138
+// int mask = InputEvent.BUTTON1_MASK;
3139
+// bot.mouseMove(100, 100);
3140
+// bot.mousePress(mask);
3141
+// bot.mouseRelease(mask);
3142
+// }
3143
+// catch (Exception e)
3144
+// {
3145
+//
3146
+// }
3147
+
28053148 } else
28063149 if (source == threeButton)
28073150 {
28083151 radio.layout = threeButton;
3152
+
3153
+ if (CameraPane.FULLSCREEN)
3154
+ fullscreenLayout = radio.layout;
28093155
28103156 // bigThree.remove(scenePanel);
28113157 // bigThree.remove(centralPanel);
....@@ -2838,10 +3184,15 @@
28383184 bigThree.add(centralPanel);
28393185 bigThree.add(XYZPanel);
28403186 bigThree.FlushUI();
3187
+
3188
+ cameraView.requestFocusInWindow();
28413189 } else
28423190 if (source == fourButton)
28433191 {
28443192 radio.layout = fourButton;
3193
+
3194
+ if (CameraPane.FULLSCREEN)
3195
+ fullscreenLayout = radio.layout;
28453196
28463197 // bigThree.remove(scenePanel);
28473198 // bigThree.remove(centralPanel);
....@@ -2873,10 +3224,15 @@
28733224 bigThree.ClearUI();
28743225 bigThree.add(scenePanel);
28753226 bigThree.FlushUI();
3227
+
3228
+ cameraView.requestFocusInWindow();
28763229 } else
28773230 if (source == sixButton)
28783231 {
28793232 radio.layout = sixButton;
3233
+
3234
+ if (CameraPane.FULLSCREEN)
3235
+ fullscreenLayout = radio.layout;
28803236
28813237 // bigThree.remove(scenePanel);
28823238 // bigThree.remove(centralPanel);
....@@ -2909,10 +3265,15 @@
29093265 bigThree.add(scenePanel);
29103266 bigThree.add(centralPanel);
29113267 bigThree.FlushUI();
3268
+
3269
+ cameraView.requestFocusInWindow();
29123270 } else
29133271 if (source == sevenButton)
29143272 {
29153273 radio.layout = sevenButton;
3274
+
3275
+ if (CameraPane.FULLSCREEN)
3276
+ fullscreenLayout = radio.layout;
29163277
29173278 // bigThree.remove(scenePanel);
29183279 // bigThree.remove(centralPanel);
....@@ -2946,6 +3307,8 @@
29463307 bigThree.add(centralPanel);
29473308 bigThree.add(XYZPanel);
29483309 bigThree.FlushUI();
3310
+
3311
+ cameraView.requestFocusInWindow();
29493312 } else
29503313 if (source == rootButton)
29513314 {
....@@ -2957,6 +3320,7 @@
29573320 EditObject(obj);
29583321 }
29593322
3323
+ cameraView.requestFocusInWindow();
29603324 refreshContents(true);
29613325 } else
29623326 if (source == closeButton)
....@@ -2966,22 +3330,37 @@
29663330 for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
29673331 {
29683332 ab = (cRadio)e.nextElement();
2969
- if(ab.getModel().isSelected() && ab.GetObject() != client)
3333
+ if (ab.getModel().isSelected() && ab.GetObject() != client)
29703334 {
3335
+ // Patch to avoid bug with transparency.
3336
+ if (!ab.hadMaterial)
3337
+ {
3338
+ ab.object.material = null;
3339
+ }
3340
+
29713341 buttonGroup.remove(ab);
29723342 radioPanel.remove(ab);
29733343
2974
- ab.GetObject().editWindow = null;
3344
+ //ab.GetObject().editWindow = null;
3345
+ ab.GetObject().manipWindow = null;
29753346 // ab.GetObject().objectUI = null; // ?????????
29763347
29773348 ((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
29783349 break;
29793350 }
29803351 }
3352
+
3353
+ cameraView.requestFocusInWindow();
29813354 refreshContents(true);
29823355 } else
29833356 if (source == editItem || source == editButton)
29843357 {
3358
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3359
+ {
3360
+ Object3D child = (Object3D)e.nextElement();
3361
+ child.pinned = true;
3362
+ }
3363
+
29853364 EditSelection(false);
29863365 } else
29873366 if (source == uneditButton)
....@@ -2991,10 +3370,11 @@
29913370 Object3D child = (Object3D)e.nextElement();
29923371 if(child.editWindow != null)
29933372 objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3373
+ child.pinned = false;
29943374 child.CloseUI();
29953375 listUI.remove(child);
29963376
2997
- child.editWindow = null; // ???????????
3377
+ //child.editWindow = null; // ???????????
29983378 }
29993379 objEditor.ctrlPanel.FlushUI();
30003380 //objEditor.jTree.clearSelection();
....@@ -3007,6 +3387,7 @@
30073387 //copy.ClearUI();
30083388 for (Object3D obj : listUI)
30093389 {
3390
+ obj.pinned = false;
30103391 obj.CloseUI();
30113392 }
30123393 listUI.clear();
....@@ -3016,7 +3397,7 @@
30163397 {
30173398 assert(copy == group);
30183399
3019
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3400
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
30203401
30213402 for (Object3D obj : listUI)
30223403 {
....@@ -3081,7 +3462,9 @@
30813462 sideView.object = group;
30823463 }
30833464
3084
-// fix "+" issue group.editWindow = this;
3465
+// fix "+" issue
3466
+ //group.editWindow = this;
3467
+ group.manipWindow = this;
30853468
30863469 /*
30873470 currentLayout = radio.layout;
....@@ -3089,13 +3472,33 @@
30893472 currentLayout = sevenButton;
30903473 */
30913474 radio.layout.doClick();
3475
+
3476
+ ClearUnpinned();
3477
+ SetPinStates(group.selection.size() > 0);
3478
+ if (group.selection.size() == 1)
3479
+ EditSelection(false);
30923480 keepparent = group.parent;
30933481 // PARENT = NULL or not???
30943482 //group.parent = null; // ROOT
30953483 //group.attributes = -1;
30963484 ResetModel();
3485
+
3486
+ cameraView.requestFocusInWindow();
30973487 refreshContents(true);
3098
- }
3488
+ } else if (event.getSource() == editCameraItem)
3489
+ {
3490
+ cameraView.ProtectCamera();
3491
+ cameraView.repaint();
3492
+ return;
3493
+ } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
3494
+ {
3495
+ cameraView.RevertCamera();
3496
+ cameraView.repaint();
3497
+ return;
3498
+ // } else if (event.getSource() == textureButton)
3499
+ // {
3500
+ // return; // true;
3501
+ }
30993502 else
31003503 {
31013504 //return super.action(event, arg);
....@@ -3104,7 +3507,6 @@
31043507 }
31053508
31063509 boolean useclient = false;
3107
- cRadio radio;
31083510
31093511 void ToggleRoot()
31103512 {
....@@ -3343,7 +3745,8 @@
33433745
33443746 int size = obj.MemorySize();
33453747
3346
- System.err.println((size/1024) + " KB is the size of " + obj);
3748
+ //System.err.println((size/1024) + " KB is the size of " + obj);
3749
+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
33473750 }
33483751 }
33493752 catch (Exception e)
....@@ -3424,6 +3827,13 @@
34243827 void GenNormals(boolean crease)
34253828 {
34263829 group.GenNormalsS(crease);
3830
+
3831
+ refreshContents();
3832
+ }
3833
+
3834
+ void GenNormalsMESH()
3835
+ {
3836
+ group.GenNormalsMeshS();
34273837
34283838 refreshContents();
34293839 }
....@@ -4051,6 +4461,18 @@
40514461 refreshContents();
40524462 }
40534463
4464
+ void RewindLeaves(boolean hide)
4465
+ {
4466
+ group.selection.RewindLeaves(hide);
4467
+ refreshContents();
4468
+ }
4469
+
4470
+ void RandomLeaves(boolean hide)
4471
+ {
4472
+ group.selection.RandomLeaves(hide);
4473
+ refreshContents();
4474
+ }
4475
+
40544476 void SetTexRes(int tr)
40554477 {
40564478 group.selection.SetTexRes(tr);
....@@ -4122,10 +4544,6 @@
41224544 // }
41234545 // }
41244546
4125
- static boolean allparams = true;
4126
-
4127
- static Vector<Object3D> listUI = new Vector<Object3D>();
4128
-
41294547 void EditSelection(boolean newWindow)
41304548 {
41314549 // aConstraints.gridy = 0;
....@@ -4133,7 +4551,7 @@
41334551 {
41344552 //System.out.println("edit : " + objectPanel.indexOfTab("Material"));
41354553 //objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4136
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4554
+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
41374555
41384556 Object3D elem = (Object3D)group.selection.elementAt(i);
41394557 if(elem != group || !newWindow)
....@@ -4218,7 +4636,8 @@
42184636 //new Exception().printStackTrace();
42194637
42204638 freezemodel = true;
4221
-
4639
+ ClearUnpinned();
4640
+
42224641 /**/
42234642 //switch (event.id)
42244643 {
....@@ -4226,7 +4645,6 @@
42264645 //case 702: // Event.LIST_DESELECT
42274646 group.deselectAll();
42284647 TreePath tps[] = objEditor.jTree.getSelectionPaths();
4229
- objEditor.ClearInfo(); // .GetMaterial());
42304648 if (tps != null)
42314649 {
42324650 for (int i=0; i < tps.length; i++)
....@@ -4235,10 +4653,8 @@
42354653
42364654 //if (child.parent != null)
42374655 //child.parent.addSelectee(child);
4656
+ objEditor.SetMaterial(child);
42384657 group.addSelectee(child);
4239
- objEditor.SetMaterial(child); // .GetMaterial());
4240
- objEditor.AddInfo(child, this, true); // .GetMaterial());
4241
- System.err.println("info : " + child.GetPath());
42424658 }
42434659 }
42444660 // else
....@@ -4248,20 +4664,28 @@
42484664 // System.err.println("info : " + group.GetPath());
42494665 // }
42504666
4251
- objEditor.SetText(); // jan 2014
4252
-
4253
- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
4667
+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
42544668 CameraPane.flash = true;
42554669
4256
- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
4670
+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
42574671 // a camera
42584672 {
4259
- CameraPane.camerachangeframe = 0; // don't refuse it
4260
- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4673
+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4674
+ {
4675
+ CameraPane.camerachangeframe = 0; // don't refuse it
4676
+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4677
+ }
42614678 // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
42624679 // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
42634680 }
42644681
4682
+ if (tps != null && tps.length == 1)
4683
+ {
4684
+ EditSelection(false);
4685
+ }
4686
+
4687
+ SetPinStates(tps != null && tps.length > 0);
4688
+
42654689 refreshContents();
42664690 //return true;
42674691 }
....@@ -4270,6 +4694,35 @@
42704694
42714695 freezemodel = false;
42724696 }
4697
+
4698
+ void SetPinStates(boolean enabled)
4699
+ {
4700
+ editButton.setEnabled(enabled);
4701
+ uneditButton.setEnabled(enabled);
4702
+ unselectButton.setEnabled(enabled);
4703
+ flashSelectionButton.setEnabled(enabled);
4704
+ }
4705
+
4706
+ void refreshContents(boolean cp)
4707
+ {
4708
+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4709
+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
4710
+ {
4711
+ objEditor.ClearInfo(); // .GetMaterial());
4712
+
4713
+ for (int i=0; i < group.selection.Size(); i++)
4714
+ {
4715
+ Object3D child = (Object3D) group.selection.get(i);
4716
+
4717
+ objEditor.AddInfo(child, this, true);
4718
+ System.err.println("info : " + child.GetPath());
4719
+ }
4720
+
4721
+ objEditor.SetText(); // jan 2014
4722
+ }
4723
+
4724
+ super.refreshContents(cp);
4725
+ }
42734726
42744727 void linkSomething(Object3D thing)
42754728 {
....@@ -4341,6 +4794,7 @@
43414794 {
43424795 if (group.selection.isEmpty())
43434796 return;
4797
+
43444798 Grafreed.clipboardIsTempGroup = false;
43454799 Composite tGroup = null;
43464800 if (group.selection.size() > 0) // 1)
....@@ -4351,6 +4805,8 @@
43514805
43524806 if (cut)
43534807 {
4808
+ if (Globals.SAVEONMAKE)
4809
+ Save();
43544810 //int indices[] = jList.getSelectedIndices();
43554811 //for (int i = indices.length - 1; i >= 0; i--)
43564812 //jList.remove(indices[i]);
....@@ -4440,8 +4896,10 @@
44404896 }
44414897
44424898 }
4899
+
44434900 if (Grafreed.clipboardIsTempGroup)
44444901 Grafreed.clipboard = tGroup;
4902
+
44454903 if (cut)
44464904 {
44474905 ResetModel();
....@@ -4973,21 +5431,6 @@
49735431 }
49745432 */
49755433
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
-
49915434 /*
49925435 public void Callback(Object obj)
49935436 {
....@@ -5011,23 +5454,6 @@
50115454 }
50125455 */
50135456
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
-
50315457 String GetFile(String dialogName)
50325458 {
50335459 if (Grafreed.standAlone)
....@@ -5098,7 +5524,31 @@
50985524 cButton clearpanelButton;
50995525 cButton unselectButton;
51005526
5527
+ cButton restoreCameraButton;
5528
+
5529
+ cButton minButton;
5530
+ cButton maxButton;
5531
+ cButton fullButton;
5532
+ cButton saveButton;
51015533 cButton oneStepButton;
5534
+
5535
+ cButton groupButton;
5536
+ cButton ungroupButton;
5537
+ cButton compositeButton;
5538
+ cButton switchButton;
5539
+ cButton loopButton;
5540
+ cButton textureButton;
5541
+
5542
+ cButton gridButton;
5543
+ cButton boxButton;
5544
+ cButton sphereButton;
5545
+ cButton coneButton;
5546
+ cButton torusButton;
5547
+ cButton superButton;
5548
+ cButton kleinButton;
5549
+ cButton particlesButton;
5550
+ cButton overlayButton;
5551
+ cButton lightButton;
51025552
51035553 cButton screenfitButton;
51045554 cButton screenfitpointButton;
....@@ -5111,14 +5561,6 @@
51115561
51125562 cButton setsupportButton;
51135563
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
-
51225564 //
51235565 //Composite
51245566 Object3D // to do !!
....@@ -5128,9 +5570,11 @@
51285570 //JTree jTree;
51295571 private MenuItem lookAtItem;
51305572 private MenuItem lookFromItem;
5131
- private MenuItem switchItem;
5573
+ private MenuItem switchViewItem;
51325574 private MenuItem cutItem;
5133
- private MenuItem duplicateItem;
5575
+ private MenuItem undoItem;
5576
+ private MenuItem redoItem;
5577
+ private JMenuItem duplicateItem;
51345578 private MenuItem cloneItem;
51355579 private MenuItem cloneSupportItem;
51365580 private MenuItem overwriteGeoItem;
....@@ -5193,6 +5637,10 @@
51935637 private MenuItem showleavesItem;
51945638 private MenuItem markleavesItem;
51955639 private MenuItem unmarkleavesItem;
5640
+ private MenuItem rewindleavesItem;
5641
+ private MenuItem unrewindleavesItem;
5642
+ private MenuItem randomleavesItem;
5643
+ private MenuItem unrandomleavesItem;
51965644
51975645 private MenuItem flipVItem;
51985646 private MenuItem unflipVItem;
....@@ -5214,7 +5662,7 @@
52145662 private MenuItem frontItem;
52155663 private MenuItem cameraItem;
52165664 private MenuItem compositeItem;
5217
- private MenuItem randomItem;
5665
+ private MenuItem switchItem;
52185666 private MenuItem physicsItem;
52195667 private MenuItem frameselectorItem;
52205668 private MenuItem scriptNodeItem;
....@@ -5276,11 +5724,6 @@
52765724 private MenuItem doubleItem;
52775725 private MenuItem tripleItem;
52785726
5279
- private MenuItem importGFDItem;
5280
- private MenuItem importVRMLX3DItem;
5281
- private MenuItem import3DSItem;
5282
- private MenuItem importOBJItem;
5283
-
52845727 private MenuItem computeAOItem;
52855728 private MenuItem recompileItem;
52865729 private MenuItem editScriptItem;
....@@ -5290,4 +5733,8 @@
52905733 private MenuItem analyzeItem;
52915734 private MenuItem dumpItem;
52925735 //boolean freezemodel = false;
5736
+
5737
+ Menu cameraMenu;
5738
+ MenuItem editCameraItem;
5739
+ MenuItem restoreCameraItem;
52935740 }