From d7a17c35c443e2cb6c09eaa3cfeaf590a571faa1 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Wed, 17 Jul 2019 20:15:40 -0400
Subject: [PATCH] Version slider
---
Object3D.java | 87 +++++++++++++++++++++++++++++++------------
1 files changed, 63 insertions(+), 24 deletions(-)
diff --git a/Object3D.java b/Object3D.java
index 2a9ae20..f8d6c9c 100644
--- a/Object3D.java
+++ b/Object3D.java
@@ -24,11 +24,14 @@
private UUID uuid = UUID.randomUUID();
- // TEMPORARY for mocap undo
- mocap.reader.BVHReader.BVHResult bvh;
- Object3D skeleton;
+ // TEMPORARY for mocap undo. No need to be transient.
+ mocap.reader.BVHReader.BVHResult savebvh;
+ Object3D saveskeleton;
//
+ byte[] versions[] = new byte[100][];
+ int versionindex = -1;
+
ScriptNode scriptnode;
void InitOthers()
@@ -170,24 +173,35 @@
void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
{
+ Object3D o;
+
if (hashtable.containsKey(GetUUID()))
{
- Object3D o = hashtable.get(GetUUID());
+ o = hashtable.get(GetUUID());
Grafreed.Assert(this.bRep == o.bRep);
- if (this.bRep != null)
- assert(this.bRep.support == o.transientrep);
+ //if (this.bRep != null)
+ // assert(this.bRep.support == o.transientrep);
+ if (this.support != null)
+ assert(this.support.bRep == o.transientrep);
+ }
+ else
+ {
+ o = new Object3D("copy of " + this.name);
- return;
+ hashtable.put(GetUUID(), o);
}
- Object3D o = new Object3D("copy of " + this.name);
-
- hashtable.put(GetUUID(), o);
-
- for (int i=0; i<Size(); i++)
+ if (!blockloop)
{
- get(i).ExtractBigData(hashtable);
+ blockloop = true;
+
+ for (int i=0; i<Size(); i++)
+ {
+ get(i).ExtractBigData(hashtable);
+ }
+
+ blockloop = false;
}
ExtractBigData(o);
@@ -195,11 +209,26 @@
void ExtractBigData(Object3D o)
{
+ if (o.bRep != null)
+ Grafreed.Assert(o.bRep == this.bRep);
+
o.bRep = this.bRep;
- if (this.bRep != null)
+// July 2019 if (this.bRep != null)
+// {
+// o.transientrep = this.bRep.support;
+// o.bRep.support = null;
+// }
+ o.selection = this.selection;
+ o.versions = this.versions;
+ o.versionindex = this.versionindex;
+
+ if (this.support != null)
{
- o.transientrep = this.bRep.support;
- o.bRep.support = null;
+ if (o.transientrep != null)
+ Grafreed.Assert(o.transientrep == this.support.bRep);
+
+ o.transientrep = this.support.bRep;
+ this.support.bRep = null;
}
// o.support = this.support;
@@ -219,14 +248,14 @@
if (!hashtable.containsKey(GetUUID()))
return;
+ Object3D o = hashtable.get(GetUUID());
+
+ RestoreBigData(o);
+
if (blockloop)
return;
blockloop = true;
-
- Object3D o = hashtable.get(GetUUID());
-
- RestoreBigData(o);
//hashtable.remove(GetUUID());
@@ -241,8 +270,17 @@
void RestoreBigData(Object3D o)
{
this.bRep = o.bRep;
- if (this.bRep != null)
- this.bRep.support = o.transientrep;
+ if (this.support != null && o.transientrep != null)
+ {
+ this.support.bRep = o.transientrep;
+ }
+
+ this.selection = o.selection;
+
+ this.versions = o.versions;
+ this.versionindex = o.versionindex;
+// July 2019 if (this.bRep != null)
+// this.bRep.support = o.transientrep;
// this.support = o.support;
// this.fileparent = o.fileparent;
}
@@ -1374,6 +1412,7 @@
toParent = LA.newMatrix();
fromParent = LA.newMatrix();
}
+
LA.matCopy(other.toParent, toParent);
LA.matCopy(other.fromParent, fromParent);
@@ -7288,8 +7327,8 @@
// {
// CameraPane.Ymax = spoth;
// }
- info.g.drawArc(boundary.x, boundary.y,
- boundary.width, boundary.height, 0, 360);
+ info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
+ (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
// if (CameraPane.Xmin > boundary.x)
// {
--
Gitblit v1.6.2