~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -14,11 +14,15 @@
14	14	import //weka.core.
15	15	matrix.Matrix;
16	16
	17	+import java.util.UUID;
	18	+
17	19	//import net.sourceforge.sizeof.SizeOf;
18	20	public class Object3D extends Vector<Object3D> implements java.io.Serializable, iSendInfo //, aurelienribon.tweenengine.TweenAccessor<Object3D>
19	21	{
20	22	//static final long serialVersionUID = -607422624994562685L;
21	23	static final long serialVersionUID = 5022536242724664900L;
	24	+
	25	+ private UUID uuid = UUID.randomUUID();
22	26
23	27	ScriptNode scriptnode;
24	28
..	..	@@ -156,6 +160,67 @@
156	160	blockloop = true;
157	161	child.RestoreSupports();
158	162	blockloop = false;
	163	+ }
	164	+}
	165	+
	166	+void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	167	+{
	168	+ if (hashtable.containsKey(GetUUID()))
	169	+ {
	170	+ Object3D o = hashtable.get(GetUUID());
	171	+
	172	+ assert(this.bRep == o.bRep);
	173	+ if (this.bRep != null)
	174	+ assert(this.bRep.support == o.transientrep);
	175	+
	176	+ return;
	177	+ }
	178	+
	179	+ Object3D o = new Object3D();
	180	+ o.bRep = this.bRep;
	181	+ if (this.bRep != null)
	182	+ {
	183	+ o.transientrep = this.bRep.support;
	184	+ o.bRep.support = null;
	185	+ }
	186	+
	187	+// o.support = this.support;
	188	+// o.fileparent = this.fileparent;
	189	+// if (this.bRep != null)
	190	+// o.bRep = this.bRep.support;
	191	+
	192	+ hashtable.put(GetUUID(), o);
	193	+
	194	+ this.bRep = null;
	195	+// if (this.bRep != null)
	196	+// this.bRep.support = null;
	197	+// this.support = null;
	198	+// this.fileparent = null;
	199	+
	200	+ for (int i=0; i<Size(); i++)
	201	+ {
	202	+ get(i).ExtractBigData(hashtable);
	203	+ }
	204	+}
	205	+
	206	+void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	207	+{
	208	+ if (!hashtable.containsKey(GetUUID()))
	209	+ return;
	210	+
	211	+ Object3D o = hashtable.get(GetUUID());
	212	+
	213	+ this.bRep = o.bRep;
	214	+ if (this.bRep != null)
	215	+ this.bRep.support = o.transientrep;
	216	+// this.support = o.support;
	217	+// this.fileparent = o.fileparent;
	218	+
	219	+ hashtable.remove(GetUUID());
	220	+
	221	+ for (int i=0; i<Size(); i++)
	222	+ {
	223	+ get(i).RestoreBigData(hashtable);
159	224	}
160	225	}
161	226
..	..	@@ -300,6 +365,7 @@
300	365	}
301	366
302	367	boolean live = false;
	368	+ boolean dontselect = false;
303	369	boolean hide = false;
304	370	boolean link2master = false; // performs reset support/master at each frame
305	371	boolean marked = false; // animation node
..	..	@@ -774,7 +840,7 @@
774	840	if (step == 0)
775	841	step = 1;
776	842	if (maxcount == 0)
777		- maxcount = 2048; // 4;
	843	+ maxcount = 128; // 2048; // 4;
778	844	// if (acceleration == 0)
779	845	// acceleration = 10;
780	846	if (delay == 0) // serial
..	..	@@ -797,7 +863,7 @@
797	863
798	864	if (marked && Globals.isLIVE() && live &&
799	865	//TEMP21aug2018
800		- Globals.DrawMode() == iCameraPane.SHADOW &&
	866	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
801	867	currentframe != Globals.framecount)
802	868	{
803	869	currentframe = Globals.framecount;
..	..	@@ -912,6 +978,11 @@
912	978	fromParent = null; // LA.newMatrix();
913	979	bRep = null; // new BoundaryRep();
914	980
	981	+ if (oname != null && oname.equals("LeftHand"))
	982	+ {
	983	+ name = oname;
	984	+ }
	985	+
915	986	/*
916	987	float hue = (float)Math.random();
917	988	Color col;
..	..	@@ -1470,7 +1541,7 @@
1470	1541	BoundaryRep.SEUIL = other.material.cameralight;
1471	1542
1472	1543	// Set default to 0.1
1473		- BoundaryRep.SEUIL /= 2;
	1544	+ BoundaryRep.SEUIL /= 4; // 2;
1474	1545	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1475	1546	}
1476	1547
..	..	@@ -1829,12 +1900,15 @@
1829	1900	if (obj.name == null)
1830	1901	continue; // can't be a null one
1831	1902
	1903	+ // Try perfect match first.
1832	1904	if (n.equals(obj.name))
1833	1905	{
1834	1906	theobj = obj;
1835	1907	count++;
1836	1908	}
1837	1909	}
	1910	+
	1911	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1838	1912
1839	1913	if (count != 1)
1840	1914	for (int i=Size(); --i>=0;)
..	..	@@ -2983,6 +3057,33 @@
2983	3057	blockloop = false;
2984	3058	}
2985	3059
	3060	+ void TransformChildren()
	3061	+ {
	3062	+ if (toParent != null)
	3063	+ {
	3064	+ for (int i=Size(); --i>=0;)
	3065	+ {
	3066	+ Object3D v = get(i);
	3067	+
	3068	+ if (v.toParent == null)
	3069	+ {
	3070	+ v.toParent = LA.newMatrix();
	3071	+ v.fromParent = LA.newMatrix();
	3072	+ }
	3073	+
	3074	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3075	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3076	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3077	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3078	+ }
	3079	+
	3080	+ toParent = null; // LA.matIdentity(toParent);
	3081	+ fromParent = null; // LA.matIdentity(fromParent);
	3082	+
	3083	+ Touch();
	3084	+ }
	3085	+ }
	3086	+
2986	3087	void TransformGeometry()
2987	3088	{
2988	3089	Object3D obj = this;
..	..	@@ -3206,7 +3307,9 @@
3206	3307	bRep.support = null;
3207	3308	BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3208	3309	// bRep.SplitInTwo(onlyone); // thread...
3209		- temprep.SplitInTwo(reduction34, onlyone);
	3310	+
	3311	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3312	+
3210	3313	bRep = temprep;
3211	3314	bRep.support = sup;
3212	3315	Touch();
..	..	@@ -4681,7 +4784,7 @@
4681	4784
4682	4785	cTreePath SelectLeaf(int indexcount, boolean deselect)
4683	4786	{
4684		- if (hide)
	4787	+ if (hide \|\| dontselect)
4685	4788	return null;
4686	4789
4687	4790	if (count <= 0)
..	..	@@ -4707,7 +4810,7 @@
4707	4810
4708	4811	cTreePath Select(int indexcount, boolean deselect)
4709	4812	{
4710		- if (hide)
	4813	+ if (hide \|\| dontselect)
4711	4814	return null;
4712	4815
4713	4816	if (count <= 0)
..	..	@@ -5333,6 +5436,43 @@
5333	5436	}
5334	5437	}
5335	5438
	5439	+ UUID GetUUID()
	5440	+ {
	5441	+ if (uuid == null)
	5442	+ {
	5443	+ // Serial
	5444	+ uuid = UUID.randomUUID();
	5445	+ }
	5446	+
	5447	+ return uuid;
	5448	+ }
	5449	+
	5450	+ Object3D GetObject(UUID uid)
	5451	+ {
	5452	+ if (blockloop)
	5453	+ return null;
	5454	+
	5455	+ if (GetUUID().equals(uid))
	5456	+ return this;
	5457	+
	5458	+ int nb = Size();
	5459	+ for (int i = 0; i < nb; i++)
	5460	+ {
	5461	+ Object3D child = (Object3D) get(i);
	5462	+
	5463	+ if (child == null)
	5464	+ continue;
	5465	+
	5466	+ blockloop = true;
	5467	+ Object3D obj = child.GetObject(uid);
	5468	+ blockloop = false;
	5469	+ if (obj != null)
	5470	+ return obj;
	5471	+ }
	5472	+
	5473	+ return null;
	5474	+ }
	5475	+
5336	5476	void SetBumpTexture(String tex)
5337	5477	{
5338	5478	if (GetTextures() == null)
..	..	@@ -5377,9 +5517,9 @@
5377	5517	boolean NeedSupport()
5378	5518	{
5379	5519	return
5380		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5520	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
5381	5521	// PROBLEM with CROWD!!
5382		- && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
	5522	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5383	5523	}
5384	5524
5385	5525	static boolean DEBUG_SELECTION = false;
..	..	@@ -5394,7 +5534,7 @@
5394	5534	}
5395	5535
5396	5536	if (display.DrawMode() == iCameraPane.SELECTION &&
5397		- hide)
	5537	+ (hide \|\| dontselect))
5398	5538	return;
5399	5539
5400	5540	if (name != null && name.contains("sclera"))
..	..	@@ -5636,7 +5776,17 @@
5636	5776	tex = GetTextures();
5637	5777	}
5638	5778
5639		- display.BindTextures(tex, texres);
	5779	+ boolean failed = false;
	5780	+
	5781	+ try
	5782	+ {
	5783	+ display.BindTextures(tex, texres);
	5784	+ }
	5785	+ catch (Exception e)
	5786	+ {
	5787	+ System.err.println("FAILED: " + this);
	5788	+ failed = true;
	5789	+ }
5640	5790
5641	5791	if (!compiled)
5642	5792	{
..	..	@@ -5658,7 +5808,8 @@
5658	5808	}
5659	5809	}
5660	5810
5661		- display.ReleaseTextures(tex);
	5811	+ if (!failed)
	5812	+ display.ReleaseTextures(tex);
5662	5813
5663	5814	display.PopMaterial(this, selected);
5664	5815	}
..	..	@@ -5787,6 +5938,9 @@
5787	5938
5788	5939	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5789	5940	{
	5941	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	5942	+ return;
	5943	+
5790	5944	if (hide)
5791	5945	return;
5792	5946	// shadow optimisation
..	..	@@ -5911,6 +6065,9 @@
5911	6065	{
5912	6066	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5913	6067	return; // no shadow for transparent objects
	6068	+
	6069	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6070	+ return;
5914	6071
5915	6072	if (hide)
5916	6073	return;
..	..	@@ -6895,8 +7052,8 @@
6895	7052	// {
6896	7053	// CameraPane.Ymax = spoth;
6897	7054	// }
6898		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6899		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7055	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
	7056	+ //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
6900	7057	spot.translate(0, -32);
6901	7058	info.g.setColor(Color.green);
6902	7059	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
..	..	@@ -6951,7 +7108,7 @@
6951	7108	startX = info.x;
6952	7109	startY = info.y;
6953	7110
6954		- hitSomething = 0;
	7111	+ hitSomething = -1;
6955	7112	cVector origin = new cVector();
6956	7113	//LA.xformPos(origin, toParent, origin);
6957	7114	Rectangle spot = new Rectangle();
..	..	@@ -7027,6 +7184,7 @@
7027	7184	//System.out.println("hitSomething = " + hitSomething);
7028	7185
7029	7186	double scale = 0.005f * info.camera.Distance();
	7187	+
7030	7188	cVector xlate = new cVector();
7031	7189	//cVector xlate2 = new cVector();
7032	7190	switch (hitSomething)
..	..	@@ -7175,24 +7333,27 @@
7175	7333
7176	7334	case hitScale: // scale
7177	7335	double hScale = (double) (info.x - centerPt.x) / 32;
	7336	+ double sign = 1;
	7337	+ if (hScale < 0)
	7338	+ {
	7339	+ sign = -1;
	7340	+ }
	7341	+ hScale = signMath.pow(signhScale, scale * 50);
7178	7342	if (hScale < 0.01)
7179	7343	{
7180		- hScale = 0.01;
	7344	+ //hScale = 0.01;
7181	7345	}
7182		- hScale = Math.pow(hScale, scale * 50);
7183		- if (hScale < 0.01)
7184		- {
7185		- hScale = 0.01;
7186		- }
	7346	+
7187	7347	double vScale = (double) (info.y - centerPt.y) / 32;
7188		- if (vScale < 0.01)
	7348	+ sign = 1;
	7349	+ if (vScale < 0)
7189	7350	{
7190		- vScale = 0.01;
	7351	+ sign = -1;
7191	7352	}
7192		- vScale = Math.pow(vScale, scale * 50);
	7353	+ vScale = signMath.pow(signvScale, scale * 50);
7193	7354	if (vScale < 0.01)
7194	7355	{
7195		- vScale = 0.01;
	7356	+ //vScale = 0.01;
7196	7357	}
7197	7358	LA.matCopy(startMat, toParent);
7198	7359	/**/
..	..	@@ -7203,17 +7364,24 @@
7203	7364	}
7204	7365	/**/
7205	7366
	7367	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7368	+
	7369	+ if (totalScale < 0.01)
	7370	+ {
	7371	+ totalScale = 0.01;
	7372	+ }
	7373	+
7206	7374	switch (info.pane.RenderCamera().viewCode)
7207	7375	{
7208	7376	case 3: // '\001'
7209	7377	if (modified)
7210	7378	{
7211	7379	//LA.matScale(toParent, 1, hScale, vScale);
7212		- LA.matScale(toParent, vScale, 1, 1);
	7380	+ LA.matScale(toParent, totalScale, 1, 1);
7213	7381	} // vScale, 1);
7214	7382	else
7215	7383	{
7216		- LA.matScale(toParent, vScale, vScale, vScale);
	7384	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7217	7385	} // vScale, 1);
7218	7386	break;
7219	7387
..	..	@@ -7221,10 +7389,10 @@
7221	7389	if (modified)
7222	7390	{
7223	7391	//LA.matScale(toParent, hScale, 1, vScale);
7224		- LA.matScale(toParent, 1, vScale, 1);
	7392	+ LA.matScale(toParent, 1, totalScale, 1);
7225	7393	} else
7226	7394	{
7227		- LA.matScale(toParent, vScale, 1, vScale);
	7395	+ LA.matScale(toParent, totalScale, 1, totalScale);
7228	7396	}
7229	7397	break;
7230	7398
..	..	@@ -7232,10 +7400,10 @@
7232	7400	if (modified)
7233	7401	{
7234	7402	//LA.matScale(toParent, hScale, vScale, 1);
7235		- LA.matScale(toParent, 1, 1, vScale);
	7403	+ LA.matScale(toParent, 1, 1, totalScale);
7236	7404	} else
7237	7405	{
7238		- LA.matScale(toParent, vScale, vScale, 1);
	7406	+ LA.matScale(toParent, totalScale, totalScale, 1);
7239	7407	}
7240	7408	break;
7241	7409	}
..	..	@@ -7368,14 +7536,22 @@
7368	7536	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7369	7537	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7370	7538	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7539	+
	7540	+ String objname;
	7541	+
7371	7542	if (false) //parent != null)
7372	7543	{
7373		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7544	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7374	7545	} else
7375	7546	{
7376		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7547	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7377	7548	} // + super.toString();
7378	7549	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7550	+
	7551	+ if (!Globals.ADVANCED)
	7552	+ return objname;
	7553	+
	7554	+ return objname + " " + System.identityHashCode(this);
7379	7555	}
7380	7556
7381	7557	public int hashCode()
..	..	@@ -7452,7 +7628,7 @@
7452	7628	/transient/ cVector2[] projectedVertices = new cVector2[0];
7453	7629
7454	7630	Object3D /Composite/ parent;
7455		- Object3D /Composite/ fileparent;
	7631	+ Object3D /Composite/ fileparent; // In the case of FileObject
7456	7632
7457	7633	double[][] toParent; // dynamic matrix
7458	7634	double[][] fromParent;
..	..	@@ -7616,9 +7792,9 @@
7616	7792	private static cVector edge2 = new cVector();
7617	7793	//private static cVector norm = new cVector();
7618	7794	/transient private/ int hitSomething;
7619		- private static final int hitCenter = 1;
7620		- private static final int hitScale = 2;
7621		- private static final int hitRotate = 3;
	7795	+ static final int hitCenter = 1;
	7796	+ static final int hitScale = 2;
	7797	+ static final int hitRotate = 3;
7622	7798	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7623	7799	/transient/ private Point centerPt;
7624	7800	/transient/ private int startX;