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 | 335 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 244 insertions(+), 91 deletions(-)
diff --git a/Object3D.java b/Object3D.java
index 3b928eb..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;
@@ -100,7 +116,7 @@
other.softtouched = softtouched;
other.random = random;
- other.link2support = link2support;
+ other.link2master = Link2Support();
other.transformcount = transformcount;
other.marked = marked;
other.skip = skip;
@@ -220,10 +236,10 @@
return;
transientsupport = support;
- transientlink2master = link2support;
+ transientlink2master = Link2Support();
support = null;
- link2support = false;
+ link2master = false;
if (bRep != null)
{
@@ -247,7 +263,7 @@
return;
support = transientsupport;
- link2support = transientlink2master;
+ link2master = transientlink2master;
transientsupport = null;
transientlink2master = false;
@@ -633,7 +649,10 @@
transient boolean keepdontselect;
boolean dontselect = false;
boolean hide = false;
- boolean link2support = false; // performs reset support/master at each frame
+
+ boolean link2master = false; // performs reset support/master at each frame (cannot rename due to serialization)
+ boolean link2support = false; // (cannot rename due to serialization)
+
boolean marked = false; // animation node
boolean skip = false; // centroid issue
boolean skipmocap = false; // mocap data
@@ -654,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);
}
}
@@ -706,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()
@@ -1023,7 +1114,7 @@
void Step()
{
- // marde pour serialization de Texture
+ // patch pour serialization de Texture
resetmaxcount();
resettransformcount();
resetstep();
@@ -1058,7 +1149,7 @@
transformcount++;
}
- int maxcount;
+ int maxcount = 128;
int transformcount;
int step;
@@ -1111,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
@@ -1137,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);
@@ -1421,7 +1517,7 @@
blockloop = true;
- other.parent = parent;
+ // other.parent = parent;
//System.out.println("COPY " + this + " to " + other);
//new Exception().printStackTrace();
@@ -1457,7 +1553,7 @@
Object3D obj = (Object3D)Children().get(i);
if (IsContainedIn(obj))
{
-// assert(false); // ?!?!?!?!?!
+ assert(false); // ?!?!?!?!?!
c.Children().setElementAt(c, i);
}
else
@@ -2202,7 +2298,7 @@
{
support = other;
- link2support = support != null;
+ link2master = support != null;
if (support != null && bRep.trimmed)
{
@@ -2555,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)
{
@@ -2565,7 +2661,7 @@
// super.UpdateMaterial(anchor, current, false);
if (material != null)
{
- material.UpdateMaterial(anchor, current);
+ material.UpdateMaterial(anchor, current, colorparallax);
}
if (!propagate)
@@ -2579,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);
}
@@ -2593,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);
}
@@ -3414,7 +3510,7 @@
}
}
- public void Scale(int scale)
+ public void Scale(float scale)
{
Object3D obj = this;
@@ -3921,7 +4017,7 @@
//if (bRep != null)
if (//marked || // does not make sense
(bRep != null || material != null)) // borderline...
- link2support = h;
+ link2master = h;
for (int i = 0; i < Size(); i++)
{
@@ -4101,11 +4197,6 @@
Step();
Touch();
- StepRecur();
- }
-
- void StepRecur()
- {
for (int i = 0; i < size(); i++)
{
Object3D child = (Object3D) get(i); // reserve(i);
@@ -5623,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()
{
@@ -5677,6 +5769,7 @@
{
//System.out.println("HardTouch " + this); // new Exception().printStackTrace();
//new Exception().printStackTrace();
+ reset = true;
touched = true;
CameraPane.touched = true;
//if (parent != null)
@@ -6159,7 +6252,7 @@
boolean NeedSupport()
{
return
- CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2support && /*live &&*/ support != null
+ CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && Link2Support() && /*live &&*/ support != null
// PROBLEM with CROWD!!
&& (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || Globals.CROWD);
}
@@ -6182,6 +6275,17 @@
return live && bRep != null;
}
+ boolean Link2Support()
+ {
+ return link2master || link2support;
+ }
+
+ static cVector minima = new cVector();
+ 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
@@ -6189,6 +6293,29 @@
if (support != null)
{
// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
+ }
+
+ if (false) // live && Link2Support() && support == null && !this.marked) // project on ground
+ {
+ getBounds(minima, maxima, true);
+ center.x = (minima.x + maxima.x) / 2;
+ center.y = 10000; // (minima.y + maxima.y) / 2;
+ center.z = (minima.z + maxima.z) / 2;
+
+ Ray ray = new Ray(center, new Vector3d(0,-1,0));
+
+ IntersectResult res = new IntersectResult();
+ res.t = Double.POSITIVE_INFINITY;
+
+ if (Grafreed.grafreed.universe.intersect(ray, res))
+ {
+ double resx = ray.eyePoint.x + ray.viewDirection.x * res.t;
+ double resy = ray.eyePoint.y + ray.viewDirection.y * res.t;
+ double resz = ray.eyePoint.z + ray.viewDirection.z * res.t;
+
+ LA.matTranslate(toParent, 0, resy - minima.y, 0);
+ LA.matInvert(toParent, fromParent);
+ }
}
if (display.DrawMode() == iCameraPane.SELECTION &&
@@ -6243,8 +6370,9 @@
support = support;
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);
+ IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !Link2Support()); // !(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.
@@ -6254,7 +6382,8 @@
bRep.displaylist = 0;
}
// usecalllists &= !(parent instanceof RandomNode);
- // usecalllists = false;
+ if (CameraPane.BOXMODE) // Too dynamic
+ usecalllists = false;
if (display.DrawMode() == display.SHADOW)
//GetBRep() != null)
@@ -6268,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...
@@ -6297,7 +6426,9 @@
display.NewList(bRep.displaylist);
}
+ compiling = true;
CallList(display, root, selected, blocked);
+ compiling = false;
// compiled = true;
if (usecalllists && bRep.displaylist > 0)
@@ -6350,7 +6481,7 @@
{
if (display.DrawMode() == iCameraPane.SHADOW)
{
- if (!link2support // tricky to cull in shadow mode.
+ if (!Link2Support() // tricky to cull in shadow mode.
&& GetBRep().FrustumCull(this, null, display.LightCamera(), true))
{
//System.out.print("CULLED");
@@ -6498,7 +6629,7 @@
}
}
- assert (!(this instanceof Composite));
+ // Bezier surface: assert (!(this instanceof Composite));
{
// CRASH MOCAP!! for (int i = 0; i < size(); i++)
// {
@@ -6772,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);
@@ -6823,7 +6957,8 @@
//javax.media.opengl.GL gl = display.GetGL();
- if (CameraPane.BOXMODE && !selected) // || CameraPane.movingcamera)
+ if (CameraPane.BOXMODE && !Link2Support()) //
+ //!selected) // || CameraPane.movingcamera)
{
int fc = bRep.FaceCount();
int vc = bRep.VertexCount();
@@ -6985,7 +7120,7 @@
facescompare[k] = new FaceCompare(k);
}
- center = new cVector();
+ centertriangle = new cVector();
}
else
{
@@ -7108,7 +7243,7 @@
*/
}
- transient cVector center;
+ transient cVector centertriangle;
class FaceCompare implements Comparable
{
@@ -7137,14 +7272,14 @@
Vertex q = bRep.GetVertex(face.q);
Vertex r = bRep.GetVertex(face.r);
- center.set(p);
- center.add(q);
- center.add(r);
- center.mul(1.0/3);
+ centertriangle.set(p);
+ centertriangle.add(q);
+ centertriangle.add(r);
+ centertriangle.mul(1.0/3);
- center.sub(Globals.theRenderer.EyeCamera().location);
+ centertriangle.sub(Globals.theRenderer.EyeCamera().location);
- distance = center.dot(center);
+ distance = centertriangle.dot(centertriangle);
}
return distance;
@@ -8315,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();
@@ -8327,7 +8462,7 @@
public int hashCode()
{
- // Fuck Vector...
+ // Do not use Vector...
return System.identityHashCode(this);
}
@@ -8869,7 +9004,7 @@
double diry = ray.viewDirection.y;
double dirz = ray.viewDirection.z;
- if (this.fromParent != null)
+ if (this.fromParent != null && !(this instanceof TextureNode))
{
eye.x = eyex;
eye.y = eyey;
@@ -8894,7 +9029,7 @@
boolean touch = false;
- if (bRep != null)
+ if (bRep != null && Link2Support())
{
if (bbox == null)
{
@@ -8903,7 +9038,7 @@
cVector min = new cVector();
cVector max = new cVector();
- this.getBounds(min, max, false);
+ this.getBounds(min, max, true);
bbox.min.x = min.x;
bbox.min.y = min.y;
@@ -8914,7 +9049,7 @@
bbox.max.z = max.z;
}
- if (bbox.intersect(ray, result))
+ if (true) // NOT WORKING bbox.intersect(ray, result))
{
success |= intersectMesh(ray, result);
}
@@ -8958,6 +9093,12 @@
private boolean intersectTriangle(Ray ray, IntersectResult result, Vertex v1, Vertex v2, Vertex v3)
{
+ if (false)
+ {
+ result.t = 0;
+ return true;
+ }
+
/*
Fast, Minimum Storage Ray/Triangle Intersection, Moller et al.
@@ -9125,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