From d5fac992bb6a91e52a90e8318060f5f26ddab982 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sun, 15 Sep 2019 10:55:46 -0400
Subject: [PATCH] Fix navigation and hide cursor.
---
Object3D.java | 924 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 722 insertions(+), 202 deletions(-)
diff --git a/Object3D.java b/Object3D.java
index f8d6c9c..f36024d 100644
--- a/Object3D.java
+++ b/Object3D.java
@@ -22,18 +22,113 @@
//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;
//
- byte[] versions[] = new byte[100][];
+ String skyboxname;
+ String skyboxext;
+
+ Object3D[] versionlist;
int versionindex = -1;
+ java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
+
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 = 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;
+ }
+
+ 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)
@@ -45,6 +140,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)
@@ -171,9 +267,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()))
{
@@ -187,12 +316,14 @@
}
else
{
+ isnew = true;
+
o = new Object3D("copy of " + this.name);
hashtable.put(GetUUID(), o);
}
- if (!blockloop)
+ //if (!blockloop)
{
blockloop = true;
@@ -203,12 +334,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);
@@ -219,8 +353,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)
{
@@ -243,17 +377,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;
@@ -269,6 +470,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)
{
@@ -277,8 +481,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;
@@ -426,6 +630,7 @@
}
boolean live = false;
+ transient boolean keepdontselect;
boolean dontselect = false;
boolean hide = false;
boolean link2master = false; // performs reset support/master at each frame
@@ -436,6 +641,9 @@
boolean random = false;
boolean speedup = false;
boolean rewind = false;
+
+ // Option to sort triangles, e.g. for transparency.
+ boolean sort = false;
float NORMALPUSH = 0;
@@ -494,11 +702,11 @@
}
}
- int memorysize;
+ transient int memorysize; // needs to be transient, dunno why
int MemorySize()
{
- if (true) // memorysize == 0)
+ if (memorysize == 0)
{
try
{
@@ -613,7 +821,7 @@
{
if (maxcount != 1)
{
- new Exception().printStackTrace();
+ //new Exception().printStackTrace();
}
toParentMarked = LA.newMatrix();
@@ -1008,21 +1216,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()
@@ -1100,8 +1315,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()
@@ -1109,6 +1326,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)
@@ -1179,78 +1420,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)
// {
@@ -1306,17 +1485,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
@@ -2292,11 +2478,6 @@
InitOthers();
- if (this instanceof Camera)
- {
- material.shift = 90;
- }
-
material.multiply = multiply;
if (multiply)
@@ -2437,6 +2618,11 @@
else
{
//((ObjEditor)editWindow).SetupUI2(null);
+ if (objectUI != null)
+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
+ else
+ //new Exception().printStackTrace();
+ System.err.println("objectUI is null");
}
}
@@ -2566,7 +2752,8 @@
private static final int editSelf = 1;
private static final int editChild = 2;
- void drawEditHandles(ClickInfo info, int level)
+ void drawEditHandles(//ClickInfo info,
+ int level)
{
if (level == 0)
{
@@ -2574,7 +2761,8 @@
return;
Object3D selectee;
- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
+ level + 1))
{
selectee = (Object3D) e.nextElement();
}
@@ -2582,19 +2770,22 @@
} else
{
//super.
- drawEditHandles0(info, level + 1);
+ drawEditHandles0(//info,
+ level + 1);
}
}
- boolean doEditClick(ClickInfo info, int level)
+ boolean doEditClick(//ClickInfo info,
+ int level)
{
doSomething = 0;
if (level == 0)
{
- return doParentClick(info);
+ return doParentClick(); //info);
}
if (//super.
- doEditClick0(info, level))
+ doEditClick0(//info,
+ level))
{
doSomething = 1;
return true;
@@ -2604,7 +2795,7 @@
}
}
- boolean doParentClick(ClickInfo info)
+ boolean doParentClick() //ClickInfo info)
{
if (selection == null)
{
@@ -2617,7 +2808,8 @@
for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
{
Object3D selectee = (Object3D) e.nextElement();
- if (selectee.doEditClick(info, 1))
+ if (selectee.doEditClick(//info,
+ 1))
{
childToDrag = selectee;
doSomething = 2;
@@ -2629,13 +2821,15 @@
return retval;
}
- void doEditDrag(ClickInfo info, boolean opposite)
+ void doEditDrag(//ClickInfo clickInfo,
+ boolean opposite)
{
switch (doSomething)
{
case 1: // '\001'
//super.
- doEditDrag0(info, opposite);
+ doEditDrag0(//clickInfo,
+ opposite);
break;
case 2: // '\002'
@@ -2648,11 +2842,13 @@
{
//sel.hitSomething = childToDrag.hitSomething;
//childToDrag.doEditDrag(info);
- sel.doEditDrag(info, opposite);
+ sel.doEditDrag(//clickInfo,
+ opposite);
} else
{
//super.
- doEditDrag0(info, opposite);
+ doEditDrag0(//clickInfo,
+ opposite);
}
}
break;
@@ -2670,6 +2866,9 @@
{
deselectAll();
}
+
+ new Exception().printStackTrace();
+
ClickInfo newInfo = new ClickInfo();
newInfo.flags = info.flags;
newInfo.bounds = info.bounds;
@@ -3099,7 +3298,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();
}
}
@@ -3117,7 +3319,7 @@
{
if (bRep != null)
{
- bRep.GenerateNormalsMINE();
+ bRep.MergeNormals(); //.GenerateNormalsMINE();
Touch();
}
}
@@ -3174,6 +3376,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)
@@ -3416,6 +3717,7 @@
if (bRep != null)
{
//bRep.RemoveOneTriangle();
+ System.out.println();
System.out.println("Reducing " + this);
if (name != null && name.contains("lockpickstraps"))
name = name;
@@ -3527,15 +3829,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)
@@ -3985,9 +4319,9 @@
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;
@@ -4006,14 +4340,14 @@
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);
}
@@ -5420,6 +5754,51 @@
blockloop = false;
}
+ void ResetSelectable()
+ {
+ if (blockloop)
+ return;
+
+ blockloop = true;
+
+ keepdontselect = dontselect;
+ dontselect = true;
+
+ Object3D child;
+ int nb = Size();
+ for (int i = 0; i < nb; i++)
+ {
+ child = (Object3D) get(i);
+ if (child == null)
+ continue;
+ child.ResetSelectable();
+ }
+
+ blockloop = false;
+ }
+
+ void RestoreSelectable()
+ {
+ if (blockloop)
+ return;
+
+ blockloop = true;
+
+ dontselect = keepdontselect;
+
+ Object3D child;
+ int nb = Size();
+ for (int i = 0; i < nb; i++)
+ {
+ child = (Object3D) get(i);
+ if (child == null)
+ continue;
+ child.RestoreSelectable();
+ }
+
+ blockloop = false;
+ }
+
boolean IsSelected()
{
if (parent == null)
@@ -5480,6 +5859,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:
@@ -5492,7 +5876,7 @@
if (split.length == 0)
{
- return "";
+ return fullname.pigment = "";
}
if (split.length <= 2)
@@ -5500,22 +5884,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:
@@ -5527,12 +5916,12 @@
if (split.length == 0)
{
- return "";
+ return fullname.bump = "";
}
if (split.length == 1)
{
- return "";
+ return fullname.bump = "";
}
if (split.length == 2)
@@ -5540,16 +5929,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()
@@ -5632,6 +6021,9 @@
texname = "";
GetTextures().name = texname + ":" + GetBump(GetTextures());
+
+ GetTextures().pigment = null;
+
Touch();
}
@@ -5705,6 +6097,8 @@
GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
+ GetTextures().bump = null;
+
Touch();
}
@@ -5725,6 +6119,38 @@
blockloop = true;
child.ResetBumpTexture();
+ blockloop = false;
+ }
+ }
+
+ void EmbedTextures(boolean embed)
+ {
+ if (blockloop)
+ return;
+
+ //if (GetTextures() != null)
+ if (embed)
+ CameraPane.EmbedTextures(GetTextures());
+ else
+ {
+ GetTextures().pigmentdata = null;
+ GetTextures().bumpdata = null;
+ GetTextures().pw = 0;
+ GetTextures().ph = 0;
+ GetTextures().bw = 0;
+ GetTextures().bh = 0;
+ }
+
+ int nb = Size();
+ for (int i = 0; i < nb; i++)
+ {
+ Object3D child = (Object3D) get(i);
+
+ if (child == null)
+ continue;
+
+ blockloop = true;
+ child.EmbedTextures(embed);
blockloop = false;
}
}
@@ -5753,6 +6179,11 @@
return false;
return parent.IsLive();
+ }
+
+ boolean IsDynamic()
+ {
+ return live && bRep != null;
}
void Draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
@@ -5815,8 +6246,11 @@
if (support != null)
support = support;
- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
- boolean usecalllists = !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 || !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);
+
+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
if (!usecalllists && bRep != null && bRep.displaylist > 0)
{
@@ -5826,8 +6260,9 @@
// usecalllists &= !(parent instanceof RandomNode);
// usecalllists = false;
- if (GetBRep() != null)
- usecalllists = usecalllists;
+ if (display.DrawMode() == display.SHADOW)
+ //GetBRep() != null)
+ usecalllists = !!usecalllists;
//System.out.println("draw " + this);
//new Exception().printStackTrace();
@@ -5849,7 +6284,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);
@@ -5860,7 +6295,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);
@@ -5869,7 +6304,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();
@@ -5879,8 +6314,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)
{
@@ -5981,6 +6416,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
{
/*
@@ -6013,13 +6462,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;
}
@@ -6050,6 +6500,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);
+// }
}
}
@@ -6103,16 +6567,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);
}
}
@@ -7220,20 +7685,23 @@
}
}
- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
+ static ClickInfo clickInfo = new ClickInfo();
+
+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
+ Point outPt, Rectangle outRec)
{
- int hc = info.bounds.x + info.bounds.width / 2;
- int vc = info.bounds.y + info.bounds.height / 2;
- double[][] toscreen = info.toScreen;
+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
+ double[][] toscreen = clickInfo.toScreen;
if (toscreen == null)
{
- toscreen = new Camera(info.camera.viewCode).toScreen;
+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
}
cVector vec = in;
LA.xformPos(in, toscreen, in);
//System.out.println("Distance = " + info.camera.Distance());
- vec.x *= 100 * info.camera.SCALE / info.camera.Distance();
- vec.y *= 100 * info.camera.SCALE / info.camera.Distance();
+ vec.x *= 100 * clickInfo.camera.SCALE / clickInfo.camera.Distance();
+ vec.y *= 100 * clickInfo.camera.SCALE / clickInfo.camera.Distance();
outPt.x = hc + (int) vec.x;
outPt.y = vc - (int) vec.y;
outRec.x = outPt.x - 3;
@@ -7241,15 +7709,18 @@
outRec.width = outRec.height = 6;
}
- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
+ )
{
Point pt = new Point(0, 0);
Rectangle rec = new Rectangle();
- calcHotSpot(in, info, pt, rec);
+ calcHotSpot(in, //clickInfo,
+ pt, rec);
return rec;
}
- void drawEditHandles0(ClickInfo info, int level)
+ void drawEditHandles0(//ClickInfo clickInfo,
+ int level)
{
if (level == 0)
{
@@ -7258,16 +7729,19 @@
{
cVector origin = new cVector();
//LA.xformPos(origin, toParent, origin);
- Rectangle spot = calcHotSpot(origin, info);
+ if (this.clickInfo == null)
+ this.clickInfo = new ClickInfo();
+
+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
Rectangle boundary = new Rectangle();
boundary.x = spot.x - 30;
boundary.y = spot.y - 30;
boundary.width = spot.width + 60;
boundary.height = spot.height + 60;
- info.g.setColor(Color.red);
+ clickInfo.g.setColor(Color.white);
int spotw = spot.x + spot.width;
int spoth = spot.y + spot.height;
- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
// if (CameraPane.Xmin > spot.x)
// {
// CameraPane.Xmin = spot.x;
@@ -7284,11 +7758,6 @@
// {
// CameraPane.Ymax = spoth;
// }
- spot.translate(32, 32);
- spotw = spot.x + spot.width;
- spoth = spot.y + spot.height;
- info.g.setColor(Color.cyan);
- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
// if (CameraPane.Xmin > spot.x)
// {
// CameraPane.Xmin = spot.x;
@@ -7307,10 +7776,15 @@
// }
// 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);
- info.g.setColor(Color.yellow);
- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
- info.g.setColor(Color.green);
+ 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);
+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
// if (CameraPane.Xmin > spot.x)
// {
// CameraPane.Xmin = spot.x;
@@ -7327,8 +7801,9 @@
// {
// CameraPane.Ymax = spoth;
// }
- info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
- (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
+ clickInfo.g.setColor(Color.green);
+ 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);
// if (CameraPane.Xmin > boundary.x)
// {
@@ -7350,7 +7825,8 @@
}
}
- boolean doEditClick0(ClickInfo info, int level)
+ boolean doEditClick0(//ClickInfo clickInfo,
+ int level)
{
if (level == 0)
{
@@ -7359,8 +7835,8 @@
boolean retval = false;
- startX = info.x;
- startY = info.y;
+ startX = clickInfo.x;
+ startY = clickInfo.y;
hitSomething = -1;
cVector origin = new cVector();
@@ -7370,22 +7846,53 @@
{
centerPt = new Point(0, 0);
}
- calcHotSpot(origin, info, centerPt, spot);
- if (spot.contains(info.x, info.y))
+ calcHotSpot(origin, //info,
+ centerPt, spot);
+ if (spot.contains(clickInfo.x, clickInfo.y))
{
hitSomething = hitCenter;
retval = true;
}
spot.translate(32, 0);
- if (spot.contains(info.x, info.y))
+ if (spot.contains(clickInfo.x, clickInfo.y))
{
hitSomething = hitRotate;
retval = true;
}
spot.translate(0, 32);
- if (spot.contains(info.x, info.y))
+ 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) / 64;
+ double sign = 1;
+ if (hScale < 0)
+ {
+ sign = -1;
+ }
+ hScale = sign*Math.pow(sign*hScale, scale * 50);
+ if (hScale < 0.01)
+ {
+ //hScale = 0.01;
+ }
+
+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
+ sign = 1;
+ if (vScale < 0)
+ {
+ sign = -1;
+ }
+ vScale = sign*Math.pow(sign*vScale, scale * 50);
+ if (vScale < 0.01)
+ {
+ //vScale = 0.01;
+ }
+
+ clickInfo.scale = Math.sqrt(hScale*hScale + vScale*vScale);
+
retval = true;
}
@@ -7395,7 +7902,7 @@
}
//System.out.println("info.modifiers = " + info.modifiers);
- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
//System.out.println("modified = " + modified);
//new Exception().printStackTrace();
//viewCode = info.pane.renderCamera.viewCode;
@@ -7423,7 +7930,8 @@
return true;
}
- void doEditDrag0(ClickInfo info, boolean opposite)
+ void doEditDrag0(//ClickInfo info,
+ boolean opposite)
{
if (hitSomething == 0)
{
@@ -7437,7 +7945,7 @@
//System.out.println("hitSomething = " + hitSomething);
- double scale = 0.005f * info.camera.Distance();
+ double scale = 0.005f * clickInfo.camera.Distance();
cVector xlate = new cVector();
//cVector xlate2 = new cVector();
@@ -7451,7 +7959,9 @@
scale *= 0.05f * Globals.theRenderer.RenderCamera().Distance();
- if (modified || opposite)
+ // Modified could snap
+ if (//modified ||
+ opposite)
{
//assert(false);
/*
@@ -7471,8 +7981,8 @@
toParent[3][i] = xlate.get(i);
LA.matInvert(toParent, fromParent);
*/
- cVector delta = LA.newVector(0, 0, startY - info.y);
- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
LA.matCopy(startMat, toParent);
LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
@@ -7481,7 +7991,7 @@
} else
{
//LA.xformDir(delta, info.camera.fromScreen, delta);
- cVector up = new cVector(info.camera.up);
+ cVector up = new cVector(clickInfo.camera.up);
cVector away = new cVector();
//cVector right2 = new cVector();
//LA.vecCross(up, cVector.Z, right);
@@ -7498,19 +8008,19 @@
LA.xformDir(up, ClickInfo.matbuffer, up);
// if (!CameraPane.LOCALTRANSFORM)
LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
// if (!CameraPane.LOCALTRANSFORM)
LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
//LA.vecCross(up, cVector.Z, right2);
- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
//System.out.println("DELTA0 = " + delta);
//System.out.println("AWAY = " + info.camera.away);
//System.out.println("UP = " + info.camera.up);
if (away.z > 0)
{
- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
{
delta.x = -delta.x;
} else
@@ -7525,7 +8035,7 @@
//System.out.println("DELTA1 = " + delta);
LA.xformDir(delta, ClickInfo.matbuffer, delta);
//System.out.println("DELTA2 = " + delta);
- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
LA.matCopy(startMat, toParent);
//System.out.println("DELTA3 = " + delta);
LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
@@ -7535,8 +8045,8 @@
break;
case hitRotate: // rotate
- int dx = info.x - centerPt.x;
- int dy = -(info.y - centerPt.y);
+ int dx = clickInfo.x - centerPt.x;
+ int dy = -(clickInfo.y - centerPt.y);
double angle = (double) Math.atan2(dx, dy);
angle = -(1.570796 - angle);
@@ -7545,7 +8055,7 @@
if (modified)
{
- // Rotate 90 degrees
+ // Rotate 45 degrees
angle /= (Math.PI / 4);
angle = Math.floor(angle + 0.5);
angle *= (Math.PI / 4);
@@ -7559,7 +8069,7 @@
}
/**/
- switch (info.pane.RenderCamera().viewCode)
+ switch (clickInfo.pane.RenderCamera().viewCode)
{
case 1: // '\001'
LA.matZRotate(toParent, angle);
@@ -7586,7 +8096,7 @@
break;
case hitScale: // scale
- double hScale = (double) (info.x - centerPt.x) / 32;
+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
double sign = 1;
if (hScale < 0)
{
@@ -7598,7 +8108,7 @@
//hScale = 0.01;
}
- double vScale = (double) (info.y - centerPt.y) / 32;
+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
sign = 1;
if (vScale < 0)
{
@@ -7609,6 +8119,7 @@
{
//vScale = 0.01;
}
+
LA.matCopy(startMat, toParent);
/**/
for (int i = 0; i < 3; i++)
@@ -7618,33 +8129,39 @@
}
/**/
- double totalScale = Math.sqrt(hScale*hScale + vScale*vScale) / Math.sqrt(2);
+ double totalScale = Math.sqrt(hScale*hScale + vScale*vScale) / clickInfo.scale;
if (totalScale < 0.01)
{
totalScale = 0.01;
}
- switch (info.pane.RenderCamera().viewCode)
+ switch (clickInfo.pane.RenderCamera().viewCode)
{
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);
@@ -7654,8 +8171,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);
@@ -7692,7 +8212,7 @@
} // NEW ...
- info.pane.repaint();
+ clickInfo.pane.repaint();
}
boolean overflow = false;
@@ -7806,7 +8326,7 @@
if (!Globals.ADVANCED)
return objname;
- return objname + " " + System.identityHashCode(this);
+ return objname + " " + System.identityHashCode(this) + " " + GetUUID();
}
public int hashCode()
--
Gitblit v1.6.2