From ecaf579303705545735450cbc8b8014d7e062329 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sat, 07 Jul 2018 18:44:29 -0400
Subject: [PATCH] Timeline integrated
---
ObjEditor.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index 74fe7f1..4b1a4fd 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -1161,6 +1161,7 @@
/*JPanel*/ cameraPanel =
new JPanel(new BorderLayout());
cameraPanel.add(cameraView);
+ //new timeflow.app.TimeflowApp().TimeFlowWindow(cameraPanel, frame);
//topView.camera = ;
//frontView.camera = new Camera(2);
@@ -1244,15 +1245,15 @@
scrollpane.setWheelScrollingEnabled(true);
scrollpane.addMouseWheelListener(this); // Default not fast enough
- /*JTabbedPane*/ jtp = new JTabbedPane();
- jtp.add(scrollpane);
+ /*JTabbedPane*/ scenePanel = new JTabbedPane();
+ scenePanel.add(scrollpane);
- jtp.add(FSPane = new cFileSystemPane(this));
+ scenePanel.add(FSPane = new cFileSystemPane(this));
optionsPanel = new JPanel(new GridBagLayout());
optionsPanel.setName("Options");
- jtp.add(optionsPanel);
+ scenePanel.add(optionsPanel);
/*
@@ -1275,7 +1276,7 @@
jtp.add(tree);
*/
- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, jtp, gridPanel);
+ bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
bigPanel.setContinuousLayout(true);
bigPanel.setOneTouchExpandable(true);
bigPanel.setDividerLocation(0.8);
@@ -1297,7 +1298,7 @@
aWindowConstraints.fill = GridBagConstraints.VERTICAL;
aWindowConstraints.weightx = 0;
aWindowConstraints.weighty = 1;
- bigThree.add(jtp, aWindowConstraints);
+ bigThree.add(scenePanel, aWindowConstraints);
aWindowConstraints.weightx = 1;
aWindowConstraints.gridwidth = 3;
// aConstraints.gridheight = 3;
@@ -2194,6 +2195,8 @@
{
Mocap sel = (Mocap) copy.selection.get(0);
+ sel.SetCurrentBones(sel.frame);
+
sel.fullname = fullname;
if (changename)
@@ -2245,6 +2248,8 @@
{
Mocap sel = (Mocap) select;
+ sel.SetCurrentBones(sel.frame);
+
File file = new File(fullname);
// Mocap mocap = new Mocap("Mocap" + file.getName());
@@ -3660,7 +3665,7 @@
if (obj.parent != null)
{
- obj.parent.TransformToWorld(interest);
+// obj.parent.TransformToWorld(interest);
}
if (!CameraPane.TRACK)
@@ -4467,7 +4472,7 @@
JSplitPane gridPanel;
JSplitPane bigPanel;
JPanel bigThree;
- JTabbedPane jtp;
+ JTabbedPane scenePanel;
JPanel cameraPanel;
JSplitPane framePanel;
JTextArea/*Field*/ nameField;
--
Gitblit v1.6.2