~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,64 +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();
	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;
	317	+ }
	318	+
	319	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	320	+ {
	321	+ if (!hashtable.containsKey(GetUUID()))
	322	+ return;
	323	+
	324	+ Object3D o = hashtable.get(GetUUID());
	325	+
	326	+ RestoreBigData(o);
	327	+
	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	+
162	340	blockloop = false;
163	341	}
164		-}
	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	+ }
165	360
166	361	// MOCAP SUPPORT
167	362	double tx,ty,tz,rx,ry,rz;
..	..	@@ -304,6 +499,7 @@
304	499	}
305	500
306	501	boolean live = false;
	502	+ transient boolean keepdontselect;
307	503	boolean dontselect = false;
308	504	boolean hide = false;
309	505	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -486,12 +682,14 @@
486	682	toParent = LA.newMatrix();
487	683	fromParent = LA.newMatrix();
488	684	}
	685	+
489	686	if (toParentMarked == null)
490	687	{
491	688	if (maxcount != 1)
492	689	{
493		- new Exception().printStackTrace();
	690	+ //new Exception().printStackTrace();
494	691	}
	692	+
495	693	toParentMarked = LA.newMatrix();
496	694	fromParentMarked = LA.newMatrix();
497	695	}
..	..	@@ -802,7 +1000,7 @@
802	1000
803	1001	if (marked && Globals.isLIVE() && live &&
804	1002	//TEMP21aug2018
805		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	1003	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
806	1004	currentframe != Globals.framecount)
807	1005	{
808	1006	currentframe = Globals.framecount;
..	..	@@ -814,7 +1012,8 @@
814	1012
815	1013	boolean changedir = random && Math.random() < 0.01; // && !link2master;
816	1014
817		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	1015	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	1016	+ (step == 1 && changedir))
818	1017	{
819	1018	countdown = 1;
820	1019	delay = speedup?8:1;
..	..	@@ -886,6 +1085,10 @@
886	1085	if (material == null \|\| material.multiply)
887	1086	return true;
888	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.
889	1092	return material.opacity > 0.99;
890	1093	}
891	1094
..	..	@@ -1286,6 +1489,7 @@
1286	1489	toParent = LA.newMatrix();
1287	1490	fromParent = LA.newMatrix();
1288	1491	}
	1492	+
1289	1493	LA.matCopy(other.toParent, toParent);
1290	1494	LA.matCopy(other.fromParent, fromParent);
1291	1495
..	..	@@ -2165,11 +2369,6 @@
2165	2369
2166	2370	InitOthers();
2167	2371
2168		- if (this instanceof Camera)
2169		- {
2170		- material.shift = 90;
2171		- }
2172		-
2173	2372	material.multiply = multiply;
2174	2373
2175	2374	if (multiply)
..	..	@@ -2307,6 +2506,15 @@
2307	2506	}
2308	2507	*/
2309	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	+ }
2310	2518	}
2311	2519
2312	2520	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2348,6 +2556,14 @@
2348	2556	{
2349	2557	editWindow.refreshContents();
2350	2558	}
	2559	+ else
	2560	+ {
	2561	+ if (manipWindow != null)
	2562	+ {
	2563	+ manipWindow.refreshContents();
	2564	+ }
	2565	+ }
	2566	+
2351	2567	//if (parent != null)
2352	2568	//parent.refreshEditWindow();
2353	2569	}
..	..	@@ -2427,7 +2643,8 @@
2427	2643	private static final int editSelf = 1;
2428	2644	private static final int editChild = 2;
2429	2645
2430		- void drawEditHandles(ClickInfo info, int level)
	2646	+ void drawEditHandles(//ClickInfo info,
	2647	+ int level)
2431	2648	{
2432	2649	if (level == 0)
2433	2650	{
..	..	@@ -2435,7 +2652,8 @@
2435	2652	return;
2436	2653
2437	2654	Object3D selectee;
2438		- 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))
2439	2657	{
2440	2658	selectee = (Object3D) e.nextElement();
2441	2659	}
..	..	@@ -2443,19 +2661,22 @@
2443	2661	} else
2444	2662	{
2445	2663	//super.
2446		- drawEditHandles0(info, level + 1);
	2664	+ drawEditHandles0(//info,
	2665	+ level + 1);
2447	2666	}
2448	2667	}
2449	2668
2450		- boolean doEditClick(ClickInfo info, int level)
	2669	+ boolean doEditClick(//ClickInfo info,
	2670	+ int level)
2451	2671	{
2452	2672	doSomething = 0;
2453	2673	if (level == 0)
2454	2674	{
2455		- return doParentClick(info);
	2675	+ return doParentClick(); //info);
2456	2676	}
2457	2677	if (//super.
2458		- doEditClick0(info, level))
	2678	+ doEditClick0(//info,
	2679	+ level))
2459	2680	{
2460	2681	doSomething = 1;
2461	2682	return true;
..	..	@@ -2465,7 +2686,7 @@
2465	2686	}
2466	2687	}
2467	2688
2468		- boolean doParentClick(ClickInfo info)
	2689	+ boolean doParentClick() //ClickInfo info)
2469	2690	{
2470	2691	if (selection == null)
2471	2692	{
..	..	@@ -2478,7 +2699,8 @@
2478	2699	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2479	2700	{
2480	2701	Object3D selectee = (Object3D) e.nextElement();
2481		- if (selectee.doEditClick(info, 1))
	2702	+ if (selectee.doEditClick(//info,
	2703	+ 1))
2482	2704	{
2483	2705	childToDrag = selectee;
2484	2706	doSomething = 2;
..	..	@@ -2490,13 +2712,15 @@
2490	2712	return retval;
2491	2713	}
2492	2714
2493		- void doEditDrag(ClickInfo info, boolean opposite)
	2715	+ void doEditDrag(//ClickInfo clickInfo,
	2716	+ boolean opposite)
2494	2717	{
2495	2718	switch (doSomething)
2496	2719	{
2497	2720	case 1: // '\001'
2498	2721	//super.
2499		- doEditDrag0(info, opposite);
	2722	+ doEditDrag0(//clickInfo,
	2723	+ opposite);
2500	2724	break;
2501	2725
2502	2726	case 2: // '\002'
..	..	@@ -2509,11 +2733,13 @@
2509	2733	{
2510	2734	//sel.hitSomething = childToDrag.hitSomething;
2511	2735	//childToDrag.doEditDrag(info);
2512		- sel.doEditDrag(info, opposite);
	2736	+ sel.doEditDrag(//clickInfo,
	2737	+ opposite);
2513	2738	} else
2514	2739	{
2515	2740	//super.
2516		- doEditDrag0(info, opposite);
	2741	+ doEditDrag0(//clickInfo,
	2742	+ opposite);
2517	2743	}
2518	2744	}
2519	2745	break;
..	..	@@ -2531,6 +2757,9 @@
2531	2757	{
2532	2758	deselectAll();
2533	2759	}
	2760	+
	2761	+ new Exception().printStackTrace();
	2762	+
2534	2763	ClickInfo newInfo = new ClickInfo();
2535	2764	newInfo.flags = info.flags;
2536	2765	newInfo.bounds = info.bounds;
..	..	@@ -2623,6 +2852,18 @@
2623	2852	void GenNormalsS(boolean crease)
2624	2853	{
2625	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();
2626	2867	// for (int i=0; i<selection.size(); i++)
2627	2868	// {
2628	2869	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2763,6 +3004,24 @@
2763	3004	if (child == null)
2764	3005	continue;
2765	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();
2766	3025	// Children().release(i);
2767	3026	}
2768	3027	blockloop = false;
..	..	@@ -2935,11 +3194,20 @@
2935	3194	}
2936	3195	}
2937	3196
	3197	+ void GenNormalsMesh0()
	3198	+ {
	3199	+ if (bRep != null)
	3200	+ {
	3201	+ bRep.GenerateNormalsMesh();
	3202	+ Touch();
	3203	+ }
	3204	+ }
	3205	+
2938	3206	void GenNormalsMINE0()
2939	3207	{
2940	3208	if (bRep != null)
2941	3209	{
2942		- bRep.GenerateNormalsMINE();
	3210	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2943	3211	Touch();
2944	3212	}
2945	3213	}
..	..	@@ -3349,15 +3617,47 @@
3349	3617
3350	3618	void ClearMaterials()
3351	3619	{
	3620	+ if (blockloop)
	3621	+ return;
	3622	+
	3623	+ blockloop = true;
	3624	+
3352	3625	ClearMaterial();
3353		- for (int i = 0; i < size(); i++)
	3626	+ for (int i = 0; i < Size(); i++)
3354	3627	{
3355		- Object3D child = (Object3D) reserve(i);
	3628	+ Object3D child = (Object3D) get(i);
3356	3629	if (child == null)
3357	3630	continue;
3358	3631	child.ClearMaterials();
3359		- release(i);
3360	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;
3361	3661	}
3362	3662
3363	3663	void FlipV(boolean flip)
..	..	@@ -3385,7 +3685,8 @@
3385	3685	if (blockloop)
3386	3686	return;
3387	3687
3388		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3688	+ if (//marked \|\| // does not make sense
	3689	+ (bRep != null \|\| material != null)) // borderline...
3389	3690	live = h;
3390	3691
3391	3692	for (int i = 0; i < Size(); i++)
..	..	@@ -3406,7 +3707,8 @@
3406	3707	return;
3407	3708
3408	3709	//if (bRep != null)
3409		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3710	+ if (//marked \|\| // does not make sense
	3711	+ (bRep != null \|\| material != null)) // borderline...
3410	3712	link2master = h;
3411	3713
3412	3714	for (int i = 0; i < Size(); i++)
..	..	@@ -3426,7 +3728,8 @@
3426	3728	if (blockloop)
3427	3729	return;
3428	3730
3429		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3731	+ if (//marked \|\| // does not make sense
	3732	+ (bRep != null \|\| material != null)) // borderline...
3430	3733	hide = h;
3431	3734
3432	3735	for (int i = 0; i < Size(); i++)
..	..	@@ -3446,7 +3749,7 @@
3446	3749	if (blockloop)
3447	3750	return;
3448	3751
3449		- if (bRep != null && material != null) // borderline...
	3752	+ if (bRep != null \|\| material != null) // borderline...
3450	3753	marked = h;
3451	3754
3452	3755	for (int i = 0; i < Size(); i++)
..	..	@@ -3456,6 +3759,46 @@
3456	3759	continue;
3457	3760	blockloop = true;
3458	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);
3459	3802	blockloop = false;
3460	3803	// release(i);
3461	3804	}
..	..	@@ -4233,6 +4576,55 @@
4233	4576	}
4234	4577	}
4235	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	+
4236	4628	void RepairTexture()
4237	4629	{
4238	4630	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4747,6 +5139,14 @@
4747	5139	}
4748	5140	}
4749	5141
	5142	+ ObjEditor GetWindow()
	5143	+ {
	5144	+ if (editWindow != null)
	5145	+ return editWindow;
	5146	+
	5147	+ return manipWindow;
	5148	+ }
	5149	+
4750	5150	cTreePath Select(int indexcount, boolean deselect)
4751	5151	{
4752	5152	if (hide \|\| dontselect)
..	..	@@ -4783,10 +5183,11 @@
4783	5183	if (leaf != null)
4784	5184	{
4785	5185	cTreePath tp = new cTreePath(this, leaf);
4786		- if (editWindow != null)
	5186	+ ObjEditor window = GetWindow();
	5187	+ if (window != null)
4787	5188	{
4788	5189	//System.out.println("editWindow = " + editWindow + " vs " + this);
4789		- editWindow.Select(tp, deselect, true);
	5190	+ window.Select(tp, deselect, true);
4790	5191	}
4791	5192
4792	5193	return tp;
..	..	@@ -4803,6 +5204,7 @@
4803	5204
4804	5205	if (child == null)
4805	5206	continue;
	5207	+
4806	5208	if (child.HasTransparency() && child.size() != 0)
4807	5209	{
4808	5210	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4812,9 +5214,10 @@
4812	5214	if (leaf != null)
4813	5215	{
4814	5216	cTreePath tp = new cTreePath(this, leaf);
4815		- if (editWindow != null)
	5217	+ ObjEditor window = GetWindow();
	5218	+ if (window != null)
4816	5219	{
4817		- editWindow.Select(tp, deselect, true);
	5220	+ window.Select(tp, deselect, true);
4818	5221	}
4819	5222
4820	5223	return tp;
..	..	@@ -5139,6 +5542,51 @@
5139	5542	blockloop = false;
5140	5543	}
5141	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	+
5142	5590	boolean IsSelected()
5143	5591	{
5144	5592	if (parent == null)
..	..	@@ -5199,6 +5647,11 @@
5199	5647	if (fullname == null)
5200	5648	return "";
5201	5649
	5650	+ if (fullname.pigment != null)
	5651	+ {
	5652	+ return fullname.pigment;
	5653	+ }
	5654	+
5202	5655	// System.out.println("Fullname = " + fullname);
5203	5656
5204	5657	// Does not work on Windows due to C:
..	..	@@ -5211,7 +5664,7 @@
5211	5664
5212	5665	if (split.length == 0)
5213	5666	{
5214		- return "";
	5667	+ return fullname.pigment = "";
5215	5668	}
5216	5669
5217	5670	if (split.length <= 2)
..	..	@@ -5219,22 +5672,27 @@
5219	5672	if (fullname.name.endsWith(":"))
5220	5673	{
5221	5674	// Windows
5222		- return fullname.name.substring(0, fullname.name.length()-1);
	5675	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5223	5676	}
5224	5677
5225		- return split[0];
	5678	+ return fullname.pigment = split[0];
5226	5679	}
5227	5680
5228	5681	// Windows
5229	5682	assert(split.length == 4);
5230	5683
5231		- return split[0] + ":" + split[1];
	5684	+ return fullname.pigment = split[0] + ":" + split[1];
5232	5685	}
5233	5686
5234	5687	static String GetBump(cTexture fullname)
5235	5688	{
5236	5689	if (fullname == null)
5237	5690	return "";
	5691	+
	5692	+ if (fullname.bump != null)
	5693	+ {
	5694	+ return fullname.bump;
	5695	+ }
5238	5696
5239	5697	// System.out.println("Fullname = " + fullname);
5240	5698	// Does not work on Windows due to C:
..	..	@@ -5246,12 +5704,12 @@
5246	5704
5247	5705	if (split.length == 0)
5248	5706	{
5249		- return "";
	5707	+ return fullname.bump = "";
5250	5708	}
5251	5709
5252	5710	if (split.length == 1)
5253	5711	{
5254		- return "";
	5712	+ return fullname.bump = "";
5255	5713	}
5256	5714
5257	5715	if (split.length == 2)
..	..	@@ -5259,16 +5717,16 @@
5259	5717	if (fullname.name.endsWith(":"))
5260	5718	{
5261	5719	// Windows
5262		- return "";
	5720	+ return fullname.bump = "";
5263	5721	}
5264	5722
5265		- return split[1];
	5723	+ return fullname.bump = split[1];
5266	5724	}
5267	5725
5268	5726	// Windows
5269	5727	assert(split.length == 4);
5270	5728
5271		- return split[2] + ":" + split[3];
	5729	+ return fullname.bump = split[2] + ":" + split[3];
5272	5730	}
5273	5731
5274	5732	String GetPigmentTexture()
..	..	@@ -5351,6 +5809,9 @@
5351	5809	texname = "";
5352	5810
5353	5811	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5812	+
	5813	+ GetTextures().pigment = null;
	5814	+
5354	5815	Touch();
5355	5816	}
5356	5817
..	..	@@ -5424,6 +5885,8 @@
5424	5885
5425	5886	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5426	5887
	5888	+ GetTextures().bump = null;
	5889	+
5427	5890	Touch();
5428	5891	}
5429	5892
..	..	@@ -5448,6 +5911,38 @@
5448	5911	}
5449	5912	}
5450	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	+
5451	5946	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5452	5947	{
5453	5948	Draw(display, root, selected, blocked);
..	..	@@ -5456,12 +5951,23 @@
5456	5951	boolean NeedSupport()
5457	5952	{
5458	5953	return
5459		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
	5954	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5460	5955	// PROBLEM with CROWD!!
5461	5956	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5462	5957	}
5463	5958
5464	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	+ }
5465	5971
5466	5972	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5467	5973	{
..	..	@@ -5523,8 +6029,10 @@
5523	6029	if (support != null)
5524	6030	support = support;
5525	6031
5526		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5527		- 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.
5528	6036
5529	6037	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5530	6038	{
..	..	@@ -5534,8 +6042,9 @@
5534	6042	// usecalllists &= !(parent instanceof RandomNode);
5535	6043	// usecalllists = false;
5536	6044
5537		- if (GetBRep() != null)
5538		- usecalllists = usecalllists;
	6045	+ if (display.DrawMode() == display.SHADOW)
	6046	+ //GetBRep() != null)
	6047	+ usecalllists = !!usecalllists;
5539	6048	//System.out.println("draw " + this);
5540	6049	//new Exception().printStackTrace();
5541	6050
..	..	@@ -5544,10 +6053,12 @@
5544	6053	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5545	6054
5546	6055	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5547		- (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)))
5548	6058	{
5549	6059	Globals.lighttouched = true;
5550	6060	} // all panes...
	6061	+
5551	6062	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5552	6063	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5553	6064	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5555,7 +6066,7 @@
5555	6066	if (!(this instanceof Composite))
5556	6067	touched = false;
5557	6068	//if (displaylist == -1 && usecalllists)
5558		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6069	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5559	6070	{
5560	6071	bRep.displaylist = display.GenList();
5561	6072	assert(bRep.displaylist != 0);
..	..	@@ -5566,7 +6077,7 @@
5566	6077
5567	6078	//System.out.println("\tnew list " + list);
5568	6079	//gl.glDrawBuffer(gl.GL_NONE);
5569		- if (usecalllists)
	6080	+ if (usecalllists && bRep.displaylist > 0)
5570	6081	{
5571	6082	// System.err.println("new list " + bRep.displaylist + " for " + this);
5572	6083	display.NewList(bRep.displaylist);
..	..	@@ -5575,7 +6086,7 @@
5575	6086	CallList(display, root, selected, blocked);
5576	6087
5577	6088	// compiled = true;
5578		- if (usecalllists)
	6089	+ if (usecalllists && bRep.displaylist > 0)
5579	6090	{
5580	6091	// System.err.println("end list " + bRep.displaylist + " for " + this);
5581	6092	display.EndList();
..	..	@@ -5675,6 +6186,7 @@
5675	6186	if (GetBRep() != null)
5676	6187	{
5677	6188	display.NextIndex();
	6189	+
5678	6190	// vertex color conflict : gl.glCallList(list);
5679	6191	DrawNode(display, root, selected);
5680	6192	if (this instanceof BezierPatch)
..	..	@@ -5715,16 +6227,27 @@
5715	6227	tex = GetTextures();
5716	6228	}
5717	6229
5718		- boolean failed = false;
	6230	+ boolean failedPigment = false;
	6231	+ boolean failedBump = false;
5719	6232
5720	6233	try
5721	6234	{
5722		- display.BindTextures(tex, texres);
	6235	+ display.BindPigmentTexture(tex, texres);
5723	6236	}
5724	6237	catch (Exception e)
5725	6238	{
5726	6239	System.err.println("FAILED: " + this);
5727		- 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;
5728	6251	}
5729	6252
5730	6253	if (!compiled)
..	..	@@ -5747,8 +6270,11 @@
5747	6270	}
5748	6271	}
5749	6272
5750		- if (!failed)
5751		- display.ReleaseTextures(tex);
	6273	+ if (!failedBump)
	6274	+ display.ReleaseBumpTexture(tex);
	6275	+
	6276	+ if (!failedPigment)
	6277	+ display.ReleasePigmentTexture(tex);
5752	6278
5753	6279	display.PopMaterial(this, selected);
5754	6280	}
..	..	@@ -6121,6 +6647,11 @@
6121	6647	// dec 2012
6122	6648	new Exception().printStackTrace();
6123	6649	return;
	6650	+ }
	6651	+
	6652	+ if (dontselect)
	6653	+ {
	6654	+ //bRep.GenerateNormalsMINE();
6124	6655	}
6125	6656
6126	6657	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6906,20 +7437,23 @@
6906	7437	}
6907	7438	}
6908	7439
6909		- 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)
6910	7444	{
6911		- int hc = info.bounds.x + info.bounds.width / 2;
6912		- int vc = info.bounds.y + info.bounds.height / 2;
6913		- 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;
6914	7448	if (toscreen == null)
6915	7449	{
6916		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7450	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6917	7451	}
6918	7452	cVector vec = in;
6919	7453	LA.xformPos(in, toscreen, in);
6920	7454	//System.out.println("Distance = " + info.camera.Distance());
6921		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
6922		- 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();
6923	7457	outPt.x = hc + (int) vec.x;
6924	7458	outPt.y = vc - (int) vec.y;
6925	7459	outRec.x = outPt.x - 3;
..	..	@@ -6927,15 +7461,18 @@
6927	7461	outRec.width = outRec.height = 6;
6928	7462	}
6929	7463
6930		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7464	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7465	+ )
6931	7466	{
6932	7467	Point pt = new Point(0, 0);
6933	7468	Rectangle rec = new Rectangle();
6934		- calcHotSpot(in, info, pt, rec);
	7469	+ calcHotSpot(in, //clickInfo,
	7470	+ pt, rec);
6935	7471	return rec;
6936	7472	}
6937	7473
6938		- void drawEditHandles0(ClickInfo info, int level)
	7474	+ void drawEditHandles0(//ClickInfo clickInfo,
	7475	+ int level)
6939	7476	{
6940	7477	if (level == 0)
6941	7478	{
..	..	@@ -6944,16 +7481,19 @@
6944	7481	{
6945	7482	cVector origin = new cVector();
6946	7483	//LA.xformPos(origin, toParent, origin);
6947		- Rectangle spot = calcHotSpot(origin, info);
	7484	+ if (this.clickInfo == null)
	7485	+ this.clickInfo = new ClickInfo();
	7486	+
	7487	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
6948	7488	Rectangle boundary = new Rectangle();
6949	7489	boundary.x = spot.x - 30;
6950	7490	boundary.y = spot.y - 30;
6951	7491	boundary.width = spot.width + 60;
6952	7492	boundary.height = spot.height + 60;
6953		- info.g.setColor(Color.red);
	7493	+ clickInfo.g.setColor(Color.white);
6954	7494	int spotw = spot.x + spot.width;
6955	7495	int spoth = spot.y + spot.height;
6956		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7496	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6957	7497	// if (CameraPane.Xmin > spot.x)
6958	7498	// {
6959	7499	// CameraPane.Xmin = spot.x;
..	..	@@ -6970,11 +7510,33 @@
6970	7510	// {
6971	7511	// CameraPane.Ymax = spoth;
6972	7512	// }
6973		- 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);
6974	7536	spotw = spot.x + spot.width;
6975	7537	spoth = spot.y + spot.height;
6976		- info.g.setColor(Color.blue);
6977		- 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);
6978	7540	// if (CameraPane.Xmin > spot.x)
6979	7541	// {
6980	7542	// CameraPane.Xmin = spot.x;
..	..	@@ -6991,29 +7553,9 @@
6991	7553	// {
6992	7554	// CameraPane.Ymax = spoth;
6993	7555	// }
6994		- // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6995		- //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
6996		- spot.translate(0, -32);
6997		- info.g.setColor(Color.green);
6998		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6999		-// if (CameraPane.Xmin > spot.x)
7000		-// {
7001		-// CameraPane.Xmin = spot.x;
7002		-// }
7003		-// if (CameraPane.Xmax < spotw)
7004		-// {
7005		-// CameraPane.Xmax = spotw;
7006		-// }
7007		-// if (CameraPane.Ymin > spot.y)
7008		-// {
7009		-// CameraPane.Ymin = spot.y;
7010		-// }
7011		-// if (CameraPane.Ymax < spoth)
7012		-// {
7013		-// CameraPane.Ymax = spoth;
7014		-// }
7015		- info.g.drawArc(boundary.x, boundary.y,
7016		- 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);
7017	7559	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7018	7560	// if (CameraPane.Xmin > boundary.x)
7019	7561	// {
..	..	@@ -7035,7 +7577,8 @@
7035	7577	}
7036	7578	}
7037	7579
7038		- boolean doEditClick0(ClickInfo info, int level)
	7580	+ boolean doEditClick0(//ClickInfo clickInfo,
	7581	+ int level)
7039	7582	{
7040	7583	if (level == 0)
7041	7584	{
..	..	@@ -7044,8 +7587,8 @@
7044	7587
7045	7588	boolean retval = false;
7046	7589
7047		- startX = info.x;
7048		- startY = info.y;
	7590	+ startX = clickInfo.x;
	7591	+ startY = clickInfo.y;
7049	7592
7050	7593	hitSomething = -1;
7051	7594	cVector origin = new cVector();
..	..	@@ -7055,22 +7598,53 @@
7055	7598	{
7056	7599	centerPt = new Point(0, 0);
7057	7600	}
7058		- calcHotSpot(origin, info, centerPt, spot);
7059		- if (spot.contains(info.x, info.y))
	7601	+ calcHotSpot(origin, //info,
	7602	+ centerPt, spot);
	7603	+ if (spot.contains(clickInfo.x, clickInfo.y))
7060	7604	{
7061	7605	hitSomething = hitCenter;
7062	7606	retval = true;
7063	7607	}
7064	7608	spot.translate(32, 0);
7065		- if (spot.contains(info.x, info.y))
	7609	+ if (spot.contains(clickInfo.x, clickInfo.y))
7066	7610	{
7067	7611	hitSomething = hitRotate;
7068	7612	retval = true;
7069	7613	}
7070	7614	spot.translate(0, 32);
7071		- 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))
7072	7618	{
7073	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	+
7074	7648	retval = true;
7075	7649	}
7076	7650
..	..	@@ -7080,7 +7654,7 @@
7080	7654	}
7081	7655
7082	7656	//System.out.println("info.modifiers = " + info.modifiers);
7083		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7657	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7084	7658	//System.out.println("modified = " + modified);
7085	7659	//new Exception().printStackTrace();
7086	7660	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7108,7 +7682,8 @@
7108	7682	return true;
7109	7683	}
7110	7684
7111		- void doEditDrag0(ClickInfo info, boolean opposite)
	7685	+ void doEditDrag0(//ClickInfo info,
	7686	+ boolean opposite)
7112	7687	{
7113	7688	if (hitSomething == 0)
7114	7689	{
..	..	@@ -7122,7 +7697,7 @@
7122	7697
7123	7698	//System.out.println("hitSomething = " + hitSomething);
7124	7699
7125		- double scale = 0.005f * info.camera.Distance();
	7700	+ double scale = 0.005f * clickInfo.camera.Distance();
7126	7701
7127	7702	cVector xlate = new cVector();
7128	7703	//cVector xlate2 = new cVector();
..	..	@@ -7136,7 +7711,9 @@
7136	7711
7137	7712	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7138	7713
7139		- if (modified \|\| opposite)
	7714	+ // Modified could snap
	7715	+ if (//modified \|\|
	7716	+ opposite)
7140	7717	{
7141	7718	//assert(false);
7142	7719	/*
..	..	@@ -7156,8 +7733,8 @@
7156	7733	toParent[3][i] = xlate.get(i);
7157	7734	LA.matInvert(toParent, fromParent);
7158	7735	*/
7159		- cVector delta = LA.newVector(0, 0, startY - info.y);
7160		- 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);
7161	7738
7162	7739	LA.matCopy(startMat, toParent);
7163	7740	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7166,7 +7743,7 @@
7166	7743	} else
7167	7744	{
7168	7745	//LA.xformDir(delta, info.camera.fromScreen, delta);
7169		- cVector up = new cVector(info.camera.up);
	7746	+ cVector up = new cVector(clickInfo.camera.up);
7170	7747	cVector away = new cVector();
7171	7748	//cVector right2 = new cVector();
7172	7749	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7183,19 +7760,19 @@
7183	7760	LA.xformDir(up, ClickInfo.matbuffer, up);
7184	7761	// if (!CameraPane.LOCALTRANSFORM)
7185	7762	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7186		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7763	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7187	7764	// if (!CameraPane.LOCALTRANSFORM)
7188	7765	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7189	7766	//LA.vecCross(up, cVector.Z, right2);
7190	7767
7191		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7768	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7192	7769
7193	7770	//System.out.println("DELTA0 = " + delta);
7194	7771	//System.out.println("AWAY = " + info.camera.away);
7195	7772	//System.out.println("UP = " + info.camera.up);
7196	7773	if (away.z > 0)
7197	7774	{
7198		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7775	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7199	7776	{
7200	7777	delta.x = -delta.x;
7201	7778	} else
..	..	@@ -7210,7 +7787,7 @@
7210	7787	//System.out.println("DELTA1 = " + delta);
7211	7788	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7212	7789	//System.out.println("DELTA2 = " + delta);
7213		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7790	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7214	7791	LA.matCopy(startMat, toParent);
7215	7792	//System.out.println("DELTA3 = " + delta);
7216	7793	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7220,8 +7797,8 @@
7220	7797	break;
7221	7798
7222	7799	case hitRotate: // rotate
7223		- int dx = info.x - centerPt.x;
7224		- int dy = -(info.y - centerPt.y);
	7800	+ int dx = clickInfo.x - centerPt.x;
	7801	+ int dy = -(clickInfo.y - centerPt.y);
7225	7802	double angle = (double) Math.atan2(dx, dy);
7226	7803	angle = -(1.570796 - angle);
7227	7804
..	..	@@ -7230,7 +7807,7 @@
7230	7807
7231	7808	if (modified)
7232	7809	{
7233		- // Rotate 90 degrees
	7810	+ // Rotate 45 degrees
7234	7811	angle /= (Math.PI / 4);
7235	7812	angle = Math.floor(angle + 0.5);
7236	7813	angle *= (Math.PI / 4);
..	..	@@ -7244,7 +7821,7 @@
7244	7821	}
7245	7822	/**/
7246	7823
7247		- switch (info.pane.RenderCamera().viewCode)
	7824	+ switch (clickInfo.pane.RenderCamera().viewCode)
7248	7825	{
7249	7826	case 1: // '\001'
7250	7827	LA.matZRotate(toParent, angle);
..	..	@@ -7271,7 +7848,7 @@
7271	7848	break;
7272	7849
7273	7850	case hitScale: // scale
7274		- double hScale = (double) (info.x - centerPt.x) / 32;
	7851	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7275	7852	double sign = 1;
7276	7853	if (hScale < 0)
7277	7854	{
..	..	@@ -7283,7 +7860,7 @@
7283	7860	//hScale = 0.01;
7284	7861	}
7285	7862
7286		- double vScale = (double) (info.y - centerPt.y) / 32;
	7863	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7287	7864	sign = 1;
7288	7865	if (vScale < 0)
7289	7866	{
..	..	@@ -7294,6 +7871,7 @@
7294	7871	{
7295	7872	//vScale = 0.01;
7296	7873	}
	7874	+
7297	7875	LA.matCopy(startMat, toParent);
7298	7876	/**/
7299	7877	for (int i = 0; i < 3; i++)
..	..	@@ -7303,32 +7881,39 @@
7303	7881	}
7304	7882	/**/
7305	7883
7306		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7884	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7307	7885
7308	7886	if (totalScale < 0.01)
7309	7887	{
7310	7888	totalScale = 0.01;
7311	7889	}
7312	7890
7313		- switch (info.pane.RenderCamera().viewCode)
	7891	+ switch (clickInfo.pane.RenderCamera().viewCode)
7314	7892	{
7315	7893	case 3: // '\001'
7316		- if (modified)
	7894	+ if (modified \|\| opposite)
7317	7895	{
	7896	+ if (modified) // && opposite)
	7897	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7898	+ else
7318	7899	//LA.matScale(toParent, 1, hScale, vScale);
7319		- LA.matScale(toParent, totalScale, 1, 1);
	7900	+ LA.matScale(toParent, totalScale, 1, 1);
7320	7901	} // vScale, 1);
7321	7902	else
7322	7903	{
7323		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	7904	+ // EXCEPTION!
	7905	+ LA.matScale(toParent, 1, totalScale, totalScale);
7324	7906	} // vScale, 1);
7325	7907	break;
7326	7908
7327	7909	case 2: // '\002'
7328		- if (modified)
	7910	+ if (modified \|\| opposite)
7329	7911	{
7330		- //LA.matScale(toParent, hScale, 1, vScale);
7331		- 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);
7332	7917	} else
7333	7918	{
7334	7919	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7336,10 +7921,13 @@
7336	7921	break;
7337	7922
7338	7923	case 1: // '\003'
7339		- if (modified)
	7924	+ if (modified \|\| opposite)
7340	7925	{
7341		- //LA.matScale(toParent, hScale, vScale, 1);
7342		- 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);
7343	7931	} else
7344	7932	{
7345	7933	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7376,7 +7964,7 @@
7376	7964	} // NEW ...
7377	7965
7378	7966
7379		- info.pane.repaint();
	7967	+ clickInfo.pane.repaint();
7380	7968	}
7381	7969
7382	7970	boolean overflow = false;
..	..	@@ -7556,6 +8144,10 @@
7556	8144	editWindow = null;
7557	8145	} // ?
7558	8146	}
	8147	+ else
	8148	+ {
	8149	+ //editWindow.closeUI();
	8150	+ }
7559	8151	}
7560	8152
7561	8153	boolean root; // patch for edit windows
..	..	@@ -7567,7 +8159,7 @@
7567	8159	/transient/ cVector2[] projectedVertices = new cVector2[0];
7568	8160
7569	8161	Object3D /Composite/ parent;
7570		- Object3D /Composite/ fileparent;
	8162	+ Object3D /Composite/ fileparent; // In the case of FileObject
7571	8163
7572	8164	double[][] toParent; // dynamic matrix
7573	8165	double[][] fromParent;
..	..	@@ -7713,6 +8305,10 @@
7713	8305	}
7714	8306
7715	8307	transient ObjEditor editWindow;
	8308	+ transient ObjEditor manipWindow;
	8309	+
	8310	+ transient boolean pinned;
	8311	+
7716	8312	transient ObjectUI objectUI;
7717	8313	public static int povDepth = 0;
7718	8314	private static cVector tbMin = new cVector();