Grafreed 1.0.1 Option panel

Normand Briere

2019-04-28 f23e09019d161b02d566ffe312fdc553459fb954

 ObjEditor.java
..
..
@@ -124,7 +124,7 @@
124
124
     void keyPressed(int key, int modifiers)
125
125
     {
126
126
     System.out.println("KEY PRESSED");
127
-    CameraPane.theRenderer.keyPressed(key, modifiers);
127
+    Globals.theRenderer.keyPressed(key, modifiers);
128
128
     }
129
129
      */
130
130
 
..
..
@@ -311,7 +311,7 @@
311
311
         toggleTextureItem.setState(CameraPane.textureon);
312
312
         cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
313
313
         toggleLiveItem.addItemListener(this);
314
-        toggleLiveItem.setState(CameraPane.isLIVE());
314
+        toggleLiveItem.setState(Globals.isLIVE());
315
315
         cameraMenu.add(stepItem = new MenuItem("Step"));
316
316
         stepItem.addActionListener(this);
317
317
 //		cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
..
..
@@ -1292,6 +1292,9 @@
1292
1292
         optionsPanel = new JPanel(new GridBagLayout());
1293
1293
 
1294
1294
         optionsPanel.setName("Options");
1295
+        
1296
+        AddOptions(optionsPanel, aConstraints);
1297
+        
1295
1298
         scenePanel.add(optionsPanel);
1296
1299
 
1297
1300
 
..
..
@@ -1393,6 +1396,10 @@
1393
1396
         });
1394
1397
     }
1395
1398
 
1399
+    void AddOptions(JPanel panel, GridBagConstraints constraints)
1400
+    {
1401
+    }
1402
+    
1396
1403
     JTree GetTree()
1397
1404
     {
1398
1405
         return objEditor.jTree;
..
..
@@ -3139,7 +3146,8 @@
3139
3146
             objEditor.refreshContents();
3140
3147
         } else if (event.getSource() == stepItem)
3141
3148
         {
3142
-            cameraView.ONESTEP = true;
3149
+            //cameraView.ONESTEP = true;
3150
+            Globals.ONESTEP = true;
3143
3151
             cameraView.repaint();
3144
3152
             return;
3145
3153
         } else if (event.getSource() == stepButton)
..
..
@@ -3296,25 +3304,25 @@
3296
3304
 
3297
3305
     void ToggleAnimation()
3298
3306
     {
3299
-        if (!CameraPane.ANIMATION)
3307
+        if (!Globals.ANIMATION)
3300
3308
         {
3301
3309
             FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3302
3310
             browser.show();
3303
3311
             String filename = browser.getFile();
3304
3312
             if (filename != null && filename.length() > 0)
3305
3313
             {
3306
-                CameraPane.filename = browser.getDirectory() + filename;
3314
+                Globals.filename = browser.getDirectory() + filename;
3307
3315
                 //CameraPane.framecount = 0;
3308
-                CameraPane.imagecount = 0;
3316
+                Globals.imagecount = 0;
3309
3317
 
3310
-                CameraPane.ANIMATION ^= true;
3318
+                Globals.ANIMATION ^= true;
3311
3319
 
3312
3320
                 GrafreeD.wav.cursor = 0;
3313
3321
                 GrafreeD.wav.loop = 0;
3314
3322
             }
3315
3323
         } else
3316
3324
         {
3317
-            CameraPane.ANIMATION ^= true;
3325
+            Globals.ANIMATION ^= true;
3318
3326
         }
3319
3327
     }
3320
3328