.. | .. |
---|
438 | 438 | oe.aConstraints.gridx = 0; |
---|
439 | 439 | |
---|
440 | 440 | oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints); |
---|
| 441 | + liveCB.setToolTipText("Enabled animation"); |
---|
441 | 442 | liveCB.addItemListener(this); |
---|
442 | 443 | |
---|
443 | 444 | oe.aConstraints.gridx += 1; |
---|
| 445 | + oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints); |
---|
| 446 | + fastCB.setToolTipText("Fast mode"); |
---|
| 447 | + fastCB.addItemListener(this); |
---|
| 448 | + oe.aConstraints.gridx += 1; |
---|
444 | 449 | oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints); |
---|
| 450 | + supportCB.setToolTipText("Enabled rigging"); |
---|
445 | 451 | supportCB.addItemListener(this); |
---|
446 | 452 | |
---|
447 | 453 | // oe.aConstraints.gridx += 1; |
---|
.. | .. |
---|
450 | 456 | |
---|
451 | 457 | oe.aConstraints.gridx += 1; |
---|
452 | 458 | oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), oe.aConstraints); |
---|
| 459 | + crowdCB.setToolTipText("Used for crowds"); |
---|
453 | 460 | crowdCB.addItemListener(this); |
---|
454 | 461 | |
---|
455 | 462 | oe.aConstraints.gridx += 1; |
---|
456 | 463 | oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints); |
---|
| 464 | + smoothCB.setToolTipText("Snapping delay"); |
---|
457 | 465 | smoothCB.addItemListener(this); |
---|
458 | 466 | |
---|
459 | 467 | oe.aConstraints.gridx += 1; |
---|
460 | | - oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints); |
---|
461 | | - fastCB.addItemListener(this); |
---|
462 | | - oe.aConstraints.gridx += 1; |
---|
463 | 468 | oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints); |
---|
| 469 | + slowCB.setToolTipText("Smooth interpolation"); |
---|
464 | 470 | slowCB.addItemListener(this); |
---|
465 | 471 | oe.aConstraints.gridx += 1; |
---|
466 | | - oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints); |
---|
| 472 | + oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), oe.aConstraints); |
---|
| 473 | + boxCB.setToolTipText("Display bounding boxes"); |
---|
467 | 474 | boxCB.addItemListener(this); |
---|
| 475 | + oe.aConstraints.gridx += 1; |
---|
| 476 | + oe.toolbarPanel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), oe.aConstraints); |
---|
| 477 | + zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel"); |
---|
| 478 | + zoomBoxCB.addItemListener(this); |
---|
468 | 479 | |
---|
469 | 480 | // oe.aConstraints.gridx += 1; |
---|
470 | 481 | // oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints); |
---|
.. | .. |
---|
491 | 502 | // debugCB.addItemListener(this); |
---|
492 | 503 | |
---|
493 | 504 | oe.aConstraints.gridx += 1; |
---|
494 | | - oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints); |
---|
| 505 | + oe.toolbarPanel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), oe.aConstraints); |
---|
495 | 506 | oeilCB.addItemListener(this); |
---|
496 | 507 | |
---|
497 | 508 | oe.aConstraints.gridx += 1; |
---|
498 | | - oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints); |
---|
| 509 | + oe.toolbarPanel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), oe.aConstraints); |
---|
| 510 | + lookAtCB.setToolTipText("Look-at target"); |
---|
499 | 511 | lookAtCB.addItemListener(this); |
---|
500 | 512 | |
---|
501 | 513 | oe.aConstraints.gridx += 1; |
---|
502 | 514 | oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints); |
---|
| 515 | + trackCB.setToolTipText("Enable tracking"); |
---|
503 | 516 | trackCB.addItemListener(this); |
---|
504 | 517 | |
---|
505 | 518 | oe.aConstraints.gridx += 1; |
---|
506 | 519 | oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints); |
---|
| 520 | + screenfitButton.setToolTipText("Screen fit"); |
---|
507 | 521 | screenfitButton.addActionListener(this); |
---|
508 | 522 | oe.aConstraints.gridx += 1; |
---|
509 | 523 | // oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints); |
---|
.. | .. |
---|
511 | 525 | // oe.aConstraints.gridx += 1; |
---|
512 | 526 | oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints); |
---|
513 | 527 | snapobjectButton.addActionListener(this); |
---|
| 528 | + snapobjectButton.setToolTipText("Snap Object"); |
---|
514 | 529 | oe.aConstraints.gridx += 1; |
---|
515 | 530 | |
---|
516 | 531 | //aConstraints.gridx = 0; |
---|
.. | .. |
---|
519 | 534 | oe.aConstraints.gridwidth = 1; |
---|
520 | 535 | |
---|
521 | 536 | oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints); |
---|
| 537 | + flashSelectionButton.setToolTipText("Show selection"); |
---|
522 | 538 | flashSelectionButton.addActionListener(this); |
---|
523 | 539 | |
---|
524 | 540 | oe.toolbarPanel.add(new cButton(" ", false)); |
---|
.. | .. |
---|
529 | 545 | |
---|
530 | 546 | // |
---|
531 | 547 | oe.toolbarPanel.add(twoButton = new cButton(" |+| ")); //, oe.aConstraints); |
---|
| 548 | + twoButton.setToolTipText("Show center view only"); |
---|
532 | 549 | twoButton.addActionListener(this); |
---|
533 | 550 | oe.toolbarPanel.add(fourButton = new cButton("+|| ")); //, oe.aConstraints); |
---|
534 | 551 | fourButton.addActionListener(this); |
---|
| 552 | + fourButton.setToolTipText("Show left panel only"); |
---|
535 | 553 | oe.toolbarPanel.add(sixButton = new cButton("+|+| ")); //, oe.aConstraints); |
---|
| 554 | + sixButton.setToolTipText("2-column layout left"); |
---|
536 | 555 | sixButton.addActionListener(this); |
---|
537 | 556 | oe.toolbarPanel.add(threeButton = new cButton(" |+|+")); //, oe.aConstraints); |
---|
| 557 | + threeButton.setToolTipText("2-column layout right"); |
---|
538 | 558 | threeButton.addActionListener(this); |
---|
539 | 559 | oe.toolbarPanel.add(sevenButton = new cButton("+|+|+")); //, oe.aConstraints); |
---|
| 560 | + sevenButton.setToolTipText("3-column layout"); |
---|
540 | 561 | sevenButton.addActionListener(this); |
---|
541 | 562 | // |
---|
542 | 563 | |
---|
543 | | - oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints); |
---|
| 564 | + oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints); |
---|
| 565 | + rootButton.setToolTipText("Edit object in new tab"); |
---|
544 | 566 | rootButton.addActionListener(this); |
---|
545 | 567 | oe.aConstraints.gridx += 1; |
---|
546 | 568 | oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints); |
---|
| 569 | + closeButton.setToolTipText("Close tab"); |
---|
547 | 570 | closeButton.addActionListener(this); |
---|
548 | 571 | //oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints); |
---|
549 | 572 | //clearButton.addActionListener(this); |
---|
.. | .. |
---|
676 | 699 | JCheckBox fastCB; |
---|
677 | 700 | JCheckBox slowCB; |
---|
678 | 701 | JCheckBox boxCB; |
---|
| 702 | + JCheckBox zoomBoxCB; |
---|
679 | 703 | JCheckBox trackCB; |
---|
680 | 704 | JCheckBox smoothfocusCB; |
---|
681 | 705 | // JCheckBox speakerMocapCB; |
---|
.. | .. |
---|
755 | 779 | Recompile(); |
---|
756 | 780 | cameraView.repaint(); |
---|
757 | 781 | // refreshContents(); |
---|
| 782 | + } |
---|
| 783 | + else if(e.getSource() == zoomBoxCB) |
---|
| 784 | + { |
---|
| 785 | + cameraView.ToggleZoomBoxMode(); |
---|
758 | 786 | } |
---|
759 | 787 | else if(e.getSource() == smoothfocusCB) |
---|
760 | 788 | { |
---|
.. | .. |
---|
1783 | 1811 | if (event.getSource() == computeAOItem) |
---|
1784 | 1812 | { |
---|
1785 | 1813 | Globals.drawMode = CameraPane.OCCLUSION; |
---|
1786 | | - CameraPane.theRenderer.repaint(); |
---|
| 1814 | + Globals.theRenderer.repaint(); |
---|
1787 | 1815 | } else |
---|
1788 | 1816 | if (event.getSource() == recompileItem) |
---|
1789 | 1817 | { |
---|
.. | .. |
---|
2094 | 2122 | if (content instanceof cGroup && ((cGroup)content).transientlink ) |
---|
2095 | 2123 | content = ((cGroup)content).get(0); |
---|
2096 | 2124 | |
---|
2097 | | - CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR)); |
---|
| 2125 | + Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR)); |
---|
2098 | 2126 | for (int i=0; i<group.selection.size(); i++) |
---|
2099 | 2127 | { |
---|
2100 | 2128 | boolean random = CameraPane.RANDOM; |
---|
.. | .. |
---|
2103 | 2131 | // group.selection.get(i).setMasterThis(content); // should be identity |
---|
2104 | 2132 | CameraPane.RANDOM = random; |
---|
2105 | 2133 | } |
---|
2106 | | - CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR)); |
---|
| 2134 | + Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR)); |
---|
2107 | 2135 | refreshContents(); |
---|
2108 | 2136 | } |
---|
2109 | 2137 | } else |
---|
.. | .. |
---|
2911 | 2939 | } |
---|
2912 | 2940 | |
---|
2913 | 2941 | copy = group; |
---|
2914 | | - //CameraPane.theRenderer.object = group; |
---|
| 2942 | + //Globals.theRenderer.object = group; |
---|
2915 | 2943 | if(!useclient) |
---|
2916 | 2944 | { |
---|
2917 | 2945 | cameraView.renderCamera = radio.camera; |
---|
.. | .. |
---|
3473 | 3501 | String pigment = Object3D.GetPigment(tex); |
---|
3474 | 3502 | //String bump = Object3D.GetBump(tex); |
---|
3475 | 3503 | |
---|
3476 | | - com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres); |
---|
| 3504 | + com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres); |
---|
3477 | 3505 | |
---|
3478 | 3506 | double s = v.s; |
---|
3479 | 3507 | |
---|
.. | .. |
---|
3774 | 3802 | group.selection.RelinkToSupport(); // july 2014 |
---|
3775 | 3803 | System.out.println("DONE."); |
---|
3776 | 3804 | refreshContents(); |
---|
3777 | | - CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR)); |
---|
| 3805 | + Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR)); |
---|
3778 | 3806 | } |
---|
3779 | 3807 | |
---|
3780 | 3808 | void ReduceMesh(boolean reduction34) |
---|
.. | .. |
---|
4066 | 4094 | // a camera |
---|
4067 | 4095 | { |
---|
4068 | 4096 | CameraPane.camerachangeframe = 0; // don't refuse it |
---|
4069 | | - CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent()); |
---|
4070 | | - // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera; |
---|
4071 | | - // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera; |
---|
| 4097 | + Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent()); |
---|
| 4098 | + // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera; |
---|
| 4099 | + // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera; |
---|
4072 | 4100 | } |
---|
4073 | 4101 | |
---|
4074 | 4102 | refreshContents(); |
---|