From b3ae4e889872ca0b9ca76f1d17b2f0b961226729 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 05 Aug 2019 21:48:55 -0400
Subject: [PATCH] Fix physics UI
---
Object3D.java | 757 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 623 insertions(+), 134 deletions(-)
diff --git a/Object3D.java b/Object3D.java
index 2c2cf4d..4b58659 100644
--- a/Object3D.java
+++ b/Object3D.java
@@ -22,8 +22,20 @@
//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.
+ mocap.reader.BVHReader.BVHResult savebvh;
+ Object3D saveskeleton;
+ //
+
+ String skyboxname;
+ String skyboxext;
+
+ Object3D versionlist[];
+ int versionindex = -1;
+
ScriptNode scriptnode;
void InitOthers()
@@ -104,64 +116,201 @@
// transient boolean reduced; // for morph reduction
-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
-transient Object3D transientsupport; // for cloning
-transient boolean transientlink2master;
+ transient Object3D transientsupport; // for cloning
+ transient boolean transientlink2master;
-void SaveSupports()
-{
- if (blockloop)
- return;
-
- transientsupport = support;
- transientlink2master = link2master;
-
- support = null;
- link2master = false;
-
- if (bRep != null)
+ void SaveSupports()
{
- bRep.SaveSupports();
+ if (blockloop)
+ return;
+
+ transientsupport = support;
+ transientlink2master = link2master;
+
+ support = null;
+ link2master = false;
+
+ if (bRep != null)
+ {
+ bRep.SaveSupports();
+ }
+
+ for (int i = 0; i < Size(); i++)
+ {
+ Object3D child = (Object3D) get(i);
+ if (child == null)
+ continue;
+ blockloop = true;
+ child.SaveSupports();
+ blockloop = false;
+ }
}
-
- for (int i = 0; i < Size(); i++)
+
+ void RestoreSupports()
{
- Object3D child = (Object3D) get(i);
- if (child == null)
- continue;
+ if (blockloop)
+ return;
+
+ support = transientsupport;
+ link2master = transientlink2master;
+ transientsupport = null;
+ transientlink2master = false;
+
+ if (bRep != null)
+ {
+ bRep.RestoreSupports();
+ }
+
+ for (int i = 0; i < Size(); i++)
+ {
+ Object3D child = (Object3D) get(i);
+ if (child == null)
+ continue;
+ blockloop = true;
+ child.RestoreSupports();
+ blockloop = false;
+ }
+ }
+
+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
+ {
+ Object3D o;
+
+ if (hashtable.containsKey(GetUUID()))
+ {
+ o = hashtable.get(GetUUID());
+
+ Grafreed.Assert(this.bRep == o.bRep);
+ //if (this.bRep != null)
+ // assert(this.bRep.support == o.transientrep);
+ if (this.support != null)
+ assert(this.support.bRep == o.transientrep);
+ }
+ else
+ {
+ o = new Object3D("copy of " + this.name);
+
+ hashtable.put(GetUUID(), o);
+ }
+
+ if (!blockloop)
+ {
+ blockloop = true;
+
+ for (int i=0; i<Size(); i++)
+ {
+ get(i).ExtractBigData(hashtable);
+ }
+
+ blockloop = false;
+ }
+
+ ExtractBigData(o);
+ }
+
+ void ExtractBigData(Object3D o)
+ {
+ if (o.bRep != null)
+ Grafreed.Assert(o.bRep == this.bRep);
+
+ o.bRep = this.bRep;
+// July 2019 if (this.bRep != null)
+// {
+// o.transientrep = this.bRep.support;
+// o.bRep.support = null;
+// }
+ o.selection = this.selection;
+ o.versionlist = this.versionlist;
+ o.versionindex = this.versionindex;
+
+ if (this.support != null)
+ {
+ if (o.transientrep != null)
+ Grafreed.Assert(o.transientrep == this.support.bRep);
+
+ o.transientrep = this.support.bRep;
+ this.support.bRep = null;
+ }
+
+ // o.support = this.support;
+ // o.fileparent = this.fileparent;
+ // if (this.bRep != null)
+ // o.bRep = this.bRep.support;
+
+ this.bRep = null;
+ // if (this.bRep != null)
+ // this.bRep.support = null;
+ // this.support = null;
+ // 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;
+// }
+
+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
+ {
+ if (!hashtable.containsKey(GetUUID()))
+ return;
+
+ Object3D o = hashtable.get(GetUUID());
+
+ RestoreBigData(o);
+
+ if (blockloop)
+ return;
+
blockloop = true;
- child.SaveSupports();
+
+ //hashtable.remove(GetUUID());
+
+ for (int i=0; i<Size(); i++)
+ {
+ get(i).RestoreBigData(hashtable);
+ }
+
blockloop = false;
}
-}
-void RestoreSupports()
-{
- if (blockloop)
- return;
-
- support = transientsupport;
- link2master = transientlink2master;
- transientsupport = null;
- transientlink2master = false;
-
- if (bRep != null)
+ void RestoreBigData(Object3D o)
{
- bRep.RestoreSupports();
+ this.bRep = o.bRep;
+ if (this.support != null && o.transientrep != null)
+ {
+ this.support.bRep = o.transientrep;
+ }
+
+ this.selection = o.selection;
+
+ this.versionlist = o.versionlist;
+ this.versionindex = o.versionindex;
+// July 2019 if (this.bRep != null)
+// this.bRep.support = o.transientrep;
+ // this.support = o.support;
+ // this.fileparent = o.fileparent;
}
-
- for (int i = 0; i < Size(); i++)
- {
- Object3D child = (Object3D) get(i);
- if (child == null)
- continue;
- blockloop = true;
- child.RestoreSupports();
- blockloop = false;
- }
-}
// MOCAP SUPPORT
double tx,ty,tz,rx,ry,rz;
@@ -304,6 +453,7 @@
}
boolean live = false;
+ transient boolean keepdontselect;
boolean dontselect = false;
boolean hide = false;
boolean link2master = false; // performs reset support/master at each frame
@@ -486,12 +636,14 @@
toParent = LA.newMatrix();
fromParent = LA.newMatrix();
}
+
if (toParentMarked == null)
{
if (maxcount != 1)
{
new Exception().printStackTrace();
}
+
toParentMarked = LA.newMatrix();
fromParentMarked = LA.newMatrix();
}
@@ -802,7 +954,7 @@
if (marked && Globals.isLIVE() && live &&
//TEMP21aug2018
- (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW) &&
+ (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || !Globals.COMPUTESHADOWWHENLIVE) &&
currentframe != Globals.framecount)
{
currentframe = Globals.framecount;
@@ -814,7 +966,8 @@
boolean changedir = random && Math.random() < 0.01; // && !link2master;
- if (transformcount*factor > maxcount || (step == 1 && changedir))
+ if (transformcount*factor >= maxcount && (rewind || random) ||
+ (step == 1 && changedir))
{
countdown = 1;
delay = speedup?8:1;
@@ -886,6 +1039,10 @@
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;
}
@@ -1286,6 +1443,7 @@
toParent = LA.newMatrix();
fromParent = LA.newMatrix();
}
+
LA.matCopy(other.toParent, toParent);
LA.matCopy(other.fromParent, fromParent);
@@ -2307,6 +2465,10 @@
}
*/
}
+ else
+ {
+ //((ObjEditor)editWindow).SetupUI2(null);
+ }
}
void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
@@ -2348,6 +2510,14 @@
{
editWindow.refreshContents();
}
+ else
+ {
+ if (manipWindow != null)
+ {
+ manipWindow.refreshContents();
+ }
+ }
+
//if (parent != null)
//parent.refreshEditWindow();
}
@@ -2427,7 +2597,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)
{
@@ -2435,7 +2606,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();
}
@@ -2443,19 +2615,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;
@@ -2465,7 +2640,7 @@
}
}
- boolean doParentClick(ClickInfo info)
+ boolean doParentClick() //ClickInfo info)
{
if (selection == null)
{
@@ -2478,7 +2653,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;
@@ -2490,13 +2666,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'
@@ -2509,11 +2687,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;
@@ -2531,6 +2711,9 @@
{
deselectAll();
}
+
+ new Exception().printStackTrace();
+
ClickInfo newInfo = new ClickInfo();
newInfo.flags = info.flags;
newInfo.bounds = info.bounds;
@@ -2623,6 +2806,18 @@
void GenNormalsS(boolean crease)
{
selection.GenNormals(crease);
+// for (int i=0; i<selection.size(); i++)
+// {
+// Object3D selectee = (Object3D) selection.elementAt(i);
+// selectee.GenNormals(crease);
+// }
+
+ //Touch();
+ }
+
+ void GenNormalsMeshS()
+ {
+ selection.GenNormalsMesh();
// for (int i=0; i<selection.size(); i++)
// {
// Object3D selectee = (Object3D) selection.elementAt(i);
@@ -2763,6 +2958,24 @@
if (child == null)
continue;
child.GenNormals(crease);
+// Children().release(i);
+ }
+ blockloop = false;
+ }
+
+ void GenNormalsMesh()
+ {
+ if (blockloop)
+ return;
+
+ blockloop = true;
+ GenNormalsMesh0();
+ for (int i = 0; i < Children().Size(); i++)
+ {
+ Object3D child = (Object3D) Children().get(i); // reserve(i);
+ if (child == null)
+ continue;
+ child.GenNormalsMesh();
// Children().release(i);
}
blockloop = false;
@@ -2935,11 +3148,20 @@
}
}
+ void GenNormalsMesh0()
+ {
+ if (bRep != null)
+ {
+ bRep.GenerateNormalsMesh();
+ Touch();
+ }
+ }
+
void GenNormalsMINE0()
{
if (bRep != null)
{
- bRep.GenerateNormalsMINE();
+ bRep.MergeNormals(); //.GenerateNormalsMINE();
Touch();
}
}
@@ -3385,7 +3607,8 @@
if (blockloop)
return;
- if (marked || (bRep != null && material != null)) // borderline...
+ if (//marked || // does not make sense
+ (bRep != null || material != null)) // borderline...
live = h;
for (int i = 0; i < Size(); i++)
@@ -3406,7 +3629,8 @@
return;
//if (bRep != null)
- if (marked || (bRep != null && material != null)) // borderline...
+ if (//marked || // does not make sense
+ (bRep != null || material != null)) // borderline...
link2master = h;
for (int i = 0; i < Size(); i++)
@@ -3426,7 +3650,8 @@
if (blockloop)
return;
- if (marked || (bRep != null && material != null)) // borderline...
+ if (//marked || // does not make sense
+ (bRep != null || material != null)) // borderline...
hide = h;
for (int i = 0; i < Size(); i++)
@@ -3446,7 +3671,7 @@
if (blockloop)
return;
- if (bRep != null && material != null) // borderline...
+ if (bRep != null || material != null) // borderline...
marked = h;
for (int i = 0; i < Size(); i++)
@@ -3456,6 +3681,46 @@
continue;
blockloop = true;
child.MarkLeaves(h);
+ blockloop = false;
+ // release(i);
+ }
+ }
+
+ void RewindLeaves(boolean h)
+ {
+ if (blockloop)
+ return;
+
+ if (bRep != null || material != null) // borderline...
+ rewind = h;
+
+ for (int i = 0; i < Size(); i++)
+ {
+ Object3D child = (Object3D) get(i); // reserve(i);
+ if (child == null)
+ continue;
+ blockloop = true;
+ child.RewindLeaves(h);
+ blockloop = false;
+ // release(i);
+ }
+ }
+
+ void RandomLeaves(boolean h)
+ {
+ if (blockloop)
+ return;
+
+ if (bRep != null || material != null) // borderline...
+ random = h;
+
+ for (int i = 0; i < Size(); i++)
+ {
+ Object3D child = (Object3D) get(i); // reserve(i);
+ if (child == null)
+ continue;
+ blockloop = true;
+ child.RandomLeaves(h);
blockloop = false;
// release(i);
}
@@ -4233,6 +4498,55 @@
}
}
+ void RepairSOV()
+ {
+ if (blockloop)
+ return;
+
+ String texname = this.GetPigmentTexture();
+
+ if (texname.startsWith("sov"))
+ {
+ String[] s = texname.split("/");
+
+ String[] sname = s[1].split("Color.pn");
+
+ texname = sname[0];
+
+ if (sname.length > 1)
+ {
+ texname += "Color.jpg";
+ }
+
+ this.SetPigmentTexture("sov/" + texname);
+ }
+
+ texname = this.GetBumpTexture();
+
+ if (texname.startsWith("sov"))
+ {
+ String[] s = texname.split("/");
+
+ String[] sname = s[1].split("Bump.pn");
+
+ texname = sname[0];
+
+ if (sname.length > 1)
+ {
+ texname += "Bump.jpg";
+ }
+
+ this.SetBumpTexture("sov/" + texname);
+ }
+
+ for (int i=0; i<Size(); i++)
+ {
+ blockloop = true;
+ get(i).RepairSOV();
+ blockloop = false;
+ }
+ }
+
void RepairTexture()
{
if (this instanceof FileObject || blockloop)
@@ -4747,6 +5061,14 @@
}
}
+ ObjEditor GetWindow()
+ {
+ if (editWindow != null)
+ return editWindow;
+
+ return manipWindow;
+ }
+
cTreePath Select(int indexcount, boolean deselect)
{
if (hide || dontselect)
@@ -4783,10 +5105,11 @@
if (leaf != null)
{
cTreePath tp = new cTreePath(this, leaf);
- if (editWindow != null)
+ ObjEditor window = GetWindow();
+ if (window != null)
{
//System.out.println("editWindow = " + editWindow + " vs " + this);
- editWindow.Select(tp, deselect, true);
+ window.Select(tp, deselect, true);
}
return tp;
@@ -4803,6 +5126,7 @@
if (child == null)
continue;
+
if (child.HasTransparency() && child.size() != 0)
{
cTreePath leaf = child.Select(indexcount, deselect);
@@ -4812,9 +5136,10 @@
if (leaf != null)
{
cTreePath tp = new cTreePath(this, leaf);
- if (editWindow != null)
+ ObjEditor window = GetWindow();
+ if (window != null)
{
- editWindow.Select(tp, deselect, true);
+ window.Select(tp, deselect, true);
}
return tp;
@@ -5139,6 +5464,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)
@@ -5448,6 +5818,38 @@
}
}
+ 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;
+ }
+ }
+
void draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
{
Draw(display, root, selected, blocked);
@@ -5456,12 +5858,23 @@
boolean NeedSupport()
{
return
- CameraPane.SUPPORT && (!CameraPane.movingcamera || !Globals.FREEZEONMOVE) && link2master && /*live &&*/ support != null
+ CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /*live &&*/ support != null
// PROBLEM with CROWD!!
&& (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || Globals.CROWD);
}
static boolean DEBUG_SELECTION = false;
+
+ boolean IsLive()
+ {
+ if (live)
+ return true;
+
+ if (parent == null)
+ return false;
+
+ return parent.IsLive();
+ }
void Draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
{
@@ -5523,8 +5936,10 @@
if (support != null)
support = support;
- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
- boolean usecalllists = false; // 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 = 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)
{
@@ -5534,8 +5949,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();
@@ -5544,10 +5960,12 @@
boolean selectmode = display.DrawMode() == display.SELECTION || display.IsDebugSelection();
if (!selectmode && //display.DrawMode() != display.SELECTION &&
- (touched || (bRep != null && bRep.displaylist <= 0)))
+ //(touched || (bRep != null && bRep.displaylist <= 0)))
+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE || touched && Globals.COMPUTESHADOWWHENLIVE)) // || (bRep != null && bRep.displaylist <= 0)))
{
Globals.lighttouched = true;
} // all panes...
+
//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
(touched || (bRep != null && bRep.displaylist <= 0)))
@@ -5555,7 +5973,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);
@@ -5566,7 +5984,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);
@@ -5575,7 +5993,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();
@@ -5675,6 +6093,7 @@
if (GetBRep() != null)
{
display.NextIndex();
+
// vertex color conflict : gl.glCallList(list);
DrawNode(display, root, selected);
if (this instanceof BezierPatch)
@@ -5715,16 +6134,27 @@
tex = GetTextures();
}
- boolean failed = false;
+ boolean failedPigment = false;
+ boolean failedBump = false;
try
{
- display.BindTextures(tex, texres);
+ display.BindPigmentTexture(tex, texres);
}
catch (Exception e)
{
System.err.println("FAILED: " + this);
- failed = true;
+ failedPigment = true;
+ }
+
+ try
+ {
+ display.BindBumpTexture(tex, texres);
+ }
+ catch (Exception e)
+ {
+ //System.err.println("FAILED: " + this);
+ failedBump = true;
}
if (!compiled)
@@ -5747,8 +6177,11 @@
}
}
- if (!failed)
- display.ReleaseTextures(tex);
+ if (!failedBump)
+ display.ReleaseBumpTexture(tex);
+
+ if (!failedPigment)
+ display.ReleasePigmentTexture(tex);
display.PopMaterial(this, selected);
}
@@ -6121,6 +6554,11 @@
// dec 2012
new Exception().printStackTrace();
return;
+ }
+
+ if (dontselect)
+ {
+ //bRep.GenerateNormalsMINE();
}
display.DrawGeometry(bRep, flipV, selectmode);
@@ -6906,20 +7344,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;
@@ -6927,15 +7368,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)
{
@@ -6944,16 +7388,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.red);
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;
@@ -6973,8 +7420,8 @@
spot.translate(32, 32);
spotw = spot.x + spot.width;
spoth = spot.y + spot.height;
- info.g.setColor(Color.blue);
- info.g.fillRect(spot.x, spot.y, spot.width, 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;
@@ -6991,11 +7438,12 @@
// {
// CameraPane.Ymax = spoth;
// }
- // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
- //info.g.drawLine(spotw, spoth, spotw - 15, 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);
- info.g.setColor(Color.green);
- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
+ 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;
@@ -7012,8 +7460,8 @@
// {
// CameraPane.Ymax = spoth;
// }
- info.g.drawArc(boundary.x, boundary.y,
- boundary.width, boundary.height, 0, 360);
+ 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)
// {
@@ -7035,7 +7483,8 @@
}
}
- boolean doEditClick0(ClickInfo info, int level)
+ boolean doEditClick0(//ClickInfo clickInfo,
+ int level)
{
if (level == 0)
{
@@ -7044,8 +7493,8 @@
boolean retval = false;
- startX = info.x;
- startY = info.y;
+ startX = clickInfo.x;
+ startY = clickInfo.y;
hitSomething = -1;
cVector origin = new cVector();
@@ -7055,22 +7504,51 @@
{
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))
+ 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 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) / 32;
+ 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;
}
@@ -7080,7 +7558,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;
@@ -7108,7 +7586,8 @@
return true;
}
- void doEditDrag0(ClickInfo info, boolean opposite)
+ void doEditDrag0(//ClickInfo info,
+ boolean opposite)
{
if (hitSomething == 0)
{
@@ -7122,7 +7601,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();
@@ -7156,8 +7635,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);
@@ -7166,7 +7645,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);
@@ -7183,19 +7662,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
@@ -7210,7 +7689,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);
@@ -7220,8 +7699,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);
@@ -7244,7 +7723,7 @@
}
/**/
- switch (info.pane.RenderCamera().viewCode)
+ switch (clickInfo.pane.RenderCamera().viewCode)
{
case 1: // '\001'
LA.matZRotate(toParent, angle);
@@ -7271,7 +7750,7 @@
break;
case hitScale: // scale
- double hScale = (double) (info.x - centerPt.x) / 32;
+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
double sign = 1;
if (hScale < 0)
{
@@ -7283,7 +7762,7 @@
//hScale = 0.01;
}
- double vScale = (double) (info.y - centerPt.y) / 32;
+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
sign = 1;
if (vScale < 0)
{
@@ -7294,6 +7773,7 @@
{
//vScale = 0.01;
}
+
LA.matCopy(startMat, toParent);
/**/
for (int i = 0; i < 3; i++)
@@ -7303,29 +7783,30 @@
}
/**/
- 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)
+ if (modified || opposite)
{
//LA.matScale(toParent, 1, hScale, vScale);
LA.matScale(toParent, totalScale, 1, 1);
} // vScale, 1);
else
{
+ // EXCEPTION!
LA.matScale(toParent, totalScale, totalScale, totalScale);
} // vScale, 1);
break;
case 2: // '\002'
- if (modified)
+ if (modified || opposite)
{
//LA.matScale(toParent, hScale, 1, vScale);
LA.matScale(toParent, 1, totalScale, 1);
@@ -7336,7 +7817,7 @@
break;
case 1: // '\003'
- if (modified)
+ if (modified || opposite)
{
//LA.matScale(toParent, hScale, vScale, 1);
LA.matScale(toParent, 1, 1, totalScale);
@@ -7376,7 +7857,7 @@
} // NEW ...
- info.pane.repaint();
+ clickInfo.pane.repaint();
}
boolean overflow = false;
@@ -7556,6 +8037,10 @@
editWindow = null;
} // ?
}
+ else
+ {
+ //editWindow.closeUI();
+ }
}
boolean root; // patch for edit windows
@@ -7567,7 +8052,7 @@
/*transient*/ cVector2[] projectedVertices = new cVector2[0];
Object3D /*Composite*/ parent;
- Object3D /*Composite*/ fileparent;
+ Object3D /*Composite*/ fileparent; // In the case of FileObject
double[][] toParent; // dynamic matrix
double[][] fromParent;
@@ -7713,6 +8198,10 @@
}
transient ObjEditor editWindow;
+ transient ObjEditor manipWindow;
+
+ transient boolean pinned;
+
transient ObjectUI objectUI;
public static int povDepth = 0;
private static cVector tbMin = new cVector();
--
Gitblit v1.6.2