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);
....@@ -522,18 +524,18 @@
522524                     maxima.y = sel.toParent[3][1];
523525                     maxima.z = sel.toParent[3][2];
524526                     si.SendInfo("    Orig: " + maxima, "regular");
525
-                    maxima.x = sel.globalTransform[3][0];
526
-                    maxima.y = sel.globalTransform[3][1];
527
-                    maxima.z = sel.globalTransform[3][2];
528
-        if (full)
529
-            si.SendInfo("    Global Orig: " + maxima, "regular");
530527                     maxima.x = sel.toParent[0][0];
531528                     maxima.y = sel.toParent[1][1];
532529                     maxima.z = sel.toParent[2][2];
533530                     si.SendInfo("    Scale: " + maxima, "regular");
534
-                    maxima.x = sel.globalTransform[0][0];
535
-                    maxima.y = sel.globalTransform[1][1];
536
-                    maxima.z = sel.globalTransform[2][2];
531
+        maxima.x = sel.globalTransform[3][0];
532
+        maxima.y = sel.globalTransform[3][1];
533
+        maxima.z = sel.globalTransform[3][2];
534
+        if (full)
535
+            si.SendInfo("    Global Orig: " + maxima, "regular");
536
+        maxima.x = sel.globalTransform[0][0];
537
+        maxima.y = sel.globalTransform[1][1];
538
+        maxima.z = sel.globalTransform[2][2];
537539         if (full)
538540             si.SendInfo("    Global Scale: " + maxima, "regular");
539541                 }
....@@ -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)
....@@ -2207,14 +2215,18 @@
22072215                 sel.smoothed = false;
22082216 
22092217                 //    if (!changename)
2210
-                sel.SetPositionDelta(false, true, true, true/*?*/); // false
2218
+                //sel.SetPositionDelta(false, true, true, true/*?*/); // false
2219
+                sel.SetGlobalTransform();
2220
+                sel.LoadData();
2221
+                sel.Rewind();
2222
+                sel.Fade();
22112223                 //                sel.setPose(0);
22122224                 refreshContents();
22132225             } else
22142226             {
22152227                 mocap.Reset();
22162228                 // new skeleton
2217
-                makeSomething(mocap, false); // true);
2229
+                makeSomething(mocap, true); // true);
22182230             }
22192231         } catch (Exception e)
22202232         {
....@@ -2241,6 +2253,8 @@
22412253         {
22422254             Mocap sel = (Mocap) select;
22432255 
2256
+            sel.SetCurrentBones(sel.frame);
2257
+            
22442258             File file = new File(fullname);
22452259 
22462260             //       Mocap mocap = new Mocap("Mocap" + file.getName());
....@@ -2307,7 +2321,11 @@
23072321 
23082322             if (!changename)
23092323             {
2310
-                sel.SetPositionDelta(false, true, true, true/*?*/);
2324
+                //sel.SetPositionDelta(false, true, true, true/*?*/);
2325
+                sel.SetGlobalTransform();
2326
+                sel.LoadData();
2327
+                sel.Rewind();
2328
+                sel.Fade();
23112329             }
23122330 
23132331             //          sel.setPose(0);
....@@ -2946,7 +2964,26 @@
29462964             // june 2013           copy.HardTouch();
29472965             cameraView.repaint();
29482966             return;
2949
-        } 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)
29502987         {
29512988             if (CameraPane.FULLSCREEN)
29522989             {
....@@ -3208,9 +3245,9 @@
32083245             cameraView.RevertCamera();
32093246             cameraView.repaint();
32103247             return;
3211
-        } else if (event.getSource() == textureButton)
3212
-        {
3213
-            return; // true;
3248
+//        } else if (event.getSource() == textureButton)
3249
+//        {
3250
+//            return; // true;
32143251         } else // combos...
32153252         if (event.getSource() == texresMenu)
32163253         {
....@@ -3652,7 +3689,7 @@
36523689 
36533690         if (obj.parent != null)
36543691         {
3655
-            obj.parent.TransformToWorld(interest);
3692
+//            obj.parent.TransformToWorld(interest);
36563693         }
36573694 
36583695         if (!CameraPane.TRACK)
....@@ -4432,7 +4469,8 @@
44324469     MenuItem revertCameraItem;
44334470     CheckboxMenuItem toggleLiveItem;
44344471     MenuItem stepItem;
4435
-    CheckboxMenuItem toggleFullItem;
4472
+    CheckboxMenuItem toggleFullScreenItem;
4473
+    CheckboxMenuItem toggleTimelineItem;
44364474     CheckboxMenuItem toggleRenderItem;
44374475     CheckboxMenuItem toggleDebugItem;
44384476     CheckboxMenuItem toggleFrustumItem;
....@@ -4459,11 +4497,13 @@
44594497     JSplitPane gridPanel;
44604498     JSplitPane bigPanel;
44614499     JPanel bigThree;
4462
-    JTabbedPane jtp;
4463
-    JPanel cameraPanel;
4500
+    JTabbedPane scenePanel;
4501
+    JPanel centralPanel;
4502
+    JPanel timelinePanel;
4503
+    JMenuBar timelineMenubar;
44644504     JSplitPane framePanel;
44654505     JTextArea/*Field*/ nameField;
4466
-    cButton textureButton;
4506
+    //cButton textureButton;
44674507     cButton okButton;
44684508     cButton applyButton;
44694509     cButton cancelButton;