From 631719825b865aaf9fa1cb124d9fc5bd9dd78bd4 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sun, 05 May 2019 10:27:02 -0400
Subject: [PATCH] Disabled timer for instant selection.
---
ObjEditor.java | 113 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 68 insertions(+), 45 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index b81d8f2..9412bce 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -309,44 +309,61 @@
//normalLensItem.addActionListener(this);
cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
revertCameraItem.addActionListener(this);
- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
- toggleTimelineItem.addItemListener(this);
+
cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
toggleFullScreenItem.addItemListener(this);
toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
cameraMenu.add("-");
+
cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
toggleTextureItem.addItemListener(this);
toggleTextureItem.setState(CameraPane.textureon);
- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
- toggleLiveItem.addItemListener(this);
- toggleLiveItem.setState(Globals.isLIVE());
- cameraMenu.add(stepItem = new MenuItem("Step"));
- stepItem.addActionListener(this);
-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
-// toggleDLItem.addItemListener(this);
-// toggleDLItem.setState(false);
- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
- toggleRenderItem.addItemListener(this);
- toggleRenderItem.setState(!CameraPane.frozen);
- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
- toggleDebugItem.addItemListener(this);
- toggleDebugItem.setState(CameraPane.DEBUG);
- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
- toggleFrustumItem.addItemListener(this);
- toggleFrustumItem.setState(CameraPane.FRUSTUM);
- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
- toggleFootContactItem.addItemListener(this);
- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
- toggleRandomItem.addItemListener(this);
- toggleRandomItem.setState(CameraPane.RANDOM);
+
+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
+ toggleSwitchItem.addItemListener(this);
+ toggleSwitchItem.setState(CameraPane.SWITCH);
+
cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
toggleHandleItem.addItemListener(this);
toggleHandleItem.setState(CameraPane.HANDLES);
+
cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
togglePaintItem.addItemListener(this);
togglePaintItem.setState(CameraPane.PAINTMODE);
+
+ if (Globals.ADVANCED)
+ {
+ cameraMenu.add("-");
+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
+ toggleLiveItem.addItemListener(this);
+ toggleLiveItem.setState(Globals.isLIVE());
+
+ cameraMenu.add(stepItem = new MenuItem("Step"));
+ stepItem.addActionListener(this);
+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
+ // toggleDLItem.addItemListener(this);
+ // toggleDLItem.setState(false);
+
+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
+ toggleRenderItem.addItemListener(this);
+ toggleRenderItem.setState(!CameraPane.frozen);
+
+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
+ toggleDebugItem.addItemListener(this);
+ toggleDebugItem.setState(CameraPane.DEBUG);
+
+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
+ toggleFrustumItem.addItemListener(this);
+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
+
+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
+ toggleFootContactItem.addItemListener(this);
+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
+
+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
+ toggleTimelineItem.addItemListener(this);
+ }
+
// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
// toggleRootItem.addItemListener(this);
// toggleRootItem.setState(false);
@@ -1313,7 +1330,7 @@
scrollpane.addMouseWheelListener(this); // Default not fast enough
/*JTabbedPane*/ scenePanel = new cGridBag();
- scenePanel.preferredWidth = 7;
+ scenePanel.preferredWidth = 6;
JTabbedPane tabbedPane = new JTabbedPane();
tabbedPane.add(scrollpane);
@@ -1419,8 +1436,8 @@
// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
- frame.setSize(1024, 768);
- frame.show();
+ frame.setSize(1280, 860);
+ frame.setVisible(true);
gridPanel.setDividerLocation(1.0);
@@ -1469,9 +1486,12 @@
editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
clearMaterialButton.setToolTipText("Clear material");
- editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
- editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
- editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
+ if (Globals.ADVANCED)
+ {
+ editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
+ }
editBar.preferredHeight = 15;
@@ -1740,12 +1760,15 @@
opacityPowerField.addChangeListener(this);
/**/
- resetSlidersButton.addActionListener(this);
clearMaterialButton.addActionListener(this);
createMaterialButton.addActionListener(this);
-
- propagateToggle.addItemListener(this);
- multiplyToggle.addItemListener(this);
+
+ if (Globals.ADVANCED)
+ {
+ resetSlidersButton.addActionListener(this);
+ propagateToggle.addItemListener(this);
+ multiplyToggle.addItemListener(this);
+ }
}
void DropFile(java.io.File[] files, boolean textures)
@@ -1916,7 +1939,7 @@
//? flashIt = false;
CameraPane pane = (CameraPane) cameraView;
- pane.clickStart(location.x, location.y, 0);
+ pane.clickStart(location.x, location.y, 0, 0);
pane.clickEnd(location.x, location.y, 0, true);
if (group.selection.size() == 1)
@@ -2377,7 +2400,7 @@
{
/**/
FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
- browser.show();
+ browser.setVisible(true);
String filename = browser.getFile();
if (filename != null && filename.length() > 0)
{
@@ -2737,7 +2760,8 @@
return;
}
- multiplyToggle.setSelected(mat.multiply);
+ if (multiplyToggle != null)
+ multiplyToggle.setSelected(mat.multiply);
assert (object.projectedVertices != null);
@@ -2952,7 +2976,7 @@
frame.validate();
return;
- } else if (event.getSource() == toggleRandomItem)
+ } else if (event.getSource() == toggleSwitchItem)
{
cameraView.ToggleRandom();
cameraView.repaint();
@@ -3253,7 +3277,6 @@
callee.refreshContents();
} else
{
- new Exception().printStackTrace();
System.exit(0);
}
}
@@ -3283,7 +3306,7 @@
void CreateMaterial()
{
//copy.ClearMaterial(); // PATCH
- copy.CreateMaterialS(multiplyToggle.isSelected());
+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
if (copy.selection.size() > 0)
//SetMaterial(copy);
{
@@ -3342,11 +3365,11 @@
{
copy.ResetBlockLoop(); // temporary problem
- boolean random = CameraPane.RANDOM;
- CameraPane.RANDOM = false; // parse everything
+ boolean random = CameraPane.SWITCH;
+ CameraPane.SWITCH = false; // parse everything
copy.ResetDisplayList();
copy.HardTouch();
- CameraPane.RANDOM = random;
+ CameraPane.SWITCH = random;
}
// public void applySelf()
@@ -4446,7 +4469,7 @@
CheckboxMenuItem toggleFootContactItem;
CheckboxMenuItem toggleDLItem;
CheckboxMenuItem toggleTextureItem;
- CheckboxMenuItem toggleRandomItem;
+ CheckboxMenuItem toggleSwitchItem;
CheckboxMenuItem toggleRootItem;
CheckboxMenuItem animationItem;
CheckboxMenuItem toggleHandleItem;
--
Gitblit v1.6.2