~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;
..	..	@@ -614,7 +687,7 @@
614	687	{
615	688	if (maxcount != 1)
616	689	{
617		- new Exception().printStackTrace();
	690	+ //new Exception().printStackTrace();
618	691	}
619	692
620	693	toParentMarked = LA.newMatrix();
..	..	@@ -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;
..	..	@@ -2293,11 +2369,6 @@
2293	2369
2294	2370	InitOthers();
2295	2371
2296		- if (this instanceof Camera)
2297		- {
2298		- material.shift = 90;
2299		- }
2300		-
2301	2372	material.multiply = multiply;
2302	2373
2303	2374	if (multiply)
..	..	@@ -2438,6 +2509,11 @@
2438	2509	else
2439	2510	{
2440	2511	//((ObjEditor)editWindow).SetupUI2(null);
	2512	+ if (objectUI != null)
	2513	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2514	+ else
	2515	+ //new Exception().printStackTrace();
	2516	+ System.err.println("objectUI is null");
2441	2517	}
2442	2518	}
2443	2519
..	..	@@ -3541,15 +3617,47 @@
3541	3617
3542	3618	void ClearMaterials()
3543	3619	{
	3620	+ if (blockloop)
	3621	+ return;
	3622	+
	3623	+ blockloop = true;
	3624	+
3544	3625	ClearMaterial();
3545		- for (int i = 0; i < size(); i++)
	3626	+ for (int i = 0; i < Size(); i++)
3546	3627	{
3547		- Object3D child = (Object3D) reserve(i);
	3628	+ Object3D child = (Object3D) get(i);
3548	3629	if (child == null)
3549	3630	continue;
3550	3631	child.ClearMaterials();
3551		- release(i);
3552	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;
3553	3661	}
3554	3662
3555	3663	void FlipV(boolean flip)
..	..	@@ -5539,6 +5647,11 @@
5539	5647	if (fullname == null)
5540	5648	return "";
5541	5649
	5650	+ if (fullname.pigment != null)
	5651	+ {
	5652	+ return fullname.pigment;
	5653	+ }
	5654	+
5542	5655	// System.out.println("Fullname = " + fullname);
5543	5656
5544	5657	// Does not work on Windows due to C:
..	..	@@ -5551,7 +5664,7 @@
5551	5664
5552	5665	if (split.length == 0)
5553	5666	{
5554		- return "";
	5667	+ return fullname.pigment = "";
5555	5668	}
5556	5669
5557	5670	if (split.length <= 2)
..	..	@@ -5559,22 +5672,27 @@
5559	5672	if (fullname.name.endsWith(":"))
5560	5673	{
5561	5674	// Windows
5562		- return fullname.name.substring(0, fullname.name.length()-1);
	5675	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5563	5676	}
5564	5677
5565		- return split[0];
	5678	+ return fullname.pigment = split[0];
5566	5679	}
5567	5680
5568	5681	// Windows
5569	5682	assert(split.length == 4);
5570	5683
5571		- return split[0] + ":" + split[1];
	5684	+ return fullname.pigment = split[0] + ":" + split[1];
5572	5685	}
5573	5686
5574	5687	static String GetBump(cTexture fullname)
5575	5688	{
5576	5689	if (fullname == null)
5577	5690	return "";
	5691	+
	5692	+ if (fullname.bump != null)
	5693	+ {
	5694	+ return fullname.bump;
	5695	+ }
5578	5696
5579	5697	// System.out.println("Fullname = " + fullname);
5580	5698	// Does not work on Windows due to C:
..	..	@@ -5586,12 +5704,12 @@
5586	5704
5587	5705	if (split.length == 0)
5588	5706	{
5589		- return "";
	5707	+ return fullname.bump = "";
5590	5708	}
5591	5709
5592	5710	if (split.length == 1)
5593	5711	{
5594		- return "";
	5712	+ return fullname.bump = "";
5595	5713	}
5596	5714
5597	5715	if (split.length == 2)
..	..	@@ -5599,16 +5717,16 @@
5599	5717	if (fullname.name.endsWith(":"))
5600	5718	{
5601	5719	// Windows
5602		- return "";
	5720	+ return fullname.bump = "";
5603	5721	}
5604	5722
5605		- return split[1];
	5723	+ return fullname.bump = split[1];
5606	5724	}
5607	5725
5608	5726	// Windows
5609	5727	assert(split.length == 4);
5610	5728
5611		- return split[2] + ":" + split[3];
	5729	+ return fullname.bump = split[2] + ":" + split[3];
5612	5730	}
5613	5731
5614	5732	String GetPigmentTexture()
..	..	@@ -5691,6 +5809,9 @@
5691	5809	texname = "";
5692	5810
5693	5811	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5812	+
	5813	+ GetTextures().pigment = null;
	5814	+
5694	5815	Touch();
5695	5816	}
5696	5817
..	..	@@ -5763,6 +5884,8 @@
5763	5884	texname = "";
5764	5885
5765	5886	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
	5887	+
	5888	+ GetTextures().bump = null;
5766	5889
5767	5890	Touch();
5768	5891	}
..	..	@@ -5906,8 +6029,10 @@
5906	6029	if (support != null)
5907	6030	support = support;
5908	6031
5909		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5910		- boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6032	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6033	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6034	+
	6035	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5911	6036
5912	6037	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5913	6038	{
..	..	@@ -5917,8 +6042,9 @@
5917	6042	// usecalllists &= !(parent instanceof RandomNode);
5918	6043	// usecalllists = false;
5919	6044
5920		- if (GetBRep() != null)
5921		- usecalllists = usecalllists;
	6045	+ if (display.DrawMode() == display.SHADOW)
	6046	+ //GetBRep() != null)
	6047	+ usecalllists = !!usecalllists;
5922	6048	//System.out.println("draw " + this);
5923	6049	//new Exception().printStackTrace();
5924	6050
..	..	@@ -5940,7 +6066,7 @@
5940	6066	if (!(this instanceof Composite))
5941	6067	touched = false;
5942	6068	//if (displaylist == -1 && usecalllists)
5943		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6069	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5944	6070	{
5945	6071	bRep.displaylist = display.GenList();
5946	6072	assert(bRep.displaylist != 0);
..	..	@@ -5951,7 +6077,7 @@
5951	6077
5952	6078	//System.out.println("\tnew list " + list);
5953	6079	//gl.glDrawBuffer(gl.GL_NONE);
5954		- if (usecalllists)
	6080	+ if (usecalllists && bRep.displaylist > 0)
5955	6081	{
5956	6082	// System.err.println("new list " + bRep.displaylist + " for " + this);
5957	6083	display.NewList(bRep.displaylist);
..	..	@@ -5960,7 +6086,7 @@
5960	6086	CallList(display, root, selected, blocked);
5961	6087
5962	6088	// compiled = true;
5963		- if (usecalllists)
	6089	+ if (usecalllists && bRep.displaylist > 0)
5964	6090	{
5965	6091	// System.err.println("end list " + bRep.displaylist + " for " + this);
5966	6092	display.EndList();
..	..	@@ -7364,7 +7490,7 @@
7364	7490	boundary.y = spot.y - 30;
7365	7491	boundary.width = spot.width + 60;
7366	7492	boundary.height = spot.height + 60;
7367		- clickInfo.g.setColor(Color.red);
	7493	+ clickInfo.g.setColor(Color.white);
7368	7494	int spotw = spot.x + spot.width;
7369	7495	int spoth = spot.y + spot.height;
7370	7496	clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
..	..	@@ -7384,7 +7510,29 @@
7384	7510	// {
7385	7511	// CameraPane.Ymax = spoth;
7386	7512	// }
7387		- 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);
7388	7536	spotw = spot.x + spot.width;
7389	7537	spoth = spot.y + spot.height;
7390	7538	clickInfo.g.setColor(Color.cyan);
..	..	@@ -7405,28 +7553,7 @@
7405	7553	// {
7406	7554	// CameraPane.Ymax = spoth;
7407	7555	// }
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	7556	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	7557	clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
7431	7558	(int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7432	7559	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
..	..	@@ -7485,12 +7612,14 @@
7485	7612	retval = true;
7486	7613	}
7487	7614	spot.translate(0, 32);
	7615	+ spot.translate(32, 0);
	7616	+ spot.translate(0, 32);
7488	7617	if (spot.contains(clickInfo.x, clickInfo.y))
7489	7618	{
7490	7619	hitSomething = hitScale;
7491	7620
7492	7621	double scale = 0.005f * clickInfo.camera.Distance();
7493		- double hScale = (double) (clickInfo.x /- centerPt.x/) / 32;
	7622	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7494	7623	double sign = 1;
7495	7624	if (hScale < 0)
7496	7625	{
..	..	@@ -7502,7 +7631,7 @@
7502	7631	//hScale = 0.01;
7503	7632	}
7504	7633
7505		- double vScale = (double) (clickInfo.y /- centerPt.y/) / 32;
	7634	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7506	7635	sign = 1;
7507	7636	if (vScale < 0)
7508	7637	{
..	..	@@ -7582,7 +7711,9 @@
7582	7711
7583	7712	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7584	7713
7585		- if (modified \|\| opposite)
	7714	+ // Modified could snap
	7715	+ if (//modified \|\|
	7716	+ opposite)
7586	7717	{
7587	7718	//assert(false);
7588	7719	/*
..	..	@@ -7676,7 +7807,7 @@
7676	7807
7677	7808	if (modified)
7678	7809	{
7679		- // Rotate 90 degrees
	7810	+ // Rotate 45 degrees
7680	7811	angle /= (Math.PI / 4);
7681	7812	angle = Math.floor(angle + 0.5);
7682	7813	angle *= (Math.PI / 4);
..	..	@@ -7717,7 +7848,7 @@
7717	7848	break;
7718	7849
7719	7850	case hitScale: // scale
7720		- double hScale = (double) (clickInfo.x /- centerPt.x/) / 32;
	7851	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7721	7852	double sign = 1;
7722	7853	if (hScale < 0)
7723	7854	{
..	..	@@ -7729,7 +7860,7 @@
7729	7860	//hScale = 0.01;
7730	7861	}
7731	7862
7732		- double vScale = (double) (clickInfo.y /- centerPt.y/) / 32;
	7863	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7733	7864	sign = 1;
7734	7865	if (vScale < 0)
7735	7866	{
..	..	@@ -7762,21 +7893,27 @@
7762	7893	case 3: // '\001'
7763	7894	if (modified \|\| opposite)
7764	7895	{
	7896	+ if (modified) // && opposite)
	7897	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7898	+ else
7765	7899	//LA.matScale(toParent, 1, hScale, vScale);
7766		- LA.matScale(toParent, totalScale, 1, 1);
	7900	+ LA.matScale(toParent, totalScale, 1, 1);
7767	7901	} // vScale, 1);
7768	7902	else
7769	7903	{
7770	7904	// EXCEPTION!
7771		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	7905	+ LA.matScale(toParent, 1, totalScale, totalScale);
7772	7906	} // vScale, 1);
7773	7907	break;
7774	7908
7775	7909	case 2: // '\002'
7776	7910	if (modified \|\| opposite)
7777	7911	{
7778		- //LA.matScale(toParent, hScale, 1, vScale);
7779		- 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);
7780	7917	} else
7781	7918	{
7782	7919	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7786,8 +7923,11 @@
7786	7923	case 1: // '\003'
7787	7924	if (modified \|\| opposite)
7788	7925	{
7789		- //LA.matScale(toParent, hScale, vScale, 1);
7790		- 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);
7791	7931	} else
7792	7932	{
7793	7933	LA.matScale(toParent, totalScale, totalScale, 1);