~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -22,6 +22,7 @@
22	22	//static final long serialVersionUID = -607422624994562685L;
23	23	static final long serialVersionUID = 5022536242724664900L;
24	24
	25	+ // Use GetUUID for backward compatibility with null.
25	26	private UUID uuid = UUID.randomUUID();
26	27
27	28	// TEMPORARY for mocap undo. No need to be transient.
..	..	@@ -29,9 +30,14 @@
29	30	Object3D saveskeleton;
30	31	//
31	32
32		- byte[] versions[];
	33	+ String skyboxname;
	34	+ String skyboxext;
	35	+
	36	+ Object3D versionlist[];
33	37	int versionindex = -1;
34	38
	39	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
	40	+
35	41	ScriptNode scriptnode;
36	42
37	43	void InitOthers()
..	..	@@ -219,7 +225,7 @@
219	225	// o.bRep.support = null;
220	226	// }
221	227	o.selection = this.selection;
222		- o.versions = this.versions;
	228	+ o.versionlist = this.versionlist;
223	229	o.versionindex = this.versionindex;
224	230
225	231	if (this.support != null)
..	..	@@ -241,6 +247,73 @@
241	247	// this.bRep.support = null;
242	248	// this.support = null;
243	249	// this.fileparent = null;
	250	+ }
	251	+
	252	+// Object3D GetObject(java.util.UUID uuid)
	253	+// {
	254	+// if (this.uuid.equals(uuid))
	255	+// return this;
	256	+//
	257	+// if (blockloop)
	258	+// return null;
	259	+//
	260	+// blockloop = true;
	261	+//
	262	+// for (int i=0; i<Size(); i++)
	263	+// {
	264	+// Object3D o = get(i).GetObject(uuid);
	265	+//
	266	+// if (o != null)
	267	+// return o;
	268	+// }
	269	+//
	270	+// blockloop = false;
	271	+//
	272	+// return null;
	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;
244	317	}
245	318
246	319	void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
..	..	@@ -277,7 +350,7 @@
277	350
278	351	this.selection = o.selection;
279	352
280		- this.versions = o.versions;
	353	+ this.versionlist = o.versionlist;
281	354	this.versionindex = o.versionindex;
282	355	// July 2019 if (this.bRep != null)
283	356	// this.bRep.support = o.transientrep;
..	..	@@ -1011,6 +1084,9 @@
1011	1084
1012	1085	if (material == null \|\| material.multiply)
1013	1086	return true;
	1087	+
	1088	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1089	+ return false;
1014	1090
1015	1091	// Transparent objects are dynamic because we have to sort the triangles.
1016	1092	return material.opacity > 0.99;
..	..	@@ -2438,6 +2514,11 @@
2438	2514	else
2439	2515	{
2440	2516	//((ObjEditor)editWindow).SetupUI2(null);
	2517	+ if (objectUI != null)
	2518	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2519	+ else
	2520	+ //new Exception().printStackTrace();
	2521	+ System.err.println("objectUI is null");
2441	2522	}
2442	2523	}
2443	2524
..	..	@@ -5539,6 +5620,11 @@
5539	5620	if (fullname == null)
5540	5621	return "";
5541	5622
	5623	+ if (fullname.pigment != null)
	5624	+ {
	5625	+ return fullname.pigment;
	5626	+ }
	5627	+
5542	5628	// System.out.println("Fullname = " + fullname);
5543	5629
5544	5630	// Does not work on Windows due to C:
..	..	@@ -5551,7 +5637,7 @@
5551	5637
5552	5638	if (split.length == 0)
5553	5639	{
5554		- return "";
	5640	+ return fullname.pigment = "";
5555	5641	}
5556	5642
5557	5643	if (split.length <= 2)
..	..	@@ -5559,22 +5645,27 @@
5559	5645	if (fullname.name.endsWith(":"))
5560	5646	{
5561	5647	// Windows
5562		- return fullname.name.substring(0, fullname.name.length()-1);
	5648	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5563	5649	}
5564	5650
5565		- return split[0];
	5651	+ return fullname.pigment = split[0];
5566	5652	}
5567	5653
5568	5654	// Windows
5569	5655	assert(split.length == 4);
5570	5656
5571		- return split[0] + ":" + split[1];
	5657	+ return fullname.pigment = split[0] + ":" + split[1];
5572	5658	}
5573	5659
5574	5660	static String GetBump(cTexture fullname)
5575	5661	{
5576	5662	if (fullname == null)
5577	5663	return "";
	5664	+
	5665	+ if (fullname.bump != null)
	5666	+ {
	5667	+ return fullname.bump;
	5668	+ }
5578	5669
5579	5670	// System.out.println("Fullname = " + fullname);
5580	5671	// Does not work on Windows due to C:
..	..	@@ -5586,12 +5677,12 @@
5586	5677
5587	5678	if (split.length == 0)
5588	5679	{
5589		- return "";
	5680	+ return fullname.bump = "";
5590	5681	}
5591	5682
5592	5683	if (split.length == 1)
5593	5684	{
5594		- return "";
	5685	+ return fullname.bump = "";
5595	5686	}
5596	5687
5597	5688	if (split.length == 2)
..	..	@@ -5599,16 +5690,16 @@
5599	5690	if (fullname.name.endsWith(":"))
5600	5691	{
5601	5692	// Windows
5602		- return "";
	5693	+ return fullname.bump = "";
5603	5694	}
5604	5695
5605		- return split[1];
	5696	+ return fullname.bump = split[1];
5606	5697	}
5607	5698
5608	5699	// Windows
5609	5700	assert(split.length == 4);
5610	5701
5611		- return split[2] + ":" + split[3];
	5702	+ return fullname.bump = split[2] + ":" + split[3];
5612	5703	}
5613	5704
5614	5705	String GetPigmentTexture()
..	..	@@ -5691,6 +5782,9 @@
5691	5782	texname = "";
5692	5783
5693	5784	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5785	+
	5786	+ GetTextures().pigment = null;
	5787	+
5694	5788	Touch();
5695	5789	}
5696	5790
..	..	@@ -5763,6 +5857,8 @@
5763	5857	texname = "";
5764	5858
5765	5859	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
	5860	+
	5861	+ GetTextures().bump = null;
5766	5862
5767	5863	Touch();
5768	5864	}
..	..	@@ -5906,8 +6002,10 @@
5906	6002	if (support != null)
5907	6003	support = support;
5908	6004
5909		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5910		- boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6005	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6006	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6007	+
	6008	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5911	6009
5912	6010	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5913	6011	{
..	..	@@ -5917,8 +6015,9 @@
5917	6015	// usecalllists &= !(parent instanceof RandomNode);
5918	6016	// usecalllists = false;
5919	6017
5920		- if (GetBRep() != null)
5921		- usecalllists = usecalllists;
	6018	+ if (display.DrawMode() == display.SHADOW)
	6019	+ //GetBRep() != null)
	6020	+ usecalllists = !!usecalllists;
5922	6021	//System.out.println("draw " + this);
5923	6022	//new Exception().printStackTrace();
5924	6023
..	..	@@ -5940,7 +6039,7 @@
5940	6039	if (!(this instanceof Composite))
5941	6040	touched = false;
5942	6041	//if (displaylist == -1 && usecalllists)
5943		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6042	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5944	6043	{
5945	6044	bRep.displaylist = display.GenList();
5946	6045	assert(bRep.displaylist != 0);
..	..	@@ -5951,7 +6050,7 @@
5951	6050
5952	6051	//System.out.println("\tnew list " + list);
5953	6052	//gl.glDrawBuffer(gl.GL_NONE);
5954		- if (usecalllists)
	6053	+ if (usecalllists && bRep.displaylist > 0)
5955	6054	{
5956	6055	// System.err.println("new list " + bRep.displaylist + " for " + this);
5957	6056	display.NewList(bRep.displaylist);
..	..	@@ -5960,7 +6059,7 @@
5960	6059	CallList(display, root, selected, blocked);
5961	6060
5962	6061	// compiled = true;
5963		- if (usecalllists)
	6062	+ if (usecalllists && bRep.displaylist > 0)
5964	6063	{
5965	6064	// System.err.println("end list " + bRep.displaylist + " for " + this);
5966	6065	display.EndList();
..	..	@@ -7364,7 +7463,7 @@
7364	7463	boundary.y = spot.y - 30;
7365	7464	boundary.width = spot.width + 60;
7366	7465	boundary.height = spot.height + 60;
7367		- clickInfo.g.setColor(Color.red);
	7466	+ clickInfo.g.setColor(Color.white);
7368	7467	int spotw = spot.x + spot.width;
7369	7468	int spoth = spot.y + spot.height;
7370	7469	clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
..	..	@@ -7384,7 +7483,29 @@
7384	7483	// {
7385	7484	// CameraPane.Ymax = spoth;
7386	7485	// }
7387		- 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);
7388	7509	spotw = spot.x + spot.width;
7389	7510	spoth = spot.y + spot.height;
7390	7511	clickInfo.g.setColor(Color.cyan);
..	..	@@ -7405,28 +7526,7 @@
7405	7526	// {
7406	7527	// CameraPane.Ymax = spoth;
7407	7528	// }
7408		- // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7409		- //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7410		- spot.translate(0, -32);
7411		- clickInfo.g.setColor(Color.yellow);
7412		- clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7413	7529	clickInfo.g.setColor(Color.green);
7414		-// if (CameraPane.Xmin > spot.x)
7415		-// {
7416		-// CameraPane.Xmin = spot.x;
7417		-// }
7418		-// if (CameraPane.Xmax < spotw)
7419		-// {
7420		-// CameraPane.Xmax = spotw;
7421		-// }
7422		-// if (CameraPane.Ymin > spot.y)
7423		-// {
7424		-// CameraPane.Ymin = spot.y;
7425		-// }
7426		-// if (CameraPane.Ymax < spoth)
7427		-// {
7428		-// CameraPane.Ymax = spoth;
7429		-// }
7430	7530	clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
7431	7531	(int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7432	7532	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
..	..	@@ -7485,12 +7585,14 @@
7485	7585	retval = true;
7486	7586	}
7487	7587	spot.translate(0, 32);
	7588	+ spot.translate(32, 0);
	7589	+ spot.translate(0, 32);
7488	7590	if (spot.contains(clickInfo.x, clickInfo.y))
7489	7591	{
7490	7592	hitSomething = hitScale;
7491	7593
7492	7594	double scale = 0.005f * clickInfo.camera.Distance();
7493		- double hScale = (double) (clickInfo.x /- centerPt.x/) / 32;
	7595	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7494	7596	double sign = 1;
7495	7597	if (hScale < 0)
7496	7598	{
..	..	@@ -7502,7 +7604,7 @@
7502	7604	//hScale = 0.01;
7503	7605	}
7504	7606
7505		- double vScale = (double) (clickInfo.y /- centerPt.y/) / 32;
	7607	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7506	7608	sign = 1;
7507	7609	if (vScale < 0)
7508	7610	{
..	..	@@ -7717,7 +7819,7 @@
7717	7819	break;
7718	7820
7719	7821	case hitScale: // scale
7720		- double hScale = (double) (clickInfo.x /- centerPt.x/) / 32;
	7822	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7721	7823	double sign = 1;
7722	7824	if (hScale < 0)
7723	7825	{
..	..	@@ -7729,7 +7831,7 @@
7729	7831	//hScale = 0.01;
7730	7832	}
7731	7833
7732		- double vScale = (double) (clickInfo.y /- centerPt.y/) / 32;
	7834	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7733	7835	sign = 1;
7734	7836	if (vScale < 0)
7735	7837	{
..	..	@@ -7762,21 +7864,27 @@
7762	7864	case 3: // '\001'
7763	7865	if (modified \|\| opposite)
7764	7866	{
	7867	+ if (modified && opposite)
	7868	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7869	+ else
7765	7870	//LA.matScale(toParent, 1, hScale, vScale);
7766		- LA.matScale(toParent, totalScale, 1, 1);
	7871	+ LA.matScale(toParent, totalScale, 1, 1);
7767	7872	} // vScale, 1);
7768	7873	else
7769	7874	{
7770	7875	// EXCEPTION!
7771		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	7876	+ LA.matScale(toParent, 1, totalScale, totalScale);
7772	7877	} // vScale, 1);
7773	7878	break;
7774	7879
7775	7880	case 2: // '\002'
7776	7881	if (modified \|\| opposite)
7777	7882	{
7778		- //LA.matScale(toParent, hScale, 1, vScale);
7779		- 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);
7780	7888	} else
7781	7889	{
7782	7890	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7786,8 +7894,11 @@
7786	7894	case 1: // '\003'
7787	7895	if (modified \|\| opposite)
7788	7896	{
7789		- //LA.matScale(toParent, hScale, vScale, 1);
7790		- 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);
7791	7902	} else
7792	7903	{
7793	7904	LA.matScale(toParent, totalScale, totalScale, 1);