~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,41 @@
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	+ private UUID uuid = UUID.randomUUID();
	26	+
	27	+ // TEMPORARY for mocap undo. No need to be transient.
	28	+ mocap.reader.BVHReader.BVHResult savebvh;
	29	+ Object3D saveskeleton;
	30	+ //
	31	+
	32	+ String skyboxname;
	33	+ String skyboxext;
	34	+
	35	+ byte[] versions[];
	36	+ int versionindex = -1;
	37	+
22	38	ScriptNode scriptnode;
	39	+
	40	+ void InitOthers()
	41	+ {
	42	+ if (projectedVertices == null \|\| projectedVertices.length <= 2)
	43	+ {
	44	+ projectedVertices = new Object3D.cVector2[3];
	45	+ }
	46	+ for (int i = 0; i < 3; i++)
	47	+ {
	48	+ projectedVertices[i] = new cVector2(); // Others
	49	+ }
	50	+ projectedVertices[0].x = 100; // bump
	51	+ }
23	52
24	53	void MinMax(cVector minima, cVector maxima)
25	54	{
..	..	@@ -86,64 +115,178 @@
86	115
87	116	// transient boolean reduced; // for morph reduction
88	117
89		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
90		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	118	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	119	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
91	120
92		-transient Object3D transientsupport; // for cloning
93		-transient boolean transientlink2master;
	121	+ transient Object3D transientsupport; // for cloning
	122	+ transient boolean transientlink2master;
94	123
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)
	124	+ void SaveSupports()
107	125	{
108		- bRep.SaveSupports();
	126	+ if (blockloop)
	127	+ return;
	128	+
	129	+ transientsupport = support;
	130	+ transientlink2master = link2master;
	131	+
	132	+ support = null;
	133	+ link2master = false;
	134	+
	135	+ if (bRep != null)
	136	+ {
	137	+ bRep.SaveSupports();
	138	+ }
	139	+
	140	+ for (int i = 0; i < Size(); i++)
	141	+ {
	142	+ Object3D child = (Object3D) get(i);
	143	+ if (child == null)
	144	+ continue;
	145	+ blockloop = true;
	146	+ child.SaveSupports();
	147	+ blockloop = false;
	148	+ }
109	149	}
110		-
111		- for (int i = 0; i < Size(); i++)
	150	+
	151	+ void RestoreSupports()
112	152	{
113		- Object3D child = (Object3D) get(i);
114		- if (child == null)
115		- continue;
	153	+ if (blockloop)
	154	+ return;
	155	+
	156	+ support = transientsupport;
	157	+ link2master = transientlink2master;
	158	+ transientsupport = null;
	159	+ transientlink2master = false;
	160	+
	161	+ if (bRep != null)
	162	+ {
	163	+ bRep.RestoreSupports();
	164	+ }
	165	+
	166	+ for (int i = 0; i < Size(); i++)
	167	+ {
	168	+ Object3D child = (Object3D) get(i);
	169	+ if (child == null)
	170	+ continue;
	171	+ blockloop = true;
	172	+ child.RestoreSupports();
	173	+ blockloop = false;
	174	+ }
	175	+ }
	176	+
	177	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	178	+ {
	179	+ Object3D o;
	180	+
	181	+ if (hashtable.containsKey(GetUUID()))
	182	+ {
	183	+ o = hashtable.get(GetUUID());
	184	+
	185	+ Grafreed.Assert(this.bRep == o.bRep);
	186	+ //if (this.bRep != null)
	187	+ // assert(this.bRep.support == o.transientrep);
	188	+ if (this.support != null)
	189	+ assert(this.support.bRep == o.transientrep);
	190	+ }
	191	+ else
	192	+ {
	193	+ o = new Object3D("copy of " + this.name);
	194	+
	195	+ hashtable.put(GetUUID(), o);
	196	+ }
	197	+
	198	+ if (!blockloop)
	199	+ {
	200	+ blockloop = true;
	201	+
	202	+ for (int i=0; i<Size(); i++)
	203	+ {
	204	+ get(i).ExtractBigData(hashtable);
	205	+ }
	206	+
	207	+ blockloop = false;
	208	+ }
	209	+
	210	+ ExtractBigData(o);
	211	+ }
	212	+
	213	+ void ExtractBigData(Object3D o)
	214	+ {
	215	+ if (o.bRep != null)
	216	+ Grafreed.Assert(o.bRep == this.bRep);
	217	+
	218	+ o.bRep = this.bRep;
	219	+// July 2019 if (this.bRep != null)
	220	+// {
	221	+// o.transientrep = this.bRep.support;
	222	+// o.bRep.support = null;
	223	+// }
	224	+ o.selection = this.selection;
	225	+ o.versions = this.versions;
	226	+ o.versionindex = this.versionindex;
	227	+
	228	+ if (this.support != null)
	229	+ {
	230	+ if (o.transientrep != null)
	231	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	232	+
	233	+ o.transientrep = this.support.bRep;
	234	+ this.support.bRep = null;
	235	+ }
	236	+
	237	+ // o.support = this.support;
	238	+ // o.fileparent = this.fileparent;
	239	+ // if (this.bRep != null)
	240	+ // o.bRep = this.bRep.support;
	241	+
	242	+ this.bRep = null;
	243	+ // if (this.bRep != null)
	244	+ // this.bRep.support = null;
	245	+ // this.support = null;
	246	+ // this.fileparent = null;
	247	+ }
	248	+
	249	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	250	+ {
	251	+ if (!hashtable.containsKey(GetUUID()))
	252	+ return;
	253	+
	254	+ Object3D o = hashtable.get(GetUUID());
	255	+
	256	+ RestoreBigData(o);
	257	+
	258	+ if (blockloop)
	259	+ return;
	260	+
116	261	blockloop = true;
117		- child.SaveSupports();
	262	+
	263	+ //hashtable.remove(GetUUID());
	264	+
	265	+ for (int i=0; i<Size(); i++)
	266	+ {
	267	+ get(i).RestoreBigData(hashtable);
	268	+ }
	269	+
118	270	blockloop = false;
119	271	}
120		-}
121	272
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)
	273	+ void RestoreBigData(Object3D o)
133	274	{
134		- bRep.RestoreSupports();
	275	+ this.bRep = o.bRep;
	276	+ if (this.support != null && o.transientrep != null)
	277	+ {
	278	+ this.support.bRep = o.transientrep;
	279	+ }
	280	+
	281	+ this.selection = o.selection;
	282	+
	283	+ this.versions = o.versions;
	284	+ this.versionindex = o.versionindex;
	285	+// July 2019 if (this.bRep != null)
	286	+// this.bRep.support = o.transientrep;
	287	+ // this.support = o.support;
	288	+ // this.fileparent = o.fileparent;
135	289	}
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	290
148	291	// MOCAP SUPPORT
149	292	double tx,ty,tz,rx,ry,rz;
..	..	@@ -285,8 +428,9 @@
285	428	return parent.GetName() + "#";
286	429	}
287	430
288		- boolean timeline = false;
289	431	boolean live = false;
	432	+ transient boolean keepdontselect;
	433	+ boolean dontselect = false;
290	434	boolean hide = false;
291	435	boolean link2master = false; // performs reset support/master at each frame
292	436	boolean marked = false; // animation node
..	..	@@ -296,6 +440,8 @@
296	440	boolean random = false;
297	441	boolean speedup = false;
298	442	boolean rewind = false;
	443	+
	444	+ float NORMALPUSH = 0;
299	445
300	446	Object3D support;
301	447
..	..	@@ -416,16 +562,16 @@
416	562	{
417	563	Object3D copy = this;
418	564
419		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	565	+ Camera parentcam = Globals.theRenderer.ManipCamera();
420	566
421		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	567	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
422	568	{
423		- parentcam = CameraPane.theRenderer.cameras[1];
	569	+ parentcam = Globals.theRenderer.Cameras()[1];
424	570	}
425	571
426		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	572	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
427	573	{
428		- parentcam = CameraPane.theRenderer.cameras[0];
	574	+ parentcam = Globals.theRenderer.Cameras()[0];
429	575	}
430	576
431	577	if (this == parentcam)
..	..	@@ -433,7 +579,7 @@
433	579	//assert(this instanceof Camera);
434	580
435	581	for (int count = parentcam.GetTransformCount(); --count>=0;)
436		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	582	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
437	583	}
438	584
439	585	copy.marked ^= true;
..	..	@@ -453,7 +599,7 @@
453	599	//assert(this instanceof Camera);
454	600
455	601	for (int count = parentcam.GetTransformCount(); --count>=0;)
456		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	602	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
457	603	}
458	604
459	605	copy.Touch(); // display list issue
..	..	@@ -466,12 +612,14 @@
466	612	toParent = LA.newMatrix();
467	613	fromParent = LA.newMatrix();
468	614	}
	615	+
469	616	if (toParentMarked == null)
470	617	{
471	618	if (maxcount != 1)
472	619	{
473	620	new Exception().printStackTrace();
474	621	}
	622	+
475	623	toParentMarked = LA.newMatrix();
476	624	fromParentMarked = LA.newMatrix();
477	625	}
..	..	@@ -588,7 +736,7 @@
588	736	return;
589	737	}
590	738
591		- if (CameraPane.fromscript)
	739	+ if (Globals.fromscript)
592	740	{
593	741	transformcount = 0;
594	742	return;
..	..	@@ -746,7 +894,7 @@
746	894
747	895	int GetTransformCount()
748	896	{
749		- // marde pour serialization de Texture
	897	+ // patch pour serialization de Texture
750	898	resetmaxcount();
751	899	resettransformcount();
752	900	resetstep();
..	..	@@ -759,7 +907,7 @@
759	907	if (step == 0)
760	908	step = 1;
761	909	if (maxcount == 0)
762		- maxcount = 2048; // 4;
	910	+ maxcount = 128; // 2048; // 4;
763	911	// if (acceleration == 0)
764	912	// acceleration = 10;
765	913	if (delay == 0) // serial
..	..	@@ -780,9 +928,12 @@
780	928	// factor = CameraPane.STEP;
781	929	// }
782	930
783		- if (marked && CameraPane.isLIVE() && live && CameraPane.drawMode == CameraPane.SHADOW && currentframe != CameraPane.framecount)
	931	+ if (marked && Globals.isLIVE() && live &&
	932	+ //TEMP21aug2018
	933	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
	934	+ currentframe != Globals.framecount)
784	935	{
785		- currentframe = CameraPane.framecount;
	936	+ currentframe = Globals.framecount;
786	937
787	938	// System.err.println("transformcount = " + transformcount);
788	939	// System.err.println("factor = " + factor);
..	..	@@ -791,7 +942,8 @@
791	942
792	943	boolean changedir = random && Math.random() < 0.01; // && !link2master;
793	944
794		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	945	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	946	+ (step == 1 && changedir))
795	947	{
796	948	countdown = 1;
797	949	delay = speedup?8:1;
..	..	@@ -863,6 +1015,7 @@
863	1015	if (material == null \|\| material.multiply)
864	1016	return true;
865	1017
	1018	+ // Transparent objects are dynamic because we have to sort the triangles.
866	1019	return material.opacity > 0.99;
867	1020	}
868	1021
..	..	@@ -894,6 +1047,11 @@
894	1047	fromParent = null; // LA.newMatrix();
895	1048	bRep = null; // new BoundaryRep();
896	1049
	1050	+ if (oname != null && oname.equals("LeftHand"))
	1051	+ {
	1052	+ name = oname;
	1053	+ }
	1054	+
897	1055	/*
898	1056	float hue = (float)Math.random();
899	1057	Color col;
..	..	@@ -936,7 +1094,7 @@
936	1094
937	1095	public Object clone()
938	1096	{
939		- return GrafreeD.clone(this);
	1097	+ return Grafreed.clone(this);
940	1098	}
941	1099
942	1100	Object3D copyExpand()
..	..	@@ -1258,6 +1416,7 @@
1258	1416	toParent = LA.newMatrix();
1259	1417	fromParent = LA.newMatrix();
1260	1418	}
	1419	+
1261	1420	LA.matCopy(other.toParent, toParent);
1262	1421	LA.matCopy(other.fromParent, fromParent);
1263	1422
..	..	@@ -1452,7 +1611,7 @@
1452	1611	BoundaryRep.SEUIL = other.material.cameralight;
1453	1612
1454	1613	// Set default to 0.1
1455		- BoundaryRep.SEUIL /= 2;
	1614	+ BoundaryRep.SEUIL /= 4; // 2;
1456	1615	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1457	1616	}
1458	1617
..	..	@@ -1711,7 +1870,7 @@
1711	1870	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1712	1871	o.bRep = transientrep;
1713	1872	if (clone)
1714		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1873	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1715	1874	o.CreateMaterial();
1716	1875	o.SetAttributes(this, -1);
1717	1876	//parent
..	..	@@ -1724,7 +1883,7 @@
1724	1883	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1725	1884	o.bRep = bRep;
1726	1885	if (clone)
1727		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1886	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1728	1887	o.CreateMaterial();
1729	1888	//o.overwriteThis(this, -1);
1730	1889	o.SetAttributes(this, -1);
..	..	@@ -1811,12 +1970,15 @@
1811	1970	if (obj.name == null)
1812	1971	continue; // can't be a null one
1813	1972
	1973	+ // Try perfect match first.
1814	1974	if (n.equals(obj.name))
1815	1975	{
1816	1976	theobj = obj;
1817	1977	count++;
1818	1978	}
1819	1979	}
	1980	+
	1981	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1820	1982
1821	1983	if (count != 1)
1822	1984	for (int i=Size(); --i>=0;)
..	..	@@ -2131,15 +2293,8 @@
2131	2293	if (/parent != null &&/ material == null)
2132	2294	{
2133	2295	material = new cMaterial(GetMaterial());
2134		- if (projectedVertices == null \|\| projectedVertices.length <= 2)
2135		- {
2136		- projectedVertices = new Object3D.cVector2[3];
2137		- }
2138		- for (int i = 0; i < 3; i++)
2139		- {
2140		- projectedVertices[i] = new cVector2(); // Others
2141		- }
2142		- projectedVertices[0].x = 100; // bump
	2296	+
	2297	+ InitOthers();
2143	2298
2144	2299	if (this instanceof Camera)
2145	2300	{
..	..	@@ -2283,12 +2438,17 @@
2283	2438	}
2284	2439	*/
2285	2440	}
	2441	+ else
	2442	+ {
	2443	+ //((ObjEditor)editWindow).SetupUI2(null);
	2444	+ }
2286	2445	}
2287	2446
2288	2447	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2289	2448	{
2290	2449	if (newWindow)
2291	2450	{
	2451	+ new Exception().printStackTrace();
2292	2452	System.exit(0);
2293	2453	if (parent != null)
2294	2454	{
..	..	@@ -2323,6 +2483,14 @@
2323	2483	{
2324	2484	editWindow.refreshContents();
2325	2485	}
	2486	+ else
	2487	+ {
	2488	+ if (manipWindow != null)
	2489	+ {
	2490	+ manipWindow.refreshContents();
	2491	+ }
	2492	+ }
	2493	+
2326	2494	//if (parent != null)
2327	2495	//parent.refreshEditWindow();
2328	2496	}
..	..	@@ -2402,7 +2570,8 @@
2402	2570	private static final int editSelf = 1;
2403	2571	private static final int editChild = 2;
2404	2572
2405		- void drawEditHandles(ClickInfo info, int level)
	2573	+ void drawEditHandles(//ClickInfo info,
	2574	+ int level)
2406	2575	{
2407	2576	if (level == 0)
2408	2577	{
..	..	@@ -2410,7 +2579,8 @@
2410	2579	return;
2411	2580
2412	2581	Object3D selectee;
2413		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2582	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2583	+ level + 1))
2414	2584	{
2415	2585	selectee = (Object3D) e.nextElement();
2416	2586	}
..	..	@@ -2418,19 +2588,22 @@
2418	2588	} else
2419	2589	{
2420	2590	//super.
2421		- drawEditHandles0(info, level + 1);
	2591	+ drawEditHandles0(//info,
	2592	+ level + 1);
2422	2593	}
2423	2594	}
2424	2595
2425		- boolean doEditClick(ClickInfo info, int level)
	2596	+ boolean doEditClick(//ClickInfo info,
	2597	+ int level)
2426	2598	{
2427	2599	doSomething = 0;
2428	2600	if (level == 0)
2429	2601	{
2430		- return doParentClick(info);
	2602	+ return doParentClick(); //info);
2431	2603	}
2432	2604	if (//super.
2433		- doEditClick0(info, level))
	2605	+ doEditClick0(//info,
	2606	+ level))
2434	2607	{
2435	2608	doSomething = 1;
2436	2609	return true;
..	..	@@ -2440,7 +2613,7 @@
2440	2613	}
2441	2614	}
2442	2615
2443		- boolean doParentClick(ClickInfo info)
	2616	+ boolean doParentClick() //ClickInfo info)
2444	2617	{
2445	2618	if (selection == null)
2446	2619	{
..	..	@@ -2453,7 +2626,8 @@
2453	2626	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2454	2627	{
2455	2628	Object3D selectee = (Object3D) e.nextElement();
2456		- if (selectee.doEditClick(info, 1))
	2629	+ if (selectee.doEditClick(//info,
	2630	+ 1))
2457	2631	{
2458	2632	childToDrag = selectee;
2459	2633	doSomething = 2;
..	..	@@ -2465,13 +2639,15 @@
2465	2639	return retval;
2466	2640	}
2467	2641
2468		- void doEditDrag(ClickInfo info)
	2642	+ void doEditDrag(//ClickInfo clickInfo,
	2643	+ boolean opposite)
2469	2644	{
2470	2645	switch (doSomething)
2471	2646	{
2472	2647	case 1: // '\001'
2473	2648	//super.
2474		- doEditDrag0(info);
	2649	+ doEditDrag0(//clickInfo,
	2650	+ opposite);
2475	2651	break;
2476	2652
2477	2653	case 2: // '\002'
..	..	@@ -2484,11 +2660,13 @@
2484	2660	{
2485	2661	//sel.hitSomething = childToDrag.hitSomething;
2486	2662	//childToDrag.doEditDrag(info);
2487		- sel.doEditDrag(info);
	2663	+ sel.doEditDrag(//clickInfo,
	2664	+ opposite);
2488	2665	} else
2489	2666	{
2490	2667	//super.
2491		- doEditDrag0(info);
	2668	+ doEditDrag0(//clickInfo,
	2669	+ opposite);
2492	2670	}
2493	2671	}
2494	2672	break;
..	..	@@ -2506,6 +2684,9 @@
2506	2684	{
2507	2685	deselectAll();
2508	2686	}
	2687	+
	2688	+ new Exception().printStackTrace();
	2689	+
2509	2690	ClickInfo newInfo = new ClickInfo();
2510	2691	newInfo.flags = info.flags;
2511	2692	newInfo.bounds = info.bounds;
..	..	@@ -2598,6 +2779,18 @@
2598	2779	void GenNormalsS(boolean crease)
2599	2780	{
2600	2781	selection.GenNormals(crease);
	2782	+// for (int i=0; i<selection.size(); i++)
	2783	+// {
	2784	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2785	+// selectee.GenNormals(crease);
	2786	+// }
	2787	+
	2788	+ //Touch();
	2789	+ }
	2790	+
	2791	+ void GenNormalsMeshS()
	2792	+ {
	2793	+ selection.GenNormalsMesh();
2601	2794	// for (int i=0; i<selection.size(); i++)
2602	2795	// {
2603	2796	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2738,6 +2931,24 @@
2738	2931	if (child == null)
2739	2932	continue;
2740	2933	child.GenNormals(crease);
	2934	+// Children().release(i);
	2935	+ }
	2936	+ blockloop = false;
	2937	+ }
	2938	+
	2939	+ void GenNormalsMesh()
	2940	+ {
	2941	+ if (blockloop)
	2942	+ return;
	2943	+
	2944	+ blockloop = true;
	2945	+ GenNormalsMesh0();
	2946	+ for (int i = 0; i < Children().Size(); i++)
	2947	+ {
	2948	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2949	+ if (child == null)
	2950	+ continue;
	2951	+ child.GenNormalsMesh();
2741	2952	// Children().release(i);
2742	2953	}
2743	2954	blockloop = false;
..	..	@@ -2895,7 +3106,8 @@
2895	3106	{
2896	3107	if (bRep != null)
2897	3108	{
2898		- bRep.GenUV();
	3109	+ bRep.GenUV(); //1);
	3110	+ //bRep.UnfoldUV();
2899	3111	Touch();
2900	3112	}
2901	3113	}
..	..	@@ -2909,11 +3121,20 @@
2909	3121	}
2910	3122	}
2911	3123
	3124	+ void GenNormalsMesh0()
	3125	+ {
	3126	+ if (bRep != null)
	3127	+ {
	3128	+ bRep.GenerateNormalsMesh();
	3129	+ Touch();
	3130	+ }
	3131	+ }
	3132	+
2912	3133	void GenNormalsMINE0()
2913	3134	{
2914	3135	if (bRep != null)
2915	3136	{
2916		- bRep.GenerateNormalsMINE();
	3137	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2917	3138	Touch();
2918	3139	}
2919	3140	}
..	..	@@ -2970,6 +3191,33 @@
2970	3191	blockloop = false;
2971	3192	}
2972	3193
	3194	+ void TransformChildren()
	3195	+ {
	3196	+ if (toParent != null)
	3197	+ {
	3198	+ for (int i=Size(); --i>=0;)
	3199	+ {
	3200	+ Object3D v = get(i);
	3201	+
	3202	+ if (v.toParent == null)
	3203	+ {
	3204	+ v.toParent = LA.newMatrix();
	3205	+ v.fromParent = LA.newMatrix();
	3206	+ }
	3207	+
	3208	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3209	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3210	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3211	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3212	+ }
	3213	+
	3214	+ toParent = null; // LA.matIdentity(toParent);
	3215	+ fromParent = null; // LA.matIdentity(fromParent);
	3216	+
	3217	+ Touch();
	3218	+ }
	3219	+ }
	3220	+
2973	3221	void TransformGeometry()
2974	3222	{
2975	3223	Object3D obj = this;
..	..	@@ -3191,9 +3439,11 @@
3191	3439
3192	3440	BoundaryRep sup = bRep.support;
3193	3441	bRep.support = null;
3194		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3442	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3195	3443	// bRep.SplitInTwo(onlyone); // thread...
3196		- temprep.SplitInTwo(reduction34, onlyone);
	3444	+
	3445	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3446	+
3197	3447	bRep = temprep;
3198	3448	bRep.support = sup;
3199	3449	Touch();
..	..	@@ -3330,7 +3580,8 @@
3330	3580	if (blockloop)
3331	3581	return;
3332	3582
3333		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3583	+ if (//marked \|\| // does not make sense
	3584	+ (bRep != null \|\| material != null)) // borderline...
3334	3585	live = h;
3335	3586
3336	3587	for (int i = 0; i < Size(); i++)
..	..	@@ -3351,7 +3602,8 @@
3351	3602	return;
3352	3603
3353	3604	//if (bRep != null)
3354		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3605	+ if (//marked \|\| // does not make sense
	3606	+ (bRep != null \|\| material != null)) // borderline...
3355	3607	link2master = h;
3356	3608
3357	3609	for (int i = 0; i < Size(); i++)
..	..	@@ -3371,7 +3623,8 @@
3371	3623	if (blockloop)
3372	3624	return;
3373	3625
3374		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3626	+ if (//marked \|\| // does not make sense
	3627	+ (bRep != null \|\| material != null)) // borderline...
3375	3628	hide = h;
3376	3629
3377	3630	for (int i = 0; i < Size(); i++)
..	..	@@ -3391,7 +3644,7 @@
3391	3644	if (blockloop)
3392	3645	return;
3393	3646
3394		- if (bRep != null && material != null) // borderline...
	3647	+ if (bRep != null \|\| material != null) // borderline...
3395	3648	marked = h;
3396	3649
3397	3650	for (int i = 0; i < Size(); i++)
..	..	@@ -3401,6 +3654,46 @@
3401	3654	continue;
3402	3655	blockloop = true;
3403	3656	child.MarkLeaves(h);
	3657	+ blockloop = false;
	3658	+ // release(i);
	3659	+ }
	3660	+ }
	3661	+
	3662	+ void RewindLeaves(boolean h)
	3663	+ {
	3664	+ if (blockloop)
	3665	+ return;
	3666	+
	3667	+ if (bRep != null \|\| material != null) // borderline...
	3668	+ rewind = h;
	3669	+
	3670	+ for (int i = 0; i < Size(); i++)
	3671	+ {
	3672	+ Object3D child = (Object3D) get(i); // reserve(i);
	3673	+ if (child == null)
	3674	+ continue;
	3675	+ blockloop = true;
	3676	+ child.RewindLeaves(h);
	3677	+ blockloop = false;
	3678	+ // release(i);
	3679	+ }
	3680	+ }
	3681	+
	3682	+ void RandomLeaves(boolean h)
	3683	+ {
	3684	+ if (blockloop)
	3685	+ return;
	3686	+
	3687	+ if (bRep != null \|\| material != null) // borderline...
	3688	+ random = h;
	3689	+
	3690	+ for (int i = 0; i < Size(); i++)
	3691	+ {
	3692	+ Object3D child = (Object3D) get(i); // reserve(i);
	3693	+ if (child == null)
	3694	+ continue;
	3695	+ blockloop = true;
	3696	+ child.RandomLeaves(h);
3404	3697	blockloop = false;
3405	3698	// release(i);
3406	3699	}
..	..	@@ -3715,7 +4008,7 @@
3715	4008	if (child == null)
3716	4009	continue;
3717	4010
3718		- if (GrafreeD.RENDERME > 0)
	4011	+ if (Grafreed.RENDERME > 0)
3719	4012	{
3720	4013	if (child instanceof Merge)
3721	4014	((Merge)child).renderme();
..	..	@@ -3866,7 +4159,7 @@
3866	4159	if (child == null)
3867	4160	continue;
3868	4161
3869		- if (GrafreeD.RENDERME > 0)
	4162	+ if (Grafreed.RENDERME > 0)
3870	4163	{
3871	4164	if (child instanceof Merge)
3872	4165	((Merge)child).renderme();
..	..	@@ -4061,7 +4354,7 @@
4061	4354	if (child == null)
4062	4355	continue;
4063	4356
4064		- if (GrafreeD.RENDERME > 0)
	4357	+ if (Grafreed.RENDERME > 0)
4065	4358	{
4066	4359	if (child instanceof Merge)
4067	4360	((Merge)child).renderme();
..	..	@@ -4158,6 +4451,71 @@
4158	4451	}
4159	4452	blockloop = true;
4160	4453	get(i).RepairParent();
	4454	+ blockloop = false;
	4455	+ }
	4456	+ }
	4457	+
	4458	+ void RepairShadow()
	4459	+ {
	4460	+ if (blockloop)
	4461	+ return;
	4462	+
	4463	+ if (this.material != null)
	4464	+ this.InitOthers();
	4465	+
	4466	+ for (int i=0; i<Size(); i++)
	4467	+ {
	4468	+ blockloop = true;
	4469	+ get(i).RepairShadow();
	4470	+ blockloop = false;
	4471	+ }
	4472	+ }
	4473	+
	4474	+ void RepairSOV()
	4475	+ {
	4476	+ if (blockloop)
	4477	+ return;
	4478	+
	4479	+ String texname = this.GetPigmentTexture();
	4480	+
	4481	+ if (texname.startsWith("sov"))
	4482	+ {
	4483	+ String[] s = texname.split("/");
	4484	+
	4485	+ String[] sname = s[1].split("Color.pn");
	4486	+
	4487	+ texname = sname[0];
	4488	+
	4489	+ if (sname.length > 1)
	4490	+ {
	4491	+ texname += "Color.jpg";
	4492	+ }
	4493	+
	4494	+ this.SetPigmentTexture("sov/" + texname);
	4495	+ }
	4496	+
	4497	+ texname = this.GetBumpTexture();
	4498	+
	4499	+ if (texname.startsWith("sov"))
	4500	+ {
	4501	+ String[] s = texname.split("/");
	4502	+
	4503	+ String[] sname = s[1].split("Bump.pn");
	4504	+
	4505	+ texname = sname[0];
	4506	+
	4507	+ if (sname.length > 1)
	4508	+ {
	4509	+ texname += "Bump.jpg";
	4510	+ }
	4511	+
	4512	+ this.SetBumpTexture("sov/" + texname);
	4513	+ }
	4514	+
	4515	+ for (int i=0; i<Size(); i++)
	4516	+ {
	4517	+ blockloop = true;
	4518	+ get(i).RepairSOV();
4161	4519	blockloop = false;
4162	4520	}
4163	4521	}
..	..	@@ -4652,7 +5010,7 @@
4652	5010
4653	5011	cTreePath SelectLeaf(int indexcount, boolean deselect)
4654	5012	{
4655		- if (hide)
	5013	+ if (hide \|\| dontselect)
4656	5014	return null;
4657	5015
4658	5016	if (count <= 0)
..	..	@@ -4676,9 +5034,17 @@
4676	5034	}
4677	5035	}
4678	5036
	5037	+ ObjEditor GetWindow()
	5038	+ {
	5039	+ if (editWindow != null)
	5040	+ return editWindow;
	5041	+
	5042	+ return manipWindow;
	5043	+ }
	5044	+
4679	5045	cTreePath Select(int indexcount, boolean deselect)
4680	5046	{
4681		- if (hide)
	5047	+ if (hide \|\| dontselect)
4682	5048	return null;
4683	5049
4684	5050	if (count <= 0)
..	..	@@ -4712,10 +5078,11 @@
4712	5078	if (leaf != null)
4713	5079	{
4714	5080	cTreePath tp = new cTreePath(this, leaf);
4715		- if (editWindow != null)
	5081	+ ObjEditor window = GetWindow();
	5082	+ if (window != null)
4716	5083	{
4717	5084	//System.out.println("editWindow = " + editWindow + " vs " + this);
4718		- editWindow.Select(tp, deselect, true);
	5085	+ window.Select(tp, deselect, true);
4719	5086	}
4720	5087
4721	5088	return tp;
..	..	@@ -4732,6 +5099,7 @@
4732	5099
4733	5100	if (child == null)
4734	5101	continue;
	5102	+
4735	5103	if (child.HasTransparency() && child.size() != 0)
4736	5104	{
4737	5105	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4741,9 +5109,10 @@
4741	5109	if (leaf != null)
4742	5110	{
4743	5111	cTreePath tp = new cTreePath(this, leaf);
4744		- if (editWindow != null)
	5112	+ ObjEditor window = GetWindow();
	5113	+ if (window != null)
4745	5114	{
4746		- editWindow.Select(tp, deselect, true);
	5115	+ window.Select(tp, deselect, true);
4747	5116	}
4748	5117
4749	5118	return tp;
..	..	@@ -4828,7 +5197,7 @@
4828	5197	return globalTransform;
4829	5198	}
4830	5199
4831		- void PreprocessOcclusion(CameraPane cp)
	5200	+ void PreprocessOcclusion(iCameraPane cp)
4832	5201	{
4833	5202	/*
4834	5203	if (AOdone)
..	..	@@ -4975,7 +5344,8 @@
4975	5344	} else //
4976	5345	if (editWindow != null)
4977	5346	{
4978		- editWindow.cameraView.lighttouched = true;
	5347	+ //editWindow.cameraView.lighttouched = true;
	5348	+ Globals.lighttouched = true;
4979	5349	}
4980	5350	}
4981	5351
..	..	@@ -5067,6 +5437,51 @@
5067	5437	blockloop = false;
5068	5438	}
5069	5439
	5440	+ void ResetSelectable()
	5441	+ {
	5442	+ if (blockloop)
	5443	+ return;
	5444	+
	5445	+ blockloop = true;
	5446	+
	5447	+ keepdontselect = dontselect;
	5448	+ dontselect = true;
	5449	+
	5450	+ Object3D child;
	5451	+ int nb = Size();
	5452	+ for (int i = 0; i < nb; i++)
	5453	+ {
	5454	+ child = (Object3D) get(i);
	5455	+ if (child == null)
	5456	+ continue;
	5457	+ child.ResetSelectable();
	5458	+ }
	5459	+
	5460	+ blockloop = false;
	5461	+ }
	5462	+
	5463	+ void RestoreSelectable()
	5464	+ {
	5465	+ if (blockloop)
	5466	+ return;
	5467	+
	5468	+ blockloop = true;
	5469	+
	5470	+ dontselect = keepdontselect;
	5471	+
	5472	+ Object3D child;
	5473	+ int nb = Size();
	5474	+ for (int i = 0; i < nb; i++)
	5475	+ {
	5476	+ child = (Object3D) get(i);
	5477	+ if (child == null)
	5478	+ continue;
	5479	+ child.RestoreSelectable();
	5480	+ }
	5481	+
	5482	+ blockloop = false;
	5483	+ }
	5484	+
5070	5485	boolean IsSelected()
5071	5486	{
5072	5487	if (parent == null)
..	..	@@ -5129,10 +5544,34 @@
5129	5544
5130	5545	// System.out.println("Fullname = " + fullname);
5131	5546
5132		- if (fullname.name.indexOf(":") == -1)
5133		- return fullname.name;
	5547	+ // Does not work on Windows due to C:
	5548	+// if (fullname.name.indexOf(":") == -1)
	5549	+// return fullname.name;
	5550	+//
	5551	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5134	5552
5135		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5553	+ String[] split = fullname.name.split(":");
	5554	+
	5555	+ if (split.length == 0)
	5556	+ {
	5557	+ return "";
	5558	+ }
	5559	+
	5560	+ if (split.length <= 2)
	5561	+ {
	5562	+ if (fullname.name.endsWith(":"))
	5563	+ {
	5564	+ // Windows
	5565	+ return fullname.name.substring(0, fullname.name.length()-1);
	5566	+ }
	5567	+
	5568	+ return split[0];
	5569	+ }
	5570	+
	5571	+ // Windows
	5572	+ assert(split.length == 4);
	5573	+
	5574	+ return split[0] + ":" + split[1];
5136	5575	}
5137	5576
5138	5577	static String GetBump(cTexture fullname)
..	..	@@ -5141,10 +5580,38 @@
5141	5580	return "";
5142	5581
5143	5582	// System.out.println("Fullname = " + fullname);
5144		- if (fullname.name.indexOf(":") == -1)
5145		- return "";
5146		-
5147		- return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5583	+ // Does not work on Windows due to C:
	5584	+// if (fullname.name.indexOf(":") == -1)
	5585	+// return "";
	5586	+//
	5587	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5588	+ String[] split = fullname.name.split(":");
	5589	+
	5590	+ if (split.length == 0)
	5591	+ {
	5592	+ return "";
	5593	+ }
	5594	+
	5595	+ if (split.length == 1)
	5596	+ {
	5597	+ return "";
	5598	+ }
	5599	+
	5600	+ if (split.length == 2)
	5601	+ {
	5602	+ if (fullname.name.endsWith(":"))
	5603	+ {
	5604	+ // Windows
	5605	+ return "";
	5606	+ }
	5607	+
	5608	+ return split[1];
	5609	+ }
	5610	+
	5611	+ // Windows
	5612	+ assert(split.length == 4);
	5613	+
	5614	+ return split[2] + ":" + split[3];
5148	5615	}
5149	5616
5150	5617	String GetPigmentTexture()
..	..	@@ -5218,7 +5685,7 @@
5218	5685	System.out.print("; textures = " + textures);
5219	5686	System.out.println("; usedtextures = " + usedtextures);
5220	5687
5221		- if (GetTextures() == null)
	5688	+ if (GetTextures() == null) // What is that??
5222	5689	GetTextures().name = ":";
5223	5690
5224	5691	String texname = tex;
..	..	@@ -5249,6 +5716,43 @@
5249	5716	child.ResetPigmentTexture();
5250	5717	blockloop = false;
5251	5718	}
	5719	+ }
	5720	+
	5721	+ UUID GetUUID()
	5722	+ {
	5723	+ if (uuid == null)
	5724	+ {
	5725	+ // Serial
	5726	+ uuid = UUID.randomUUID();
	5727	+ }
	5728	+
	5729	+ return uuid;
	5730	+ }
	5731	+
	5732	+ Object3D GetObject(UUID uid)
	5733	+ {
	5734	+ if (blockloop)
	5735	+ return null;
	5736	+
	5737	+ if (GetUUID().equals(uid))
	5738	+ return this;
	5739	+
	5740	+ int nb = Size();
	5741	+ for (int i = 0; i < nb; i++)
	5742	+ {
	5743	+ Object3D child = (Object3D) get(i);
	5744	+
	5745	+ if (child == null)
	5746	+ continue;
	5747	+
	5748	+ blockloop = true;
	5749	+ Object3D obj = child.GetObject(uid);
	5750	+ blockloop = false;
	5751	+ if (obj != null)
	5752	+ return obj;
	5753	+ }
	5754	+
	5755	+ return null;
5252	5756	}
5253	5757
5254	5758	void SetBumpTexture(String tex)
..	..	@@ -5287,25 +5791,65 @@
5287	5791	}
5288	5792	}
5289	5793
5290		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5794	+ void EmbedTextures(boolean embed)
	5795	+ {
	5796	+ if (blockloop)
	5797	+ return;
	5798	+
	5799	+ //if (GetTextures() != null)
	5800	+ if (embed)
	5801	+ CameraPane.EmbedTextures(GetTextures());
	5802	+ else
	5803	+ {
	5804	+ GetTextures().pigmentdata = null;
	5805	+ GetTextures().bumpdata = null;
	5806	+ GetTextures().pw = 0;
	5807	+ GetTextures().ph = 0;
	5808	+ GetTextures().bw = 0;
	5809	+ GetTextures().bh = 0;
	5810	+ }
	5811	+
	5812	+ int nb = Size();
	5813	+ for (int i = 0; i < nb; i++)
	5814	+ {
	5815	+ Object3D child = (Object3D) get(i);
	5816	+
	5817	+ if (child == null)
	5818	+ continue;
	5819	+
	5820	+ blockloop = true;
	5821	+ child.EmbedTextures(embed);
	5822	+ blockloop = false;
	5823	+ }
	5824	+ }
	5825	+
	5826	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5291	5827	{
5292	5828	Draw(display, root, selected, blocked);
5293	5829	}
5294	5830
5295		- static cMaterial[] materialstack = new cMaterial[65536];
5296		- static boolean[] selectedstack = new boolean[65536];
5297		- static int materialdepth = 0;
5298		-
5299	5831	boolean NeedSupport()
5300	5832	{
5301	5833	return
5302		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5834	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5303	5835	// PROBLEM with CROWD!!
5304		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	5836	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5305	5837	}
5306	5838
	5839	+ static boolean DEBUG_SELECTION = false;
5307	5840
5308		- void Draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5841	+ boolean IsLive()
	5842	+ {
	5843	+ if (live)
	5844	+ return true;
	5845	+
	5846	+ if (parent == null)
	5847	+ return false;
	5848	+
	5849	+ return parent.IsLive();
	5850	+ }
	5851	+
	5852	+ void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5309	5853	{
5310	5854	Invariants(); // june 2013
5311	5855
..	..	@@ -5314,8 +5858,8 @@
5314	5858	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5315	5859	}
5316	5860
5317		- if (display.drawMode == CameraPane.SELECTION &&
5318		- hide)
	5861	+ if (display.DrawMode() == iCameraPane.SELECTION &&
	5862	+ (hide \|\| dontselect))
5319	5863	return;
5320	5864
5321	5865	if (name != null && name.contains("sclera"))
..	..	@@ -5333,7 +5877,7 @@
5333	5877	if (this instanceof Checker)
5334	5878	return;
5335	5879
5336		- if (display.drawMode == display.SHADOW && PASSTEST)
	5880	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5337	5881	return;
5338	5882
5339	5883	if (count <= 0)
..	..	@@ -5341,13 +5885,13 @@
5341	5885	return;
5342	5886	}
5343	5887
5344		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5345		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5888	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	5889	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5346	5890	{
5347	5891	return;
5348	5892	}
5349	5893
5350		- javax.media.opengl.GL gl = display.GetGL();
	5894	+ //javax.media.opengl.GL gl = display.GetGL();
5351	5895
5352	5896	/*
5353	5897	if (touched)
..	..	@@ -5366,7 +5910,7 @@
5366	5910	support = support;
5367	5911
5368	5912	//boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5369		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5913	+ boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5370	5914
5371	5915	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5372	5916	{
..	..	@@ -5383,15 +5927,17 @@
5383	5927
5384	5928	boolean compiled = false;
5385	5929
5386		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5930	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5387	5931
5388		- if (!selectmode && //display.drawMode != display.SELECTION &&
5389		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5932	+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
	5933	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5934	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5390	5935	{
5391		- display.lighttouched = true;
	5936	+ Globals.lighttouched = true;
5392	5937	} // all panes...
5393		- //if (usecalllists && display.drawMode != display.SELECTION && display.drawMode != display.SHADOW &&
5394		- if (bRep != null && usecalllists && !selectmode && // june 2013 display.drawMode != display.SHADOW &&
	5938	+
	5939	+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
	5940	+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5395	5941	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5396	5942	{
5397	5943	if (!(this instanceof Composite))
..	..	@@ -5399,7 +5945,7 @@
5399	5945	//if (displaylist == -1 && usecalllists)
5400	5946	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5401	5947	{
5402		- bRep.displaylist = gl.glGenLists(1);
	5948	+ bRep.displaylist = display.GenList();
5403	5949	assert(bRep.displaylist != 0);
5404	5950	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5405	5951	//System.out.println("\tgen list " + list);
..	..	@@ -5411,18 +5957,20 @@
5411	5957	if (usecalllists)
5412	5958	{
5413	5959	// System.err.println("new list " + bRep.displaylist + " for " + this);
5414		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5960	+ display.NewList(bRep.displaylist);
5415	5961	}
	5962	+
5416	5963	CallList(display, root, selected, blocked);
	5964	+
5417	5965	// compiled = true;
5418	5966	if (usecalllists)
5419	5967	{
5420	5968	// System.err.println("end list " + bRep.displaylist + " for " + this);
5421		- gl.glEndList();
	5969	+ display.EndList();
5422	5970	}
5423	5971	//gl.glDrawBuffer(gl.GL_BACK);
5424	5972	// XXX touched = false;
5425		- display.lighttouched = true; // all panes...
	5973	+ Globals.lighttouched = true; // all panes...
5426	5974	}
5427	5975
5428	5976	touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
..	..	@@ -5461,12 +6009,12 @@
5461	6009
5462	6010	// frustum culling
5463	6011	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5464		- && display.drawMode != CameraPane.SELECTION)
	6012	+ && display.DrawMode() != iCameraPane.SELECTION)
5465	6013	{
5466		- if (display.drawMode == CameraPane.SHADOW)
	6014	+ if (display.DrawMode() == iCameraPane.SHADOW)
5467	6015	{
5468	6016	if (!link2master // tricky to cull in shadow mode.
5469		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	6017	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5470	6018	{
5471	6019	//System.out.print("CULLED");
5472	6020	culled = true;
..	..	@@ -5474,7 +6022,7 @@
5474	6022	}
5475	6023	else
5476	6024	//GetBRep().getBounds(v0, v1, this);
5477		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	6025	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5478	6026	culled = true;
5479	6027
5480	6028	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5510,11 +6058,12 @@
5510	6058
5511	6059
5512	6060	if (!culled)
5513		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	6061	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5514	6062	{
5515	6063	if (GetBRep() != null)
5516	6064	{
5517		- CameraPane.NextIndex(this, gl);
	6065	+ display.NextIndex();
	6066	+
5518	6067	// vertex color conflict : gl.glCallList(list);
5519	6068	DrawNode(display, root, selected);
5520	6069	if (this instanceof BezierPatch)
..	..	@@ -5536,55 +6085,7 @@
5536	6085	color[2] /= 2;
5537	6086	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5538	6087	*/
5539		- if (material != null)
5540		- {
5541		- materialstack[materialdepth] = material;
5542		- selectedstack[materialdepth] = selected;
5543		- cStatic.objectstack[materialdepth++] = this;
5544		- //System.out.println("material " + material);
5545		- //Applet3D.tracein(this, selected);
5546		- display.vector2buffer = projectedVertices;
5547		- if (this instanceof Camera)
5548		- {
5549		- display.options1[0] = material.shift;
5550		- //System.out.println("shift " + material.shift);
5551		- display.options1[1] = material.lightarea;
5552		- display.options1[2] = material.shadowbias;
5553		- display.options1[3] = material.aniso;
5554		- display.options1[4] = material.anisoV;
5555		- display.options2[0] = material.opacity;
5556		- display.options2[1] = material.diffuse;
5557		- display.options2[2] = material.factor;
5558		-
5559		- cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
5560		- display.options4[0] = material.cameralight/0.2f;
5561		- display.options4[1] = material.subsurface;
5562		- display.options4[2] = material.sheen;
5563		-
5564		- // if (display.CURRENTANTIALIAS > 0)
5565		- // display.options3[3] /= 4;
5566		-
5567		- /*
5568		- System.out.println("Focus = " + display.options1[0]);
5569		- System.out.println("Aperture = " + display.options1[1]);
5570		- System.out.println("ShadowBlur = " + display.options1[2]);
5571		- System.out.println("Antialiasing = " + display.options1[3]);
5572		- System.out.println("Fog = " + display.options2[0]);
5573		- System.out.println("Intensity = " + display.options2[1]);
5574		- System.out.println("Elevation = " + display.options2[2]);
5575		- /**/
5576		- } else
5577		- {
5578		- material.Draw(display, selected);
5579		- }
5580		- } else
5581		- {
5582		- if (selected && CameraPane.flash)
5583		- {
5584		- display.modelParams4[1] = 100;
5585		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5586		- }
5587		- }
	6088	+ display.PushMaterial(this, selected);
5588	6089
5589	6090	//System.out.println("call list " + list);
5590	6091	//System.out.println();
..	..	@@ -5603,7 +6104,28 @@
5603	6104	tex = GetTextures();
5604	6105	}
5605	6106
5606		- display.BindTextures(tex, texres);
	6107	+ boolean failedPigment = false;
	6108	+ boolean failedBump = false;
	6109	+
	6110	+ try
	6111	+ {
	6112	+ display.BindPigmentTexture(tex, texres);
	6113	+ }
	6114	+ catch (Exception e)
	6115	+ {
	6116	+ System.err.println("FAILED: " + this);
	6117	+ failedPigment = true;
	6118	+ }
	6119	+
	6120	+ try
	6121	+ {
	6122	+ display.BindBumpTexture(tex, texres);
	6123	+ }
	6124	+ catch (Exception e)
	6125	+ {
	6126	+ //System.err.println("FAILED: " + this);
	6127	+ failedBump = true;
	6128	+ }
5607	6129
5608	6130	if (!compiled)
5609	6131	{
..	..	@@ -5619,30 +6141,19 @@
5619	6141
5620	6142	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5621	6143	assert(bRep.displaylist != 0);
5622		- gl.glCallList(bRep.displaylist);
	6144	+ display.CallList(bRep.displaylist);
5623	6145	// june 2013 drawSelf(display, root, selected);
5624	6146	}
5625	6147	}
5626	6148	}
5627	6149
5628		- display.ReleaseTextures(tex);
5629		-
5630		- //if (parent != null && parent.GetMaterial() != null)
5631		- // parent.GetMaterial().Draw(display, parent.IsSelected(this));
5632		- if (material != null)
5633		- {
5634		- materialdepth -= 1;
5635		- if (materialdepth > 0)
5636		- {
5637		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5638		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5639		- }
5640		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5641		- } else if (selected && CameraPane.flash && GetMaterial() != null)
5642		- {
5643		- display.modelParams4[1] = GetMaterial().cameralight;
5644		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5645		- }
	6150	+ if (!failedBump)
	6151	+ display.ReleaseBumpTexture(tex);
	6152	+
	6153	+ if (!failedPigment)
	6154	+ display.ReleasePigmentTexture(tex);
	6155	+
	6156	+ display.PopMaterial(this, selected);
5646	6157	}
5647	6158
5648	6159	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5684,7 +6195,7 @@
5684	6195	// resetMasterNode();
5685	6196	}
5686	6197
5687		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6198	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5688	6199	{
5689	6200	if (GetBRep() == null)
5690	6201	{
..	..	@@ -5767,8 +6278,11 @@
5767	6278	boolean flipV = false; // true;
5768	6279	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5769	6280
5770		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6281	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5771	6282	{
	6283	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6284	+ return;
	6285	+
5772	6286	if (hide)
5773	6287	return;
5774	6288	// shadow optimisation
..	..	@@ -5826,16 +6340,7 @@
5826	6340	// // ??????????????????????????? Touch();
5827	6341	// }
5828	6342
5829		- if (material != null)
5830		- {
5831		- materialstack[materialdepth] = material;
5832		- selectedstack[materialdepth] = selected;
5833		- cStatic.objectstack[materialdepth++] = this;
5834		- //System.out.println("material " + material);
5835		- //Applet3D.tracein("selected ", selected);
5836		- display.vector2buffer = projectedVertices;
5837		- material.Draw(display, selected);
5838		- }
	6343	+display.PushMaterial2(this, selected);
5839	6344
5840	6345	Object3D child;
5841	6346	boolean sel;
..	..	@@ -5887,19 +6392,7 @@
5887	6392	*/
5888	6393	//depth += 1;
5889	6394
5890		- if (material != null)
5891		- {
5892		- materialdepth -= 1;
5893		- if (materialdepth > 0)
5894		- {
5895		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5896		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5897		- }
5898		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5899		- //else
5900		- //material.Draw(display, false);
5901		- }
5902		-
	6395	+display.PopMaterial2(this);
5903	6396	/*
5904	6397	display.ReleaseTextures(tex);
5905	6398	*/
..	..	@@ -5910,10 +6403,13 @@
5910	6403
5911	6404	//static cVector min,max;
5912	6405
5913		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	6406	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5914	6407	{
5915		- if (display.drawMode == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	6408	+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5916	6409	return; // no shadow for transparent objects
	6410	+
	6411	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6412	+ return;
5917	6413
5918	6414	if (hide)
5919	6415	return;
..	..	@@ -5955,11 +6451,12 @@
5955	6451	return;
5956	6452	}
5957	6453
	6454	+ //bRep.GenUV(1/material.diffuseness);
5958	6455	// bRep.lock = true;
5959	6456
5960		- javax.media.opengl.GL gl = display.GetGL();
	6457	+ //javax.media.opengl.GL gl = display.GetGL();
5961	6458
5962		- if (CameraPane.BOXMODE) // \|\| CameraPane.movingcamera)
	6459	+ if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5963	6460	{
5964	6461	int fc = bRep.FaceCount();
5965	6462	int vc = bRep.VertexCount();
..	..	@@ -5974,23 +6471,7 @@
5974	6471
5975	6472	bRep.getMinMax(min, max, 100);
5976	6473
5977		- gl.glBegin(gl.GL_LINES);
5978		-
5979		- gl.glVertex3d(min.x, min.y, min.z);
5980		- gl.glVertex3d(min.x, min.y, max.z);
5981		- gl.glVertex3d(min.x, min.y, min.z);
5982		- gl.glVertex3d(min.x, max.y, min.z);
5983		- gl.glVertex3d(min.x, min.y, min.z);
5984		- gl.glVertex3d(max.x, min.y, min.z);
5985		-
5986		- gl.glVertex3d(max.x, max.y, max.z);
5987		- gl.glVertex3d(min.x, max.y, max.z);
5988		- gl.glVertex3d(max.x, max.y, max.z);
5989		- gl.glVertex3d(max.x, min.y, max.z);
5990		- gl.glVertex3d(max.x, max.y, max.z);
5991		- gl.glVertex3d(max.x, max.y, min.z);
5992		-
5993		- gl.glEnd();
	6474	+ display.DrawBox(min, max);
5994	6475
5995	6476	return;
5996	6477	}
..	..	@@ -6034,7 +6515,7 @@
6034	6515	{
6035	6516	//throw new Error();
6036	6517
6037		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6518	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
6038	6519
6039	6520	int[] strips = bRep.getRawIndices();
6040	6521
..	..	@@ -6044,178 +6525,19 @@
6044	6525	new Exception().printStackTrace();
6045	6526	return;
6046	6527	}
6047		-
6048		- // TRIANGLE STRIP ARRAY
6049		- if (bRep.trimmed)
	6528	+
	6529	+ if (dontselect)
6050	6530	{
6051		- float[] v = bRep.getRawVertices();
6052		- float[] n = bRep.getRawNormals();
6053		- float[] c = bRep.getRawColors();
6054		- float[] uv = bRep.getRawUVMap();
6055		-
6056		- int count2 = 0;
6057		- int count3 = 0;
6058		-
6059		- if (n.length > 0)
6060		- {
6061		- for (int i = 0; i < strips.length; i++)
6062		- {
6063		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6064		-
6065		- /*
6066		- boolean locked = false;
6067		- float eps = 0.1f;
6068		- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6069		-
6070		- int dot = 0;
6071		-
6072		- if ((dot&1) == 0)
6073		- dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6074		-
6075		- if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6076		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6077		- else
6078		- {
6079		- locked = true;
6080		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6081		- }
6082		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6083		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6084		- if (hasnorm)
6085		- {
6086		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6087		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6088		- }
6089		-
6090		- if ((dot&4) == 0)
6091		- dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6092		-
6093		- if (wrap \|\| !locked && (dot&8) != 0)
6094		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6095		- else
6096		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6097		-
6098		- f.dot = dot;
6099		- */
6100		-
6101		- if (!selectmode)
6102		- {
6103		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6104		- {
6105		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6106		- } else
6107		- {
6108		- gl.glNormal3f(0, 0, 1);
6109		- }
6110		-
6111		- if (c != null)
6112		- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
6113		- {
6114		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6115		- }
6116		- }
6117		- if (flipV)
6118		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6119		- else
6120		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6121		- //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6122		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6123		-
6124		- count2 += 2;
6125		- count3 += 3;
6126		- if (!selectmode)
6127		- {
6128		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6129		- {
6130		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6131		- } else
6132		- {
6133		- gl.glNormal3f(0, 0, 1);
6134		- }
6135		- if (c != null)
6136		- {
6137		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6138		- }
6139		- }
6140		- if (flipV)
6141		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6142		- else
6143		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6144		- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6145		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6146		-
6147		- count2 += 2;
6148		- count3 += 3;
6149		- for (int j = 0; j < strips[i] - 2; j++)
6150		- {
6151		- //gl.glTexCoord2d(...);
6152		- if (!selectmode)
6153		- {
6154		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6155		- {
6156		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6157		- } else
6158		- {
6159		- gl.glNormal3f(0, 0, 1);
6160		- }
6161		- if (c != null)
6162		- {
6163		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6164		- }
6165		- }
6166		-
6167		- if (flipV)
6168		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6169		- else
6170		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6171		- //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6172		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6173		- count2 += 2;
6174		- count3 += 3;
6175		- }
6176		-
6177		- gl.glEnd();
6178		- }
6179		- }
6180		-
6181		- assert count3 == v.length;
	6531	+ //bRep.GenerateNormalsMINE();
6182	6532	}
6183		- else // !trimmed
6184		- {
6185		- int count = 0;
6186		- for (int i = 0; i < strips.length; i++)
6187		- {
6188		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6189		-
6190		- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6191		- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6192		-
6193		- drawVertex(gl, p, selectmode);
6194		- drawVertex(gl, q, selectmode);
6195		-
6196		- for (int j = 0; j < strips[i] - 2; j++)
6197		- {
6198		- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6199		-
6200		-// if (j%2 == 0)
6201		-// drawFace(p, q, r, display, null);
6202		-// else
6203		-// drawFace(p, r, q, display, null);
6204		-
6205		-// p = q;
6206		-// q = r;
6207		- drawVertex(gl, r, selectmode);
6208		- }
6209		-
6210		- gl.glEnd();
6211		- }
6212		- }
	6533	+
	6534	+ display.DrawGeometry(bRep, flipV, selectmode);
6213	6535	} else // catch (Error e)
6214	6536	{
6215	6537	// TRIANGLE ARRAY
6216	6538	if (IsOpaque()) // Static())
6217	6539	{
6218		- gl.glBegin(gl.GL_TRIANGLES);
	6540	+ display.StartTriangles();
6219	6541	int facecount = bRep.FaceCount();
6220	6542	for (int i = 0; i < facecount; i++)
6221	6543	{
..	..	@@ -6278,9 +6600,9 @@
6278	6600	// // r.norm.dot(v3) > -0.5)
6279	6601	// // continue;
6280	6602
6281		- drawFace(p, q, r, display, face);
	6603	+ display.DrawFace(this, p, q, r, face);
6282	6604	}
6283		- gl.glEnd();
	6605	+ display.EndTriangles();
6284	6606	}
6285	6607	else
6286	6608	{
..	..	@@ -6309,8 +6631,8 @@
6309	6631	//System.out.println("SORT");
6310	6632
6311	6633	java.util.Arrays.sort(facescompare);
6312		-
6313		- gl.glBegin(gl.GL_TRIANGLES);
	6634	+
	6635	+ display.StartTriangles();
6314	6636	for (int i = 0; i < facecount; i++)
6315	6637	{
6316	6638	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6322,13 +6644,14 @@
6322	6644	Vertex q = bRep.GetVertex(face.q);
6323	6645	Vertex r = bRep.GetVertex(face.r);
6324	6646
6325		- drawFace(p, q, r, display, face);
	6647	+ display.DrawFace(this, p, q, r, face);
6326	6648	}
6327		- gl.glEnd();
	6649	+ display.EndTriangles();
6328	6650	}
6329	6651
6330	6652	if (false) // live && support != null && support.bRep != null) // debug weights
6331	6653	{
	6654	+ /*
6332	6655	gl.glDisable(gl.GL_LIGHTING);
6333	6656	float[] colorV = new float[3];
6334	6657
..	..	@@ -6407,6 +6730,7 @@
6407	6730	// gl.glEnd();
6408	6731	}
6409	6732	}
	6733	+ */
6410	6734	}
6411	6735	}
6412	6736
..	..	@@ -6451,7 +6775,7 @@
6451	6775	center.add(r);
6452	6776	center.mul(1.0/3);
6453	6777
6454		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6778	+ center.sub(Globals.theRenderer.EyeCamera().location);
6455	6779
6456	6780	distance = center.dot(center);
6457	6781	}
..	..	@@ -6462,347 +6786,11 @@
6462	6786
6463	6787	transient FaceCompare[] facescompare = null;
6464	6788
6465		- void SetColor(CameraPane display, Vertex p0)
6466		- {
6467		- if (display.RENDERPROGRAM == 0)
6468		- {
6469		- float r = 0;
6470		- if (bRep != null)
6471		- {
6472		- if (bRep.stripified)
6473		- {
6474		- r = 1;
6475		- }
6476		- }
6477		- float g = 0;
6478		- if (bRep != null)
6479		- {
6480		- if (bRep.trimmed)
6481		- {
6482		- g = 1;
6483		- }
6484		- }
6485		- float b = 0;
6486		- if (support != null && link2master)
6487		- {
6488		- b = 1;
6489		- }
6490		- display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
6491		- return;
6492		- }
6493		-
6494		- if (display.drawMode != CameraPane.SHADOW)
6495		- return;
6496		-
6497		- javax.media.opengl.GL gl = display.GetGL();
6498		-// if (true) return;
6499		-// float ao = p.AO;
6500		-//
6501		-// // if (ao == 0 && !bRep.AOdone) // transient problem!
6502		-// // ao = 1;
6503		-//
6504		-// gl.glColor4f(ao, ao, ao, 1);
6505		-
6506		-// CameraPane.selectedpoint.
6507		-// getAverage(cStatic.point1, true);
6508		- if (CameraPane.pointflow == null) // !random) // live)
6509		- {
6510		- return;
6511		- }
6512		-
6513		- cStatic.point1.set(0,0,0);
6514		- LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
6515		-
6516		- cStatic.point1.sub(p0);
6517		-
6518		-
6519		-// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
6520		-// {
6521		-// return;
6522		-// }
6523		-
6524		- //if (true)
6525		- if (cStatic.point1.dot(cStatic.point1) > 0.000001)
6526		- {
6527		- return;
6528		- }
6529		-
6530		- float[] colorV = new float[3];
6531		-
6532		- if (false) // marked)
6533		- {
6534		- // debug rigging weights
6535		- for (int object = 0; object < p0.vertexlinks.length; object++)
6536		- {
6537		- float weight = p0.weights[object] / p0.totalweight;
6538		-
6539		- // if (weight < 0.1)
6540		- // {
6541		- // assert(weight == 0);
6542		- // continue;
6543		- // }
6544		-
6545		- if (p0.vertexlinks[object] == -1)
6546		- continue;
6547		-
6548		- Vertex q = support.bRep.GetVertex(p0.vertexlinks[object]);
6549		-
6550		- int color = //1 << object; //
6551		- //p.vertexlinks.length;
6552		- support.bRep.supports[p0.closestsupport].links[object];
6553		- colorV[2] += (color & 1) * weight;
6554		- colorV[1] += ((color & 2) >> 1) * weight;
6555		- colorV[0] += ((color & 4) >> 2) * weight;
6556		- }
6557		- }
6558		- else
6559		- {
6560		- if (drawingstarted)
6561		- {
6562		- // find next point
6563		- if (bRep.GetVertex(0).faceindices == null)
6564		- {
6565		- bRep.InitFaceIndices();
6566		- }
6567		-
6568		- double ymin = p0.y;
6569		-
6570		- Vertex newp = p0;
6571		-
6572		- for (int fii = 0; fii < p0.faceindices.length; fii++)
6573		- {
6574		- int fi = p0.faceindices[fii];
6575		-
6576		- if (fi == -1)
6577		- break;
6578		-
6579		- Face f = bRep.GetFace(fi);
6580		-
6581		- Vertex p = bRep.GetVertex(f.p);
6582		- Vertex q = bRep.GetVertex(f.q);
6583		- Vertex r = bRep.GetVertex(f.r);
6584		-
6585		- int swap = (int)(Math.random()*3);
6586		-
6587		-// for (int s=swap; --s>=0;)
6588		-// {
6589		-// Vertex t = p;
6590		-// p = q;
6591		-// q = r;
6592		-// r = t;
6593		-// }
6594		- if (ymin > p.y)
6595		- {
6596		- ymin = p.y;
6597		- newp = p;
6598		-// break;
6599		- }
6600		- if (ymin > q.y)
6601		- {
6602		- ymin = q.y;
6603		- newp = q;
6604		-// break;
6605		- }
6606		- if (ymin > r.y)
6607		- {
6608		- ymin = r.y;
6609		- newp = r;
6610		-// break;
6611		- }
6612		- }
6613		-
6614		- CameraPane.selectedpoint.toParent[3][0] = newp.x;
6615		- CameraPane.selectedpoint.toParent[3][1] = newp.y;
6616		- CameraPane.selectedpoint.toParent[3][2] = newp.z;
6617		-
6618		- drawingstarted = false;
6619		-
6620		- // return;
6621		- }
6622		-
6623		- if (false) // CameraPane.DRAW
6624		- {
6625		- p0.AO = colorV[0] = 2;
6626		- colorV[1] = 2;
6627		- colorV[2] = 2;
6628		- }
6629		-
6630		- CameraPane.pointflow.add(p0);
6631		- CameraPane.pointflow.Touch();
6632		- }
6633		-
6634		-// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
6635		-// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
6636		-// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
6637		- }
6638		-
6639	6789	void Print(Vertex v)
6640	6790	{
6641	6791	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6642	6792	}
6643	6793
6644		- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6645		- {
6646		- if (!selectmode)
6647		- {
6648		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6649		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6650		-
6651		- if (flipV)
6652		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6653		- else
6654		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6655		- }
6656		-
6657		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6658		- }
6659		-
6660		- void drawFace(Vertex pv, Vertex qv, Vertex rv,
6661		- CameraPane display, Face face)
6662		- {
6663		- if (pv.y == -10000 \|\|
6664		- qv.y == -10000 \|\|
6665		- rv.y == -10000)
6666		- return;
6667		-
6668		-// float b = f.nbiterations & 1;
6669		-// float g = (f.nbiterations>>1) & 1;
6670		-// float r = (f.nbiterations>>2) & 1;
6671		-//
6672		-// //if (f.weight == 10000)
6673		-// //{
6674		-// // r = 1; g = b = 0;
6675		-// //}
6676		-// //else
6677		-// //{
6678		-// // assert(f.weight < 10000);
6679		-// r = g = b = (float)bRep.FaceWeight(f)*100;
6680		-// if (r<0)
6681		-// assert(r>=0);
6682		-// //}
6683		-
6684		- javax.media.opengl.GL gl = display.GetGL();
6685		-
6686		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
6687		-
6688		- //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
6689		- if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
6690		- {
6691		- //gl.glBegin(gl.GL_TRIANGLES);
6692		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
6693		- if (!hasnorm)
6694		- {
6695		- // System.out.println("FUCK!!");
6696		- LA.vecSub(pv/.pos/, qv/.pos/, v0);
6697		- LA.vecSub(pv/.pos/, rv/.pos/, v1);
6698		- LA.vecCross(v0, v1, v2);
6699		- LA.vecNormalize(v2);
6700		- gl.glNormal3f((float) v2.x, (float) v2.y, (float) v2.z);
6701		- }
6702		-
6703		- if (hasnorm)
6704		- {
6705		-// if (!pv.norm.normalized())
6706		-// assert(pv.norm.normalized());
6707		-
6708		- //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
6709		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6710		- }
6711		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6712		- SetColor(display, pv);
6713		- //gl.glColor4f(r, g, b, 1);
6714		- //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
6715		- if (flipV)
6716		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6717		- else
6718		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6719		- //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
6720		- gl.glVertex3f((float) pv./pos./x, (float) pv./pos./y, (float) pv./pos./z);
6721		-// Print(pv);
6722		- if (hasnorm)
6723		- {
6724		-// assert(qv.norm.normalized());
6725		- //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
6726		- gl.glNormal3f((float) qv.norm.x, (float) qv.norm.y, (float) qv.norm.z);
6727		- }
6728		- //System.out.println("vertexq = " + qv.s + ", " + qv.t);
6729		- // boolean locked = false;
6730		- // float eps = 0.1f;
6731		- // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6732		-
6733		- // int dot = 0; //*/ (int)f.dot;
6734		-
6735		- // if ((dot&1) == 0)
6736		- // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6737		-
6738		- // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6739		- if (flipV)
6740		- gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
6741		- else
6742		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6743		- // else
6744		- // {
6745		- // locked = true;
6746		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6747		- // }
6748		- gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
6749		- SetColor(display, qv);
6750		- //gl.glColor4f(r, g, b, 1);
6751		- //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
6752		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6753		- gl.glVertex3f((float) qv./pos./x, (float) qv./pos./y, (float) qv./pos./z);
6754		-// Print(qv);
6755		- if (hasnorm)
6756		- {
6757		-// assert(rv.norm.normalized());
6758		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6759		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6760		- }
6761		-
6762		- // if ((dot&4) == 0)
6763		- // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6764		-
6765		- // if (wrap \|\| !locked && (dot&8) != 0)
6766		- if (flipV)
6767		- gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
6768		- else
6769		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6770		- // else
6771		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6772		-
6773		- // f.dot = dot;
6774		-
6775		- gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
6776		- SetColor(display, rv);
6777		- //gl.glColor4f(r, g, b, 1);
6778		- //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
6779		- //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
6780		- gl.glVertex3f((float) rv./pos./x, (float) rv./pos./y, (float) rv./pos./z);
6781		-// Print(rv);
6782		- //gl.glEnd();
6783		- }
6784		- else
6785		- {
6786		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6787		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6788		- gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
6789		-
6790		- }
6791		-
6792		- if (false) // (attributes & WIREFRAME) != 0)
6793		- {
6794		- gl.glDisable(gl.GL_LIGHTING);
6795		-
6796		- gl.glBegin(gl.GL_LINE_LOOP);
6797		- gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
6798		- gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
6799		- gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
6800		- gl.glEnd();
6801		-
6802		- gl.glEnable(gl.GL_LIGHTING);
6803		- }
6804		- }
6805		-
6806	6794	void drawSelf(ClickInfo info, int level, boolean select)
6807	6795	{
6808	6796	if (bRep == null)
..	..	@@ -7326,20 +7314,23 @@
7326	7314	}
7327	7315	}
7328	7316
7329		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7317	+ static ClickInfo clickInfo = new ClickInfo();
	7318	+
	7319	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7320	+ Point outPt, Rectangle outRec)
7330	7321	{
7331		- int hc = info.bounds.x + info.bounds.width / 2;
7332		- int vc = info.bounds.y + info.bounds.height / 2;
7333		- double[][] toscreen = info.toScreen;
	7322	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7323	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7324	+ double[][] toscreen = clickInfo.toScreen;
7334	7325	if (toscreen == null)
7335	7326	{
7336		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7327	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7337	7328	}
7338	7329	cVector vec = in;
7339	7330	LA.xformPos(in, toscreen, in);
7340	7331	//System.out.println("Distance = " + info.camera.Distance());
7341		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7342		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7332	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7333	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7343	7334	outPt.x = hc + (int) vec.x;
7344	7335	outPt.y = vc - (int) vec.y;
7345	7336	outRec.x = outPt.x - 3;
..	..	@@ -7347,15 +7338,18 @@
7347	7338	outRec.width = outRec.height = 6;
7348	7339	}
7349	7340
7350		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7341	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7342	+ )
7351	7343	{
7352	7344	Point pt = new Point(0, 0);
7353	7345	Rectangle rec = new Rectangle();
7354		- calcHotSpot(in, info, pt, rec);
	7346	+ calcHotSpot(in, //clickInfo,
	7347	+ pt, rec);
7355	7348	return rec;
7356	7349	}
7357	7350
7358		- void drawEditHandles0(ClickInfo info, int level)
	7351	+ void drawEditHandles0(//ClickInfo clickInfo,
	7352	+ int level)
7359	7353	{
7360	7354	if (level == 0)
7361	7355	{
..	..	@@ -7364,98 +7358,103 @@
7364	7358	{
7365	7359	cVector origin = new cVector();
7366	7360	//LA.xformPos(origin, toParent, origin);
7367		- Rectangle spot = calcHotSpot(origin, info);
	7361	+ if (this.clickInfo == null)
	7362	+ this.clickInfo = new ClickInfo();
	7363	+
	7364	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7368	7365	Rectangle boundary = new Rectangle();
7369	7366	boundary.x = spot.x - 30;
7370	7367	boundary.y = spot.y - 30;
7371	7368	boundary.width = spot.width + 60;
7372	7369	boundary.height = spot.height + 60;
7373		- info.g.setColor(Color.red);
	7370	+ clickInfo.g.setColor(Color.red);
7374	7371	int spotw = spot.x + spot.width;
7375	7372	int spoth = spot.y + spot.height;
7376		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7377		- if (CameraPane.Xmin > spot.x)
7378		- {
7379		- CameraPane.Xmin = spot.x;
7380		- }
7381		- if (CameraPane.Xmax < spotw)
7382		- {
7383		- CameraPane.Xmax = spotw;
7384		- }
7385		- if (CameraPane.Ymin > spot.y)
7386		- {
7387		- CameraPane.Ymin = spot.y;
7388		- }
7389		- if (CameraPane.Ymax < spoth)
7390		- {
7391		- CameraPane.Ymax = spoth;
7392		- }
	7373	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7374	+// if (CameraPane.Xmin > spot.x)
	7375	+// {
	7376	+// CameraPane.Xmin = spot.x;
	7377	+// }
	7378	+// if (CameraPane.Xmax < spotw)
	7379	+// {
	7380	+// CameraPane.Xmax = spotw;
	7381	+// }
	7382	+// if (CameraPane.Ymin > spot.y)
	7383	+// {
	7384	+// CameraPane.Ymin = spot.y;
	7385	+// }
	7386	+// if (CameraPane.Ymax < spoth)
	7387	+// {
	7388	+// CameraPane.Ymax = spoth;
	7389	+// }
7393	7390	spot.translate(32, 32);
7394	7391	spotw = spot.x + spot.width;
7395	7392	spoth = spot.y + spot.height;
7396		- info.g.setColor(Color.blue);
7397		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7398		- if (CameraPane.Xmin > spot.x)
7399		- {
7400		- CameraPane.Xmin = spot.x;
7401		- }
7402		- if (CameraPane.Xmax < spotw)
7403		- {
7404		- CameraPane.Xmax = spotw;
7405		- }
7406		- if (CameraPane.Ymin > spot.y)
7407		- {
7408		- CameraPane.Ymin = spot.y;
7409		- }
7410		- if (CameraPane.Ymax < spoth)
7411		- {
7412		- CameraPane.Ymax = spoth;
7413		- }
7414		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7415		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7393	+ clickInfo.g.setColor(Color.cyan);
	7394	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7395	+// if (CameraPane.Xmin > spot.x)
	7396	+// {
	7397	+// CameraPane.Xmin = spot.x;
	7398	+// }
	7399	+// if (CameraPane.Xmax < spotw)
	7400	+// {
	7401	+// CameraPane.Xmax = spotw;
	7402	+// }
	7403	+// if (CameraPane.Ymin > spot.y)
	7404	+// {
	7405	+// CameraPane.Ymin = spot.y;
	7406	+// }
	7407	+// if (CameraPane.Ymax < spoth)
	7408	+// {
	7409	+// CameraPane.Ymax = spoth;
	7410	+// }
	7411	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7412	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7416	7413	spot.translate(0, -32);
7417		- info.g.setColor(Color.green);
7418		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7419		- if (CameraPane.Xmin > spot.x)
7420		- {
7421		- CameraPane.Xmin = spot.x;
7422		- }
7423		- if (CameraPane.Xmax < spotw)
7424		- {
7425		- CameraPane.Xmax = spotw;
7426		- }
7427		- if (CameraPane.Ymin > spot.y)
7428		- {
7429		- CameraPane.Ymin = spot.y;
7430		- }
7431		- if (CameraPane.Ymax < spoth)
7432		- {
7433		- CameraPane.Ymax = spoth;
7434		- }
7435		- info.g.drawArc(boundary.x, boundary.y,
7436		- boundary.width, boundary.height, 0, 360);
	7414	+ clickInfo.g.setColor(Color.yellow);
	7415	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7416	+ clickInfo.g.setColor(Color.green);
	7417	+// if (CameraPane.Xmin > spot.x)
	7418	+// {
	7419	+// CameraPane.Xmin = spot.x;
	7420	+// }
	7421	+// if (CameraPane.Xmax < spotw)
	7422	+// {
	7423	+// CameraPane.Xmax = spotw;
	7424	+// }
	7425	+// if (CameraPane.Ymin > spot.y)
	7426	+// {
	7427	+// CameraPane.Ymin = spot.y;
	7428	+// }
	7429	+// if (CameraPane.Ymax < spoth)
	7430	+// {
	7431	+// CameraPane.Ymax = spoth;
	7432	+// }
	7433	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7434	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7437	7435	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7438		- if (CameraPane.Xmin > boundary.x)
7439		- {
7440		- CameraPane.Xmin = boundary.x;
7441		- }
7442		- if (CameraPane.Xmax < boundary.x + boundary.width)
7443		- {
7444		- CameraPane.Xmax = boundary.x + boundary.width;
7445		- }
7446		- if (CameraPane.Ymin > boundary.y)
7447		- {
7448		- CameraPane.Ymin = boundary.y;
7449		- }
7450		- if (CameraPane.Ymax < boundary.y + boundary.height)
7451		- {
7452		- CameraPane.Ymax = boundary.y + boundary.height;
7453		- }
	7436	+// if (CameraPane.Xmin > boundary.x)
	7437	+// {
	7438	+// CameraPane.Xmin = boundary.x;
	7439	+// }
	7440	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	7441	+// {
	7442	+// CameraPane.Xmax = boundary.x + boundary.width;
	7443	+// }
	7444	+// if (CameraPane.Ymin > boundary.y)
	7445	+// {
	7446	+// CameraPane.Ymin = boundary.y;
	7447	+// }
	7448	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	7449	+// {
	7450	+// CameraPane.Ymax = boundary.y + boundary.height;
	7451	+// }
7454	7452	return;
7455	7453	}
7456	7454	}
7457	7455
7458		- boolean doEditClick0(ClickInfo info, int level)
	7456	+ boolean doEditClick0(//ClickInfo clickInfo,
	7457	+ int level)
7459	7458	{
7460	7459	if (level == 0)
7461	7460	{
..	..	@@ -7464,10 +7463,10 @@
7464	7463
7465	7464	boolean retval = false;
7466	7465
7467		- startX = info.x;
7468		- startY = info.y;
	7466	+ startX = clickInfo.x;
	7467	+ startY = clickInfo.y;
7469	7468
7470		- hitSomething = 0;
	7469	+ hitSomething = -1;
7471	7470	cVector origin = new cVector();
7472	7471	//LA.xformPos(origin, toParent, origin);
7473	7472	Rectangle spot = new Rectangle();
..	..	@@ -7475,22 +7474,51 @@
7475	7474	{
7476	7475	centerPt = new Point(0, 0);
7477	7476	}
7478		- calcHotSpot(origin, info, centerPt, spot);
7479		- if (spot.contains(info.x, info.y))
	7477	+ calcHotSpot(origin, //info,
	7478	+ centerPt, spot);
	7479	+ if (spot.contains(clickInfo.x, clickInfo.y))
7480	7480	{
7481	7481	hitSomething = hitCenter;
7482	7482	retval = true;
7483	7483	}
7484	7484	spot.translate(32, 0);
7485		- if (spot.contains(info.x, info.y))
	7485	+ if (spot.contains(clickInfo.x, clickInfo.y))
7486	7486	{
7487	7487	hitSomething = hitRotate;
7488	7488	retval = true;
7489	7489	}
7490	7490	spot.translate(0, 32);
7491		- if (spot.contains(info.x, info.y))
	7491	+ if (spot.contains(clickInfo.x, clickInfo.y))
7492	7492	{
7493	7493	hitSomething = hitScale;
	7494	+
	7495	+ double scale = 0.005f * clickInfo.camera.Distance();
	7496	+ double hScale = (double) (clickInfo.x /- centerPt.x/) / 32;
	7497	+ double sign = 1;
	7498	+ if (hScale < 0)
	7499	+ {
	7500	+ sign = -1;
	7501	+ }
	7502	+ hScale = signMath.pow(signhScale, scale * 50);
	7503	+ if (hScale < 0.01)
	7504	+ {
	7505	+ //hScale = 0.01;
	7506	+ }
	7507	+
	7508	+ double vScale = (double) (clickInfo.y /- centerPt.y/) / 32;
	7509	+ sign = 1;
	7510	+ if (vScale < 0)
	7511	+ {
	7512	+ sign = -1;
	7513	+ }
	7514	+ vScale = signMath.pow(signvScale, scale * 50);
	7515	+ if (vScale < 0.01)
	7516	+ {
	7517	+ //vScale = 0.01;
	7518	+ }
	7519	+
	7520	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7521	+
7494	7522	retval = true;
7495	7523	}
7496	7524
..	..	@@ -7500,7 +7528,7 @@
7500	7528	}
7501	7529
7502	7530	//System.out.println("info.modifiers = " + info.modifiers);
7503		- modified = (info.modifiers & CameraPane.META) != 0;
	7531	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7504	7532	//System.out.println("modified = " + modified);
7505	7533	//new Exception().printStackTrace();
7506	7534	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7528,7 +7556,8 @@
7528	7556	return true;
7529	7557	}
7530	7558
7531		- void doEditDrag0(ClickInfo info)
	7559	+ void doEditDrag0(//ClickInfo info,
	7560	+ boolean opposite)
7532	7561	{
7533	7562	if (hitSomething == 0)
7534	7563	{
..	..	@@ -7542,7 +7571,8 @@
7542	7571
7543	7572	//System.out.println("hitSomething = " + hitSomething);
7544	7573
7545		- double scale = 0.005f * info.camera.Distance();
	7574	+ double scale = 0.005f * clickInfo.camera.Distance();
	7575	+
7546	7576	cVector xlate = new cVector();
7547	7577	//cVector xlate2 = new cVector();
7548	7578	switch (hitSomething)
..	..	@@ -7553,9 +7583,9 @@
7553	7583
7554	7584	case hitCenter: // Translate
7555	7585
7556		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7586	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7557	7587
7558		- if (modified)
	7588	+ if (modified \|\| opposite)
7559	7589	{
7560	7590	//assert(false);
7561	7591	/*
..	..	@@ -7575,8 +7605,8 @@
7575	7605	toParent[3][i] = xlate.get(i);
7576	7606	LA.matInvert(toParent, fromParent);
7577	7607	*/
7578		- cVector delta = LA.newVector(0, 0, startY - info.y);
7579		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7608	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7609	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7580	7610
7581	7611	LA.matCopy(startMat, toParent);
7582	7612	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7585,7 +7615,7 @@
7585	7615	} else
7586	7616	{
7587	7617	//LA.xformDir(delta, info.camera.fromScreen, delta);
7588		- cVector up = new cVector(info.camera.up);
	7618	+ cVector up = new cVector(clickInfo.camera.up);
7589	7619	cVector away = new cVector();
7590	7620	//cVector right2 = new cVector();
7591	7621	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7601,20 +7631,20 @@
7601	7631	}
7602	7632	LA.xformDir(up, ClickInfo.matbuffer, up);
7603	7633	// if (!CameraPane.LOCALTRANSFORM)
7604		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
7605		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7634	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
	7635	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7606	7636	// if (!CameraPane.LOCALTRANSFORM)
7607		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7637	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7608	7638	//LA.vecCross(up, cVector.Z, right2);
7609	7639
7610		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7640	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7611	7641
7612	7642	//System.out.println("DELTA0 = " + delta);
7613	7643	//System.out.println("AWAY = " + info.camera.away);
7614	7644	//System.out.println("UP = " + info.camera.up);
7615	7645	if (away.z > 0)
7616	7646	{
7617		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7647	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7618	7648	{
7619	7649	delta.x = -delta.x;
7620	7650	} else
..	..	@@ -7629,7 +7659,7 @@
7629	7659	//System.out.println("DELTA1 = " + delta);
7630	7660	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7631	7661	//System.out.println("DELTA2 = " + delta);
7632		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7662	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7633	7663	LA.matCopy(startMat, toParent);
7634	7664	//System.out.println("DELTA3 = " + delta);
7635	7665	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7639,8 +7669,8 @@
7639	7669	break;
7640	7670
7641	7671	case hitRotate: // rotate
7642		- int dx = info.x - centerPt.x;
7643		- int dy = -(info.y - centerPt.y);
	7672	+ int dx = clickInfo.x - centerPt.x;
	7673	+ int dy = -(clickInfo.y - centerPt.y);
7644	7674	double angle = (double) Math.atan2(dx, dy);
7645	7675	angle = -(1.570796 - angle);
7646	7676
..	..	@@ -7649,6 +7679,7 @@
7649	7679
7650	7680	if (modified)
7651	7681	{
	7682	+ // Rotate 90 degrees
7652	7683	angle /= (Math.PI / 4);
7653	7684	angle = Math.floor(angle + 0.5);
7654	7685	angle *= (Math.PI / 4);
..	..	@@ -7662,7 +7693,7 @@
7662	7693	}
7663	7694	/**/
7664	7695
7665		- switch (info.pane.renderCamera.viewCode)
	7696	+ switch (clickInfo.pane.RenderCamera().viewCode)
7666	7697	{
7667	7698	case 1: // '\001'
7668	7699	LA.matZRotate(toParent, angle);
..	..	@@ -7689,26 +7720,30 @@
7689	7720	break;
7690	7721
7691	7722	case hitScale: // scale
7692		- double hScale = (double) (info.x - centerPt.x) / 32;
	7723	+ double hScale = (double) (clickInfo.x /- centerPt.x/) / 32;
	7724	+ double sign = 1;
	7725	+ if (hScale < 0)
	7726	+ {
	7727	+ sign = -1;
	7728	+ }
	7729	+ hScale = signMath.pow(signhScale, scale * 50);
7693	7730	if (hScale < 0.01)
7694	7731	{
7695		- hScale = 0.01;
	7732	+ //hScale = 0.01;
7696	7733	}
7697		- hScale = Math.pow(hScale, scale * 50);
7698		- if (hScale < 0.01)
	7734	+
	7735	+ double vScale = (double) (clickInfo.y /- centerPt.y/) / 32;
	7736	+ sign = 1;
	7737	+ if (vScale < 0)
7699	7738	{
7700		- hScale = 0.01;
	7739	+ sign = -1;
7701	7740	}
7702		- double vScale = (double) (info.y - centerPt.y) / 32;
	7741	+ vScale = signMath.pow(signvScale, scale * 50);
7703	7742	if (vScale < 0.01)
7704	7743	{
7705		- vScale = 0.01;
	7744	+ //vScale = 0.01;
7706	7745	}
7707		- vScale = Math.pow(vScale, scale * 50);
7708		- if (vScale < 0.01)
7709		- {
7710		- vScale = 0.01;
7711		- }
	7746	+
7712	7747	LA.matCopy(startMat, toParent);
7713	7748	/**/
7714	7749	for (int i = 0; i < 3; i++)
..	..	@@ -7718,39 +7753,47 @@
7718	7753	}
7719	7754	/**/
7720	7755
7721		- switch (info.pane.renderCamera.viewCode)
	7756	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
	7757	+
	7758	+ if (totalScale < 0.01)
	7759	+ {
	7760	+ totalScale = 0.01;
	7761	+ }
	7762	+
	7763	+ switch (clickInfo.pane.RenderCamera().viewCode)
7722	7764	{
7723	7765	case 3: // '\001'
7724		- if (modified)
	7766	+ if (modified \|\| opposite)
7725	7767	{
7726	7768	//LA.matScale(toParent, 1, hScale, vScale);
7727		- LA.matScale(toParent, vScale, 1, 1);
	7769	+ LA.matScale(toParent, totalScale, 1, 1);
7728	7770	} // vScale, 1);
7729	7771	else
7730	7772	{
7731		- LA.matScale(toParent, vScale, vScale, vScale);
	7773	+ // EXCEPTION!
	7774	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7732	7775	} // vScale, 1);
7733	7776	break;
7734	7777
7735	7778	case 2: // '\002'
7736		- if (modified)
	7779	+ if (modified \|\| opposite)
7737	7780	{
7738	7781	//LA.matScale(toParent, hScale, 1, vScale);
7739		- LA.matScale(toParent, 1, vScale, 1);
	7782	+ LA.matScale(toParent, 1, totalScale, 1);
7740	7783	} else
7741	7784	{
7742		- LA.matScale(toParent, vScale, 1, vScale);
	7785	+ LA.matScale(toParent, totalScale, 1, totalScale);
7743	7786	}
7744	7787	break;
7745	7788
7746	7789	case 1: // '\003'
7747		- if (modified)
	7790	+ if (modified \|\| opposite)
7748	7791	{
7749	7792	//LA.matScale(toParent, hScale, vScale, 1);
7750		- LA.matScale(toParent, 1, 1, vScale);
	7793	+ LA.matScale(toParent, 1, 1, totalScale);
7751	7794	} else
7752	7795	{
7753		- LA.matScale(toParent, vScale, vScale, 1);
	7796	+ LA.matScale(toParent, totalScale, totalScale, 1);
7754	7797	}
7755	7798	break;
7756	7799	}
..	..	@@ -7784,7 +7827,7 @@
7784	7827	} // NEW ...
7785	7828
7786	7829
7787		- info.pane.repaint();
	7830	+ clickInfo.pane.repaint();
7788	7831	}
7789	7832
7790	7833	boolean overflow = false;
..	..	@@ -7883,14 +7926,22 @@
7883	7926	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7884	7927	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7885	7928	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7929	+
	7930	+ String objname;
	7931	+
7886	7932	if (false) //parent != null)
7887	7933	{
7888		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7934	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7889	7935	} else
7890	7936	{
7891		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7937	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7892	7938	} // + super.toString();
7893	7939	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7940	+
	7941	+ if (!Globals.ADVANCED)
	7942	+ return objname;
	7943	+
	7944	+ return objname + " " + System.identityHashCode(this);
7894	7945	}
7895	7946
7896	7947	public int hashCode()
..	..	@@ -7946,6 +7997,7 @@
7946	7997	objectUI.closeUI();
7947	7998	if (editWindow != null)
7948	7999	{
	8000	+ editWindow.ctrlPanel.FlushUI();
7949	8001	editWindow.refreshContents();
7950	8002	} // ? new
7951	8003	objectUI = null;
..	..	@@ -7954,6 +8006,10 @@
7954	8006	{
7955	8007	editWindow = null;
7956	8008	} // ?
	8009	+ }
	8010	+ else
	8011	+ {
	8012	+ //editWindow.closeUI();
7957	8013	}
7958	8014	}
7959	8015
..	..	@@ -7966,7 +8022,7 @@
7966	8022	/transient/ cVector2[] projectedVertices = new cVector2[0];
7967	8023
7968	8024	Object3D /Composite/ parent;
7969		- Object3D /Composite/ fileparent;
	8025	+ Object3D /Composite/ fileparent; // In the case of FileObject
7970	8026
7971	8027	double[][] toParent; // dynamic matrix
7972	8028	double[][] fromParent;
..	..	@@ -8081,7 +8137,7 @@
8081	8137	{
8082	8138	assert(bRep != null);
8083	8139	if (!(support instanceof GenericJoint)) // support.bRep != null)
8084		- GrafreeD.Assert(support.bRep == bRep.support);
	8140	+ Grafreed.Assert(support.bRep == bRep.support);
8085	8141	}
8086	8142	else
8087	8143	{
..	..	@@ -8112,6 +8168,10 @@
8112	8168	}
8113	8169
8114	8170	transient ObjEditor editWindow;
	8171	+ transient ObjEditor manipWindow;
	8172	+
	8173	+ transient boolean pinned;
	8174	+
8115	8175	transient ObjectUI objectUI;
8116	8176	public static int povDepth = 0;
8117	8177	private static cVector tbMin = new cVector();
..	..	@@ -8130,9 +8190,9 @@
8130	8190	private static cVector edge2 = new cVector();
8131	8191	//private static cVector norm = new cVector();
8132	8192	/transient private/ int hitSomething;
8133		- private static final int hitCenter = 1;
8134		- private static final int hitScale = 2;
8135		- private static final int hitRotate = 3;
	8193	+ static final int hitCenter = 1;
	8194	+ static final int hitScale = 2;
	8195	+ static final int hitRotate = 3;
8136	8196	/transient/ /private/ int viewCode; // Now used for transparency cache flag
8137	8197	/transient/ private Point centerPt;
8138	8198	/transient/ private int startX;
..	..	@@ -8164,6 +8224,8 @@
8164	8224	{
8165	8225	Object3D targ = this;
8166	8226
	8227	+ targ.NORMALPUSH = obj.NORMALPUSH;
	8228	+
8167	8229	if (obj.material != null)
8168	8230	{
8169	8231	if ((mask&MATERIAL)!=0) // ==(COLOR\|MATERIAL))