Timeline integrated

Normand Briere

2018-07-07 ecaf579303705545735450cbc8b8014d7e062329

 ObjEditor.java
..
..
@@ -1161,6 +1161,7 @@
1161
1161
 		/*JPanel*/ cameraPanel =
1162
1162
                 new JPanel(new BorderLayout());
1163
1163
         cameraPanel.add(cameraView);
1164
+        //new timeflow.app.TimeflowApp().TimeFlowWindow(cameraPanel, frame);
1164
1165
 
1165
1166
         //topView.camera = ;
1166
1167
         //frontView.camera = new Camera(2);
..
..
@@ -1244,15 +1245,15 @@
1244
1245
         scrollpane.setWheelScrollingEnabled(true);
1245
1246
         scrollpane.addMouseWheelListener(this); // Default not fast enough
1246
1247
 
1247
-        /*JTabbedPane*/ jtp = new JTabbedPane();
1248
-        jtp.add(scrollpane);
1248
+        /*JTabbedPane*/ scenePanel = new JTabbedPane();
1249
+        scenePanel.add(scrollpane);
1249
1250
 
1250
-        jtp.add(FSPane = new cFileSystemPane(this));
1251
+        scenePanel.add(FSPane = new cFileSystemPane(this));
1251
1252
 
1252
1253
         optionsPanel = new JPanel(new GridBagLayout());
1253
1254
 
1254
1255
         optionsPanel.setName("Options");
1255
-        jtp.add(optionsPanel);
1256
+        scenePanel.add(optionsPanel);
1256
1257
 
1257
1258
 
1258
1259
         /*
..
..
@@ -1275,7 +1276,7 @@
1275
1276
         jtp.add(tree);
1276
1277
          */
1277
1278
 
1278
-        bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, jtp, gridPanel);
1279
+        bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1279
1280
         bigPanel.setContinuousLayout(true);
1280
1281
         bigPanel.setOneTouchExpandable(true);
1281
1282
         bigPanel.setDividerLocation(0.8);
..
..
@@ -1297,7 +1298,7 @@
1297
1298
         aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1298
1299
         aWindowConstraints.weightx = 0;
1299
1300
         aWindowConstraints.weighty = 1;
1300
-        bigThree.add(jtp, aWindowConstraints);
1301
+        bigThree.add(scenePanel, aWindowConstraints);
1301
1302
         aWindowConstraints.weightx = 1;
1302
1303
         aWindowConstraints.gridwidth = 3;
1303
1304
         //	aConstraints.gridheight = 3;
..
..
@@ -2194,6 +2195,8 @@
2194
2195
             {
2195
2196
                 Mocap sel = (Mocap) copy.selection.get(0);
2196
2197
 
2198
+                sel.SetCurrentBones(sel.frame);
2199
+            
2197
2200
                 sel.fullname = fullname;
2198
2201
 
2199
2202
                 if (changename)
..
..
@@ -2245,6 +2248,8 @@
2245
2248
         {
2246
2249
             Mocap sel = (Mocap) select;
2247
2250
 
2251
+            sel.SetCurrentBones(sel.frame);
2252
+            
2248
2253
             File file = new File(fullname);
2249
2254
 
2250
2255
             //       Mocap mocap = new Mocap("Mocap" + file.getName());
..
..
@@ -3660,7 +3665,7 @@
3660
3665
 
3661
3666
         if (obj.parent != null)
3662
3667
         {
3663
-            obj.parent.TransformToWorld(interest);
3668
+//            obj.parent.TransformToWorld(interest);
3664
3669
         }
3665
3670
 
3666
3671
         if (!CameraPane.TRACK)
..
..
@@ -4467,7 +4472,7 @@
4467
4472
     JSplitPane gridPanel;
4468
4473
     JSplitPane bigPanel;
4469
4474
     JPanel bigThree;
4470
-    JTabbedPane jtp;
4475
+    JTabbedPane scenePanel;
4471
4476
     JPanel cameraPanel;
4472
4477
     JSplitPane framePanel;
4473
4478
     JTextArea/*Field*/ nameField;