blame | history | patch | commit | commitdiff
Normand Briere
2018-07-08 f4160780a4d8278920b99ada1050f320d6e30a73 
 ObjEditor.java
....@@ -292,9 +292,11 @@
292292         //normalLensItem.addActionListener(this);
293293         cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
294294         revertCameraItem.addActionListener(this);
295
-        cameraMenu.add(toggleFullItem = new CheckboxMenuItem("Full Screen"));
296
-        toggleFullItem.addItemListener(this);
297
-        toggleFullItem.setState(CameraPane.FULLSCREEN);
295
+        cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
296
+        toggleFullScreenItem.addItemListener(this);
297
+        toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
298
+        cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
299
+        toggleTimelineItem.addItemListener(this);
298300         cameraMenu.add("-");
299301         cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
300302         toggleTextureItem.addItemListener(this);
....@@ -1158,10 +1160,14 @@
11581160         //JPanel worldPanel =
11591161         //		new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
11601162         //worldPanel.setName("World");
1161
-		/*JPanel*/ cameraPanel =
1162
-                new JPanel(new BorderLayout());
1163
-        cameraPanel.add(cameraView);
1163
+	centralPanel = new JPanel(new BorderLayout());
1164
+	timelinePanel = new JPanel(new BorderLayout());
1165
+        timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
11641166 
1167
+        centralPanel.add(cameraView);
1168
+        //frame.setJMenuBar(timelineMenubar);
1169
+        //centralPanel.add(timelinePanel);
1170
+        
11651171         //topView.camera = ;
11661172         //frontView.camera = new Camera(2);
11671173         //sideView.camera = new Camera(3);
....@@ -1191,7 +1197,7 @@
11911197         gridPanel.add(cameraView);
11921198         gridPanel.add(XYZPanel);
11931199          */
1194
-        gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, cameraPanel, XYZPanel); //new BorderLayout());
1200
+        gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
11951201         gridPanel.setContinuousLayout(true);
11961202         gridPanel.setOneTouchExpandable(true);
11971203         gridPanel.setDividerLocation(1.0);
....@@ -1244,15 +1250,15 @@
12441250         scrollpane.setWheelScrollingEnabled(true);
12451251         scrollpane.addMouseWheelListener(this); // Default not fast enough
12461252 
1247
-        /*JTabbedPane*/ jtp = new JTabbedPane();
1248
-        jtp.add(scrollpane);
1253
+        /*JTabbedPane*/ scenePanel = new JTabbedPane();
1254
+        scenePanel.add(scrollpane);
12491255 
1250
-        jtp.add(FSPane = new cFileSystemPane(this));
1256
+        scenePanel.add(FSPane = new cFileSystemPane(this));
12511257 
12521258         optionsPanel = new JPanel(new GridBagLayout());
12531259 
12541260         optionsPanel.setName("Options");
1255
-        jtp.add(optionsPanel);
1261
+        scenePanel.add(optionsPanel);
12561262 
12571263 
12581264         /*
....@@ -1275,7 +1281,7 @@
12751281         jtp.add(tree);
12761282          */
12771283 
1278
-        bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, jtp, gridPanel);
1284
+        bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
12791285         bigPanel.setContinuousLayout(true);
12801286         bigPanel.setOneTouchExpandable(true);
12811287         bigPanel.setDividerLocation(0.8);
....@@ -1297,13 +1303,13 @@
12971303         aWindowConstraints.fill = GridBagConstraints.VERTICAL;
12981304         aWindowConstraints.weightx = 0;
12991305         aWindowConstraints.weighty = 1;
1300
-        bigThree.add(jtp, aWindowConstraints);
1306
+        bigThree.add(scenePanel, aWindowConstraints);
13011307         aWindowConstraints.weightx = 1;
13021308         aWindowConstraints.gridwidth = 3;
13031309         //	aConstraints.gridheight = 3;
13041310         aWindowConstraints.gridx = 1;
13051311         aWindowConstraints.fill = GridBagConstraints.BOTH;
1306
-        bigThree.add(cameraPanel, aWindowConstraints);
1312
+        bigThree.add(centralPanel, aWindowConstraints);
13071313         aWindowConstraints.weightx = 0;
13081314         aWindowConstraints.gridx = 4;
13091315         aWindowConstraints.gridwidth = 1;
....@@ -2194,6 +2200,8 @@
21942200             {
21952201                 Mocap sel = (Mocap) copy.selection.get(0);
21962202 
2203
+                sel.SetCurrentBones(sel.frame);
2204
+            
21972205                 sel.fullname = fullname;
21982206 
21992207                 if (changename)
....@@ -2245,6 +2253,8 @@
22452253         {
22462254             Mocap sel = (Mocap) select;
22472255 
2256
+            sel.SetCurrentBones(sel.frame);
2257
+            
22482258             File file = new File(fullname);
22492259 
22502260             //       Mocap mocap = new Mocap("Mocap" + file.getName());
....@@ -2954,7 +2964,26 @@
29542964             // june 2013           copy.HardTouch();
29552965             cameraView.repaint();
29562966             return;
2957
-        } else if (event.getSource() == toggleFullItem)
2967
+        } else if (event.getSource() == toggleTimelineItem)
2968
+        {
2969
+            copy.timeline ^= true;
2970
+
2971
+            if (copy.timeline)
2972
+            {
2973
+                centralPanel.remove(cameraView);
2974
+                centralPanel.add(timelinePanel);
2975
+                frame.setJMenuBar(timelineMenubar);
2976
+            }
2977
+            else
2978
+            {
2979
+                centralPanel.remove(timelinePanel);
2980
+                centralPanel.add(cameraView);
2981
+                frame.setJMenuBar(null);
2982
+            }
2983
+
2984
+            frame.validate();
2985
+            return;
2986
+        } else if (event.getSource() == toggleFullScreenItem)
29582987         {
29592988             if (CameraPane.FULLSCREEN)
29602989             {
....@@ -3216,9 +3245,9 @@
32163245             cameraView.RevertCamera();
32173246             cameraView.repaint();
32183247             return;
3219
-        } else if (event.getSource() == textureButton)
3220
-        {
3221
-            return; // true;
3248
+//        } else if (event.getSource() == textureButton)
3249
+//        {
3250
+//            return; // true;
32223251         } else // combos...
32233252         if (event.getSource() == texresMenu)
32243253         {
....@@ -3660,7 +3689,7 @@
36603689 
36613690         if (obj.parent != null)
36623691         {
3663
-            obj.parent.TransformToWorld(interest);
3692
+//            obj.parent.TransformToWorld(interest);
36643693         }
36653694 
36663695         if (!CameraPane.TRACK)
....@@ -4440,7 +4469,8 @@
44404469     MenuItem revertCameraItem;
44414470     CheckboxMenuItem toggleLiveItem;
44424471     MenuItem stepItem;
4443
-    CheckboxMenuItem toggleFullItem;
4472
+    CheckboxMenuItem toggleFullScreenItem;
4473
+    CheckboxMenuItem toggleTimelineItem;
44444474     CheckboxMenuItem toggleRenderItem;
44454475     CheckboxMenuItem toggleDebugItem;
44464476     CheckboxMenuItem toggleFrustumItem;
....@@ -4467,11 +4497,13 @@
44674497     JSplitPane gridPanel;
44684498     JSplitPane bigPanel;
44694499     JPanel bigThree;
4470
-    JTabbedPane jtp;
4471
-    JPanel cameraPanel;
4500
+    JTabbedPane scenePanel;
4501
+    JPanel centralPanel;
4502
+    JPanel timelinePanel;
4503
+    JMenuBar timelineMenubar;
44724504     JSplitPane framePanel;
44734505     JTextArea/*Field*/ nameField;
4474
-    cButton textureButton;
4506
+    //cButton textureButton;
44754507     cButton okButton;
44764508     cButton applyButton;
44774509     cButton cancelButton;