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