~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,24 @@
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	+ private UUID uuid = UUID.randomUUID();
	26	+
	27	+ // TEMPORARY for mocap undo. No need to be transient.
	28	+ mocap.reader.BVHReader.BVHResult savebvh;
	29	+ Object3D saveskeleton;
	30	+ //
	31	+
	32	+ byte[] versions[];
	33	+ int versionindex = -1;
	34	+
22	35	ScriptNode scriptnode;
23	36
24	37	void InitOthers()
..	..	@@ -99,64 +112,178 @@
99	112
100	113	// transient boolean reduced; // for morph reduction
101	114
102		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
103		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	115	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	116	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
104	117
105		-transient Object3D transientsupport; // for cloning
106		-transient boolean transientlink2master;
	118	+ transient Object3D transientsupport; // for cloning
	119	+ transient boolean transientlink2master;
107	120
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)
	121	+ void SaveSupports()
120	122	{
121		- bRep.SaveSupports();
	123	+ if (blockloop)
	124	+ return;
	125	+
	126	+ transientsupport = support;
	127	+ transientlink2master = link2master;
	128	+
	129	+ support = null;
	130	+ link2master = false;
	131	+
	132	+ if (bRep != null)
	133	+ {
	134	+ bRep.SaveSupports();
	135	+ }
	136	+
	137	+ for (int i = 0; i < Size(); i++)
	138	+ {
	139	+ Object3D child = (Object3D) get(i);
	140	+ if (child == null)
	141	+ continue;
	142	+ blockloop = true;
	143	+ child.SaveSupports();
	144	+ blockloop = false;
	145	+ }
122	146	}
123		-
124		- for (int i = 0; i < Size(); i++)
	147	+
	148	+ void RestoreSupports()
125	149	{
126		- Object3D child = (Object3D) get(i);
127		- if (child == null)
128		- continue;
	150	+ if (blockloop)
	151	+ return;
	152	+
	153	+ support = transientsupport;
	154	+ link2master = transientlink2master;
	155	+ transientsupport = null;
	156	+ transientlink2master = false;
	157	+
	158	+ if (bRep != null)
	159	+ {
	160	+ bRep.RestoreSupports();
	161	+ }
	162	+
	163	+ for (int i = 0; i < Size(); i++)
	164	+ {
	165	+ Object3D child = (Object3D) get(i);
	166	+ if (child == null)
	167	+ continue;
	168	+ blockloop = true;
	169	+ child.RestoreSupports();
	170	+ blockloop = false;
	171	+ }
	172	+ }
	173	+
	174	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	175	+ {
	176	+ Object3D o;
	177	+
	178	+ if (hashtable.containsKey(GetUUID()))
	179	+ {
	180	+ o = hashtable.get(GetUUID());
	181	+
	182	+ Grafreed.Assert(this.bRep == o.bRep);
	183	+ //if (this.bRep != null)
	184	+ // assert(this.bRep.support == o.transientrep);
	185	+ if (this.support != null)
	186	+ assert(this.support.bRep == o.transientrep);
	187	+ }
	188	+ else
	189	+ {
	190	+ o = new Object3D("copy of " + this.name);
	191	+
	192	+ hashtable.put(GetUUID(), o);
	193	+ }
	194	+
	195	+ if (!blockloop)
	196	+ {
	197	+ blockloop = true;
	198	+
	199	+ for (int i=0; i<Size(); i++)
	200	+ {
	201	+ get(i).ExtractBigData(hashtable);
	202	+ }
	203	+
	204	+ blockloop = false;
	205	+ }
	206	+
	207	+ ExtractBigData(o);
	208	+ }
	209	+
	210	+ void ExtractBigData(Object3D o)
	211	+ {
	212	+ if (o.bRep != null)
	213	+ Grafreed.Assert(o.bRep == this.bRep);
	214	+
	215	+ o.bRep = this.bRep;
	216	+// July 2019 if (this.bRep != null)
	217	+// {
	218	+// o.transientrep = this.bRep.support;
	219	+// o.bRep.support = null;
	220	+// }
	221	+ o.selection = this.selection;
	222	+ o.versions = this.versions;
	223	+ o.versionindex = this.versionindex;
	224	+
	225	+ if (this.support != null)
	226	+ {
	227	+ if (o.transientrep != null)
	228	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	229	+
	230	+ o.transientrep = this.support.bRep;
	231	+ this.support.bRep = null;
	232	+ }
	233	+
	234	+ // o.support = this.support;
	235	+ // o.fileparent = this.fileparent;
	236	+ // if (this.bRep != null)
	237	+ // o.bRep = this.bRep.support;
	238	+
	239	+ this.bRep = null;
	240	+ // if (this.bRep != null)
	241	+ // this.bRep.support = null;
	242	+ // this.support = null;
	243	+ // this.fileparent = null;
	244	+ }
	245	+
	246	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	247	+ {
	248	+ if (!hashtable.containsKey(GetUUID()))
	249	+ return;
	250	+
	251	+ Object3D o = hashtable.get(GetUUID());
	252	+
	253	+ RestoreBigData(o);
	254	+
	255	+ if (blockloop)
	256	+ return;
	257	+
129	258	blockloop = true;
130		- child.SaveSupports();
	259	+
	260	+ //hashtable.remove(GetUUID());
	261	+
	262	+ for (int i=0; i<Size(); i++)
	263	+ {
	264	+ get(i).RestoreBigData(hashtable);
	265	+ }
	266	+
131	267	blockloop = false;
132	268	}
133		-}
134	269
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)
	270	+ void RestoreBigData(Object3D o)
146	271	{
147		- bRep.RestoreSupports();
	272	+ this.bRep = o.bRep;
	273	+ if (this.support != null && o.transientrep != null)
	274	+ {
	275	+ this.support.bRep = o.transientrep;
	276	+ }
	277	+
	278	+ this.selection = o.selection;
	279	+
	280	+ this.versions = o.versions;
	281	+ this.versionindex = o.versionindex;
	282	+// July 2019 if (this.bRep != null)
	283	+// this.bRep.support = o.transientrep;
	284	+ // this.support = o.support;
	285	+ // this.fileparent = o.fileparent;
148	286	}
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	287
161	288	// MOCAP SUPPORT
162	289	double tx,ty,tz,rx,ry,rz;
..	..	@@ -299,6 +426,8 @@
299	426	}
300	427
301	428	boolean live = false;
	429	+ transient boolean keepdontselect;
	430	+ boolean dontselect = false;
302	431	boolean hide = false;
303	432	boolean link2master = false; // performs reset support/master at each frame
304	433	boolean marked = false; // animation node
..	..	@@ -430,16 +559,16 @@
430	559	{
431	560	Object3D copy = this;
432	561
433		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	562	+ Camera parentcam = Globals.theRenderer.ManipCamera();
434	563
435		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	564	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
436	565	{
437		- parentcam = CameraPane.theRenderer.cameras[1];
	566	+ parentcam = Globals.theRenderer.Cameras()[1];
438	567	}
439	568
440		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	569	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
441	570	{
442		- parentcam = CameraPane.theRenderer.cameras[0];
	571	+ parentcam = Globals.theRenderer.Cameras()[0];
443	572	}
444	573
445	574	if (this == parentcam)
..	..	@@ -447,7 +576,7 @@
447	576	//assert(this instanceof Camera);
448	577
449	578	for (int count = parentcam.GetTransformCount(); --count>=0;)
450		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	579	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
451	580	}
452	581
453	582	copy.marked ^= true;
..	..	@@ -467,7 +596,7 @@
467	596	//assert(this instanceof Camera);
468	597
469	598	for (int count = parentcam.GetTransformCount(); --count>=0;)
470		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	599	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
471	600	}
472	601
473	602	copy.Touch(); // display list issue
..	..	@@ -480,12 +609,14 @@
480	609	toParent = LA.newMatrix();
481	610	fromParent = LA.newMatrix();
482	611	}
	612	+
483	613	if (toParentMarked == null)
484	614	{
485	615	if (maxcount != 1)
486	616	{
487	617	new Exception().printStackTrace();
488	618	}
	619	+
489	620	toParentMarked = LA.newMatrix();
490	621	fromParentMarked = LA.newMatrix();
491	622	}
..	..	@@ -602,7 +733,7 @@
602	733	return;
603	734	}
604	735
605		- if (CameraPane.fromscript)
	736	+ if (Globals.fromscript)
606	737	{
607	738	transformcount = 0;
608	739	return;
..	..	@@ -773,7 +904,7 @@
773	904	if (step == 0)
774	905	step = 1;
775	906	if (maxcount == 0)
776		- maxcount = 2048; // 4;
	907	+ maxcount = 128; // 2048; // 4;
777	908	// if (acceleration == 0)
778	909	// acceleration = 10;
779	910	if (delay == 0) // serial
..	..	@@ -796,7 +927,7 @@
796	927
797	928	if (marked && Globals.isLIVE() && live &&
798	929	//TEMP21aug2018
799		- Globals.DrawMode() == iCameraPane.SHADOW &&
	930	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
800	931	currentframe != Globals.framecount)
801	932	{
802	933	currentframe = Globals.framecount;
..	..	@@ -808,7 +939,8 @@
808	939
809	940	boolean changedir = random && Math.random() < 0.01; // && !link2master;
810	941
811		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	942	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	943	+ (step == 1 && changedir))
812	944	{
813	945	countdown = 1;
814	946	delay = speedup?8:1;
..	..	@@ -880,6 +1012,7 @@
880	1012	if (material == null \|\| material.multiply)
881	1013	return true;
882	1014
	1015	+ // Transparent objects are dynamic because we have to sort the triangles.
883	1016	return material.opacity > 0.99;
884	1017	}
885	1018
..	..	@@ -911,6 +1044,11 @@
911	1044	fromParent = null; // LA.newMatrix();
912	1045	bRep = null; // new BoundaryRep();
913	1046
	1047	+ if (oname != null && oname.equals("LeftHand"))
	1048	+ {
	1049	+ name = oname;
	1050	+ }
	1051	+
914	1052	/*
915	1053	float hue = (float)Math.random();
916	1054	Color col;
..	..	@@ -953,7 +1091,7 @@
953	1091
954	1092	public Object clone()
955	1093	{
956		- return GrafreeD.clone(this);
	1094	+ return Grafreed.clone(this);
957	1095	}
958	1096
959	1097	Object3D copyExpand()
..	..	@@ -1275,6 +1413,7 @@
1275	1413	toParent = LA.newMatrix();
1276	1414	fromParent = LA.newMatrix();
1277	1415	}
	1416	+
1278	1417	LA.matCopy(other.toParent, toParent);
1279	1418	LA.matCopy(other.fromParent, fromParent);
1280	1419
..	..	@@ -1469,7 +1608,7 @@
1469	1608	BoundaryRep.SEUIL = other.material.cameralight;
1470	1609
1471	1610	// Set default to 0.1
1472		- BoundaryRep.SEUIL /= 2;
	1611	+ BoundaryRep.SEUIL /= 4; // 2;
1473	1612	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1474	1613	}
1475	1614
..	..	@@ -1728,7 +1867,7 @@
1728	1867	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1729	1868	o.bRep = transientrep;
1730	1869	if (clone)
1731		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1870	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1732	1871	o.CreateMaterial();
1733	1872	o.SetAttributes(this, -1);
1734	1873	//parent
..	..	@@ -1741,7 +1880,7 @@
1741	1880	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1742	1881	o.bRep = bRep;
1743	1882	if (clone)
1744		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1883	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1745	1884	o.CreateMaterial();
1746	1885	//o.overwriteThis(this, -1);
1747	1886	o.SetAttributes(this, -1);
..	..	@@ -1828,12 +1967,15 @@
1828	1967	if (obj.name == null)
1829	1968	continue; // can't be a null one
1830	1969
	1970	+ // Try perfect match first.
1831	1971	if (n.equals(obj.name))
1832	1972	{
1833	1973	theobj = obj;
1834	1974	count++;
1835	1975	}
1836	1976	}
	1977	+
	1978	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1837	1979
1838	1980	if (count != 1)
1839	1981	for (int i=Size(); --i>=0;)
..	..	@@ -2293,12 +2435,17 @@
2293	2435	}
2294	2436	*/
2295	2437	}
	2438	+ else
	2439	+ {
	2440	+ //((ObjEditor)editWindow).SetupUI2(null);
	2441	+ }
2296	2442	}
2297	2443
2298	2444	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2299	2445	{
2300	2446	if (newWindow)
2301	2447	{
	2448	+ new Exception().printStackTrace();
2302	2449	System.exit(0);
2303	2450	if (parent != null)
2304	2451	{
..	..	@@ -2333,6 +2480,14 @@
2333	2480	{
2334	2481	editWindow.refreshContents();
2335	2482	}
	2483	+ else
	2484	+ {
	2485	+ if (manipWindow != null)
	2486	+ {
	2487	+ manipWindow.refreshContents();
	2488	+ }
	2489	+ }
	2490	+
2336	2491	//if (parent != null)
2337	2492	//parent.refreshEditWindow();
2338	2493	}
..	..	@@ -2412,7 +2567,8 @@
2412	2567	private static final int editSelf = 1;
2413	2568	private static final int editChild = 2;
2414	2569
2415		- void drawEditHandles(ClickInfo info, int level)
	2570	+ void drawEditHandles(//ClickInfo info,
	2571	+ int level)
2416	2572	{
2417	2573	if (level == 0)
2418	2574	{
..	..	@@ -2420,7 +2576,8 @@
2420	2576	return;
2421	2577
2422	2578	Object3D selectee;
2423		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2579	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2580	+ level + 1))
2424	2581	{
2425	2582	selectee = (Object3D) e.nextElement();
2426	2583	}
..	..	@@ -2428,19 +2585,22 @@
2428	2585	} else
2429	2586	{
2430	2587	//super.
2431		- drawEditHandles0(info, level + 1);
	2588	+ drawEditHandles0(//info,
	2589	+ level + 1);
2432	2590	}
2433	2591	}
2434	2592
2435		- boolean doEditClick(ClickInfo info, int level)
	2593	+ boolean doEditClick(//ClickInfo info,
	2594	+ int level)
2436	2595	{
2437	2596	doSomething = 0;
2438	2597	if (level == 0)
2439	2598	{
2440		- return doParentClick(info);
	2599	+ return doParentClick(); //info);
2441	2600	}
2442	2601	if (//super.
2443		- doEditClick0(info, level))
	2602	+ doEditClick0(//info,
	2603	+ level))
2444	2604	{
2445	2605	doSomething = 1;
2446	2606	return true;
..	..	@@ -2450,7 +2610,7 @@
2450	2610	}
2451	2611	}
2452	2612
2453		- boolean doParentClick(ClickInfo info)
	2613	+ boolean doParentClick() //ClickInfo info)
2454	2614	{
2455	2615	if (selection == null)
2456	2616	{
..	..	@@ -2463,7 +2623,8 @@
2463	2623	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2464	2624	{
2465	2625	Object3D selectee = (Object3D) e.nextElement();
2466		- if (selectee.doEditClick(info, 1))
	2626	+ if (selectee.doEditClick(//info,
	2627	+ 1))
2467	2628	{
2468	2629	childToDrag = selectee;
2469	2630	doSomething = 2;
..	..	@@ -2475,13 +2636,15 @@
2475	2636	return retval;
2476	2637	}
2477	2638
2478		- void doEditDrag(ClickInfo info)
	2639	+ void doEditDrag(//ClickInfo clickInfo,
	2640	+ boolean opposite)
2479	2641	{
2480	2642	switch (doSomething)
2481	2643	{
2482	2644	case 1: // '\001'
2483	2645	//super.
2484		- doEditDrag0(info);
	2646	+ doEditDrag0(//clickInfo,
	2647	+ opposite);
2485	2648	break;
2486	2649
2487	2650	case 2: // '\002'
..	..	@@ -2494,11 +2657,13 @@
2494	2657	{
2495	2658	//sel.hitSomething = childToDrag.hitSomething;
2496	2659	//childToDrag.doEditDrag(info);
2497		- sel.doEditDrag(info);
	2660	+ sel.doEditDrag(//clickInfo,
	2661	+ opposite);
2498	2662	} else
2499	2663	{
2500	2664	//super.
2501		- doEditDrag0(info);
	2665	+ doEditDrag0(//clickInfo,
	2666	+ opposite);
2502	2667	}
2503	2668	}
2504	2669	break;
..	..	@@ -2516,6 +2681,9 @@
2516	2681	{
2517	2682	deselectAll();
2518	2683	}
	2684	+
	2685	+ new Exception().printStackTrace();
	2686	+
2519	2687	ClickInfo newInfo = new ClickInfo();
2520	2688	newInfo.flags = info.flags;
2521	2689	newInfo.bounds = info.bounds;
..	..	@@ -2608,6 +2776,18 @@
2608	2776	void GenNormalsS(boolean crease)
2609	2777	{
2610	2778	selection.GenNormals(crease);
	2779	+// for (int i=0; i<selection.size(); i++)
	2780	+// {
	2781	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2782	+// selectee.GenNormals(crease);
	2783	+// }
	2784	+
	2785	+ //Touch();
	2786	+ }
	2787	+
	2788	+ void GenNormalsMeshS()
	2789	+ {
	2790	+ selection.GenNormalsMesh();
2611	2791	// for (int i=0; i<selection.size(); i++)
2612	2792	// {
2613	2793	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2748,6 +2928,24 @@
2748	2928	if (child == null)
2749	2929	continue;
2750	2930	child.GenNormals(crease);
	2931	+// Children().release(i);
	2932	+ }
	2933	+ blockloop = false;
	2934	+ }
	2935	+
	2936	+ void GenNormalsMesh()
	2937	+ {
	2938	+ if (blockloop)
	2939	+ return;
	2940	+
	2941	+ blockloop = true;
	2942	+ GenNormalsMesh0();
	2943	+ for (int i = 0; i < Children().Size(); i++)
	2944	+ {
	2945	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2946	+ if (child == null)
	2947	+ continue;
	2948	+ child.GenNormalsMesh();
2751	2949	// Children().release(i);
2752	2950	}
2753	2951	blockloop = false;
..	..	@@ -2905,7 +3103,8 @@
2905	3103	{
2906	3104	if (bRep != null)
2907	3105	{
2908		- bRep.GenUV();
	3106	+ bRep.GenUV(); //1);
	3107	+ //bRep.UnfoldUV();
2909	3108	Touch();
2910	3109	}
2911	3110	}
..	..	@@ -2919,11 +3118,20 @@
2919	3118	}
2920	3119	}
2921	3120
	3121	+ void GenNormalsMesh0()
	3122	+ {
	3123	+ if (bRep != null)
	3124	+ {
	3125	+ bRep.GenerateNormalsMesh();
	3126	+ Touch();
	3127	+ }
	3128	+ }
	3129	+
2922	3130	void GenNormalsMINE0()
2923	3131	{
2924	3132	if (bRep != null)
2925	3133	{
2926		- bRep.GenerateNormalsMINE();
	3134	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2927	3135	Touch();
2928	3136	}
2929	3137	}
..	..	@@ -2980,6 +3188,33 @@
2980	3188	blockloop = false;
2981	3189	}
2982	3190
	3191	+ void TransformChildren()
	3192	+ {
	3193	+ if (toParent != null)
	3194	+ {
	3195	+ for (int i=Size(); --i>=0;)
	3196	+ {
	3197	+ Object3D v = get(i);
	3198	+
	3199	+ if (v.toParent == null)
	3200	+ {
	3201	+ v.toParent = LA.newMatrix();
	3202	+ v.fromParent = LA.newMatrix();
	3203	+ }
	3204	+
	3205	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3206	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3207	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3208	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3209	+ }
	3210	+
	3211	+ toParent = null; // LA.matIdentity(toParent);
	3212	+ fromParent = null; // LA.matIdentity(fromParent);
	3213	+
	3214	+ Touch();
	3215	+ }
	3216	+ }
	3217	+
2983	3218	void TransformGeometry()
2984	3219	{
2985	3220	Object3D obj = this;
..	..	@@ -3201,9 +3436,11 @@
3201	3436
3202	3437	BoundaryRep sup = bRep.support;
3203	3438	bRep.support = null;
3204		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3439	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3205	3440	// bRep.SplitInTwo(onlyone); // thread...
3206		- temprep.SplitInTwo(reduction34, onlyone);
	3441	+
	3442	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3443	+
3207	3444	bRep = temprep;
3208	3445	bRep.support = sup;
3209	3446	Touch();
..	..	@@ -3340,7 +3577,8 @@
3340	3577	if (blockloop)
3341	3578	return;
3342	3579
3343		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3580	+ if (//marked \|\| // does not make sense
	3581	+ (bRep != null \|\| material != null)) // borderline...
3344	3582	live = h;
3345	3583
3346	3584	for (int i = 0; i < Size(); i++)
..	..	@@ -3361,7 +3599,8 @@
3361	3599	return;
3362	3600
3363	3601	//if (bRep != null)
3364		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3602	+ if (//marked \|\| // does not make sense
	3603	+ (bRep != null \|\| material != null)) // borderline...
3365	3604	link2master = h;
3366	3605
3367	3606	for (int i = 0; i < Size(); i++)
..	..	@@ -3381,7 +3620,8 @@
3381	3620	if (blockloop)
3382	3621	return;
3383	3622
3384		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3623	+ if (//marked \|\| // does not make sense
	3624	+ (bRep != null \|\| material != null)) // borderline...
3385	3625	hide = h;
3386	3626
3387	3627	for (int i = 0; i < Size(); i++)
..	..	@@ -3401,7 +3641,7 @@
3401	3641	if (blockloop)
3402	3642	return;
3403	3643
3404		- if (bRep != null && material != null) // borderline...
	3644	+ if (bRep != null \|\| material != null) // borderline...
3405	3645	marked = h;
3406	3646
3407	3647	for (int i = 0; i < Size(); i++)
..	..	@@ -3411,6 +3651,46 @@
3411	3651	continue;
3412	3652	blockloop = true;
3413	3653	child.MarkLeaves(h);
	3654	+ blockloop = false;
	3655	+ // release(i);
	3656	+ }
	3657	+ }
	3658	+
	3659	+ void RewindLeaves(boolean h)
	3660	+ {
	3661	+ if (blockloop)
	3662	+ return;
	3663	+
	3664	+ if (bRep != null \|\| material != null) // borderline...
	3665	+ rewind = h;
	3666	+
	3667	+ for (int i = 0; i < Size(); i++)
	3668	+ {
	3669	+ Object3D child = (Object3D) get(i); // reserve(i);
	3670	+ if (child == null)
	3671	+ continue;
	3672	+ blockloop = true;
	3673	+ child.RewindLeaves(h);
	3674	+ blockloop = false;
	3675	+ // release(i);
	3676	+ }
	3677	+ }
	3678	+
	3679	+ void RandomLeaves(boolean h)
	3680	+ {
	3681	+ if (blockloop)
	3682	+ return;
	3683	+
	3684	+ if (bRep != null \|\| material != null) // borderline...
	3685	+ random = h;
	3686	+
	3687	+ for (int i = 0; i < Size(); i++)
	3688	+ {
	3689	+ Object3D child = (Object3D) get(i); // reserve(i);
	3690	+ if (child == null)
	3691	+ continue;
	3692	+ blockloop = true;
	3693	+ child.RandomLeaves(h);
3414	3694	blockloop = false;
3415	3695	// release(i);
3416	3696	}
..	..	@@ -3725,7 +4005,7 @@
3725	4005	if (child == null)
3726	4006	continue;
3727	4007
3728		- if (GrafreeD.RENDERME > 0)
	4008	+ if (Grafreed.RENDERME > 0)
3729	4009	{
3730	4010	if (child instanceof Merge)
3731	4011	((Merge)child).renderme();
..	..	@@ -3876,7 +4156,7 @@
3876	4156	if (child == null)
3877	4157	continue;
3878	4158
3879		- if (GrafreeD.RENDERME > 0)
	4159	+ if (Grafreed.RENDERME > 0)
3880	4160	{
3881	4161	if (child instanceof Merge)
3882	4162	((Merge)child).renderme();
..	..	@@ -4071,7 +4351,7 @@
4071	4351	if (child == null)
4072	4352	continue;
4073	4353
4074		- if (GrafreeD.RENDERME > 0)
	4354	+ if (Grafreed.RENDERME > 0)
4075	4355	{
4076	4356	if (child instanceof Merge)
4077	4357	((Merge)child).renderme();
..	..	@@ -4184,6 +4464,55 @@
4184	4464	{
4185	4465	blockloop = true;
4186	4466	get(i).RepairShadow();
	4467	+ blockloop = false;
	4468	+ }
	4469	+ }
	4470	+
	4471	+ void RepairSOV()
	4472	+ {
	4473	+ if (blockloop)
	4474	+ return;
	4475	+
	4476	+ String texname = this.GetPigmentTexture();
	4477	+
	4478	+ if (texname.startsWith("sov"))
	4479	+ {
	4480	+ String[] s = texname.split("/");
	4481	+
	4482	+ String[] sname = s[1].split("Color.pn");
	4483	+
	4484	+ texname = sname[0];
	4485	+
	4486	+ if (sname.length > 1)
	4487	+ {
	4488	+ texname += "Color.jpg";
	4489	+ }
	4490	+
	4491	+ this.SetPigmentTexture("sov/" + texname);
	4492	+ }
	4493	+
	4494	+ texname = this.GetBumpTexture();
	4495	+
	4496	+ if (texname.startsWith("sov"))
	4497	+ {
	4498	+ String[] s = texname.split("/");
	4499	+
	4500	+ String[] sname = s[1].split("Bump.pn");
	4501	+
	4502	+ texname = sname[0];
	4503	+
	4504	+ if (sname.length > 1)
	4505	+ {
	4506	+ texname += "Bump.jpg";
	4507	+ }
	4508	+
	4509	+ this.SetBumpTexture("sov/" + texname);
	4510	+ }
	4511	+
	4512	+ for (int i=0; i<Size(); i++)
	4513	+ {
	4514	+ blockloop = true;
	4515	+ get(i).RepairSOV();
4187	4516	blockloop = false;
4188	4517	}
4189	4518	}
..	..	@@ -4678,7 +5007,7 @@
4678	5007
4679	5008	cTreePath SelectLeaf(int indexcount, boolean deselect)
4680	5009	{
4681		- if (hide)
	5010	+ if (hide \|\| dontselect)
4682	5011	return null;
4683	5012
4684	5013	if (count <= 0)
..	..	@@ -4702,9 +5031,17 @@
4702	5031	}
4703	5032	}
4704	5033
	5034	+ ObjEditor GetWindow()
	5035	+ {
	5036	+ if (editWindow != null)
	5037	+ return editWindow;
	5038	+
	5039	+ return manipWindow;
	5040	+ }
	5041	+
4705	5042	cTreePath Select(int indexcount, boolean deselect)
4706	5043	{
4707		- if (hide)
	5044	+ if (hide \|\| dontselect)
4708	5045	return null;
4709	5046
4710	5047	if (count <= 0)
..	..	@@ -4738,10 +5075,11 @@
4738	5075	if (leaf != null)
4739	5076	{
4740	5077	cTreePath tp = new cTreePath(this, leaf);
4741		- if (editWindow != null)
	5078	+ ObjEditor window = GetWindow();
	5079	+ if (window != null)
4742	5080	{
4743	5081	//System.out.println("editWindow = " + editWindow + " vs " + this);
4744		- editWindow.Select(tp, deselect, true);
	5082	+ window.Select(tp, deselect, true);
4745	5083	}
4746	5084
4747	5085	return tp;
..	..	@@ -4758,6 +5096,7 @@
4758	5096
4759	5097	if (child == null)
4760	5098	continue;
	5099	+
4761	5100	if (child.HasTransparency() && child.size() != 0)
4762	5101	{
4763	5102	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4767,9 +5106,10 @@
4767	5106	if (leaf != null)
4768	5107	{
4769	5108	cTreePath tp = new cTreePath(this, leaf);
4770		- if (editWindow != null)
	5109	+ ObjEditor window = GetWindow();
	5110	+ if (window != null)
4771	5111	{
4772		- editWindow.Select(tp, deselect, true);
	5112	+ window.Select(tp, deselect, true);
4773	5113	}
4774	5114
4775	5115	return tp;
..	..	@@ -4854,7 +5194,7 @@
4854	5194	return globalTransform;
4855	5195	}
4856	5196
4857		- void PreprocessOcclusion(CameraPane cp)
	5197	+ void PreprocessOcclusion(iCameraPane cp)
4858	5198	{
4859	5199	/*
4860	5200	if (AOdone)
..	..	@@ -5094,6 +5434,51 @@
5094	5434	blockloop = false;
5095	5435	}
5096	5436
	5437	+ void ResetSelectable()
	5438	+ {
	5439	+ if (blockloop)
	5440	+ return;
	5441	+
	5442	+ blockloop = true;
	5443	+
	5444	+ keepdontselect = dontselect;
	5445	+ dontselect = true;
	5446	+
	5447	+ Object3D child;
	5448	+ int nb = Size();
	5449	+ for (int i = 0; i < nb; i++)
	5450	+ {
	5451	+ child = (Object3D) get(i);
	5452	+ if (child == null)
	5453	+ continue;
	5454	+ child.ResetSelectable();
	5455	+ }
	5456	+
	5457	+ blockloop = false;
	5458	+ }
	5459	+
	5460	+ void RestoreSelectable()
	5461	+ {
	5462	+ if (blockloop)
	5463	+ return;
	5464	+
	5465	+ blockloop = true;
	5466	+
	5467	+ dontselect = keepdontselect;
	5468	+
	5469	+ Object3D child;
	5470	+ int nb = Size();
	5471	+ for (int i = 0; i < nb; i++)
	5472	+ {
	5473	+ child = (Object3D) get(i);
	5474	+ if (child == null)
	5475	+ continue;
	5476	+ child.RestoreSelectable();
	5477	+ }
	5478	+
	5479	+ blockloop = false;
	5480	+ }
	5481	+
5097	5482	boolean IsSelected()
5098	5483	{
5099	5484	if (parent == null)
..	..	@@ -5156,10 +5541,34 @@
5156	5541
5157	5542	// System.out.println("Fullname = " + fullname);
5158	5543
5159		- if (fullname.name.indexOf(":") == -1)
5160		- return fullname.name;
	5544	+ // Does not work on Windows due to C:
	5545	+// if (fullname.name.indexOf(":") == -1)
	5546	+// return fullname.name;
	5547	+//
	5548	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5161	5549
5162		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5550	+ String[] split = fullname.name.split(":");
	5551	+
	5552	+ if (split.length == 0)
	5553	+ {
	5554	+ return "";
	5555	+ }
	5556	+
	5557	+ if (split.length <= 2)
	5558	+ {
	5559	+ if (fullname.name.endsWith(":"))
	5560	+ {
	5561	+ // Windows
	5562	+ return fullname.name.substring(0, fullname.name.length()-1);
	5563	+ }
	5564	+
	5565	+ return split[0];
	5566	+ }
	5567	+
	5568	+ // Windows
	5569	+ assert(split.length == 4);
	5570	+
	5571	+ return split[0] + ":" + split[1];
5163	5572	}
5164	5573
5165	5574	static String GetBump(cTexture fullname)
..	..	@@ -5168,10 +5577,38 @@
5168	5577	return "";
5169	5578
5170	5579	// 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());
	5580	+ // Does not work on Windows due to C:
	5581	+// if (fullname.name.indexOf(":") == -1)
	5582	+// return "";
	5583	+//
	5584	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5585	+ String[] split = fullname.name.split(":");
	5586	+
	5587	+ if (split.length == 0)
	5588	+ {
	5589	+ return "";
	5590	+ }
	5591	+
	5592	+ if (split.length == 1)
	5593	+ {
	5594	+ return "";
	5595	+ }
	5596	+
	5597	+ if (split.length == 2)
	5598	+ {
	5599	+ if (fullname.name.endsWith(":"))
	5600	+ {
	5601	+ // Windows
	5602	+ return "";
	5603	+ }
	5604	+
	5605	+ return split[1];
	5606	+ }
	5607	+
	5608	+ // Windows
	5609	+ assert(split.length == 4);
	5610	+
	5611	+ return split[2] + ":" + split[3];
5175	5612	}
5176	5613
5177	5614	String GetPigmentTexture()
..	..	@@ -5245,7 +5682,7 @@
5245	5682	System.out.print("; textures = " + textures);
5246	5683	System.out.println("; usedtextures = " + usedtextures);
5247	5684
5248		- if (GetTextures() == null)
	5685	+ if (GetTextures() == null) // What is that??
5249	5686	GetTextures().name = ":";
5250	5687
5251	5688	String texname = tex;
..	..	@@ -5276,6 +5713,43 @@
5276	5713	child.ResetPigmentTexture();
5277	5714	blockloop = false;
5278	5715	}
	5716	+ }
	5717	+
	5718	+ UUID GetUUID()
	5719	+ {
	5720	+ if (uuid == null)
	5721	+ {
	5722	+ // Serial
	5723	+ uuid = UUID.randomUUID();
	5724	+ }
	5725	+
	5726	+ return uuid;
	5727	+ }
	5728	+
	5729	+ Object3D GetObject(UUID uid)
	5730	+ {
	5731	+ if (blockloop)
	5732	+ return null;
	5733	+
	5734	+ if (GetUUID().equals(uid))
	5735	+ return this;
	5736	+
	5737	+ int nb = Size();
	5738	+ for (int i = 0; i < nb; i++)
	5739	+ {
	5740	+ Object3D child = (Object3D) get(i);
	5741	+
	5742	+ if (child == null)
	5743	+ continue;
	5744	+
	5745	+ blockloop = true;
	5746	+ Object3D obj = child.GetObject(uid);
	5747	+ blockloop = false;
	5748	+ if (obj != null)
	5749	+ return obj;
	5750	+ }
	5751	+
	5752	+ return null;
5279	5753	}
5280	5754
5281	5755	void SetBumpTexture(String tex)
..	..	@@ -5314,6 +5788,38 @@
5314	5788	}
5315	5789	}
5316	5790
	5791	+ void EmbedTextures(boolean embed)
	5792	+ {
	5793	+ if (blockloop)
	5794	+ return;
	5795	+
	5796	+ //if (GetTextures() != null)
	5797	+ if (embed)
	5798	+ CameraPane.EmbedTextures(GetTextures());
	5799	+ else
	5800	+ {
	5801	+ GetTextures().pigmentdata = null;
	5802	+ GetTextures().bumpdata = null;
	5803	+ GetTextures().pw = 0;
	5804	+ GetTextures().ph = 0;
	5805	+ GetTextures().bw = 0;
	5806	+ GetTextures().bh = 0;
	5807	+ }
	5808	+
	5809	+ int nb = Size();
	5810	+ for (int i = 0; i < nb; i++)
	5811	+ {
	5812	+ Object3D child = (Object3D) get(i);
	5813	+
	5814	+ if (child == null)
	5815	+ continue;
	5816	+
	5817	+ blockloop = true;
	5818	+ child.EmbedTextures(embed);
	5819	+ blockloop = false;
	5820	+ }
	5821	+ }
	5822	+
5317	5823	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5318	5824	{
5319	5825	Draw(display, root, selected, blocked);
..	..	@@ -5322,11 +5828,23 @@
5322	5828	boolean NeedSupport()
5323	5829	{
5324	5830	return
5325		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5831	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5326	5832	// PROBLEM with CROWD!!
5327		- && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
	5833	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5328	5834	}
5329	5835
	5836	+ static boolean DEBUG_SELECTION = false;
	5837	+
	5838	+ boolean IsLive()
	5839	+ {
	5840	+ if (live)
	5841	+ return true;
	5842	+
	5843	+ if (parent == null)
	5844	+ return false;
	5845	+
	5846	+ return parent.IsLive();
	5847	+ }
5330	5848
5331	5849	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5332	5850	{
..	..	@@ -5338,7 +5856,7 @@
5338	5856	}
5339	5857
5340	5858	if (display.DrawMode() == iCameraPane.SELECTION &&
5341		- hide)
	5859	+ (hide \|\| dontselect))
5342	5860	return;
5343	5861
5344	5862	if (name != null && name.contains("sclera"))
..	..	@@ -5365,12 +5883,12 @@
5365	5883	}
5366	5884
5367	5885	if ((//display.DrawMode() == CameraPane.SHADOW \|\|
5368		- display.DrawMode() == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5886	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5369	5887	{
5370	5888	return;
5371	5889	}
5372	5890
5373		- javax.media.opengl.GL gl = display.GetGL();
	5891	+ //javax.media.opengl.GL gl = display.GetGL();
5374	5892
5375	5893	/*
5376	5894	if (touched)
..	..	@@ -5389,7 +5907,7 @@
5389	5907	support = support;
5390	5908
5391	5909	//boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5392		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5910	+ boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5393	5911
5394	5912	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5395	5913	{
..	..	@@ -5406,13 +5924,15 @@
5406	5924
5407	5925	boolean compiled = false;
5408	5926
5409		- boolean selectmode = display.DrawMode() == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5927	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5410	5928
5411	5929	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5412		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5930	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5931	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5413	5932	{
5414	5933	Globals.lighttouched = true;
5415	5934	} // all panes...
	5935	+
5416	5936	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5417	5937	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5418	5938	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5422,7 +5942,7 @@
5422	5942	//if (displaylist == -1 && usecalllists)
5423	5943	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5424	5944	{
5425		- bRep.displaylist = gl.glGenLists(1);
	5945	+ bRep.displaylist = display.GenList();
5426	5946	assert(bRep.displaylist != 0);
5427	5947	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5428	5948	//System.out.println("\tgen list " + list);
..	..	@@ -5434,14 +5954,16 @@
5434	5954	if (usecalllists)
5435	5955	{
5436	5956	// System.err.println("new list " + bRep.displaylist + " for " + this);
5437		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5957	+ display.NewList(bRep.displaylist);
5438	5958	}
	5959	+
5439	5960	CallList(display, root, selected, blocked);
	5961	+
5440	5962	// compiled = true;
5441	5963	if (usecalllists)
5442	5964	{
5443	5965	// System.err.println("end list " + bRep.displaylist + " for " + this);
5444		- gl.glEndList();
	5966	+ display.EndList();
5445	5967	}
5446	5968	//gl.glDrawBuffer(gl.GL_BACK);
5447	5969	// XXX touched = false;
..	..	@@ -5484,12 +6006,12 @@
5484	6006
5485	6007	// frustum culling
5486	6008	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5487		- && display.DrawMode() != CameraPane.SELECTION)
	6009	+ && display.DrawMode() != iCameraPane.SELECTION)
5488	6010	{
5489		- if (display.DrawMode() == CameraPane.SHADOW)
	6011	+ if (display.DrawMode() == iCameraPane.SHADOW)
5490	6012	{
5491	6013	if (!link2master // tricky to cull in shadow mode.
5492		- && GetBRep().FrustumCull(this, gl, display.LightCamera(), true))
	6014	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5493	6015	{
5494	6016	//System.out.print("CULLED");
5495	6017	culled = true;
..	..	@@ -5497,7 +6019,7 @@
5497	6019	}
5498	6020	else
5499	6021	//GetBRep().getBounds(v0, v1, this);
5500		- if (GetBRep().FrustumCull(this, gl, display.RenderCamera(), false))
	6022	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5501	6023	culled = true;
5502	6024
5503	6025	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5533,11 +6055,12 @@
5533	6055
5534	6056
5535	6057	if (!culled)
5536		- if (display.DrawMode() == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	6058	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5537	6059	{
5538	6060	if (GetBRep() != null)
5539	6061	{
5540		- CameraPane.NextIndex(this, gl);
	6062	+ display.NextIndex();
	6063	+
5541	6064	// vertex color conflict : gl.glCallList(list);
5542	6065	DrawNode(display, root, selected);
5543	6066	if (this instanceof BezierPatch)
..	..	@@ -5578,7 +6101,28 @@
5578	6101	tex = GetTextures();
5579	6102	}
5580	6103
5581		- display.BindTextures(tex, texres);
	6104	+ boolean failedPigment = false;
	6105	+ boolean failedBump = false;
	6106	+
	6107	+ try
	6108	+ {
	6109	+ display.BindPigmentTexture(tex, texres);
	6110	+ }
	6111	+ catch (Exception e)
	6112	+ {
	6113	+ System.err.println("FAILED: " + this);
	6114	+ failedPigment = true;
	6115	+ }
	6116	+
	6117	+ try
	6118	+ {
	6119	+ display.BindBumpTexture(tex, texres);
	6120	+ }
	6121	+ catch (Exception e)
	6122	+ {
	6123	+ //System.err.println("FAILED: " + this);
	6124	+ failedBump = true;
	6125	+ }
5582	6126
5583	6127	if (!compiled)
5584	6128	{
..	..	@@ -5594,13 +6138,17 @@
5594	6138
5595	6139	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5596	6140	assert(bRep.displaylist != 0);
5597		- gl.glCallList(bRep.displaylist);
	6141	+ display.CallList(bRep.displaylist);
5598	6142	// june 2013 drawSelf(display, root, selected);
5599	6143	}
5600	6144	}
5601	6145	}
5602	6146
5603		- display.ReleaseTextures(tex);
	6147	+ if (!failedBump)
	6148	+ display.ReleaseBumpTexture(tex);
	6149	+
	6150	+ if (!failedPigment)
	6151	+ display.ReleasePigmentTexture(tex);
5604	6152
5605	6153	display.PopMaterial(this, selected);
5606	6154	}
..	..	@@ -5729,6 +6277,9 @@
5729	6277
5730	6278	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5731	6279	{
	6280	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6281	+ return;
	6282	+
5732	6283	if (hide)
5733	6284	return;
5734	6285	// shadow optimisation
..	..	@@ -5854,6 +6405,9 @@
5854	6405	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5855	6406	return; // no shadow for transparent objects
5856	6407
	6408	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6409	+ return;
	6410	+
5857	6411	if (hide)
5858	6412	return;
5859	6413
..	..	@@ -5894,9 +6448,10 @@
5894	6448	return;
5895	6449	}
5896	6450
	6451	+ //bRep.GenUV(1/material.diffuseness);
5897	6452	// bRep.lock = true;
5898	6453
5899		- javax.media.opengl.GL gl = display.GetGL();
	6454	+ //javax.media.opengl.GL gl = display.GetGL();
5900	6455
5901	6456	if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5902	6457	{
..	..	@@ -5913,23 +6468,7 @@
5913	6468
5914	6469	bRep.getMinMax(min, max, 100);
5915	6470
5916		- gl.glBegin(gl.GL_LINES);
5917		-
5918		- gl.glVertex3d(min.x, min.y, min.z);
5919		- gl.glVertex3d(min.x, min.y, max.z);
5920		- gl.glVertex3d(min.x, min.y, min.z);
5921		- gl.glVertex3d(min.x, max.y, min.z);
5922		- gl.glVertex3d(min.x, min.y, min.z);
5923		- gl.glVertex3d(max.x, min.y, min.z);
5924		-
5925		- gl.glVertex3d(max.x, max.y, max.z);
5926		- gl.glVertex3d(min.x, max.y, max.z);
5927		- gl.glVertex3d(max.x, max.y, max.z);
5928		- gl.glVertex3d(max.x, min.y, max.z);
5929		- gl.glVertex3d(max.x, max.y, max.z);
5930		- gl.glVertex3d(max.x, max.y, min.z);
5931		-
5932		- gl.glEnd();
	6471	+ display.DrawBox(min, max);
5933	6472
5934	6473	return;
5935	6474	}
..	..	@@ -5973,7 +6512,7 @@
5973	6512	{
5974	6513	//throw new Error();
5975	6514
5976		- boolean selectmode = display.DrawMode() == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6515	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5977	6516
5978	6517	int[] strips = bRep.getRawIndices();
5979	6518
..	..	@@ -5983,178 +6522,19 @@
5983	6522	new Exception().printStackTrace();
5984	6523	return;
5985	6524	}
5986		-
5987		- // TRIANGLE STRIP ARRAY
5988		- if (bRep.trimmed)
	6525	+
	6526	+ if (dontselect)
5989	6527	{
5990		- float[] v = bRep.getRawVertices();
5991		- float[] n = bRep.getRawNormals();
5992		- float[] c = bRep.getRawColors();
5993		- float[] uv = bRep.getRawUVMap();
5994		-
5995		- int count2 = 0;
5996		- int count3 = 0;
5997		-
5998		- if (n.length > 0)
5999		- {
6000		- for (int i = 0; i < strips.length; i++)
6001		- {
6002		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6003		-
6004		- /*
6005		- boolean locked = false;
6006		- float eps = 0.1f;
6007		- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6008		-
6009		- int dot = 0;
6010		-
6011		- if ((dot&1) == 0)
6012		- dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6013		-
6014		- if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6015		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6016		- else
6017		- {
6018		- locked = true;
6019		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6020		- }
6021		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6022		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6023		- if (hasnorm)
6024		- {
6025		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6026		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6027		- }
6028		-
6029		- if ((dot&4) == 0)
6030		- dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6031		-
6032		- if (wrap \|\| !locked && (dot&8) != 0)
6033		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6034		- else
6035		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6036		-
6037		- f.dot = dot;
6038		- */
6039		-
6040		- if (!selectmode)
6041		- {
6042		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6043		- {
6044		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6045		- } else
6046		- {
6047		- gl.glNormal3f(0, 0, 1);
6048		- }
6049		-
6050		- if (c != null)
6051		- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
6052		- {
6053		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6054		- }
6055		- }
6056		- if (flipV)
6057		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6058		- else
6059		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6060		- //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6061		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6062		-
6063		- count2 += 2;
6064		- count3 += 3;
6065		- if (!selectmode)
6066		- {
6067		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6068		- {
6069		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6070		- } else
6071		- {
6072		- gl.glNormal3f(0, 0, 1);
6073		- }
6074		- if (c != null)
6075		- {
6076		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6077		- }
6078		- }
6079		- if (flipV)
6080		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6081		- else
6082		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6083		- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6084		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6085		-
6086		- count2 += 2;
6087		- count3 += 3;
6088		- for (int j = 0; j < strips[i] - 2; j++)
6089		- {
6090		- //gl.glTexCoord2d(...);
6091		- if (!selectmode)
6092		- {
6093		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6094		- {
6095		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6096		- } else
6097		- {
6098		- gl.glNormal3f(0, 0, 1);
6099		- }
6100		- if (c != null)
6101		- {
6102		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6103		- }
6104		- }
6105		-
6106		- if (flipV)
6107		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6108		- else
6109		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6110		- //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6111		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6112		- count2 += 2;
6113		- count3 += 3;
6114		- }
6115		-
6116		- gl.glEnd();
6117		- }
6118		- }
6119		-
6120		- assert count3 == v.length;
	6528	+ //bRep.GenerateNormalsMINE();
6121	6529	}
6122		- else // !trimmed
6123		- {
6124		- int count = 0;
6125		- for (int i = 0; i < strips.length; i++)
6126		- {
6127		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6128		-
6129		- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6130		- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6131		-
6132		- drawVertex(gl, p, selectmode);
6133		- drawVertex(gl, q, selectmode);
6134		-
6135		- for (int j = 0; j < strips[i] - 2; j++)
6136		- {
6137		- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6138		-
6139		-// if (j%2 == 0)
6140		-// drawFace(p, q, r, display, null);
6141		-// else
6142		-// drawFace(p, r, q, display, null);
6143		-
6144		-// p = q;
6145		-// q = r;
6146		- drawVertex(gl, r, selectmode);
6147		- }
6148		-
6149		- gl.glEnd();
6150		- }
6151		- }
	6530	+
	6531	+ display.DrawGeometry(bRep, flipV, selectmode);
6152	6532	} else // catch (Error e)
6153	6533	{
6154	6534	// TRIANGLE ARRAY
6155	6535	if (IsOpaque()) // Static())
6156	6536	{
6157		- gl.glBegin(gl.GL_TRIANGLES);
	6537	+ display.StartTriangles();
6158	6538	int facecount = bRep.FaceCount();
6159	6539	for (int i = 0; i < facecount; i++)
6160	6540	{
..	..	@@ -6219,7 +6599,7 @@
6219	6599
6220	6600	display.DrawFace(this, p, q, r, face);
6221	6601	}
6222		- gl.glEnd();
	6602	+ display.EndTriangles();
6223	6603	}
6224	6604	else
6225	6605	{
..	..	@@ -6248,8 +6628,8 @@
6248	6628	//System.out.println("SORT");
6249	6629
6250	6630	java.util.Arrays.sort(facescompare);
6251		-
6252		- gl.glBegin(gl.GL_TRIANGLES);
	6631	+
	6632	+ display.StartTriangles();
6253	6633	for (int i = 0; i < facecount; i++)
6254	6634	{
6255	6635	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6263,11 +6643,12 @@
6263	6643
6264	6644	display.DrawFace(this, p, q, r, face);
6265	6645	}
6266		- gl.glEnd();
	6646	+ display.EndTriangles();
6267	6647	}
6268	6648
6269	6649	if (false) // live && support != null && support.bRep != null) // debug weights
6270	6650	{
	6651	+ /*
6271	6652	gl.glDisable(gl.GL_LIGHTING);
6272	6653	float[] colorV = new float[3];
6273	6654
..	..	@@ -6346,6 +6727,7 @@
6346	6727	// gl.glEnd();
6347	6728	}
6348	6729	}
	6730	+ */
6349	6731	}
6350	6732	}
6351	6733
..	..	@@ -6390,7 +6772,7 @@
6390	6772	center.add(r);
6391	6773	center.mul(1.0/3);
6392	6774
6393		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6775	+ center.sub(Globals.theRenderer.EyeCamera().location);
6394	6776
6395	6777	distance = center.dot(center);
6396	6778	}
..	..	@@ -6404,22 +6786,6 @@
6404	6786	void Print(Vertex v)
6405	6787	{
6406	6788	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6407		- }
6408		-
6409		- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6410		- {
6411		- if (!selectmode)
6412		- {
6413		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6414		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6415		-
6416		- if (flipV)
6417		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6418		- else
6419		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6420		- }
6421		-
6422		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6423	6789	}
6424	6790
6425	6791	void drawSelf(ClickInfo info, int level, boolean select)
..	..	@@ -6945,20 +7311,23 @@
6945	7311	}
6946	7312	}
6947	7313
6948		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7314	+ static ClickInfo clickInfo = new ClickInfo();
	7315	+
	7316	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7317	+ Point outPt, Rectangle outRec)
6949	7318	{
6950		- int hc = info.bounds.x + info.bounds.width / 2;
6951		- int vc = info.bounds.y + info.bounds.height / 2;
6952		- double[][] toscreen = info.toScreen;
	7319	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7320	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7321	+ double[][] toscreen = clickInfo.toScreen;
6953	7322	if (toscreen == null)
6954	7323	{
6955		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7324	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6956	7325	}
6957	7326	cVector vec = in;
6958	7327	LA.xformPos(in, toscreen, in);
6959	7328	//System.out.println("Distance = " + info.camera.Distance());
6960		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
6961		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7329	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7330	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6962	7331	outPt.x = hc + (int) vec.x;
6963	7332	outPt.y = vc - (int) vec.y;
6964	7333	outRec.x = outPt.x - 3;
..	..	@@ -6966,15 +7335,18 @@
6966	7335	outRec.width = outRec.height = 6;
6967	7336	}
6968	7337
6969		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7338	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7339	+ )
6970	7340	{
6971	7341	Point pt = new Point(0, 0);
6972	7342	Rectangle rec = new Rectangle();
6973		- calcHotSpot(in, info, pt, rec);
	7343	+ calcHotSpot(in, //clickInfo,
	7344	+ pt, rec);
6974	7345	return rec;
6975	7346	}
6976	7347
6977		- void drawEditHandles0(ClickInfo info, int level)
	7348	+ void drawEditHandles0(//ClickInfo clickInfo,
	7349	+ int level)
6978	7350	{
6979	7351	if (level == 0)
6980	7352	{
..	..	@@ -6983,98 +7355,103 @@
6983	7355	{
6984	7356	cVector origin = new cVector();
6985	7357	//LA.xformPos(origin, toParent, origin);
6986		- Rectangle spot = calcHotSpot(origin, info);
	7358	+ if (this.clickInfo == null)
	7359	+ this.clickInfo = new ClickInfo();
	7360	+
	7361	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
6987	7362	Rectangle boundary = new Rectangle();
6988	7363	boundary.x = spot.x - 30;
6989	7364	boundary.y = spot.y - 30;
6990	7365	boundary.width = spot.width + 60;
6991	7366	boundary.height = spot.height + 60;
6992		- info.g.setColor(Color.red);
	7367	+ clickInfo.g.setColor(Color.red);
6993	7368	int spotw = spot.x + spot.width;
6994	7369	int spoth = spot.y + spot.height;
6995		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6996		- if (CameraPane.Xmin > spot.x)
6997		- {
6998		- CameraPane.Xmin = spot.x;
6999		- }
7000		- if (CameraPane.Xmax < spotw)
7001		- {
7002		- CameraPane.Xmax = spotw;
7003		- }
7004		- if (CameraPane.Ymin > spot.y)
7005		- {
7006		- CameraPane.Ymin = spot.y;
7007		- }
7008		- if (CameraPane.Ymax < spoth)
7009		- {
7010		- CameraPane.Ymax = spoth;
7011		- }
	7370	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7371	+// if (CameraPane.Xmin > spot.x)
	7372	+// {
	7373	+// CameraPane.Xmin = spot.x;
	7374	+// }
	7375	+// if (CameraPane.Xmax < spotw)
	7376	+// {
	7377	+// CameraPane.Xmax = spotw;
	7378	+// }
	7379	+// if (CameraPane.Ymin > spot.y)
	7380	+// {
	7381	+// CameraPane.Ymin = spot.y;
	7382	+// }
	7383	+// if (CameraPane.Ymax < spoth)
	7384	+// {
	7385	+// CameraPane.Ymax = spoth;
	7386	+// }
7012	7387	spot.translate(32, 32);
7013	7388	spotw = spot.x + spot.width;
7014	7389	spoth = spot.y + spot.height;
7015		- info.g.setColor(Color.blue);
7016		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7017		- if (CameraPane.Xmin > spot.x)
7018		- {
7019		- CameraPane.Xmin = spot.x;
7020		- }
7021		- if (CameraPane.Xmax < spotw)
7022		- {
7023		- CameraPane.Xmax = spotw;
7024		- }
7025		- if (CameraPane.Ymin > spot.y)
7026		- {
7027		- CameraPane.Ymin = spot.y;
7028		- }
7029		- if (CameraPane.Ymax < spoth)
7030		- {
7031		- CameraPane.Ymax = spoth;
7032		- }
7033		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7034		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7390	+ clickInfo.g.setColor(Color.cyan);
	7391	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7392	+// if (CameraPane.Xmin > spot.x)
	7393	+// {
	7394	+// CameraPane.Xmin = spot.x;
	7395	+// }
	7396	+// if (CameraPane.Xmax < spotw)
	7397	+// {
	7398	+// CameraPane.Xmax = spotw;
	7399	+// }
	7400	+// if (CameraPane.Ymin > spot.y)
	7401	+// {
	7402	+// CameraPane.Ymin = spot.y;
	7403	+// }
	7404	+// if (CameraPane.Ymax < spoth)
	7405	+// {
	7406	+// CameraPane.Ymax = spoth;
	7407	+// }
	7408	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7409	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7035	7410	spot.translate(0, -32);
7036		- info.g.setColor(Color.green);
7037		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7038		- if (CameraPane.Xmin > spot.x)
7039		- {
7040		- CameraPane.Xmin = spot.x;
7041		- }
7042		- if (CameraPane.Xmax < spotw)
7043		- {
7044		- CameraPane.Xmax = spotw;
7045		- }
7046		- if (CameraPane.Ymin > spot.y)
7047		- {
7048		- CameraPane.Ymin = spot.y;
7049		- }
7050		- if (CameraPane.Ymax < spoth)
7051		- {
7052		- CameraPane.Ymax = spoth;
7053		- }
7054		- info.g.drawArc(boundary.x, boundary.y,
7055		- boundary.width, boundary.height, 0, 360);
	7411	+ clickInfo.g.setColor(Color.yellow);
	7412	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7413	+ clickInfo.g.setColor(Color.green);
	7414	+// if (CameraPane.Xmin > spot.x)
	7415	+// {
	7416	+// CameraPane.Xmin = spot.x;
	7417	+// }
	7418	+// if (CameraPane.Xmax < spotw)
	7419	+// {
	7420	+// CameraPane.Xmax = spotw;
	7421	+// }
	7422	+// if (CameraPane.Ymin > spot.y)
	7423	+// {
	7424	+// CameraPane.Ymin = spot.y;
	7425	+// }
	7426	+// if (CameraPane.Ymax < spoth)
	7427	+// {
	7428	+// CameraPane.Ymax = spoth;
	7429	+// }
	7430	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7431	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7056	7432	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7057		- if (CameraPane.Xmin > boundary.x)
7058		- {
7059		- CameraPane.Xmin = boundary.x;
7060		- }
7061		- if (CameraPane.Xmax < boundary.x + boundary.width)
7062		- {
7063		- CameraPane.Xmax = boundary.x + boundary.width;
7064		- }
7065		- if (CameraPane.Ymin > boundary.y)
7066		- {
7067		- CameraPane.Ymin = boundary.y;
7068		- }
7069		- if (CameraPane.Ymax < boundary.y + boundary.height)
7070		- {
7071		- CameraPane.Ymax = boundary.y + boundary.height;
7072		- }
	7433	+// if (CameraPane.Xmin > boundary.x)
	7434	+// {
	7435	+// CameraPane.Xmin = boundary.x;
	7436	+// }
	7437	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	7438	+// {
	7439	+// CameraPane.Xmax = boundary.x + boundary.width;
	7440	+// }
	7441	+// if (CameraPane.Ymin > boundary.y)
	7442	+// {
	7443	+// CameraPane.Ymin = boundary.y;
	7444	+// }
	7445	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	7446	+// {
	7447	+// CameraPane.Ymax = boundary.y + boundary.height;
	7448	+// }
7073	7449	return;
7074	7450	}
7075	7451	}
7076	7452
7077		- boolean doEditClick0(ClickInfo info, int level)
	7453	+ boolean doEditClick0(//ClickInfo clickInfo,
	7454	+ int level)
7078	7455	{
7079	7456	if (level == 0)
7080	7457	{
..	..	@@ -7083,10 +7460,10 @@
7083	7460
7084	7461	boolean retval = false;
7085	7462
7086		- startX = info.x;
7087		- startY = info.y;
	7463	+ startX = clickInfo.x;
	7464	+ startY = clickInfo.y;
7088	7465
7089		- hitSomething = 0;
	7466	+ hitSomething = -1;
7090	7467	cVector origin = new cVector();
7091	7468	//LA.xformPos(origin, toParent, origin);
7092	7469	Rectangle spot = new Rectangle();
..	..	@@ -7094,22 +7471,51 @@
7094	7471	{
7095	7472	centerPt = new Point(0, 0);
7096	7473	}
7097		- calcHotSpot(origin, info, centerPt, spot);
7098		- if (spot.contains(info.x, info.y))
	7474	+ calcHotSpot(origin, //info,
	7475	+ centerPt, spot);
	7476	+ if (spot.contains(clickInfo.x, clickInfo.y))
7099	7477	{
7100	7478	hitSomething = hitCenter;
7101	7479	retval = true;
7102	7480	}
7103	7481	spot.translate(32, 0);
7104		- if (spot.contains(info.x, info.y))
	7482	+ if (spot.contains(clickInfo.x, clickInfo.y))
7105	7483	{
7106	7484	hitSomething = hitRotate;
7107	7485	retval = true;
7108	7486	}
7109	7487	spot.translate(0, 32);
7110		- if (spot.contains(info.x, info.y))
	7488	+ if (spot.contains(clickInfo.x, clickInfo.y))
7111	7489	{
7112	7490	hitSomething = hitScale;
	7491	+
	7492	+ double scale = 0.005f * clickInfo.camera.Distance();
	7493	+ double hScale = (double) (clickInfo.x /- centerPt.x/) / 32;
	7494	+ double sign = 1;
	7495	+ if (hScale < 0)
	7496	+ {
	7497	+ sign = -1;
	7498	+ }
	7499	+ hScale = signMath.pow(signhScale, scale * 50);
	7500	+ if (hScale < 0.01)
	7501	+ {
	7502	+ //hScale = 0.01;
	7503	+ }
	7504	+
	7505	+ double vScale = (double) (clickInfo.y /- centerPt.y/) / 32;
	7506	+ sign = 1;
	7507	+ if (vScale < 0)
	7508	+ {
	7509	+ sign = -1;
	7510	+ }
	7511	+ vScale = signMath.pow(signvScale, scale * 50);
	7512	+ if (vScale < 0.01)
	7513	+ {
	7514	+ //vScale = 0.01;
	7515	+ }
	7516	+
	7517	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7518	+
7113	7519	retval = true;
7114	7520	}
7115	7521
..	..	@@ -7119,7 +7525,7 @@
7119	7525	}
7120	7526
7121	7527	//System.out.println("info.modifiers = " + info.modifiers);
7122		- modified = (info.modifiers & CameraPane.META) != 0;
	7528	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7123	7529	//System.out.println("modified = " + modified);
7124	7530	//new Exception().printStackTrace();
7125	7531	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7147,7 +7553,8 @@
7147	7553	return true;
7148	7554	}
7149	7555
7150		- void doEditDrag0(ClickInfo info)
	7556	+ void doEditDrag0(//ClickInfo info,
	7557	+ boolean opposite)
7151	7558	{
7152	7559	if (hitSomething == 0)
7153	7560	{
..	..	@@ -7161,7 +7568,8 @@
7161	7568
7162	7569	//System.out.println("hitSomething = " + hitSomething);
7163	7570
7164		- double scale = 0.005f * info.camera.Distance();
	7571	+ double scale = 0.005f * clickInfo.camera.Distance();
	7572	+
7165	7573	cVector xlate = new cVector();
7166	7574	//cVector xlate2 = new cVector();
7167	7575	switch (hitSomething)
..	..	@@ -7172,9 +7580,9 @@
7172	7580
7173	7581	case hitCenter: // Translate
7174	7582
7175		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7583	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7176	7584
7177		- if (modified)
	7585	+ if (modified \|\| opposite)
7178	7586	{
7179	7587	//assert(false);
7180	7588	/*
..	..	@@ -7194,8 +7602,8 @@
7194	7602	toParent[3][i] = xlate.get(i);
7195	7603	LA.matInvert(toParent, fromParent);
7196	7604	*/
7197		- cVector delta = LA.newVector(0, 0, startY - info.y);
7198		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7605	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7606	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7199	7607
7200	7608	LA.matCopy(startMat, toParent);
7201	7609	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7204,7 +7612,7 @@
7204	7612	} else
7205	7613	{
7206	7614	//LA.xformDir(delta, info.camera.fromScreen, delta);
7207		- cVector up = new cVector(info.camera.up);
	7615	+ cVector up = new cVector(clickInfo.camera.up);
7208	7616	cVector away = new cVector();
7209	7617	//cVector right2 = new cVector();
7210	7618	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7220,20 +7628,20 @@
7220	7628	}
7221	7629	LA.xformDir(up, ClickInfo.matbuffer, up);
7222	7630	// if (!CameraPane.LOCALTRANSFORM)
7223		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
7224		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7631	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
	7632	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7225	7633	// if (!CameraPane.LOCALTRANSFORM)
7226		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7634	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7227	7635	//LA.vecCross(up, cVector.Z, right2);
7228	7636
7229		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7637	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7230	7638
7231	7639	//System.out.println("DELTA0 = " + delta);
7232	7640	//System.out.println("AWAY = " + info.camera.away);
7233	7641	//System.out.println("UP = " + info.camera.up);
7234	7642	if (away.z > 0)
7235	7643	{
7236		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7644	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7237	7645	{
7238	7646	delta.x = -delta.x;
7239	7647	} else
..	..	@@ -7248,7 +7656,7 @@
7248	7656	//System.out.println("DELTA1 = " + delta);
7249	7657	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7250	7658	//System.out.println("DELTA2 = " + delta);
7251		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7659	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7252	7660	LA.matCopy(startMat, toParent);
7253	7661	//System.out.println("DELTA3 = " + delta);
7254	7662	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7258,8 +7666,8 @@
7258	7666	break;
7259	7667
7260	7668	case hitRotate: // rotate
7261		- int dx = info.x - centerPt.x;
7262		- int dy = -(info.y - centerPt.y);
	7669	+ int dx = clickInfo.x - centerPt.x;
	7670	+ int dy = -(clickInfo.y - centerPt.y);
7263	7671	double angle = (double) Math.atan2(dx, dy);
7264	7672	angle = -(1.570796 - angle);
7265	7673
..	..	@@ -7268,6 +7676,7 @@
7268	7676
7269	7677	if (modified)
7270	7678	{
	7679	+ // Rotate 90 degrees
7271	7680	angle /= (Math.PI / 4);
7272	7681	angle = Math.floor(angle + 0.5);
7273	7682	angle *= (Math.PI / 4);
..	..	@@ -7281,7 +7690,7 @@
7281	7690	}
7282	7691	/**/
7283	7692
7284		- switch (info.pane.renderCamera.viewCode)
	7693	+ switch (clickInfo.pane.RenderCamera().viewCode)
7285	7694	{
7286	7695	case 1: // '\001'
7287	7696	LA.matZRotate(toParent, angle);
..	..	@@ -7308,26 +7717,30 @@
7308	7717	break;
7309	7718
7310	7719	case hitScale: // scale
7311		- double hScale = (double) (info.x - centerPt.x) / 32;
	7720	+ double hScale = (double) (clickInfo.x /- centerPt.x/) / 32;
	7721	+ double sign = 1;
	7722	+ if (hScale < 0)
	7723	+ {
	7724	+ sign = -1;
	7725	+ }
	7726	+ hScale = signMath.pow(signhScale, scale * 50);
7312	7727	if (hScale < 0.01)
7313	7728	{
7314		- hScale = 0.01;
	7729	+ //hScale = 0.01;
7315	7730	}
7316		- hScale = Math.pow(hScale, scale * 50);
7317		- if (hScale < 0.01)
	7731	+
	7732	+ double vScale = (double) (clickInfo.y /- centerPt.y/) / 32;
	7733	+ sign = 1;
	7734	+ if (vScale < 0)
7318	7735	{
7319		- hScale = 0.01;
	7736	+ sign = -1;
7320	7737	}
7321		- double vScale = (double) (info.y - centerPt.y) / 32;
	7738	+ vScale = signMath.pow(signvScale, scale * 50);
7322	7739	if (vScale < 0.01)
7323	7740	{
7324		- vScale = 0.01;
	7741	+ //vScale = 0.01;
7325	7742	}
7326		- vScale = Math.pow(vScale, scale * 50);
7327		- if (vScale < 0.01)
7328		- {
7329		- vScale = 0.01;
7330		- }
	7743	+
7331	7744	LA.matCopy(startMat, toParent);
7332	7745	/**/
7333	7746	for (int i = 0; i < 3; i++)
..	..	@@ -7337,39 +7750,47 @@
7337	7750	}
7338	7751	/**/
7339	7752
7340		- switch (info.pane.renderCamera.viewCode)
	7753	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
	7754	+
	7755	+ if (totalScale < 0.01)
	7756	+ {
	7757	+ totalScale = 0.01;
	7758	+ }
	7759	+
	7760	+ switch (clickInfo.pane.RenderCamera().viewCode)
7341	7761	{
7342	7762	case 3: // '\001'
7343		- if (modified)
	7763	+ if (modified \|\| opposite)
7344	7764	{
7345	7765	//LA.matScale(toParent, 1, hScale, vScale);
7346		- LA.matScale(toParent, vScale, 1, 1);
	7766	+ LA.matScale(toParent, totalScale, 1, 1);
7347	7767	} // vScale, 1);
7348	7768	else
7349	7769	{
7350		- LA.matScale(toParent, vScale, vScale, vScale);
	7770	+ // EXCEPTION!
	7771	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7351	7772	} // vScale, 1);
7352	7773	break;
7353	7774
7354	7775	case 2: // '\002'
7355		- if (modified)
	7776	+ if (modified \|\| opposite)
7356	7777	{
7357	7778	//LA.matScale(toParent, hScale, 1, vScale);
7358		- LA.matScale(toParent, 1, vScale, 1);
	7779	+ LA.matScale(toParent, 1, totalScale, 1);
7359	7780	} else
7360	7781	{
7361		- LA.matScale(toParent, vScale, 1, vScale);
	7782	+ LA.matScale(toParent, totalScale, 1, totalScale);
7362	7783	}
7363	7784	break;
7364	7785
7365	7786	case 1: // '\003'
7366		- if (modified)
	7787	+ if (modified \|\| opposite)
7367	7788	{
7368	7789	//LA.matScale(toParent, hScale, vScale, 1);
7369		- LA.matScale(toParent, 1, 1, vScale);
	7790	+ LA.matScale(toParent, 1, 1, totalScale);
7370	7791	} else
7371	7792	{
7372		- LA.matScale(toParent, vScale, vScale, 1);
	7793	+ LA.matScale(toParent, totalScale, totalScale, 1);
7373	7794	}
7374	7795	break;
7375	7796	}
..	..	@@ -7403,7 +7824,7 @@
7403	7824	} // NEW ...
7404	7825
7405	7826
7406		- info.pane.repaint();
	7827	+ clickInfo.pane.repaint();
7407	7828	}
7408	7829
7409	7830	boolean overflow = false;
..	..	@@ -7502,14 +7923,22 @@
7502	7923	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7503	7924	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7504	7925	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7926	+
	7927	+ String objname;
	7928	+
7505	7929	if (false) //parent != null)
7506	7930	{
7507		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7931	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7508	7932	} else
7509	7933	{
7510		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7934	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7511	7935	} // + super.toString();
7512	7936	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7937	+
	7938	+ if (!Globals.ADVANCED)
	7939	+ return objname;
	7940	+
	7941	+ return objname + " " + System.identityHashCode(this);
7513	7942	}
7514	7943
7515	7944	public int hashCode()
..	..	@@ -7565,6 +7994,7 @@
7565	7994	objectUI.closeUI();
7566	7995	if (editWindow != null)
7567	7996	{
	7997	+ editWindow.ctrlPanel.FlushUI();
7568	7998	editWindow.refreshContents();
7569	7999	} // ? new
7570	8000	objectUI = null;
..	..	@@ -7573,6 +8003,10 @@
7573	8003	{
7574	8004	editWindow = null;
7575	8005	} // ?
	8006	+ }
	8007	+ else
	8008	+ {
	8009	+ //editWindow.closeUI();
7576	8010	}
7577	8011	}
7578	8012
..	..	@@ -7585,7 +8019,7 @@
7585	8019	/transient/ cVector2[] projectedVertices = new cVector2[0];
7586	8020
7587	8021	Object3D /Composite/ parent;
7588		- Object3D /Composite/ fileparent;
	8022	+ Object3D /Composite/ fileparent; // In the case of FileObject
7589	8023
7590	8024	double[][] toParent; // dynamic matrix
7591	8025	double[][] fromParent;
..	..	@@ -7700,7 +8134,7 @@
7700	8134	{
7701	8135	assert(bRep != null);
7702	8136	if (!(support instanceof GenericJoint)) // support.bRep != null)
7703		- GrafreeD.Assert(support.bRep == bRep.support);
	8137	+ Grafreed.Assert(support.bRep == bRep.support);
7704	8138	}
7705	8139	else
7706	8140	{
..	..	@@ -7731,6 +8165,10 @@
7731	8165	}
7732	8166
7733	8167	transient ObjEditor editWindow;
	8168	+ transient ObjEditor manipWindow;
	8169	+
	8170	+ transient boolean pinned;
	8171	+
7734	8172	transient ObjectUI objectUI;
7735	8173	public static int povDepth = 0;
7736	8174	private static cVector tbMin = new cVector();
..	..	@@ -7749,9 +8187,9 @@
7749	8187	private static cVector edge2 = new cVector();
7750	8188	//private static cVector norm = new cVector();
7751	8189	/transient private/ int hitSomething;
7752		- private static final int hitCenter = 1;
7753		- private static final int hitScale = 2;
7754		- private static final int hitRotate = 3;
	8190	+ static final int hitCenter = 1;
	8191	+ static final int hitScale = 2;
	8192	+ static final int hitRotate = 3;
7755	8193	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7756	8194	/transient/ private Point centerPt;
7757	8195	/transient/ private int startX;