~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -5,6 +5,7 @@
5	5	import java.util.Vector;
6	6
7	7	import javax.media.j3d.Transform3D;
	8	+import javax.media.opengl.GL;
8	9	import javax.vecmath.Vector3d;
9	10
10	11	import javax.imageio.ImageIO;
..	..	@@ -13,13 +14,44 @@
13	14	import //weka.core.
14	15	matrix.Matrix;
15	16
	17	+import java.util.UUID;
	18	+
16	19	//import net.sourceforge.sizeof.SizeOf;
17	20	public class Object3D extends Vector<Object3D> implements java.io.Serializable, iSendInfo //, aurelienribon.tweenengine.TweenAccessor<Object3D>
18	21	{
19	22	//static final long serialVersionUID = -607422624994562685L;
20	23	static final long serialVersionUID = 5022536242724664900L;
21	24
	25	+ // Use GetUUID for backward compatibility with null.
	26	+ private UUID uuid = UUID.randomUUID();
	27	+
	28	+ // TEMPORARY for mocap undo. No need to be transient.
	29	+ mocap.reader.BVHReader.BVHResult savebvh;
	30	+ Object3D saveskeleton;
	31	+ //
	32	+
	33	+ String skyboxname;
	34	+ String skyboxext;
	35	+
	36	+ Object3D versionlist[];
	37	+ int versionindex = -1;
	38	+
	39	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
	40	+
22	41	ScriptNode scriptnode;
	42	+
	43	+ void InitOthers()
	44	+ {
	45	+ if (projectedVertices == null \|\| projectedVertices.length <= 2)
	46	+ {
	47	+ projectedVertices = new Object3D.cVector2[3];
	48	+ }
	49	+ for (int i = 0; i < 3; i++)
	50	+ {
	51	+ projectedVertices[i] = new cVector2(); // Others
	52	+ }
	53	+ projectedVertices[0].x = 100; // bump
	54	+ }
23	55
24	56	void MinMax(cVector minima, cVector maxima)
25	57	{
..	..	@@ -86,64 +118,245 @@
86	118
87	119	// transient boolean reduced; // for morph reduction
88	120
89		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
90		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	121	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	122	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
91	123
92		-transient Object3D transientsupport; // for cloning
93		-transient boolean transientlink2master;
	124	+ transient Object3D transientsupport; // for cloning
	125	+ transient boolean transientlink2master;
94	126
95		-void SaveSupports()
96		-{
97		- if (blockloop)
98		- return;
99		-
100		- transientsupport = support;
101		- transientlink2master = link2master;
102		-
103		- support = null;
104		- link2master = false;
105		-
106		- if (bRep != null)
	127	+ void SaveSupports()
107	128	{
108		- bRep.SaveSupports();
	129	+ if (blockloop)
	130	+ return;
	131	+
	132	+ transientsupport = support;
	133	+ transientlink2master = link2master;
	134	+
	135	+ support = null;
	136	+ link2master = false;
	137	+
	138	+ if (bRep != null)
	139	+ {
	140	+ bRep.SaveSupports();
	141	+ }
	142	+
	143	+ for (int i = 0; i < Size(); i++)
	144	+ {
	145	+ Object3D child = (Object3D) get(i);
	146	+ if (child == null)
	147	+ continue;
	148	+ blockloop = true;
	149	+ child.SaveSupports();
	150	+ blockloop = false;
	151	+ }
109	152	}
110		-
111		- for (int i = 0; i < Size(); i++)
	153	+
	154	+ void RestoreSupports()
112	155	{
113		- Object3D child = (Object3D) get(i);
114		- if (child == null)
115		- continue;
	156	+ if (blockloop)
	157	+ return;
	158	+
	159	+ support = transientsupport;
	160	+ link2master = transientlink2master;
	161	+ transientsupport = null;
	162	+ transientlink2master = false;
	163	+
	164	+ if (bRep != null)
	165	+ {
	166	+ bRep.RestoreSupports();
	167	+ }
	168	+
	169	+ for (int i = 0; i < Size(); i++)
	170	+ {
	171	+ Object3D child = (Object3D) get(i);
	172	+ if (child == null)
	173	+ continue;
	174	+ blockloop = true;
	175	+ child.RestoreSupports();
	176	+ blockloop = false;
	177	+ }
	178	+ }
	179	+
	180	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	181	+ {
	182	+ Object3D o;
	183	+
	184	+ if (hashtable.containsKey(GetUUID()))
	185	+ {
	186	+ o = hashtable.get(GetUUID());
	187	+
	188	+ Grafreed.Assert(this.bRep == o.bRep);
	189	+ //if (this.bRep != null)
	190	+ // assert(this.bRep.support == o.transientrep);
	191	+ if (this.support != null)
	192	+ assert(this.support.bRep == o.transientrep);
	193	+ }
	194	+ else
	195	+ {
	196	+ o = new Object3D("copy of " + this.name);
	197	+
	198	+ hashtable.put(GetUUID(), o);
	199	+ }
	200	+
	201	+ if (!blockloop)
	202	+ {
	203	+ blockloop = true;
	204	+
	205	+ for (int i=0; i<Size(); i++)
	206	+ {
	207	+ get(i).ExtractBigData(hashtable);
	208	+ }
	209	+
	210	+ blockloop = false;
	211	+ }
	212	+
	213	+ ExtractBigData(o);
	214	+ }
	215	+
	216	+ void ExtractBigData(Object3D o)
	217	+ {
	218	+ if (o.bRep != null)
	219	+ Grafreed.Assert(o.bRep == this.bRep);
	220	+
	221	+ o.bRep = this.bRep;
	222	+// July 2019 if (this.bRep != null)
	223	+// {
	224	+// o.transientrep = this.bRep.support;
	225	+// o.bRep.support = null;
	226	+// }
	227	+ o.selection = this.selection;
	228	+ o.versionlist = this.versionlist;
	229	+ o.versionindex = this.versionindex;
	230	+
	231	+ if (this.support != null)
	232	+ {
	233	+ if (o.transientrep != null)
	234	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	235	+
	236	+ o.transientrep = this.support.bRep;
	237	+ this.support.bRep = null;
	238	+ }
	239	+
	240	+ // o.support = this.support;
	241	+ // o.fileparent = this.fileparent;
	242	+ // if (this.bRep != null)
	243	+ // o.bRep = this.bRep.support;
	244	+
	245	+ this.bRep = null;
	246	+ // if (this.bRep != null)
	247	+ // this.bRep.support = null;
	248	+ // this.support = null;
	249	+ // this.fileparent = null;
	250	+ }
	251	+
	252	+// Object3D GetObject(java.util.UUID uuid)
	253	+// {
	254	+// if (this.uuid.equals(uuid))
	255	+// return this;
	256	+//
	257	+// if (blockloop)
	258	+// return null;
	259	+//
	260	+// blockloop = true;
	261	+//
	262	+// for (int i=0; i<Size(); i++)
	263	+// {
	264	+// Object3D o = get(i).GetObject(uuid);
	265	+//
	266	+// if (o != null)
	267	+// return o;
	268	+// }
	269	+//
	270	+// blockloop = false;
	271	+//
	272	+// return null;
	273	+// }
	274	+
	275	+ transient boolean tag;
	276	+
	277	+ void TagObjects(Object3D o, boolean tag)
	278	+ {
	279	+ if (blockloop)
	280	+ return;
	281	+
	282	+ o.tag = tag;
	283	+
	284	+ if (o == this)
	285	+ return;
	286	+
116	287	blockloop = true;
117		- child.SaveSupports();
	288	+
	289	+ for (int i=0; i<Size(); i++)
	290	+ {
	291	+ get(i).TagObjects(o, tag);
	292	+ }
	293	+
118	294	blockloop = false;
119	295	}
120		-}
121	296
122		-void RestoreSupports()
123		-{
124		- if (blockloop)
125		- return;
	297	+ boolean HasTags()
	298	+ {
	299	+ if (blockloop)
	300	+ return false;
126	301
127		- support = transientsupport;
128		- link2master = transientlink2master;
129		- transientsupport = null;
130		- transientlink2master = false;
131		-
132		- if (bRep != null)
133		- {
134		- bRep.RestoreSupports();
135		- }
136		-
137		- for (int i = 0; i < Size(); i++)
138		- {
139		- Object3D child = (Object3D) get(i);
140		- if (child == null)
141		- continue;
142	302	blockloop = true;
143		- child.RestoreSupports();
	303	+
	304	+ boolean hasTags = false;
	305	+
	306	+ for (int i=0; i<Size(); i++)
	307	+ {
	308	+ hasTags \|= get(i).tag \|\| get(i).HasTags();
	309	+
	310	+ if (hasTags)
	311	+ break;
	312	+ }
	313	+
	314	+ blockloop = false;
	315	+
	316	+ return hasTags;
	317	+ }
	318	+
	319	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	320	+ {
	321	+ if (!hashtable.containsKey(GetUUID()))
	322	+ return;
	323	+
	324	+ Object3D o = hashtable.get(GetUUID());
	325	+
	326	+ RestoreBigData(o);
	327	+
	328	+ if (blockloop)
	329	+ return;
	330	+
	331	+ blockloop = true;
	332	+
	333	+ //hashtable.remove(GetUUID());
	334	+
	335	+ for (int i=0; i<Size(); i++)
	336	+ {
	337	+ get(i).RestoreBigData(hashtable);
	338	+ }
	339	+
144	340	blockloop = false;
145	341	}
146		-}
	342	+
	343	+ void RestoreBigData(Object3D o)
	344	+ {
	345	+ this.bRep = o.bRep;
	346	+ if (this.support != null && o.transientrep != null)
	347	+ {
	348	+ this.support.bRep = o.transientrep;
	349	+ }
	350	+
	351	+ this.selection = o.selection;
	352	+
	353	+ this.versionlist = o.versionlist;
	354	+ this.versionindex = o.versionindex;
	355	+// July 2019 if (this.bRep != null)
	356	+// this.bRep.support = o.transientrep;
	357	+ // this.support = o.support;
	358	+ // this.fileparent = o.fileparent;
	359	+ }
147	360
148	361	// MOCAP SUPPORT
149	362	double tx,ty,tz,rx,ry,rz;
..	..	@@ -286,6 +499,8 @@
286	499	}
287	500
288	501	boolean live = false;
	502	+ transient boolean keepdontselect;
	503	+ boolean dontselect = false;
289	504	boolean hide = false;
290	505	boolean link2master = false; // performs reset support/master at each frame
291	506	boolean marked = false; // animation node
..	..	@@ -295,6 +510,8 @@
295	510	boolean random = false;
296	511	boolean speedup = false;
297	512	boolean rewind = false;
	513	+
	514	+ float NORMALPUSH = 0;
298	515
299	516	Object3D support;
300	517
..	..	@@ -355,7 +572,7 @@
355	572
356	573	int MemorySize()
357	574	{
358		- if (memorysize == 0)
	575	+ if (true) // memorysize == 0)
359	576	{
360	577	try
361	578	{
..	..	@@ -415,16 +632,16 @@
415	632	{
416	633	Object3D copy = this;
417	634
418		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	635	+ Camera parentcam = Globals.theRenderer.ManipCamera();
419	636
420		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	637	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
421	638	{
422		- parentcam = CameraPane.theRenderer.cameras[1];
	639	+ parentcam = Globals.theRenderer.Cameras()[1];
423	640	}
424	641
425		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	642	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
426	643	{
427		- parentcam = CameraPane.theRenderer.cameras[0];
	644	+ parentcam = Globals.theRenderer.Cameras()[0];
428	645	}
429	646
430	647	if (this == parentcam)
..	..	@@ -432,7 +649,7 @@
432	649	//assert(this instanceof Camera);
433	650
434	651	for (int count = parentcam.GetTransformCount(); --count>=0;)
435		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	652	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
436	653	}
437	654
438	655	copy.marked ^= true;
..	..	@@ -452,7 +669,7 @@
452	669	//assert(this instanceof Camera);
453	670
454	671	for (int count = parentcam.GetTransformCount(); --count>=0;)
455		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	672	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
456	673	}
457	674
458	675	copy.Touch(); // display list issue
..	..	@@ -465,12 +682,14 @@
465	682	toParent = LA.newMatrix();
466	683	fromParent = LA.newMatrix();
467	684	}
	685	+
468	686	if (toParentMarked == null)
469	687	{
470	688	if (maxcount != 1)
471	689	{
472		- new Exception().printStackTrace();
	690	+ //new Exception().printStackTrace();
473	691	}
	692	+
474	693	toParentMarked = LA.newMatrix();
475	694	fromParentMarked = LA.newMatrix();
476	695	}
..	..	@@ -587,7 +806,7 @@
587	806	return;
588	807	}
589	808
590		- if (CameraPane.fromscript)
	809	+ if (Globals.fromscript)
591	810	{
592	811	transformcount = 0;
593	812	return;
..	..	@@ -745,7 +964,7 @@
745	964
746	965	int GetTransformCount()
747	966	{
748		- // marde pour serialization de Texture
	967	+ // patch pour serialization de Texture
749	968	resetmaxcount();
750	969	resettransformcount();
751	970	resetstep();
..	..	@@ -758,7 +977,7 @@
758	977	if (step == 0)
759	978	step = 1;
760	979	if (maxcount == 0)
761		- maxcount = 2048; // 4;
	980	+ maxcount = 128; // 2048; // 4;
762	981	// if (acceleration == 0)
763	982	// acceleration = 10;
764	983	if (delay == 0) // serial
..	..	@@ -779,9 +998,12 @@
779	998	// factor = CameraPane.STEP;
780	999	// }
781	1000
782		- if (marked && CameraPane.isLIVE() && live && CameraPane.drawMode == CameraPane.SHADOW && currentframe != CameraPane.framecount)
	1001	+ if (marked && Globals.isLIVE() && live &&
	1002	+ //TEMP21aug2018
	1003	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
	1004	+ currentframe != Globals.framecount)
783	1005	{
784		- currentframe = CameraPane.framecount;
	1006	+ currentframe = Globals.framecount;
785	1007
786	1008	// System.err.println("transformcount = " + transformcount);
787	1009	// System.err.println("factor = " + factor);
..	..	@@ -790,7 +1012,8 @@
790	1012
791	1013	boolean changedir = random && Math.random() < 0.01; // && !link2master;
792	1014
793		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	1015	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	1016	+ (step == 1 && changedir))
794	1017	{
795	1018	countdown = 1;
796	1019	delay = speedup?8:1;
..	..	@@ -862,6 +1085,10 @@
862	1085	if (material == null \|\| material.multiply)
863	1086	return true;
864	1087
	1088	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1089	+ return false;
	1090	+
	1091	+ // Transparent objects are dynamic because we have to sort the triangles.
865	1092	return material.opacity > 0.99;
866	1093	}
867	1094
..	..	@@ -893,6 +1120,11 @@
893	1120	fromParent = null; // LA.newMatrix();
894	1121	bRep = null; // new BoundaryRep();
895	1122
	1123	+ if (oname != null && oname.equals("LeftHand"))
	1124	+ {
	1125	+ name = oname;
	1126	+ }
	1127	+
896	1128	/*
897	1129	float hue = (float)Math.random();
898	1130	Color col;
..	..	@@ -935,7 +1167,7 @@
935	1167
936	1168	public Object clone()
937	1169	{
938		- return GrafreeD.clone(this);
	1170	+ return Grafreed.clone(this);
939	1171	}
940	1172
941	1173	Object3D copyExpand()
..	..	@@ -1257,6 +1489,7 @@
1257	1489	toParent = LA.newMatrix();
1258	1490	fromParent = LA.newMatrix();
1259	1491	}
	1492	+
1260	1493	LA.matCopy(other.toParent, toParent);
1261	1494	LA.matCopy(other.fromParent, fromParent);
1262	1495
..	..	@@ -1446,7 +1679,16 @@
1446	1679	// if (other == null)
1447	1680	// return;
1448	1681
1449		- System.out.println("Link support this = " + this + "; other = " + other);
	1682	+ if (other != null)
	1683	+ {
	1684	+ BoundaryRep.SEUIL = other.material.cameralight;
	1685	+
	1686	+ // Set default to 0.1
	1687	+ BoundaryRep.SEUIL /= 4; // 2;
	1688	+ System.out.println("SEUIL = " + BoundaryRep.SEUIL);
	1689	+ }
	1690	+
	1691	+ System.out.println("Link this = " + this + "; support = " + other);
1450	1692
1451	1693	//if (bRep != null)
1452	1694	// bRep.linkVerticesThis(other.bRep);
..	..	@@ -1701,7 +1943,7 @@
1701	1943	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1702	1944	o.bRep = transientrep;
1703	1945	if (clone)
1704		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1946	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1705	1947	o.CreateMaterial();
1706	1948	o.SetAttributes(this, -1);
1707	1949	//parent
..	..	@@ -1714,7 +1956,7 @@
1714	1956	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1715	1957	o.bRep = bRep;
1716	1958	if (clone)
1717		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1959	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1718	1960	o.CreateMaterial();
1719	1961	//o.overwriteThis(this, -1);
1720	1962	o.SetAttributes(this, -1);
..	..	@@ -1801,12 +2043,15 @@
1801	2043	if (obj.name == null)
1802	2044	continue; // can't be a null one
1803	2045
	2046	+ // Try perfect match first.
1804	2047	if (n.equals(obj.name))
1805	2048	{
1806	2049	theobj = obj;
1807	2050	count++;
1808	2051	}
1809	2052	}
	2053	+
	2054	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1810	2055
1811	2056	if (count != 1)
1812	2057	for (int i=Size(); --i>=0;)
..	..	@@ -1816,8 +2061,9 @@
1816	2061	if (obj.name == null)
1817	2062	continue; // can't be a null one
1818	2063
1819		- //if (n.contains(obj.name)) // dec 2013 name.split(":")[0])) // Poser generates a count
1820		- if (n.startsWith(obj.name))
	2064	+ String name = obj.name.split(":")[0]; // Poser generates a count
	2065	+ //if (n.startsWith(obj.name))
	2066	+ if (n.contains(name))
1821	2067	{
1822	2068	theobj = obj;
1823	2069	count++;
..	..	@@ -2120,21 +2366,9 @@
2120	2366	if (/parent != null &&/ material == null)
2121	2367	{
2122	2368	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
2132	2369
2133		- if (this instanceof Camera)
2134		- {
2135		- material.shift = 90;
2136		- }
2137		-
	2370	+ InitOthers();
	2371	+
2138	2372	material.multiply = multiply;
2139	2373
2140	2374	if (multiply)
..	..	@@ -2272,12 +2506,22 @@
2272	2506	}
2273	2507	*/
2274	2508	}
	2509	+ else
	2510	+ {
	2511	+ //((ObjEditor)editWindow).SetupUI2(null);
	2512	+ if (objectUI != null)
	2513	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2514	+ else
	2515	+ //new Exception().printStackTrace();
	2516	+ System.err.println("objectUI is null");
	2517	+ }
2275	2518	}
2276	2519
2277	2520	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2278	2521	{
2279	2522	if (newWindow)
2280	2523	{
	2524	+ new Exception().printStackTrace();
2281	2525	System.exit(0);
2282	2526	if (parent != null)
2283	2527	{
..	..	@@ -2312,6 +2556,14 @@
2312	2556	{
2313	2557	editWindow.refreshContents();
2314	2558	}
	2559	+ else
	2560	+ {
	2561	+ if (manipWindow != null)
	2562	+ {
	2563	+ manipWindow.refreshContents();
	2564	+ }
	2565	+ }
	2566	+
2315	2567	//if (parent != null)
2316	2568	//parent.refreshEditWindow();
2317	2569	}
..	..	@@ -2391,7 +2643,8 @@
2391	2643	private static final int editSelf = 1;
2392	2644	private static final int editChild = 2;
2393	2645
2394		- void drawEditHandles(ClickInfo info, int level)
	2646	+ void drawEditHandles(//ClickInfo info,
	2647	+ int level)
2395	2648	{
2396	2649	if (level == 0)
2397	2650	{
..	..	@@ -2399,7 +2652,8 @@
2399	2652	return;
2400	2653
2401	2654	Object3D selectee;
2402		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2655	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2656	+ level + 1))
2403	2657	{
2404	2658	selectee = (Object3D) e.nextElement();
2405	2659	}
..	..	@@ -2407,19 +2661,22 @@
2407	2661	} else
2408	2662	{
2409	2663	//super.
2410		- drawEditHandles0(info, level + 1);
	2664	+ drawEditHandles0(//info,
	2665	+ level + 1);
2411	2666	}
2412	2667	}
2413	2668
2414		- boolean doEditClick(ClickInfo info, int level)
	2669	+ boolean doEditClick(//ClickInfo info,
	2670	+ int level)
2415	2671	{
2416	2672	doSomething = 0;
2417	2673	if (level == 0)
2418	2674	{
2419		- return doParentClick(info);
	2675	+ return doParentClick(); //info);
2420	2676	}
2421	2677	if (//super.
2422		- doEditClick0(info, level))
	2678	+ doEditClick0(//info,
	2679	+ level))
2423	2680	{
2424	2681	doSomething = 1;
2425	2682	return true;
..	..	@@ -2429,7 +2686,7 @@
2429	2686	}
2430	2687	}
2431	2688
2432		- boolean doParentClick(ClickInfo info)
	2689	+ boolean doParentClick() //ClickInfo info)
2433	2690	{
2434	2691	if (selection == null)
2435	2692	{
..	..	@@ -2442,7 +2699,8 @@
2442	2699	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2443	2700	{
2444	2701	Object3D selectee = (Object3D) e.nextElement();
2445		- if (selectee.doEditClick(info, 1))
	2702	+ if (selectee.doEditClick(//info,
	2703	+ 1))
2446	2704	{
2447	2705	childToDrag = selectee;
2448	2706	doSomething = 2;
..	..	@@ -2454,13 +2712,15 @@
2454	2712	return retval;
2455	2713	}
2456	2714
2457		- void doEditDrag(ClickInfo info)
	2715	+ void doEditDrag(//ClickInfo clickInfo,
	2716	+ boolean opposite)
2458	2717	{
2459	2718	switch (doSomething)
2460	2719	{
2461	2720	case 1: // '\001'
2462	2721	//super.
2463		- doEditDrag0(info);
	2722	+ doEditDrag0(//clickInfo,
	2723	+ opposite);
2464	2724	break;
2465	2725
2466	2726	case 2: // '\002'
..	..	@@ -2473,11 +2733,13 @@
2473	2733	{
2474	2734	//sel.hitSomething = childToDrag.hitSomething;
2475	2735	//childToDrag.doEditDrag(info);
2476		- sel.doEditDrag(info);
	2736	+ sel.doEditDrag(//clickInfo,
	2737	+ opposite);
2477	2738	} else
2478	2739	{
2479	2740	//super.
2480		- doEditDrag0(info);
	2741	+ doEditDrag0(//clickInfo,
	2742	+ opposite);
2481	2743	}
2482	2744	}
2483	2745	break;
..	..	@@ -2495,6 +2757,9 @@
2495	2757	{
2496	2758	deselectAll();
2497	2759	}
	2760	+
	2761	+ new Exception().printStackTrace();
	2762	+
2498	2763	ClickInfo newInfo = new ClickInfo();
2499	2764	newInfo.flags = info.flags;
2500	2765	newInfo.bounds = info.bounds;
..	..	@@ -2587,6 +2852,18 @@
2587	2852	void GenNormalsS(boolean crease)
2588	2853	{
2589	2854	selection.GenNormals(crease);
	2855	+// for (int i=0; i<selection.size(); i++)
	2856	+// {
	2857	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2858	+// selectee.GenNormals(crease);
	2859	+// }
	2860	+
	2861	+ //Touch();
	2862	+ }
	2863	+
	2864	+ void GenNormalsMeshS()
	2865	+ {
	2866	+ selection.GenNormalsMesh();
2590	2867	// for (int i=0; i<selection.size(); i++)
2591	2868	// {
2592	2869	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2732,6 +3009,42 @@
2732	3009	blockloop = false;
2733	3010	}
2734	3011
	3012	+ void GenNormalsMesh()
	3013	+ {
	3014	+ if (blockloop)
	3015	+ return;
	3016	+
	3017	+ blockloop = true;
	3018	+ GenNormalsMesh0();
	3019	+ for (int i = 0; i < Children().Size(); i++)
	3020	+ {
	3021	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	3022	+ if (child == null)
	3023	+ continue;
	3024	+ child.GenNormalsMesh();
	3025	+// Children().release(i);
	3026	+ }
	3027	+ blockloop = false;
	3028	+ }
	3029	+
	3030	+ void GenNormalsMINE()
	3031	+ {
	3032	+ if (blockloop)
	3033	+ return;
	3034	+
	3035	+ blockloop = true;
	3036	+ GenNormalsMINE0();
	3037	+ for (int i = 0; i < Children().Size(); i++)
	3038	+ {
	3039	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	3040	+ if (child == null)
	3041	+ continue;
	3042	+ child.GenNormalsMINE();
	3043	+// Children().release(i);
	3044	+ }
	3045	+ blockloop = false;
	3046	+ }
	3047	+
2735	3048	void ClearColors()
2736	3049	{
2737	3050	if (blockloop)
..	..	@@ -2866,7 +3179,8 @@
2866	3179	{
2867	3180	if (bRep != null)
2868	3181	{
2869		- bRep.GenUV();
	3182	+ bRep.GenUV(); //1);
	3183	+ //bRep.UnfoldUV();
2870	3184	Touch();
2871	3185	}
2872	3186	}
..	..	@@ -2876,6 +3190,24 @@
2876	3190	if (bRep != null)
2877	3191	{
2878	3192	bRep.GenerateNormals(crease);
	3193	+ Touch();
	3194	+ }
	3195	+ }
	3196	+
	3197	+ void GenNormalsMesh0()
	3198	+ {
	3199	+ if (bRep != null)
	3200	+ {
	3201	+ bRep.GenerateNormalsMesh();
	3202	+ Touch();
	3203	+ }
	3204	+ }
	3205	+
	3206	+ void GenNormalsMINE0()
	3207	+ {
	3208	+ if (bRep != null)
	3209	+ {
	3210	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2879	3211	Touch();
2880	3212	}
2881	3213	}
..	..	@@ -2932,6 +3264,33 @@
2932	3264	blockloop = false;
2933	3265	}
2934	3266
	3267	+ void TransformChildren()
	3268	+ {
	3269	+ if (toParent != null)
	3270	+ {
	3271	+ for (int i=Size(); --i>=0;)
	3272	+ {
	3273	+ Object3D v = get(i);
	3274	+
	3275	+ if (v.toParent == null)
	3276	+ {
	3277	+ v.toParent = LA.newMatrix();
	3278	+ v.fromParent = LA.newMatrix();
	3279	+ }
	3280	+
	3281	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3282	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3283	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3284	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3285	+ }
	3286	+
	3287	+ toParent = null; // LA.matIdentity(toParent);
	3288	+ fromParent = null; // LA.matIdentity(fromParent);
	3289	+
	3290	+ Touch();
	3291	+ }
	3292	+ }
	3293	+
2935	3294	void TransformGeometry()
2936	3295	{
2937	3296	Object3D obj = this;
..	..	@@ -3153,9 +3512,11 @@
3153	3512
3154	3513	BoundaryRep sup = bRep.support;
3155	3514	bRep.support = null;
3156		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3515	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3157	3516	// bRep.SplitInTwo(onlyone); // thread...
3158		- temprep.SplitInTwo(reduction34, onlyone);
	3517	+
	3518	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3519	+
3159	3520	bRep = temprep;
3160	3521	bRep.support = sup;
3161	3522	Touch();
..	..	@@ -3256,15 +3617,47 @@
3256	3617
3257	3618	void ClearMaterials()
3258	3619	{
	3620	+ if (blockloop)
	3621	+ return;
	3622	+
	3623	+ blockloop = true;
	3624	+
3259	3625	ClearMaterial();
3260		- for (int i = 0; i < size(); i++)
	3626	+ for (int i = 0; i < Size(); i++)
3261	3627	{
3262		- Object3D child = (Object3D) reserve(i);
	3628	+ Object3D child = (Object3D) get(i);
3263	3629	if (child == null)
3264	3630	continue;
3265	3631	child.ClearMaterials();
3266		- release(i);
3267	3632	}
	3633	+
	3634	+ blockloop = false;
	3635	+ }
	3636	+
	3637	+ void ClearVersionList()
	3638	+ {
	3639	+ this.versionlist = null;
	3640	+ this.versionindex = -1;
	3641	+ this.versiontable = null;
	3642	+ }
	3643	+
	3644	+ void ClearVersions()
	3645	+ {
	3646	+ if (blockloop)
	3647	+ return;
	3648	+
	3649	+ blockloop = true;
	3650	+
	3651	+ ClearVersionList();
	3652	+ for (int i = 0; i < Size(); i++)
	3653	+ {
	3654	+ Object3D child = (Object3D) get(i);
	3655	+ if (child == null)
	3656	+ continue;
	3657	+ child.ClearVersions();
	3658	+ }
	3659	+
	3660	+ blockloop = false;
3268	3661	}
3269	3662
3270	3663	void FlipV(boolean flip)
..	..	@@ -3292,7 +3685,8 @@
3292	3685	if (blockloop)
3293	3686	return;
3294	3687
3295		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3688	+ if (//marked \|\| // does not make sense
	3689	+ (bRep != null \|\| material != null)) // borderline...
3296	3690	live = h;
3297	3691
3298	3692	for (int i = 0; i < Size(); i++)
..	..	@@ -3313,7 +3707,8 @@
3313	3707	return;
3314	3708
3315	3709	//if (bRep != null)
3316		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3710	+ if (//marked \|\| // does not make sense
	3711	+ (bRep != null \|\| material != null)) // borderline...
3317	3712	link2master = h;
3318	3713
3319	3714	for (int i = 0; i < Size(); i++)
..	..	@@ -3333,7 +3728,8 @@
3333	3728	if (blockloop)
3334	3729	return;
3335	3730
3336		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3731	+ if (//marked \|\| // does not make sense
	3732	+ (bRep != null \|\| material != null)) // borderline...
3337	3733	hide = h;
3338	3734
3339	3735	for (int i = 0; i < Size(); i++)
..	..	@@ -3353,7 +3749,7 @@
3353	3749	if (blockloop)
3354	3750	return;
3355	3751
3356		- if (bRep != null && material != null) // borderline...
	3752	+ if (bRep != null \|\| material != null) // borderline...
3357	3753	marked = h;
3358	3754
3359	3755	for (int i = 0; i < Size(); i++)
..	..	@@ -3363,6 +3759,46 @@
3363	3759	continue;
3364	3760	blockloop = true;
3365	3761	child.MarkLeaves(h);
	3762	+ blockloop = false;
	3763	+ // release(i);
	3764	+ }
	3765	+ }
	3766	+
	3767	+ void RewindLeaves(boolean h)
	3768	+ {
	3769	+ if (blockloop)
	3770	+ return;
	3771	+
	3772	+ if (bRep != null \|\| material != null) // borderline...
	3773	+ rewind = h;
	3774	+
	3775	+ for (int i = 0; i < Size(); i++)
	3776	+ {
	3777	+ Object3D child = (Object3D) get(i); // reserve(i);
	3778	+ if (child == null)
	3779	+ continue;
	3780	+ blockloop = true;
	3781	+ child.RewindLeaves(h);
	3782	+ blockloop = false;
	3783	+ // release(i);
	3784	+ }
	3785	+ }
	3786	+
	3787	+ void RandomLeaves(boolean h)
	3788	+ {
	3789	+ if (blockloop)
	3790	+ return;
	3791	+
	3792	+ if (bRep != null \|\| material != null) // borderline...
	3793	+ random = h;
	3794	+
	3795	+ for (int i = 0; i < Size(); i++)
	3796	+ {
	3797	+ Object3D child = (Object3D) get(i); // reserve(i);
	3798	+ if (child == null)
	3799	+ continue;
	3800	+ blockloop = true;
	3801	+ child.RandomLeaves(h);
3366	3802	blockloop = false;
3367	3803	// release(i);
3368	3804	}
..	..	@@ -3677,7 +4113,7 @@
3677	4113	if (child == null)
3678	4114	continue;
3679	4115
3680		- if (GrafreeD.RENDERME > 0)
	4116	+ if (Grafreed.RENDERME > 0)
3681	4117	{
3682	4118	if (child instanceof Merge)
3683	4119	((Merge)child).renderme();
..	..	@@ -3828,7 +4264,7 @@
3828	4264	if (child == null)
3829	4265	continue;
3830	4266
3831		- if (GrafreeD.RENDERME > 0)
	4267	+ if (Grafreed.RENDERME > 0)
3832	4268	{
3833	4269	if (child instanceof Merge)
3834	4270	((Merge)child).renderme();
..	..	@@ -4023,7 +4459,7 @@
4023	4459	if (child == null)
4024	4460	continue;
4025	4461
4026		- if (GrafreeD.RENDERME > 0)
	4462	+ if (Grafreed.RENDERME > 0)
4027	4463	{
4028	4464	if (child instanceof Merge)
4029	4465	((Merge)child).renderme();
..	..	@@ -4111,7 +4547,7 @@
4111	4547	if (blockloop)
4112	4548	return;
4113	4549
4114		- for (int i=0; i<size(); i++)
	4550	+ for (int i=0; i<Size(); i++)
4115	4551	{
4116	4552	if (get(i).parent != this)
4117	4553	{
..	..	@@ -4120,6 +4556,71 @@
4120	4556	}
4121	4557	blockloop = true;
4122	4558	get(i).RepairParent();
	4559	+ blockloop = false;
	4560	+ }
	4561	+ }
	4562	+
	4563	+ void RepairShadow()
	4564	+ {
	4565	+ if (blockloop)
	4566	+ return;
	4567	+
	4568	+ if (this.material != null)
	4569	+ this.InitOthers();
	4570	+
	4571	+ for (int i=0; i<Size(); i++)
	4572	+ {
	4573	+ blockloop = true;
	4574	+ get(i).RepairShadow();
	4575	+ blockloop = false;
	4576	+ }
	4577	+ }
	4578	+
	4579	+ void RepairSOV()
	4580	+ {
	4581	+ if (blockloop)
	4582	+ return;
	4583	+
	4584	+ String texname = this.GetPigmentTexture();
	4585	+
	4586	+ if (texname.startsWith("sov"))
	4587	+ {
	4588	+ String[] s = texname.split("/");
	4589	+
	4590	+ String[] sname = s[1].split("Color.pn");
	4591	+
	4592	+ texname = sname[0];
	4593	+
	4594	+ if (sname.length > 1)
	4595	+ {
	4596	+ texname += "Color.jpg";
	4597	+ }
	4598	+
	4599	+ this.SetPigmentTexture("sov/" + texname);
	4600	+ }
	4601	+
	4602	+ texname = this.GetBumpTexture();
	4603	+
	4604	+ if (texname.startsWith("sov"))
	4605	+ {
	4606	+ String[] s = texname.split("/");
	4607	+
	4608	+ String[] sname = s[1].split("Bump.pn");
	4609	+
	4610	+ texname = sname[0];
	4611	+
	4612	+ if (sname.length > 1)
	4613	+ {
	4614	+ texname += "Bump.jpg";
	4615	+ }
	4616	+
	4617	+ this.SetBumpTexture("sov/" + texname);
	4618	+ }
	4619	+
	4620	+ for (int i=0; i<Size(); i++)
	4621	+ {
	4622	+ blockloop = true;
	4623	+ get(i).RepairSOV();
4123	4624	blockloop = false;
4124	4625	}
4125	4626	}
..	..	@@ -4614,7 +5115,7 @@
4614	5115
4615	5116	cTreePath SelectLeaf(int indexcount, boolean deselect)
4616	5117	{
4617		- if (hide)
	5118	+ if (hide \|\| dontselect)
4618	5119	return null;
4619	5120
4620	5121	if (count <= 0)
..	..	@@ -4638,9 +5139,17 @@
4638	5139	}
4639	5140	}
4640	5141
	5142	+ ObjEditor GetWindow()
	5143	+ {
	5144	+ if (editWindow != null)
	5145	+ return editWindow;
	5146	+
	5147	+ return manipWindow;
	5148	+ }
	5149	+
4641	5150	cTreePath Select(int indexcount, boolean deselect)
4642	5151	{
4643		- if (hide)
	5152	+ if (hide \|\| dontselect)
4644	5153	return null;
4645	5154
4646	5155	if (count <= 0)
..	..	@@ -4674,10 +5183,11 @@
4674	5183	if (leaf != null)
4675	5184	{
4676	5185	cTreePath tp = new cTreePath(this, leaf);
4677		- if (editWindow != null)
	5186	+ ObjEditor window = GetWindow();
	5187	+ if (window != null)
4678	5188	{
4679	5189	//System.out.println("editWindow = " + editWindow + " vs " + this);
4680		- editWindow.Select(tp, deselect, true);
	5190	+ window.Select(tp, deselect, true);
4681	5191	}
4682	5192
4683	5193	return tp;
..	..	@@ -4694,6 +5204,7 @@
4694	5204
4695	5205	if (child == null)
4696	5206	continue;
	5207	+
4697	5208	if (child.HasTransparency() && child.size() != 0)
4698	5209	{
4699	5210	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4703,9 +5214,10 @@
4703	5214	if (leaf != null)
4704	5215	{
4705	5216	cTreePath tp = new cTreePath(this, leaf);
4706		- if (editWindow != null)
	5217	+ ObjEditor window = GetWindow();
	5218	+ if (window != null)
4707	5219	{
4708		- editWindow.Select(tp, deselect, true);
	5220	+ window.Select(tp, deselect, true);
4709	5221	}
4710	5222
4711	5223	return tp;
..	..	@@ -4790,7 +5302,7 @@
4790	5302	return globalTransform;
4791	5303	}
4792	5304
4793		- void PreprocessOcclusion(CameraPane cp)
	5305	+ void PreprocessOcclusion(iCameraPane cp)
4794	5306	{
4795	5307	/*
4796	5308	if (AOdone)
..	..	@@ -4937,7 +5449,8 @@
4937	5449	} else //
4938	5450	if (editWindow != null)
4939	5451	{
4940		- editWindow.cameraView.lighttouched = true;
	5452	+ //editWindow.cameraView.lighttouched = true;
	5453	+ Globals.lighttouched = true;
4941	5454	}
4942	5455	}
4943	5456
..	..	@@ -5029,6 +5542,51 @@
5029	5542	blockloop = false;
5030	5543	}
5031	5544
	5545	+ void ResetSelectable()
	5546	+ {
	5547	+ if (blockloop)
	5548	+ return;
	5549	+
	5550	+ blockloop = true;
	5551	+
	5552	+ keepdontselect = dontselect;
	5553	+ dontselect = true;
	5554	+
	5555	+ Object3D child;
	5556	+ int nb = Size();
	5557	+ for (int i = 0; i < nb; i++)
	5558	+ {
	5559	+ child = (Object3D) get(i);
	5560	+ if (child == null)
	5561	+ continue;
	5562	+ child.ResetSelectable();
	5563	+ }
	5564	+
	5565	+ blockloop = false;
	5566	+ }
	5567	+
	5568	+ void RestoreSelectable()
	5569	+ {
	5570	+ if (blockloop)
	5571	+ return;
	5572	+
	5573	+ blockloop = true;
	5574	+
	5575	+ dontselect = keepdontselect;
	5576	+
	5577	+ Object3D child;
	5578	+ int nb = Size();
	5579	+ for (int i = 0; i < nb; i++)
	5580	+ {
	5581	+ child = (Object3D) get(i);
	5582	+ if (child == null)
	5583	+ continue;
	5584	+ child.RestoreSelectable();
	5585	+ }
	5586	+
	5587	+ blockloop = false;
	5588	+ }
	5589	+
5032	5590	boolean IsSelected()
5033	5591	{
5034	5592	if (parent == null)
..	..	@@ -5089,12 +5647,41 @@
5089	5647	if (fullname == null)
5090	5648	return "";
5091	5649
	5650	+ if (fullname.pigment != null)
	5651	+ {
	5652	+ return fullname.pigment;
	5653	+ }
	5654	+
5092	5655	// System.out.println("Fullname = " + fullname);
5093	5656
5094		- if (fullname.name.indexOf(":") == -1)
5095		- return fullname.name;
	5657	+ // Does not work on Windows due to C:
	5658	+// if (fullname.name.indexOf(":") == -1)
	5659	+// return fullname.name;
	5660	+//
	5661	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5096	5662
5097		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5663	+ String[] split = fullname.name.split(":");
	5664	+
	5665	+ if (split.length == 0)
	5666	+ {
	5667	+ return fullname.pigment = "";
	5668	+ }
	5669	+
	5670	+ if (split.length <= 2)
	5671	+ {
	5672	+ if (fullname.name.endsWith(":"))
	5673	+ {
	5674	+ // Windows
	5675	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
	5676	+ }
	5677	+
	5678	+ return fullname.pigment = split[0];
	5679	+ }
	5680	+
	5681	+ // Windows
	5682	+ assert(split.length == 4);
	5683	+
	5684	+ return fullname.pigment = split[0] + ":" + split[1];
5098	5685	}
5099	5686
5100	5687	static String GetBump(cTexture fullname)
..	..	@@ -5102,11 +5689,44 @@
5102	5689	if (fullname == null)
5103	5690	return "";
5104	5691
	5692	+ if (fullname.bump != null)
	5693	+ {
	5694	+ return fullname.bump;
	5695	+ }
	5696	+
5105	5697	// 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());
	5698	+ // Does not work on Windows due to C:
	5699	+// if (fullname.name.indexOf(":") == -1)
	5700	+// return "";
	5701	+//
	5702	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5703	+ String[] split = fullname.name.split(":");
	5704	+
	5705	+ if (split.length == 0)
	5706	+ {
	5707	+ return fullname.bump = "";
	5708	+ }
	5709	+
	5710	+ if (split.length == 1)
	5711	+ {
	5712	+ return fullname.bump = "";
	5713	+ }
	5714	+
	5715	+ if (split.length == 2)
	5716	+ {
	5717	+ if (fullname.name.endsWith(":"))
	5718	+ {
	5719	+ // Windows
	5720	+ return fullname.bump = "";
	5721	+ }
	5722	+
	5723	+ return fullname.bump = split[1];
	5724	+ }
	5725	+
	5726	+ // Windows
	5727	+ assert(split.length == 4);
	5728	+
	5729	+ return fullname.bump = split[2] + ":" + split[3];
5110	5730	}
5111	5731
5112	5732	String GetPigmentTexture()
..	..	@@ -5180,7 +5800,7 @@
5180	5800	System.out.print("; textures = " + textures);
5181	5801	System.out.println("; usedtextures = " + usedtextures);
5182	5802
5183		- if (GetTextures() == null)
	5803	+ if (GetTextures() == null) // What is that??
5184	5804	GetTextures().name = ":";
5185	5805
5186	5806	String texname = tex;
..	..	@@ -5189,6 +5809,9 @@
5189	5809	texname = "";
5190	5810
5191	5811	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5812	+
	5813	+ GetTextures().pigment = null;
	5814	+
5192	5815	Touch();
5193	5816	}
5194	5817
..	..	@@ -5213,6 +5836,43 @@
5213	5836	}
5214	5837	}
5215	5838
	5839	+ UUID GetUUID()
	5840	+ {
	5841	+ if (uuid == null)
	5842	+ {
	5843	+ // Serial
	5844	+ uuid = UUID.randomUUID();
	5845	+ }
	5846	+
	5847	+ return uuid;
	5848	+ }
	5849	+
	5850	+ Object3D GetObject(UUID uid)
	5851	+ {
	5852	+ if (blockloop)
	5853	+ return null;
	5854	+
	5855	+ if (GetUUID().equals(uid))
	5856	+ return this;
	5857	+
	5858	+ int nb = Size();
	5859	+ for (int i = 0; i < nb; i++)
	5860	+ {
	5861	+ Object3D child = (Object3D) get(i);
	5862	+
	5863	+ if (child == null)
	5864	+ continue;
	5865	+
	5866	+ blockloop = true;
	5867	+ Object3D obj = child.GetObject(uid);
	5868	+ blockloop = false;
	5869	+ if (obj != null)
	5870	+ return obj;
	5871	+ }
	5872	+
	5873	+ return null;
	5874	+ }
	5875	+
5216	5876	void SetBumpTexture(String tex)
5217	5877	{
5218	5878	if (GetTextures() == null)
..	..	@@ -5224,6 +5884,8 @@
5224	5884	texname = "";
5225	5885
5226	5886	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
	5887	+
	5888	+ GetTextures().bump = null;
5227	5889
5228	5890	Touch();
5229	5891	}
..	..	@@ -5249,25 +5911,65 @@
5249	5911	}
5250	5912	}
5251	5913
5252		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5914	+ void EmbedTextures(boolean embed)
	5915	+ {
	5916	+ if (blockloop)
	5917	+ return;
	5918	+
	5919	+ //if (GetTextures() != null)
	5920	+ if (embed)
	5921	+ CameraPane.EmbedTextures(GetTextures());
	5922	+ else
	5923	+ {
	5924	+ GetTextures().pigmentdata = null;
	5925	+ GetTextures().bumpdata = null;
	5926	+ GetTextures().pw = 0;
	5927	+ GetTextures().ph = 0;
	5928	+ GetTextures().bw = 0;
	5929	+ GetTextures().bh = 0;
	5930	+ }
	5931	+
	5932	+ int nb = Size();
	5933	+ for (int i = 0; i < nb; i++)
	5934	+ {
	5935	+ Object3D child = (Object3D) get(i);
	5936	+
	5937	+ if (child == null)
	5938	+ continue;
	5939	+
	5940	+ blockloop = true;
	5941	+ child.EmbedTextures(embed);
	5942	+ blockloop = false;
	5943	+ }
	5944	+ }
	5945	+
	5946	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5253	5947	{
5254	5948	Draw(display, root, selected, blocked);
5255	5949	}
5256	5950
5257		- static cMaterial[] materialstack = new cMaterial[65536];
5258		- static boolean[] selectedstack = new boolean[65536];
5259		- static int materialdepth = 0;
5260		-
5261	5951	boolean NeedSupport()
5262	5952	{
5263	5953	return
5264		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5954	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5265	5955	// PROBLEM with CROWD!!
5266		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	5956	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5267	5957	}
5268	5958
	5959	+ static boolean DEBUG_SELECTION = false;
5269	5960
5270		- void Draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5961	+ boolean IsLive()
	5962	+ {
	5963	+ if (live)
	5964	+ return true;
	5965	+
	5966	+ if (parent == null)
	5967	+ return false;
	5968	+
	5969	+ return parent.IsLive();
	5970	+ }
	5971	+
	5972	+ void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5271	5973	{
5272	5974	Invariants(); // june 2013
5273	5975
..	..	@@ -5276,8 +5978,8 @@
5276	5978	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5277	5979	}
5278	5980
5279		- if (display.drawMode == CameraPane.SELECTION &&
5280		- hide)
	5981	+ if (display.DrawMode() == iCameraPane.SELECTION &&
	5982	+ (hide \|\| dontselect))
5281	5983	return;
5282	5984
5283	5985	if (name != null && name.contains("sclera"))
..	..	@@ -5295,7 +5997,7 @@
5295	5997	if (this instanceof Checker)
5296	5998	return;
5297	5999
5298		- if (display.drawMode == display.SHADOW && PASSTEST)
	6000	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5299	6001	return;
5300	6002
5301	6003	if (count <= 0)
..	..	@@ -5303,13 +6005,13 @@
5303	6005	return;
5304	6006	}
5305	6007
5306		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5307		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	6008	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	6009	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5308	6010	{
5309	6011	return;
5310	6012	}
5311	6013
5312		- javax.media.opengl.GL gl = display.GetGL();
	6014	+ //javax.media.opengl.GL gl = display.GetGL();
5313	6015
5314	6016	/*
5315	6017	if (touched)
..	..	@@ -5327,8 +6029,10 @@
5327	6029	if (support != null)
5328	6030	support = support;
5329	6031
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);
	6032	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6033	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6034	+
	6035	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5332	6036
5333	6037	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5334	6038	{
..	..	@@ -5338,30 +6042,33 @@
5338	6042	// usecalllists &= !(parent instanceof RandomNode);
5339	6043	// usecalllists = false;
5340	6044
5341		- if (GetBRep() != null)
5342		- usecalllists = usecalllists;
	6045	+ if (display.DrawMode() == display.SHADOW)
	6046	+ //GetBRep() != null)
	6047	+ usecalllists = !!usecalllists;
5343	6048	//System.out.println("draw " + this);
5344	6049	//new Exception().printStackTrace();
5345	6050
5346	6051	boolean compiled = false;
5347	6052
5348		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6053	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5349	6054
5350		- if (!selectmode && //display.drawMode != display.SELECTION &&
5351		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	6055	+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
	6056	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	6057	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5352	6058	{
5353		- display.lighttouched = true;
	6059	+ Globals.lighttouched = true;
5354	6060	} // 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 &&
	6061	+
	6062	+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
	6063	+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5357	6064	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5358	6065	{
5359	6066	if (!(this instanceof Composite))
5360	6067	touched = false;
5361	6068	//if (displaylist == -1 && usecalllists)
5362		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6069	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5363	6070	{
5364		- bRep.displaylist = gl.glGenLists(1);
	6071	+ bRep.displaylist = display.GenList();
5365	6072	assert(bRep.displaylist != 0);
5366	6073	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5367	6074	//System.out.println("\tgen list " + list);
..	..	@@ -5370,21 +6077,23 @@
5370	6077
5371	6078	//System.out.println("\tnew list " + list);
5372	6079	//gl.glDrawBuffer(gl.GL_NONE);
5373		- if (usecalllists)
	6080	+ if (usecalllists && bRep.displaylist > 0)
5374	6081	{
5375	6082	// System.err.println("new list " + bRep.displaylist + " for " + this);
5376		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	6083	+ display.NewList(bRep.displaylist);
5377	6084	}
	6085	+
5378	6086	CallList(display, root, selected, blocked);
	6087	+
5379	6088	// compiled = true;
5380		- if (usecalllists)
	6089	+ if (usecalllists && bRep.displaylist > 0)
5381	6090	{
5382	6091	// System.err.println("end list " + bRep.displaylist + " for " + this);
5383		- gl.glEndList();
	6092	+ display.EndList();
5384	6093	}
5385	6094	//gl.glDrawBuffer(gl.GL_BACK);
5386	6095	// XXX touched = false;
5387		- display.lighttouched = true; // all panes...
	6096	+ Globals.lighttouched = true; // all panes...
5388	6097	}
5389	6098
5390	6099	touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
..	..	@@ -5423,12 +6132,12 @@
5423	6132
5424	6133	// frustum culling
5425	6134	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5426		- && display.drawMode != CameraPane.SELECTION)
	6135	+ && display.DrawMode() != iCameraPane.SELECTION)
5427	6136	{
5428		- if (display.drawMode == CameraPane.SHADOW)
	6137	+ if (display.DrawMode() == iCameraPane.SHADOW)
5429	6138	{
5430	6139	if (!link2master // tricky to cull in shadow mode.
5431		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	6140	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5432	6141	{
5433	6142	//System.out.print("CULLED");
5434	6143	culled = true;
..	..	@@ -5436,7 +6145,7 @@
5436	6145	}
5437	6146	else
5438	6147	//GetBRep().getBounds(v0, v1, this);
5439		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	6148	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5440	6149	culled = true;
5441	6150
5442	6151	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5472,11 +6181,12 @@
5472	6181
5473	6182
5474	6183	if (!culled)
5475		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	6184	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5476	6185	{
5477	6186	if (GetBRep() != null)
5478	6187	{
5479		- CameraPane.NextIndex(this, gl);
	6188	+ display.NextIndex();
	6189	+
5480	6190	// vertex color conflict : gl.glCallList(list);
5481	6191	DrawNode(display, root, selected);
5482	6192	if (this instanceof BezierPatch)
..	..	@@ -5498,55 +6208,7 @@
5498	6208	color[2] /= 2;
5499	6209	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5500	6210	*/
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.options4[0] = material.cameralight/0.2f;
5523		- display.options4[1] = material.subsurface;
5524		- display.options4[2] = material.sheen;
5525		-
5526		- // if (display.CURRENTANTIALIAS > 0)
5527		- // display.options3[3] /= 4;
5528		-
5529		- /*
5530		- System.out.println("Focus = " + display.options1[0]);
5531		- System.out.println("Aperture = " + display.options1[1]);
5532		- System.out.println("ShadowBlur = " + display.options1[2]);
5533		- System.out.println("Antialiasing = " + display.options1[3]);
5534		- System.out.println("Fog = " + display.options2[0]);
5535		- System.out.println("Intensity = " + display.options2[1]);
5536		- System.out.println("Elevation = " + display.options2[2]);
5537		- /**/
5538		- } else
5539		- {
5540		- material.Draw(display, selected);
5541		- }
5542		- } else
5543		- {
5544		- if (selected && CameraPane.flash)
5545		- {
5546		- display.modelParams4[1] = 100;
5547		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5548		- }
5549		- }
	6211	+ display.PushMaterial(this, selected);
5550	6212
5551	6213	//System.out.println("call list " + list);
5552	6214	//System.out.println();
..	..	@@ -5565,7 +6227,28 @@
5565	6227	tex = GetTextures();
5566	6228	}
5567	6229
5568		- display.BindTextures(tex, texres);
	6230	+ boolean failedPigment = false;
	6231	+ boolean failedBump = false;
	6232	+
	6233	+ try
	6234	+ {
	6235	+ display.BindPigmentTexture(tex, texres);
	6236	+ }
	6237	+ catch (Exception e)
	6238	+ {
	6239	+ System.err.println("FAILED: " + this);
	6240	+ failedPigment = true;
	6241	+ }
	6242	+
	6243	+ try
	6244	+ {
	6245	+ display.BindBumpTexture(tex, texres);
	6246	+ }
	6247	+ catch (Exception e)
	6248	+ {
	6249	+ //System.err.println("FAILED: " + this);
	6250	+ failedBump = true;
	6251	+ }
5569	6252
5570	6253	if (!compiled)
5571	6254	{
..	..	@@ -5581,30 +6264,19 @@
5581	6264
5582	6265	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5583	6266	assert(bRep.displaylist != 0);
5584		- gl.glCallList(bRep.displaylist);
	6267	+ display.CallList(bRep.displaylist);
5585	6268	// june 2013 drawSelf(display, root, selected);
5586	6269	}
5587	6270	}
5588	6271	}
5589	6272
5590		- display.ReleaseTextures(tex);
5591		-
5592		- //if (parent != null && parent.GetMaterial() != null)
5593		- // parent.GetMaterial().Draw(display, parent.IsSelected(this));
5594		- if (material != null)
5595		- {
5596		- materialdepth -= 1;
5597		- if (materialdepth > 0)
5598		- {
5599		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5600		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5601		- }
5602		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5603		- } else if (selected && CameraPane.flash && GetMaterial() != null)
5604		- {
5605		- display.modelParams4[1] = GetMaterial().cameralight;
5606		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5607		- }
	6273	+ if (!failedBump)
	6274	+ display.ReleaseBumpTexture(tex);
	6275	+
	6276	+ if (!failedPigment)
	6277	+ display.ReleasePigmentTexture(tex);
	6278	+
	6279	+ display.PopMaterial(this, selected);
5608	6280	}
5609	6281
5610	6282	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5646,7 +6318,7 @@
5646	6318	// resetMasterNode();
5647	6319	}
5648	6320
5649		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6321	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5650	6322	{
5651	6323	if (GetBRep() == null)
5652	6324	{
..	..	@@ -5729,8 +6401,11 @@
5729	6401	boolean flipV = false; // true;
5730	6402	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5731	6403
5732		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6404	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5733	6405	{
	6406	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6407	+ return;
	6408	+
5734	6409	if (hide)
5735	6410	return;
5736	6411	// shadow optimisation
..	..	@@ -5788,16 +6463,7 @@
5788	6463	// // ??????????????????????????? Touch();
5789	6464	// }
5790	6465
5791		- if (material != null)
5792		- {
5793		- materialstack[materialdepth] = material;
5794		- selectedstack[materialdepth] = selected;
5795		- cStatic.objectstack[materialdepth++] = this;
5796		- //System.out.println("material " + material);
5797		- //Applet3D.tracein("selected ", selected);
5798		- display.vector2buffer = projectedVertices;
5799		- material.Draw(display, selected);
5800		- }
	6466	+display.PushMaterial2(this, selected);
5801	6467
5802	6468	Object3D child;
5803	6469	boolean sel;
..	..	@@ -5849,19 +6515,7 @@
5849	6515	*/
5850	6516	//depth += 1;
5851	6517
5852		- if (material != null)
5853		- {
5854		- materialdepth -= 1;
5855		- if (materialdepth > 0)
5856		- {
5857		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5858		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5859		- }
5860		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5861		- //else
5862		- //material.Draw(display, false);
5863		- }
5864		-
	6518	+display.PopMaterial2(this);
5865	6519	/*
5866	6520	display.ReleaseTextures(tex);
5867	6521	*/
..	..	@@ -5872,10 +6526,13 @@
5872	6526
5873	6527	//static cVector min,max;
5874	6528
5875		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	6529	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5876	6530	{
5877		- if (display.drawMode == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	6531	+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5878	6532	return; // no shadow for transparent objects
	6533	+
	6534	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6535	+ return;
5879	6536
5880	6537	if (hide)
5881	6538	return;
..	..	@@ -5917,11 +6574,12 @@
5917	6574	return;
5918	6575	}
5919	6576
	6577	+ //bRep.GenUV(1/material.diffuseness);
5920	6578	// bRep.lock = true;
5921	6579
5922		- javax.media.opengl.GL gl = display.GetGL();
	6580	+ //javax.media.opengl.GL gl = display.GetGL();
5923	6581
5924		- if (CameraPane.BOXMODE) // \|\| CameraPane.movingcamera)
	6582	+ if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5925	6583	{
5926	6584	int fc = bRep.FaceCount();
5927	6585	int vc = bRep.VertexCount();
..	..	@@ -5936,23 +6594,7 @@
5936	6594
5937	6595	bRep.getMinMax(min, max, 100);
5938	6596
5939		- gl.glBegin(gl.GL_LINES);
5940		-
5941		- gl.glVertex3d(min.x, min.y, min.z);
5942		- gl.glVertex3d(min.x, min.y, max.z);
5943		- gl.glVertex3d(min.x, min.y, min.z);
5944		- gl.glVertex3d(min.x, max.y, min.z);
5945		- gl.glVertex3d(min.x, min.y, min.z);
5946		- gl.glVertex3d(max.x, min.y, min.z);
5947		-
5948		- gl.glVertex3d(max.x, max.y, max.z);
5949		- gl.glVertex3d(min.x, max.y, max.z);
5950		- gl.glVertex3d(max.x, max.y, max.z);
5951		- gl.glVertex3d(max.x, min.y, max.z);
5952		- gl.glVertex3d(max.x, max.y, max.z);
5953		- gl.glVertex3d(max.x, max.y, min.z);
5954		-
5955		- gl.glEnd();
	6597	+ display.DrawBox(min, max);
5956	6598
5957	6599	return;
5958	6600	}
..	..	@@ -5996,7 +6638,7 @@
5996	6638	{
5997	6639	//throw new Error();
5998	6640
5999		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6641	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
6000	6642
6001	6643	int[] strips = bRep.getRawIndices();
6002	6644
..	..	@@ -6006,178 +6648,19 @@
6006	6648	new Exception().printStackTrace();
6007	6649	return;
6008	6650	}
6009		-
6010		- // TRIANGLE STRIP ARRAY
6011		- if (bRep.trimmed)
	6651	+
	6652	+ if (dontselect)
6012	6653	{
6013		- float[] v = bRep.getRawVertices();
6014		- float[] n = bRep.getRawNormals();
6015		- float[] c = bRep.getRawColors();
6016		- float[] uv = bRep.getRawUVMap();
6017		-
6018		- int count2 = 0;
6019		- int count3 = 0;
6020		-
6021		- if (n.length > 0)
6022		- {
6023		- for (int i = 0; i < strips.length; i++)
6024		- {
6025		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6026		-
6027		- /*
6028		- boolean locked = false;
6029		- float eps = 0.1f;
6030		- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6031		-
6032		- int dot = 0;
6033		-
6034		- if ((dot&1) == 0)
6035		- dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6036		-
6037		- if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6038		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6039		- else
6040		- {
6041		- locked = true;
6042		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6043		- }
6044		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6045		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6046		- if (hasnorm)
6047		- {
6048		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6049		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6050		- }
6051		-
6052		- if ((dot&4) == 0)
6053		- dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6054		-
6055		- if (wrap \|\| !locked && (dot&8) != 0)
6056		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6057		- else
6058		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6059		-
6060		- f.dot = dot;
6061		- */
6062		-
6063		- if (!selectmode)
6064		- {
6065		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6066		- {
6067		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6068		- } else
6069		- {
6070		- gl.glNormal3f(0, 0, 1);
6071		- }
6072		-
6073		- if (c != null)
6074		- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
6075		- {
6076		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6077		- }
6078		- }
6079		- if (flipV)
6080		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6081		- else
6082		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6083		- //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6084		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6085		-
6086		- count2 += 2;
6087		- count3 += 3;
6088		- if (!selectmode)
6089		- {
6090		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6091		- {
6092		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6093		- } else
6094		- {
6095		- gl.glNormal3f(0, 0, 1);
6096		- }
6097		- if (c != null)
6098		- {
6099		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6100		- }
6101		- }
6102		- if (flipV)
6103		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6104		- else
6105		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6106		- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6107		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6108		-
6109		- count2 += 2;
6110		- count3 += 3;
6111		- for (int j = 0; j < strips[i] - 2; j++)
6112		- {
6113		- //gl.glTexCoord2d(...);
6114		- if (!selectmode)
6115		- {
6116		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6117		- {
6118		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6119		- } else
6120		- {
6121		- gl.glNormal3f(0, 0, 1);
6122		- }
6123		- if (c != null)
6124		- {
6125		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6126		- }
6127		- }
6128		-
6129		- if (flipV)
6130		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6131		- else
6132		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6133		- //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6134		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6135		- count2 += 2;
6136		- count3 += 3;
6137		- }
6138		-
6139		- gl.glEnd();
6140		- }
6141		- }
6142		-
6143		- assert count3 == v.length;
	6654	+ //bRep.GenerateNormalsMINE();
6144	6655	}
6145		- else // !trimmed
6146		- {
6147		- int count = 0;
6148		- for (int i = 0; i < strips.length; i++)
6149		- {
6150		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6151		-
6152		- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6153		- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6154		-
6155		- drawVertex(gl, p, selectmode);
6156		- drawVertex(gl, q, selectmode);
6157		-
6158		- for (int j = 0; j < strips[i] - 2; j++)
6159		- {
6160		- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6161		-
6162		-// if (j%2 == 0)
6163		-// drawFace(p, q, r, display, null);
6164		-// else
6165		-// drawFace(p, r, q, display, null);
6166		-
6167		-// p = q;
6168		-// q = r;
6169		- drawVertex(gl, r, selectmode);
6170		- }
6171		-
6172		- gl.glEnd();
6173		- }
6174		- }
	6656	+
	6657	+ display.DrawGeometry(bRep, flipV, selectmode);
6175	6658	} else // catch (Error e)
6176	6659	{
6177	6660	// TRIANGLE ARRAY
6178	6661	if (IsOpaque()) // Static())
6179	6662	{
6180		- gl.glBegin(gl.GL_TRIANGLES);
	6663	+ display.StartTriangles();
6181	6664	int facecount = bRep.FaceCount();
6182	6665	for (int i = 0; i < facecount; i++)
6183	6666	{
..	..	@@ -6240,9 +6723,9 @@
6240	6723	// // r.norm.dot(v3) > -0.5)
6241	6724	// // continue;
6242	6725
6243		- drawFace(p, q, r, display, face);
	6726	+ display.DrawFace(this, p, q, r, face);
6244	6727	}
6245		- gl.glEnd();
	6728	+ display.EndTriangles();
6246	6729	}
6247	6730	else
6248	6731	{
..	..	@@ -6271,8 +6754,8 @@
6271	6754	//System.out.println("SORT");
6272	6755
6273	6756	java.util.Arrays.sort(facescompare);
6274		-
6275		- gl.glBegin(gl.GL_TRIANGLES);
	6757	+
	6758	+ display.StartTriangles();
6276	6759	for (int i = 0; i < facecount; i++)
6277	6760	{
6278	6761	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6284,13 +6767,14 @@
6284	6767	Vertex q = bRep.GetVertex(face.q);
6285	6768	Vertex r = bRep.GetVertex(face.r);
6286	6769
6287		- drawFace(p, q, r, display, face);
	6770	+ display.DrawFace(this, p, q, r, face);
6288	6771	}
6289		- gl.glEnd();
	6772	+ display.EndTriangles();
6290	6773	}
6291	6774
6292	6775	if (false) // live && support != null && support.bRep != null) // debug weights
6293	6776	{
	6777	+ /*
6294	6778	gl.glDisable(gl.GL_LIGHTING);
6295	6779	float[] colorV = new float[3];
6296	6780
..	..	@@ -6369,6 +6853,7 @@
6369	6853	// gl.glEnd();
6370	6854	}
6371	6855	}
	6856	+ */
6372	6857	}
6373	6858	}
6374	6859
..	..	@@ -6413,7 +6898,7 @@
6413	6898	center.add(r);
6414	6899	center.mul(1.0/3);
6415	6900
6416		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6901	+ center.sub(Globals.theRenderer.EyeCamera().location);
6417	6902
6418	6903	distance = center.dot(center);
6419	6904	}
..	..	@@ -6424,347 +6909,11 @@
6424	6909
6425	6910	transient FaceCompare[] facescompare = null;
6426	6911
6427		- void SetColor(CameraPane display, Vertex p0)
6428		- {
6429		- if (display.RENDERPROGRAM == 0)
6430		- {
6431		- float r = 0;
6432		- if (bRep != null)
6433		- {
6434		- if (bRep.stripified)
6435		- {
6436		- r = 1;
6437		- }
6438		- }
6439		- float g = 0;
6440		- if (bRep != null)
6441		- {
6442		- if (bRep.trimmed)
6443		- {
6444		- g = 1;
6445		- }
6446		- }
6447		- float b = 0;
6448		- if (support != null && link2master)
6449		- {
6450		- b = 1;
6451		- }
6452		- display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
6453		- return;
6454		- }
6455		-
6456		- if (display.drawMode != CameraPane.SHADOW)
6457		- return;
6458		-
6459		- javax.media.opengl.GL gl = display.GetGL();
6460		-// if (true) return;
6461		-// float ao = p.AO;
6462		-//
6463		-// // if (ao == 0 && !bRep.AOdone) // transient problem!
6464		-// // ao = 1;
6465		-//
6466		-// gl.glColor4f(ao, ao, ao, 1);
6467		-
6468		-// CameraPane.selectedpoint.
6469		-// getAverage(cStatic.point1, true);
6470		- if (CameraPane.pointflow == null) // !random) // live)
6471		- {
6472		- return;
6473		- }
6474		-
6475		- cStatic.point1.set(0,0,0);
6476		- LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
6477		-
6478		- cStatic.point1.sub(p0);
6479		-
6480		-
6481		-// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
6482		-// {
6483		-// return;
6484		-// }
6485		-
6486		- //if (true)
6487		- if (cStatic.point1.dot(cStatic.point1) > 0.000001)
6488		- {
6489		- return;
6490		- }
6491		-
6492		- float[] colorV = new float[3];
6493		-
6494		- if (false) // marked)
6495		- {
6496		- // debug rigging weights
6497		- for (int object = 0; object < p0.vertexlinks.length; object++)
6498		- {
6499		- float weight = p0.weights[object] / p0.totalweight;
6500		-
6501		- // if (weight < 0.1)
6502		- // {
6503		- // assert(weight == 0);
6504		- // continue;
6505		- // }
6506		-
6507		- if (p0.vertexlinks[object] == -1)
6508		- continue;
6509		-
6510		- Vertex q = support.bRep.GetVertex(p0.vertexlinks[object]);
6511		-
6512		- int color = //1 << object; //
6513		- //p.vertexlinks.length;
6514		- support.bRep.supports[p0.closestsupport].links[object];
6515		- colorV[2] += (color & 1) * weight;
6516		- colorV[1] += ((color & 2) >> 1) * weight;
6517		- colorV[0] += ((color & 4) >> 2) * weight;
6518		- }
6519		- }
6520		- else
6521		- {
6522		- if (drawingstarted)
6523		- {
6524		- // find next point
6525		- if (bRep.GetVertex(0).faceindices == null)
6526		- {
6527		- bRep.InitFaceIndices();
6528		- }
6529		-
6530		- double ymin = p0.y;
6531		-
6532		- Vertex newp = p0;
6533		-
6534		- for (int fii = 0; fii < p0.faceindices.length; fii++)
6535		- {
6536		- int fi = p0.faceindices[fii];
6537		-
6538		- if (fi == -1)
6539		- break;
6540		-
6541		- Face f = bRep.GetFace(fi);
6542		-
6543		- Vertex p = bRep.GetVertex(f.p);
6544		- Vertex q = bRep.GetVertex(f.q);
6545		- Vertex r = bRep.GetVertex(f.r);
6546		-
6547		- int swap = (int)(Math.random()*3);
6548		-
6549		-// for (int s=swap; --s>=0;)
6550		-// {
6551		-// Vertex t = p;
6552		-// p = q;
6553		-// q = r;
6554		-// r = t;
6555		-// }
6556		- if (ymin > p.y)
6557		- {
6558		- ymin = p.y;
6559		- newp = p;
6560		-// break;
6561		- }
6562		- if (ymin > q.y)
6563		- {
6564		- ymin = q.y;
6565		- newp = q;
6566		-// break;
6567		- }
6568		- if (ymin > r.y)
6569		- {
6570		- ymin = r.y;
6571		- newp = r;
6572		-// break;
6573		- }
6574		- }
6575		-
6576		- CameraPane.selectedpoint.toParent[3][0] = newp.x;
6577		- CameraPane.selectedpoint.toParent[3][1] = newp.y;
6578		- CameraPane.selectedpoint.toParent[3][2] = newp.z;
6579		-
6580		- drawingstarted = false;
6581		-
6582		- // return;
6583		- }
6584		-
6585		- if (false) // CameraPane.DRAW
6586		- {
6587		- p0.AO = colorV[0] = 2;
6588		- colorV[1] = 2;
6589		- colorV[2] = 2;
6590		- }
6591		-
6592		- CameraPane.pointflow.add(p0);
6593		- CameraPane.pointflow.Touch();
6594		- }
6595		-
6596		-// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
6597		-// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
6598		-// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
6599		- }
6600		-
6601	6912	void Print(Vertex v)
6602	6913	{
6603	6914	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6604	6915	}
6605	6916
6606		- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6607		- {
6608		- if (!selectmode)
6609		- {
6610		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6611		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6612		-
6613		- if (flipV)
6614		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6615		- else
6616		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6617		- }
6618		-
6619		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6620		- }
6621		-
6622		- void drawFace(Vertex pv, Vertex qv, Vertex rv,
6623		- CameraPane display, Face face)
6624		- {
6625		- if (pv.y == -10000 \|\|
6626		- qv.y == -10000 \|\|
6627		- rv.y == -10000)
6628		- return;
6629		-
6630		-// float b = f.nbiterations & 1;
6631		-// float g = (f.nbiterations>>1) & 1;
6632		-// float r = (f.nbiterations>>2) & 1;
6633		-//
6634		-// //if (f.weight == 10000)
6635		-// //{
6636		-// // r = 1; g = b = 0;
6637		-// //}
6638		-// //else
6639		-// //{
6640		-// // assert(f.weight < 10000);
6641		-// r = g = b = (float)bRep.FaceWeight(f)*100;
6642		-// if (r<0)
6643		-// assert(r>=0);
6644		-// //}
6645		-
6646		- javax.media.opengl.GL gl = display.GetGL();
6647		-
6648		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
6649		-
6650		- //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
6651		- if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
6652		- {
6653		- //gl.glBegin(gl.GL_TRIANGLES);
6654		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
6655		- if (!hasnorm)
6656		- {
6657		- // System.out.println("FUCK!!");
6658		- LA.vecSub(pv/.pos/, qv/.pos/, v0);
6659		- LA.vecSub(pv/.pos/, rv/.pos/, v1);
6660		- LA.vecCross(v0, v1, v2);
6661		- LA.vecNormalize(v2);
6662		- gl.glNormal3f((float) v2.x, (float) v2.y, (float) v2.z);
6663		- }
6664		-
6665		- if (hasnorm)
6666		- {
6667		-// if (!pv.norm.normalized())
6668		-// assert(pv.norm.normalized());
6669		-
6670		- //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
6671		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6672		- }
6673		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6674		- SetColor(display, pv);
6675		- //gl.glColor4f(r, g, b, 1);
6676		- //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
6677		- if (flipV)
6678		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6679		- else
6680		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6681		- //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
6682		- gl.glVertex3f((float) pv./pos./x, (float) pv./pos./y, (float) pv./pos./z);
6683		-// Print(pv);
6684		- if (hasnorm)
6685		- {
6686		-// assert(qv.norm.normalized());
6687		- //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
6688		- gl.glNormal3f((float) qv.norm.x, (float) qv.norm.y, (float) qv.norm.z);
6689		- }
6690		- //System.out.println("vertexq = " + qv.s + ", " + qv.t);
6691		- // boolean locked = false;
6692		- // float eps = 0.1f;
6693		- // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6694		-
6695		- // int dot = 0; //*/ (int)f.dot;
6696		-
6697		- // if ((dot&1) == 0)
6698		- // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6699		-
6700		- // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6701		- if (flipV)
6702		- gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
6703		- else
6704		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6705		- // else
6706		- // {
6707		- // locked = true;
6708		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6709		- // }
6710		- gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
6711		- SetColor(display, qv);
6712		- //gl.glColor4f(r, g, b, 1);
6713		- //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
6714		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6715		- gl.glVertex3f((float) qv./pos./x, (float) qv./pos./y, (float) qv./pos./z);
6716		-// Print(qv);
6717		- if (hasnorm)
6718		- {
6719		-// assert(rv.norm.normalized());
6720		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6721		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6722		- }
6723		-
6724		- // if ((dot&4) == 0)
6725		- // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6726		-
6727		- // if (wrap \|\| !locked && (dot&8) != 0)
6728		- if (flipV)
6729		- gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
6730		- else
6731		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6732		- // else
6733		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6734		-
6735		- // f.dot = dot;
6736		-
6737		- gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
6738		- SetColor(display, rv);
6739		- //gl.glColor4f(r, g, b, 1);
6740		- //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
6741		- //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
6742		- gl.glVertex3f((float) rv./pos./x, (float) rv./pos./y, (float) rv./pos./z);
6743		-// Print(rv);
6744		- //gl.glEnd();
6745		- }
6746		- else
6747		- {
6748		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6749		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6750		- gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
6751		-
6752		- }
6753		-
6754		- if (false) // (attributes & WIREFRAME) != 0)
6755		- {
6756		- gl.glDisable(gl.GL_LIGHTING);
6757		-
6758		- gl.glBegin(gl.GL_LINE_LOOP);
6759		- gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
6760		- gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
6761		- gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
6762		- gl.glEnd();
6763		-
6764		- gl.glEnable(gl.GL_LIGHTING);
6765		- }
6766		- }
6767		-
6768	6917	void drawSelf(ClickInfo info, int level, boolean select)
6769	6918	{
6770	6919	if (bRep == null)
..	..	@@ -7288,20 +7437,23 @@
7288	7437	}
7289	7438	}
7290	7439
7291		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7440	+ static ClickInfo clickInfo = new ClickInfo();
	7441	+
	7442	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7443	+ Point outPt, Rectangle outRec)
7292	7444	{
7293		- int hc = info.bounds.x + info.bounds.width / 2;
7294		- int vc = info.bounds.y + info.bounds.height / 2;
7295		- double[][] toscreen = info.toScreen;
	7445	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7446	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7447	+ double[][] toscreen = clickInfo.toScreen;
7296	7448	if (toscreen == null)
7297	7449	{
7298		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7450	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7299	7451	}
7300	7452	cVector vec = in;
7301	7453	LA.xformPos(in, toscreen, in);
7302	7454	//System.out.println("Distance = " + info.camera.Distance());
7303		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7304		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7455	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7456	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7305	7457	outPt.x = hc + (int) vec.x;
7306	7458	outPt.y = vc - (int) vec.y;
7307	7459	outRec.x = outPt.x - 3;
..	..	@@ -7309,15 +7461,18 @@
7309	7461	outRec.width = outRec.height = 6;
7310	7462	}
7311	7463
7312		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7464	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7465	+ )
7313	7466	{
7314	7467	Point pt = new Point(0, 0);
7315	7468	Rectangle rec = new Rectangle();
7316		- calcHotSpot(in, info, pt, rec);
	7469	+ calcHotSpot(in, //clickInfo,
	7470	+ pt, rec);
7317	7471	return rec;
7318	7472	}
7319	7473
7320		- void drawEditHandles0(ClickInfo info, int level)
	7474	+ void drawEditHandles0(//ClickInfo clickInfo,
	7475	+ int level)
7321	7476	{
7322	7477	if (level == 0)
7323	7478	{
..	..	@@ -7326,98 +7481,104 @@
7326	7481	{
7327	7482	cVector origin = new cVector();
7328	7483	//LA.xformPos(origin, toParent, origin);
7329		- Rectangle spot = calcHotSpot(origin, info);
	7484	+ if (this.clickInfo == null)
	7485	+ this.clickInfo = new ClickInfo();
	7486	+
	7487	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7330	7488	Rectangle boundary = new Rectangle();
7331	7489	boundary.x = spot.x - 30;
7332	7490	boundary.y = spot.y - 30;
7333	7491	boundary.width = spot.width + 60;
7334	7492	boundary.height = spot.height + 60;
7335		- info.g.setColor(Color.red);
	7493	+ clickInfo.g.setColor(Color.white);
7336	7494	int spotw = spot.x + spot.width;
7337	7495	int spoth = spot.y + spot.height;
7338		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7339		- if (CameraPane.Xmin > spot.x)
7340		- {
7341		- CameraPane.Xmin = spot.x;
7342		- }
7343		- if (CameraPane.Xmax < spotw)
7344		- {
7345		- CameraPane.Xmax = spotw;
7346		- }
7347		- if (CameraPane.Ymin > spot.y)
7348		- {
7349		- CameraPane.Ymin = spot.y;
7350		- }
7351		- if (CameraPane.Ymax < spoth)
7352		- {
7353		- CameraPane.Ymax = spoth;
7354		- }
7355		- spot.translate(32, 32);
	7496	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7497	+// if (CameraPane.Xmin > spot.x)
	7498	+// {
	7499	+// CameraPane.Xmin = spot.x;
	7500	+// }
	7501	+// if (CameraPane.Xmax < spotw)
	7502	+// {
	7503	+// CameraPane.Xmax = spotw;
	7504	+// }
	7505	+// if (CameraPane.Ymin > spot.y)
	7506	+// {
	7507	+// CameraPane.Ymin = spot.y;
	7508	+// }
	7509	+// if (CameraPane.Ymax < spoth)
	7510	+// {
	7511	+// CameraPane.Ymax = spoth;
	7512	+// }
	7513	+// if (CameraPane.Xmin > spot.x)
	7514	+// {
	7515	+// CameraPane.Xmin = spot.x;
	7516	+// }
	7517	+// if (CameraPane.Xmax < spotw)
	7518	+// {
	7519	+// CameraPane.Xmax = spotw;
	7520	+// }
	7521	+// if (CameraPane.Ymin > spot.y)
	7522	+// {
	7523	+// CameraPane.Ymin = spot.y;
	7524	+// }
	7525	+// if (CameraPane.Ymax < spoth)
	7526	+// {
	7527	+// CameraPane.Ymax = spoth;
	7528	+// }
	7529	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7530	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
	7531	+ spot.translate(32, 0);
	7532	+ clickInfo.g.setColor(Color.yellow);
	7533	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7534	+
	7535	+ spot.translate(32, 64);
7356	7536	spotw = spot.x + spot.width;
7357	7537	spoth = spot.y + spot.height;
7358		- info.g.setColor(Color.blue);
7359		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7360		- if (CameraPane.Xmin > spot.x)
7361		- {
7362		- CameraPane.Xmin = spot.x;
7363		- }
7364		- if (CameraPane.Xmax < spotw)
7365		- {
7366		- CameraPane.Xmax = spotw;
7367		- }
7368		- if (CameraPane.Ymin > spot.y)
7369		- {
7370		- CameraPane.Ymin = spot.y;
7371		- }
7372		- if (CameraPane.Ymax < spoth)
7373		- {
7374		- CameraPane.Ymax = spoth;
7375		- }
7376		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7377		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7378		- spot.translate(0, -32);
7379		- info.g.setColor(Color.green);
7380		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7381		- if (CameraPane.Xmin > spot.x)
7382		- {
7383		- CameraPane.Xmin = spot.x;
7384		- }
7385		- if (CameraPane.Xmax < spotw)
7386		- {
7387		- CameraPane.Xmax = spotw;
7388		- }
7389		- if (CameraPane.Ymin > spot.y)
7390		- {
7391		- CameraPane.Ymin = spot.y;
7392		- }
7393		- if (CameraPane.Ymax < spoth)
7394		- {
7395		- CameraPane.Ymax = spoth;
7396		- }
7397		- info.g.drawArc(boundary.x, boundary.y,
7398		- boundary.width, boundary.height, 0, 360);
	7538	+ clickInfo.g.setColor(Color.cyan);
	7539	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7540	+// if (CameraPane.Xmin > spot.x)
	7541	+// {
	7542	+// CameraPane.Xmin = spot.x;
	7543	+// }
	7544	+// if (CameraPane.Xmax < spotw)
	7545	+// {
	7546	+// CameraPane.Xmax = spotw;
	7547	+// }
	7548	+// if (CameraPane.Ymin > spot.y)
	7549	+// {
	7550	+// CameraPane.Ymin = spot.y;
	7551	+// }
	7552	+// if (CameraPane.Ymax < spoth)
	7553	+// {
	7554	+// CameraPane.Ymax = spoth;
	7555	+// }
	7556	+ clickInfo.g.setColor(Color.green);
	7557	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7558	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7399	7559	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7400		- if (CameraPane.Xmin > boundary.x)
7401		- {
7402		- CameraPane.Xmin = boundary.x;
7403		- }
7404		- if (CameraPane.Xmax < boundary.x + boundary.width)
7405		- {
7406		- CameraPane.Xmax = boundary.x + boundary.width;
7407		- }
7408		- if (CameraPane.Ymin > boundary.y)
7409		- {
7410		- CameraPane.Ymin = boundary.y;
7411		- }
7412		- if (CameraPane.Ymax < boundary.y + boundary.height)
7413		- {
7414		- CameraPane.Ymax = boundary.y + boundary.height;
7415		- }
	7560	+// if (CameraPane.Xmin > boundary.x)
	7561	+// {
	7562	+// CameraPane.Xmin = boundary.x;
	7563	+// }
	7564	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	7565	+// {
	7566	+// CameraPane.Xmax = boundary.x + boundary.width;
	7567	+// }
	7568	+// if (CameraPane.Ymin > boundary.y)
	7569	+// {
	7570	+// CameraPane.Ymin = boundary.y;
	7571	+// }
	7572	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	7573	+// {
	7574	+// CameraPane.Ymax = boundary.y + boundary.height;
	7575	+// }
7416	7576	return;
7417	7577	}
7418	7578	}
7419	7579
7420		- boolean doEditClick0(ClickInfo info, int level)
	7580	+ boolean doEditClick0(//ClickInfo clickInfo,
	7581	+ int level)
7421	7582	{
7422	7583	if (level == 0)
7423	7584	{
..	..	@@ -7426,10 +7587,10 @@
7426	7587
7427	7588	boolean retval = false;
7428	7589
7429		- startX = info.x;
7430		- startY = info.y;
	7590	+ startX = clickInfo.x;
	7591	+ startY = clickInfo.y;
7431	7592
7432		- hitSomething = 0;
	7593	+ hitSomething = -1;
7433	7594	cVector origin = new cVector();
7434	7595	//LA.xformPos(origin, toParent, origin);
7435	7596	Rectangle spot = new Rectangle();
..	..	@@ -7437,22 +7598,53 @@
7437	7598	{
7438	7599	centerPt = new Point(0, 0);
7439	7600	}
7440		- calcHotSpot(origin, info, centerPt, spot);
7441		- if (spot.contains(info.x, info.y))
	7601	+ calcHotSpot(origin, //info,
	7602	+ centerPt, spot);
	7603	+ if (spot.contains(clickInfo.x, clickInfo.y))
7442	7604	{
7443	7605	hitSomething = hitCenter;
7444	7606	retval = true;
7445	7607	}
7446	7608	spot.translate(32, 0);
7447		- if (spot.contains(info.x, info.y))
	7609	+ if (spot.contains(clickInfo.x, clickInfo.y))
7448	7610	{
7449	7611	hitSomething = hitRotate;
7450	7612	retval = true;
7451	7613	}
7452	7614	spot.translate(0, 32);
7453		- if (spot.contains(info.x, info.y))
	7615	+ spot.translate(32, 0);
	7616	+ spot.translate(0, 32);
	7617	+ if (spot.contains(clickInfo.x, clickInfo.y))
7454	7618	{
7455	7619	hitSomething = hitScale;
	7620	+
	7621	+ double scale = 0.005f * clickInfo.camera.Distance();
	7622	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7623	+ double sign = 1;
	7624	+ if (hScale < 0)
	7625	+ {
	7626	+ sign = -1;
	7627	+ }
	7628	+ hScale = signMath.pow(signhScale, scale * 50);
	7629	+ if (hScale < 0.01)
	7630	+ {
	7631	+ //hScale = 0.01;
	7632	+ }
	7633	+
	7634	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7635	+ sign = 1;
	7636	+ if (vScale < 0)
	7637	+ {
	7638	+ sign = -1;
	7639	+ }
	7640	+ vScale = signMath.pow(signvScale, scale * 50);
	7641	+ if (vScale < 0.01)
	7642	+ {
	7643	+ //vScale = 0.01;
	7644	+ }
	7645	+
	7646	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7647	+
7456	7648	retval = true;
7457	7649	}
7458	7650
..	..	@@ -7462,7 +7654,7 @@
7462	7654	}
7463	7655
7464	7656	//System.out.println("info.modifiers = " + info.modifiers);
7465		- modified = (info.modifiers & CameraPane.META) != 0;
	7657	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7466	7658	//System.out.println("modified = " + modified);
7467	7659	//new Exception().printStackTrace();
7468	7660	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7490,7 +7682,8 @@
7490	7682	return true;
7491	7683	}
7492	7684
7493		- void doEditDrag0(ClickInfo info)
	7685	+ void doEditDrag0(//ClickInfo info,
	7686	+ boolean opposite)
7494	7687	{
7495	7688	if (hitSomething == 0)
7496	7689	{
..	..	@@ -7504,7 +7697,8 @@
7504	7697
7505	7698	//System.out.println("hitSomething = " + hitSomething);
7506	7699
7507		- double scale = 0.005f * info.camera.Distance();
	7700	+ double scale = 0.005f * clickInfo.camera.Distance();
	7701	+
7508	7702	cVector xlate = new cVector();
7509	7703	//cVector xlate2 = new cVector();
7510	7704	switch (hitSomething)
..	..	@@ -7515,9 +7709,11 @@
7515	7709
7516	7710	case hitCenter: // Translate
7517	7711
7518		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7712	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7519	7713
7520		- if (modified)
	7714	+ // Modified could snap
	7715	+ if (//modified \|\|
	7716	+ opposite)
7521	7717	{
7522	7718	//assert(false);
7523	7719	/*
..	..	@@ -7537,8 +7733,8 @@
7537	7733	toParent[3][i] = xlate.get(i);
7538	7734	LA.matInvert(toParent, fromParent);
7539	7735	*/
7540		- cVector delta = LA.newVector(0, 0, startY - info.y);
7541		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7736	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7737	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7542	7738
7543	7739	LA.matCopy(startMat, toParent);
7544	7740	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7547,7 +7743,7 @@
7547	7743	} else
7548	7744	{
7549	7745	//LA.xformDir(delta, info.camera.fromScreen, delta);
7550		- cVector up = new cVector(info.camera.up);
	7746	+ cVector up = new cVector(clickInfo.camera.up);
7551	7747	cVector away = new cVector();
7552	7748	//cVector right2 = new cVector();
7553	7749	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7563,20 +7759,20 @@
7563	7759	}
7564	7760	LA.xformDir(up, ClickInfo.matbuffer, up);
7565	7761	// if (!CameraPane.LOCALTRANSFORM)
7566		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
7567		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7762	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
	7763	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7568	7764	// if (!CameraPane.LOCALTRANSFORM)
7569		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7765	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7570	7766	//LA.vecCross(up, cVector.Z, right2);
7571	7767
7572		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7768	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7573	7769
7574	7770	//System.out.println("DELTA0 = " + delta);
7575	7771	//System.out.println("AWAY = " + info.camera.away);
7576	7772	//System.out.println("UP = " + info.camera.up);
7577	7773	if (away.z > 0)
7578	7774	{
7579		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7775	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7580	7776	{
7581	7777	delta.x = -delta.x;
7582	7778	} else
..	..	@@ -7591,7 +7787,7 @@
7591	7787	//System.out.println("DELTA1 = " + delta);
7592	7788	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7593	7789	//System.out.println("DELTA2 = " + delta);
7594		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7790	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7595	7791	LA.matCopy(startMat, toParent);
7596	7792	//System.out.println("DELTA3 = " + delta);
7597	7793	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7601,8 +7797,8 @@
7601	7797	break;
7602	7798
7603	7799	case hitRotate: // rotate
7604		- int dx = info.x - centerPt.x;
7605		- int dy = -(info.y - centerPt.y);
	7800	+ int dx = clickInfo.x - centerPt.x;
	7801	+ int dy = -(clickInfo.y - centerPt.y);
7606	7802	double angle = (double) Math.atan2(dx, dy);
7607	7803	angle = -(1.570796 - angle);
7608	7804
..	..	@@ -7611,6 +7807,7 @@
7611	7807
7612	7808	if (modified)
7613	7809	{
	7810	+ // Rotate 45 degrees
7614	7811	angle /= (Math.PI / 4);
7615	7812	angle = Math.floor(angle + 0.5);
7616	7813	angle *= (Math.PI / 4);
..	..	@@ -7624,7 +7821,7 @@
7624	7821	}
7625	7822	/**/
7626	7823
7627		- switch (info.pane.renderCamera.viewCode)
	7824	+ switch (clickInfo.pane.RenderCamera().viewCode)
7628	7825	{
7629	7826	case 1: // '\001'
7630	7827	LA.matZRotate(toParent, angle);
..	..	@@ -7651,26 +7848,30 @@
7651	7848	break;
7652	7849
7653	7850	case hitScale: // scale
7654		- double hScale = (double) (info.x - centerPt.x) / 32;
	7851	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7852	+ double sign = 1;
	7853	+ if (hScale < 0)
	7854	+ {
	7855	+ sign = -1;
	7856	+ }
	7857	+ hScale = signMath.pow(signhScale, scale * 50);
7655	7858	if (hScale < 0.01)
7656	7859	{
7657		- hScale = 0.01;
	7860	+ //hScale = 0.01;
7658	7861	}
7659		- hScale = Math.pow(hScale, scale * 50);
7660		- if (hScale < 0.01)
	7862	+
	7863	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7864	+ sign = 1;
	7865	+ if (vScale < 0)
7661	7866	{
7662		- hScale = 0.01;
	7867	+ sign = -1;
7663	7868	}
7664		- double vScale = (double) (info.y - centerPt.y) / 32;
	7869	+ vScale = signMath.pow(signvScale, scale * 50);
7665	7870	if (vScale < 0.01)
7666	7871	{
7667		- vScale = 0.01;
	7872	+ //vScale = 0.01;
7668	7873	}
7669		- vScale = Math.pow(vScale, scale * 50);
7670		- if (vScale < 0.01)
7671		- {
7672		- vScale = 0.01;
7673		- }
	7874	+
7674	7875	LA.matCopy(startMat, toParent);
7675	7876	/**/
7676	7877	for (int i = 0; i < 3; i++)
..	..	@@ -7680,39 +7881,56 @@
7680	7881	}
7681	7882	/**/
7682	7883
7683		- switch (info.pane.renderCamera.viewCode)
	7884	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
	7885	+
	7886	+ if (totalScale < 0.01)
	7887	+ {
	7888	+ totalScale = 0.01;
	7889	+ }
	7890	+
	7891	+ switch (clickInfo.pane.RenderCamera().viewCode)
7684	7892	{
7685	7893	case 3: // '\001'
7686		- if (modified)
	7894	+ if (modified \|\| opposite)
7687	7895	{
	7896	+ if (modified) // && opposite)
	7897	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7898	+ else
7688	7899	//LA.matScale(toParent, 1, hScale, vScale);
7689		- LA.matScale(toParent, vScale, 1, 1);
	7900	+ LA.matScale(toParent, totalScale, 1, 1);
7690	7901	} // vScale, 1);
7691	7902	else
7692	7903	{
7693		- LA.matScale(toParent, vScale, vScale, vScale);
	7904	+ // EXCEPTION!
	7905	+ LA.matScale(toParent, 1, totalScale, totalScale);
7694	7906	} // vScale, 1);
7695	7907	break;
7696	7908
7697	7909	case 2: // '\002'
7698		- if (modified)
	7910	+ if (modified \|\| opposite)
7699	7911	{
7700		- //LA.matScale(toParent, hScale, 1, vScale);
7701		- LA.matScale(toParent, 1, vScale, 1);
	7912	+ if (modified) // && opposite)
	7913	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7914	+ else
	7915	+ //LA.matScale(toParent, hScale, 1, vScale);
	7916	+ LA.matScale(toParent, 1, totalScale, 1);
7702	7917	} else
7703	7918	{
7704		- LA.matScale(toParent, vScale, 1, vScale);
	7919	+ LA.matScale(toParent, totalScale, 1, totalScale);
7705	7920	}
7706	7921	break;
7707	7922
7708	7923	case 1: // '\003'
7709		- if (modified)
	7924	+ if (modified \|\| opposite)
7710	7925	{
7711		- //LA.matScale(toParent, hScale, vScale, 1);
7712		- LA.matScale(toParent, 1, 1, vScale);
	7926	+ if (modified) // && opposite)
	7927	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7928	+ else
	7929	+ //LA.matScale(toParent, hScale, vScale, 1);
	7930	+ LA.matScale(toParent, 1, 1, totalScale);
7713	7931	} else
7714	7932	{
7715		- LA.matScale(toParent, vScale, vScale, 1);
	7933	+ LA.matScale(toParent, totalScale, totalScale, 1);
7716	7934	}
7717	7935	break;
7718	7936	}
..	..	@@ -7733,7 +7951,7 @@
7733	7951	if (parent == null)
7734	7952	{
7735	7953	System.out.println("NULL PARENT");
7736		- new Exception().printStackTrace();
	7954	+ //new Exception().printStackTrace();
7737	7955	} else
7738	7956	{
7739	7957	if (parent instanceof BezierPatch)
..	..	@@ -7746,7 +7964,7 @@
7746	7964	} // NEW ...
7747	7965
7748	7966
7749		- info.pane.repaint();
	7967	+ clickInfo.pane.repaint();
7750	7968	}
7751	7969
7752	7970	boolean overflow = false;
..	..	@@ -7845,14 +8063,22 @@
7845	8063	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7846	8064	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7847	8065	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	8066	+
	8067	+ String objname;
	8068	+
7848	8069	if (false) //parent != null)
7849	8070	{
7850		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	8071	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7851	8072	} else
7852	8073	{
7853		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	8074	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7854	8075	} // + super.toString();
7855	8076	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	8077	+
	8078	+ if (!Globals.ADVANCED)
	8079	+ return objname;
	8080	+
	8081	+ return objname + " " + System.identityHashCode(this);
7856	8082	}
7857	8083
7858	8084	public int hashCode()
..	..	@@ -7908,6 +8134,7 @@
7908	8134	objectUI.closeUI();
7909	8135	if (editWindow != null)
7910	8136	{
	8137	+ editWindow.ctrlPanel.FlushUI();
7911	8138	editWindow.refreshContents();
7912	8139	} // ? new
7913	8140	objectUI = null;
..	..	@@ -7916,6 +8143,10 @@
7916	8143	{
7917	8144	editWindow = null;
7918	8145	} // ?
	8146	+ }
	8147	+ else
	8148	+ {
	8149	+ //editWindow.closeUI();
7919	8150	}
7920	8151	}
7921	8152
..	..	@@ -7928,7 +8159,7 @@
7928	8159	/transient/ cVector2[] projectedVertices = new cVector2[0];
7929	8160
7930	8161	Object3D /Composite/ parent;
7931		- Object3D /Composite/ fileparent;
	8162	+ Object3D /Composite/ fileparent; // In the case of FileObject
7932	8163
7933	8164	double[][] toParent; // dynamic matrix
7934	8165	double[][] fromParent;
..	..	@@ -8043,7 +8274,7 @@
8043	8274	{
8044	8275	assert(bRep != null);
8045	8276	if (!(support instanceof GenericJoint)) // support.bRep != null)
8046		- GrafreeD.Assert(support.bRep == bRep.support);
	8277	+ Grafreed.Assert(support.bRep == bRep.support);
8047	8278	}
8048	8279	else
8049	8280	{
..	..	@@ -8074,6 +8305,10 @@
8074	8305	}
8075	8306
8076	8307	transient ObjEditor editWindow;
	8308	+ transient ObjEditor manipWindow;
	8309	+
	8310	+ transient boolean pinned;
	8311	+
8077	8312	transient ObjectUI objectUI;
8078	8313	public static int povDepth = 0;
8079	8314	private static cVector tbMin = new cVector();
..	..	@@ -8092,9 +8327,9 @@
8092	8327	private static cVector edge2 = new cVector();
8093	8328	//private static cVector norm = new cVector();
8094	8329	/transient private/ int hitSomething;
8095		- private static final int hitCenter = 1;
8096		- private static final int hitScale = 2;
8097		- private static final int hitRotate = 3;
	8330	+ static final int hitCenter = 1;
	8331	+ static final int hitScale = 2;
	8332	+ static final int hitRotate = 3;
8098	8333	/transient/ /private/ int viewCode; // Now used for transparency cache flag
8099	8334	/transient/ private Point centerPt;
8100	8335	/transient/ private int startX;
..	..	@@ -8126,6 +8361,8 @@
8126	8361	{
8127	8362	Object3D targ = this;
8128	8363
	8364	+ targ.NORMALPUSH = obj.NORMALPUSH;
	8365	+
8129	8366	if (obj.material != null)
8130	8367	{
8131	8368	if ((mask&MATERIAL)!=0) // ==(COLOR\|MATERIAL))