Normand Briere
2019-04-28 f23e09019d161b02d566ffe312fdc553459fb954
ObjEditor.java
....@@ -31,6 +31,9 @@
3131 boolean timeline;
3232 boolean wasFullScreen;
3333
34
+ GroupEditor callee;
35
+ JFrame frame;
36
+
3437 // SCRIPT
3538
3639 transient JFrame textpanel = null;
....@@ -121,14 +124,13 @@
121124 void keyPressed(int key, int modifiers)
122125 {
123126 System.out.println("KEY PRESSED");
124
- CameraPane.theRenderer.keyPressed(key, modifiers);
127
+ Globals.theRenderer.keyPressed(key, modifiers);
125128 }
126129 */
127130
128131 static GridBagConstraints aConstraints;
129132 static GridBagConstraints aWindowConstraints;
130
- GroupEditor callee;
131
- JFrame frame;
133
+
132134 static int GRIDWIDTH = 100; // 4;
133135
134136 public void closeUI()
....@@ -309,7 +311,7 @@
309311 toggleTextureItem.setState(CameraPane.textureon);
310312 cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
311313 toggleLiveItem.addItemListener(this);
312
- toggleLiveItem.setState(CameraPane.isLIVE());
314
+ toggleLiveItem.setState(Globals.isLIVE());
313315 cameraMenu.add(stepItem = new MenuItem("Step"));
314316 stepItem.addActionListener(this);
315317 // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
....@@ -1290,6 +1292,9 @@
12901292 optionsPanel = new JPanel(new GridBagLayout());
12911293
12921294 optionsPanel.setName("Options");
1295
+
1296
+ AddOptions(optionsPanel, aConstraints);
1297
+
12931298 scenePanel.add(optionsPanel);
12941299
12951300
....@@ -1369,7 +1374,8 @@
13691374 //worldPane.add(bigPanel);
13701375 //worldPane.add(worldPanel);
13711376 /**/
1372
- frame.getContentPane().add(/*"Center",*/framePanel);
1377
+ //frame.getContentPane().add(/*"Center",*/framePanel);
1378
+ frame.add(/*"Center",*/framePanel);
13731379 //frame.getContentPane().add(/*"Center",*/ worldPane);
13741380
13751381 // aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
....@@ -1390,6 +1396,10 @@
13901396 });
13911397 }
13921398
1399
+ void AddOptions(JPanel panel, GridBagConstraints constraints)
1400
+ {
1401
+ }
1402
+
13931403 JTree GetTree()
13941404 {
13951405 return objEditor.jTree;
....@@ -3136,7 +3146,8 @@
31363146 objEditor.refreshContents();
31373147 } else if (event.getSource() == stepItem)
31383148 {
3139
- cameraView.ONESTEP = true;
3149
+ //cameraView.ONESTEP = true;
3150
+ Globals.ONESTEP = true;
31403151 cameraView.repaint();
31413152 return;
31423153 } else if (event.getSource() == stepButton)
....@@ -3293,25 +3304,25 @@
32933304
32943305 void ToggleAnimation()
32953306 {
3296
- if (!CameraPane.ANIMATION)
3307
+ if (!Globals.ANIMATION)
32973308 {
32983309 FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
32993310 browser.show();
33003311 String filename = browser.getFile();
33013312 if (filename != null && filename.length() > 0)
33023313 {
3303
- CameraPane.filename = browser.getDirectory() + filename;
3314
+ Globals.filename = browser.getDirectory() + filename;
33043315 //CameraPane.framecount = 0;
3305
- CameraPane.imagecount = 0;
3316
+ Globals.imagecount = 0;
33063317
3307
- CameraPane.ANIMATION ^= true;
3318
+ Globals.ANIMATION ^= true;
33083319
33093320 GrafreeD.wav.cursor = 0;
33103321 GrafreeD.wav.loop = 0;
33113322 }
33123323 } else
33133324 {
3314
- CameraPane.ANIMATION ^= true;
3325
+ Globals.ANIMATION ^= true;
33153326 }
33163327 }
33173328