~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -24,6 +24,14 @@
24	24
25	25	private UUID uuid = UUID.randomUUID();
26	26
	27	+ // TEMPORARY for mocap undo. No need to be transient.
	28	+ mocap.reader.BVHReader.BVHResult savebvh;
	29	+ Object3D saveskeleton;
	30	+ //
	31	+
	32	+ byte[] versions[];
	33	+ int versionindex = -1;
	34	+
27	35	ScriptNode scriptnode;
28	36
29	37	void InitOthers()
..	..	@@ -104,117 +112,178 @@
104	112
105	113	// transient boolean reduced; // for morph reduction
106	114
107		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
108		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	115	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	116	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
109	117
110		-transient Object3D transientsupport; // for cloning
111		-transient boolean transientlink2master;
	118	+ transient Object3D transientsupport; // for cloning
	119	+ transient boolean transientlink2master;
112	120
113		-void SaveSupports()
114		-{
115		- if (blockloop)
116		- return;
117		-
118		- transientsupport = support;
119		- transientlink2master = link2master;
120		-
121		- support = null;
122		- link2master = false;
123		-
124		- if (bRep != null)
	121	+ void SaveSupports()
125	122	{
126		- bRep.SaveSupports();
	123	+ if (blockloop)
	124	+ return;
	125	+
	126	+ transientsupport = support;
	127	+ transientlink2master = link2master;
	128	+
	129	+ support = null;
	130	+ link2master = false;
	131	+
	132	+ if (bRep != null)
	133	+ {
	134	+ bRep.SaveSupports();
	135	+ }
	136	+
	137	+ for (int i = 0; i < Size(); i++)
	138	+ {
	139	+ Object3D child = (Object3D) get(i);
	140	+ if (child == null)
	141	+ continue;
	142	+ blockloop = true;
	143	+ child.SaveSupports();
	144	+ blockloop = false;
	145	+ }
127	146	}
128		-
129		- for (int i = 0; i < Size(); i++)
	147	+
	148	+ void RestoreSupports()
130	149	{
131		- Object3D child = (Object3D) get(i);
132		- if (child == null)
133		- continue;
	150	+ if (blockloop)
	151	+ return;
	152	+
	153	+ support = transientsupport;
	154	+ link2master = transientlink2master;
	155	+ transientsupport = null;
	156	+ transientlink2master = false;
	157	+
	158	+ if (bRep != null)
	159	+ {
	160	+ bRep.RestoreSupports();
	161	+ }
	162	+
	163	+ for (int i = 0; i < Size(); i++)
	164	+ {
	165	+ Object3D child = (Object3D) get(i);
	166	+ if (child == null)
	167	+ continue;
	168	+ blockloop = true;
	169	+ child.RestoreSupports();
	170	+ blockloop = false;
	171	+ }
	172	+ }
	173	+
	174	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	175	+ {
	176	+ Object3D o;
	177	+
	178	+ if (hashtable.containsKey(GetUUID()))
	179	+ {
	180	+ o = hashtable.get(GetUUID());
	181	+
	182	+ Grafreed.Assert(this.bRep == o.bRep);
	183	+ //if (this.bRep != null)
	184	+ // assert(this.bRep.support == o.transientrep);
	185	+ if (this.support != null)
	186	+ assert(this.support.bRep == o.transientrep);
	187	+ }
	188	+ else
	189	+ {
	190	+ o = new Object3D("copy of " + this.name);
	191	+
	192	+ hashtable.put(GetUUID(), o);
	193	+ }
	194	+
	195	+ if (!blockloop)
	196	+ {
	197	+ blockloop = true;
	198	+
	199	+ for (int i=0; i<Size(); i++)
	200	+ {
	201	+ get(i).ExtractBigData(hashtable);
	202	+ }
	203	+
	204	+ blockloop = false;
	205	+ }
	206	+
	207	+ ExtractBigData(o);
	208	+ }
	209	+
	210	+ void ExtractBigData(Object3D o)
	211	+ {
	212	+ if (o.bRep != null)
	213	+ Grafreed.Assert(o.bRep == this.bRep);
	214	+
	215	+ o.bRep = this.bRep;
	216	+// July 2019 if (this.bRep != null)
	217	+// {
	218	+// o.transientrep = this.bRep.support;
	219	+// o.bRep.support = null;
	220	+// }
	221	+ o.selection = this.selection;
	222	+ o.versions = this.versions;
	223	+ o.versionindex = this.versionindex;
	224	+
	225	+ if (this.support != null)
	226	+ {
	227	+ if (o.transientrep != null)
	228	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	229	+
	230	+ o.transientrep = this.support.bRep;
	231	+ this.support.bRep = null;
	232	+ }
	233	+
	234	+ // o.support = this.support;
	235	+ // o.fileparent = this.fileparent;
	236	+ // if (this.bRep != null)
	237	+ // o.bRep = this.bRep.support;
	238	+
	239	+ this.bRep = null;
	240	+ // if (this.bRep != null)
	241	+ // this.bRep.support = null;
	242	+ // this.support = null;
	243	+ // this.fileparent = null;
	244	+ }
	245	+
	246	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	247	+ {
	248	+ if (!hashtable.containsKey(GetUUID()))
	249	+ return;
	250	+
	251	+ Object3D o = hashtable.get(GetUUID());
	252	+
	253	+ RestoreBigData(o);
	254	+
	255	+ if (blockloop)
	256	+ return;
	257	+
134	258	blockloop = true;
135		- child.SaveSupports();
	259	+
	260	+ //hashtable.remove(GetUUID());
	261	+
	262	+ for (int i=0; i<Size(); i++)
	263	+ {
	264	+ get(i).RestoreBigData(hashtable);
	265	+ }
	266	+
136	267	blockloop = false;
137	268	}
138		-}
139	269
140		-void RestoreSupports()
141		-{
142		- if (blockloop)
143		- return;
144		-
145		- support = transientsupport;
146		- link2master = transientlink2master;
147		- transientsupport = null;
148		- transientlink2master = false;
149		-
150		- if (bRep != null)
	270	+ void RestoreBigData(Object3D o)
151	271	{
152		- bRep.RestoreSupports();
	272	+ this.bRep = o.bRep;
	273	+ if (this.support != null && o.transientrep != null)
	274	+ {
	275	+ this.support.bRep = o.transientrep;
	276	+ }
	277	+
	278	+ this.selection = o.selection;
	279	+
	280	+ this.versions = o.versions;
	281	+ this.versionindex = o.versionindex;
	282	+// July 2019 if (this.bRep != null)
	283	+// this.bRep.support = o.transientrep;
	284	+ // this.support = o.support;
	285	+ // this.fileparent = o.fileparent;
153	286	}
154		-
155		- for (int i = 0; i < Size(); i++)
156		- {
157		- Object3D child = (Object3D) get(i);
158		- if (child == null)
159		- continue;
160		- blockloop = true;
161		- child.RestoreSupports();
162		- blockloop = false;
163		- }
164		-}
165		-
166		-void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
167		-{
168		- if (hashtable.containsKey(GetUUID()))
169		- return;
170		-
171		- Object3D o = new Object3D();
172		- o.bRep = this.bRep;
173		- if (this.bRep != null)
174		- {
175		- o.transientrep = this.bRep.support;
176		- o.bRep.support = null;
177		- }
178		-
179		-// o.support = this.support;
180		-// o.fileparent = this.fileparent;
181		-// if (this.bRep != null)
182		-// o.bRep = this.bRep.support;
183		-
184		- hashtable.put(GetUUID(), o);
185		-
186		- this.bRep = null;
187		-// if (this.bRep != null)
188		-// this.bRep.support = null;
189		-// this.support = null;
190		-// this.fileparent = null;
191		-
192		- for (int i=0; i<Size(); i++)
193		- {
194		- get(i).ExtractBigData(hashtable);
195		- }
196		-}
197		-
198		-void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
199		-{
200		- if (!hashtable.containsKey(GetUUID()))
201		- return;
202		-
203		- Object3D o = hashtable.get(GetUUID());
204		-
205		- this.bRep = o.bRep;
206		- if (this.bRep != null)
207		- this.bRep.support = o.transientrep;
208		-// this.support = o.support;
209		-// this.fileparent = o.fileparent;
210		-
211		- hashtable.remove(GetUUID());
212		-
213		- for (int i=0; i<Size(); i++)
214		- {
215		- get(i).RestoreBigData(hashtable);
216		- }
217		-}
218	287
219	288	// MOCAP SUPPORT
220	289	double tx,ty,tz,rx,ry,rz;
..	..	@@ -357,6 +426,7 @@
357	426	}
358	427
359	428	boolean live = false;
	429	+ transient boolean keepdontselect;
360	430	boolean dontselect = false;
361	431	boolean hide = false;
362	432	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -539,12 +609,14 @@
539	609	toParent = LA.newMatrix();
540	610	fromParent = LA.newMatrix();
541	611	}
	612	+
542	613	if (toParentMarked == null)
543	614	{
544	615	if (maxcount != 1)
545	616	{
546	617	new Exception().printStackTrace();
547	618	}
	619	+
548	620	toParentMarked = LA.newMatrix();
549	621	fromParentMarked = LA.newMatrix();
550	622	}
..	..	@@ -855,7 +927,7 @@
855	927
856	928	if (marked && Globals.isLIVE() && live &&
857	929	//TEMP21aug2018
858		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	930	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
859	931	currentframe != Globals.framecount)
860	932	{
861	933	currentframe = Globals.framecount;
..	..	@@ -867,7 +939,8 @@
867	939
868	940	boolean changedir = random && Math.random() < 0.01; // && !link2master;
869	941
870		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	942	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	943	+ (step == 1 && changedir))
871	944	{
872	945	countdown = 1;
873	946	delay = speedup?8:1;
..	..	@@ -939,6 +1012,7 @@
939	1012	if (material == null \|\| material.multiply)
940	1013	return true;
941	1014
	1015	+ // Transparent objects are dynamic because we have to sort the triangles.
942	1016	return material.opacity > 0.99;
943	1017	}
944	1018
..	..	@@ -1339,6 +1413,7 @@
1339	1413	toParent = LA.newMatrix();
1340	1414	fromParent = LA.newMatrix();
1341	1415	}
	1416	+
1342	1417	LA.matCopy(other.toParent, toParent);
1343	1418	LA.matCopy(other.fromParent, fromParent);
1344	1419
..	..	@@ -2360,6 +2435,10 @@
2360	2435	}
2361	2436	*/
2362	2437	}
	2438	+ else
	2439	+ {
	2440	+ //((ObjEditor)editWindow).SetupUI2(null);
	2441	+ }
2363	2442	}
2364	2443
2365	2444	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2401,6 +2480,14 @@
2401	2480	{
2402	2481	editWindow.refreshContents();
2403	2482	}
	2483	+ else
	2484	+ {
	2485	+ if (manipWindow != null)
	2486	+ {
	2487	+ manipWindow.refreshContents();
	2488	+ }
	2489	+ }
	2490	+
2404	2491	//if (parent != null)
2405	2492	//parent.refreshEditWindow();
2406	2493	}
..	..	@@ -2685,6 +2772,18 @@
2685	2772	//Touch();
2686	2773	}
2687	2774
	2775	+ void GenNormalsMeshS()
	2776	+ {
	2777	+ selection.GenNormalsMesh();
	2778	+// for (int i=0; i<selection.size(); i++)
	2779	+// {
	2780	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2781	+// selectee.GenNormals(crease);
	2782	+// }
	2783	+
	2784	+ //Touch();
	2785	+ }
	2786	+
2688	2787	void ClearColorsS()
2689	2788	{
2690	2789	selection.ClearColors();
..	..	@@ -2816,6 +2915,24 @@
2816	2915	if (child == null)
2817	2916	continue;
2818	2917	child.GenNormals(crease);
	2918	+// Children().release(i);
	2919	+ }
	2920	+ blockloop = false;
	2921	+ }
	2922	+
	2923	+ void GenNormalsMesh()
	2924	+ {
	2925	+ if (blockloop)
	2926	+ return;
	2927	+
	2928	+ blockloop = true;
	2929	+ GenNormalsMesh0();
	2930	+ for (int i = 0; i < Children().Size(); i++)
	2931	+ {
	2932	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2933	+ if (child == null)
	2934	+ continue;
	2935	+ child.GenNormalsMesh();
2819	2936	// Children().release(i);
2820	2937	}
2821	2938	blockloop = false;
..	..	@@ -2988,11 +3105,20 @@
2988	3105	}
2989	3106	}
2990	3107
	3108	+ void GenNormalsMesh0()
	3109	+ {
	3110	+ if (bRep != null)
	3111	+ {
	3112	+ bRep.GenerateNormalsMesh();
	3113	+ Touch();
	3114	+ }
	3115	+ }
	3116	+
2991	3117	void GenNormalsMINE0()
2992	3118	{
2993	3119	if (bRep != null)
2994	3120	{
2995		- bRep.GenerateNormalsMINE();
	3121	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2996	3122	Touch();
2997	3123	}
2998	3124	}
..	..	@@ -3438,7 +3564,8 @@
3438	3564	if (blockloop)
3439	3565	return;
3440	3566
3441		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3567	+ if (//marked \|\| // does not make sense
	3568	+ (bRep != null \|\| material != null)) // borderline...
3442	3569	live = h;
3443	3570
3444	3571	for (int i = 0; i < Size(); i++)
..	..	@@ -3459,7 +3586,8 @@
3459	3586	return;
3460	3587
3461	3588	//if (bRep != null)
3462		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3589	+ if (//marked \|\| // does not make sense
	3590	+ (bRep != null \|\| material != null)) // borderline...
3463	3591	link2master = h;
3464	3592
3465	3593	for (int i = 0; i < Size(); i++)
..	..	@@ -3479,7 +3607,8 @@
3479	3607	if (blockloop)
3480	3608	return;
3481	3609
3482		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3610	+ if (//marked \|\| // does not make sense
	3611	+ (bRep != null \|\| material != null)) // borderline...
3483	3612	hide = h;
3484	3613
3485	3614	for (int i = 0; i < Size(); i++)
..	..	@@ -3499,7 +3628,7 @@
3499	3628	if (blockloop)
3500	3629	return;
3501	3630
3502		- if (bRep != null && material != null) // borderline...
	3631	+ if (bRep != null \|\| material != null) // borderline...
3503	3632	marked = h;
3504	3633
3505	3634	for (int i = 0; i < Size(); i++)
..	..	@@ -3509,6 +3638,46 @@
3509	3638	continue;
3510	3639	blockloop = true;
3511	3640	child.MarkLeaves(h);
	3641	+ blockloop = false;
	3642	+ // release(i);
	3643	+ }
	3644	+ }
	3645	+
	3646	+ void RewindLeaves(boolean h)
	3647	+ {
	3648	+ if (blockloop)
	3649	+ return;
	3650	+
	3651	+ if (bRep != null \|\| material != null) // borderline...
	3652	+ rewind = h;
	3653	+
	3654	+ for (int i = 0; i < Size(); i++)
	3655	+ {
	3656	+ Object3D child = (Object3D) get(i); // reserve(i);
	3657	+ if (child == null)
	3658	+ continue;
	3659	+ blockloop = true;
	3660	+ child.RewindLeaves(h);
	3661	+ blockloop = false;
	3662	+ // release(i);
	3663	+ }
	3664	+ }
	3665	+
	3666	+ void RandomLeaves(boolean h)
	3667	+ {
	3668	+ if (blockloop)
	3669	+ return;
	3670	+
	3671	+ if (bRep != null \|\| material != null) // borderline...
	3672	+ random = h;
	3673	+
	3674	+ for (int i = 0; i < Size(); i++)
	3675	+ {
	3676	+ Object3D child = (Object3D) get(i); // reserve(i);
	3677	+ if (child == null)
	3678	+ continue;
	3679	+ blockloop = true;
	3680	+ child.RandomLeaves(h);
3512	3681	blockloop = false;
3513	3682	// release(i);
3514	3683	}
..	..	@@ -4286,6 +4455,55 @@
4286	4455	}
4287	4456	}
4288	4457
	4458	+ void RepairSOV()
	4459	+ {
	4460	+ if (blockloop)
	4461	+ return;
	4462	+
	4463	+ String texname = this.GetPigmentTexture();
	4464	+
	4465	+ if (texname.startsWith("sov"))
	4466	+ {
	4467	+ String[] s = texname.split("/");
	4468	+
	4469	+ String[] sname = s[1].split("Color.pn");
	4470	+
	4471	+ texname = sname[0];
	4472	+
	4473	+ if (sname.length > 1)
	4474	+ {
	4475	+ texname += "Color.jpg";
	4476	+ }
	4477	+
	4478	+ this.SetPigmentTexture("sov/" + texname);
	4479	+ }
	4480	+
	4481	+ texname = this.GetBumpTexture();
	4482	+
	4483	+ if (texname.startsWith("sov"))
	4484	+ {
	4485	+ String[] s = texname.split("/");
	4486	+
	4487	+ String[] sname = s[1].split("Bump.pn");
	4488	+
	4489	+ texname = sname[0];
	4490	+
	4491	+ if (sname.length > 1)
	4492	+ {
	4493	+ texname += "Bump.jpg";
	4494	+ }
	4495	+
	4496	+ this.SetBumpTexture("sov/" + texname);
	4497	+ }
	4498	+
	4499	+ for (int i=0; i<Size(); i++)
	4500	+ {
	4501	+ blockloop = true;
	4502	+ get(i).RepairSOV();
	4503	+ blockloop = false;
	4504	+ }
	4505	+ }
	4506	+
4289	4507	void RepairTexture()
4290	4508	{
4291	4509	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4800,6 +5018,14 @@
4800	5018	}
4801	5019	}
4802	5020
	5021	+ ObjEditor GetWindow()
	5022	+ {
	5023	+ if (editWindow != null)
	5024	+ return editWindow;
	5025	+
	5026	+ return manipWindow;
	5027	+ }
	5028	+
4803	5029	cTreePath Select(int indexcount, boolean deselect)
4804	5030	{
4805	5031	if (hide \|\| dontselect)
..	..	@@ -4836,10 +5062,11 @@
4836	5062	if (leaf != null)
4837	5063	{
4838	5064	cTreePath tp = new cTreePath(this, leaf);
4839		- if (editWindow != null)
	5065	+ ObjEditor window = GetWindow();
	5066	+ if (window != null)
4840	5067	{
4841	5068	//System.out.println("editWindow = " + editWindow + " vs " + this);
4842		- editWindow.Select(tp, deselect, true);
	5069	+ window.Select(tp, deselect, true);
4843	5070	}
4844	5071
4845	5072	return tp;
..	..	@@ -4856,6 +5083,7 @@
4856	5083
4857	5084	if (child == null)
4858	5085	continue;
	5086	+
4859	5087	if (child.HasTransparency() && child.size() != 0)
4860	5088	{
4861	5089	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4865,9 +5093,10 @@
4865	5093	if (leaf != null)
4866	5094	{
4867	5095	cTreePath tp = new cTreePath(this, leaf);
4868		- if (editWindow != null)
	5096	+ ObjEditor window = GetWindow();
	5097	+ if (window != null)
4869	5098	{
4870		- editWindow.Select(tp, deselect, true);
	5099	+ window.Select(tp, deselect, true);
4871	5100	}
4872	5101
4873	5102	return tp;
..	..	@@ -5192,6 +5421,51 @@
5192	5421	blockloop = false;
5193	5422	}
5194	5423
	5424	+ void ResetSelectable()
	5425	+ {
	5426	+ if (blockloop)
	5427	+ return;
	5428	+
	5429	+ blockloop = true;
	5430	+
	5431	+ keepdontselect = dontselect;
	5432	+ dontselect = true;
	5433	+
	5434	+ Object3D child;
	5435	+ int nb = Size();
	5436	+ for (int i = 0; i < nb; i++)
	5437	+ {
	5438	+ child = (Object3D) get(i);
	5439	+ if (child == null)
	5440	+ continue;
	5441	+ child.ResetSelectable();
	5442	+ }
	5443	+
	5444	+ blockloop = false;
	5445	+ }
	5446	+
	5447	+ void RestoreSelectable()
	5448	+ {
	5449	+ if (blockloop)
	5450	+ return;
	5451	+
	5452	+ blockloop = true;
	5453	+
	5454	+ dontselect = keepdontselect;
	5455	+
	5456	+ Object3D child;
	5457	+ int nb = Size();
	5458	+ for (int i = 0; i < nb; i++)
	5459	+ {
	5460	+ child = (Object3D) get(i);
	5461	+ if (child == null)
	5462	+ continue;
	5463	+ child.RestoreSelectable();
	5464	+ }
	5465	+
	5466	+ blockloop = false;
	5467	+ }
	5468	+
5195	5469	boolean IsSelected()
5196	5470	{
5197	5471	if (parent == null)
..	..	@@ -5501,6 +5775,38 @@
5501	5775	}
5502	5776	}
5503	5777
	5778	+ void EmbedTextures(boolean embed)
	5779	+ {
	5780	+ if (blockloop)
	5781	+ return;
	5782	+
	5783	+ //if (GetTextures() != null)
	5784	+ if (embed)
	5785	+ CameraPane.EmbedTextures(GetTextures());
	5786	+ else
	5787	+ {
	5788	+ GetTextures().pigmentdata = null;
	5789	+ GetTextures().bumpdata = null;
	5790	+ GetTextures().pw = 0;
	5791	+ GetTextures().ph = 0;
	5792	+ GetTextures().bw = 0;
	5793	+ GetTextures().bh = 0;
	5794	+ }
	5795	+
	5796	+ int nb = Size();
	5797	+ for (int i = 0; i < nb; i++)
	5798	+ {
	5799	+ Object3D child = (Object3D) get(i);
	5800	+
	5801	+ if (child == null)
	5802	+ continue;
	5803	+
	5804	+ blockloop = true;
	5805	+ child.EmbedTextures(embed);
	5806	+ blockloop = false;
	5807	+ }
	5808	+ }
	5809	+
5504	5810	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5505	5811	{
5506	5812	Draw(display, root, selected, blocked);
..	..	@@ -5509,12 +5815,23 @@
5509	5815	boolean NeedSupport()
5510	5816	{
5511	5817	return
5512		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
	5818	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5513	5819	// PROBLEM with CROWD!!
5514	5820	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5515	5821	}
5516	5822
5517	5823	static boolean DEBUG_SELECTION = false;
	5824	+
	5825	+ boolean IsLive()
	5826	+ {
	5827	+ if (live)
	5828	+ return true;
	5829	+
	5830	+ if (parent == null)
	5831	+ return false;
	5832	+
	5833	+ return parent.IsLive();
	5834	+ }
5518	5835
5519	5836	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5520	5837	{
..	..	@@ -5577,7 +5894,7 @@
5577	5894	support = support;
5578	5895
5579	5896	//boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5580		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5897	+ boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5581	5898
5582	5899	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5583	5900	{
..	..	@@ -5597,10 +5914,12 @@
5597	5914	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5598	5915
5599	5916	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5600		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5917	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5918	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5601	5919	{
5602	5920	Globals.lighttouched = true;
5603	5921	} // all panes...
	5922	+
5604	5923	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5605	5924	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5606	5925	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5728,6 +6047,7 @@
5728	6047	if (GetBRep() != null)
5729	6048	{
5730	6049	display.NextIndex();
	6050	+
5731	6051	// vertex color conflict : gl.glCallList(list);
5732	6052	DrawNode(display, root, selected);
5733	6053	if (this instanceof BezierPatch)
..	..	@@ -5768,16 +6088,27 @@
5768	6088	tex = GetTextures();
5769	6089	}
5770	6090
5771		- boolean failed = false;
	6091	+ boolean failedPigment = false;
	6092	+ boolean failedBump = false;
5772	6093
5773	6094	try
5774	6095	{
5775		- display.BindTextures(tex, texres);
	6096	+ display.BindPigmentTexture(tex, texres);
5776	6097	}
5777	6098	catch (Exception e)
5778	6099	{
5779	6100	System.err.println("FAILED: " + this);
5780		- failed = true;
	6101	+ failedPigment = true;
	6102	+ }
	6103	+
	6104	+ try
	6105	+ {
	6106	+ display.BindBumpTexture(tex, texres);
	6107	+ }
	6108	+ catch (Exception e)
	6109	+ {
	6110	+ //System.err.println("FAILED: " + this);
	6111	+ failedBump = true;
5781	6112	}
5782	6113
5783	6114	if (!compiled)
..	..	@@ -5800,8 +6131,11 @@
5800	6131	}
5801	6132	}
5802	6133
5803		- if (!failed)
5804		- display.ReleaseTextures(tex);
	6134	+ if (!failedBump)
	6135	+ display.ReleaseBumpTexture(tex);
	6136	+
	6137	+ if (!failedPigment)
	6138	+ display.ReleasePigmentTexture(tex);
5805	6139
5806	6140	display.PopMaterial(this, selected);
5807	6141	}
..	..	@@ -6174,6 +6508,11 @@
6174	6508	// dec 2012
6175	6509	new Exception().printStackTrace();
6176	6510	return;
	6511	+ }
	6512	+
	6513	+ if (dontselect)
	6514	+ {
	6515	+ //bRep.GenerateNormalsMINE();
6177	6516	}
6178	6517
6179	6518	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -7026,7 +7365,7 @@
7026	7365	spot.translate(32, 32);
7027	7366	spotw = spot.x + spot.width;
7028	7367	spoth = spot.y + spot.height;
7029		- info.g.setColor(Color.blue);
	7368	+ info.g.setColor(Color.cyan);
7030	7369	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7031	7370	// if (CameraPane.Xmin > spot.x)
7032	7371	// {
..	..	@@ -7044,11 +7383,12 @@
7044	7383	// {
7045	7384	// CameraPane.Ymax = spoth;
7046	7385	// }
7047		- // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7048		- //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7386	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7387	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7049	7388	spot.translate(0, -32);
7050		- info.g.setColor(Color.green);
	7389	+ info.g.setColor(Color.yellow);
7051	7390	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7391	+ info.g.setColor(Color.green);
7052	7392	// if (CameraPane.Xmin > spot.x)
7053	7393	// {
7054	7394	// CameraPane.Xmin = spot.x;
..	..	@@ -7065,8 +7405,8 @@
7065	7405	// {
7066	7406	// CameraPane.Ymax = spoth;
7067	7407	// }
7068		- info.g.drawArc(boundary.x, boundary.y,
7069		- boundary.width, boundary.height, 0, 360);
	7408	+ info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
	7409	+ (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
7070	7410	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7071	7411	// if (CameraPane.Xmin > boundary.x)
7072	7412	// {
..	..	@@ -7366,19 +7706,20 @@
7366	7706	switch (info.pane.RenderCamera().viewCode)
7367	7707	{
7368	7708	case 3: // '\001'
7369		- if (modified)
	7709	+ if (modified \|\| opposite)
7370	7710	{
7371	7711	//LA.matScale(toParent, 1, hScale, vScale);
7372	7712	LA.matScale(toParent, totalScale, 1, 1);
7373	7713	} // vScale, 1);
7374	7714	else
7375	7715	{
	7716	+ // EXCEPTION!
7376	7717	LA.matScale(toParent, totalScale, totalScale, totalScale);
7377	7718	} // vScale, 1);
7378	7719	break;
7379	7720
7380	7721	case 2: // '\002'
7381		- if (modified)
	7722	+ if (modified \|\| opposite)
7382	7723	{
7383	7724	//LA.matScale(toParent, hScale, 1, vScale);
7384	7725	LA.matScale(toParent, 1, totalScale, 1);
..	..	@@ -7389,7 +7730,7 @@
7389	7730	break;
7390	7731
7391	7732	case 1: // '\003'
7392		- if (modified)
	7733	+ if (modified \|\| opposite)
7393	7734	{
7394	7735	//LA.matScale(toParent, hScale, vScale, 1);
7395	7736	LA.matScale(toParent, 1, 1, totalScale);
..	..	@@ -7609,6 +7950,10 @@
7609	7950	editWindow = null;
7610	7951	} // ?
7611	7952	}
	7953	+ else
	7954	+ {
	7955	+ //editWindow.closeUI();
	7956	+ }
7612	7957	}
7613	7958
7614	7959	boolean root; // patch for edit windows
..	..	@@ -7766,6 +8111,10 @@
7766	8111	}
7767	8112
7768	8113	transient ObjEditor editWindow;
	8114	+ transient ObjEditor manipWindow;
	8115	+
	8116	+ transient boolean pinned;
	8117	+
7769	8118	transient ObjectUI objectUI;
7770	8119	public static int povDepth = 0;
7771	8120	private static cVector tbMin = new cVector();