From 65bdec7ae2c99ca2102c55f92bd62b48c9f14847 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Tue, 01 Oct 2019 17:30:29 -0400
Subject: [PATCH] Disable project on ground + adam/eve/tom
---
Object3D.java | 1084 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 883 insertions(+), 201 deletions(-)
diff --git a/Object3D.java b/Object3D.java
index 1e36e28..abd4fbd 100644
--- a/Object3D.java
+++ b/Object3D.java
@@ -22,21 +22,115 @@
//static final long serialVersionUID = -607422624994562685L;
static final long serialVersionUID = 5022536242724664900L;
+ // Use GetUUID for backward compatibility with null.
private UUID uuid = UUID.randomUUID();
- // TEMPORARY for mocap undo. No need to be transient.
+ // TEMPORARY for versions. No need to be transient.
mocap.reader.BVHReader.BVHResult savebvh;
Object3D saveskeleton;
+
+ // FileObject
+ Object3D savefilecontent;
//
String skyboxname;
String skyboxext;
- byte[] versions[];
+ Object3D[] versionlist;
int versionindex = -1;
+ java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
+
+ int tabIndex;
+
ScriptNode scriptnode;
+ void deepCopyNode(Object3D other)
+ {
+ other.skyboxname = skyboxname;
+ other.skyboxext = skyboxext;
+
+ if (toParent != null)
+ {
+ other.toParent = LA.newMatrix();
+ other.fromParent = LA.newMatrix();
+ LA.matCopy(toParent, other.toParent);
+ LA.matCopy(fromParent, other.fromParent);
+ if (toParentMarked != null)
+ {
+ other.toParentMarked = LA.newMatrix();
+ other.fromParentMarked = LA.newMatrix();
+ LA.matCopy(toParentMarked, other.toParentMarked);
+ LA.matCopy(fromParentMarked, other.fromParentMarked);
+ }
+ }
+ else
+ {
+ if (other.toParent == null)
+// assert(other.toParent == null);
+// new Exception().printStackTrace();
+ System.err.println("null parent: " + other);
+ }
+
+ /*
+ double ident[][] = LA.newMatrix();
+ if (bRep == null)
+ other.bRep = null;
+ else
+ other.bRep = new BoundaryRep(bRep, ident);
+ */
+ // Really new...
+ //other.editWindow = null;
+ if (name == null)
+ other.name = null;
+ else
+ other.name = new String(name);
+
+ if (material != null)
+ {
+ other.material = new cMaterial(material);
+ } else
+ {
+ other.material = null;
+ }
+
+ other.GetTextures().name = GetTextures().name;
+
+ CopyExtraMaterial(other);
+
+ other.touched = touched;
+ other.softtouched = softtouched;
+
+ other.random = random;
+ other.link2master = Link2Support();
+ other.transformcount = transformcount;
+ other.marked = marked;
+ other.skip = skip;
+ other.count = count;
+ other.flipV = flipV;
+ other.live = live;
+ other.rewind = rewind;
+ other.hide = hide;
+ other.texres = texres;
+ other.speedup = speedup;
+ other.height = height;
+ other.depth = depth;
+ }
+
+ int VersionCount()
+ {
+ int count = 0;
+
+ if (versionlist != null)
+ for (int i = versionlist.length; --i >= 0;)
+ {
+ if (versionlist[i] != null)
+ count++;
+ }
+
+ return count;
+ }
+
void InitOthers()
{
if (projectedVertices == null || projectedVertices.length <= 2)
@@ -48,6 +142,7 @@
projectedVertices[i] = new cVector2(); // Others
}
projectedVertices[0].x = 100; // bump
+ projectedVertices[1].y = 1000; // punchthrough. only for png
}
void MinMax(cVector minima, cVector maxima)
@@ -127,7 +222,7 @@
return;
transientsupport = support;
- transientlink2master = link2master;
+ transientlink2master = Link2Support();
support = null;
link2master = false;
@@ -174,9 +269,42 @@
}
}
+ boolean HasBigData()
+ {
+ if (blockloop)
+ return false;
+
+ if (bRep != null)
+ {
+ return true;
+ }
+
+ blockloop = true;
+
+ for (int i = 0; i < Size(); i++)
+ {
+ Object3D child = (Object3D) get(i);
+ if (child == null)
+ continue;
+ if (child.HasBigData())
+ {
+ blockloop = false;
+ return true;
+ }
+ }
+
+ blockloop = false;
+ return false;
+ }
+
void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
{
+ if (blockloop)
+ return;
+
Object3D o;
+
+ boolean isnew = false;
if (hashtable.containsKey(GetUUID()))
{
@@ -190,12 +318,14 @@
}
else
{
+ isnew = true;
+
o = new Object3D("copy of " + this.name);
hashtable.put(GetUUID(), o);
}
- if (!blockloop)
+ //if (!blockloop)
{
blockloop = true;
@@ -206,12 +336,15 @@
blockloop = false;
}
-
- ExtractBigData(o);
+
+ //if (isnew)
+ ExtractBigData(o);
}
void ExtractBigData(Object3D o)
{
+ //System.err.println("ExtractBigData : " + this + " --> " + o);
+
if (o.bRep != null)
Grafreed.Assert(o.bRep == this.bRep);
@@ -222,8 +355,8 @@
// o.bRep.support = null;
// }
o.selection = this.selection;
- o.versions = this.versions;
- o.versionindex = this.versionindex;
+ //o.versionlist = this.versionlist;
+ //o.versionindex = this.versionindex;
if (this.support != null)
{
@@ -246,17 +379,84 @@
// this.fileparent = null;
}
+// Object3D GetObject(java.util.UUID uuid)
+// {
+// if (this.uuid.equals(uuid))
+// return this;
+//
+// if (blockloop)
+// return null;
+//
+// blockloop = true;
+//
+// for (int i=0; i<Size(); i++)
+// {
+// Object3D o = get(i).GetObject(uuid);
+//
+// if (o != null)
+// return o;
+// }
+//
+// blockloop = false;
+//
+// return null;
+// }
+
+ transient boolean tag;
+
+ void TagObjects(Object3D o, boolean tag)
+ {
+ if (blockloop)
+ return;
+
+ o.tag = tag;
+
+ if (o == this)
+ return;
+
+ blockloop = true;
+
+ for (int i=0; i<Size(); i++)
+ {
+ get(i).TagObjects(o, tag);
+ }
+
+ blockloop = false;
+ }
+
+ boolean HasTags()
+ {
+ if (blockloop)
+ return false;
+
+ blockloop = true;
+
+ boolean hasTags = false;
+
+ for (int i=0; i<Size(); i++)
+ {
+ hasTags |= get(i).tag || get(i).HasTags();
+
+ if (hasTags)
+ break;
+ }
+
+ blockloop = false;
+
+ return hasTags;
+ }
+
void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
{
+ if (blockloop)
+ return;
+
if (!hashtable.containsKey(GetUUID()))
return;
Object3D o = hashtable.get(GetUUID());
RestoreBigData(o);
-
- if (blockloop)
- return;
blockloop = true;
@@ -272,6 +472,9 @@
void RestoreBigData(Object3D o)
{
+ //System.err.println("RestoreBigData : " + this + " <-- " + o);
+ Grafreed.Assert(this.bRep == null);
+
this.bRep = o.bRep;
if (this.support != null && o.transientrep != null)
{
@@ -280,8 +483,8 @@
this.selection = o.selection;
- this.versions = o.versions;
- this.versionindex = o.versionindex;
+ //this.versionlist = o.versionlist;
+ //this.versionindex = o.versionindex;
// July 2019 if (this.bRep != null)
// this.bRep.support = o.transientrep;
// this.support = o.support;
@@ -432,7 +635,10 @@
transient boolean keepdontselect;
boolean dontselect = false;
boolean hide = false;
- boolean link2master = 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
@@ -440,6 +646,9 @@
boolean random = false;
boolean speedup = false;
boolean rewind = false;
+
+ // Option to sort triangles, e.g. for transparency.
+ boolean sort = false;
float NORMALPUSH = 0;
@@ -458,7 +667,7 @@
{
sorted = true;
- for (int i=0; i<size()-1; i++)
+ for (int i=0; i<Size()-1; i++)
{
Object3D obji = get(i);
Object3D objj = get(i+1);
@@ -482,7 +691,7 @@
{
sorted = true;
- for (int i=0; i<size()-1; i++)
+ for (int i=0; i<Size()-1; i++)
{
Object3D obji = get(i);
Object3D objj = get(i+1);
@@ -498,11 +707,11 @@
}
}
- int memorysize;
+ transient int memorysize; // needs to be transient, dunno why
int MemorySize()
{
- if (true) // memorysize == 0)
+ if (memorysize == 0)
{
try
{
@@ -617,7 +826,7 @@
{
if (maxcount != 1)
{
- new Exception().printStackTrace();
+ //new Exception().printStackTrace();
}
toParentMarked = LA.newMatrix();
@@ -819,7 +1028,7 @@
void Step()
{
- // marde pour serialization de Texture
+ // patch pour serialization de Texture
resetmaxcount();
resettransformcount();
resetstep();
@@ -1012,21 +1221,28 @@
{
// return true;
- if (material == null || material.multiply)
- return true;
+// if (material == null || material.multiply)
+// return true;
+//
+// if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
+// return false;
+//
+// // Transparent objects are dynamic because we have to sort the triangles.
+// return material.opacity > 0.99;
- // Transparent objects are dynamic because we have to sort the triangles.
- return material.opacity > 0.99;
+ return !sort;
}
boolean IsOpaque()
{
// return true;
- if (material == null || material.multiply)
- return true;
+// if (material == null || material.multiply)
+// return true;
+//
+// return material.opacity > 0.99;
- return material.opacity > 0.99;
+ return !sort;
}
Object3D()
@@ -1104,8 +1320,10 @@
// will share the geometry
assert (!(this instanceof Composite));
- return deepCopy(); // Never called for Composite
-
+
+ Object3D obj = deepCopy(); // Never called for Composite
+ obj.count = 2;
+ return obj;
}
boolean HasLoops()
@@ -1113,6 +1331,30 @@
return false;
}
+ void ResetUUIDs()
+ {
+ if (blockloop)
+ {
+ return;
+ }
+
+ this.uuid = null;
+
+ blockloop = true;
+
+ for (int i = 0; i < Size(); i++)
+ {
+ Object3D obj = (Object3D) Children().get(i);
+
+ if (obj != null)
+ {
+ obj.ResetUUIDs();
+ }
+ }
+
+ blockloop = false;
+ }
+
boolean IsInfinite()
{
if (blockloop)
@@ -1183,78 +1425,16 @@
return;
blockloop = true;
+
+ other.parent = parent;
+
//System.out.println("COPY " + this + " to " + other);
//new Exception().printStackTrace();
+ deepCopyNode(other);
- other.parent = parent;
- if (toParent != null)
- {
- other.toParent = LA.newMatrix();
- other.fromParent = LA.newMatrix();
- LA.matCopy(toParent, other.toParent);
- LA.matCopy(fromParent, other.fromParent);
- if (toParentMarked != null)
- {
- other.toParentMarked = LA.newMatrix();
- other.fromParentMarked = LA.newMatrix();
- LA.matCopy(toParentMarked, other.toParentMarked);
- LA.matCopy(fromParentMarked, other.fromParentMarked);
- }
- }
- else
- {
- if (other.toParent == null)
-// assert(other.toParent == null);
-// new Exception().printStackTrace();
- System.err.println("null parent: " + other);
- }
- /*
- double ident[][] = LA.newMatrix();
- if (bRep == null)
- other.bRep = null;
- else
- other.bRep = new BoundaryRep(bRep, ident);
- */
- // Really new...
other.bRep = bRep; // Share the geometry
other.support = support; // Share the support
-
- //other.editWindow = null;
- if (name == null)
- other.name = null;
- else
- other.name = new String(name);
-
- if (material != null)
- {
- other.material = new cMaterial(material);
- } else
- {
- other.material = null;
- }
-
- other.GetTextures().name = GetTextures().name;
-
- CopyExtraMaterial(other);
-
- other.touched = touched;
- other.softtouched = softtouched;
-
- other.random = random;
- other.link2master = link2master;
- other.transformcount = transformcount;
- other.marked = marked;
- other.skip = skip;
- other.count = count;
- other.flipV = flipV;
- other.live = live;
- other.rewind = rewind;
- other.hide = hide;
- other.texres = texres;
- other.speedup = speedup;
- other.height = height;
- other.depth = depth;
// aout 2013 if (/*displaylist != -1 &&*/other.displaylist != displaylist)
// {
@@ -1310,17 +1490,24 @@
if ((mask & GEOMETRY) != 0)
{
if (bRep != null)
- bRep.overwriteThis(other.bRep==null?other.transientrep:other.bRep);
- else
- assert(other.bRep == null);
-
- if (bRep != null)
{
+ bRep.overwriteThis(other.bRep==null?other.transientrep:other.bRep);
CameraPane.RemoveList(bRep.displaylist);
bRep.displaylist = 0; // june 2013 -1;
}
else
- bRep = bRep;
+ {
+ //assert(other.bRep == null);
+ bRep = other.bRep;
+ }
+
+// if (bRep != null)
+// {
+// CameraPane.RemoveList(bRep.displaylist);
+// bRep.displaylist = 0; // june 2013 -1;
+// }
+// else
+// bRep = bRep;
}
/* Use a MASK = GEO/MAT
@@ -2296,11 +2483,6 @@
InitOthers();
- if (this instanceof Camera)
- {
- material.shift = 90;
- }
-
material.multiply = multiply;
if (multiply)
@@ -2441,6 +2623,11 @@
else
{
//((ObjEditor)editWindow).SetupUI2(null);
+ if (objectUI != null)
+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
+ else
+ //new Exception().printStackTrace();
+ System.err.println("objectUI is null");
}
}
@@ -3116,7 +3303,10 @@
{
if (bRep != null)
{
+ //bRep.GenerateNormals2(crease); // in-place doesn't work. it gives wrong normals (diamond artifact).
bRep.GenerateNormals(crease);
+ if (!bRep.trimmed)
+ bRep.MergeNormals();
Touch();
}
}
@@ -3191,6 +3381,105 @@
blockloop = false;
}
+ public void ResetTransform(int mask)
+ {
+ Object3D obj = this;
+
+ if (mask == -1)
+ {
+ if (obj instanceof Camera) // jan 2014
+ {
+ LA.matIdentity(obj.toParent);
+ LA.matIdentity(obj.fromParent);
+ }
+ else
+ {
+ obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
+ obj.fromParent = null; // LA.matIdentity(obj.fromParent);
+ }
+ return;
+ }
+
+ if ((mask&2) != 0) // Scale/rotation
+ {
+ obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
+ obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
+ obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
+ obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
+ obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
+ obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
+ }
+ if ((mask&1) != 0) // Translation
+ {
+ if (obj.toParent != null)
+ {
+ obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
+ obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
+ }
+ }
+ }
+
+ public void Scale(int scale)
+ {
+ Object3D obj = this;
+
+ obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = scale;
+ obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
+ obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
+ obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1/scale;
+ obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
+ obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
+ }
+
+ public void TextureRatioTransform(int axis)
+ {
+ cTexture tex = GetTextures();
+
+ com.sun.opengl.util.texture.TextureData texturedata = null;
+
+ try
+ {
+ texturedata = Globals.theRenderer.GetTextureData(tex, false, texres);
+ }
+ catch (Exception e)
+ {
+ System.err.println("FAIL TextureRatio: " + this);
+ }
+
+ LA.matIdentity(Object3D.mat);
+ Object3D.mat[axis][axis] = (double)texturedata.getWidth() / texturedata.getHeight();
+
+ if (toParent == null)
+ {
+ toParent = LA.newMatrix();
+ fromParent = LA.newMatrix();
+ }
+
+ ResetTransform(2);
+
+ LA.matConcat(Object3D.mat, fromParent, fromParent);
+ LA.matInvert(fromParent, toParent);
+ }
+
+ void TextureRatio(int axis)
+ {
+ if (blockloop)
+ return;
+
+ blockloop = true;
+
+ TextureRatioTransform(axis);
+
+ for (int i=Size(); --i>=0;)
+ {
+ Object3D v = get(i);
+
+ v.TextureRatio(axis);
+ }
+
+ blockloop = false;
+ }
+
void TransformChildren()
{
if (toParent != null)
@@ -3433,6 +3722,7 @@
if (bRep != null)
{
//bRep.RemoveOneTriangle();
+ System.out.println();
System.out.println("Reducing " + this);
if (name != null && name.contains("lockpickstraps"))
name = name;
@@ -3544,15 +3834,47 @@
void ClearMaterials()
{
+ if (blockloop)
+ return;
+
+ blockloop = true;
+
ClearMaterial();
- for (int i = 0; i < size(); i++)
+ for (int i = 0; i < Size(); i++)
{
- Object3D child = (Object3D) reserve(i);
+ Object3D child = (Object3D) get(i);
if (child == null)
continue;
child.ClearMaterials();
- release(i);
}
+
+ blockloop = false;
+ }
+
+ void ClearVersionList()
+ {
+ this.versionlist = null;
+ this.versionindex = -1;
+ this.versiontable = null;
+ }
+
+ void ClearVersions()
+ {
+ if (blockloop)
+ return;
+
+ blockloop = true;
+
+ ClearVersionList();
+ for (int i = 0; i < Size(); i++)
+ {
+ Object3D child = (Object3D) get(i);
+ if (child == null)
+ continue;
+ child.ClearVersions();
+ }
+
+ blockloop = false;
}
void FlipV(boolean flip)
@@ -3731,6 +4053,7 @@
void RevertMeshes()
{
+ // BLOCKLOOP
if (this instanceof cMesh)
{
((cMesh)this).Revert();
@@ -3761,11 +4084,6 @@
Touch();
}
- ResetRecur();
- }
-
- void ResetRecur()
- {
for (int i = 0; i < size(); i++)
{
Object3D child = (Object3D) get(i); // reserve(i);
@@ -3788,11 +4106,6 @@
Step();
Touch();
- StepRecur();
- }
-
- void StepRecur()
- {
for (int i = 0; i < size(); i++)
{
Object3D child = (Object3D) get(i); // reserve(i);
@@ -3979,8 +4292,8 @@
Touch();
}
- transient cVector min = new cVector();
- transient cVector max = new cVector();
+ transient cVector min;
+ transient cVector max;
void getBounds(cVector minima, cVector maxima, boolean xform)
{
@@ -3996,15 +4309,15 @@
if (blockloop)
return;
- if (min == null) // ???
+ if (min == null)
{
min = new cVector();
max = new cVector();
}
- for (int i = 0; i<size(); i++)
+ for (int i = 0; i<Size(); i++)
{
- Object3D child = (Object3D) reserve(i);
+ Object3D child = (Object3D) get(i); //reserve(i);
if (child == null)
continue;
@@ -4023,21 +4336,21 @@
if (child.hide && !(child instanceof Merge) || child.skip)
//if (child.hide)
{
- release(i);
+ //release(i);
continue;
}
blockloop = true;
child.getBounds(min, max, true); // xform);
blockloop = false;
- release(i);
+ //release(i);
MinMax(minima, maxima);
}
if (bRep != null)
{
- bRep.getBounds(minima,maxima,this);
+ bRep.getBounds(minima, maxima, xform?this:null);
}
if (false) // xform)
@@ -5542,6 +5855,11 @@
if (fullname == null)
return "";
+ if (fullname.pigment != null)
+ {
+ return fullname.pigment;
+ }
+
// System.out.println("Fullname = " + fullname);
// Does not work on Windows due to C:
@@ -5554,7 +5872,7 @@
if (split.length == 0)
{
- return "";
+ return fullname.pigment = "";
}
if (split.length <= 2)
@@ -5562,22 +5880,27 @@
if (fullname.name.endsWith(":"))
{
// Windows
- return fullname.name.substring(0, fullname.name.length()-1);
+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
}
- return split[0];
+ return fullname.pigment = split[0];
}
// Windows
assert(split.length == 4);
- return split[0] + ":" + split[1];
+ return fullname.pigment = split[0] + ":" + split[1];
}
static String GetBump(cTexture fullname)
{
if (fullname == null)
return "";
+
+ if (fullname.bump != null)
+ {
+ return fullname.bump;
+ }
// System.out.println("Fullname = " + fullname);
// Does not work on Windows due to C:
@@ -5589,12 +5912,12 @@
if (split.length == 0)
{
- return "";
+ return fullname.bump = "";
}
if (split.length == 1)
{
- return "";
+ return fullname.bump = "";
}
if (split.length == 2)
@@ -5602,16 +5925,16 @@
if (fullname.name.endsWith(":"))
{
// Windows
- return "";
+ return fullname.bump = "";
}
- return split[1];
+ return fullname.bump = split[1];
}
// Windows
assert(split.length == 4);
- return split[2] + ":" + split[3];
+ return fullname.bump = split[2] + ":" + split[3];
}
String GetPigmentTexture()
@@ -5694,6 +6017,9 @@
texname = "";
GetTextures().name = texname + ":" + GetBump(GetTextures());
+
+ GetTextures().pigment = null;
+
Touch();
}
@@ -5767,6 +6093,8 @@
GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
+ GetTextures().bump = null;
+
Touch();
}
@@ -5831,7 +6159,7 @@
boolean NeedSupport()
{
return
- CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /*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);
}
@@ -5849,6 +6177,20 @@
return parent.IsLive();
}
+ boolean IsDynamic()
+ {
+ 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();
+
void Draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
{
Invariants(); // june 2013
@@ -5856,6 +6198,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 &&
@@ -5909,8 +6274,11 @@
if (support != null)
support = support;
- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
- boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
+ 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 &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
if (!usecalllists && bRep != null && bRep.displaylist > 0)
{
@@ -5918,10 +6286,12 @@
bRep.displaylist = 0;
}
// usecalllists &= !(parent instanceof RandomNode);
- // usecalllists = false;
+ if (CameraPane.BOXMODE) // Too dynamic
+ usecalllists = false;
- if (GetBRep() != null)
- usecalllists = usecalllists;
+ if (display.DrawMode() == display.SHADOW)
+ //GetBRep() != null)
+ usecalllists = !!usecalllists;
//System.out.println("draw " + this);
//new Exception().printStackTrace();
@@ -5943,7 +6313,7 @@
if (!(this instanceof Composite))
touched = false;
//if (displaylist == -1 && usecalllists)
- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
{
bRep.displaylist = display.GenList();
assert(bRep.displaylist != 0);
@@ -5954,7 +6324,7 @@
//System.out.println("\tnew list " + list);
//gl.glDrawBuffer(gl.GL_NONE);
- if (usecalllists)
+ if (usecalllists && bRep.displaylist > 0)
{
// System.err.println("new list " + bRep.displaylist + " for " + this);
display.NewList(bRep.displaylist);
@@ -5963,7 +6333,7 @@
CallList(display, root, selected, blocked);
// compiled = true;
- if (usecalllists)
+ if (usecalllists && bRep.displaylist > 0)
{
// System.err.println("end list " + bRep.displaylist + " for " + this);
display.EndList();
@@ -5973,8 +6343,8 @@
Globals.lighttouched = true; // all panes...
}
- touched = GetBRep() == null; // this instanceof Composite || this instanceof FileObject; // false;
- //touched = false;
+ //touched = GetBRep() == null; // this instanceof Composite || this instanceof FileObject; // false;
+ touched = false;
if (this instanceof Texture || this instanceof TextureNode)
{
@@ -6013,7 +6383,7 @@
{
if (display.DrawMode() == iCameraPane.SHADOW)
{
- if (!link2master // 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");
@@ -6075,6 +6445,20 @@
{
drawSelf(display, root, selected, blocked);
}
+
+// if (!(this instanceof Composite))
+// {
+// for (int i = 0; i < size(); i++)
+// {
+// Object3D child = (Object3D) reserve(i);
+// if (child == null)
+// continue;
+//
+// child.draw(display, root, selected, blocked);
+//
+// release(i);
+// }
+// }
} else
{
/*
@@ -6107,13 +6491,14 @@
boolean failedPigment = false;
boolean failedBump = false;
+ CameraPane.lastObject = this;
try
{
display.BindPigmentTexture(tex, texres);
}
catch (Exception e)
{
- System.err.println("FAILED: " + this);
+ // System.err.println("FAILED: " + this);
failedPigment = true;
}
@@ -6144,6 +6529,20 @@
display.CallList(bRep.displaylist);
// june 2013 drawSelf(display, root, selected);
}
+ }
+
+ assert (!(this instanceof Composite));
+ {
+// CRASH MOCAP!! for (int i = 0; i < size(); i++)
+// {
+// Object3D child = (Object3D) reserve(i);
+// if (child == null)
+// continue;
+//
+// child.draw(display, root, selected, blocked);
+//
+// release(i);
+// }
}
}
@@ -6197,16 +6596,17 @@
void CallList(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
{
- if (GetBRep() == null)
- {
- drawSelf(display, root, selected, blocked);
- } else
+ if (GetBRep() != null)
{
DrawNode(display, root, selected);
if (this instanceof BezierPatch)
{
//drawSelf(display, root, selected);
}
+ }
+ else
+ {
+ drawSelf(display, root, selected, blocked);
}
}
@@ -6456,7 +6856,7 @@
//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();
@@ -6618,7 +7018,7 @@
facescompare[k] = new FaceCompare(k);
}
- center = new cVector();
+ centertriangle = new cVector();
}
else
{
@@ -6741,7 +7141,7 @@
*/
}
- transient cVector center;
+ transient cVector centertriangle;
class FaceCompare implements Comparable
{
@@ -6770,14 +7170,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;
@@ -7367,7 +7767,7 @@
boundary.y = spot.y - 30;
boundary.width = spot.width + 60;
boundary.height = spot.height + 60;
- clickInfo.g.setColor(Color.red);
+ clickInfo.g.setColor(Color.white);
int spotw = spot.x + spot.width;
int spoth = spot.y + spot.height;
clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
@@ -7387,7 +7787,29 @@
// {
// CameraPane.Ymax = spoth;
// }
- spot.translate(32, 32);
+// if (CameraPane.Xmin > spot.x)
+// {
+// CameraPane.Xmin = spot.x;
+// }
+// if (CameraPane.Xmax < spotw)
+// {
+// CameraPane.Xmax = spotw;
+// }
+// if (CameraPane.Ymin > spot.y)
+// {
+// CameraPane.Ymin = spot.y;
+// }
+// if (CameraPane.Ymax < spoth)
+// {
+// CameraPane.Ymax = spoth;
+// }
+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
+ spot.translate(32, 0);
+ clickInfo.g.setColor(Color.yellow);
+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
+
+ spot.translate(32, 64);
spotw = spot.x + spot.width;
spoth = spot.y + spot.height;
clickInfo.g.setColor(Color.cyan);
@@ -7408,28 +7830,7 @@
// {
// CameraPane.Ymax = spoth;
// }
- // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
- //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
- spot.translate(0, -32);
- clickInfo.g.setColor(Color.yellow);
- clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
clickInfo.g.setColor(Color.green);
-// if (CameraPane.Xmin > spot.x)
-// {
-// CameraPane.Xmin = spot.x;
-// }
-// if (CameraPane.Xmax < spotw)
-// {
-// CameraPane.Xmax = spotw;
-// }
-// if (CameraPane.Ymin > spot.y)
-// {
-// CameraPane.Ymin = spot.y;
-// }
-// if (CameraPane.Ymax < spoth)
-// {
-// CameraPane.Ymax = spoth;
-// }
clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
(int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
@@ -7488,12 +7889,14 @@
retval = true;
}
spot.translate(0, 32);
+ spot.translate(32, 0);
+ spot.translate(0, 32);
if (spot.contains(clickInfo.x, clickInfo.y))
{
hitSomething = hitScale;
double scale = 0.005f * clickInfo.camera.Distance();
- double hScale = (double) (clickInfo.x /*- centerPt.x*/) / 32;
+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
double sign = 1;
if (hScale < 0)
{
@@ -7505,7 +7908,7 @@
//hScale = 0.01;
}
- double vScale = (double) (clickInfo.y /*- centerPt.y*/) / 32;
+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
sign = 1;
if (vScale < 0)
{
@@ -7585,7 +7988,9 @@
scale *= 0.05f * Globals.theRenderer.RenderCamera().Distance();
- if (modified || opposite)
+ // Modified could snap
+ if (//modified ||
+ opposite)
{
//assert(false);
/*
@@ -7679,7 +8084,7 @@
if (modified)
{
- // Rotate 90 degrees
+ // Rotate 45 degrees
angle /= (Math.PI / 4);
angle = Math.floor(angle + 0.5);
angle *= (Math.PI / 4);
@@ -7720,7 +8125,7 @@
break;
case hitScale: // scale
- double hScale = (double) (clickInfo.x /*- centerPt.x*/) / 32;
+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
double sign = 1;
if (hScale < 0)
{
@@ -7732,7 +8137,7 @@
//hScale = 0.01;
}
- double vScale = (double) (clickInfo.y /*- centerPt.y*/) / 32;
+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
sign = 1;
if (vScale < 0)
{
@@ -7765,21 +8170,27 @@
case 3: // '\001'
if (modified || opposite)
{
+ if (modified) // && opposite)
+ LA.matScale(toParent, totalScale, totalScale, totalScale);
+ else
//LA.matScale(toParent, 1, hScale, vScale);
- LA.matScale(toParent, totalScale, 1, 1);
+ LA.matScale(toParent, totalScale, 1, 1);
} // vScale, 1);
else
{
// EXCEPTION!
- LA.matScale(toParent, totalScale, totalScale, totalScale);
+ LA.matScale(toParent, 1, totalScale, totalScale);
} // vScale, 1);
break;
case 2: // '\002'
if (modified || opposite)
{
- //LA.matScale(toParent, hScale, 1, vScale);
- LA.matScale(toParent, 1, totalScale, 1);
+ if (modified) // && opposite)
+ LA.matScale(toParent, totalScale, totalScale, totalScale);
+ else
+ //LA.matScale(toParent, hScale, 1, vScale);
+ LA.matScale(toParent, 1, totalScale, 1);
} else
{
LA.matScale(toParent, totalScale, 1, totalScale);
@@ -7789,8 +8200,11 @@
case 1: // '\003'
if (modified || opposite)
{
- //LA.matScale(toParent, hScale, vScale, 1);
- LA.matScale(toParent, 1, 1, totalScale);
+ if (modified) // && opposite)
+ LA.matScale(toParent, totalScale, totalScale, totalScale);
+ else
+ //LA.matScale(toParent, hScale, vScale, 1);
+ LA.matScale(toParent, 1, 1, totalScale);
} else
{
LA.matScale(toParent, totalScale, totalScale, 1);
@@ -7941,12 +8355,12 @@
if (!Globals.ADVANCED)
return objname;
- return objname + " " + System.identityHashCode(this);
+ return objname + " " + System.identityHashCode(this) + " " + GetUUID();
}
public int hashCode()
{
- // Fuck Vector...
+ // Do not use Vector...
return System.identityHashCode(this);
}
@@ -8186,8 +8600,8 @@
private static cVector2 qq2 = new cVector2();
private static cVector2 rr2 = new cVector2();
private static cVector2 ss2 = new cVector2();
- private static cVector edge1 = new cVector();
- private static cVector edge2 = new cVector();
+// private static cVector edge1 = new cVector();
+// private static cVector edge2 = new cVector();
//private static cVector norm = new cVector();
/*transient private*/ int hitSomething;
static final int hitCenter = 1;
@@ -8385,7 +8799,275 @@
Touch();
}
+
+ static Vertex s1 = new Vertex();
+ static Vertex s2 = new Vertex();
+ static Vertex s3 = new Vertex();
+ boolean intersectMesh(Ray ray, IntersectResult result)
+ {
+ boolean success = false;
+
+ if (bRep.stripified)
+ {
+ int[] strips = bRep.getRawIndices();
+
+ // TRIANGLE STRIP ARRAY
+ if (bRep.trimmed)
+ {
+ float[] v = bRep.getRawVertices();
+
+ int count3 = 0;
+
+ if (v.length > 0)
+ {
+ for (int i = 0; i < strips.length; i++)
+ {
+ s1.set(v[count3], v[count3 + 1], v[count3 + 2]);
+ count3 += 3;
+
+ s2.set(v[count3], v[count3 + 1], v[count3 + 2]);
+ count3 += 3;
+
+ for (int j = 0; j < strips[i] - 2; j++)
+ {
+ s3.set(v[count3], v[count3 + 1], v[count3 + 2]);
+ count3 += 3;
+
+ if (j%2 == 0)
+ success |= intersectTriangle(ray, result, s1, s2, s3);
+ else
+ success |= intersectTriangle(ray, result, s1, s3, s2);
+
+ s1.set(s2);
+ s2.set(s3);
+ }
+ }
+ }
+
+ assert count3 == v.length;
+ }
+ else // !trimmed
+ {
+ int count = 0;
+ for (int i = 0; i < strips.length; i++)
+ {
+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
+
+ for (int j = 0; j < strips[i] - 2; j++)
+ {
+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
+
+ if (j%2 == 0)
+ success |= intersectTriangle(ray, result, p, q, r);
+ else
+ success |= intersectTriangle(ray, result, p, r, q);
+
+ p = q;
+ q = r;
+ }
+ }
+ }
+ } else // catch (Error e)
+ {
+ int facecount = bRep.FaceCount();
+ for (int i = 0; i < facecount; i++)
+ {
+ Face face = bRep.GetFace(i);
+
+ Vertex p = bRep.GetVertex(face.p);
+ Vertex q = bRep.GetVertex(face.q);
+ Vertex r = bRep.GetVertex(face.r);
+
+ success |= intersectTriangle(ray, result, p, q, r);
+ }
+ }
+
+ return success;
+ }
+
+ static cVector eye = new cVector();
+ static cVector dir = new cVector();
+
+ transient BBox bbox = null;
+
+ boolean intersect(Ray ray, IntersectResult result)
+ {
+ double eyex = ray.eyePoint.x;
+ double eyey = ray.eyePoint.y;
+ double eyez = ray.eyePoint.z;
+
+ double dirx = ray.viewDirection.x;
+ double diry = ray.viewDirection.y;
+ double dirz = ray.viewDirection.z;
+
+ if (this.fromParent != null && !(this instanceof TextureNode))
+ {
+ eye.x = eyex;
+ eye.y = eyey;
+ eye.z = eyez;
+ dir.x = dirx;
+ dir.y = diry;
+ dir.z = dirz;
+
+ LA.xformPos(eye, this.fromParent, eye);
+ LA.xformDir(dir, this.fromParent, dir);
+
+ ray.eyePoint.x = eye.x;
+ ray.eyePoint.y = eye.y;
+ ray.eyePoint.z = eye.z;
+
+ ray.viewDirection.x = dir.x;
+ ray.viewDirection.y = dir.y;
+ ray.viewDirection.z = dir.z;
+ }
+
+ boolean success = false;
+
+ boolean touch = false;
+
+ if (bRep != null && Link2Support())
+ {
+ if (bbox == null)
+ {
+ bbox = new BBox();
+
+ cVector min = new cVector();
+ cVector max = new cVector();
+
+ this.getBounds(min, max, true);
+
+ bbox.min.x = min.x;
+ bbox.min.y = min.y;
+ bbox.min.z = min.z;
+
+ bbox.max.x = max.x;
+ bbox.max.y = max.y;
+ bbox.max.z = max.z;
+ }
+
+ if (true) // NOT WORKING bbox.intersect(ray, result))
+ {
+ success |= intersectMesh(ray, result);
+ }
+ else
+ {
+ //this.hide = true;
+ touch = true;
+ }
+ }
+
+ for (int i=0; i<size(); i++)
+ {
+ Object3D child = (Object3D) reserve(i);
+
+ if (child == null)
+ continue;
+
+ success |= child.intersect(ray, result);
+ release(i);
+ }
+
+ ray.eyePoint.x = eyex;
+ ray.eyePoint.y = eyey;
+ ray.eyePoint.z = eyez;
+
+ ray.viewDirection.x = dirx;
+ ray.viewDirection.y = diry;
+ ray.viewDirection.z = dirz;
+
+// if (touch)
+// this.Touch(); // refresh display list
+
+ return success;
+ }
+
+ static Vector3d edge1 = new Vector3d();
+ static Vector3d edge2 = new Vector3d();
+ static Vector3d P = new Vector3d();
+ static Vector3d T = new Vector3d();
+ static Vector3d Q = new Vector3d();
+
+ 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.
+
+ Reference: http://www.cs.virginia.edu/~gfx/Courses/2003/ImageSynthesis/papers/Acceleration/Fast%20MinimumStorage%20RayTriangle%20Intersection.pdf
+ */
+
+ // Calculate edges of the triangle
+ edge1.set(v2.x - v1.x, v2.y - v1.y, v2.z - v1.z);
+ edge2.set(v3.x - v1.x, v3.y - v1.y, v3.z - v1.z);
+
+ // Calculate the determinant (U parameter)
+ P.cross(ray.viewDirection, edge2);
+ double det = edge1.dot(P);
+
+ if (det > -1e-9 && det < 1e-9)
+ {
+ return false;
+ } // Ray lies in plane of triangle
+
+ double invDet = 1 / det;
+
+ // Calculate distance from vertex1 to ray origin
+ T.set(ray.eyePoint.x - v1.x, ray.eyePoint.y - v1.y, ray.eyePoint.z - v1.z);
+
+ double U = (T.dot(P)) * invDet; // Calculate U parameter
+
+ if (U < 0.f || U > 1.f)
+ {
+ return false;
+ } // Intersection lies outside of the triangle
+
+ // Calculate V parameter
+ Q.cross(T, edge1);
+
+ double V = ray.viewDirection.dot(Q) * invDet;
+
+ if (V < 0.f || (U + V) > 1.f)
+ {
+ return false;
+ } // Intersection lies outside of the triangle
+
+ double t = edge2.dot(Q) * invDet;
+
+ if (t > 1e-9) // Triangle and ray intersects
+ {
+ //result.isIntersected = true;
+ //result.id = id;
+
+ if (false) // isShadow)
+ {
+ result.t = t;
+ return true;
+ } else if (t < result.t)
+ {
+ result.object = this;
+
+ result.t = t;
+
+ //result.p.x = ray.eyePoint.x + ray.viewDirection.x * t;
+ //result.p.y = ray.eyePoint.y + ray.viewDirection.y * t;
+ //result.p.z = ray.eyePoint.z + ray.viewDirection.z * t;
+
+ result.n.cross(edge1, edge2);
+ result.n.normalize();
+ }
+
+ return true;
+ }
+
+ return false;
+ }
public int Size()
{
--
Gitblit v1.6.2