From 15123b19e7bc8da2869429b07f0fbaa0598e945e Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Thu, 20 Jun 2019 20:56:08 -0400
Subject: [PATCH] Rewind all.
---
ObjEditor.java | 52 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 35 insertions(+), 17 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index 1319073..877fe87 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -168,6 +168,7 @@
// objEditor.ctrlPanel.remove(remarkButton);
objEditor.ctrlPanel.remove(setupPanel);
+ objEditor.ctrlPanel.remove(setupPanel2);
objEditor.ctrlPanel.remove(commandsPanel);
objEditor.ctrlPanel.remove(pushPanel);
//objEditor.ctrlPanel.remove(fillPanel);
@@ -278,7 +279,7 @@
frame.setMenuBar(menuBar = new MenuBar());
menuBar.add(fileMenu = new Menu("File"));
fileMenu.add(newItem = new MenuItem("New"));
- fileMenu.add(loadItem = new MenuItem("Load..."));
+ fileMenu.add(loadItem = new MenuItem("Open..."));
//oe.menuBar.add(menu = new Menu("Include"));
Menu menu = new Menu("Import");
@@ -419,10 +420,10 @@
e.printStackTrace();
}
- String selection = infoarea.getText();
- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
- java.awt.datatransfer.Clipboard clipboard =
- Toolkit.getDefaultToolkit().getSystemClipboard();
+// String selection = infoarea.getText();
+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
+// java.awt.datatransfer.Clipboard clipboard =
+// Toolkit.getDefaultToolkit().getSystemClipboard();
//clipboard.setContents(data, data);
}
@@ -747,6 +748,7 @@
cGridBag namePanel;
cGridBag setupPanel;
+ cGridBag setupPanel2;
cGridBag commandsPanel;
cGridBag pushPanel;
cGridBag fillPanel;
@@ -939,21 +941,25 @@
markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
markCB.setToolTipText("Set the animation target transform");
- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
+ setupPanel2 = new cGridBag().setVertical(false);
+
+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
rewindCB.setToolTipText("Rewind animation");
- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
- randomCB.setToolTipText("Option for switch node");
+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
+ randomCB.setToolTipText("Rewind or Go back and forth randomly");
if (Globals.ADVANCED)
{
- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
link2masterCB.setToolTipText("Attach to support");
- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
speedupCB.setToolTipText("Option motion capture");
}
oe.ctrlPanel.add(setupPanel);
+ oe.ctrlPanel.Return();
+ oe.ctrlPanel.add(setupPanel2);
oe.ctrlPanel.Return();
commandsPanel = new cGridBag().setVertical(false);
@@ -2072,19 +2078,19 @@
void LoadObjFile(String fullname)
{
- /*
+ System.out.println("Loading " + fullname);
+ /**/
//lastFilename = fullname;
if(loadObjThread == null)
{
- loadObjThread = new LoadOBJThread();
- loadObjThread.start();
+ loadObjThread = new LoadOBJThread();
+ loadObjThread.start();
}
loadObjThread.add(fullname);
- */
+ /**/
- System.out.println("Loading " + fullname);
- makeSomething(new FileObject(fullname, true), true);
+ //makeSomething(new FileObject(fullname, true), true);
}
void LoadGFDFile(String fullname)
@@ -3214,7 +3220,7 @@
objEditor.refreshContents();
}
- static public byte[] Compress(Object o)
+ static public byte[] Compress(Object3D o)
{
try
{
@@ -3222,8 +3228,13 @@
java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
ObjectOutputStream out = new ObjectOutputStream(zstream);
+ Object3D parent = o.parent;
+ o.parent = null;
+
out.writeObject(o);
+ o.parent = parent;
+
out.flush();
zstream.close();
@@ -4290,6 +4301,7 @@
try
{
+ // Try compressed version first.
java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
@@ -4359,6 +4371,12 @@
void LoadIt(Object obj)
{
+ if (obj == null)
+ {
+ // Invalid file
+ return;
+ }
+
System.out.println("Loaded " + obj);
//new Exception().printStackTrace();
Object3D readobj = (Object3D) obj;
--
Gitblit v1.6.2