~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	+ Object3D 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;
..	..	@@ -286,6 +429,8 @@
286	429	}
287	430
288	431	boolean live = false;
	432	+ transient boolean keepdontselect;
	433	+ boolean dontselect = false;
289	434	boolean hide = false;
290	435	boolean link2master = false; // performs reset support/master at each frame
291	436	boolean marked = false; // animation node
..	..	@@ -295,6 +440,8 @@
295	440	boolean random = false;
296	441	boolean speedup = false;
297	442	boolean rewind = false;
	443	+
	444	+ float NORMALPUSH = 0;
298	445
299	446	Object3D support;
300	447
..	..	@@ -355,7 +502,7 @@
355	502
356	503	int MemorySize()
357	504	{
358		- if (memorysize == 0)
	505	+ if (true) // memorysize == 0)
359	506	{
360	507	try
361	508	{
..	..	@@ -415,16 +562,16 @@
415	562	{
416	563	Object3D copy = this;
417	564
418		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	565	+ Camera parentcam = Globals.theRenderer.ManipCamera();
419	566
420		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	567	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
421	568	{
422		- parentcam = CameraPane.theRenderer.cameras[1];
	569	+ parentcam = Globals.theRenderer.Cameras()[1];
423	570	}
424	571
425		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	572	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
426	573	{
427		- parentcam = CameraPane.theRenderer.cameras[0];
	574	+ parentcam = Globals.theRenderer.Cameras()[0];
428	575	}
429	576
430	577	if (this == parentcam)
..	..	@@ -432,7 +579,7 @@
432	579	//assert(this instanceof Camera);
433	580
434	581	for (int count = parentcam.GetTransformCount(); --count>=0;)
435		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	582	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
436	583	}
437	584
438	585	copy.marked ^= true;
..	..	@@ -452,7 +599,7 @@
452	599	//assert(this instanceof Camera);
453	600
454	601	for (int count = parentcam.GetTransformCount(); --count>=0;)
455		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	602	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
456	603	}
457	604
458	605	copy.Touch(); // display list issue
..	..	@@ -465,12 +612,14 @@
465	612	toParent = LA.newMatrix();
466	613	fromParent = LA.newMatrix();
467	614	}
	615	+
468	616	if (toParentMarked == null)
469	617	{
470	618	if (maxcount != 1)
471	619	{
472	620	new Exception().printStackTrace();
473	621	}
	622	+
474	623	toParentMarked = LA.newMatrix();
475	624	fromParentMarked = LA.newMatrix();
476	625	}
..	..	@@ -587,7 +736,7 @@
587	736	return;
588	737	}
589	738
590		- if (CameraPane.fromscript)
	739	+ if (Globals.fromscript)
591	740	{
592	741	transformcount = 0;
593	742	return;
..	..	@@ -745,7 +894,7 @@
745	894
746	895	int GetTransformCount()
747	896	{
748		- // marde pour serialization de Texture
	897	+ // patch pour serialization de Texture
749	898	resetmaxcount();
750	899	resettransformcount();
751	900	resetstep();
..	..	@@ -758,7 +907,7 @@
758	907	if (step == 0)
759	908	step = 1;
760	909	if (maxcount == 0)
761		- maxcount = 2048; // 4;
	910	+ maxcount = 128; // 2048; // 4;
762	911	// if (acceleration == 0)
763	912	// acceleration = 10;
764	913	if (delay == 0) // serial
..	..	@@ -779,9 +928,12 @@
779	928	// factor = CameraPane.STEP;
780	929	// }
781	930
782		- 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)
783	935	{
784		- currentframe = CameraPane.framecount;
	936	+ currentframe = Globals.framecount;
785	937
786	938	// System.err.println("transformcount = " + transformcount);
787	939	// System.err.println("factor = " + factor);
..	..	@@ -790,7 +942,8 @@
790	942
791	943	boolean changedir = random && Math.random() < 0.01; // && !link2master;
792	944
793		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	945	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	946	+ (step == 1 && changedir))
794	947	{
795	948	countdown = 1;
796	949	delay = speedup?8:1;
..	..	@@ -862,6 +1015,10 @@
862	1015	if (material == null \|\| material.multiply)
863	1016	return true;
864	1017
	1018	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1019	+ return false;
	1020	+
	1021	+ // Transparent objects are dynamic because we have to sort the triangles.
865	1022	return material.opacity > 0.99;
866	1023	}
867	1024
..	..	@@ -893,6 +1050,11 @@
893	1050	fromParent = null; // LA.newMatrix();
894	1051	bRep = null; // new BoundaryRep();
895	1052
	1053	+ if (oname != null && oname.equals("LeftHand"))
	1054	+ {
	1055	+ name = oname;
	1056	+ }
	1057	+
896	1058	/*
897	1059	float hue = (float)Math.random();
898	1060	Color col;
..	..	@@ -935,7 +1097,7 @@
935	1097
936	1098	public Object clone()
937	1099	{
938		- return GraphreeD.clone(this);
	1100	+ return Grafreed.clone(this);
939	1101	}
940	1102
941	1103	Object3D copyExpand()
..	..	@@ -1257,6 +1419,7 @@
1257	1419	toParent = LA.newMatrix();
1258	1420	fromParent = LA.newMatrix();
1259	1421	}
	1422	+
1260	1423	LA.matCopy(other.toParent, toParent);
1261	1424	LA.matCopy(other.fromParent, fromParent);
1262	1425
..	..	@@ -1446,7 +1609,16 @@
1446	1609	// if (other == null)
1447	1610	// return;
1448	1611
1449		- System.out.println("Link support this = " + this + "; other = " + other);
	1612	+ if (other != null)
	1613	+ {
	1614	+ BoundaryRep.SEUIL = other.material.cameralight;
	1615	+
	1616	+ // Set default to 0.1
	1617	+ BoundaryRep.SEUIL /= 4; // 2;
	1618	+ System.out.println("SEUIL = " + BoundaryRep.SEUIL);
	1619	+ }
	1620	+
	1621	+ System.out.println("Link this = " + this + "; support = " + other);
1450	1622
1451	1623	//if (bRep != null)
1452	1624	// bRep.linkVerticesThis(other.bRep);
..	..	@@ -1701,7 +1873,7 @@
1701	1873	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1702	1874	o.bRep = transientrep;
1703	1875	if (clone)
1704		- o.bRep = (BoundaryRep) GraphreeD.clone(transientrep);
	1876	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1705	1877	o.CreateMaterial();
1706	1878	o.SetAttributes(this, -1);
1707	1879	//parent
..	..	@@ -1714,7 +1886,7 @@
1714	1886	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1715	1887	o.bRep = bRep;
1716	1888	if (clone)
1717		- o.bRep = (BoundaryRep) GraphreeD.clone(bRep);
	1889	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1718	1890	o.CreateMaterial();
1719	1891	//o.overwriteThis(this, -1);
1720	1892	o.SetAttributes(this, -1);
..	..	@@ -1756,7 +1928,7 @@
1756	1928	// {
1757	1929	// assert(bRep == null);
1758	1930	// Object3D o = new Object3D("Geometry:" + this.name);
1759		-// o.bRep = (BoundaryRep) GraphreeD.clone(transientrep);
	1931	+// o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
1760	1932	// o.CreateMaterial();
1761	1933	// parent.addChild(o);
1762	1934	// }
..	..	@@ -1765,7 +1937,7 @@
1765	1937	// {
1766	1938	// assert(transientrep == null);
1767	1939	// Object3D o = new Object3D("Geometry:" + this.name);
1768		-// o.bRep = (BoundaryRep) GraphreeD.clone(bRep);
	1940	+// o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
1769	1941	// o.CreateMaterial();
1770	1942	// parent.addChild(o);
1771	1943	// }
..	..	@@ -1801,12 +1973,15 @@
1801	1973	if (obj.name == null)
1802	1974	continue; // can't be a null one
1803	1975
	1976	+ // Try perfect match first.
1804	1977	if (n.equals(obj.name))
1805	1978	{
1806	1979	theobj = obj;
1807	1980	count++;
1808	1981	}
1809	1982	}
	1983	+
	1984	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1810	1985
1811	1986	if (count != 1)
1812	1987	for (int i=Size(); --i>=0;)
..	..	@@ -1816,8 +1991,9 @@
1816	1991	if (obj.name == null)
1817	1992	continue; // can't be a null one
1818	1993
1819		- //if (n.contains(obj.name)) // dec 2013 name.split(":")[0])) // Poser generates a count
1820		- if (n.startsWith(obj.name))
	1994	+ String name = obj.name.split(":")[0]; // Poser generates a count
	1995	+ //if (n.startsWith(obj.name))
	1996	+ if (n.contains(name))
1821	1997	{
1822	1998	theobj = obj;
1823	1999	count++;
..	..	@@ -2120,15 +2296,8 @@
2120	2296	if (/parent != null &&/ material == null)
2121	2297	{
2122	2298	material = new cMaterial(GetMaterial());
2123		- if (projectedVertices == null \|\| projectedVertices.length <= 2)
2124		- {
2125		- projectedVertices = new Object3D.cVector2[3];
2126		- }
2127		- for (int i = 0; i < 3; i++)
2128		- {
2129		- projectedVertices[i] = new cVector2(); // Others
2130		- }
2131		- projectedVertices[0].x = 100; // bump
	2299	+
	2300	+ InitOthers();
2132	2301
2133	2302	if (this instanceof Camera)
2134	2303	{
..	..	@@ -2272,12 +2441,17 @@
2272	2441	}
2273	2442	*/
2274	2443	}
	2444	+ else
	2445	+ {
	2446	+ //((ObjEditor)editWindow).SetupUI2(null);
	2447	+ }
2275	2448	}
2276	2449
2277	2450	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2278	2451	{
2279	2452	if (newWindow)
2280	2453	{
	2454	+ new Exception().printStackTrace();
2281	2455	System.exit(0);
2282	2456	if (parent != null)
2283	2457	{
..	..	@@ -2312,6 +2486,14 @@
2312	2486	{
2313	2487	editWindow.refreshContents();
2314	2488	}
	2489	+ else
	2490	+ {
	2491	+ if (manipWindow != null)
	2492	+ {
	2493	+ manipWindow.refreshContents();
	2494	+ }
	2495	+ }
	2496	+
2315	2497	//if (parent != null)
2316	2498	//parent.refreshEditWindow();
2317	2499	}
..	..	@@ -2391,7 +2573,8 @@
2391	2573	private static final int editSelf = 1;
2392	2574	private static final int editChild = 2;
2393	2575
2394		- void drawEditHandles(ClickInfo info, int level)
	2576	+ void drawEditHandles(//ClickInfo info,
	2577	+ int level)
2395	2578	{
2396	2579	if (level == 0)
2397	2580	{
..	..	@@ -2399,7 +2582,8 @@
2399	2582	return;
2400	2583
2401	2584	Object3D selectee;
2402		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2585	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2586	+ level + 1))
2403	2587	{
2404	2588	selectee = (Object3D) e.nextElement();
2405	2589	}
..	..	@@ -2407,19 +2591,22 @@
2407	2591	} else
2408	2592	{
2409	2593	//super.
2410		- drawEditHandles0(info, level + 1);
	2594	+ drawEditHandles0(//info,
	2595	+ level + 1);
2411	2596	}
2412	2597	}
2413	2598
2414		- boolean doEditClick(ClickInfo info, int level)
	2599	+ boolean doEditClick(//ClickInfo info,
	2600	+ int level)
2415	2601	{
2416	2602	doSomething = 0;
2417	2603	if (level == 0)
2418	2604	{
2419		- return doParentClick(info);
	2605	+ return doParentClick(); //info);
2420	2606	}
2421	2607	if (//super.
2422		- doEditClick0(info, level))
	2608	+ doEditClick0(//info,
	2609	+ level))
2423	2610	{
2424	2611	doSomething = 1;
2425	2612	return true;
..	..	@@ -2429,7 +2616,7 @@
2429	2616	}
2430	2617	}
2431	2618
2432		- boolean doParentClick(ClickInfo info)
	2619	+ boolean doParentClick() //ClickInfo info)
2433	2620	{
2434	2621	if (selection == null)
2435	2622	{
..	..	@@ -2442,7 +2629,8 @@
2442	2629	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2443	2630	{
2444	2631	Object3D selectee = (Object3D) e.nextElement();
2445		- if (selectee.doEditClick(info, 1))
	2632	+ if (selectee.doEditClick(//info,
	2633	+ 1))
2446	2634	{
2447	2635	childToDrag = selectee;
2448	2636	doSomething = 2;
..	..	@@ -2454,13 +2642,15 @@
2454	2642	return retval;
2455	2643	}
2456	2644
2457		- void doEditDrag(ClickInfo info)
	2645	+ void doEditDrag(//ClickInfo clickInfo,
	2646	+ boolean opposite)
2458	2647	{
2459	2648	switch (doSomething)
2460	2649	{
2461	2650	case 1: // '\001'
2462	2651	//super.
2463		- doEditDrag0(info);
	2652	+ doEditDrag0(//clickInfo,
	2653	+ opposite);
2464	2654	break;
2465	2655
2466	2656	case 2: // '\002'
..	..	@@ -2473,11 +2663,13 @@
2473	2663	{
2474	2664	//sel.hitSomething = childToDrag.hitSomething;
2475	2665	//childToDrag.doEditDrag(info);
2476		- sel.doEditDrag(info);
	2666	+ sel.doEditDrag(//clickInfo,
	2667	+ opposite);
2477	2668	} else
2478	2669	{
2479	2670	//super.
2480		- doEditDrag0(info);
	2671	+ doEditDrag0(//clickInfo,
	2672	+ opposite);
2481	2673	}
2482	2674	}
2483	2675	break;
..	..	@@ -2495,6 +2687,9 @@
2495	2687	{
2496	2688	deselectAll();
2497	2689	}
	2690	+
	2691	+ new Exception().printStackTrace();
	2692	+
2498	2693	ClickInfo newInfo = new ClickInfo();
2499	2694	newInfo.flags = info.flags;
2500	2695	newInfo.bounds = info.bounds;
..	..	@@ -2587,6 +2782,18 @@
2587	2782	void GenNormalsS(boolean crease)
2588	2783	{
2589	2784	selection.GenNormals(crease);
	2785	+// for (int i=0; i<selection.size(); i++)
	2786	+// {
	2787	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2788	+// selectee.GenNormals(crease);
	2789	+// }
	2790	+
	2791	+ //Touch();
	2792	+ }
	2793	+
	2794	+ void GenNormalsMeshS()
	2795	+ {
	2796	+ selection.GenNormalsMesh();
2590	2797	// for (int i=0; i<selection.size(); i++)
2591	2798	// {
2592	2799	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2732,6 +2939,42 @@
2732	2939	blockloop = false;
2733	2940	}
2734	2941
	2942	+ void GenNormalsMesh()
	2943	+ {
	2944	+ if (blockloop)
	2945	+ return;
	2946	+
	2947	+ blockloop = true;
	2948	+ GenNormalsMesh0();
	2949	+ for (int i = 0; i < Children().Size(); i++)
	2950	+ {
	2951	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2952	+ if (child == null)
	2953	+ continue;
	2954	+ child.GenNormalsMesh();
	2955	+// Children().release(i);
	2956	+ }
	2957	+ blockloop = false;
	2958	+ }
	2959	+
	2960	+ void GenNormalsMINE()
	2961	+ {
	2962	+ if (blockloop)
	2963	+ return;
	2964	+
	2965	+ blockloop = true;
	2966	+ GenNormalsMINE0();
	2967	+ for (int i = 0; i < Children().Size(); i++)
	2968	+ {
	2969	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2970	+ if (child == null)
	2971	+ continue;
	2972	+ child.GenNormalsMINE();
	2973	+// Children().release(i);
	2974	+ }
	2975	+ blockloop = false;
	2976	+ }
	2977	+
2735	2978	void ClearColors()
2736	2979	{
2737	2980	if (blockloop)
..	..	@@ -2866,7 +3109,8 @@
2866	3109	{
2867	3110	if (bRep != null)
2868	3111	{
2869		- bRep.GenUV();
	3112	+ bRep.GenUV(); //1);
	3113	+ //bRep.UnfoldUV();
2870	3114	Touch();
2871	3115	}
2872	3116	}
..	..	@@ -2876,6 +3120,24 @@
2876	3120	if (bRep != null)
2877	3121	{
2878	3122	bRep.GenerateNormals(crease);
	3123	+ Touch();
	3124	+ }
	3125	+ }
	3126	+
	3127	+ void GenNormalsMesh0()
	3128	+ {
	3129	+ if (bRep != null)
	3130	+ {
	3131	+ bRep.GenerateNormalsMesh();
	3132	+ Touch();
	3133	+ }
	3134	+ }
	3135	+
	3136	+ void GenNormalsMINE0()
	3137	+ {
	3138	+ if (bRep != null)
	3139	+ {
	3140	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2879	3141	Touch();
2880	3142	}
2881	3143	}
..	..	@@ -2932,6 +3194,33 @@
2932	3194	blockloop = false;
2933	3195	}
2934	3196
	3197	+ void TransformChildren()
	3198	+ {
	3199	+ if (toParent != null)
	3200	+ {
	3201	+ for (int i=Size(); --i>=0;)
	3202	+ {
	3203	+ Object3D v = get(i);
	3204	+
	3205	+ if (v.toParent == null)
	3206	+ {
	3207	+ v.toParent = LA.newMatrix();
	3208	+ v.fromParent = LA.newMatrix();
	3209	+ }
	3210	+
	3211	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3212	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3213	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3214	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3215	+ }
	3216	+
	3217	+ toParent = null; // LA.matIdentity(toParent);
	3218	+ fromParent = null; // LA.matIdentity(fromParent);
	3219	+
	3220	+ Touch();
	3221	+ }
	3222	+ }
	3223	+
2935	3224	void TransformGeometry()
2936	3225	{
2937	3226	Object3D obj = this;
..	..	@@ -3153,9 +3442,11 @@
3153	3442
3154	3443	BoundaryRep sup = bRep.support;
3155	3444	bRep.support = null;
3156		- BoundaryRep temprep = (BoundaryRep) GraphreeD.clone(bRep);
	3445	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3157	3446	// bRep.SplitInTwo(onlyone); // thread...
3158		- temprep.SplitInTwo(reduction34, onlyone);
	3447	+
	3448	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3449	+
3159	3450	bRep = temprep;
3160	3451	bRep.support = sup;
3161	3452	Touch();
..	..	@@ -3292,7 +3583,8 @@
3292	3583	if (blockloop)
3293	3584	return;
3294	3585
3295		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3586	+ if (//marked \|\| // does not make sense
	3587	+ (bRep != null \|\| material != null)) // borderline...
3296	3588	live = h;
3297	3589
3298	3590	for (int i = 0; i < Size(); i++)
..	..	@@ -3313,7 +3605,8 @@
3313	3605	return;
3314	3606
3315	3607	//if (bRep != null)
3316		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3608	+ if (//marked \|\| // does not make sense
	3609	+ (bRep != null \|\| material != null)) // borderline...
3317	3610	link2master = h;
3318	3611
3319	3612	for (int i = 0; i < Size(); i++)
..	..	@@ -3333,7 +3626,8 @@
3333	3626	if (blockloop)
3334	3627	return;
3335	3628
3336		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3629	+ if (//marked \|\| // does not make sense
	3630	+ (bRep != null \|\| material != null)) // borderline...
3337	3631	hide = h;
3338	3632
3339	3633	for (int i = 0; i < Size(); i++)
..	..	@@ -3353,7 +3647,7 @@
3353	3647	if (blockloop)
3354	3648	return;
3355	3649
3356		- if (bRep != null && material != null) // borderline...
	3650	+ if (bRep != null \|\| material != null) // borderline...
3357	3651	marked = h;
3358	3652
3359	3653	for (int i = 0; i < Size(); i++)
..	..	@@ -3363,6 +3657,46 @@
3363	3657	continue;
3364	3658	blockloop = true;
3365	3659	child.MarkLeaves(h);
	3660	+ blockloop = false;
	3661	+ // release(i);
	3662	+ }
	3663	+ }
	3664	+
	3665	+ void RewindLeaves(boolean h)
	3666	+ {
	3667	+ if (blockloop)
	3668	+ return;
	3669	+
	3670	+ if (bRep != null \|\| material != null) // borderline...
	3671	+ rewind = h;
	3672	+
	3673	+ for (int i = 0; i < Size(); i++)
	3674	+ {
	3675	+ Object3D child = (Object3D) get(i); // reserve(i);
	3676	+ if (child == null)
	3677	+ continue;
	3678	+ blockloop = true;
	3679	+ child.RewindLeaves(h);
	3680	+ blockloop = false;
	3681	+ // release(i);
	3682	+ }
	3683	+ }
	3684	+
	3685	+ void RandomLeaves(boolean h)
	3686	+ {
	3687	+ if (blockloop)
	3688	+ return;
	3689	+
	3690	+ if (bRep != null \|\| material != null) // borderline...
	3691	+ random = h;
	3692	+
	3693	+ for (int i = 0; i < Size(); i++)
	3694	+ {
	3695	+ Object3D child = (Object3D) get(i); // reserve(i);
	3696	+ if (child == null)
	3697	+ continue;
	3698	+ blockloop = true;
	3699	+ child.RandomLeaves(h);
3366	3700	blockloop = false;
3367	3701	// release(i);
3368	3702	}
..	..	@@ -3677,7 +4011,7 @@
3677	4011	if (child == null)
3678	4012	continue;
3679	4013
3680		- if (GraphreeD.RENDERME > 0)
	4014	+ if (Grafreed.RENDERME > 0)
3681	4015	{
3682	4016	if (child instanceof Merge)
3683	4017	((Merge)child).renderme();
..	..	@@ -3828,7 +4162,7 @@
3828	4162	if (child == null)
3829	4163	continue;
3830	4164
3831		- if (GraphreeD.RENDERME > 0)
	4165	+ if (Grafreed.RENDERME > 0)
3832	4166	{
3833	4167	if (child instanceof Merge)
3834	4168	((Merge)child).renderme();
..	..	@@ -4023,7 +4357,7 @@
4023	4357	if (child == null)
4024	4358	continue;
4025	4359
4026		- if (GraphreeD.RENDERME > 0)
	4360	+ if (Grafreed.RENDERME > 0)
4027	4361	{
4028	4362	if (child instanceof Merge)
4029	4363	((Merge)child).renderme();
..	..	@@ -4111,7 +4445,7 @@
4111	4445	if (blockloop)
4112	4446	return;
4113	4447
4114		- for (int i=0; i<size(); i++)
	4448	+ for (int i=0; i<Size(); i++)
4115	4449	{
4116	4450	if (get(i).parent != this)
4117	4451	{
..	..	@@ -4120,6 +4454,71 @@
4120	4454	}
4121	4455	blockloop = true;
4122	4456	get(i).RepairParent();
	4457	+ blockloop = false;
	4458	+ }
	4459	+ }
	4460	+
	4461	+ void RepairShadow()
	4462	+ {
	4463	+ if (blockloop)
	4464	+ return;
	4465	+
	4466	+ if (this.material != null)
	4467	+ this.InitOthers();
	4468	+
	4469	+ for (int i=0; i<Size(); i++)
	4470	+ {
	4471	+ blockloop = true;
	4472	+ get(i).RepairShadow();
	4473	+ blockloop = false;
	4474	+ }
	4475	+ }
	4476	+
	4477	+ void RepairSOV()
	4478	+ {
	4479	+ if (blockloop)
	4480	+ return;
	4481	+
	4482	+ String texname = this.GetPigmentTexture();
	4483	+
	4484	+ if (texname.startsWith("sov"))
	4485	+ {
	4486	+ String[] s = texname.split("/");
	4487	+
	4488	+ String[] sname = s[1].split("Color.pn");
	4489	+
	4490	+ texname = sname[0];
	4491	+
	4492	+ if (sname.length > 1)
	4493	+ {
	4494	+ texname += "Color.jpg";
	4495	+ }
	4496	+
	4497	+ this.SetPigmentTexture("sov/" + texname);
	4498	+ }
	4499	+
	4500	+ texname = this.GetBumpTexture();
	4501	+
	4502	+ if (texname.startsWith("sov"))
	4503	+ {
	4504	+ String[] s = texname.split("/");
	4505	+
	4506	+ String[] sname = s[1].split("Bump.pn");
	4507	+
	4508	+ texname = sname[0];
	4509	+
	4510	+ if (sname.length > 1)
	4511	+ {
	4512	+ texname += "Bump.jpg";
	4513	+ }
	4514	+
	4515	+ this.SetBumpTexture("sov/" + texname);
	4516	+ }
	4517	+
	4518	+ for (int i=0; i<Size(); i++)
	4519	+ {
	4520	+ blockloop = true;
	4521	+ get(i).RepairSOV();
4123	4522	blockloop = false;
4124	4523	}
4125	4524	}
..	..	@@ -4614,7 +5013,7 @@
4614	5013
4615	5014	cTreePath SelectLeaf(int indexcount, boolean deselect)
4616	5015	{
4617		- if (hide)
	5016	+ if (hide \|\| dontselect)
4618	5017	return null;
4619	5018
4620	5019	if (count <= 0)
..	..	@@ -4638,9 +5037,17 @@
4638	5037	}
4639	5038	}
4640	5039
	5040	+ ObjEditor GetWindow()
	5041	+ {
	5042	+ if (editWindow != null)
	5043	+ return editWindow;
	5044	+
	5045	+ return manipWindow;
	5046	+ }
	5047	+
4641	5048	cTreePath Select(int indexcount, boolean deselect)
4642	5049	{
4643		- if (hide)
	5050	+ if (hide \|\| dontselect)
4644	5051	return null;
4645	5052
4646	5053	if (count <= 0)
..	..	@@ -4674,10 +5081,11 @@
4674	5081	if (leaf != null)
4675	5082	{
4676	5083	cTreePath tp = new cTreePath(this, leaf);
4677		- if (editWindow != null)
	5084	+ ObjEditor window = GetWindow();
	5085	+ if (window != null)
4678	5086	{
4679	5087	//System.out.println("editWindow = " + editWindow + " vs " + this);
4680		- editWindow.Select(tp, deselect, true);
	5088	+ window.Select(tp, deselect, true);
4681	5089	}
4682	5090
4683	5091	return tp;
..	..	@@ -4694,6 +5102,7 @@
4694	5102
4695	5103	if (child == null)
4696	5104	continue;
	5105	+
4697	5106	if (child.HasTransparency() && child.size() != 0)
4698	5107	{
4699	5108	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4703,9 +5112,10 @@
4703	5112	if (leaf != null)
4704	5113	{
4705	5114	cTreePath tp = new cTreePath(this, leaf);
4706		- if (editWindow != null)
	5115	+ ObjEditor window = GetWindow();
	5116	+ if (window != null)
4707	5117	{
4708		- editWindow.Select(tp, deselect, true);
	5118	+ window.Select(tp, deselect, true);
4709	5119	}
4710	5120
4711	5121	return tp;
..	..	@@ -4790,7 +5200,7 @@
4790	5200	return globalTransform;
4791	5201	}
4792	5202
4793		- void PreprocessOcclusion(CameraPane cp)
	5203	+ void PreprocessOcclusion(iCameraPane cp)
4794	5204	{
4795	5205	/*
4796	5206	if (AOdone)
..	..	@@ -4937,7 +5347,8 @@
4937	5347	} else //
4938	5348	if (editWindow != null)
4939	5349	{
4940		- editWindow.cameraView.lighttouched = true;
	5350	+ //editWindow.cameraView.lighttouched = true;
	5351	+ Globals.lighttouched = true;
4941	5352	}
4942	5353	}
4943	5354
..	..	@@ -5029,6 +5440,51 @@
5029	5440	blockloop = false;
5030	5441	}
5031	5442
	5443	+ void ResetSelectable()
	5444	+ {
	5445	+ if (blockloop)
	5446	+ return;
	5447	+
	5448	+ blockloop = true;
	5449	+
	5450	+ keepdontselect = dontselect;
	5451	+ dontselect = true;
	5452	+
	5453	+ Object3D child;
	5454	+ int nb = Size();
	5455	+ for (int i = 0; i < nb; i++)
	5456	+ {
	5457	+ child = (Object3D) get(i);
	5458	+ if (child == null)
	5459	+ continue;
	5460	+ child.ResetSelectable();
	5461	+ }
	5462	+
	5463	+ blockloop = false;
	5464	+ }
	5465	+
	5466	+ void RestoreSelectable()
	5467	+ {
	5468	+ if (blockloop)
	5469	+ return;
	5470	+
	5471	+ blockloop = true;
	5472	+
	5473	+ dontselect = keepdontselect;
	5474	+
	5475	+ Object3D child;
	5476	+ int nb = Size();
	5477	+ for (int i = 0; i < nb; i++)
	5478	+ {
	5479	+ child = (Object3D) get(i);
	5480	+ if (child == null)
	5481	+ continue;
	5482	+ child.RestoreSelectable();
	5483	+ }
	5484	+
	5485	+ blockloop = false;
	5486	+ }
	5487	+
5032	5488	boolean IsSelected()
5033	5489	{
5034	5490	if (parent == null)
..	..	@@ -5091,10 +5547,34 @@
5091	5547
5092	5548	// System.out.println("Fullname = " + fullname);
5093	5549
5094		- if (fullname.name.indexOf(":") == -1)
5095		- return fullname.name;
	5550	+ // Does not work on Windows due to C:
	5551	+// if (fullname.name.indexOf(":") == -1)
	5552	+// return fullname.name;
	5553	+//
	5554	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5096	5555
5097		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5556	+ String[] split = fullname.name.split(":");
	5557	+
	5558	+ if (split.length == 0)
	5559	+ {
	5560	+ return "";
	5561	+ }
	5562	+
	5563	+ if (split.length <= 2)
	5564	+ {
	5565	+ if (fullname.name.endsWith(":"))
	5566	+ {
	5567	+ // Windows
	5568	+ return fullname.name.substring(0, fullname.name.length()-1);
	5569	+ }
	5570	+
	5571	+ return split[0];
	5572	+ }
	5573	+
	5574	+ // Windows
	5575	+ assert(split.length == 4);
	5576	+
	5577	+ return split[0] + ":" + split[1];
5098	5578	}
5099	5579
5100	5580	static String GetBump(cTexture fullname)
..	..	@@ -5103,10 +5583,38 @@
5103	5583	return "";
5104	5584
5105	5585	// System.out.println("Fullname = " + fullname);
5106		- if (fullname.name.indexOf(":") == -1)
5107		- return "";
5108		-
5109		- return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5586	+ // Does not work on Windows due to C:
	5587	+// if (fullname.name.indexOf(":") == -1)
	5588	+// return "";
	5589	+//
	5590	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5591	+ String[] split = fullname.name.split(":");
	5592	+
	5593	+ if (split.length == 0)
	5594	+ {
	5595	+ return "";
	5596	+ }
	5597	+
	5598	+ if (split.length == 1)
	5599	+ {
	5600	+ return "";
	5601	+ }
	5602	+
	5603	+ if (split.length == 2)
	5604	+ {
	5605	+ if (fullname.name.endsWith(":"))
	5606	+ {
	5607	+ // Windows
	5608	+ return "";
	5609	+ }
	5610	+
	5611	+ return split[1];
	5612	+ }
	5613	+
	5614	+ // Windows
	5615	+ assert(split.length == 4);
	5616	+
	5617	+ return split[2] + ":" + split[3];
5110	5618	}
5111	5619
5112	5620	String GetPigmentTexture()
..	..	@@ -5180,7 +5688,7 @@
5180	5688	System.out.print("; textures = " + textures);
5181	5689	System.out.println("; usedtextures = " + usedtextures);
5182	5690
5183		- if (GetTextures() == null)
	5691	+ if (GetTextures() == null) // What is that??
5184	5692	GetTextures().name = ":";
5185	5693
5186	5694	String texname = tex;
..	..	@@ -5211,6 +5719,43 @@
5211	5719	child.ResetPigmentTexture();
5212	5720	blockloop = false;
5213	5721	}
	5722	+ }
	5723	+
	5724	+ UUID GetUUID()
	5725	+ {
	5726	+ if (uuid == null)
	5727	+ {
	5728	+ // Serial
	5729	+ uuid = UUID.randomUUID();
	5730	+ }
	5731	+
	5732	+ return uuid;
	5733	+ }
	5734	+
	5735	+ Object3D GetObject(UUID uid)
	5736	+ {
	5737	+ if (blockloop)
	5738	+ return null;
	5739	+
	5740	+ if (GetUUID().equals(uid))
	5741	+ return this;
	5742	+
	5743	+ int nb = Size();
	5744	+ for (int i = 0; i < nb; i++)
	5745	+ {
	5746	+ Object3D child = (Object3D) get(i);
	5747	+
	5748	+ if (child == null)
	5749	+ continue;
	5750	+
	5751	+ blockloop = true;
	5752	+ Object3D obj = child.GetObject(uid);
	5753	+ blockloop = false;
	5754	+ if (obj != null)
	5755	+ return obj;
	5756	+ }
	5757	+
	5758	+ return null;
5214	5759	}
5215	5760
5216	5761	void SetBumpTexture(String tex)
..	..	@@ -5249,25 +5794,65 @@
5249	5794	}
5250	5795	}
5251	5796
5252		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5797	+ void EmbedTextures(boolean embed)
	5798	+ {
	5799	+ if (blockloop)
	5800	+ return;
	5801	+
	5802	+ //if (GetTextures() != null)
	5803	+ if (embed)
	5804	+ CameraPane.EmbedTextures(GetTextures());
	5805	+ else
	5806	+ {
	5807	+ GetTextures().pigmentdata = null;
	5808	+ GetTextures().bumpdata = null;
	5809	+ GetTextures().pw = 0;
	5810	+ GetTextures().ph = 0;
	5811	+ GetTextures().bw = 0;
	5812	+ GetTextures().bh = 0;
	5813	+ }
	5814	+
	5815	+ int nb = Size();
	5816	+ for (int i = 0; i < nb; i++)
	5817	+ {
	5818	+ Object3D child = (Object3D) get(i);
	5819	+
	5820	+ if (child == null)
	5821	+ continue;
	5822	+
	5823	+ blockloop = true;
	5824	+ child.EmbedTextures(embed);
	5825	+ blockloop = false;
	5826	+ }
	5827	+ }
	5828	+
	5829	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5253	5830	{
5254	5831	Draw(display, root, selected, blocked);
5255	5832	}
5256	5833
5257		- static cMaterial[] materialstack = new cMaterial[65536];
5258		- static boolean[] selectedstack = new boolean[65536];
5259		- static int materialdepth = 0;
5260		-
5261	5834	boolean NeedSupport()
5262	5835	{
5263	5836	return
5264		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5837	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5265	5838	// PROBLEM with CROWD!!
5266		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	5839	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5267	5840	}
5268	5841
	5842	+ static boolean DEBUG_SELECTION = false;
5269	5843
5270		- void Draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5844	+ boolean IsLive()
	5845	+ {
	5846	+ if (live)
	5847	+ return true;
	5848	+
	5849	+ if (parent == null)
	5850	+ return false;
	5851	+
	5852	+ return parent.IsLive();
	5853	+ }
	5854	+
	5855	+ void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5271	5856	{
5272	5857	Invariants(); // june 2013
5273	5858
..	..	@@ -5276,8 +5861,8 @@
5276	5861	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5277	5862	}
5278	5863
5279		- if (display.drawMode == CameraPane.SELECTION &&
5280		- hide)
	5864	+ if (display.DrawMode() == iCameraPane.SELECTION &&
	5865	+ (hide \|\| dontselect))
5281	5866	return;
5282	5867
5283	5868	if (name != null && name.contains("sclera"))
..	..	@@ -5295,7 +5880,7 @@
5295	5880	if (this instanceof Checker)
5296	5881	return;
5297	5882
5298		- if (display.drawMode == display.SHADOW && PASSTEST)
	5883	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5299	5884	return;
5300	5885
5301	5886	if (count <= 0)
..	..	@@ -5303,13 +5888,13 @@
5303	5888	return;
5304	5889	}
5305	5890
5306		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5307		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5891	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	5892	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5308	5893	{
5309	5894	return;
5310	5895	}
5311	5896
5312		- javax.media.opengl.GL gl = display.GetGL();
	5897	+ //javax.media.opengl.GL gl = display.GetGL();
5313	5898
5314	5899	/*
5315	5900	if (touched)
..	..	@@ -5327,8 +5912,10 @@
5327	5912	if (support != null)
5328	5913	support = support;
5329	5914
5330		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5331		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5915	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5916	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5917	+
	5918	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5332	5919
5333	5920	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5334	5921	{
..	..	@@ -5338,30 +5925,33 @@
5338	5925	// usecalllists &= !(parent instanceof RandomNode);
5339	5926	// usecalllists = false;
5340	5927
5341		- if (GetBRep() != null)
5342		- usecalllists = usecalllists;
	5928	+ if (display.DrawMode() == display.SHADOW)
	5929	+ //GetBRep() != null)
	5930	+ usecalllists = !!usecalllists;
5343	5931	//System.out.println("draw " + this);
5344	5932	//new Exception().printStackTrace();
5345	5933
5346	5934	boolean compiled = false;
5347	5935
5348		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5936	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5349	5937
5350		- if (!selectmode && //display.drawMode != display.SELECTION &&
5351		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5938	+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
	5939	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5940	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5352	5941	{
5353		- display.lighttouched = true;
	5942	+ Globals.lighttouched = true;
5354	5943	} // all panes...
5355		- //if (usecalllists && display.drawMode != display.SELECTION && display.drawMode != display.SHADOW &&
5356		- if (bRep != null && usecalllists && !selectmode && // june 2013 display.drawMode != display.SHADOW &&
	5944	+
	5945	+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
	5946	+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5357	5947	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5358	5948	{
5359	5949	if (!(this instanceof Composite))
5360	5950	touched = false;
5361	5951	//if (displaylist == -1 && usecalllists)
5362		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5952	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5363	5953	{
5364		- bRep.displaylist = gl.glGenLists(1);
	5954	+ bRep.displaylist = display.GenList();
5365	5955	assert(bRep.displaylist != 0);
5366	5956	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5367	5957	//System.out.println("\tgen list " + list);
..	..	@@ -5370,21 +5960,23 @@
5370	5960
5371	5961	//System.out.println("\tnew list " + list);
5372	5962	//gl.glDrawBuffer(gl.GL_NONE);
5373		- if (usecalllists)
	5963	+ if (usecalllists && bRep.displaylist > 0)
5374	5964	{
5375	5965	// System.err.println("new list " + bRep.displaylist + " for " + this);
5376		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5966	+ display.NewList(bRep.displaylist);
5377	5967	}
	5968	+
5378	5969	CallList(display, root, selected, blocked);
	5970	+
5379	5971	// compiled = true;
5380		- if (usecalllists)
	5972	+ if (usecalllists && bRep.displaylist > 0)
5381	5973	{
5382	5974	// System.err.println("end list " + bRep.displaylist + " for " + this);
5383		- gl.glEndList();
	5975	+ display.EndList();
5384	5976	}
5385	5977	//gl.glDrawBuffer(gl.GL_BACK);
5386	5978	// XXX touched = false;
5387		- display.lighttouched = true; // all panes...
	5979	+ Globals.lighttouched = true; // all panes...
5388	5980	}
5389	5981
5390	5982	touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
..	..	@@ -5423,12 +6015,12 @@
5423	6015
5424	6016	// frustum culling
5425	6017	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5426		- && display.drawMode != CameraPane.SELECTION)
	6018	+ && display.DrawMode() != iCameraPane.SELECTION)
5427	6019	{
5428		- if (display.drawMode == CameraPane.SHADOW)
	6020	+ if (display.DrawMode() == iCameraPane.SHADOW)
5429	6021	{
5430	6022	if (!link2master // tricky to cull in shadow mode.
5431		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	6023	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5432	6024	{
5433	6025	//System.out.print("CULLED");
5434	6026	culled = true;
..	..	@@ -5436,7 +6028,7 @@
5436	6028	}
5437	6029	else
5438	6030	//GetBRep().getBounds(v0, v1, this);
5439		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	6031	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5440	6032	culled = true;
5441	6033
5442	6034	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5472,11 +6064,12 @@
5472	6064
5473	6065
5474	6066	if (!culled)
5475		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	6067	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5476	6068	{
5477	6069	if (GetBRep() != null)
5478	6070	{
5479		- CameraPane.NextIndex(this, gl);
	6071	+ display.NextIndex();
	6072	+
5480	6073	// vertex color conflict : gl.glCallList(list);
5481	6074	DrawNode(display, root, selected);
5482	6075	if (this instanceof BezierPatch)
..	..	@@ -5498,53 +6091,7 @@
5498	6091	color[2] /= 2;
5499	6092	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5500	6093	*/
5501		- if (material != null)
5502		- {
5503		- materialstack[materialdepth] = material;
5504		- selectedstack[materialdepth] = selected;
5505		- cStatic.objectstack[materialdepth++] = this;
5506		- //System.out.println("material " + material);
5507		- //Applet3D.tracein(this, selected);
5508		- display.vector2buffer = projectedVertices;
5509		- if (this instanceof Camera)
5510		- {
5511		- display.options1[0] = material.shift;
5512		- //System.out.println("shift " + material.shift);
5513		- display.options1[1] = material.lightarea;
5514		- display.options1[2] = material.shadowbias;
5515		- display.options1[3] = material.aniso;
5516		- display.options1[4] = material.anisoV;
5517		- display.options2[0] = material.opacity;
5518		- display.options2[1] = material.diffuse;
5519		- display.options2[2] = material.factor;
5520		-
5521		- cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
5522		- display.options3[3] = material.cameralight/0.2f;
5523		-
5524		- // if (display.CURRENTANTIALIAS > 0)
5525		- // display.options3[3] /= 4;
5526		-
5527		- /*
5528		- System.out.println("Focus = " + display.options1[0]);
5529		- System.out.println("Aperture = " + display.options1[1]);
5530		- System.out.println("ShadowBlur = " + display.options1[2]);
5531		- System.out.println("Antialiasing = " + display.options1[3]);
5532		- System.out.println("Fog = " + display.options2[0]);
5533		- System.out.println("Intensity = " + display.options2[1]);
5534		- System.out.println("Elevation = " + display.options2[2]);
5535		- /**/
5536		- } else
5537		- {
5538		- material.Draw(display, selected);
5539		- }
5540		- } else
5541		- {
5542		- if (selected && CameraPane.flash)
5543		- {
5544		- display.modelParams4[1] = 100;
5545		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5546		- }
5547		- }
	6094	+ display.PushMaterial(this, selected);
5548	6095
5549	6096	//System.out.println("call list " + list);
5550	6097	//System.out.println();
..	..	@@ -5563,7 +6110,28 @@
5563	6110	tex = GetTextures();
5564	6111	}
5565	6112
5566		- display.BindTextures(tex, texres);
	6113	+ boolean failedPigment = false;
	6114	+ boolean failedBump = false;
	6115	+
	6116	+ try
	6117	+ {
	6118	+ display.BindPigmentTexture(tex, texres);
	6119	+ }
	6120	+ catch (Exception e)
	6121	+ {
	6122	+ System.err.println("FAILED: " + this);
	6123	+ failedPigment = true;
	6124	+ }
	6125	+
	6126	+ try
	6127	+ {
	6128	+ display.BindBumpTexture(tex, texres);
	6129	+ }
	6130	+ catch (Exception e)
	6131	+ {
	6132	+ //System.err.println("FAILED: " + this);
	6133	+ failedBump = true;
	6134	+ }
5567	6135
5568	6136	if (!compiled)
5569	6137	{
..	..	@@ -5579,30 +6147,19 @@
5579	6147
5580	6148	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5581	6149	assert(bRep.displaylist != 0);
5582		- gl.glCallList(bRep.displaylist);
	6150	+ display.CallList(bRep.displaylist);
5583	6151	// june 2013 drawSelf(display, root, selected);
5584	6152	}
5585	6153	}
5586	6154	}
5587	6155
5588		- display.ReleaseTextures(tex);
5589		-
5590		- //if (parent != null && parent.GetMaterial() != null)
5591		- // parent.GetMaterial().Draw(display, parent.IsSelected(this));
5592		- if (material != null)
5593		- {
5594		- materialdepth -= 1;
5595		- if (materialdepth > 0)
5596		- {
5597		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5598		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5599		- }
5600		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5601		- } else if (selected && CameraPane.flash && GetMaterial() != null)
5602		- {
5603		- display.modelParams4[1] = GetMaterial().cameralight;
5604		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5605		- }
	6156	+ if (!failedBump)
	6157	+ display.ReleaseBumpTexture(tex);
	6158	+
	6159	+ if (!failedPigment)
	6160	+ display.ReleasePigmentTexture(tex);
	6161	+
	6162	+ display.PopMaterial(this, selected);
5606	6163	}
5607	6164
5608	6165	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5644,7 +6201,7 @@
5644	6201	// resetMasterNode();
5645	6202	}
5646	6203
5647		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6204	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5648	6205	{
5649	6206	if (GetBRep() == null)
5650	6207	{
..	..	@@ -5727,8 +6284,11 @@
5727	6284	boolean flipV = false; // true;
5728	6285	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5729	6286
5730		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6287	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5731	6288	{
	6289	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6290	+ return;
	6291	+
5732	6292	if (hide)
5733	6293	return;
5734	6294	// shadow optimisation
..	..	@@ -5786,16 +6346,7 @@
5786	6346	// // ??????????????????????????? Touch();
5787	6347	// }
5788	6348
5789		- if (material != null)
5790		- {
5791		- materialstack[materialdepth] = material;
5792		- selectedstack[materialdepth] = selected;
5793		- cStatic.objectstack[materialdepth++] = this;
5794		- //System.out.println("material " + material);
5795		- //Applet3D.tracein("selected ", selected);
5796		- display.vector2buffer = projectedVertices;
5797		- material.Draw(display, selected);
5798		- }
	6349	+display.PushMaterial2(this, selected);
5799	6350
5800	6351	Object3D child;
5801	6352	boolean sel;
..	..	@@ -5819,12 +6370,12 @@
5819	6370	if (!child.HasTransparency())
5820	6371	{
5821	6372	sel = root != null && root.selection != null && root.selection.indexOf(child) != -1;
5822		- // GraphreeD.tracein("draw ", child);
	6373	+ // GrafreeD.tracein("draw ", child);
5823	6374	boolean wasblocked = blockdraw;
5824	6375	blockdraw = true;
5825	6376	child.draw(display, root, selected \|\| sel, wasblocked \|\| blocked); // \|\| child.IsSelected());
5826	6377	blockdraw = false;
5827		- // GraphreeD.traceout("draw ", child);
	6378	+ // GrafreeD.traceout("draw ", child);
5828	6379	}
5829	6380
5830	6381	release(i);
..	..	@@ -5847,19 +6398,7 @@
5847	6398	*/
5848	6399	//depth += 1;
5849	6400
5850		- if (material != null)
5851		- {
5852		- materialdepth -= 1;
5853		- if (materialdepth > 0)
5854		- {
5855		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5856		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5857		- }
5858		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5859		- //else
5860		- //material.Draw(display, false);
5861		- }
5862		-
	6401	+display.PopMaterial2(this);
5863	6402	/*
5864	6403	display.ReleaseTextures(tex);
5865	6404	*/
..	..	@@ -5870,10 +6409,13 @@
5870	6409
5871	6410	//static cVector min,max;
5872	6411
5873		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	6412	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5874	6413	{
5875		- if (display.drawMode == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	6414	+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5876	6415	return; // no shadow for transparent objects
	6416	+
	6417	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6418	+ return;
5877	6419
5878	6420	if (hide)
5879	6421	return;
..	..	@@ -5915,11 +6457,12 @@
5915	6457	return;
5916	6458	}
5917	6459
	6460	+ //bRep.GenUV(1/material.diffuseness);
5918	6461	// bRep.lock = true;
5919	6462
5920		- javax.media.opengl.GL gl = display.GetGL();
	6463	+ //javax.media.opengl.GL gl = display.GetGL();
5921	6464
5922		- if (CameraPane.BOXMODE) // \|\| CameraPane.movingcamera)
	6465	+ if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5923	6466	{
5924	6467	int fc = bRep.FaceCount();
5925	6468	int vc = bRep.VertexCount();
..	..	@@ -5934,23 +6477,7 @@
5934	6477
5935	6478	bRep.getMinMax(min, max, 100);
5936	6479
5937		- gl.glBegin(gl.GL_LINES);
5938		-
5939		- gl.glVertex3d(min.x, min.y, min.z);
5940		- gl.glVertex3d(min.x, min.y, max.z);
5941		- gl.glVertex3d(min.x, min.y, min.z);
5942		- gl.glVertex3d(min.x, max.y, min.z);
5943		- gl.glVertex3d(min.x, min.y, min.z);
5944		- gl.glVertex3d(max.x, min.y, min.z);
5945		-
5946		- gl.glVertex3d(max.x, max.y, max.z);
5947		- gl.glVertex3d(min.x, max.y, max.z);
5948		- gl.glVertex3d(max.x, max.y, max.z);
5949		- gl.glVertex3d(max.x, min.y, max.z);
5950		- gl.glVertex3d(max.x, max.y, max.z);
5951		- gl.glVertex3d(max.x, max.y, min.z);
5952		-
5953		- gl.glEnd();
	6480	+ display.DrawBox(min, max);
5954	6481
5955	6482	return;
5956	6483	}
..	..	@@ -5994,7 +6521,7 @@
5994	6521	{
5995	6522	//throw new Error();
5996	6523
5997		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6524	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5998	6525
5999	6526	int[] strips = bRep.getRawIndices();
6000	6527
..	..	@@ -6004,178 +6531,19 @@
6004	6531	new Exception().printStackTrace();
6005	6532	return;
6006	6533	}
6007		-
6008		- // TRIANGLE STRIP ARRAY
6009		- if (bRep.trimmed)
	6534	+
	6535	+ if (dontselect)
6010	6536	{
6011		- float[] v = bRep.getRawVertices();
6012		- float[] n = bRep.getRawNormals();
6013		- float[] c = bRep.getRawColors();
6014		- float[] uv = bRep.getRawUVMap();
6015		-
6016		- int count2 = 0;
6017		- int count3 = 0;
6018		-
6019		- if (n.length > 0)
6020		- {
6021		- for (int i = 0; i < strips.length; i++)
6022		- {
6023		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6024		-
6025		- /*
6026		- boolean locked = false;
6027		- float eps = 0.1f;
6028		- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6029		-
6030		- int dot = 0;
6031		-
6032		- if ((dot&1) == 0)
6033		- dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6034		-
6035		- if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6036		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6037		- else
6038		- {
6039		- locked = true;
6040		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6041		- }
6042		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6043		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6044		- if (hasnorm)
6045		- {
6046		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6047		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6048		- }
6049		-
6050		- if ((dot&4) == 0)
6051		- dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6052		-
6053		- if (wrap \|\| !locked && (dot&8) != 0)
6054		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6055		- else
6056		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6057		-
6058		- f.dot = dot;
6059		- */
6060		-
6061		- if (!selectmode)
6062		- {
6063		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6064		- {
6065		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6066		- } else
6067		- {
6068		- gl.glNormal3f(0, 0, 1);
6069		- }
6070		-
6071		- if (c != null)
6072		- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
6073		- {
6074		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6075		- }
6076		- }
6077		- if (flipV)
6078		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6079		- else
6080		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6081		- //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6082		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6083		-
6084		- count2 += 2;
6085		- count3 += 3;
6086		- if (!selectmode)
6087		- {
6088		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6089		- {
6090		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6091		- } else
6092		- {
6093		- gl.glNormal3f(0, 0, 1);
6094		- }
6095		- if (c != null)
6096		- {
6097		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6098		- }
6099		- }
6100		- if (flipV)
6101		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6102		- else
6103		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6104		- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6105		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6106		-
6107		- count2 += 2;
6108		- count3 += 3;
6109		- for (int j = 0; j < strips[i] - 2; j++)
6110		- {
6111		- //gl.glTexCoord2d(...);
6112		- if (!selectmode)
6113		- {
6114		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6115		- {
6116		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6117		- } else
6118		- {
6119		- gl.glNormal3f(0, 0, 1);
6120		- }
6121		- if (c != null)
6122		- {
6123		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6124		- }
6125		- }
6126		-
6127		- if (flipV)
6128		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6129		- else
6130		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6131		- //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6132		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6133		- count2 += 2;
6134		- count3 += 3;
6135		- }
6136		-
6137		- gl.glEnd();
6138		- }
6139		- }
6140		-
6141		- assert count3 == v.length;
	6537	+ //bRep.GenerateNormalsMINE();
6142	6538	}
6143		- else // !trimmed
6144		- {
6145		- int count = 0;
6146		- for (int i = 0; i < strips.length; i++)
6147		- {
6148		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6149		-
6150		- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6151		- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6152		-
6153		- drawVertex(gl, p, selectmode);
6154		- drawVertex(gl, q, selectmode);
6155		-
6156		- for (int j = 0; j < strips[i] - 2; j++)
6157		- {
6158		- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6159		-
6160		-// if (j%2 == 0)
6161		-// drawFace(p, q, r, display, null);
6162		-// else
6163		-// drawFace(p, r, q, display, null);
6164		-
6165		-// p = q;
6166		-// q = r;
6167		- drawVertex(gl, r, selectmode);
6168		- }
6169		-
6170		- gl.glEnd();
6171		- }
6172		- }
	6539	+
	6540	+ display.DrawGeometry(bRep, flipV, selectmode);
6173	6541	} else // catch (Error e)
6174	6542	{
6175	6543	// TRIANGLE ARRAY
6176	6544	if (IsOpaque()) // Static())
6177	6545	{
6178		- gl.glBegin(gl.GL_TRIANGLES);
	6546	+ display.StartTriangles();
6179	6547	int facecount = bRep.FaceCount();
6180	6548	for (int i = 0; i < facecount; i++)
6181	6549	{
..	..	@@ -6238,9 +6606,9 @@
6238	6606	// // r.norm.dot(v3) > -0.5)
6239	6607	// // continue;
6240	6608
6241		- drawFace(p, q, r, display, face);
	6609	+ display.DrawFace(this, p, q, r, face);
6242	6610	}
6243		- gl.glEnd();
	6611	+ display.EndTriangles();
6244	6612	}
6245	6613	else
6246	6614	{
..	..	@@ -6269,8 +6637,8 @@
6269	6637	//System.out.println("SORT");
6270	6638
6271	6639	java.util.Arrays.sort(facescompare);
6272		-
6273		- gl.glBegin(gl.GL_TRIANGLES);
	6640	+
	6641	+ display.StartTriangles();
6274	6642	for (int i = 0; i < facecount; i++)
6275	6643	{
6276	6644	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6282,13 +6650,14 @@
6282	6650	Vertex q = bRep.GetVertex(face.q);
6283	6651	Vertex r = bRep.GetVertex(face.r);
6284	6652
6285		- drawFace(p, q, r, display, face);
	6653	+ display.DrawFace(this, p, q, r, face);
6286	6654	}
6287		- gl.glEnd();
	6655	+ display.EndTriangles();
6288	6656	}
6289	6657
6290	6658	if (false) // live && support != null && support.bRep != null) // debug weights
6291	6659	{
	6660	+ /*
6292	6661	gl.glDisable(gl.GL_LIGHTING);
6293	6662	float[] colorV = new float[3];
6294	6663
..	..	@@ -6367,6 +6736,7 @@
6367	6736	// gl.glEnd();
6368	6737	}
6369	6738	}
	6739	+ */
6370	6740	}
6371	6741	}
6372	6742
..	..	@@ -6411,7 +6781,7 @@
6411	6781	center.add(r);
6412	6782	center.mul(1.0/3);
6413	6783
6414		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6784	+ center.sub(Globals.theRenderer.EyeCamera().location);
6415	6785
6416	6786	distance = center.dot(center);
6417	6787	}
..	..	@@ -6422,347 +6792,11 @@
6422	6792
6423	6793	transient FaceCompare[] facescompare = null;
6424	6794
6425		- void SetColor(CameraPane display, Vertex p0)
6426		- {
6427		- if (display.RENDERPROGRAM == 0)
6428		- {
6429		- float r = 0;
6430		- if (bRep != null)
6431		- {
6432		- if (bRep.stripified)
6433		- {
6434		- r = 1;
6435		- }
6436		- }
6437		- float g = 0;
6438		- if (bRep != null)
6439		- {
6440		- if (bRep.trimmed)
6441		- {
6442		- g = 1;
6443		- }
6444		- }
6445		- float b = 0;
6446		- if (support != null && link2master)
6447		- {
6448		- b = 1;
6449		- }
6450		- display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
6451		- return;
6452		- }
6453		-
6454		- if (display.drawMode != CameraPane.SHADOW)
6455		- return;
6456		-
6457		- javax.media.opengl.GL gl = display.GetGL();
6458		-// if (true) return;
6459		-// float ao = p.AO;
6460		-//
6461		-// // if (ao == 0 && !bRep.AOdone) // transient problem!
6462		-// // ao = 1;
6463		-//
6464		-// gl.glColor4f(ao, ao, ao, 1);
6465		-
6466		-// CameraPane.selectedpoint.
6467		-// getAverage(cStatic.point1, true);
6468		- if (CameraPane.pointflow == null) // !random) // live)
6469		- {
6470		- return;
6471		- }
6472		-
6473		- cStatic.point1.set(0,0,0);
6474		- LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
6475		-
6476		- cStatic.point1.sub(p0);
6477		-
6478		-
6479		-// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
6480		-// {
6481		-// return;
6482		-// }
6483		-
6484		- //if (true)
6485		- if (cStatic.point1.dot(cStatic.point1) > 0.000001)
6486		- {
6487		- return;
6488		- }
6489		-
6490		- float[] colorV = new float[3];
6491		-
6492		- if (false) // marked)
6493		- {
6494		- // debug rigging weights
6495		- for (int object = 0; object < p0.vertexlinks.length; object++)
6496		- {
6497		- float weight = p0.weights[object] / p0.totalweight;
6498		-
6499		- // if (weight < 0.1)
6500		- // {
6501		- // assert(weight == 0);
6502		- // continue;
6503		- // }
6504		-
6505		- if (p0.vertexlinks[object] == -1)
6506		- continue;
6507		-
6508		- Vertex q = support.bRep.GetVertex(p0.vertexlinks[object]);
6509		-
6510		- int color = //1 << object; //
6511		- //p.vertexlinks.length;
6512		- support.bRep.supports[p0.closestsupport].links[object];
6513		- colorV[2] += (color & 1) * weight;
6514		- colorV[1] += ((color & 2) >> 1) * weight;
6515		- colorV[0] += ((color & 4) >> 2) * weight;
6516		- }
6517		- }
6518		- else
6519		- {
6520		- if (drawingstarted)
6521		- {
6522		- // find next point
6523		- if (bRep.GetVertex(0).faceindices == null)
6524		- {
6525		- bRep.InitFaceIndices();
6526		- }
6527		-
6528		- double ymin = p0.y;
6529		-
6530		- Vertex newp = p0;
6531		-
6532		- for (int fii = 0; fii < p0.faceindices.length; fii++)
6533		- {
6534		- int fi = p0.faceindices[fii];
6535		-
6536		- if (fi == -1)
6537		- break;
6538		-
6539		- Face f = bRep.GetFace(fi);
6540		-
6541		- Vertex p = bRep.GetVertex(f.p);
6542		- Vertex q = bRep.GetVertex(f.q);
6543		- Vertex r = bRep.GetVertex(f.r);
6544		-
6545		- int swap = (int)(Math.random()*3);
6546		-
6547		-// for (int s=swap; --s>=0;)
6548		-// {
6549		-// Vertex t = p;
6550		-// p = q;
6551		-// q = r;
6552		-// r = t;
6553		-// }
6554		- if (ymin > p.y)
6555		- {
6556		- ymin = p.y;
6557		- newp = p;
6558		-// break;
6559		- }
6560		- if (ymin > q.y)
6561		- {
6562		- ymin = q.y;
6563		- newp = q;
6564		-// break;
6565		- }
6566		- if (ymin > r.y)
6567		- {
6568		- ymin = r.y;
6569		- newp = r;
6570		-// break;
6571		- }
6572		- }
6573		-
6574		- CameraPane.selectedpoint.toParent[3][0] = newp.x;
6575		- CameraPane.selectedpoint.toParent[3][1] = newp.y;
6576		- CameraPane.selectedpoint.toParent[3][2] = newp.z;
6577		-
6578		- drawingstarted = false;
6579		-
6580		- // return;
6581		- }
6582		-
6583		- if (false) // CameraPane.DRAW
6584		- {
6585		- p0.AO = colorV[0] = 2;
6586		- colorV[1] = 2;
6587		- colorV[2] = 2;
6588		- }
6589		-
6590		- CameraPane.pointflow.add(p0);
6591		- CameraPane.pointflow.Touch();
6592		- }
6593		-
6594		-// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
6595		-// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
6596		-// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
6597		- }
6598		-
6599	6795	void Print(Vertex v)
6600	6796	{
6601	6797	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6602	6798	}
6603	6799
6604		- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6605		- {
6606		- if (!selectmode)
6607		- {
6608		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6609		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6610		-
6611		- if (flipV)
6612		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6613		- else
6614		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6615		- }
6616		-
6617		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6618		- }
6619		-
6620		- void drawFace(Vertex pv, Vertex qv, Vertex rv,
6621		- CameraPane display, Face face)
6622		- {
6623		- if (pv.y == -10000 \|\|
6624		- qv.y == -10000 \|\|
6625		- rv.y == -10000)
6626		- return;
6627		-
6628		-// float b = f.nbiterations & 1;
6629		-// float g = (f.nbiterations>>1) & 1;
6630		-// float r = (f.nbiterations>>2) & 1;
6631		-//
6632		-// //if (f.weight == 10000)
6633		-// //{
6634		-// // r = 1; g = b = 0;
6635		-// //}
6636		-// //else
6637		-// //{
6638		-// // assert(f.weight < 10000);
6639		-// r = g = b = (float)bRep.FaceWeight(f)*100;
6640		-// if (r<0)
6641		-// assert(r>=0);
6642		-// //}
6643		-
6644		- javax.media.opengl.GL gl = display.GetGL();
6645		-
6646		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
6647		-
6648		- //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
6649		- if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
6650		- {
6651		- //gl.glBegin(gl.GL_TRIANGLES);
6652		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
6653		- if (!hasnorm)
6654		- {
6655		- // System.out.println("FUCK!!");
6656		- LA.vecSub(pv/.pos/, qv/.pos/, v0);
6657		- LA.vecSub(pv/.pos/, rv/.pos/, v1);
6658		- LA.vecCross(v0, v1, v2);
6659		- LA.vecNormalize(v2);
6660		- gl.glNormal3f((float) v2.x, (float) v2.y, (float) v2.z);
6661		- }
6662		-
6663		- if (hasnorm)
6664		- {
6665		-// if (!pv.norm.normalized())
6666		-// assert(pv.norm.normalized());
6667		-
6668		- //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
6669		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6670		- }
6671		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6672		- SetColor(display, pv);
6673		- //gl.glColor4f(r, g, b, 1);
6674		- //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
6675		- if (flipV)
6676		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6677		- else
6678		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6679		- //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
6680		- gl.glVertex3f((float) pv./pos./x, (float) pv./pos./y, (float) pv./pos./z);
6681		-// Print(pv);
6682		- if (hasnorm)
6683		- {
6684		-// assert(qv.norm.normalized());
6685		- //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
6686		- gl.glNormal3f((float) qv.norm.x, (float) qv.norm.y, (float) qv.norm.z);
6687		- }
6688		- //System.out.println("vertexq = " + qv.s + ", " + qv.t);
6689		- // boolean locked = false;
6690		- // float eps = 0.1f;
6691		- // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6692		-
6693		- // int dot = 0; //*/ (int)f.dot;
6694		-
6695		- // if ((dot&1) == 0)
6696		- // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6697		-
6698		- // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6699		- if (flipV)
6700		- gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
6701		- else
6702		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6703		- // else
6704		- // {
6705		- // locked = true;
6706		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6707		- // }
6708		- gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
6709		- SetColor(display, qv);
6710		- //gl.glColor4f(r, g, b, 1);
6711		- //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
6712		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6713		- gl.glVertex3f((float) qv./pos./x, (float) qv./pos./y, (float) qv./pos./z);
6714		-// Print(qv);
6715		- if (hasnorm)
6716		- {
6717		-// assert(rv.norm.normalized());
6718		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6719		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6720		- }
6721		-
6722		- // if ((dot&4) == 0)
6723		- // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6724		-
6725		- // if (wrap \|\| !locked && (dot&8) != 0)
6726		- if (flipV)
6727		- gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
6728		- else
6729		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6730		- // else
6731		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6732		-
6733		- // f.dot = dot;
6734		-
6735		- gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
6736		- SetColor(display, rv);
6737		- //gl.glColor4f(r, g, b, 1);
6738		- //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
6739		- //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
6740		- gl.glVertex3f((float) rv./pos./x, (float) rv./pos./y, (float) rv./pos./z);
6741		-// Print(rv);
6742		- //gl.glEnd();
6743		- }
6744		- else
6745		- {
6746		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6747		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6748		- gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
6749		-
6750		- }
6751		-
6752		- if (false) // (attributes & WIREFRAME) != 0)
6753		- {
6754		- gl.glDisable(gl.GL_LIGHTING);
6755		-
6756		- gl.glBegin(gl.GL_LINE_LOOP);
6757		- gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
6758		- gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
6759		- gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
6760		- gl.glEnd();
6761		-
6762		- gl.glEnable(gl.GL_LIGHTING);
6763		- }
6764		- }
6765		-
6766	6800	void drawSelf(ClickInfo info, int level, boolean select)
6767	6801	{
6768	6802	if (bRep == null)
..	..	@@ -7286,20 +7320,23 @@
7286	7320	}
7287	7321	}
7288	7322
7289		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7323	+ static ClickInfo clickInfo = new ClickInfo();
	7324	+
	7325	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7326	+ Point outPt, Rectangle outRec)
7290	7327	{
7291		- int hc = info.bounds.x + info.bounds.width / 2;
7292		- int vc = info.bounds.y + info.bounds.height / 2;
7293		- double[][] toscreen = info.toScreen;
	7328	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7329	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7330	+ double[][] toscreen = clickInfo.toScreen;
7294	7331	if (toscreen == null)
7295	7332	{
7296		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7333	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7297	7334	}
7298	7335	cVector vec = in;
7299	7336	LA.xformPos(in, toscreen, in);
7300	7337	//System.out.println("Distance = " + info.camera.Distance());
7301		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7302		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7338	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7339	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7303	7340	outPt.x = hc + (int) vec.x;
7304	7341	outPt.y = vc - (int) vec.y;
7305	7342	outRec.x = outPt.x - 3;
..	..	@@ -7307,15 +7344,18 @@
7307	7344	outRec.width = outRec.height = 6;
7308	7345	}
7309	7346
7310		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7347	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7348	+ )
7311	7349	{
7312	7350	Point pt = new Point(0, 0);
7313	7351	Rectangle rec = new Rectangle();
7314		- calcHotSpot(in, info, pt, rec);
	7352	+ calcHotSpot(in, //clickInfo,
	7353	+ pt, rec);
7315	7354	return rec;
7316	7355	}
7317	7356
7318		- void drawEditHandles0(ClickInfo info, int level)
	7357	+ void drawEditHandles0(//ClickInfo clickInfo,
	7358	+ int level)
7319	7359	{
7320	7360	if (level == 0)
7321	7361	{
..	..	@@ -7324,98 +7364,103 @@
7324	7364	{
7325	7365	cVector origin = new cVector();
7326	7366	//LA.xformPos(origin, toParent, origin);
7327		- Rectangle spot = calcHotSpot(origin, info);
	7367	+ if (this.clickInfo == null)
	7368	+ this.clickInfo = new ClickInfo();
	7369	+
	7370	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7328	7371	Rectangle boundary = new Rectangle();
7329	7372	boundary.x = spot.x - 30;
7330	7373	boundary.y = spot.y - 30;
7331	7374	boundary.width = spot.width + 60;
7332	7375	boundary.height = spot.height + 60;
7333		- info.g.setColor(Color.red);
	7376	+ clickInfo.g.setColor(Color.red);
7334	7377	int spotw = spot.x + spot.width;
7335	7378	int spoth = spot.y + spot.height;
7336		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7337		- if (CameraPane.Xmin > spot.x)
7338		- {
7339		- CameraPane.Xmin = spot.x;
7340		- }
7341		- if (CameraPane.Xmax < spotw)
7342		- {
7343		- CameraPane.Xmax = spotw;
7344		- }
7345		- if (CameraPane.Ymin > spot.y)
7346		- {
7347		- CameraPane.Ymin = spot.y;
7348		- }
7349		- if (CameraPane.Ymax < spoth)
7350		- {
7351		- CameraPane.Ymax = spoth;
7352		- }
	7379	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7380	+// if (CameraPane.Xmin > spot.x)
	7381	+// {
	7382	+// CameraPane.Xmin = spot.x;
	7383	+// }
	7384	+// if (CameraPane.Xmax < spotw)
	7385	+// {
	7386	+// CameraPane.Xmax = spotw;
	7387	+// }
	7388	+// if (CameraPane.Ymin > spot.y)
	7389	+// {
	7390	+// CameraPane.Ymin = spot.y;
	7391	+// }
	7392	+// if (CameraPane.Ymax < spoth)
	7393	+// {
	7394	+// CameraPane.Ymax = spoth;
	7395	+// }
7353	7396	spot.translate(32, 32);
7354	7397	spotw = spot.x + spot.width;
7355	7398	spoth = spot.y + spot.height;
7356		- info.g.setColor(Color.blue);
7357		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7358		- if (CameraPane.Xmin > spot.x)
7359		- {
7360		- CameraPane.Xmin = spot.x;
7361		- }
7362		- if (CameraPane.Xmax < spotw)
7363		- {
7364		- CameraPane.Xmax = spotw;
7365		- }
7366		- if (CameraPane.Ymin > spot.y)
7367		- {
7368		- CameraPane.Ymin = spot.y;
7369		- }
7370		- if (CameraPane.Ymax < spoth)
7371		- {
7372		- CameraPane.Ymax = spoth;
7373		- }
7374		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7375		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7399	+ clickInfo.g.setColor(Color.cyan);
	7400	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7401	+// if (CameraPane.Xmin > spot.x)
	7402	+// {
	7403	+// CameraPane.Xmin = spot.x;
	7404	+// }
	7405	+// if (CameraPane.Xmax < spotw)
	7406	+// {
	7407	+// CameraPane.Xmax = spotw;
	7408	+// }
	7409	+// if (CameraPane.Ymin > spot.y)
	7410	+// {
	7411	+// CameraPane.Ymin = spot.y;
	7412	+// }
	7413	+// if (CameraPane.Ymax < spoth)
	7414	+// {
	7415	+// CameraPane.Ymax = spoth;
	7416	+// }
	7417	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7418	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7376	7419	spot.translate(0, -32);
7377		- info.g.setColor(Color.green);
7378		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7379		- if (CameraPane.Xmin > spot.x)
7380		- {
7381		- CameraPane.Xmin = spot.x;
7382		- }
7383		- if (CameraPane.Xmax < spotw)
7384		- {
7385		- CameraPane.Xmax = spotw;
7386		- }
7387		- if (CameraPane.Ymin > spot.y)
7388		- {
7389		- CameraPane.Ymin = spot.y;
7390		- }
7391		- if (CameraPane.Ymax < spoth)
7392		- {
7393		- CameraPane.Ymax = spoth;
7394		- }
7395		- info.g.drawArc(boundary.x, boundary.y,
7396		- boundary.width, boundary.height, 0, 360);
	7420	+ clickInfo.g.setColor(Color.yellow);
	7421	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7422	+ clickInfo.g.setColor(Color.green);
	7423	+// if (CameraPane.Xmin > spot.x)
	7424	+// {
	7425	+// CameraPane.Xmin = spot.x;
	7426	+// }
	7427	+// if (CameraPane.Xmax < spotw)
	7428	+// {
	7429	+// CameraPane.Xmax = spotw;
	7430	+// }
	7431	+// if (CameraPane.Ymin > spot.y)
	7432	+// {
	7433	+// CameraPane.Ymin = spot.y;
	7434	+// }
	7435	+// if (CameraPane.Ymax < spoth)
	7436	+// {
	7437	+// CameraPane.Ymax = spoth;
	7438	+// }
	7439	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7440	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7397	7441	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7398		- if (CameraPane.Xmin > boundary.x)
7399		- {
7400		- CameraPane.Xmin = boundary.x;
7401		- }
7402		- if (CameraPane.Xmax < boundary.x + boundary.width)
7403		- {
7404		- CameraPane.Xmax = boundary.x + boundary.width;
7405		- }
7406		- if (CameraPane.Ymin > boundary.y)
7407		- {
7408		- CameraPane.Ymin = boundary.y;
7409		- }
7410		- if (CameraPane.Ymax < boundary.y + boundary.height)
7411		- {
7412		- CameraPane.Ymax = boundary.y + boundary.height;
7413		- }
	7442	+// if (CameraPane.Xmin > boundary.x)
	7443	+// {
	7444	+// CameraPane.Xmin = boundary.x;
	7445	+// }
	7446	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	7447	+// {
	7448	+// CameraPane.Xmax = boundary.x + boundary.width;
	7449	+// }
	7450	+// if (CameraPane.Ymin > boundary.y)
	7451	+// {
	7452	+// CameraPane.Ymin = boundary.y;
	7453	+// }
	7454	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	7455	+// {
	7456	+// CameraPane.Ymax = boundary.y + boundary.height;
	7457	+// }
7414	7458	return;
7415	7459	}
7416	7460	}
7417	7461
7418		- boolean doEditClick0(ClickInfo info, int level)
	7462	+ boolean doEditClick0(//ClickInfo clickInfo,
	7463	+ int level)
7419	7464	{
7420	7465	if (level == 0)
7421	7466	{
..	..	@@ -7424,10 +7469,10 @@
7424	7469
7425	7470	boolean retval = false;
7426	7471
7427		- startX = info.x;
7428		- startY = info.y;
	7472	+ startX = clickInfo.x;
	7473	+ startY = clickInfo.y;
7429	7474
7430		- hitSomething = 0;
	7475	+ hitSomething = -1;
7431	7476	cVector origin = new cVector();
7432	7477	//LA.xformPos(origin, toParent, origin);
7433	7478	Rectangle spot = new Rectangle();
..	..	@@ -7435,22 +7480,51 @@
7435	7480	{
7436	7481	centerPt = new Point(0, 0);
7437	7482	}
7438		- calcHotSpot(origin, info, centerPt, spot);
7439		- if (spot.contains(info.x, info.y))
	7483	+ calcHotSpot(origin, //info,
	7484	+ centerPt, spot);
	7485	+ if (spot.contains(clickInfo.x, clickInfo.y))
7440	7486	{
7441	7487	hitSomething = hitCenter;
7442	7488	retval = true;
7443	7489	}
7444	7490	spot.translate(32, 0);
7445		- if (spot.contains(info.x, info.y))
	7491	+ if (spot.contains(clickInfo.x, clickInfo.y))
7446	7492	{
7447	7493	hitSomething = hitRotate;
7448	7494	retval = true;
7449	7495	}
7450	7496	spot.translate(0, 32);
7451		- if (spot.contains(info.x, info.y))
	7497	+ if (spot.contains(clickInfo.x, clickInfo.y))
7452	7498	{
7453	7499	hitSomething = hitScale;
	7500	+
	7501	+ double scale = 0.005f * clickInfo.camera.Distance();
	7502	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7503	+ double sign = 1;
	7504	+ if (hScale < 0)
	7505	+ {
	7506	+ sign = -1;
	7507	+ }
	7508	+ hScale = signMath.pow(signhScale, scale * 50);
	7509	+ if (hScale < 0.01)
	7510	+ {
	7511	+ //hScale = 0.01;
	7512	+ }
	7513	+
	7514	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7515	+ sign = 1;
	7516	+ if (vScale < 0)
	7517	+ {
	7518	+ sign = -1;
	7519	+ }
	7520	+ vScale = signMath.pow(signvScale, scale * 50);
	7521	+ if (vScale < 0.01)
	7522	+ {
	7523	+ //vScale = 0.01;
	7524	+ }
	7525	+
	7526	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7527	+
7454	7528	retval = true;
7455	7529	}
7456	7530
..	..	@@ -7460,7 +7534,7 @@
7460	7534	}
7461	7535
7462	7536	//System.out.println("info.modifiers = " + info.modifiers);
7463		- modified = (info.modifiers & CameraPane.META) != 0;
	7537	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7464	7538	//System.out.println("modified = " + modified);
7465	7539	//new Exception().printStackTrace();
7466	7540	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7488,7 +7562,8 @@
7488	7562	return true;
7489	7563	}
7490	7564
7491		- void doEditDrag0(ClickInfo info)
	7565	+ void doEditDrag0(//ClickInfo info,
	7566	+ boolean opposite)
7492	7567	{
7493	7568	if (hitSomething == 0)
7494	7569	{
..	..	@@ -7502,7 +7577,8 @@
7502	7577
7503	7578	//System.out.println("hitSomething = " + hitSomething);
7504	7579
7505		- double scale = 0.005f * info.camera.Distance();
	7580	+ double scale = 0.005f * clickInfo.camera.Distance();
	7581	+
7506	7582	cVector xlate = new cVector();
7507	7583	//cVector xlate2 = new cVector();
7508	7584	switch (hitSomething)
..	..	@@ -7513,9 +7589,9 @@
7513	7589
7514	7590	case hitCenter: // Translate
7515	7591
7516		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7592	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7517	7593
7518		- if (modified)
	7594	+ if (modified \|\| opposite)
7519	7595	{
7520	7596	//assert(false);
7521	7597	/*
..	..	@@ -7535,8 +7611,8 @@
7535	7611	toParent[3][i] = xlate.get(i);
7536	7612	LA.matInvert(toParent, fromParent);
7537	7613	*/
7538		- cVector delta = LA.newVector(0, 0, startY - info.y);
7539		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7614	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7615	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7540	7616
7541	7617	LA.matCopy(startMat, toParent);
7542	7618	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7545,7 +7621,7 @@
7545	7621	} else
7546	7622	{
7547	7623	//LA.xformDir(delta, info.camera.fromScreen, delta);
7548		- cVector up = new cVector(info.camera.up);
	7624	+ cVector up = new cVector(clickInfo.camera.up);
7549	7625	cVector away = new cVector();
7550	7626	//cVector right2 = new cVector();
7551	7627	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7561,20 +7637,20 @@
7561	7637	}
7562	7638	LA.xformDir(up, ClickInfo.matbuffer, up);
7563	7639	// if (!CameraPane.LOCALTRANSFORM)
7564		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
7565		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7640	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
	7641	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7566	7642	// if (!CameraPane.LOCALTRANSFORM)
7567		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7643	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7568	7644	//LA.vecCross(up, cVector.Z, right2);
7569	7645
7570		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7646	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7571	7647
7572	7648	//System.out.println("DELTA0 = " + delta);
7573	7649	//System.out.println("AWAY = " + info.camera.away);
7574	7650	//System.out.println("UP = " + info.camera.up);
7575	7651	if (away.z > 0)
7576	7652	{
7577		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7653	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7578	7654	{
7579	7655	delta.x = -delta.x;
7580	7656	} else
..	..	@@ -7589,7 +7665,7 @@
7589	7665	//System.out.println("DELTA1 = " + delta);
7590	7666	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7591	7667	//System.out.println("DELTA2 = " + delta);
7592		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7668	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7593	7669	LA.matCopy(startMat, toParent);
7594	7670	//System.out.println("DELTA3 = " + delta);
7595	7671	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7599,8 +7675,8 @@
7599	7675	break;
7600	7676
7601	7677	case hitRotate: // rotate
7602		- int dx = info.x - centerPt.x;
7603		- int dy = -(info.y - centerPt.y);
	7678	+ int dx = clickInfo.x - centerPt.x;
	7679	+ int dy = -(clickInfo.y - centerPt.y);
7604	7680	double angle = (double) Math.atan2(dx, dy);
7605	7681	angle = -(1.570796 - angle);
7606	7682
..	..	@@ -7609,6 +7685,7 @@
7609	7685
7610	7686	if (modified)
7611	7687	{
	7688	+ // Rotate 90 degrees
7612	7689	angle /= (Math.PI / 4);
7613	7690	angle = Math.floor(angle + 0.5);
7614	7691	angle *= (Math.PI / 4);
..	..	@@ -7622,7 +7699,7 @@
7622	7699	}
7623	7700	/**/
7624	7701
7625		- switch (info.pane.renderCamera.viewCode)
	7702	+ switch (clickInfo.pane.RenderCamera().viewCode)
7626	7703	{
7627	7704	case 1: // '\001'
7628	7705	LA.matZRotate(toParent, angle);
..	..	@@ -7649,26 +7726,30 @@
7649	7726	break;
7650	7727
7651	7728	case hitScale: // scale
7652		- double hScale = (double) (info.x - centerPt.x) / 32;
	7729	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7730	+ double sign = 1;
	7731	+ if (hScale < 0)
	7732	+ {
	7733	+ sign = -1;
	7734	+ }
	7735	+ hScale = signMath.pow(signhScale, scale * 50);
7653	7736	if (hScale < 0.01)
7654	7737	{
7655		- hScale = 0.01;
	7738	+ //hScale = 0.01;
7656	7739	}
7657		- hScale = Math.pow(hScale, scale * 50);
7658		- if (hScale < 0.01)
	7740	+
	7741	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7742	+ sign = 1;
	7743	+ if (vScale < 0)
7659	7744	{
7660		- hScale = 0.01;
	7745	+ sign = -1;
7661	7746	}
7662		- double vScale = (double) (info.y - centerPt.y) / 32;
	7747	+ vScale = signMath.pow(signvScale, scale * 50);
7663	7748	if (vScale < 0.01)
7664	7749	{
7665		- vScale = 0.01;
	7750	+ //vScale = 0.01;
7666	7751	}
7667		- vScale = Math.pow(vScale, scale * 50);
7668		- if (vScale < 0.01)
7669		- {
7670		- vScale = 0.01;
7671		- }
	7752	+
7672	7753	LA.matCopy(startMat, toParent);
7673	7754	/**/
7674	7755	for (int i = 0; i < 3; i++)
..	..	@@ -7678,39 +7759,47 @@
7678	7759	}
7679	7760	/**/
7680	7761
7681		- switch (info.pane.renderCamera.viewCode)
	7762	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
	7763	+
	7764	+ if (totalScale < 0.01)
	7765	+ {
	7766	+ totalScale = 0.01;
	7767	+ }
	7768	+
	7769	+ switch (clickInfo.pane.RenderCamera().viewCode)
7682	7770	{
7683	7771	case 3: // '\001'
7684		- if (modified)
	7772	+ if (modified \|\| opposite)
7685	7773	{
7686	7774	//LA.matScale(toParent, 1, hScale, vScale);
7687		- LA.matScale(toParent, vScale, 1, 1);
	7775	+ LA.matScale(toParent, totalScale, 1, 1);
7688	7776	} // vScale, 1);
7689	7777	else
7690	7778	{
7691		- LA.matScale(toParent, vScale, vScale, vScale);
	7779	+ // EXCEPTION!
	7780	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7692	7781	} // vScale, 1);
7693	7782	break;
7694	7783
7695	7784	case 2: // '\002'
7696		- if (modified)
	7785	+ if (modified \|\| opposite)
7697	7786	{
7698	7787	//LA.matScale(toParent, hScale, 1, vScale);
7699		- LA.matScale(toParent, 1, vScale, 1);
	7788	+ LA.matScale(toParent, 1, totalScale, 1);
7700	7789	} else
7701	7790	{
7702		- LA.matScale(toParent, vScale, 1, vScale);
	7791	+ LA.matScale(toParent, totalScale, 1, totalScale);
7703	7792	}
7704	7793	break;
7705	7794
7706	7795	case 1: // '\003'
7707		- if (modified)
	7796	+ if (modified \|\| opposite)
7708	7797	{
7709	7798	//LA.matScale(toParent, hScale, vScale, 1);
7710		- LA.matScale(toParent, 1, 1, vScale);
	7799	+ LA.matScale(toParent, 1, 1, totalScale);
7711	7800	} else
7712	7801	{
7713		- LA.matScale(toParent, vScale, vScale, 1);
	7802	+ LA.matScale(toParent, totalScale, totalScale, 1);
7714	7803	}
7715	7804	break;
7716	7805	}
..	..	@@ -7731,7 +7820,7 @@
7731	7820	if (parent == null)
7732	7821	{
7733	7822	System.out.println("NULL PARENT");
7734		- new Exception().printStackTrace();
	7823	+ //new Exception().printStackTrace();
7735	7824	} else
7736	7825	{
7737	7826	if (parent instanceof BezierPatch)
..	..	@@ -7744,7 +7833,7 @@
7744	7833	} // NEW ...
7745	7834
7746	7835
7747		- info.pane.repaint();
	7836	+ clickInfo.pane.repaint();
7748	7837	}
7749	7838
7750	7839	boolean overflow = false;
..	..	@@ -7843,14 +7932,22 @@
7843	7932	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7844	7933	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7845	7934	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7935	+
	7936	+ String objname;
	7937	+
7846	7938	if (false) //parent != null)
7847	7939	{
7848		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7940	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7849	7941	} else
7850	7942	{
7851		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7943	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7852	7944	} // + super.toString();
7853	7945	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7946	+
	7947	+ if (!Globals.ADVANCED)
	7948	+ return objname;
	7949	+
	7950	+ return objname + " " + System.identityHashCode(this);
7854	7951	}
7855	7952
7856	7953	public int hashCode()
..	..	@@ -7906,6 +8003,7 @@
7906	8003	objectUI.closeUI();
7907	8004	if (editWindow != null)
7908	8005	{
	8006	+ editWindow.ctrlPanel.FlushUI();
7909	8007	editWindow.refreshContents();
7910	8008	} // ? new
7911	8009	objectUI = null;
..	..	@@ -7914,6 +8012,10 @@
7914	8012	{
7915	8013	editWindow = null;
7916	8014	} // ?
	8015	+ }
	8016	+ else
	8017	+ {
	8018	+ //editWindow.closeUI();
7917	8019	}
7918	8020	}
7919	8021
..	..	@@ -7926,7 +8028,7 @@
7926	8028	/transient/ cVector2[] projectedVertices = new cVector2[0];
7927	8029
7928	8030	Object3D /Composite/ parent;
7929		- Object3D /Composite/ fileparent;
	8031	+ Object3D /Composite/ fileparent; // In the case of FileObject
7930	8032
7931	8033	double[][] toParent; // dynamic matrix
7932	8034	double[][] fromParent;
..	..	@@ -8041,7 +8143,7 @@
8041	8143	{
8042	8144	assert(bRep != null);
8043	8145	if (!(support instanceof GenericJoint)) // support.bRep != null)
8044		- GraphreeD.Assert(support.bRep == bRep.support);
	8146	+ Grafreed.Assert(support.bRep == bRep.support);
8045	8147	}
8046	8148	else
8047	8149	{
..	..	@@ -8072,6 +8174,10 @@
8072	8174	}
8073	8175
8074	8176	transient ObjEditor editWindow;
	8177	+ transient ObjEditor manipWindow;
	8178	+
	8179	+ transient boolean pinned;
	8180	+
8075	8181	transient ObjectUI objectUI;
8076	8182	public static int povDepth = 0;
8077	8183	private static cVector tbMin = new cVector();
..	..	@@ -8090,9 +8196,9 @@
8090	8196	private static cVector edge2 = new cVector();
8091	8197	//private static cVector norm = new cVector();
8092	8198	/transient private/ int hitSomething;
8093		- private static final int hitCenter = 1;
8094		- private static final int hitScale = 2;
8095		- private static final int hitRotate = 3;
	8199	+ static final int hitCenter = 1;
	8200	+ static final int hitScale = 2;
	8201	+ static final int hitRotate = 3;
8096	8202	/transient/ /private/ int viewCode; // Now used for transparency cache flag
8097	8203	/transient/ private Point centerPt;
8098	8204	/transient/ private int startX;
..	..	@@ -8124,6 +8230,8 @@
8124	8230	{
8125	8231	Object3D targ = this;
8126	8232
	8233	+ targ.NORMALPUSH = obj.NORMALPUSH;
	8234	+
8127	8235	if (obj.material != null)
8128	8236	{
8129	8237	if ((mask&MATERIAL)!=0) // ==(COLOR\|MATERIAL))