From 4629090fafbef256abd0686a85ee12042d658868 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Wed, 12 Jun 2019 22:37:48 -0400
Subject: [PATCH] Mocap big data
---
ObjEditor.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index 2cb5163..1319073 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -2927,7 +2927,7 @@
return;
} else if (event.getSource() == toggleSwitchItem)
{
- cameraView.ToggleRandom();
+ cameraView.ToggleSwitch();
cameraView.repaint();
return;
} else if (event.getSource() == toggleHandleItem)
@@ -3239,6 +3239,7 @@
static public Object Uncompress(byte[] bytes)
{
+ System.out.println("#bytes = " + bytes.length);
try
{
ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
@@ -3305,12 +3306,17 @@
{
cRadio tab = GetCurrentTab();
+ boolean temp = CameraPane.SWITCH;
+ CameraPane.SWITCH = false;
+
copy.ExtractBigData(hashtable);
//EditorFrame.m_MainFrame.requestFocusInWindow();
- tab.graphs[tab.undoindex++] = (Object3D)clone(copy);
+ tab.graphs[tab.undoindex++] = Compress(copy);
copy.RestoreBigData(hashtable);
+
+ CameraPane.SWITCH = temp;
//assert(hashtable.isEmpty());
@@ -3341,6 +3347,9 @@
void CopyChanged(Object3D obj)
{
+ boolean temp = CameraPane.SWITCH;
+ CameraPane.SWITCH = false;
+
copy.ExtractBigData(hashtable);
copy.clear();
@@ -3351,6 +3360,8 @@
}
copy.RestoreBigData(hashtable);
+
+ CameraPane.SWITCH = temp;
//assert(hashtable.isEmpty());
@@ -3393,7 +3404,7 @@
tab.undoindex -= 1;
- CopyChanged(tab.graphs[tab.undoindex]);
+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
}
public void Redo()
@@ -3408,7 +3419,7 @@
tab.undoindex += 1;
- CopyChanged(tab.graphs[tab.undoindex]);
+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
}
void ImportGFD()
--
Gitblit v1.6.2