From ddb10cb84dddfeef1ef9946f2e13cef3c93e6cc4 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Wed, 20 Nov 2019 20:49:12 -0500
Subject: [PATCH] New maze
---
Object3D.java | 240 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 178 insertions(+), 62 deletions(-)
diff --git a/Object3D.java b/Object3D.java
index 0bb1b02..bcefc4f 100644
--- a/Object3D.java
+++ b/Object3D.java
@@ -41,8 +41,24 @@
java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
+ transient int tabIndex; // Tabs can change between sessions.
+
ScriptNode scriptnode;
+ void GetOrigin(cVector o)
+ {
+ o.x = this.toParent[3][0];
+ o.y = this.toParent[3][1];
+ o.z = this.toParent[3][2];
+ }
+
+ void SetOrigin(cVector o)
+ {
+ this.toParent[3][0] = o.x;
+ this.toParent[3][1] = o.y;
+ this.toParent[3][2] = o.z;
+ }
+
void deepCopyNode(Object3D other)
{
other.skyboxname = skyboxname;
@@ -657,27 +673,74 @@
return this;
}
+ class SizeCompare implements Comparable
+ {
+ int size;
+ Object3D child;
+
+ SizeCompare(Object3D c)
+ {
+ child = c;
+ size = c.MemorySize();
+ }
+
+ public int compareTo(Object o)
+ {
+ SizeCompare comp = (SizeCompare) o;
+
+ return comp.size < size ? 1 : -1;
+ }
+ }
+
+ transient SizeCompare[] sizecompare = null;
+
void SortBySize()
{
- boolean sorted = false;
+// boolean sorted = false;
+//
+// while (!sorted)
+// {
+// sorted = true;
+//
+// for (int i=0; i<Size()-1; i++)
+// {
+// Object3D obji = get(i);
+// Object3D objj = get(i+1);
+//
+// if (obji.MemorySize() < objj.MemorySize())
+// {
+// set(i, objj);
+// set(i+1, obji);
+//
+// sorted = false;
+// }
+// }
+// }
+
+ int count = Size();
- while (!sorted)
+ if (sizecompare == null || sizecompare.length != count)
{
- sorted = true;
-
- for (int i=0; i<Size()-1; i++)
+ sizecompare = new SizeCompare[count];
+
+ for (int k=0; k<count; k++)
{
- Object3D obji = get(i);
- Object3D objj = get(i+1);
-
- if (obji.MemorySize() < objj.MemorySize())
- {
- set(i, objj);
- set(i+1, obji);
-
- sorted = false;
- }
+ sizecompare[k] = new SizeCompare(get(k));
}
+ }
+ else
+ {
+ for (int k=0; k<count; k++)
+ {
+ sizecompare[k].size = get(k).MemorySize();
+ }
+ }
+
+ java.util.Arrays.sort(sizecompare);
+
+ for (int i=0; i<count; i++)
+ {
+ set(i, sizecompare[i].child);
}
}
@@ -709,34 +772,59 @@
int MemorySize()
{
- if (memorysize == 0)
+// if (memorysize == 0)
+// {
+// try
+// {
+// Object3D obj = this;
+//
+// Object3D parent = obj.parent;
+// obj.parent = null;
+// Object3D support = obj.support;
+// obj.support = null;
+//
+// java.io.ByteArrayOutputStream baos = new java.io.ByteArrayOutputStream();
+// java.io.ObjectOutputStream out = new java.io.ObjectOutputStream(baos);
+//
+// out.writeObject(obj);
+//
+// obj.parent = parent;
+// obj.support = support;
+//
+// memorysize = baos.toByteArray().length;
+// }
+// catch (Exception e)
+// {
+// e.printStackTrace();
+// }
+// }
+//
+// return memorysize;
+
+ if (blockloop)
{
- try
- {
- Object3D obj = this;
+ return 0;
+ }
- Object3D parent = obj.parent;
- obj.parent = null;
- Object3D support = obj.support;
- obj.support = null;
-
- java.io.ByteArrayOutputStream baos = new java.io.ByteArrayOutputStream();
- java.io.ObjectOutputStream out = new java.io.ObjectOutputStream(baos);
-
- out.writeObject(obj);
-
- obj.parent = parent;
- obj.support = support;
-
- memorysize = baos.toByteArray().length;
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
+ int memory = 0;
+
+ if (bRep != null)
+ {
+ memory = bRep.VertexCount();
}
- return memorysize;
+ blockloop = true;
+
+ for (int i = 0; i < Size(); i++)
+ {
+ Object3D obj = (Object3D) Children().get(i);
+
+ memory += obj.MemorySize();
+ }
+
+ blockloop = false;
+
+ return memory;
}
void Slower()
@@ -1061,7 +1149,7 @@
transformcount++;
}
- int maxcount;
+ int maxcount = 128;
int transformcount;
int step;
@@ -1114,7 +1202,10 @@
if (step == 0)
step = 1;
if (maxcount == 0)
- maxcount = 128; // 2048; // 4;
+ {
+ System.out.println("maxcount == 0");
+ System.exit(0); // maxcount = 128; // 2048; // 4;
+ }
// if (acceleration == 0)
// acceleration = 10;
if (delay == 0) // serial
@@ -1140,6 +1231,8 @@
(Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || !Globals.COMPUTESHADOWWHENLIVE) &&
currentframe != Globals.framecount)
{
+ Globals.lighttouched = true;
+
currentframe = Globals.framecount;
// System.err.println("transformcount = " + transformcount);
@@ -1424,7 +1517,7 @@
blockloop = true;
- other.parent = parent;
+ // other.parent = parent;
//System.out.println("COPY " + this + " to " + other);
//new Exception().printStackTrace();
@@ -1460,7 +1553,7 @@
Object3D obj = (Object3D)Children().get(i);
if (IsContainedIn(obj))
{
-// assert(false); // ?!?!?!?!?!
+ assert(false); // ?!?!?!?!?!
c.Children().setElementAt(c, i);
}
else
@@ -2558,7 +2651,7 @@
return b;
}
- void UpdateMaterial(cMaterial anchor, cMaterial current, boolean propagate)
+ void UpdateMaterial(cMaterial anchor, cMaterial current, boolean propagate, boolean colorparallax)
{
if (blockloop)
{
@@ -2568,7 +2661,7 @@
// super.UpdateMaterial(anchor, current, false);
if (material != null)
{
- material.UpdateMaterial(anchor, current);
+ material.UpdateMaterial(anchor, current, colorparallax);
}
if (!propagate)
@@ -2582,7 +2675,7 @@
if (child == null)
continue;
blockloop = true;
- child.UpdateMaterial(anchor, current, propagate);
+ child.UpdateMaterial(anchor, current, propagate, false);
blockloop = false;
Children().release(i);
}
@@ -2596,7 +2689,7 @@
if (child == null)
continue;
blockloop = true;
- child.UpdateMaterial(anchor, current, propagate);
+ child.UpdateMaterial(anchor, current, propagate, false);
blockloop = false;
Children().release(i);
}
@@ -3417,7 +3510,7 @@
}
}
- public void Scale(int scale)
+ public void Scale(float scale)
{
Object3D obj = this;
@@ -5621,8 +5714,9 @@
{
}
// transient int displaylist = 0; // -1;
- transient boolean touched = true;
- transient boolean softtouched = true;
+ transient boolean reset = false; // Recalculate
+ transient boolean touched = true; // call list only
+ transient boolean softtouched = true; // aucune idee
void Touch()
{
@@ -5675,6 +5769,7 @@
{
//System.out.println("HardTouch " + this); // new Exception().printStackTrace();
//new Exception().printStackTrace();
+ reset = true;
touched = true;
CameraPane.touched = true;
//if (parent != null)
@@ -6189,6 +6284,8 @@
static cVector maxima = new cVector();
static javax.vecmath.Point3d center = new javax.vecmath.Point3d();
+ boolean compiling;
+
void Draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
{
Invariants(); // june 2013
@@ -6198,7 +6295,7 @@
// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
}
- if (live && Link2Support() && support == null && !this.marked) // project on ground
+ if (false) // live && Link2Support() && support == null && !this.marked) // project on ground
{
getBounds(minima, maxima, true);
center.x = (minima.x + maxima.x) / 2;
@@ -6274,7 +6371,8 @@
boolean usecalllists = !IsDynamic() &&
IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !Link2Support()); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
- //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
+
+ //usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
//usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
@@ -6299,7 +6397,7 @@
if (!selectmode && //display.DrawMode() != display.SELECTION &&
//(touched || (bRep != null && bRep.displaylist <= 0)))
- (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE || touched && Globals.COMPUTESHADOWWHENLIVE)) // || (bRep != null && bRep.displaylist <= 0)))
+ ((Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE) || touched)) // || (bRep != null && bRep.displaylist <= 0)))
{
Globals.lighttouched = true;
} // all panes...
@@ -6328,7 +6426,9 @@
display.NewList(bRep.displaylist);
}
+ compiling = true;
CallList(display, root, selected, blocked);
+ compiling = false;
// compiled = true;
if (usecalllists && bRep.displaylist > 0)
@@ -6529,7 +6629,7 @@
}
}
- assert (!(this instanceof Composite));
+ // Bezier surface: assert (!(this instanceof Composite));
{
// CRASH MOCAP!! for (int i = 0; i < size(); i++)
// {
@@ -6803,15 +6903,18 @@
void DrawNode(iCameraPane display, Object3D /*Composite*/ root, boolean selected)
{
- if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
- return; // no shadow for transparent objects
-
- if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
- return;
+ if (!compiling)
+ {
+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
+ return; // no shadow for transparent objects
+
+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
+ return;
+ }
if (hide)
return;
-
+
if (scriptnode != null)
{
scriptnode.DrawNode(display, root, selected);
@@ -6854,7 +6957,8 @@
//javax.media.opengl.GL gl = display.GetGL();
- if (CameraPane.BOXMODE && !Link2Support()) //selected) // || CameraPane.movingcamera)
+ if (CameraPane.BOXMODE && !Link2Support()) //
+ //!selected) // || CameraPane.movingcamera)
{
int fc = bRep.FaceCount();
int vc = bRep.VertexCount();
@@ -8346,7 +8450,7 @@
objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
} else
{
- objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /*(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") */ "";
+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + ((bRep==null)?(count - 1):bRep.VertexCount()) + ")")) + /*(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") */ "";
} // + super.toString();
//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
@@ -9162,5 +9266,17 @@
return -1;
}
*/
+
+ void Translate(double x, double y, double z)
+ {
+ if (toParent == null)
+ {
+ toParent = LA.newMatrix();
+ fromParent = LA.newMatrix();
+ }
+
+ LA.matTranslate(toParent, x, y, z);
+ LA.matTranslateInv(fromParent, -x, -y, -z);
+ }
}
--
Gitblit v1.6.2