~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,201 @@
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++)
130		- {
131		- Object3D child = (Object3D) get(i);
132		- if (child == null)
133		- continue;
134		- blockloop = true;
135		- child.SaveSupports();
136		- blockloop = false;
137		- }
138		-}
139	153
140		-void RestoreSupports()
141		-{
142		- if (blockloop)
143		- return;
	154	+ void RestoreSupports()
	155	+ {
	156	+ if (blockloop)
	157	+ return;
144	158
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		- blockloop = true;
161		- child.RestoreSupports();
162		- blockloop = false;
163		- }
164		-}
	159	+ support = transientsupport;
	160	+ link2master = transientlink2master;
	161	+ transientsupport = null;
	162	+ transientlink2master = false;
165	163
166		-void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
167		-{
168		- if (hashtable.containsKey(GetUUID()))
	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)
169	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	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	276	+ {
	277	+ if (!hashtable.containsKey(GetUUID()))
	278	+ return;
	279	+
170	280	Object3D o = hashtable.get(GetUUID());
171	281
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		-}
	282	+ RestoreBigData(o);
205	283
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);
	284	+ if (blockloop)
	285	+ return;
	286	+
	287	+ blockloop = true;
	288	+
	289	+ //hashtable.remove(GetUUID());
	290	+
	291	+ for (int i=0; i<Size(); i++)
	292	+ {
	293	+ get(i).RestoreBigData(hashtable);
	294	+ }
	295	+
	296	+ blockloop = false;
224	297	}
225		-}
	298	+
	299	+ void RestoreBigData(Object3D o)
	300	+ {
	301	+ this.bRep = o.bRep;
	302	+ if (this.support != null && o.transientrep != null)
	303	+ {
	304	+ this.support.bRep = o.transientrep;
	305	+ }
	306	+
	307	+ this.selection = o.selection;
	308	+
	309	+ this.versionlist = o.versionlist;
	310	+ this.versionindex = o.versionindex;
	311	+// July 2019 if (this.bRep != null)
	312	+// this.bRep.support = o.transientrep;
	313	+ // this.support = o.support;
	314	+ // this.fileparent = o.fileparent;
	315	+ }
226	316
227	317	// MOCAP SUPPORT
228	318	double tx,ty,tz,rx,ry,rz;
..	..	@@ -365,6 +455,7 @@
365	455	}
366	456
367	457	boolean live = false;
	458	+ transient boolean keepdontselect;
368	459	boolean dontselect = false;
369	460	boolean hide = false;
370	461	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -547,12 +638,14 @@
547	638	toParent = LA.newMatrix();
548	639	fromParent = LA.newMatrix();
549	640	}
	641	+
550	642	if (toParentMarked == null)
551	643	{
552	644	if (maxcount != 1)
553	645	{
554	646	new Exception().printStackTrace();
555	647	}
	648	+
556	649	toParentMarked = LA.newMatrix();
557	650	fromParentMarked = LA.newMatrix();
558	651	}
..	..	@@ -863,7 +956,7 @@
863	956
864	957	if (marked && Globals.isLIVE() && live &&
865	958	//TEMP21aug2018
866		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	959	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
867	960	currentframe != Globals.framecount)
868	961	{
869	962	currentframe = Globals.framecount;
..	..	@@ -875,7 +968,8 @@
875	968
876	969	boolean changedir = random && Math.random() < 0.01; // && !link2master;
877	970
878		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	971	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	972	+ (step == 1 && changedir))
879	973	{
880	974	countdown = 1;
881	975	delay = speedup?8:1;
..	..	@@ -947,6 +1041,10 @@
947	1041	if (material == null \|\| material.multiply)
948	1042	return true;
949	1043
	1044	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1045	+ return false;
	1046	+
	1047	+ // Transparent objects are dynamic because we have to sort the triangles.
950	1048	return material.opacity > 0.99;
951	1049	}
952	1050
..	..	@@ -1347,6 +1445,7 @@
1347	1445	toParent = LA.newMatrix();
1348	1446	fromParent = LA.newMatrix();
1349	1447	}
	1448	+
1350	1449	LA.matCopy(other.toParent, toParent);
1351	1450	LA.matCopy(other.fromParent, fromParent);
1352	1451
..	..	@@ -2368,6 +2467,15 @@
2368	2467	}
2369	2468	*/
2370	2469	}
	2470	+ else
	2471	+ {
	2472	+ //((ObjEditor)editWindow).SetupUI2(null);
	2473	+ if (objectUI != null)
	2474	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2475	+ else
	2476	+ //new Exception().printStackTrace();
	2477	+ System.err.println("objectUI is null");
	2478	+ }
2371	2479	}
2372	2480
2373	2481	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2409,6 +2517,14 @@
2409	2517	{
2410	2518	editWindow.refreshContents();
2411	2519	}
	2520	+ else
	2521	+ {
	2522	+ if (manipWindow != null)
	2523	+ {
	2524	+ manipWindow.refreshContents();
	2525	+ }
	2526	+ }
	2527	+
2412	2528	//if (parent != null)
2413	2529	//parent.refreshEditWindow();
2414	2530	}
..	..	@@ -2488,7 +2604,8 @@
2488	2604	private static final int editSelf = 1;
2489	2605	private static final int editChild = 2;
2490	2606
2491		- void drawEditHandles(ClickInfo info, int level)
	2607	+ void drawEditHandles(//ClickInfo info,
	2608	+ int level)
2492	2609	{
2493	2610	if (level == 0)
2494	2611	{
..	..	@@ -2496,7 +2613,8 @@
2496	2613	return;
2497	2614
2498	2615	Object3D selectee;
2499		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2616	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2617	+ level + 1))
2500	2618	{
2501	2619	selectee = (Object3D) e.nextElement();
2502	2620	}
..	..	@@ -2504,19 +2622,22 @@
2504	2622	} else
2505	2623	{
2506	2624	//super.
2507		- drawEditHandles0(info, level + 1);
	2625	+ drawEditHandles0(//info,
	2626	+ level + 1);
2508	2627	}
2509	2628	}
2510	2629
2511		- boolean doEditClick(ClickInfo info, int level)
	2630	+ boolean doEditClick(//ClickInfo info,
	2631	+ int level)
2512	2632	{
2513	2633	doSomething = 0;
2514	2634	if (level == 0)
2515	2635	{
2516		- return doParentClick(info);
	2636	+ return doParentClick(); //info);
2517	2637	}
2518	2638	if (//super.
2519		- doEditClick0(info, level))
	2639	+ doEditClick0(//info,
	2640	+ level))
2520	2641	{
2521	2642	doSomething = 1;
2522	2643	return true;
..	..	@@ -2526,7 +2647,7 @@
2526	2647	}
2527	2648	}
2528	2649
2529		- boolean doParentClick(ClickInfo info)
	2650	+ boolean doParentClick() //ClickInfo info)
2530	2651	{
2531	2652	if (selection == null)
2532	2653	{
..	..	@@ -2539,7 +2660,8 @@
2539	2660	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2540	2661	{
2541	2662	Object3D selectee = (Object3D) e.nextElement();
2542		- if (selectee.doEditClick(info, 1))
	2663	+ if (selectee.doEditClick(//info,
	2664	+ 1))
2543	2665	{
2544	2666	childToDrag = selectee;
2545	2667	doSomething = 2;
..	..	@@ -2551,13 +2673,15 @@
2551	2673	return retval;
2552	2674	}
2553	2675
2554		- void doEditDrag(ClickInfo info, boolean opposite)
	2676	+ void doEditDrag(//ClickInfo clickInfo,
	2677	+ boolean opposite)
2555	2678	{
2556	2679	switch (doSomething)
2557	2680	{
2558	2681	case 1: // '\001'
2559	2682	//super.
2560		- doEditDrag0(info, opposite);
	2683	+ doEditDrag0(//clickInfo,
	2684	+ opposite);
2561	2685	break;
2562	2686
2563	2687	case 2: // '\002'
..	..	@@ -2570,11 +2694,13 @@
2570	2694	{
2571	2695	//sel.hitSomething = childToDrag.hitSomething;
2572	2696	//childToDrag.doEditDrag(info);
2573		- sel.doEditDrag(info, opposite);
	2697	+ sel.doEditDrag(//clickInfo,
	2698	+ opposite);
2574	2699	} else
2575	2700	{
2576	2701	//super.
2577		- doEditDrag0(info, opposite);
	2702	+ doEditDrag0(//clickInfo,
	2703	+ opposite);
2578	2704	}
2579	2705	}
2580	2706	break;
..	..	@@ -2592,6 +2718,9 @@
2592	2718	{
2593	2719	deselectAll();
2594	2720	}
	2721	+
	2722	+ new Exception().printStackTrace();
	2723	+
2595	2724	ClickInfo newInfo = new ClickInfo();
2596	2725	newInfo.flags = info.flags;
2597	2726	newInfo.bounds = info.bounds;
..	..	@@ -2684,6 +2813,18 @@
2684	2813	void GenNormalsS(boolean crease)
2685	2814	{
2686	2815	selection.GenNormals(crease);
	2816	+// for (int i=0; i<selection.size(); i++)
	2817	+// {
	2818	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2819	+// selectee.GenNormals(crease);
	2820	+// }
	2821	+
	2822	+ //Touch();
	2823	+ }
	2824	+
	2825	+ void GenNormalsMeshS()
	2826	+ {
	2827	+ selection.GenNormalsMesh();
2687	2828	// for (int i=0; i<selection.size(); i++)
2688	2829	// {
2689	2830	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2824,6 +2965,24 @@
2824	2965	if (child == null)
2825	2966	continue;
2826	2967	child.GenNormals(crease);
	2968	+// Children().release(i);
	2969	+ }
	2970	+ blockloop = false;
	2971	+ }
	2972	+
	2973	+ void GenNormalsMesh()
	2974	+ {
	2975	+ if (blockloop)
	2976	+ return;
	2977	+
	2978	+ blockloop = true;
	2979	+ GenNormalsMesh0();
	2980	+ for (int i = 0; i < Children().Size(); i++)
	2981	+ {
	2982	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2983	+ if (child == null)
	2984	+ continue;
	2985	+ child.GenNormalsMesh();
2827	2986	// Children().release(i);
2828	2987	}
2829	2988	blockloop = false;
..	..	@@ -2996,11 +3155,20 @@
2996	3155	}
2997	3156	}
2998	3157
	3158	+ void GenNormalsMesh0()
	3159	+ {
	3160	+ if (bRep != null)
	3161	+ {
	3162	+ bRep.GenerateNormalsMesh();
	3163	+ Touch();
	3164	+ }
	3165	+ }
	3166	+
2999	3167	void GenNormalsMINE0()
3000	3168	{
3001	3169	if (bRep != null)
3002	3170	{
3003		- bRep.GenerateNormalsMINE();
	3171	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
3004	3172	Touch();
3005	3173	}
3006	3174	}
..	..	@@ -3446,7 +3614,8 @@
3446	3614	if (blockloop)
3447	3615	return;
3448	3616
3449		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3617	+ if (//marked \|\| // does not make sense
	3618	+ (bRep != null \|\| material != null)) // borderline...
3450	3619	live = h;
3451	3620
3452	3621	for (int i = 0; i < Size(); i++)
..	..	@@ -3467,7 +3636,8 @@
3467	3636	return;
3468	3637
3469	3638	//if (bRep != null)
3470		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3639	+ if (//marked \|\| // does not make sense
	3640	+ (bRep != null \|\| material != null)) // borderline...
3471	3641	link2master = h;
3472	3642
3473	3643	for (int i = 0; i < Size(); i++)
..	..	@@ -3487,7 +3657,8 @@
3487	3657	if (blockloop)
3488	3658	return;
3489	3659
3490		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3660	+ if (//marked \|\| // does not make sense
	3661	+ (bRep != null \|\| material != null)) // borderline...
3491	3662	hide = h;
3492	3663
3493	3664	for (int i = 0; i < Size(); i++)
..	..	@@ -3507,7 +3678,7 @@
3507	3678	if (blockloop)
3508	3679	return;
3509	3680
3510		- if (bRep != null && material != null) // borderline...
	3681	+ if (bRep != null \|\| material != null) // borderline...
3511	3682	marked = h;
3512	3683
3513	3684	for (int i = 0; i < Size(); i++)
..	..	@@ -3517,6 +3688,46 @@
3517	3688	continue;
3518	3689	blockloop = true;
3519	3690	child.MarkLeaves(h);
	3691	+ blockloop = false;
	3692	+ // release(i);
	3693	+ }
	3694	+ }
	3695	+
	3696	+ void RewindLeaves(boolean h)
	3697	+ {
	3698	+ if (blockloop)
	3699	+ return;
	3700	+
	3701	+ if (bRep != null \|\| material != null) // borderline...
	3702	+ rewind = h;
	3703	+
	3704	+ for (int i = 0; i < Size(); i++)
	3705	+ {
	3706	+ Object3D child = (Object3D) get(i); // reserve(i);
	3707	+ if (child == null)
	3708	+ continue;
	3709	+ blockloop = true;
	3710	+ child.RewindLeaves(h);
	3711	+ blockloop = false;
	3712	+ // release(i);
	3713	+ }
	3714	+ }
	3715	+
	3716	+ void RandomLeaves(boolean h)
	3717	+ {
	3718	+ if (blockloop)
	3719	+ return;
	3720	+
	3721	+ if (bRep != null \|\| material != null) // borderline...
	3722	+ random = h;
	3723	+
	3724	+ for (int i = 0; i < Size(); i++)
	3725	+ {
	3726	+ Object3D child = (Object3D) get(i); // reserve(i);
	3727	+ if (child == null)
	3728	+ continue;
	3729	+ blockloop = true;
	3730	+ child.RandomLeaves(h);
3520	3731	blockloop = false;
3521	3732	// release(i);
3522	3733	}
..	..	@@ -4294,6 +4505,55 @@
4294	4505	}
4295	4506	}
4296	4507
	4508	+ void RepairSOV()
	4509	+ {
	4510	+ if (blockloop)
	4511	+ return;
	4512	+
	4513	+ String texname = this.GetPigmentTexture();
	4514	+
	4515	+ if (texname.startsWith("sov"))
	4516	+ {
	4517	+ String[] s = texname.split("/");
	4518	+
	4519	+ String[] sname = s[1].split("Color.pn");
	4520	+
	4521	+ texname = sname[0];
	4522	+
	4523	+ if (sname.length > 1)
	4524	+ {
	4525	+ texname += "Color.jpg";
	4526	+ }
	4527	+
	4528	+ this.SetPigmentTexture("sov/" + texname);
	4529	+ }
	4530	+
	4531	+ texname = this.GetBumpTexture();
	4532	+
	4533	+ if (texname.startsWith("sov"))
	4534	+ {
	4535	+ String[] s = texname.split("/");
	4536	+
	4537	+ String[] sname = s[1].split("Bump.pn");
	4538	+
	4539	+ texname = sname[0];
	4540	+
	4541	+ if (sname.length > 1)
	4542	+ {
	4543	+ texname += "Bump.jpg";
	4544	+ }
	4545	+
	4546	+ this.SetBumpTexture("sov/" + texname);
	4547	+ }
	4548	+
	4549	+ for (int i=0; i<Size(); i++)
	4550	+ {
	4551	+ blockloop = true;
	4552	+ get(i).RepairSOV();
	4553	+ blockloop = false;
	4554	+ }
	4555	+ }
	4556	+
4297	4557	void RepairTexture()
4298	4558	{
4299	4559	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4808,6 +5068,14 @@
4808	5068	}
4809	5069	}
4810	5070
	5071	+ ObjEditor GetWindow()
	5072	+ {
	5073	+ if (editWindow != null)
	5074	+ return editWindow;
	5075	+
	5076	+ return manipWindow;
	5077	+ }
	5078	+
4811	5079	cTreePath Select(int indexcount, boolean deselect)
4812	5080	{
4813	5081	if (hide \|\| dontselect)
..	..	@@ -4844,10 +5112,11 @@
4844	5112	if (leaf != null)
4845	5113	{
4846	5114	cTreePath tp = new cTreePath(this, leaf);
4847		- if (editWindow != null)
	5115	+ ObjEditor window = GetWindow();
	5116	+ if (window != null)
4848	5117	{
4849	5118	//System.out.println("editWindow = " + editWindow + " vs " + this);
4850		- editWindow.Select(tp, deselect, true);
	5119	+ window.Select(tp, deselect, true);
4851	5120	}
4852	5121
4853	5122	return tp;
..	..	@@ -4864,6 +5133,7 @@
4864	5133
4865	5134	if (child == null)
4866	5135	continue;
	5136	+
4867	5137	if (child.HasTransparency() && child.size() != 0)
4868	5138	{
4869	5139	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4873,9 +5143,10 @@
4873	5143	if (leaf != null)
4874	5144	{
4875	5145	cTreePath tp = new cTreePath(this, leaf);
4876		- if (editWindow != null)
	5146	+ ObjEditor window = GetWindow();
	5147	+ if (window != null)
4877	5148	{
4878		- editWindow.Select(tp, deselect, true);
	5149	+ window.Select(tp, deselect, true);
4879	5150	}
4880	5151
4881	5152	return tp;
..	..	@@ -5200,6 +5471,51 @@
5200	5471	blockloop = false;
5201	5472	}
5202	5473
	5474	+ void ResetSelectable()
	5475	+ {
	5476	+ if (blockloop)
	5477	+ return;
	5478	+
	5479	+ blockloop = true;
	5480	+
	5481	+ keepdontselect = dontselect;
	5482	+ dontselect = true;
	5483	+
	5484	+ Object3D child;
	5485	+ int nb = Size();
	5486	+ for (int i = 0; i < nb; i++)
	5487	+ {
	5488	+ child = (Object3D) get(i);
	5489	+ if (child == null)
	5490	+ continue;
	5491	+ child.ResetSelectable();
	5492	+ }
	5493	+
	5494	+ blockloop = false;
	5495	+ }
	5496	+
	5497	+ void RestoreSelectable()
	5498	+ {
	5499	+ if (blockloop)
	5500	+ return;
	5501	+
	5502	+ blockloop = true;
	5503	+
	5504	+ dontselect = keepdontselect;
	5505	+
	5506	+ Object3D child;
	5507	+ int nb = Size();
	5508	+ for (int i = 0; i < nb; i++)
	5509	+ {
	5510	+ child = (Object3D) get(i);
	5511	+ if (child == null)
	5512	+ continue;
	5513	+ child.RestoreSelectable();
	5514	+ }
	5515	+
	5516	+ blockloop = false;
	5517	+ }
	5518	+
5203	5519	boolean IsSelected()
5204	5520	{
5205	5521	if (parent == null)
..	..	@@ -5260,6 +5576,11 @@
5260	5576	if (fullname == null)
5261	5577	return "";
5262	5578
	5579	+ if (fullname.pigment != null)
	5580	+ {
	5581	+ return fullname.pigment;
	5582	+ }
	5583	+
5263	5584	// System.out.println("Fullname = " + fullname);
5264	5585
5265	5586	// Does not work on Windows due to C:
..	..	@@ -5272,7 +5593,7 @@
5272	5593
5273	5594	if (split.length == 0)
5274	5595	{
5275		- return "";
	5596	+ return fullname.pigment = "";
5276	5597	}
5277	5598
5278	5599	if (split.length <= 2)
..	..	@@ -5280,22 +5601,27 @@
5280	5601	if (fullname.name.endsWith(":"))
5281	5602	{
5282	5603	// Windows
5283		- return fullname.name.substring(0, fullname.name.length()-1);
	5604	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
5284	5605	}
5285	5606
5286		- return split[0];
	5607	+ return fullname.pigment = split[0];
5287	5608	}
5288	5609
5289	5610	// Windows
5290	5611	assert(split.length == 4);
5291	5612
5292		- return split[0] + ":" + split[1];
	5613	+ return fullname.pigment = split[0] + ":" + split[1];
5293	5614	}
5294	5615
5295	5616	static String GetBump(cTexture fullname)
5296	5617	{
5297	5618	if (fullname == null)
5298	5619	return "";
	5620	+
	5621	+ if (fullname.bump != null)
	5622	+ {
	5623	+ return fullname.bump;
	5624	+ }
5299	5625
5300	5626	// System.out.println("Fullname = " + fullname);
5301	5627	// Does not work on Windows due to C:
..	..	@@ -5307,12 +5633,12 @@
5307	5633
5308	5634	if (split.length == 0)
5309	5635	{
5310		- return "";
	5636	+ return fullname.bump = "";
5311	5637	}
5312	5638
5313	5639	if (split.length == 1)
5314	5640	{
5315		- return "";
	5641	+ return fullname.bump = "";
5316	5642	}
5317	5643
5318	5644	if (split.length == 2)
..	..	@@ -5320,16 +5646,16 @@
5320	5646	if (fullname.name.endsWith(":"))
5321	5647	{
5322	5648	// Windows
5323		- return "";
	5649	+ return fullname.bump = "";
5324	5650	}
5325	5651
5326		- return split[1];
	5652	+ return fullname.bump = split[1];
5327	5653	}
5328	5654
5329	5655	// Windows
5330	5656	assert(split.length == 4);
5331	5657
5332		- return split[2] + ":" + split[3];
	5658	+ return fullname.bump = split[2] + ":" + split[3];
5333	5659	}
5334	5660
5335	5661	String GetPigmentTexture()
..	..	@@ -5412,6 +5738,9 @@
5412	5738	texname = "";
5413	5739
5414	5740	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5741	+
	5742	+ GetTextures().pigment = null;
	5743	+
5415	5744	Touch();
5416	5745	}
5417	5746
..	..	@@ -5485,6 +5814,8 @@
5485	5814
5486	5815	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
5487	5816
	5817	+ GetTextures().bump = null;
	5818	+
5488	5819	Touch();
5489	5820	}
5490	5821
..	..	@@ -5509,6 +5840,38 @@
5509	5840	}
5510	5841	}
5511	5842
	5843	+ void EmbedTextures(boolean embed)
	5844	+ {
	5845	+ if (blockloop)
	5846	+ return;
	5847	+
	5848	+ //if (GetTextures() != null)
	5849	+ if (embed)
	5850	+ CameraPane.EmbedTextures(GetTextures());
	5851	+ else
	5852	+ {
	5853	+ GetTextures().pigmentdata = null;
	5854	+ GetTextures().bumpdata = null;
	5855	+ GetTextures().pw = 0;
	5856	+ GetTextures().ph = 0;
	5857	+ GetTextures().bw = 0;
	5858	+ GetTextures().bh = 0;
	5859	+ }
	5860	+
	5861	+ int nb = Size();
	5862	+ for (int i = 0; i < nb; i++)
	5863	+ {
	5864	+ Object3D child = (Object3D) get(i);
	5865	+
	5866	+ if (child == null)
	5867	+ continue;
	5868	+
	5869	+ blockloop = true;
	5870	+ child.EmbedTextures(embed);
	5871	+ blockloop = false;
	5872	+ }
	5873	+ }
	5874	+
5512	5875	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5513	5876	{
5514	5877	Draw(display, root, selected, blocked);
..	..	@@ -5517,12 +5880,23 @@
5517	5880	boolean NeedSupport()
5518	5881	{
5519	5882	return
5520		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
	5883	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5521	5884	// PROBLEM with CROWD!!
5522	5885	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5523	5886	}
5524	5887
5525	5888	static boolean DEBUG_SELECTION = false;
	5889	+
	5890	+ boolean IsLive()
	5891	+ {
	5892	+ if (live)
	5893	+ return true;
	5894	+
	5895	+ if (parent == null)
	5896	+ return false;
	5897	+
	5898	+ return parent.IsLive();
	5899	+ }
5526	5900
5527	5901	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5528	5902	{
..	..	@@ -5584,8 +5958,10 @@
5584	5958	if (support != null)
5585	5959	support = support;
5586	5960
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);
	5961	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5962	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5963	+
	5964	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5589	5965
5590	5966	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5591	5967	{
..	..	@@ -5595,8 +5971,9 @@
5595	5971	// usecalllists &= !(parent instanceof RandomNode);
5596	5972	// usecalllists = false;
5597	5973
5598		- if (GetBRep() != null)
5599		- usecalllists = usecalllists;
	5974	+ if (display.DrawMode() == display.SHADOW)
	5975	+ //GetBRep() != null)
	5976	+ usecalllists = !!usecalllists;
5600	5977	//System.out.println("draw " + this);
5601	5978	//new Exception().printStackTrace();
5602	5979
..	..	@@ -5605,10 +5982,12 @@
5605	5982	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5606	5983
5607	5984	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5608		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5985	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5986	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5609	5987	{
5610	5988	Globals.lighttouched = true;
5611	5989	} // all panes...
	5990	+
5612	5991	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5613	5992	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5614	5993	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5616,7 +5995,7 @@
5616	5995	if (!(this instanceof Composite))
5617	5996	touched = false;
5618	5997	//if (displaylist == -1 && usecalllists)
5619		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5998	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5620	5999	{
5621	6000	bRep.displaylist = display.GenList();
5622	6001	assert(bRep.displaylist != 0);
..	..	@@ -5627,7 +6006,7 @@
5627	6006
5628	6007	//System.out.println("\tnew list " + list);
5629	6008	//gl.glDrawBuffer(gl.GL_NONE);
5630		- if (usecalllists)
	6009	+ if (usecalllists && bRep.displaylist > 0)
5631	6010	{
5632	6011	// System.err.println("new list " + bRep.displaylist + " for " + this);
5633	6012	display.NewList(bRep.displaylist);
..	..	@@ -5636,7 +6015,7 @@
5636	6015	CallList(display, root, selected, blocked);
5637	6016
5638	6017	// compiled = true;
5639		- if (usecalllists)
	6018	+ if (usecalllists && bRep.displaylist > 0)
5640	6019	{
5641	6020	// System.err.println("end list " + bRep.displaylist + " for " + this);
5642	6021	display.EndList();
..	..	@@ -5736,6 +6115,7 @@
5736	6115	if (GetBRep() != null)
5737	6116	{
5738	6117	display.NextIndex();
	6118	+
5739	6119	// vertex color conflict : gl.glCallList(list);
5740	6120	DrawNode(display, root, selected);
5741	6121	if (this instanceof BezierPatch)
..	..	@@ -5776,16 +6156,27 @@
5776	6156	tex = GetTextures();
5777	6157	}
5778	6158
5779		- boolean failed = false;
	6159	+ boolean failedPigment = false;
	6160	+ boolean failedBump = false;
5780	6161
5781	6162	try
5782	6163	{
5783		- display.BindTextures(tex, texres);
	6164	+ display.BindPigmentTexture(tex, texres);
5784	6165	}
5785	6166	catch (Exception e)
5786	6167	{
5787	6168	System.err.println("FAILED: " + this);
5788		- failed = true;
	6169	+ failedPigment = true;
	6170	+ }
	6171	+
	6172	+ try
	6173	+ {
	6174	+ display.BindBumpTexture(tex, texres);
	6175	+ }
	6176	+ catch (Exception e)
	6177	+ {
	6178	+ //System.err.println("FAILED: " + this);
	6179	+ failedBump = true;
5789	6180	}
5790	6181
5791	6182	if (!compiled)
..	..	@@ -5808,8 +6199,11 @@
5808	6199	}
5809	6200	}
5810	6201
5811		- if (!failed)
5812		- display.ReleaseTextures(tex);
	6202	+ if (!failedBump)
	6203	+ display.ReleaseBumpTexture(tex);
	6204	+
	6205	+ if (!failedPigment)
	6206	+ display.ReleasePigmentTexture(tex);
5813	6207
5814	6208	display.PopMaterial(this, selected);
5815	6209	}
..	..	@@ -6182,6 +6576,11 @@
6182	6576	// dec 2012
6183	6577	new Exception().printStackTrace();
6184	6578	return;
	6579	+ }
	6580	+
	6581	+ if (dontselect)
	6582	+ {
	6583	+ //bRep.GenerateNormalsMINE();
6185	6584	}
6186	6585
6187	6586	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6967,20 +7366,23 @@
6967	7366	}
6968	7367	}
6969	7368
6970		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7369	+ static ClickInfo clickInfo = new ClickInfo();
	7370	+
	7371	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7372	+ Point outPt, Rectangle outRec)
6971	7373	{
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;
	7374	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7375	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7376	+ double[][] toscreen = clickInfo.toScreen;
6975	7377	if (toscreen == null)
6976	7378	{
6977		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7379	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6978	7380	}
6979	7381	cVector vec = in;
6980	7382	LA.xformPos(in, toscreen, in);
6981	7383	//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();
	7384	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7385	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6984	7386	outPt.x = hc + (int) vec.x;
6985	7387	outPt.y = vc - (int) vec.y;
6986	7388	outRec.x = outPt.x - 3;
..	..	@@ -6988,15 +7390,18 @@
6988	7390	outRec.width = outRec.height = 6;
6989	7391	}
6990	7392
6991		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7393	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7394	+ )
6992	7395	{
6993	7396	Point pt = new Point(0, 0);
6994	7397	Rectangle rec = new Rectangle();
6995		- calcHotSpot(in, info, pt, rec);
	7398	+ calcHotSpot(in, //clickInfo,
	7399	+ pt, rec);
6996	7400	return rec;
6997	7401	}
6998	7402
6999		- void drawEditHandles0(ClickInfo info, int level)
	7403	+ void drawEditHandles0(//ClickInfo clickInfo,
	7404	+ int level)
7000	7405	{
7001	7406	if (level == 0)
7002	7407	{
..	..	@@ -7005,16 +7410,19 @@
7005	7410	{
7006	7411	cVector origin = new cVector();
7007	7412	//LA.xformPos(origin, toParent, origin);
7008		- Rectangle spot = calcHotSpot(origin, info);
	7413	+ if (this.clickInfo == null)
	7414	+ this.clickInfo = new ClickInfo();
	7415	+
	7416	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7009	7417	Rectangle boundary = new Rectangle();
7010	7418	boundary.x = spot.x - 30;
7011	7419	boundary.y = spot.y - 30;
7012	7420	boundary.width = spot.width + 60;
7013	7421	boundary.height = spot.height + 60;
7014		- info.g.setColor(Color.red);
	7422	+ clickInfo.g.setColor(Color.white);
7015	7423	int spotw = spot.x + spot.width;
7016	7424	int spoth = spot.y + spot.height;
7017		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7425	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7018	7426	// if (CameraPane.Xmin > spot.x)
7019	7427	// {
7020	7428	// CameraPane.Xmin = spot.x;
..	..	@@ -7031,11 +7439,33 @@
7031	7439	// {
7032	7440	// CameraPane.Ymax = spoth;
7033	7441	// }
7034		- spot.translate(32, 32);
	7442	+// if (CameraPane.Xmin > spot.x)
	7443	+// {
	7444	+// CameraPane.Xmin = spot.x;
	7445	+// }
	7446	+// if (CameraPane.Xmax < spotw)
	7447	+// {
	7448	+// CameraPane.Xmax = spotw;
	7449	+// }
	7450	+// if (CameraPane.Ymin > spot.y)
	7451	+// {
	7452	+// CameraPane.Ymin = spot.y;
	7453	+// }
	7454	+// if (CameraPane.Ymax < spoth)
	7455	+// {
	7456	+// CameraPane.Ymax = spoth;
	7457	+// }
	7458	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7459	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
	7460	+ spot.translate(32, 0);
	7461	+ clickInfo.g.setColor(Color.yellow);
	7462	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7463	+
	7464	+ spot.translate(32, 64);
7035	7465	spotw = spot.x + spot.width;
7036	7466	spoth = spot.y + spot.height;
7037		- info.g.setColor(Color.blue);
7038		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7467	+ clickInfo.g.setColor(Color.cyan);
	7468	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7039	7469	// if (CameraPane.Xmin > spot.x)
7040	7470	// {
7041	7471	// CameraPane.Xmin = spot.x;
..	..	@@ -7052,29 +7482,9 @@
7052	7482	// {
7053	7483	// CameraPane.Ymax = spoth;
7054	7484	// }
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);
	7485	+ clickInfo.g.setColor(Color.green);
	7486	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7487	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7078	7488	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7079	7489	// if (CameraPane.Xmin > boundary.x)
7080	7490	// {
..	..	@@ -7096,7 +7506,8 @@
7096	7506	}
7097	7507	}
7098	7508
7099		- boolean doEditClick0(ClickInfo info, int level)
	7509	+ boolean doEditClick0(//ClickInfo clickInfo,
	7510	+ int level)
7100	7511	{
7101	7512	if (level == 0)
7102	7513	{
..	..	@@ -7105,8 +7516,8 @@
7105	7516
7106	7517	boolean retval = false;
7107	7518
7108		- startX = info.x;
7109		- startY = info.y;
	7519	+ startX = clickInfo.x;
	7520	+ startY = clickInfo.y;
7110	7521
7111	7522	hitSomething = -1;
7112	7523	cVector origin = new cVector();
..	..	@@ -7116,22 +7527,53 @@
7116	7527	{
7117	7528	centerPt = new Point(0, 0);
7118	7529	}
7119		- calcHotSpot(origin, info, centerPt, spot);
7120		- if (spot.contains(info.x, info.y))
	7530	+ calcHotSpot(origin, //info,
	7531	+ centerPt, spot);
	7532	+ if (spot.contains(clickInfo.x, clickInfo.y))
7121	7533	{
7122	7534	hitSomething = hitCenter;
7123	7535	retval = true;
7124	7536	}
7125	7537	spot.translate(32, 0);
7126		- if (spot.contains(info.x, info.y))
	7538	+ if (spot.contains(clickInfo.x, clickInfo.y))
7127	7539	{
7128	7540	hitSomething = hitRotate;
7129	7541	retval = true;
7130	7542	}
7131	7543	spot.translate(0, 32);
7132		- if (spot.contains(info.x, info.y))
	7544	+ spot.translate(32, 0);
	7545	+ spot.translate(0, 32);
	7546	+ if (spot.contains(clickInfo.x, clickInfo.y))
7133	7547	{
7134	7548	hitSomething = hitScale;
	7549	+
	7550	+ double scale = 0.005f * clickInfo.camera.Distance();
	7551	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7552	+ double sign = 1;
	7553	+ if (hScale < 0)
	7554	+ {
	7555	+ sign = -1;
	7556	+ }
	7557	+ hScale = signMath.pow(signhScale, scale * 50);
	7558	+ if (hScale < 0.01)
	7559	+ {
	7560	+ //hScale = 0.01;
	7561	+ }
	7562	+
	7563	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7564	+ sign = 1;
	7565	+ if (vScale < 0)
	7566	+ {
	7567	+ sign = -1;
	7568	+ }
	7569	+ vScale = signMath.pow(signvScale, scale * 50);
	7570	+ if (vScale < 0.01)
	7571	+ {
	7572	+ //vScale = 0.01;
	7573	+ }
	7574	+
	7575	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7576	+
7135	7577	retval = true;
7136	7578	}
7137	7579
..	..	@@ -7141,7 +7583,7 @@
7141	7583	}
7142	7584
7143	7585	//System.out.println("info.modifiers = " + info.modifiers);
7144		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7586	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7145	7587	//System.out.println("modified = " + modified);
7146	7588	//new Exception().printStackTrace();
7147	7589	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7169,7 +7611,8 @@
7169	7611	return true;
7170	7612	}
7171	7613
7172		- void doEditDrag0(ClickInfo info, boolean opposite)
	7614	+ void doEditDrag0(//ClickInfo info,
	7615	+ boolean opposite)
7173	7616	{
7174	7617	if (hitSomething == 0)
7175	7618	{
..	..	@@ -7183,7 +7626,7 @@
7183	7626
7184	7627	//System.out.println("hitSomething = " + hitSomething);
7185	7628
7186		- double scale = 0.005f * info.camera.Distance();
	7629	+ double scale = 0.005f * clickInfo.camera.Distance();
7187	7630
7188	7631	cVector xlate = new cVector();
7189	7632	//cVector xlate2 = new cVector();
..	..	@@ -7217,8 +7660,8 @@
7217	7660	toParent[3][i] = xlate.get(i);
7218	7661	LA.matInvert(toParent, fromParent);
7219	7662	*/
7220		- cVector delta = LA.newVector(0, 0, startY - info.y);
7221		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7663	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7664	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7222	7665
7223	7666	LA.matCopy(startMat, toParent);
7224	7667	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7227,7 +7670,7 @@
7227	7670	} else
7228	7671	{
7229	7672	//LA.xformDir(delta, info.camera.fromScreen, delta);
7230		- cVector up = new cVector(info.camera.up);
	7673	+ cVector up = new cVector(clickInfo.camera.up);
7231	7674	cVector away = new cVector();
7232	7675	//cVector right2 = new cVector();
7233	7676	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7244,19 +7687,19 @@
7244	7687	LA.xformDir(up, ClickInfo.matbuffer, up);
7245	7688	// if (!CameraPane.LOCALTRANSFORM)
7246	7689	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7247		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7690	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7248	7691	// if (!CameraPane.LOCALTRANSFORM)
7249	7692	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7250	7693	//LA.vecCross(up, cVector.Z, right2);
7251	7694
7252		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7695	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7253	7696
7254	7697	//System.out.println("DELTA0 = " + delta);
7255	7698	//System.out.println("AWAY = " + info.camera.away);
7256	7699	//System.out.println("UP = " + info.camera.up);
7257	7700	if (away.z > 0)
7258	7701	{
7259		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7702	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7260	7703	{
7261	7704	delta.x = -delta.x;
7262	7705	} else
..	..	@@ -7271,7 +7714,7 @@
7271	7714	//System.out.println("DELTA1 = " + delta);
7272	7715	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7273	7716	//System.out.println("DELTA2 = " + delta);
7274		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7717	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7275	7718	LA.matCopy(startMat, toParent);
7276	7719	//System.out.println("DELTA3 = " + delta);
7277	7720	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7281,8 +7724,8 @@
7281	7724	break;
7282	7725
7283	7726	case hitRotate: // rotate
7284		- int dx = info.x - centerPt.x;
7285		- int dy = -(info.y - centerPt.y);
	7727	+ int dx = clickInfo.x - centerPt.x;
	7728	+ int dy = -(clickInfo.y - centerPt.y);
7286	7729	double angle = (double) Math.atan2(dx, dy);
7287	7730	angle = -(1.570796 - angle);
7288	7731
..	..	@@ -7305,7 +7748,7 @@
7305	7748	}
7306	7749	/**/
7307	7750
7308		- switch (info.pane.RenderCamera().viewCode)
	7751	+ switch (clickInfo.pane.RenderCamera().viewCode)
7309	7752	{
7310	7753	case 1: // '\001'
7311	7754	LA.matZRotate(toParent, angle);
..	..	@@ -7332,7 +7775,7 @@
7332	7775	break;
7333	7776
7334	7777	case hitScale: // scale
7335		- double hScale = (double) (info.x - centerPt.x) / 32;
	7778	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7336	7779	double sign = 1;
7337	7780	if (hScale < 0)
7338	7781	{
..	..	@@ -7344,7 +7787,7 @@
7344	7787	//hScale = 0.01;
7345	7788	}
7346	7789
7347		- double vScale = (double) (info.y - centerPt.y) / 32;
	7790	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7348	7791	sign = 1;
7349	7792	if (vScale < 0)
7350	7793	{
..	..	@@ -7355,6 +7798,7 @@
7355	7798	{
7356	7799	//vScale = 0.01;
7357	7800	}
	7801	+
7358	7802	LA.matCopy(startMat, toParent);
7359	7803	/**/
7360	7804	for (int i = 0; i < 3; i++)
..	..	@@ -7364,32 +7808,39 @@
7364	7808	}
7365	7809	/**/
7366	7810
7367		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7811	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7368	7812
7369	7813	if (totalScale < 0.01)
7370	7814	{
7371	7815	totalScale = 0.01;
7372	7816	}
7373	7817
7374		- switch (info.pane.RenderCamera().viewCode)
	7818	+ switch (clickInfo.pane.RenderCamera().viewCode)
7375	7819	{
7376	7820	case 3: // '\001'
7377		- if (modified)
	7821	+ if (modified \|\| opposite)
7378	7822	{
	7823	+ if (modified && opposite)
	7824	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7825	+ else
7379	7826	//LA.matScale(toParent, 1, hScale, vScale);
7380		- LA.matScale(toParent, totalScale, 1, 1);
	7827	+ LA.matScale(toParent, totalScale, 1, 1);
7381	7828	} // vScale, 1);
7382	7829	else
7383	7830	{
7384		- LA.matScale(toParent, totalScale, totalScale, totalScale);
	7831	+ // EXCEPTION!
	7832	+ LA.matScale(toParent, 1, totalScale, totalScale);
7385	7833	} // vScale, 1);
7386	7834	break;
7387	7835
7388	7836	case 2: // '\002'
7389		- if (modified)
	7837	+ if (modified \|\| opposite)
7390	7838	{
7391		- //LA.matScale(toParent, hScale, 1, vScale);
7392		- LA.matScale(toParent, 1, totalScale, 1);
	7839	+ if (modified && opposite)
	7840	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7841	+ else
	7842	+ //LA.matScale(toParent, hScale, 1, vScale);
	7843	+ LA.matScale(toParent, 1, totalScale, 1);
7393	7844	} else
7394	7845	{
7395	7846	LA.matScale(toParent, totalScale, 1, totalScale);
..	..	@@ -7397,10 +7848,13 @@
7397	7848	break;
7398	7849
7399	7850	case 1: // '\003'
7400		- if (modified)
	7851	+ if (modified \|\| opposite)
7401	7852	{
7402		- //LA.matScale(toParent, hScale, vScale, 1);
7403		- LA.matScale(toParent, 1, 1, totalScale);
	7853	+ if (modified && opposite)
	7854	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7855	+ else
	7856	+ //LA.matScale(toParent, hScale, vScale, 1);
	7857	+ LA.matScale(toParent, 1, 1, totalScale);
7404	7858	} else
7405	7859	{
7406	7860	LA.matScale(toParent, totalScale, totalScale, 1);
..	..	@@ -7437,7 +7891,7 @@
7437	7891	} // NEW ...
7438	7892
7439	7893
7440		- info.pane.repaint();
	7894	+ clickInfo.pane.repaint();
7441	7895	}
7442	7896
7443	7897	boolean overflow = false;
..	..	@@ -7617,6 +8071,10 @@
7617	8071	editWindow = null;
7618	8072	} // ?
7619	8073	}
	8074	+ else
	8075	+ {
	8076	+ //editWindow.closeUI();
	8077	+ }
7620	8078	}
7621	8079
7622	8080	boolean root; // patch for edit windows
..	..	@@ -7774,6 +8232,10 @@
7774	8232	}
7775	8233
7776	8234	transient ObjEditor editWindow;
	8235	+ transient ObjEditor manipWindow;
	8236	+
	8237	+ transient boolean pinned;
	8238	+
7777	8239	transient ObjectUI objectUI;
7778	8240	public static int povDepth = 0;
7779	8241	private static cVector tbMin = new cVector();