~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	{
..	..	@@ -2468,7 +2514,11 @@
2468	2514	else
2469	2515	{
2470	2516	//((ObjEditor)editWindow).SetupUI2(null);
2471		- ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2517	+ if (objectUI != null)
	2518	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2519	+ else
	2520	+ //new Exception().printStackTrace();
	2521	+ System.err.println("objectUI is null");
2472	2522	}
2473	2523	}
2474	2524
..	..	@@ -5570,6 +5620,11 @@
5570	5620	if (fullname == null)
5571	5621	return "";
5572	5622
	5623	+ if (fullname.pigment != null)
	5624	+ {
	5625	+ return fullname.pigment;
	5626	+ }
	5627	+
5573	5628	// System.out.println("Fullname = " + fullname);
5574	5629
5575	5630	// Does not work on Windows due to C:
..	..	@@ -5582,7 +5637,7 @@
5582	5637
5583	5638	if (split.length == 0)
5584	5639	{
5585		- return "";
	5640	+ return fullname.pigment = "";
5586	5641	}
5587	5642
5588	5643	if (split.length <= 2)
..	..	@@ -5590,22 +5645,27 @@
5590	5645	if (fullname.name.endsWith(":"))
5591	5646	{
5592	5647	// Windows
5593		- return fullname.name.substring(0, fullname.name.length()-1);
	5648	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5594	5649	}
5595	5650
5596		- return split[0];
	5651	+ return fullname.pigment = split[0];
5597	5652	}
5598	5653
5599	5654	// Windows
5600	5655	assert(split.length == 4);
5601	5656
5602		- return split[0] + ":" + split[1];
	5657	+ return fullname.pigment = split[0] + ":" + split[1];
5603	5658	}
5604	5659
5605	5660	static String GetBump(cTexture fullname)
5606	5661	{
5607	5662	if (fullname == null)
5608	5663	return "";
	5664	+
	5665	+ if (fullname.bump != null)
	5666	+ {
	5667	+ return fullname.bump;
	5668	+ }
5609	5669
5610	5670	// System.out.println("Fullname = " + fullname);
5611	5671	// Does not work on Windows due to C:
..	..	@@ -5617,12 +5677,12 @@
5617	5677
5618	5678	if (split.length == 0)
5619	5679	{
5620		- return "";
	5680	+ return fullname.bump = "";
5621	5681	}
5622	5682
5623	5683	if (split.length == 1)
5624	5684	{
5625		- return "";
	5685	+ return fullname.bump = "";
5626	5686	}
5627	5687
5628	5688	if (split.length == 2)
..	..	@@ -5630,16 +5690,16 @@
5630	5690	if (fullname.name.endsWith(":"))
5631	5691	{
5632	5692	// Windows
5633		- return "";
	5693	+ return fullname.bump = "";
5634	5694	}
5635	5695
5636		- return split[1];
	5696	+ return fullname.bump = split[1];
5637	5697	}
5638	5698
5639	5699	// Windows
5640	5700	assert(split.length == 4);
5641	5701
5642		- return split[2] + ":" + split[3];
	5702	+ return fullname.bump = split[2] + ":" + split[3];
5643	5703	}
5644	5704
5645	5705	String GetPigmentTexture()
..	..	@@ -5722,6 +5782,9 @@
5722	5782	texname = "";
5723	5783
5724	5784	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5785	+
	5786	+ GetTextures().pigment = null;
	5787	+
5725	5788	Touch();
5726	5789	}
5727	5790
..	..	@@ -5794,6 +5857,8 @@
5794	5857	texname = "";
5795	5858
5796	5859	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
	5860	+
	5861	+ GetTextures().bump = null;
5797	5862
5798	5863	Touch();
5799	5864	}
..	..	@@ -7398,7 +7463,7 @@
7398	7463	boundary.y = spot.y - 30;
7399	7464	boundary.width = spot.width + 60;
7400	7465	boundary.height = spot.height + 60;
7401		- clickInfo.g.setColor(Color.red);
	7466	+ clickInfo.g.setColor(Color.white);
7402	7467	int spotw = spot.x + spot.width;
7403	7468	int spoth = spot.y + spot.height;
7404	7469	clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
..	..	@@ -7418,7 +7483,29 @@
7418	7483	// {
7419	7484	// CameraPane.Ymax = spoth;
7420	7485	// }
7421		- spot.translate(32, 32);
	7486	+// if (CameraPane.Xmin > spot.x)
	7487	+// {
	7488	+// CameraPane.Xmin = spot.x;
	7489	+// }
	7490	+// if (CameraPane.Xmax < spotw)
	7491	+// {
	7492	+// CameraPane.Xmax = spotw;
	7493	+// }
	7494	+// if (CameraPane.Ymin > spot.y)
	7495	+// {
	7496	+// CameraPane.Ymin = spot.y;
	7497	+// }
	7498	+// if (CameraPane.Ymax < spoth)
	7499	+// {
	7500	+// CameraPane.Ymax = spoth;
	7501	+// }
	7502	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7503	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
	7504	+ spot.translate(32, 0);
	7505	+ clickInfo.g.setColor(Color.yellow);
	7506	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7507	+
	7508	+ spot.translate(32, 64);
7422	7509	spotw = spot.x + spot.width;
7423	7510	spoth = spot.y + spot.height;
7424	7511	clickInfo.g.setColor(Color.cyan);
..	..	@@ -7439,28 +7526,7 @@
7439	7526	// {
7440	7527	// CameraPane.Ymax = spoth;
7441	7528	// }
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	7529	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	7530	clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
7465	7531	(int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7466	7532	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
..	..	@@ -7519,12 +7585,14 @@
7519	7585	retval = true;
7520	7586	}
7521	7587	spot.translate(0, 32);
	7588	+ spot.translate(32, 0);
	7589	+ spot.translate(0, 32);
7522	7590	if (spot.contains(clickInfo.x, clickInfo.y))
7523	7591	{
7524	7592	hitSomething = hitScale;
7525	7593
7526	7594	double scale = 0.005f * clickInfo.camera.Distance();
7527		- double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7595	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7528	7596	double sign = 1;
7529	7597	if (hScale < 0)
7530	7598	{
..	..	@@ -7536,7 +7604,7 @@
7536	7604	//hScale = 0.01;
7537	7605	}
7538	7606
7539		- double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7607	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7540	7608	sign = 1;
7541	7609	if (vScale < 0)
7542	7610	{
..	..	@@ -7751,7 +7819,7 @@
7751	7819	break;
7752	7820
7753	7821	case hitScale: // scale
7754		- double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7822	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7755	7823	double sign = 1;
7756	7824	if (hScale < 0)
7757	7825	{
..	..	@@ -7763,7 +7831,7 @@
7763	7831	//hScale = 0.01;
7764	7832	}
7765	7833
7766		- double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7834	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7767	7835	sign = 1;
7768	7836	if (vScale < 0)
7769	7837	{
..	..	@@ -7796,21 +7864,27 @@
7796	7864	case 3: // '\001'
7797	7865	if (modified \|\| opposite)
7798	7866	{
	7867	+ if (modified && opposite)
	7868	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7869	+ else
7799	7870	//LA.matScale(toParent, 1, hScale, vScale);
7800		- LA.matScale(toParent, totalScale, 1, 1);
	7871	+ LA.matScale(toParent, totalScale, 1, 1);
7801	7872	} // vScale, 1);
7802	7873	else
7803	7874	{
7804	7875	// EXCEPTION!
7805		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	7876	+ LA.matScale(toParent, 1, totalScale, totalScale);
7806	7877	} // vScale, 1);
7807	7878	break;
7808	7879
7809	7880	case 2: // '\002'
7810	7881	if (modified \|\| opposite)
7811	7882	{
7812		- //LA.matScale(toParent, hScale, 1, vScale);
7813		- LA.matScale(toParent, 1, totalScale, 1);
	7883	+ if (modified && opposite)
	7884	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7885	+ else
	7886	+ //LA.matScale(toParent, hScale, 1, vScale);
	7887	+ LA.matScale(toParent, 1, totalScale, 1);
7814	7888	} else
7815	7889	{
7816	7890	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7820,8 +7894,11 @@
7820	7894	case 1: // '\003'
7821	7895	if (modified \|\| opposite)
7822	7896	{
7823		- //LA.matScale(toParent, hScale, vScale, 1);
7824		- LA.matScale(toParent, 1, 1, totalScale);
	7897	+ if (modified && opposite)
	7898	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7899	+ else
	7900	+ //LA.matScale(toParent, hScale, vScale, 1);
	7901	+ LA.matScale(toParent, 1, 1, totalScale);
7825	7902	} else
7826	7903	{
7827	7904	LA.matScale(toParent, totalScale, totalScale, 1);