From 4113164b3be1e50251ac40d6fd65660f0a6c2e63 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Tue, 11 Jun 2019 18:46:21 -0400
Subject: [PATCH] Compressed undo stack.
---
ObjEditor.java | 168 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 134 insertions(+), 34 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index 05b548c..13331f4 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -1935,6 +1935,7 @@
e2.printStackTrace();
}
}
+
LoadJMEThread loadThread;
class LoadJMEThread extends Thread
@@ -1992,6 +1993,7 @@
//LoadFile0(filename, converter);
}
}
+
LoadOBJThread loadObjThread;
class LoadOBJThread extends Thread
@@ -2925,7 +2927,7 @@
return;
} else if (event.getSource() == toggleSwitchItem)
{
- cameraView.ToggleRandom();
+ cameraView.ToggleSwitch();
cameraView.repaint();
return;
} else if (event.getSource() == toggleHandleItem)
@@ -3212,23 +3214,40 @@
objEditor.refreshContents();
}
- Object3D graphs[] = new Object3D[10000];
- int undoindex = 0;
-
- static public Object clone(Object o)
+ static public byte[] Compress(Object o)
{
try
{
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- ObjectOutputStream out = new ObjectOutputStream(baos);
+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
+ ObjectOutputStream out = new ObjectOutputStream(zstream);
out.writeObject(o);
+
+ out.flush();
- ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
- ObjectInputStream in = new ObjectInputStream(bais);
+ zstream.close();
+ out.close();
+
+ return baos.toByteArray();
+ } catch (Exception e)
+ {
+ System.err.println(e);
+ return null;
+ }
+ }
+
+ static public Object Uncompress(byte[] bytes)
+ {
+ System.out.println("#bytes = " + bytes.length);
+ try
+ {
+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
+ ObjectInputStream in = new ObjectInputStream(istream);
Object obj = in.readObject();
in.close();
- out.close();
+
return obj;
} catch (Exception e)
{
@@ -3237,16 +3256,68 @@
}
}
+ static public Object clone(Object o)
+ {
+ try
+ {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutputStream out = new ObjectOutputStream(baos);
+
+ out.writeObject(o);
+
+ out.flush();
+ out.close();
+
+ byte[] bytes = baos.toByteArray();
+
+ System.out.println("clone = " + bytes.length);
+
+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
+ ObjectInputStream in = new ObjectInputStream(bais);
+ Object obj = in.readObject();
+ in.close();
+
+ return obj;
+ } catch (Exception e)
+ {
+ System.err.println(e);
+ return null;
+ }
+ }
+
+ cRadio GetCurrentTab()
+ {
+ cRadio ab;
+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
+ {
+ ab = (cRadio)e.nextElement();
+ if(ab.GetObject() == copy)
+ {
+ return ab;
+ }
+ }
+
+ return null;
+ }
+
+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
+
public void Save()
{
- if (true) return;
+ cRadio tab = GetCurrentTab();
+
+ copy.ExtractBigData(hashtable);
//EditorFrame.m_MainFrame.requestFocusInWindow();
- graphs[undoindex++] = (Object3D)clone(copy);
+ tab.graphs[tab.undoindex++] = Compress(copy);
- for (int i = undoindex; i < graphs.length; i++)
+ copy.RestoreBigData(hashtable);
+
+ //assert(hashtable.isEmpty());
+
+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
{
- graphs[i] = null;
+ tab.graphs[i] = null;
}
// test save
@@ -3254,7 +3325,7 @@
{
try
{
- FileOutputStream ostream = new FileOutputStream("save" + undoindex);
+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
ObjectOutputStream p = new ObjectOutputStream(ostream);
p.writeObject(copy);
@@ -3269,48 +3340,76 @@
}
}
+ void CopyChanged(Object3D obj)
+ {
+ copy.ExtractBigData(hashtable);
+
+ copy.clear();
+
+ for (int i=0; i<obj.Size(); i++)
+ {
+ copy.add(obj.get(i));
+ }
+
+ copy.RestoreBigData(hashtable);
+
+ //assert(hashtable.isEmpty());
+
+ copy.Touch();
+
+ ResetModel();
+ copy.HardTouch(); // recompile?
+
+ cRadio ab;
+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
+ {
+ ab = (cRadio)e.nextElement();
+ Object3D test = copy.GetObject(ab.object.GetUUID());
+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
+ if (test != null)
+ {
+ test.editWindow = ab.object.editWindow;
+ ab.object = test;
+ }
+ }
+
+ refreshContents();
+ }
+
public void Undo()
{
- if (undoindex == 0)
+ cRadio tab = GetCurrentTab();
+
+ if (tab.undoindex == 0)
{
java.awt.Toolkit.getDefaultToolkit().beep();
return;
}
- if (graphs[undoindex] == null)
+ if (tab.graphs[tab.undoindex] == null)
{
Save();
- undoindex -= 1;
+ tab.undoindex -= 1;
}
- undoindex -= 1;
+ tab.undoindex -= 1;
- copy = graphs[undoindex];
-
- cameraView.object = copy;
- copy.Touch();
-
- ResetModel();
- refreshContents();
+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
}
public void Redo()
{
- if (graphs[undoindex + 1] == null)
+ cRadio tab = GetCurrentTab();
+
+ if (tab.graphs[tab.undoindex + 1] == null)
{
java.awt.Toolkit.getDefaultToolkit().beep();
return;
}
- undoindex += 1;
+ tab.undoindex += 1;
- copy = graphs[undoindex];
-
- cameraView.object = copy;
- copy.Touch();
-
- ResetModel();
- refreshContents();
+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
}
void ImportGFD()
@@ -4259,6 +4358,7 @@
if (readobj != null)
{
+ Save();
try
{
//readobj.deepCopySelf(copy);
--
Gitblit v1.6.2