blame | history | patch | commit | commitdiff
Normand Briere
2018-07-07 ecaf579303705545735450cbc8b8014d7e062329 
 ObjEditor.java
....@@ -522,18 +522,18 @@
522522                     maxima.y = sel.toParent[3][1];
523523                     maxima.z = sel.toParent[3][2];
524524                     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");
530525                     maxima.x = sel.toParent[0][0];
531526                     maxima.y = sel.toParent[1][1];
532527                     maxima.z = sel.toParent[2][2];
533528                     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];
529
+        maxima.x = sel.globalTransform[3][0];
530
+        maxima.y = sel.globalTransform[3][1];
531
+        maxima.z = sel.globalTransform[3][2];
532
+        if (full)
533
+            si.SendInfo("    Global Orig: " + maxima, "regular");
534
+        maxima.x = sel.globalTransform[0][0];
535
+        maxima.y = sel.globalTransform[1][1];
536
+        maxima.z = sel.globalTransform[2][2];
537537         if (full)
538538             si.SendInfo("    Global Scale: " + maxima, "regular");
539539                 }
....@@ -1161,6 +1161,7 @@
11611161 		/*JPanel*/ cameraPanel =
11621162                 new JPanel(new BorderLayout());
11631163         cameraPanel.add(cameraView);
1164
+        //new timeflow.app.TimeflowApp().TimeFlowWindow(cameraPanel, frame);
11641165 
11651166         //topView.camera = ;
11661167         //frontView.camera = new Camera(2);
....@@ -1244,15 +1245,15 @@
12441245         scrollpane.setWheelScrollingEnabled(true);
12451246         scrollpane.addMouseWheelListener(this); // Default not fast enough
12461247 
1247
-        /*JTabbedPane*/ jtp = new JTabbedPane();
1248
-        jtp.add(scrollpane);
1248
+        /*JTabbedPane*/ scenePanel = new JTabbedPane();
1249
+        scenePanel.add(scrollpane);
12491250 
1250
-        jtp.add(FSPane = new cFileSystemPane(this));
1251
+        scenePanel.add(FSPane = new cFileSystemPane(this));
12511252 
12521253         optionsPanel = new JPanel(new GridBagLayout());
12531254 
12541255         optionsPanel.setName("Options");
1255
-        jtp.add(optionsPanel);
1256
+        scenePanel.add(optionsPanel);
12561257 
12571258 
12581259         /*
....@@ -1275,7 +1276,7 @@
12751276         jtp.add(tree);
12761277          */
12771278 
1278
-        bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, jtp, gridPanel);
1279
+        bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
12791280         bigPanel.setContinuousLayout(true);
12801281         bigPanel.setOneTouchExpandable(true);
12811282         bigPanel.setDividerLocation(0.8);
....@@ -1297,7 +1298,7 @@
12971298         aWindowConstraints.fill = GridBagConstraints.VERTICAL;
12981299         aWindowConstraints.weightx = 0;
12991300         aWindowConstraints.weighty = 1;
1300
-        bigThree.add(jtp, aWindowConstraints);
1301
+        bigThree.add(scenePanel, aWindowConstraints);
13011302         aWindowConstraints.weightx = 1;
13021303         aWindowConstraints.gridwidth = 3;
13031304         //	aConstraints.gridheight = 3;
....@@ -2194,6 +2195,8 @@
21942195             {
21952196                 Mocap sel = (Mocap) copy.selection.get(0);
21962197 
2198
+                sel.SetCurrentBones(sel.frame);
2199
+            
21972200                 sel.fullname = fullname;
21982201 
21992202                 if (changename)
....@@ -2207,14 +2210,18 @@
22072210                 sel.smoothed = false;
22082211 
22092212                 //    if (!changename)
2210
-                sel.SetPositionDelta(false, true, true, true/*?*/); // false
2213
+                //sel.SetPositionDelta(false, true, true, true/*?*/); // false
2214
+                sel.SetGlobalTransform();
2215
+                sel.LoadData();
2216
+                sel.Rewind();
2217
+                sel.Fade();
22112218                 //                sel.setPose(0);
22122219                 refreshContents();
22132220             } else
22142221             {
22152222                 mocap.Reset();
22162223                 // new skeleton
2217
-                makeSomething(mocap, false); // true);
2224
+                makeSomething(mocap, true); // true);
22182225             }
22192226         } catch (Exception e)
22202227         {
....@@ -2241,6 +2248,8 @@
22412248         {
22422249             Mocap sel = (Mocap) select;
22432250 
2251
+            sel.SetCurrentBones(sel.frame);
2252
+            
22442253             File file = new File(fullname);
22452254 
22462255             //       Mocap mocap = new Mocap("Mocap" + file.getName());
....@@ -2307,7 +2316,11 @@
23072316 
23082317             if (!changename)
23092318             {
2310
-                sel.SetPositionDelta(false, true, true, true/*?*/);
2319
+                //sel.SetPositionDelta(false, true, true, true/*?*/);
2320
+                sel.SetGlobalTransform();
2321
+                sel.LoadData();
2322
+                sel.Rewind();
2323
+                sel.Fade();
23112324             }
23122325 
23132326             //          sel.setPose(0);
....@@ -3652,7 +3665,7 @@
36523665 
36533666         if (obj.parent != null)
36543667         {
3655
-            obj.parent.TransformToWorld(interest);
3668
+//            obj.parent.TransformToWorld(interest);
36563669         }
36573670 
36583671         if (!CameraPane.TRACK)
....@@ -4459,7 +4472,7 @@
44594472     JSplitPane gridPanel;
44604473     JSplitPane bigPanel;
44614474     JPanel bigThree;
4462
-    JTabbedPane jtp;
4475
+    JTabbedPane scenePanel;
44634476     JPanel cameraPanel;
44644477     JSplitPane framePanel;
44654478     JTextArea/*Field*/ nameField;