~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -36,8 +36,23 @@
36	36	Object3D versionlist[];
37	37	int versionindex = -1;
38	38
	39	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
	40	+
39	41	ScriptNode scriptnode;
40	42
	43	+ int VersionCount()
	44	+ {
	45	+ int count = 0;
	46	+
	47	+ for (int i = versionlist.length; --i >= 0;)
	48	+ {
	49	+ if (versionlist[i] != null)
	50	+ count++;
	51	+ }
	52	+
	53	+ return count;
	54	+ }
	55	+
41	56	void InitOthers()
42	57	{
43	58	if (projectedVertices == null \|\| projectedVertices.length <= 2)
..	..	@@ -269,6 +284,50 @@
269	284	//
270	285	// return null;
271	286	// }
	287	+
	288	+ transient boolean tag;
	289	+
	290	+ void TagObjects(Object3D o, boolean tag)
	291	+ {
	292	+ if (blockloop)
	293	+ return;
	294	+
	295	+ o.tag = tag;
	296	+
	297	+ if (o == this)
	298	+ return;
	299	+
	300	+ blockloop = true;
	301	+
	302	+ for (int i=0; i<Size(); i++)
	303	+ {
	304	+ get(i).TagObjects(o, tag);
	305	+ }
	306	+
	307	+ blockloop = false;
	308	+ }
	309	+
	310	+ boolean HasTags()
	311	+ {
	312	+ if (blockloop)
	313	+ return false;
	314	+
	315	+ blockloop = true;
	316	+
	317	+ boolean hasTags = false;
	318	+
	319	+ for (int i=0; i<Size(); i++)
	320	+ {
	321	+ hasTags \|= get(i).tag \|\| get(i).HasTags();
	322	+
	323	+ if (hasTags)
	324	+ break;
	325	+ }
	326	+
	327	+ blockloop = false;
	328	+
	329	+ return hasTags;
	330	+ }
272	331
273	332	void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
274	333	{
..	..	@@ -522,11 +581,11 @@
522	581	}
523	582	}
524	583
525		- int memorysize;
	584	+ transient int memorysize; // needs to be transient, dunno why
526	585
527	586	int MemorySize()
528	587	{
529		- if (true) // memorysize == 0)
	588	+ if (memorysize == 0)
530	589	{
531	590	try
532	591	{
..	..	@@ -641,7 +700,7 @@
641	700	{
642	701	if (maxcount != 1)
643	702	{
644		- new Exception().printStackTrace();
	703	+ //new Exception().printStackTrace();
645	704	}
646	705
647	706	toParentMarked = LA.newMatrix();
..	..	@@ -2323,11 +2382,6 @@
2323	2382
2324	2383	InitOthers();
2325	2384
2326		- if (this instanceof Camera)
2327		- {
2328		- material.shift = 90;
2329		- }
2330		-
2331	2385	material.multiply = multiply;
2332	2386
2333	2387	if (multiply)
..	..	@@ -2468,7 +2522,11 @@
2468	2522	else
2469	2523	{
2470	2524	//((ObjEditor)editWindow).SetupUI2(null);
2471		- ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2525	+ if (objectUI != null)
	2526	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2527	+ else
	2528	+ //new Exception().printStackTrace();
	2529	+ System.err.println("objectUI is null");
2472	2530	}
2473	2531	}
2474	2532
..	..	@@ -3219,6 +3277,93 @@
3219	3277	blockloop = false;
3220	3278	}
3221	3279
	3280	+ public void ResetTransform(int mask)
	3281	+ {
	3282	+ Object3D obj = this;
	3283	+
	3284	+ if (mask == -1)
	3285	+ {
	3286	+ if (obj instanceof Camera) // jan 2014
	3287	+ {
	3288	+ LA.matIdentity(obj.toParent);
	3289	+ LA.matIdentity(obj.fromParent);
	3290	+ }
	3291	+ else
	3292	+ {
	3293	+ obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
	3294	+ obj.fromParent = null; // LA.matIdentity(obj.fromParent);
	3295	+ }
	3296	+ return;
	3297	+ }
	3298	+
	3299	+ if ((mask&2) != 0) // Scale/rotation
	3300	+ {
	3301	+ obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
	3302	+ obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
	3303	+ obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
	3304	+ obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
	3305	+ obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
	3306	+ obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
	3307	+ }
	3308	+ if ((mask&1) != 0) // Translation
	3309	+ {
	3310	+ if (obj.toParent != null)
	3311	+ {
	3312	+ obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
	3313	+ obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
	3314	+ }
	3315	+ }
	3316	+ }
	3317	+
	3318	+ public void TextureRatioTransform(int axis)
	3319	+ {
	3320	+ cTexture tex = GetTextures();
	3321	+
	3322	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3323	+
	3324	+ try
	3325	+ {
	3326	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, texres);
	3327	+ }
	3328	+ catch (Exception e)
	3329	+ {
	3330	+ System.err.println("FAIL TextureRatio: " + this);
	3331	+ }
	3332	+
	3333	+ LA.matIdentity(Object3D.mat);
	3334	+ Object3D.mat[axis][axis] = (double)texturedata.getWidth() / texturedata.getHeight();
	3335	+
	3336	+ if (toParent == null)
	3337	+ {
	3338	+ toParent = LA.newMatrix();
	3339	+ fromParent = LA.newMatrix();
	3340	+ }
	3341	+
	3342	+ ResetTransform(2);
	3343	+
	3344	+ LA.matConcat(Object3D.mat, fromParent, fromParent);
	3345	+ LA.matInvert(fromParent, toParent);
	3346	+ }
	3347	+
	3348	+ void TextureRatio(int axis)
	3349	+ {
	3350	+ if (blockloop)
	3351	+ return;
	3352	+
	3353	+ blockloop = true;
	3354	+
	3355	+ TextureRatioTransform(axis);
	3356	+
	3357	+ for (int i=Size(); --i>=0;)
	3358	+ {
	3359	+ Object3D v = get(i);
	3360	+
	3361	+ v.TextureRatio(axis);
	3362	+ }
	3363	+
	3364	+ blockloop = false;
	3365	+ }
	3366	+
3222	3367	void TransformChildren()
3223	3368	{
3224	3369	if (toParent != null)
..	..	@@ -3572,15 +3717,47 @@
3572	3717
3573	3718	void ClearMaterials()
3574	3719	{
	3720	+ if (blockloop)
	3721	+ return;
	3722	+
	3723	+ blockloop = true;
	3724	+
3575	3725	ClearMaterial();
3576		- for (int i = 0; i < size(); i++)
	3726	+ for (int i = 0; i < Size(); i++)
3577	3727	{
3578		- Object3D child = (Object3D) reserve(i);
	3728	+ Object3D child = (Object3D) get(i);
3579	3729	if (child == null)
3580	3730	continue;
3581	3731	child.ClearMaterials();
3582		- release(i);
3583	3732	}
	3733	+
	3734	+ blockloop = false;
	3735	+ }
	3736	+
	3737	+ void ClearVersionList()
	3738	+ {
	3739	+ this.versionlist = null;
	3740	+ this.versionindex = -1;
	3741	+ this.versiontable = null;
	3742	+ }
	3743	+
	3744	+ void ClearVersions()
	3745	+ {
	3746	+ if (blockloop)
	3747	+ return;
	3748	+
	3749	+ blockloop = true;
	3750	+
	3751	+ ClearVersionList();
	3752	+ for (int i = 0; i < Size(); i++)
	3753	+ {
	3754	+ Object3D child = (Object3D) get(i);
	3755	+ if (child == null)
	3756	+ continue;
	3757	+ child.ClearVersions();
	3758	+ }
	3759	+
	3760	+ blockloop = false;
3584	3761	}
3585	3762
3586	3763	void FlipV(boolean flip)
..	..	@@ -5570,6 +5747,11 @@
5570	5747	if (fullname == null)
5571	5748	return "";
5572	5749
	5750	+ if (fullname.pigment != null)
	5751	+ {
	5752	+ return fullname.pigment;
	5753	+ }
	5754	+
5573	5755	// System.out.println("Fullname = " + fullname);
5574	5756
5575	5757	// Does not work on Windows due to C:
..	..	@@ -5582,7 +5764,7 @@
5582	5764
5583	5765	if (split.length == 0)
5584	5766	{
5585		- return "";
	5767	+ return fullname.pigment = "";
5586	5768	}
5587	5769
5588	5770	if (split.length <= 2)
..	..	@@ -5590,22 +5772,27 @@
5590	5772	if (fullname.name.endsWith(":"))
5591	5773	{
5592	5774	// Windows
5593		- return fullname.name.substring(0, fullname.name.length()-1);
	5775	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5594	5776	}
5595	5777
5596		- return split[0];
	5778	+ return fullname.pigment = split[0];
5597	5779	}
5598	5780
5599	5781	// Windows
5600	5782	assert(split.length == 4);
5601	5783
5602		- return split[0] + ":" + split[1];
	5784	+ return fullname.pigment = split[0] + ":" + split[1];
5603	5785	}
5604	5786
5605	5787	static String GetBump(cTexture fullname)
5606	5788	{
5607	5789	if (fullname == null)
5608	5790	return "";
	5791	+
	5792	+ if (fullname.bump != null)
	5793	+ {
	5794	+ return fullname.bump;
	5795	+ }
5609	5796
5610	5797	// System.out.println("Fullname = " + fullname);
5611	5798	// Does not work on Windows due to C:
..	..	@@ -5617,12 +5804,12 @@
5617	5804
5618	5805	if (split.length == 0)
5619	5806	{
5620		- return "";
	5807	+ return fullname.bump = "";
5621	5808	}
5622	5809
5623	5810	if (split.length == 1)
5624	5811	{
5625		- return "";
	5812	+ return fullname.bump = "";
5626	5813	}
5627	5814
5628	5815	if (split.length == 2)
..	..	@@ -5630,16 +5817,16 @@
5630	5817	if (fullname.name.endsWith(":"))
5631	5818	{
5632	5819	// Windows
5633		- return "";
	5820	+ return fullname.bump = "";
5634	5821	}
5635	5822
5636		- return split[1];
	5823	+ return fullname.bump = split[1];
5637	5824	}
5638	5825
5639	5826	// Windows
5640	5827	assert(split.length == 4);
5641	5828
5642		- return split[2] + ":" + split[3];
	5829	+ return fullname.bump = split[2] + ":" + split[3];
5643	5830	}
5644	5831
5645	5832	String GetPigmentTexture()
..	..	@@ -5722,6 +5909,9 @@
5722	5909	texname = "";
5723	5910
5724	5911	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5912	+
	5913	+ GetTextures().pigment = null;
	5914	+
5725	5915	Touch();
5726	5916	}
5727	5917
..	..	@@ -5794,6 +5984,8 @@
5794	5984	texname = "";
5795	5985
5796	5986	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
	5987	+
	5988	+ GetTextures().bump = null;
5797	5989
5798	5990	Touch();
5799	5991	}
..	..	@@ -5877,6 +6069,11 @@
5877	6069	return parent.IsLive();
5878	6070	}
5879	6071
	6072	+ boolean IsDynamic()
	6073	+ {
	6074	+ return live && bRep != null;
	6075	+ }
	6076	+
5880	6077	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5881	6078	{
5882	6079	Invariants(); // june 2013
..	..	@@ -5937,7 +6134,8 @@
5937	6134	if (support != null)
5938	6135	support = support;
5939	6136
5940		- boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6137	+ boolean usecalllists = !IsDynamic() &&
	6138	+ IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5941	6139	//boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5942	6140
5943	6141	//usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
..	..	@@ -7398,7 +7596,7 @@
7398	7596	boundary.y = spot.y - 30;
7399	7597	boundary.width = spot.width + 60;
7400	7598	boundary.height = spot.height + 60;
7401		- clickInfo.g.setColor(Color.red);
	7599	+ clickInfo.g.setColor(Color.white);
7402	7600	int spotw = spot.x + spot.width;
7403	7601	int spoth = spot.y + spot.height;
7404	7602	clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
..	..	@@ -7418,7 +7616,29 @@
7418	7616	// {
7419	7617	// CameraPane.Ymax = spoth;
7420	7618	// }
7421		- spot.translate(32, 32);
	7619	+// if (CameraPane.Xmin > spot.x)
	7620	+// {
	7621	+// CameraPane.Xmin = spot.x;
	7622	+// }
	7623	+// if (CameraPane.Xmax < spotw)
	7624	+// {
	7625	+// CameraPane.Xmax = spotw;
	7626	+// }
	7627	+// if (CameraPane.Ymin > spot.y)
	7628	+// {
	7629	+// CameraPane.Ymin = spot.y;
	7630	+// }
	7631	+// if (CameraPane.Ymax < spoth)
	7632	+// {
	7633	+// CameraPane.Ymax = spoth;
	7634	+// }
	7635	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7636	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
	7637	+ spot.translate(32, 0);
	7638	+ clickInfo.g.setColor(Color.yellow);
	7639	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7640	+
	7641	+ spot.translate(32, 64);
7422	7642	spotw = spot.x + spot.width;
7423	7643	spoth = spot.y + spot.height;
7424	7644	clickInfo.g.setColor(Color.cyan);
..	..	@@ -7439,28 +7659,7 @@
7439	7659	// {
7440	7660	// CameraPane.Ymax = spoth;
7441	7661	// }
7442		- // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7443		- //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7444		- spot.translate(0, -32);
7445		- clickInfo.g.setColor(Color.yellow);
7446		- clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7447	7662	clickInfo.g.setColor(Color.green);
7448		-// if (CameraPane.Xmin > spot.x)
7449		-// {
7450		-// CameraPane.Xmin = spot.x;
7451		-// }
7452		-// if (CameraPane.Xmax < spotw)
7453		-// {
7454		-// CameraPane.Xmax = spotw;
7455		-// }
7456		-// if (CameraPane.Ymin > spot.y)
7457		-// {
7458		-// CameraPane.Ymin = spot.y;
7459		-// }
7460		-// if (CameraPane.Ymax < spoth)
7461		-// {
7462		-// CameraPane.Ymax = spoth;
7463		-// }
7464	7663	clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
7465	7664	(int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7466	7665	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
..	..	@@ -7519,12 +7718,14 @@
7519	7718	retval = true;
7520	7719	}
7521	7720	spot.translate(0, 32);
	7721	+ spot.translate(32, 0);
	7722	+ spot.translate(0, 32);
7522	7723	if (spot.contains(clickInfo.x, clickInfo.y))
7523	7724	{
7524	7725	hitSomething = hitScale;
7525	7726
7526	7727	double scale = 0.005f * clickInfo.camera.Distance();
7527		- double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7728	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7528	7729	double sign = 1;
7529	7730	if (hScale < 0)
7530	7731	{
..	..	@@ -7536,7 +7737,7 @@
7536	7737	//hScale = 0.01;
7537	7738	}
7538	7739
7539		- double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7740	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7540	7741	sign = 1;
7541	7742	if (vScale < 0)
7542	7743	{
..	..	@@ -7616,7 +7817,9 @@
7616	7817
7617	7818	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7618	7819
7619		- if (modified \|\| opposite)
	7820	+ // Modified could snap
	7821	+ if (//modified \|\|
	7822	+ opposite)
7620	7823	{
7621	7824	//assert(false);
7622	7825	/*
..	..	@@ -7710,7 +7913,7 @@
7710	7913
7711	7914	if (modified)
7712	7915	{
7713		- // Rotate 90 degrees
	7916	+ // Rotate 45 degrees
7714	7917	angle /= (Math.PI / 4);
7715	7918	angle = Math.floor(angle + 0.5);
7716	7919	angle *= (Math.PI / 4);
..	..	@@ -7751,7 +7954,7 @@
7751	7954	break;
7752	7955
7753	7956	case hitScale: // scale
7754		- double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7957	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7755	7958	double sign = 1;
7756	7959	if (hScale < 0)
7757	7960	{
..	..	@@ -7763,7 +7966,7 @@
7763	7966	//hScale = 0.01;
7764	7967	}
7765	7968
7766		- double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7969	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7767	7970	sign = 1;
7768	7971	if (vScale < 0)
7769	7972	{
..	..	@@ -7796,21 +7999,27 @@
7796	7999	case 3: // '\001'
7797	8000	if (modified \|\| opposite)
7798	8001	{
	8002	+ if (modified) // && opposite)
	8003	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8004	+ else
7799	8005	//LA.matScale(toParent, 1, hScale, vScale);
7800		- LA.matScale(toParent, totalScale, 1, 1);
	8006	+ LA.matScale(toParent, totalScale, 1, 1);
7801	8007	} // vScale, 1);
7802	8008	else
7803	8009	{
7804	8010	// EXCEPTION!
7805		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	8011	+ LA.matScale(toParent, 1, totalScale, totalScale);
7806	8012	} // vScale, 1);
7807	8013	break;
7808	8014
7809	8015	case 2: // '\002'
7810	8016	if (modified \|\| opposite)
7811	8017	{
7812		- //LA.matScale(toParent, hScale, 1, vScale);
7813		- LA.matScale(toParent, 1, totalScale, 1);
	8018	+ if (modified) // && opposite)
	8019	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8020	+ else
	8021	+ //LA.matScale(toParent, hScale, 1, vScale);
	8022	+ LA.matScale(toParent, 1, totalScale, 1);
7814	8023	} else
7815	8024	{
7816	8025	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7820,8 +8029,11 @@
7820	8029	case 1: // '\003'
7821	8030	if (modified \|\| opposite)
7822	8031	{
7823		- //LA.matScale(toParent, hScale, vScale, 1);
7824		- LA.matScale(toParent, 1, 1, totalScale);
	8032	+ if (modified) // && opposite)
	8033	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	8034	+ else
	8035	+ //LA.matScale(toParent, hScale, vScale, 1);
	8036	+ LA.matScale(toParent, 1, 1, totalScale);
7825	8037	} else
7826	8038	{
7827	8039	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7969,10 +8181,10 @@
7969	8181	} // + super.toString();
7970	8182	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
7971	8183
7972		- if (!Globals.ADVANCED)
7973		- return objname;
	8184	+// if (!Globals.ADVANCED)
	8185	+// return objname;
7974	8186
7975		- return objname + " " + System.identityHashCode(this);
	8187	+ return objname + " " + System.identityHashCode(this); // + GetUUID()
7976	8188	}
7977	8189
7978	8190	public int hashCode()