Refactoring GelGL.

Normand Briere

2019-04-23 ec9d13e42c9c8674739acefb0769a9273a1048c9

 ObjEditor.java
..
..
@@ -31,6 +31,9 @@
31
31
         boolean timeline;
32
32
         boolean wasFullScreen;
33
33
 
34
+    GroupEditor callee;
35
+    JFrame frame;
36
+    
34
37
     // SCRIPT
35
38
     
36
39
     transient JFrame textpanel = null;
..
..
@@ -121,14 +124,13 @@
121
124
     void keyPressed(int key, int modifiers)
122
125
     {
123
126
     System.out.println("KEY PRESSED");
124
-    CameraPane.theRenderer.keyPressed(key, modifiers);
127
+    Globals.theRenderer.keyPressed(key, modifiers);
125
128
     }
126
129
      */
127
130
 
128
131
     static GridBagConstraints aConstraints;
129
132
     static GridBagConstraints aWindowConstraints;
130
-    GroupEditor callee;
131
-    JFrame frame;
133
+
132
134
     static int GRIDWIDTH = 100; // 4;
133
135
 
134
136
     public void closeUI()
..
..
@@ -309,7 +311,7 @@
309
311
         toggleTextureItem.setState(CameraPane.textureon);
310
312
         cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
311
313
         toggleLiveItem.addItemListener(this);
312
-        toggleLiveItem.setState(CameraPane.isLIVE());
314
+        toggleLiveItem.setState(Globals.isLIVE());
313
315
         cameraMenu.add(stepItem = new MenuItem("Step"));
314
316
         stepItem.addActionListener(this);
315
317
 //		cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
..
..
@@ -1369,7 +1371,8 @@
1369
1371
         //worldPane.add(bigPanel);
1370
1372
         //worldPane.add(worldPanel);
1371
1373
                 /**/
1372
-        frame.getContentPane().add(/*"Center",*/framePanel);
1374
+        //frame.getContentPane().add(/*"Center",*/framePanel);
1375
+        frame.add(/*"Center",*/framePanel);
1373
1376
         //frame.getContentPane().add(/*"Center",*/ worldPane);
1374
1377
 
1375
1378
 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
..
..
@@ -3136,7 +3139,8 @@
3136
3139
             objEditor.refreshContents();
3137
3140
         } else if (event.getSource() == stepItem)
3138
3141
         {
3139
-            cameraView.ONESTEP = true;
3142
+            //cameraView.ONESTEP = true;
3143
+            Globals.ONESTEP = true;
3140
3144
             cameraView.repaint();
3141
3145
             return;
3142
3146
         } else if (event.getSource() == stepButton)
..
..
@@ -3293,25 +3297,25 @@
3293
3297
 
3294
3298
     void ToggleAnimation()
3295
3299
     {
3296
-        if (!CameraPane.ANIMATION)
3300
+        if (!Globals.ANIMATION)
3297
3301
         {
3298
3302
             FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3299
3303
             browser.show();
3300
3304
             String filename = browser.getFile();
3301
3305
             if (filename != null && filename.length() > 0)
3302
3306
             {
3303
-                CameraPane.filename = browser.getDirectory() + filename;
3307
+                Globals.filename = browser.getDirectory() + filename;
3304
3308
                 //CameraPane.framecount = 0;
3305
-                CameraPane.imagecount = 0;
3309
+                Globals.imagecount = 0;
3306
3310
 
3307
-                CameraPane.ANIMATION ^= true;
3311
+                Globals.ANIMATION ^= true;
3308
3312
 
3309
3313
                 GrafreeD.wav.cursor = 0;
3310
3314
                 GrafreeD.wav.loop = 0;
3311
3315
             }
3312
3316
         } else
3313
3317
         {
3314
-            CameraPane.ANIMATION ^= true;
3318
+            Globals.ANIMATION ^= true;
3315
3319
         }
3316
3320
     }
3317
3321