From bc829f47837b5a001f911542140b0b8e63c2bb0c Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sun, 14 Jul 2019 19:47:03 -0400
Subject: [PATCH] Fix extract big data.
---
ObjEditor.java | 127 ++++++++++++++++++++++++++++++++----------
1 files changed, 96 insertions(+), 31 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index 1779397..b1bbdf6 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -449,7 +449,7 @@
// TEXTAREA infoarea.setLineWrap(true);
// TEXTAREA infoarea.setWrapStyleWord(true);
infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
- //infoPanel.setPreferredSize(new Dimension(50, 200));
+ infoPanel.setPreferredSize(new Dimension(1, 1));
infoPanel.setName("Info");
//infoPanel.setLayout(new BorderLayout());
//infoPanel.add(createTextPane());
@@ -1174,10 +1174,11 @@
randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
+ link2masterCB.setToolTipText("Attach to support");
+
if (Globals.ADVANCED)
{
- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
- link2masterCB.setToolTipText("Attach to support");
speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
speedupCB.setToolTipText("Option motion capture");
}
@@ -1494,7 +1495,7 @@
// objectPanel.add(north);
objectPanel.add(editPanel);
- if (Globals.ADVANCED)
+ //if (Globals.ADVANCED)
objectPanel.add(infoPanel);
objectPanel.add(toolboxPanel);
@@ -1979,8 +1980,9 @@
// 3D models
if (filename.endsWith(".3ds") || filename.endsWith(".3DS"))
{
- lastConverter = new com.jmex.model.converters.MaxToJme();
- LoadFile(filename, lastConverter);
+ //lastConverter = new com.jmex.model.converters.MaxToJme();
+ //LoadFile(filename, lastConverter);
+ LoadObjFile(filename); // New 3ds loader
continue;
}
if (filename.endsWith(".dae") || filename.endsWith(".DAE"))
@@ -2706,6 +2708,7 @@
LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
}
+
//cJME.count++;
//cJME.count %= 12;
if (gc)
@@ -2889,6 +2892,7 @@
}
}
}
+
cFileSystemPane FSPane;
void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
@@ -2942,6 +2946,7 @@
}
}
}
+
freezematerial = false;
}
@@ -3201,10 +3206,6 @@
{
ToggleAnimation();
return;
- } else if (event.getSource() == archiveItem)
- {
- cTools.Archive(frame);
- return;
} else if (event.getSource() == flipVCB)
{
copy.flipV ^= true;
@@ -3425,6 +3426,10 @@
{
generatePOV();
//return true;
+ } else if (event.getSource() == archiveItem)
+ {
+ cTools.Archive(frame);
+ return;
} else if (source == zBufferItem)
{
try
@@ -3476,8 +3481,8 @@
try
{
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
- ObjectOutputStream out = new ObjectOutputStream(zstream);
+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
Object3D parent = o.parent;
o.parent = null;
@@ -3488,10 +3493,14 @@
out.flush();
- zstream.close();
+ baos //zstream
+ .close();
out.close();
- return baos.toByteArray();
+ byte[] bytes = baos.toByteArray();
+
+ System.out.println("save #bytes = " + bytes.length);
+ return bytes;
} catch (Exception e)
{
System.err.println(e);
@@ -3501,13 +3510,16 @@
static public Object Uncompress(byte[] bytes)
{
- System.out.println("#bytes = " + bytes.length);
+ System.out.println("restore #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);
+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
Object obj = in.readObject();
+
+ bais //istream
+ .close();
in.close();
return obj;
@@ -3566,6 +3578,27 @@
public void Save()
{
+ Save(true);
+ }
+
+ private boolean Equal(byte[] compress, byte[] name)
+ {
+ if (compress.length != name.length)
+ {
+ return false;
+ }
+
+ for (int i=compress.length; --i>=0;)
+ {
+ if (compress[i] != name[i])
+ return false;
+ }
+
+ return true;
+ }
+
+ public boolean Save(boolean user)
+ {
System.err.println("Save");
cRadio tab = GetCurrentTab();
@@ -3576,19 +3609,37 @@
copy.ExtractBigData(hashtable);
byte[] compress = Compress(copy);
-
- //EditorFrame.m_MainFrame.requestFocusInWindow();
- tab.graphs[tab.undoindex++] = compress;
-
- copy.RestoreBigData(hashtable);
CameraPane.SWITCH = temp;
+ boolean thesame = false;
+
+ // Quick heuristic using length. Works only when stream is compressed.
+ if (tab.undoindex > 0 && tab.graphs[tab.undoindex-1] != null && Equal(compress, tab.graphs[tab.undoindex-1]))
+ {
+ thesame = true;
+ }
+
+ //EditorFrame.m_MainFrame.requestFocusInWindow();
+ if (!thesame)
+ {
+ //tab.user[tab.undoindex] = user;
+ boolean increment = tab.graphs[tab.undoindex] == null;
+
+ tab.graphs[tab.undoindex] = compress;
+
+ if (increment)
+ tab.undoindex++;
+ }
+
+ copy.RestoreBigData(hashtable);
+
//assert(hashtable.isEmpty());
for (int i = tab.undoindex; i < tab.graphs.length; i++)
{
- tab.graphs[i] = null;
+ //tab.user[i] = false;
+ // tab.graphs[i] = null;
}
SetUndoStates();
@@ -3611,6 +3662,8 @@
e.printStackTrace();
}
}
+
+ return !thesame;
}
void CopyChanged(Object3D obj)
@@ -3667,7 +3720,7 @@
redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
}
- public void Undo()
+ public boolean Undo()
{
System.err.println("Undo");
@@ -3676,18 +3729,27 @@
if (tab.undoindex == 0)
{
java.awt.Toolkit.getDefaultToolkit().beep();
- return;
+ return false;
}
- if (tab.graphs[tab.undoindex] == null)
+ if (tab.graphs[tab.undoindex] == null) // || !tab.user[tab.undoindex])
{
- Save();
- tab.undoindex -= 1;
+ if (Save(false))
+ tab.undoindex -= 1;
+ else
+ {
+ if (tab.undoindex <= 0)
+ return false;
+ else
+ tab.undoindex -= 1;
+ }
}
tab.undoindex -= 1;
CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
+
+ return true;
}
public void Redo()
@@ -3703,6 +3765,9 @@
tab.undoindex += 1;
CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
+
+ //if (!tab.user[tab.undoindex])
+ // tab.graphs[tab.undoindex] = null;
}
void ImportGFD()
@@ -4665,8 +4730,8 @@
if (readobj != null)
{
- if (Globals.SAVEONMAKE)
- Save();
+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
+ // Save();
try
{
//readobj.deepCopySelf(copy);
@@ -5035,7 +5100,7 @@
CheckboxMenuItem toggleSwitchItem;
CheckboxMenuItem toggleRootItem;
CheckboxMenuItem animationItem;
- CheckboxMenuItem archiveItem;
+ MenuItem archiveItem;
CheckboxMenuItem toggleHandleItem;
CheckboxMenuItem togglePaintItem;
JSplitPane mainPanel;
--
Gitblit v1.6.2