blame | history | patch | commit | commitdiff
Normand Briere
2018-10-27 d34fd9341c61d13677e029cb187d4dacff5e44ea 
 ObjEditor.java
....@@ -28,6 +28,8 @@
2828         iSendInfo
2929 //KeyListener
3030 {
31
+        boolean timeline;
32
+        boolean wasFullScreen;
3133 
3234     // SCRIPT
3335     
....@@ -238,7 +240,7 @@
238240         //if (!isDisplayable())
239241         //setUndecorated(true);
240242 
241
-        System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
243
+        //System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
242244         client = inClient;
243245         copy = localCopy;
244246         copy.editWindow = this;
....@@ -292,9 +294,11 @@
292294         //normalLensItem.addActionListener(this);
293295         cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
294296         revertCameraItem.addActionListener(this);
295
-        cameraMenu.add(toggleFullItem = new CheckboxMenuItem("Full Screen"));
296
-        toggleFullItem.addItemListener(this);
297
-        toggleFullItem.setState(CameraPane.FULLSCREEN);
297
+        cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
298
+        toggleTimelineItem.addItemListener(this);
299
+        cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
300
+        toggleFullScreenItem.addItemListener(this);
301
+        toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
298302         cameraMenu.add("-");
299303         cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
300304         toggleTextureItem.addItemListener(this);
....@@ -593,6 +597,22 @@
593597             System.err.println("Couldn't insert initial text into text pane.");
594598         }
595599     }
600
+
601
+        void ToggleFullScreen()
602
+        {
603
+                if (CameraPane.FULLSCREEN)
604
+                {
605
+                    frame.getContentPane().remove(/*"Center",*/bigThree);
606
+                    framePanel.add(bigThree);
607
+                    frame.getContentPane().add(/*"Center",*/framePanel);
608
+                } else
609
+                {
610
+                    frame.getContentPane().remove(/*"Center",*/framePanel);
611
+                    framePanel.remove(bigThree);
612
+                    frame.getContentPane().add(/*"Center",*/bigThree);
613
+                }
614
+                cameraView.ToggleFullScreen();
615
+        }
596616 
597617     private JTextArea createTextPane()
598618     {
....@@ -1158,10 +1178,14 @@
11581178         //JPanel worldPanel =
11591179         //		new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
11601180         //worldPanel.setName("World");
1161
-		/*JPanel*/ cameraPanel =
1162
-                new JPanel(new BorderLayout());
1163
-        cameraPanel.add(cameraView);
1181
+	centralPanel = new JPanel(new BorderLayout());
1182
+	timelinePanel = new JPanel(new BorderLayout());
1183
+        timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
11641184 
1185
+        centralPanel.add(cameraView);
1186
+        //frame.setJMenuBar(timelineMenubar);
1187
+        //centralPanel.add(timelinePanel);
1188
+        
11651189         //topView.camera = ;
11661190         //frontView.camera = new Camera(2);
11671191         //sideView.camera = new Camera(3);
....@@ -1191,7 +1215,7 @@
11911215         gridPanel.add(cameraView);
11921216         gridPanel.add(XYZPanel);
11931217          */
1194
-        gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, cameraPanel, XYZPanel); //new BorderLayout());
1218
+        gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
11951219         gridPanel.setContinuousLayout(true);
11961220         gridPanel.setOneTouchExpandable(true);
11971221         gridPanel.setDividerLocation(1.0);
....@@ -1244,15 +1268,15 @@
12441268         scrollpane.setWheelScrollingEnabled(true);
12451269         scrollpane.addMouseWheelListener(this); // Default not fast enough
12461270 
1247
-        /*JTabbedPane*/ jtp = new JTabbedPane();
1248
-        jtp.add(scrollpane);
1271
+        /*JTabbedPane*/ scenePanel = new JTabbedPane();
1272
+        scenePanel.add(scrollpane);
12491273 
1250
-        jtp.add(FSPane = new cFileSystemPane(this));
1274
+        scenePanel.add(FSPane = new cFileSystemPane(this));
12511275 
12521276         optionsPanel = new JPanel(new GridBagLayout());
12531277 
12541278         optionsPanel.setName("Options");
1255
-        jtp.add(optionsPanel);
1279
+        scenePanel.add(optionsPanel);
12561280 
12571281 
12581282         /*
....@@ -1275,7 +1299,7 @@
12751299         jtp.add(tree);
12761300          */
12771301 
1278
-        bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, jtp, gridPanel);
1302
+        bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
12791303         bigPanel.setContinuousLayout(true);
12801304         bigPanel.setOneTouchExpandable(true);
12811305         bigPanel.setDividerLocation(0.8);
....@@ -1297,13 +1321,13 @@
12971321         aWindowConstraints.fill = GridBagConstraints.VERTICAL;
12981322         aWindowConstraints.weightx = 0;
12991323         aWindowConstraints.weighty = 1;
1300
-        bigThree.add(jtp, aWindowConstraints);
1324
+        bigThree.add(scenePanel, aWindowConstraints);
13011325         aWindowConstraints.weightx = 1;
13021326         aWindowConstraints.gridwidth = 3;
13031327         //	aConstraints.gridheight = 3;
13041328         aWindowConstraints.gridx = 1;
13051329         aWindowConstraints.fill = GridBagConstraints.BOTH;
1306
-        bigThree.add(cameraPanel, aWindowConstraints);
1330
+        bigThree.add(centralPanel, aWindowConstraints);
13071331         aWindowConstraints.weightx = 0;
13081332         aWindowConstraints.gridx = 4;
13091333         aWindowConstraints.gridwidth = 1;
....@@ -2958,20 +2982,36 @@
29582982             // june 2013           copy.HardTouch();
29592983             cameraView.repaint();
29602984             return;
2961
-        } else if (event.getSource() == toggleFullItem)
2985
+        } else if (event.getSource() == toggleTimelineItem)
29622986         {
2963
-            if (CameraPane.FULLSCREEN)
2987
+            timeline ^= true;
2988
+
2989
+            if (timeline)
29642990             {
2965
-                frame.getContentPane().remove(/*"Center",*/bigThree);
2966
-                framePanel.add(bigThree);
2967
-                frame.getContentPane().add(/*"Center",*/framePanel);
2968
-            } else
2969
-            {
2970
-                frame.getContentPane().remove(/*"Center",*/framePanel);
2971
-                frame.getContentPane().add(/*"Center",*/bigThree);
2991
+                centralPanel.remove(cameraView);
2992
+                centralPanel.add(timelinePanel);
2993
+                frame.setJMenuBar(timelineMenubar);
2994
+                wasFullScreen = CameraPane.FULLSCREEN;
2995
+                if (!CameraPane.FULLSCREEN)
2996
+                    ToggleFullScreen();
2997
+                toggleFullScreenItem.setEnabled(false);
29722998             }
2999
+            else
3000
+            {
3001
+                centralPanel.remove(timelinePanel);
3002
+                centralPanel.add(cameraView);
3003
+                frame.setJMenuBar(null);
3004
+                if (!wasFullScreen)
3005
+                    ToggleFullScreen();
3006
+                toggleFullScreenItem.setEnabled(true);
3007
+            }
3008
+
29733009             frame.validate();
2974
-            cameraView.ToggleFullScreen();
3010
+            return;
3011
+        } else if (event.getSource() == toggleFullScreenItem)
3012
+        {
3013
+            ToggleFullScreen();
3014
+            frame.validate();
29753015 
29763016             return;
29773017         } else if (event.getSource() == toggleRandomItem)
....@@ -3220,9 +3260,9 @@
32203260             cameraView.RevertCamera();
32213261             cameraView.repaint();
32223262             return;
3223
-        } else if (event.getSource() == textureButton)
3224
-        {
3225
-            return; // true;
3263
+//        } else if (event.getSource() == textureButton)
3264
+//        {
3265
+//            return; // true;
32263266         } else // combos...
32273267         if (event.getSource() == texresMenu)
32283268         {
....@@ -3549,8 +3589,11 @@
35493589 
35503590         void SnapObject()
35513591         {
3552
-            Object3D obj = (Object3D)copy.selection.elementAt(0);
3553
-            SnapObject(obj);
3592
+            if (copy.selection.size() > 0)
3593
+            {
3594
+                    Object3D obj = (Object3D)copy.selection.elementAt(0);
3595
+                    SnapObject(obj);
3596
+            }
35543597         }
35553598         
35563599         void SnapObject(Object3D obj)
....@@ -4444,7 +4487,8 @@
44444487     MenuItem revertCameraItem;
44454488     CheckboxMenuItem toggleLiveItem;
44464489     MenuItem stepItem;
4447
-    CheckboxMenuItem toggleFullItem;
4490
+    CheckboxMenuItem toggleFullScreenItem;
4491
+    CheckboxMenuItem toggleTimelineItem;
44484492     CheckboxMenuItem toggleRenderItem;
44494493     CheckboxMenuItem toggleDebugItem;
44504494     CheckboxMenuItem toggleFrustumItem;
....@@ -4471,11 +4515,13 @@
44714515     JSplitPane gridPanel;
44724516     JSplitPane bigPanel;
44734517     JPanel bigThree;
4474
-    JTabbedPane jtp;
4475
-    JPanel cameraPanel;
4518
+    JTabbedPane scenePanel;
4519
+    JPanel centralPanel;
4520
+    JPanel timelinePanel;
4521
+    JMenuBar timelineMenubar;
44764522     JSplitPane framePanel;
44774523     JTextArea/*Field*/ nameField;
4478
-    cButton textureButton;
4524
+    //cButton textureButton;
44794525     cButton okButton;
44804526     cButton applyButton;
44814527     cButton cancelButton;