blame | history | patch | commit | commitdiff
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"));
....@@ -1189,6 +1191,13 @@
11891191 	timelinePanel = new JPanel(new BorderLayout());
11901192         timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
11911193 
1194
+        cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1195
+        cameraPanel.setContinuousLayout(true);
1196
+        cameraPanel.setOneTouchExpandable(true);
1197
+//        cameraPanel.setDividerLocation(0.9);
1198
+//        cameraPanel.setDividerSize(9);
1199
+        cameraPanel.setResizeWeight(1.0);
1200
+        
11921201         centralPanel.add(cameraView);
11931202         //frame.setJMenuBar(timelineMenubar);
11941203         //centralPanel.add(timelinePanel);
....@@ -1283,6 +1292,9 @@
12831292         optionsPanel = new JPanel(new GridBagLayout());
12841293 
12851294         optionsPanel.setName("Options");
1295
+        
1296
+        AddOptions(optionsPanel, aConstraints);
1297
+        
12861298         scenePanel.add(optionsPanel);
12871299 
12881300 
....@@ -1362,7 +1374,8 @@
13621374         //worldPane.add(bigPanel);
13631375         //worldPane.add(worldPanel);
13641376                 /**/
1365
-        frame.getContentPane().add(/*"Center",*/framePanel);
1377
+        //frame.getContentPane().add(/*"Center",*/framePanel);
1378
+        frame.add(/*"Center",*/framePanel);
13661379         //frame.getContentPane().add(/*"Center",*/ worldPane);
13671380 
13681381 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
....@@ -1383,6 +1396,10 @@
13831396         });
13841397     }
13851398 
1399
+    void AddOptions(JPanel panel, GridBagConstraints constraints)
1400
+    {
1401
+    }
1402
+    
13861403     JTree GetTree()
13871404     {
13881405         return objEditor.jTree;
....@@ -2996,7 +3013,8 @@
29963013             if (timeline)
29973014             {
29983015                 centralPanel.remove(cameraView);
2999
-                centralPanel.add(timelinePanel);
3016
+                cameraPanel.add(cameraView);
3017
+                centralPanel.add(cameraPanel);
30003018                 frame.setJMenuBar(timelineMenubar);
30013019                 wasFullScreen = CameraPane.FULLSCREEN;
30023020                 if (!CameraPane.FULLSCREEN)
....@@ -3005,7 +3023,7 @@
30053023             }
30063024             else
30073025             {
3008
-                centralPanel.remove(timelinePanel);
3026
+                centralPanel.remove(cameraPanel);
30093027                 centralPanel.add(cameraView);
30103028                 frame.setJMenuBar(null);
30113029                 if (!wasFullScreen)
....@@ -3128,7 +3146,8 @@
31283146             objEditor.refreshContents();
31293147         } else if (event.getSource() == stepItem)
31303148         {
3131
-            cameraView.ONESTEP = true;
3149
+            //cameraView.ONESTEP = true;
3150
+            Globals.ONESTEP = true;
31323151             cameraView.repaint();
31333152             return;
31343153         } else if (event.getSource() == stepButton)
....@@ -3285,25 +3304,25 @@
32853304 
32863305     void ToggleAnimation()
32873306     {
3288
-        if (!CameraPane.ANIMATION)
3307
+        if (!Globals.ANIMATION)
32893308         {
32903309             FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
32913310             browser.show();
32923311             String filename = browser.getFile();
32933312             if (filename != null && filename.length() > 0)
32943313             {
3295
-                CameraPane.filename = browser.getDirectory() + filename;
3314
+                Globals.filename = browser.getDirectory() + filename;
32963315                 //CameraPane.framecount = 0;
3297
-                CameraPane.imagecount = 0;
3316
+                Globals.imagecount = 0;
32983317 
3299
-                CameraPane.ANIMATION ^= true;
3318
+                Globals.ANIMATION ^= true;
33003319 
33013320                 GrafreeD.wav.cursor = 0;
33023321                 GrafreeD.wav.loop = 0;
33033322             }
33043323         } else
33053324         {
3306
-            CameraPane.ANIMATION ^= true;
3325
+            Globals.ANIMATION ^= true;
33073326         }
33083327     }
33093328 
....@@ -4533,6 +4552,7 @@
45334552     JPanel bigThree;
45344553     JTabbedPane scenePanel;
45354554     JPanel centralPanel;
4555
+    JSplitPane cameraPanel;
45364556     JPanel timelinePanel;
45374557     JMenuBar timelineMenubar;
45384558     JSplitPane framePanel;