~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -36,6 +36,8 @@
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
41	43	void InitOthers()
..	..	@@ -269,6 +271,50 @@
269	271	//
270	272	// return null;
271	273	// }
	274	+
	275	+ transient boolean tag;
	276	+
	277	+ void TagObjects(Object3D o, boolean tag)
	278	+ {
	279	+ if (blockloop)
	280	+ return;
	281	+
	282	+ o.tag = tag;
	283	+
	284	+ if (o == this)
	285	+ return;
	286	+
	287	+ blockloop = true;
	288	+
	289	+ for (int i=0; i<Size(); i++)
	290	+ {
	291	+ get(i).TagObjects(o, tag);
	292	+ }
	293	+
	294	+ blockloop = false;
	295	+ }
	296	+
	297	+ boolean HasTags()
	298	+ {
	299	+ if (blockloop)
	300	+ return false;
	301	+
	302	+ blockloop = true;
	303	+
	304	+ boolean hasTags = false;
	305	+
	306	+ for (int i=0; i<Size(); i++)
	307	+ {
	308	+ hasTags \|= get(i).tag \|\| get(i).HasTags();
	309	+
	310	+ if (hasTags)
	311	+ break;
	312	+ }
	313	+
	314	+ blockloop = false;
	315	+
	316	+ return hasTags;
	317	+ }
272	318
273	319	void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
274	320	{
..	..	@@ -641,7 +687,7 @@
641	687	{
642	688	if (maxcount != 1)
643	689	{
644		- new Exception().printStackTrace();
	690	+ //new Exception().printStackTrace();
645	691	}
646	692
647	693	toParentMarked = LA.newMatrix();
..	..	@@ -2323,11 +2369,6 @@
2323	2369
2324	2370	InitOthers();
2325	2371
2326		- if (this instanceof Camera)
2327		- {
2328		- material.shift = 90;
2329		- }
2330		-
2331	2372	material.multiply = multiply;
2332	2373
2333	2374	if (multiply)
..	..	@@ -2468,7 +2509,11 @@
2468	2509	else
2469	2510	{
2470	2511	//((ObjEditor)editWindow).SetupUI2(null);
2471		- ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2512	+ if (objectUI != null)
	2513	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2514	+ else
	2515	+ //new Exception().printStackTrace();
	2516	+ System.err.println("objectUI is null");
2472	2517	}
2473	2518	}
2474	2519
..	..	@@ -3572,15 +3617,47 @@
3572	3617
3573	3618	void ClearMaterials()
3574	3619	{
	3620	+ if (blockloop)
	3621	+ return;
	3622	+
	3623	+ blockloop = true;
	3624	+
3575	3625	ClearMaterial();
3576		- for (int i = 0; i < size(); i++)
	3626	+ for (int i = 0; i < Size(); i++)
3577	3627	{
3578		- Object3D child = (Object3D) reserve(i);
	3628	+ Object3D child = (Object3D) get(i);
3579	3629	if (child == null)
3580	3630	continue;
3581	3631	child.ClearMaterials();
3582		- release(i);
3583	3632	}
	3633	+
	3634	+ blockloop = false;
	3635	+ }
	3636	+
	3637	+ void ClearVersionList()
	3638	+ {
	3639	+ this.versionlist = null;
	3640	+ this.versionindex = -1;
	3641	+ this.versiontable = null;
	3642	+ }
	3643	+
	3644	+ void ClearVersions()
	3645	+ {
	3646	+ if (blockloop)
	3647	+ return;
	3648	+
	3649	+ blockloop = true;
	3650	+
	3651	+ ClearVersionList();
	3652	+ for (int i = 0; i < Size(); i++)
	3653	+ {
	3654	+ Object3D child = (Object3D) get(i);
	3655	+ if (child == null)
	3656	+ continue;
	3657	+ child.ClearVersions();
	3658	+ }
	3659	+
	3660	+ blockloop = false;
3584	3661	}
3585	3662
3586	3663	void FlipV(boolean flip)
..	..	@@ -5570,6 +5647,11 @@
5570	5647	if (fullname == null)
5571	5648	return "";
5572	5649
	5650	+ if (fullname.pigment != null)
	5651	+ {
	5652	+ return fullname.pigment;
	5653	+ }
	5654	+
5573	5655	// System.out.println("Fullname = " + fullname);
5574	5656
5575	5657	// Does not work on Windows due to C:
..	..	@@ -5582,7 +5664,7 @@
5582	5664
5583	5665	if (split.length == 0)
5584	5666	{
5585		- return "";
	5667	+ return fullname.pigment = "";
5586	5668	}
5587	5669
5588	5670	if (split.length <= 2)
..	..	@@ -5590,22 +5672,27 @@
5590	5672	if (fullname.name.endsWith(":"))
5591	5673	{
5592	5674	// Windows
5593		- return fullname.name.substring(0, fullname.name.length()-1);
	5675	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5594	5676	}
5595	5677
5596		- return split[0];
	5678	+ return fullname.pigment = split[0];
5597	5679	}
5598	5680
5599	5681	// Windows
5600	5682	assert(split.length == 4);
5601	5683
5602		- return split[0] + ":" + split[1];
	5684	+ return fullname.pigment = split[0] + ":" + split[1];
5603	5685	}
5604	5686
5605	5687	static String GetBump(cTexture fullname)
5606	5688	{
5607	5689	if (fullname == null)
5608	5690	return "";
	5691	+
	5692	+ if (fullname.bump != null)
	5693	+ {
	5694	+ return fullname.bump;
	5695	+ }
5609	5696
5610	5697	// System.out.println("Fullname = " + fullname);
5611	5698	// Does not work on Windows due to C:
..	..	@@ -5617,12 +5704,12 @@
5617	5704
5618	5705	if (split.length == 0)
5619	5706	{
5620		- return "";
	5707	+ return fullname.bump = "";
5621	5708	}
5622	5709
5623	5710	if (split.length == 1)
5624	5711	{
5625		- return "";
	5712	+ return fullname.bump = "";
5626	5713	}
5627	5714
5628	5715	if (split.length == 2)
..	..	@@ -5630,16 +5717,16 @@
5630	5717	if (fullname.name.endsWith(":"))
5631	5718	{
5632	5719	// Windows
5633		- return "";
	5720	+ return fullname.bump = "";
5634	5721	}
5635	5722
5636		- return split[1];
	5723	+ return fullname.bump = split[1];
5637	5724	}
5638	5725
5639	5726	// Windows
5640	5727	assert(split.length == 4);
5641	5728
5642		- return split[2] + ":" + split[3];
	5729	+ return fullname.bump = split[2] + ":" + split[3];
5643	5730	}
5644	5731
5645	5732	String GetPigmentTexture()
..	..	@@ -5722,6 +5809,9 @@
5722	5809	texname = "";
5723	5810
5724	5811	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5812	+
	5813	+ GetTextures().pigment = null;
	5814	+
5725	5815	Touch();
5726	5816	}
5727	5817
..	..	@@ -5794,6 +5884,8 @@
5794	5884	texname = "";
5795	5885
5796	5886	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
	5887	+
	5888	+ GetTextures().bump = null;
5797	5889
5798	5890	Touch();
5799	5891	}
..	..	@@ -7398,7 +7490,7 @@
7398	7490	boundary.y = spot.y - 30;
7399	7491	boundary.width = spot.width + 60;
7400	7492	boundary.height = spot.height + 60;
7401		- clickInfo.g.setColor(Color.red);
	7493	+ clickInfo.g.setColor(Color.white);
7402	7494	int spotw = spot.x + spot.width;
7403	7495	int spoth = spot.y + spot.height;
7404	7496	clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
..	..	@@ -7418,7 +7510,29 @@
7418	7510	// {
7419	7511	// CameraPane.Ymax = spoth;
7420	7512	// }
7421		- spot.translate(32, 32);
	7513	+// if (CameraPane.Xmin > spot.x)
	7514	+// {
	7515	+// CameraPane.Xmin = spot.x;
	7516	+// }
	7517	+// if (CameraPane.Xmax < spotw)
	7518	+// {
	7519	+// CameraPane.Xmax = spotw;
	7520	+// }
	7521	+// if (CameraPane.Ymin > spot.y)
	7522	+// {
	7523	+// CameraPane.Ymin = spot.y;
	7524	+// }
	7525	+// if (CameraPane.Ymax < spoth)
	7526	+// {
	7527	+// CameraPane.Ymax = spoth;
	7528	+// }
	7529	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7530	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
	7531	+ spot.translate(32, 0);
	7532	+ clickInfo.g.setColor(Color.yellow);
	7533	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7534	+
	7535	+ spot.translate(32, 64);
7422	7536	spotw = spot.x + spot.width;
7423	7537	spoth = spot.y + spot.height;
7424	7538	clickInfo.g.setColor(Color.cyan);
..	..	@@ -7439,28 +7553,7 @@
7439	7553	// {
7440	7554	// CameraPane.Ymax = spoth;
7441	7555	// }
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	7556	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	7557	clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
7465	7558	(int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7466	7559	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
..	..	@@ -7519,12 +7612,14 @@
7519	7612	retval = true;
7520	7613	}
7521	7614	spot.translate(0, 32);
	7615	+ spot.translate(32, 0);
	7616	+ spot.translate(0, 32);
7522	7617	if (spot.contains(clickInfo.x, clickInfo.y))
7523	7618	{
7524	7619	hitSomething = hitScale;
7525	7620
7526	7621	double scale = 0.005f * clickInfo.camera.Distance();
7527		- double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7622	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7528	7623	double sign = 1;
7529	7624	if (hScale < 0)
7530	7625	{
..	..	@@ -7536,7 +7631,7 @@
7536	7631	//hScale = 0.01;
7537	7632	}
7538	7633
7539		- double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7634	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7540	7635	sign = 1;
7541	7636	if (vScale < 0)
7542	7637	{
..	..	@@ -7616,7 +7711,9 @@
7616	7711
7617	7712	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7618	7713
7619		- if (modified \|\| opposite)
	7714	+ // Modified could snap
	7715	+ if (//modified \|\|
	7716	+ opposite)
7620	7717	{
7621	7718	//assert(false);
7622	7719	/*
..	..	@@ -7710,7 +7807,7 @@
7710	7807
7711	7808	if (modified)
7712	7809	{
7713		- // Rotate 90 degrees
	7810	+ // Rotate 45 degrees
7714	7811	angle /= (Math.PI / 4);
7715	7812	angle = Math.floor(angle + 0.5);
7716	7813	angle *= (Math.PI / 4);
..	..	@@ -7751,7 +7848,7 @@
7751	7848	break;
7752	7849
7753	7850	case hitScale: // scale
7754		- double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7851	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7755	7852	double sign = 1;
7756	7853	if (hScale < 0)
7757	7854	{
..	..	@@ -7763,7 +7860,7 @@
7763	7860	//hScale = 0.01;
7764	7861	}
7765	7862
7766		- double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7863	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7767	7864	sign = 1;
7768	7865	if (vScale < 0)
7769	7866	{
..	..	@@ -7796,21 +7893,27 @@
7796	7893	case 3: // '\001'
7797	7894	if (modified \|\| opposite)
7798	7895	{
	7896	+ if (modified) // && opposite)
	7897	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7898	+ else
7799	7899	//LA.matScale(toParent, 1, hScale, vScale);
7800		- LA.matScale(toParent, totalScale, 1, 1);
	7900	+ LA.matScale(toParent, totalScale, 1, 1);
7801	7901	} // vScale, 1);
7802	7902	else
7803	7903	{
7804	7904	// EXCEPTION!
7805		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	7905	+ LA.matScale(toParent, 1, totalScale, totalScale);
7806	7906	} // vScale, 1);
7807	7907	break;
7808	7908
7809	7909	case 2: // '\002'
7810	7910	if (modified \|\| opposite)
7811	7911	{
7812		- //LA.matScale(toParent, hScale, 1, vScale);
7813		- LA.matScale(toParent, 1, totalScale, 1);
	7912	+ if (modified) // && opposite)
	7913	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7914	+ else
	7915	+ //LA.matScale(toParent, hScale, 1, vScale);
	7916	+ LA.matScale(toParent, 1, totalScale, 1);
7814	7917	} else
7815	7918	{
7816	7919	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7820,8 +7923,11 @@
7820	7923	case 1: // '\003'
7821	7924	if (modified \|\| opposite)
7822	7925	{
7823		- //LA.matScale(toParent, hScale, vScale, 1);
7824		- LA.matScale(toParent, 1, 1, totalScale);
	7926	+ if (modified) // && opposite)
	7927	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7928	+ else
	7929	+ //LA.matScale(toParent, hScale, vScale, 1);
	7930	+ LA.matScale(toParent, 1, 1, totalScale);
7825	7931	} else
7826	7932	{
7827	7933	LA.matScale(toParent, totalScale, totalScale, 1);