From 91106535bc5aa5e67cbb02a67cf6de1519cba0e4 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 22 Apr 2019 13:27:24 -0400
Subject: [PATCH] iCameraPane refactoring phase 1.
---
ObjEditor.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index 751955c..884881a 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -31,6 +31,9 @@
boolean timeline;
boolean wasFullScreen;
+ GroupEditor callee;
+ JFrame frame;
+
// SCRIPT
transient JFrame textpanel = null;
@@ -127,8 +130,7 @@
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"));
@@ -1369,7 +1371,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);
@@ -3136,7 +3139,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)
--
Gitblit v1.6.2