~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -5,6 +5,7 @@
5	5	import java.util.Vector;
6	6
7	7	import javax.media.j3d.Transform3D;
	8	+import javax.media.opengl.GL;
8	9	import javax.vecmath.Vector3d;
9	10
10	11	import javax.imageio.ImageIO;
..	..	@@ -13,13 +14,42 @@
13	14	import //weka.core.
14	15	matrix.Matrix;
15	16
	17	+import java.util.UUID;
	18	+
16	19	//import net.sourceforge.sizeof.SizeOf;
17	20	public class Object3D extends Vector<Object3D> implements java.io.Serializable, iSendInfo //, aurelienribon.tweenengine.TweenAccessor<Object3D>
18	21	{
19	22	//static final long serialVersionUID = -607422624994562685L;
20	23	static final long serialVersionUID = 5022536242724664900L;
21	24
	25	+ // Use GetUUID for backward compatibility with null.
	26	+ private UUID uuid = UUID.randomUUID();
	27	+
	28	+ // TEMPORARY for mocap undo. No need to be transient.
	29	+ mocap.reader.BVHReader.BVHResult savebvh;
	30	+ Object3D saveskeleton;
	31	+ //
	32	+
	33	+ String skyboxname;
	34	+ String skyboxext;
	35	+
	36	+ Object3D versionlist[];
	37	+ int versionindex = -1;
	38	+
22	39	ScriptNode scriptnode;
	40	+
	41	+ void InitOthers()
	42	+ {
	43	+ if (projectedVertices == null \|\| projectedVertices.length <= 2)
	44	+ {
	45	+ projectedVertices = new Object3D.cVector2[3];
	46	+ }
	47	+ for (int i = 0; i < 3; i++)
	48	+ {
	49	+ projectedVertices[i] = new cVector2(); // Others
	50	+ }
	51	+ projectedVertices[0].x = 100; // bump
	52	+ }
23	53
24	54	void MinMax(cVector minima, cVector maxima)
25	55	{
..	..	@@ -86,64 +116,201 @@
86	116
87	117	// transient boolean reduced; // for morph reduction
88	118
89		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
90		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	119	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	120	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
91	121
92		-transient Object3D transientsupport; // for cloning
93		-transient boolean transientlink2master;
	122	+ transient Object3D transientsupport; // for cloning
	123	+ transient boolean transientlink2master;
94	124
95		-void SaveSupports()
96		-{
97		- if (blockloop)
98		- return;
99		-
100		- transientsupport = support;
101		- transientlink2master = link2master;
102		-
103		- support = null;
104		- link2master = false;
105		-
106		- if (bRep != null)
	125	+ void SaveSupports()
107	126	{
108		- bRep.SaveSupports();
	127	+ if (blockloop)
	128	+ return;
	129	+
	130	+ transientsupport = support;
	131	+ transientlink2master = link2master;
	132	+
	133	+ support = null;
	134	+ link2master = false;
	135	+
	136	+ if (bRep != null)
	137	+ {
	138	+ bRep.SaveSupports();
	139	+ }
	140	+
	141	+ for (int i = 0; i < Size(); i++)
	142	+ {
	143	+ Object3D child = (Object3D) get(i);
	144	+ if (child == null)
	145	+ continue;
	146	+ blockloop = true;
	147	+ child.SaveSupports();
	148	+ blockloop = false;
	149	+ }
109	150	}
110		-
111		- for (int i = 0; i < Size(); i++)
	151	+
	152	+ void RestoreSupports()
112	153	{
113		- Object3D child = (Object3D) get(i);
114		- if (child == null)
115		- continue;
	154	+ if (blockloop)
	155	+ return;
	156	+
	157	+ support = transientsupport;
	158	+ link2master = transientlink2master;
	159	+ transientsupport = null;
	160	+ transientlink2master = false;
	161	+
	162	+ if (bRep != null)
	163	+ {
	164	+ bRep.RestoreSupports();
	165	+ }
	166	+
	167	+ for (int i = 0; i < Size(); i++)
	168	+ {
	169	+ Object3D child = (Object3D) get(i);
	170	+ if (child == null)
	171	+ continue;
	172	+ blockloop = true;
	173	+ child.RestoreSupports();
	174	+ blockloop = false;
	175	+ }
	176	+ }
	177	+
	178	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	179	+ {
	180	+ Object3D o;
	181	+
	182	+ if (hashtable.containsKey(GetUUID()))
	183	+ {
	184	+ o = hashtable.get(GetUUID());
	185	+
	186	+ Grafreed.Assert(this.bRep == o.bRep);
	187	+ //if (this.bRep != null)
	188	+ // assert(this.bRep.support == o.transientrep);
	189	+ if (this.support != null)
	190	+ assert(this.support.bRep == o.transientrep);
	191	+ }
	192	+ else
	193	+ {
	194	+ o = new Object3D("copy of " + this.name);
	195	+
	196	+ hashtable.put(GetUUID(), o);
	197	+ }
	198	+
	199	+ if (!blockloop)
	200	+ {
	201	+ blockloop = true;
	202	+
	203	+ for (int i=0; i<Size(); i++)
	204	+ {
	205	+ get(i).ExtractBigData(hashtable);
	206	+ }
	207	+
	208	+ blockloop = false;
	209	+ }
	210	+
	211	+ ExtractBigData(o);
	212	+ }
	213	+
	214	+ void ExtractBigData(Object3D o)
	215	+ {
	216	+ if (o.bRep != null)
	217	+ Grafreed.Assert(o.bRep == this.bRep);
	218	+
	219	+ o.bRep = this.bRep;
	220	+// July 2019 if (this.bRep != null)
	221	+// {
	222	+// o.transientrep = this.bRep.support;
	223	+// o.bRep.support = null;
	224	+// }
	225	+ o.selection = this.selection;
	226	+ o.versionlist = this.versionlist;
	227	+ o.versionindex = this.versionindex;
	228	+
	229	+ if (this.support != null)
	230	+ {
	231	+ if (o.transientrep != null)
	232	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	233	+
	234	+ o.transientrep = this.support.bRep;
	235	+ this.support.bRep = null;
	236	+ }
	237	+
	238	+ // o.support = this.support;
	239	+ // o.fileparent = this.fileparent;
	240	+ // if (this.bRep != null)
	241	+ // o.bRep = this.bRep.support;
	242	+
	243	+ this.bRep = null;
	244	+ // if (this.bRep != null)
	245	+ // this.bRep.support = null;
	246	+ // this.support = null;
	247	+ // this.fileparent = null;
	248	+ }
	249	+
	250	+// Object3D GetObject(java.util.UUID uuid)
	251	+// {
	252	+// if (this.uuid.equals(uuid))
	253	+// return this;
	254	+//
	255	+// if (blockloop)
	256	+// return null;
	257	+//
	258	+// blockloop = true;
	259	+//
	260	+// for (int i=0; i<Size(); i++)
	261	+// {
	262	+// Object3D o = get(i).GetObject(uuid);
	263	+//
	264	+// if (o != null)
	265	+// return o;
	266	+// }
	267	+//
	268	+// blockloop = false;
	269	+//
	270	+// return null;
	271	+// }
	272	+
	273	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	274	+ {
	275	+ if (!hashtable.containsKey(GetUUID()))
	276	+ return;
	277	+
	278	+ Object3D o = hashtable.get(GetUUID());
	279	+
	280	+ RestoreBigData(o);
	281	+
	282	+ if (blockloop)
	283	+ return;
	284	+
116	285	blockloop = true;
117		- child.SaveSupports();
	286	+
	287	+ //hashtable.remove(GetUUID());
	288	+
	289	+ for (int i=0; i<Size(); i++)
	290	+ {
	291	+ get(i).RestoreBigData(hashtable);
	292	+ }
	293	+
118	294	blockloop = false;
119	295	}
120		-}
121	296
122		-void RestoreSupports()
123		-{
124		- if (blockloop)
125		- return;
126		-
127		- support = transientsupport;
128		- link2master = transientlink2master;
129		- transientsupport = null;
130		- transientlink2master = false;
131		-
132		- if (bRep != null)
	297	+ void RestoreBigData(Object3D o)
133	298	{
134		- bRep.RestoreSupports();
	299	+ this.bRep = o.bRep;
	300	+ if (this.support != null && o.transientrep != null)
	301	+ {
	302	+ this.support.bRep = o.transientrep;
	303	+ }
	304	+
	305	+ this.selection = o.selection;
	306	+
	307	+ this.versionlist = o.versionlist;
	308	+ this.versionindex = o.versionindex;
	309	+// July 2019 if (this.bRep != null)
	310	+// this.bRep.support = o.transientrep;
	311	+ // this.support = o.support;
	312	+ // this.fileparent = o.fileparent;
135	313	}
136		-
137		- for (int i = 0; i < Size(); i++)
138		- {
139		- Object3D child = (Object3D) get(i);
140		- if (child == null)
141		- continue;
142		- blockloop = true;
143		- child.RestoreSupports();
144		- blockloop = false;
145		- }
146		-}
147	314
148	315	// MOCAP SUPPORT
149	316	double tx,ty,tz,rx,ry,rz;
..	..	@@ -286,6 +453,8 @@
286	453	}
287	454
288	455	boolean live = false;
	456	+ transient boolean keepdontselect;
	457	+ boolean dontselect = false;
289	458	boolean hide = false;
290	459	boolean link2master = false; // performs reset support/master at each frame
291	460	boolean marked = false; // animation node
..	..	@@ -295,6 +464,8 @@
295	464	boolean random = false;
296	465	boolean speedup = false;
297	466	boolean rewind = false;
	467	+
	468	+ float NORMALPUSH = 0;
298	469
299	470	Object3D support;
300	471
..	..	@@ -415,16 +586,16 @@
415	586	{
416	587	Object3D copy = this;
417	588
418		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	589	+ Camera parentcam = Globals.theRenderer.ManipCamera();
419	590
420		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	591	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
421	592	{
422		- parentcam = CameraPane.theRenderer.cameras[1];
	593	+ parentcam = Globals.theRenderer.Cameras()[1];
423	594	}
424	595
425		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	596	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
426	597	{
427		- parentcam = CameraPane.theRenderer.cameras[0];
	598	+ parentcam = Globals.theRenderer.Cameras()[0];
428	599	}
429	600
430	601	if (this == parentcam)
..	..	@@ -432,7 +603,7 @@
432	603	//assert(this instanceof Camera);
433	604
434	605	for (int count = parentcam.GetTransformCount(); --count>=0;)
435		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	606	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
436	607	}
437	608
438	609	copy.marked ^= true;
..	..	@@ -452,7 +623,7 @@
452	623	//assert(this instanceof Camera);
453	624
454	625	for (int count = parentcam.GetTransformCount(); --count>=0;)
455		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	626	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
456	627	}
457	628
458	629	copy.Touch(); // display list issue
..	..	@@ -465,12 +636,14 @@
465	636	toParent = LA.newMatrix();
466	637	fromParent = LA.newMatrix();
467	638	}
	639	+
468	640	if (toParentMarked == null)
469	641	{
470	642	if (maxcount != 1)
471	643	{
472	644	new Exception().printStackTrace();
473	645	}
	646	+
474	647	toParentMarked = LA.newMatrix();
475	648	fromParentMarked = LA.newMatrix();
476	649	}
..	..	@@ -587,7 +760,7 @@
587	760	return;
588	761	}
589	762
590		- if (CameraPane.fromscript)
	763	+ if (Globals.fromscript)
591	764	{
592	765	transformcount = 0;
593	766	return;
..	..	@@ -745,7 +918,7 @@
745	918
746	919	int GetTransformCount()
747	920	{
748		- // marde pour serialization de Texture
	921	+ // patch pour serialization de Texture
749	922	resetmaxcount();
750	923	resettransformcount();
751	924	resetstep();
..	..	@@ -758,7 +931,7 @@
758	931	if (step == 0)
759	932	step = 1;
760	933	if (maxcount == 0)
761		- maxcount = 2048; // 4;
	934	+ maxcount = 128; // 2048; // 4;
762	935	// if (acceleration == 0)
763	936	// acceleration = 10;
764	937	if (delay == 0) // serial
..	..	@@ -779,9 +952,12 @@
779	952	// factor = CameraPane.STEP;
780	953	// }
781	954
782		- if (marked && CameraPane.isLIVE() && live && CameraPane.drawMode == CameraPane.SHADOW && currentframe != CameraPane.framecount)
	955	+ if (marked && Globals.isLIVE() && live &&
	956	+ //TEMP21aug2018
	957	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
	958	+ currentframe != Globals.framecount)
783	959	{
784		- currentframe = CameraPane.framecount;
	960	+ currentframe = Globals.framecount;
785	961
786	962	// System.err.println("transformcount = " + transformcount);
787	963	// System.err.println("factor = " + factor);
..	..	@@ -790,7 +966,8 @@
790	966
791	967	boolean changedir = random && Math.random() < 0.01; // && !link2master;
792	968
793		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	969	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	970	+ (step == 1 && changedir))
794	971	{
795	972	countdown = 1;
796	973	delay = speedup?8:1;
..	..	@@ -862,6 +1039,10 @@
862	1039	if (material == null \|\| material.multiply)
863	1040	return true;
864	1041
	1042	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1043	+ return false;
	1044	+
	1045	+ // Transparent objects are dynamic because we have to sort the triangles.
865	1046	return material.opacity > 0.99;
866	1047	}
867	1048
..	..	@@ -893,6 +1074,11 @@
893	1074	fromParent = null; // LA.newMatrix();
894	1075	bRep = null; // new BoundaryRep();
895	1076
	1077	+ if (oname != null && oname.equals("LeftHand"))
	1078	+ {
	1079	+ name = oname;
	1080	+ }
	1081	+
896	1082	/*
897	1083	float hue = (float)Math.random();
898	1084	Color col;
..	..	@@ -935,7 +1121,7 @@
935	1121
936	1122	public Object clone()
937	1123	{
938		- return GrafreeD.clone(this);
	1124	+ return Grafreed.clone(this);
939	1125	}
940	1126
941	1127	Object3D copyExpand()
..	..	@@ -1257,6 +1443,7 @@
1257	1443	toParent = LA.newMatrix();
1258	1444	fromParent = LA.newMatrix();
1259	1445	}
	1446	+
1260	1447	LA.matCopy(other.toParent, toParent);
1261	1448	LA.matCopy(other.fromParent, fromParent);
1262	1449
..	..	@@ -1451,7 +1638,7 @@
1451	1638	BoundaryRep.SEUIL = other.material.cameralight;
1452	1639
1453	1640	// Set default to 0.1
1454		- BoundaryRep.SEUIL /= 2;
	1641	+ BoundaryRep.SEUIL /= 4; // 2;
1455	1642	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1456	1643	}
1457	1644
..	..	@@ -1710,7 +1897,7 @@
1710	1897	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1711	1898	o.bRep = transientrep;
1712	1899	if (clone)
1713		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1900	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1714	1901	o.CreateMaterial();
1715	1902	o.SetAttributes(this, -1);
1716	1903	//parent
..	..	@@ -1723,7 +1910,7 @@
1723	1910	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1724	1911	o.bRep = bRep;
1725	1912	if (clone)
1726		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1913	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1727	1914	o.CreateMaterial();
1728	1915	//o.overwriteThis(this, -1);
1729	1916	o.SetAttributes(this, -1);
..	..	@@ -1810,12 +1997,15 @@
1810	1997	if (obj.name == null)
1811	1998	continue; // can't be a null one
1812	1999
	2000	+ // Try perfect match first.
1813	2001	if (n.equals(obj.name))
1814	2002	{
1815	2003	theobj = obj;
1816	2004	count++;
1817	2005	}
1818	2006	}
	2007	+
	2008	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1819	2009
1820	2010	if (count != 1)
1821	2011	for (int i=Size(); --i>=0;)
..	..	@@ -2130,15 +2320,8 @@
2130	2320	if (/parent != null &&/ material == null)
2131	2321	{
2132	2322	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
	2323	+
	2324	+ InitOthers();
2142	2325
2143	2326	if (this instanceof Camera)
2144	2327	{
..	..	@@ -2282,12 +2465,18 @@
2282	2465	}
2283	2466	*/
2284	2467	}
	2468	+ else
	2469	+ {
	2470	+ //((ObjEditor)editWindow).SetupUI2(null);
	2471	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2472	+ }
2285	2473	}
2286	2474
2287	2475	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2288	2476	{
2289	2477	if (newWindow)
2290	2478	{
	2479	+ new Exception().printStackTrace();
2291	2480	System.exit(0);
2292	2481	if (parent != null)
2293	2482	{
..	..	@@ -2322,6 +2511,14 @@
2322	2511	{
2323	2512	editWindow.refreshContents();
2324	2513	}
	2514	+ else
	2515	+ {
	2516	+ if (manipWindow != null)
	2517	+ {
	2518	+ manipWindow.refreshContents();
	2519	+ }
	2520	+ }
	2521	+
2325	2522	//if (parent != null)
2326	2523	//parent.refreshEditWindow();
2327	2524	}
..	..	@@ -2401,7 +2598,8 @@
2401	2598	private static final int editSelf = 1;
2402	2599	private static final int editChild = 2;
2403	2600
2404		- void drawEditHandles(ClickInfo info, int level)
	2601	+ void drawEditHandles(//ClickInfo info,
	2602	+ int level)
2405	2603	{
2406	2604	if (level == 0)
2407	2605	{
..	..	@@ -2409,7 +2607,8 @@
2409	2607	return;
2410	2608
2411	2609	Object3D selectee;
2412		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2610	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2611	+ level + 1))
2413	2612	{
2414	2613	selectee = (Object3D) e.nextElement();
2415	2614	}
..	..	@@ -2417,19 +2616,22 @@
2417	2616	} else
2418	2617	{
2419	2618	//super.
2420		- drawEditHandles0(info, level + 1);
	2619	+ drawEditHandles0(//info,
	2620	+ level + 1);
2421	2621	}
2422	2622	}
2423	2623
2424		- boolean doEditClick(ClickInfo info, int level)
	2624	+ boolean doEditClick(//ClickInfo info,
	2625	+ int level)
2425	2626	{
2426	2627	doSomething = 0;
2427	2628	if (level == 0)
2428	2629	{
2429		- return doParentClick(info);
	2630	+ return doParentClick(); //info);
2430	2631	}
2431	2632	if (//super.
2432		- doEditClick0(info, level))
	2633	+ doEditClick0(//info,
	2634	+ level))
2433	2635	{
2434	2636	doSomething = 1;
2435	2637	return true;
..	..	@@ -2439,7 +2641,7 @@
2439	2641	}
2440	2642	}
2441	2643
2442		- boolean doParentClick(ClickInfo info)
	2644	+ boolean doParentClick() //ClickInfo info)
2443	2645	{
2444	2646	if (selection == null)
2445	2647	{
..	..	@@ -2452,7 +2654,8 @@
2452	2654	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2453	2655	{
2454	2656	Object3D selectee = (Object3D) e.nextElement();
2455		- if (selectee.doEditClick(info, 1))
	2657	+ if (selectee.doEditClick(//info,
	2658	+ 1))
2456	2659	{
2457	2660	childToDrag = selectee;
2458	2661	doSomething = 2;
..	..	@@ -2464,13 +2667,15 @@
2464	2667	return retval;
2465	2668	}
2466	2669
2467		- void doEditDrag(ClickInfo info)
	2670	+ void doEditDrag(//ClickInfo clickInfo,
	2671	+ boolean opposite)
2468	2672	{
2469	2673	switch (doSomething)
2470	2674	{
2471	2675	case 1: // '\001'
2472	2676	//super.
2473		- doEditDrag0(info);
	2677	+ doEditDrag0(//clickInfo,
	2678	+ opposite);
2474	2679	break;
2475	2680
2476	2681	case 2: // '\002'
..	..	@@ -2483,11 +2688,13 @@
2483	2688	{
2484	2689	//sel.hitSomething = childToDrag.hitSomething;
2485	2690	//childToDrag.doEditDrag(info);
2486		- sel.doEditDrag(info);
	2691	+ sel.doEditDrag(//clickInfo,
	2692	+ opposite);
2487	2693	} else
2488	2694	{
2489	2695	//super.
2490		- doEditDrag0(info);
	2696	+ doEditDrag0(//clickInfo,
	2697	+ opposite);
2491	2698	}
2492	2699	}
2493	2700	break;
..	..	@@ -2505,6 +2712,9 @@
2505	2712	{
2506	2713	deselectAll();
2507	2714	}
	2715	+
	2716	+ new Exception().printStackTrace();
	2717	+
2508	2718	ClickInfo newInfo = new ClickInfo();
2509	2719	newInfo.flags = info.flags;
2510	2720	newInfo.bounds = info.bounds;
..	..	@@ -2597,6 +2807,18 @@
2597	2807	void GenNormalsS(boolean crease)
2598	2808	{
2599	2809	selection.GenNormals(crease);
	2810	+// for (int i=0; i<selection.size(); i++)
	2811	+// {
	2812	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2813	+// selectee.GenNormals(crease);
	2814	+// }
	2815	+
	2816	+ //Touch();
	2817	+ }
	2818	+
	2819	+ void GenNormalsMeshS()
	2820	+ {
	2821	+ selection.GenNormalsMesh();
2600	2822	// for (int i=0; i<selection.size(); i++)
2601	2823	// {
2602	2824	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2737,6 +2959,24 @@
2737	2959	if (child == null)
2738	2960	continue;
2739	2961	child.GenNormals(crease);
	2962	+// Children().release(i);
	2963	+ }
	2964	+ blockloop = false;
	2965	+ }
	2966	+
	2967	+ void GenNormalsMesh()
	2968	+ {
	2969	+ if (blockloop)
	2970	+ return;
	2971	+
	2972	+ blockloop = true;
	2973	+ GenNormalsMesh0();
	2974	+ for (int i = 0; i < Children().Size(); i++)
	2975	+ {
	2976	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2977	+ if (child == null)
	2978	+ continue;
	2979	+ child.GenNormalsMesh();
2740	2980	// Children().release(i);
2741	2981	}
2742	2982	blockloop = false;
..	..	@@ -2894,7 +3134,8 @@
2894	3134	{
2895	3135	if (bRep != null)
2896	3136	{
2897		- bRep.GenUV();
	3137	+ bRep.GenUV(); //1);
	3138	+ //bRep.UnfoldUV();
2898	3139	Touch();
2899	3140	}
2900	3141	}
..	..	@@ -2908,11 +3149,20 @@
2908	3149	}
2909	3150	}
2910	3151
	3152	+ void GenNormalsMesh0()
	3153	+ {
	3154	+ if (bRep != null)
	3155	+ {
	3156	+ bRep.GenerateNormalsMesh();
	3157	+ Touch();
	3158	+ }
	3159	+ }
	3160	+
2911	3161	void GenNormalsMINE0()
2912	3162	{
2913	3163	if (bRep != null)
2914	3164	{
2915		- bRep.GenerateNormalsMINE();
	3165	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2916	3166	Touch();
2917	3167	}
2918	3168	}
..	..	@@ -2969,6 +3219,33 @@
2969	3219	blockloop = false;
2970	3220	}
2971	3221
	3222	+ void TransformChildren()
	3223	+ {
	3224	+ if (toParent != null)
	3225	+ {
	3226	+ for (int i=Size(); --i>=0;)
	3227	+ {
	3228	+ Object3D v = get(i);
	3229	+
	3230	+ if (v.toParent == null)
	3231	+ {
	3232	+ v.toParent = LA.newMatrix();
	3233	+ v.fromParent = LA.newMatrix();
	3234	+ }
	3235	+
	3236	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3237	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3238	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3239	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3240	+ }
	3241	+
	3242	+ toParent = null; // LA.matIdentity(toParent);
	3243	+ fromParent = null; // LA.matIdentity(fromParent);
	3244	+
	3245	+ Touch();
	3246	+ }
	3247	+ }
	3248	+
2972	3249	void TransformGeometry()
2973	3250	{
2974	3251	Object3D obj = this;
..	..	@@ -3190,9 +3467,11 @@
3190	3467
3191	3468	BoundaryRep sup = bRep.support;
3192	3469	bRep.support = null;
3193		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3470	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3194	3471	// bRep.SplitInTwo(onlyone); // thread...
3195		- temprep.SplitInTwo(reduction34, onlyone);
	3472	+
	3473	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3474	+
3196	3475	bRep = temprep;
3197	3476	bRep.support = sup;
3198	3477	Touch();
..	..	@@ -3329,7 +3608,8 @@
3329	3608	if (blockloop)
3330	3609	return;
3331	3610
3332		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3611	+ if (//marked \|\| // does not make sense
	3612	+ (bRep != null \|\| material != null)) // borderline...
3333	3613	live = h;
3334	3614
3335	3615	for (int i = 0; i < Size(); i++)
..	..	@@ -3350,7 +3630,8 @@
3350	3630	return;
3351	3631
3352	3632	//if (bRep != null)
3353		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3633	+ if (//marked \|\| // does not make sense
	3634	+ (bRep != null \|\| material != null)) // borderline...
3354	3635	link2master = h;
3355	3636
3356	3637	for (int i = 0; i < Size(); i++)
..	..	@@ -3370,7 +3651,8 @@
3370	3651	if (blockloop)
3371	3652	return;
3372	3653
3373		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3654	+ if (//marked \|\| // does not make sense
	3655	+ (bRep != null \|\| material != null)) // borderline...
3374	3656	hide = h;
3375	3657
3376	3658	for (int i = 0; i < Size(); i++)
..	..	@@ -3390,7 +3672,7 @@
3390	3672	if (blockloop)
3391	3673	return;
3392	3674
3393		- if (bRep != null && material != null) // borderline...
	3675	+ if (bRep != null \|\| material != null) // borderline...
3394	3676	marked = h;
3395	3677
3396	3678	for (int i = 0; i < Size(); i++)
..	..	@@ -3400,6 +3682,46 @@
3400	3682	continue;
3401	3683	blockloop = true;
3402	3684	child.MarkLeaves(h);
	3685	+ blockloop = false;
	3686	+ // release(i);
	3687	+ }
	3688	+ }
	3689	+
	3690	+ void RewindLeaves(boolean h)
	3691	+ {
	3692	+ if (blockloop)
	3693	+ return;
	3694	+
	3695	+ if (bRep != null \|\| material != null) // borderline...
	3696	+ rewind = h;
	3697	+
	3698	+ for (int i = 0; i < Size(); i++)
	3699	+ {
	3700	+ Object3D child = (Object3D) get(i); // reserve(i);
	3701	+ if (child == null)
	3702	+ continue;
	3703	+ blockloop = true;
	3704	+ child.RewindLeaves(h);
	3705	+ blockloop = false;
	3706	+ // release(i);
	3707	+ }
	3708	+ }
	3709	+
	3710	+ void RandomLeaves(boolean h)
	3711	+ {
	3712	+ if (blockloop)
	3713	+ return;
	3714	+
	3715	+ if (bRep != null \|\| material != null) // borderline...
	3716	+ random = h;
	3717	+
	3718	+ for (int i = 0; i < Size(); i++)
	3719	+ {
	3720	+ Object3D child = (Object3D) get(i); // reserve(i);
	3721	+ if (child == null)
	3722	+ continue;
	3723	+ blockloop = true;
	3724	+ child.RandomLeaves(h);
3403	3725	blockloop = false;
3404	3726	// release(i);
3405	3727	}
..	..	@@ -3714,7 +4036,7 @@
3714	4036	if (child == null)
3715	4037	continue;
3716	4038
3717		- if (GrafreeD.RENDERME > 0)
	4039	+ if (Grafreed.RENDERME > 0)
3718	4040	{
3719	4041	if (child instanceof Merge)
3720	4042	((Merge)child).renderme();
..	..	@@ -3865,7 +4187,7 @@
3865	4187	if (child == null)
3866	4188	continue;
3867	4189
3868		- if (GrafreeD.RENDERME > 0)
	4190	+ if (Grafreed.RENDERME > 0)
3869	4191	{
3870	4192	if (child instanceof Merge)
3871	4193	((Merge)child).renderme();
..	..	@@ -4060,7 +4382,7 @@
4060	4382	if (child == null)
4061	4383	continue;
4062	4384
4063		- if (GrafreeD.RENDERME > 0)
	4385	+ if (Grafreed.RENDERME > 0)
4064	4386	{
4065	4387	if (child instanceof Merge)
4066	4388	((Merge)child).renderme();
..	..	@@ -4157,6 +4479,71 @@
4157	4479	}
4158	4480	blockloop = true;
4159	4481	get(i).RepairParent();
	4482	+ blockloop = false;
	4483	+ }
	4484	+ }
	4485	+
	4486	+ void RepairShadow()
	4487	+ {
	4488	+ if (blockloop)
	4489	+ return;
	4490	+
	4491	+ if (this.material != null)
	4492	+ this.InitOthers();
	4493	+
	4494	+ for (int i=0; i<Size(); i++)
	4495	+ {
	4496	+ blockloop = true;
	4497	+ get(i).RepairShadow();
	4498	+ blockloop = false;
	4499	+ }
	4500	+ }
	4501	+
	4502	+ void RepairSOV()
	4503	+ {
	4504	+ if (blockloop)
	4505	+ return;
	4506	+
	4507	+ String texname = this.GetPigmentTexture();
	4508	+
	4509	+ if (texname.startsWith("sov"))
	4510	+ {
	4511	+ String[] s = texname.split("/");
	4512	+
	4513	+ String[] sname = s[1].split("Color.pn");
	4514	+
	4515	+ texname = sname[0];
	4516	+
	4517	+ if (sname.length > 1)
	4518	+ {
	4519	+ texname += "Color.jpg";
	4520	+ }
	4521	+
	4522	+ this.SetPigmentTexture("sov/" + texname);
	4523	+ }
	4524	+
	4525	+ texname = this.GetBumpTexture();
	4526	+
	4527	+ if (texname.startsWith("sov"))
	4528	+ {
	4529	+ String[] s = texname.split("/");
	4530	+
	4531	+ String[] sname = s[1].split("Bump.pn");
	4532	+
	4533	+ texname = sname[0];
	4534	+
	4535	+ if (sname.length > 1)
	4536	+ {
	4537	+ texname += "Bump.jpg";
	4538	+ }
	4539	+
	4540	+ this.SetBumpTexture("sov/" + texname);
	4541	+ }
	4542	+
	4543	+ for (int i=0; i<Size(); i++)
	4544	+ {
	4545	+ blockloop = true;
	4546	+ get(i).RepairSOV();
4160	4547	blockloop = false;
4161	4548	}
4162	4549	}
..	..	@@ -4651,7 +5038,7 @@
4651	5038
4652	5039	cTreePath SelectLeaf(int indexcount, boolean deselect)
4653	5040	{
4654		- if (hide)
	5041	+ if (hide \|\| dontselect)
4655	5042	return null;
4656	5043
4657	5044	if (count <= 0)
..	..	@@ -4675,9 +5062,17 @@
4675	5062	}
4676	5063	}
4677	5064
	5065	+ ObjEditor GetWindow()
	5066	+ {
	5067	+ if (editWindow != null)
	5068	+ return editWindow;
	5069	+
	5070	+ return manipWindow;
	5071	+ }
	5072	+
4678	5073	cTreePath Select(int indexcount, boolean deselect)
4679	5074	{
4680		- if (hide)
	5075	+ if (hide \|\| dontselect)
4681	5076	return null;
4682	5077
4683	5078	if (count <= 0)
..	..	@@ -4711,10 +5106,11 @@
4711	5106	if (leaf != null)
4712	5107	{
4713	5108	cTreePath tp = new cTreePath(this, leaf);
4714		- if (editWindow != null)
	5109	+ ObjEditor window = GetWindow();
	5110	+ if (window != null)
4715	5111	{
4716	5112	//System.out.println("editWindow = " + editWindow + " vs " + this);
4717		- editWindow.Select(tp, deselect, true);
	5113	+ window.Select(tp, deselect, true);
4718	5114	}
4719	5115
4720	5116	return tp;
..	..	@@ -4731,6 +5127,7 @@
4731	5127
4732	5128	if (child == null)
4733	5129	continue;
	5130	+
4734	5131	if (child.HasTransparency() && child.size() != 0)
4735	5132	{
4736	5133	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4740,9 +5137,10 @@
4740	5137	if (leaf != null)
4741	5138	{
4742	5139	cTreePath tp = new cTreePath(this, leaf);
4743		- if (editWindow != null)
	5140	+ ObjEditor window = GetWindow();
	5141	+ if (window != null)
4744	5142	{
4745		- editWindow.Select(tp, deselect, true);
	5143	+ window.Select(tp, deselect, true);
4746	5144	}
4747	5145
4748	5146	return tp;
..	..	@@ -4827,7 +5225,7 @@
4827	5225	return globalTransform;
4828	5226	}
4829	5227
4830		- void PreprocessOcclusion(CameraPane cp)
	5228	+ void PreprocessOcclusion(iCameraPane cp)
4831	5229	{
4832	5230	/*
4833	5231	if (AOdone)
..	..	@@ -4974,7 +5372,8 @@
4974	5372	} else //
4975	5373	if (editWindow != null)
4976	5374	{
4977		- editWindow.cameraView.lighttouched = true;
	5375	+ //editWindow.cameraView.lighttouched = true;
	5376	+ Globals.lighttouched = true;
4978	5377	}
4979	5378	}
4980	5379
..	..	@@ -5066,6 +5465,51 @@
5066	5465	blockloop = false;
5067	5466	}
5068	5467
	5468	+ void ResetSelectable()
	5469	+ {
	5470	+ if (blockloop)
	5471	+ return;
	5472	+
	5473	+ blockloop = true;
	5474	+
	5475	+ keepdontselect = dontselect;
	5476	+ dontselect = true;
	5477	+
	5478	+ Object3D child;
	5479	+ int nb = Size();
	5480	+ for (int i = 0; i < nb; i++)
	5481	+ {
	5482	+ child = (Object3D) get(i);
	5483	+ if (child == null)
	5484	+ continue;
	5485	+ child.ResetSelectable();
	5486	+ }
	5487	+
	5488	+ blockloop = false;
	5489	+ }
	5490	+
	5491	+ void RestoreSelectable()
	5492	+ {
	5493	+ if (blockloop)
	5494	+ return;
	5495	+
	5496	+ blockloop = true;
	5497	+
	5498	+ dontselect = keepdontselect;
	5499	+
	5500	+ Object3D child;
	5501	+ int nb = Size();
	5502	+ for (int i = 0; i < nb; i++)
	5503	+ {
	5504	+ child = (Object3D) get(i);
	5505	+ if (child == null)
	5506	+ continue;
	5507	+ child.RestoreSelectable();
	5508	+ }
	5509	+
	5510	+ blockloop = false;
	5511	+ }
	5512	+
5069	5513	boolean IsSelected()
5070	5514	{
5071	5515	if (parent == null)
..	..	@@ -5128,10 +5572,34 @@
5128	5572
5129	5573	// System.out.println("Fullname = " + fullname);
5130	5574
5131		- if (fullname.name.indexOf(":") == -1)
5132		- return fullname.name;
	5575	+ // Does not work on Windows due to C:
	5576	+// if (fullname.name.indexOf(":") == -1)
	5577	+// return fullname.name;
	5578	+//
	5579	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5133	5580
5134		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5581	+ String[] split = fullname.name.split(":");
	5582	+
	5583	+ if (split.length == 0)
	5584	+ {
	5585	+ return "";
	5586	+ }
	5587	+
	5588	+ if (split.length <= 2)
	5589	+ {
	5590	+ if (fullname.name.endsWith(":"))
	5591	+ {
	5592	+ // Windows
	5593	+ return fullname.name.substring(0, fullname.name.length()-1);
	5594	+ }
	5595	+
	5596	+ return split[0];
	5597	+ }
	5598	+
	5599	+ // Windows
	5600	+ assert(split.length == 4);
	5601	+
	5602	+ return split[0] + ":" + split[1];
5135	5603	}
5136	5604
5137	5605	static String GetBump(cTexture fullname)
..	..	@@ -5140,10 +5608,38 @@
5140	5608	return "";
5141	5609
5142	5610	// 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());
	5611	+ // Does not work on Windows due to C:
	5612	+// if (fullname.name.indexOf(":") == -1)
	5613	+// return "";
	5614	+//
	5615	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5616	+ String[] split = fullname.name.split(":");
	5617	+
	5618	+ if (split.length == 0)
	5619	+ {
	5620	+ return "";
	5621	+ }
	5622	+
	5623	+ if (split.length == 1)
	5624	+ {
	5625	+ return "";
	5626	+ }
	5627	+
	5628	+ if (split.length == 2)
	5629	+ {
	5630	+ if (fullname.name.endsWith(":"))
	5631	+ {
	5632	+ // Windows
	5633	+ return "";
	5634	+ }
	5635	+
	5636	+ return split[1];
	5637	+ }
	5638	+
	5639	+ // Windows
	5640	+ assert(split.length == 4);
	5641	+
	5642	+ return split[2] + ":" + split[3];
5147	5643	}
5148	5644
5149	5645	String GetPigmentTexture()
..	..	@@ -5217,7 +5713,7 @@
5217	5713	System.out.print("; textures = " + textures);
5218	5714	System.out.println("; usedtextures = " + usedtextures);
5219	5715
5220		- if (GetTextures() == null)
	5716	+ if (GetTextures() == null) // What is that??
5221	5717	GetTextures().name = ":";
5222	5718
5223	5719	String texname = tex;
..	..	@@ -5248,6 +5744,43 @@
5248	5744	child.ResetPigmentTexture();
5249	5745	blockloop = false;
5250	5746	}
	5747	+ }
	5748	+
	5749	+ UUID GetUUID()
	5750	+ {
	5751	+ if (uuid == null)
	5752	+ {
	5753	+ // Serial
	5754	+ uuid = UUID.randomUUID();
	5755	+ }
	5756	+
	5757	+ return uuid;
	5758	+ }
	5759	+
	5760	+ Object3D GetObject(UUID uid)
	5761	+ {
	5762	+ if (blockloop)
	5763	+ return null;
	5764	+
	5765	+ if (GetUUID().equals(uid))
	5766	+ return this;
	5767	+
	5768	+ int nb = Size();
	5769	+ for (int i = 0; i < nb; i++)
	5770	+ {
	5771	+ Object3D child = (Object3D) get(i);
	5772	+
	5773	+ if (child == null)
	5774	+ continue;
	5775	+
	5776	+ blockloop = true;
	5777	+ Object3D obj = child.GetObject(uid);
	5778	+ blockloop = false;
	5779	+ if (obj != null)
	5780	+ return obj;
	5781	+ }
	5782	+
	5783	+ return null;
5251	5784	}
5252	5785
5253	5786	void SetBumpTexture(String tex)
..	..	@@ -5286,25 +5819,65 @@
5286	5819	}
5287	5820	}
5288	5821
5289		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5822	+ void EmbedTextures(boolean embed)
	5823	+ {
	5824	+ if (blockloop)
	5825	+ return;
	5826	+
	5827	+ //if (GetTextures() != null)
	5828	+ if (embed)
	5829	+ CameraPane.EmbedTextures(GetTextures());
	5830	+ else
	5831	+ {
	5832	+ GetTextures().pigmentdata = null;
	5833	+ GetTextures().bumpdata = null;
	5834	+ GetTextures().pw = 0;
	5835	+ GetTextures().ph = 0;
	5836	+ GetTextures().bw = 0;
	5837	+ GetTextures().bh = 0;
	5838	+ }
	5839	+
	5840	+ int nb = Size();
	5841	+ for (int i = 0; i < nb; i++)
	5842	+ {
	5843	+ Object3D child = (Object3D) get(i);
	5844	+
	5845	+ if (child == null)
	5846	+ continue;
	5847	+
	5848	+ blockloop = true;
	5849	+ child.EmbedTextures(embed);
	5850	+ blockloop = false;
	5851	+ }
	5852	+ }
	5853	+
	5854	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5290	5855	{
5291	5856	Draw(display, root, selected, blocked);
5292	5857	}
5293	5858
5294		- static cMaterial[] materialstack = new cMaterial[65536];
5295		- static boolean[] selectedstack = new boolean[65536];
5296		- static int materialdepth = 0;
5297		-
5298	5859	boolean NeedSupport()
5299	5860	{
5300	5861	return
5301		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5862	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5302	5863	// PROBLEM with CROWD!!
5303		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	5864	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5304	5865	}
5305	5866
	5867	+ static boolean DEBUG_SELECTION = false;
5306	5868
5307		- void Draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5869	+ boolean IsLive()
	5870	+ {
	5871	+ if (live)
	5872	+ return true;
	5873	+
	5874	+ if (parent == null)
	5875	+ return false;
	5876	+
	5877	+ return parent.IsLive();
	5878	+ }
	5879	+
	5880	+ void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5308	5881	{
5309	5882	Invariants(); // june 2013
5310	5883
..	..	@@ -5313,8 +5886,8 @@
5313	5886	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5314	5887	}
5315	5888
5316		- if (display.drawMode == CameraPane.SELECTION &&
5317		- hide)
	5889	+ if (display.DrawMode() == iCameraPane.SELECTION &&
	5890	+ (hide \|\| dontselect))
5318	5891	return;
5319	5892
5320	5893	if (name != null && name.contains("sclera"))
..	..	@@ -5332,7 +5905,7 @@
5332	5905	if (this instanceof Checker)
5333	5906	return;
5334	5907
5335		- if (display.drawMode == display.SHADOW && PASSTEST)
	5908	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5336	5909	return;
5337	5910
5338	5911	if (count <= 0)
..	..	@@ -5340,13 +5913,13 @@
5340	5913	return;
5341	5914	}
5342	5915
5343		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5344		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5916	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	5917	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5345	5918	{
5346	5919	return;
5347	5920	}
5348	5921
5349		- javax.media.opengl.GL gl = display.GetGL();
	5922	+ //javax.media.opengl.GL gl = display.GetGL();
5350	5923
5351	5924	/*
5352	5925	if (touched)
..	..	@@ -5364,8 +5937,10 @@
5364	5937	if (support != null)
5365	5938	support = support;
5366	5939
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);
	5940	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5941	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5942	+
	5943	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5369	5944
5370	5945	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5371	5946	{
..	..	@@ -5375,30 +5950,33 @@
5375	5950	// usecalllists &= !(parent instanceof RandomNode);
5376	5951	// usecalllists = false;
5377	5952
5378		- if (GetBRep() != null)
5379		- usecalllists = usecalllists;
	5953	+ if (display.DrawMode() == display.SHADOW)
	5954	+ //GetBRep() != null)
	5955	+ usecalllists = !!usecalllists;
5380	5956	//System.out.println("draw " + this);
5381	5957	//new Exception().printStackTrace();
5382	5958
5383	5959	boolean compiled = false;
5384	5960
5385		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5961	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5386	5962
5387		- if (!selectmode && //display.drawMode != display.SELECTION &&
5388		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5963	+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
	5964	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5965	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5389	5966	{
5390		- display.lighttouched = true;
	5967	+ Globals.lighttouched = true;
5391	5968	} // 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 &&
	5969	+
	5970	+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
	5971	+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5394	5972	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5395	5973	{
5396	5974	if (!(this instanceof Composite))
5397	5975	touched = false;
5398	5976	//if (displaylist == -1 && usecalllists)
5399		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5977	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5400	5978	{
5401		- bRep.displaylist = gl.glGenLists(1);
	5979	+ bRep.displaylist = display.GenList();
5402	5980	assert(bRep.displaylist != 0);
5403	5981	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5404	5982	//System.out.println("\tgen list " + list);
..	..	@@ -5407,21 +5985,23 @@
5407	5985
5408	5986	//System.out.println("\tnew list " + list);
5409	5987	//gl.glDrawBuffer(gl.GL_NONE);
5410		- if (usecalllists)
	5988	+ if (usecalllists && bRep.displaylist > 0)
5411	5989	{
5412	5990	// System.err.println("new list " + bRep.displaylist + " for " + this);
5413		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5991	+ display.NewList(bRep.displaylist);
5414	5992	}
	5993	+
5415	5994	CallList(display, root, selected, blocked);
	5995	+
5416	5996	// compiled = true;
5417		- if (usecalllists)
	5997	+ if (usecalllists && bRep.displaylist > 0)
5418	5998	{
5419	5999	// System.err.println("end list " + bRep.displaylist + " for " + this);
5420		- gl.glEndList();
	6000	+ display.EndList();
5421	6001	}
5422	6002	//gl.glDrawBuffer(gl.GL_BACK);
5423	6003	// XXX touched = false;
5424		- display.lighttouched = true; // all panes...
	6004	+ Globals.lighttouched = true; // all panes...
5425	6005	}
5426	6006
5427	6007	touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
..	..	@@ -5460,12 +6040,12 @@
5460	6040
5461	6041	// frustum culling
5462	6042	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5463		- && display.drawMode != CameraPane.SELECTION)
	6043	+ && display.DrawMode() != iCameraPane.SELECTION)
5464	6044	{
5465		- if (display.drawMode == CameraPane.SHADOW)
	6045	+ if (display.DrawMode() == iCameraPane.SHADOW)
5466	6046	{
5467	6047	if (!link2master // tricky to cull in shadow mode.
5468		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	6048	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5469	6049	{
5470	6050	//System.out.print("CULLED");
5471	6051	culled = true;
..	..	@@ -5473,7 +6053,7 @@
5473	6053	}
5474	6054	else
5475	6055	//GetBRep().getBounds(v0, v1, this);
5476		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	6056	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5477	6057	culled = true;
5478	6058
5479	6059	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5509,11 +6089,12 @@
5509	6089
5510	6090
5511	6091	if (!culled)
5512		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	6092	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5513	6093	{
5514	6094	if (GetBRep() != null)
5515	6095	{
5516		- CameraPane.NextIndex(this, gl);
	6096	+ display.NextIndex();
	6097	+
5517	6098	// vertex color conflict : gl.glCallList(list);
5518	6099	DrawNode(display, root, selected);
5519	6100	if (this instanceof BezierPatch)
..	..	@@ -5535,55 +6116,7 @@
5535	6116	color[2] /= 2;
5536	6117	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5537	6118	*/
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		- }
	6119	+ display.PushMaterial(this, selected);
5587	6120
5588	6121	//System.out.println("call list " + list);
5589	6122	//System.out.println();
..	..	@@ -5602,7 +6135,28 @@
5602	6135	tex = GetTextures();
5603	6136	}
5604	6137
5605		- display.BindTextures(tex, texres);
	6138	+ boolean failedPigment = false;
	6139	+ boolean failedBump = false;
	6140	+
	6141	+ try
	6142	+ {
	6143	+ display.BindPigmentTexture(tex, texres);
	6144	+ }
	6145	+ catch (Exception e)
	6146	+ {
	6147	+ System.err.println("FAILED: " + this);
	6148	+ failedPigment = true;
	6149	+ }
	6150	+
	6151	+ try
	6152	+ {
	6153	+ display.BindBumpTexture(tex, texres);
	6154	+ }
	6155	+ catch (Exception e)
	6156	+ {
	6157	+ //System.err.println("FAILED: " + this);
	6158	+ failedBump = true;
	6159	+ }
5606	6160
5607	6161	if (!compiled)
5608	6162	{
..	..	@@ -5618,30 +6172,19 @@
5618	6172
5619	6173	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5620	6174	assert(bRep.displaylist != 0);
5621		- gl.glCallList(bRep.displaylist);
	6175	+ display.CallList(bRep.displaylist);
5622	6176	// june 2013 drawSelf(display, root, selected);
5623	6177	}
5624	6178	}
5625	6179	}
5626	6180
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		- }
	6181	+ if (!failedBump)
	6182	+ display.ReleaseBumpTexture(tex);
	6183	+
	6184	+ if (!failedPigment)
	6185	+ display.ReleasePigmentTexture(tex);
	6186	+
	6187	+ display.PopMaterial(this, selected);
5645	6188	}
5646	6189
5647	6190	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5683,7 +6226,7 @@
5683	6226	// resetMasterNode();
5684	6227	}
5685	6228
5686		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6229	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5687	6230	{
5688	6231	if (GetBRep() == null)
5689	6232	{
..	..	@@ -5766,8 +6309,11 @@
5766	6309	boolean flipV = false; // true;
5767	6310	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5768	6311
5769		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6312	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5770	6313	{
	6314	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6315	+ return;
	6316	+
5771	6317	if (hide)
5772	6318	return;
5773	6319	// shadow optimisation
..	..	@@ -5825,16 +6371,7 @@
5825	6371	// // ??????????????????????????? Touch();
5826	6372	// }
5827	6373
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		- }
	6374	+display.PushMaterial2(this, selected);
5838	6375
5839	6376	Object3D child;
5840	6377	boolean sel;
..	..	@@ -5886,19 +6423,7 @@
5886	6423	*/
5887	6424	//depth += 1;
5888	6425
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		-
	6426	+display.PopMaterial2(this);
5902	6427	/*
5903	6428	display.ReleaseTextures(tex);
5904	6429	*/
..	..	@@ -5909,10 +6434,13 @@
5909	6434
5910	6435	//static cVector min,max;
5911	6436
5912		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	6437	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5913	6438	{
5914		- if (display.drawMode == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	6439	+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5915	6440	return; // no shadow for transparent objects
	6441	+
	6442	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6443	+ return;
5916	6444
5917	6445	if (hide)
5918	6446	return;
..	..	@@ -5954,11 +6482,12 @@
5954	6482	return;
5955	6483	}
5956	6484
	6485	+ //bRep.GenUV(1/material.diffuseness);
5957	6486	// bRep.lock = true;
5958	6487
5959		- javax.media.opengl.GL gl = display.GetGL();
	6488	+ //javax.media.opengl.GL gl = display.GetGL();
5960	6489
5961		- if (CameraPane.BOXMODE) // \|\| CameraPane.movingcamera)
	6490	+ if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5962	6491	{
5963	6492	int fc = bRep.FaceCount();
5964	6493	int vc = bRep.VertexCount();
..	..	@@ -5973,23 +6502,7 @@
5973	6502
5974	6503	bRep.getMinMax(min, max, 100);
5975	6504
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();
	6505	+ display.DrawBox(min, max);
5993	6506
5994	6507	return;
5995	6508	}
..	..	@@ -6033,7 +6546,7 @@
6033	6546	{
6034	6547	//throw new Error();
6035	6548
6036		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6549	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
6037	6550
6038	6551	int[] strips = bRep.getRawIndices();
6039	6552
..	..	@@ -6043,178 +6556,19 @@
6043	6556	new Exception().printStackTrace();
6044	6557	return;
6045	6558	}
6046		-
6047		- // TRIANGLE STRIP ARRAY
6048		- if (bRep.trimmed)
	6559	+
	6560	+ if (dontselect)
6049	6561	{
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;
	6562	+ //bRep.GenerateNormalsMINE();
6181	6563	}
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		- }
	6564	+
	6565	+ display.DrawGeometry(bRep, flipV, selectmode);
6212	6566	} else // catch (Error e)
6213	6567	{
6214	6568	// TRIANGLE ARRAY
6215	6569	if (IsOpaque()) // Static())
6216	6570	{
6217		- gl.glBegin(gl.GL_TRIANGLES);
	6571	+ display.StartTriangles();
6218	6572	int facecount = bRep.FaceCount();
6219	6573	for (int i = 0; i < facecount; i++)
6220	6574	{
..	..	@@ -6277,9 +6631,9 @@
6277	6631	// // r.norm.dot(v3) > -0.5)
6278	6632	// // continue;
6279	6633
6280		- drawFace(p, q, r, display, face);
	6634	+ display.DrawFace(this, p, q, r, face);
6281	6635	}
6282		- gl.glEnd();
	6636	+ display.EndTriangles();
6283	6637	}
6284	6638	else
6285	6639	{
..	..	@@ -6308,8 +6662,8 @@
6308	6662	//System.out.println("SORT");
6309	6663
6310	6664	java.util.Arrays.sort(facescompare);
6311		-
6312		- gl.glBegin(gl.GL_TRIANGLES);
	6665	+
	6666	+ display.StartTriangles();
6313	6667	for (int i = 0; i < facecount; i++)
6314	6668	{
6315	6669	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6321,13 +6675,14 @@
6321	6675	Vertex q = bRep.GetVertex(face.q);
6322	6676	Vertex r = bRep.GetVertex(face.r);
6323	6677
6324		- drawFace(p, q, r, display, face);
	6678	+ display.DrawFace(this, p, q, r, face);
6325	6679	}
6326		- gl.glEnd();
	6680	+ display.EndTriangles();
6327	6681	}
6328	6682
6329	6683	if (false) // live && support != null && support.bRep != null) // debug weights
6330	6684	{
	6685	+ /*
6331	6686	gl.glDisable(gl.GL_LIGHTING);
6332	6687	float[] colorV = new float[3];
6333	6688
..	..	@@ -6406,6 +6761,7 @@
6406	6761	// gl.glEnd();
6407	6762	}
6408	6763	}
	6764	+ */
6409	6765	}
6410	6766	}
6411	6767
..	..	@@ -6450,7 +6806,7 @@
6450	6806	center.add(r);
6451	6807	center.mul(1.0/3);
6452	6808
6453		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6809	+ center.sub(Globals.theRenderer.EyeCamera().location);
6454	6810
6455	6811	distance = center.dot(center);
6456	6812	}
..	..	@@ -6461,347 +6817,11 @@
6461	6817
6462	6818	transient FaceCompare[] facescompare = null;
6463	6819
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	6820	void Print(Vertex v)
6639	6821	{
6640	6822	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6641	6823	}
6642	6824
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	6825	void drawSelf(ClickInfo info, int level, boolean select)
6806	6826	{
6807	6827	if (bRep == null)
..	..	@@ -7325,20 +7345,23 @@
7325	7345	}
7326	7346	}
7327	7347
7328		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7348	+ static ClickInfo clickInfo = new ClickInfo();
	7349	+
	7350	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7351	+ Point outPt, Rectangle outRec)
7329	7352	{
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;
	7353	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7354	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7355	+ double[][] toscreen = clickInfo.toScreen;
7333	7356	if (toscreen == null)
7334	7357	{
7335		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7358	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7336	7359	}
7337	7360	cVector vec = in;
7338	7361	LA.xformPos(in, toscreen, in);
7339	7362	//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();
	7363	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7364	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7342	7365	outPt.x = hc + (int) vec.x;
7343	7366	outPt.y = vc - (int) vec.y;
7344	7367	outRec.x = outPt.x - 3;
..	..	@@ -7346,15 +7369,18 @@
7346	7369	outRec.width = outRec.height = 6;
7347	7370	}
7348	7371
7349		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7372	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7373	+ )
7350	7374	{
7351	7375	Point pt = new Point(0, 0);
7352	7376	Rectangle rec = new Rectangle();
7353		- calcHotSpot(in, info, pt, rec);
	7377	+ calcHotSpot(in, //clickInfo,
	7378	+ pt, rec);
7354	7379	return rec;
7355	7380	}
7356	7381
7357		- void drawEditHandles0(ClickInfo info, int level)
	7382	+ void drawEditHandles0(//ClickInfo clickInfo,
	7383	+ int level)
7358	7384	{
7359	7385	if (level == 0)
7360	7386	{
..	..	@@ -7363,98 +7389,103 @@
7363	7389	{
7364	7390	cVector origin = new cVector();
7365	7391	//LA.xformPos(origin, toParent, origin);
7366		- Rectangle spot = calcHotSpot(origin, info);
	7392	+ if (this.clickInfo == null)
	7393	+ this.clickInfo = new ClickInfo();
	7394	+
	7395	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7367	7396	Rectangle boundary = new Rectangle();
7368	7397	boundary.x = spot.x - 30;
7369	7398	boundary.y = spot.y - 30;
7370	7399	boundary.width = spot.width + 60;
7371	7400	boundary.height = spot.height + 60;
7372		- info.g.setColor(Color.red);
	7401	+ clickInfo.g.setColor(Color.red);
7373	7402	int spotw = spot.x + spot.width;
7374	7403	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		- }
	7404	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7405	+// if (CameraPane.Xmin > spot.x)
	7406	+// {
	7407	+// CameraPane.Xmin = spot.x;
	7408	+// }
	7409	+// if (CameraPane.Xmax < spotw)
	7410	+// {
	7411	+// CameraPane.Xmax = spotw;
	7412	+// }
	7413	+// if (CameraPane.Ymin > spot.y)
	7414	+// {
	7415	+// CameraPane.Ymin = spot.y;
	7416	+// }
	7417	+// if (CameraPane.Ymax < spoth)
	7418	+// {
	7419	+// CameraPane.Ymax = spoth;
	7420	+// }
7392	7421	spot.translate(32, 32);
7393	7422	spotw = spot.x + spot.width;
7394	7423	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);
	7424	+ clickInfo.g.setColor(Color.cyan);
	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	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7443	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7415	7444	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);
	7445	+ clickInfo.g.setColor(Color.yellow);
	7446	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7447	+ clickInfo.g.setColor(Color.green);
	7448	+// if (CameraPane.Xmin > spot.x)
	7449	+// {
	7450	+// CameraPane.Xmin = spot.x;
	7451	+// }
	7452	+// if (CameraPane.Xmax < spotw)
	7453	+// {
	7454	+// CameraPane.Xmax = spotw;
	7455	+// }
	7456	+// if (CameraPane.Ymin > spot.y)
	7457	+// {
	7458	+// CameraPane.Ymin = spot.y;
	7459	+// }
	7460	+// if (CameraPane.Ymax < spoth)
	7461	+// {
	7462	+// CameraPane.Ymax = spoth;
	7463	+// }
	7464	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7465	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7436	7466	//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		- }
	7467	+// if (CameraPane.Xmin > boundary.x)
	7468	+// {
	7469	+// CameraPane.Xmin = boundary.x;
	7470	+// }
	7471	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	7472	+// {
	7473	+// CameraPane.Xmax = boundary.x + boundary.width;
	7474	+// }
	7475	+// if (CameraPane.Ymin > boundary.y)
	7476	+// {
	7477	+// CameraPane.Ymin = boundary.y;
	7478	+// }
	7479	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	7480	+// {
	7481	+// CameraPane.Ymax = boundary.y + boundary.height;
	7482	+// }
7453	7483	return;
7454	7484	}
7455	7485	}
7456	7486
7457		- boolean doEditClick0(ClickInfo info, int level)
	7487	+ boolean doEditClick0(//ClickInfo clickInfo,
	7488	+ int level)
7458	7489	{
7459	7490	if (level == 0)
7460	7491	{
..	..	@@ -7463,10 +7494,10 @@
7463	7494
7464	7495	boolean retval = false;
7465	7496
7466		- startX = info.x;
7467		- startY = info.y;
	7497	+ startX = clickInfo.x;
	7498	+ startY = clickInfo.y;
7468	7499
7469		- hitSomething = 0;
	7500	+ hitSomething = -1;
7470	7501	cVector origin = new cVector();
7471	7502	//LA.xformPos(origin, toParent, origin);
7472	7503	Rectangle spot = new Rectangle();
..	..	@@ -7474,22 +7505,51 @@
7474	7505	{
7475	7506	centerPt = new Point(0, 0);
7476	7507	}
7477		- calcHotSpot(origin, info, centerPt, spot);
7478		- if (spot.contains(info.x, info.y))
	7508	+ calcHotSpot(origin, //info,
	7509	+ centerPt, spot);
	7510	+ if (spot.contains(clickInfo.x, clickInfo.y))
7479	7511	{
7480	7512	hitSomething = hitCenter;
7481	7513	retval = true;
7482	7514	}
7483	7515	spot.translate(32, 0);
7484		- if (spot.contains(info.x, info.y))
	7516	+ if (spot.contains(clickInfo.x, clickInfo.y))
7485	7517	{
7486	7518	hitSomething = hitRotate;
7487	7519	retval = true;
7488	7520	}
7489	7521	spot.translate(0, 32);
7490		- if (spot.contains(info.x, info.y))
	7522	+ if (spot.contains(clickInfo.x, clickInfo.y))
7491	7523	{
7492	7524	hitSomething = hitScale;
	7525	+
	7526	+ double scale = 0.005f * clickInfo.camera.Distance();
	7527	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7528	+ double sign = 1;
	7529	+ if (hScale < 0)
	7530	+ {
	7531	+ sign = -1;
	7532	+ }
	7533	+ hScale = signMath.pow(signhScale, scale * 50);
	7534	+ if (hScale < 0.01)
	7535	+ {
	7536	+ //hScale = 0.01;
	7537	+ }
	7538	+
	7539	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7540	+ sign = 1;
	7541	+ if (vScale < 0)
	7542	+ {
	7543	+ sign = -1;
	7544	+ }
	7545	+ vScale = signMath.pow(signvScale, scale * 50);
	7546	+ if (vScale < 0.01)
	7547	+ {
	7548	+ //vScale = 0.01;
	7549	+ }
	7550	+
	7551	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7552	+
7493	7553	retval = true;
7494	7554	}
7495	7555
..	..	@@ -7499,7 +7559,7 @@
7499	7559	}
7500	7560
7501	7561	//System.out.println("info.modifiers = " + info.modifiers);
7502		- modified = (info.modifiers & CameraPane.META) != 0;
	7562	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7503	7563	//System.out.println("modified = " + modified);
7504	7564	//new Exception().printStackTrace();
7505	7565	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7527,7 +7587,8 @@
7527	7587	return true;
7528	7588	}
7529	7589
7530		- void doEditDrag0(ClickInfo info)
	7590	+ void doEditDrag0(//ClickInfo info,
	7591	+ boolean opposite)
7531	7592	{
7532	7593	if (hitSomething == 0)
7533	7594	{
..	..	@@ -7541,7 +7602,8 @@
7541	7602
7542	7603	//System.out.println("hitSomething = " + hitSomething);
7543	7604
7544		- double scale = 0.005f * info.camera.Distance();
	7605	+ double scale = 0.005f * clickInfo.camera.Distance();
	7606	+
7545	7607	cVector xlate = new cVector();
7546	7608	//cVector xlate2 = new cVector();
7547	7609	switch (hitSomething)
..	..	@@ -7552,9 +7614,9 @@
7552	7614
7553	7615	case hitCenter: // Translate
7554	7616
7555		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7617	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7556	7618
7557		- if (modified)
	7619	+ if (modified \|\| opposite)
7558	7620	{
7559	7621	//assert(false);
7560	7622	/*
..	..	@@ -7574,8 +7636,8 @@
7574	7636	toParent[3][i] = xlate.get(i);
7575	7637	LA.matInvert(toParent, fromParent);
7576	7638	*/
7577		- cVector delta = LA.newVector(0, 0, startY - info.y);
7578		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7639	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7640	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7579	7641
7580	7642	LA.matCopy(startMat, toParent);
7581	7643	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7584,7 +7646,7 @@
7584	7646	} else
7585	7647	{
7586	7648	//LA.xformDir(delta, info.camera.fromScreen, delta);
7587		- cVector up = new cVector(info.camera.up);
	7649	+ cVector up = new cVector(clickInfo.camera.up);
7588	7650	cVector away = new cVector();
7589	7651	//cVector right2 = new cVector();
7590	7652	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7600,20 +7662,20 @@
7600	7662	}
7601	7663	LA.xformDir(up, ClickInfo.matbuffer, up);
7602	7664	// if (!CameraPane.LOCALTRANSFORM)
7603		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
7604		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7665	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
	7666	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7605	7667	// if (!CameraPane.LOCALTRANSFORM)
7606		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7668	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7607	7669	//LA.vecCross(up, cVector.Z, right2);
7608	7670
7609		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7671	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7610	7672
7611	7673	//System.out.println("DELTA0 = " + delta);
7612	7674	//System.out.println("AWAY = " + info.camera.away);
7613	7675	//System.out.println("UP = " + info.camera.up);
7614	7676	if (away.z > 0)
7615	7677	{
7616		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7678	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7617	7679	{
7618	7680	delta.x = -delta.x;
7619	7681	} else
..	..	@@ -7628,7 +7690,7 @@
7628	7690	//System.out.println("DELTA1 = " + delta);
7629	7691	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7630	7692	//System.out.println("DELTA2 = " + delta);
7631		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7693	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7632	7694	LA.matCopy(startMat, toParent);
7633	7695	//System.out.println("DELTA3 = " + delta);
7634	7696	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7638,8 +7700,8 @@
7638	7700	break;
7639	7701
7640	7702	case hitRotate: // rotate
7641		- int dx = info.x - centerPt.x;
7642		- int dy = -(info.y - centerPt.y);
	7703	+ int dx = clickInfo.x - centerPt.x;
	7704	+ int dy = -(clickInfo.y - centerPt.y);
7643	7705	double angle = (double) Math.atan2(dx, dy);
7644	7706	angle = -(1.570796 - angle);
7645	7707
..	..	@@ -7648,6 +7710,7 @@
7648	7710
7649	7711	if (modified)
7650	7712	{
	7713	+ // Rotate 90 degrees
7651	7714	angle /= (Math.PI / 4);
7652	7715	angle = Math.floor(angle + 0.5);
7653	7716	angle *= (Math.PI / 4);
..	..	@@ -7661,7 +7724,7 @@
7661	7724	}
7662	7725	/**/
7663	7726
7664		- switch (info.pane.renderCamera.viewCode)
	7727	+ switch (clickInfo.pane.RenderCamera().viewCode)
7665	7728	{
7666	7729	case 1: // '\001'
7667	7730	LA.matZRotate(toParent, angle);
..	..	@@ -7688,26 +7751,30 @@
7688	7751	break;
7689	7752
7690	7753	case hitScale: // scale
7691		- double hScale = (double) (info.x - centerPt.x) / 32;
	7754	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7755	+ double sign = 1;
	7756	+ if (hScale < 0)
	7757	+ {
	7758	+ sign = -1;
	7759	+ }
	7760	+ hScale = signMath.pow(signhScale, scale * 50);
7692	7761	if (hScale < 0.01)
7693	7762	{
7694		- hScale = 0.01;
	7763	+ //hScale = 0.01;
7695	7764	}
7696		- hScale = Math.pow(hScale, scale * 50);
7697		- if (hScale < 0.01)
	7765	+
	7766	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7767	+ sign = 1;
	7768	+ if (vScale < 0)
7698	7769	{
7699		- hScale = 0.01;
	7770	+ sign = -1;
7700	7771	}
7701		- double vScale = (double) (info.y - centerPt.y) / 32;
	7772	+ vScale = signMath.pow(signvScale, scale * 50);
7702	7773	if (vScale < 0.01)
7703	7774	{
7704		- vScale = 0.01;
	7775	+ //vScale = 0.01;
7705	7776	}
7706		- vScale = Math.pow(vScale, scale * 50);
7707		- if (vScale < 0.01)
7708		- {
7709		- vScale = 0.01;
7710		- }
	7777	+
7711	7778	LA.matCopy(startMat, toParent);
7712	7779	/**/
7713	7780	for (int i = 0; i < 3; i++)
..	..	@@ -7717,39 +7784,47 @@
7717	7784	}
7718	7785	/**/
7719	7786
7720		- switch (info.pane.renderCamera.viewCode)
	7787	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
	7788	+
	7789	+ if (totalScale < 0.01)
	7790	+ {
	7791	+ totalScale = 0.01;
	7792	+ }
	7793	+
	7794	+ switch (clickInfo.pane.RenderCamera().viewCode)
7721	7795	{
7722	7796	case 3: // '\001'
7723		- if (modified)
	7797	+ if (modified \|\| opposite)
7724	7798	{
7725	7799	//LA.matScale(toParent, 1, hScale, vScale);
7726		- LA.matScale(toParent, vScale, 1, 1);
	7800	+ LA.matScale(toParent, totalScale, 1, 1);
7727	7801	} // vScale, 1);
7728	7802	else
7729	7803	{
7730		- LA.matScale(toParent, vScale, vScale, vScale);
	7804	+ // EXCEPTION!
	7805	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7731	7806	} // vScale, 1);
7732	7807	break;
7733	7808
7734	7809	case 2: // '\002'
7735		- if (modified)
	7810	+ if (modified \|\| opposite)
7736	7811	{
7737	7812	//LA.matScale(toParent, hScale, 1, vScale);
7738		- LA.matScale(toParent, 1, vScale, 1);
	7813	+ LA.matScale(toParent, 1, totalScale, 1);
7739	7814	} else
7740	7815	{
7741		- LA.matScale(toParent, vScale, 1, vScale);
	7816	+ LA.matScale(toParent, totalScale, 1, totalScale);
7742	7817	}
7743	7818	break;
7744	7819
7745	7820	case 1: // '\003'
7746		- if (modified)
	7821	+ if (modified \|\| opposite)
7747	7822	{
7748	7823	//LA.matScale(toParent, hScale, vScale, 1);
7749		- LA.matScale(toParent, 1, 1, vScale);
	7824	+ LA.matScale(toParent, 1, 1, totalScale);
7750	7825	} else
7751	7826	{
7752		- LA.matScale(toParent, vScale, vScale, 1);
	7827	+ LA.matScale(toParent, totalScale, totalScale, 1);
7753	7828	}
7754	7829	break;
7755	7830	}
..	..	@@ -7783,7 +7858,7 @@
7783	7858	} // NEW ...
7784	7859
7785	7860
7786		- info.pane.repaint();
	7861	+ clickInfo.pane.repaint();
7787	7862	}
7788	7863
7789	7864	boolean overflow = false;
..	..	@@ -7882,14 +7957,22 @@
7882	7957	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7883	7958	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7884	7959	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7960	+
	7961	+ String objname;
	7962	+
7885	7963	if (false) //parent != null)
7886	7964	{
7887		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7965	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7888	7966	} else
7889	7967	{
7890		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7968	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7891	7969	} // + super.toString();
7892	7970	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7971	+
	7972	+ if (!Globals.ADVANCED)
	7973	+ return objname;
	7974	+
	7975	+ return objname + " " + System.identityHashCode(this);
7893	7976	}
7894	7977
7895	7978	public int hashCode()
..	..	@@ -7945,6 +8028,7 @@
7945	8028	objectUI.closeUI();
7946	8029	if (editWindow != null)
7947	8030	{
	8031	+ editWindow.ctrlPanel.FlushUI();
7948	8032	editWindow.refreshContents();
7949	8033	} // ? new
7950	8034	objectUI = null;
..	..	@@ -7953,6 +8037,10 @@
7953	8037	{
7954	8038	editWindow = null;
7955	8039	} // ?
	8040	+ }
	8041	+ else
	8042	+ {
	8043	+ //editWindow.closeUI();
7956	8044	}
7957	8045	}
7958	8046
..	..	@@ -7965,7 +8053,7 @@
7965	8053	/transient/ cVector2[] projectedVertices = new cVector2[0];
7966	8054
7967	8055	Object3D /Composite/ parent;
7968		- Object3D /Composite/ fileparent;
	8056	+ Object3D /Composite/ fileparent; // In the case of FileObject
7969	8057
7970	8058	double[][] toParent; // dynamic matrix
7971	8059	double[][] fromParent;
..	..	@@ -8080,7 +8168,7 @@
8080	8168	{
8081	8169	assert(bRep != null);
8082	8170	if (!(support instanceof GenericJoint)) // support.bRep != null)
8083		- GrafreeD.Assert(support.bRep == bRep.support);
	8171	+ Grafreed.Assert(support.bRep == bRep.support);
8084	8172	}
8085	8173	else
8086	8174	{
..	..	@@ -8111,6 +8199,10 @@
8111	8199	}
8112	8200
8113	8201	transient ObjEditor editWindow;
	8202	+ transient ObjEditor manipWindow;
	8203	+
	8204	+ transient boolean pinned;
	8205	+
8114	8206	transient ObjectUI objectUI;
8115	8207	public static int povDepth = 0;
8116	8208	private static cVector tbMin = new cVector();
..	..	@@ -8129,9 +8221,9 @@
8129	8221	private static cVector edge2 = new cVector();
8130	8222	//private static cVector norm = new cVector();
8131	8223	/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;
	8224	+ static final int hitCenter = 1;
	8225	+ static final int hitScale = 2;
	8226	+ static final int hitRotate = 3;
8135	8227	/transient/ /private/ int viewCode; // Now used for transparency cache flag
8136	8228	/transient/ private Point centerPt;
8137	8229	/transient/ private int startX;
..	..	@@ -8163,6 +8255,8 @@
8163	8255	{
8164	8256	Object3D targ = this;
8165	8257
	8258	+ targ.NORMALPUSH = obj.NORMALPUSH;
	8259	+
8166	8260	if (obj.material != null)
8167	8261	{
8168	8262	if ((mask&MATERIAL)!=0) // ==(COLOR\|MATERIAL))