~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
..	..	@@ -430,16 +586,16 @@
430	586	{
431	587	Object3D copy = this;
432	588
433		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	589	+ Camera parentcam = Globals.theRenderer.ManipCamera();
434	590
435		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	591	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
436	592	{
437		- parentcam = CameraPane.theRenderer.cameras[1];
	593	+ parentcam = Globals.theRenderer.Cameras()[1];
438	594	}
439	595
440		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	596	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
441	597	{
442		- parentcam = CameraPane.theRenderer.cameras[0];
	598	+ parentcam = Globals.theRenderer.Cameras()[0];
443	599	}
444	600
445	601	if (this == parentcam)
..	..	@@ -447,7 +603,7 @@
447	603	//assert(this instanceof Camera);
448	604
449	605	for (int count = parentcam.GetTransformCount(); --count>=0;)
450		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	606	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
451	607	}
452	608
453	609	copy.marked ^= true;
..	..	@@ -467,7 +623,7 @@
467	623	//assert(this instanceof Camera);
468	624
469	625	for (int count = parentcam.GetTransformCount(); --count>=0;)
470		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	626	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
471	627	}
472	628
473	629	copy.Touch(); // display list issue
..	..	@@ -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	}
..	..	@@ -602,7 +760,7 @@
602	760	return;
603	761	}
604	762
605		- if (CameraPane.fromscript)
	763	+ if (Globals.fromscript)
606	764	{
607	765	transformcount = 0;
608	766	return;
..	..	@@ -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,22 @@
2293	2465	}
2294	2466	*/
2295	2467	}
	2468	+ else
	2469	+ {
	2470	+ //((ObjEditor)editWindow).SetupUI2(null);
	2471	+ if (objectUI != null)
	2472	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2473	+ else
	2474	+ //new Exception().printStackTrace();
	2475	+ System.err.println("objectUI is null");
	2476	+ }
2296	2477	}
2297	2478
2298	2479	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2299	2480	{
2300	2481	if (newWindow)
2301	2482	{
	2483	+ new Exception().printStackTrace();
2302	2484	System.exit(0);
2303	2485	if (parent != null)
2304	2486	{
..	..	@@ -2333,6 +2515,14 @@
2333	2515	{
2334	2516	editWindow.refreshContents();
2335	2517	}
	2518	+ else
	2519	+ {
	2520	+ if (manipWindow != null)
	2521	+ {
	2522	+ manipWindow.refreshContents();
	2523	+ }
	2524	+ }
	2525	+
2336	2526	//if (parent != null)
2337	2527	//parent.refreshEditWindow();
2338	2528	}
..	..	@@ -2412,7 +2602,8 @@
2412	2602	private static final int editSelf = 1;
2413	2603	private static final int editChild = 2;
2414	2604
2415		- void drawEditHandles(ClickInfo info, int level)
	2605	+ void drawEditHandles(//ClickInfo info,
	2606	+ int level)
2416	2607	{
2417	2608	if (level == 0)
2418	2609	{
..	..	@@ -2420,7 +2611,8 @@
2420	2611	return;
2421	2612
2422	2613	Object3D selectee;
2423		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2614	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2615	+ level + 1))
2424	2616	{
2425	2617	selectee = (Object3D) e.nextElement();
2426	2618	}
..	..	@@ -2428,19 +2620,22 @@
2428	2620	} else
2429	2621	{
2430	2622	//super.
2431		- drawEditHandles0(info, level + 1);
	2623	+ drawEditHandles0(//info,
	2624	+ level + 1);
2432	2625	}
2433	2626	}
2434	2627
2435		- boolean doEditClick(ClickInfo info, int level)
	2628	+ boolean doEditClick(//ClickInfo info,
	2629	+ int level)
2436	2630	{
2437	2631	doSomething = 0;
2438	2632	if (level == 0)
2439	2633	{
2440		- return doParentClick(info);
	2634	+ return doParentClick(); //info);
2441	2635	}
2442	2636	if (//super.
2443		- doEditClick0(info, level))
	2637	+ doEditClick0(//info,
	2638	+ level))
2444	2639	{
2445	2640	doSomething = 1;
2446	2641	return true;
..	..	@@ -2450,7 +2645,7 @@
2450	2645	}
2451	2646	}
2452	2647
2453		- boolean doParentClick(ClickInfo info)
	2648	+ boolean doParentClick() //ClickInfo info)
2454	2649	{
2455	2650	if (selection == null)
2456	2651	{
..	..	@@ -2463,7 +2658,8 @@
2463	2658	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2464	2659	{
2465	2660	Object3D selectee = (Object3D) e.nextElement();
2466		- if (selectee.doEditClick(info, 1))
	2661	+ if (selectee.doEditClick(//info,
	2662	+ 1))
2467	2663	{
2468	2664	childToDrag = selectee;
2469	2665	doSomething = 2;
..	..	@@ -2475,13 +2671,15 @@
2475	2671	return retval;
2476	2672	}
2477	2673
2478		- void doEditDrag(ClickInfo info)
	2674	+ void doEditDrag(//ClickInfo clickInfo,
	2675	+ boolean opposite)
2479	2676	{
2480	2677	switch (doSomething)
2481	2678	{
2482	2679	case 1: // '\001'
2483	2680	//super.
2484		- doEditDrag0(info);
	2681	+ doEditDrag0(//clickInfo,
	2682	+ opposite);
2485	2683	break;
2486	2684
2487	2685	case 2: // '\002'
..	..	@@ -2494,11 +2692,13 @@
2494	2692	{
2495	2693	//sel.hitSomething = childToDrag.hitSomething;
2496	2694	//childToDrag.doEditDrag(info);
2497		- sel.doEditDrag(info);
	2695	+ sel.doEditDrag(//clickInfo,
	2696	+ opposite);
2498	2697	} else
2499	2698	{
2500	2699	//super.
2501		- doEditDrag0(info);
	2700	+ doEditDrag0(//clickInfo,
	2701	+ opposite);
2502	2702	}
2503	2703	}
2504	2704	break;
..	..	@@ -2516,6 +2716,9 @@
2516	2716	{
2517	2717	deselectAll();
2518	2718	}
	2719	+
	2720	+ new Exception().printStackTrace();
	2721	+
2519	2722	ClickInfo newInfo = new ClickInfo();
2520	2723	newInfo.flags = info.flags;
2521	2724	newInfo.bounds = info.bounds;
..	..	@@ -2608,6 +2811,18 @@
2608	2811	void GenNormalsS(boolean crease)
2609	2812	{
2610	2813	selection.GenNormals(crease);
	2814	+// for (int i=0; i<selection.size(); i++)
	2815	+// {
	2816	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2817	+// selectee.GenNormals(crease);
	2818	+// }
	2819	+
	2820	+ //Touch();
	2821	+ }
	2822	+
	2823	+ void GenNormalsMeshS()
	2824	+ {
	2825	+ selection.GenNormalsMesh();
2611	2826	// for (int i=0; i<selection.size(); i++)
2612	2827	// {
2613	2828	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2748,6 +2963,24 @@
2748	2963	if (child == null)
2749	2964	continue;
2750	2965	child.GenNormals(crease);
	2966	+// Children().release(i);
	2967	+ }
	2968	+ blockloop = false;
	2969	+ }
	2970	+
	2971	+ void GenNormalsMesh()
	2972	+ {
	2973	+ if (blockloop)
	2974	+ return;
	2975	+
	2976	+ blockloop = true;
	2977	+ GenNormalsMesh0();
	2978	+ for (int i = 0; i < Children().Size(); i++)
	2979	+ {
	2980	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2981	+ if (child == null)
	2982	+ continue;
	2983	+ child.GenNormalsMesh();
2751	2984	// Children().release(i);
2752	2985	}
2753	2986	blockloop = false;
..	..	@@ -2905,7 +3138,8 @@
2905	3138	{
2906	3139	if (bRep != null)
2907	3140	{
2908		- bRep.GenUV();
	3141	+ bRep.GenUV(); //1);
	3142	+ //bRep.UnfoldUV();
2909	3143	Touch();
2910	3144	}
2911	3145	}
..	..	@@ -2919,11 +3153,20 @@
2919	3153	}
2920	3154	}
2921	3155
	3156	+ void GenNormalsMesh0()
	3157	+ {
	3158	+ if (bRep != null)
	3159	+ {
	3160	+ bRep.GenerateNormalsMesh();
	3161	+ Touch();
	3162	+ }
	3163	+ }
	3164	+
2922	3165	void GenNormalsMINE0()
2923	3166	{
2924	3167	if (bRep != null)
2925	3168	{
2926		- bRep.GenerateNormalsMINE();
	3169	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2927	3170	Touch();
2928	3171	}
2929	3172	}
..	..	@@ -2980,6 +3223,33 @@
2980	3223	blockloop = false;
2981	3224	}
2982	3225
	3226	+ void TransformChildren()
	3227	+ {
	3228	+ if (toParent != null)
	3229	+ {
	3230	+ for (int i=Size(); --i>=0;)
	3231	+ {
	3232	+ Object3D v = get(i);
	3233	+
	3234	+ if (v.toParent == null)
	3235	+ {
	3236	+ v.toParent = LA.newMatrix();
	3237	+ v.fromParent = LA.newMatrix();
	3238	+ }
	3239	+
	3240	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3241	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3242	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3243	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3244	+ }
	3245	+
	3246	+ toParent = null; // LA.matIdentity(toParent);
	3247	+ fromParent = null; // LA.matIdentity(fromParent);
	3248	+
	3249	+ Touch();
	3250	+ }
	3251	+ }
	3252	+
2983	3253	void TransformGeometry()
2984	3254	{
2985	3255	Object3D obj = this;
..	..	@@ -3201,9 +3471,11 @@
3201	3471
3202	3472	BoundaryRep sup = bRep.support;
3203	3473	bRep.support = null;
3204		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3474	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3205	3475	// bRep.SplitInTwo(onlyone); // thread...
3206		- temprep.SplitInTwo(reduction34, onlyone);
	3476	+
	3477	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3478	+
3207	3479	bRep = temprep;
3208	3480	bRep.support = sup;
3209	3481	Touch();
..	..	@@ -3340,7 +3612,8 @@
3340	3612	if (blockloop)
3341	3613	return;
3342	3614
3343		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3615	+ if (//marked \|\| // does not make sense
	3616	+ (bRep != null \|\| material != null)) // borderline...
3344	3617	live = h;
3345	3618
3346	3619	for (int i = 0; i < Size(); i++)
..	..	@@ -3361,7 +3634,8 @@
3361	3634	return;
3362	3635
3363	3636	//if (bRep != null)
3364		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3637	+ if (//marked \|\| // does not make sense
	3638	+ (bRep != null \|\| material != null)) // borderline...
3365	3639	link2master = h;
3366	3640
3367	3641	for (int i = 0; i < Size(); i++)
..	..	@@ -3381,7 +3655,8 @@
3381	3655	if (blockloop)
3382	3656	return;
3383	3657
3384		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3658	+ if (//marked \|\| // does not make sense
	3659	+ (bRep != null \|\| material != null)) // borderline...
3385	3660	hide = h;
3386	3661
3387	3662	for (int i = 0; i < Size(); i++)
..	..	@@ -3401,7 +3676,7 @@
3401	3676	if (blockloop)
3402	3677	return;
3403	3678
3404		- if (bRep != null && material != null) // borderline...
	3679	+ if (bRep != null \|\| material != null) // borderline...
3405	3680	marked = h;
3406	3681
3407	3682	for (int i = 0; i < Size(); i++)
..	..	@@ -3411,6 +3686,46 @@
3411	3686	continue;
3412	3687	blockloop = true;
3413	3688	child.MarkLeaves(h);
	3689	+ blockloop = false;
	3690	+ // release(i);
	3691	+ }
	3692	+ }
	3693	+
	3694	+ void RewindLeaves(boolean h)
	3695	+ {
	3696	+ if (blockloop)
	3697	+ return;
	3698	+
	3699	+ if (bRep != null \|\| material != null) // borderline...
	3700	+ rewind = h;
	3701	+
	3702	+ for (int i = 0; i < Size(); i++)
	3703	+ {
	3704	+ Object3D child = (Object3D) get(i); // reserve(i);
	3705	+ if (child == null)
	3706	+ continue;
	3707	+ blockloop = true;
	3708	+ child.RewindLeaves(h);
	3709	+ blockloop = false;
	3710	+ // release(i);
	3711	+ }
	3712	+ }
	3713	+
	3714	+ void RandomLeaves(boolean h)
	3715	+ {
	3716	+ if (blockloop)
	3717	+ return;
	3718	+
	3719	+ if (bRep != null \|\| material != null) // borderline...
	3720	+ random = h;
	3721	+
	3722	+ for (int i = 0; i < Size(); i++)
	3723	+ {
	3724	+ Object3D child = (Object3D) get(i); // reserve(i);
	3725	+ if (child == null)
	3726	+ continue;
	3727	+ blockloop = true;
	3728	+ child.RandomLeaves(h);
3414	3729	blockloop = false;
3415	3730	// release(i);
3416	3731	}
..	..	@@ -3725,7 +4040,7 @@
3725	4040	if (child == null)
3726	4041	continue;
3727	4042
3728		- if (GrafreeD.RENDERME > 0)
	4043	+ if (Grafreed.RENDERME > 0)
3729	4044	{
3730	4045	if (child instanceof Merge)
3731	4046	((Merge)child).renderme();
..	..	@@ -3876,7 +4191,7 @@
3876	4191	if (child == null)
3877	4192	continue;
3878	4193
3879		- if (GrafreeD.RENDERME > 0)
	4194	+ if (Grafreed.RENDERME > 0)
3880	4195	{
3881	4196	if (child instanceof Merge)
3882	4197	((Merge)child).renderme();
..	..	@@ -4071,7 +4386,7 @@
4071	4386	if (child == null)
4072	4387	continue;
4073	4388
4074		- if (GrafreeD.RENDERME > 0)
	4389	+ if (Grafreed.RENDERME > 0)
4075	4390	{
4076	4391	if (child instanceof Merge)
4077	4392	((Merge)child).renderme();
..	..	@@ -4184,6 +4499,55 @@
4184	4499	{
4185	4500	blockloop = true;
4186	4501	get(i).RepairShadow();
	4502	+ blockloop = false;
	4503	+ }
	4504	+ }
	4505	+
	4506	+ void RepairSOV()
	4507	+ {
	4508	+ if (blockloop)
	4509	+ return;
	4510	+
	4511	+ String texname = this.GetPigmentTexture();
	4512	+
	4513	+ if (texname.startsWith("sov"))
	4514	+ {
	4515	+ String[] s = texname.split("/");
	4516	+
	4517	+ String[] sname = s[1].split("Color.pn");
	4518	+
	4519	+ texname = sname[0];
	4520	+
	4521	+ if (sname.length > 1)
	4522	+ {
	4523	+ texname += "Color.jpg";
	4524	+ }
	4525	+
	4526	+ this.SetPigmentTexture("sov/" + texname);
	4527	+ }
	4528	+
	4529	+ texname = this.GetBumpTexture();
	4530	+
	4531	+ if (texname.startsWith("sov"))
	4532	+ {
	4533	+ String[] s = texname.split("/");
	4534	+
	4535	+ String[] sname = s[1].split("Bump.pn");
	4536	+
	4537	+ texname = sname[0];
	4538	+
	4539	+ if (sname.length > 1)
	4540	+ {
	4541	+ texname += "Bump.jpg";
	4542	+ }
	4543	+
	4544	+ this.SetBumpTexture("sov/" + texname);
	4545	+ }
	4546	+
	4547	+ for (int i=0; i<Size(); i++)
	4548	+ {
	4549	+ blockloop = true;
	4550	+ get(i).RepairSOV();
4187	4551	blockloop = false;
4188	4552	}
4189	4553	}
..	..	@@ -4678,7 +5042,7 @@
4678	5042
4679	5043	cTreePath SelectLeaf(int indexcount, boolean deselect)
4680	5044	{
4681		- if (hide)
	5045	+ if (hide \|\| dontselect)
4682	5046	return null;
4683	5047
4684	5048	if (count <= 0)
..	..	@@ -4702,9 +5066,17 @@
4702	5066	}
4703	5067	}
4704	5068
	5069	+ ObjEditor GetWindow()
	5070	+ {
	5071	+ if (editWindow != null)
	5072	+ return editWindow;
	5073	+
	5074	+ return manipWindow;
	5075	+ }
	5076	+
4705	5077	cTreePath Select(int indexcount, boolean deselect)
4706	5078	{
4707		- if (hide)
	5079	+ if (hide \|\| dontselect)
4708	5080	return null;
4709	5081
4710	5082	if (count <= 0)
..	..	@@ -4738,10 +5110,11 @@
4738	5110	if (leaf != null)
4739	5111	{
4740	5112	cTreePath tp = new cTreePath(this, leaf);
4741		- if (editWindow != null)
	5113	+ ObjEditor window = GetWindow();
	5114	+ if (window != null)
4742	5115	{
4743	5116	//System.out.println("editWindow = " + editWindow + " vs " + this);
4744		- editWindow.Select(tp, deselect, true);
	5117	+ window.Select(tp, deselect, true);
4745	5118	}
4746	5119
4747	5120	return tp;
..	..	@@ -4758,6 +5131,7 @@
4758	5131
4759	5132	if (child == null)
4760	5133	continue;
	5134	+
4761	5135	if (child.HasTransparency() && child.size() != 0)
4762	5136	{
4763	5137	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4767,9 +5141,10 @@
4767	5141	if (leaf != null)
4768	5142	{
4769	5143	cTreePath tp = new cTreePath(this, leaf);
4770		- if (editWindow != null)
	5144	+ ObjEditor window = GetWindow();
	5145	+ if (window != null)
4771	5146	{
4772		- editWindow.Select(tp, deselect, true);
	5147	+ window.Select(tp, deselect, true);
4773	5148	}
4774	5149
4775	5150	return tp;
..	..	@@ -4854,7 +5229,7 @@
4854	5229	return globalTransform;
4855	5230	}
4856	5231
4857		- void PreprocessOcclusion(CameraPane cp)
	5232	+ void PreprocessOcclusion(iCameraPane cp)
4858	5233	{
4859	5234	/*
4860	5235	if (AOdone)
..	..	@@ -5094,6 +5469,51 @@
5094	5469	blockloop = false;
5095	5470	}
5096	5471
	5472	+ void ResetSelectable()
	5473	+ {
	5474	+ if (blockloop)
	5475	+ return;
	5476	+
	5477	+ blockloop = true;
	5478	+
	5479	+ keepdontselect = dontselect;
	5480	+ dontselect = true;
	5481	+
	5482	+ Object3D child;
	5483	+ int nb = Size();
	5484	+ for (int i = 0; i < nb; i++)
	5485	+ {
	5486	+ child = (Object3D) get(i);
	5487	+ if (child == null)
	5488	+ continue;
	5489	+ child.ResetSelectable();
	5490	+ }
	5491	+
	5492	+ blockloop = false;
	5493	+ }
	5494	+
	5495	+ void RestoreSelectable()
	5496	+ {
	5497	+ if (blockloop)
	5498	+ return;
	5499	+
	5500	+ blockloop = true;
	5501	+
	5502	+ dontselect = keepdontselect;
	5503	+
	5504	+ Object3D child;
	5505	+ int nb = Size();
	5506	+ for (int i = 0; i < nb; i++)
	5507	+ {
	5508	+ child = (Object3D) get(i);
	5509	+ if (child == null)
	5510	+ continue;
	5511	+ child.RestoreSelectable();
	5512	+ }
	5513	+
	5514	+ blockloop = false;
	5515	+ }
	5516	+
5097	5517	boolean IsSelected()
5098	5518	{
5099	5519	if (parent == null)
..	..	@@ -5156,10 +5576,34 @@
5156	5576
5157	5577	// System.out.println("Fullname = " + fullname);
5158	5578
5159		- if (fullname.name.indexOf(":") == -1)
5160		- return fullname.name;
	5579	+ // Does not work on Windows due to C:
	5580	+// if (fullname.name.indexOf(":") == -1)
	5581	+// return fullname.name;
	5582	+//
	5583	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5161	5584
5162		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5585	+ String[] split = fullname.name.split(":");
	5586	+
	5587	+ if (split.length == 0)
	5588	+ {
	5589	+ return "";
	5590	+ }
	5591	+
	5592	+ if (split.length <= 2)
	5593	+ {
	5594	+ if (fullname.name.endsWith(":"))
	5595	+ {
	5596	+ // Windows
	5597	+ return fullname.name.substring(0, fullname.name.length()-1);
	5598	+ }
	5599	+
	5600	+ return split[0];
	5601	+ }
	5602	+
	5603	+ // Windows
	5604	+ assert(split.length == 4);
	5605	+
	5606	+ return split[0] + ":" + split[1];
5163	5607	}
5164	5608
5165	5609	static String GetBump(cTexture fullname)
..	..	@@ -5168,10 +5612,38 @@
5168	5612	return "";
5169	5613
5170	5614	// 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());
	5615	+ // Does not work on Windows due to C:
	5616	+// if (fullname.name.indexOf(":") == -1)
	5617	+// return "";
	5618	+//
	5619	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5620	+ String[] split = fullname.name.split(":");
	5621	+
	5622	+ if (split.length == 0)
	5623	+ {
	5624	+ return "";
	5625	+ }
	5626	+
	5627	+ if (split.length == 1)
	5628	+ {
	5629	+ return "";
	5630	+ }
	5631	+
	5632	+ if (split.length == 2)
	5633	+ {
	5634	+ if (fullname.name.endsWith(":"))
	5635	+ {
	5636	+ // Windows
	5637	+ return "";
	5638	+ }
	5639	+
	5640	+ return split[1];
	5641	+ }
	5642	+
	5643	+ // Windows
	5644	+ assert(split.length == 4);
	5645	+
	5646	+ return split[2] + ":" + split[3];
5175	5647	}
5176	5648
5177	5649	String GetPigmentTexture()
..	..	@@ -5245,7 +5717,7 @@
5245	5717	System.out.print("; textures = " + textures);
5246	5718	System.out.println("; usedtextures = " + usedtextures);
5247	5719
5248		- if (GetTextures() == null)
	5720	+ if (GetTextures() == null) // What is that??
5249	5721	GetTextures().name = ":";
5250	5722
5251	5723	String texname = tex;
..	..	@@ -5276,6 +5748,43 @@
5276	5748	child.ResetPigmentTexture();
5277	5749	blockloop = false;
5278	5750	}
	5751	+ }
	5752	+
	5753	+ UUID GetUUID()
	5754	+ {
	5755	+ if (uuid == null)
	5756	+ {
	5757	+ // Serial
	5758	+ uuid = UUID.randomUUID();
	5759	+ }
	5760	+
	5761	+ return uuid;
	5762	+ }
	5763	+
	5764	+ Object3D GetObject(UUID uid)
	5765	+ {
	5766	+ if (blockloop)
	5767	+ return null;
	5768	+
	5769	+ if (GetUUID().equals(uid))
	5770	+ return this;
	5771	+
	5772	+ int nb = Size();
	5773	+ for (int i = 0; i < nb; i++)
	5774	+ {
	5775	+ Object3D child = (Object3D) get(i);
	5776	+
	5777	+ if (child == null)
	5778	+ continue;
	5779	+
	5780	+ blockloop = true;
	5781	+ Object3D obj = child.GetObject(uid);
	5782	+ blockloop = false;
	5783	+ if (obj != null)
	5784	+ return obj;
	5785	+ }
	5786	+
	5787	+ return null;
5279	5788	}
5280	5789
5281	5790	void SetBumpTexture(String tex)
..	..	@@ -5314,6 +5823,38 @@
5314	5823	}
5315	5824	}
5316	5825
	5826	+ void EmbedTextures(boolean embed)
	5827	+ {
	5828	+ if (blockloop)
	5829	+ return;
	5830	+
	5831	+ //if (GetTextures() != null)
	5832	+ if (embed)
	5833	+ CameraPane.EmbedTextures(GetTextures());
	5834	+ else
	5835	+ {
	5836	+ GetTextures().pigmentdata = null;
	5837	+ GetTextures().bumpdata = null;
	5838	+ GetTextures().pw = 0;
	5839	+ GetTextures().ph = 0;
	5840	+ GetTextures().bw = 0;
	5841	+ GetTextures().bh = 0;
	5842	+ }
	5843	+
	5844	+ int nb = Size();
	5845	+ for (int i = 0; i < nb; i++)
	5846	+ {
	5847	+ Object3D child = (Object3D) get(i);
	5848	+
	5849	+ if (child == null)
	5850	+ continue;
	5851	+
	5852	+ blockloop = true;
	5853	+ child.EmbedTextures(embed);
	5854	+ blockloop = false;
	5855	+ }
	5856	+ }
	5857	+
5317	5858	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5318	5859	{
5319	5860	Draw(display, root, selected, blocked);
..	..	@@ -5322,11 +5863,23 @@
5322	5863	boolean NeedSupport()
5323	5864	{
5324	5865	return
5325		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5866	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5326	5867	// PROBLEM with CROWD!!
5327		- && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
	5868	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5328	5869	}
5329	5870
	5871	+ static boolean DEBUG_SELECTION = false;
	5872	+
	5873	+ boolean IsLive()
	5874	+ {
	5875	+ if (live)
	5876	+ return true;
	5877	+
	5878	+ if (parent == null)
	5879	+ return false;
	5880	+
	5881	+ return parent.IsLive();
	5882	+ }
5330	5883
5331	5884	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5332	5885	{
..	..	@@ -5338,7 +5891,7 @@
5338	5891	}
5339	5892
5340	5893	if (display.DrawMode() == iCameraPane.SELECTION &&
5341		- hide)
	5894	+ (hide \|\| dontselect))
5342	5895	return;
5343	5896
5344	5897	if (name != null && name.contains("sclera"))
..	..	@@ -5365,12 +5918,12 @@
5365	5918	}
5366	5919
5367	5920	if ((//display.DrawMode() == CameraPane.SHADOW \|\|
5368		- display.DrawMode() == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5921	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5369	5922	{
5370	5923	return;
5371	5924	}
5372	5925
5373		- javax.media.opengl.GL gl = display.GetGL();
	5926	+ //javax.media.opengl.GL gl = display.GetGL();
5374	5927
5375	5928	/*
5376	5929	if (touched)
..	..	@@ -5388,8 +5941,10 @@
5388	5941	if (support != null)
5389	5942	support = support;
5390	5943
5391		- //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);
	5944	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5945	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5946	+
	5947	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5393	5948
5394	5949	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5395	5950	{
..	..	@@ -5399,20 +5954,23 @@
5399	5954	// usecalllists &= !(parent instanceof RandomNode);
5400	5955	// usecalllists = false;
5401	5956
5402		- if (GetBRep() != null)
5403		- usecalllists = usecalllists;
	5957	+ if (display.DrawMode() == display.SHADOW)
	5958	+ //GetBRep() != null)
	5959	+ usecalllists = !!usecalllists;
5404	5960	//System.out.println("draw " + this);
5405	5961	//new Exception().printStackTrace();
5406	5962
5407	5963	boolean compiled = false;
5408	5964
5409		- boolean selectmode = display.DrawMode() == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5965	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5410	5966
5411	5967	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5412		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5968	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5969	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5413	5970	{
5414	5971	Globals.lighttouched = true;
5415	5972	} // all panes...
	5973	+
5416	5974	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5417	5975	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5418	5976	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5420,9 +5978,9 @@
5420	5978	if (!(this instanceof Composite))
5421	5979	touched = false;
5422	5980	//if (displaylist == -1 && usecalllists)
5423		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5981	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5424	5982	{
5425		- bRep.displaylist = gl.glGenLists(1);
	5983	+ bRep.displaylist = display.GenList();
5426	5984	assert(bRep.displaylist != 0);
5427	5985	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5428	5986	//System.out.println("\tgen list " + list);
..	..	@@ -5431,17 +5989,19 @@
5431	5989
5432	5990	//System.out.println("\tnew list " + list);
5433	5991	//gl.glDrawBuffer(gl.GL_NONE);
5434		- if (usecalllists)
	5992	+ if (usecalllists && bRep.displaylist > 0)
5435	5993	{
5436	5994	// System.err.println("new list " + bRep.displaylist + " for " + this);
5437		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5995	+ display.NewList(bRep.displaylist);
5438	5996	}
	5997	+
5439	5998	CallList(display, root, selected, blocked);
	5999	+
5440	6000	// compiled = true;
5441		- if (usecalllists)
	6001	+ if (usecalllists && bRep.displaylist > 0)
5442	6002	{
5443	6003	// System.err.println("end list " + bRep.displaylist + " for " + this);
5444		- gl.glEndList();
	6004	+ display.EndList();
5445	6005	}
5446	6006	//gl.glDrawBuffer(gl.GL_BACK);
5447	6007	// XXX touched = false;
..	..	@@ -5484,12 +6044,12 @@
5484	6044
5485	6045	// frustum culling
5486	6046	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5487		- && display.DrawMode() != CameraPane.SELECTION)
	6047	+ && display.DrawMode() != iCameraPane.SELECTION)
5488	6048	{
5489		- if (display.DrawMode() == CameraPane.SHADOW)
	6049	+ if (display.DrawMode() == iCameraPane.SHADOW)
5490	6050	{
5491	6051	if (!link2master // tricky to cull in shadow mode.
5492		- && GetBRep().FrustumCull(this, gl, display.LightCamera(), true))
	6052	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5493	6053	{
5494	6054	//System.out.print("CULLED");
5495	6055	culled = true;
..	..	@@ -5497,7 +6057,7 @@
5497	6057	}
5498	6058	else
5499	6059	//GetBRep().getBounds(v0, v1, this);
5500		- if (GetBRep().FrustumCull(this, gl, display.RenderCamera(), false))
	6060	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5501	6061	culled = true;
5502	6062
5503	6063	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5533,11 +6093,12 @@
5533	6093
5534	6094
5535	6095	if (!culled)
5536		- if (display.DrawMode() == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	6096	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5537	6097	{
5538	6098	if (GetBRep() != null)
5539	6099	{
5540		- CameraPane.NextIndex(this, gl);
	6100	+ display.NextIndex();
	6101	+
5541	6102	// vertex color conflict : gl.glCallList(list);
5542	6103	DrawNode(display, root, selected);
5543	6104	if (this instanceof BezierPatch)
..	..	@@ -5578,7 +6139,28 @@
5578	6139	tex = GetTextures();
5579	6140	}
5580	6141
5581		- display.BindTextures(tex, texres);
	6142	+ boolean failedPigment = false;
	6143	+ boolean failedBump = false;
	6144	+
	6145	+ try
	6146	+ {
	6147	+ display.BindPigmentTexture(tex, texres);
	6148	+ }
	6149	+ catch (Exception e)
	6150	+ {
	6151	+ System.err.println("FAILED: " + this);
	6152	+ failedPigment = true;
	6153	+ }
	6154	+
	6155	+ try
	6156	+ {
	6157	+ display.BindBumpTexture(tex, texres);
	6158	+ }
	6159	+ catch (Exception e)
	6160	+ {
	6161	+ //System.err.println("FAILED: " + this);
	6162	+ failedBump = true;
	6163	+ }
5582	6164
5583	6165	if (!compiled)
5584	6166	{
..	..	@@ -5594,13 +6176,17 @@
5594	6176
5595	6177	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5596	6178	assert(bRep.displaylist != 0);
5597		- gl.glCallList(bRep.displaylist);
	6179	+ display.CallList(bRep.displaylist);
5598	6180	// june 2013 drawSelf(display, root, selected);
5599	6181	}
5600	6182	}
5601	6183	}
5602	6184
5603		- display.ReleaseTextures(tex);
	6185	+ if (!failedBump)
	6186	+ display.ReleaseBumpTexture(tex);
	6187	+
	6188	+ if (!failedPigment)
	6189	+ display.ReleasePigmentTexture(tex);
5604	6190
5605	6191	display.PopMaterial(this, selected);
5606	6192	}
..	..	@@ -5729,6 +6315,9 @@
5729	6315
5730	6316	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5731	6317	{
	6318	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6319	+ return;
	6320	+
5732	6321	if (hide)
5733	6322	return;
5734	6323	// shadow optimisation
..	..	@@ -5854,6 +6443,9 @@
5854	6443	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5855	6444	return; // no shadow for transparent objects
5856	6445
	6446	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6447	+ return;
	6448	+
5857	6449	if (hide)
5858	6450	return;
5859	6451
..	..	@@ -5894,9 +6486,10 @@
5894	6486	return;
5895	6487	}
5896	6488
	6489	+ //bRep.GenUV(1/material.diffuseness);
5897	6490	// bRep.lock = true;
5898	6491
5899		- javax.media.opengl.GL gl = display.GetGL();
	6492	+ //javax.media.opengl.GL gl = display.GetGL();
5900	6493
5901	6494	if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5902	6495	{
..	..	@@ -5913,23 +6506,7 @@
5913	6506
5914	6507	bRep.getMinMax(min, max, 100);
5915	6508
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();
	6509	+ display.DrawBox(min, max);
5933	6510
5934	6511	return;
5935	6512	}
..	..	@@ -5973,7 +6550,7 @@
5973	6550	{
5974	6551	//throw new Error();
5975	6552
5976		- boolean selectmode = display.DrawMode() == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6553	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5977	6554
5978	6555	int[] strips = bRep.getRawIndices();
5979	6556
..	..	@@ -5983,178 +6560,19 @@
5983	6560	new Exception().printStackTrace();
5984	6561	return;
5985	6562	}
5986		-
5987		- // TRIANGLE STRIP ARRAY
5988		- if (bRep.trimmed)
	6563	+
	6564	+ if (dontselect)
5989	6565	{
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;
	6566	+ //bRep.GenerateNormalsMINE();
6121	6567	}
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		- }
	6568	+
	6569	+ display.DrawGeometry(bRep, flipV, selectmode);
6152	6570	} else // catch (Error e)
6153	6571	{
6154	6572	// TRIANGLE ARRAY
6155	6573	if (IsOpaque()) // Static())
6156	6574	{
6157		- gl.glBegin(gl.GL_TRIANGLES);
	6575	+ display.StartTriangles();
6158	6576	int facecount = bRep.FaceCount();
6159	6577	for (int i = 0; i < facecount; i++)
6160	6578	{
..	..	@@ -6219,7 +6637,7 @@
6219	6637
6220	6638	display.DrawFace(this, p, q, r, face);
6221	6639	}
6222		- gl.glEnd();
	6640	+ display.EndTriangles();
6223	6641	}
6224	6642	else
6225	6643	{
..	..	@@ -6248,8 +6666,8 @@
6248	6666	//System.out.println("SORT");
6249	6667
6250	6668	java.util.Arrays.sort(facescompare);
6251		-
6252		- gl.glBegin(gl.GL_TRIANGLES);
	6669	+
	6670	+ display.StartTriangles();
6253	6671	for (int i = 0; i < facecount; i++)
6254	6672	{
6255	6673	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6263,11 +6681,12 @@
6263	6681
6264	6682	display.DrawFace(this, p, q, r, face);
6265	6683	}
6266		- gl.glEnd();
	6684	+ display.EndTriangles();
6267	6685	}
6268	6686
6269	6687	if (false) // live && support != null && support.bRep != null) // debug weights
6270	6688	{
	6689	+ /*
6271	6690	gl.glDisable(gl.GL_LIGHTING);
6272	6691	float[] colorV = new float[3];
6273	6692
..	..	@@ -6346,6 +6765,7 @@
6346	6765	// gl.glEnd();
6347	6766	}
6348	6767	}
	6768	+ */
6349	6769	}
6350	6770	}
6351	6771
..	..	@@ -6390,7 +6810,7 @@
6390	6810	center.add(r);
6391	6811	center.mul(1.0/3);
6392	6812
6393		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6813	+ center.sub(Globals.theRenderer.EyeCamera().location);
6394	6814
6395	6815	distance = center.dot(center);
6396	6816	}
..	..	@@ -6404,22 +6824,6 @@
6404	6824	void Print(Vertex v)
6405	6825	{
6406	6826	//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	6827	}
6424	6828
6425	6829	void drawSelf(ClickInfo info, int level, boolean select)
..	..	@@ -6945,20 +7349,23 @@
6945	7349	}
6946	7350	}
6947	7351
6948		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7352	+ static ClickInfo clickInfo = new ClickInfo();
	7353	+
	7354	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7355	+ Point outPt, Rectangle outRec)
6949	7356	{
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;
	7357	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7358	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7359	+ double[][] toscreen = clickInfo.toScreen;
6953	7360	if (toscreen == null)
6954	7361	{
6955		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7362	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6956	7363	}
6957	7364	cVector vec = in;
6958	7365	LA.xformPos(in, toscreen, in);
6959	7366	//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();
	7367	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7368	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6962	7369	outPt.x = hc + (int) vec.x;
6963	7370	outPt.y = vc - (int) vec.y;
6964	7371	outRec.x = outPt.x - 3;
..	..	@@ -6966,15 +7373,18 @@
6966	7373	outRec.width = outRec.height = 6;
6967	7374	}
6968	7375
6969		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7376	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7377	+ )
6970	7378	{
6971	7379	Point pt = new Point(0, 0);
6972	7380	Rectangle rec = new Rectangle();
6973		- calcHotSpot(in, info, pt, rec);
	7381	+ calcHotSpot(in, //clickInfo,
	7382	+ pt, rec);
6974	7383	return rec;
6975	7384	}
6976	7385
6977		- void drawEditHandles0(ClickInfo info, int level)
	7386	+ void drawEditHandles0(//ClickInfo clickInfo,
	7387	+ int level)
6978	7388	{
6979	7389	if (level == 0)
6980	7390	{
..	..	@@ -6983,98 +7393,103 @@
6983	7393	{
6984	7394	cVector origin = new cVector();
6985	7395	//LA.xformPos(origin, toParent, origin);
6986		- Rectangle spot = calcHotSpot(origin, info);
	7396	+ if (this.clickInfo == null)
	7397	+ this.clickInfo = new ClickInfo();
	7398	+
	7399	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
6987	7400	Rectangle boundary = new Rectangle();
6988	7401	boundary.x = spot.x - 30;
6989	7402	boundary.y = spot.y - 30;
6990	7403	boundary.width = spot.width + 60;
6991	7404	boundary.height = spot.height + 60;
6992		- info.g.setColor(Color.red);
	7405	+ clickInfo.g.setColor(Color.red);
6993	7406	int spotw = spot.x + spot.width;
6994	7407	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		- }
	7408	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7409	+// if (CameraPane.Xmin > spot.x)
	7410	+// {
	7411	+// CameraPane.Xmin = spot.x;
	7412	+// }
	7413	+// if (CameraPane.Xmax < spotw)
	7414	+// {
	7415	+// CameraPane.Xmax = spotw;
	7416	+// }
	7417	+// if (CameraPane.Ymin > spot.y)
	7418	+// {
	7419	+// CameraPane.Ymin = spot.y;
	7420	+// }
	7421	+// if (CameraPane.Ymax < spoth)
	7422	+// {
	7423	+// CameraPane.Ymax = spoth;
	7424	+// }
7012	7425	spot.translate(32, 32);
7013	7426	spotw = spot.x + spot.width;
7014	7427	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);
	7428	+ clickInfo.g.setColor(Color.cyan);
	7429	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7430	+// if (CameraPane.Xmin > spot.x)
	7431	+// {
	7432	+// CameraPane.Xmin = spot.x;
	7433	+// }
	7434	+// if (CameraPane.Xmax < spotw)
	7435	+// {
	7436	+// CameraPane.Xmax = spotw;
	7437	+// }
	7438	+// if (CameraPane.Ymin > spot.y)
	7439	+// {
	7440	+// CameraPane.Ymin = spot.y;
	7441	+// }
	7442	+// if (CameraPane.Ymax < spoth)
	7443	+// {
	7444	+// CameraPane.Ymax = spoth;
	7445	+// }
	7446	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7447	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7035	7448	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);
	7449	+ clickInfo.g.setColor(Color.yellow);
	7450	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7451	+ clickInfo.g.setColor(Color.green);
	7452	+// if (CameraPane.Xmin > spot.x)
	7453	+// {
	7454	+// CameraPane.Xmin = spot.x;
	7455	+// }
	7456	+// if (CameraPane.Xmax < spotw)
	7457	+// {
	7458	+// CameraPane.Xmax = spotw;
	7459	+// }
	7460	+// if (CameraPane.Ymin > spot.y)
	7461	+// {
	7462	+// CameraPane.Ymin = spot.y;
	7463	+// }
	7464	+// if (CameraPane.Ymax < spoth)
	7465	+// {
	7466	+// CameraPane.Ymax = spoth;
	7467	+// }
	7468	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7469	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7056	7470	//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		- }
	7471	+// if (CameraPane.Xmin > boundary.x)
	7472	+// {
	7473	+// CameraPane.Xmin = boundary.x;
	7474	+// }
	7475	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	7476	+// {
	7477	+// CameraPane.Xmax = boundary.x + boundary.width;
	7478	+// }
	7479	+// if (CameraPane.Ymin > boundary.y)
	7480	+// {
	7481	+// CameraPane.Ymin = boundary.y;
	7482	+// }
	7483	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	7484	+// {
	7485	+// CameraPane.Ymax = boundary.y + boundary.height;
	7486	+// }
7073	7487	return;
7074	7488	}
7075	7489	}
7076	7490
7077		- boolean doEditClick0(ClickInfo info, int level)
	7491	+ boolean doEditClick0(//ClickInfo clickInfo,
	7492	+ int level)
7078	7493	{
7079	7494	if (level == 0)
7080	7495	{
..	..	@@ -7083,10 +7498,10 @@
7083	7498
7084	7499	boolean retval = false;
7085	7500
7086		- startX = info.x;
7087		- startY = info.y;
	7501	+ startX = clickInfo.x;
	7502	+ startY = clickInfo.y;
7088	7503
7089		- hitSomething = 0;
	7504	+ hitSomething = -1;
7090	7505	cVector origin = new cVector();
7091	7506	//LA.xformPos(origin, toParent, origin);
7092	7507	Rectangle spot = new Rectangle();
..	..	@@ -7094,22 +7509,51 @@
7094	7509	{
7095	7510	centerPt = new Point(0, 0);
7096	7511	}
7097		- calcHotSpot(origin, info, centerPt, spot);
7098		- if (spot.contains(info.x, info.y))
	7512	+ calcHotSpot(origin, //info,
	7513	+ centerPt, spot);
	7514	+ if (spot.contains(clickInfo.x, clickInfo.y))
7099	7515	{
7100	7516	hitSomething = hitCenter;
7101	7517	retval = true;
7102	7518	}
7103	7519	spot.translate(32, 0);
7104		- if (spot.contains(info.x, info.y))
	7520	+ if (spot.contains(clickInfo.x, clickInfo.y))
7105	7521	{
7106	7522	hitSomething = hitRotate;
7107	7523	retval = true;
7108	7524	}
7109	7525	spot.translate(0, 32);
7110		- if (spot.contains(info.x, info.y))
	7526	+ if (spot.contains(clickInfo.x, clickInfo.y))
7111	7527	{
7112	7528	hitSomething = hitScale;
	7529	+
	7530	+ double scale = 0.005f * clickInfo.camera.Distance();
	7531	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7532	+ double sign = 1;
	7533	+ if (hScale < 0)
	7534	+ {
	7535	+ sign = -1;
	7536	+ }
	7537	+ hScale = signMath.pow(signhScale, scale * 50);
	7538	+ if (hScale < 0.01)
	7539	+ {
	7540	+ //hScale = 0.01;
	7541	+ }
	7542	+
	7543	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7544	+ sign = 1;
	7545	+ if (vScale < 0)
	7546	+ {
	7547	+ sign = -1;
	7548	+ }
	7549	+ vScale = signMath.pow(signvScale, scale * 50);
	7550	+ if (vScale < 0.01)
	7551	+ {
	7552	+ //vScale = 0.01;
	7553	+ }
	7554	+
	7555	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7556	+
7113	7557	retval = true;
7114	7558	}
7115	7559
..	..	@@ -7119,7 +7563,7 @@
7119	7563	}
7120	7564
7121	7565	//System.out.println("info.modifiers = " + info.modifiers);
7122		- modified = (info.modifiers & CameraPane.META) != 0;
	7566	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7123	7567	//System.out.println("modified = " + modified);
7124	7568	//new Exception().printStackTrace();
7125	7569	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7147,7 +7591,8 @@
7147	7591	return true;
7148	7592	}
7149	7593
7150		- void doEditDrag0(ClickInfo info)
	7594	+ void doEditDrag0(//ClickInfo info,
	7595	+ boolean opposite)
7151	7596	{
7152	7597	if (hitSomething == 0)
7153	7598	{
..	..	@@ -7161,7 +7606,8 @@
7161	7606
7162	7607	//System.out.println("hitSomething = " + hitSomething);
7163	7608
7164		- double scale = 0.005f * info.camera.Distance();
	7609	+ double scale = 0.005f * clickInfo.camera.Distance();
	7610	+
7165	7611	cVector xlate = new cVector();
7166	7612	//cVector xlate2 = new cVector();
7167	7613	switch (hitSomething)
..	..	@@ -7172,9 +7618,9 @@
7172	7618
7173	7619	case hitCenter: // Translate
7174	7620
7175		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7621	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7176	7622
7177		- if (modified)
	7623	+ if (modified \|\| opposite)
7178	7624	{
7179	7625	//assert(false);
7180	7626	/*
..	..	@@ -7194,8 +7640,8 @@
7194	7640	toParent[3][i] = xlate.get(i);
7195	7641	LA.matInvert(toParent, fromParent);
7196	7642	*/
7197		- cVector delta = LA.newVector(0, 0, startY - info.y);
7198		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7643	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7644	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7199	7645
7200	7646	LA.matCopy(startMat, toParent);
7201	7647	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7204,7 +7650,7 @@
7204	7650	} else
7205	7651	{
7206	7652	//LA.xformDir(delta, info.camera.fromScreen, delta);
7207		- cVector up = new cVector(info.camera.up);
	7653	+ cVector up = new cVector(clickInfo.camera.up);
7208	7654	cVector away = new cVector();
7209	7655	//cVector right2 = new cVector();
7210	7656	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7220,20 +7666,20 @@
7220	7666	}
7221	7667	LA.xformDir(up, ClickInfo.matbuffer, up);
7222	7668	// if (!CameraPane.LOCALTRANSFORM)
7223		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
7224		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7669	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
	7670	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7225	7671	// if (!CameraPane.LOCALTRANSFORM)
7226		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7672	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7227	7673	//LA.vecCross(up, cVector.Z, right2);
7228	7674
7229		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7675	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7230	7676
7231	7677	//System.out.println("DELTA0 = " + delta);
7232	7678	//System.out.println("AWAY = " + info.camera.away);
7233	7679	//System.out.println("UP = " + info.camera.up);
7234	7680	if (away.z > 0)
7235	7681	{
7236		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7682	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7237	7683	{
7238	7684	delta.x = -delta.x;
7239	7685	} else
..	..	@@ -7248,7 +7694,7 @@
7248	7694	//System.out.println("DELTA1 = " + delta);
7249	7695	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7250	7696	//System.out.println("DELTA2 = " + delta);
7251		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7697	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7252	7698	LA.matCopy(startMat, toParent);
7253	7699	//System.out.println("DELTA3 = " + delta);
7254	7700	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7258,8 +7704,8 @@
7258	7704	break;
7259	7705
7260	7706	case hitRotate: // rotate
7261		- int dx = info.x - centerPt.x;
7262		- int dy = -(info.y - centerPt.y);
	7707	+ int dx = clickInfo.x - centerPt.x;
	7708	+ int dy = -(clickInfo.y - centerPt.y);
7263	7709	double angle = (double) Math.atan2(dx, dy);
7264	7710	angle = -(1.570796 - angle);
7265	7711
..	..	@@ -7268,6 +7714,7 @@
7268	7714
7269	7715	if (modified)
7270	7716	{
	7717	+ // Rotate 90 degrees
7271	7718	angle /= (Math.PI / 4);
7272	7719	angle = Math.floor(angle + 0.5);
7273	7720	angle *= (Math.PI / 4);
..	..	@@ -7281,7 +7728,7 @@
7281	7728	}
7282	7729	/**/
7283	7730
7284		- switch (info.pane.renderCamera.viewCode)
	7731	+ switch (clickInfo.pane.RenderCamera().viewCode)
7285	7732	{
7286	7733	case 1: // '\001'
7287	7734	LA.matZRotate(toParent, angle);
..	..	@@ -7308,26 +7755,30 @@
7308	7755	break;
7309	7756
7310	7757	case hitScale: // scale
7311		- double hScale = (double) (info.x - centerPt.x) / 32;
	7758	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7759	+ double sign = 1;
	7760	+ if (hScale < 0)
	7761	+ {
	7762	+ sign = -1;
	7763	+ }
	7764	+ hScale = signMath.pow(signhScale, scale * 50);
7312	7765	if (hScale < 0.01)
7313	7766	{
7314		- hScale = 0.01;
	7767	+ //hScale = 0.01;
7315	7768	}
7316		- hScale = Math.pow(hScale, scale * 50);
7317		- if (hScale < 0.01)
	7769	+
	7770	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7771	+ sign = 1;
	7772	+ if (vScale < 0)
7318	7773	{
7319		- hScale = 0.01;
	7774	+ sign = -1;
7320	7775	}
7321		- double vScale = (double) (info.y - centerPt.y) / 32;
	7776	+ vScale = signMath.pow(signvScale, scale * 50);
7322	7777	if (vScale < 0.01)
7323	7778	{
7324		- vScale = 0.01;
	7779	+ //vScale = 0.01;
7325	7780	}
7326		- vScale = Math.pow(vScale, scale * 50);
7327		- if (vScale < 0.01)
7328		- {
7329		- vScale = 0.01;
7330		- }
	7781	+
7331	7782	LA.matCopy(startMat, toParent);
7332	7783	/**/
7333	7784	for (int i = 0; i < 3; i++)
..	..	@@ -7337,39 +7788,47 @@
7337	7788	}
7338	7789	/**/
7339	7790
7340		- switch (info.pane.renderCamera.viewCode)
	7791	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
	7792	+
	7793	+ if (totalScale < 0.01)
	7794	+ {
	7795	+ totalScale = 0.01;
	7796	+ }
	7797	+
	7798	+ switch (clickInfo.pane.RenderCamera().viewCode)
7341	7799	{
7342	7800	case 3: // '\001'
7343		- if (modified)
	7801	+ if (modified \|\| opposite)
7344	7802	{
7345	7803	//LA.matScale(toParent, 1, hScale, vScale);
7346		- LA.matScale(toParent, vScale, 1, 1);
	7804	+ LA.matScale(toParent, totalScale, 1, 1);
7347	7805	} // vScale, 1);
7348	7806	else
7349	7807	{
7350		- LA.matScale(toParent, vScale, vScale, vScale);
	7808	+ // EXCEPTION!
	7809	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7351	7810	} // vScale, 1);
7352	7811	break;
7353	7812
7354	7813	case 2: // '\002'
7355		- if (modified)
	7814	+ if (modified \|\| opposite)
7356	7815	{
7357	7816	//LA.matScale(toParent, hScale, 1, vScale);
7358		- LA.matScale(toParent, 1, vScale, 1);
	7817	+ LA.matScale(toParent, 1, totalScale, 1);
7359	7818	} else
7360	7819	{
7361		- LA.matScale(toParent, vScale, 1, vScale);
	7820	+ LA.matScale(toParent, totalScale, 1, totalScale);
7362	7821	}
7363	7822	break;
7364	7823
7365	7824	case 1: // '\003'
7366		- if (modified)
	7825	+ if (modified \|\| opposite)
7367	7826	{
7368	7827	//LA.matScale(toParent, hScale, vScale, 1);
7369		- LA.matScale(toParent, 1, 1, vScale);
	7828	+ LA.matScale(toParent, 1, 1, totalScale);
7370	7829	} else
7371	7830	{
7372		- LA.matScale(toParent, vScale, vScale, 1);
	7831	+ LA.matScale(toParent, totalScale, totalScale, 1);
7373	7832	}
7374	7833	break;
7375	7834	}
..	..	@@ -7403,7 +7862,7 @@
7403	7862	} // NEW ...
7404	7863
7405	7864
7406		- info.pane.repaint();
	7865	+ clickInfo.pane.repaint();
7407	7866	}
7408	7867
7409	7868	boolean overflow = false;
..	..	@@ -7502,14 +7961,22 @@
7502	7961	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7503	7962	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7504	7963	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7964	+
	7965	+ String objname;
	7966	+
7505	7967	if (false) //parent != null)
7506	7968	{
7507		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7969	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7508	7970	} else
7509	7971	{
7510		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7972	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7511	7973	} // + super.toString();
7512	7974	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7975	+
	7976	+ if (!Globals.ADVANCED)
	7977	+ return objname;
	7978	+
	7979	+ return objname + " " + System.identityHashCode(this);
7513	7980	}
7514	7981
7515	7982	public int hashCode()
..	..	@@ -7565,6 +8032,7 @@
7565	8032	objectUI.closeUI();
7566	8033	if (editWindow != null)
7567	8034	{
	8035	+ editWindow.ctrlPanel.FlushUI();
7568	8036	editWindow.refreshContents();
7569	8037	} // ? new
7570	8038	objectUI = null;
..	..	@@ -7573,6 +8041,10 @@
7573	8041	{
7574	8042	editWindow = null;
7575	8043	} // ?
	8044	+ }
	8045	+ else
	8046	+ {
	8047	+ //editWindow.closeUI();
7576	8048	}
7577	8049	}
7578	8050
..	..	@@ -7585,7 +8057,7 @@
7585	8057	/transient/ cVector2[] projectedVertices = new cVector2[0];
7586	8058
7587	8059	Object3D /Composite/ parent;
7588		- Object3D /Composite/ fileparent;
	8060	+ Object3D /Composite/ fileparent; // In the case of FileObject
7589	8061
7590	8062	double[][] toParent; // dynamic matrix
7591	8063	double[][] fromParent;
..	..	@@ -7700,7 +8172,7 @@
7700	8172	{
7701	8173	assert(bRep != null);
7702	8174	if (!(support instanceof GenericJoint)) // support.bRep != null)
7703		- GrafreeD.Assert(support.bRep == bRep.support);
	8175	+ Grafreed.Assert(support.bRep == bRep.support);
7704	8176	}
7705	8177	else
7706	8178	{
..	..	@@ -7731,6 +8203,10 @@
7731	8203	}
7732	8204
7733	8205	transient ObjEditor editWindow;
	8206	+ transient ObjEditor manipWindow;
	8207	+
	8208	+ transient boolean pinned;
	8209	+
7734	8210	transient ObjectUI objectUI;
7735	8211	public static int povDepth = 0;
7736	8212	private static cVector tbMin = new cVector();
..	..	@@ -7749,9 +8225,9 @@
7749	8225	private static cVector edge2 = new cVector();
7750	8226	//private static cVector norm = new cVector();
7751	8227	/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;
	8228	+ static final int hitCenter = 1;
	8229	+ static final int hitScale = 2;
	8230	+ static final int hitRotate = 3;
7755	8231	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7756	8232	/transient/ private Point centerPt;
7757	8233	/transient/ private int startX;