~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -22,7 +22,21 @@
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();
	27	+
	28	+ // TEMPORARY for mocap undo. No need to be transient.
	29	+ mocap.reader.BVHReader.BVHResult savebvh;
	30	+ Object3D saveskeleton;
	31	+ //
	32	+
	33	+ String skyboxname;
	34	+ String skyboxext;
	35	+
	36	+ Object3D versionlist[];
	37	+ int versionindex = -1;
	38	+
	39	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
26	40
27	41	ScriptNode scriptnode;
28	42
..	..	@@ -104,125 +118,245 @@
104	118
105	119	// transient boolean reduced; // for morph reduction
106	120
107		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
108		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	121	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	122	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
109	123
110		-transient Object3D transientsupport; // for cloning
111		-transient boolean transientlink2master;
	124	+ transient Object3D transientsupport; // for cloning
	125	+ transient boolean transientlink2master;
112	126
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)
	127	+ void SaveSupports()
125	128	{
126		- bRep.SaveSupports();
	129	+ if (blockloop)
	130	+ return;
	131	+
	132	+ transientsupport = support;
	133	+ transientlink2master = link2master;
	134	+
	135	+ support = null;
	136	+ link2master = false;
	137	+
	138	+ if (bRep != null)
	139	+ {
	140	+ bRep.SaveSupports();
	141	+ }
	142	+
	143	+ for (int i = 0; i < Size(); i++)
	144	+ {
	145	+ Object3D child = (Object3D) get(i);
	146	+ if (child == null)
	147	+ continue;
	148	+ blockloop = true;
	149	+ child.SaveSupports();
	150	+ blockloop = false;
	151	+ }
127	152	}
128		-
129		- for (int i = 0; i < Size(); i++)
	153	+
	154	+ void RestoreSupports()
130	155	{
131		- Object3D child = (Object3D) get(i);
132		- if (child == null)
133		- continue;
	156	+ if (blockloop)
	157	+ return;
	158	+
	159	+ support = transientsupport;
	160	+ link2master = transientlink2master;
	161	+ transientsupport = null;
	162	+ transientlink2master = false;
	163	+
	164	+ if (bRep != null)
	165	+ {
	166	+ bRep.RestoreSupports();
	167	+ }
	168	+
	169	+ for (int i = 0; i < Size(); i++)
	170	+ {
	171	+ Object3D child = (Object3D) get(i);
	172	+ if (child == null)
	173	+ continue;
	174	+ blockloop = true;
	175	+ child.RestoreSupports();
	176	+ blockloop = false;
	177	+ }
	178	+ }
	179	+
	180	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	181	+ {
	182	+ Object3D o;
	183	+
	184	+ if (hashtable.containsKey(GetUUID()))
	185	+ {
	186	+ o = hashtable.get(GetUUID());
	187	+
	188	+ Grafreed.Assert(this.bRep == o.bRep);
	189	+ //if (this.bRep != null)
	190	+ // assert(this.bRep.support == o.transientrep);
	191	+ if (this.support != null)
	192	+ assert(this.support.bRep == o.transientrep);
	193	+ }
	194	+ else
	195	+ {
	196	+ o = new Object3D("copy of " + this.name);
	197	+
	198	+ hashtable.put(GetUUID(), o);
	199	+ }
	200	+
	201	+ if (!blockloop)
	202	+ {
	203	+ blockloop = true;
	204	+
	205	+ for (int i=0; i<Size(); i++)
	206	+ {
	207	+ get(i).ExtractBigData(hashtable);
	208	+ }
	209	+
	210	+ blockloop = false;
	211	+ }
	212	+
	213	+ ExtractBigData(o);
	214	+ }
	215	+
	216	+ void ExtractBigData(Object3D o)
	217	+ {
	218	+ if (o.bRep != null)
	219	+ Grafreed.Assert(o.bRep == this.bRep);
	220	+
	221	+ o.bRep = this.bRep;
	222	+// July 2019 if (this.bRep != null)
	223	+// {
	224	+// o.transientrep = this.bRep.support;
	225	+// o.bRep.support = null;
	226	+// }
	227	+ o.selection = this.selection;
	228	+ o.versionlist = this.versionlist;
	229	+ o.versionindex = this.versionindex;
	230	+
	231	+ if (this.support != null)
	232	+ {
	233	+ if (o.transientrep != null)
	234	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	235	+
	236	+ o.transientrep = this.support.bRep;
	237	+ this.support.bRep = null;
	238	+ }
	239	+
	240	+ // o.support = this.support;
	241	+ // o.fileparent = this.fileparent;
	242	+ // if (this.bRep != null)
	243	+ // o.bRep = this.bRep.support;
	244	+
	245	+ this.bRep = null;
	246	+ // if (this.bRep != null)
	247	+ // this.bRep.support = null;
	248	+ // this.support = null;
	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	+
134	287	blockloop = true;
135		- child.SaveSupports();
	288	+
	289	+ for (int i=0; i<Size(); i++)
	290	+ {
	291	+ get(i).TagObjects(o, tag);
	292	+ }
	293	+
136	294	blockloop = false;
137	295	}
138		-}
139	296
140		-void RestoreSupports()
141		-{
142		- if (blockloop)
143		- return;
	297	+ boolean HasTags()
	298	+ {
	299	+ if (blockloop)
	300	+ return false;
144	301
145		- support = transientsupport;
146		- link2master = transientlink2master;
147		- transientsupport = null;
148		- transientlink2master = false;
149		-
150		- if (bRep != null)
151		- {
152		- bRep.RestoreSupports();
153		- }
154		-
155		- for (int i = 0; i < Size(); i++)
156		- {
157		- Object3D child = (Object3D) get(i);
158		- if (child == null)
159		- continue;
160	302	blockloop = true;
161		- child.RestoreSupports();
162		- blockloop = false;
163		- }
164		-}
165	303
166		-void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
167		-{
168		- if (hashtable.containsKey(GetUUID()))
	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	+ }
	318	+
	319	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
169	320	{
	321	+ if (!hashtable.containsKey(GetUUID()))
	322	+ return;
	323	+
170	324	Object3D o = hashtable.get(GetUUID());
171	325
172		- assert(this.bRep == o.bRep);
173		- if (this.bRep != null)
174		- assert(this.bRep.support == o.transientrep);
175		-
176		- return;
177		- }
178		-
179		- Object3D o = new Object3D();
180		- o.bRep = this.bRep;
181		- if (this.bRep != null)
182		- {
183		- o.transientrep = this.bRep.support;
184		- o.bRep.support = null;
185		- }
186		-
187		-// o.support = this.support;
188		-// o.fileparent = this.fileparent;
189		-// if (this.bRep != null)
190		-// o.bRep = this.bRep.support;
191		-
192		- hashtable.put(GetUUID(), o);
193		-
194		- this.bRep = null;
195		-// if (this.bRep != null)
196		-// this.bRep.support = null;
197		-// this.support = null;
198		-// this.fileparent = null;
199		-
200		- for (int i=0; i<Size(); i++)
201		- {
202		- get(i).ExtractBigData(hashtable);
203		- }
204		-}
	326	+ RestoreBigData(o);
205	327
206		-void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
207		-{
208		- if (!hashtable.containsKey(GetUUID()))
209		- return;
210		-
211		- Object3D o = hashtable.get(GetUUID());
212		-
213		- this.bRep = o.bRep;
214		- if (this.bRep != null)
215		- this.bRep.support = o.transientrep;
216		-// this.support = o.support;
217		-// this.fileparent = o.fileparent;
218		-
219		- hashtable.remove(GetUUID());
220		-
221		- for (int i=0; i<Size(); i++)
222		- {
223		- get(i).RestoreBigData(hashtable);
	328	+ if (blockloop)
	329	+ return;
	330	+
	331	+ blockloop = true;
	332	+
	333	+ //hashtable.remove(GetUUID());
	334	+
	335	+ for (int i=0; i<Size(); i++)
	336	+ {
	337	+ get(i).RestoreBigData(hashtable);
	338	+ }
	339	+
	340	+ blockloop = false;
224	341	}
225		-}
	342	+
	343	+ void RestoreBigData(Object3D o)
	344	+ {
	345	+ this.bRep = o.bRep;
	346	+ if (this.support != null && o.transientrep != null)
	347	+ {
	348	+ this.support.bRep = o.transientrep;
	349	+ }
	350	+
	351	+ this.selection = o.selection;
	352	+
	353	+ this.versionlist = o.versionlist;
	354	+ this.versionindex = o.versionindex;
	355	+// July 2019 if (this.bRep != null)
	356	+// this.bRep.support = o.transientrep;
	357	+ // this.support = o.support;
	358	+ // this.fileparent = o.fileparent;
	359	+ }
226	360
227	361	// MOCAP SUPPORT
228	362	double tx,ty,tz,rx,ry,rz;
..	..	@@ -365,6 +499,7 @@
365	499	}
366	500
367	501	boolean live = false;
	502	+ transient boolean keepdontselect;
368	503	boolean dontselect = false;
369	504	boolean hide = false;
370	505	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -547,12 +682,14 @@
547	682	toParent = LA.newMatrix();
548	683	fromParent = LA.newMatrix();
549	684	}
	685	+
550	686	if (toParentMarked == null)
551	687	{
552	688	if (maxcount != 1)
553	689	{
554		- new Exception().printStackTrace();
	690	+ //new Exception().printStackTrace();
555	691	}
	692	+
556	693	toParentMarked = LA.newMatrix();
557	694	fromParentMarked = LA.newMatrix();
558	695	}
..	..	@@ -863,7 +1000,7 @@
863	1000
864	1001	if (marked && Globals.isLIVE() && live &&
865	1002	//TEMP21aug2018
866		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	1003	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
867	1004	currentframe != Globals.framecount)
868	1005	{
869	1006	currentframe = Globals.framecount;
..	..	@@ -875,7 +1012,8 @@
875	1012
876	1013	boolean changedir = random && Math.random() < 0.01; // && !link2master;
877	1014
878		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	1015	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	1016	+ (step == 1 && changedir))
879	1017	{
880	1018	countdown = 1;
881	1019	delay = speedup?8:1;
..	..	@@ -947,6 +1085,10 @@
947	1085	if (material == null \|\| material.multiply)
948	1086	return true;
949	1087
	1088	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1089	+ return false;
	1090	+
	1091	+ // Transparent objects are dynamic because we have to sort the triangles.
950	1092	return material.opacity > 0.99;
951	1093	}
952	1094
..	..	@@ -1347,6 +1489,7 @@
1347	1489	toParent = LA.newMatrix();
1348	1490	fromParent = LA.newMatrix();
1349	1491	}
	1492	+
1350	1493	LA.matCopy(other.toParent, toParent);
1351	1494	LA.matCopy(other.fromParent, fromParent);
1352	1495
..	..	@@ -2226,11 +2369,6 @@
2226	2369
2227	2370	InitOthers();
2228	2371
2229		- if (this instanceof Camera)
2230		- {
2231		- material.shift = 90;
2232		- }
2233		-
2234	2372	material.multiply = multiply;
2235	2373
2236	2374	if (multiply)
..	..	@@ -2368,6 +2506,15 @@
2368	2506	}
2369	2507	*/
2370	2508	}
	2509	+ else
	2510	+ {
	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");
	2517	+ }
2371	2518	}
2372	2519
2373	2520	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2409,6 +2556,14 @@
2409	2556	{
2410	2557	editWindow.refreshContents();
2411	2558	}
	2559	+ else
	2560	+ {
	2561	+ if (manipWindow != null)
	2562	+ {
	2563	+ manipWindow.refreshContents();
	2564	+ }
	2565	+ }
	2566	+
2412	2567	//if (parent != null)
2413	2568	//parent.refreshEditWindow();
2414	2569	}
..	..	@@ -2488,7 +2643,8 @@
2488	2643	private static final int editSelf = 1;
2489	2644	private static final int editChild = 2;
2490	2645
2491		- void drawEditHandles(ClickInfo info, int level)
	2646	+ void drawEditHandles(//ClickInfo info,
	2647	+ int level)
2492	2648	{
2493	2649	if (level == 0)
2494	2650	{
..	..	@@ -2496,7 +2652,8 @@
2496	2652	return;
2497	2653
2498	2654	Object3D selectee;
2499		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2655	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2656	+ level + 1))
2500	2657	{
2501	2658	selectee = (Object3D) e.nextElement();
2502	2659	}
..	..	@@ -2504,19 +2661,22 @@
2504	2661	} else
2505	2662	{
2506	2663	//super.
2507		- drawEditHandles0(info, level + 1);
	2664	+ drawEditHandles0(//info,
	2665	+ level + 1);
2508	2666	}
2509	2667	}
2510	2668
2511		- boolean doEditClick(ClickInfo info, int level)
	2669	+ boolean doEditClick(//ClickInfo info,
	2670	+ int level)
2512	2671	{
2513	2672	doSomething = 0;
2514	2673	if (level == 0)
2515	2674	{
2516		- return doParentClick(info);
	2675	+ return doParentClick(); //info);
2517	2676	}
2518	2677	if (//super.
2519		- doEditClick0(info, level))
	2678	+ doEditClick0(//info,
	2679	+ level))
2520	2680	{
2521	2681	doSomething = 1;
2522	2682	return true;
..	..	@@ -2526,7 +2686,7 @@
2526	2686	}
2527	2687	}
2528	2688
2529		- boolean doParentClick(ClickInfo info)
	2689	+ boolean doParentClick() //ClickInfo info)
2530	2690	{
2531	2691	if (selection == null)
2532	2692	{
..	..	@@ -2539,7 +2699,8 @@
2539	2699	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2540	2700	{
2541	2701	Object3D selectee = (Object3D) e.nextElement();
2542		- if (selectee.doEditClick(info, 1))
	2702	+ if (selectee.doEditClick(//info,
	2703	+ 1))
2543	2704	{
2544	2705	childToDrag = selectee;
2545	2706	doSomething = 2;
..	..	@@ -2551,13 +2712,15 @@
2551	2712	return retval;
2552	2713	}
2553	2714
2554		- void doEditDrag(ClickInfo info, boolean opposite)
	2715	+ void doEditDrag(//ClickInfo clickInfo,
	2716	+ boolean opposite)
2555	2717	{
2556	2718	switch (doSomething)
2557	2719	{
2558	2720	case 1: // '\001'
2559	2721	//super.
2560		- doEditDrag0(info, opposite);
	2722	+ doEditDrag0(//clickInfo,
	2723	+ opposite);
2561	2724	break;
2562	2725
2563	2726	case 2: // '\002'
..	..	@@ -2570,11 +2733,13 @@
2570	2733	{
2571	2734	//sel.hitSomething = childToDrag.hitSomething;
2572	2735	//childToDrag.doEditDrag(info);
2573		- sel.doEditDrag(info, opposite);
	2736	+ sel.doEditDrag(//clickInfo,
	2737	+ opposite);
2574	2738	} else
2575	2739	{
2576	2740	//super.
2577		- doEditDrag0(info, opposite);
	2741	+ doEditDrag0(//clickInfo,
	2742	+ opposite);
2578	2743	}
2579	2744	}
2580	2745	break;
..	..	@@ -2592,6 +2757,9 @@
2592	2757	{
2593	2758	deselectAll();
2594	2759	}
	2760	+
	2761	+ new Exception().printStackTrace();
	2762	+
2595	2763	ClickInfo newInfo = new ClickInfo();
2596	2764	newInfo.flags = info.flags;
2597	2765	newInfo.bounds = info.bounds;
..	..	@@ -2684,6 +2852,18 @@
2684	2852	void GenNormalsS(boolean crease)
2685	2853	{
2686	2854	selection.GenNormals(crease);
	2855	+// for (int i=0; i<selection.size(); i++)
	2856	+// {
	2857	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2858	+// selectee.GenNormals(crease);
	2859	+// }
	2860	+
	2861	+ //Touch();
	2862	+ }
	2863	+
	2864	+ void GenNormalsMeshS()
	2865	+ {
	2866	+ selection.GenNormalsMesh();
2687	2867	// for (int i=0; i<selection.size(); i++)
2688	2868	// {
2689	2869	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2824,6 +3004,24 @@
2824	3004	if (child == null)
2825	3005	continue;
2826	3006	child.GenNormals(crease);
	3007	+// Children().release(i);
	3008	+ }
	3009	+ blockloop = false;
	3010	+ }
	3011	+
	3012	+ void GenNormalsMesh()
	3013	+ {
	3014	+ if (blockloop)
	3015	+ return;
	3016	+
	3017	+ blockloop = true;
	3018	+ GenNormalsMesh0();
	3019	+ for (int i = 0; i < Children().Size(); i++)
	3020	+ {
	3021	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	3022	+ if (child == null)
	3023	+ continue;
	3024	+ child.GenNormalsMesh();
2827	3025	// Children().release(i);
2828	3026	}
2829	3027	blockloop = false;
..	..	@@ -2996,11 +3194,20 @@
2996	3194	}
2997	3195	}
2998	3196
	3197	+ void GenNormalsMesh0()
	3198	+ {
	3199	+ if (bRep != null)
	3200	+ {
	3201	+ bRep.GenerateNormalsMesh();
	3202	+ Touch();
	3203	+ }
	3204	+ }
	3205	+
2999	3206	void GenNormalsMINE0()
3000	3207	{
3001	3208	if (bRep != null)
3002	3209	{
3003		- bRep.GenerateNormalsMINE();
	3210	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3004	3211	Touch();
3005	3212	}
3006	3213	}
..	..	@@ -3410,15 +3617,47 @@
3410	3617
3411	3618	void ClearMaterials()
3412	3619	{
	3620	+ if (blockloop)
	3621	+ return;
	3622	+
	3623	+ blockloop = true;
	3624	+
3413	3625	ClearMaterial();
3414		- for (int i = 0; i < size(); i++)
	3626	+ for (int i = 0; i < Size(); i++)
3415	3627	{
3416		- Object3D child = (Object3D) reserve(i);
	3628	+ Object3D child = (Object3D) get(i);
3417	3629	if (child == null)
3418	3630	continue;
3419	3631	child.ClearMaterials();
3420		- release(i);
3421	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;
3422	3661	}
3423	3662
3424	3663	void FlipV(boolean flip)
..	..	@@ -3446,7 +3685,8 @@
3446	3685	if (blockloop)
3447	3686	return;
3448	3687
3449		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3688	+ if (//marked \|\| // does not make sense
	3689	+ (bRep != null \|\| material != null)) // borderline...
3450	3690	live = h;
3451	3691
3452	3692	for (int i = 0; i < Size(); i++)
..	..	@@ -3467,7 +3707,8 @@
3467	3707	return;
3468	3708
3469	3709	//if (bRep != null)
3470		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3710	+ if (//marked \|\| // does not make sense
	3711	+ (bRep != null \|\| material != null)) // borderline...
3471	3712	link2master = h;
3472	3713
3473	3714	for (int i = 0; i < Size(); i++)
..	..	@@ -3487,7 +3728,8 @@
3487	3728	if (blockloop)
3488	3729	return;
3489	3730
3490		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3731	+ if (//marked \|\| // does not make sense
	3732	+ (bRep != null \|\| material != null)) // borderline...
3491	3733	hide = h;
3492	3734
3493	3735	for (int i = 0; i < Size(); i++)
..	..	@@ -3507,7 +3749,7 @@
3507	3749	if (blockloop)
3508	3750	return;
3509	3751
3510		- if (bRep != null && material != null) // borderline...
	3752	+ if (bRep != null \|\| material != null) // borderline...
3511	3753	marked = h;
3512	3754
3513	3755	for (int i = 0; i < Size(); i++)
..	..	@@ -3517,6 +3759,46 @@
3517	3759	continue;
3518	3760	blockloop = true;
3519	3761	child.MarkLeaves(h);
	3762	+ blockloop = false;
	3763	+ // release(i);
	3764	+ }
	3765	+ }
	3766	+
	3767	+ void RewindLeaves(boolean h)
	3768	+ {
	3769	+ if (blockloop)
	3770	+ return;
	3771	+
	3772	+ if (bRep != null \|\| material != null) // borderline...
	3773	+ rewind = h;
	3774	+
	3775	+ for (int i = 0; i < Size(); i++)
	3776	+ {
	3777	+ Object3D child = (Object3D) get(i); // reserve(i);
	3778	+ if (child == null)
	3779	+ continue;
	3780	+ blockloop = true;
	3781	+ child.RewindLeaves(h);
	3782	+ blockloop = false;
	3783	+ // release(i);
	3784	+ }
	3785	+ }
	3786	+
	3787	+ void RandomLeaves(boolean h)
	3788	+ {
	3789	+ if (blockloop)
	3790	+ return;
	3791	+
	3792	+ if (bRep != null \|\| material != null) // borderline...
	3793	+ random = h;
	3794	+
	3795	+ for (int i = 0; i < Size(); i++)
	3796	+ {
	3797	+ Object3D child = (Object3D) get(i); // reserve(i);
	3798	+ if (child == null)
	3799	+ continue;
	3800	+ blockloop = true;
	3801	+ child.RandomLeaves(h);
3520	3802	blockloop = false;
3521	3803	// release(i);
3522	3804	}
..	..	@@ -4294,6 +4576,55 @@
4294	4576	}
4295	4577	}
4296	4578
	4579	+ void RepairSOV()
	4580	+ {
	4581	+ if (blockloop)
	4582	+ return;
	4583	+
	4584	+ String texname = this.GetPigmentTexture();
	4585	+
	4586	+ if (texname.startsWith("sov"))
	4587	+ {
	4588	+ String[] s = texname.split("/");
	4589	+
	4590	+ String[] sname = s[1].split("Color.pn");
	4591	+
	4592	+ texname = sname[0];
	4593	+
	4594	+ if (sname.length > 1)
	4595	+ {
	4596	+ texname += "Color.jpg";
	4597	+ }
	4598	+
	4599	+ this.SetPigmentTexture("sov/" + texname);
	4600	+ }
	4601	+
	4602	+ texname = this.GetBumpTexture();
	4603	+
	4604	+ if (texname.startsWith("sov"))
	4605	+ {
	4606	+ String[] s = texname.split("/");
	4607	+
	4608	+ String[] sname = s[1].split("Bump.pn");
	4609	+
	4610	+ texname = sname[0];
	4611	+
	4612	+ if (sname.length > 1)
	4613	+ {
	4614	+ texname += "Bump.jpg";
	4615	+ }
	4616	+
	4617	+ this.SetBumpTexture("sov/" + texname);
	4618	+ }
	4619	+
	4620	+ for (int i=0; i<Size(); i++)
	4621	+ {
	4622	+ blockloop = true;
	4623	+ get(i).RepairSOV();
	4624	+ blockloop = false;
	4625	+ }
	4626	+ }
	4627	+
4297	4628	void RepairTexture()
4298	4629	{
4299	4630	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4808,6 +5139,14 @@
4808	5139	}
4809	5140	}
4810	5141
	5142	+ ObjEditor GetWindow()
	5143	+ {
	5144	+ if (editWindow != null)
	5145	+ return editWindow;
	5146	+
	5147	+ return manipWindow;
	5148	+ }
	5149	+
4811	5150	cTreePath Select(int indexcount, boolean deselect)
4812	5151	{
4813	5152	if (hide \|\| dontselect)
..	..	@@ -4844,10 +5183,11 @@
4844	5183	if (leaf != null)
4845	5184	{
4846	5185	cTreePath tp = new cTreePath(this, leaf);
4847		- if (editWindow != null)
	5186	+ ObjEditor window = GetWindow();
	5187	+ if (window != null)
4848	5188	{
4849	5189	//System.out.println("editWindow = " + editWindow + " vs " + this);
4850		- editWindow.Select(tp, deselect, true);
	5190	+ window.Select(tp, deselect, true);
4851	5191	}
4852	5192
4853	5193	return tp;
..	..	@@ -4864,6 +5204,7 @@
4864	5204
4865	5205	if (child == null)
4866	5206	continue;
	5207	+
4867	5208	if (child.HasTransparency() && child.size() != 0)
4868	5209	{
4869	5210	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4873,9 +5214,10 @@
4873	5214	if (leaf != null)
4874	5215	{
4875	5216	cTreePath tp = new cTreePath(this, leaf);
4876		- if (editWindow != null)
	5217	+ ObjEditor window = GetWindow();
	5218	+ if (window != null)
4877	5219	{
4878		- editWindow.Select(tp, deselect, true);
	5220	+ window.Select(tp, deselect, true);
4879	5221	}
4880	5222
4881	5223	return tp;
..	..	@@ -5200,6 +5542,51 @@
5200	5542	blockloop = false;
5201	5543	}
5202	5544
	5545	+ void ResetSelectable()
	5546	+ {
	5547	+ if (blockloop)
	5548	+ return;
	5549	+
	5550	+ blockloop = true;
	5551	+
	5552	+ keepdontselect = dontselect;
	5553	+ dontselect = true;
	5554	+
	5555	+ Object3D child;
	5556	+ int nb = Size();
	5557	+ for (int i = 0; i < nb; i++)
	5558	+ {
	5559	+ child = (Object3D) get(i);
	5560	+ if (child == null)
	5561	+ continue;
	5562	+ child.ResetSelectable();
	5563	+ }
	5564	+
	5565	+ blockloop = false;
	5566	+ }
	5567	+
	5568	+ void RestoreSelectable()
	5569	+ {
	5570	+ if (blockloop)
	5571	+ return;
	5572	+
	5573	+ blockloop = true;
	5574	+
	5575	+ dontselect = keepdontselect;
	5576	+
	5577	+ Object3D child;
	5578	+ int nb = Size();
	5579	+ for (int i = 0; i < nb; i++)
	5580	+ {
	5581	+ child = (Object3D) get(i);
	5582	+ if (child == null)
	5583	+ continue;
	5584	+ child.RestoreSelectable();
	5585	+ }
	5586	+
	5587	+ blockloop = false;
	5588	+ }
	5589	+
5203	5590	boolean IsSelected()
5204	5591	{
5205	5592	if (parent == null)
..	..	@@ -5260,6 +5647,11 @@
5260	5647	if (fullname == null)
5261	5648	return "";
5262	5649
	5650	+ if (fullname.pigment != null)
	5651	+ {
	5652	+ return fullname.pigment;
	5653	+ }
	5654	+
5263	5655	// System.out.println("Fullname = " + fullname);
5264	5656
5265	5657	// Does not work on Windows due to C:
..	..	@@ -5272,7 +5664,7 @@
5272	5664
5273	5665	if (split.length == 0)
5274	5666	{
5275		- return "";
	5667	+ return fullname.pigment = "";
5276	5668	}
5277	5669
5278	5670	if (split.length <= 2)
..	..	@@ -5280,22 +5672,27 @@
5280	5672	if (fullname.name.endsWith(":"))
5281	5673	{
5282	5674	// Windows
5283		- return fullname.name.substring(0, fullname.name.length()-1);
	5675	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5284	5676	}
5285	5677
5286		- return split[0];
	5678	+ return fullname.pigment = split[0];
5287	5679	}
5288	5680
5289	5681	// Windows
5290	5682	assert(split.length == 4);
5291	5683
5292		- return split[0] + ":" + split[1];
	5684	+ return fullname.pigment = split[0] + ":" + split[1];
5293	5685	}
5294	5686
5295	5687	static String GetBump(cTexture fullname)
5296	5688	{
5297	5689	if (fullname == null)
5298	5690	return "";
	5691	+
	5692	+ if (fullname.bump != null)
	5693	+ {
	5694	+ return fullname.bump;
	5695	+ }
5299	5696
5300	5697	// System.out.println("Fullname = " + fullname);
5301	5698	// Does not work on Windows due to C:
..	..	@@ -5307,12 +5704,12 @@
5307	5704
5308	5705	if (split.length == 0)
5309	5706	{
5310		- return "";
	5707	+ return fullname.bump = "";
5311	5708	}
5312	5709
5313	5710	if (split.length == 1)
5314	5711	{
5315		- return "";
	5712	+ return fullname.bump = "";
5316	5713	}
5317	5714
5318	5715	if (split.length == 2)
..	..	@@ -5320,16 +5717,16 @@
5320	5717	if (fullname.name.endsWith(":"))
5321	5718	{
5322	5719	// Windows
5323		- return "";
	5720	+ return fullname.bump = "";
5324	5721	}
5325	5722
5326		- return split[1];
	5723	+ return fullname.bump = split[1];
5327	5724	}
5328	5725
5329	5726	// Windows
5330	5727	assert(split.length == 4);
5331	5728
5332		- return split[2] + ":" + split[3];
	5729	+ return fullname.bump = split[2] + ":" + split[3];
5333	5730	}
5334	5731
5335	5732	String GetPigmentTexture()
..	..	@@ -5412,6 +5809,9 @@
5412	5809	texname = "";
5413	5810
5414	5811	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5812	+
	5813	+ GetTextures().pigment = null;
	5814	+
5415	5815	Touch();
5416	5816	}
5417	5817
..	..	@@ -5485,6 +5885,8 @@
5485	5885
5486	5886	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5487	5887
	5888	+ GetTextures().bump = null;
	5889	+
5488	5890	Touch();
5489	5891	}
5490	5892
..	..	@@ -5509,6 +5911,38 @@
5509	5911	}
5510	5912	}
5511	5913
	5914	+ void EmbedTextures(boolean embed)
	5915	+ {
	5916	+ if (blockloop)
	5917	+ return;
	5918	+
	5919	+ //if (GetTextures() != null)
	5920	+ if (embed)
	5921	+ CameraPane.EmbedTextures(GetTextures());
	5922	+ else
	5923	+ {
	5924	+ GetTextures().pigmentdata = null;
	5925	+ GetTextures().bumpdata = null;
	5926	+ GetTextures().pw = 0;
	5927	+ GetTextures().ph = 0;
	5928	+ GetTextures().bw = 0;
	5929	+ GetTextures().bh = 0;
	5930	+ }
	5931	+
	5932	+ int nb = Size();
	5933	+ for (int i = 0; i < nb; i++)
	5934	+ {
	5935	+ Object3D child = (Object3D) get(i);
	5936	+
	5937	+ if (child == null)
	5938	+ continue;
	5939	+
	5940	+ blockloop = true;
	5941	+ child.EmbedTextures(embed);
	5942	+ blockloop = false;
	5943	+ }
	5944	+ }
	5945	+
5512	5946	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5513	5947	{
5514	5948	Draw(display, root, selected, blocked);
..	..	@@ -5517,12 +5951,23 @@
5517	5951	boolean NeedSupport()
5518	5952	{
5519	5953	return
5520		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
	5954	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5521	5955	// PROBLEM with CROWD!!
5522	5956	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5523	5957	}
5524	5958
5525	5959	static boolean DEBUG_SELECTION = false;
	5960	+
	5961	+ boolean IsLive()
	5962	+ {
	5963	+ if (live)
	5964	+ return true;
	5965	+
	5966	+ if (parent == null)
	5967	+ return false;
	5968	+
	5969	+ return parent.IsLive();
	5970	+ }
5526	5971
5527	5972	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5528	5973	{
..	..	@@ -5584,8 +6029,10 @@
5584	6029	if (support != null)
5585	6030	support = support;
5586	6031
5587		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5588		- boolean usecalllists = false; // 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.
5589	6036
5590	6037	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5591	6038	{
..	..	@@ -5595,8 +6042,9 @@
5595	6042	// usecalllists &= !(parent instanceof RandomNode);
5596	6043	// usecalllists = false;
5597	6044
5598		- if (GetBRep() != null)
5599		- usecalllists = usecalllists;
	6045	+ if (display.DrawMode() == display.SHADOW)
	6046	+ //GetBRep() != null)
	6047	+ usecalllists = !!usecalllists;
5600	6048	//System.out.println("draw " + this);
5601	6049	//new Exception().printStackTrace();
5602	6050
..	..	@@ -5605,10 +6053,12 @@
5605	6053	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5606	6054
5607	6055	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5608		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	6056	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	6057	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5609	6058	{
5610	6059	Globals.lighttouched = true;
5611	6060	} // all panes...
	6061	+
5612	6062	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5613	6063	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5614	6064	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5616,7 +6066,7 @@
5616	6066	if (!(this instanceof Composite))
5617	6067	touched = false;
5618	6068	//if (displaylist == -1 && usecalllists)
5619		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6069	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5620	6070	{
5621	6071	bRep.displaylist = display.GenList();
5622	6072	assert(bRep.displaylist != 0);
..	..	@@ -5627,7 +6077,7 @@
5627	6077
5628	6078	//System.out.println("\tnew list " + list);
5629	6079	//gl.glDrawBuffer(gl.GL_NONE);
5630		- if (usecalllists)
	6080	+ if (usecalllists && bRep.displaylist > 0)
5631	6081	{
5632	6082	// System.err.println("new list " + bRep.displaylist + " for " + this);
5633	6083	display.NewList(bRep.displaylist);
..	..	@@ -5636,7 +6086,7 @@
5636	6086	CallList(display, root, selected, blocked);
5637	6087
5638	6088	// compiled = true;
5639		- if (usecalllists)
	6089	+ if (usecalllists && bRep.displaylist > 0)
5640	6090	{
5641	6091	// System.err.println("end list " + bRep.displaylist + " for " + this);
5642	6092	display.EndList();
..	..	@@ -5736,6 +6186,7 @@
5736	6186	if (GetBRep() != null)
5737	6187	{
5738	6188	display.NextIndex();
	6189	+
5739	6190	// vertex color conflict : gl.glCallList(list);
5740	6191	DrawNode(display, root, selected);
5741	6192	if (this instanceof BezierPatch)
..	..	@@ -5776,16 +6227,27 @@
5776	6227	tex = GetTextures();
5777	6228	}
5778	6229
5779		- boolean failed = false;
	6230	+ boolean failedPigment = false;
	6231	+ boolean failedBump = false;
5780	6232
5781	6233	try
5782	6234	{
5783		- display.BindTextures(tex, texres);
	6235	+ display.BindPigmentTexture(tex, texres);
5784	6236	}
5785	6237	catch (Exception e)
5786	6238	{
5787	6239	System.err.println("FAILED: " + this);
5788		- failed = true;
	6240	+ failedPigment = true;
	6241	+ }
	6242	+
	6243	+ try
	6244	+ {
	6245	+ display.BindBumpTexture(tex, texres);
	6246	+ }
	6247	+ catch (Exception e)
	6248	+ {
	6249	+ //System.err.println("FAILED: " + this);
	6250	+ failedBump = true;
5789	6251	}
5790	6252
5791	6253	if (!compiled)
..	..	@@ -5808,8 +6270,11 @@
5808	6270	}
5809	6271	}
5810	6272
5811		- if (!failed)
5812		- display.ReleaseTextures(tex);
	6273	+ if (!failedBump)
	6274	+ display.ReleaseBumpTexture(tex);
	6275	+
	6276	+ if (!failedPigment)
	6277	+ display.ReleasePigmentTexture(tex);
5813	6278
5814	6279	display.PopMaterial(this, selected);
5815	6280	}
..	..	@@ -6182,6 +6647,11 @@
6182	6647	// dec 2012
6183	6648	new Exception().printStackTrace();
6184	6649	return;
	6650	+ }
	6651	+
	6652	+ if (dontselect)
	6653	+ {
	6654	+ //bRep.GenerateNormalsMINE();
6185	6655	}
6186	6656
6187	6657	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6967,20 +7437,23 @@
6967	7437	}
6968	7438	}
6969	7439
6970		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7440	+ static ClickInfo clickInfo = new ClickInfo();
	7441	+
	7442	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7443	+ Point outPt, Rectangle outRec)
6971	7444	{
6972		- int hc = info.bounds.x + info.bounds.width / 2;
6973		- int vc = info.bounds.y + info.bounds.height / 2;
6974		- double[][] toscreen = info.toScreen;
	7445	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7446	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7447	+ double[][] toscreen = clickInfo.toScreen;
6975	7448	if (toscreen == null)
6976	7449	{
6977		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7450	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6978	7451	}
6979	7452	cVector vec = in;
6980	7453	LA.xformPos(in, toscreen, in);
6981	7454	//System.out.println("Distance = " + info.camera.Distance());
6982		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
6983		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7455	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7456	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6984	7457	outPt.x = hc + (int) vec.x;
6985	7458	outPt.y = vc - (int) vec.y;
6986	7459	outRec.x = outPt.x - 3;
..	..	@@ -6988,15 +7461,18 @@
6988	7461	outRec.width = outRec.height = 6;
6989	7462	}
6990	7463
6991		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7464	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7465	+ )
6992	7466	{
6993	7467	Point pt = new Point(0, 0);
6994	7468	Rectangle rec = new Rectangle();
6995		- calcHotSpot(in, info, pt, rec);
	7469	+ calcHotSpot(in, //clickInfo,
	7470	+ pt, rec);
6996	7471	return rec;
6997	7472	}
6998	7473
6999		- void drawEditHandles0(ClickInfo info, int level)
	7474	+ void drawEditHandles0(//ClickInfo clickInfo,
	7475	+ int level)
7000	7476	{
7001	7477	if (level == 0)
7002	7478	{
..	..	@@ -7005,16 +7481,19 @@
7005	7481	{
7006	7482	cVector origin = new cVector();
7007	7483	//LA.xformPos(origin, toParent, origin);
7008		- Rectangle spot = calcHotSpot(origin, info);
	7484	+ if (this.clickInfo == null)
	7485	+ this.clickInfo = new ClickInfo();
	7486	+
	7487	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7009	7488	Rectangle boundary = new Rectangle();
7010	7489	boundary.x = spot.x - 30;
7011	7490	boundary.y = spot.y - 30;
7012	7491	boundary.width = spot.width + 60;
7013	7492	boundary.height = spot.height + 60;
7014		- info.g.setColor(Color.red);
	7493	+ clickInfo.g.setColor(Color.white);
7015	7494	int spotw = spot.x + spot.width;
7016	7495	int spoth = spot.y + spot.height;
7017		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7496	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7018	7497	// if (CameraPane.Xmin > spot.x)
7019	7498	// {
7020	7499	// CameraPane.Xmin = spot.x;
..	..	@@ -7031,11 +7510,33 @@
7031	7510	// {
7032	7511	// CameraPane.Ymax = spoth;
7033	7512	// }
7034		- 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);
7035	7536	spotw = spot.x + spot.width;
7036	7537	spoth = spot.y + spot.height;
7037		- info.g.setColor(Color.blue);
7038		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7538	+ clickInfo.g.setColor(Color.cyan);
	7539	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7039	7540	// if (CameraPane.Xmin > spot.x)
7040	7541	// {
7041	7542	// CameraPane.Xmin = spot.x;
..	..	@@ -7052,29 +7553,9 @@
7052	7553	// {
7053	7554	// CameraPane.Ymax = spoth;
7054	7555	// }
7055		- // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7056		- //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7057		- spot.translate(0, -32);
7058		- info.g.setColor(Color.green);
7059		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7060		-// if (CameraPane.Xmin > spot.x)
7061		-// {
7062		-// CameraPane.Xmin = spot.x;
7063		-// }
7064		-// if (CameraPane.Xmax < spotw)
7065		-// {
7066		-// CameraPane.Xmax = spotw;
7067		-// }
7068		-// if (CameraPane.Ymin > spot.y)
7069		-// {
7070		-// CameraPane.Ymin = spot.y;
7071		-// }
7072		-// if (CameraPane.Ymax < spoth)
7073		-// {
7074		-// CameraPane.Ymax = spoth;
7075		-// }
7076		- info.g.drawArc(boundary.x, boundary.y,
7077		- boundary.width, boundary.height, 0, 360);
	7556	+ clickInfo.g.setColor(Color.green);
	7557	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7558	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7078	7559	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7079	7560	// if (CameraPane.Xmin > boundary.x)
7080	7561	// {
..	..	@@ -7096,7 +7577,8 @@
7096	7577	}
7097	7578	}
7098	7579
7099		- boolean doEditClick0(ClickInfo info, int level)
	7580	+ boolean doEditClick0(//ClickInfo clickInfo,
	7581	+ int level)
7100	7582	{
7101	7583	if (level == 0)
7102	7584	{
..	..	@@ -7105,8 +7587,8 @@
7105	7587
7106	7588	boolean retval = false;
7107	7589
7108		- startX = info.x;
7109		- startY = info.y;
	7590	+ startX = clickInfo.x;
	7591	+ startY = clickInfo.y;
7110	7592
7111	7593	hitSomething = -1;
7112	7594	cVector origin = new cVector();
..	..	@@ -7116,22 +7598,53 @@
7116	7598	{
7117	7599	centerPt = new Point(0, 0);
7118	7600	}
7119		- calcHotSpot(origin, info, centerPt, spot);
7120		- if (spot.contains(info.x, info.y))
	7601	+ calcHotSpot(origin, //info,
	7602	+ centerPt, spot);
	7603	+ if (spot.contains(clickInfo.x, clickInfo.y))
7121	7604	{
7122	7605	hitSomething = hitCenter;
7123	7606	retval = true;
7124	7607	}
7125	7608	spot.translate(32, 0);
7126		- if (spot.contains(info.x, info.y))
	7609	+ if (spot.contains(clickInfo.x, clickInfo.y))
7127	7610	{
7128	7611	hitSomething = hitRotate;
7129	7612	retval = true;
7130	7613	}
7131	7614	spot.translate(0, 32);
7132		- if (spot.contains(info.x, info.y))
	7615	+ spot.translate(32, 0);
	7616	+ spot.translate(0, 32);
	7617	+ if (spot.contains(clickInfo.x, clickInfo.y))
7133	7618	{
7134	7619	hitSomething = hitScale;
	7620	+
	7621	+ double scale = 0.005f * clickInfo.camera.Distance();
	7622	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7623	+ double sign = 1;
	7624	+ if (hScale < 0)
	7625	+ {
	7626	+ sign = -1;
	7627	+ }
	7628	+ hScale = signMath.pow(signhScale, scale * 50);
	7629	+ if (hScale < 0.01)
	7630	+ {
	7631	+ //hScale = 0.01;
	7632	+ }
	7633	+
	7634	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7635	+ sign = 1;
	7636	+ if (vScale < 0)
	7637	+ {
	7638	+ sign = -1;
	7639	+ }
	7640	+ vScale = signMath.pow(signvScale, scale * 50);
	7641	+ if (vScale < 0.01)
	7642	+ {
	7643	+ //vScale = 0.01;
	7644	+ }
	7645	+
	7646	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7647	+
7135	7648	retval = true;
7136	7649	}
7137	7650
..	..	@@ -7141,7 +7654,7 @@
7141	7654	}
7142	7655
7143	7656	//System.out.println("info.modifiers = " + info.modifiers);
7144		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7657	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7145	7658	//System.out.println("modified = " + modified);
7146	7659	//new Exception().printStackTrace();
7147	7660	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7169,7 +7682,8 @@
7169	7682	return true;
7170	7683	}
7171	7684
7172		- void doEditDrag0(ClickInfo info, boolean opposite)
	7685	+ void doEditDrag0(//ClickInfo info,
	7686	+ boolean opposite)
7173	7687	{
7174	7688	if (hitSomething == 0)
7175	7689	{
..	..	@@ -7183,7 +7697,7 @@
7183	7697
7184	7698	//System.out.println("hitSomething = " + hitSomething);
7185	7699
7186		- double scale = 0.005f * info.camera.Distance();
	7700	+ double scale = 0.005f * clickInfo.camera.Distance();
7187	7701
7188	7702	cVector xlate = new cVector();
7189	7703	//cVector xlate2 = new cVector();
..	..	@@ -7197,7 +7711,9 @@
7197	7711
7198	7712	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7199	7713
7200		- if (modified \|\| opposite)
	7714	+ // Modified could snap
	7715	+ if (//modified \|\|
	7716	+ opposite)
7201	7717	{
7202	7718	//assert(false);
7203	7719	/*
..	..	@@ -7217,8 +7733,8 @@
7217	7733	toParent[3][i] = xlate.get(i);
7218	7734	LA.matInvert(toParent, fromParent);
7219	7735	*/
7220		- cVector delta = LA.newVector(0, 0, startY - info.y);
7221		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7736	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7737	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7222	7738
7223	7739	LA.matCopy(startMat, toParent);
7224	7740	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7227,7 +7743,7 @@
7227	7743	} else
7228	7744	{
7229	7745	//LA.xformDir(delta, info.camera.fromScreen, delta);
7230		- cVector up = new cVector(info.camera.up);
	7746	+ cVector up = new cVector(clickInfo.camera.up);
7231	7747	cVector away = new cVector();
7232	7748	//cVector right2 = new cVector();
7233	7749	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7244,19 +7760,19 @@
7244	7760	LA.xformDir(up, ClickInfo.matbuffer, up);
7245	7761	// if (!CameraPane.LOCALTRANSFORM)
7246	7762	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7247		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7763	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7248	7764	// if (!CameraPane.LOCALTRANSFORM)
7249	7765	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7250	7766	//LA.vecCross(up, cVector.Z, right2);
7251	7767
7252		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7768	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7253	7769
7254	7770	//System.out.println("DELTA0 = " + delta);
7255	7771	//System.out.println("AWAY = " + info.camera.away);
7256	7772	//System.out.println("UP = " + info.camera.up);
7257	7773	if (away.z > 0)
7258	7774	{
7259		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7775	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7260	7776	{
7261	7777	delta.x = -delta.x;
7262	7778	} else
..	..	@@ -7271,7 +7787,7 @@
7271	7787	//System.out.println("DELTA1 = " + delta);
7272	7788	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7273	7789	//System.out.println("DELTA2 = " + delta);
7274		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7790	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7275	7791	LA.matCopy(startMat, toParent);
7276	7792	//System.out.println("DELTA3 = " + delta);
7277	7793	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7281,8 +7797,8 @@
7281	7797	break;
7282	7798
7283	7799	case hitRotate: // rotate
7284		- int dx = info.x - centerPt.x;
7285		- int dy = -(info.y - centerPt.y);
	7800	+ int dx = clickInfo.x - centerPt.x;
	7801	+ int dy = -(clickInfo.y - centerPt.y);
7286	7802	double angle = (double) Math.atan2(dx, dy);
7287	7803	angle = -(1.570796 - angle);
7288	7804
..	..	@@ -7291,7 +7807,7 @@
7291	7807
7292	7808	if (modified)
7293	7809	{
7294		- // Rotate 90 degrees
	7810	+ // Rotate 45 degrees
7295	7811	angle /= (Math.PI / 4);
7296	7812	angle = Math.floor(angle + 0.5);
7297	7813	angle *= (Math.PI / 4);
..	..	@@ -7305,7 +7821,7 @@
7305	7821	}
7306	7822	/**/
7307	7823
7308		- switch (info.pane.RenderCamera().viewCode)
	7824	+ switch (clickInfo.pane.RenderCamera().viewCode)
7309	7825	{
7310	7826	case 1: // '\001'
7311	7827	LA.matZRotate(toParent, angle);
..	..	@@ -7332,7 +7848,7 @@
7332	7848	break;
7333	7849
7334	7850	case hitScale: // scale
7335		- double hScale = (double) (info.x - centerPt.x) / 32;
	7851	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7336	7852	double sign = 1;
7337	7853	if (hScale < 0)
7338	7854	{
..	..	@@ -7344,7 +7860,7 @@
7344	7860	//hScale = 0.01;
7345	7861	}
7346	7862
7347		- double vScale = (double) (info.y - centerPt.y) / 32;
	7863	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7348	7864	sign = 1;
7349	7865	if (vScale < 0)
7350	7866	{
..	..	@@ -7355,6 +7871,7 @@
7355	7871	{
7356	7872	//vScale = 0.01;
7357	7873	}
	7874	+
7358	7875	LA.matCopy(startMat, toParent);
7359	7876	/**/
7360	7877	for (int i = 0; i < 3; i++)
..	..	@@ -7364,32 +7881,39 @@
7364	7881	}
7365	7882	/**/
7366	7883
7367		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7884	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7368	7885
7369	7886	if (totalScale < 0.01)
7370	7887	{
7371	7888	totalScale = 0.01;
7372	7889	}
7373	7890
7374		- switch (info.pane.RenderCamera().viewCode)
	7891	+ switch (clickInfo.pane.RenderCamera().viewCode)
7375	7892	{
7376	7893	case 3: // '\001'
7377		- if (modified)
	7894	+ if (modified \|\| opposite)
7378	7895	{
	7896	+ if (modified) // && opposite)
	7897	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7898	+ else
7379	7899	//LA.matScale(toParent, 1, hScale, vScale);
7380		- LA.matScale(toParent, totalScale, 1, 1);
	7900	+ LA.matScale(toParent, totalScale, 1, 1);
7381	7901	} // vScale, 1);
7382	7902	else
7383	7903	{
7384		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	7904	+ // EXCEPTION!
	7905	+ LA.matScale(toParent, 1, totalScale, totalScale);
7385	7906	} // vScale, 1);
7386	7907	break;
7387	7908
7388	7909	case 2: // '\002'
7389		- if (modified)
	7910	+ if (modified \|\| opposite)
7390	7911	{
7391		- //LA.matScale(toParent, hScale, 1, vScale);
7392		- 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);
7393	7917	} else
7394	7918	{
7395	7919	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7397,10 +7921,13 @@
7397	7921	break;
7398	7922
7399	7923	case 1: // '\003'
7400		- if (modified)
	7924	+ if (modified \|\| opposite)
7401	7925	{
7402		- //LA.matScale(toParent, hScale, vScale, 1);
7403		- 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);
7404	7931	} else
7405	7932	{
7406	7933	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7437,7 +7964,7 @@
7437	7964	} // NEW ...
7438	7965
7439	7966
7440		- info.pane.repaint();
	7967	+ clickInfo.pane.repaint();
7441	7968	}
7442	7969
7443	7970	boolean overflow = false;
..	..	@@ -7617,6 +8144,10 @@
7617	8144	editWindow = null;
7618	8145	} // ?
7619	8146	}
	8147	+ else
	8148	+ {
	8149	+ //editWindow.closeUI();
	8150	+ }
7620	8151	}
7621	8152
7622	8153	boolean root; // patch for edit windows
..	..	@@ -7774,6 +8305,10 @@
7774	8305	}
7775	8306
7776	8307	transient ObjEditor editWindow;
	8308	+ transient ObjEditor manipWindow;
	8309	+
	8310	+ transient boolean pinned;
	8311	+
7777	8312	transient ObjectUI objectUI;
7778	8313	public static int povDepth = 0;
7779	8314	private static cVector tbMin = new cVector();