~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -22,8 +22,20 @@
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();
26	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	+
27	39	ScriptNode scriptnode;
28	40
29	41	void InitOthers()
..	..	@@ -104,117 +116,201 @@
104	116
105	117	// transient boolean reduced; // for morph reduction
106	118
107		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
108		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	119	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	120	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
109	121
110		-transient Object3D transientsupport; // for cloning
111		-transient boolean transientlink2master;
	122	+ transient Object3D transientsupport; // for cloning
	123	+ transient boolean transientlink2master;
112	124
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)
	125	+ void SaveSupports()
125	126	{
126		- bRep.SaveSupports();
	127	+ if (blockloop)
	128	+ return;
	129	+
	130	+ transientsupport = support;
	131	+ transientlink2master = link2master;
	132	+
	133	+ support = null;
	134	+ link2master = false;
	135	+
	136	+ if (bRep != null)
	137	+ {
	138	+ bRep.SaveSupports();
	139	+ }
	140	+
	141	+ for (int i = 0; i < Size(); i++)
	142	+ {
	143	+ Object3D child = (Object3D) get(i);
	144	+ if (child == null)
	145	+ continue;
	146	+ blockloop = true;
	147	+ child.SaveSupports();
	148	+ blockloop = false;
	149	+ }
127	150	}
128		-
129		- for (int i = 0; i < Size(); i++)
	151	+
	152	+ void RestoreSupports()
130	153	{
131		- Object3D child = (Object3D) get(i);
132		- if (child == null)
133		- continue;
	154	+ if (blockloop)
	155	+ return;
	156	+
	157	+ support = transientsupport;
	158	+ link2master = transientlink2master;
	159	+ transientsupport = null;
	160	+ transientlink2master = false;
	161	+
	162	+ if (bRep != null)
	163	+ {
	164	+ bRep.RestoreSupports();
	165	+ }
	166	+
	167	+ for (int i = 0; i < Size(); i++)
	168	+ {
	169	+ Object3D child = (Object3D) get(i);
	170	+ if (child == null)
	171	+ continue;
	172	+ blockloop = true;
	173	+ child.RestoreSupports();
	174	+ blockloop = false;
	175	+ }
	176	+ }
	177	+
	178	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	179	+ {
	180	+ Object3D o;
	181	+
	182	+ if (hashtable.containsKey(GetUUID()))
	183	+ {
	184	+ o = hashtable.get(GetUUID());
	185	+
	186	+ Grafreed.Assert(this.bRep == o.bRep);
	187	+ //if (this.bRep != null)
	188	+ // assert(this.bRep.support == o.transientrep);
	189	+ if (this.support != null)
	190	+ assert(this.support.bRep == o.transientrep);
	191	+ }
	192	+ else
	193	+ {
	194	+ o = new Object3D("copy of " + this.name);
	195	+
	196	+ hashtable.put(GetUUID(), o);
	197	+ }
	198	+
	199	+ if (!blockloop)
	200	+ {
	201	+ blockloop = true;
	202	+
	203	+ for (int i=0; i<Size(); i++)
	204	+ {
	205	+ get(i).ExtractBigData(hashtable);
	206	+ }
	207	+
	208	+ blockloop = false;
	209	+ }
	210	+
	211	+ ExtractBigData(o);
	212	+ }
	213	+
	214	+ void ExtractBigData(Object3D o)
	215	+ {
	216	+ if (o.bRep != null)
	217	+ Grafreed.Assert(o.bRep == this.bRep);
	218	+
	219	+ o.bRep = this.bRep;
	220	+// July 2019 if (this.bRep != null)
	221	+// {
	222	+// o.transientrep = this.bRep.support;
	223	+// o.bRep.support = null;
	224	+// }
	225	+ o.selection = this.selection;
	226	+ o.versionlist = this.versionlist;
	227	+ o.versionindex = this.versionindex;
	228	+
	229	+ if (this.support != null)
	230	+ {
	231	+ if (o.transientrep != null)
	232	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	233	+
	234	+ o.transientrep = this.support.bRep;
	235	+ this.support.bRep = null;
	236	+ }
	237	+
	238	+ // o.support = this.support;
	239	+ // o.fileparent = this.fileparent;
	240	+ // if (this.bRep != null)
	241	+ // o.bRep = this.bRep.support;
	242	+
	243	+ this.bRep = null;
	244	+ // if (this.bRep != null)
	245	+ // this.bRep.support = null;
	246	+ // this.support = null;
	247	+ // this.fileparent = null;
	248	+ }
	249	+
	250	+// Object3D GetObject(java.util.UUID uuid)
	251	+// {
	252	+// if (this.uuid.equals(uuid))
	253	+// return this;
	254	+//
	255	+// if (blockloop)
	256	+// return null;
	257	+//
	258	+// blockloop = true;
	259	+//
	260	+// for (int i=0; i<Size(); i++)
	261	+// {
	262	+// Object3D o = get(i).GetObject(uuid);
	263	+//
	264	+// if (o != null)
	265	+// return o;
	266	+// }
	267	+//
	268	+// blockloop = false;
	269	+//
	270	+// return null;
	271	+// }
	272	+
	273	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	274	+ {
	275	+ if (!hashtable.containsKey(GetUUID()))
	276	+ return;
	277	+
	278	+ Object3D o = hashtable.get(GetUUID());
	279	+
	280	+ RestoreBigData(o);
	281	+
	282	+ if (blockloop)
	283	+ return;
	284	+
134	285	blockloop = true;
135		- child.SaveSupports();
	286	+
	287	+ //hashtable.remove(GetUUID());
	288	+
	289	+ for (int i=0; i<Size(); i++)
	290	+ {
	291	+ get(i).RestoreBigData(hashtable);
	292	+ }
	293	+
136	294	blockloop = false;
137	295	}
138		-}
139	296
140		-void RestoreSupports()
141		-{
142		- if (blockloop)
143		- return;
144		-
145		- support = transientsupport;
146		- link2master = transientlink2master;
147		- transientsupport = null;
148		- transientlink2master = false;
149		-
150		- if (bRep != null)
	297	+ void RestoreBigData(Object3D o)
151	298	{
152		- bRep.RestoreSupports();
	299	+ this.bRep = o.bRep;
	300	+ if (this.support != null && o.transientrep != null)
	301	+ {
	302	+ this.support.bRep = o.transientrep;
	303	+ }
	304	+
	305	+ this.selection = o.selection;
	306	+
	307	+ this.versionlist = o.versionlist;
	308	+ this.versionindex = o.versionindex;
	309	+// July 2019 if (this.bRep != null)
	310	+// this.bRep.support = o.transientrep;
	311	+ // this.support = o.support;
	312	+ // this.fileparent = o.fileparent;
153	313	}
154		-
155		- for (int i = 0; i < Size(); i++)
156		- {
157		- Object3D child = (Object3D) get(i);
158		- if (child == null)
159		- continue;
160		- blockloop = true;
161		- child.RestoreSupports();
162		- blockloop = false;
163		- }
164		-}
165		-
166		-void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
167		-{
168		- if (hashtable.containsKey(GetUUID()))
169		- return;
170		-
171		- Object3D o = new Object3D();
172		- o.bRep = this.bRep;
173		- if (this.bRep != null)
174		- {
175		- o.transientrep = this.bRep.support;
176		- o.bRep.support = null;
177		- }
178		-
179		-// o.support = this.support;
180		-// o.fileparent = this.fileparent;
181		-// if (this.bRep != null)
182		-// o.bRep = this.bRep.support;
183		-
184		- hashtable.put(GetUUID(), o);
185		-
186		- this.bRep = null;
187		-// if (this.bRep != null)
188		-// this.bRep.support = null;
189		-// this.support = null;
190		-// this.fileparent = null;
191		-
192		- for (int i=0; i<Size(); i++)
193		- {
194		- get(i).ExtractBigData(hashtable);
195		- }
196		-}
197		-
198		-void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
199		-{
200		- if (!hashtable.containsKey(GetUUID()))
201		- return;
202		-
203		- Object3D o = hashtable.get(GetUUID());
204		-
205		- this.bRep = o.bRep;
206		- if (this.bRep != null)
207		- this.bRep.support = o.transientrep;
208		-// this.support = o.support;
209		-// this.fileparent = o.fileparent;
210		-
211		- hashtable.remove(GetUUID());
212		-
213		- for (int i=0; i<Size(); i++)
214		- {
215		- get(i).RestoreBigData(hashtable);
216		- }
217		-}
218	314
219	315	// MOCAP SUPPORT
220	316	double tx,ty,tz,rx,ry,rz;
..	..	@@ -357,6 +453,7 @@
357	453	}
358	454
359	455	boolean live = false;
	456	+ transient boolean keepdontselect;
360	457	boolean dontselect = false;
361	458	boolean hide = false;
362	459	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -539,12 +636,14 @@
539	636	toParent = LA.newMatrix();
540	637	fromParent = LA.newMatrix();
541	638	}
	639	+
542	640	if (toParentMarked == null)
543	641	{
544	642	if (maxcount != 1)
545	643	{
546	644	new Exception().printStackTrace();
547	645	}
	646	+
548	647	toParentMarked = LA.newMatrix();
549	648	fromParentMarked = LA.newMatrix();
550	649	}
..	..	@@ -855,7 +954,7 @@
855	954
856	955	if (marked && Globals.isLIVE() && live &&
857	956	//TEMP21aug2018
858		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	957	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
859	958	currentframe != Globals.framecount)
860	959	{
861	960	currentframe = Globals.framecount;
..	..	@@ -867,7 +966,8 @@
867	966
868	967	boolean changedir = random && Math.random() < 0.01; // && !link2master;
869	968
870		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	969	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	970	+ (step == 1 && changedir))
871	971	{
872	972	countdown = 1;
873	973	delay = speedup?8:1;
..	..	@@ -939,6 +1039,10 @@
939	1039	if (material == null \|\| material.multiply)
940	1040	return true;
941	1041
	1042	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1043	+ return false;
	1044	+
	1045	+ // Transparent objects are dynamic because we have to sort the triangles.
942	1046	return material.opacity > 0.99;
943	1047	}
944	1048
..	..	@@ -1339,6 +1443,7 @@
1339	1443	toParent = LA.newMatrix();
1340	1444	fromParent = LA.newMatrix();
1341	1445	}
	1446	+
1342	1447	LA.matCopy(other.toParent, toParent);
1343	1448	LA.matCopy(other.fromParent, fromParent);
1344	1449
..	..	@@ -2360,6 +2465,15 @@
2360	2465	}
2361	2466	*/
2362	2467	}
	2468	+ else
	2469	+ {
	2470	+ //((ObjEditor)editWindow).SetupUI2(null);
	2471	+ if (objectUI != null)
	2472	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2473	+ else
	2474	+ //new Exception().printStackTrace();
	2475	+ System.err.println("objectUI is null");
	2476	+ }
2363	2477	}
2364	2478
2365	2479	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2401,6 +2515,14 @@
2401	2515	{
2402	2516	editWindow.refreshContents();
2403	2517	}
	2518	+ else
	2519	+ {
	2520	+ if (manipWindow != null)
	2521	+ {
	2522	+ manipWindow.refreshContents();
	2523	+ }
	2524	+ }
	2525	+
2404	2526	//if (parent != null)
2405	2527	//parent.refreshEditWindow();
2406	2528	}
..	..	@@ -2480,7 +2602,8 @@
2480	2602	private static final int editSelf = 1;
2481	2603	private static final int editChild = 2;
2482	2604
2483		- void drawEditHandles(ClickInfo info, int level)
	2605	+ void drawEditHandles(//ClickInfo info,
	2606	+ int level)
2484	2607	{
2485	2608	if (level == 0)
2486	2609	{
..	..	@@ -2488,7 +2611,8 @@
2488	2611	return;
2489	2612
2490	2613	Object3D selectee;
2491		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2614	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2615	+ level + 1))
2492	2616	{
2493	2617	selectee = (Object3D) e.nextElement();
2494	2618	}
..	..	@@ -2496,19 +2620,22 @@
2496	2620	} else
2497	2621	{
2498	2622	//super.
2499		- drawEditHandles0(info, level + 1);
	2623	+ drawEditHandles0(//info,
	2624	+ level + 1);
2500	2625	}
2501	2626	}
2502	2627
2503		- boolean doEditClick(ClickInfo info, int level)
	2628	+ boolean doEditClick(//ClickInfo info,
	2629	+ int level)
2504	2630	{
2505	2631	doSomething = 0;
2506	2632	if (level == 0)
2507	2633	{
2508		- return doParentClick(info);
	2634	+ return doParentClick(); //info);
2509	2635	}
2510	2636	if (//super.
2511		- doEditClick0(info, level))
	2637	+ doEditClick0(//info,
	2638	+ level))
2512	2639	{
2513	2640	doSomething = 1;
2514	2641	return true;
..	..	@@ -2518,7 +2645,7 @@
2518	2645	}
2519	2646	}
2520	2647
2521		- boolean doParentClick(ClickInfo info)
	2648	+ boolean doParentClick() //ClickInfo info)
2522	2649	{
2523	2650	if (selection == null)
2524	2651	{
..	..	@@ -2531,7 +2658,8 @@
2531	2658	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2532	2659	{
2533	2660	Object3D selectee = (Object3D) e.nextElement();
2534		- if (selectee.doEditClick(info, 1))
	2661	+ if (selectee.doEditClick(//info,
	2662	+ 1))
2535	2663	{
2536	2664	childToDrag = selectee;
2537	2665	doSomething = 2;
..	..	@@ -2543,13 +2671,15 @@
2543	2671	return retval;
2544	2672	}
2545	2673
2546		- void doEditDrag(ClickInfo info, boolean opposite)
	2674	+ void doEditDrag(//ClickInfo clickInfo,
	2675	+ boolean opposite)
2547	2676	{
2548	2677	switch (doSomething)
2549	2678	{
2550	2679	case 1: // '\001'
2551	2680	//super.
2552		- doEditDrag0(info, opposite);
	2681	+ doEditDrag0(//clickInfo,
	2682	+ opposite);
2553	2683	break;
2554	2684
2555	2685	case 2: // '\002'
..	..	@@ -2562,11 +2692,13 @@
2562	2692	{
2563	2693	//sel.hitSomething = childToDrag.hitSomething;
2564	2694	//childToDrag.doEditDrag(info);
2565		- sel.doEditDrag(info, opposite);
	2695	+ sel.doEditDrag(//clickInfo,
	2696	+ opposite);
2566	2697	} else
2567	2698	{
2568	2699	//super.
2569		- doEditDrag0(info, opposite);
	2700	+ doEditDrag0(//clickInfo,
	2701	+ opposite);
2570	2702	}
2571	2703	}
2572	2704	break;
..	..	@@ -2584,6 +2716,9 @@
2584	2716	{
2585	2717	deselectAll();
2586	2718	}
	2719	+
	2720	+ new Exception().printStackTrace();
	2721	+
2587	2722	ClickInfo newInfo = new ClickInfo();
2588	2723	newInfo.flags = info.flags;
2589	2724	newInfo.bounds = info.bounds;
..	..	@@ -2676,6 +2811,18 @@
2676	2811	void GenNormalsS(boolean crease)
2677	2812	{
2678	2813	selection.GenNormals(crease);
	2814	+// for (int i=0; i<selection.size(); i++)
	2815	+// {
	2816	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2817	+// selectee.GenNormals(crease);
	2818	+// }
	2819	+
	2820	+ //Touch();
	2821	+ }
	2822	+
	2823	+ void GenNormalsMeshS()
	2824	+ {
	2825	+ selection.GenNormalsMesh();
2679	2826	// for (int i=0; i<selection.size(); i++)
2680	2827	// {
2681	2828	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2816,6 +2963,24 @@
2816	2963	if (child == null)
2817	2964	continue;
2818	2965	child.GenNormals(crease);
	2966	+// Children().release(i);
	2967	+ }
	2968	+ blockloop = false;
	2969	+ }
	2970	+
	2971	+ void GenNormalsMesh()
	2972	+ {
	2973	+ if (blockloop)
	2974	+ return;
	2975	+
	2976	+ blockloop = true;
	2977	+ GenNormalsMesh0();
	2978	+ for (int i = 0; i < Children().Size(); i++)
	2979	+ {
	2980	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2981	+ if (child == null)
	2982	+ continue;
	2983	+ child.GenNormalsMesh();
2819	2984	// Children().release(i);
2820	2985	}
2821	2986	blockloop = false;
..	..	@@ -2988,11 +3153,20 @@
2988	3153	}
2989	3154	}
2990	3155
	3156	+ void GenNormalsMesh0()
	3157	+ {
	3158	+ if (bRep != null)
	3159	+ {
	3160	+ bRep.GenerateNormalsMesh();
	3161	+ Touch();
	3162	+ }
	3163	+ }
	3164	+
2991	3165	void GenNormalsMINE0()
2992	3166	{
2993	3167	if (bRep != null)
2994	3168	{
2995		- bRep.GenerateNormalsMINE();
	3169	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2996	3170	Touch();
2997	3171	}
2998	3172	}
..	..	@@ -3438,7 +3612,8 @@
3438	3612	if (blockloop)
3439	3613	return;
3440	3614
3441		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3615	+ if (//marked \|\| // does not make sense
	3616	+ (bRep != null \|\| material != null)) // borderline...
3442	3617	live = h;
3443	3618
3444	3619	for (int i = 0; i < Size(); i++)
..	..	@@ -3459,7 +3634,8 @@
3459	3634	return;
3460	3635
3461	3636	//if (bRep != null)
3462		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3637	+ if (//marked \|\| // does not make sense
	3638	+ (bRep != null \|\| material != null)) // borderline...
3463	3639	link2master = h;
3464	3640
3465	3641	for (int i = 0; i < Size(); i++)
..	..	@@ -3479,7 +3655,8 @@
3479	3655	if (blockloop)
3480	3656	return;
3481	3657
3482		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3658	+ if (//marked \|\| // does not make sense
	3659	+ (bRep != null \|\| material != null)) // borderline...
3483	3660	hide = h;
3484	3661
3485	3662	for (int i = 0; i < Size(); i++)
..	..	@@ -3499,7 +3676,7 @@
3499	3676	if (blockloop)
3500	3677	return;
3501	3678
3502		- if (bRep != null && material != null) // borderline...
	3679	+ if (bRep != null \|\| material != null) // borderline...
3503	3680	marked = h;
3504	3681
3505	3682	for (int i = 0; i < Size(); i++)
..	..	@@ -3509,6 +3686,46 @@
3509	3686	continue;
3510	3687	blockloop = true;
3511	3688	child.MarkLeaves(h);
	3689	+ blockloop = false;
	3690	+ // release(i);
	3691	+ }
	3692	+ }
	3693	+
	3694	+ void RewindLeaves(boolean h)
	3695	+ {
	3696	+ if (blockloop)
	3697	+ return;
	3698	+
	3699	+ if (bRep != null \|\| material != null) // borderline...
	3700	+ rewind = h;
	3701	+
	3702	+ for (int i = 0; i < Size(); i++)
	3703	+ {
	3704	+ Object3D child = (Object3D) get(i); // reserve(i);
	3705	+ if (child == null)
	3706	+ continue;
	3707	+ blockloop = true;
	3708	+ child.RewindLeaves(h);
	3709	+ blockloop = false;
	3710	+ // release(i);
	3711	+ }
	3712	+ }
	3713	+
	3714	+ void RandomLeaves(boolean h)
	3715	+ {
	3716	+ if (blockloop)
	3717	+ return;
	3718	+
	3719	+ if (bRep != null \|\| material != null) // borderline...
	3720	+ random = h;
	3721	+
	3722	+ for (int i = 0; i < Size(); i++)
	3723	+ {
	3724	+ Object3D child = (Object3D) get(i); // reserve(i);
	3725	+ if (child == null)
	3726	+ continue;
	3727	+ blockloop = true;
	3728	+ child.RandomLeaves(h);
3512	3729	blockloop = false;
3513	3730	// release(i);
3514	3731	}
..	..	@@ -4286,6 +4503,55 @@
4286	4503	}
4287	4504	}
4288	4505
	4506	+ void RepairSOV()
	4507	+ {
	4508	+ if (blockloop)
	4509	+ return;
	4510	+
	4511	+ String texname = this.GetPigmentTexture();
	4512	+
	4513	+ if (texname.startsWith("sov"))
	4514	+ {
	4515	+ String[] s = texname.split("/");
	4516	+
	4517	+ String[] sname = s[1].split("Color.pn");
	4518	+
	4519	+ texname = sname[0];
	4520	+
	4521	+ if (sname.length > 1)
	4522	+ {
	4523	+ texname += "Color.jpg";
	4524	+ }
	4525	+
	4526	+ this.SetPigmentTexture("sov/" + texname);
	4527	+ }
	4528	+
	4529	+ texname = this.GetBumpTexture();
	4530	+
	4531	+ if (texname.startsWith("sov"))
	4532	+ {
	4533	+ String[] s = texname.split("/");
	4534	+
	4535	+ String[] sname = s[1].split("Bump.pn");
	4536	+
	4537	+ texname = sname[0];
	4538	+
	4539	+ if (sname.length > 1)
	4540	+ {
	4541	+ texname += "Bump.jpg";
	4542	+ }
	4543	+
	4544	+ this.SetBumpTexture("sov/" + texname);
	4545	+ }
	4546	+
	4547	+ for (int i=0; i<Size(); i++)
	4548	+ {
	4549	+ blockloop = true;
	4550	+ get(i).RepairSOV();
	4551	+ blockloop = false;
	4552	+ }
	4553	+ }
	4554	+
4289	4555	void RepairTexture()
4290	4556	{
4291	4557	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4800,6 +5066,14 @@
4800	5066	}
4801	5067	}
4802	5068
	5069	+ ObjEditor GetWindow()
	5070	+ {
	5071	+ if (editWindow != null)
	5072	+ return editWindow;
	5073	+
	5074	+ return manipWindow;
	5075	+ }
	5076	+
4803	5077	cTreePath Select(int indexcount, boolean deselect)
4804	5078	{
4805	5079	if (hide \|\| dontselect)
..	..	@@ -4836,10 +5110,11 @@
4836	5110	if (leaf != null)
4837	5111	{
4838	5112	cTreePath tp = new cTreePath(this, leaf);
4839		- if (editWindow != null)
	5113	+ ObjEditor window = GetWindow();
	5114	+ if (window != null)
4840	5115	{
4841	5116	//System.out.println("editWindow = " + editWindow + " vs " + this);
4842		- editWindow.Select(tp, deselect, true);
	5117	+ window.Select(tp, deselect, true);
4843	5118	}
4844	5119
4845	5120	return tp;
..	..	@@ -4856,6 +5131,7 @@
4856	5131
4857	5132	if (child == null)
4858	5133	continue;
	5134	+
4859	5135	if (child.HasTransparency() && child.size() != 0)
4860	5136	{
4861	5137	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4865,9 +5141,10 @@
4865	5141	if (leaf != null)
4866	5142	{
4867	5143	cTreePath tp = new cTreePath(this, leaf);
4868		- if (editWindow != null)
	5144	+ ObjEditor window = GetWindow();
	5145	+ if (window != null)
4869	5146	{
4870		- editWindow.Select(tp, deselect, true);
	5147	+ window.Select(tp, deselect, true);
4871	5148	}
4872	5149
4873	5150	return tp;
..	..	@@ -5192,6 +5469,51 @@
5192	5469	blockloop = false;
5193	5470	}
5194	5471
	5472	+ void ResetSelectable()
	5473	+ {
	5474	+ if (blockloop)
	5475	+ return;
	5476	+
	5477	+ blockloop = true;
	5478	+
	5479	+ keepdontselect = dontselect;
	5480	+ dontselect = true;
	5481	+
	5482	+ Object3D child;
	5483	+ int nb = Size();
	5484	+ for (int i = 0; i < nb; i++)
	5485	+ {
	5486	+ child = (Object3D) get(i);
	5487	+ if (child == null)
	5488	+ continue;
	5489	+ child.ResetSelectable();
	5490	+ }
	5491	+
	5492	+ blockloop = false;
	5493	+ }
	5494	+
	5495	+ void RestoreSelectable()
	5496	+ {
	5497	+ if (blockloop)
	5498	+ return;
	5499	+
	5500	+ blockloop = true;
	5501	+
	5502	+ dontselect = keepdontselect;
	5503	+
	5504	+ Object3D child;
	5505	+ int nb = Size();
	5506	+ for (int i = 0; i < nb; i++)
	5507	+ {
	5508	+ child = (Object3D) get(i);
	5509	+ if (child == null)
	5510	+ continue;
	5511	+ child.RestoreSelectable();
	5512	+ }
	5513	+
	5514	+ blockloop = false;
	5515	+ }
	5516	+
5195	5517	boolean IsSelected()
5196	5518	{
5197	5519	if (parent == null)
..	..	@@ -5501,6 +5823,38 @@
5501	5823	}
5502	5824	}
5503	5825
	5826	+ void EmbedTextures(boolean embed)
	5827	+ {
	5828	+ if (blockloop)
	5829	+ return;
	5830	+
	5831	+ //if (GetTextures() != null)
	5832	+ if (embed)
	5833	+ CameraPane.EmbedTextures(GetTextures());
	5834	+ else
	5835	+ {
	5836	+ GetTextures().pigmentdata = null;
	5837	+ GetTextures().bumpdata = null;
	5838	+ GetTextures().pw = 0;
	5839	+ GetTextures().ph = 0;
	5840	+ GetTextures().bw = 0;
	5841	+ GetTextures().bh = 0;
	5842	+ }
	5843	+
	5844	+ int nb = Size();
	5845	+ for (int i = 0; i < nb; i++)
	5846	+ {
	5847	+ Object3D child = (Object3D) get(i);
	5848	+
	5849	+ if (child == null)
	5850	+ continue;
	5851	+
	5852	+ blockloop = true;
	5853	+ child.EmbedTextures(embed);
	5854	+ blockloop = false;
	5855	+ }
	5856	+ }
	5857	+
5504	5858	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5505	5859	{
5506	5860	Draw(display, root, selected, blocked);
..	..	@@ -5509,12 +5863,23 @@
5509	5863	boolean NeedSupport()
5510	5864	{
5511	5865	return
5512		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
	5866	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5513	5867	// PROBLEM with CROWD!!
5514	5868	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5515	5869	}
5516	5870
5517	5871	static boolean DEBUG_SELECTION = false;
	5872	+
	5873	+ boolean IsLive()
	5874	+ {
	5875	+ if (live)
	5876	+ return true;
	5877	+
	5878	+ if (parent == null)
	5879	+ return false;
	5880	+
	5881	+ return parent.IsLive();
	5882	+ }
5518	5883
5519	5884	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5520	5885	{
..	..	@@ -5576,8 +5941,10 @@
5576	5941	if (support != null)
5577	5942	support = support;
5578	5943
5579		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5580		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5944	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5945	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5946	+
	5947	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5581	5948
5582	5949	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5583	5950	{
..	..	@@ -5587,8 +5954,9 @@
5587	5954	// usecalllists &= !(parent instanceof RandomNode);
5588	5955	// usecalllists = false;
5589	5956
5590		- if (GetBRep() != null)
5591		- usecalllists = usecalllists;
	5957	+ if (display.DrawMode() == display.SHADOW)
	5958	+ //GetBRep() != null)
	5959	+ usecalllists = !!usecalllists;
5592	5960	//System.out.println("draw " + this);
5593	5961	//new Exception().printStackTrace();
5594	5962
..	..	@@ -5597,10 +5965,12 @@
5597	5965	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5598	5966
5599	5967	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5600		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5968	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5969	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5601	5970	{
5602	5971	Globals.lighttouched = true;
5603	5972	} // all panes...
	5973	+
5604	5974	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5605	5975	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5606	5976	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5608,7 +5978,7 @@
5608	5978	if (!(this instanceof Composite))
5609	5979	touched = false;
5610	5980	//if (displaylist == -1 && usecalllists)
5611		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5981	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5612	5982	{
5613	5983	bRep.displaylist = display.GenList();
5614	5984	assert(bRep.displaylist != 0);
..	..	@@ -5619,7 +5989,7 @@
5619	5989
5620	5990	//System.out.println("\tnew list " + list);
5621	5991	//gl.glDrawBuffer(gl.GL_NONE);
5622		- if (usecalllists)
	5992	+ if (usecalllists && bRep.displaylist > 0)
5623	5993	{
5624	5994	// System.err.println("new list " + bRep.displaylist + " for " + this);
5625	5995	display.NewList(bRep.displaylist);
..	..	@@ -5628,7 +5998,7 @@
5628	5998	CallList(display, root, selected, blocked);
5629	5999
5630	6000	// compiled = true;
5631		- if (usecalllists)
	6001	+ if (usecalllists && bRep.displaylist > 0)
5632	6002	{
5633	6003	// System.err.println("end list " + bRep.displaylist + " for " + this);
5634	6004	display.EndList();
..	..	@@ -5728,6 +6098,7 @@
5728	6098	if (GetBRep() != null)
5729	6099	{
5730	6100	display.NextIndex();
	6101	+
5731	6102	// vertex color conflict : gl.glCallList(list);
5732	6103	DrawNode(display, root, selected);
5733	6104	if (this instanceof BezierPatch)
..	..	@@ -5768,16 +6139,27 @@
5768	6139	tex = GetTextures();
5769	6140	}
5770	6141
5771		- boolean failed = false;
	6142	+ boolean failedPigment = false;
	6143	+ boolean failedBump = false;
5772	6144
5773	6145	try
5774	6146	{
5775		- display.BindTextures(tex, texres);
	6147	+ display.BindPigmentTexture(tex, texres);
5776	6148	}
5777	6149	catch (Exception e)
5778	6150	{
5779	6151	System.err.println("FAILED: " + this);
5780		- failed = true;
	6152	+ failedPigment = true;
	6153	+ }
	6154	+
	6155	+ try
	6156	+ {
	6157	+ display.BindBumpTexture(tex, texres);
	6158	+ }
	6159	+ catch (Exception e)
	6160	+ {
	6161	+ //System.err.println("FAILED: " + this);
	6162	+ failedBump = true;
5781	6163	}
5782	6164
5783	6165	if (!compiled)
..	..	@@ -5800,8 +6182,11 @@
5800	6182	}
5801	6183	}
5802	6184
5803		- if (!failed)
5804		- display.ReleaseTextures(tex);
	6185	+ if (!failedBump)
	6186	+ display.ReleaseBumpTexture(tex);
	6187	+
	6188	+ if (!failedPigment)
	6189	+ display.ReleasePigmentTexture(tex);
5805	6190
5806	6191	display.PopMaterial(this, selected);
5807	6192	}
..	..	@@ -6174,6 +6559,11 @@
6174	6559	// dec 2012
6175	6560	new Exception().printStackTrace();
6176	6561	return;
	6562	+ }
	6563	+
	6564	+ if (dontselect)
	6565	+ {
	6566	+ //bRep.GenerateNormalsMINE();
6177	6567	}
6178	6568
6179	6569	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6959,20 +7349,23 @@
6959	7349	}
6960	7350	}
6961	7351
6962		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7352	+ static ClickInfo clickInfo = new ClickInfo();
	7353	+
	7354	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7355	+ Point outPt, Rectangle outRec)
6963	7356	{
6964		- int hc = info.bounds.x + info.bounds.width / 2;
6965		- int vc = info.bounds.y + info.bounds.height / 2;
6966		- double[][] toscreen = info.toScreen;
	7357	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7358	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7359	+ double[][] toscreen = clickInfo.toScreen;
6967	7360	if (toscreen == null)
6968	7361	{
6969		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7362	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6970	7363	}
6971	7364	cVector vec = in;
6972	7365	LA.xformPos(in, toscreen, in);
6973	7366	//System.out.println("Distance = " + info.camera.Distance());
6974		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
6975		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7367	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7368	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6976	7369	outPt.x = hc + (int) vec.x;
6977	7370	outPt.y = vc - (int) vec.y;
6978	7371	outRec.x = outPt.x - 3;
..	..	@@ -6980,15 +7373,18 @@
6980	7373	outRec.width = outRec.height = 6;
6981	7374	}
6982	7375
6983		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7376	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7377	+ )
6984	7378	{
6985	7379	Point pt = new Point(0, 0);
6986	7380	Rectangle rec = new Rectangle();
6987		- calcHotSpot(in, info, pt, rec);
	7381	+ calcHotSpot(in, //clickInfo,
	7382	+ pt, rec);
6988	7383	return rec;
6989	7384	}
6990	7385
6991		- void drawEditHandles0(ClickInfo info, int level)
	7386	+ void drawEditHandles0(//ClickInfo clickInfo,
	7387	+ int level)
6992	7388	{
6993	7389	if (level == 0)
6994	7390	{
..	..	@@ -6997,16 +7393,19 @@
6997	7393	{
6998	7394	cVector origin = new cVector();
6999	7395	//LA.xformPos(origin, toParent, origin);
7000		- Rectangle spot = calcHotSpot(origin, info);
	7396	+ if (this.clickInfo == null)
	7397	+ this.clickInfo = new ClickInfo();
	7398	+
	7399	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7001	7400	Rectangle boundary = new Rectangle();
7002	7401	boundary.x = spot.x - 30;
7003	7402	boundary.y = spot.y - 30;
7004	7403	boundary.width = spot.width + 60;
7005	7404	boundary.height = spot.height + 60;
7006		- info.g.setColor(Color.red);
	7405	+ clickInfo.g.setColor(Color.red);
7007	7406	int spotw = spot.x + spot.width;
7008	7407	int spoth = spot.y + spot.height;
7009		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7408	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7010	7409	// if (CameraPane.Xmin > spot.x)
7011	7410	// {
7012	7411	// CameraPane.Xmin = spot.x;
..	..	@@ -7026,8 +7425,8 @@
7026	7425	spot.translate(32, 32);
7027	7426	spotw = spot.x + spot.width;
7028	7427	spoth = spot.y + spot.height;
7029		- info.g.setColor(Color.blue);
7030		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7428	+ clickInfo.g.setColor(Color.cyan);
	7429	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7031	7430	// if (CameraPane.Xmin > spot.x)
7032	7431	// {
7033	7432	// CameraPane.Xmin = spot.x;
..	..	@@ -7044,11 +7443,12 @@
7044	7443	// {
7045	7444	// CameraPane.Ymax = spoth;
7046	7445	// }
7047		- // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7048		- //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7446	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7447	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7049	7448	spot.translate(0, -32);
7050		- info.g.setColor(Color.green);
7051		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7449	+ clickInfo.g.setColor(Color.yellow);
	7450	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7451	+ clickInfo.g.setColor(Color.green);
7052	7452	// if (CameraPane.Xmin > spot.x)
7053	7453	// {
7054	7454	// CameraPane.Xmin = spot.x;
..	..	@@ -7065,8 +7465,8 @@
7065	7465	// {
7066	7466	// CameraPane.Ymax = spoth;
7067	7467	// }
7068		- info.g.drawArc(boundary.x, boundary.y,
7069		- boundary.width, boundary.height, 0, 360);
	7468	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7469	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7070	7470	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7071	7471	// if (CameraPane.Xmin > boundary.x)
7072	7472	// {
..	..	@@ -7088,7 +7488,8 @@
7088	7488	}
7089	7489	}
7090	7490
7091		- boolean doEditClick0(ClickInfo info, int level)
	7491	+ boolean doEditClick0(//ClickInfo clickInfo,
	7492	+ int level)
7092	7493	{
7093	7494	if (level == 0)
7094	7495	{
..	..	@@ -7097,8 +7498,8 @@
7097	7498
7098	7499	boolean retval = false;
7099	7500
7100		- startX = info.x;
7101		- startY = info.y;
	7501	+ startX = clickInfo.x;
	7502	+ startY = clickInfo.y;
7102	7503
7103	7504	hitSomething = -1;
7104	7505	cVector origin = new cVector();
..	..	@@ -7108,22 +7509,51 @@
7108	7509	{
7109	7510	centerPt = new Point(0, 0);
7110	7511	}
7111		- calcHotSpot(origin, info, centerPt, spot);
7112		- if (spot.contains(info.x, info.y))
	7512	+ calcHotSpot(origin, //info,
	7513	+ centerPt, spot);
	7514	+ if (spot.contains(clickInfo.x, clickInfo.y))
7113	7515	{
7114	7516	hitSomething = hitCenter;
7115	7517	retval = true;
7116	7518	}
7117	7519	spot.translate(32, 0);
7118		- if (spot.contains(info.x, info.y))
	7520	+ if (spot.contains(clickInfo.x, clickInfo.y))
7119	7521	{
7120	7522	hitSomething = hitRotate;
7121	7523	retval = true;
7122	7524	}
7123	7525	spot.translate(0, 32);
7124		- if (spot.contains(info.x, info.y))
	7526	+ if (spot.contains(clickInfo.x, clickInfo.y))
7125	7527	{
7126	7528	hitSomething = hitScale;
	7529	+
	7530	+ double scale = 0.005f * clickInfo.camera.Distance();
	7531	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7532	+ double sign = 1;
	7533	+ if (hScale < 0)
	7534	+ {
	7535	+ sign = -1;
	7536	+ }
	7537	+ hScale = signMath.pow(signhScale, scale * 50);
	7538	+ if (hScale < 0.01)
	7539	+ {
	7540	+ //hScale = 0.01;
	7541	+ }
	7542	+
	7543	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7544	+ sign = 1;
	7545	+ if (vScale < 0)
	7546	+ {
	7547	+ sign = -1;
	7548	+ }
	7549	+ vScale = signMath.pow(signvScale, scale * 50);
	7550	+ if (vScale < 0.01)
	7551	+ {
	7552	+ //vScale = 0.01;
	7553	+ }
	7554	+
	7555	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7556	+
7127	7557	retval = true;
7128	7558	}
7129	7559
..	..	@@ -7133,7 +7563,7 @@
7133	7563	}
7134	7564
7135	7565	//System.out.println("info.modifiers = " + info.modifiers);
7136		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7566	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7137	7567	//System.out.println("modified = " + modified);
7138	7568	//new Exception().printStackTrace();
7139	7569	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7161,7 +7591,8 @@
7161	7591	return true;
7162	7592	}
7163	7593
7164		- void doEditDrag0(ClickInfo info, boolean opposite)
	7594	+ void doEditDrag0(//ClickInfo info,
	7595	+ boolean opposite)
7165	7596	{
7166	7597	if (hitSomething == 0)
7167	7598	{
..	..	@@ -7175,7 +7606,7 @@
7175	7606
7176	7607	//System.out.println("hitSomething = " + hitSomething);
7177	7608
7178		- double scale = 0.005f * info.camera.Distance();
	7609	+ double scale = 0.005f * clickInfo.camera.Distance();
7179	7610
7180	7611	cVector xlate = new cVector();
7181	7612	//cVector xlate2 = new cVector();
..	..	@@ -7209,8 +7640,8 @@
7209	7640	toParent[3][i] = xlate.get(i);
7210	7641	LA.matInvert(toParent, fromParent);
7211	7642	*/
7212		- cVector delta = LA.newVector(0, 0, startY - info.y);
7213		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7643	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7644	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7214	7645
7215	7646	LA.matCopy(startMat, toParent);
7216	7647	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7219,7 +7650,7 @@
7219	7650	} else
7220	7651	{
7221	7652	//LA.xformDir(delta, info.camera.fromScreen, delta);
7222		- cVector up = new cVector(info.camera.up);
	7653	+ cVector up = new cVector(clickInfo.camera.up);
7223	7654	cVector away = new cVector();
7224	7655	//cVector right2 = new cVector();
7225	7656	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7236,19 +7667,19 @@
7236	7667	LA.xformDir(up, ClickInfo.matbuffer, up);
7237	7668	// if (!CameraPane.LOCALTRANSFORM)
7238	7669	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7239		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7670	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7240	7671	// if (!CameraPane.LOCALTRANSFORM)
7241	7672	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7242	7673	//LA.vecCross(up, cVector.Z, right2);
7243	7674
7244		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7675	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7245	7676
7246	7677	//System.out.println("DELTA0 = " + delta);
7247	7678	//System.out.println("AWAY = " + info.camera.away);
7248	7679	//System.out.println("UP = " + info.camera.up);
7249	7680	if (away.z > 0)
7250	7681	{
7251		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7682	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7252	7683	{
7253	7684	delta.x = -delta.x;
7254	7685	} else
..	..	@@ -7263,7 +7694,7 @@
7263	7694	//System.out.println("DELTA1 = " + delta);
7264	7695	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7265	7696	//System.out.println("DELTA2 = " + delta);
7266		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7697	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7267	7698	LA.matCopy(startMat, toParent);
7268	7699	//System.out.println("DELTA3 = " + delta);
7269	7700	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7273,8 +7704,8 @@
7273	7704	break;
7274	7705
7275	7706	case hitRotate: // rotate
7276		- int dx = info.x - centerPt.x;
7277		- int dy = -(info.y - centerPt.y);
	7707	+ int dx = clickInfo.x - centerPt.x;
	7708	+ int dy = -(clickInfo.y - centerPt.y);
7278	7709	double angle = (double) Math.atan2(dx, dy);
7279	7710	angle = -(1.570796 - angle);
7280	7711
..	..	@@ -7297,7 +7728,7 @@
7297	7728	}
7298	7729	/**/
7299	7730
7300		- switch (info.pane.RenderCamera().viewCode)
	7731	+ switch (clickInfo.pane.RenderCamera().viewCode)
7301	7732	{
7302	7733	case 1: // '\001'
7303	7734	LA.matZRotate(toParent, angle);
..	..	@@ -7324,7 +7755,7 @@
7324	7755	break;
7325	7756
7326	7757	case hitScale: // scale
7327		- double hScale = (double) (info.x - centerPt.x) / 32;
	7758	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
7328	7759	double sign = 1;
7329	7760	if (hScale < 0)
7330	7761	{
..	..	@@ -7336,7 +7767,7 @@
7336	7767	//hScale = 0.01;
7337	7768	}
7338	7769
7339		- double vScale = (double) (info.y - centerPt.y) / 32;
	7770	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
7340	7771	sign = 1;
7341	7772	if (vScale < 0)
7342	7773	{
..	..	@@ -7347,6 +7778,7 @@
7347	7778	{
7348	7779	//vScale = 0.01;
7349	7780	}
	7781	+
7350	7782	LA.matCopy(startMat, toParent);
7351	7783	/**/
7352	7784	for (int i = 0; i < 3; i++)
..	..	@@ -7356,29 +7788,30 @@
7356	7788	}
7357	7789	/**/
7358	7790
7359		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7791	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7360	7792
7361	7793	if (totalScale < 0.01)
7362	7794	{
7363	7795	totalScale = 0.01;
7364	7796	}
7365	7797
7366		- switch (info.pane.RenderCamera().viewCode)
	7798	+ switch (clickInfo.pane.RenderCamera().viewCode)
7367	7799	{
7368	7800	case 3: // '\001'
7369		- if (modified)
	7801	+ if (modified \|\| opposite)
7370	7802	{
7371	7803	//LA.matScale(toParent, 1, hScale, vScale);
7372	7804	LA.matScale(toParent, totalScale, 1, 1);
7373	7805	} // vScale, 1);
7374	7806	else
7375	7807	{
	7808	+ // EXCEPTION!
7376	7809	LA.matScale(toParent, totalScale, totalScale, totalScale);
7377	7810	} // vScale, 1);
7378	7811	break;
7379	7812
7380	7813	case 2: // '\002'
7381		- if (modified)
	7814	+ if (modified \|\| opposite)
7382	7815	{
7383	7816	//LA.matScale(toParent, hScale, 1, vScale);
7384	7817	LA.matScale(toParent, 1, totalScale, 1);
..	..	@@ -7389,7 +7822,7 @@
7389	7822	break;
7390	7823
7391	7824	case 1: // '\003'
7392		- if (modified)
	7825	+ if (modified \|\| opposite)
7393	7826	{
7394	7827	//LA.matScale(toParent, hScale, vScale, 1);
7395	7828	LA.matScale(toParent, 1, 1, totalScale);
..	..	@@ -7429,7 +7862,7 @@
7429	7862	} // NEW ...
7430	7863
7431	7864
7432		- info.pane.repaint();
	7865	+ clickInfo.pane.repaint();
7433	7866	}
7434	7867
7435	7868	boolean overflow = false;
..	..	@@ -7609,6 +8042,10 @@
7609	8042	editWindow = null;
7610	8043	} // ?
7611	8044	}
	8045	+ else
	8046	+ {
	8047	+ //editWindow.closeUI();
	8048	+ }
7612	8049	}
7613	8050
7614	8051	boolean root; // patch for edit windows
..	..	@@ -7766,6 +8203,10 @@
7766	8203	}
7767	8204
7768	8205	transient ObjEditor editWindow;
	8206	+ transient ObjEditor manipWindow;
	8207	+
	8208	+ transient boolean pinned;
	8209	+
7769	8210	transient ObjectUI objectUI;
7770	8211	public static int povDepth = 0;
7771	8212	private static cVector tbMin = new cVector();