From 20c1a07b76c39462594aedfedfe6e6adb17cd552 Mon Sep 17 00:00:00 2001 From: Normand Briere <nbriere@noware.ca> Date: Wed, 01 May 2019 14:27:01 -0400 Subject: [PATCH] Fix animation and fast mode. --- GroupEditor.java | 22 +++++++--------------- 1 files changed, 7 insertions(+), 15 deletions(-) diff --git a/GroupEditor.java b/GroupEditor.java index 93258aa..9679b9d 100644 --- a/GroupEditor.java +++ b/GroupEditor.java @@ -440,6 +440,10 @@ liveCB.setToolTipText("Enabled animation"); liveCB.addItemListener(this); + oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints); + fastCB.setToolTipText("Fast mode"); + fastCB.addItemListener(this); + oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints); trackCB.setToolTipText("Enable tracking"); trackCB.addItemListener(this); @@ -587,39 +591,29 @@ void AddOptions(cGridBag panel) //, GridBagConstraints constraints) { - //constraints.gridx = 0; - //constraints.gridy = 0; - panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints); - fastCB.setToolTipText("Fast mode"); - fastCB.addItemListener(this); - //constraints.gridy += 1; panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints); supportCB.setToolTipText("Enabled rigging"); supportCB.addItemListener(this); - // constraints.gridy += 1; // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints); // localCB.addItemListener(this); - //constraints.gridy += 1; panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints); crowdCB.setToolTipText("Used for crowds"); crowdCB.addItemListener(this); - //constraints.gridy += 1; panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints); smoothCB.setToolTipText("Snapping delay"); smoothCB.addItemListener(this); - //constraints.gridy += 1; panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints); slowCB.setToolTipText("Smooth interpolation"); slowCB.addItemListener(this); - //constraints.gridy += 1; + panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints); boxCB.setToolTipText("Display bounding boxes"); boxCB.addItemListener(this); - //constraints.gridy += 1; + panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints); zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel"); zoomBoxCB.addItemListener(this); @@ -648,11 +642,9 @@ //panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints); // debugCB.addItemListener(this); - //constraints.gridy += 1; panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints); oeilCB.addItemListener(this); - //constraints.gridy += 1; panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints); lookAtCB.setToolTipText("Look-at target"); lookAtCB.addItemListener(this); @@ -1110,7 +1102,7 @@ { menu.add(animationItem = new CheckboxMenuItem("Animation...")); animationItem.addItemListener(this); - animationItem.setState(CameraPane.ANIMATION); + animationItem.setState(Globals.ANIMATION); menu.add("-"); parseverticesItem = menu.add(new MenuItem("Multiplicity")); -- Gitblit v1.6.2