~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,13 +14,42 @@
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;
	40	+
	41	+ void InitOthers()
	42	+ {
	43	+ if (projectedVertices == null \|\| projectedVertices.length <= 2)
	44	+ {
	45	+ projectedVertices = new Object3D.cVector2[3];
	46	+ }
	47	+ for (int i = 0; i < 3; i++)
	48	+ {
	49	+ projectedVertices[i] = new cVector2(); // Others
	50	+ }
	51	+ projectedVertices[0].x = 100; // bump
	52	+ }
23	53
24	54	void MinMax(cVector minima, cVector maxima)
25	55	{
..	..	@@ -86,64 +116,201 @@
86	116
87	117	// transient boolean reduced; // for morph reduction
88	118
89		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
90		-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
91	121
92		-transient Object3D transientsupport; // for cloning
93		-transient boolean transientlink2master;
	122	+ transient Object3D transientsupport; // for cloning
	123	+ transient boolean transientlink2master;
94	124
95		-void SaveSupports()
96		-{
97		- if (blockloop)
98		- return;
99		-
100		- transientsupport = support;
101		- transientlink2master = link2master;
102		-
103		- support = null;
104		- link2master = false;
105		-
106		- if (bRep != null)
	125	+ void SaveSupports()
107	126	{
108		- 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	+ }
109	150	}
110		-
111		- for (int i = 0; i < Size(); i++)
	151	+
	152	+ void RestoreSupports()
112	153	{
113		- Object3D child = (Object3D) get(i);
114		- if (child == null)
115		- 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	+
116	285	blockloop = true;
117		- child.SaveSupports();
	286	+
	287	+ //hashtable.remove(GetUUID());
	288	+
	289	+ for (int i=0; i<Size(); i++)
	290	+ {
	291	+ get(i).RestoreBigData(hashtable);
	292	+ }
	293	+
118	294	blockloop = false;
119	295	}
120		-}
121	296
122		-void RestoreSupports()
123		-{
124		- if (blockloop)
125		- return;
126		-
127		- support = transientsupport;
128		- link2master = transientlink2master;
129		- transientsupport = null;
130		- transientlink2master = false;
131		-
132		- if (bRep != null)
	297	+ void RestoreBigData(Object3D o)
133	298	{
134		- 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;
135	313	}
136		-
137		- for (int i = 0; i < Size(); i++)
138		- {
139		- Object3D child = (Object3D) get(i);
140		- if (child == null)
141		- continue;
142		- blockloop = true;
143		- child.RestoreSupports();
144		- blockloop = false;
145		- }
146		-}
147	314
148	315	// MOCAP SUPPORT
149	316	double tx,ty,tz,rx,ry,rz;
..	..	@@ -286,6 +453,8 @@
286	453	}
287	454
288	455	boolean live = false;
	456	+ transient boolean keepdontselect;
	457	+ boolean dontselect = false;
289	458	boolean hide = false;
290	459	boolean link2master = false; // performs reset support/master at each frame
291	460	boolean marked = false; // animation node
..	..	@@ -295,6 +464,8 @@
295	464	boolean random = false;
296	465	boolean speedup = false;
297	466	boolean rewind = false;
	467	+
	468	+ float NORMALPUSH = 0;
298	469
299	470	Object3D support;
300	471
..	..	@@ -355,7 +526,7 @@
355	526
356	527	int MemorySize()
357	528	{
358		- if (memorysize == 0)
	529	+ if (true) // memorysize == 0)
359	530	{
360	531	try
361	532	{
..	..	@@ -415,16 +586,16 @@
415	586	{
416	587	Object3D copy = this;
417	588
418		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	589	+ Camera parentcam = Globals.theRenderer.ManipCamera();
419	590
420		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	591	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
421	592	{
422		- parentcam = CameraPane.theRenderer.cameras[1];
	593	+ parentcam = Globals.theRenderer.Cameras()[1];
423	594	}
424	595
425		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	596	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
426	597	{
427		- parentcam = CameraPane.theRenderer.cameras[0];
	598	+ parentcam = Globals.theRenderer.Cameras()[0];
428	599	}
429	600
430	601	if (this == parentcam)
..	..	@@ -432,7 +603,7 @@
432	603	//assert(this instanceof Camera);
433	604
434	605	for (int count = parentcam.GetTransformCount(); --count>=0;)
435		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	606	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
436	607	}
437	608
438	609	copy.marked ^= true;
..	..	@@ -452,7 +623,7 @@
452	623	//assert(this instanceof Camera);
453	624
454	625	for (int count = parentcam.GetTransformCount(); --count>=0;)
455		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	626	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
456	627	}
457	628
458	629	copy.Touch(); // display list issue
..	..	@@ -465,12 +636,14 @@
465	636	toParent = LA.newMatrix();
466	637	fromParent = LA.newMatrix();
467	638	}
	639	+
468	640	if (toParentMarked == null)
469	641	{
470	642	if (maxcount != 1)
471	643	{
472	644	new Exception().printStackTrace();
473	645	}
	646	+
474	647	toParentMarked = LA.newMatrix();
475	648	fromParentMarked = LA.newMatrix();
476	649	}
..	..	@@ -587,7 +760,7 @@
587	760	return;
588	761	}
589	762
590		- if (CameraPane.fromscript)
	763	+ if (Globals.fromscript)
591	764	{
592	765	transformcount = 0;
593	766	return;
..	..	@@ -745,7 +918,7 @@
745	918
746	919	int GetTransformCount()
747	920	{
748		- // marde pour serialization de Texture
	921	+ // patch pour serialization de Texture
749	922	resetmaxcount();
750	923	resettransformcount();
751	924	resetstep();
..	..	@@ -758,7 +931,7 @@
758	931	if (step == 0)
759	932	step = 1;
760	933	if (maxcount == 0)
761		- maxcount = 2048; // 4;
	934	+ maxcount = 128; // 2048; // 4;
762	935	// if (acceleration == 0)
763	936	// acceleration = 10;
764	937	if (delay == 0) // serial
..	..	@@ -779,9 +952,12 @@
779	952	// factor = CameraPane.STEP;
780	953	// }
781	954
782		- if (marked && CameraPane.isLIVE() && live && CameraPane.drawMode == CameraPane.SHADOW && currentframe != CameraPane.framecount)
	955	+ if (marked && Globals.isLIVE() && live &&
	956	+ //TEMP21aug2018
	957	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
	958	+ currentframe != Globals.framecount)
783	959	{
784		- currentframe = CameraPane.framecount;
	960	+ currentframe = Globals.framecount;
785	961
786	962	// System.err.println("transformcount = " + transformcount);
787	963	// System.err.println("factor = " + factor);
..	..	@@ -790,7 +966,8 @@
790	966
791	967	boolean changedir = random && Math.random() < 0.01; // && !link2master;
792	968
793		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	969	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	970	+ (step == 1 && changedir))
794	971	{
795	972	countdown = 1;
796	973	delay = speedup?8:1;
..	..	@@ -862,6 +1039,10 @@
862	1039	if (material == null \|\| material.multiply)
863	1040	return true;
864	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.
865	1046	return material.opacity > 0.99;
866	1047	}
867	1048
..	..	@@ -893,6 +1074,11 @@
893	1074	fromParent = null; // LA.newMatrix();
894	1075	bRep = null; // new BoundaryRep();
895	1076
	1077	+ if (oname != null && oname.equals("LeftHand"))
	1078	+ {
	1079	+ name = oname;
	1080	+ }
	1081	+
896	1082	/*
897	1083	float hue = (float)Math.random();
898	1084	Color col;
..	..	@@ -935,7 +1121,7 @@
935	1121
936	1122	public Object clone()
937	1123	{
938		- return GrafreeD.clone(this);
	1124	+ return Grafreed.clone(this);
939	1125	}
940	1126
941	1127	Object3D copyExpand()
..	..	@@ -1257,6 +1443,7 @@
1257	1443	toParent = LA.newMatrix();
1258	1444	fromParent = LA.newMatrix();
1259	1445	}
	1446	+
1260	1447	LA.matCopy(other.toParent, toParent);
1261	1448	LA.matCopy(other.fromParent, fromParent);
1262	1449
..	..	@@ -1446,7 +1633,16 @@
1446	1633	// if (other == null)
1447	1634	// return;
1448	1635
1449		- System.out.println("Link support this = " + this + "; other = " + other);
	1636	+ if (other != null)
	1637	+ {
	1638	+ BoundaryRep.SEUIL = other.material.cameralight;
	1639	+
	1640	+ // Set default to 0.1
	1641	+ BoundaryRep.SEUIL /= 4; // 2;
	1642	+ System.out.println("SEUIL = " + BoundaryRep.SEUIL);
	1643	+ }
	1644	+
	1645	+ System.out.println("Link this = " + this + "; support = " + other);
1450	1646
1451	1647	//if (bRep != null)
1452	1648	// bRep.linkVerticesThis(other.bRep);
..	..	@@ -1701,7 +1897,7 @@
1701	1897	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1702	1898	o.bRep = transientrep;
1703	1899	if (clone)
1704		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1900	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1705	1901	o.CreateMaterial();
1706	1902	o.SetAttributes(this, -1);
1707	1903	//parent
..	..	@@ -1714,7 +1910,7 @@
1714	1910	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1715	1911	o.bRep = bRep;
1716	1912	if (clone)
1717		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1913	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1718	1914	o.CreateMaterial();
1719	1915	//o.overwriteThis(this, -1);
1720	1916	o.SetAttributes(this, -1);
..	..	@@ -1801,12 +1997,15 @@
1801	1997	if (obj.name == null)
1802	1998	continue; // can't be a null one
1803	1999
	2000	+ // Try perfect match first.
1804	2001	if (n.equals(obj.name))
1805	2002	{
1806	2003	theobj = obj;
1807	2004	count++;
1808	2005	}
1809	2006	}
	2007	+
	2008	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1810	2009
1811	2010	if (count != 1)
1812	2011	for (int i=Size(); --i>=0;)
..	..	@@ -1816,8 +2015,9 @@
1816	2015	if (obj.name == null)
1817	2016	continue; // can't be a null one
1818	2017
1819		- //if (n.contains(obj.name)) // dec 2013 name.split(":")[0])) // Poser generates a count
1820		- if (n.startsWith(obj.name))
	2018	+ String name = obj.name.split(":")[0]; // Poser generates a count
	2019	+ //if (n.startsWith(obj.name))
	2020	+ if (n.contains(name))
1821	2021	{
1822	2022	theobj = obj;
1823	2023	count++;
..	..	@@ -2120,15 +2320,8 @@
2120	2320	if (/parent != null &&/ material == null)
2121	2321	{
2122	2322	material = new cMaterial(GetMaterial());
2123		- if (projectedVertices == null \|\| projectedVertices.length <= 2)
2124		- {
2125		- projectedVertices = new Object3D.cVector2[3];
2126		- }
2127		- for (int i = 0; i < 3; i++)
2128		- {
2129		- projectedVertices[i] = new cVector2(); // Others
2130		- }
2131		- projectedVertices[0].x = 100; // bump
	2323	+
	2324	+ InitOthers();
2132	2325
2133	2326	if (this instanceof Camera)
2134	2327	{
..	..	@@ -2272,12 +2465,22 @@
2272	2465	}
2273	2466	*/
2274	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	+ }
2275	2477	}
2276	2478
2277	2479	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2278	2480	{
2279	2481	if (newWindow)
2280	2482	{
	2483	+ new Exception().printStackTrace();
2281	2484	System.exit(0);
2282	2485	if (parent != null)
2283	2486	{
..	..	@@ -2312,6 +2515,14 @@
2312	2515	{
2313	2516	editWindow.refreshContents();
2314	2517	}
	2518	+ else
	2519	+ {
	2520	+ if (manipWindow != null)
	2521	+ {
	2522	+ manipWindow.refreshContents();
	2523	+ }
	2524	+ }
	2525	+
2315	2526	//if (parent != null)
2316	2527	//parent.refreshEditWindow();
2317	2528	}
..	..	@@ -2391,7 +2602,8 @@
2391	2602	private static final int editSelf = 1;
2392	2603	private static final int editChild = 2;
2393	2604
2394		- void drawEditHandles(ClickInfo info, int level)
	2605	+ void drawEditHandles(//ClickInfo info,
	2606	+ int level)
2395	2607	{
2396	2608	if (level == 0)
2397	2609	{
..	..	@@ -2399,7 +2611,8 @@
2399	2611	return;
2400	2612
2401	2613	Object3D selectee;
2402		- 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))
2403	2616	{
2404	2617	selectee = (Object3D) e.nextElement();
2405	2618	}
..	..	@@ -2407,19 +2620,22 @@
2407	2620	} else
2408	2621	{
2409	2622	//super.
2410		- drawEditHandles0(info, level + 1);
	2623	+ drawEditHandles0(//info,
	2624	+ level + 1);
2411	2625	}
2412	2626	}
2413	2627
2414		- boolean doEditClick(ClickInfo info, int level)
	2628	+ boolean doEditClick(//ClickInfo info,
	2629	+ int level)
2415	2630	{
2416	2631	doSomething = 0;
2417	2632	if (level == 0)
2418	2633	{
2419		- return doParentClick(info);
	2634	+ return doParentClick(); //info);
2420	2635	}
2421	2636	if (//super.
2422		- doEditClick0(info, level))
	2637	+ doEditClick0(//info,
	2638	+ level))
2423	2639	{
2424	2640	doSomething = 1;
2425	2641	return true;
..	..	@@ -2429,7 +2645,7 @@
2429	2645	}
2430	2646	}
2431	2647
2432		- boolean doParentClick(ClickInfo info)
	2648	+ boolean doParentClick() //ClickInfo info)
2433	2649	{
2434	2650	if (selection == null)
2435	2651	{
..	..	@@ -2442,7 +2658,8 @@
2442	2658	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2443	2659	{
2444	2660	Object3D selectee = (Object3D) e.nextElement();
2445		- if (selectee.doEditClick(info, 1))
	2661	+ if (selectee.doEditClick(//info,
	2662	+ 1))
2446	2663	{
2447	2664	childToDrag = selectee;
2448	2665	doSomething = 2;
..	..	@@ -2454,13 +2671,15 @@
2454	2671	return retval;
2455	2672	}
2456	2673
2457		- void doEditDrag(ClickInfo info)
	2674	+ void doEditDrag(//ClickInfo clickInfo,
	2675	+ boolean opposite)
2458	2676	{
2459	2677	switch (doSomething)
2460	2678	{
2461	2679	case 1: // '\001'
2462	2680	//super.
2463		- doEditDrag0(info);
	2681	+ doEditDrag0(//clickInfo,
	2682	+ opposite);
2464	2683	break;
2465	2684
2466	2685	case 2: // '\002'
..	..	@@ -2473,11 +2692,13 @@
2473	2692	{
2474	2693	//sel.hitSomething = childToDrag.hitSomething;
2475	2694	//childToDrag.doEditDrag(info);
2476		- sel.doEditDrag(info);
	2695	+ sel.doEditDrag(//clickInfo,
	2696	+ opposite);
2477	2697	} else
2478	2698	{
2479	2699	//super.
2480		- doEditDrag0(info);
	2700	+ doEditDrag0(//clickInfo,
	2701	+ opposite);
2481	2702	}
2482	2703	}
2483	2704	break;
..	..	@@ -2495,6 +2716,9 @@
2495	2716	{
2496	2717	deselectAll();
2497	2718	}
	2719	+
	2720	+ new Exception().printStackTrace();
	2721	+
2498	2722	ClickInfo newInfo = new ClickInfo();
2499	2723	newInfo.flags = info.flags;
2500	2724	newInfo.bounds = info.bounds;
..	..	@@ -2587,6 +2811,18 @@
2587	2811	void GenNormalsS(boolean crease)
2588	2812	{
2589	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();
2590	2826	// for (int i=0; i<selection.size(); i++)
2591	2827	// {
2592	2828	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2732,6 +2968,42 @@
2732	2968	blockloop = false;
2733	2969	}
2734	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();
	2984	+// Children().release(i);
	2985	+ }
	2986	+ blockloop = false;
	2987	+ }
	2988	+
	2989	+ void GenNormalsMINE()
	2990	+ {
	2991	+ if (blockloop)
	2992	+ return;
	2993	+
	2994	+ blockloop = true;
	2995	+ GenNormalsMINE0();
	2996	+ for (int i = 0; i < Children().Size(); i++)
	2997	+ {
	2998	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2999	+ if (child == null)
	3000	+ continue;
	3001	+ child.GenNormalsMINE();
	3002	+// Children().release(i);
	3003	+ }
	3004	+ blockloop = false;
	3005	+ }
	3006	+
2735	3007	void ClearColors()
2736	3008	{
2737	3009	if (blockloop)
..	..	@@ -2866,7 +3138,8 @@
2866	3138	{
2867	3139	if (bRep != null)
2868	3140	{
2869		- bRep.GenUV();
	3141	+ bRep.GenUV(); //1);
	3142	+ //bRep.UnfoldUV();
2870	3143	Touch();
2871	3144	}
2872	3145	}
..	..	@@ -2876,6 +3149,24 @@
2876	3149	if (bRep != null)
2877	3150	{
2878	3151	bRep.GenerateNormals(crease);
	3152	+ Touch();
	3153	+ }
	3154	+ }
	3155	+
	3156	+ void GenNormalsMesh0()
	3157	+ {
	3158	+ if (bRep != null)
	3159	+ {
	3160	+ bRep.GenerateNormalsMesh();
	3161	+ Touch();
	3162	+ }
	3163	+ }
	3164	+
	3165	+ void GenNormalsMINE0()
	3166	+ {
	3167	+ if (bRep != null)
	3168	+ {
	3169	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2879	3170	Touch();
2880	3171	}
2881	3172	}
..	..	@@ -2932,6 +3223,33 @@
2932	3223	blockloop = false;
2933	3224	}
2934	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	+
2935	3253	void TransformGeometry()
2936	3254	{
2937	3255	Object3D obj = this;
..	..	@@ -3153,9 +3471,11 @@
3153	3471
3154	3472	BoundaryRep sup = bRep.support;
3155	3473	bRep.support = null;
3156		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3474	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3157	3475	// bRep.SplitInTwo(onlyone); // thread...
3158		- temprep.SplitInTwo(reduction34, onlyone);
	3476	+
	3477	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3478	+
3159	3479	bRep = temprep;
3160	3480	bRep.support = sup;
3161	3481	Touch();
..	..	@@ -3292,7 +3612,8 @@
3292	3612	if (blockloop)
3293	3613	return;
3294	3614
3295		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3615	+ if (//marked \|\| // does not make sense
	3616	+ (bRep != null \|\| material != null)) // borderline...
3296	3617	live = h;
3297	3618
3298	3619	for (int i = 0; i < Size(); i++)
..	..	@@ -3313,7 +3634,8 @@
3313	3634	return;
3314	3635
3315	3636	//if (bRep != null)
3316		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3637	+ if (//marked \|\| // does not make sense
	3638	+ (bRep != null \|\| material != null)) // borderline...
3317	3639	link2master = h;
3318	3640
3319	3641	for (int i = 0; i < Size(); i++)
..	..	@@ -3333,7 +3655,8 @@
3333	3655	if (blockloop)
3334	3656	return;
3335	3657
3336		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3658	+ if (//marked \|\| // does not make sense
	3659	+ (bRep != null \|\| material != null)) // borderline...
3337	3660	hide = h;
3338	3661
3339	3662	for (int i = 0; i < Size(); i++)
..	..	@@ -3353,7 +3676,7 @@
3353	3676	if (blockloop)
3354	3677	return;
3355	3678
3356		- if (bRep != null && material != null) // borderline...
	3679	+ if (bRep != null \|\| material != null) // borderline...
3357	3680	marked = h;
3358	3681
3359	3682	for (int i = 0; i < Size(); i++)
..	..	@@ -3363,6 +3686,46 @@
3363	3686	continue;
3364	3687	blockloop = true;
3365	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);
3366	3729	blockloop = false;
3367	3730	// release(i);
3368	3731	}
..	..	@@ -3677,7 +4040,7 @@
3677	4040	if (child == null)
3678	4041	continue;
3679	4042
3680		- if (GrafreeD.RENDERME > 0)
	4043	+ if (Grafreed.RENDERME > 0)
3681	4044	{
3682	4045	if (child instanceof Merge)
3683	4046	((Merge)child).renderme();
..	..	@@ -3828,7 +4191,7 @@
3828	4191	if (child == null)
3829	4192	continue;
3830	4193
3831		- if (GrafreeD.RENDERME > 0)
	4194	+ if (Grafreed.RENDERME > 0)
3832	4195	{
3833	4196	if (child instanceof Merge)
3834	4197	((Merge)child).renderme();
..	..	@@ -4023,7 +4386,7 @@
4023	4386	if (child == null)
4024	4387	continue;
4025	4388
4026		- if (GrafreeD.RENDERME > 0)
	4389	+ if (Grafreed.RENDERME > 0)
4027	4390	{
4028	4391	if (child instanceof Merge)
4029	4392	((Merge)child).renderme();
..	..	@@ -4111,7 +4474,7 @@
4111	4474	if (blockloop)
4112	4475	return;
4113	4476
4114		- for (int i=0; i<size(); i++)
	4477	+ for (int i=0; i<Size(); i++)
4115	4478	{
4116	4479	if (get(i).parent != this)
4117	4480	{
..	..	@@ -4120,6 +4483,71 @@
4120	4483	}
4121	4484	blockloop = true;
4122	4485	get(i).RepairParent();
	4486	+ blockloop = false;
	4487	+ }
	4488	+ }
	4489	+
	4490	+ void RepairShadow()
	4491	+ {
	4492	+ if (blockloop)
	4493	+ return;
	4494	+
	4495	+ if (this.material != null)
	4496	+ this.InitOthers();
	4497	+
	4498	+ for (int i=0; i<Size(); i++)
	4499	+ {
	4500	+ blockloop = true;
	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();
4123	4551	blockloop = false;
4124	4552	}
4125	4553	}
..	..	@@ -4614,7 +5042,7 @@
4614	5042
4615	5043	cTreePath SelectLeaf(int indexcount, boolean deselect)
4616	5044	{
4617		- if (hide)
	5045	+ if (hide \|\| dontselect)
4618	5046	return null;
4619	5047
4620	5048	if (count <= 0)
..	..	@@ -4638,9 +5066,17 @@
4638	5066	}
4639	5067	}
4640	5068
	5069	+ ObjEditor GetWindow()
	5070	+ {
	5071	+ if (editWindow != null)
	5072	+ return editWindow;
	5073	+
	5074	+ return manipWindow;
	5075	+ }
	5076	+
4641	5077	cTreePath Select(int indexcount, boolean deselect)
4642	5078	{
4643		- if (hide)
	5079	+ if (hide \|\| dontselect)
4644	5080	return null;
4645	5081
4646	5082	if (count <= 0)
..	..	@@ -4674,10 +5110,11 @@
4674	5110	if (leaf != null)
4675	5111	{
4676	5112	cTreePath tp = new cTreePath(this, leaf);
4677		- if (editWindow != null)
	5113	+ ObjEditor window = GetWindow();
	5114	+ if (window != null)
4678	5115	{
4679	5116	//System.out.println("editWindow = " + editWindow + " vs " + this);
4680		- editWindow.Select(tp, deselect, true);
	5117	+ window.Select(tp, deselect, true);
4681	5118	}
4682	5119
4683	5120	return tp;
..	..	@@ -4694,6 +5131,7 @@
4694	5131
4695	5132	if (child == null)
4696	5133	continue;
	5134	+
4697	5135	if (child.HasTransparency() && child.size() != 0)
4698	5136	{
4699	5137	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4703,9 +5141,10 @@
4703	5141	if (leaf != null)
4704	5142	{
4705	5143	cTreePath tp = new cTreePath(this, leaf);
4706		- if (editWindow != null)
	5144	+ ObjEditor window = GetWindow();
	5145	+ if (window != null)
4707	5146	{
4708		- editWindow.Select(tp, deselect, true);
	5147	+ window.Select(tp, deselect, true);
4709	5148	}
4710	5149
4711	5150	return tp;
..	..	@@ -4790,7 +5229,7 @@
4790	5229	return globalTransform;
4791	5230	}
4792	5231
4793		- void PreprocessOcclusion(CameraPane cp)
	5232	+ void PreprocessOcclusion(iCameraPane cp)
4794	5233	{
4795	5234	/*
4796	5235	if (AOdone)
..	..	@@ -4937,7 +5376,8 @@
4937	5376	} else //
4938	5377	if (editWindow != null)
4939	5378	{
4940		- editWindow.cameraView.lighttouched = true;
	5379	+ //editWindow.cameraView.lighttouched = true;
	5380	+ Globals.lighttouched = true;
4941	5381	}
4942	5382	}
4943	5383
..	..	@@ -5029,6 +5469,51 @@
5029	5469	blockloop = false;
5030	5470	}
5031	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	+
5032	5517	boolean IsSelected()
5033	5518	{
5034	5519	if (parent == null)
..	..	@@ -5091,10 +5576,34 @@
5091	5576
5092	5577	// System.out.println("Fullname = " + fullname);
5093	5578
5094		- if (fullname.name.indexOf(":") == -1)
5095		- 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(":"));
5096	5584
5097		- 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];
5098	5607	}
5099	5608
5100	5609	static String GetBump(cTexture fullname)
..	..	@@ -5103,10 +5612,38 @@
5103	5612	return "";
5104	5613
5105	5614	// System.out.println("Fullname = " + fullname);
5106		- if (fullname.name.indexOf(":") == -1)
5107		- return "";
5108		-
5109		- 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];
5110	5647	}
5111	5648
5112	5649	String GetPigmentTexture()
..	..	@@ -5180,7 +5717,7 @@
5180	5717	System.out.print("; textures = " + textures);
5181	5718	System.out.println("; usedtextures = " + usedtextures);
5182	5719
5183		- if (GetTextures() == null)
	5720	+ if (GetTextures() == null) // What is that??
5184	5721	GetTextures().name = ":";
5185	5722
5186	5723	String texname = tex;
..	..	@@ -5211,6 +5748,43 @@
5211	5748	child.ResetPigmentTexture();
5212	5749	blockloop = false;
5213	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;
5214	5788	}
5215	5789
5216	5790	void SetBumpTexture(String tex)
..	..	@@ -5249,25 +5823,65 @@
5249	5823	}
5250	5824	}
5251	5825
5252		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	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	+
	5858	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5253	5859	{
5254	5860	Draw(display, root, selected, blocked);
5255	5861	}
5256	5862
5257		- static cMaterial[] materialstack = new cMaterial[65536];
5258		- static boolean[] selectedstack = new boolean[65536];
5259		- static int materialdepth = 0;
5260		-
5261	5863	boolean NeedSupport()
5262	5864	{
5263	5865	return
5264		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5866	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5265	5867	// PROBLEM with CROWD!!
5266		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	5868	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5267	5869	}
5268	5870
	5871	+ static boolean DEBUG_SELECTION = false;
5269	5872
5270		- void Draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5873	+ boolean IsLive()
	5874	+ {
	5875	+ if (live)
	5876	+ return true;
	5877	+
	5878	+ if (parent == null)
	5879	+ return false;
	5880	+
	5881	+ return parent.IsLive();
	5882	+ }
	5883	+
	5884	+ void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5271	5885	{
5272	5886	Invariants(); // june 2013
5273	5887
..	..	@@ -5276,8 +5890,8 @@
5276	5890	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5277	5891	}
5278	5892
5279		- if (display.drawMode == CameraPane.SELECTION &&
5280		- hide)
	5893	+ if (display.DrawMode() == iCameraPane.SELECTION &&
	5894	+ (hide \|\| dontselect))
5281	5895	return;
5282	5896
5283	5897	if (name != null && name.contains("sclera"))
..	..	@@ -5295,7 +5909,7 @@
5295	5909	if (this instanceof Checker)
5296	5910	return;
5297	5911
5298		- if (display.drawMode == display.SHADOW && PASSTEST)
	5912	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5299	5913	return;
5300	5914
5301	5915	if (count <= 0)
..	..	@@ -5303,13 +5917,13 @@
5303	5917	return;
5304	5918	}
5305	5919
5306		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5307		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5920	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	5921	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5308	5922	{
5309	5923	return;
5310	5924	}
5311	5925
5312		- javax.media.opengl.GL gl = display.GetGL();
	5926	+ //javax.media.opengl.GL gl = display.GetGL();
5313	5927
5314	5928	/*
5315	5929	if (touched)
..	..	@@ -5327,8 +5941,10 @@
5327	5941	if (support != null)
5328	5942	support = support;
5329	5943
5330		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5331		- 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.
5332	5948
5333	5949	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5334	5950	{
..	..	@@ -5338,30 +5954,33 @@
5338	5954	// usecalllists &= !(parent instanceof RandomNode);
5339	5955	// usecalllists = false;
5340	5956
5341		- if (GetBRep() != null)
5342		- usecalllists = usecalllists;
	5957	+ if (display.DrawMode() == display.SHADOW)
	5958	+ //GetBRep() != null)
	5959	+ usecalllists = !!usecalllists;
5343	5960	//System.out.println("draw " + this);
5344	5961	//new Exception().printStackTrace();
5345	5962
5346	5963	boolean compiled = false;
5347	5964
5348		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5965	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5349	5966
5350		- if (!selectmode && //display.drawMode != display.SELECTION &&
5351		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5967	+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
	5968	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5969	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5352	5970	{
5353		- display.lighttouched = true;
	5971	+ Globals.lighttouched = true;
5354	5972	} // all panes...
5355		- //if (usecalllists && display.drawMode != display.SELECTION && display.drawMode != display.SHADOW &&
5356		- if (bRep != null && usecalllists && !selectmode && // june 2013 display.drawMode != display.SHADOW &&
	5973	+
	5974	+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
	5975	+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5357	5976	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5358	5977	{
5359	5978	if (!(this instanceof Composite))
5360	5979	touched = false;
5361	5980	//if (displaylist == -1 && usecalllists)
5362		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5981	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5363	5982	{
5364		- bRep.displaylist = gl.glGenLists(1);
	5983	+ bRep.displaylist = display.GenList();
5365	5984	assert(bRep.displaylist != 0);
5366	5985	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5367	5986	//System.out.println("\tgen list " + list);
..	..	@@ -5370,21 +5989,23 @@
5370	5989
5371	5990	//System.out.println("\tnew list " + list);
5372	5991	//gl.glDrawBuffer(gl.GL_NONE);
5373		- if (usecalllists)
	5992	+ if (usecalllists && bRep.displaylist > 0)
5374	5993	{
5375	5994	// System.err.println("new list " + bRep.displaylist + " for " + this);
5376		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5995	+ display.NewList(bRep.displaylist);
5377	5996	}
	5997	+
5378	5998	CallList(display, root, selected, blocked);
	5999	+
5379	6000	// compiled = true;
5380		- if (usecalllists)
	6001	+ if (usecalllists && bRep.displaylist > 0)
5381	6002	{
5382	6003	// System.err.println("end list " + bRep.displaylist + " for " + this);
5383		- gl.glEndList();
	6004	+ display.EndList();
5384	6005	}
5385	6006	//gl.glDrawBuffer(gl.GL_BACK);
5386	6007	// XXX touched = false;
5387		- display.lighttouched = true; // all panes...
	6008	+ Globals.lighttouched = true; // all panes...
5388	6009	}
5389	6010
5390	6011	touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
..	..	@@ -5423,12 +6044,12 @@
5423	6044
5424	6045	// frustum culling
5425	6046	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5426		- && display.drawMode != CameraPane.SELECTION)
	6047	+ && display.DrawMode() != iCameraPane.SELECTION)
5427	6048	{
5428		- if (display.drawMode == CameraPane.SHADOW)
	6049	+ if (display.DrawMode() == iCameraPane.SHADOW)
5429	6050	{
5430	6051	if (!link2master // tricky to cull in shadow mode.
5431		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	6052	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5432	6053	{
5433	6054	//System.out.print("CULLED");
5434	6055	culled = true;
..	..	@@ -5436,7 +6057,7 @@
5436	6057	}
5437	6058	else
5438	6059	//GetBRep().getBounds(v0, v1, this);
5439		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	6060	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5440	6061	culled = true;
5441	6062
5442	6063	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5472,11 +6093,12 @@
5472	6093
5473	6094
5474	6095	if (!culled)
5475		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	6096	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5476	6097	{
5477	6098	if (GetBRep() != null)
5478	6099	{
5479		- CameraPane.NextIndex(this, gl);
	6100	+ display.NextIndex();
	6101	+
5480	6102	// vertex color conflict : gl.glCallList(list);
5481	6103	DrawNode(display, root, selected);
5482	6104	if (this instanceof BezierPatch)
..	..	@@ -5498,55 +6120,7 @@
5498	6120	color[2] /= 2;
5499	6121	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5500	6122	*/
5501		- if (material != null)
5502		- {
5503		- materialstack[materialdepth] = material;
5504		- selectedstack[materialdepth] = selected;
5505		- cStatic.objectstack[materialdepth++] = this;
5506		- //System.out.println("material " + material);
5507		- //Applet3D.tracein(this, selected);
5508		- display.vector2buffer = projectedVertices;
5509		- if (this instanceof Camera)
5510		- {
5511		- display.options1[0] = material.shift;
5512		- //System.out.println("shift " + material.shift);
5513		- display.options1[1] = material.lightarea;
5514		- display.options1[2] = material.shadowbias;
5515		- display.options1[3] = material.aniso;
5516		- display.options1[4] = material.anisoV;
5517		- display.options2[0] = material.opacity;
5518		- display.options2[1] = material.diffuse;
5519		- display.options2[2] = material.factor;
5520		-
5521		- cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
5522		- display.options4[0] = material.cameralight/0.2f;
5523		- display.options4[1] = material.subsurface;
5524		- display.options4[2] = material.sheen;
5525		-
5526		- // if (display.CURRENTANTIALIAS > 0)
5527		- // display.options3[3] /= 4;
5528		-
5529		- /*
5530		- System.out.println("Focus = " + display.options1[0]);
5531		- System.out.println("Aperture = " + display.options1[1]);
5532		- System.out.println("ShadowBlur = " + display.options1[2]);
5533		- System.out.println("Antialiasing = " + display.options1[3]);
5534		- System.out.println("Fog = " + display.options2[0]);
5535		- System.out.println("Intensity = " + display.options2[1]);
5536		- System.out.println("Elevation = " + display.options2[2]);
5537		- /**/
5538		- } else
5539		- {
5540		- material.Draw(display, selected);
5541		- }
5542		- } else
5543		- {
5544		- if (selected && CameraPane.flash)
5545		- {
5546		- display.modelParams4[1] = 100;
5547		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5548		- }
5549		- }
	6123	+ display.PushMaterial(this, selected);
5550	6124
5551	6125	//System.out.println("call list " + list);
5552	6126	//System.out.println();
..	..	@@ -5565,7 +6139,28 @@
5565	6139	tex = GetTextures();
5566	6140	}
5567	6141
5568		- 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	+ }
5569	6164
5570	6165	if (!compiled)
5571	6166	{
..	..	@@ -5581,30 +6176,19 @@
5581	6176
5582	6177	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5583	6178	assert(bRep.displaylist != 0);
5584		- gl.glCallList(bRep.displaylist);
	6179	+ display.CallList(bRep.displaylist);
5585	6180	// june 2013 drawSelf(display, root, selected);
5586	6181	}
5587	6182	}
5588	6183	}
5589	6184
5590		- display.ReleaseTextures(tex);
5591		-
5592		- //if (parent != null && parent.GetMaterial() != null)
5593		- // parent.GetMaterial().Draw(display, parent.IsSelected(this));
5594		- if (material != null)
5595		- {
5596		- materialdepth -= 1;
5597		- if (materialdepth > 0)
5598		- {
5599		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5600		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5601		- }
5602		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5603		- } else if (selected && CameraPane.flash && GetMaterial() != null)
5604		- {
5605		- display.modelParams4[1] = GetMaterial().cameralight;
5606		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5607		- }
	6185	+ if (!failedBump)
	6186	+ display.ReleaseBumpTexture(tex);
	6187	+
	6188	+ if (!failedPigment)
	6189	+ display.ReleasePigmentTexture(tex);
	6190	+
	6191	+ display.PopMaterial(this, selected);
5608	6192	}
5609	6193
5610	6194	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5646,7 +6230,7 @@
5646	6230	// resetMasterNode();
5647	6231	}
5648	6232
5649		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6233	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5650	6234	{
5651	6235	if (GetBRep() == null)
5652	6236	{
..	..	@@ -5729,8 +6313,11 @@
5729	6313	boolean flipV = false; // true;
5730	6314	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5731	6315
5732		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6316	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5733	6317	{
	6318	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6319	+ return;
	6320	+
5734	6321	if (hide)
5735	6322	return;
5736	6323	// shadow optimisation
..	..	@@ -5788,16 +6375,7 @@
5788	6375	// // ??????????????????????????? Touch();
5789	6376	// }
5790	6377
5791		- if (material != null)
5792		- {
5793		- materialstack[materialdepth] = material;
5794		- selectedstack[materialdepth] = selected;
5795		- cStatic.objectstack[materialdepth++] = this;
5796		- //System.out.println("material " + material);
5797		- //Applet3D.tracein("selected ", selected);
5798		- display.vector2buffer = projectedVertices;
5799		- material.Draw(display, selected);
5800		- }
	6378	+display.PushMaterial2(this, selected);
5801	6379
5802	6380	Object3D child;
5803	6381	boolean sel;
..	..	@@ -5849,19 +6427,7 @@
5849	6427	*/
5850	6428	//depth += 1;
5851	6429
5852		- if (material != null)
5853		- {
5854		- materialdepth -= 1;
5855		- if (materialdepth > 0)
5856		- {
5857		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5858		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5859		- }
5860		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5861		- //else
5862		- //material.Draw(display, false);
5863		- }
5864		-
	6430	+display.PopMaterial2(this);
5865	6431	/*
5866	6432	display.ReleaseTextures(tex);
5867	6433	*/
..	..	@@ -5872,10 +6438,13 @@
5872	6438
5873	6439	//static cVector min,max;
5874	6440
5875		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	6441	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5876	6442	{
5877		- if (display.drawMode == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	6443	+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5878	6444	return; // no shadow for transparent objects
	6445	+
	6446	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6447	+ return;
5879	6448
5880	6449	if (hide)
5881	6450	return;
..	..	@@ -5917,11 +6486,12 @@
5917	6486	return;
5918	6487	}
5919	6488
	6489	+ //bRep.GenUV(1/material.diffuseness);
5920	6490	// bRep.lock = true;
5921	6491
5922		- javax.media.opengl.GL gl = display.GetGL();
	6492	+ //javax.media.opengl.GL gl = display.GetGL();
5923	6493
5924		- if (CameraPane.BOXMODE) // \|\| CameraPane.movingcamera)
	6494	+ if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5925	6495	{
5926	6496	int fc = bRep.FaceCount();
5927	6497	int vc = bRep.VertexCount();
..	..	@@ -5936,23 +6506,7 @@
5936	6506
5937	6507	bRep.getMinMax(min, max, 100);
5938	6508
5939		- gl.glBegin(gl.GL_LINES);
5940		-
5941		- gl.glVertex3d(min.x, min.y, min.z);
5942		- gl.glVertex3d(min.x, min.y, max.z);
5943		- gl.glVertex3d(min.x, min.y, min.z);
5944		- gl.glVertex3d(min.x, max.y, min.z);
5945		- gl.glVertex3d(min.x, min.y, min.z);
5946		- gl.glVertex3d(max.x, min.y, min.z);
5947		-
5948		- gl.glVertex3d(max.x, max.y, max.z);
5949		- gl.glVertex3d(min.x, max.y, max.z);
5950		- gl.glVertex3d(max.x, max.y, max.z);
5951		- gl.glVertex3d(max.x, min.y, max.z);
5952		- gl.glVertex3d(max.x, max.y, max.z);
5953		- gl.glVertex3d(max.x, max.y, min.z);
5954		-
5955		- gl.glEnd();
	6509	+ display.DrawBox(min, max);
5956	6510
5957	6511	return;
5958	6512	}
..	..	@@ -5996,7 +6550,7 @@
5996	6550	{
5997	6551	//throw new Error();
5998	6552
5999		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6553	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
6000	6554
6001	6555	int[] strips = bRep.getRawIndices();
6002	6556
..	..	@@ -6006,178 +6560,19 @@
6006	6560	new Exception().printStackTrace();
6007	6561	return;
6008	6562	}
6009		-
6010		- // TRIANGLE STRIP ARRAY
6011		- if (bRep.trimmed)
	6563	+
	6564	+ if (dontselect)
6012	6565	{
6013		- float[] v = bRep.getRawVertices();
6014		- float[] n = bRep.getRawNormals();
6015		- float[] c = bRep.getRawColors();
6016		- float[] uv = bRep.getRawUVMap();
6017		-
6018		- int count2 = 0;
6019		- int count3 = 0;
6020		-
6021		- if (n.length > 0)
6022		- {
6023		- for (int i = 0; i < strips.length; i++)
6024		- {
6025		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6026		-
6027		- /*
6028		- boolean locked = false;
6029		- float eps = 0.1f;
6030		- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6031		-
6032		- int dot = 0;
6033		-
6034		- if ((dot&1) == 0)
6035		- dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6036		-
6037		- if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6038		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6039		- else
6040		- {
6041		- locked = true;
6042		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6043		- }
6044		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6045		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6046		- if (hasnorm)
6047		- {
6048		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6049		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6050		- }
6051		-
6052		- if ((dot&4) == 0)
6053		- dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6054		-
6055		- if (wrap \|\| !locked && (dot&8) != 0)
6056		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6057		- else
6058		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6059		-
6060		- f.dot = dot;
6061		- */
6062		-
6063		- if (!selectmode)
6064		- {
6065		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6066		- {
6067		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6068		- } else
6069		- {
6070		- gl.glNormal3f(0, 0, 1);
6071		- }
6072		-
6073		- if (c != null)
6074		- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
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("vertex1 = " + 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		- if (!selectmode)
6089		- {
6090		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6091		- {
6092		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6093		- } else
6094		- {
6095		- gl.glNormal3f(0, 0, 1);
6096		- }
6097		- if (c != null)
6098		- {
6099		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6100		- }
6101		- }
6102		- if (flipV)
6103		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6104		- else
6105		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6106		- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6107		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6108		-
6109		- count2 += 2;
6110		- count3 += 3;
6111		- for (int j = 0; j < strips[i] - 2; j++)
6112		- {
6113		- //gl.glTexCoord2d(...);
6114		- if (!selectmode)
6115		- {
6116		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6117		- {
6118		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6119		- } else
6120		- {
6121		- gl.glNormal3f(0, 0, 1);
6122		- }
6123		- if (c != null)
6124		- {
6125		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6126		- }
6127		- }
6128		-
6129		- if (flipV)
6130		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6131		- else
6132		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6133		- //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6134		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6135		- count2 += 2;
6136		- count3 += 3;
6137		- }
6138		-
6139		- gl.glEnd();
6140		- }
6141		- }
6142		-
6143		- assert count3 == v.length;
	6566	+ //bRep.GenerateNormalsMINE();
6144	6567	}
6145		- else // !trimmed
6146		- {
6147		- int count = 0;
6148		- for (int i = 0; i < strips.length; i++)
6149		- {
6150		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6151		-
6152		- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6153		- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6154		-
6155		- drawVertex(gl, p, selectmode);
6156		- drawVertex(gl, q, selectmode);
6157		-
6158		- for (int j = 0; j < strips[i] - 2; j++)
6159		- {
6160		- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6161		-
6162		-// if (j%2 == 0)
6163		-// drawFace(p, q, r, display, null);
6164		-// else
6165		-// drawFace(p, r, q, display, null);
6166		-
6167		-// p = q;
6168		-// q = r;
6169		- drawVertex(gl, r, selectmode);
6170		- }
6171		-
6172		- gl.glEnd();
6173		- }
6174		- }
	6568	+
	6569	+ display.DrawGeometry(bRep, flipV, selectmode);
6175	6570	} else // catch (Error e)
6176	6571	{
6177	6572	// TRIANGLE ARRAY
6178	6573	if (IsOpaque()) // Static())
6179	6574	{
6180		- gl.glBegin(gl.GL_TRIANGLES);
	6575	+ display.StartTriangles();
6181	6576	int facecount = bRep.FaceCount();
6182	6577	for (int i = 0; i < facecount; i++)
6183	6578	{
..	..	@@ -6240,9 +6635,9 @@
6240	6635	// // r.norm.dot(v3) > -0.5)
6241	6636	// // continue;
6242	6637
6243		- drawFace(p, q, r, display, face);
	6638	+ display.DrawFace(this, p, q, r, face);
6244	6639	}
6245		- gl.glEnd();
	6640	+ display.EndTriangles();
6246	6641	}
6247	6642	else
6248	6643	{
..	..	@@ -6271,8 +6666,8 @@
6271	6666	//System.out.println("SORT");
6272	6667
6273	6668	java.util.Arrays.sort(facescompare);
6274		-
6275		- gl.glBegin(gl.GL_TRIANGLES);
	6669	+
	6670	+ display.StartTriangles();
6276	6671	for (int i = 0; i < facecount; i++)
6277	6672	{
6278	6673	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6284,13 +6679,14 @@
6284	6679	Vertex q = bRep.GetVertex(face.q);
6285	6680	Vertex r = bRep.GetVertex(face.r);
6286	6681
6287		- drawFace(p, q, r, display, face);
	6682	+ display.DrawFace(this, p, q, r, face);
6288	6683	}
6289		- gl.glEnd();
	6684	+ display.EndTriangles();
6290	6685	}
6291	6686
6292	6687	if (false) // live && support != null && support.bRep != null) // debug weights
6293	6688	{
	6689	+ /*
6294	6690	gl.glDisable(gl.GL_LIGHTING);
6295	6691	float[] colorV = new float[3];
6296	6692
..	..	@@ -6369,6 +6765,7 @@
6369	6765	// gl.glEnd();
6370	6766	}
6371	6767	}
	6768	+ */
6372	6769	}
6373	6770	}
6374	6771
..	..	@@ -6413,7 +6810,7 @@
6413	6810	center.add(r);
6414	6811	center.mul(1.0/3);
6415	6812
6416		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6813	+ center.sub(Globals.theRenderer.EyeCamera().location);
6417	6814
6418	6815	distance = center.dot(center);
6419	6816	}
..	..	@@ -6424,347 +6821,11 @@
6424	6821
6425	6822	transient FaceCompare[] facescompare = null;
6426	6823
6427		- void SetColor(CameraPane display, Vertex p0)
6428		- {
6429		- if (display.RENDERPROGRAM == 0)
6430		- {
6431		- float r = 0;
6432		- if (bRep != null)
6433		- {
6434		- if (bRep.stripified)
6435		- {
6436		- r = 1;
6437		- }
6438		- }
6439		- float g = 0;
6440		- if (bRep != null)
6441		- {
6442		- if (bRep.trimmed)
6443		- {
6444		- g = 1;
6445		- }
6446		- }
6447		- float b = 0;
6448		- if (support != null && link2master)
6449		- {
6450		- b = 1;
6451		- }
6452		- display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
6453		- return;
6454		- }
6455		-
6456		- if (display.drawMode != CameraPane.SHADOW)
6457		- return;
6458		-
6459		- javax.media.opengl.GL gl = display.GetGL();
6460		-// if (true) return;
6461		-// float ao = p.AO;
6462		-//
6463		-// // if (ao == 0 && !bRep.AOdone) // transient problem!
6464		-// // ao = 1;
6465		-//
6466		-// gl.glColor4f(ao, ao, ao, 1);
6467		-
6468		-// CameraPane.selectedpoint.
6469		-// getAverage(cStatic.point1, true);
6470		- if (CameraPane.pointflow == null) // !random) // live)
6471		- {
6472		- return;
6473		- }
6474		-
6475		- cStatic.point1.set(0,0,0);
6476		- LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
6477		-
6478		- cStatic.point1.sub(p0);
6479		-
6480		-
6481		-// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
6482		-// {
6483		-// return;
6484		-// }
6485		-
6486		- //if (true)
6487		- if (cStatic.point1.dot(cStatic.point1) > 0.000001)
6488		- {
6489		- return;
6490		- }
6491		-
6492		- float[] colorV = new float[3];
6493		-
6494		- if (false) // marked)
6495		- {
6496		- // debug rigging weights
6497		- for (int object = 0; object < p0.vertexlinks.length; object++)
6498		- {
6499		- float weight = p0.weights[object] / p0.totalweight;
6500		-
6501		- // if (weight < 0.1)
6502		- // {
6503		- // assert(weight == 0);
6504		- // continue;
6505		- // }
6506		-
6507		- if (p0.vertexlinks[object] == -1)
6508		- continue;
6509		-
6510		- Vertex q = support.bRep.GetVertex(p0.vertexlinks[object]);
6511		-
6512		- int color = //1 << object; //
6513		- //p.vertexlinks.length;
6514		- support.bRep.supports[p0.closestsupport].links[object];
6515		- colorV[2] += (color & 1) * weight;
6516		- colorV[1] += ((color & 2) >> 1) * weight;
6517		- colorV[0] += ((color & 4) >> 2) * weight;
6518		- }
6519		- }
6520		- else
6521		- {
6522		- if (drawingstarted)
6523		- {
6524		- // find next point
6525		- if (bRep.GetVertex(0).faceindices == null)
6526		- {
6527		- bRep.InitFaceIndices();
6528		- }
6529		-
6530		- double ymin = p0.y;
6531		-
6532		- Vertex newp = p0;
6533		-
6534		- for (int fii = 0; fii < p0.faceindices.length; fii++)
6535		- {
6536		- int fi = p0.faceindices[fii];
6537		-
6538		- if (fi == -1)
6539		- break;
6540		-
6541		- Face f = bRep.GetFace(fi);
6542		-
6543		- Vertex p = bRep.GetVertex(f.p);
6544		- Vertex q = bRep.GetVertex(f.q);
6545		- Vertex r = bRep.GetVertex(f.r);
6546		-
6547		- int swap = (int)(Math.random()*3);
6548		-
6549		-// for (int s=swap; --s>=0;)
6550		-// {
6551		-// Vertex t = p;
6552		-// p = q;
6553		-// q = r;
6554		-// r = t;
6555		-// }
6556		- if (ymin > p.y)
6557		- {
6558		- ymin = p.y;
6559		- newp = p;
6560		-// break;
6561		- }
6562		- if (ymin > q.y)
6563		- {
6564		- ymin = q.y;
6565		- newp = q;
6566		-// break;
6567		- }
6568		- if (ymin > r.y)
6569		- {
6570		- ymin = r.y;
6571		- newp = r;
6572		-// break;
6573		- }
6574		- }
6575		-
6576		- CameraPane.selectedpoint.toParent[3][0] = newp.x;
6577		- CameraPane.selectedpoint.toParent[3][1] = newp.y;
6578		- CameraPane.selectedpoint.toParent[3][2] = newp.z;
6579		-
6580		- drawingstarted = false;
6581		-
6582		- // return;
6583		- }
6584		-
6585		- if (false) // CameraPane.DRAW
6586		- {
6587		- p0.AO = colorV[0] = 2;
6588		- colorV[1] = 2;
6589		- colorV[2] = 2;
6590		- }
6591		-
6592		- CameraPane.pointflow.add(p0);
6593		- CameraPane.pointflow.Touch();
6594		- }
6595		-
6596		-// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
6597		-// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
6598		-// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
6599		- }
6600		-
6601	6824	void Print(Vertex v)
6602	6825	{
6603	6826	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6604	6827	}
6605	6828
6606		- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6607		- {
6608		- if (!selectmode)
6609		- {
6610		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6611		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6612		-
6613		- if (flipV)
6614		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6615		- else
6616		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6617		- }
6618		-
6619		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6620		- }
6621		-
6622		- void drawFace(Vertex pv, Vertex qv, Vertex rv,
6623		- CameraPane display, Face face)
6624		- {
6625		- if (pv.y == -10000 \|\|
6626		- qv.y == -10000 \|\|
6627		- rv.y == -10000)
6628		- return;
6629		-
6630		-// float b = f.nbiterations & 1;
6631		-// float g = (f.nbiterations>>1) & 1;
6632		-// float r = (f.nbiterations>>2) & 1;
6633		-//
6634		-// //if (f.weight == 10000)
6635		-// //{
6636		-// // r = 1; g = b = 0;
6637		-// //}
6638		-// //else
6639		-// //{
6640		-// // assert(f.weight < 10000);
6641		-// r = g = b = (float)bRep.FaceWeight(f)*100;
6642		-// if (r<0)
6643		-// assert(r>=0);
6644		-// //}
6645		-
6646		- javax.media.opengl.GL gl = display.GetGL();
6647		-
6648		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
6649		-
6650		- //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
6651		- if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
6652		- {
6653		- //gl.glBegin(gl.GL_TRIANGLES);
6654		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
6655		- if (!hasnorm)
6656		- {
6657		- // System.out.println("FUCK!!");
6658		- LA.vecSub(pv/.pos/, qv/.pos/, v0);
6659		- LA.vecSub(pv/.pos/, rv/.pos/, v1);
6660		- LA.vecCross(v0, v1, v2);
6661		- LA.vecNormalize(v2);
6662		- gl.glNormal3f((float) v2.x, (float) v2.y, (float) v2.z);
6663		- }
6664		-
6665		- if (hasnorm)
6666		- {
6667		-// if (!pv.norm.normalized())
6668		-// assert(pv.norm.normalized());
6669		-
6670		- //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
6671		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6672		- }
6673		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6674		- SetColor(display, pv);
6675		- //gl.glColor4f(r, g, b, 1);
6676		- //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
6677		- if (flipV)
6678		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6679		- else
6680		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6681		- //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
6682		- gl.glVertex3f((float) pv./pos./x, (float) pv./pos./y, (float) pv./pos./z);
6683		-// Print(pv);
6684		- if (hasnorm)
6685		- {
6686		-// assert(qv.norm.normalized());
6687		- //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
6688		- gl.glNormal3f((float) qv.norm.x, (float) qv.norm.y, (float) qv.norm.z);
6689		- }
6690		- //System.out.println("vertexq = " + qv.s + ", " + qv.t);
6691		- // boolean locked = false;
6692		- // float eps = 0.1f;
6693		- // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6694		-
6695		- // int dot = 0; //*/ (int)f.dot;
6696		-
6697		- // if ((dot&1) == 0)
6698		- // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6699		-
6700		- // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6701		- if (flipV)
6702		- gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
6703		- else
6704		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6705		- // else
6706		- // {
6707		- // locked = true;
6708		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6709		- // }
6710		- gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
6711		- SetColor(display, qv);
6712		- //gl.glColor4f(r, g, b, 1);
6713		- //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
6714		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6715		- gl.glVertex3f((float) qv./pos./x, (float) qv./pos./y, (float) qv./pos./z);
6716		-// Print(qv);
6717		- if (hasnorm)
6718		- {
6719		-// assert(rv.norm.normalized());
6720		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6721		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6722		- }
6723		-
6724		- // if ((dot&4) == 0)
6725		- // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6726		-
6727		- // if (wrap \|\| !locked && (dot&8) != 0)
6728		- if (flipV)
6729		- gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
6730		- else
6731		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6732		- // else
6733		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6734		-
6735		- // f.dot = dot;
6736		-
6737		- gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
6738		- SetColor(display, rv);
6739		- //gl.glColor4f(r, g, b, 1);
6740		- //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
6741		- //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
6742		- gl.glVertex3f((float) rv./pos./x, (float) rv./pos./y, (float) rv./pos./z);
6743		-// Print(rv);
6744		- //gl.glEnd();
6745		- }
6746		- else
6747		- {
6748		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6749		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6750		- gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
6751		-
6752		- }
6753		-
6754		- if (false) // (attributes & WIREFRAME) != 0)
6755		- {
6756		- gl.glDisable(gl.GL_LIGHTING);
6757		-
6758		- gl.glBegin(gl.GL_LINE_LOOP);
6759		- gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
6760		- gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
6761		- gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
6762		- gl.glEnd();
6763		-
6764		- gl.glEnable(gl.GL_LIGHTING);
6765		- }
6766		- }
6767		-
6768	6829	void drawSelf(ClickInfo info, int level, boolean select)
6769	6830	{
6770	6831	if (bRep == null)
..	..	@@ -7288,20 +7349,23 @@
7288	7349	}
7289	7350	}
7290	7351
7291		- 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)
7292	7356	{
7293		- int hc = info.bounds.x + info.bounds.width / 2;
7294		- int vc = info.bounds.y + info.bounds.height / 2;
7295		- 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;
7296	7360	if (toscreen == null)
7297	7361	{
7298		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7362	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7299	7363	}
7300	7364	cVector vec = in;
7301	7365	LA.xformPos(in, toscreen, in);
7302	7366	//System.out.println("Distance = " + info.camera.Distance());
7303		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7304		- 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();
7305	7369	outPt.x = hc + (int) vec.x;
7306	7370	outPt.y = vc - (int) vec.y;
7307	7371	outRec.x = outPt.x - 3;
..	..	@@ -7309,15 +7373,18 @@
7309	7373	outRec.width = outRec.height = 6;
7310	7374	}
7311	7375
7312		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7376	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7377	+ )
7313	7378	{
7314	7379	Point pt = new Point(0, 0);
7315	7380	Rectangle rec = new Rectangle();
7316		- calcHotSpot(in, info, pt, rec);
	7381	+ calcHotSpot(in, //clickInfo,
	7382	+ pt, rec);
7317	7383	return rec;
7318	7384	}
7319	7385
7320		- void drawEditHandles0(ClickInfo info, int level)
	7386	+ void drawEditHandles0(//ClickInfo clickInfo,
	7387	+ int level)
7321	7388	{
7322	7389	if (level == 0)
7323	7390	{
..	..	@@ -7326,98 +7393,103 @@
7326	7393	{
7327	7394	cVector origin = new cVector();
7328	7395	//LA.xformPos(origin, toParent, origin);
7329		- Rectangle spot = calcHotSpot(origin, info);
	7396	+ if (this.clickInfo == null)
	7397	+ this.clickInfo = new ClickInfo();
	7398	+
	7399	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7330	7400	Rectangle boundary = new Rectangle();
7331	7401	boundary.x = spot.x - 30;
7332	7402	boundary.y = spot.y - 30;
7333	7403	boundary.width = spot.width + 60;
7334	7404	boundary.height = spot.height + 60;
7335		- info.g.setColor(Color.red);
	7405	+ clickInfo.g.setColor(Color.red);
7336	7406	int spotw = spot.x + spot.width;
7337	7407	int spoth = spot.y + spot.height;
7338		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7339		- if (CameraPane.Xmin > spot.x)
7340		- {
7341		- CameraPane.Xmin = spot.x;
7342		- }
7343		- if (CameraPane.Xmax < spotw)
7344		- {
7345		- CameraPane.Xmax = spotw;
7346		- }
7347		- if (CameraPane.Ymin > spot.y)
7348		- {
7349		- CameraPane.Ymin = spot.y;
7350		- }
7351		- if (CameraPane.Ymax < spoth)
7352		- {
7353		- CameraPane.Ymax = spoth;
7354		- }
	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	+// }
7355	7425	spot.translate(32, 32);
7356	7426	spotw = spot.x + spot.width;
7357	7427	spoth = spot.y + spot.height;
7358		- info.g.setColor(Color.blue);
7359		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7360		- if (CameraPane.Xmin > spot.x)
7361		- {
7362		- CameraPane.Xmin = spot.x;
7363		- }
7364		- if (CameraPane.Xmax < spotw)
7365		- {
7366		- CameraPane.Xmax = spotw;
7367		- }
7368		- if (CameraPane.Ymin > spot.y)
7369		- {
7370		- CameraPane.Ymin = spot.y;
7371		- }
7372		- if (CameraPane.Ymax < spoth)
7373		- {
7374		- CameraPane.Ymax = spoth;
7375		- }
7376		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7377		- 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
7378	7448	spot.translate(0, -32);
7379		- info.g.setColor(Color.green);
7380		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7381		- if (CameraPane.Xmin > spot.x)
7382		- {
7383		- CameraPane.Xmin = spot.x;
7384		- }
7385		- if (CameraPane.Xmax < spotw)
7386		- {
7387		- CameraPane.Xmax = spotw;
7388		- }
7389		- if (CameraPane.Ymin > spot.y)
7390		- {
7391		- CameraPane.Ymin = spot.y;
7392		- }
7393		- if (CameraPane.Ymax < spoth)
7394		- {
7395		- CameraPane.Ymax = spoth;
7396		- }
7397		- info.g.drawArc(boundary.x, boundary.y,
7398		- 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);
7399	7470	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7400		- if (CameraPane.Xmin > boundary.x)
7401		- {
7402		- CameraPane.Xmin = boundary.x;
7403		- }
7404		- if (CameraPane.Xmax < boundary.x + boundary.width)
7405		- {
7406		- CameraPane.Xmax = boundary.x + boundary.width;
7407		- }
7408		- if (CameraPane.Ymin > boundary.y)
7409		- {
7410		- CameraPane.Ymin = boundary.y;
7411		- }
7412		- if (CameraPane.Ymax < boundary.y + boundary.height)
7413		- {
7414		- CameraPane.Ymax = boundary.y + boundary.height;
7415		- }
	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	+// }
7416	7487	return;
7417	7488	}
7418	7489	}
7419	7490
7420		- boolean doEditClick0(ClickInfo info, int level)
	7491	+ boolean doEditClick0(//ClickInfo clickInfo,
	7492	+ int level)
7421	7493	{
7422	7494	if (level == 0)
7423	7495	{
..	..	@@ -7426,10 +7498,10 @@
7426	7498
7427	7499	boolean retval = false;
7428	7500
7429		- startX = info.x;
7430		- startY = info.y;
	7501	+ startX = clickInfo.x;
	7502	+ startY = clickInfo.y;
7431	7503
7432		- hitSomething = 0;
	7504	+ hitSomething = -1;
7433	7505	cVector origin = new cVector();
7434	7506	//LA.xformPos(origin, toParent, origin);
7435	7507	Rectangle spot = new Rectangle();
..	..	@@ -7437,22 +7509,51 @@
7437	7509	{
7438	7510	centerPt = new Point(0, 0);
7439	7511	}
7440		- calcHotSpot(origin, info, centerPt, spot);
7441		- if (spot.contains(info.x, info.y))
	7512	+ calcHotSpot(origin, //info,
	7513	+ centerPt, spot);
	7514	+ if (spot.contains(clickInfo.x, clickInfo.y))
7442	7515	{
7443	7516	hitSomething = hitCenter;
7444	7517	retval = true;
7445	7518	}
7446	7519	spot.translate(32, 0);
7447		- if (spot.contains(info.x, info.y))
	7520	+ if (spot.contains(clickInfo.x, clickInfo.y))
7448	7521	{
7449	7522	hitSomething = hitRotate;
7450	7523	retval = true;
7451	7524	}
7452	7525	spot.translate(0, 32);
7453		- if (spot.contains(info.x, info.y))
	7526	+ if (spot.contains(clickInfo.x, clickInfo.y))
7454	7527	{
7455	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	+
7456	7557	retval = true;
7457	7558	}
7458	7559
..	..	@@ -7462,7 +7563,7 @@
7462	7563	}
7463	7564
7464	7565	//System.out.println("info.modifiers = " + info.modifiers);
7465		- modified = (info.modifiers & CameraPane.META) != 0;
	7566	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7466	7567	//System.out.println("modified = " + modified);
7467	7568	//new Exception().printStackTrace();
7468	7569	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7490,7 +7591,8 @@
7490	7591	return true;
7491	7592	}
7492	7593
7493		- void doEditDrag0(ClickInfo info)
	7594	+ void doEditDrag0(//ClickInfo info,
	7595	+ boolean opposite)
7494	7596	{
7495	7597	if (hitSomething == 0)
7496	7598	{
..	..	@@ -7504,7 +7606,8 @@
7504	7606
7505	7607	//System.out.println("hitSomething = " + hitSomething);
7506	7608
7507		- double scale = 0.005f * info.camera.Distance();
	7609	+ double scale = 0.005f * clickInfo.camera.Distance();
	7610	+
7508	7611	cVector xlate = new cVector();
7509	7612	//cVector xlate2 = new cVector();
7510	7613	switch (hitSomething)
..	..	@@ -7515,9 +7618,9 @@
7515	7618
7516	7619	case hitCenter: // Translate
7517	7620
7518		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7621	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7519	7622
7520		- if (modified)
	7623	+ if (modified \|\| opposite)
7521	7624	{
7522	7625	//assert(false);
7523	7626	/*
..	..	@@ -7537,8 +7640,8 @@
7537	7640	toParent[3][i] = xlate.get(i);
7538	7641	LA.matInvert(toParent, fromParent);
7539	7642	*/
7540		- cVector delta = LA.newVector(0, 0, startY - info.y);
7541		- 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);
7542	7645
7543	7646	LA.matCopy(startMat, toParent);
7544	7647	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7547,7 +7650,7 @@
7547	7650	} else
7548	7651	{
7549	7652	//LA.xformDir(delta, info.camera.fromScreen, delta);
7550		- cVector up = new cVector(info.camera.up);
	7653	+ cVector up = new cVector(clickInfo.camera.up);
7551	7654	cVector away = new cVector();
7552	7655	//cVector right2 = new cVector();
7553	7656	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7563,20 +7666,20 @@
7563	7666	}
7564	7667	LA.xformDir(up, ClickInfo.matbuffer, up);
7565	7668	// if (!CameraPane.LOCALTRANSFORM)
7566		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
7567		- 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);
7568	7671	// if (!CameraPane.LOCALTRANSFORM)
7569		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7672	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7570	7673	//LA.vecCross(up, cVector.Z, right2);
7571	7674
7572		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7675	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7573	7676
7574	7677	//System.out.println("DELTA0 = " + delta);
7575	7678	//System.out.println("AWAY = " + info.camera.away);
7576	7679	//System.out.println("UP = " + info.camera.up);
7577	7680	if (away.z > 0)
7578	7681	{
7579		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7682	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7580	7683	{
7581	7684	delta.x = -delta.x;
7582	7685	} else
..	..	@@ -7591,7 +7694,7 @@
7591	7694	//System.out.println("DELTA1 = " + delta);
7592	7695	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7593	7696	//System.out.println("DELTA2 = " + delta);
7594		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7697	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7595	7698	LA.matCopy(startMat, toParent);
7596	7699	//System.out.println("DELTA3 = " + delta);
7597	7700	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7601,8 +7704,8 @@
7601	7704	break;
7602	7705
7603	7706	case hitRotate: // rotate
7604		- int dx = info.x - centerPt.x;
7605		- int dy = -(info.y - centerPt.y);
	7707	+ int dx = clickInfo.x - centerPt.x;
	7708	+ int dy = -(clickInfo.y - centerPt.y);
7606	7709	double angle = (double) Math.atan2(dx, dy);
7607	7710	angle = -(1.570796 - angle);
7608	7711
..	..	@@ -7611,6 +7714,7 @@
7611	7714
7612	7715	if (modified)
7613	7716	{
	7717	+ // Rotate 90 degrees
7614	7718	angle /= (Math.PI / 4);
7615	7719	angle = Math.floor(angle + 0.5);
7616	7720	angle *= (Math.PI / 4);
..	..	@@ -7624,7 +7728,7 @@
7624	7728	}
7625	7729	/**/
7626	7730
7627		- switch (info.pane.renderCamera.viewCode)
	7731	+ switch (clickInfo.pane.RenderCamera().viewCode)
7628	7732	{
7629	7733	case 1: // '\001'
7630	7734	LA.matZRotate(toParent, angle);
..	..	@@ -7651,26 +7755,30 @@
7651	7755	break;
7652	7756
7653	7757	case hitScale: // scale
7654		- 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);
7655	7765	if (hScale < 0.01)
7656	7766	{
7657		- hScale = 0.01;
	7767	+ //hScale = 0.01;
7658	7768	}
7659		- hScale = Math.pow(hScale, scale * 50);
7660		- if (hScale < 0.01)
	7769	+
	7770	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7771	+ sign = 1;
	7772	+ if (vScale < 0)
7661	7773	{
7662		- hScale = 0.01;
	7774	+ sign = -1;
7663	7775	}
7664		- double vScale = (double) (info.y - centerPt.y) / 32;
	7776	+ vScale = signMath.pow(signvScale, scale * 50);
7665	7777	if (vScale < 0.01)
7666	7778	{
7667		- vScale = 0.01;
	7779	+ //vScale = 0.01;
7668	7780	}
7669		- vScale = Math.pow(vScale, scale * 50);
7670		- if (vScale < 0.01)
7671		- {
7672		- vScale = 0.01;
7673		- }
	7781	+
7674	7782	LA.matCopy(startMat, toParent);
7675	7783	/**/
7676	7784	for (int i = 0; i < 3; i++)
..	..	@@ -7680,39 +7788,47 @@
7680	7788	}
7681	7789	/**/
7682	7790
7683		- 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)
7684	7799	{
7685	7800	case 3: // '\001'
7686		- if (modified)
	7801	+ if (modified \|\| opposite)
7687	7802	{
7688	7803	//LA.matScale(toParent, 1, hScale, vScale);
7689		- LA.matScale(toParent, vScale, 1, 1);
	7804	+ LA.matScale(toParent, totalScale, 1, 1);
7690	7805	} // vScale, 1);
7691	7806	else
7692	7807	{
7693		- LA.matScale(toParent, vScale, vScale, vScale);
	7808	+ // EXCEPTION!
	7809	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7694	7810	} // vScale, 1);
7695	7811	break;
7696	7812
7697	7813	case 2: // '\002'
7698		- if (modified)
	7814	+ if (modified \|\| opposite)
7699	7815	{
7700	7816	//LA.matScale(toParent, hScale, 1, vScale);
7701		- LA.matScale(toParent, 1, vScale, 1);
	7817	+ LA.matScale(toParent, 1, totalScale, 1);
7702	7818	} else
7703	7819	{
7704		- LA.matScale(toParent, vScale, 1, vScale);
	7820	+ LA.matScale(toParent, totalScale, 1, totalScale);
7705	7821	}
7706	7822	break;
7707	7823
7708	7824	case 1: // '\003'
7709		- if (modified)
	7825	+ if (modified \|\| opposite)
7710	7826	{
7711	7827	//LA.matScale(toParent, hScale, vScale, 1);
7712		- LA.matScale(toParent, 1, 1, vScale);
	7828	+ LA.matScale(toParent, 1, 1, totalScale);
7713	7829	} else
7714	7830	{
7715		- LA.matScale(toParent, vScale, vScale, 1);
	7831	+ LA.matScale(toParent, totalScale, totalScale, 1);
7716	7832	}
7717	7833	break;
7718	7834	}
..	..	@@ -7733,7 +7849,7 @@
7733	7849	if (parent == null)
7734	7850	{
7735	7851	System.out.println("NULL PARENT");
7736		- new Exception().printStackTrace();
	7852	+ //new Exception().printStackTrace();
7737	7853	} else
7738	7854	{
7739	7855	if (parent instanceof BezierPatch)
..	..	@@ -7746,7 +7862,7 @@
7746	7862	} // NEW ...
7747	7863
7748	7864
7749		- info.pane.repaint();
	7865	+ clickInfo.pane.repaint();
7750	7866	}
7751	7867
7752	7868	boolean overflow = false;
..	..	@@ -7845,14 +7961,22 @@
7845	7961	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7846	7962	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7847	7963	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7964	+
	7965	+ String objname;
	7966	+
7848	7967	if (false) //parent != null)
7849	7968	{
7850		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7969	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7851	7970	} else
7852	7971	{
7853		- 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) ":"") / "";
7854	7973	} // + super.toString();
7855	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);
7856	7980	}
7857	7981
7858	7982	public int hashCode()
..	..	@@ -7908,6 +8032,7 @@
7908	8032	objectUI.closeUI();
7909	8033	if (editWindow != null)
7910	8034	{
	8035	+ editWindow.ctrlPanel.FlushUI();
7911	8036	editWindow.refreshContents();
7912	8037	} // ? new
7913	8038	objectUI = null;
..	..	@@ -7916,6 +8041,10 @@
7916	8041	{
7917	8042	editWindow = null;
7918	8043	} // ?
	8044	+ }
	8045	+ else
	8046	+ {
	8047	+ //editWindow.closeUI();
7919	8048	}
7920	8049	}
7921	8050
..	..	@@ -7928,7 +8057,7 @@
7928	8057	/transient/ cVector2[] projectedVertices = new cVector2[0];
7929	8058
7930	8059	Object3D /Composite/ parent;
7931		- Object3D /Composite/ fileparent;
	8060	+ Object3D /Composite/ fileparent; // In the case of FileObject
7932	8061
7933	8062	double[][] toParent; // dynamic matrix
7934	8063	double[][] fromParent;
..	..	@@ -8043,7 +8172,7 @@
8043	8172	{
8044	8173	assert(bRep != null);
8045	8174	if (!(support instanceof GenericJoint)) // support.bRep != null)
8046		- GrafreeD.Assert(support.bRep == bRep.support);
	8175	+ Grafreed.Assert(support.bRep == bRep.support);
8047	8176	}
8048	8177	else
8049	8178	{
..	..	@@ -8074,6 +8203,10 @@
8074	8203	}
8075	8204
8076	8205	transient ObjEditor editWindow;
	8206	+ transient ObjEditor manipWindow;
	8207	+
	8208	+ transient boolean pinned;
	8209	+
8077	8210	transient ObjectUI objectUI;
8078	8211	public static int povDepth = 0;
8079	8212	private static cVector tbMin = new cVector();
..	..	@@ -8092,9 +8225,9 @@
8092	8225	private static cVector edge2 = new cVector();
8093	8226	//private static cVector norm = new cVector();
8094	8227	/transient private/ int hitSomething;
8095		- private static final int hitCenter = 1;
8096		- private static final int hitScale = 2;
8097		- private static final int hitRotate = 3;
	8228	+ static final int hitCenter = 1;
	8229	+ static final int hitScale = 2;
	8230	+ static final int hitRotate = 3;
8098	8231	/transient/ /private/ int viewCode; // Now used for transparency cache flag
8099	8232	/transient/ private Point centerPt;
8100	8233	/transient/ private int startX;
..	..	@@ -8126,6 +8259,8 @@
8126	8259	{
8127	8260	Object3D targ = this;
8128	8261
	8262	+ targ.NORMALPUSH = obj.NORMALPUSH;
	8263	+
8129	8264	if (obj.material != null)
8130	8265	{
8131	8266	if ((mask&MATERIAL)!=0) // ==(COLOR\|MATERIAL))