~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -174,14 +174,14 @@
174	174	{
175	175	Object3D o = hashtable.get(GetUUID());
176	176
177		- assert(this.bRep == o.bRep);
	177	+ Grafreed.Assert(this.bRep == o.bRep);
178	178	if (this.bRep != null)
179	179	assert(this.bRep.support == o.transientrep);
180	180
181	181	return;
182	182	}
183	183
184		- Object3D o = new Object3D();
	184	+ Object3D o = new Object3D("copy of " + this.name);
185	185
186	186	hashtable.put(GetUUID(), o);
187	187
..	..	@@ -219,16 +219,23 @@
219	219	if (!hashtable.containsKey(GetUUID()))
220	220	return;
221	221
	222	+ if (blockloop)
	223	+ return;
	224	+
	225	+ blockloop = true;
	226	+
222	227	Object3D o = hashtable.get(GetUUID());
223	228
224	229	RestoreBigData(o);
225	230
226		- hashtable.remove(GetUUID());
	231	+ //hashtable.remove(GetUUID());
227	232
228	233	for (int i=0; i<Size(); i++)
229	234	{
230	235	get(i).RestoreBigData(hashtable);
231	236	}
	237	+
	238	+ blockloop = false;
232	239	}
233	240
234	241	void RestoreBigData(Object3D o)
..	..	@@ -563,12 +570,14 @@
563	570	toParent = LA.newMatrix();
564	571	fromParent = LA.newMatrix();
565	572	}
	573	+
566	574	if (toParentMarked == null)
567	575	{
568	576	if (maxcount != 1)
569	577	{
570	578	new Exception().printStackTrace();
571	579	}
	580	+
572	581	toParentMarked = LA.newMatrix();
573	582	fromParentMarked = LA.newMatrix();
574	583	}
..	..	@@ -879,7 +888,7 @@
879	888
880	889	if (marked && Globals.isLIVE() && live &&
881	890	//TEMP21aug2018
882		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	891	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
883	892	currentframe != Globals.framecount)
884	893	{
885	894	currentframe = Globals.framecount;
..	..	@@ -891,7 +900,8 @@
891	900
892	901	boolean changedir = random && Math.random() < 0.01; // && !link2master;
893	902
894		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	903	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	904	+ (step == 1 && changedir))
895	905	{
896	906	countdown = 1;
897	907	delay = speedup?8:1;
..	..	@@ -963,6 +973,7 @@
963	973	if (material == null \|\| material.multiply)
964	974	return true;
965	975
	976	+ // Transparent objects are dynamic because we have to sort the triangles.
966	977	return material.opacity > 0.99;
967	978	}
968	979
..	..	@@ -2384,6 +2395,10 @@
2384	2395	}
2385	2396	*/
2386	2397	}
	2398	+ else
	2399	+ {
	2400	+ //((ObjEditor)editWindow).SetupUI2(null);
	2401	+ }
2387	2402	}
2388	2403
2389	2404	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2425,6 +2440,14 @@
2425	2440	{
2426	2441	editWindow.refreshContents();
2427	2442	}
	2443	+ else
	2444	+ {
	2445	+ if (manipWindow != null)
	2446	+ {
	2447	+ manipWindow.refreshContents();
	2448	+ }
	2449	+ }
	2450	+
2428	2451	//if (parent != null)
2429	2452	//parent.refreshEditWindow();
2430	2453	}
..	..	@@ -3501,7 +3524,8 @@
3501	3524	if (blockloop)
3502	3525	return;
3503	3526
3504		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3527	+ if (//marked \|\| // does not make sense
	3528	+ (bRep != null \|\| material != null)) // borderline...
3505	3529	live = h;
3506	3530
3507	3531	for (int i = 0; i < Size(); i++)
..	..	@@ -3522,7 +3546,8 @@
3522	3546	return;
3523	3547
3524	3548	//if (bRep != null)
3525		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3549	+ if (//marked \|\| // does not make sense
	3550	+ (bRep != null \|\| material != null)) // borderline...
3526	3551	link2master = h;
3527	3552
3528	3553	for (int i = 0; i < Size(); i++)
..	..	@@ -3542,7 +3567,8 @@
3542	3567	if (blockloop)
3543	3568	return;
3544	3569
3545		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3570	+ if (//marked \|\| // does not make sense
	3571	+ (bRep != null \|\| material != null)) // borderline...
3546	3572	hide = h;
3547	3573
3548	3574	for (int i = 0; i < Size(); i++)
..	..	@@ -3562,7 +3588,7 @@
3562	3588	if (blockloop)
3563	3589	return;
3564	3590
3565		- if (bRep != null && material != null) // borderline...
	3591	+ if (bRep != null \|\| material != null) // borderline...
3566	3592	marked = h;
3567	3593
3568	3594	for (int i = 0; i < Size(); i++)
..	..	@@ -3572,6 +3598,46 @@
3572	3598	continue;
3573	3599	blockloop = true;
3574	3600	child.MarkLeaves(h);
	3601	+ blockloop = false;
	3602	+ // release(i);
	3603	+ }
	3604	+ }
	3605	+
	3606	+ void RewindLeaves(boolean h)
	3607	+ {
	3608	+ if (blockloop)
	3609	+ return;
	3610	+
	3611	+ if (bRep != null \|\| material != null) // borderline...
	3612	+ rewind = h;
	3613	+
	3614	+ for (int i = 0; i < Size(); i++)
	3615	+ {
	3616	+ Object3D child = (Object3D) get(i); // reserve(i);
	3617	+ if (child == null)
	3618	+ continue;
	3619	+ blockloop = true;
	3620	+ child.RewindLeaves(h);
	3621	+ blockloop = false;
	3622	+ // release(i);
	3623	+ }
	3624	+ }
	3625	+
	3626	+ void RandomLeaves(boolean h)
	3627	+ {
	3628	+ if (blockloop)
	3629	+ return;
	3630	+
	3631	+ if (bRep != null \|\| material != null) // borderline...
	3632	+ random = h;
	3633	+
	3634	+ for (int i = 0; i < Size(); i++)
	3635	+ {
	3636	+ Object3D child = (Object3D) get(i); // reserve(i);
	3637	+ if (child == null)
	3638	+ continue;
	3639	+ blockloop = true;
	3640	+ child.RandomLeaves(h);
3575	3641	blockloop = false;
3576	3642	// release(i);
3577	3643	}
..	..	@@ -4349,6 +4415,55 @@
4349	4415	}
4350	4416	}
4351	4417
	4418	+ void RepairSOV()
	4419	+ {
	4420	+ if (blockloop)
	4421	+ return;
	4422	+
	4423	+ String texname = this.GetPigmentTexture();
	4424	+
	4425	+ if (texname.startsWith("sov"))
	4426	+ {
	4427	+ String[] s = texname.split("/");
	4428	+
	4429	+ String[] sname = s[1].split("Color.pn");
	4430	+
	4431	+ texname = sname[0];
	4432	+
	4433	+ if (sname.length > 1)
	4434	+ {
	4435	+ texname += "Color.jpg";
	4436	+ }
	4437	+
	4438	+ this.SetPigmentTexture("sov/" + texname);
	4439	+ }
	4440	+
	4441	+ texname = this.GetBumpTexture();
	4442	+
	4443	+ if (texname.startsWith("sov"))
	4444	+ {
	4445	+ String[] s = texname.split("/");
	4446	+
	4447	+ String[] sname = s[1].split("Bump.pn");
	4448	+
	4449	+ texname = sname[0];
	4450	+
	4451	+ if (sname.length > 1)
	4452	+ {
	4453	+ texname += "Bump.jpg";
	4454	+ }
	4455	+
	4456	+ this.SetBumpTexture("sov/" + texname);
	4457	+ }
	4458	+
	4459	+ for (int i=0; i<Size(); i++)
	4460	+ {
	4461	+ blockloop = true;
	4462	+ get(i).RepairSOV();
	4463	+ blockloop = false;
	4464	+ }
	4465	+ }
	4466	+
4352	4467	void RepairTexture()
4353	4468	{
4354	4469	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4863,6 +4978,14 @@
4863	4978	}
4864	4979	}
4865	4980
	4981	+ ObjEditor GetWindow()
	4982	+ {
	4983	+ if (editWindow != null)
	4984	+ return editWindow;
	4985	+
	4986	+ return manipWindow;
	4987	+ }
	4988	+
4866	4989	cTreePath Select(int indexcount, boolean deselect)
4867	4990	{
4868	4991	if (hide \|\| dontselect)
..	..	@@ -4899,10 +5022,11 @@
4899	5022	if (leaf != null)
4900	5023	{
4901	5024	cTreePath tp = new cTreePath(this, leaf);
4902		- if (editWindow != null)
	5025	+ ObjEditor window = GetWindow();
	5026	+ if (window != null)
4903	5027	{
4904	5028	//System.out.println("editWindow = " + editWindow + " vs " + this);
4905		- editWindow.Select(tp, deselect, true);
	5029	+ window.Select(tp, deselect, true);
4906	5030	}
4907	5031
4908	5032	return tp;
..	..	@@ -4928,9 +5052,10 @@
4928	5052	if (leaf != null)
4929	5053	{
4930	5054	cTreePath tp = new cTreePath(this, leaf);
4931		- if (editWindow != null)
	5055	+ ObjEditor window = GetWindow();
	5056	+ if (window != null)
4932	5057	{
4933		- editWindow.Select(tp, deselect, true);
	5058	+ window.Select(tp, deselect, true);
4934	5059	}
4935	5060
4936	5061	return tp;
..	..	@@ -5572,12 +5697,23 @@
5572	5697	boolean NeedSupport()
5573	5698	{
5574	5699	return
5575		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
	5700	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5576	5701	// PROBLEM with CROWD!!
5577	5702	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5578	5703	}
5579	5704
5580	5705	static boolean DEBUG_SELECTION = false;
	5706	+
	5707	+ boolean IsLive()
	5708	+ {
	5709	+ if (live)
	5710	+ return true;
	5711	+
	5712	+ if (parent == null)
	5713	+ return false;
	5714	+
	5715	+ return parent.IsLive();
	5716	+ }
5581	5717
5582	5718	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5583	5719	{
..	..	@@ -5640,7 +5776,7 @@
5640	5776	support = support;
5641	5777
5642	5778	//boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5643		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5779	+ boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5644	5780
5645	5781	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5646	5782	{
..	..	@@ -5660,10 +5796,12 @@
5660	5796	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5661	5797
5662	5798	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5663		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5799	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5800	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && (bRep != null && bRep.displaylist <= 0)))
5664	5801	{
5665	5802	Globals.lighttouched = true;
5666	5803	} // all panes...
	5804	+
5667	5805	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5668	5806	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5669	5807	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5831,16 +5969,27 @@
5831	5969	tex = GetTextures();
5832	5970	}
5833	5971
5834		- boolean failed = false;
	5972	+ boolean failedPigment = false;
	5973	+ boolean failedBump = false;
5835	5974
5836	5975	try
5837	5976	{
5838		- display.BindTextures(tex, texres);
	5977	+ display.BindPigmentTexture(tex, texres);
5839	5978	}
5840	5979	catch (Exception e)
5841	5980	{
5842	5981	System.err.println("FAILED: " + this);
5843		- failed = true;
	5982	+ failedPigment = true;
	5983	+ }
	5984	+
	5985	+ try
	5986	+ {
	5987	+ display.BindBumpTexture(tex, texres);
	5988	+ }
	5989	+ catch (Exception e)
	5990	+ {
	5991	+ //System.err.println("FAILED: " + this);
	5992	+ failedBump = true;
5844	5993	}
5845	5994
5846	5995	if (!compiled)
..	..	@@ -5863,8 +6012,11 @@
5863	6012	}
5864	6013	}
5865	6014
5866		- if (!failed)
5867		- display.ReleaseTextures(tex);
	6015	+ if (!failedBump)
	6016	+ display.ReleaseBumpTexture(tex);
	6017	+
	6018	+ if (!failedPigment)
	6019	+ display.ReleasePigmentTexture(tex);
5868	6020
5869	6021	display.PopMaterial(this, selected);
5870	6022	}
..	..	@@ -6237,6 +6389,11 @@
6237	6389	// dec 2012
6238	6390	new Exception().printStackTrace();
6239	6391	return;
	6392	+ }
	6393	+
	6394	+ if (dontselect)
	6395	+ {
	6396	+ //bRep.GenerateNormalsMINE();
6240	6397	}
6241	6398
6242	6399	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -7089,7 +7246,7 @@
7089	7246	spot.translate(32, 32);
7090	7247	spotw = spot.x + spot.width;
7091	7248	spoth = spot.y + spot.height;
7092		- info.g.setColor(Color.blue);
	7249	+ info.g.setColor(Color.cyan);
7093	7250	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7094	7251	// if (CameraPane.Xmin > spot.x)
7095	7252	// {
..	..	@@ -7107,11 +7264,12 @@
7107	7264	// {
7108	7265	// CameraPane.Ymax = spoth;
7109	7266	// }
7110		- // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7111		- //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7267	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7268	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7112	7269	spot.translate(0, -32);
7113		- info.g.setColor(Color.green);
	7270	+ info.g.setColor(Color.yellow);
7114	7271	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7272	+ info.g.setColor(Color.green);
7115	7273	// if (CameraPane.Xmin > spot.x)
7116	7274	// {
7117	7275	// CameraPane.Xmin = spot.x;
..	..	@@ -7429,19 +7587,20 @@
7429	7587	switch (info.pane.RenderCamera().viewCode)
7430	7588	{
7431	7589	case 3: // '\001'
7432		- if (modified)
	7590	+ if (modified \|\| opposite)
7433	7591	{
7434	7592	//LA.matScale(toParent, 1, hScale, vScale);
7435	7593	LA.matScale(toParent, totalScale, 1, 1);
7436	7594	} // vScale, 1);
7437	7595	else
7438	7596	{
	7597	+ // EXCEPTION!
7439	7598	LA.matScale(toParent, totalScale, totalScale, totalScale);
7440	7599	} // vScale, 1);
7441	7600	break;
7442	7601
7443	7602	case 2: // '\002'
7444		- if (modified)
	7603	+ if (modified \|\| opposite)
7445	7604	{
7446	7605	//LA.matScale(toParent, hScale, 1, vScale);
7447	7606	LA.matScale(toParent, 1, totalScale, 1);
..	..	@@ -7452,7 +7611,7 @@
7452	7611	break;
7453	7612
7454	7613	case 1: // '\003'
7455		- if (modified)
	7614	+ if (modified \|\| opposite)
7456	7615	{
7457	7616	//LA.matScale(toParent, hScale, vScale, 1);
7458	7617	LA.matScale(toParent, 1, 1, totalScale);
..	..	@@ -7672,6 +7831,10 @@
7672	7831	editWindow = null;
7673	7832	} // ?
7674	7833	}
	7834	+ else
	7835	+ {
	7836	+ //editWindow.closeUI();
	7837	+ }
7675	7838	}
7676	7839
7677	7840	boolean root; // patch for edit windows
..	..	@@ -7829,6 +7992,8 @@
7829	7992	}
7830	7993
7831	7994	transient ObjEditor editWindow;
	7995	+ transient ObjEditor manipWindow;
	7996	+
7832	7997	transient ObjectUI objectUI;
7833	7998	public static int povDepth = 0;
7834	7999	private static cVector tbMin = new cVector();