From f4160780a4d8278920b99ada1050f320d6e30a73 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sun, 08 Jul 2018 10:29:46 -0400
Subject: [PATCH] Timeline activated
---
ObjEditor.java | 72 +++++++++++++++++++++++++-----------
1 files changed, 50 insertions(+), 22 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index a7f467c..6877515 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -292,9 +292,11 @@
//normalLensItem.addActionListener(this);
cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
revertCameraItem.addActionListener(this);
- cameraMenu.add(toggleFullItem = new CheckboxMenuItem("Full Screen"));
- toggleFullItem.addItemListener(this);
- toggleFullItem.setState(CameraPane.FULLSCREEN);
+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
+ toggleFullScreenItem.addItemListener(this);
+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
+ toggleTimelineItem.addItemListener(this);
cameraMenu.add("-");
cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
toggleTextureItem.addItemListener(this);
@@ -1158,10 +1160,14 @@
//JPanel worldPanel =
// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
//worldPanel.setName("World");
- /*JPanel*/ cameraPanel =
- new JPanel(new BorderLayout());
- cameraPanel.add(cameraView);
+ centralPanel = new JPanel(new BorderLayout());
+ timelinePanel = new JPanel(new BorderLayout());
+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
+ centralPanel.add(cameraView);
+ //frame.setJMenuBar(timelineMenubar);
+ //centralPanel.add(timelinePanel);
+
//topView.camera = ;
//frontView.camera = new Camera(2);
//sideView.camera = new Camera(3);
@@ -1191,7 +1197,7 @@
gridPanel.add(cameraView);
gridPanel.add(XYZPanel);
*/
- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, cameraPanel, XYZPanel); //new BorderLayout());
+ gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
gridPanel.setContinuousLayout(true);
gridPanel.setOneTouchExpandable(true);
gridPanel.setDividerLocation(1.0);
@@ -1244,15 +1250,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 +1281,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,13 +1303,13 @@
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;
aWindowConstraints.gridx = 1;
aWindowConstraints.fill = GridBagConstraints.BOTH;
- bigThree.add(cameraPanel, aWindowConstraints);
+ bigThree.add(centralPanel, aWindowConstraints);
aWindowConstraints.weightx = 0;
aWindowConstraints.gridx = 4;
aWindowConstraints.gridwidth = 1;
@@ -2958,7 +2964,26 @@
// june 2013 copy.HardTouch();
cameraView.repaint();
return;
- } else if (event.getSource() == toggleFullItem)
+ } else if (event.getSource() == toggleTimelineItem)
+ {
+ copy.timeline ^= true;
+
+ if (copy.timeline)
+ {
+ centralPanel.remove(cameraView);
+ centralPanel.add(timelinePanel);
+ frame.setJMenuBar(timelineMenubar);
+ }
+ else
+ {
+ centralPanel.remove(timelinePanel);
+ centralPanel.add(cameraView);
+ frame.setJMenuBar(null);
+ }
+
+ frame.validate();
+ return;
+ } else if (event.getSource() == toggleFullScreenItem)
{
if (CameraPane.FULLSCREEN)
{
@@ -3220,9 +3245,9 @@
cameraView.RevertCamera();
cameraView.repaint();
return;
- } else if (event.getSource() == textureButton)
- {
- return; // true;
+// } else if (event.getSource() == textureButton)
+// {
+// return; // true;
} else // combos...
if (event.getSource() == texresMenu)
{
@@ -4444,7 +4469,8 @@
MenuItem revertCameraItem;
CheckboxMenuItem toggleLiveItem;
MenuItem stepItem;
- CheckboxMenuItem toggleFullItem;
+ CheckboxMenuItem toggleFullScreenItem;
+ CheckboxMenuItem toggleTimelineItem;
CheckboxMenuItem toggleRenderItem;
CheckboxMenuItem toggleDebugItem;
CheckboxMenuItem toggleFrustumItem;
@@ -4471,11 +4497,13 @@
JSplitPane gridPanel;
JSplitPane bigPanel;
JPanel bigThree;
- JTabbedPane jtp;
- JPanel cameraPanel;
+ JTabbedPane scenePanel;
+ JPanel centralPanel;
+ JPanel timelinePanel;
+ JMenuBar timelineMenubar;
JSplitPane framePanel;
JTextArea/*Field*/ nameField;
- cButton textureButton;
+ //cButton textureButton;
cButton okButton;
cButton applyButton;
cButton cancelButton;
--
Gitblit v1.6.2