.. | .. |
---|
150 | 150 | |
---|
151 | 151 | void SetupMenu2(GroupEditor oe) |
---|
152 | 152 | { |
---|
| 153 | + oe.jTree = new cTree(); |
---|
| 154 | + |
---|
153 | 155 | Menu menu; |
---|
154 | 156 | oe.menuBar.add(menu = new Menu("Edit")); |
---|
155 | 157 | //editItem = menu.add(new MenuItem("Edit")); |
---|
156 | 158 | //editItem.addActionListener(this); |
---|
157 | | - 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")); |
---|
158 | 166 | duplicateItem.addActionListener(this); |
---|
159 | 167 | cloneItem = menu.add(new MenuItem("Clone")); |
---|
160 | 168 | cloneItem.addActionListener(this); |
---|
.. | .. |
---|
170 | 178 | copyItem.addActionListener(this); |
---|
171 | 179 | pasteItem = menu.add(new MenuItem("Paste")); |
---|
172 | 180 | pasteItem.addActionListener(this); |
---|
173 | | - menu.add("-"); |
---|
174 | 181 | |
---|
175 | 182 | menu.add("-"); |
---|
176 | 183 | pasteIntoItem = menu.add(new MenuItem("Paste into")); |
---|
.. | .. |
---|
197 | 204 | //zBufferItem.addActionListener(this); |
---|
198 | 205 | //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens")); |
---|
199 | 206 | //normalLensItem.addActionListener(this); |
---|
200 | | - cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera")); |
---|
201 | | - revertCameraItem.addActionListener(this); |
---|
| 207 | + cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint")); |
---|
| 208 | + restoreCameraItem.addActionListener(this); |
---|
202 | 209 | |
---|
203 | | - cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen")); |
---|
204 | | - toggleFullScreenItem.addItemListener(this); |
---|
205 | | - toggleFullScreenItem.setState(CameraPane.FULLSCREEN); |
---|
206 | | - cameraMenu.add("-"); |
---|
| 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); |
---|
207 | 222 | |
---|
208 | | - cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture")); |
---|
209 | | - toggleTextureItem.addItemListener(this); |
---|
210 | | - toggleTextureItem.setState(CameraPane.textureon); |
---|
211 | | - |
---|
212 | | - cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch")); |
---|
213 | | - toggleSwitchItem.addItemListener(this); |
---|
214 | | - toggleSwitchItem.setState(CameraPane.SWITCH); |
---|
215 | | - |
---|
216 | | - cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles")); |
---|
| 223 | + cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles")); |
---|
217 | 224 | toggleHandleItem.addItemListener(this); |
---|
218 | 225 | toggleHandleItem.setState(CameraPane.HANDLES); |
---|
219 | 226 | |
---|
.. | .. |
---|
240 | 247 | |
---|
241 | 248 | cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug")); |
---|
242 | 249 | toggleDebugItem.addItemListener(this); |
---|
243 | | - toggleDebugItem.setState(CameraPane.DEBUG); |
---|
| 250 | + toggleDebugItem.setState(Globals.DEBUG); |
---|
244 | 251 | |
---|
245 | 252 | cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum")); |
---|
246 | 253 | toggleFrustumItem.addItemListener(this); |
---|
.. | .. |
---|
261 | 268 | // animationItem.addItemListener(this); |
---|
262 | 269 | // animationItem.setState(CameraPane.ANIMATION); |
---|
263 | 270 | cameraMenu.add("-"); |
---|
264 | | - cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera")); |
---|
| 271 | + cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint")); |
---|
265 | 272 | editCameraItem.addActionListener(this); |
---|
266 | 273 | |
---|
267 | 274 | if (Globals.ADVANCED) |
---|
268 | 275 | { |
---|
269 | 276 | oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest")); |
---|
270 | 277 | //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection")); |
---|
271 | | - //cameraMenu.add(switchItem = new MenuItem("Reverse View")); |
---|
| 278 | + //cameraMenu.add(switchViewItem = new MenuItem("Reverse View")); |
---|
272 | 279 | editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf")); |
---|
273 | 280 | oe.cameraMenu.add("-"); |
---|
274 | 281 | openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy...")); |
---|
.. | .. |
---|
276 | 283 | editLeafItem.addActionListener(this); |
---|
277 | 284 | lookAtItem.addActionListener(this); |
---|
278 | 285 | //lookFromItem.addActinoListener(this); |
---|
279 | | - //switchItem.addActionListener(this); |
---|
| 286 | + //switchViewItem.addActionListener(this); |
---|
280 | 287 | } |
---|
281 | 288 | |
---|
282 | 289 | oe.menuBar.add(menu = new Menu("Setting")); |
---|
.. | .. |
---|
321 | 328 | } |
---|
322 | 329 | |
---|
323 | 330 | oe.menuBar.add(menu = new Menu("Group")); |
---|
324 | | - grabItem = menu.add(new MenuItem("Grab")); |
---|
325 | | - grabItem.addActionListener(this); |
---|
| 331 | +// grabItem = menu.add(new MenuItem("Grab")); |
---|
| 332 | +// grabItem.addActionListener(this); |
---|
326 | 333 | backItem = menu.add(new MenuItem("Back")); |
---|
327 | 334 | backItem.addActionListener(this); |
---|
328 | 335 | frontItem = menu.add(new MenuItem("Front")); |
---|
329 | 336 | frontItem.addActionListener(this); |
---|
330 | | - compositeItem = menu.add(new MenuItem("Composite")); |
---|
331 | | - compositeItem.addActionListener(this); |
---|
| 337 | +// compositeItem = menu.add(new MenuItem("Composite")); |
---|
| 338 | +// compositeItem.addActionListener(this); |
---|
| 339 | + |
---|
| 340 | + if (Globals.ADVANCED) |
---|
| 341 | + { |
---|
332 | 342 | hideItem = menu.add(new MenuItem("Hidden Group")); |
---|
333 | 343 | hideItem.addActionListener(this); |
---|
| 344 | + } |
---|
334 | 345 | ungroupItem = menu.add(new MenuItem("Ungroup")); |
---|
335 | 346 | ungroupItem.addActionListener(this); |
---|
336 | | - menu.add("-"); |
---|
337 | | - randomItem = menu.add(new MenuItem("Switch node")); |
---|
338 | | - 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 | + { |
---|
339 | 354 | switchGeoItem = menu.add(new MenuItem("Switch Geometry")); |
---|
340 | 355 | switchGeoItem.addActionListener(this); |
---|
341 | 356 | switchTransfoItem = menu.add(new MenuItem("Switch Transform")); |
---|
.. | .. |
---|
343 | 358 | morphItem = menu.add(new MenuItem("Morph Group")); |
---|
344 | 359 | morphItem.addActionListener(this); |
---|
345 | 360 | |
---|
346 | | - if (Globals.ADVANCED) |
---|
347 | | - { |
---|
348 | 361 | menu.add("-"); |
---|
349 | 362 | physicsItem = menu.add(new MenuItem("Physics")); |
---|
350 | 363 | physicsItem.addActionListener(this); |
---|
.. | .. |
---|
352 | 365 | frameselectorItem.addActionListener(this); |
---|
353 | 366 | scriptNodeItem = menu.add(new MenuItem("Script Node")); |
---|
354 | 367 | scriptNodeItem.addActionListener(this); |
---|
355 | | - cameraItem = menu.add(new MenuItem("Camera")); |
---|
356 | | - cameraItem.addActionListener(this); |
---|
357 | 368 | } |
---|
358 | 369 | |
---|
359 | 370 | oe.menuBar.add(menu = new Menu("Object")); |
---|
360 | | - textureItem = menu.add(new MenuItem("Texture")); |
---|
361 | | - textureItem.addActionListener(this); |
---|
| 371 | +// textureItem = menu.add(new MenuItem("Texture")); |
---|
| 372 | +// textureItem.addActionListener(this); |
---|
362 | 373 | billboardItem = menu.add(new MenuItem("Billboard")); |
---|
363 | 374 | billboardItem.addActionListener(this); |
---|
364 | 375 | csgItem = menu.add(new MenuItem("CSG")); |
---|
365 | 376 | csgItem.addActionListener(this); |
---|
366 | | - shadowXItem = menu.add(new MenuItem("Shadow X")); |
---|
| 377 | + shadowXItem = menu.add(new MenuItem("Shadow Red")); |
---|
367 | 378 | shadowXItem.addActionListener(this); |
---|
368 | | - shadowYItem = menu.add(new MenuItem("Shadow Y")); |
---|
| 379 | + shadowYItem = menu.add(new MenuItem("Shadow Green")); |
---|
369 | 380 | shadowYItem.addActionListener(this); |
---|
370 | | - shadowZItem = menu.add(new MenuItem("Shadow Z")); |
---|
| 381 | + shadowZItem = menu.add(new MenuItem("Shadow Blue")); |
---|
371 | 382 | shadowZItem.addActionListener(this); |
---|
372 | 383 | if (Globals.ADVANCED) |
---|
373 | 384 | { |
---|
.. | .. |
---|
464 | 475 | markleavesItem.addActionListener(this); |
---|
465 | 476 | unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves")); |
---|
466 | 477 | 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); |
---|
467 | 486 | menu.add("-"); |
---|
468 | 487 | flipVItem = menu.add(new MenuItem("Flip V")); |
---|
469 | 488 | flipVItem.addActionListener(this); |
---|
.. | .. |
---|
521 | 540 | |
---|
522 | 541 | void SetupUI2(ObjEditor oe) |
---|
523 | 542 | { |
---|
| 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 | + |
---|
524 | 555 | //new Exception().printStackTrace(); |
---|
525 | 556 | |
---|
526 | 557 | oe.radioPanel = new JPanel(new GridBagLayout()); |
---|
.. | .. |
---|
549 | 580 | oe.radioPanel.add(dummyButton); |
---|
550 | 581 | oe.buttonGroup.add(dummyButton); |
---|
551 | 582 | */ |
---|
| 583 | + cGridBag copyOptionsPanel = new cGridBag(); |
---|
| 584 | + |
---|
| 585 | + copyOptionsPanel.preferredHeight = 1; |
---|
| 586 | + |
---|
552 | 587 | //this.AddOptions(oe.toolbarPanel, oe.aConstraints); |
---|
553 | 588 | |
---|
554 | | - 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); |
---|
555 | 620 | liveCB.setToolTipText("Enable animation"); |
---|
556 | 621 | liveCB.addItemListener(this); |
---|
557 | 622 | |
---|
558 | | - oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
| 623 | + copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
559 | 624 | oneStepButton.setToolTipText("Animate one step forward"); |
---|
560 | 625 | oneStepButton.addActionListener(this); |
---|
561 | 626 | |
---|
562 | | - oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints); |
---|
| 627 | + copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints); |
---|
563 | 628 | fastCB.setToolTipText("Fast mode"); |
---|
564 | 629 | fastCB.addItemListener(this); |
---|
565 | 630 | |
---|
566 | | - oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints); |
---|
567 | | - trackCB.setToolTipText("Enable tracking"); |
---|
568 | | - trackCB.addItemListener(this); |
---|
569 | | - |
---|
570 | | - 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); |
---|
571 | 634 | screenfitButton.setToolTipText("Screen fit"); |
---|
572 | 635 | 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); |
---|
573 | 640 | |
---|
574 | 641 | // oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints); |
---|
575 | 642 | // screenfitpointButton.addActionListener(this); |
---|
.. | .. |
---|
581 | 648 | snapobjectButton.setToolTipText("Snap Object"); |
---|
582 | 649 | } |
---|
583 | 650 | |
---|
584 | | - oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
585 | | - flashSelectionButton.setToolTipText("Show selection"); |
---|
586 | | - flashSelectionButton.addActionListener(this); |
---|
| 651 | + //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL)); |
---|
587 | 652 | |
---|
588 | | - oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL)); |
---|
589 | | - |
---|
590 | | - oe.toolbarPanel.add(twoButton = new cButton("|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
| 653 | + oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
591 | 654 | twoButton.setToolTipText("Show center view only"); |
---|
592 | 655 | twoButton.addActionListener(this); |
---|
593 | | - 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); |
---|
594 | 659 | fourButton.addActionListener(this); |
---|
595 | 660 | fourButton.setToolTipText("Show left panel only"); |
---|
596 | | - oe.toolbarPanel.add(sixButton = new cButton("+|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
| 661 | + oe.toolbarPanel.add(sixButton = new cButton("-|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
597 | 662 | sixButton.setToolTipText("2-column layout left"); |
---|
598 | 663 | sixButton.addActionListener(this); |
---|
599 | | - oe.toolbarPanel.add(threeButton = new cButton("|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
| 664 | + oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
600 | 665 | threeButton.setToolTipText("2-column layout right"); |
---|
601 | 666 | threeButton.addActionListener(this); |
---|
602 | | - oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
| 667 | + oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
603 | 668 | sevenButton.setToolTipText("3-column layout"); |
---|
604 | 669 | sevenButton.addActionListener(this); |
---|
605 | 670 | // |
---|
606 | 671 | |
---|
607 | | - 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); |
---|
608 | 673 | rootButton.setToolTipText("Edit selection in new tab"); |
---|
609 | 674 | rootButton.addActionListener(this); |
---|
610 | 675 | |
---|
611 | | - 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); |
---|
612 | 677 | closeButton.setToolTipText("Close tab"); |
---|
613 | 678 | closeButton.addActionListener(this); |
---|
614 | 679 | //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints); |
---|
615 | 680 | //clearButton.addActionListener(this); |
---|
616 | | - |
---|
617 | | - 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 | + } |
---|
618 | 713 | |
---|
619 | | - commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
620 | | - 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 item switcher"); |
---|
| 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"); |
---|
621 | 763 | editButton.addActionListener(this); |
---|
622 | 764 | |
---|
623 | | - commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
624 | | - uneditButton.setToolTipText("Unedit selection"); |
---|
| 765 | + editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
| 766 | + uneditButton.setToolTipText("Remove selection controls"); |
---|
625 | 767 | uneditButton.addActionListener(this); |
---|
626 | 768 | |
---|
627 | | - commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints); |
---|
628 | | - allParamsButton.setToolTipText("Edit all params"); |
---|
| 769 | + editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints); |
---|
| 770 | + allParamsButton.setToolTipText("Show all controle"); |
---|
629 | 771 | allParamsButton.addActionListener(this); |
---|
630 | 772 | |
---|
631 | | - commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
| 773 | + editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
632 | 774 | clearPanelButton.setToolTipText("Clear edit panel"); |
---|
633 | 775 | clearPanelButton.addActionListener(this); |
---|
634 | 776 | |
---|
635 | | - commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
| 777 | + editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
636 | 778 | unselectButton.setToolTipText("Unselect"); |
---|
637 | 779 | unselectButton.addActionListener(this); |
---|
638 | 780 | |
---|
639 | | - 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); |
---|
640 | 784 | |
---|
641 | | - oe.treePanel.add(commandsPanel); |
---|
642 | | - oe.treePanel.Return(); |
---|
| 785 | + editCommandsPanel.preferredHeight = 1; |
---|
| 786 | + |
---|
| 787 | + SetPinStates(false); |
---|
| 788 | +// oe.treePanel.add(commandsPanel); |
---|
| 789 | +// oe.treePanel.Return(); |
---|
643 | 790 | |
---|
644 | 791 | // oe.aConstraints.gridx += 1; |
---|
645 | 792 | // oe.aConstraints.weighty = 0; |
---|
.. | .. |
---|
656 | 803 | |
---|
657 | 804 | JScrollPane jSP; |
---|
658 | 805 | //ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints); |
---|
659 | | - jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints); |
---|
| 806 | + jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints); |
---|
660 | 807 | ResetModel(); |
---|
661 | 808 | |
---|
662 | 809 | oe.treePanel.add(jSPPanel); |
---|
663 | 810 | oe.treePanel.Return(); |
---|
664 | 811 | |
---|
665 | | - cGridBag copyOptionsPanel = new cGridBag(); |
---|
666 | | - |
---|
667 | | - copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints); |
---|
668 | | - colorCB.setToolTipText("Copy color when dropped"); |
---|
669 | | - colorCB.addItemListener(this); |
---|
670 | | - |
---|
671 | | - copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints); |
---|
672 | | - materialCB.setToolTipText("Copy material when dropped"); |
---|
673 | | - materialCB.addItemListener(this); |
---|
674 | | - |
---|
675 | | - copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints); |
---|
676 | | - textureCB.setToolTipText("Copy texture when dropped"); |
---|
677 | | - textureCB.addItemListener(this); |
---|
678 | | - |
---|
679 | | - copyOptionsPanel.preferredHeight = 1; |
---|
680 | 812 | oe.treePanel.add(copyOptionsPanel); |
---|
681 | 813 | oe.treePanel.Return(); |
---|
682 | 814 | |
---|
.. | .. |
---|
707 | 839 | |
---|
708 | 840 | void AddOptions(cGridBag panel) //, GridBagConstraints constraints) |
---|
709 | 841 | { |
---|
| 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 | + |
---|
710 | 856 | panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints); |
---|
711 | 857 | boxCB.setToolTipText("Display bounding boxes"); |
---|
712 | 858 | boxCB.addItemListener(this); |
---|
713 | 859 | |
---|
714 | 860 | panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints); |
---|
715 | | - zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel"); |
---|
| 861 | + zoomBoxCB.setToolTipText("Display only for wheel"); |
---|
716 | 862 | zoomBoxCB.addItemListener(this); |
---|
717 | 863 | |
---|
718 | 864 | if (true) // Globals.ADVANCED) |
---|
719 | 865 | { |
---|
720 | | - panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints); |
---|
721 | | - supportCB.setToolTipText("Enable rigging"); |
---|
722 | | - supportCB.addItemListener(this); |
---|
| 866 | +// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints); |
---|
| 867 | +// supportCB.setToolTipText("Enable rigging"); |
---|
| 868 | +// supportCB.addItemListener(this); |
---|
| 869 | + |
---|
| 870 | + panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints); |
---|
| 871 | + freezeCB.setToolTipText("Fast moving camera"); |
---|
| 872 | + freezeCB.addItemListener(this); |
---|
723 | 873 | |
---|
724 | 874 | // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints); |
---|
725 | 875 | // localCB.addItemListener(this); |
---|
726 | 876 | |
---|
| 877 | + panel.Return(); |
---|
| 878 | + |
---|
727 | 879 | panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints); |
---|
728 | 880 | crowdCB.setToolTipText("Used for crowds"); |
---|
729 | 881 | crowdCB.addItemListener(this); |
---|
.. | .. |
---|
740 | 892 | // panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints); |
---|
741 | 893 | // speakerMocapCB.addItemListener(this); |
---|
742 | 894 | |
---|
| 895 | + panel.Return(); |
---|
| 896 | + |
---|
743 | 897 | if (false) |
---|
744 | 898 | { |
---|
745 | 899 | // handled in scripts |
---|
.. | .. |
---|
754 | 908 | //constraints.gridy += 1; |
---|
755 | 909 | panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints); |
---|
756 | 910 | smoothfocusCB.addItemListener(this); |
---|
| 911 | + panel.Return(); |
---|
757 | 912 | } |
---|
758 | 913 | |
---|
759 | 914 | //constraints.gridx += 1; |
---|
760 | 915 | //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints); |
---|
761 | 916 | // debugCB.addItemListener(this); |
---|
762 | 917 | |
---|
| 918 | + panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints); |
---|
| 919 | + trackCB.setToolTipText("Enable tracking target"); |
---|
| 920 | + trackCB.addItemListener(this); |
---|
| 921 | + |
---|
763 | 922 | panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints); |
---|
| 923 | + oeilCB.setToolTipText("Move camera when tracking"); |
---|
764 | 924 | oeilCB.addItemListener(this); |
---|
765 | 925 | |
---|
| 926 | + panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints); |
---|
| 927 | + shadowCB.setToolTipText("When live compute shadows"); |
---|
| 928 | + shadowCB.addItemListener(this); |
---|
| 929 | + |
---|
| 930 | + panel.Return(); |
---|
| 931 | + panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints); |
---|
| 932 | + toggleTextureCB.setToolTipText("Load textures"); |
---|
| 933 | + toggleTextureCB.addItemListener(this); |
---|
| 934 | + |
---|
| 935 | + panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints); |
---|
| 936 | + toggleSwitchCB.setToolTipText("Choose a single item"); |
---|
| 937 | + toggleSwitchCB.addItemListener(this); |
---|
| 938 | + |
---|
| 939 | + panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints); |
---|
| 940 | + autosaveCB.setToolTipText("On structure change"); |
---|
| 941 | + autosaveCB.addItemListener(this); |
---|
| 942 | + |
---|
| 943 | + panel.Return(); |
---|
| 944 | + if (Globals.ADVANCED) |
---|
| 945 | + { |
---|
766 | 946 | panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints); |
---|
767 | 947 | lookAtCB.setToolTipText("Look-at target"); |
---|
768 | 948 | lookAtCB.addItemListener(this); |
---|
| 949 | + } |
---|
769 | 950 | |
---|
770 | 951 | } |
---|
771 | 952 | |
---|
772 | 953 | cGridBag fill = new cGridBag(); |
---|
773 | | - |
---|
774 | 954 | fill.preferredHeight = 200; |
---|
| 955 | + cGridBag fill2 = new cGridBag(); |
---|
| 956 | + fill2.preferredHeight = 200; |
---|
| 957 | + cGridBag fill3 = new cGridBag(); |
---|
| 958 | + fill3.preferredHeight = 200; |
---|
775 | 959 | |
---|
776 | 960 | panel.add(fill); |
---|
| 961 | + panel.add(fill2); |
---|
| 962 | + panel.add(fill3); |
---|
777 | 963 | |
---|
778 | 964 | } |
---|
779 | 965 | |
---|
780 | 966 | void EditObject(Object3D obj) |
---|
781 | 967 | { |
---|
782 | 968 | cRadio radioButton = new cRadio(obj.name); |
---|
| 969 | + |
---|
| 970 | + // Patch to avoid bug with transparency. |
---|
| 971 | + radioButton.hadMaterial = obj.material != null; |
---|
| 972 | + if (!radioButton.hadMaterial) |
---|
| 973 | + { |
---|
| 974 | + obj.material = new cMaterial(); |
---|
| 975 | + } |
---|
| 976 | + |
---|
783 | 977 | radioButton.SetObject(obj); |
---|
784 | 978 | radioButton.layout = sevenButton; |
---|
785 | 979 | radioButton.SetCamera(cameraView.renderCamera, false); |
---|
.. | .. |
---|
791 | 985 | |
---|
792 | 986 | void SetupViews(ObjEditor oe) |
---|
793 | 987 | { |
---|
| 988 | + theFrame = this; |
---|
| 989 | + |
---|
794 | 990 | oe.SetupViews(); |
---|
795 | 991 | |
---|
796 | 992 | System.out.println("SetupViews"); |
---|
.. | .. |
---|
799 | 995 | /*DropTarget dropTarget =*/ new DropTarget(oe.cameraView, this); |
---|
800 | 996 | } |
---|
801 | 997 | |
---|
802 | | - JCheckBox liveCB; |
---|
803 | | - JCheckBox supportCB; |
---|
804 | | - JCheckBox localCB; |
---|
805 | | - JCheckBox crowdCB; |
---|
806 | | - JCheckBox smoothCB; |
---|
807 | | - JCheckBox fastCB; |
---|
808 | | - JCheckBox slowCB; |
---|
809 | | - JCheckBox boxCB; |
---|
810 | | - JCheckBox zoomBoxCB; |
---|
811 | | - JCheckBox trackCB; |
---|
812 | | - JCheckBox smoothfocusCB; |
---|
| 998 | + cToggleButton liveCB; |
---|
| 999 | + cCheckBox supportCB; |
---|
| 1000 | + cCheckBox localCB; |
---|
| 1001 | + cCheckBox crowdCB; |
---|
| 1002 | + cCheckBox smoothCB; |
---|
| 1003 | + cToggleButton fastCB; |
---|
| 1004 | + cCheckBox slowCB; |
---|
| 1005 | + cCheckBox boxCB; |
---|
| 1006 | + cCheckBox zoomBoxCB; |
---|
| 1007 | + cCheckBox freezeCB; |
---|
| 1008 | + //cToggleButton trackCB; |
---|
| 1009 | + cCheckBox trackCB; |
---|
| 1010 | + cCheckBox smoothfocusCB; |
---|
813 | 1011 | // JCheckBox speakerMocapCB; |
---|
814 | | - JCheckBox speakerCameraCB; |
---|
815 | | - JCheckBox speakerFocusCB; |
---|
816 | | - JCheckBox debugCB; |
---|
817 | | - JCheckBox oeilCB; |
---|
818 | | - JCheckBox lookAtCB; |
---|
| 1012 | + cCheckBox speakerCameraCB; |
---|
| 1013 | + cCheckBox speakerFocusCB; |
---|
| 1014 | + cCheckBox debugCB; |
---|
| 1015 | + |
---|
| 1016 | + cCheckBox oeilCB; |
---|
| 1017 | + cCheckBox shadowCB; |
---|
| 1018 | + cCheckBox autosaveCB; |
---|
| 1019 | + cCheckBox lookAtCB; |
---|
819 | 1020 | |
---|
820 | 1021 | // static int COLOR = 1; |
---|
821 | 1022 | // static int MATERIAL = 2; |
---|
.. | .. |
---|
823 | 1024 | |
---|
824 | 1025 | int dropAttributes = Object3D.COLOR | Object3D.MATERIAL; |
---|
825 | 1026 | |
---|
826 | | - JCheckBox colorCB; |
---|
827 | | - JCheckBox materialCB; |
---|
828 | | - JCheckBox textureCB; |
---|
| 1027 | + cCheckBox colorCB; |
---|
| 1028 | + cCheckBox materialCB; |
---|
| 1029 | + cCheckBox textureCB; |
---|
829 | 1030 | |
---|
830 | 1031 | public void itemStateChanged(ItemEvent e) |
---|
831 | 1032 | { |
---|
.. | .. |
---|
853 | 1054 | } else if(e.getSource() == liveCB) |
---|
854 | 1055 | { |
---|
855 | 1056 | cameraView.ToggleLive(); |
---|
| 1057 | + refreshContents(false); |
---|
856 | 1058 | } |
---|
857 | 1059 | else if(e.getSource() == supportCB) |
---|
858 | 1060 | { |
---|
.. | .. |
---|
917 | 1119 | { |
---|
918 | 1120 | cameraView.ToggleOeil(); |
---|
919 | 1121 | } |
---|
| 1122 | + else if(e.getSource() == shadowCB) |
---|
| 1123 | + { |
---|
| 1124 | + Globals.COMPUTESHADOWWHENLIVE ^= true; |
---|
| 1125 | + } |
---|
| 1126 | + else if(e.getSource() == freezeCB) |
---|
| 1127 | + { |
---|
| 1128 | + Globals.FREEZEONMOVE ^= true; |
---|
| 1129 | + } |
---|
| 1130 | + else if(e.getSource() == autosaveCB) |
---|
| 1131 | + { |
---|
| 1132 | + Globals.SAVEONMAKE ^= true; |
---|
| 1133 | + } |
---|
920 | 1134 | else if(e.getSource() == lookAtCB) |
---|
921 | 1135 | { |
---|
922 | 1136 | cameraView.ToggleLookAt(); |
---|
.. | .. |
---|
933 | 1147 | |
---|
934 | 1148 | /**/ |
---|
935 | 1149 | //DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this); |
---|
936 | | - TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent()); |
---|
| 1150 | + //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent()); |
---|
| 1151 | + TreePath path = objEditor.jTree.getSelectionPath(); |
---|
937 | 1152 | if ((path == null) || (path.getPathCount() <= 1)) { |
---|
938 | 1153 | // We can't move the root node or an empty selection |
---|
939 | 1154 | return; |
---|
.. | .. |
---|
1050 | 1265 | |
---|
1051 | 1266 | assert target == objEditor.jTree; |
---|
1052 | 1267 | TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y); |
---|
| 1268 | + Object3D destinationLeaf; |
---|
1053 | 1269 | try { |
---|
1054 | | - Object3D dummy = (Composite) destinationPath.getLastPathComponent(); |
---|
| 1270 | + destinationLeaf = (Composite) destinationPath.getLastPathComponent(); |
---|
1055 | 1271 | } catch (Exception e) { |
---|
1056 | 1272 | System.out.println("destinationPath : " + destinationPath); |
---|
1057 | 1273 | return; |
---|
1058 | 1274 | } |
---|
1059 | 1275 | |
---|
1060 | | - if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK) |
---|
| 1276 | + for (int i=group.selection.size(); --i>=0;) |
---|
1061 | 1277 | { |
---|
| 1278 | + Object3D child = (Object3D)group.selection.elementAt(i); |
---|
| 1279 | + |
---|
| 1280 | + // Cannot move into itself |
---|
| 1281 | + if (child == destinationLeaf) |
---|
| 1282 | + return; |
---|
| 1283 | + } |
---|
| 1284 | + |
---|
| 1285 | +// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK) |
---|
| 1286 | +// { |
---|
1062 | 1287 | loadClipboard(true); |
---|
1063 | 1288 | objEditor.jTree.setSelectionPath(destinationPath); |
---|
1064 | 1289 | pasteInto(false, false); |
---|
1065 | | - } else { |
---|
1066 | | - loadClipboard(false); |
---|
1067 | | - objEditor.jTree.setSelectionPath(destinationPath); |
---|
1068 | | - pasteInto(false, false); // true); // ??? |
---|
1069 | | - } |
---|
| 1290 | +// } else { |
---|
| 1291 | +// loadClipboard(false); |
---|
| 1292 | +// objEditor.jTree.setSelectionPath(destinationPath); |
---|
| 1293 | +// pasteInto(false, false); // true); // ??? |
---|
| 1294 | +// } |
---|
1070 | 1295 | } |
---|
1071 | 1296 | public void dropActionChanged(DropTargetDragEvent dtde) |
---|
1072 | 1297 | // Called if the user has modified the current drop gesture |
---|
.. | .. |
---|
1171 | 1396 | { |
---|
1172 | 1397 | //heightFieldItem = menu.add(new MenuItem("Height Field")); |
---|
1173 | 1398 | //heightFieldItem.addActionListener(this); |
---|
1174 | | - gridItem = menu.add(new MenuItem("Grid")); |
---|
1175 | | - gridItem.addActionListener(this); |
---|
1176 | | - rectoidItem = menu.add(new MenuItem("Box")); |
---|
1177 | | - rectoidItem.addActionListener(this); |
---|
1178 | | - ellipsoidItem = menu.add(new MenuItem("Sphere")); |
---|
1179 | | - ellipsoidItem.addActionListener(this); |
---|
1180 | | - coneItem = menu.add(new MenuItem("Cone")); |
---|
1181 | | - coneItem.addActionListener(this); |
---|
1182 | | - torusItem = menu.add(new MenuItem("Torus")); |
---|
1183 | | - torusItem.addActionListener(this); |
---|
1184 | | - superItem = menu.add(new MenuItem("Superellipsoid")); |
---|
1185 | | - superItem.addActionListener(this); |
---|
| 1399 | +// gridItem = menu.add(new MenuItem("Grid")); |
---|
| 1400 | +// gridItem.addActionListener(this); |
---|
| 1401 | +// rectoidItem = menu.add(new MenuItem("Box")); |
---|
| 1402 | +// rectoidItem.addActionListener(this); |
---|
| 1403 | +// ellipsoidItem = menu.add(new MenuItem("Sphere")); |
---|
| 1404 | +// ellipsoidItem.addActionListener(this); |
---|
| 1405 | +// coneItem = menu.add(new MenuItem("Cone")); |
---|
| 1406 | +// coneItem.addActionListener(this); |
---|
| 1407 | +// torusItem = menu.add(new MenuItem("Torus")); |
---|
| 1408 | +// torusItem.addActionListener(this); |
---|
| 1409 | +// superItem = menu.add(new MenuItem("Superellipsoid")); |
---|
| 1410 | +// superItem.addActionListener(this); |
---|
| 1411 | + |
---|
| 1412 | + cameraItem = menu.add(new MenuItem("Camera")); |
---|
| 1413 | + cameraItem.addActionListener(this); |
---|
| 1414 | + |
---|
| 1415 | + if (!Globals.ADVANCED) |
---|
| 1416 | + { |
---|
1186 | 1417 | kleinItem = menu.add(new MenuItem("Klein Bottle")); |
---|
1187 | 1418 | kleinItem.addActionListener(this); |
---|
1188 | | - particleItem = menu.add(new MenuItem("Particle system")); |
---|
1189 | | - particleItem.addActionListener(this); |
---|
| 1419 | + } |
---|
| 1420 | + |
---|
| 1421 | +// particleItem = menu.add(new MenuItem("Particle system")); |
---|
| 1422 | +// particleItem.addActionListener(this); |
---|
1190 | 1423 | if (Globals.ADVANCED) |
---|
1191 | 1424 | { |
---|
1192 | 1425 | ragdollItem = menu.add(new MenuItem("Rag Walk")); |
---|
.. | .. |
---|
1212 | 1445 | } |
---|
1213 | 1446 | bezierItem = menu.add(new MenuItem("Bezier Patch")); |
---|
1214 | 1447 | bezierItem.addActionListener(this); |
---|
1215 | | - overlayItem = menu.add(new MenuItem("Overlay")); |
---|
1216 | | - overlayItem.addActionListener(this); |
---|
1217 | | - lightItem = menu.add(new MenuItem("Light")); |
---|
1218 | | - lightItem.addActionListener(this); |
---|
| 1448 | +// overlayItem = menu.add(new MenuItem("Overlay")); |
---|
| 1449 | +// overlayItem.addActionListener(this); |
---|
| 1450 | +// lightItem = menu.add(new MenuItem("Light")); |
---|
| 1451 | +// lightItem.addActionListener(this); |
---|
1219 | 1452 | menu.add("-"); |
---|
1220 | 1453 | //superLoopItem = menu.add(new MenuItem("Super Loop")); |
---|
1221 | 1454 | //superLoopItem.addActionListener(this); |
---|
1222 | | - loopItem = menu.add(new MenuItem("Loop")); |
---|
1223 | | - loopItem.addActionListener(this); |
---|
| 1455 | +// loopItem = menu.add(new MenuItem("Loop")); |
---|
| 1456 | +// loopItem.addActionListener(this); |
---|
1224 | 1457 | doubleItem = menu.add(new MenuItem("Fork")); |
---|
1225 | 1458 | doubleItem.addActionListener(this); |
---|
1226 | 1459 | if (Globals.ADVANCED) |
---|
.. | .. |
---|
1260 | 1493 | memoryItem.addActionListener(this); |
---|
1261 | 1494 | menu.add(analyzeItem = new MenuItem("Analyze")); |
---|
1262 | 1495 | analyzeItem.addActionListener(this); |
---|
1263 | | - menu.add(dumpItem = new MenuItem("Dump")); |
---|
| 1496 | + menu.add(dumpItem = new MenuItem("Print")); |
---|
1264 | 1497 | dumpItem.addActionListener(this); |
---|
1265 | 1498 | // menu.add(pathItem = new MenuItem("From-to path")); |
---|
1266 | 1499 | // pathItem.addActionListener(this); |
---|
.. | .. |
---|
1401 | 1634 | shadow.material = new cMaterial(obj.material); |
---|
1402 | 1635 | shadow.material.diffuse = 0.0001f; |
---|
1403 | 1636 | shadow.material.specular = 0.0001f; |
---|
| 1637 | + //shadow.projectedVertices[1].x = 300; |
---|
1404 | 1638 | |
---|
1405 | 1639 | makeSomething(shadow); |
---|
1406 | 1640 | } |
---|
| 1641 | + |
---|
| 1642 | + private void ClearUnpinned() |
---|
| 1643 | + { |
---|
| 1644 | + //for (Object3D obj : listUI) |
---|
| 1645 | + for (int i=listUI.size(); --i>=0;) |
---|
| 1646 | + { |
---|
| 1647 | + Object3D obj = listUI.elementAt(i); |
---|
| 1648 | + if (!obj.pinned) |
---|
| 1649 | + { |
---|
| 1650 | + obj.CloseUI(); |
---|
| 1651 | + listUI.remove(i); |
---|
| 1652 | + } |
---|
| 1653 | + } |
---|
| 1654 | + } |
---|
1407 | 1655 | |
---|
1408 | 1656 | /** |
---|
1409 | 1657 | * applyExample |
---|
.. | .. |
---|
1648 | 1896 | { |
---|
1649 | 1897 | ScreenFit(); |
---|
1650 | 1898 | } else |
---|
1651 | | - if (source == switchItem) |
---|
| 1899 | + if (source == switchViewItem) |
---|
1652 | 1900 | { |
---|
1653 | 1901 | cVector v1 = new cVector(); |
---|
1654 | 1902 | cVector v2 = new cVector(); |
---|
.. | .. |
---|
1657 | 1905 | objEditor.cameraView.renderCamera.setAim(v2, v1); |
---|
1658 | 1906 | objEditor.cameraView.repaint(); |
---|
1659 | 1907 | } else |
---|
1660 | | - if (source == rectoidItem) |
---|
| 1908 | + if (source == rectoidItem || source == boxButton) |
---|
1661 | 1909 | { |
---|
1662 | 1910 | makeSomething(new Box()); |
---|
1663 | 1911 | } else |
---|
1664 | | - if (source == particleItem) |
---|
| 1912 | + if (source == particleItem || source == particlesButton) |
---|
1665 | 1913 | { |
---|
1666 | 1914 | ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType); |
---|
1667 | 1915 | ParticleController particleController = new ParticleController(particleGeom); |
---|
.. | .. |
---|
1740 | 1988 | |
---|
1741 | 1989 | makeSomething(obj); |
---|
1742 | 1990 | } else |
---|
1743 | | - if (source == gridItem) |
---|
| 1991 | + if (source == gridItem || source == gridButton) |
---|
1744 | 1992 | { |
---|
1745 | 1993 | makeSomething(new Grid()); |
---|
1746 | 1994 | } else |
---|
1747 | | - if (source == ellipsoidItem) |
---|
| 1995 | + if (source == ellipsoidItem || source == sphereButton) |
---|
1748 | 1996 | { |
---|
1749 | 1997 | makeSomething(new Sphere()); |
---|
1750 | 1998 | } else |
---|
1751 | | - if (source == coneItem) |
---|
| 1999 | + if (source == coneItem || source == coneButton) |
---|
1752 | 2000 | { |
---|
1753 | 2001 | makeSomething(new Cone()); |
---|
1754 | 2002 | } else |
---|
1755 | | - if (source == torusItem) |
---|
| 2003 | + if (source == torusItem || source == torusButton) |
---|
1756 | 2004 | { |
---|
1757 | 2005 | makeSomething(new Torus()); |
---|
1758 | 2006 | } else |
---|
1759 | | - if (source == superItem) |
---|
| 2007 | + if (source == superItem || source == superButton) |
---|
1760 | 2008 | { |
---|
1761 | 2009 | makeSomething(new Superellipsoid()); |
---|
1762 | 2010 | } else |
---|
1763 | | - if (source == kleinItem) |
---|
| 2011 | + if (source == kleinItem || source == kleinButton) |
---|
1764 | 2012 | { |
---|
1765 | 2013 | makeSomething(new Klein()); |
---|
1766 | 2014 | } else |
---|
.. | .. |
---|
1780 | 2028 | { |
---|
1781 | 2029 | makeSomething(new BezierSurface()); |
---|
1782 | 2030 | } else |
---|
1783 | | - if (source == overlayItem) |
---|
| 2031 | + if (source == overlayItem || source == overlayButton) |
---|
1784 | 2032 | { |
---|
1785 | 2033 | /* |
---|
1786 | 2034 | Object3D obj = new BezierSurface(5,8); |
---|
.. | .. |
---|
1828 | 2076 | s.setup(); |
---|
1829 | 2077 | makeSomething(s); |
---|
1830 | 2078 | } else |
---|
1831 | | - if (source == lightItem) |
---|
| 2079 | + if (source == lightItem || source == lightButton) |
---|
1832 | 2080 | { |
---|
1833 | 2081 | makeSomething(new Light()); |
---|
1834 | 2082 | } else |
---|
.. | .. |
---|
1878 | 2126 | |
---|
1879 | 2127 | group(g); |
---|
1880 | 2128 | } else |
---|
1881 | | - if (source == loopItem) |
---|
| 2129 | + if (source == loopItem || source == loopButton) |
---|
1882 | 2130 | { |
---|
1883 | 2131 | Composite csg = new GroupLeaf(); |
---|
1884 | 2132 | csg.count = 5; |
---|
1885 | 2133 | group(csg); |
---|
1886 | | - Composite child = new cGroup(); |
---|
| 2134 | + Composite child = new cGroup("Branch"); |
---|
1887 | 2135 | csg.addChild(child); |
---|
1888 | 2136 | child.addChild(csg); |
---|
1889 | 2137 | } else |
---|
1890 | 2138 | if (source == doubleItem) |
---|
1891 | 2139 | { |
---|
1892 | | - Composite csg = new GroupLeaf(); |
---|
| 2140 | + Composite csg = new GroupLeaf("Fork"); |
---|
1893 | 2141 | csg.count = 5; |
---|
1894 | 2142 | group(csg); |
---|
1895 | | - Composite child = new cGroup(); |
---|
| 2143 | + Composite child = new cGroup("Branch A"); |
---|
1896 | 2144 | csg.addChild(child); |
---|
1897 | 2145 | child.addChild(csg); |
---|
1898 | | - child = new cGroup(); |
---|
| 2146 | + child = new cGroup("Branch B"); |
---|
1899 | 2147 | csg.addChild(child); |
---|
1900 | 2148 | child.addChild(csg); |
---|
1901 | 2149 | } else |
---|
1902 | 2150 | if (source == tripleItem) |
---|
1903 | 2151 | { |
---|
1904 | | - Composite csg = new GroupLeaf(); |
---|
| 2152 | + Composite csg = new GroupLeaf("Trident"); |
---|
1905 | 2153 | csg.count = 4; |
---|
1906 | 2154 | group(csg); |
---|
1907 | 2155 | Composite child = new cGroup(); |
---|
.. | .. |
---|
1950 | 2198 | if (source == dumpItem) |
---|
1951 | 2199 | { |
---|
1952 | 2200 | DumpObject(); |
---|
| 2201 | + } else |
---|
| 2202 | + if (source == minButton) |
---|
| 2203 | + { |
---|
| 2204 | + Minimize(); |
---|
| 2205 | + } else |
---|
| 2206 | + if (source == maxButton) |
---|
| 2207 | + { |
---|
| 2208 | + Maximize(); |
---|
| 2209 | + } else |
---|
| 2210 | + if (source == fullButton) |
---|
| 2211 | + { |
---|
| 2212 | + ToggleFullScreen(); |
---|
| 2213 | + } else |
---|
| 2214 | + if (source == undoButton) |
---|
| 2215 | + { |
---|
| 2216 | + Undo(); |
---|
| 2217 | + } else |
---|
| 2218 | + if (source == redoButton) |
---|
| 2219 | + { |
---|
| 2220 | + Redo(); |
---|
| 2221 | + } else |
---|
| 2222 | + if (source == saveButton) |
---|
| 2223 | + { |
---|
| 2224 | + Save(); |
---|
1953 | 2225 | } else |
---|
1954 | 2226 | if (source == oneStepButton) |
---|
1955 | 2227 | { |
---|
.. | .. |
---|
2004 | 2276 | if (source == cutItem || source == clearButton) |
---|
2005 | 2277 | { |
---|
2006 | 2278 | loadClipboard(true); |
---|
| 2279 | + } else |
---|
| 2280 | + if (source == undoItem) |
---|
| 2281 | + { |
---|
| 2282 | + Undo(); |
---|
| 2283 | + } else |
---|
| 2284 | + if (source == redoItem) |
---|
| 2285 | + { |
---|
| 2286 | + Redo(); |
---|
2007 | 2287 | } else |
---|
2008 | 2288 | if (source == duplicateItem) |
---|
2009 | 2289 | { |
---|
.. | .. |
---|
2336 | 2616 | { |
---|
2337 | 2617 | ClearSelection(true); |
---|
2338 | 2618 | } else |
---|
2339 | | - if (source == grabItem) |
---|
| 2619 | + if (source == grabItem || source == groupButton) |
---|
2340 | 2620 | { |
---|
2341 | | - group(new cGroup(), true); |
---|
| 2621 | + group(new cGroup(), false); // true); |
---|
2342 | 2622 | } else |
---|
2343 | 2623 | if (source == hideItem) |
---|
2344 | 2624 | { |
---|
.. | .. |
---|
2356 | 2636 | { |
---|
2357 | 2637 | makeSomething(new Camera()); |
---|
2358 | 2638 | } else |
---|
2359 | | - if (source == compositeItem) |
---|
| 2639 | + if (source == compositeItem || source == compositeButton) |
---|
2360 | 2640 | { |
---|
2361 | 2641 | group(new Composite()); |
---|
2362 | 2642 | } else |
---|
2363 | | - if (source == randomItem) |
---|
| 2643 | + if (source == switchItem || source == switchButton) |
---|
2364 | 2644 | { |
---|
2365 | 2645 | RandomNode random = new RandomNode(); |
---|
2366 | 2646 | group(random); |
---|
.. | .. |
---|
2462 | 2742 | { |
---|
2463 | 2743 | group(new cLinker()); |
---|
2464 | 2744 | } else |
---|
2465 | | - if (source == textureItem) |
---|
| 2745 | + if (source == textureItem || source == textureButton) |
---|
2466 | 2746 | { |
---|
2467 | 2747 | group(new TextureNode()); |
---|
2468 | 2748 | } else |
---|
.. | .. |
---|
2482 | 2762 | { |
---|
2483 | 2763 | CastShadow(2); |
---|
2484 | 2764 | } else |
---|
2485 | | - if (source == ungroupItem) |
---|
| 2765 | + if (source == ungroupItem || source == ungroupButton) |
---|
2486 | 2766 | { |
---|
2487 | | - //ungroup(); |
---|
| 2767 | + boolean hasRoot = false; |
---|
| 2768 | + |
---|
2488 | 2769 | for (int i=0; i<group.selection.size(); i++) |
---|
2489 | 2770 | { |
---|
2490 | | - Ungroup(group.selection.get(i)); |
---|
| 2771 | + if (group.selection.get(i) == group) |
---|
| 2772 | + { |
---|
| 2773 | + hasRoot = true; |
---|
| 2774 | + break; |
---|
| 2775 | + } |
---|
2491 | 2776 | } |
---|
2492 | 2777 | |
---|
2493 | | - ClearSelection(false); |
---|
2494 | | - |
---|
2495 | | - refreshContents(); |
---|
| 2778 | + if (!hasRoot) |
---|
| 2779 | + { |
---|
| 2780 | + for (int i=0; i<group.selection.size(); i++) |
---|
| 2781 | + { |
---|
| 2782 | + Ungroup(group.selection.get(i)); |
---|
| 2783 | + } |
---|
| 2784 | + |
---|
| 2785 | + ClearSelection(false); |
---|
| 2786 | + |
---|
| 2787 | + refreshContents(); |
---|
| 2788 | + } |
---|
2496 | 2789 | } else |
---|
2497 | 2790 | if (source == genUVItem) |
---|
2498 | 2791 | { |
---|
.. | .. |
---|
2504 | 2797 | } else |
---|
2505 | 2798 | if (source == genNormalsMESHItem) |
---|
2506 | 2799 | { |
---|
2507 | | - GenNormals(true); // TODO |
---|
| 2800 | + GenNormalsMESH(); |
---|
2508 | 2801 | } else |
---|
2509 | 2802 | if (source == genNormalsORGANItem) |
---|
2510 | 2803 | { |
---|
.. | .. |
---|
2569 | 2862 | if (source == unmarkleavesItem) |
---|
2570 | 2863 | { |
---|
2571 | 2864 | MarkLeaves(false); |
---|
| 2865 | + } else |
---|
| 2866 | + if (source == rewindleavesItem) |
---|
| 2867 | + { |
---|
| 2868 | + RewindLeaves(true); |
---|
| 2869 | + } else |
---|
| 2870 | + if (source == unrewindleavesItem) |
---|
| 2871 | + { |
---|
| 2872 | + RewindLeaves(false); |
---|
| 2873 | + } else |
---|
| 2874 | + if (source == randomleavesItem) |
---|
| 2875 | + { |
---|
| 2876 | + RandomLeaves(true); |
---|
| 2877 | + } else |
---|
| 2878 | + if (source == unrandomleavesItem) |
---|
| 2879 | + { |
---|
| 2880 | + RandomLeaves(false); |
---|
2572 | 2881 | } else |
---|
2573 | 2882 | if (source == flipVItem) |
---|
2574 | 2883 | { |
---|
.. | .. |
---|
2804 | 3113 | if (source == twoButton) |
---|
2805 | 3114 | { |
---|
2806 | 3115 | radio.layout = twoButton; |
---|
| 3116 | + |
---|
| 3117 | + if (CameraPane.FULLSCREEN) |
---|
| 3118 | + fullscreenLayout = radio.layout; |
---|
| 3119 | + |
---|
2807 | 3120 | // bug |
---|
2808 | 3121 | //gridPanel.setDividerLocation(1.0); |
---|
2809 | 3122 | //bigPanel.setDividerLocation(0.0); |
---|
.. | .. |
---|
2836 | 3149 | bigThree.ClearUI(); |
---|
2837 | 3150 | bigThree.add(centralPanel); |
---|
2838 | 3151 | bigThree.FlushUI(); |
---|
| 3152 | + |
---|
| 3153 | + cameraView.requestFocusInWindow(); |
---|
| 3154 | + |
---|
| 3155 | +// refreshContents(true); |
---|
| 3156 | +// |
---|
| 3157 | +// try |
---|
| 3158 | +// { |
---|
| 3159 | +// java.awt.Robot bot = new java.awt.Robot(); |
---|
| 3160 | +// int mask = InputEvent.BUTTON1_MASK; |
---|
| 3161 | +// bot.mouseMove(100, 100); |
---|
| 3162 | +// bot.mousePress(mask); |
---|
| 3163 | +// bot.mouseRelease(mask); |
---|
| 3164 | +// } |
---|
| 3165 | +// catch (Exception e) |
---|
| 3166 | +// { |
---|
| 3167 | +// |
---|
| 3168 | +// } |
---|
| 3169 | + |
---|
2839 | 3170 | } else |
---|
2840 | 3171 | if (source == threeButton) |
---|
2841 | 3172 | { |
---|
2842 | 3173 | radio.layout = threeButton; |
---|
| 3174 | + |
---|
| 3175 | + if (CameraPane.FULLSCREEN) |
---|
| 3176 | + fullscreenLayout = radio.layout; |
---|
2843 | 3177 | |
---|
2844 | 3178 | // bigThree.remove(scenePanel); |
---|
2845 | 3179 | // bigThree.remove(centralPanel); |
---|
.. | .. |
---|
2872 | 3206 | bigThree.add(centralPanel); |
---|
2873 | 3207 | bigThree.add(XYZPanel); |
---|
2874 | 3208 | bigThree.FlushUI(); |
---|
| 3209 | + |
---|
| 3210 | + cameraView.requestFocusInWindow(); |
---|
2875 | 3211 | } else |
---|
2876 | 3212 | if (source == fourButton) |
---|
2877 | 3213 | { |
---|
2878 | 3214 | radio.layout = fourButton; |
---|
| 3215 | + |
---|
| 3216 | + if (CameraPane.FULLSCREEN) |
---|
| 3217 | + fullscreenLayout = radio.layout; |
---|
2879 | 3218 | |
---|
2880 | 3219 | // bigThree.remove(scenePanel); |
---|
2881 | 3220 | // bigThree.remove(centralPanel); |
---|
.. | .. |
---|
2907 | 3246 | bigThree.ClearUI(); |
---|
2908 | 3247 | bigThree.add(scenePanel); |
---|
2909 | 3248 | bigThree.FlushUI(); |
---|
| 3249 | + |
---|
| 3250 | + cameraView.requestFocusInWindow(); |
---|
2910 | 3251 | } else |
---|
2911 | 3252 | if (source == sixButton) |
---|
2912 | 3253 | { |
---|
2913 | 3254 | radio.layout = sixButton; |
---|
| 3255 | + |
---|
| 3256 | + if (CameraPane.FULLSCREEN) |
---|
| 3257 | + fullscreenLayout = radio.layout; |
---|
2914 | 3258 | |
---|
2915 | 3259 | // bigThree.remove(scenePanel); |
---|
2916 | 3260 | // bigThree.remove(centralPanel); |
---|
.. | .. |
---|
2943 | 3287 | bigThree.add(scenePanel); |
---|
2944 | 3288 | bigThree.add(centralPanel); |
---|
2945 | 3289 | bigThree.FlushUI(); |
---|
| 3290 | + |
---|
| 3291 | + cameraView.requestFocusInWindow(); |
---|
2946 | 3292 | } else |
---|
2947 | 3293 | if (source == sevenButton) |
---|
2948 | 3294 | { |
---|
2949 | 3295 | radio.layout = sevenButton; |
---|
| 3296 | + |
---|
| 3297 | + if (CameraPane.FULLSCREEN) |
---|
| 3298 | + fullscreenLayout = radio.layout; |
---|
2950 | 3299 | |
---|
2951 | 3300 | // bigThree.remove(scenePanel); |
---|
2952 | 3301 | // bigThree.remove(centralPanel); |
---|
.. | .. |
---|
2980 | 3329 | bigThree.add(centralPanel); |
---|
2981 | 3330 | bigThree.add(XYZPanel); |
---|
2982 | 3331 | bigThree.FlushUI(); |
---|
| 3332 | + |
---|
| 3333 | + cameraView.requestFocusInWindow(); |
---|
2983 | 3334 | } else |
---|
2984 | 3335 | if (source == rootButton) |
---|
2985 | 3336 | { |
---|
.. | .. |
---|
2991 | 3342 | EditObject(obj); |
---|
2992 | 3343 | } |
---|
2993 | 3344 | |
---|
| 3345 | + cameraView.requestFocusInWindow(); |
---|
2994 | 3346 | refreshContents(true); |
---|
2995 | 3347 | } else |
---|
2996 | 3348 | if (source == closeButton) |
---|
.. | .. |
---|
3000 | 3352 | for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();) |
---|
3001 | 3353 | { |
---|
3002 | 3354 | ab = (cRadio)e.nextElement(); |
---|
3003 | | - if(ab.getModel().isSelected() && ab.GetObject() != client) |
---|
| 3355 | + if (ab.getModel().isSelected() && ab.GetObject() != client) |
---|
3004 | 3356 | { |
---|
| 3357 | + // Patch to avoid bug with transparency. |
---|
| 3358 | + if (!ab.hadMaterial) |
---|
| 3359 | + { |
---|
| 3360 | + ab.object.material = null; |
---|
| 3361 | + } |
---|
| 3362 | + |
---|
3005 | 3363 | buttonGroup.remove(ab); |
---|
3006 | 3364 | radioPanel.remove(ab); |
---|
3007 | 3365 | |
---|
3008 | | - ab.GetObject().editWindow = null; |
---|
| 3366 | + //ab.GetObject().editWindow = null; |
---|
| 3367 | + ab.GetObject().manipWindow = null; |
---|
3009 | 3368 | // ab.GetObject().objectUI = null; // ????????? |
---|
3010 | 3369 | |
---|
3011 | 3370 | ((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick(); |
---|
3012 | 3371 | break; |
---|
3013 | 3372 | } |
---|
3014 | 3373 | } |
---|
| 3374 | + |
---|
| 3375 | + cameraView.requestFocusInWindow(); |
---|
3015 | 3376 | refreshContents(true); |
---|
3016 | 3377 | } else |
---|
3017 | 3378 | if (source == editItem || source == editButton) |
---|
3018 | 3379 | { |
---|
| 3380 | + for (Enumeration e = group.selection.elements(); e.hasMoreElements();) |
---|
| 3381 | + { |
---|
| 3382 | + Object3D child = (Object3D)e.nextElement(); |
---|
| 3383 | + child.pinned = true; |
---|
| 3384 | + } |
---|
| 3385 | + |
---|
3019 | 3386 | EditSelection(false); |
---|
3020 | 3387 | } else |
---|
3021 | 3388 | if (source == uneditButton) |
---|
.. | .. |
---|
3025 | 3392 | Object3D child = (Object3D)e.nextElement(); |
---|
3026 | 3393 | if(child.editWindow != null) |
---|
3027 | 3394 | objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit")); |
---|
| 3395 | + child.pinned = false; |
---|
3028 | 3396 | child.CloseUI(); |
---|
3029 | 3397 | listUI.remove(child); |
---|
3030 | 3398 | |
---|
3031 | | - child.editWindow = null; // ??????????? |
---|
| 3399 | + //child.editWindow = null; // ??????????? |
---|
3032 | 3400 | } |
---|
3033 | 3401 | objEditor.ctrlPanel.FlushUI(); |
---|
3034 | 3402 | //objEditor.jTree.clearSelection(); |
---|
.. | .. |
---|
3041 | 3409 | //copy.ClearUI(); |
---|
3042 | 3410 | for (Object3D obj : listUI) |
---|
3043 | 3411 | { |
---|
| 3412 | + obj.pinned = false; |
---|
3044 | 3413 | obj.CloseUI(); |
---|
3045 | 3414 | } |
---|
3046 | 3415 | listUI.clear(); |
---|
.. | .. |
---|
3050 | 3419 | { |
---|
3051 | 3420 | assert(copy == group); |
---|
3052 | 3421 | |
---|
3053 | | - objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit")); |
---|
| 3422 | + //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit")); |
---|
3054 | 3423 | |
---|
3055 | 3424 | for (Object3D obj : listUI) |
---|
3056 | 3425 | { |
---|
.. | .. |
---|
3115 | 3484 | sideView.object = group; |
---|
3116 | 3485 | } |
---|
3117 | 3486 | |
---|
3118 | | -// fix "+" issue group.editWindow = this; |
---|
| 3487 | +// fix "+" issue |
---|
| 3488 | + //group.editWindow = this; |
---|
| 3489 | + group.manipWindow = this; |
---|
3119 | 3490 | |
---|
3120 | 3491 | /* |
---|
3121 | 3492 | currentLayout = radio.layout; |
---|
.. | .. |
---|
3123 | 3494 | currentLayout = sevenButton; |
---|
3124 | 3495 | */ |
---|
3125 | 3496 | radio.layout.doClick(); |
---|
| 3497 | + |
---|
| 3498 | + ClearUnpinned(); |
---|
| 3499 | + SetPinStates(group.selection.size() > 0); |
---|
| 3500 | + if (group.selection.size() == 1) |
---|
| 3501 | + EditSelection(false); |
---|
3126 | 3502 | keepparent = group.parent; |
---|
3127 | 3503 | // PARENT = NULL or not??? |
---|
3128 | 3504 | //group.parent = null; // ROOT |
---|
3129 | 3505 | //group.attributes = -1; |
---|
3130 | 3506 | ResetModel(); |
---|
| 3507 | + |
---|
| 3508 | + cameraView.requestFocusInWindow(); |
---|
3131 | 3509 | refreshContents(true); |
---|
3132 | 3510 | } else if (event.getSource() == editCameraItem) |
---|
3133 | 3511 | { |
---|
3134 | 3512 | cameraView.ProtectCamera(); |
---|
3135 | 3513 | cameraView.repaint(); |
---|
3136 | 3514 | return; |
---|
3137 | | - } else if (event.getSource() == revertCameraItem) |
---|
| 3515 | + } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton) |
---|
3138 | 3516 | { |
---|
3139 | 3517 | cameraView.RevertCamera(); |
---|
3140 | 3518 | cameraView.repaint(); |
---|
.. | .. |
---|
3151 | 3529 | } |
---|
3152 | 3530 | |
---|
3153 | 3531 | boolean useclient = false; |
---|
3154 | | - cRadio radio; |
---|
3155 | 3532 | |
---|
3156 | 3533 | void ToggleRoot() |
---|
3157 | 3534 | { |
---|
.. | .. |
---|
3390 | 3767 | |
---|
3391 | 3768 | int size = obj.MemorySize(); |
---|
3392 | 3769 | |
---|
3393 | | - System.err.println((size/1024) + " KB is the size of " + obj); |
---|
| 3770 | + //System.err.println((size/1024) + " KB is the size of " + obj); |
---|
| 3771 | + System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)"); |
---|
3394 | 3772 | } |
---|
3395 | 3773 | } |
---|
3396 | 3774 | catch (Exception e) |
---|
.. | .. |
---|
3471 | 3849 | void GenNormals(boolean crease) |
---|
3472 | 3850 | { |
---|
3473 | 3851 | group.GenNormalsS(crease); |
---|
| 3852 | + |
---|
| 3853 | + refreshContents(); |
---|
| 3854 | + } |
---|
| 3855 | + |
---|
| 3856 | + void GenNormalsMESH() |
---|
| 3857 | + { |
---|
| 3858 | + group.GenNormalsMeshS(); |
---|
3474 | 3859 | |
---|
3475 | 3860 | refreshContents(); |
---|
3476 | 3861 | } |
---|
.. | .. |
---|
4098 | 4483 | refreshContents(); |
---|
4099 | 4484 | } |
---|
4100 | 4485 | |
---|
| 4486 | + void RewindLeaves(boolean hide) |
---|
| 4487 | + { |
---|
| 4488 | + group.selection.RewindLeaves(hide); |
---|
| 4489 | + refreshContents(); |
---|
| 4490 | + } |
---|
| 4491 | + |
---|
| 4492 | + void RandomLeaves(boolean hide) |
---|
| 4493 | + { |
---|
| 4494 | + group.selection.RandomLeaves(hide); |
---|
| 4495 | + refreshContents(); |
---|
| 4496 | + } |
---|
| 4497 | + |
---|
4101 | 4498 | void SetTexRes(int tr) |
---|
4102 | 4499 | { |
---|
4103 | 4500 | group.selection.SetTexRes(tr); |
---|
.. | .. |
---|
4169 | 4566 | // } |
---|
4170 | 4567 | // } |
---|
4171 | 4568 | |
---|
4172 | | - static boolean allparams = true; |
---|
4173 | | - |
---|
4174 | | - static Vector<Object3D> listUI = new Vector<Object3D>(); |
---|
4175 | | - |
---|
4176 | 4569 | void EditSelection(boolean newWindow) |
---|
4177 | 4570 | { |
---|
4178 | 4571 | // aConstraints.gridy = 0; |
---|
.. | .. |
---|
4180 | 4573 | { |
---|
4181 | 4574 | //System.out.println("edit : " + objectPanel.indexOfTab("Material")); |
---|
4182 | 4575 | //objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false); |
---|
4183 | | - objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit")); |
---|
| 4576 | + //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit")); |
---|
4184 | 4577 | |
---|
4185 | 4578 | Object3D elem = (Object3D)group.selection.elementAt(i); |
---|
4186 | 4579 | if(elem != group || !newWindow) |
---|
.. | .. |
---|
4265 | 4658 | //new Exception().printStackTrace(); |
---|
4266 | 4659 | |
---|
4267 | 4660 | freezemodel = true; |
---|
4268 | | - |
---|
| 4661 | + ClearUnpinned(); |
---|
| 4662 | + |
---|
4269 | 4663 | /**/ |
---|
4270 | 4664 | //switch (event.id) |
---|
4271 | 4665 | { |
---|
.. | .. |
---|
4273 | 4667 | //case 702: // Event.LIST_DESELECT |
---|
4274 | 4668 | group.deselectAll(); |
---|
4275 | 4669 | TreePath tps[] = objEditor.jTree.getSelectionPaths(); |
---|
4276 | | - objEditor.ClearInfo(); // .GetMaterial()); |
---|
4277 | 4670 | if (tps != null) |
---|
4278 | 4671 | { |
---|
4279 | 4672 | for (int i=0; i < tps.length; i++) |
---|
.. | .. |
---|
4282 | 4675 | |
---|
4283 | 4676 | //if (child.parent != null) |
---|
4284 | 4677 | //child.parent.addSelectee(child); |
---|
| 4678 | + objEditor.SetMaterial(child); |
---|
4285 | 4679 | group.addSelectee(child); |
---|
4286 | | - objEditor.SetMaterial(child); // .GetMaterial()); |
---|
4287 | | - objEditor.AddInfo(child, this, true); // .GetMaterial()); |
---|
4288 | | - System.err.println("info : " + child.GetPath()); |
---|
4289 | 4680 | } |
---|
4290 | 4681 | } |
---|
4291 | 4682 | // else |
---|
.. | .. |
---|
4295 | 4686 | // System.err.println("info : " + group.GetPath()); |
---|
4296 | 4687 | // } |
---|
4297 | 4688 | |
---|
4298 | | - objEditor.SetText(); // jan 2014 |
---|
4299 | | - |
---|
4300 | | - if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera)) |
---|
| 4689 | + if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera)) |
---|
4301 | 4690 | CameraPane.flash = true; |
---|
4302 | 4691 | |
---|
4303 | | - if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera) |
---|
| 4692 | + if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera) |
---|
4304 | 4693 | // a camera |
---|
4305 | 4694 | { |
---|
4306 | | - CameraPane.camerachangeframe = 0; // don't refuse it |
---|
4307 | | - Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent()); |
---|
| 4695 | + if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace |
---|
| 4696 | + { |
---|
| 4697 | + CameraPane.camerachangeframe = 0; // don't refuse it |
---|
| 4698 | + Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent()); |
---|
| 4699 | + } |
---|
4308 | 4700 | // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera; |
---|
4309 | 4701 | // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera; |
---|
4310 | 4702 | } |
---|
4311 | 4703 | |
---|
| 4704 | + if (tps != null && tps.length == 1) |
---|
| 4705 | + { |
---|
| 4706 | + EditSelection(false); |
---|
| 4707 | + } |
---|
| 4708 | + |
---|
| 4709 | + SetPinStates(tps != null && tps.length > 0); |
---|
| 4710 | + |
---|
4312 | 4711 | refreshContents(); |
---|
4313 | 4712 | //return true; |
---|
4314 | 4713 | } |
---|
.. | .. |
---|
4317 | 4716 | |
---|
4318 | 4717 | freezemodel = false; |
---|
4319 | 4718 | } |
---|
| 4719 | + |
---|
| 4720 | + void SetPinStates(boolean enabled) |
---|
| 4721 | + { |
---|
| 4722 | + editButton.setEnabled(enabled); |
---|
| 4723 | + uneditButton.setEnabled(enabled); |
---|
| 4724 | + unselectButton.setEnabled(enabled); |
---|
| 4725 | + flashSelectionButton.setEnabled(enabled); |
---|
| 4726 | + } |
---|
| 4727 | + |
---|
| 4728 | + void refreshContents(boolean cp) |
---|
| 4729 | + { |
---|
| 4730 | + if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info")) |
---|
| 4731 | + if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING) |
---|
| 4732 | + { |
---|
| 4733 | + objEditor.ClearInfo(); // .GetMaterial()); |
---|
| 4734 | + |
---|
| 4735 | + for (int i=0; i < group.selection.Size(); i++) |
---|
| 4736 | + { |
---|
| 4737 | + Object3D child = (Object3D) group.selection.get(i); |
---|
| 4738 | + |
---|
| 4739 | + objEditor.AddInfo(child, this, true); |
---|
| 4740 | + System.err.println("info : " + child.GetPath()); |
---|
| 4741 | + } |
---|
| 4742 | + |
---|
| 4743 | + objEditor.SetText(); // jan 2014 |
---|
| 4744 | + } |
---|
| 4745 | + |
---|
| 4746 | + super.refreshContents(cp); |
---|
| 4747 | + } |
---|
4320 | 4748 | |
---|
4321 | 4749 | void linkSomething(Object3D thing) |
---|
4322 | 4750 | { |
---|
.. | .. |
---|
4388 | 4816 | { |
---|
4389 | 4817 | if (group.selection.isEmpty()) |
---|
4390 | 4818 | return; |
---|
| 4819 | + |
---|
4391 | 4820 | Grafreed.clipboardIsTempGroup = false; |
---|
4392 | 4821 | Composite tGroup = null; |
---|
4393 | 4822 | if (group.selection.size() > 0) // 1) |
---|
.. | .. |
---|
4398 | 4827 | |
---|
4399 | 4828 | if (cut) |
---|
4400 | 4829 | { |
---|
| 4830 | + if (Globals.SAVEONMAKE) |
---|
| 4831 | + Save(); |
---|
4401 | 4832 | //int indices[] = jList.getSelectedIndices(); |
---|
4402 | 4833 | //for (int i = indices.length - 1; i >= 0; i--) |
---|
4403 | 4834 | //jList.remove(indices[i]); |
---|
.. | .. |
---|
4487 | 4918 | } |
---|
4488 | 4919 | |
---|
4489 | 4920 | } |
---|
| 4921 | + |
---|
4490 | 4922 | if (Grafreed.clipboardIsTempGroup) |
---|
4491 | 4923 | Grafreed.clipboard = tGroup; |
---|
| 4924 | + |
---|
4492 | 4925 | if (cut) |
---|
4493 | 4926 | { |
---|
4494 | 4927 | ResetModel(); |
---|
.. | .. |
---|
5113 | 5546 | cButton clearpanelButton; |
---|
5114 | 5547 | cButton unselectButton; |
---|
5115 | 5548 | |
---|
| 5549 | + cButton restoreCameraButton; |
---|
| 5550 | + |
---|
| 5551 | + cButton saveButton; |
---|
5116 | 5552 | cButton oneStepButton; |
---|
| 5553 | + |
---|
| 5554 | + cButton groupButton; |
---|
| 5555 | + cButton ungroupButton; |
---|
| 5556 | + cButton compositeButton; |
---|
| 5557 | + cButton switchButton; |
---|
| 5558 | + cButton loopButton; |
---|
| 5559 | + cButton textureButton; |
---|
| 5560 | + |
---|
| 5561 | + cButton gridButton; |
---|
| 5562 | + cButton boxButton; |
---|
| 5563 | + cButton sphereButton; |
---|
| 5564 | + cButton coneButton; |
---|
| 5565 | + cButton torusButton; |
---|
| 5566 | + cButton superButton; |
---|
| 5567 | + cButton kleinButton; |
---|
| 5568 | + cButton particlesButton; |
---|
| 5569 | + cButton overlayButton; |
---|
| 5570 | + cButton lightButton; |
---|
5117 | 5571 | |
---|
5118 | 5572 | cButton screenfitButton; |
---|
5119 | 5573 | cButton screenfitpointButton; |
---|
.. | .. |
---|
5126 | 5580 | |
---|
5127 | 5581 | cButton setsupportButton; |
---|
5128 | 5582 | |
---|
5129 | | - cButton twoButton; |
---|
5130 | | - cButton sixButton; |
---|
5131 | | - cButton threeButton; |
---|
5132 | | - cButton sevenButton; |
---|
5133 | | - cButton fourButton; // full panel |
---|
5134 | | - cButton oneButton; // full XYZ |
---|
5135 | | - //cButton currentLayout; |
---|
5136 | | - |
---|
5137 | 5583 | // |
---|
5138 | 5584 | //Composite |
---|
5139 | 5585 | Object3D // to do !! |
---|
.. | .. |
---|
5143 | 5589 | //JTree jTree; |
---|
5144 | 5590 | private MenuItem lookAtItem; |
---|
5145 | 5591 | private MenuItem lookFromItem; |
---|
5146 | | - private MenuItem switchItem; |
---|
| 5592 | + private MenuItem switchViewItem; |
---|
5147 | 5593 | private MenuItem cutItem; |
---|
5148 | | - private MenuItem duplicateItem; |
---|
| 5594 | + private MenuItem undoItem; |
---|
| 5595 | + private MenuItem redoItem; |
---|
| 5596 | + private JMenuItem duplicateItem; |
---|
5149 | 5597 | private MenuItem cloneItem; |
---|
5150 | 5598 | private MenuItem cloneSupportItem; |
---|
5151 | 5599 | private MenuItem overwriteGeoItem; |
---|
.. | .. |
---|
5208 | 5656 | private MenuItem showleavesItem; |
---|
5209 | 5657 | private MenuItem markleavesItem; |
---|
5210 | 5658 | private MenuItem unmarkleavesItem; |
---|
| 5659 | + private MenuItem rewindleavesItem; |
---|
| 5660 | + private MenuItem unrewindleavesItem; |
---|
| 5661 | + private MenuItem randomleavesItem; |
---|
| 5662 | + private MenuItem unrandomleavesItem; |
---|
5211 | 5663 | |
---|
5212 | 5664 | private MenuItem flipVItem; |
---|
5213 | 5665 | private MenuItem unflipVItem; |
---|
.. | .. |
---|
5229 | 5681 | private MenuItem frontItem; |
---|
5230 | 5682 | private MenuItem cameraItem; |
---|
5231 | 5683 | private MenuItem compositeItem; |
---|
5232 | | - private MenuItem randomItem; |
---|
| 5684 | + private MenuItem switchItem; |
---|
5233 | 5685 | private MenuItem physicsItem; |
---|
5234 | 5686 | private MenuItem frameselectorItem; |
---|
5235 | 5687 | private MenuItem scriptNodeItem; |
---|
.. | .. |
---|
5303 | 5755 | |
---|
5304 | 5756 | Menu cameraMenu; |
---|
5305 | 5757 | MenuItem editCameraItem; |
---|
5306 | | - MenuItem revertCameraItem; |
---|
| 5758 | + MenuItem restoreCameraItem; |
---|
5307 | 5759 | } |
---|