From f23e09019d161b02d566ffe312fdc553459fb954 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sun, 28 Apr 2019 16:14:58 -0400
Subject: [PATCH] Grafreed 1.0.1 Option panel
---
ObjEditor.java | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index 751955c..d819144 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -31,6 +31,9 @@
boolean timeline;
boolean wasFullScreen;
+ GroupEditor callee;
+ JFrame frame;
+
// SCRIPT
transient JFrame textpanel = null;
@@ -121,14 +124,13 @@
void keyPressed(int key, int modifiers)
{
System.out.println("KEY PRESSED");
- CameraPane.theRenderer.keyPressed(key, modifiers);
+ Globals.theRenderer.keyPressed(key, modifiers);
}
*/
static GridBagConstraints aConstraints;
static GridBagConstraints aWindowConstraints;
- GroupEditor callee;
- JFrame frame;
+
static int GRIDWIDTH = 100; // 4;
public void closeUI()
@@ -309,7 +311,7 @@
toggleTextureItem.setState(CameraPane.textureon);
cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
toggleLiveItem.addItemListener(this);
- toggleLiveItem.setState(CameraPane.isLIVE());
+ toggleLiveItem.setState(Globals.isLIVE());
cameraMenu.add(stepItem = new MenuItem("Step"));
stepItem.addActionListener(this);
// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
@@ -1290,6 +1292,9 @@
optionsPanel = new JPanel(new GridBagLayout());
optionsPanel.setName("Options");
+
+ AddOptions(optionsPanel, aConstraints);
+
scenePanel.add(optionsPanel);
@@ -1369,7 +1374,8 @@
//worldPane.add(bigPanel);
//worldPane.add(worldPanel);
/**/
- frame.getContentPane().add(/*"Center",*/framePanel);
+ //frame.getContentPane().add(/*"Center",*/framePanel);
+ frame.add(/*"Center",*/framePanel);
//frame.getContentPane().add(/*"Center",*/ worldPane);
// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
@@ -1390,6 +1396,10 @@
});
}
+ void AddOptions(JPanel panel, GridBagConstraints constraints)
+ {
+ }
+
JTree GetTree()
{
return objEditor.jTree;
@@ -3136,7 +3146,8 @@
objEditor.refreshContents();
} else if (event.getSource() == stepItem)
{
- cameraView.ONESTEP = true;
+ //cameraView.ONESTEP = true;
+ Globals.ONESTEP = true;
cameraView.repaint();
return;
} else if (event.getSource() == stepButton)
@@ -3293,25 +3304,25 @@
void ToggleAnimation()
{
- if (!CameraPane.ANIMATION)
+ if (!Globals.ANIMATION)
{
FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
browser.show();
String filename = browser.getFile();
if (filename != null && filename.length() > 0)
{
- CameraPane.filename = browser.getDirectory() + filename;
+ Globals.filename = browser.getDirectory() + filename;
//CameraPane.framecount = 0;
- CameraPane.imagecount = 0;
+ Globals.imagecount = 0;
- CameraPane.ANIMATION ^= true;
+ Globals.ANIMATION ^= true;
GrafreeD.wav.cursor = 0;
GrafreeD.wav.loop = 0;
}
} else
{
- CameraPane.ANIMATION ^= true;
+ Globals.ANIMATION ^= true;
}
}
--
Gitblit v1.6.2