~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,44 @@
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	+
	39	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
	40	+
22	41	ScriptNode scriptnode;
	42	+
	43	+ void InitOthers()
	44	+ {
	45	+ if (projectedVertices == null \|\| projectedVertices.length <= 2)
	46	+ {
	47	+ projectedVertices = new Object3D.cVector2[3];
	48	+ }
	49	+ for (int i = 0; i < 3; i++)
	50	+ {
	51	+ projectedVertices[i] = new cVector2(); // Others
	52	+ }
	53	+ projectedVertices[0].x = 100; // bump
	54	+ }
23	55
24	56	void MinMax(cVector minima, cVector maxima)
25	57	{
..	..	@@ -86,64 +118,201 @@
86	118
87	119	// transient boolean reduced; // for morph reduction
88	120
89		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
90		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	121	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	122	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
91	123
92		-transient Object3D transientsupport; // for cloning
93		-transient boolean transientlink2master;
	124	+ transient Object3D transientsupport; // for cloning
	125	+ transient boolean transientlink2master;
94	126
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)
	127	+ void SaveSupports()
107	128	{
108		- bRep.SaveSupports();
	129	+ if (blockloop)
	130	+ return;
	131	+
	132	+ transientsupport = support;
	133	+ transientlink2master = link2master;
	134	+
	135	+ support = null;
	136	+ link2master = false;
	137	+
	138	+ if (bRep != null)
	139	+ {
	140	+ bRep.SaveSupports();
	141	+ }
	142	+
	143	+ for (int i = 0; i < Size(); i++)
	144	+ {
	145	+ Object3D child = (Object3D) get(i);
	146	+ if (child == null)
	147	+ continue;
	148	+ blockloop = true;
	149	+ child.SaveSupports();
	150	+ blockloop = false;
	151	+ }
109	152	}
110		-
111		- for (int i = 0; i < Size(); i++)
	153	+
	154	+ void RestoreSupports()
112	155	{
113		- Object3D child = (Object3D) get(i);
114		- if (child == null)
115		- continue;
	156	+ if (blockloop)
	157	+ return;
	158	+
	159	+ support = transientsupport;
	160	+ link2master = transientlink2master;
	161	+ transientsupport = null;
	162	+ transientlink2master = false;
	163	+
	164	+ if (bRep != null)
	165	+ {
	166	+ bRep.RestoreSupports();
	167	+ }
	168	+
	169	+ for (int i = 0; i < Size(); i++)
	170	+ {
	171	+ Object3D child = (Object3D) get(i);
	172	+ if (child == null)
	173	+ continue;
	174	+ blockloop = true;
	175	+ child.RestoreSupports();
	176	+ blockloop = false;
	177	+ }
	178	+ }
	179	+
	180	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	181	+ {
	182	+ Object3D o;
	183	+
	184	+ if (hashtable.containsKey(GetUUID()))
	185	+ {
	186	+ o = hashtable.get(GetUUID());
	187	+
	188	+ Grafreed.Assert(this.bRep == o.bRep);
	189	+ //if (this.bRep != null)
	190	+ // assert(this.bRep.support == o.transientrep);
	191	+ if (this.support != null)
	192	+ assert(this.support.bRep == o.transientrep);
	193	+ }
	194	+ else
	195	+ {
	196	+ o = new Object3D("copy of " + this.name);
	197	+
	198	+ hashtable.put(GetUUID(), o);
	199	+ }
	200	+
	201	+ if (!blockloop)
	202	+ {
	203	+ blockloop = true;
	204	+
	205	+ for (int i=0; i<Size(); i++)
	206	+ {
	207	+ get(i).ExtractBigData(hashtable);
	208	+ }
	209	+
	210	+ blockloop = false;
	211	+ }
	212	+
	213	+ ExtractBigData(o);
	214	+ }
	215	+
	216	+ void ExtractBigData(Object3D o)
	217	+ {
	218	+ if (o.bRep != null)
	219	+ Grafreed.Assert(o.bRep == this.bRep);
	220	+
	221	+ o.bRep = this.bRep;
	222	+// July 2019 if (this.bRep != null)
	223	+// {
	224	+// o.transientrep = this.bRep.support;
	225	+// o.bRep.support = null;
	226	+// }
	227	+ o.selection = this.selection;
	228	+ o.versionlist = this.versionlist;
	229	+ o.versionindex = this.versionindex;
	230	+
	231	+ if (this.support != null)
	232	+ {
	233	+ if (o.transientrep != null)
	234	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	235	+
	236	+ o.transientrep = this.support.bRep;
	237	+ this.support.bRep = null;
	238	+ }
	239	+
	240	+ // o.support = this.support;
	241	+ // o.fileparent = this.fileparent;
	242	+ // if (this.bRep != null)
	243	+ // o.bRep = this.bRep.support;
	244	+
	245	+ this.bRep = null;
	246	+ // if (this.bRep != null)
	247	+ // this.bRep.support = null;
	248	+ // this.support = null;
	249	+ // this.fileparent = null;
	250	+ }
	251	+
	252	+// Object3D GetObject(java.util.UUID uuid)
	253	+// {
	254	+// if (this.uuid.equals(uuid))
	255	+// return this;
	256	+//
	257	+// if (blockloop)
	258	+// return null;
	259	+//
	260	+// blockloop = true;
	261	+//
	262	+// for (int i=0; i<Size(); i++)
	263	+// {
	264	+// Object3D o = get(i).GetObject(uuid);
	265	+//
	266	+// if (o != null)
	267	+// return o;
	268	+// }
	269	+//
	270	+// blockloop = false;
	271	+//
	272	+// return null;
	273	+// }
	274	+
	275	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	276	+ {
	277	+ if (!hashtable.containsKey(GetUUID()))
	278	+ return;
	279	+
	280	+ Object3D o = hashtable.get(GetUUID());
	281	+
	282	+ RestoreBigData(o);
	283	+
	284	+ if (blockloop)
	285	+ return;
	286	+
116	287	blockloop = true;
117		- child.SaveSupports();
	288	+
	289	+ //hashtable.remove(GetUUID());
	290	+
	291	+ for (int i=0; i<Size(); i++)
	292	+ {
	293	+ get(i).RestoreBigData(hashtable);
	294	+ }
	295	+
118	296	blockloop = false;
119	297	}
120		-}
121	298
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)
	299	+ void RestoreBigData(Object3D o)
133	300	{
134		- bRep.RestoreSupports();
	301	+ this.bRep = o.bRep;
	302	+ if (this.support != null && o.transientrep != null)
	303	+ {
	304	+ this.support.bRep = o.transientrep;
	305	+ }
	306	+
	307	+ this.selection = o.selection;
	308	+
	309	+ this.versionlist = o.versionlist;
	310	+ this.versionindex = o.versionindex;
	311	+// July 2019 if (this.bRep != null)
	312	+// this.bRep.support = o.transientrep;
	313	+ // this.support = o.support;
	314	+ // this.fileparent = o.fileparent;
135	315	}
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	316
148	317	// MOCAP SUPPORT
149	318	double tx,ty,tz,rx,ry,rz;
..	..	@@ -286,6 +455,8 @@
286	455	}
287	456
288	457	boolean live = false;
	458	+ transient boolean keepdontselect;
	459	+ boolean dontselect = false;
289	460	boolean hide = false;
290	461	boolean link2master = false; // performs reset support/master at each frame
291	462	boolean marked = false; // animation node
..	..	@@ -295,6 +466,8 @@
295	466	boolean random = false;
296	467	boolean speedup = false;
297	468	boolean rewind = false;
	469	+
	470	+ float NORMALPUSH = 0;
298	471
299	472	Object3D support;
300	473
..	..	@@ -415,16 +588,16 @@
415	588	{
416	589	Object3D copy = this;
417	590
418		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	591	+ Camera parentcam = Globals.theRenderer.ManipCamera();
419	592
420		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	593	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
421	594	{
422		- parentcam = CameraPane.theRenderer.cameras[1];
	595	+ parentcam = Globals.theRenderer.Cameras()[1];
423	596	}
424	597
425		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	598	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
426	599	{
427		- parentcam = CameraPane.theRenderer.cameras[0];
	600	+ parentcam = Globals.theRenderer.Cameras()[0];
428	601	}
429	602
430	603	if (this == parentcam)
..	..	@@ -432,7 +605,7 @@
432	605	//assert(this instanceof Camera);
433	606
434	607	for (int count = parentcam.GetTransformCount(); --count>=0;)
435		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	608	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
436	609	}
437	610
438	611	copy.marked ^= true;
..	..	@@ -452,7 +625,7 @@
452	625	//assert(this instanceof Camera);
453	626
454	627	for (int count = parentcam.GetTransformCount(); --count>=0;)
455		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	628	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
456	629	}
457	630
458	631	copy.Touch(); // display list issue
..	..	@@ -465,12 +638,14 @@
465	638	toParent = LA.newMatrix();
466	639	fromParent = LA.newMatrix();
467	640	}
	641	+
468	642	if (toParentMarked == null)
469	643	{
470	644	if (maxcount != 1)
471	645	{
472	646	new Exception().printStackTrace();
473	647	}
	648	+
474	649	toParentMarked = LA.newMatrix();
475	650	fromParentMarked = LA.newMatrix();
476	651	}
..	..	@@ -587,7 +762,7 @@
587	762	return;
588	763	}
589	764
590		- if (CameraPane.fromscript)
	765	+ if (Globals.fromscript)
591	766	{
592	767	transformcount = 0;
593	768	return;
..	..	@@ -745,7 +920,7 @@
745	920
746	921	int GetTransformCount()
747	922	{
748		- // marde pour serialization de Texture
	923	+ // patch pour serialization de Texture
749	924	resetmaxcount();
750	925	resettransformcount();
751	926	resetstep();
..	..	@@ -758,7 +933,7 @@
758	933	if (step == 0)
759	934	step = 1;
760	935	if (maxcount == 0)
761		- maxcount = 2048; // 4;
	936	+ maxcount = 128; // 2048; // 4;
762	937	// if (acceleration == 0)
763	938	// acceleration = 10;
764	939	if (delay == 0) // serial
..	..	@@ -779,9 +954,12 @@
779	954	// factor = CameraPane.STEP;
780	955	// }
781	956
782		- if (marked && CameraPane.isLIVE() && live && CameraPane.drawMode == CameraPane.SHADOW && currentframe != CameraPane.framecount)
	957	+ if (marked && Globals.isLIVE() && live &&
	958	+ //TEMP21aug2018
	959	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
	960	+ currentframe != Globals.framecount)
783	961	{
784		- currentframe = CameraPane.framecount;
	962	+ currentframe = Globals.framecount;
785	963
786	964	// System.err.println("transformcount = " + transformcount);
787	965	// System.err.println("factor = " + factor);
..	..	@@ -790,7 +968,8 @@
790	968
791	969	boolean changedir = random && Math.random() < 0.01; // && !link2master;
792	970
793		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	971	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	972	+ (step == 1 && changedir))
794	973	{
795	974	countdown = 1;
796	975	delay = speedup?8:1;
..	..	@@ -862,6 +1041,10 @@
862	1041	if (material == null \|\| material.multiply)
863	1042	return true;
864	1043
	1044	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1045	+ return false;
	1046	+
	1047	+ // Transparent objects are dynamic because we have to sort the triangles.
865	1048	return material.opacity > 0.99;
866	1049	}
867	1050
..	..	@@ -893,6 +1076,11 @@
893	1076	fromParent = null; // LA.newMatrix();
894	1077	bRep = null; // new BoundaryRep();
895	1078
	1079	+ if (oname != null && oname.equals("LeftHand"))
	1080	+ {
	1081	+ name = oname;
	1082	+ }
	1083	+
896	1084	/*
897	1085	float hue = (float)Math.random();
898	1086	Color col;
..	..	@@ -935,7 +1123,7 @@
935	1123
936	1124	public Object clone()
937	1125	{
938		- return GrafreeD.clone(this);
	1126	+ return Grafreed.clone(this);
939	1127	}
940	1128
941	1129	Object3D copyExpand()
..	..	@@ -1257,6 +1445,7 @@
1257	1445	toParent = LA.newMatrix();
1258	1446	fromParent = LA.newMatrix();
1259	1447	}
	1448	+
1260	1449	LA.matCopy(other.toParent, toParent);
1261	1450	LA.matCopy(other.fromParent, fromParent);
1262	1451
..	..	@@ -1451,7 +1640,7 @@
1451	1640	BoundaryRep.SEUIL = other.material.cameralight;
1452	1641
1453	1642	// Set default to 0.1
1454		- BoundaryRep.SEUIL /= 2;
	1643	+ BoundaryRep.SEUIL /= 4; // 2;
1455	1644	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1456	1645	}
1457	1646
..	..	@@ -1710,7 +1899,7 @@
1710	1899	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1711	1900	o.bRep = transientrep;
1712	1901	if (clone)
1713		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1902	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1714	1903	o.CreateMaterial();
1715	1904	o.SetAttributes(this, -1);
1716	1905	//parent
..	..	@@ -1723,7 +1912,7 @@
1723	1912	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1724	1913	o.bRep = bRep;
1725	1914	if (clone)
1726		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1915	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1727	1916	o.CreateMaterial();
1728	1917	//o.overwriteThis(this, -1);
1729	1918	o.SetAttributes(this, -1);
..	..	@@ -1810,12 +1999,15 @@
1810	1999	if (obj.name == null)
1811	2000	continue; // can't be a null one
1812	2001
	2002	+ // Try perfect match first.
1813	2003	if (n.equals(obj.name))
1814	2004	{
1815	2005	theobj = obj;
1816	2006	count++;
1817	2007	}
1818	2008	}
	2009	+
	2010	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1819	2011
1820	2012	if (count != 1)
1821	2013	for (int i=Size(); --i>=0;)
..	..	@@ -2130,15 +2322,8 @@
2130	2322	if (/parent != null &&/ material == null)
2131	2323	{
2132	2324	material = new cMaterial(GetMaterial());
2133		- if (projectedVertices == null \|\| projectedVertices.length <= 2)
2134		- {
2135		- projectedVertices = new Object3D.cVector2[3];
2136		- }
2137		- for (int i = 0; i < 3; i++)
2138		- {
2139		- projectedVertices[i] = new cVector2(); // Others
2140		- }
2141		- projectedVertices[0].x = 100; // bump
	2325	+
	2326	+ InitOthers();
2142	2327
2143	2328	if (this instanceof Camera)
2144	2329	{
..	..	@@ -2282,12 +2467,22 @@
2282	2467	}
2283	2468	*/
2284	2469	}
	2470	+ else
	2471	+ {
	2472	+ //((ObjEditor)editWindow).SetupUI2(null);
	2473	+ if (objectUI != null)
	2474	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2475	+ else
	2476	+ //new Exception().printStackTrace();
	2477	+ System.err.println("objectUI is null");
	2478	+ }
2285	2479	}
2286	2480
2287	2481	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2288	2482	{
2289	2483	if (newWindow)
2290	2484	{
	2485	+ new Exception().printStackTrace();
2291	2486	System.exit(0);
2292	2487	if (parent != null)
2293	2488	{
..	..	@@ -2322,6 +2517,14 @@
2322	2517	{
2323	2518	editWindow.refreshContents();
2324	2519	}
	2520	+ else
	2521	+ {
	2522	+ if (manipWindow != null)
	2523	+ {
	2524	+ manipWindow.refreshContents();
	2525	+ }
	2526	+ }
	2527	+
2325	2528	//if (parent != null)
2326	2529	//parent.refreshEditWindow();
2327	2530	}
..	..	@@ -2401,7 +2604,8 @@
2401	2604	private static final int editSelf = 1;
2402	2605	private static final int editChild = 2;
2403	2606
2404		- void drawEditHandles(ClickInfo info, int level)
	2607	+ void drawEditHandles(//ClickInfo info,
	2608	+ int level)
2405	2609	{
2406	2610	if (level == 0)
2407	2611	{
..	..	@@ -2409,7 +2613,8 @@
2409	2613	return;
2410	2614
2411	2615	Object3D selectee;
2412		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2616	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2617	+ level + 1))
2413	2618	{
2414	2619	selectee = (Object3D) e.nextElement();
2415	2620	}
..	..	@@ -2417,19 +2622,22 @@
2417	2622	} else
2418	2623	{
2419	2624	//super.
2420		- drawEditHandles0(info, level + 1);
	2625	+ drawEditHandles0(//info,
	2626	+ level + 1);
2421	2627	}
2422	2628	}
2423	2629
2424		- boolean doEditClick(ClickInfo info, int level)
	2630	+ boolean doEditClick(//ClickInfo info,
	2631	+ int level)
2425	2632	{
2426	2633	doSomething = 0;
2427	2634	if (level == 0)
2428	2635	{
2429		- return doParentClick(info);
	2636	+ return doParentClick(); //info);
2430	2637	}
2431	2638	if (//super.
2432		- doEditClick0(info, level))
	2639	+ doEditClick0(//info,
	2640	+ level))
2433	2641	{
2434	2642	doSomething = 1;
2435	2643	return true;
..	..	@@ -2439,7 +2647,7 @@
2439	2647	}
2440	2648	}
2441	2649
2442		- boolean doParentClick(ClickInfo info)
	2650	+ boolean doParentClick() //ClickInfo info)
2443	2651	{
2444	2652	if (selection == null)
2445	2653	{
..	..	@@ -2452,7 +2660,8 @@
2452	2660	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2453	2661	{
2454	2662	Object3D selectee = (Object3D) e.nextElement();
2455		- if (selectee.doEditClick(info, 1))
	2663	+ if (selectee.doEditClick(//info,
	2664	+ 1))
2456	2665	{
2457	2666	childToDrag = selectee;
2458	2667	doSomething = 2;
..	..	@@ -2464,13 +2673,15 @@
2464	2673	return retval;
2465	2674	}
2466	2675
2467		- void doEditDrag(ClickInfo info)
	2676	+ void doEditDrag(//ClickInfo clickInfo,
	2677	+ boolean opposite)
2468	2678	{
2469	2679	switch (doSomething)
2470	2680	{
2471	2681	case 1: // '\001'
2472	2682	//super.
2473		- doEditDrag0(info);
	2683	+ doEditDrag0(//clickInfo,
	2684	+ opposite);
2474	2685	break;
2475	2686
2476	2687	case 2: // '\002'
..	..	@@ -2483,11 +2694,13 @@
2483	2694	{
2484	2695	//sel.hitSomething = childToDrag.hitSomething;
2485	2696	//childToDrag.doEditDrag(info);
2486		- sel.doEditDrag(info);
	2697	+ sel.doEditDrag(//clickInfo,
	2698	+ opposite);
2487	2699	} else
2488	2700	{
2489	2701	//super.
2490		- doEditDrag0(info);
	2702	+ doEditDrag0(//clickInfo,
	2703	+ opposite);
2491	2704	}
2492	2705	}
2493	2706	break;
..	..	@@ -2505,6 +2718,9 @@
2505	2718	{
2506	2719	deselectAll();
2507	2720	}
	2721	+
	2722	+ new Exception().printStackTrace();
	2723	+
2508	2724	ClickInfo newInfo = new ClickInfo();
2509	2725	newInfo.flags = info.flags;
2510	2726	newInfo.bounds = info.bounds;
..	..	@@ -2597,6 +2813,18 @@
2597	2813	void GenNormalsS(boolean crease)
2598	2814	{
2599	2815	selection.GenNormals(crease);
	2816	+// for (int i=0; i<selection.size(); i++)
	2817	+// {
	2818	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2819	+// selectee.GenNormals(crease);
	2820	+// }
	2821	+
	2822	+ //Touch();
	2823	+ }
	2824	+
	2825	+ void GenNormalsMeshS()
	2826	+ {
	2827	+ selection.GenNormalsMesh();
2600	2828	// for (int i=0; i<selection.size(); i++)
2601	2829	// {
2602	2830	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2737,6 +2965,24 @@
2737	2965	if (child == null)
2738	2966	continue;
2739	2967	child.GenNormals(crease);
	2968	+// Children().release(i);
	2969	+ }
	2970	+ blockloop = false;
	2971	+ }
	2972	+
	2973	+ void GenNormalsMesh()
	2974	+ {
	2975	+ if (blockloop)
	2976	+ return;
	2977	+
	2978	+ blockloop = true;
	2979	+ GenNormalsMesh0();
	2980	+ for (int i = 0; i < Children().Size(); i++)
	2981	+ {
	2982	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2983	+ if (child == null)
	2984	+ continue;
	2985	+ child.GenNormalsMesh();
2740	2986	// Children().release(i);
2741	2987	}
2742	2988	blockloop = false;
..	..	@@ -2894,7 +3140,8 @@
2894	3140	{
2895	3141	if (bRep != null)
2896	3142	{
2897		- bRep.GenUV();
	3143	+ bRep.GenUV(); //1);
	3144	+ //bRep.UnfoldUV();
2898	3145	Touch();
2899	3146	}
2900	3147	}
..	..	@@ -2908,11 +3155,20 @@
2908	3155	}
2909	3156	}
2910	3157
	3158	+ void GenNormalsMesh0()
	3159	+ {
	3160	+ if (bRep != null)
	3161	+ {
	3162	+ bRep.GenerateNormalsMesh();
	3163	+ Touch();
	3164	+ }
	3165	+ }
	3166	+
2911	3167	void GenNormalsMINE0()
2912	3168	{
2913	3169	if (bRep != null)
2914	3170	{
2915		- bRep.GenerateNormalsMINE();
	3171	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2916	3172	Touch();
2917	3173	}
2918	3174	}
..	..	@@ -2969,6 +3225,33 @@
2969	3225	blockloop = false;
2970	3226	}
2971	3227
	3228	+ void TransformChildren()
	3229	+ {
	3230	+ if (toParent != null)
	3231	+ {
	3232	+ for (int i=Size(); --i>=0;)
	3233	+ {
	3234	+ Object3D v = get(i);
	3235	+
	3236	+ if (v.toParent == null)
	3237	+ {
	3238	+ v.toParent = LA.newMatrix();
	3239	+ v.fromParent = LA.newMatrix();
	3240	+ }
	3241	+
	3242	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3243	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3244	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3245	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3246	+ }
	3247	+
	3248	+ toParent = null; // LA.matIdentity(toParent);
	3249	+ fromParent = null; // LA.matIdentity(fromParent);
	3250	+
	3251	+ Touch();
	3252	+ }
	3253	+ }
	3254	+
2972	3255	void TransformGeometry()
2973	3256	{
2974	3257	Object3D obj = this;
..	..	@@ -3190,9 +3473,11 @@
3190	3473
3191	3474	BoundaryRep sup = bRep.support;
3192	3475	bRep.support = null;
3193		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3476	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3194	3477	// bRep.SplitInTwo(onlyone); // thread...
3195		- temprep.SplitInTwo(reduction34, onlyone);
	3478	+
	3479	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3480	+
3196	3481	bRep = temprep;
3197	3482	bRep.support = sup;
3198	3483	Touch();
..	..	@@ -3329,7 +3614,8 @@
3329	3614	if (blockloop)
3330	3615	return;
3331	3616
3332		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3617	+ if (//marked \|\| // does not make sense
	3618	+ (bRep != null \|\| material != null)) // borderline...
3333	3619	live = h;
3334	3620
3335	3621	for (int i = 0; i < Size(); i++)
..	..	@@ -3350,7 +3636,8 @@
3350	3636	return;
3351	3637
3352	3638	//if (bRep != null)
3353		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3639	+ if (//marked \|\| // does not make sense
	3640	+ (bRep != null \|\| material != null)) // borderline...
3354	3641	link2master = h;
3355	3642
3356	3643	for (int i = 0; i < Size(); i++)
..	..	@@ -3370,7 +3657,8 @@
3370	3657	if (blockloop)
3371	3658	return;
3372	3659
3373		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3660	+ if (//marked \|\| // does not make sense
	3661	+ (bRep != null \|\| material != null)) // borderline...
3374	3662	hide = h;
3375	3663
3376	3664	for (int i = 0; i < Size(); i++)
..	..	@@ -3390,7 +3678,7 @@
3390	3678	if (blockloop)
3391	3679	return;
3392	3680
3393		- if (bRep != null && material != null) // borderline...
	3681	+ if (bRep != null \|\| material != null) // borderline...
3394	3682	marked = h;
3395	3683
3396	3684	for (int i = 0; i < Size(); i++)
..	..	@@ -3400,6 +3688,46 @@
3400	3688	continue;
3401	3689	blockloop = true;
3402	3690	child.MarkLeaves(h);
	3691	+ blockloop = false;
	3692	+ // release(i);
	3693	+ }
	3694	+ }
	3695	+
	3696	+ void RewindLeaves(boolean h)
	3697	+ {
	3698	+ if (blockloop)
	3699	+ return;
	3700	+
	3701	+ if (bRep != null \|\| material != null) // borderline...
	3702	+ rewind = h;
	3703	+
	3704	+ for (int i = 0; i < Size(); i++)
	3705	+ {
	3706	+ Object3D child = (Object3D) get(i); // reserve(i);
	3707	+ if (child == null)
	3708	+ continue;
	3709	+ blockloop = true;
	3710	+ child.RewindLeaves(h);
	3711	+ blockloop = false;
	3712	+ // release(i);
	3713	+ }
	3714	+ }
	3715	+
	3716	+ void RandomLeaves(boolean h)
	3717	+ {
	3718	+ if (blockloop)
	3719	+ return;
	3720	+
	3721	+ if (bRep != null \|\| material != null) // borderline...
	3722	+ random = h;
	3723	+
	3724	+ for (int i = 0; i < Size(); i++)
	3725	+ {
	3726	+ Object3D child = (Object3D) get(i); // reserve(i);
	3727	+ if (child == null)
	3728	+ continue;
	3729	+ blockloop = true;
	3730	+ child.RandomLeaves(h);
3403	3731	blockloop = false;
3404	3732	// release(i);
3405	3733	}
..	..	@@ -3714,7 +4042,7 @@
3714	4042	if (child == null)
3715	4043	continue;
3716	4044
3717		- if (GrafreeD.RENDERME > 0)
	4045	+ if (Grafreed.RENDERME > 0)
3718	4046	{
3719	4047	if (child instanceof Merge)
3720	4048	((Merge)child).renderme();
..	..	@@ -3865,7 +4193,7 @@
3865	4193	if (child == null)
3866	4194	continue;
3867	4195
3868		- if (GrafreeD.RENDERME > 0)
	4196	+ if (Grafreed.RENDERME > 0)
3869	4197	{
3870	4198	if (child instanceof Merge)
3871	4199	((Merge)child).renderme();
..	..	@@ -4060,7 +4388,7 @@
4060	4388	if (child == null)
4061	4389	continue;
4062	4390
4063		- if (GrafreeD.RENDERME > 0)
	4391	+ if (Grafreed.RENDERME > 0)
4064	4392	{
4065	4393	if (child instanceof Merge)
4066	4394	((Merge)child).renderme();
..	..	@@ -4157,6 +4485,71 @@
4157	4485	}
4158	4486	blockloop = true;
4159	4487	get(i).RepairParent();
	4488	+ blockloop = false;
	4489	+ }
	4490	+ }
	4491	+
	4492	+ void RepairShadow()
	4493	+ {
	4494	+ if (blockloop)
	4495	+ return;
	4496	+
	4497	+ if (this.material != null)
	4498	+ this.InitOthers();
	4499	+
	4500	+ for (int i=0; i<Size(); i++)
	4501	+ {
	4502	+ blockloop = true;
	4503	+ get(i).RepairShadow();
	4504	+ blockloop = false;
	4505	+ }
	4506	+ }
	4507	+
	4508	+ void RepairSOV()
	4509	+ {
	4510	+ if (blockloop)
	4511	+ return;
	4512	+
	4513	+ String texname = this.GetPigmentTexture();
	4514	+
	4515	+ if (texname.startsWith("sov"))
	4516	+ {
	4517	+ String[] s = texname.split("/");
	4518	+
	4519	+ String[] sname = s[1].split("Color.pn");
	4520	+
	4521	+ texname = sname[0];
	4522	+
	4523	+ if (sname.length > 1)
	4524	+ {
	4525	+ texname += "Color.jpg";
	4526	+ }
	4527	+
	4528	+ this.SetPigmentTexture("sov/" + texname);
	4529	+ }
	4530	+
	4531	+ texname = this.GetBumpTexture();
	4532	+
	4533	+ if (texname.startsWith("sov"))
	4534	+ {
	4535	+ String[] s = texname.split("/");
	4536	+
	4537	+ String[] sname = s[1].split("Bump.pn");
	4538	+
	4539	+ texname = sname[0];
	4540	+
	4541	+ if (sname.length > 1)
	4542	+ {
	4543	+ texname += "Bump.jpg";
	4544	+ }
	4545	+
	4546	+ this.SetBumpTexture("sov/" + texname);
	4547	+ }
	4548	+
	4549	+ for (int i=0; i<Size(); i++)
	4550	+ {
	4551	+ blockloop = true;
	4552	+ get(i).RepairSOV();
4160	4553	blockloop = false;
4161	4554	}
4162	4555	}
..	..	@@ -4651,7 +5044,7 @@
4651	5044
4652	5045	cTreePath SelectLeaf(int indexcount, boolean deselect)
4653	5046	{
4654		- if (hide)
	5047	+ if (hide \|\| dontselect)
4655	5048	return null;
4656	5049
4657	5050	if (count <= 0)
..	..	@@ -4675,9 +5068,17 @@
4675	5068	}
4676	5069	}
4677	5070
	5071	+ ObjEditor GetWindow()
	5072	+ {
	5073	+ if (editWindow != null)
	5074	+ return editWindow;
	5075	+
	5076	+ return manipWindow;
	5077	+ }
	5078	+
4678	5079	cTreePath Select(int indexcount, boolean deselect)
4679	5080	{
4680		- if (hide)
	5081	+ if (hide \|\| dontselect)
4681	5082	return null;
4682	5083
4683	5084	if (count <= 0)
..	..	@@ -4711,10 +5112,11 @@
4711	5112	if (leaf != null)
4712	5113	{
4713	5114	cTreePath tp = new cTreePath(this, leaf);
4714		- if (editWindow != null)
	5115	+ ObjEditor window = GetWindow();
	5116	+ if (window != null)
4715	5117	{
4716	5118	//System.out.println("editWindow = " + editWindow + " vs " + this);
4717		- editWindow.Select(tp, deselect, true);
	5119	+ window.Select(tp, deselect, true);
4718	5120	}
4719	5121
4720	5122	return tp;
..	..	@@ -4731,6 +5133,7 @@
4731	5133
4732	5134	if (child == null)
4733	5135	continue;
	5136	+
4734	5137	if (child.HasTransparency() && child.size() != 0)
4735	5138	{
4736	5139	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4740,9 +5143,10 @@
4740	5143	if (leaf != null)
4741	5144	{
4742	5145	cTreePath tp = new cTreePath(this, leaf);
4743		- if (editWindow != null)
	5146	+ ObjEditor window = GetWindow();
	5147	+ if (window != null)
4744	5148	{
4745		- editWindow.Select(tp, deselect, true);
	5149	+ window.Select(tp, deselect, true);
4746	5150	}
4747	5151
4748	5152	return tp;
..	..	@@ -4827,7 +5231,7 @@
4827	5231	return globalTransform;
4828	5232	}
4829	5233
4830		- void PreprocessOcclusion(CameraPane cp)
	5234	+ void PreprocessOcclusion(iCameraPane cp)
4831	5235	{
4832	5236	/*
4833	5237	if (AOdone)
..	..	@@ -4974,7 +5378,8 @@
4974	5378	} else //
4975	5379	if (editWindow != null)
4976	5380	{
4977		- editWindow.cameraView.lighttouched = true;
	5381	+ //editWindow.cameraView.lighttouched = true;
	5382	+ Globals.lighttouched = true;
4978	5383	}
4979	5384	}
4980	5385
..	..	@@ -5066,6 +5471,51 @@
5066	5471	blockloop = false;
5067	5472	}
5068	5473
	5474	+ void ResetSelectable()
	5475	+ {
	5476	+ if (blockloop)
	5477	+ return;
	5478	+
	5479	+ blockloop = true;
	5480	+
	5481	+ keepdontselect = dontselect;
	5482	+ dontselect = true;
	5483	+
	5484	+ Object3D child;
	5485	+ int nb = Size();
	5486	+ for (int i = 0; i < nb; i++)
	5487	+ {
	5488	+ child = (Object3D) get(i);
	5489	+ if (child == null)
	5490	+ continue;
	5491	+ child.ResetSelectable();
	5492	+ }
	5493	+
	5494	+ blockloop = false;
	5495	+ }
	5496	+
	5497	+ void RestoreSelectable()
	5498	+ {
	5499	+ if (blockloop)
	5500	+ return;
	5501	+
	5502	+ blockloop = true;
	5503	+
	5504	+ dontselect = keepdontselect;
	5505	+
	5506	+ Object3D child;
	5507	+ int nb = Size();
	5508	+ for (int i = 0; i < nb; i++)
	5509	+ {
	5510	+ child = (Object3D) get(i);
	5511	+ if (child == null)
	5512	+ continue;
	5513	+ child.RestoreSelectable();
	5514	+ }
	5515	+
	5516	+ blockloop = false;
	5517	+ }
	5518	+
5069	5519	boolean IsSelected()
5070	5520	{
5071	5521	if (parent == null)
..	..	@@ -5126,12 +5576,41 @@
5126	5576	if (fullname == null)
5127	5577	return "";
5128	5578
	5579	+ if (fullname.pigment != null)
	5580	+ {
	5581	+ return fullname.pigment;
	5582	+ }
	5583	+
5129	5584	// System.out.println("Fullname = " + fullname);
5130	5585
5131		- if (fullname.name.indexOf(":") == -1)
5132		- return fullname.name;
	5586	+ // Does not work on Windows due to C:
	5587	+// if (fullname.name.indexOf(":") == -1)
	5588	+// return fullname.name;
	5589	+//
	5590	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5133	5591
5134		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5592	+ String[] split = fullname.name.split(":");
	5593	+
	5594	+ if (split.length == 0)
	5595	+ {
	5596	+ return fullname.pigment = "";
	5597	+ }
	5598	+
	5599	+ if (split.length <= 2)
	5600	+ {
	5601	+ if (fullname.name.endsWith(":"))
	5602	+ {
	5603	+ // Windows
	5604	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
	5605	+ }
	5606	+
	5607	+ return fullname.pigment = split[0];
	5608	+ }
	5609	+
	5610	+ // Windows
	5611	+ assert(split.length == 4);
	5612	+
	5613	+ return fullname.pigment = split[0] + ":" + split[1];
5135	5614	}
5136	5615
5137	5616	static String GetBump(cTexture fullname)
..	..	@@ -5139,11 +5618,44 @@
5139	5618	if (fullname == null)
5140	5619	return "";
5141	5620
	5621	+ if (fullname.bump != null)
	5622	+ {
	5623	+ return fullname.bump;
	5624	+ }
	5625	+
5142	5626	// System.out.println("Fullname = " + fullname);
5143		- if (fullname.name.indexOf(":") == -1)
5144		- return "";
5145		-
5146		- return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5627	+ // Does not work on Windows due to C:
	5628	+// if (fullname.name.indexOf(":") == -1)
	5629	+// return "";
	5630	+//
	5631	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5632	+ String[] split = fullname.name.split(":");
	5633	+
	5634	+ if (split.length == 0)
	5635	+ {
	5636	+ return fullname.bump = "";
	5637	+ }
	5638	+
	5639	+ if (split.length == 1)
	5640	+ {
	5641	+ return fullname.bump = "";
	5642	+ }
	5643	+
	5644	+ if (split.length == 2)
	5645	+ {
	5646	+ if (fullname.name.endsWith(":"))
	5647	+ {
	5648	+ // Windows
	5649	+ return fullname.bump = "";
	5650	+ }
	5651	+
	5652	+ return fullname.bump = split[1];
	5653	+ }
	5654	+
	5655	+ // Windows
	5656	+ assert(split.length == 4);
	5657	+
	5658	+ return fullname.bump = split[2] + ":" + split[3];
5147	5659	}
5148	5660
5149	5661	String GetPigmentTexture()
..	..	@@ -5217,7 +5729,7 @@
5217	5729	System.out.print("; textures = " + textures);
5218	5730	System.out.println("; usedtextures = " + usedtextures);
5219	5731
5220		- if (GetTextures() == null)
	5732	+ if (GetTextures() == null) // What is that??
5221	5733	GetTextures().name = ":";
5222	5734
5223	5735	String texname = tex;
..	..	@@ -5226,6 +5738,9 @@
5226	5738	texname = "";
5227	5739
5228	5740	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5741	+
	5742	+ GetTextures().pigment = null;
	5743	+
5229	5744	Touch();
5230	5745	}
5231	5746
..	..	@@ -5250,6 +5765,43 @@
5250	5765	}
5251	5766	}
5252	5767
	5768	+ UUID GetUUID()
	5769	+ {
	5770	+ if (uuid == null)
	5771	+ {
	5772	+ // Serial
	5773	+ uuid = UUID.randomUUID();
	5774	+ }
	5775	+
	5776	+ return uuid;
	5777	+ }
	5778	+
	5779	+ Object3D GetObject(UUID uid)
	5780	+ {
	5781	+ if (blockloop)
	5782	+ return null;
	5783	+
	5784	+ if (GetUUID().equals(uid))
	5785	+ return this;
	5786	+
	5787	+ int nb = Size();
	5788	+ for (int i = 0; i < nb; i++)
	5789	+ {
	5790	+ Object3D child = (Object3D) get(i);
	5791	+
	5792	+ if (child == null)
	5793	+ continue;
	5794	+
	5795	+ blockloop = true;
	5796	+ Object3D obj = child.GetObject(uid);
	5797	+ blockloop = false;
	5798	+ if (obj != null)
	5799	+ return obj;
	5800	+ }
	5801	+
	5802	+ return null;
	5803	+ }
	5804	+
5253	5805	void SetBumpTexture(String tex)
5254	5806	{
5255	5807	if (GetTextures() == null)
..	..	@@ -5261,6 +5813,8 @@
5261	5813	texname = "";
5262	5814
5263	5815	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
	5816	+
	5817	+ GetTextures().bump = null;
5264	5818
5265	5819	Touch();
5266	5820	}
..	..	@@ -5286,25 +5840,65 @@
5286	5840	}
5287	5841	}
5288	5842
5289		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5843	+ void EmbedTextures(boolean embed)
	5844	+ {
	5845	+ if (blockloop)
	5846	+ return;
	5847	+
	5848	+ //if (GetTextures() != null)
	5849	+ if (embed)
	5850	+ CameraPane.EmbedTextures(GetTextures());
	5851	+ else
	5852	+ {
	5853	+ GetTextures().pigmentdata = null;
	5854	+ GetTextures().bumpdata = null;
	5855	+ GetTextures().pw = 0;
	5856	+ GetTextures().ph = 0;
	5857	+ GetTextures().bw = 0;
	5858	+ GetTextures().bh = 0;
	5859	+ }
	5860	+
	5861	+ int nb = Size();
	5862	+ for (int i = 0; i < nb; i++)
	5863	+ {
	5864	+ Object3D child = (Object3D) get(i);
	5865	+
	5866	+ if (child == null)
	5867	+ continue;
	5868	+
	5869	+ blockloop = true;
	5870	+ child.EmbedTextures(embed);
	5871	+ blockloop = false;
	5872	+ }
	5873	+ }
	5874	+
	5875	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5290	5876	{
5291	5877	Draw(display, root, selected, blocked);
5292	5878	}
5293	5879
5294		- static cMaterial[] materialstack = new cMaterial[65536];
5295		- static boolean[] selectedstack = new boolean[65536];
5296		- static int materialdepth = 0;
5297		-
5298	5880	boolean NeedSupport()
5299	5881	{
5300	5882	return
5301		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5883	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5302	5884	// PROBLEM with CROWD!!
5303		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	5885	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5304	5886	}
5305	5887
	5888	+ static boolean DEBUG_SELECTION = false;
5306	5889
5307		- void Draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5890	+ boolean IsLive()
	5891	+ {
	5892	+ if (live)
	5893	+ return true;
	5894	+
	5895	+ if (parent == null)
	5896	+ return false;
	5897	+
	5898	+ return parent.IsLive();
	5899	+ }
	5900	+
	5901	+ void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5308	5902	{
5309	5903	Invariants(); // june 2013
5310	5904
..	..	@@ -5313,8 +5907,8 @@
5313	5907	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5314	5908	}
5315	5909
5316		- if (display.drawMode == CameraPane.SELECTION &&
5317		- hide)
	5910	+ if (display.DrawMode() == iCameraPane.SELECTION &&
	5911	+ (hide \|\| dontselect))
5318	5912	return;
5319	5913
5320	5914	if (name != null && name.contains("sclera"))
..	..	@@ -5332,7 +5926,7 @@
5332	5926	if (this instanceof Checker)
5333	5927	return;
5334	5928
5335		- if (display.drawMode == display.SHADOW && PASSTEST)
	5929	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5336	5930	return;
5337	5931
5338	5932	if (count <= 0)
..	..	@@ -5340,13 +5934,13 @@
5340	5934	return;
5341	5935	}
5342	5936
5343		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5344		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5937	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	5938	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5345	5939	{
5346	5940	return;
5347	5941	}
5348	5942
5349		- javax.media.opengl.GL gl = display.GetGL();
	5943	+ //javax.media.opengl.GL gl = display.GetGL();
5350	5944
5351	5945	/*
5352	5946	if (touched)
..	..	@@ -5364,8 +5958,10 @@
5364	5958	if (support != null)
5365	5959	support = support;
5366	5960
5367		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5368		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5961	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5962	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5963	+
	5964	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5369	5965
5370	5966	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5371	5967	{
..	..	@@ -5375,30 +5971,33 @@
5375	5971	// usecalllists &= !(parent instanceof RandomNode);
5376	5972	// usecalllists = false;
5377	5973
5378		- if (GetBRep() != null)
5379		- usecalllists = usecalllists;
	5974	+ if (display.DrawMode() == display.SHADOW)
	5975	+ //GetBRep() != null)
	5976	+ usecalllists = !!usecalllists;
5380	5977	//System.out.println("draw " + this);
5381	5978	//new Exception().printStackTrace();
5382	5979
5383	5980	boolean compiled = false;
5384	5981
5385		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5982	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5386	5983
5387		- if (!selectmode && //display.drawMode != display.SELECTION &&
5388		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5984	+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
	5985	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5986	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5389	5987	{
5390		- display.lighttouched = true;
	5988	+ Globals.lighttouched = true;
5391	5989	} // all panes...
5392		- //if (usecalllists && display.drawMode != display.SELECTION && display.drawMode != display.SHADOW &&
5393		- if (bRep != null && usecalllists && !selectmode && // june 2013 display.drawMode != display.SHADOW &&
	5990	+
	5991	+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
	5992	+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5394	5993	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5395	5994	{
5396	5995	if (!(this instanceof Composite))
5397	5996	touched = false;
5398	5997	//if (displaylist == -1 && usecalllists)
5399		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5998	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5400	5999	{
5401		- bRep.displaylist = gl.glGenLists(1);
	6000	+ bRep.displaylist = display.GenList();
5402	6001	assert(bRep.displaylist != 0);
5403	6002	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5404	6003	//System.out.println("\tgen list " + list);
..	..	@@ -5407,21 +6006,23 @@
5407	6006
5408	6007	//System.out.println("\tnew list " + list);
5409	6008	//gl.glDrawBuffer(gl.GL_NONE);
5410		- if (usecalllists)
	6009	+ if (usecalllists && bRep.displaylist > 0)
5411	6010	{
5412	6011	// System.err.println("new list " + bRep.displaylist + " for " + this);
5413		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	6012	+ display.NewList(bRep.displaylist);
5414	6013	}
	6014	+
5415	6015	CallList(display, root, selected, blocked);
	6016	+
5416	6017	// compiled = true;
5417		- if (usecalllists)
	6018	+ if (usecalllists && bRep.displaylist > 0)
5418	6019	{
5419	6020	// System.err.println("end list " + bRep.displaylist + " for " + this);
5420		- gl.glEndList();
	6021	+ display.EndList();
5421	6022	}
5422	6023	//gl.glDrawBuffer(gl.GL_BACK);
5423	6024	// XXX touched = false;
5424		- display.lighttouched = true; // all panes...
	6025	+ Globals.lighttouched = true; // all panes...
5425	6026	}
5426	6027
5427	6028	touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
..	..	@@ -5460,12 +6061,12 @@
5460	6061
5461	6062	// frustum culling
5462	6063	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5463		- && display.drawMode != CameraPane.SELECTION)
	6064	+ && display.DrawMode() != iCameraPane.SELECTION)
5464	6065	{
5465		- if (display.drawMode == CameraPane.SHADOW)
	6066	+ if (display.DrawMode() == iCameraPane.SHADOW)
5466	6067	{
5467	6068	if (!link2master // tricky to cull in shadow mode.
5468		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	6069	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5469	6070	{
5470	6071	//System.out.print("CULLED");
5471	6072	culled = true;
..	..	@@ -5473,7 +6074,7 @@
5473	6074	}
5474	6075	else
5475	6076	//GetBRep().getBounds(v0, v1, this);
5476		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	6077	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5477	6078	culled = true;
5478	6079
5479	6080	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5509,11 +6110,12 @@
5509	6110
5510	6111
5511	6112	if (!culled)
5512		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	6113	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5513	6114	{
5514	6115	if (GetBRep() != null)
5515	6116	{
5516		- CameraPane.NextIndex(this, gl);
	6117	+ display.NextIndex();
	6118	+
5517	6119	// vertex color conflict : gl.glCallList(list);
5518	6120	DrawNode(display, root, selected);
5519	6121	if (this instanceof BezierPatch)
..	..	@@ -5535,55 +6137,7 @@
5535	6137	color[2] /= 2;
5536	6138	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5537	6139	*/
5538		- if (material != null)
5539		- {
5540		- materialstack[materialdepth] = material;
5541		- selectedstack[materialdepth] = selected;
5542		- cStatic.objectstack[materialdepth++] = this;
5543		- //System.out.println("material " + material);
5544		- //Applet3D.tracein(this, selected);
5545		- display.vector2buffer = projectedVertices;
5546		- if (this instanceof Camera)
5547		- {
5548		- display.options1[0] = material.shift;
5549		- //System.out.println("shift " + material.shift);
5550		- display.options1[1] = material.lightarea;
5551		- display.options1[2] = material.shadowbias;
5552		- display.options1[3] = material.aniso;
5553		- display.options1[4] = material.anisoV;
5554		- display.options2[0] = material.opacity;
5555		- display.options2[1] = material.diffuse;
5556		- display.options2[2] = material.factor;
5557		-
5558		- cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
5559		- display.options4[0] = material.cameralight/0.2f;
5560		- display.options4[1] = material.subsurface;
5561		- display.options4[2] = material.sheen;
5562		-
5563		- // if (display.CURRENTANTIALIAS > 0)
5564		- // display.options3[3] /= 4;
5565		-
5566		- /*
5567		- System.out.println("Focus = " + display.options1[0]);
5568		- System.out.println("Aperture = " + display.options1[1]);
5569		- System.out.println("ShadowBlur = " + display.options1[2]);
5570		- System.out.println("Antialiasing = " + display.options1[3]);
5571		- System.out.println("Fog = " + display.options2[0]);
5572		- System.out.println("Intensity = " + display.options2[1]);
5573		- System.out.println("Elevation = " + display.options2[2]);
5574		- /**/
5575		- } else
5576		- {
5577		- material.Draw(display, selected);
5578		- }
5579		- } else
5580		- {
5581		- if (selected && CameraPane.flash)
5582		- {
5583		- display.modelParams4[1] = 100;
5584		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5585		- }
5586		- }
	6140	+ display.PushMaterial(this, selected);
5587	6141
5588	6142	//System.out.println("call list " + list);
5589	6143	//System.out.println();
..	..	@@ -5602,7 +6156,28 @@
5602	6156	tex = GetTextures();
5603	6157	}
5604	6158
5605		- display.BindTextures(tex, texres);
	6159	+ boolean failedPigment = false;
	6160	+ boolean failedBump = false;
	6161	+
	6162	+ try
	6163	+ {
	6164	+ display.BindPigmentTexture(tex, texres);
	6165	+ }
	6166	+ catch (Exception e)
	6167	+ {
	6168	+ System.err.println("FAILED: " + this);
	6169	+ failedPigment = true;
	6170	+ }
	6171	+
	6172	+ try
	6173	+ {
	6174	+ display.BindBumpTexture(tex, texres);
	6175	+ }
	6176	+ catch (Exception e)
	6177	+ {
	6178	+ //System.err.println("FAILED: " + this);
	6179	+ failedBump = true;
	6180	+ }
5606	6181
5607	6182	if (!compiled)
5608	6183	{
..	..	@@ -5618,30 +6193,19 @@
5618	6193
5619	6194	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5620	6195	assert(bRep.displaylist != 0);
5621		- gl.glCallList(bRep.displaylist);
	6196	+ display.CallList(bRep.displaylist);
5622	6197	// june 2013 drawSelf(display, root, selected);
5623	6198	}
5624	6199	}
5625	6200	}
5626	6201
5627		- display.ReleaseTextures(tex);
5628		-
5629		- //if (parent != null && parent.GetMaterial() != null)
5630		- // parent.GetMaterial().Draw(display, parent.IsSelected(this));
5631		- if (material != null)
5632		- {
5633		- materialdepth -= 1;
5634		- if (materialdepth > 0)
5635		- {
5636		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5637		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5638		- }
5639		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5640		- } else if (selected && CameraPane.flash && GetMaterial() != null)
5641		- {
5642		- display.modelParams4[1] = GetMaterial().cameralight;
5643		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5644		- }
	6202	+ if (!failedBump)
	6203	+ display.ReleaseBumpTexture(tex);
	6204	+
	6205	+ if (!failedPigment)
	6206	+ display.ReleasePigmentTexture(tex);
	6207	+
	6208	+ display.PopMaterial(this, selected);
5645	6209	}
5646	6210
5647	6211	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5683,7 +6247,7 @@
5683	6247	// resetMasterNode();
5684	6248	}
5685	6249
5686		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6250	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5687	6251	{
5688	6252	if (GetBRep() == null)
5689	6253	{
..	..	@@ -5766,8 +6330,11 @@
5766	6330	boolean flipV = false; // true;
5767	6331	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5768	6332
5769		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6333	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5770	6334	{
	6335	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6336	+ return;
	6337	+
5771	6338	if (hide)
5772	6339	return;
5773	6340	// shadow optimisation
..	..	@@ -5825,16 +6392,7 @@
5825	6392	// // ??????????????????????????? Touch();
5826	6393	// }
5827	6394
5828		- if (material != null)
5829		- {
5830		- materialstack[materialdepth] = material;
5831		- selectedstack[materialdepth] = selected;
5832		- cStatic.objectstack[materialdepth++] = this;
5833		- //System.out.println("material " + material);
5834		- //Applet3D.tracein("selected ", selected);
5835		- display.vector2buffer = projectedVertices;
5836		- material.Draw(display, selected);
5837		- }
	6395	+display.PushMaterial2(this, selected);
5838	6396
5839	6397	Object3D child;
5840	6398	boolean sel;
..	..	@@ -5886,19 +6444,7 @@
5886	6444	*/
5887	6445	//depth += 1;
5888	6446
5889		- if (material != null)
5890		- {
5891		- materialdepth -= 1;
5892		- if (materialdepth > 0)
5893		- {
5894		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5895		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5896		- }
5897		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5898		- //else
5899		- //material.Draw(display, false);
5900		- }
5901		-
	6447	+display.PopMaterial2(this);
5902	6448	/*
5903	6449	display.ReleaseTextures(tex);
5904	6450	*/
..	..	@@ -5909,10 +6455,13 @@
5909	6455
5910	6456	//static cVector min,max;
5911	6457
5912		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	6458	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5913	6459	{
5914		- if (display.drawMode == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	6460	+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5915	6461	return; // no shadow for transparent objects
	6462	+
	6463	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6464	+ return;
5916	6465
5917	6466	if (hide)
5918	6467	return;
..	..	@@ -5954,11 +6503,12 @@
5954	6503	return;
5955	6504	}
5956	6505
	6506	+ //bRep.GenUV(1/material.diffuseness);
5957	6507	// bRep.lock = true;
5958	6508
5959		- javax.media.opengl.GL gl = display.GetGL();
	6509	+ //javax.media.opengl.GL gl = display.GetGL();
5960	6510
5961		- if (CameraPane.BOXMODE) // \|\| CameraPane.movingcamera)
	6511	+ if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5962	6512	{
5963	6513	int fc = bRep.FaceCount();
5964	6514	int vc = bRep.VertexCount();
..	..	@@ -5973,23 +6523,7 @@
5973	6523
5974	6524	bRep.getMinMax(min, max, 100);
5975	6525
5976		- gl.glBegin(gl.GL_LINES);
5977		-
5978		- gl.glVertex3d(min.x, min.y, min.z);
5979		- gl.glVertex3d(min.x, min.y, max.z);
5980		- gl.glVertex3d(min.x, min.y, min.z);
5981		- gl.glVertex3d(min.x, max.y, min.z);
5982		- gl.glVertex3d(min.x, min.y, min.z);
5983		- gl.glVertex3d(max.x, min.y, min.z);
5984		-
5985		- gl.glVertex3d(max.x, max.y, max.z);
5986		- gl.glVertex3d(min.x, max.y, max.z);
5987		- gl.glVertex3d(max.x, max.y, max.z);
5988		- gl.glVertex3d(max.x, min.y, max.z);
5989		- gl.glVertex3d(max.x, max.y, max.z);
5990		- gl.glVertex3d(max.x, max.y, min.z);
5991		-
5992		- gl.glEnd();
	6526	+ display.DrawBox(min, max);
5993	6527
5994	6528	return;
5995	6529	}
..	..	@@ -6033,7 +6567,7 @@
6033	6567	{
6034	6568	//throw new Error();
6035	6569
6036		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6570	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
6037	6571
6038	6572	int[] strips = bRep.getRawIndices();
6039	6573
..	..	@@ -6043,178 +6577,19 @@
6043	6577	new Exception().printStackTrace();
6044	6578	return;
6045	6579	}
6046		-
6047		- // TRIANGLE STRIP ARRAY
6048		- if (bRep.trimmed)
	6580	+
	6581	+ if (dontselect)
6049	6582	{
6050		- float[] v = bRep.getRawVertices();
6051		- float[] n = bRep.getRawNormals();
6052		- float[] c = bRep.getRawColors();
6053		- float[] uv = bRep.getRawUVMap();
6054		-
6055		- int count2 = 0;
6056		- int count3 = 0;
6057		-
6058		- if (n.length > 0)
6059		- {
6060		- for (int i = 0; i < strips.length; i++)
6061		- {
6062		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6063		-
6064		- /*
6065		- boolean locked = false;
6066		- float eps = 0.1f;
6067		- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6068		-
6069		- int dot = 0;
6070		-
6071		- if ((dot&1) == 0)
6072		- dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6073		-
6074		- if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6075		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6076		- else
6077		- {
6078		- locked = true;
6079		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6080		- }
6081		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6082		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6083		- if (hasnorm)
6084		- {
6085		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6086		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6087		- }
6088		-
6089		- if ((dot&4) == 0)
6090		- dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6091		-
6092		- if (wrap \|\| !locked && (dot&8) != 0)
6093		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6094		- else
6095		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6096		-
6097		- f.dot = dot;
6098		- */
6099		-
6100		- if (!selectmode)
6101		- {
6102		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6103		- {
6104		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6105		- } else
6106		- {
6107		- gl.glNormal3f(0, 0, 1);
6108		- }
6109		-
6110		- if (c != null)
6111		- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
6112		- {
6113		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6114		- }
6115		- }
6116		- if (flipV)
6117		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6118		- else
6119		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6120		- //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6121		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6122		-
6123		- count2 += 2;
6124		- count3 += 3;
6125		- if (!selectmode)
6126		- {
6127		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6128		- {
6129		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6130		- } else
6131		- {
6132		- gl.glNormal3f(0, 0, 1);
6133		- }
6134		- if (c != null)
6135		- {
6136		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6137		- }
6138		- }
6139		- if (flipV)
6140		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6141		- else
6142		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6143		- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6144		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6145		-
6146		- count2 += 2;
6147		- count3 += 3;
6148		- for (int j = 0; j < strips[i] - 2; j++)
6149		- {
6150		- //gl.glTexCoord2d(...);
6151		- if (!selectmode)
6152		- {
6153		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6154		- {
6155		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6156		- } else
6157		- {
6158		- gl.glNormal3f(0, 0, 1);
6159		- }
6160		- if (c != null)
6161		- {
6162		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6163		- }
6164		- }
6165		-
6166		- if (flipV)
6167		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6168		- else
6169		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6170		- //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6171		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6172		- count2 += 2;
6173		- count3 += 3;
6174		- }
6175		-
6176		- gl.glEnd();
6177		- }
6178		- }
6179		-
6180		- assert count3 == v.length;
	6583	+ //bRep.GenerateNormalsMINE();
6181	6584	}
6182		- else // !trimmed
6183		- {
6184		- int count = 0;
6185		- for (int i = 0; i < strips.length; i++)
6186		- {
6187		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6188		-
6189		- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6190		- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6191		-
6192		- drawVertex(gl, p, selectmode);
6193		- drawVertex(gl, q, selectmode);
6194		-
6195		- for (int j = 0; j < strips[i] - 2; j++)
6196		- {
6197		- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6198		-
6199		-// if (j%2 == 0)
6200		-// drawFace(p, q, r, display, null);
6201		-// else
6202		-// drawFace(p, r, q, display, null);
6203		-
6204		-// p = q;
6205		-// q = r;
6206		- drawVertex(gl, r, selectmode);
6207		- }
6208		-
6209		- gl.glEnd();
6210		- }
6211		- }
	6585	+
	6586	+ display.DrawGeometry(bRep, flipV, selectmode);
6212	6587	} else // catch (Error e)
6213	6588	{
6214	6589	// TRIANGLE ARRAY
6215	6590	if (IsOpaque()) // Static())
6216	6591	{
6217		- gl.glBegin(gl.GL_TRIANGLES);
	6592	+ display.StartTriangles();
6218	6593	int facecount = bRep.FaceCount();
6219	6594	for (int i = 0; i < facecount; i++)
6220	6595	{
..	..	@@ -6277,9 +6652,9 @@
6277	6652	// // r.norm.dot(v3) > -0.5)
6278	6653	// // continue;
6279	6654
6280		- drawFace(p, q, r, display, face);
	6655	+ display.DrawFace(this, p, q, r, face);
6281	6656	}
6282		- gl.glEnd();
	6657	+ display.EndTriangles();
6283	6658	}
6284	6659	else
6285	6660	{
..	..	@@ -6308,8 +6683,8 @@
6308	6683	//System.out.println("SORT");
6309	6684
6310	6685	java.util.Arrays.sort(facescompare);
6311		-
6312		- gl.glBegin(gl.GL_TRIANGLES);
	6686	+
	6687	+ display.StartTriangles();
6313	6688	for (int i = 0; i < facecount; i++)
6314	6689	{
6315	6690	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6321,13 +6696,14 @@
6321	6696	Vertex q = bRep.GetVertex(face.q);
6322	6697	Vertex r = bRep.GetVertex(face.r);
6323	6698
6324		- drawFace(p, q, r, display, face);
	6699	+ display.DrawFace(this, p, q, r, face);
6325	6700	}
6326		- gl.glEnd();
	6701	+ display.EndTriangles();
6327	6702	}
6328	6703
6329	6704	if (false) // live && support != null && support.bRep != null) // debug weights
6330	6705	{
	6706	+ /*
6331	6707	gl.glDisable(gl.GL_LIGHTING);
6332	6708	float[] colorV = new float[3];
6333	6709
..	..	@@ -6406,6 +6782,7 @@
6406	6782	// gl.glEnd();
6407	6783	}
6408	6784	}
	6785	+ */
6409	6786	}
6410	6787	}
6411	6788
..	..	@@ -6450,7 +6827,7 @@
6450	6827	center.add(r);
6451	6828	center.mul(1.0/3);
6452	6829
6453		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6830	+ center.sub(Globals.theRenderer.EyeCamera().location);
6454	6831
6455	6832	distance = center.dot(center);
6456	6833	}
..	..	@@ -6461,347 +6838,11 @@
6461	6838
6462	6839	transient FaceCompare[] facescompare = null;
6463	6840
6464		- void SetColor(CameraPane display, Vertex p0)
6465		- {
6466		- if (display.RENDERPROGRAM == 0)
6467		- {
6468		- float r = 0;
6469		- if (bRep != null)
6470		- {
6471		- if (bRep.stripified)
6472		- {
6473		- r = 1;
6474		- }
6475		- }
6476		- float g = 0;
6477		- if (bRep != null)
6478		- {
6479		- if (bRep.trimmed)
6480		- {
6481		- g = 1;
6482		- }
6483		- }
6484		- float b = 0;
6485		- if (support != null && link2master)
6486		- {
6487		- b = 1;
6488		- }
6489		- display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
6490		- return;
6491		- }
6492		-
6493		- if (display.drawMode != CameraPane.SHADOW)
6494		- return;
6495		-
6496		- javax.media.opengl.GL gl = display.GetGL();
6497		-// if (true) return;
6498		-// float ao = p.AO;
6499		-//
6500		-// // if (ao == 0 && !bRep.AOdone) // transient problem!
6501		-// // ao = 1;
6502		-//
6503		-// gl.glColor4f(ao, ao, ao, 1);
6504		-
6505		-// CameraPane.selectedpoint.
6506		-// getAverage(cStatic.point1, true);
6507		- if (CameraPane.pointflow == null) // !random) // live)
6508		- {
6509		- return;
6510		- }
6511		-
6512		- cStatic.point1.set(0,0,0);
6513		- LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
6514		-
6515		- cStatic.point1.sub(p0);
6516		-
6517		-
6518		-// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
6519		-// {
6520		-// return;
6521		-// }
6522		-
6523		- //if (true)
6524		- if (cStatic.point1.dot(cStatic.point1) > 0.000001)
6525		- {
6526		- return;
6527		- }
6528		-
6529		- float[] colorV = new float[3];
6530		-
6531		- if (false) // marked)
6532		- {
6533		- // debug rigging weights
6534		- for (int object = 0; object < p0.vertexlinks.length; object++)
6535		- {
6536		- float weight = p0.weights[object] / p0.totalweight;
6537		-
6538		- // if (weight < 0.1)
6539		- // {
6540		- // assert(weight == 0);
6541		- // continue;
6542		- // }
6543		-
6544		- if (p0.vertexlinks[object] == -1)
6545		- continue;
6546		-
6547		- Vertex q = support.bRep.GetVertex(p0.vertexlinks[object]);
6548		-
6549		- int color = //1 << object; //
6550		- //p.vertexlinks.length;
6551		- support.bRep.supports[p0.closestsupport].links[object];
6552		- colorV[2] += (color & 1) * weight;
6553		- colorV[1] += ((color & 2) >> 1) * weight;
6554		- colorV[0] += ((color & 4) >> 2) * weight;
6555		- }
6556		- }
6557		- else
6558		- {
6559		- if (drawingstarted)
6560		- {
6561		- // find next point
6562		- if (bRep.GetVertex(0).faceindices == null)
6563		- {
6564		- bRep.InitFaceIndices();
6565		- }
6566		-
6567		- double ymin = p0.y;
6568		-
6569		- Vertex newp = p0;
6570		-
6571		- for (int fii = 0; fii < p0.faceindices.length; fii++)
6572		- {
6573		- int fi = p0.faceindices[fii];
6574		-
6575		- if (fi == -1)
6576		- break;
6577		-
6578		- Face f = bRep.GetFace(fi);
6579		-
6580		- Vertex p = bRep.GetVertex(f.p);
6581		- Vertex q = bRep.GetVertex(f.q);
6582		- Vertex r = bRep.GetVertex(f.r);
6583		-
6584		- int swap = (int)(Math.random()*3);
6585		-
6586		-// for (int s=swap; --s>=0;)
6587		-// {
6588		-// Vertex t = p;
6589		-// p = q;
6590		-// q = r;
6591		-// r = t;
6592		-// }
6593		- if (ymin > p.y)
6594		- {
6595		- ymin = p.y;
6596		- newp = p;
6597		-// break;
6598		- }
6599		- if (ymin > q.y)
6600		- {
6601		- ymin = q.y;
6602		- newp = q;
6603		-// break;
6604		- }
6605		- if (ymin > r.y)
6606		- {
6607		- ymin = r.y;
6608		- newp = r;
6609		-// break;
6610		- }
6611		- }
6612		-
6613		- CameraPane.selectedpoint.toParent[3][0] = newp.x;
6614		- CameraPane.selectedpoint.toParent[3][1] = newp.y;
6615		- CameraPane.selectedpoint.toParent[3][2] = newp.z;
6616		-
6617		- drawingstarted = false;
6618		-
6619		- // return;
6620		- }
6621		-
6622		- if (false) // CameraPane.DRAW
6623		- {
6624		- p0.AO = colorV[0] = 2;
6625		- colorV[1] = 2;
6626		- colorV[2] = 2;
6627		- }
6628		-
6629		- CameraPane.pointflow.add(p0);
6630		- CameraPane.pointflow.Touch();
6631		- }
6632		-
6633		-// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
6634		-// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
6635		-// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
6636		- }
6637		-
6638	6841	void Print(Vertex v)
6639	6842	{
6640	6843	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6641	6844	}
6642	6845
6643		- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6644		- {
6645		- if (!selectmode)
6646		- {
6647		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6648		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6649		-
6650		- if (flipV)
6651		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6652		- else
6653		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6654		- }
6655		-
6656		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6657		- }
6658		-
6659		- void drawFace(Vertex pv, Vertex qv, Vertex rv,
6660		- CameraPane display, Face face)
6661		- {
6662		- if (pv.y == -10000 \|\|
6663		- qv.y == -10000 \|\|
6664		- rv.y == -10000)
6665		- return;
6666		-
6667		-// float b = f.nbiterations & 1;
6668		-// float g = (f.nbiterations>>1) & 1;
6669		-// float r = (f.nbiterations>>2) & 1;
6670		-//
6671		-// //if (f.weight == 10000)
6672		-// //{
6673		-// // r = 1; g = b = 0;
6674		-// //}
6675		-// //else
6676		-// //{
6677		-// // assert(f.weight < 10000);
6678		-// r = g = b = (float)bRep.FaceWeight(f)*100;
6679		-// if (r<0)
6680		-// assert(r>=0);
6681		-// //}
6682		-
6683		- javax.media.opengl.GL gl = display.GetGL();
6684		-
6685		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
6686		-
6687		- //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
6688		- if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
6689		- {
6690		- //gl.glBegin(gl.GL_TRIANGLES);
6691		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
6692		- if (!hasnorm)
6693		- {
6694		- // System.out.println("FUCK!!");
6695		- LA.vecSub(pv/.pos/, qv/.pos/, v0);
6696		- LA.vecSub(pv/.pos/, rv/.pos/, v1);
6697		- LA.vecCross(v0, v1, v2);
6698		- LA.vecNormalize(v2);
6699		- gl.glNormal3f((float) v2.x, (float) v2.y, (float) v2.z);
6700		- }
6701		-
6702		- if (hasnorm)
6703		- {
6704		-// if (!pv.norm.normalized())
6705		-// assert(pv.norm.normalized());
6706		-
6707		- //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
6708		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6709		- }
6710		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6711		- SetColor(display, pv);
6712		- //gl.glColor4f(r, g, b, 1);
6713		- //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
6714		- if (flipV)
6715		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6716		- else
6717		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6718		- //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
6719		- gl.glVertex3f((float) pv./pos./x, (float) pv./pos./y, (float) pv./pos./z);
6720		-// Print(pv);
6721		- if (hasnorm)
6722		- {
6723		-// assert(qv.norm.normalized());
6724		- //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
6725		- gl.glNormal3f((float) qv.norm.x, (float) qv.norm.y, (float) qv.norm.z);
6726		- }
6727		- //System.out.println("vertexq = " + qv.s + ", " + qv.t);
6728		- // boolean locked = false;
6729		- // float eps = 0.1f;
6730		- // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6731		-
6732		- // int dot = 0; //*/ (int)f.dot;
6733		-
6734		- // if ((dot&1) == 0)
6735		- // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6736		-
6737		- // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6738		- if (flipV)
6739		- gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
6740		- else
6741		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6742		- // else
6743		- // {
6744		- // locked = true;
6745		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6746		- // }
6747		- gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
6748		- SetColor(display, qv);
6749		- //gl.glColor4f(r, g, b, 1);
6750		- //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
6751		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6752		- gl.glVertex3f((float) qv./pos./x, (float) qv./pos./y, (float) qv./pos./z);
6753		-// Print(qv);
6754		- if (hasnorm)
6755		- {
6756		-// assert(rv.norm.normalized());
6757		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6758		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6759		- }
6760		-
6761		- // if ((dot&4) == 0)
6762		- // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6763		-
6764		- // if (wrap \|\| !locked && (dot&8) != 0)
6765		- if (flipV)
6766		- gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
6767		- else
6768		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6769		- // else
6770		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6771		-
6772		- // f.dot = dot;
6773		-
6774		- gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
6775		- SetColor(display, rv);
6776		- //gl.glColor4f(r, g, b, 1);
6777		- //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
6778		- //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
6779		- gl.glVertex3f((float) rv./pos./x, (float) rv./pos./y, (float) rv./pos./z);
6780		-// Print(rv);
6781		- //gl.glEnd();
6782		- }
6783		- else
6784		- {
6785		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6786		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6787		- gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
6788		-
6789		- }
6790		-
6791		- if (false) // (attributes & WIREFRAME) != 0)
6792		- {
6793		- gl.glDisable(gl.GL_LIGHTING);
6794		-
6795		- gl.glBegin(gl.GL_LINE_LOOP);
6796		- gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
6797		- gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
6798		- gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
6799		- gl.glEnd();
6800		-
6801		- gl.glEnable(gl.GL_LIGHTING);
6802		- }
6803		- }
6804		-
6805	6846	void drawSelf(ClickInfo info, int level, boolean select)
6806	6847	{
6807	6848	if (bRep == null)
..	..	@@ -7325,20 +7366,23 @@
7325	7366	}
7326	7367	}
7327	7368
7328		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7369	+ static ClickInfo clickInfo = new ClickInfo();
	7370	+
	7371	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7372	+ Point outPt, Rectangle outRec)
7329	7373	{
7330		- int hc = info.bounds.x + info.bounds.width / 2;
7331		- int vc = info.bounds.y + info.bounds.height / 2;
7332		- double[][] toscreen = info.toScreen;
	7374	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7375	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7376	+ double[][] toscreen = clickInfo.toScreen;
7333	7377	if (toscreen == null)
7334	7378	{
7335		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7379	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7336	7380	}
7337	7381	cVector vec = in;
7338	7382	LA.xformPos(in, toscreen, in);
7339	7383	//System.out.println("Distance = " + info.camera.Distance());
7340		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7341		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7384	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7385	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7342	7386	outPt.x = hc + (int) vec.x;
7343	7387	outPt.y = vc - (int) vec.y;
7344	7388	outRec.x = outPt.x - 3;
..	..	@@ -7346,15 +7390,18 @@
7346	7390	outRec.width = outRec.height = 6;
7347	7391	}
7348	7392
7349		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7393	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7394	+ )
7350	7395	{
7351	7396	Point pt = new Point(0, 0);
7352	7397	Rectangle rec = new Rectangle();
7353		- calcHotSpot(in, info, pt, rec);
	7398	+ calcHotSpot(in, //clickInfo,
	7399	+ pt, rec);
7354	7400	return rec;
7355	7401	}
7356	7402
7357		- void drawEditHandles0(ClickInfo info, int level)
	7403	+ void drawEditHandles0(//ClickInfo clickInfo,
	7404	+ int level)
7358	7405	{
7359	7406	if (level == 0)
7360	7407	{
..	..	@@ -7363,98 +7410,104 @@
7363	7410	{
7364	7411	cVector origin = new cVector();
7365	7412	//LA.xformPos(origin, toParent, origin);
7366		- Rectangle spot = calcHotSpot(origin, info);
	7413	+ if (this.clickInfo == null)
	7414	+ this.clickInfo = new ClickInfo();
	7415	+
	7416	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7367	7417	Rectangle boundary = new Rectangle();
7368	7418	boundary.x = spot.x - 30;
7369	7419	boundary.y = spot.y - 30;
7370	7420	boundary.width = spot.width + 60;
7371	7421	boundary.height = spot.height + 60;
7372		- info.g.setColor(Color.red);
	7422	+ clickInfo.g.setColor(Color.white);
7373	7423	int spotw = spot.x + spot.width;
7374	7424	int spoth = spot.y + spot.height;
7375		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7376		- if (CameraPane.Xmin > spot.x)
7377		- {
7378		- CameraPane.Xmin = spot.x;
7379		- }
7380		- if (CameraPane.Xmax < spotw)
7381		- {
7382		- CameraPane.Xmax = spotw;
7383		- }
7384		- if (CameraPane.Ymin > spot.y)
7385		- {
7386		- CameraPane.Ymin = spot.y;
7387		- }
7388		- if (CameraPane.Ymax < spoth)
7389		- {
7390		- CameraPane.Ymax = spoth;
7391		- }
7392		- spot.translate(32, 32);
	7425	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7426	+// if (CameraPane.Xmin > spot.x)
	7427	+// {
	7428	+// CameraPane.Xmin = spot.x;
	7429	+// }
	7430	+// if (CameraPane.Xmax < spotw)
	7431	+// {
	7432	+// CameraPane.Xmax = spotw;
	7433	+// }
	7434	+// if (CameraPane.Ymin > spot.y)
	7435	+// {
	7436	+// CameraPane.Ymin = spot.y;
	7437	+// }
	7438	+// if (CameraPane.Ymax < spoth)
	7439	+// {
	7440	+// CameraPane.Ymax = spoth;
	7441	+// }
	7442	+// if (CameraPane.Xmin > spot.x)
	7443	+// {
	7444	+// CameraPane.Xmin = spot.x;
	7445	+// }
	7446	+// if (CameraPane.Xmax < spotw)
	7447	+// {
	7448	+// CameraPane.Xmax = spotw;
	7449	+// }
	7450	+// if (CameraPane.Ymin > spot.y)
	7451	+// {
	7452	+// CameraPane.Ymin = spot.y;
	7453	+// }
	7454	+// if (CameraPane.Ymax < spoth)
	7455	+// {
	7456	+// CameraPane.Ymax = spoth;
	7457	+// }
	7458	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7459	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
	7460	+ spot.translate(32, 0);
	7461	+ clickInfo.g.setColor(Color.yellow);
	7462	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7463	+
	7464	+ spot.translate(32, 64);
7393	7465	spotw = spot.x + spot.width;
7394	7466	spoth = spot.y + spot.height;
7395		- info.g.setColor(Color.blue);
7396		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7397		- if (CameraPane.Xmin > spot.x)
7398		- {
7399		- CameraPane.Xmin = spot.x;
7400		- }
7401		- if (CameraPane.Xmax < spotw)
7402		- {
7403		- CameraPane.Xmax = spotw;
7404		- }
7405		- if (CameraPane.Ymin > spot.y)
7406		- {
7407		- CameraPane.Ymin = spot.y;
7408		- }
7409		- if (CameraPane.Ymax < spoth)
7410		- {
7411		- CameraPane.Ymax = spoth;
7412		- }
7413		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7414		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7415		- spot.translate(0, -32);
7416		- info.g.setColor(Color.green);
7417		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7418		- if (CameraPane.Xmin > spot.x)
7419		- {
7420		- CameraPane.Xmin = spot.x;
7421		- }
7422		- if (CameraPane.Xmax < spotw)
7423		- {
7424		- CameraPane.Xmax = spotw;
7425		- }
7426		- if (CameraPane.Ymin > spot.y)
7427		- {
7428		- CameraPane.Ymin = spot.y;
7429		- }
7430		- if (CameraPane.Ymax < spoth)
7431		- {
7432		- CameraPane.Ymax = spoth;
7433		- }
7434		- info.g.drawArc(boundary.x, boundary.y,
7435		- boundary.width, boundary.height, 0, 360);
	7467	+ clickInfo.g.setColor(Color.cyan);
	7468	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7469	+// if (CameraPane.Xmin > spot.x)
	7470	+// {
	7471	+// CameraPane.Xmin = spot.x;
	7472	+// }
	7473	+// if (CameraPane.Xmax < spotw)
	7474	+// {
	7475	+// CameraPane.Xmax = spotw;
	7476	+// }
	7477	+// if (CameraPane.Ymin > spot.y)
	7478	+// {
	7479	+// CameraPane.Ymin = spot.y;
	7480	+// }
	7481	+// if (CameraPane.Ymax < spoth)
	7482	+// {
	7483	+// CameraPane.Ymax = spoth;
	7484	+// }
	7485	+ clickInfo.g.setColor(Color.green);
	7486	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7487	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7436	7488	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7437		- if (CameraPane.Xmin > boundary.x)
7438		- {
7439		- CameraPane.Xmin = boundary.x;
7440		- }
7441		- if (CameraPane.Xmax < boundary.x + boundary.width)
7442		- {
7443		- CameraPane.Xmax = boundary.x + boundary.width;
7444		- }
7445		- if (CameraPane.Ymin > boundary.y)
7446		- {
7447		- CameraPane.Ymin = boundary.y;
7448		- }
7449		- if (CameraPane.Ymax < boundary.y + boundary.height)
7450		- {
7451		- CameraPane.Ymax = boundary.y + boundary.height;
7452		- }
	7489	+// if (CameraPane.Xmin > boundary.x)
	7490	+// {
	7491	+// CameraPane.Xmin = boundary.x;
	7492	+// }
	7493	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	7494	+// {
	7495	+// CameraPane.Xmax = boundary.x + boundary.width;
	7496	+// }
	7497	+// if (CameraPane.Ymin > boundary.y)
	7498	+// {
	7499	+// CameraPane.Ymin = boundary.y;
	7500	+// }
	7501	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	7502	+// {
	7503	+// CameraPane.Ymax = boundary.y + boundary.height;
	7504	+// }
7453	7505	return;
7454	7506	}
7455	7507	}
7456	7508
7457		- boolean doEditClick0(ClickInfo info, int level)
	7509	+ boolean doEditClick0(//ClickInfo clickInfo,
	7510	+ int level)
7458	7511	{
7459	7512	if (level == 0)
7460	7513	{
..	..	@@ -7463,10 +7516,10 @@
7463	7516
7464	7517	boolean retval = false;
7465	7518
7466		- startX = info.x;
7467		- startY = info.y;
	7519	+ startX = clickInfo.x;
	7520	+ startY = clickInfo.y;
7468	7521
7469		- hitSomething = 0;
	7522	+ hitSomething = -1;
7470	7523	cVector origin = new cVector();
7471	7524	//LA.xformPos(origin, toParent, origin);
7472	7525	Rectangle spot = new Rectangle();
..	..	@@ -7474,22 +7527,53 @@
7474	7527	{
7475	7528	centerPt = new Point(0, 0);
7476	7529	}
7477		- calcHotSpot(origin, info, centerPt, spot);
7478		- if (spot.contains(info.x, info.y))
	7530	+ calcHotSpot(origin, //info,
	7531	+ centerPt, spot);
	7532	+ if (spot.contains(clickInfo.x, clickInfo.y))
7479	7533	{
7480	7534	hitSomething = hitCenter;
7481	7535	retval = true;
7482	7536	}
7483	7537	spot.translate(32, 0);
7484		- if (spot.contains(info.x, info.y))
	7538	+ if (spot.contains(clickInfo.x, clickInfo.y))
7485	7539	{
7486	7540	hitSomething = hitRotate;
7487	7541	retval = true;
7488	7542	}
7489	7543	spot.translate(0, 32);
7490		- if (spot.contains(info.x, info.y))
	7544	+ spot.translate(32, 0);
	7545	+ spot.translate(0, 32);
	7546	+ if (spot.contains(clickInfo.x, clickInfo.y))
7491	7547	{
7492	7548	hitSomething = hitScale;
	7549	+
	7550	+ double scale = 0.005f * clickInfo.camera.Distance();
	7551	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7552	+ double sign = 1;
	7553	+ if (hScale < 0)
	7554	+ {
	7555	+ sign = -1;
	7556	+ }
	7557	+ hScale = signMath.pow(signhScale, scale * 50);
	7558	+ if (hScale < 0.01)
	7559	+ {
	7560	+ //hScale = 0.01;
	7561	+ }
	7562	+
	7563	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7564	+ sign = 1;
	7565	+ if (vScale < 0)
	7566	+ {
	7567	+ sign = -1;
	7568	+ }
	7569	+ vScale = signMath.pow(signvScale, scale * 50);
	7570	+ if (vScale < 0.01)
	7571	+ {
	7572	+ //vScale = 0.01;
	7573	+ }
	7574	+
	7575	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7576	+
7493	7577	retval = true;
7494	7578	}
7495	7579
..	..	@@ -7499,7 +7583,7 @@
7499	7583	}
7500	7584
7501	7585	//System.out.println("info.modifiers = " + info.modifiers);
7502		- modified = (info.modifiers & CameraPane.META) != 0;
	7586	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7503	7587	//System.out.println("modified = " + modified);
7504	7588	//new Exception().printStackTrace();
7505	7589	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7527,7 +7611,8 @@
7527	7611	return true;
7528	7612	}
7529	7613
7530		- void doEditDrag0(ClickInfo info)
	7614	+ void doEditDrag0(//ClickInfo info,
	7615	+ boolean opposite)
7531	7616	{
7532	7617	if (hitSomething == 0)
7533	7618	{
..	..	@@ -7541,7 +7626,8 @@
7541	7626
7542	7627	//System.out.println("hitSomething = " + hitSomething);
7543	7628
7544		- double scale = 0.005f * info.camera.Distance();
	7629	+ double scale = 0.005f * clickInfo.camera.Distance();
	7630	+
7545	7631	cVector xlate = new cVector();
7546	7632	//cVector xlate2 = new cVector();
7547	7633	switch (hitSomething)
..	..	@@ -7552,9 +7638,9 @@
7552	7638
7553	7639	case hitCenter: // Translate
7554	7640
7555		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7641	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7556	7642
7557		- if (modified)
	7643	+ if (modified \|\| opposite)
7558	7644	{
7559	7645	//assert(false);
7560	7646	/*
..	..	@@ -7574,8 +7660,8 @@
7574	7660	toParent[3][i] = xlate.get(i);
7575	7661	LA.matInvert(toParent, fromParent);
7576	7662	*/
7577		- cVector delta = LA.newVector(0, 0, startY - info.y);
7578		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7663	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7664	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7579	7665
7580	7666	LA.matCopy(startMat, toParent);
7581	7667	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7584,7 +7670,7 @@
7584	7670	} else
7585	7671	{
7586	7672	//LA.xformDir(delta, info.camera.fromScreen, delta);
7587		- cVector up = new cVector(info.camera.up);
	7673	+ cVector up = new cVector(clickInfo.camera.up);
7588	7674	cVector away = new cVector();
7589	7675	//cVector right2 = new cVector();
7590	7676	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7600,20 +7686,20 @@
7600	7686	}
7601	7687	LA.xformDir(up, ClickInfo.matbuffer, up);
7602	7688	// if (!CameraPane.LOCALTRANSFORM)
7603		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
7604		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7689	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
	7690	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7605	7691	// if (!CameraPane.LOCALTRANSFORM)
7606		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7692	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7607	7693	//LA.vecCross(up, cVector.Z, right2);
7608	7694
7609		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7695	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7610	7696
7611	7697	//System.out.println("DELTA0 = " + delta);
7612	7698	//System.out.println("AWAY = " + info.camera.away);
7613	7699	//System.out.println("UP = " + info.camera.up);
7614	7700	if (away.z > 0)
7615	7701	{
7616		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7702	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7617	7703	{
7618	7704	delta.x = -delta.x;
7619	7705	} else
..	..	@@ -7628,7 +7714,7 @@
7628	7714	//System.out.println("DELTA1 = " + delta);
7629	7715	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7630	7716	//System.out.println("DELTA2 = " + delta);
7631		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7717	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7632	7718	LA.matCopy(startMat, toParent);
7633	7719	//System.out.println("DELTA3 = " + delta);
7634	7720	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7638,8 +7724,8 @@
7638	7724	break;
7639	7725
7640	7726	case hitRotate: // rotate
7641		- int dx = info.x - centerPt.x;
7642		- int dy = -(info.y - centerPt.y);
	7727	+ int dx = clickInfo.x - centerPt.x;
	7728	+ int dy = -(clickInfo.y - centerPt.y);
7643	7729	double angle = (double) Math.atan2(dx, dy);
7644	7730	angle = -(1.570796 - angle);
7645	7731
..	..	@@ -7648,6 +7734,7 @@
7648	7734
7649	7735	if (modified)
7650	7736	{
	7737	+ // Rotate 90 degrees
7651	7738	angle /= (Math.PI / 4);
7652	7739	angle = Math.floor(angle + 0.5);
7653	7740	angle *= (Math.PI / 4);
..	..	@@ -7661,7 +7748,7 @@
7661	7748	}
7662	7749	/**/
7663	7750
7664		- switch (info.pane.renderCamera.viewCode)
	7751	+ switch (clickInfo.pane.RenderCamera().viewCode)
7665	7752	{
7666	7753	case 1: // '\001'
7667	7754	LA.matZRotate(toParent, angle);
..	..	@@ -7688,26 +7775,30 @@
7688	7775	break;
7689	7776
7690	7777	case hitScale: // scale
7691		- double hScale = (double) (info.x - centerPt.x) / 32;
	7778	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7779	+ double sign = 1;
	7780	+ if (hScale < 0)
	7781	+ {
	7782	+ sign = -1;
	7783	+ }
	7784	+ hScale = signMath.pow(signhScale, scale * 50);
7692	7785	if (hScale < 0.01)
7693	7786	{
7694		- hScale = 0.01;
	7787	+ //hScale = 0.01;
7695	7788	}
7696		- hScale = Math.pow(hScale, scale * 50);
7697		- if (hScale < 0.01)
	7789	+
	7790	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7791	+ sign = 1;
	7792	+ if (vScale < 0)
7698	7793	{
7699		- hScale = 0.01;
	7794	+ sign = -1;
7700	7795	}
7701		- double vScale = (double) (info.y - centerPt.y) / 32;
	7796	+ vScale = signMath.pow(signvScale, scale * 50);
7702	7797	if (vScale < 0.01)
7703	7798	{
7704		- vScale = 0.01;
	7799	+ //vScale = 0.01;
7705	7800	}
7706		- vScale = Math.pow(vScale, scale * 50);
7707		- if (vScale < 0.01)
7708		- {
7709		- vScale = 0.01;
7710		- }
	7801	+
7711	7802	LA.matCopy(startMat, toParent);
7712	7803	/**/
7713	7804	for (int i = 0; i < 3; i++)
..	..	@@ -7717,39 +7808,56 @@
7717	7808	}
7718	7809	/**/
7719	7810
7720		- switch (info.pane.renderCamera.viewCode)
	7811	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
	7812	+
	7813	+ if (totalScale < 0.01)
	7814	+ {
	7815	+ totalScale = 0.01;
	7816	+ }
	7817	+
	7818	+ switch (clickInfo.pane.RenderCamera().viewCode)
7721	7819	{
7722	7820	case 3: // '\001'
7723		- if (modified)
	7821	+ if (modified \|\| opposite)
7724	7822	{
	7823	+ if (modified && opposite)
	7824	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7825	+ else
7725	7826	//LA.matScale(toParent, 1, hScale, vScale);
7726		- LA.matScale(toParent, vScale, 1, 1);
	7827	+ LA.matScale(toParent, totalScale, 1, 1);
7727	7828	} // vScale, 1);
7728	7829	else
7729	7830	{
7730		- LA.matScale(toParent, vScale, vScale, vScale);
	7831	+ // EXCEPTION!
	7832	+ LA.matScale(toParent, 1, totalScale, totalScale);
7731	7833	} // vScale, 1);
7732	7834	break;
7733	7835
7734	7836	case 2: // '\002'
7735		- if (modified)
	7837	+ if (modified \|\| opposite)
7736	7838	{
7737		- //LA.matScale(toParent, hScale, 1, vScale);
7738		- LA.matScale(toParent, 1, vScale, 1);
	7839	+ if (modified && opposite)
	7840	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7841	+ else
	7842	+ //LA.matScale(toParent, hScale, 1, vScale);
	7843	+ LA.matScale(toParent, 1, totalScale, 1);
7739	7844	} else
7740	7845	{
7741		- LA.matScale(toParent, vScale, 1, vScale);
	7846	+ LA.matScale(toParent, totalScale, 1, totalScale);
7742	7847	}
7743	7848	break;
7744	7849
7745	7850	case 1: // '\003'
7746		- if (modified)
	7851	+ if (modified \|\| opposite)
7747	7852	{
7748		- //LA.matScale(toParent, hScale, vScale, 1);
7749		- LA.matScale(toParent, 1, 1, vScale);
	7853	+ if (modified && opposite)
	7854	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7855	+ else
	7856	+ //LA.matScale(toParent, hScale, vScale, 1);
	7857	+ LA.matScale(toParent, 1, 1, totalScale);
7750	7858	} else
7751	7859	{
7752		- LA.matScale(toParent, vScale, vScale, 1);
	7860	+ LA.matScale(toParent, totalScale, totalScale, 1);
7753	7861	}
7754	7862	break;
7755	7863	}
..	..	@@ -7783,7 +7891,7 @@
7783	7891	} // NEW ...
7784	7892
7785	7893
7786		- info.pane.repaint();
	7894	+ clickInfo.pane.repaint();
7787	7895	}
7788	7896
7789	7897	boolean overflow = false;
..	..	@@ -7882,14 +7990,22 @@
7882	7990	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7883	7991	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7884	7992	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7993	+
	7994	+ String objname;
	7995	+
7885	7996	if (false) //parent != null)
7886	7997	{
7887		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7998	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7888	7999	} else
7889	8000	{
7890		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	8001	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7891	8002	} // + super.toString();
7892	8003	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	8004	+
	8005	+ if (!Globals.ADVANCED)
	8006	+ return objname;
	8007	+
	8008	+ return objname + " " + System.identityHashCode(this);
7893	8009	}
7894	8010
7895	8011	public int hashCode()
..	..	@@ -7945,6 +8061,7 @@
7945	8061	objectUI.closeUI();
7946	8062	if (editWindow != null)
7947	8063	{
	8064	+ editWindow.ctrlPanel.FlushUI();
7948	8065	editWindow.refreshContents();
7949	8066	} // ? new
7950	8067	objectUI = null;
..	..	@@ -7953,6 +8070,10 @@
7953	8070	{
7954	8071	editWindow = null;
7955	8072	} // ?
	8073	+ }
	8074	+ else
	8075	+ {
	8076	+ //editWindow.closeUI();
7956	8077	}
7957	8078	}
7958	8079
..	..	@@ -7965,7 +8086,7 @@
7965	8086	/transient/ cVector2[] projectedVertices = new cVector2[0];
7966	8087
7967	8088	Object3D /Composite/ parent;
7968		- Object3D /Composite/ fileparent;
	8089	+ Object3D /Composite/ fileparent; // In the case of FileObject
7969	8090
7970	8091	double[][] toParent; // dynamic matrix
7971	8092	double[][] fromParent;
..	..	@@ -8080,7 +8201,7 @@
8080	8201	{
8081	8202	assert(bRep != null);
8082	8203	if (!(support instanceof GenericJoint)) // support.bRep != null)
8083		- GrafreeD.Assert(support.bRep == bRep.support);
	8204	+ Grafreed.Assert(support.bRep == bRep.support);
8084	8205	}
8085	8206	else
8086	8207	{
..	..	@@ -8111,6 +8232,10 @@
8111	8232	}
8112	8233
8113	8234	transient ObjEditor editWindow;
	8235	+ transient ObjEditor manipWindow;
	8236	+
	8237	+ transient boolean pinned;
	8238	+
8114	8239	transient ObjectUI objectUI;
8115	8240	public static int povDepth = 0;
8116	8241	private static cVector tbMin = new cVector();
..	..	@@ -8129,9 +8254,9 @@
8129	8254	private static cVector edge2 = new cVector();
8130	8255	//private static cVector norm = new cVector();
8131	8256	/transient private/ int hitSomething;
8132		- private static final int hitCenter = 1;
8133		- private static final int hitScale = 2;
8134		- private static final int hitRotate = 3;
	8257	+ static final int hitCenter = 1;
	8258	+ static final int hitScale = 2;
	8259	+ static final int hitRotate = 3;
8135	8260	/transient/ /private/ int viewCode; // Now used for transparency cache flag
8136	8261	/transient/ private Point centerPt;
8137	8262	/transient/ private int startX;
..	..	@@ -8163,6 +8288,8 @@
8163	8288	{
8164	8289	Object3D targ = this;
8165	8290
	8291	+ targ.NORMALPUSH = obj.NORMALPUSH;
	8292	+
8166	8293	if (obj.material != null)
8167	8294	{
8168	8295	if ((mask&MATERIAL)!=0) // ==(COLOR\|MATERIAL))