~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,38 @@
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	+ byte[] versions[];
	33	+ int versionindex = -1;
	34	+
22	35	ScriptNode scriptnode;
	36	+
	37	+ void InitOthers()
	38	+ {
	39	+ if (projectedVertices == null \|\| projectedVertices.length <= 2)
	40	+ {
	41	+ projectedVertices = new Object3D.cVector2[3];
	42	+ }
	43	+ for (int i = 0; i < 3; i++)
	44	+ {
	45	+ projectedVertices[i] = new cVector2(); // Others
	46	+ }
	47	+ projectedVertices[0].x = 100; // bump
	48	+ }
23	49
24	50	void MinMax(cVector minima, cVector maxima)
25	51	{
..	..	@@ -86,64 +112,178 @@
86	112
87	113	// transient boolean reduced; // for morph reduction
88	114
89		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
90		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	115	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	116	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
91	117
92		-transient Object3D transientsupport; // for cloning
93		-transient boolean transientlink2master;
	118	+ transient Object3D transientsupport; // for cloning
	119	+ transient boolean transientlink2master;
94	120
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)
	121	+ void SaveSupports()
107	122	{
108		- bRep.SaveSupports();
	123	+ if (blockloop)
	124	+ return;
	125	+
	126	+ transientsupport = support;
	127	+ transientlink2master = link2master;
	128	+
	129	+ support = null;
	130	+ link2master = false;
	131	+
	132	+ if (bRep != null)
	133	+ {
	134	+ bRep.SaveSupports();
	135	+ }
	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.SaveSupports();
	144	+ blockloop = false;
	145	+ }
109	146	}
110		-
111		- for (int i = 0; i < Size(); i++)
	147	+
	148	+ void RestoreSupports()
112	149	{
113		- Object3D child = (Object3D) get(i);
114		- if (child == null)
115		- continue;
	150	+ if (blockloop)
	151	+ return;
	152	+
	153	+ support = transientsupport;
	154	+ link2master = transientlink2master;
	155	+ transientsupport = null;
	156	+ transientlink2master = false;
	157	+
	158	+ if (bRep != null)
	159	+ {
	160	+ bRep.RestoreSupports();
	161	+ }
	162	+
	163	+ for (int i = 0; i < Size(); i++)
	164	+ {
	165	+ Object3D child = (Object3D) get(i);
	166	+ if (child == null)
	167	+ continue;
	168	+ blockloop = true;
	169	+ child.RestoreSupports();
	170	+ blockloop = false;
	171	+ }
	172	+ }
	173	+
	174	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	175	+ {
	176	+ Object3D o;
	177	+
	178	+ if (hashtable.containsKey(GetUUID()))
	179	+ {
	180	+ o = hashtable.get(GetUUID());
	181	+
	182	+ Grafreed.Assert(this.bRep == o.bRep);
	183	+ //if (this.bRep != null)
	184	+ // assert(this.bRep.support == o.transientrep);
	185	+ if (this.support != null)
	186	+ assert(this.support.bRep == o.transientrep);
	187	+ }
	188	+ else
	189	+ {
	190	+ o = new Object3D("copy of " + this.name);
	191	+
	192	+ hashtable.put(GetUUID(), o);
	193	+ }
	194	+
	195	+ if (!blockloop)
	196	+ {
	197	+ blockloop = true;
	198	+
	199	+ for (int i=0; i<Size(); i++)
	200	+ {
	201	+ get(i).ExtractBigData(hashtable);
	202	+ }
	203	+
	204	+ blockloop = false;
	205	+ }
	206	+
	207	+ ExtractBigData(o);
	208	+ }
	209	+
	210	+ void ExtractBigData(Object3D o)
	211	+ {
	212	+ if (o.bRep != null)
	213	+ Grafreed.Assert(o.bRep == this.bRep);
	214	+
	215	+ o.bRep = this.bRep;
	216	+// July 2019 if (this.bRep != null)
	217	+// {
	218	+// o.transientrep = this.bRep.support;
	219	+// o.bRep.support = null;
	220	+// }
	221	+ o.selection = this.selection;
	222	+ o.versions = this.versions;
	223	+ o.versionindex = this.versionindex;
	224	+
	225	+ if (this.support != null)
	226	+ {
	227	+ if (o.transientrep != null)
	228	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	229	+
	230	+ o.transientrep = this.support.bRep;
	231	+ this.support.bRep = null;
	232	+ }
	233	+
	234	+ // o.support = this.support;
	235	+ // o.fileparent = this.fileparent;
	236	+ // if (this.bRep != null)
	237	+ // o.bRep = this.bRep.support;
	238	+
	239	+ this.bRep = null;
	240	+ // if (this.bRep != null)
	241	+ // this.bRep.support = null;
	242	+ // this.support = null;
	243	+ // this.fileparent = null;
	244	+ }
	245	+
	246	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	247	+ {
	248	+ if (!hashtable.containsKey(GetUUID()))
	249	+ return;
	250	+
	251	+ Object3D o = hashtable.get(GetUUID());
	252	+
	253	+ RestoreBigData(o);
	254	+
	255	+ if (blockloop)
	256	+ return;
	257	+
116	258	blockloop = true;
117		- child.SaveSupports();
	259	+
	260	+ //hashtable.remove(GetUUID());
	261	+
	262	+ for (int i=0; i<Size(); i++)
	263	+ {
	264	+ get(i).RestoreBigData(hashtable);
	265	+ }
	266	+
118	267	blockloop = false;
119	268	}
120		-}
121	269
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)
	270	+ void RestoreBigData(Object3D o)
133	271	{
134		- bRep.RestoreSupports();
	272	+ this.bRep = o.bRep;
	273	+ if (this.support != null && o.transientrep != null)
	274	+ {
	275	+ this.support.bRep = o.transientrep;
	276	+ }
	277	+
	278	+ this.selection = o.selection;
	279	+
	280	+ this.versions = o.versions;
	281	+ this.versionindex = o.versionindex;
	282	+// July 2019 if (this.bRep != null)
	283	+// this.bRep.support = o.transientrep;
	284	+ // this.support = o.support;
	285	+ // this.fileparent = o.fileparent;
135	286	}
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	287
148	288	// MOCAP SUPPORT
149	289	double tx,ty,tz,rx,ry,rz;
..	..	@@ -286,6 +426,8 @@
286	426	}
287	427
288	428	boolean live = false;
	429	+ transient boolean keepdontselect;
	430	+ boolean dontselect = false;
289	431	boolean hide = false;
290	432	boolean link2master = false; // performs reset support/master at each frame
291	433	boolean marked = false; // animation node
..	..	@@ -295,6 +437,8 @@
295	437	boolean random = false;
296	438	boolean speedup = false;
297	439	boolean rewind = false;
	440	+
	441	+ float NORMALPUSH = 0;
298	442
299	443	Object3D support;
300	444
..	..	@@ -355,7 +499,7 @@
355	499
356	500	int MemorySize()
357	501	{
358		- if (memorysize == 0)
	502	+ if (true) // memorysize == 0)
359	503	{
360	504	try
361	505	{
..	..	@@ -415,16 +559,16 @@
415	559	{
416	560	Object3D copy = this;
417	561
418		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	562	+ Camera parentcam = Globals.theRenderer.ManipCamera();
419	563
420		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	564	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
421	565	{
422		- parentcam = CameraPane.theRenderer.cameras[1];
	566	+ parentcam = Globals.theRenderer.Cameras()[1];
423	567	}
424	568
425		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	569	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
426	570	{
427		- parentcam = CameraPane.theRenderer.cameras[0];
	571	+ parentcam = Globals.theRenderer.Cameras()[0];
428	572	}
429	573
430	574	if (this == parentcam)
..	..	@@ -432,7 +576,7 @@
432	576	//assert(this instanceof Camera);
433	577
434	578	for (int count = parentcam.GetTransformCount(); --count>=0;)
435		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	579	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
436	580	}
437	581
438	582	copy.marked ^= true;
..	..	@@ -452,7 +596,7 @@
452	596	//assert(this instanceof Camera);
453	597
454	598	for (int count = parentcam.GetTransformCount(); --count>=0;)
455		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	599	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
456	600	}
457	601
458	602	copy.Touch(); // display list issue
..	..	@@ -465,12 +609,14 @@
465	609	toParent = LA.newMatrix();
466	610	fromParent = LA.newMatrix();
467	611	}
	612	+
468	613	if (toParentMarked == null)
469	614	{
470	615	if (maxcount != 1)
471	616	{
472	617	new Exception().printStackTrace();
473	618	}
	619	+
474	620	toParentMarked = LA.newMatrix();
475	621	fromParentMarked = LA.newMatrix();
476	622	}
..	..	@@ -587,7 +733,7 @@
587	733	return;
588	734	}
589	735
590		- if (CameraPane.fromscript)
	736	+ if (Globals.fromscript)
591	737	{
592	738	transformcount = 0;
593	739	return;
..	..	@@ -745,7 +891,7 @@
745	891
746	892	int GetTransformCount()
747	893	{
748		- // marde pour serialization de Texture
	894	+ // patch pour serialization de Texture
749	895	resetmaxcount();
750	896	resettransformcount();
751	897	resetstep();
..	..	@@ -758,7 +904,7 @@
758	904	if (step == 0)
759	905	step = 1;
760	906	if (maxcount == 0)
761		- maxcount = 2048; // 4;
	907	+ maxcount = 128; // 2048; // 4;
762	908	// if (acceleration == 0)
763	909	// acceleration = 10;
764	910	if (delay == 0) // serial
..	..	@@ -779,9 +925,12 @@
779	925	// factor = CameraPane.STEP;
780	926	// }
781	927
782		- if (marked && CameraPane.isLIVE() && live && CameraPane.drawMode == CameraPane.SHADOW && currentframe != CameraPane.framecount)
	928	+ if (marked && Globals.isLIVE() && live &&
	929	+ //TEMP21aug2018
	930	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
	931	+ currentframe != Globals.framecount)
783	932	{
784		- currentframe = CameraPane.framecount;
	933	+ currentframe = Globals.framecount;
785	934
786	935	// System.err.println("transformcount = " + transformcount);
787	936	// System.err.println("factor = " + factor);
..	..	@@ -790,7 +939,8 @@
790	939
791	940	boolean changedir = random && Math.random() < 0.01; // && !link2master;
792	941
793		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	942	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	943	+ (step == 1 && changedir))
794	944	{
795	945	countdown = 1;
796	946	delay = speedup?8:1;
..	..	@@ -862,6 +1012,7 @@
862	1012	if (material == null \|\| material.multiply)
863	1013	return true;
864	1014
	1015	+ // Transparent objects are dynamic because we have to sort the triangles.
865	1016	return material.opacity > 0.99;
866	1017	}
867	1018
..	..	@@ -893,6 +1044,11 @@
893	1044	fromParent = null; // LA.newMatrix();
894	1045	bRep = null; // new BoundaryRep();
895	1046
	1047	+ if (oname != null && oname.equals("LeftHand"))
	1048	+ {
	1049	+ name = oname;
	1050	+ }
	1051	+
896	1052	/*
897	1053	float hue = (float)Math.random();
898	1054	Color col;
..	..	@@ -935,7 +1091,7 @@
935	1091
936	1092	public Object clone()
937	1093	{
938		- return GraphreeD.clone(this);
	1094	+ return Grafreed.clone(this);
939	1095	}
940	1096
941	1097	Object3D copyExpand()
..	..	@@ -1257,6 +1413,7 @@
1257	1413	toParent = LA.newMatrix();
1258	1414	fromParent = LA.newMatrix();
1259	1415	}
	1416	+
1260	1417	LA.matCopy(other.toParent, toParent);
1261	1418	LA.matCopy(other.fromParent, fromParent);
1262	1419
..	..	@@ -1446,7 +1603,16 @@
1446	1603	// if (other == null)
1447	1604	// return;
1448	1605
1449		- System.out.println("Link support this = " + this + "; other = " + other);
	1606	+ if (other != null)
	1607	+ {
	1608	+ BoundaryRep.SEUIL = other.material.cameralight;
	1609	+
	1610	+ // Set default to 0.1
	1611	+ BoundaryRep.SEUIL /= 4; // 2;
	1612	+ System.out.println("SEUIL = " + BoundaryRep.SEUIL);
	1613	+ }
	1614	+
	1615	+ System.out.println("Link this = " + this + "; support = " + other);
1450	1616
1451	1617	//if (bRep != null)
1452	1618	// bRep.linkVerticesThis(other.bRep);
..	..	@@ -1701,7 +1867,7 @@
1701	1867	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1702	1868	o.bRep = transientrep;
1703	1869	if (clone)
1704		- o.bRep = (BoundaryRep) GraphreeD.clone(transientrep);
	1870	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1705	1871	o.CreateMaterial();
1706	1872	o.SetAttributes(this, -1);
1707	1873	//parent
..	..	@@ -1714,7 +1880,7 @@
1714	1880	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1715	1881	o.bRep = bRep;
1716	1882	if (clone)
1717		- o.bRep = (BoundaryRep) GraphreeD.clone(bRep);
	1883	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1718	1884	o.CreateMaterial();
1719	1885	//o.overwriteThis(this, -1);
1720	1886	o.SetAttributes(this, -1);
..	..	@@ -1756,7 +1922,7 @@
1756	1922	// {
1757	1923	// assert(bRep == null);
1758	1924	// Object3D o = new Object3D("Geometry:" + this.name);
1759		-// o.bRep = (BoundaryRep) GraphreeD.clone(transientrep);
	1925	+// o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
1760	1926	// o.CreateMaterial();
1761	1927	// parent.addChild(o);
1762	1928	// }
..	..	@@ -1765,7 +1931,7 @@
1765	1931	// {
1766	1932	// assert(transientrep == null);
1767	1933	// Object3D o = new Object3D("Geometry:" + this.name);
1768		-// o.bRep = (BoundaryRep) GraphreeD.clone(bRep);
	1934	+// o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
1769	1935	// o.CreateMaterial();
1770	1936	// parent.addChild(o);
1771	1937	// }
..	..	@@ -1801,12 +1967,15 @@
1801	1967	if (obj.name == null)
1802	1968	continue; // can't be a null one
1803	1969
	1970	+ // Try perfect match first.
1804	1971	if (n.equals(obj.name))
1805	1972	{
1806	1973	theobj = obj;
1807	1974	count++;
1808	1975	}
1809	1976	}
	1977	+
	1978	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1810	1979
1811	1980	if (count != 1)
1812	1981	for (int i=Size(); --i>=0;)
..	..	@@ -1816,8 +1985,9 @@
1816	1985	if (obj.name == null)
1817	1986	continue; // can't be a null one
1818	1987
1819		- //if (n.contains(obj.name)) // dec 2013 name.split(":")[0])) // Poser generates a count
1820		- if (n.startsWith(obj.name))
	1988	+ String name = obj.name.split(":")[0]; // Poser generates a count
	1989	+ //if (n.startsWith(obj.name))
	1990	+ if (n.contains(name))
1821	1991	{
1822	1992	theobj = obj;
1823	1993	count++;
..	..	@@ -2120,15 +2290,8 @@
2120	2290	if (/parent != null &&/ material == null)
2121	2291	{
2122	2292	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
	2293	+
	2294	+ InitOthers();
2132	2295
2133	2296	if (this instanceof Camera)
2134	2297	{
..	..	@@ -2272,12 +2435,17 @@
2272	2435	}
2273	2436	*/
2274	2437	}
	2438	+ else
	2439	+ {
	2440	+ //((ObjEditor)editWindow).SetupUI2(null);
	2441	+ }
2275	2442	}
2276	2443
2277	2444	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2278	2445	{
2279	2446	if (newWindow)
2280	2447	{
	2448	+ new Exception().printStackTrace();
2281	2449	System.exit(0);
2282	2450	if (parent != null)
2283	2451	{
..	..	@@ -2312,6 +2480,14 @@
2312	2480	{
2313	2481	editWindow.refreshContents();
2314	2482	}
	2483	+ else
	2484	+ {
	2485	+ if (manipWindow != null)
	2486	+ {
	2487	+ manipWindow.refreshContents();
	2488	+ }
	2489	+ }
	2490	+
2315	2491	//if (parent != null)
2316	2492	//parent.refreshEditWindow();
2317	2493	}
..	..	@@ -2391,7 +2567,8 @@
2391	2567	private static final int editSelf = 1;
2392	2568	private static final int editChild = 2;
2393	2569
2394		- void drawEditHandles(ClickInfo info, int level)
	2570	+ void drawEditHandles(//ClickInfo info,
	2571	+ int level)
2395	2572	{
2396	2573	if (level == 0)
2397	2574	{
..	..	@@ -2399,7 +2576,8 @@
2399	2576	return;
2400	2577
2401	2578	Object3D selectee;
2402		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2579	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2580	+ level + 1))
2403	2581	{
2404	2582	selectee = (Object3D) e.nextElement();
2405	2583	}
..	..	@@ -2407,19 +2585,22 @@
2407	2585	} else
2408	2586	{
2409	2587	//super.
2410		- drawEditHandles0(info, level + 1);
	2588	+ drawEditHandles0(//info,
	2589	+ level + 1);
2411	2590	}
2412	2591	}
2413	2592
2414		- boolean doEditClick(ClickInfo info, int level)
	2593	+ boolean doEditClick(//ClickInfo info,
	2594	+ int level)
2415	2595	{
2416	2596	doSomething = 0;
2417	2597	if (level == 0)
2418	2598	{
2419		- return doParentClick(info);
	2599	+ return doParentClick(); //info);
2420	2600	}
2421	2601	if (//super.
2422		- doEditClick0(info, level))
	2602	+ doEditClick0(//info,
	2603	+ level))
2423	2604	{
2424	2605	doSomething = 1;
2425	2606	return true;
..	..	@@ -2429,7 +2610,7 @@
2429	2610	}
2430	2611	}
2431	2612
2432		- boolean doParentClick(ClickInfo info)
	2613	+ boolean doParentClick() //ClickInfo info)
2433	2614	{
2434	2615	if (selection == null)
2435	2616	{
..	..	@@ -2442,7 +2623,8 @@
2442	2623	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2443	2624	{
2444	2625	Object3D selectee = (Object3D) e.nextElement();
2445		- if (selectee.doEditClick(info, 1))
	2626	+ if (selectee.doEditClick(//info,
	2627	+ 1))
2446	2628	{
2447	2629	childToDrag = selectee;
2448	2630	doSomething = 2;
..	..	@@ -2454,13 +2636,15 @@
2454	2636	return retval;
2455	2637	}
2456	2638
2457		- void doEditDrag(ClickInfo info)
	2639	+ void doEditDrag(//ClickInfo clickInfo,
	2640	+ boolean opposite)
2458	2641	{
2459	2642	switch (doSomething)
2460	2643	{
2461	2644	case 1: // '\001'
2462	2645	//super.
2463		- doEditDrag0(info);
	2646	+ doEditDrag0(//clickInfo,
	2647	+ opposite);
2464	2648	break;
2465	2649
2466	2650	case 2: // '\002'
..	..	@@ -2473,11 +2657,13 @@
2473	2657	{
2474	2658	//sel.hitSomething = childToDrag.hitSomething;
2475	2659	//childToDrag.doEditDrag(info);
2476		- sel.doEditDrag(info);
	2660	+ sel.doEditDrag(//clickInfo,
	2661	+ opposite);
2477	2662	} else
2478	2663	{
2479	2664	//super.
2480		- doEditDrag0(info);
	2665	+ doEditDrag0(//clickInfo,
	2666	+ opposite);
2481	2667	}
2482	2668	}
2483	2669	break;
..	..	@@ -2495,6 +2681,9 @@
2495	2681	{
2496	2682	deselectAll();
2497	2683	}
	2684	+
	2685	+ new Exception().printStackTrace();
	2686	+
2498	2687	ClickInfo newInfo = new ClickInfo();
2499	2688	newInfo.flags = info.flags;
2500	2689	newInfo.bounds = info.bounds;
..	..	@@ -2587,6 +2776,18 @@
2587	2776	void GenNormalsS(boolean crease)
2588	2777	{
2589	2778	selection.GenNormals(crease);
	2779	+// for (int i=0; i<selection.size(); i++)
	2780	+// {
	2781	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2782	+// selectee.GenNormals(crease);
	2783	+// }
	2784	+
	2785	+ //Touch();
	2786	+ }
	2787	+
	2788	+ void GenNormalsMeshS()
	2789	+ {
	2790	+ selection.GenNormalsMesh();
2590	2791	// for (int i=0; i<selection.size(); i++)
2591	2792	// {
2592	2793	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2732,6 +2933,42 @@
2732	2933	blockloop = false;
2733	2934	}
2734	2935
	2936	+ void GenNormalsMesh()
	2937	+ {
	2938	+ if (blockloop)
	2939	+ return;
	2940	+
	2941	+ blockloop = true;
	2942	+ GenNormalsMesh0();
	2943	+ for (int i = 0; i < Children().Size(); i++)
	2944	+ {
	2945	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2946	+ if (child == null)
	2947	+ continue;
	2948	+ child.GenNormalsMesh();
	2949	+// Children().release(i);
	2950	+ }
	2951	+ blockloop = false;
	2952	+ }
	2953	+
	2954	+ void GenNormalsMINE()
	2955	+ {
	2956	+ if (blockloop)
	2957	+ return;
	2958	+
	2959	+ blockloop = true;
	2960	+ GenNormalsMINE0();
	2961	+ for (int i = 0; i < Children().Size(); i++)
	2962	+ {
	2963	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2964	+ if (child == null)
	2965	+ continue;
	2966	+ child.GenNormalsMINE();
	2967	+// Children().release(i);
	2968	+ }
	2969	+ blockloop = false;
	2970	+ }
	2971	+
2735	2972	void ClearColors()
2736	2973	{
2737	2974	if (blockloop)
..	..	@@ -2866,7 +3103,8 @@
2866	3103	{
2867	3104	if (bRep != null)
2868	3105	{
2869		- bRep.GenUV();
	3106	+ bRep.GenUV(); //1);
	3107	+ //bRep.UnfoldUV();
2870	3108	Touch();
2871	3109	}
2872	3110	}
..	..	@@ -2876,6 +3114,24 @@
2876	3114	if (bRep != null)
2877	3115	{
2878	3116	bRep.GenerateNormals(crease);
	3117	+ Touch();
	3118	+ }
	3119	+ }
	3120	+
	3121	+ void GenNormalsMesh0()
	3122	+ {
	3123	+ if (bRep != null)
	3124	+ {
	3125	+ bRep.GenerateNormalsMesh();
	3126	+ Touch();
	3127	+ }
	3128	+ }
	3129	+
	3130	+ void GenNormalsMINE0()
	3131	+ {
	3132	+ if (bRep != null)
	3133	+ {
	3134	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2879	3135	Touch();
2880	3136	}
2881	3137	}
..	..	@@ -2932,6 +3188,33 @@
2932	3188	blockloop = false;
2933	3189	}
2934	3190
	3191	+ void TransformChildren()
	3192	+ {
	3193	+ if (toParent != null)
	3194	+ {
	3195	+ for (int i=Size(); --i>=0;)
	3196	+ {
	3197	+ Object3D v = get(i);
	3198	+
	3199	+ if (v.toParent == null)
	3200	+ {
	3201	+ v.toParent = LA.newMatrix();
	3202	+ v.fromParent = LA.newMatrix();
	3203	+ }
	3204	+
	3205	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3206	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3207	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3208	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3209	+ }
	3210	+
	3211	+ toParent = null; // LA.matIdentity(toParent);
	3212	+ fromParent = null; // LA.matIdentity(fromParent);
	3213	+
	3214	+ Touch();
	3215	+ }
	3216	+ }
	3217	+
2935	3218	void TransformGeometry()
2936	3219	{
2937	3220	Object3D obj = this;
..	..	@@ -3153,9 +3436,11 @@
3153	3436
3154	3437	BoundaryRep sup = bRep.support;
3155	3438	bRep.support = null;
3156		- BoundaryRep temprep = (BoundaryRep) GraphreeD.clone(bRep);
	3439	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3157	3440	// bRep.SplitInTwo(onlyone); // thread...
3158		- temprep.SplitInTwo(reduction34, onlyone);
	3441	+
	3442	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3443	+
3159	3444	bRep = temprep;
3160	3445	bRep.support = sup;
3161	3446	Touch();
..	..	@@ -3292,7 +3577,8 @@
3292	3577	if (blockloop)
3293	3578	return;
3294	3579
3295		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3580	+ if (//marked \|\| // does not make sense
	3581	+ (bRep != null \|\| material != null)) // borderline...
3296	3582	live = h;
3297	3583
3298	3584	for (int i = 0; i < Size(); i++)
..	..	@@ -3313,7 +3599,8 @@
3313	3599	return;
3314	3600
3315	3601	//if (bRep != null)
3316		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3602	+ if (//marked \|\| // does not make sense
	3603	+ (bRep != null \|\| material != null)) // borderline...
3317	3604	link2master = h;
3318	3605
3319	3606	for (int i = 0; i < Size(); i++)
..	..	@@ -3333,7 +3620,8 @@
3333	3620	if (blockloop)
3334	3621	return;
3335	3622
3336		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3623	+ if (//marked \|\| // does not make sense
	3624	+ (bRep != null \|\| material != null)) // borderline...
3337	3625	hide = h;
3338	3626
3339	3627	for (int i = 0; i < Size(); i++)
..	..	@@ -3353,7 +3641,7 @@
3353	3641	if (blockloop)
3354	3642	return;
3355	3643
3356		- if (bRep != null && material != null) // borderline...
	3644	+ if (bRep != null \|\| material != null) // borderline...
3357	3645	marked = h;
3358	3646
3359	3647	for (int i = 0; i < Size(); i++)
..	..	@@ -3363,6 +3651,46 @@
3363	3651	continue;
3364	3652	blockloop = true;
3365	3653	child.MarkLeaves(h);
	3654	+ blockloop = false;
	3655	+ // release(i);
	3656	+ }
	3657	+ }
	3658	+
	3659	+ void RewindLeaves(boolean h)
	3660	+ {
	3661	+ if (blockloop)
	3662	+ return;
	3663	+
	3664	+ if (bRep != null \|\| material != null) // borderline...
	3665	+ rewind = h;
	3666	+
	3667	+ for (int i = 0; i < Size(); i++)
	3668	+ {
	3669	+ Object3D child = (Object3D) get(i); // reserve(i);
	3670	+ if (child == null)
	3671	+ continue;
	3672	+ blockloop = true;
	3673	+ child.RewindLeaves(h);
	3674	+ blockloop = false;
	3675	+ // release(i);
	3676	+ }
	3677	+ }
	3678	+
	3679	+ void RandomLeaves(boolean h)
	3680	+ {
	3681	+ if (blockloop)
	3682	+ return;
	3683	+
	3684	+ if (bRep != null \|\| material != null) // borderline...
	3685	+ random = h;
	3686	+
	3687	+ for (int i = 0; i < Size(); i++)
	3688	+ {
	3689	+ Object3D child = (Object3D) get(i); // reserve(i);
	3690	+ if (child == null)
	3691	+ continue;
	3692	+ blockloop = true;
	3693	+ child.RandomLeaves(h);
3366	3694	blockloop = false;
3367	3695	// release(i);
3368	3696	}
..	..	@@ -3677,7 +4005,7 @@
3677	4005	if (child == null)
3678	4006	continue;
3679	4007
3680		- if (GraphreeD.RENDERME > 0)
	4008	+ if (Grafreed.RENDERME > 0)
3681	4009	{
3682	4010	if (child instanceof Merge)
3683	4011	((Merge)child).renderme();
..	..	@@ -3828,7 +4156,7 @@
3828	4156	if (child == null)
3829	4157	continue;
3830	4158
3831		- if (GraphreeD.RENDERME > 0)
	4159	+ if (Grafreed.RENDERME > 0)
3832	4160	{
3833	4161	if (child instanceof Merge)
3834	4162	((Merge)child).renderme();
..	..	@@ -4023,7 +4351,7 @@
4023	4351	if (child == null)
4024	4352	continue;
4025	4353
4026		- if (GraphreeD.RENDERME > 0)
	4354	+ if (Grafreed.RENDERME > 0)
4027	4355	{
4028	4356	if (child instanceof Merge)
4029	4357	((Merge)child).renderme();
..	..	@@ -4111,7 +4439,7 @@
4111	4439	if (blockloop)
4112	4440	return;
4113	4441
4114		- for (int i=0; i<size(); i++)
	4442	+ for (int i=0; i<Size(); i++)
4115	4443	{
4116	4444	if (get(i).parent != this)
4117	4445	{
..	..	@@ -4120,6 +4448,71 @@
4120	4448	}
4121	4449	blockloop = true;
4122	4450	get(i).RepairParent();
	4451	+ blockloop = false;
	4452	+ }
	4453	+ }
	4454	+
	4455	+ void RepairShadow()
	4456	+ {
	4457	+ if (blockloop)
	4458	+ return;
	4459	+
	4460	+ if (this.material != null)
	4461	+ this.InitOthers();
	4462	+
	4463	+ for (int i=0; i<Size(); i++)
	4464	+ {
	4465	+ blockloop = true;
	4466	+ get(i).RepairShadow();
	4467	+ blockloop = false;
	4468	+ }
	4469	+ }
	4470	+
	4471	+ void RepairSOV()
	4472	+ {
	4473	+ if (blockloop)
	4474	+ return;
	4475	+
	4476	+ String texname = this.GetPigmentTexture();
	4477	+
	4478	+ if (texname.startsWith("sov"))
	4479	+ {
	4480	+ String[] s = texname.split("/");
	4481	+
	4482	+ String[] sname = s[1].split("Color.pn");
	4483	+
	4484	+ texname = sname[0];
	4485	+
	4486	+ if (sname.length > 1)
	4487	+ {
	4488	+ texname += "Color.jpg";
	4489	+ }
	4490	+
	4491	+ this.SetPigmentTexture("sov/" + texname);
	4492	+ }
	4493	+
	4494	+ texname = this.GetBumpTexture();
	4495	+
	4496	+ if (texname.startsWith("sov"))
	4497	+ {
	4498	+ String[] s = texname.split("/");
	4499	+
	4500	+ String[] sname = s[1].split("Bump.pn");
	4501	+
	4502	+ texname = sname[0];
	4503	+
	4504	+ if (sname.length > 1)
	4505	+ {
	4506	+ texname += "Bump.jpg";
	4507	+ }
	4508	+
	4509	+ this.SetBumpTexture("sov/" + texname);
	4510	+ }
	4511	+
	4512	+ for (int i=0; i<Size(); i++)
	4513	+ {
	4514	+ blockloop = true;
	4515	+ get(i).RepairSOV();
4123	4516	blockloop = false;
4124	4517	}
4125	4518	}
..	..	@@ -4614,7 +5007,7 @@
4614	5007
4615	5008	cTreePath SelectLeaf(int indexcount, boolean deselect)
4616	5009	{
4617		- if (hide)
	5010	+ if (hide \|\| dontselect)
4618	5011	return null;
4619	5012
4620	5013	if (count <= 0)
..	..	@@ -4638,9 +5031,17 @@
4638	5031	}
4639	5032	}
4640	5033
	5034	+ ObjEditor GetWindow()
	5035	+ {
	5036	+ if (editWindow != null)
	5037	+ return editWindow;
	5038	+
	5039	+ return manipWindow;
	5040	+ }
	5041	+
4641	5042	cTreePath Select(int indexcount, boolean deselect)
4642	5043	{
4643		- if (hide)
	5044	+ if (hide \|\| dontselect)
4644	5045	return null;
4645	5046
4646	5047	if (count <= 0)
..	..	@@ -4674,10 +5075,11 @@
4674	5075	if (leaf != null)
4675	5076	{
4676	5077	cTreePath tp = new cTreePath(this, leaf);
4677		- if (editWindow != null)
	5078	+ ObjEditor window = GetWindow();
	5079	+ if (window != null)
4678	5080	{
4679	5081	//System.out.println("editWindow = " + editWindow + " vs " + this);
4680		- editWindow.Select(tp, deselect, true);
	5082	+ window.Select(tp, deselect, true);
4681	5083	}
4682	5084
4683	5085	return tp;
..	..	@@ -4694,6 +5096,7 @@
4694	5096
4695	5097	if (child == null)
4696	5098	continue;
	5099	+
4697	5100	if (child.HasTransparency() && child.size() != 0)
4698	5101	{
4699	5102	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4703,9 +5106,10 @@
4703	5106	if (leaf != null)
4704	5107	{
4705	5108	cTreePath tp = new cTreePath(this, leaf);
4706		- if (editWindow != null)
	5109	+ ObjEditor window = GetWindow();
	5110	+ if (window != null)
4707	5111	{
4708		- editWindow.Select(tp, deselect, true);
	5112	+ window.Select(tp, deselect, true);
4709	5113	}
4710	5114
4711	5115	return tp;
..	..	@@ -4790,7 +5194,7 @@
4790	5194	return globalTransform;
4791	5195	}
4792	5196
4793		- void PreprocessOcclusion(CameraPane cp)
	5197	+ void PreprocessOcclusion(iCameraPane cp)
4794	5198	{
4795	5199	/*
4796	5200	if (AOdone)
..	..	@@ -4937,7 +5341,8 @@
4937	5341	} else //
4938	5342	if (editWindow != null)
4939	5343	{
4940		- editWindow.cameraView.lighttouched = true;
	5344	+ //editWindow.cameraView.lighttouched = true;
	5345	+ Globals.lighttouched = true;
4941	5346	}
4942	5347	}
4943	5348
..	..	@@ -5029,6 +5434,51 @@
5029	5434	blockloop = false;
5030	5435	}
5031	5436
	5437	+ void ResetSelectable()
	5438	+ {
	5439	+ if (blockloop)
	5440	+ return;
	5441	+
	5442	+ blockloop = true;
	5443	+
	5444	+ keepdontselect = dontselect;
	5445	+ dontselect = true;
	5446	+
	5447	+ Object3D child;
	5448	+ int nb = Size();
	5449	+ for (int i = 0; i < nb; i++)
	5450	+ {
	5451	+ child = (Object3D) get(i);
	5452	+ if (child == null)
	5453	+ continue;
	5454	+ child.ResetSelectable();
	5455	+ }
	5456	+
	5457	+ blockloop = false;
	5458	+ }
	5459	+
	5460	+ void RestoreSelectable()
	5461	+ {
	5462	+ if (blockloop)
	5463	+ return;
	5464	+
	5465	+ blockloop = true;
	5466	+
	5467	+ dontselect = keepdontselect;
	5468	+
	5469	+ Object3D child;
	5470	+ int nb = Size();
	5471	+ for (int i = 0; i < nb; i++)
	5472	+ {
	5473	+ child = (Object3D) get(i);
	5474	+ if (child == null)
	5475	+ continue;
	5476	+ child.RestoreSelectable();
	5477	+ }
	5478	+
	5479	+ blockloop = false;
	5480	+ }
	5481	+
5032	5482	boolean IsSelected()
5033	5483	{
5034	5484	if (parent == null)
..	..	@@ -5091,10 +5541,34 @@
5091	5541
5092	5542	// System.out.println("Fullname = " + fullname);
5093	5543
5094		- if (fullname.name.indexOf(":") == -1)
5095		- return fullname.name;
	5544	+ // Does not work on Windows due to C:
	5545	+// if (fullname.name.indexOf(":") == -1)
	5546	+// return fullname.name;
	5547	+//
	5548	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5096	5549
5097		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5550	+ String[] split = fullname.name.split(":");
	5551	+
	5552	+ if (split.length == 0)
	5553	+ {
	5554	+ return "";
	5555	+ }
	5556	+
	5557	+ if (split.length <= 2)
	5558	+ {
	5559	+ if (fullname.name.endsWith(":"))
	5560	+ {
	5561	+ // Windows
	5562	+ return fullname.name.substring(0, fullname.name.length()-1);
	5563	+ }
	5564	+
	5565	+ return split[0];
	5566	+ }
	5567	+
	5568	+ // Windows
	5569	+ assert(split.length == 4);
	5570	+
	5571	+ return split[0] + ":" + split[1];
5098	5572	}
5099	5573
5100	5574	static String GetBump(cTexture fullname)
..	..	@@ -5103,10 +5577,38 @@
5103	5577	return "";
5104	5578
5105	5579	// 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());
	5580	+ // Does not work on Windows due to C:
	5581	+// if (fullname.name.indexOf(":") == -1)
	5582	+// return "";
	5583	+//
	5584	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5585	+ String[] split = fullname.name.split(":");
	5586	+
	5587	+ if (split.length == 0)
	5588	+ {
	5589	+ return "";
	5590	+ }
	5591	+
	5592	+ if (split.length == 1)
	5593	+ {
	5594	+ return "";
	5595	+ }
	5596	+
	5597	+ if (split.length == 2)
	5598	+ {
	5599	+ if (fullname.name.endsWith(":"))
	5600	+ {
	5601	+ // Windows
	5602	+ return "";
	5603	+ }
	5604	+
	5605	+ return split[1];
	5606	+ }
	5607	+
	5608	+ // Windows
	5609	+ assert(split.length == 4);
	5610	+
	5611	+ return split[2] + ":" + split[3];
5110	5612	}
5111	5613
5112	5614	String GetPigmentTexture()
..	..	@@ -5180,7 +5682,7 @@
5180	5682	System.out.print("; textures = " + textures);
5181	5683	System.out.println("; usedtextures = " + usedtextures);
5182	5684
5183		- if (GetTextures() == null)
	5685	+ if (GetTextures() == null) // What is that??
5184	5686	GetTextures().name = ":";
5185	5687
5186	5688	String texname = tex;
..	..	@@ -5211,6 +5713,43 @@
5211	5713	child.ResetPigmentTexture();
5212	5714	blockloop = false;
5213	5715	}
	5716	+ }
	5717	+
	5718	+ UUID GetUUID()
	5719	+ {
	5720	+ if (uuid == null)
	5721	+ {
	5722	+ // Serial
	5723	+ uuid = UUID.randomUUID();
	5724	+ }
	5725	+
	5726	+ return uuid;
	5727	+ }
	5728	+
	5729	+ Object3D GetObject(UUID uid)
	5730	+ {
	5731	+ if (blockloop)
	5732	+ return null;
	5733	+
	5734	+ if (GetUUID().equals(uid))
	5735	+ return this;
	5736	+
	5737	+ int nb = Size();
	5738	+ for (int i = 0; i < nb; i++)
	5739	+ {
	5740	+ Object3D child = (Object3D) get(i);
	5741	+
	5742	+ if (child == null)
	5743	+ continue;
	5744	+
	5745	+ blockloop = true;
	5746	+ Object3D obj = child.GetObject(uid);
	5747	+ blockloop = false;
	5748	+ if (obj != null)
	5749	+ return obj;
	5750	+ }
	5751	+
	5752	+ return null;
5214	5753	}
5215	5754
5216	5755	void SetBumpTexture(String tex)
..	..	@@ -5249,25 +5788,65 @@
5249	5788	}
5250	5789	}
5251	5790
5252		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5791	+ void EmbedTextures(boolean embed)
	5792	+ {
	5793	+ if (blockloop)
	5794	+ return;
	5795	+
	5796	+ //if (GetTextures() != null)
	5797	+ if (embed)
	5798	+ CameraPane.EmbedTextures(GetTextures());
	5799	+ else
	5800	+ {
	5801	+ GetTextures().pigmentdata = null;
	5802	+ GetTextures().bumpdata = null;
	5803	+ GetTextures().pw = 0;
	5804	+ GetTextures().ph = 0;
	5805	+ GetTextures().bw = 0;
	5806	+ GetTextures().bh = 0;
	5807	+ }
	5808	+
	5809	+ int nb = Size();
	5810	+ for (int i = 0; i < nb; i++)
	5811	+ {
	5812	+ Object3D child = (Object3D) get(i);
	5813	+
	5814	+ if (child == null)
	5815	+ continue;
	5816	+
	5817	+ blockloop = true;
	5818	+ child.EmbedTextures(embed);
	5819	+ blockloop = false;
	5820	+ }
	5821	+ }
	5822	+
	5823	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5253	5824	{
5254	5825	Draw(display, root, selected, blocked);
5255	5826	}
5256	5827
5257		- static cMaterial[] materialstack = new cMaterial[65536];
5258		- static boolean[] selectedstack = new boolean[65536];
5259		- static int materialdepth = 0;
5260		-
5261	5828	boolean NeedSupport()
5262	5829	{
5263	5830	return
5264		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5831	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5265	5832	// PROBLEM with CROWD!!
5266		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	5833	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5267	5834	}
5268	5835
	5836	+ static boolean DEBUG_SELECTION = false;
5269	5837
5270		- void Draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5838	+ boolean IsLive()
	5839	+ {
	5840	+ if (live)
	5841	+ return true;
	5842	+
	5843	+ if (parent == null)
	5844	+ return false;
	5845	+
	5846	+ return parent.IsLive();
	5847	+ }
	5848	+
	5849	+ void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5271	5850	{
5272	5851	Invariants(); // june 2013
5273	5852
..	..	@@ -5276,8 +5855,8 @@
5276	5855	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5277	5856	}
5278	5857
5279		- if (display.drawMode == CameraPane.SELECTION &&
5280		- hide)
	5858	+ if (display.DrawMode() == iCameraPane.SELECTION &&
	5859	+ (hide \|\| dontselect))
5281	5860	return;
5282	5861
5283	5862	if (name != null && name.contains("sclera"))
..	..	@@ -5295,7 +5874,7 @@
5295	5874	if (this instanceof Checker)
5296	5875	return;
5297	5876
5298		- if (display.drawMode == display.SHADOW && PASSTEST)
	5877	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5299	5878	return;
5300	5879
5301	5880	if (count <= 0)
..	..	@@ -5303,13 +5882,13 @@
5303	5882	return;
5304	5883	}
5305	5884
5306		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5307		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5885	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	5886	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5308	5887	{
5309	5888	return;
5310	5889	}
5311	5890
5312		- javax.media.opengl.GL gl = display.GetGL();
	5891	+ //javax.media.opengl.GL gl = display.GetGL();
5313	5892
5314	5893	/*
5315	5894	if (touched)
..	..	@@ -5328,7 +5907,7 @@
5328	5907	support = support;
5329	5908
5330	5909	//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);
	5910	+ boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5332	5911
5333	5912	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5334	5913	{
..	..	@@ -5345,15 +5924,17 @@
5345	5924
5346	5925	boolean compiled = false;
5347	5926
5348		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5927	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5349	5928
5350		- if (!selectmode && //display.drawMode != display.SELECTION &&
5351		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5929	+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
	5930	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5931	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5352	5932	{
5353		- display.lighttouched = true;
	5933	+ Globals.lighttouched = true;
5354	5934	} // 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 &&
	5935	+
	5936	+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
	5937	+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5357	5938	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5358	5939	{
5359	5940	if (!(this instanceof Composite))
..	..	@@ -5361,7 +5942,7 @@
5361	5942	//if (displaylist == -1 && usecalllists)
5362	5943	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5363	5944	{
5364		- bRep.displaylist = gl.glGenLists(1);
	5945	+ bRep.displaylist = display.GenList();
5365	5946	assert(bRep.displaylist != 0);
5366	5947	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5367	5948	//System.out.println("\tgen list " + list);
..	..	@@ -5373,18 +5954,20 @@
5373	5954	if (usecalllists)
5374	5955	{
5375	5956	// System.err.println("new list " + bRep.displaylist + " for " + this);
5376		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5957	+ display.NewList(bRep.displaylist);
5377	5958	}
	5959	+
5378	5960	CallList(display, root, selected, blocked);
	5961	+
5379	5962	// compiled = true;
5380	5963	if (usecalllists)
5381	5964	{
5382	5965	// System.err.println("end list " + bRep.displaylist + " for " + this);
5383		- gl.glEndList();
	5966	+ display.EndList();
5384	5967	}
5385	5968	//gl.glDrawBuffer(gl.GL_BACK);
5386	5969	// XXX touched = false;
5387		- display.lighttouched = true; // all panes...
	5970	+ Globals.lighttouched = true; // all panes...
5388	5971	}
5389	5972
5390	5973	touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
..	..	@@ -5423,12 +6006,12 @@
5423	6006
5424	6007	// frustum culling
5425	6008	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5426		- && display.drawMode != CameraPane.SELECTION)
	6009	+ && display.DrawMode() != iCameraPane.SELECTION)
5427	6010	{
5428		- if (display.drawMode == CameraPane.SHADOW)
	6011	+ if (display.DrawMode() == iCameraPane.SHADOW)
5429	6012	{
5430	6013	if (!link2master // tricky to cull in shadow mode.
5431		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	6014	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5432	6015	{
5433	6016	//System.out.print("CULLED");
5434	6017	culled = true;
..	..	@@ -5436,7 +6019,7 @@
5436	6019	}
5437	6020	else
5438	6021	//GetBRep().getBounds(v0, v1, this);
5439		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	6022	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5440	6023	culled = true;
5441	6024
5442	6025	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5472,11 +6055,12 @@
5472	6055
5473	6056
5474	6057	if (!culled)
5475		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	6058	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5476	6059	{
5477	6060	if (GetBRep() != null)
5478	6061	{
5479		- CameraPane.NextIndex(this, gl);
	6062	+ display.NextIndex();
	6063	+
5480	6064	// vertex color conflict : gl.glCallList(list);
5481	6065	DrawNode(display, root, selected);
5482	6066	if (this instanceof BezierPatch)
..	..	@@ -5498,53 +6082,7 @@
5498	6082	color[2] /= 2;
5499	6083	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5500	6084	*/
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		- }
	6085	+ display.PushMaterial(this, selected);
5548	6086
5549	6087	//System.out.println("call list " + list);
5550	6088	//System.out.println();
..	..	@@ -5563,7 +6101,28 @@
5563	6101	tex = GetTextures();
5564	6102	}
5565	6103
5566		- display.BindTextures(tex, texres);
	6104	+ boolean failedPigment = false;
	6105	+ boolean failedBump = false;
	6106	+
	6107	+ try
	6108	+ {
	6109	+ display.BindPigmentTexture(tex, texres);
	6110	+ }
	6111	+ catch (Exception e)
	6112	+ {
	6113	+ System.err.println("FAILED: " + this);
	6114	+ failedPigment = true;
	6115	+ }
	6116	+
	6117	+ try
	6118	+ {
	6119	+ display.BindBumpTexture(tex, texres);
	6120	+ }
	6121	+ catch (Exception e)
	6122	+ {
	6123	+ //System.err.println("FAILED: " + this);
	6124	+ failedBump = true;
	6125	+ }
5567	6126
5568	6127	if (!compiled)
5569	6128	{
..	..	@@ -5579,30 +6138,19 @@
5579	6138
5580	6139	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5581	6140	assert(bRep.displaylist != 0);
5582		- gl.glCallList(bRep.displaylist);
	6141	+ display.CallList(bRep.displaylist);
5583	6142	// june 2013 drawSelf(display, root, selected);
5584	6143	}
5585	6144	}
5586	6145	}
5587	6146
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		- }
	6147	+ if (!failedBump)
	6148	+ display.ReleaseBumpTexture(tex);
	6149	+
	6150	+ if (!failedPigment)
	6151	+ display.ReleasePigmentTexture(tex);
	6152	+
	6153	+ display.PopMaterial(this, selected);
5606	6154	}
5607	6155
5608	6156	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5644,7 +6192,7 @@
5644	6192	// resetMasterNode();
5645	6193	}
5646	6194
5647		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6195	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5648	6196	{
5649	6197	if (GetBRep() == null)
5650	6198	{
..	..	@@ -5727,8 +6275,11 @@
5727	6275	boolean flipV = false; // true;
5728	6276	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5729	6277
5730		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6278	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5731	6279	{
	6280	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6281	+ return;
	6282	+
5732	6283	if (hide)
5733	6284	return;
5734	6285	// shadow optimisation
..	..	@@ -5786,16 +6337,7 @@
5786	6337	// // ??????????????????????????? Touch();
5787	6338	// }
5788	6339
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		- }
	6340	+display.PushMaterial2(this, selected);
5799	6341
5800	6342	Object3D child;
5801	6343	boolean sel;
..	..	@@ -5819,12 +6361,12 @@
5819	6361	if (!child.HasTransparency())
5820	6362	{
5821	6363	sel = root != null && root.selection != null && root.selection.indexOf(child) != -1;
5822		- // GraphreeD.tracein("draw ", child);
	6364	+ // GrafreeD.tracein("draw ", child);
5823	6365	boolean wasblocked = blockdraw;
5824	6366	blockdraw = true;
5825	6367	child.draw(display, root, selected \|\| sel, wasblocked \|\| blocked); // \|\| child.IsSelected());
5826	6368	blockdraw = false;
5827		- // GraphreeD.traceout("draw ", child);
	6369	+ // GrafreeD.traceout("draw ", child);
5828	6370	}
5829	6371
5830	6372	release(i);
..	..	@@ -5847,19 +6389,7 @@
5847	6389	*/
5848	6390	//depth += 1;
5849	6391
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		-
	6392	+display.PopMaterial2(this);
5863	6393	/*
5864	6394	display.ReleaseTextures(tex);
5865	6395	*/
..	..	@@ -5870,10 +6400,13 @@
5870	6400
5871	6401	//static cVector min,max;
5872	6402
5873		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	6403	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5874	6404	{
5875		- if (display.drawMode == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	6405	+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5876	6406	return; // no shadow for transparent objects
	6407	+
	6408	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6409	+ return;
5877	6410
5878	6411	if (hide)
5879	6412	return;
..	..	@@ -5915,11 +6448,12 @@
5915	6448	return;
5916	6449	}
5917	6450
	6451	+ //bRep.GenUV(1/material.diffuseness);
5918	6452	// bRep.lock = true;
5919	6453
5920		- javax.media.opengl.GL gl = display.GetGL();
	6454	+ //javax.media.opengl.GL gl = display.GetGL();
5921	6455
5922		- if (CameraPane.BOXMODE) // \|\| CameraPane.movingcamera)
	6456	+ if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5923	6457	{
5924	6458	int fc = bRep.FaceCount();
5925	6459	int vc = bRep.VertexCount();
..	..	@@ -5934,23 +6468,7 @@
5934	6468
5935	6469	bRep.getMinMax(min, max, 100);
5936	6470
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();
	6471	+ display.DrawBox(min, max);
5954	6472
5955	6473	return;
5956	6474	}
..	..	@@ -5994,7 +6512,7 @@
5994	6512	{
5995	6513	//throw new Error();
5996	6514
5997		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6515	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5998	6516
5999	6517	int[] strips = bRep.getRawIndices();
6000	6518
..	..	@@ -6004,178 +6522,19 @@
6004	6522	new Exception().printStackTrace();
6005	6523	return;
6006	6524	}
6007		-
6008		- // TRIANGLE STRIP ARRAY
6009		- if (bRep.trimmed)
	6525	+
	6526	+ if (dontselect)
6010	6527	{
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;
	6528	+ //bRep.GenerateNormalsMINE();
6142	6529	}
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		- }
	6530	+
	6531	+ display.DrawGeometry(bRep, flipV, selectmode);
6173	6532	} else // catch (Error e)
6174	6533	{
6175	6534	// TRIANGLE ARRAY
6176	6535	if (IsOpaque()) // Static())
6177	6536	{
6178		- gl.glBegin(gl.GL_TRIANGLES);
	6537	+ display.StartTriangles();
6179	6538	int facecount = bRep.FaceCount();
6180	6539	for (int i = 0; i < facecount; i++)
6181	6540	{
..	..	@@ -6238,9 +6597,9 @@
6238	6597	// // r.norm.dot(v3) > -0.5)
6239	6598	// // continue;
6240	6599
6241		- drawFace(p, q, r, display, face);
	6600	+ display.DrawFace(this, p, q, r, face);
6242	6601	}
6243		- gl.glEnd();
	6602	+ display.EndTriangles();
6244	6603	}
6245	6604	else
6246	6605	{
..	..	@@ -6269,8 +6628,8 @@
6269	6628	//System.out.println("SORT");
6270	6629
6271	6630	java.util.Arrays.sort(facescompare);
6272		-
6273		- gl.glBegin(gl.GL_TRIANGLES);
	6631	+
	6632	+ display.StartTriangles();
6274	6633	for (int i = 0; i < facecount; i++)
6275	6634	{
6276	6635	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6282,13 +6641,14 @@
6282	6641	Vertex q = bRep.GetVertex(face.q);
6283	6642	Vertex r = bRep.GetVertex(face.r);
6284	6643
6285		- drawFace(p, q, r, display, face);
	6644	+ display.DrawFace(this, p, q, r, face);
6286	6645	}
6287		- gl.glEnd();
	6646	+ display.EndTriangles();
6288	6647	}
6289	6648
6290	6649	if (false) // live && support != null && support.bRep != null) // debug weights
6291	6650	{
	6651	+ /*
6292	6652	gl.glDisable(gl.GL_LIGHTING);
6293	6653	float[] colorV = new float[3];
6294	6654
..	..	@@ -6367,6 +6727,7 @@
6367	6727	// gl.glEnd();
6368	6728	}
6369	6729	}
	6730	+ */
6370	6731	}
6371	6732	}
6372	6733
..	..	@@ -6411,7 +6772,7 @@
6411	6772	center.add(r);
6412	6773	center.mul(1.0/3);
6413	6774
6414		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6775	+ center.sub(Globals.theRenderer.EyeCamera().location);
6415	6776
6416	6777	distance = center.dot(center);
6417	6778	}
..	..	@@ -6422,347 +6783,11 @@
6422	6783
6423	6784	transient FaceCompare[] facescompare = null;
6424	6785
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	6786	void Print(Vertex v)
6600	6787	{
6601	6788	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6602	6789	}
6603	6790
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	6791	void drawSelf(ClickInfo info, int level, boolean select)
6767	6792	{
6768	6793	if (bRep == null)
..	..	@@ -7286,20 +7311,23 @@
7286	7311	}
7287	7312	}
7288	7313
7289		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7314	+ static ClickInfo clickInfo = new ClickInfo();
	7315	+
	7316	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7317	+ Point outPt, Rectangle outRec)
7290	7318	{
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;
	7319	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7320	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7321	+ double[][] toscreen = clickInfo.toScreen;
7294	7322	if (toscreen == null)
7295	7323	{
7296		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7324	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7297	7325	}
7298	7326	cVector vec = in;
7299	7327	LA.xformPos(in, toscreen, in);
7300	7328	//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();
	7329	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7330	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7303	7331	outPt.x = hc + (int) vec.x;
7304	7332	outPt.y = vc - (int) vec.y;
7305	7333	outRec.x = outPt.x - 3;
..	..	@@ -7307,15 +7335,18 @@
7307	7335	outRec.width = outRec.height = 6;
7308	7336	}
7309	7337
7310		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7338	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7339	+ )
7311	7340	{
7312	7341	Point pt = new Point(0, 0);
7313	7342	Rectangle rec = new Rectangle();
7314		- calcHotSpot(in, info, pt, rec);
	7343	+ calcHotSpot(in, //clickInfo,
	7344	+ pt, rec);
7315	7345	return rec;
7316	7346	}
7317	7347
7318		- void drawEditHandles0(ClickInfo info, int level)
	7348	+ void drawEditHandles0(//ClickInfo clickInfo,
	7349	+ int level)
7319	7350	{
7320	7351	if (level == 0)
7321	7352	{
..	..	@@ -7324,98 +7355,103 @@
7324	7355	{
7325	7356	cVector origin = new cVector();
7326	7357	//LA.xformPos(origin, toParent, origin);
7327		- Rectangle spot = calcHotSpot(origin, info);
	7358	+ if (this.clickInfo == null)
	7359	+ this.clickInfo = new ClickInfo();
	7360	+
	7361	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7328	7362	Rectangle boundary = new Rectangle();
7329	7363	boundary.x = spot.x - 30;
7330	7364	boundary.y = spot.y - 30;
7331	7365	boundary.width = spot.width + 60;
7332	7366	boundary.height = spot.height + 60;
7333		- info.g.setColor(Color.red);
	7367	+ clickInfo.g.setColor(Color.red);
7334	7368	int spotw = spot.x + spot.width;
7335	7369	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		- }
	7370	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7371	+// if (CameraPane.Xmin > spot.x)
	7372	+// {
	7373	+// CameraPane.Xmin = spot.x;
	7374	+// }
	7375	+// if (CameraPane.Xmax < spotw)
	7376	+// {
	7377	+// CameraPane.Xmax = spotw;
	7378	+// }
	7379	+// if (CameraPane.Ymin > spot.y)
	7380	+// {
	7381	+// CameraPane.Ymin = spot.y;
	7382	+// }
	7383	+// if (CameraPane.Ymax < spoth)
	7384	+// {
	7385	+// CameraPane.Ymax = spoth;
	7386	+// }
7353	7387	spot.translate(32, 32);
7354	7388	spotw = spot.x + spot.width;
7355	7389	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);
	7390	+ clickInfo.g.setColor(Color.cyan);
	7391	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7392	+// if (CameraPane.Xmin > spot.x)
	7393	+// {
	7394	+// CameraPane.Xmin = spot.x;
	7395	+// }
	7396	+// if (CameraPane.Xmax < spotw)
	7397	+// {
	7398	+// CameraPane.Xmax = spotw;
	7399	+// }
	7400	+// if (CameraPane.Ymin > spot.y)
	7401	+// {
	7402	+// CameraPane.Ymin = spot.y;
	7403	+// }
	7404	+// if (CameraPane.Ymax < spoth)
	7405	+// {
	7406	+// CameraPane.Ymax = spoth;
	7407	+// }
	7408	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7409	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7376	7410	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);
	7411	+ clickInfo.g.setColor(Color.yellow);
	7412	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7413	+ clickInfo.g.setColor(Color.green);
	7414	+// if (CameraPane.Xmin > spot.x)
	7415	+// {
	7416	+// CameraPane.Xmin = spot.x;
	7417	+// }
	7418	+// if (CameraPane.Xmax < spotw)
	7419	+// {
	7420	+// CameraPane.Xmax = spotw;
	7421	+// }
	7422	+// if (CameraPane.Ymin > spot.y)
	7423	+// {
	7424	+// CameraPane.Ymin = spot.y;
	7425	+// }
	7426	+// if (CameraPane.Ymax < spoth)
	7427	+// {
	7428	+// CameraPane.Ymax = spoth;
	7429	+// }
	7430	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7431	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7397	7432	//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		- }
	7433	+// if (CameraPane.Xmin > boundary.x)
	7434	+// {
	7435	+// CameraPane.Xmin = boundary.x;
	7436	+// }
	7437	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	7438	+// {
	7439	+// CameraPane.Xmax = boundary.x + boundary.width;
	7440	+// }
	7441	+// if (CameraPane.Ymin > boundary.y)
	7442	+// {
	7443	+// CameraPane.Ymin = boundary.y;
	7444	+// }
	7445	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	7446	+// {
	7447	+// CameraPane.Ymax = boundary.y + boundary.height;
	7448	+// }
7414	7449	return;
7415	7450	}
7416	7451	}
7417	7452
7418		- boolean doEditClick0(ClickInfo info, int level)
	7453	+ boolean doEditClick0(//ClickInfo clickInfo,
	7454	+ int level)
7419	7455	{
7420	7456	if (level == 0)
7421	7457	{
..	..	@@ -7424,10 +7460,10 @@
7424	7460
7425	7461	boolean retval = false;
7426	7462
7427		- startX = info.x;
7428		- startY = info.y;
	7463	+ startX = clickInfo.x;
	7464	+ startY = clickInfo.y;
7429	7465
7430		- hitSomething = 0;
	7466	+ hitSomething = -1;
7431	7467	cVector origin = new cVector();
7432	7468	//LA.xformPos(origin, toParent, origin);
7433	7469	Rectangle spot = new Rectangle();
..	..	@@ -7435,22 +7471,51 @@
7435	7471	{
7436	7472	centerPt = new Point(0, 0);
7437	7473	}
7438		- calcHotSpot(origin, info, centerPt, spot);
7439		- if (spot.contains(info.x, info.y))
	7474	+ calcHotSpot(origin, //info,
	7475	+ centerPt, spot);
	7476	+ if (spot.contains(clickInfo.x, clickInfo.y))
7440	7477	{
7441	7478	hitSomething = hitCenter;
7442	7479	retval = true;
7443	7480	}
7444	7481	spot.translate(32, 0);
7445		- if (spot.contains(info.x, info.y))
	7482	+ if (spot.contains(clickInfo.x, clickInfo.y))
7446	7483	{
7447	7484	hitSomething = hitRotate;
7448	7485	retval = true;
7449	7486	}
7450	7487	spot.translate(0, 32);
7451		- if (spot.contains(info.x, info.y))
	7488	+ if (spot.contains(clickInfo.x, clickInfo.y))
7452	7489	{
7453	7490	hitSomething = hitScale;
	7491	+
	7492	+ double scale = 0.005f * clickInfo.camera.Distance();
	7493	+ double hScale = (double) (clickInfo.x /- centerPt.x/) / 32;
	7494	+ double sign = 1;
	7495	+ if (hScale < 0)
	7496	+ {
	7497	+ sign = -1;
	7498	+ }
	7499	+ hScale = signMath.pow(signhScale, scale * 50);
	7500	+ if (hScale < 0.01)
	7501	+ {
	7502	+ //hScale = 0.01;
	7503	+ }
	7504	+
	7505	+ double vScale = (double) (clickInfo.y /- centerPt.y/) / 32;
	7506	+ sign = 1;
	7507	+ if (vScale < 0)
	7508	+ {
	7509	+ sign = -1;
	7510	+ }
	7511	+ vScale = signMath.pow(signvScale, scale * 50);
	7512	+ if (vScale < 0.01)
	7513	+ {
	7514	+ //vScale = 0.01;
	7515	+ }
	7516	+
	7517	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7518	+
7454	7519	retval = true;
7455	7520	}
7456	7521
..	..	@@ -7460,7 +7525,7 @@
7460	7525	}
7461	7526
7462	7527	//System.out.println("info.modifiers = " + info.modifiers);
7463		- modified = (info.modifiers & CameraPane.META) != 0;
	7528	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7464	7529	//System.out.println("modified = " + modified);
7465	7530	//new Exception().printStackTrace();
7466	7531	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7488,7 +7553,8 @@
7488	7553	return true;
7489	7554	}
7490	7555
7491		- void doEditDrag0(ClickInfo info)
	7556	+ void doEditDrag0(//ClickInfo info,
	7557	+ boolean opposite)
7492	7558	{
7493	7559	if (hitSomething == 0)
7494	7560	{
..	..	@@ -7502,7 +7568,8 @@
7502	7568
7503	7569	//System.out.println("hitSomething = " + hitSomething);
7504	7570
7505		- double scale = 0.005f * info.camera.Distance();
	7571	+ double scale = 0.005f * clickInfo.camera.Distance();
	7572	+
7506	7573	cVector xlate = new cVector();
7507	7574	//cVector xlate2 = new cVector();
7508	7575	switch (hitSomething)
..	..	@@ -7513,9 +7580,9 @@
7513	7580
7514	7581	case hitCenter: // Translate
7515	7582
7516		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7583	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7517	7584
7518		- if (modified)
	7585	+ if (modified \|\| opposite)
7519	7586	{
7520	7587	//assert(false);
7521	7588	/*
..	..	@@ -7535,8 +7602,8 @@
7535	7602	toParent[3][i] = xlate.get(i);
7536	7603	LA.matInvert(toParent, fromParent);
7537	7604	*/
7538		- cVector delta = LA.newVector(0, 0, startY - info.y);
7539		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7605	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7606	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7540	7607
7541	7608	LA.matCopy(startMat, toParent);
7542	7609	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7545,7 +7612,7 @@
7545	7612	} else
7546	7613	{
7547	7614	//LA.xformDir(delta, info.camera.fromScreen, delta);
7548		- cVector up = new cVector(info.camera.up);
	7615	+ cVector up = new cVector(clickInfo.camera.up);
7549	7616	cVector away = new cVector();
7550	7617	//cVector right2 = new cVector();
7551	7618	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7561,20 +7628,20 @@
7561	7628	}
7562	7629	LA.xformDir(up, ClickInfo.matbuffer, up);
7563	7630	// if (!CameraPane.LOCALTRANSFORM)
7564		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
7565		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7631	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
	7632	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7566	7633	// if (!CameraPane.LOCALTRANSFORM)
7567		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7634	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7568	7635	//LA.vecCross(up, cVector.Z, right2);
7569	7636
7570		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7637	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7571	7638
7572	7639	//System.out.println("DELTA0 = " + delta);
7573	7640	//System.out.println("AWAY = " + info.camera.away);
7574	7641	//System.out.println("UP = " + info.camera.up);
7575	7642	if (away.z > 0)
7576	7643	{
7577		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7644	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7578	7645	{
7579	7646	delta.x = -delta.x;
7580	7647	} else
..	..	@@ -7589,7 +7656,7 @@
7589	7656	//System.out.println("DELTA1 = " + delta);
7590	7657	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7591	7658	//System.out.println("DELTA2 = " + delta);
7592		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7659	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7593	7660	LA.matCopy(startMat, toParent);
7594	7661	//System.out.println("DELTA3 = " + delta);
7595	7662	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7599,8 +7666,8 @@
7599	7666	break;
7600	7667
7601	7668	case hitRotate: // rotate
7602		- int dx = info.x - centerPt.x;
7603		- int dy = -(info.y - centerPt.y);
	7669	+ int dx = clickInfo.x - centerPt.x;
	7670	+ int dy = -(clickInfo.y - centerPt.y);
7604	7671	double angle = (double) Math.atan2(dx, dy);
7605	7672	angle = -(1.570796 - angle);
7606	7673
..	..	@@ -7609,6 +7676,7 @@
7609	7676
7610	7677	if (modified)
7611	7678	{
	7679	+ // Rotate 90 degrees
7612	7680	angle /= (Math.PI / 4);
7613	7681	angle = Math.floor(angle + 0.5);
7614	7682	angle *= (Math.PI / 4);
..	..	@@ -7622,7 +7690,7 @@
7622	7690	}
7623	7691	/**/
7624	7692
7625		- switch (info.pane.renderCamera.viewCode)
	7693	+ switch (clickInfo.pane.RenderCamera().viewCode)
7626	7694	{
7627	7695	case 1: // '\001'
7628	7696	LA.matZRotate(toParent, angle);
..	..	@@ -7649,26 +7717,30 @@
7649	7717	break;
7650	7718
7651	7719	case hitScale: // scale
7652		- double hScale = (double) (info.x - centerPt.x) / 32;
	7720	+ double hScale = (double) (clickInfo.x /- centerPt.x/) / 32;
	7721	+ double sign = 1;
	7722	+ if (hScale < 0)
	7723	+ {
	7724	+ sign = -1;
	7725	+ }
	7726	+ hScale = signMath.pow(signhScale, scale * 50);
7653	7727	if (hScale < 0.01)
7654	7728	{
7655		- hScale = 0.01;
	7729	+ //hScale = 0.01;
7656	7730	}
7657		- hScale = Math.pow(hScale, scale * 50);
7658		- if (hScale < 0.01)
	7731	+
	7732	+ double vScale = (double) (clickInfo.y /- centerPt.y/) / 32;
	7733	+ sign = 1;
	7734	+ if (vScale < 0)
7659	7735	{
7660		- hScale = 0.01;
	7736	+ sign = -1;
7661	7737	}
7662		- double vScale = (double) (info.y - centerPt.y) / 32;
	7738	+ vScale = signMath.pow(signvScale, scale * 50);
7663	7739	if (vScale < 0.01)
7664	7740	{
7665		- vScale = 0.01;
	7741	+ //vScale = 0.01;
7666	7742	}
7667		- vScale = Math.pow(vScale, scale * 50);
7668		- if (vScale < 0.01)
7669		- {
7670		- vScale = 0.01;
7671		- }
	7743	+
7672	7744	LA.matCopy(startMat, toParent);
7673	7745	/**/
7674	7746	for (int i = 0; i < 3; i++)
..	..	@@ -7678,39 +7750,47 @@
7678	7750	}
7679	7751	/**/
7680	7752
7681		- switch (info.pane.renderCamera.viewCode)
	7753	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
	7754	+
	7755	+ if (totalScale < 0.01)
	7756	+ {
	7757	+ totalScale = 0.01;
	7758	+ }
	7759	+
	7760	+ switch (clickInfo.pane.RenderCamera().viewCode)
7682	7761	{
7683	7762	case 3: // '\001'
7684		- if (modified)
	7763	+ if (modified \|\| opposite)
7685	7764	{
7686	7765	//LA.matScale(toParent, 1, hScale, vScale);
7687		- LA.matScale(toParent, vScale, 1, 1);
	7766	+ LA.matScale(toParent, totalScale, 1, 1);
7688	7767	} // vScale, 1);
7689	7768	else
7690	7769	{
7691		- LA.matScale(toParent, vScale, vScale, vScale);
	7770	+ // EXCEPTION!
	7771	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7692	7772	} // vScale, 1);
7693	7773	break;
7694	7774
7695	7775	case 2: // '\002'
7696		- if (modified)
	7776	+ if (modified \|\| opposite)
7697	7777	{
7698	7778	//LA.matScale(toParent, hScale, 1, vScale);
7699		- LA.matScale(toParent, 1, vScale, 1);
	7779	+ LA.matScale(toParent, 1, totalScale, 1);
7700	7780	} else
7701	7781	{
7702		- LA.matScale(toParent, vScale, 1, vScale);
	7782	+ LA.matScale(toParent, totalScale, 1, totalScale);
7703	7783	}
7704	7784	break;
7705	7785
7706	7786	case 1: // '\003'
7707		- if (modified)
	7787	+ if (modified \|\| opposite)
7708	7788	{
7709	7789	//LA.matScale(toParent, hScale, vScale, 1);
7710		- LA.matScale(toParent, 1, 1, vScale);
	7790	+ LA.matScale(toParent, 1, 1, totalScale);
7711	7791	} else
7712	7792	{
7713		- LA.matScale(toParent, vScale, vScale, 1);
	7793	+ LA.matScale(toParent, totalScale, totalScale, 1);
7714	7794	}
7715	7795	break;
7716	7796	}
..	..	@@ -7731,7 +7811,7 @@
7731	7811	if (parent == null)
7732	7812	{
7733	7813	System.out.println("NULL PARENT");
7734		- new Exception().printStackTrace();
	7814	+ //new Exception().printStackTrace();
7735	7815	} else
7736	7816	{
7737	7817	if (parent instanceof BezierPatch)
..	..	@@ -7744,7 +7824,7 @@
7744	7824	} // NEW ...
7745	7825
7746	7826
7747		- info.pane.repaint();
	7827	+ clickInfo.pane.repaint();
7748	7828	}
7749	7829
7750	7830	boolean overflow = false;
..	..	@@ -7843,14 +7923,22 @@
7843	7923	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7844	7924	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7845	7925	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7926	+
	7927	+ String objname;
	7928	+
7846	7929	if (false) //parent != null)
7847	7930	{
7848		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7931	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7849	7932	} else
7850	7933	{
7851		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7934	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7852	7935	} // + super.toString();
7853	7936	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7937	+
	7938	+ if (!Globals.ADVANCED)
	7939	+ return objname;
	7940	+
	7941	+ return objname + " " + System.identityHashCode(this);
7854	7942	}
7855	7943
7856	7944	public int hashCode()
..	..	@@ -7906,6 +7994,7 @@
7906	7994	objectUI.closeUI();
7907	7995	if (editWindow != null)
7908	7996	{
	7997	+ editWindow.ctrlPanel.FlushUI();
7909	7998	editWindow.refreshContents();
7910	7999	} // ? new
7911	8000	objectUI = null;
..	..	@@ -7914,6 +8003,10 @@
7914	8003	{
7915	8004	editWindow = null;
7916	8005	} // ?
	8006	+ }
	8007	+ else
	8008	+ {
	8009	+ //editWindow.closeUI();
7917	8010	}
7918	8011	}
7919	8012
..	..	@@ -7926,7 +8019,7 @@
7926	8019	/transient/ cVector2[] projectedVertices = new cVector2[0];
7927	8020
7928	8021	Object3D /Composite/ parent;
7929		- Object3D /Composite/ fileparent;
	8022	+ Object3D /Composite/ fileparent; // In the case of FileObject
7930	8023
7931	8024	double[][] toParent; // dynamic matrix
7932	8025	double[][] fromParent;
..	..	@@ -8041,7 +8134,7 @@
8041	8134	{
8042	8135	assert(bRep != null);
8043	8136	if (!(support instanceof GenericJoint)) // support.bRep != null)
8044		- GraphreeD.Assert(support.bRep == bRep.support);
	8137	+ Grafreed.Assert(support.bRep == bRep.support);
8045	8138	}
8046	8139	else
8047	8140	{
..	..	@@ -8072,6 +8165,10 @@
8072	8165	}
8073	8166
8074	8167	transient ObjEditor editWindow;
	8168	+ transient ObjEditor manipWindow;
	8169	+
	8170	+ transient boolean pinned;
	8171	+
8075	8172	transient ObjectUI objectUI;
8076	8173	public static int povDepth = 0;
8077	8174	private static cVector tbMin = new cVector();
..	..	@@ -8090,9 +8187,9 @@
8090	8187	private static cVector edge2 = new cVector();
8091	8188	//private static cVector norm = new cVector();
8092	8189	/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;
	8190	+ static final int hitCenter = 1;
	8191	+ static final int hitScale = 2;
	8192	+ static final int hitRotate = 3;
8096	8193	/transient/ /private/ int viewCode; // Now used for transparency cache flag
8097	8194	/transient/ private Point centerPt;
8098	8195	/transient/ private int startX;
..	..	@@ -8124,6 +8221,8 @@
8124	8221	{
8125	8222	Object3D targ = this;
8126	8223
	8224	+ targ.NORMALPUSH = obj.NORMALPUSH;
	8225	+
8127	8226	if (obj.material != null)
8128	8227	{
8129	8228	if ((mask&MATERIAL)!=0) // ==(COLOR\|MATERIAL))