~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -5,6 +5,7 @@
5	5	import java.util.Vector;
6	6
7	7	import javax.media.j3d.Transform3D;
	8	+import javax.media.opengl.GL;
8	9	import javax.vecmath.Vector3d;
9	10
10	11	import javax.imageio.ImageIO;
..	..	@@ -13,12 +14,28 @@
13	14	import //weka.core.
14	15	matrix.Matrix;
15	16
	17	+import java.util.UUID;
	18	+
16	19	//import net.sourceforge.sizeof.SizeOf;
17	20	public class Object3D extends Vector<Object3D> implements java.io.Serializable, iSendInfo //, aurelienribon.tweenengine.TweenAccessor<Object3D>
18	21	{
19	22	//static final long serialVersionUID = -607422624994562685L;
20	23	static final long serialVersionUID = 5022536242724664900L;
21	24
	25	+ // Use GetUUID for backward compatibility with null.
	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	+
22	39	ScriptNode scriptnode;
23	40
24	41	void InitOthers()
..	..	@@ -99,64 +116,201 @@
99	116
100	117	// transient boolean reduced; // for morph reduction
101	118
102		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
103		-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
104	121
105		-transient Object3D transientsupport; // for cloning
106		-transient boolean transientlink2master;
	122	+ transient Object3D transientsupport; // for cloning
	123	+ transient boolean transientlink2master;
107	124
108		-void SaveSupports()
109		-{
110		- if (blockloop)
111		- return;
112		-
113		- transientsupport = support;
114		- transientlink2master = link2master;
115		-
116		- support = null;
117		- link2master = false;
118		-
119		- if (bRep != null)
	125	+ void SaveSupports()
120	126	{
121		- 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	+ }
122	150	}
123		-
124		- for (int i = 0; i < Size(); i++)
	151	+
	152	+ void RestoreSupports()
125	153	{
126		- Object3D child = (Object3D) get(i);
127		- if (child == null)
128		- 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	+
129	285	blockloop = true;
130		- child.SaveSupports();
	286	+
	287	+ //hashtable.remove(GetUUID());
	288	+
	289	+ for (int i=0; i<Size(); i++)
	290	+ {
	291	+ get(i).RestoreBigData(hashtable);
	292	+ }
	293	+
131	294	blockloop = false;
132	295	}
133		-}
134	296
135		-void RestoreSupports()
136		-{
137		- if (blockloop)
138		- return;
139		-
140		- support = transientsupport;
141		- link2master = transientlink2master;
142		- transientsupport = null;
143		- transientlink2master = false;
144		-
145		- if (bRep != null)
	297	+ void RestoreBigData(Object3D o)
146	298	{
147		- 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;
148	313	}
149		-
150		- for (int i = 0; i < Size(); i++)
151		- {
152		- Object3D child = (Object3D) get(i);
153		- if (child == null)
154		- continue;
155		- blockloop = true;
156		- child.RestoreSupports();
157		- blockloop = false;
158		- }
159		-}
160	314
161	315	// MOCAP SUPPORT
162	316	double tx,ty,tz,rx,ry,rz;
..	..	@@ -299,6 +453,8 @@
299	453	}
300	454
301	455	boolean live = false;
	456	+ transient boolean keepdontselect;
	457	+ boolean dontselect = false;
302	458	boolean hide = false;
303	459	boolean link2master = false; // performs reset support/master at each frame
304	460	boolean marked = false; // animation node
..	..	@@ -480,12 +636,14 @@
480	636	toParent = LA.newMatrix();
481	637	fromParent = LA.newMatrix();
482	638	}
	639	+
483	640	if (toParentMarked == null)
484	641	{
485	642	if (maxcount != 1)
486	643	{
487	644	new Exception().printStackTrace();
488	645	}
	646	+
489	647	toParentMarked = LA.newMatrix();
490	648	fromParentMarked = LA.newMatrix();
491	649	}
..	..	@@ -773,7 +931,7 @@
773	931	if (step == 0)
774	932	step = 1;
775	933	if (maxcount == 0)
776		- maxcount = 2048; // 4;
	934	+ maxcount = 128; // 2048; // 4;
777	935	// if (acceleration == 0)
778	936	// acceleration = 10;
779	937	if (delay == 0) // serial
..	..	@@ -796,7 +954,7 @@
796	954
797	955	if (marked && Globals.isLIVE() && live &&
798	956	//TEMP21aug2018
799		- Globals.DrawMode() == iCameraPane.SHADOW &&
	957	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
800	958	currentframe != Globals.framecount)
801	959	{
802	960	currentframe = Globals.framecount;
..	..	@@ -808,7 +966,8 @@
808	966
809	967	boolean changedir = random && Math.random() < 0.01; // && !link2master;
810	968
811		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	969	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	970	+ (step == 1 && changedir))
812	971	{
813	972	countdown = 1;
814	973	delay = speedup?8:1;
..	..	@@ -880,6 +1039,10 @@
880	1039	if (material == null \|\| material.multiply)
881	1040	return true;
882	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.
883	1046	return material.opacity > 0.99;
884	1047	}
885	1048
..	..	@@ -911,6 +1074,11 @@
911	1074	fromParent = null; // LA.newMatrix();
912	1075	bRep = null; // new BoundaryRep();
913	1076
	1077	+ if (oname != null && oname.equals("LeftHand"))
	1078	+ {
	1079	+ name = oname;
	1080	+ }
	1081	+
914	1082	/*
915	1083	float hue = (float)Math.random();
916	1084	Color col;
..	..	@@ -953,7 +1121,7 @@
953	1121
954	1122	public Object clone()
955	1123	{
956		- return GrafreeD.clone(this);
	1124	+ return Grafreed.clone(this);
957	1125	}
958	1126
959	1127	Object3D copyExpand()
..	..	@@ -1275,6 +1443,7 @@
1275	1443	toParent = LA.newMatrix();
1276	1444	fromParent = LA.newMatrix();
1277	1445	}
	1446	+
1278	1447	LA.matCopy(other.toParent, toParent);
1279	1448	LA.matCopy(other.fromParent, fromParent);
1280	1449
..	..	@@ -1469,7 +1638,7 @@
1469	1638	BoundaryRep.SEUIL = other.material.cameralight;
1470	1639
1471	1640	// Set default to 0.1
1472		- BoundaryRep.SEUIL /= 2;
	1641	+ BoundaryRep.SEUIL /= 4; // 2;
1473	1642	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1474	1643	}
1475	1644
..	..	@@ -1728,7 +1897,7 @@
1728	1897	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1729	1898	o.bRep = transientrep;
1730	1899	if (clone)
1731		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1900	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1732	1901	o.CreateMaterial();
1733	1902	o.SetAttributes(this, -1);
1734	1903	//parent
..	..	@@ -1741,7 +1910,7 @@
1741	1910	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1742	1911	o.bRep = bRep;
1743	1912	if (clone)
1744		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1913	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1745	1914	o.CreateMaterial();
1746	1915	//o.overwriteThis(this, -1);
1747	1916	o.SetAttributes(this, -1);
..	..	@@ -1828,12 +1997,15 @@
1828	1997	if (obj.name == null)
1829	1998	continue; // can't be a null one
1830	1999
	2000	+ // Try perfect match first.
1831	2001	if (n.equals(obj.name))
1832	2002	{
1833	2003	theobj = obj;
1834	2004	count++;
1835	2005	}
1836	2006	}
	2007	+
	2008	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1837	2009
1838	2010	if (count != 1)
1839	2011	for (int i=Size(); --i>=0;)
..	..	@@ -2293,12 +2465,18 @@
2293	2465	}
2294	2466	*/
2295	2467	}
	2468	+ else
	2469	+ {
	2470	+ //((ObjEditor)editWindow).SetupUI2(null);
	2471	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2472	+ }
2296	2473	}
2297	2474
2298	2475	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2299	2476	{
2300	2477	if (newWindow)
2301	2478	{
	2479	+ new Exception().printStackTrace();
2302	2480	System.exit(0);
2303	2481	if (parent != null)
2304	2482	{
..	..	@@ -2333,6 +2511,14 @@
2333	2511	{
2334	2512	editWindow.refreshContents();
2335	2513	}
	2514	+ else
	2515	+ {
	2516	+ if (manipWindow != null)
	2517	+ {
	2518	+ manipWindow.refreshContents();
	2519	+ }
	2520	+ }
	2521	+
2336	2522	//if (parent != null)
2337	2523	//parent.refreshEditWindow();
2338	2524	}
..	..	@@ -2412,7 +2598,8 @@
2412	2598	private static final int editSelf = 1;
2413	2599	private static final int editChild = 2;
2414	2600
2415		- void drawEditHandles(ClickInfo info, int level)
	2601	+ void drawEditHandles(//ClickInfo info,
	2602	+ int level)
2416	2603	{
2417	2604	if (level == 0)
2418	2605	{
..	..	@@ -2420,7 +2607,8 @@
2420	2607	return;
2421	2608
2422	2609	Object3D selectee;
2423		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2610	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2611	+ level + 1))
2424	2612	{
2425	2613	selectee = (Object3D) e.nextElement();
2426	2614	}
..	..	@@ -2428,19 +2616,22 @@
2428	2616	} else
2429	2617	{
2430	2618	//super.
2431		- drawEditHandles0(info, level + 1);
	2619	+ drawEditHandles0(//info,
	2620	+ level + 1);
2432	2621	}
2433	2622	}
2434	2623
2435		- boolean doEditClick(ClickInfo info, int level)
	2624	+ boolean doEditClick(//ClickInfo info,
	2625	+ int level)
2436	2626	{
2437	2627	doSomething = 0;
2438	2628	if (level == 0)
2439	2629	{
2440		- return doParentClick(info);
	2630	+ return doParentClick(); //info);
2441	2631	}
2442	2632	if (//super.
2443		- doEditClick0(info, level))
	2633	+ doEditClick0(//info,
	2634	+ level))
2444	2635	{
2445	2636	doSomething = 1;
2446	2637	return true;
..	..	@@ -2450,7 +2641,7 @@
2450	2641	}
2451	2642	}
2452	2643
2453		- boolean doParentClick(ClickInfo info)
	2644	+ boolean doParentClick() //ClickInfo info)
2454	2645	{
2455	2646	if (selection == null)
2456	2647	{
..	..	@@ -2463,7 +2654,8 @@
2463	2654	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2464	2655	{
2465	2656	Object3D selectee = (Object3D) e.nextElement();
2466		- if (selectee.doEditClick(info, 1))
	2657	+ if (selectee.doEditClick(//info,
	2658	+ 1))
2467	2659	{
2468	2660	childToDrag = selectee;
2469	2661	doSomething = 2;
..	..	@@ -2475,13 +2667,15 @@
2475	2667	return retval;
2476	2668	}
2477	2669
2478		- void doEditDrag(ClickInfo info)
	2670	+ void doEditDrag(//ClickInfo clickInfo,
	2671	+ boolean opposite)
2479	2672	{
2480	2673	switch (doSomething)
2481	2674	{
2482	2675	case 1: // '\001'
2483	2676	//super.
2484		- doEditDrag0(info);
	2677	+ doEditDrag0(//clickInfo,
	2678	+ opposite);
2485	2679	break;
2486	2680
2487	2681	case 2: // '\002'
..	..	@@ -2494,11 +2688,13 @@
2494	2688	{
2495	2689	//sel.hitSomething = childToDrag.hitSomething;
2496	2690	//childToDrag.doEditDrag(info);
2497		- sel.doEditDrag(info);
	2691	+ sel.doEditDrag(//clickInfo,
	2692	+ opposite);
2498	2693	} else
2499	2694	{
2500	2695	//super.
2501		- doEditDrag0(info);
	2696	+ doEditDrag0(//clickInfo,
	2697	+ opposite);
2502	2698	}
2503	2699	}
2504	2700	break;
..	..	@@ -2516,6 +2712,9 @@
2516	2712	{
2517	2713	deselectAll();
2518	2714	}
	2715	+
	2716	+ new Exception().printStackTrace();
	2717	+
2519	2718	ClickInfo newInfo = new ClickInfo();
2520	2719	newInfo.flags = info.flags;
2521	2720	newInfo.bounds = info.bounds;
..	..	@@ -2608,6 +2807,18 @@
2608	2807	void GenNormalsS(boolean crease)
2609	2808	{
2610	2809	selection.GenNormals(crease);
	2810	+// for (int i=0; i<selection.size(); i++)
	2811	+// {
	2812	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2813	+// selectee.GenNormals(crease);
	2814	+// }
	2815	+
	2816	+ //Touch();
	2817	+ }
	2818	+
	2819	+ void GenNormalsMeshS()
	2820	+ {
	2821	+ selection.GenNormalsMesh();
2611	2822	// for (int i=0; i<selection.size(); i++)
2612	2823	// {
2613	2824	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2748,6 +2959,24 @@
2748	2959	if (child == null)
2749	2960	continue;
2750	2961	child.GenNormals(crease);
	2962	+// Children().release(i);
	2963	+ }
	2964	+ blockloop = false;
	2965	+ }
	2966	+
	2967	+ void GenNormalsMesh()
	2968	+ {
	2969	+ if (blockloop)
	2970	+ return;
	2971	+
	2972	+ blockloop = true;
	2973	+ GenNormalsMesh0();
	2974	+ for (int i = 0; i < Children().Size(); i++)
	2975	+ {
	2976	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2977	+ if (child == null)
	2978	+ continue;
	2979	+ child.GenNormalsMesh();
2751	2980	// Children().release(i);
2752	2981	}
2753	2982	blockloop = false;
..	..	@@ -2905,7 +3134,8 @@
2905	3134	{
2906	3135	if (bRep != null)
2907	3136	{
2908		- bRep.GenUV();
	3137	+ bRep.GenUV(); //1);
	3138	+ //bRep.UnfoldUV();
2909	3139	Touch();
2910	3140	}
2911	3141	}
..	..	@@ -2919,11 +3149,20 @@
2919	3149	}
2920	3150	}
2921	3151
	3152	+ void GenNormalsMesh0()
	3153	+ {
	3154	+ if (bRep != null)
	3155	+ {
	3156	+ bRep.GenerateNormalsMesh();
	3157	+ Touch();
	3158	+ }
	3159	+ }
	3160	+
2922	3161	void GenNormalsMINE0()
2923	3162	{
2924	3163	if (bRep != null)
2925	3164	{
2926		- bRep.GenerateNormalsMINE();
	3165	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2927	3166	Touch();
2928	3167	}
2929	3168	}
..	..	@@ -2980,6 +3219,33 @@
2980	3219	blockloop = false;
2981	3220	}
2982	3221
	3222	+ void TransformChildren()
	3223	+ {
	3224	+ if (toParent != null)
	3225	+ {
	3226	+ for (int i=Size(); --i>=0;)
	3227	+ {
	3228	+ Object3D v = get(i);
	3229	+
	3230	+ if (v.toParent == null)
	3231	+ {
	3232	+ v.toParent = LA.newMatrix();
	3233	+ v.fromParent = LA.newMatrix();
	3234	+ }
	3235	+
	3236	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3237	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3238	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3239	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3240	+ }
	3241	+
	3242	+ toParent = null; // LA.matIdentity(toParent);
	3243	+ fromParent = null; // LA.matIdentity(fromParent);
	3244	+
	3245	+ Touch();
	3246	+ }
	3247	+ }
	3248	+
2983	3249	void TransformGeometry()
2984	3250	{
2985	3251	Object3D obj = this;
..	..	@@ -3201,9 +3467,11 @@
3201	3467
3202	3468	BoundaryRep sup = bRep.support;
3203	3469	bRep.support = null;
3204		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3470	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3205	3471	// bRep.SplitInTwo(onlyone); // thread...
3206		- temprep.SplitInTwo(reduction34, onlyone);
	3472	+
	3473	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3474	+
3207	3475	bRep = temprep;
3208	3476	bRep.support = sup;
3209	3477	Touch();
..	..	@@ -3340,7 +3608,8 @@
3340	3608	if (blockloop)
3341	3609	return;
3342	3610
3343		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3611	+ if (//marked \|\| // does not make sense
	3612	+ (bRep != null \|\| material != null)) // borderline...
3344	3613	live = h;
3345	3614
3346	3615	for (int i = 0; i < Size(); i++)
..	..	@@ -3361,7 +3630,8 @@
3361	3630	return;
3362	3631
3363	3632	//if (bRep != null)
3364		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3633	+ if (//marked \|\| // does not make sense
	3634	+ (bRep != null \|\| material != null)) // borderline...
3365	3635	link2master = h;
3366	3636
3367	3637	for (int i = 0; i < Size(); i++)
..	..	@@ -3381,7 +3651,8 @@
3381	3651	if (blockloop)
3382	3652	return;
3383	3653
3384		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3654	+ if (//marked \|\| // does not make sense
	3655	+ (bRep != null \|\| material != null)) // borderline...
3385	3656	hide = h;
3386	3657
3387	3658	for (int i = 0; i < Size(); i++)
..	..	@@ -3401,7 +3672,7 @@
3401	3672	if (blockloop)
3402	3673	return;
3403	3674
3404		- if (bRep != null && material != null) // borderline...
	3675	+ if (bRep != null \|\| material != null) // borderline...
3405	3676	marked = h;
3406	3677
3407	3678	for (int i = 0; i < Size(); i++)
..	..	@@ -3411,6 +3682,46 @@
3411	3682	continue;
3412	3683	blockloop = true;
3413	3684	child.MarkLeaves(h);
	3685	+ blockloop = false;
	3686	+ // release(i);
	3687	+ }
	3688	+ }
	3689	+
	3690	+ void RewindLeaves(boolean h)
	3691	+ {
	3692	+ if (blockloop)
	3693	+ return;
	3694	+
	3695	+ if (bRep != null \|\| material != null) // borderline...
	3696	+ rewind = h;
	3697	+
	3698	+ for (int i = 0; i < Size(); i++)
	3699	+ {
	3700	+ Object3D child = (Object3D) get(i); // reserve(i);
	3701	+ if (child == null)
	3702	+ continue;
	3703	+ blockloop = true;
	3704	+ child.RewindLeaves(h);
	3705	+ blockloop = false;
	3706	+ // release(i);
	3707	+ }
	3708	+ }
	3709	+
	3710	+ void RandomLeaves(boolean h)
	3711	+ {
	3712	+ if (blockloop)
	3713	+ return;
	3714	+
	3715	+ if (bRep != null \|\| material != null) // borderline...
	3716	+ random = h;
	3717	+
	3718	+ for (int i = 0; i < Size(); i++)
	3719	+ {
	3720	+ Object3D child = (Object3D) get(i); // reserve(i);
	3721	+ if (child == null)
	3722	+ continue;
	3723	+ blockloop = true;
	3724	+ child.RandomLeaves(h);
3414	3725	blockloop = false;
3415	3726	// release(i);
3416	3727	}
..	..	@@ -3725,7 +4036,7 @@
3725	4036	if (child == null)
3726	4037	continue;
3727	4038
3728		- if (GrafreeD.RENDERME > 0)
	4039	+ if (Grafreed.RENDERME > 0)
3729	4040	{
3730	4041	if (child instanceof Merge)
3731	4042	((Merge)child).renderme();
..	..	@@ -3876,7 +4187,7 @@
3876	4187	if (child == null)
3877	4188	continue;
3878	4189
3879		- if (GrafreeD.RENDERME > 0)
	4190	+ if (Grafreed.RENDERME > 0)
3880	4191	{
3881	4192	if (child instanceof Merge)
3882	4193	((Merge)child).renderme();
..	..	@@ -4071,7 +4382,7 @@
4071	4382	if (child == null)
4072	4383	continue;
4073	4384
4074		- if (GrafreeD.RENDERME > 0)
	4385	+ if (Grafreed.RENDERME > 0)
4075	4386	{
4076	4387	if (child instanceof Merge)
4077	4388	((Merge)child).renderme();
..	..	@@ -4184,6 +4495,55 @@
4184	4495	{
4185	4496	blockloop = true;
4186	4497	get(i).RepairShadow();
	4498	+ blockloop = false;
	4499	+ }
	4500	+ }
	4501	+
	4502	+ void RepairSOV()
	4503	+ {
	4504	+ if (blockloop)
	4505	+ return;
	4506	+
	4507	+ String texname = this.GetPigmentTexture();
	4508	+
	4509	+ if (texname.startsWith("sov"))
	4510	+ {
	4511	+ String[] s = texname.split("/");
	4512	+
	4513	+ String[] sname = s[1].split("Color.pn");
	4514	+
	4515	+ texname = sname[0];
	4516	+
	4517	+ if (sname.length > 1)
	4518	+ {
	4519	+ texname += "Color.jpg";
	4520	+ }
	4521	+
	4522	+ this.SetPigmentTexture("sov/" + texname);
	4523	+ }
	4524	+
	4525	+ texname = this.GetBumpTexture();
	4526	+
	4527	+ if (texname.startsWith("sov"))
	4528	+ {
	4529	+ String[] s = texname.split("/");
	4530	+
	4531	+ String[] sname = s[1].split("Bump.pn");
	4532	+
	4533	+ texname = sname[0];
	4534	+
	4535	+ if (sname.length > 1)
	4536	+ {
	4537	+ texname += "Bump.jpg";
	4538	+ }
	4539	+
	4540	+ this.SetBumpTexture("sov/" + texname);
	4541	+ }
	4542	+
	4543	+ for (int i=0; i<Size(); i++)
	4544	+ {
	4545	+ blockloop = true;
	4546	+ get(i).RepairSOV();
4187	4547	blockloop = false;
4188	4548	}
4189	4549	}
..	..	@@ -4678,7 +5038,7 @@
4678	5038
4679	5039	cTreePath SelectLeaf(int indexcount, boolean deselect)
4680	5040	{
4681		- if (hide)
	5041	+ if (hide \|\| dontselect)
4682	5042	return null;
4683	5043
4684	5044	if (count <= 0)
..	..	@@ -4702,9 +5062,17 @@
4702	5062	}
4703	5063	}
4704	5064
	5065	+ ObjEditor GetWindow()
	5066	+ {
	5067	+ if (editWindow != null)
	5068	+ return editWindow;
	5069	+
	5070	+ return manipWindow;
	5071	+ }
	5072	+
4705	5073	cTreePath Select(int indexcount, boolean deselect)
4706	5074	{
4707		- if (hide)
	5075	+ if (hide \|\| dontselect)
4708	5076	return null;
4709	5077
4710	5078	if (count <= 0)
..	..	@@ -4738,10 +5106,11 @@
4738	5106	if (leaf != null)
4739	5107	{
4740	5108	cTreePath tp = new cTreePath(this, leaf);
4741		- if (editWindow != null)
	5109	+ ObjEditor window = GetWindow();
	5110	+ if (window != null)
4742	5111	{
4743	5112	//System.out.println("editWindow = " + editWindow + " vs " + this);
4744		- editWindow.Select(tp, deselect, true);
	5113	+ window.Select(tp, deselect, true);
4745	5114	}
4746	5115
4747	5116	return tp;
..	..	@@ -4758,6 +5127,7 @@
4758	5127
4759	5128	if (child == null)
4760	5129	continue;
	5130	+
4761	5131	if (child.HasTransparency() && child.size() != 0)
4762	5132	{
4763	5133	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4767,9 +5137,10 @@
4767	5137	if (leaf != null)
4768	5138	{
4769	5139	cTreePath tp = new cTreePath(this, leaf);
4770		- if (editWindow != null)
	5140	+ ObjEditor window = GetWindow();
	5141	+ if (window != null)
4771	5142	{
4772		- editWindow.Select(tp, deselect, true);
	5143	+ window.Select(tp, deselect, true);
4773	5144	}
4774	5145
4775	5146	return tp;
..	..	@@ -5094,6 +5465,51 @@
5094	5465	blockloop = false;
5095	5466	}
5096	5467
	5468	+ void ResetSelectable()
	5469	+ {
	5470	+ if (blockloop)
	5471	+ return;
	5472	+
	5473	+ blockloop = true;
	5474	+
	5475	+ keepdontselect = dontselect;
	5476	+ dontselect = true;
	5477	+
	5478	+ Object3D child;
	5479	+ int nb = Size();
	5480	+ for (int i = 0; i < nb; i++)
	5481	+ {
	5482	+ child = (Object3D) get(i);
	5483	+ if (child == null)
	5484	+ continue;
	5485	+ child.ResetSelectable();
	5486	+ }
	5487	+
	5488	+ blockloop = false;
	5489	+ }
	5490	+
	5491	+ void RestoreSelectable()
	5492	+ {
	5493	+ if (blockloop)
	5494	+ return;
	5495	+
	5496	+ blockloop = true;
	5497	+
	5498	+ dontselect = keepdontselect;
	5499	+
	5500	+ Object3D child;
	5501	+ int nb = Size();
	5502	+ for (int i = 0; i < nb; i++)
	5503	+ {
	5504	+ child = (Object3D) get(i);
	5505	+ if (child == null)
	5506	+ continue;
	5507	+ child.RestoreSelectable();
	5508	+ }
	5509	+
	5510	+ blockloop = false;
	5511	+ }
	5512	+
5097	5513	boolean IsSelected()
5098	5514	{
5099	5515	if (parent == null)
..	..	@@ -5156,10 +5572,34 @@
5156	5572
5157	5573	// System.out.println("Fullname = " + fullname);
5158	5574
5159		- if (fullname.name.indexOf(":") == -1)
5160		- return fullname.name;
	5575	+ // Does not work on Windows due to C:
	5576	+// if (fullname.name.indexOf(":") == -1)
	5577	+// return fullname.name;
	5578	+//
	5579	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5161	5580
5162		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5581	+ String[] split = fullname.name.split(":");
	5582	+
	5583	+ if (split.length == 0)
	5584	+ {
	5585	+ return "";
	5586	+ }
	5587	+
	5588	+ if (split.length <= 2)
	5589	+ {
	5590	+ if (fullname.name.endsWith(":"))
	5591	+ {
	5592	+ // Windows
	5593	+ return fullname.name.substring(0, fullname.name.length()-1);
	5594	+ }
	5595	+
	5596	+ return split[0];
	5597	+ }
	5598	+
	5599	+ // Windows
	5600	+ assert(split.length == 4);
	5601	+
	5602	+ return split[0] + ":" + split[1];
5163	5603	}
5164	5604
5165	5605	static String GetBump(cTexture fullname)
..	..	@@ -5168,10 +5608,38 @@
5168	5608	return "";
5169	5609
5170	5610	// System.out.println("Fullname = " + fullname);
5171		- if (fullname.name.indexOf(":") == -1)
5172		- return "";
5173		-
5174		- return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5611	+ // Does not work on Windows due to C:
	5612	+// if (fullname.name.indexOf(":") == -1)
	5613	+// return "";
	5614	+//
	5615	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5616	+ String[] split = fullname.name.split(":");
	5617	+
	5618	+ if (split.length == 0)
	5619	+ {
	5620	+ return "";
	5621	+ }
	5622	+
	5623	+ if (split.length == 1)
	5624	+ {
	5625	+ return "";
	5626	+ }
	5627	+
	5628	+ if (split.length == 2)
	5629	+ {
	5630	+ if (fullname.name.endsWith(":"))
	5631	+ {
	5632	+ // Windows
	5633	+ return "";
	5634	+ }
	5635	+
	5636	+ return split[1];
	5637	+ }
	5638	+
	5639	+ // Windows
	5640	+ assert(split.length == 4);
	5641	+
	5642	+ return split[2] + ":" + split[3];
5175	5643	}
5176	5644
5177	5645	String GetPigmentTexture()
..	..	@@ -5245,7 +5713,7 @@
5245	5713	System.out.print("; textures = " + textures);
5246	5714	System.out.println("; usedtextures = " + usedtextures);
5247	5715
5248		- if (GetTextures() == null)
	5716	+ if (GetTextures() == null) // What is that??
5249	5717	GetTextures().name = ":";
5250	5718
5251	5719	String texname = tex;
..	..	@@ -5276,6 +5744,43 @@
5276	5744	child.ResetPigmentTexture();
5277	5745	blockloop = false;
5278	5746	}
	5747	+ }
	5748	+
	5749	+ UUID GetUUID()
	5750	+ {
	5751	+ if (uuid == null)
	5752	+ {
	5753	+ // Serial
	5754	+ uuid = UUID.randomUUID();
	5755	+ }
	5756	+
	5757	+ return uuid;
	5758	+ }
	5759	+
	5760	+ Object3D GetObject(UUID uid)
	5761	+ {
	5762	+ if (blockloop)
	5763	+ return null;
	5764	+
	5765	+ if (GetUUID().equals(uid))
	5766	+ return this;
	5767	+
	5768	+ int nb = Size();
	5769	+ for (int i = 0; i < nb; i++)
	5770	+ {
	5771	+ Object3D child = (Object3D) get(i);
	5772	+
	5773	+ if (child == null)
	5774	+ continue;
	5775	+
	5776	+ blockloop = true;
	5777	+ Object3D obj = child.GetObject(uid);
	5778	+ blockloop = false;
	5779	+ if (obj != null)
	5780	+ return obj;
	5781	+ }
	5782	+
	5783	+ return null;
5279	5784	}
5280	5785
5281	5786	void SetBumpTexture(String tex)
..	..	@@ -5314,6 +5819,38 @@
5314	5819	}
5315	5820	}
5316	5821
	5822	+ void EmbedTextures(boolean embed)
	5823	+ {
	5824	+ if (blockloop)
	5825	+ return;
	5826	+
	5827	+ //if (GetTextures() != null)
	5828	+ if (embed)
	5829	+ CameraPane.EmbedTextures(GetTextures());
	5830	+ else
	5831	+ {
	5832	+ GetTextures().pigmentdata = null;
	5833	+ GetTextures().bumpdata = null;
	5834	+ GetTextures().pw = 0;
	5835	+ GetTextures().ph = 0;
	5836	+ GetTextures().bw = 0;
	5837	+ GetTextures().bh = 0;
	5838	+ }
	5839	+
	5840	+ int nb = Size();
	5841	+ for (int i = 0; i < nb; i++)
	5842	+ {
	5843	+ Object3D child = (Object3D) get(i);
	5844	+
	5845	+ if (child == null)
	5846	+ continue;
	5847	+
	5848	+ blockloop = true;
	5849	+ child.EmbedTextures(embed);
	5850	+ blockloop = false;
	5851	+ }
	5852	+ }
	5853	+
5317	5854	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5318	5855	{
5319	5856	Draw(display, root, selected, blocked);
..	..	@@ -5322,12 +5859,23 @@
5322	5859	boolean NeedSupport()
5323	5860	{
5324	5861	return
5325		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5862	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5326	5863	// PROBLEM with CROWD!!
5327		- && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
	5864	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5328	5865	}
5329	5866
5330	5867	static boolean DEBUG_SELECTION = false;
	5868	+
	5869	+ boolean IsLive()
	5870	+ {
	5871	+ if (live)
	5872	+ return true;
	5873	+
	5874	+ if (parent == null)
	5875	+ return false;
	5876	+
	5877	+ return parent.IsLive();
	5878	+ }
5331	5879
5332	5880	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5333	5881	{
..	..	@@ -5339,7 +5887,7 @@
5339	5887	}
5340	5888
5341	5889	if (display.DrawMode() == iCameraPane.SELECTION &&
5342		- hide)
	5890	+ (hide \|\| dontselect))
5343	5891	return;
5344	5892
5345	5893	if (name != null && name.contains("sclera"))
..	..	@@ -5371,7 +5919,7 @@
5371	5919	return;
5372	5920	}
5373	5921
5374		- javax.media.opengl.GL gl = display.GetGL();
	5922	+ //javax.media.opengl.GL gl = display.GetGL();
5375	5923
5376	5924	/*
5377	5925	if (touched)
..	..	@@ -5389,8 +5937,10 @@
5389	5937	if (support != null)
5390	5938	support = support;
5391	5939
5392		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5393		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5940	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5941	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5942	+
	5943	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5394	5944
5395	5945	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5396	5946	{
..	..	@@ -5400,8 +5950,9 @@
5400	5950	// usecalllists &= !(parent instanceof RandomNode);
5401	5951	// usecalllists = false;
5402	5952
5403		- if (GetBRep() != null)
5404		- usecalllists = usecalllists;
	5953	+ if (display.DrawMode() == display.SHADOW)
	5954	+ //GetBRep() != null)
	5955	+ usecalllists = !!usecalllists;
5405	5956	//System.out.println("draw " + this);
5406	5957	//new Exception().printStackTrace();
5407	5958
..	..	@@ -5410,10 +5961,12 @@
5410	5961	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5411	5962
5412	5963	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5413		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5964	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5965	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5414	5966	{
5415	5967	Globals.lighttouched = true;
5416	5968	} // all panes...
	5969	+
5417	5970	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5418	5971	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5419	5972	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5421,9 +5974,9 @@
5421	5974	if (!(this instanceof Composite))
5422	5975	touched = false;
5423	5976	//if (displaylist == -1 && usecalllists)
5424		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5977	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5425	5978	{
5426		- bRep.displaylist = gl.glGenLists(1);
	5979	+ bRep.displaylist = display.GenList();
5427	5980	assert(bRep.displaylist != 0);
5428	5981	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5429	5982	//System.out.println("\tgen list " + list);
..	..	@@ -5432,17 +5985,19 @@
5432	5985
5433	5986	//System.out.println("\tnew list " + list);
5434	5987	//gl.glDrawBuffer(gl.GL_NONE);
5435		- if (usecalllists)
	5988	+ if (usecalllists && bRep.displaylist > 0)
5436	5989	{
5437	5990	// System.err.println("new list " + bRep.displaylist + " for " + this);
5438		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5991	+ display.NewList(bRep.displaylist);
5439	5992	}
	5993	+
5440	5994	CallList(display, root, selected, blocked);
	5995	+
5441	5996	// compiled = true;
5442		- if (usecalllists)
	5997	+ if (usecalllists && bRep.displaylist > 0)
5443	5998	{
5444	5999	// System.err.println("end list " + bRep.displaylist + " for " + this);
5445		- gl.glEndList();
	6000	+ display.EndList();
5446	6001	}
5447	6002	//gl.glDrawBuffer(gl.GL_BACK);
5448	6003	// XXX touched = false;
..	..	@@ -5490,7 +6045,7 @@
5490	6045	if (display.DrawMode() == iCameraPane.SHADOW)
5491	6046	{
5492	6047	if (!link2master // tricky to cull in shadow mode.
5493		- && GetBRep().FrustumCull(this, gl, display.LightCamera(), true))
	6048	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5494	6049	{
5495	6050	//System.out.print("CULLED");
5496	6051	culled = true;
..	..	@@ -5498,7 +6053,7 @@
5498	6053	}
5499	6054	else
5500	6055	//GetBRep().getBounds(v0, v1, this);
5501		- if (GetBRep().FrustumCull(this, gl, display.RenderCamera(), false))
	6056	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5502	6057	culled = true;
5503	6058
5504	6059	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5538,7 +6093,8 @@
5538	6093	{
5539	6094	if (GetBRep() != null)
5540	6095	{
5541		- CameraPane.NextIndex(this, gl);
	6096	+ display.NextIndex();
	6097	+
5542	6098	// vertex color conflict : gl.glCallList(list);
5543	6099	DrawNode(display, root, selected);
5544	6100	if (this instanceof BezierPatch)
..	..	@@ -5579,7 +6135,28 @@
5579	6135	tex = GetTextures();
5580	6136	}
5581	6137
5582		- display.BindTextures(tex, texres);
	6138	+ boolean failedPigment = false;
	6139	+ boolean failedBump = false;
	6140	+
	6141	+ try
	6142	+ {
	6143	+ display.BindPigmentTexture(tex, texres);
	6144	+ }
	6145	+ catch (Exception e)
	6146	+ {
	6147	+ System.err.println("FAILED: " + this);
	6148	+ failedPigment = true;
	6149	+ }
	6150	+
	6151	+ try
	6152	+ {
	6153	+ display.BindBumpTexture(tex, texres);
	6154	+ }
	6155	+ catch (Exception e)
	6156	+ {
	6157	+ //System.err.println("FAILED: " + this);
	6158	+ failedBump = true;
	6159	+ }
5583	6160
5584	6161	if (!compiled)
5585	6162	{
..	..	@@ -5595,13 +6172,17 @@
5595	6172
5596	6173	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5597	6174	assert(bRep.displaylist != 0);
5598		- gl.glCallList(bRep.displaylist);
	6175	+ display.CallList(bRep.displaylist);
5599	6176	// june 2013 drawSelf(display, root, selected);
5600	6177	}
5601	6178	}
5602	6179	}
5603	6180
5604		- display.ReleaseTextures(tex);
	6181	+ if (!failedBump)
	6182	+ display.ReleaseBumpTexture(tex);
	6183	+
	6184	+ if (!failedPigment)
	6185	+ display.ReleasePigmentTexture(tex);
5605	6186
5606	6187	display.PopMaterial(this, selected);
5607	6188	}
..	..	@@ -5730,6 +6311,9 @@
5730	6311
5731	6312	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5732	6313	{
	6314	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6315	+ return;
	6316	+
5733	6317	if (hide)
5734	6318	return;
5735	6319	// shadow optimisation
..	..	@@ -5855,6 +6439,9 @@
5855	6439	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5856	6440	return; // no shadow for transparent objects
5857	6441
	6442	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6443	+ return;
	6444	+
5858	6445	if (hide)
5859	6446	return;
5860	6447
..	..	@@ -5895,9 +6482,10 @@
5895	6482	return;
5896	6483	}
5897	6484
	6485	+ //bRep.GenUV(1/material.diffuseness);
5898	6486	// bRep.lock = true;
5899	6487
5900		- javax.media.opengl.GL gl = display.GetGL();
	6488	+ //javax.media.opengl.GL gl = display.GetGL();
5901	6489
5902	6490	if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5903	6491	{
..	..	@@ -5914,23 +6502,7 @@
5914	6502
5915	6503	bRep.getMinMax(min, max, 100);
5916	6504
5917		- gl.glBegin(gl.GL_LINES);
5918		-
5919		- gl.glVertex3d(min.x, min.y, min.z);
5920		- gl.glVertex3d(min.x, min.y, max.z);
5921		- gl.glVertex3d(min.x, min.y, min.z);
5922		- gl.glVertex3d(min.x, max.y, min.z);
5923		- gl.glVertex3d(min.x, min.y, min.z);
5924		- gl.glVertex3d(max.x, min.y, min.z);
5925		-
5926		- gl.glVertex3d(max.x, max.y, max.z);
5927		- gl.glVertex3d(min.x, max.y, max.z);
5928		- gl.glVertex3d(max.x, max.y, max.z);
5929		- gl.glVertex3d(max.x, min.y, max.z);
5930		- gl.glVertex3d(max.x, max.y, max.z);
5931		- gl.glVertex3d(max.x, max.y, min.z);
5932		-
5933		- gl.glEnd();
	6505	+ display.DrawBox(min, max);
5934	6506
5935	6507	return;
5936	6508	}
..	..	@@ -5984,178 +6556,19 @@
5984	6556	new Exception().printStackTrace();
5985	6557	return;
5986	6558	}
5987		-
5988		- // TRIANGLE STRIP ARRAY
5989		- if (bRep.trimmed)
	6559	+
	6560	+ if (dontselect)
5990	6561	{
5991		- float[] v = bRep.getRawVertices();
5992		- float[] n = bRep.getRawNormals();
5993		- float[] c = bRep.getRawColors();
5994		- float[] uv = bRep.getRawUVMap();
5995		-
5996		- int count2 = 0;
5997		- int count3 = 0;
5998		-
5999		- if (n.length > 0)
6000		- {
6001		- for (int i = 0; i < strips.length; i++)
6002		- {
6003		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6004		-
6005		- /*
6006		- boolean locked = false;
6007		- float eps = 0.1f;
6008		- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6009		-
6010		- int dot = 0;
6011		-
6012		- if ((dot&1) == 0)
6013		- dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6014		-
6015		- if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6016		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6017		- else
6018		- {
6019		- locked = true;
6020		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6021		- }
6022		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6023		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6024		- if (hasnorm)
6025		- {
6026		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6027		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6028		- }
6029		-
6030		- if ((dot&4) == 0)
6031		- dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6032		-
6033		- if (wrap \|\| !locked && (dot&8) != 0)
6034		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6035		- else
6036		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6037		-
6038		- f.dot = dot;
6039		- */
6040		-
6041		- if (!selectmode)
6042		- {
6043		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6044		- {
6045		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6046		- } else
6047		- {
6048		- gl.glNormal3f(0, 0, 1);
6049		- }
6050		-
6051		- if (c != null)
6052		- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
6053		- {
6054		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6055		- }
6056		- }
6057		- if (flipV)
6058		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6059		- else
6060		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6061		- //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6062		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6063		-
6064		- count2 += 2;
6065		- count3 += 3;
6066		- if (!selectmode)
6067		- {
6068		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6069		- {
6070		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6071		- } else
6072		- {
6073		- gl.glNormal3f(0, 0, 1);
6074		- }
6075		- if (c != null)
6076		- {
6077		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6078		- }
6079		- }
6080		- if (flipV)
6081		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6082		- else
6083		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6084		- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6085		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6086		-
6087		- count2 += 2;
6088		- count3 += 3;
6089		- for (int j = 0; j < strips[i] - 2; j++)
6090		- {
6091		- //gl.glTexCoord2d(...);
6092		- if (!selectmode)
6093		- {
6094		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6095		- {
6096		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6097		- } else
6098		- {
6099		- gl.glNormal3f(0, 0, 1);
6100		- }
6101		- if (c != null)
6102		- {
6103		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6104		- }
6105		- }
6106		-
6107		- if (flipV)
6108		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6109		- else
6110		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6111		- //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6112		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6113		- count2 += 2;
6114		- count3 += 3;
6115		- }
6116		-
6117		- gl.glEnd();
6118		- }
6119		- }
6120		-
6121		- assert count3 == v.length;
	6562	+ //bRep.GenerateNormalsMINE();
6122	6563	}
6123		- else // !trimmed
6124		- {
6125		- int count = 0;
6126		- for (int i = 0; i < strips.length; i++)
6127		- {
6128		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6129		-
6130		- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6131		- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6132		-
6133		- drawVertex(gl, p, selectmode);
6134		- drawVertex(gl, q, selectmode);
6135		-
6136		- for (int j = 0; j < strips[i] - 2; j++)
6137		- {
6138		- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6139		-
6140		-// if (j%2 == 0)
6141		-// drawFace(p, q, r, display, null);
6142		-// else
6143		-// drawFace(p, r, q, display, null);
6144		-
6145		-// p = q;
6146		-// q = r;
6147		- drawVertex(gl, r, selectmode);
6148		- }
6149		-
6150		- gl.glEnd();
6151		- }
6152		- }
	6564	+
	6565	+ display.DrawGeometry(bRep, flipV, selectmode);
6153	6566	} else // catch (Error e)
6154	6567	{
6155	6568	// TRIANGLE ARRAY
6156	6569	if (IsOpaque()) // Static())
6157	6570	{
6158		- gl.glBegin(gl.GL_TRIANGLES);
	6571	+ display.StartTriangles();
6159	6572	int facecount = bRep.FaceCount();
6160	6573	for (int i = 0; i < facecount; i++)
6161	6574	{
..	..	@@ -6220,7 +6633,7 @@
6220	6633
6221	6634	display.DrawFace(this, p, q, r, face);
6222	6635	}
6223		- gl.glEnd();
	6636	+ display.EndTriangles();
6224	6637	}
6225	6638	else
6226	6639	{
..	..	@@ -6249,8 +6662,8 @@
6249	6662	//System.out.println("SORT");
6250	6663
6251	6664	java.util.Arrays.sort(facescompare);
6252		-
6253		- gl.glBegin(gl.GL_TRIANGLES);
	6665	+
	6666	+ display.StartTriangles();
6254	6667	for (int i = 0; i < facecount; i++)
6255	6668	{
6256	6669	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6264,11 +6677,12 @@
6264	6677
6265	6678	display.DrawFace(this, p, q, r, face);
6266	6679	}
6267		- gl.glEnd();
	6680	+ display.EndTriangles();
6268	6681	}
6269	6682
6270	6683	if (false) // live && support != null && support.bRep != null) // debug weights
6271	6684	{
	6685	+ /*
6272	6686	gl.glDisable(gl.GL_LIGHTING);
6273	6687	float[] colorV = new float[3];
6274	6688
..	..	@@ -6347,6 +6761,7 @@
6347	6761	// gl.glEnd();
6348	6762	}
6349	6763	}
	6764	+ */
6350	6765	}
6351	6766	}
6352	6767
..	..	@@ -6405,22 +6820,6 @@
6405	6820	void Print(Vertex v)
6406	6821	{
6407	6822	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6408		- }
6409		-
6410		- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6411		- {
6412		- if (!selectmode)
6413		- {
6414		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6415		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6416		-
6417		- if (flipV)
6418		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6419		- else
6420		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6421		- }
6422		-
6423		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6424	6823	}
6425	6824
6426	6825	void drawSelf(ClickInfo info, int level, boolean select)
..	..	@@ -6946,20 +7345,23 @@
6946	7345	}
6947	7346	}
6948	7347
6949		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7348	+ static ClickInfo clickInfo = new ClickInfo();
	7349	+
	7350	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7351	+ Point outPt, Rectangle outRec)
6950	7352	{
6951		- int hc = info.bounds.x + info.bounds.width / 2;
6952		- int vc = info.bounds.y + info.bounds.height / 2;
6953		- double[][] toscreen = info.toScreen;
	7353	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7354	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7355	+ double[][] toscreen = clickInfo.toScreen;
6954	7356	if (toscreen == null)
6955	7357	{
6956		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7358	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6957	7359	}
6958	7360	cVector vec = in;
6959	7361	LA.xformPos(in, toscreen, in);
6960	7362	//System.out.println("Distance = " + info.camera.Distance());
6961		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
6962		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7363	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7364	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6963	7365	outPt.x = hc + (int) vec.x;
6964	7366	outPt.y = vc - (int) vec.y;
6965	7367	outRec.x = outPt.x - 3;
..	..	@@ -6967,15 +7369,18 @@
6967	7369	outRec.width = outRec.height = 6;
6968	7370	}
6969	7371
6970		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7372	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7373	+ )
6971	7374	{
6972	7375	Point pt = new Point(0, 0);
6973	7376	Rectangle rec = new Rectangle();
6974		- calcHotSpot(in, info, pt, rec);
	7377	+ calcHotSpot(in, //clickInfo,
	7378	+ pt, rec);
6975	7379	return rec;
6976	7380	}
6977	7381
6978		- void drawEditHandles0(ClickInfo info, int level)
	7382	+ void drawEditHandles0(//ClickInfo clickInfo,
	7383	+ int level)
6979	7384	{
6980	7385	if (level == 0)
6981	7386	{
..	..	@@ -6984,16 +7389,19 @@
6984	7389	{
6985	7390	cVector origin = new cVector();
6986	7391	//LA.xformPos(origin, toParent, origin);
6987		- Rectangle spot = calcHotSpot(origin, info);
	7392	+ if (this.clickInfo == null)
	7393	+ this.clickInfo = new ClickInfo();
	7394	+
	7395	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
6988	7396	Rectangle boundary = new Rectangle();
6989	7397	boundary.x = spot.x - 30;
6990	7398	boundary.y = spot.y - 30;
6991	7399	boundary.width = spot.width + 60;
6992	7400	boundary.height = spot.height + 60;
6993		- info.g.setColor(Color.red);
	7401	+ clickInfo.g.setColor(Color.red);
6994	7402	int spotw = spot.x + spot.width;
6995	7403	int spoth = spot.y + spot.height;
6996		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7404	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6997	7405	// if (CameraPane.Xmin > spot.x)
6998	7406	// {
6999	7407	// CameraPane.Xmin = spot.x;
..	..	@@ -7013,8 +7421,8 @@
7013	7421	spot.translate(32, 32);
7014	7422	spotw = spot.x + spot.width;
7015	7423	spoth = spot.y + spot.height;
7016		- info.g.setColor(Color.blue);
7017		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7424	+ clickInfo.g.setColor(Color.cyan);
	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,12 @@
7031	7439	// {
7032	7440	// CameraPane.Ymax = spoth;
7033	7441	// }
7034		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7035		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7442	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7443	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7036	7444	spot.translate(0, -32);
7037		- info.g.setColor(Color.green);
7038		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7445	+ clickInfo.g.setColor(Color.yellow);
	7446	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7447	+ clickInfo.g.setColor(Color.green);
7039	7448	// if (CameraPane.Xmin > spot.x)
7040	7449	// {
7041	7450	// CameraPane.Xmin = spot.x;
..	..	@@ -7052,8 +7461,8 @@
7052	7461	// {
7053	7462	// CameraPane.Ymax = spoth;
7054	7463	// }
7055		- info.g.drawArc(boundary.x, boundary.y,
7056		- boundary.width, boundary.height, 0, 360);
	7464	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7465	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7057	7466	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7058	7467	// if (CameraPane.Xmin > boundary.x)
7059	7468	// {
..	..	@@ -7075,7 +7484,8 @@
7075	7484	}
7076	7485	}
7077	7486
7078		- boolean doEditClick0(ClickInfo info, int level)
	7487	+ boolean doEditClick0(//ClickInfo clickInfo,
	7488	+ int level)
7079	7489	{
7080	7490	if (level == 0)
7081	7491	{
..	..	@@ -7084,10 +7494,10 @@
7084	7494
7085	7495	boolean retval = false;
7086	7496
7087		- startX = info.x;
7088		- startY = info.y;
	7497	+ startX = clickInfo.x;
	7498	+ startY = clickInfo.y;
7089	7499
7090		- hitSomething = 0;
	7500	+ hitSomething = -1;
7091	7501	cVector origin = new cVector();
7092	7502	//LA.xformPos(origin, toParent, origin);
7093	7503	Rectangle spot = new Rectangle();
..	..	@@ -7095,22 +7505,51 @@
7095	7505	{
7096	7506	centerPt = new Point(0, 0);
7097	7507	}
7098		- calcHotSpot(origin, info, centerPt, spot);
7099		- if (spot.contains(info.x, info.y))
	7508	+ calcHotSpot(origin, //info,
	7509	+ centerPt, spot);
	7510	+ if (spot.contains(clickInfo.x, clickInfo.y))
7100	7511	{
7101	7512	hitSomething = hitCenter;
7102	7513	retval = true;
7103	7514	}
7104	7515	spot.translate(32, 0);
7105		- if (spot.contains(info.x, info.y))
	7516	+ if (spot.contains(clickInfo.x, clickInfo.y))
7106	7517	{
7107	7518	hitSomething = hitRotate;
7108	7519	retval = true;
7109	7520	}
7110	7521	spot.translate(0, 32);
7111		- if (spot.contains(info.x, info.y))
	7522	+ if (spot.contains(clickInfo.x, clickInfo.y))
7112	7523	{
7113	7524	hitSomething = hitScale;
	7525	+
	7526	+ double scale = 0.005f * clickInfo.camera.Distance();
	7527	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7528	+ double sign = 1;
	7529	+ if (hScale < 0)
	7530	+ {
	7531	+ sign = -1;
	7532	+ }
	7533	+ hScale = signMath.pow(signhScale, scale * 50);
	7534	+ if (hScale < 0.01)
	7535	+ {
	7536	+ //hScale = 0.01;
	7537	+ }
	7538	+
	7539	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7540	+ sign = 1;
	7541	+ if (vScale < 0)
	7542	+ {
	7543	+ sign = -1;
	7544	+ }
	7545	+ vScale = signMath.pow(signvScale, scale * 50);
	7546	+ if (vScale < 0.01)
	7547	+ {
	7548	+ //vScale = 0.01;
	7549	+ }
	7550	+
	7551	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7552	+
7114	7553	retval = true;
7115	7554	}
7116	7555
..	..	@@ -7120,7 +7559,7 @@
7120	7559	}
7121	7560
7122	7561	//System.out.println("info.modifiers = " + info.modifiers);
7123		- modified = (info.modifiers & CameraPane.META) != 0;
	7562	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7124	7563	//System.out.println("modified = " + modified);
7125	7564	//new Exception().printStackTrace();
7126	7565	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7148,7 +7587,8 @@
7148	7587	return true;
7149	7588	}
7150	7589
7151		- void doEditDrag0(ClickInfo info)
	7590	+ void doEditDrag0(//ClickInfo info,
	7591	+ boolean opposite)
7152	7592	{
7153	7593	if (hitSomething == 0)
7154	7594	{
..	..	@@ -7162,7 +7602,8 @@
7162	7602
7163	7603	//System.out.println("hitSomething = " + hitSomething);
7164	7604
7165		- double scale = 0.005f * info.camera.Distance();
	7605	+ double scale = 0.005f * clickInfo.camera.Distance();
	7606	+
7166	7607	cVector xlate = new cVector();
7167	7608	//cVector xlate2 = new cVector();
7168	7609	switch (hitSomething)
..	..	@@ -7175,7 +7616,7 @@
7175	7616
7176	7617	scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7177	7618
7178		- if (modified)
	7619	+ if (modified \|\| opposite)
7179	7620	{
7180	7621	//assert(false);
7181	7622	/*
..	..	@@ -7195,8 +7636,8 @@
7195	7636	toParent[3][i] = xlate.get(i);
7196	7637	LA.matInvert(toParent, fromParent);
7197	7638	*/
7198		- cVector delta = LA.newVector(0, 0, startY - info.y);
7199		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7639	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7640	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7200	7641
7201	7642	LA.matCopy(startMat, toParent);
7202	7643	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7205,7 +7646,7 @@
7205	7646	} else
7206	7647	{
7207	7648	//LA.xformDir(delta, info.camera.fromScreen, delta);
7208		- cVector up = new cVector(info.camera.up);
	7649	+ cVector up = new cVector(clickInfo.camera.up);
7209	7650	cVector away = new cVector();
7210	7651	//cVector right2 = new cVector();
7211	7652	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7222,19 +7663,19 @@
7222	7663	LA.xformDir(up, ClickInfo.matbuffer, up);
7223	7664	// if (!CameraPane.LOCALTRANSFORM)
7224	7665	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7225		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7666	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7226	7667	// if (!CameraPane.LOCALTRANSFORM)
7227	7668	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7228	7669	//LA.vecCross(up, cVector.Z, right2);
7229	7670
7230		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7671	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7231	7672
7232	7673	//System.out.println("DELTA0 = " + delta);
7233	7674	//System.out.println("AWAY = " + info.camera.away);
7234	7675	//System.out.println("UP = " + info.camera.up);
7235	7676	if (away.z > 0)
7236	7677	{
7237		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7678	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7238	7679	{
7239	7680	delta.x = -delta.x;
7240	7681	} else
..	..	@@ -7249,7 +7690,7 @@
7249	7690	//System.out.println("DELTA1 = " + delta);
7250	7691	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7251	7692	//System.out.println("DELTA2 = " + delta);
7252		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7693	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7253	7694	LA.matCopy(startMat, toParent);
7254	7695	//System.out.println("DELTA3 = " + delta);
7255	7696	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7259,8 +7700,8 @@
7259	7700	break;
7260	7701
7261	7702	case hitRotate: // rotate
7262		- int dx = info.x - centerPt.x;
7263		- int dy = -(info.y - centerPt.y);
	7703	+ int dx = clickInfo.x - centerPt.x;
	7704	+ int dy = -(clickInfo.y - centerPt.y);
7264	7705	double angle = (double) Math.atan2(dx, dy);
7265	7706	angle = -(1.570796 - angle);
7266	7707
..	..	@@ -7269,6 +7710,7 @@
7269	7710
7270	7711	if (modified)
7271	7712	{
	7713	+ // Rotate 90 degrees
7272	7714	angle /= (Math.PI / 4);
7273	7715	angle = Math.floor(angle + 0.5);
7274	7716	angle *= (Math.PI / 4);
..	..	@@ -7282,7 +7724,7 @@
7282	7724	}
7283	7725	/**/
7284	7726
7285		- switch (info.pane.RenderCamera().viewCode)
	7727	+ switch (clickInfo.pane.RenderCamera().viewCode)
7286	7728	{
7287	7729	case 1: // '\001'
7288	7730	LA.matZRotate(toParent, angle);
..	..	@@ -7309,26 +7751,30 @@
7309	7751	break;
7310	7752
7311	7753	case hitScale: // scale
7312		- double hScale = (double) (info.x - centerPt.x) / 32;
	7754	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7755	+ double sign = 1;
	7756	+ if (hScale < 0)
	7757	+ {
	7758	+ sign = -1;
	7759	+ }
	7760	+ hScale = signMath.pow(signhScale, scale * 50);
7313	7761	if (hScale < 0.01)
7314	7762	{
7315		- hScale = 0.01;
	7763	+ //hScale = 0.01;
7316	7764	}
7317		- hScale = Math.pow(hScale, scale * 50);
7318		- if (hScale < 0.01)
	7765	+
	7766	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7767	+ sign = 1;
	7768	+ if (vScale < 0)
7319	7769	{
7320		- hScale = 0.01;
	7770	+ sign = -1;
7321	7771	}
7322		- double vScale = (double) (info.y - centerPt.y) / 32;
	7772	+ vScale = signMath.pow(signvScale, scale * 50);
7323	7773	if (vScale < 0.01)
7324	7774	{
7325		- vScale = 0.01;
	7775	+ //vScale = 0.01;
7326	7776	}
7327		- vScale = Math.pow(vScale, scale * 50);
7328		- if (vScale < 0.01)
7329		- {
7330		- vScale = 0.01;
7331		- }
	7777	+
7332	7778	LA.matCopy(startMat, toParent);
7333	7779	/**/
7334	7780	for (int i = 0; i < 3; i++)
..	..	@@ -7338,39 +7784,47 @@
7338	7784	}
7339	7785	/**/
7340	7786
7341		- switch (info.pane.RenderCamera().viewCode)
	7787	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
	7788	+
	7789	+ if (totalScale < 0.01)
	7790	+ {
	7791	+ totalScale = 0.01;
	7792	+ }
	7793	+
	7794	+ switch (clickInfo.pane.RenderCamera().viewCode)
7342	7795	{
7343	7796	case 3: // '\001'
7344		- if (modified)
	7797	+ if (modified \|\| opposite)
7345	7798	{
7346	7799	//LA.matScale(toParent, 1, hScale, vScale);
7347		- LA.matScale(toParent, vScale, 1, 1);
	7800	+ LA.matScale(toParent, totalScale, 1, 1);
7348	7801	} // vScale, 1);
7349	7802	else
7350	7803	{
7351		- LA.matScale(toParent, vScale, vScale, vScale);
	7804	+ // EXCEPTION!
	7805	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7352	7806	} // vScale, 1);
7353	7807	break;
7354	7808
7355	7809	case 2: // '\002'
7356		- if (modified)
	7810	+ if (modified \|\| opposite)
7357	7811	{
7358	7812	//LA.matScale(toParent, hScale, 1, vScale);
7359		- LA.matScale(toParent, 1, vScale, 1);
	7813	+ LA.matScale(toParent, 1, totalScale, 1);
7360	7814	} else
7361	7815	{
7362		- LA.matScale(toParent, vScale, 1, vScale);
	7816	+ LA.matScale(toParent, totalScale, 1, totalScale);
7363	7817	}
7364	7818	break;
7365	7819
7366	7820	case 1: // '\003'
7367		- if (modified)
	7821	+ if (modified \|\| opposite)
7368	7822	{
7369	7823	//LA.matScale(toParent, hScale, vScale, 1);
7370		- LA.matScale(toParent, 1, 1, vScale);
	7824	+ LA.matScale(toParent, 1, 1, totalScale);
7371	7825	} else
7372	7826	{
7373		- LA.matScale(toParent, vScale, vScale, 1);
	7827	+ LA.matScale(toParent, totalScale, totalScale, 1);
7374	7828	}
7375	7829	break;
7376	7830	}
..	..	@@ -7404,7 +7858,7 @@
7404	7858	} // NEW ...
7405	7859
7406	7860
7407		- info.pane.repaint();
	7861	+ clickInfo.pane.repaint();
7408	7862	}
7409	7863
7410	7864	boolean overflow = false;
..	..	@@ -7503,14 +7957,22 @@
7503	7957	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7504	7958	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7505	7959	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7960	+
	7961	+ String objname;
	7962	+
7506	7963	if (false) //parent != null)
7507	7964	{
7508		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7965	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7509	7966	} else
7510	7967	{
7511		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7968	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7512	7969	} // + super.toString();
7513	7970	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7971	+
	7972	+ if (!Globals.ADVANCED)
	7973	+ return objname;
	7974	+
	7975	+ return objname + " " + System.identityHashCode(this);
7514	7976	}
7515	7977
7516	7978	public int hashCode()
..	..	@@ -7566,6 +8028,7 @@
7566	8028	objectUI.closeUI();
7567	8029	if (editWindow != null)
7568	8030	{
	8031	+ editWindow.ctrlPanel.FlushUI();
7569	8032	editWindow.refreshContents();
7570	8033	} // ? new
7571	8034	objectUI = null;
..	..	@@ -7574,6 +8037,10 @@
7574	8037	{
7575	8038	editWindow = null;
7576	8039	} // ?
	8040	+ }
	8041	+ else
	8042	+ {
	8043	+ //editWindow.closeUI();
7577	8044	}
7578	8045	}
7579	8046
..	..	@@ -7586,7 +8053,7 @@
7586	8053	/transient/ cVector2[] projectedVertices = new cVector2[0];
7587	8054
7588	8055	Object3D /Composite/ parent;
7589		- Object3D /Composite/ fileparent;
	8056	+ Object3D /Composite/ fileparent; // In the case of FileObject
7590	8057
7591	8058	double[][] toParent; // dynamic matrix
7592	8059	double[][] fromParent;
..	..	@@ -7701,7 +8168,7 @@
7701	8168	{
7702	8169	assert(bRep != null);
7703	8170	if (!(support instanceof GenericJoint)) // support.bRep != null)
7704		- GrafreeD.Assert(support.bRep == bRep.support);
	8171	+ Grafreed.Assert(support.bRep == bRep.support);
7705	8172	}
7706	8173	else
7707	8174	{
..	..	@@ -7732,6 +8199,10 @@
7732	8199	}
7733	8200
7734	8201	transient ObjEditor editWindow;
	8202	+ transient ObjEditor manipWindow;
	8203	+
	8204	+ transient boolean pinned;
	8205	+
7735	8206	transient ObjectUI objectUI;
7736	8207	public static int povDepth = 0;
7737	8208	private static cVector tbMin = new cVector();
..	..	@@ -7750,9 +8221,9 @@
7750	8221	private static cVector edge2 = new cVector();
7751	8222	//private static cVector norm = new cVector();
7752	8223	/transient private/ int hitSomething;
7753		- private static final int hitCenter = 1;
7754		- private static final int hitScale = 2;
7755		- private static final int hitRotate = 3;
	8224	+ static final int hitCenter = 1;
	8225	+ static final int hitScale = 2;
	8226	+ static final int hitRotate = 3;
7756	8227	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7757	8228	/transient/ private Point centerPt;
7758	8229	/transient/ private int startX;