~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;
..	..	@@ -285,8 +498,9 @@
285	498	return parent.GetName() + "#";
286	499	}
287	500
288		- boolean timeline = false;
289	501	boolean live = false;
	502	+ transient boolean keepdontselect;
	503	+ boolean dontselect = false;
290	504	boolean hide = false;
291	505	boolean link2master = false; // performs reset support/master at each frame
292	506	boolean marked = false; // animation node
..	..	@@ -296,6 +510,8 @@
296	510	boolean random = false;
297	511	boolean speedup = false;
298	512	boolean rewind = false;
	513	+
	514	+ float NORMALPUSH = 0;
299	515
300	516	Object3D support;
301	517
..	..	@@ -416,16 +632,16 @@
416	632	{
417	633	Object3D copy = this;
418	634
419		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	635	+ Camera parentcam = Globals.theRenderer.ManipCamera();
420	636
421		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	637	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
422	638	{
423		- parentcam = CameraPane.theRenderer.cameras[1];
	639	+ parentcam = Globals.theRenderer.Cameras()[1];
424	640	}
425	641
426		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	642	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
427	643	{
428		- parentcam = CameraPane.theRenderer.cameras[0];
	644	+ parentcam = Globals.theRenderer.Cameras()[0];
429	645	}
430	646
431	647	if (this == parentcam)
..	..	@@ -433,7 +649,7 @@
433	649	//assert(this instanceof Camera);
434	650
435	651	for (int count = parentcam.GetTransformCount(); --count>=0;)
436		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	652	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
437	653	}
438	654
439	655	copy.marked ^= true;
..	..	@@ -453,7 +669,7 @@
453	669	//assert(this instanceof Camera);
454	670
455	671	for (int count = parentcam.GetTransformCount(); --count>=0;)
456		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	672	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
457	673	}
458	674
459	675	copy.Touch(); // display list issue
..	..	@@ -466,12 +682,14 @@
466	682	toParent = LA.newMatrix();
467	683	fromParent = LA.newMatrix();
468	684	}
	685	+
469	686	if (toParentMarked == null)
470	687	{
471	688	if (maxcount != 1)
472	689	{
473	690	new Exception().printStackTrace();
474	691	}
	692	+
475	693	toParentMarked = LA.newMatrix();
476	694	fromParentMarked = LA.newMatrix();
477	695	}
..	..	@@ -588,7 +806,7 @@
588	806	return;
589	807	}
590	808
591		- if (CameraPane.fromscript)
	809	+ if (Globals.fromscript)
592	810	{
593	811	transformcount = 0;
594	812	return;
..	..	@@ -746,7 +964,7 @@
746	964
747	965	int GetTransformCount()
748	966	{
749		- // marde pour serialization de Texture
	967	+ // patch pour serialization de Texture
750	968	resetmaxcount();
751	969	resettransformcount();
752	970	resetstep();
..	..	@@ -759,7 +977,7 @@
759	977	if (step == 0)
760	978	step = 1;
761	979	if (maxcount == 0)
762		- maxcount = 2048; // 4;
	980	+ maxcount = 128; // 2048; // 4;
763	981	// if (acceleration == 0)
764	982	// acceleration = 10;
765	983	if (delay == 0) // serial
..	..	@@ -780,9 +998,12 @@
780	998	// factor = CameraPane.STEP;
781	999	// }
782	1000
783		- 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)
784	1005	{
785		- currentframe = CameraPane.framecount;
	1006	+ currentframe = Globals.framecount;
786	1007
787	1008	// System.err.println("transformcount = " + transformcount);
788	1009	// System.err.println("factor = " + factor);
..	..	@@ -791,7 +1012,8 @@
791	1012
792	1013	boolean changedir = random && Math.random() < 0.01; // && !link2master;
793	1014
794		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	1015	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	1016	+ (step == 1 && changedir))
795	1017	{
796	1018	countdown = 1;
797	1019	delay = speedup?8:1;
..	..	@@ -863,6 +1085,10 @@
863	1085	if (material == null \|\| material.multiply)
864	1086	return true;
865	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.
866	1092	return material.opacity > 0.99;
867	1093	}
868	1094
..	..	@@ -894,6 +1120,11 @@
894	1120	fromParent = null; // LA.newMatrix();
895	1121	bRep = null; // new BoundaryRep();
896	1122
	1123	+ if (oname != null && oname.equals("LeftHand"))
	1124	+ {
	1125	+ name = oname;
	1126	+ }
	1127	+
897	1128	/*
898	1129	float hue = (float)Math.random();
899	1130	Color col;
..	..	@@ -936,7 +1167,7 @@
936	1167
937	1168	public Object clone()
938	1169	{
939		- return GrafreeD.clone(this);
	1170	+ return Grafreed.clone(this);
940	1171	}
941	1172
942	1173	Object3D copyExpand()
..	..	@@ -1258,6 +1489,7 @@
1258	1489	toParent = LA.newMatrix();
1259	1490	fromParent = LA.newMatrix();
1260	1491	}
	1492	+
1261	1493	LA.matCopy(other.toParent, toParent);
1262	1494	LA.matCopy(other.fromParent, fromParent);
1263	1495
..	..	@@ -1452,7 +1684,7 @@
1452	1684	BoundaryRep.SEUIL = other.material.cameralight;
1453	1685
1454	1686	// Set default to 0.1
1455		- BoundaryRep.SEUIL /= 2;
	1687	+ BoundaryRep.SEUIL /= 4; // 2;
1456	1688	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1457	1689	}
1458	1690
..	..	@@ -1711,7 +1943,7 @@
1711	1943	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1712	1944	o.bRep = transientrep;
1713	1945	if (clone)
1714		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1946	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1715	1947	o.CreateMaterial();
1716	1948	o.SetAttributes(this, -1);
1717	1949	//parent
..	..	@@ -1724,7 +1956,7 @@
1724	1956	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1725	1957	o.bRep = bRep;
1726	1958	if (clone)
1727		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1959	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1728	1960	o.CreateMaterial();
1729	1961	//o.overwriteThis(this, -1);
1730	1962	o.SetAttributes(this, -1);
..	..	@@ -1811,12 +2043,15 @@
1811	2043	if (obj.name == null)
1812	2044	continue; // can't be a null one
1813	2045
	2046	+ // Try perfect match first.
1814	2047	if (n.equals(obj.name))
1815	2048	{
1816	2049	theobj = obj;
1817	2050	count++;
1818	2051	}
1819	2052	}
	2053	+
	2054	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1820	2055
1821	2056	if (count != 1)
1822	2057	for (int i=Size(); --i>=0;)
..	..	@@ -2131,15 +2366,8 @@
2131	2366	if (/parent != null &&/ material == null)
2132	2367	{
2133	2368	material = new cMaterial(GetMaterial());
2134		- if (projectedVertices == null \|\| projectedVertices.length <= 2)
2135		- {
2136		- projectedVertices = new Object3D.cVector2[3];
2137		- }
2138		- for (int i = 0; i < 3; i++)
2139		- {
2140		- projectedVertices[i] = new cVector2(); // Others
2141		- }
2142		- projectedVertices[0].x = 100; // bump
	2369	+
	2370	+ InitOthers();
2143	2371
2144	2372	if (this instanceof Camera)
2145	2373	{
..	..	@@ -2283,12 +2511,22 @@
2283	2511	}
2284	2512	*/
2285	2513	}
	2514	+ else
	2515	+ {
	2516	+ //((ObjEditor)editWindow).SetupUI2(null);
	2517	+ if (objectUI != null)
	2518	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2519	+ else
	2520	+ //new Exception().printStackTrace();
	2521	+ System.err.println("objectUI is null");
	2522	+ }
2286	2523	}
2287	2524
2288	2525	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2289	2526	{
2290	2527	if (newWindow)
2291	2528	{
	2529	+ new Exception().printStackTrace();
2292	2530	System.exit(0);
2293	2531	if (parent != null)
2294	2532	{
..	..	@@ -2323,6 +2561,14 @@
2323	2561	{
2324	2562	editWindow.refreshContents();
2325	2563	}
	2564	+ else
	2565	+ {
	2566	+ if (manipWindow != null)
	2567	+ {
	2568	+ manipWindow.refreshContents();
	2569	+ }
	2570	+ }
	2571	+
2326	2572	//if (parent != null)
2327	2573	//parent.refreshEditWindow();
2328	2574	}
..	..	@@ -2402,7 +2648,8 @@
2402	2648	private static final int editSelf = 1;
2403	2649	private static final int editChild = 2;
2404	2650
2405		- void drawEditHandles(ClickInfo info, int level)
	2651	+ void drawEditHandles(//ClickInfo info,
	2652	+ int level)
2406	2653	{
2407	2654	if (level == 0)
2408	2655	{
..	..	@@ -2410,7 +2657,8 @@
2410	2657	return;
2411	2658
2412	2659	Object3D selectee;
2413		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2660	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2661	+ level + 1))
2414	2662	{
2415	2663	selectee = (Object3D) e.nextElement();
2416	2664	}
..	..	@@ -2418,19 +2666,22 @@
2418	2666	} else
2419	2667	{
2420	2668	//super.
2421		- drawEditHandles0(info, level + 1);
	2669	+ drawEditHandles0(//info,
	2670	+ level + 1);
2422	2671	}
2423	2672	}
2424	2673
2425		- boolean doEditClick(ClickInfo info, int level)
	2674	+ boolean doEditClick(//ClickInfo info,
	2675	+ int level)
2426	2676	{
2427	2677	doSomething = 0;
2428	2678	if (level == 0)
2429	2679	{
2430		- return doParentClick(info);
	2680	+ return doParentClick(); //info);
2431	2681	}
2432	2682	if (//super.
2433		- doEditClick0(info, level))
	2683	+ doEditClick0(//info,
	2684	+ level))
2434	2685	{
2435	2686	doSomething = 1;
2436	2687	return true;
..	..	@@ -2440,7 +2691,7 @@
2440	2691	}
2441	2692	}
2442	2693
2443		- boolean doParentClick(ClickInfo info)
	2694	+ boolean doParentClick() //ClickInfo info)
2444	2695	{
2445	2696	if (selection == null)
2446	2697	{
..	..	@@ -2453,7 +2704,8 @@
2453	2704	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2454	2705	{
2455	2706	Object3D selectee = (Object3D) e.nextElement();
2456		- if (selectee.doEditClick(info, 1))
	2707	+ if (selectee.doEditClick(//info,
	2708	+ 1))
2457	2709	{
2458	2710	childToDrag = selectee;
2459	2711	doSomething = 2;
..	..	@@ -2465,13 +2717,15 @@
2465	2717	return retval;
2466	2718	}
2467	2719
2468		- void doEditDrag(ClickInfo info)
	2720	+ void doEditDrag(//ClickInfo clickInfo,
	2721	+ boolean opposite)
2469	2722	{
2470	2723	switch (doSomething)
2471	2724	{
2472	2725	case 1: // '\001'
2473	2726	//super.
2474		- doEditDrag0(info);
	2727	+ doEditDrag0(//clickInfo,
	2728	+ opposite);
2475	2729	break;
2476	2730
2477	2731	case 2: // '\002'
..	..	@@ -2484,11 +2738,13 @@
2484	2738	{
2485	2739	//sel.hitSomething = childToDrag.hitSomething;
2486	2740	//childToDrag.doEditDrag(info);
2487		- sel.doEditDrag(info);
	2741	+ sel.doEditDrag(//clickInfo,
	2742	+ opposite);
2488	2743	} else
2489	2744	{
2490	2745	//super.
2491		- doEditDrag0(info);
	2746	+ doEditDrag0(//clickInfo,
	2747	+ opposite);
2492	2748	}
2493	2749	}
2494	2750	break;
..	..	@@ -2506,6 +2762,9 @@
2506	2762	{
2507	2763	deselectAll();
2508	2764	}
	2765	+
	2766	+ new Exception().printStackTrace();
	2767	+
2509	2768	ClickInfo newInfo = new ClickInfo();
2510	2769	newInfo.flags = info.flags;
2511	2770	newInfo.bounds = info.bounds;
..	..	@@ -2598,6 +2857,18 @@
2598	2857	void GenNormalsS(boolean crease)
2599	2858	{
2600	2859	selection.GenNormals(crease);
	2860	+// for (int i=0; i<selection.size(); i++)
	2861	+// {
	2862	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2863	+// selectee.GenNormals(crease);
	2864	+// }
	2865	+
	2866	+ //Touch();
	2867	+ }
	2868	+
	2869	+ void GenNormalsMeshS()
	2870	+ {
	2871	+ selection.GenNormalsMesh();
2601	2872	// for (int i=0; i<selection.size(); i++)
2602	2873	// {
2603	2874	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2738,6 +3009,24 @@
2738	3009	if (child == null)
2739	3010	continue;
2740	3011	child.GenNormals(crease);
	3012	+// Children().release(i);
	3013	+ }
	3014	+ blockloop = false;
	3015	+ }
	3016	+
	3017	+ void GenNormalsMesh()
	3018	+ {
	3019	+ if (blockloop)
	3020	+ return;
	3021	+
	3022	+ blockloop = true;
	3023	+ GenNormalsMesh0();
	3024	+ for (int i = 0; i < Children().Size(); i++)
	3025	+ {
	3026	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	3027	+ if (child == null)
	3028	+ continue;
	3029	+ child.GenNormalsMesh();
2741	3030	// Children().release(i);
2742	3031	}
2743	3032	blockloop = false;
..	..	@@ -2895,7 +3184,8 @@
2895	3184	{
2896	3185	if (bRep != null)
2897	3186	{
2898		- bRep.GenUV();
	3187	+ bRep.GenUV(); //1);
	3188	+ //bRep.UnfoldUV();
2899	3189	Touch();
2900	3190	}
2901	3191	}
..	..	@@ -2909,11 +3199,20 @@
2909	3199	}
2910	3200	}
2911	3201
	3202	+ void GenNormalsMesh0()
	3203	+ {
	3204	+ if (bRep != null)
	3205	+ {
	3206	+ bRep.GenerateNormalsMesh();
	3207	+ Touch();
	3208	+ }
	3209	+ }
	3210	+
2912	3211	void GenNormalsMINE0()
2913	3212	{
2914	3213	if (bRep != null)
2915	3214	{
2916		- bRep.GenerateNormalsMINE();
	3215	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2917	3216	Touch();
2918	3217	}
2919	3218	}
..	..	@@ -2970,6 +3269,33 @@
2970	3269	blockloop = false;
2971	3270	}
2972	3271
	3272	+ void TransformChildren()
	3273	+ {
	3274	+ if (toParent != null)
	3275	+ {
	3276	+ for (int i=Size(); --i>=0;)
	3277	+ {
	3278	+ Object3D v = get(i);
	3279	+
	3280	+ if (v.toParent == null)
	3281	+ {
	3282	+ v.toParent = LA.newMatrix();
	3283	+ v.fromParent = LA.newMatrix();
	3284	+ }
	3285	+
	3286	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3287	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3288	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3289	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3290	+ }
	3291	+
	3292	+ toParent = null; // LA.matIdentity(toParent);
	3293	+ fromParent = null; // LA.matIdentity(fromParent);
	3294	+
	3295	+ Touch();
	3296	+ }
	3297	+ }
	3298	+
2973	3299	void TransformGeometry()
2974	3300	{
2975	3301	Object3D obj = this;
..	..	@@ -3191,9 +3517,11 @@
3191	3517
3192	3518	BoundaryRep sup = bRep.support;
3193	3519	bRep.support = null;
3194		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3520	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3195	3521	// bRep.SplitInTwo(onlyone); // thread...
3196		- temprep.SplitInTwo(reduction34, onlyone);
	3522	+
	3523	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3524	+
3197	3525	bRep = temprep;
3198	3526	bRep.support = sup;
3199	3527	Touch();
..	..	@@ -3330,7 +3658,8 @@
3330	3658	if (blockloop)
3331	3659	return;
3332	3660
3333		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3661	+ if (//marked \|\| // does not make sense
	3662	+ (bRep != null \|\| material != null)) // borderline...
3334	3663	live = h;
3335	3664
3336	3665	for (int i = 0; i < Size(); i++)
..	..	@@ -3351,7 +3680,8 @@
3351	3680	return;
3352	3681
3353	3682	//if (bRep != null)
3354		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3683	+ if (//marked \|\| // does not make sense
	3684	+ (bRep != null \|\| material != null)) // borderline...
3355	3685	link2master = h;
3356	3686
3357	3687	for (int i = 0; i < Size(); i++)
..	..	@@ -3371,7 +3701,8 @@
3371	3701	if (blockloop)
3372	3702	return;
3373	3703
3374		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3704	+ if (//marked \|\| // does not make sense
	3705	+ (bRep != null \|\| material != null)) // borderline...
3375	3706	hide = h;
3376	3707
3377	3708	for (int i = 0; i < Size(); i++)
..	..	@@ -3391,7 +3722,7 @@
3391	3722	if (blockloop)
3392	3723	return;
3393	3724
3394		- if (bRep != null && material != null) // borderline...
	3725	+ if (bRep != null \|\| material != null) // borderline...
3395	3726	marked = h;
3396	3727
3397	3728	for (int i = 0; i < Size(); i++)
..	..	@@ -3401,6 +3732,46 @@
3401	3732	continue;
3402	3733	blockloop = true;
3403	3734	child.MarkLeaves(h);
	3735	+ blockloop = false;
	3736	+ // release(i);
	3737	+ }
	3738	+ }
	3739	+
	3740	+ void RewindLeaves(boolean h)
	3741	+ {
	3742	+ if (blockloop)
	3743	+ return;
	3744	+
	3745	+ if (bRep != null \|\| material != null) // borderline...
	3746	+ rewind = h;
	3747	+
	3748	+ for (int i = 0; i < Size(); i++)
	3749	+ {
	3750	+ Object3D child = (Object3D) get(i); // reserve(i);
	3751	+ if (child == null)
	3752	+ continue;
	3753	+ blockloop = true;
	3754	+ child.RewindLeaves(h);
	3755	+ blockloop = false;
	3756	+ // release(i);
	3757	+ }
	3758	+ }
	3759	+
	3760	+ void RandomLeaves(boolean h)
	3761	+ {
	3762	+ if (blockloop)
	3763	+ return;
	3764	+
	3765	+ if (bRep != null \|\| material != null) // borderline...
	3766	+ random = h;
	3767	+
	3768	+ for (int i = 0; i < Size(); i++)
	3769	+ {
	3770	+ Object3D child = (Object3D) get(i); // reserve(i);
	3771	+ if (child == null)
	3772	+ continue;
	3773	+ blockloop = true;
	3774	+ child.RandomLeaves(h);
3404	3775	blockloop = false;
3405	3776	// release(i);
3406	3777	}
..	..	@@ -3715,7 +4086,7 @@
3715	4086	if (child == null)
3716	4087	continue;
3717	4088
3718		- if (GrafreeD.RENDERME > 0)
	4089	+ if (Grafreed.RENDERME > 0)
3719	4090	{
3720	4091	if (child instanceof Merge)
3721	4092	((Merge)child).renderme();
..	..	@@ -3866,7 +4237,7 @@
3866	4237	if (child == null)
3867	4238	continue;
3868	4239
3869		- if (GrafreeD.RENDERME > 0)
	4240	+ if (Grafreed.RENDERME > 0)
3870	4241	{
3871	4242	if (child instanceof Merge)
3872	4243	((Merge)child).renderme();
..	..	@@ -4061,7 +4432,7 @@
4061	4432	if (child == null)
4062	4433	continue;
4063	4434
4064		- if (GrafreeD.RENDERME > 0)
	4435	+ if (Grafreed.RENDERME > 0)
4065	4436	{
4066	4437	if (child instanceof Merge)
4067	4438	((Merge)child).renderme();
..	..	@@ -4158,6 +4529,71 @@
4158	4529	}
4159	4530	blockloop = true;
4160	4531	get(i).RepairParent();
	4532	+ blockloop = false;
	4533	+ }
	4534	+ }
	4535	+
	4536	+ void RepairShadow()
	4537	+ {
	4538	+ if (blockloop)
	4539	+ return;
	4540	+
	4541	+ if (this.material != null)
	4542	+ this.InitOthers();
	4543	+
	4544	+ for (int i=0; i<Size(); i++)
	4545	+ {
	4546	+ blockloop = true;
	4547	+ get(i).RepairShadow();
	4548	+ blockloop = false;
	4549	+ }
	4550	+ }
	4551	+
	4552	+ void RepairSOV()
	4553	+ {
	4554	+ if (blockloop)
	4555	+ return;
	4556	+
	4557	+ String texname = this.GetPigmentTexture();
	4558	+
	4559	+ if (texname.startsWith("sov"))
	4560	+ {
	4561	+ String[] s = texname.split("/");
	4562	+
	4563	+ String[] sname = s[1].split("Color.pn");
	4564	+
	4565	+ texname = sname[0];
	4566	+
	4567	+ if (sname.length > 1)
	4568	+ {
	4569	+ texname += "Color.jpg";
	4570	+ }
	4571	+
	4572	+ this.SetPigmentTexture("sov/" + texname);
	4573	+ }
	4574	+
	4575	+ texname = this.GetBumpTexture();
	4576	+
	4577	+ if (texname.startsWith("sov"))
	4578	+ {
	4579	+ String[] s = texname.split("/");
	4580	+
	4581	+ String[] sname = s[1].split("Bump.pn");
	4582	+
	4583	+ texname = sname[0];
	4584	+
	4585	+ if (sname.length > 1)
	4586	+ {
	4587	+ texname += "Bump.jpg";
	4588	+ }
	4589	+
	4590	+ this.SetBumpTexture("sov/" + texname);
	4591	+ }
	4592	+
	4593	+ for (int i=0; i<Size(); i++)
	4594	+ {
	4595	+ blockloop = true;
	4596	+ get(i).RepairSOV();
4161	4597	blockloop = false;
4162	4598	}
4163	4599	}
..	..	@@ -4652,7 +5088,7 @@
4652	5088
4653	5089	cTreePath SelectLeaf(int indexcount, boolean deselect)
4654	5090	{
4655		- if (hide)
	5091	+ if (hide \|\| dontselect)
4656	5092	return null;
4657	5093
4658	5094	if (count <= 0)
..	..	@@ -4676,9 +5112,17 @@
4676	5112	}
4677	5113	}
4678	5114
	5115	+ ObjEditor GetWindow()
	5116	+ {
	5117	+ if (editWindow != null)
	5118	+ return editWindow;
	5119	+
	5120	+ return manipWindow;
	5121	+ }
	5122	+
4679	5123	cTreePath Select(int indexcount, boolean deselect)
4680	5124	{
4681		- if (hide)
	5125	+ if (hide \|\| dontselect)
4682	5126	return null;
4683	5127
4684	5128	if (count <= 0)
..	..	@@ -4712,10 +5156,11 @@
4712	5156	if (leaf != null)
4713	5157	{
4714	5158	cTreePath tp = new cTreePath(this, leaf);
4715		- if (editWindow != null)
	5159	+ ObjEditor window = GetWindow();
	5160	+ if (window != null)
4716	5161	{
4717	5162	//System.out.println("editWindow = " + editWindow + " vs " + this);
4718		- editWindow.Select(tp, deselect, true);
	5163	+ window.Select(tp, deselect, true);
4719	5164	}
4720	5165
4721	5166	return tp;
..	..	@@ -4732,6 +5177,7 @@
4732	5177
4733	5178	if (child == null)
4734	5179	continue;
	5180	+
4735	5181	if (child.HasTransparency() && child.size() != 0)
4736	5182	{
4737	5183	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4741,9 +5187,10 @@
4741	5187	if (leaf != null)
4742	5188	{
4743	5189	cTreePath tp = new cTreePath(this, leaf);
4744		- if (editWindow != null)
	5190	+ ObjEditor window = GetWindow();
	5191	+ if (window != null)
4745	5192	{
4746		- editWindow.Select(tp, deselect, true);
	5193	+ window.Select(tp, deselect, true);
4747	5194	}
4748	5195
4749	5196	return tp;
..	..	@@ -4828,7 +5275,7 @@
4828	5275	return globalTransform;
4829	5276	}
4830	5277
4831		- void PreprocessOcclusion(CameraPane cp)
	5278	+ void PreprocessOcclusion(iCameraPane cp)
4832	5279	{
4833	5280	/*
4834	5281	if (AOdone)
..	..	@@ -4975,7 +5422,8 @@
4975	5422	} else //
4976	5423	if (editWindow != null)
4977	5424	{
4978		- editWindow.cameraView.lighttouched = true;
	5425	+ //editWindow.cameraView.lighttouched = true;
	5426	+ Globals.lighttouched = true;
4979	5427	}
4980	5428	}
4981	5429
..	..	@@ -5067,6 +5515,51 @@
5067	5515	blockloop = false;
5068	5516	}
5069	5517
	5518	+ void ResetSelectable()
	5519	+ {
	5520	+ if (blockloop)
	5521	+ return;
	5522	+
	5523	+ blockloop = true;
	5524	+
	5525	+ keepdontselect = dontselect;
	5526	+ dontselect = true;
	5527	+
	5528	+ Object3D child;
	5529	+ int nb = Size();
	5530	+ for (int i = 0; i < nb; i++)
	5531	+ {
	5532	+ child = (Object3D) get(i);
	5533	+ if (child == null)
	5534	+ continue;
	5535	+ child.ResetSelectable();
	5536	+ }
	5537	+
	5538	+ blockloop = false;
	5539	+ }
	5540	+
	5541	+ void RestoreSelectable()
	5542	+ {
	5543	+ if (blockloop)
	5544	+ return;
	5545	+
	5546	+ blockloop = true;
	5547	+
	5548	+ dontselect = keepdontselect;
	5549	+
	5550	+ Object3D child;
	5551	+ int nb = Size();
	5552	+ for (int i = 0; i < nb; i++)
	5553	+ {
	5554	+ child = (Object3D) get(i);
	5555	+ if (child == null)
	5556	+ continue;
	5557	+ child.RestoreSelectable();
	5558	+ }
	5559	+
	5560	+ blockloop = false;
	5561	+ }
	5562	+
5070	5563	boolean IsSelected()
5071	5564	{
5072	5565	if (parent == null)
..	..	@@ -5127,12 +5620,41 @@
5127	5620	if (fullname == null)
5128	5621	return "";
5129	5622
	5623	+ if (fullname.pigment != null)
	5624	+ {
	5625	+ return fullname.pigment;
	5626	+ }
	5627	+
5130	5628	// System.out.println("Fullname = " + fullname);
5131	5629
5132		- if (fullname.name.indexOf(":") == -1)
5133		- return fullname.name;
	5630	+ // Does not work on Windows due to C:
	5631	+// if (fullname.name.indexOf(":") == -1)
	5632	+// return fullname.name;
	5633	+//
	5634	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5134	5635
5135		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5636	+ String[] split = fullname.name.split(":");
	5637	+
	5638	+ if (split.length == 0)
	5639	+ {
	5640	+ return fullname.pigment = "";
	5641	+ }
	5642	+
	5643	+ if (split.length <= 2)
	5644	+ {
	5645	+ if (fullname.name.endsWith(":"))
	5646	+ {
	5647	+ // Windows
	5648	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
	5649	+ }
	5650	+
	5651	+ return fullname.pigment = split[0];
	5652	+ }
	5653	+
	5654	+ // Windows
	5655	+ assert(split.length == 4);
	5656	+
	5657	+ return fullname.pigment = split[0] + ":" + split[1];
5136	5658	}
5137	5659
5138	5660	static String GetBump(cTexture fullname)
..	..	@@ -5140,11 +5662,44 @@
5140	5662	if (fullname == null)
5141	5663	return "";
5142	5664
	5665	+ if (fullname.bump != null)
	5666	+ {
	5667	+ return fullname.bump;
	5668	+ }
	5669	+
5143	5670	// System.out.println("Fullname = " + fullname);
5144		- if (fullname.name.indexOf(":") == -1)
5145		- return "";
5146		-
5147		- return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5671	+ // Does not work on Windows due to C:
	5672	+// if (fullname.name.indexOf(":") == -1)
	5673	+// return "";
	5674	+//
	5675	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5676	+ String[] split = fullname.name.split(":");
	5677	+
	5678	+ if (split.length == 0)
	5679	+ {
	5680	+ return fullname.bump = "";
	5681	+ }
	5682	+
	5683	+ if (split.length == 1)
	5684	+ {
	5685	+ return fullname.bump = "";
	5686	+ }
	5687	+
	5688	+ if (split.length == 2)
	5689	+ {
	5690	+ if (fullname.name.endsWith(":"))
	5691	+ {
	5692	+ // Windows
	5693	+ return fullname.bump = "";
	5694	+ }
	5695	+
	5696	+ return fullname.bump = split[1];
	5697	+ }
	5698	+
	5699	+ // Windows
	5700	+ assert(split.length == 4);
	5701	+
	5702	+ return fullname.bump = split[2] + ":" + split[3];
5148	5703	}
5149	5704
5150	5705	String GetPigmentTexture()
..	..	@@ -5218,7 +5773,7 @@
5218	5773	System.out.print("; textures = " + textures);
5219	5774	System.out.println("; usedtextures = " + usedtextures);
5220	5775
5221		- if (GetTextures() == null)
	5776	+ if (GetTextures() == null) // What is that??
5222	5777	GetTextures().name = ":";
5223	5778
5224	5779	String texname = tex;
..	..	@@ -5227,6 +5782,9 @@
5227	5782	texname = "";
5228	5783
5229	5784	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5785	+
	5786	+ GetTextures().pigment = null;
	5787	+
5230	5788	Touch();
5231	5789	}
5232	5790
..	..	@@ -5251,6 +5809,43 @@
5251	5809	}
5252	5810	}
5253	5811
	5812	+ UUID GetUUID()
	5813	+ {
	5814	+ if (uuid == null)
	5815	+ {
	5816	+ // Serial
	5817	+ uuid = UUID.randomUUID();
	5818	+ }
	5819	+
	5820	+ return uuid;
	5821	+ }
	5822	+
	5823	+ Object3D GetObject(UUID uid)
	5824	+ {
	5825	+ if (blockloop)
	5826	+ return null;
	5827	+
	5828	+ if (GetUUID().equals(uid))
	5829	+ return this;
	5830	+
	5831	+ int nb = Size();
	5832	+ for (int i = 0; i < nb; i++)
	5833	+ {
	5834	+ Object3D child = (Object3D) get(i);
	5835	+
	5836	+ if (child == null)
	5837	+ continue;
	5838	+
	5839	+ blockloop = true;
	5840	+ Object3D obj = child.GetObject(uid);
	5841	+ blockloop = false;
	5842	+ if (obj != null)
	5843	+ return obj;
	5844	+ }
	5845	+
	5846	+ return null;
	5847	+ }
	5848	+
5254	5849	void SetBumpTexture(String tex)
5255	5850	{
5256	5851	if (GetTextures() == null)
..	..	@@ -5262,6 +5857,8 @@
5262	5857	texname = "";
5263	5858
5264	5859	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
	5860	+
	5861	+ GetTextures().bump = null;
5265	5862
5266	5863	Touch();
5267	5864	}
..	..	@@ -5287,25 +5884,65 @@
5287	5884	}
5288	5885	}
5289	5886
5290		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5887	+ void EmbedTextures(boolean embed)
	5888	+ {
	5889	+ if (blockloop)
	5890	+ return;
	5891	+
	5892	+ //if (GetTextures() != null)
	5893	+ if (embed)
	5894	+ CameraPane.EmbedTextures(GetTextures());
	5895	+ else
	5896	+ {
	5897	+ GetTextures().pigmentdata = null;
	5898	+ GetTextures().bumpdata = null;
	5899	+ GetTextures().pw = 0;
	5900	+ GetTextures().ph = 0;
	5901	+ GetTextures().bw = 0;
	5902	+ GetTextures().bh = 0;
	5903	+ }
	5904	+
	5905	+ int nb = Size();
	5906	+ for (int i = 0; i < nb; i++)
	5907	+ {
	5908	+ Object3D child = (Object3D) get(i);
	5909	+
	5910	+ if (child == null)
	5911	+ continue;
	5912	+
	5913	+ blockloop = true;
	5914	+ child.EmbedTextures(embed);
	5915	+ blockloop = false;
	5916	+ }
	5917	+ }
	5918	+
	5919	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5291	5920	{
5292	5921	Draw(display, root, selected, blocked);
5293	5922	}
5294	5923
5295		- static cMaterial[] materialstack = new cMaterial[65536];
5296		- static boolean[] selectedstack = new boolean[65536];
5297		- static int materialdepth = 0;
5298		-
5299	5924	boolean NeedSupport()
5300	5925	{
5301	5926	return
5302		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5927	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5303	5928	// PROBLEM with CROWD!!
5304		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	5929	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5305	5930	}
5306	5931
	5932	+ static boolean DEBUG_SELECTION = false;
5307	5933
5308		- void Draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5934	+ boolean IsLive()
	5935	+ {
	5936	+ if (live)
	5937	+ return true;
	5938	+
	5939	+ if (parent == null)
	5940	+ return false;
	5941	+
	5942	+ return parent.IsLive();
	5943	+ }
	5944	+
	5945	+ void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5309	5946	{
5310	5947	Invariants(); // june 2013
5311	5948
..	..	@@ -5314,8 +5951,8 @@
5314	5951	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5315	5952	}
5316	5953
5317		- if (display.drawMode == CameraPane.SELECTION &&
5318		- hide)
	5954	+ if (display.DrawMode() == iCameraPane.SELECTION &&
	5955	+ (hide \|\| dontselect))
5319	5956	return;
5320	5957
5321	5958	if (name != null && name.contains("sclera"))
..	..	@@ -5333,7 +5970,7 @@
5333	5970	if (this instanceof Checker)
5334	5971	return;
5335	5972
5336		- if (display.drawMode == display.SHADOW && PASSTEST)
	5973	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5337	5974	return;
5338	5975
5339	5976	if (count <= 0)
..	..	@@ -5341,13 +5978,13 @@
5341	5978	return;
5342	5979	}
5343	5980
5344		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5345		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5981	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	5982	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5346	5983	{
5347	5984	return;
5348	5985	}
5349	5986
5350		- javax.media.opengl.GL gl = display.GetGL();
	5987	+ //javax.media.opengl.GL gl = display.GetGL();
5351	5988
5352	5989	/*
5353	5990	if (touched)
..	..	@@ -5365,8 +6002,10 @@
5365	6002	if (support != null)
5366	6003	support = support;
5367	6004
5368		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5369		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6005	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6006	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6007	+
	6008	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5370	6009
5371	6010	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5372	6011	{
..	..	@@ -5376,30 +6015,33 @@
5376	6015	// usecalllists &= !(parent instanceof RandomNode);
5377	6016	// usecalllists = false;
5378	6017
5379		- if (GetBRep() != null)
5380		- usecalllists = usecalllists;
	6018	+ if (display.DrawMode() == display.SHADOW)
	6019	+ //GetBRep() != null)
	6020	+ usecalllists = !!usecalllists;
5381	6021	//System.out.println("draw " + this);
5382	6022	//new Exception().printStackTrace();
5383	6023
5384	6024	boolean compiled = false;
5385	6025
5386		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6026	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5387	6027
5388		- if (!selectmode && //display.drawMode != display.SELECTION &&
5389		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	6028	+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
	6029	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	6030	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5390	6031	{
5391		- display.lighttouched = true;
	6032	+ Globals.lighttouched = true;
5392	6033	} // all panes...
5393		- //if (usecalllists && display.drawMode != display.SELECTION && display.drawMode != display.SHADOW &&
5394		- if (bRep != null && usecalllists && !selectmode && // june 2013 display.drawMode != display.SHADOW &&
	6034	+
	6035	+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
	6036	+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5395	6037	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5396	6038	{
5397	6039	if (!(this instanceof Composite))
5398	6040	touched = false;
5399	6041	//if (displaylist == -1 && usecalllists)
5400		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6042	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5401	6043	{
5402		- bRep.displaylist = gl.glGenLists(1);
	6044	+ bRep.displaylist = display.GenList();
5403	6045	assert(bRep.displaylist != 0);
5404	6046	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5405	6047	//System.out.println("\tgen list " + list);
..	..	@@ -5408,21 +6050,23 @@
5408	6050
5409	6051	//System.out.println("\tnew list " + list);
5410	6052	//gl.glDrawBuffer(gl.GL_NONE);
5411		- if (usecalllists)
	6053	+ if (usecalllists && bRep.displaylist > 0)
5412	6054	{
5413	6055	// System.err.println("new list " + bRep.displaylist + " for " + this);
5414		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	6056	+ display.NewList(bRep.displaylist);
5415	6057	}
	6058	+
5416	6059	CallList(display, root, selected, blocked);
	6060	+
5417	6061	// compiled = true;
5418		- if (usecalllists)
	6062	+ if (usecalllists && bRep.displaylist > 0)
5419	6063	{
5420	6064	// System.err.println("end list " + bRep.displaylist + " for " + this);
5421		- gl.glEndList();
	6065	+ display.EndList();
5422	6066	}
5423	6067	//gl.glDrawBuffer(gl.GL_BACK);
5424	6068	// XXX touched = false;
5425		- display.lighttouched = true; // all panes...
	6069	+ Globals.lighttouched = true; // all panes...
5426	6070	}
5427	6071
5428	6072	touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
..	..	@@ -5461,12 +6105,12 @@
5461	6105
5462	6106	// frustum culling
5463	6107	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5464		- && display.drawMode != CameraPane.SELECTION)
	6108	+ && display.DrawMode() != iCameraPane.SELECTION)
5465	6109	{
5466		- if (display.drawMode == CameraPane.SHADOW)
	6110	+ if (display.DrawMode() == iCameraPane.SHADOW)
5467	6111	{
5468	6112	if (!link2master // tricky to cull in shadow mode.
5469		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	6113	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5470	6114	{
5471	6115	//System.out.print("CULLED");
5472	6116	culled = true;
..	..	@@ -5474,7 +6118,7 @@
5474	6118	}
5475	6119	else
5476	6120	//GetBRep().getBounds(v0, v1, this);
5477		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	6121	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5478	6122	culled = true;
5479	6123
5480	6124	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5510,11 +6154,12 @@
5510	6154
5511	6155
5512	6156	if (!culled)
5513		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	6157	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5514	6158	{
5515	6159	if (GetBRep() != null)
5516	6160	{
5517		- CameraPane.NextIndex(this, gl);
	6161	+ display.NextIndex();
	6162	+
5518	6163	// vertex color conflict : gl.glCallList(list);
5519	6164	DrawNode(display, root, selected);
5520	6165	if (this instanceof BezierPatch)
..	..	@@ -5536,55 +6181,7 @@
5536	6181	color[2] /= 2;
5537	6182	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5538	6183	*/
5539		- if (material != null)
5540		- {
5541		- materialstack[materialdepth] = material;
5542		- selectedstack[materialdepth] = selected;
5543		- cStatic.objectstack[materialdepth++] = this;
5544		- //System.out.println("material " + material);
5545		- //Applet3D.tracein(this, selected);
5546		- display.vector2buffer = projectedVertices;
5547		- if (this instanceof Camera)
5548		- {
5549		- display.options1[0] = material.shift;
5550		- //System.out.println("shift " + material.shift);
5551		- display.options1[1] = material.lightarea;
5552		- display.options1[2] = material.shadowbias;
5553		- display.options1[3] = material.aniso;
5554		- display.options1[4] = material.anisoV;
5555		- display.options2[0] = material.opacity;
5556		- display.options2[1] = material.diffuse;
5557		- display.options2[2] = material.factor;
5558		-
5559		- cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
5560		- display.options4[0] = material.cameralight/0.2f;
5561		- display.options4[1] = material.subsurface;
5562		- display.options4[2] = material.sheen;
5563		-
5564		- // if (display.CURRENTANTIALIAS > 0)
5565		- // display.options3[3] /= 4;
5566		-
5567		- /*
5568		- System.out.println("Focus = " + display.options1[0]);
5569		- System.out.println("Aperture = " + display.options1[1]);
5570		- System.out.println("ShadowBlur = " + display.options1[2]);
5571		- System.out.println("Antialiasing = " + display.options1[3]);
5572		- System.out.println("Fog = " + display.options2[0]);
5573		- System.out.println("Intensity = " + display.options2[1]);
5574		- System.out.println("Elevation = " + display.options2[2]);
5575		- /**/
5576		- } else
5577		- {
5578		- material.Draw(display, selected);
5579		- }
5580		- } else
5581		- {
5582		- if (selected && CameraPane.flash)
5583		- {
5584		- display.modelParams4[1] = 100;
5585		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5586		- }
5587		- }
	6184	+ display.PushMaterial(this, selected);
5588	6185
5589	6186	//System.out.println("call list " + list);
5590	6187	//System.out.println();
..	..	@@ -5603,7 +6200,28 @@
5603	6200	tex = GetTextures();
5604	6201	}
5605	6202
5606		- display.BindTextures(tex, texres);
	6203	+ boolean failedPigment = false;
	6204	+ boolean failedBump = false;
	6205	+
	6206	+ try
	6207	+ {
	6208	+ display.BindPigmentTexture(tex, texres);
	6209	+ }
	6210	+ catch (Exception e)
	6211	+ {
	6212	+ System.err.println("FAILED: " + this);
	6213	+ failedPigment = true;
	6214	+ }
	6215	+
	6216	+ try
	6217	+ {
	6218	+ display.BindBumpTexture(tex, texres);
	6219	+ }
	6220	+ catch (Exception e)
	6221	+ {
	6222	+ //System.err.println("FAILED: " + this);
	6223	+ failedBump = true;
	6224	+ }
5607	6225
5608	6226	if (!compiled)
5609	6227	{
..	..	@@ -5619,30 +6237,19 @@
5619	6237
5620	6238	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5621	6239	assert(bRep.displaylist != 0);
5622		- gl.glCallList(bRep.displaylist);
	6240	+ display.CallList(bRep.displaylist);
5623	6241	// june 2013 drawSelf(display, root, selected);
5624	6242	}
5625	6243	}
5626	6244	}
5627	6245
5628		- display.ReleaseTextures(tex);
5629		-
5630		- //if (parent != null && parent.GetMaterial() != null)
5631		- // parent.GetMaterial().Draw(display, parent.IsSelected(this));
5632		- if (material != null)
5633		- {
5634		- materialdepth -= 1;
5635		- if (materialdepth > 0)
5636		- {
5637		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5638		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5639		- }
5640		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5641		- } else if (selected && CameraPane.flash && GetMaterial() != null)
5642		- {
5643		- display.modelParams4[1] = GetMaterial().cameralight;
5644		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5645		- }
	6246	+ if (!failedBump)
	6247	+ display.ReleaseBumpTexture(tex);
	6248	+
	6249	+ if (!failedPigment)
	6250	+ display.ReleasePigmentTexture(tex);
	6251	+
	6252	+ display.PopMaterial(this, selected);
5646	6253	}
5647	6254
5648	6255	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5684,7 +6291,7 @@
5684	6291	// resetMasterNode();
5685	6292	}
5686	6293
5687		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6294	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5688	6295	{
5689	6296	if (GetBRep() == null)
5690	6297	{
..	..	@@ -5767,8 +6374,11 @@
5767	6374	boolean flipV = false; // true;
5768	6375	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5769	6376
5770		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6377	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5771	6378	{
	6379	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6380	+ return;
	6381	+
5772	6382	if (hide)
5773	6383	return;
5774	6384	// shadow optimisation
..	..	@@ -5826,16 +6436,7 @@
5826	6436	// // ??????????????????????????? Touch();
5827	6437	// }
5828	6438
5829		- if (material != null)
5830		- {
5831		- materialstack[materialdepth] = material;
5832		- selectedstack[materialdepth] = selected;
5833		- cStatic.objectstack[materialdepth++] = this;
5834		- //System.out.println("material " + material);
5835		- //Applet3D.tracein("selected ", selected);
5836		- display.vector2buffer = projectedVertices;
5837		- material.Draw(display, selected);
5838		- }
	6439	+display.PushMaterial2(this, selected);
5839	6440
5840	6441	Object3D child;
5841	6442	boolean sel;
..	..	@@ -5887,19 +6488,7 @@
5887	6488	*/
5888	6489	//depth += 1;
5889	6490
5890		- if (material != null)
5891		- {
5892		- materialdepth -= 1;
5893		- if (materialdepth > 0)
5894		- {
5895		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5896		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5897		- }
5898		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5899		- //else
5900		- //material.Draw(display, false);
5901		- }
5902		-
	6491	+display.PopMaterial2(this);
5903	6492	/*
5904	6493	display.ReleaseTextures(tex);
5905	6494	*/
..	..	@@ -5910,10 +6499,13 @@
5910	6499
5911	6500	//static cVector min,max;
5912	6501
5913		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	6502	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5914	6503	{
5915		- if (display.drawMode == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	6504	+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5916	6505	return; // no shadow for transparent objects
	6506	+
	6507	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6508	+ return;
5917	6509
5918	6510	if (hide)
5919	6511	return;
..	..	@@ -5955,11 +6547,12 @@
5955	6547	return;
5956	6548	}
5957	6549
	6550	+ //bRep.GenUV(1/material.diffuseness);
5958	6551	// bRep.lock = true;
5959	6552
5960		- javax.media.opengl.GL gl = display.GetGL();
	6553	+ //javax.media.opengl.GL gl = display.GetGL();
5961	6554
5962		- if (CameraPane.BOXMODE) // \|\| CameraPane.movingcamera)
	6555	+ if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5963	6556	{
5964	6557	int fc = bRep.FaceCount();
5965	6558	int vc = bRep.VertexCount();
..	..	@@ -5974,23 +6567,7 @@
5974	6567
5975	6568	bRep.getMinMax(min, max, 100);
5976	6569
5977		- gl.glBegin(gl.GL_LINES);
5978		-
5979		- gl.glVertex3d(min.x, min.y, min.z);
5980		- gl.glVertex3d(min.x, min.y, max.z);
5981		- gl.glVertex3d(min.x, min.y, min.z);
5982		- gl.glVertex3d(min.x, max.y, min.z);
5983		- gl.glVertex3d(min.x, min.y, min.z);
5984		- gl.glVertex3d(max.x, min.y, min.z);
5985		-
5986		- gl.glVertex3d(max.x, max.y, max.z);
5987		- gl.glVertex3d(min.x, max.y, max.z);
5988		- gl.glVertex3d(max.x, max.y, max.z);
5989		- gl.glVertex3d(max.x, min.y, max.z);
5990		- gl.glVertex3d(max.x, max.y, max.z);
5991		- gl.glVertex3d(max.x, max.y, min.z);
5992		-
5993		- gl.glEnd();
	6570	+ display.DrawBox(min, max);
5994	6571
5995	6572	return;
5996	6573	}
..	..	@@ -6034,7 +6611,7 @@
6034	6611	{
6035	6612	//throw new Error();
6036	6613
6037		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6614	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
6038	6615
6039	6616	int[] strips = bRep.getRawIndices();
6040	6617
..	..	@@ -6044,178 +6621,19 @@
6044	6621	new Exception().printStackTrace();
6045	6622	return;
6046	6623	}
6047		-
6048		- // TRIANGLE STRIP ARRAY
6049		- if (bRep.trimmed)
	6624	+
	6625	+ if (dontselect)
6050	6626	{
6051		- float[] v = bRep.getRawVertices();
6052		- float[] n = bRep.getRawNormals();
6053		- float[] c = bRep.getRawColors();
6054		- float[] uv = bRep.getRawUVMap();
6055		-
6056		- int count2 = 0;
6057		- int count3 = 0;
6058		-
6059		- if (n.length > 0)
6060		- {
6061		- for (int i = 0; i < strips.length; i++)
6062		- {
6063		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6064		-
6065		- /*
6066		- boolean locked = false;
6067		- float eps = 0.1f;
6068		- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6069		-
6070		- int dot = 0;
6071		-
6072		- if ((dot&1) == 0)
6073		- dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6074		-
6075		- if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6076		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6077		- else
6078		- {
6079		- locked = true;
6080		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6081		- }
6082		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6083		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6084		- if (hasnorm)
6085		- {
6086		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6087		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6088		- }
6089		-
6090		- if ((dot&4) == 0)
6091		- dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6092		-
6093		- if (wrap \|\| !locked && (dot&8) != 0)
6094		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6095		- else
6096		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6097		-
6098		- f.dot = dot;
6099		- */
6100		-
6101		- if (!selectmode)
6102		- {
6103		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6104		- {
6105		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6106		- } else
6107		- {
6108		- gl.glNormal3f(0, 0, 1);
6109		- }
6110		-
6111		- if (c != null)
6112		- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
6113		- {
6114		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6115		- }
6116		- }
6117		- if (flipV)
6118		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6119		- else
6120		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6121		- //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6122		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6123		-
6124		- count2 += 2;
6125		- count3 += 3;
6126		- if (!selectmode)
6127		- {
6128		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6129		- {
6130		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6131		- } else
6132		- {
6133		- gl.glNormal3f(0, 0, 1);
6134		- }
6135		- if (c != null)
6136		- {
6137		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6138		- }
6139		- }
6140		- if (flipV)
6141		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6142		- else
6143		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6144		- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6145		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6146		-
6147		- count2 += 2;
6148		- count3 += 3;
6149		- for (int j = 0; j < strips[i] - 2; j++)
6150		- {
6151		- //gl.glTexCoord2d(...);
6152		- if (!selectmode)
6153		- {
6154		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6155		- {
6156		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6157		- } else
6158		- {
6159		- gl.glNormal3f(0, 0, 1);
6160		- }
6161		- if (c != null)
6162		- {
6163		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6164		- }
6165		- }
6166		-
6167		- if (flipV)
6168		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6169		- else
6170		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6171		- //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6172		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6173		- count2 += 2;
6174		- count3 += 3;
6175		- }
6176		-
6177		- gl.glEnd();
6178		- }
6179		- }
6180		-
6181		- assert count3 == v.length;
	6627	+ //bRep.GenerateNormalsMINE();
6182	6628	}
6183		- else // !trimmed
6184		- {
6185		- int count = 0;
6186		- for (int i = 0; i < strips.length; i++)
6187		- {
6188		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6189		-
6190		- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6191		- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6192		-
6193		- drawVertex(gl, p, selectmode);
6194		- drawVertex(gl, q, selectmode);
6195		-
6196		- for (int j = 0; j < strips[i] - 2; j++)
6197		- {
6198		- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6199		-
6200		-// if (j%2 == 0)
6201		-// drawFace(p, q, r, display, null);
6202		-// else
6203		-// drawFace(p, r, q, display, null);
6204		-
6205		-// p = q;
6206		-// q = r;
6207		- drawVertex(gl, r, selectmode);
6208		- }
6209		-
6210		- gl.glEnd();
6211		- }
6212		- }
	6629	+
	6630	+ display.DrawGeometry(bRep, flipV, selectmode);
6213	6631	} else // catch (Error e)
6214	6632	{
6215	6633	// TRIANGLE ARRAY
6216	6634	if (IsOpaque()) // Static())
6217	6635	{
6218		- gl.glBegin(gl.GL_TRIANGLES);
	6636	+ display.StartTriangles();
6219	6637	int facecount = bRep.FaceCount();
6220	6638	for (int i = 0; i < facecount; i++)
6221	6639	{
..	..	@@ -6278,9 +6696,9 @@
6278	6696	// // r.norm.dot(v3) > -0.5)
6279	6697	// // continue;
6280	6698
6281		- drawFace(p, q, r, display, face);
	6699	+ display.DrawFace(this, p, q, r, face);
6282	6700	}
6283		- gl.glEnd();
	6701	+ display.EndTriangles();
6284	6702	}
6285	6703	else
6286	6704	{
..	..	@@ -6309,8 +6727,8 @@
6309	6727	//System.out.println("SORT");
6310	6728
6311	6729	java.util.Arrays.sort(facescompare);
6312		-
6313		- gl.glBegin(gl.GL_TRIANGLES);
	6730	+
	6731	+ display.StartTriangles();
6314	6732	for (int i = 0; i < facecount; i++)
6315	6733	{
6316	6734	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6322,13 +6740,14 @@
6322	6740	Vertex q = bRep.GetVertex(face.q);
6323	6741	Vertex r = bRep.GetVertex(face.r);
6324	6742
6325		- drawFace(p, q, r, display, face);
	6743	+ display.DrawFace(this, p, q, r, face);
6326	6744	}
6327		- gl.glEnd();
	6745	+ display.EndTriangles();
6328	6746	}
6329	6747
6330	6748	if (false) // live && support != null && support.bRep != null) // debug weights
6331	6749	{
	6750	+ /*
6332	6751	gl.glDisable(gl.GL_LIGHTING);
6333	6752	float[] colorV = new float[3];
6334	6753
..	..	@@ -6407,6 +6826,7 @@
6407	6826	// gl.glEnd();
6408	6827	}
6409	6828	}
	6829	+ */
6410	6830	}
6411	6831	}
6412	6832
..	..	@@ -6451,7 +6871,7 @@
6451	6871	center.add(r);
6452	6872	center.mul(1.0/3);
6453	6873
6454		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6874	+ center.sub(Globals.theRenderer.EyeCamera().location);
6455	6875
6456	6876	distance = center.dot(center);
6457	6877	}
..	..	@@ -6462,347 +6882,11 @@
6462	6882
6463	6883	transient FaceCompare[] facescompare = null;
6464	6884
6465		- void SetColor(CameraPane display, Vertex p0)
6466		- {
6467		- if (display.RENDERPROGRAM == 0)
6468		- {
6469		- float r = 0;
6470		- if (bRep != null)
6471		- {
6472		- if (bRep.stripified)
6473		- {
6474		- r = 1;
6475		- }
6476		- }
6477		- float g = 0;
6478		- if (bRep != null)
6479		- {
6480		- if (bRep.trimmed)
6481		- {
6482		- g = 1;
6483		- }
6484		- }
6485		- float b = 0;
6486		- if (support != null && link2master)
6487		- {
6488		- b = 1;
6489		- }
6490		- display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
6491		- return;
6492		- }
6493		-
6494		- if (display.drawMode != CameraPane.SHADOW)
6495		- return;
6496		-
6497		- javax.media.opengl.GL gl = display.GetGL();
6498		-// if (true) return;
6499		-// float ao = p.AO;
6500		-//
6501		-// // if (ao == 0 && !bRep.AOdone) // transient problem!
6502		-// // ao = 1;
6503		-//
6504		-// gl.glColor4f(ao, ao, ao, 1);
6505		-
6506		-// CameraPane.selectedpoint.
6507		-// getAverage(cStatic.point1, true);
6508		- if (CameraPane.pointflow == null) // !random) // live)
6509		- {
6510		- return;
6511		- }
6512		-
6513		- cStatic.point1.set(0,0,0);
6514		- LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
6515		-
6516		- cStatic.point1.sub(p0);
6517		-
6518		-
6519		-// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
6520		-// {
6521		-// return;
6522		-// }
6523		-
6524		- //if (true)
6525		- if (cStatic.point1.dot(cStatic.point1) > 0.000001)
6526		- {
6527		- return;
6528		- }
6529		-
6530		- float[] colorV = new float[3];
6531		-
6532		- if (false) // marked)
6533		- {
6534		- // debug rigging weights
6535		- for (int object = 0; object < p0.vertexlinks.length; object++)
6536		- {
6537		- float weight = p0.weights[object] / p0.totalweight;
6538		-
6539		- // if (weight < 0.1)
6540		- // {
6541		- // assert(weight == 0);
6542		- // continue;
6543		- // }
6544		-
6545		- if (p0.vertexlinks[object] == -1)
6546		- continue;
6547		-
6548		- Vertex q = support.bRep.GetVertex(p0.vertexlinks[object]);
6549		-
6550		- int color = //1 << object; //
6551		- //p.vertexlinks.length;
6552		- support.bRep.supports[p0.closestsupport].links[object];
6553		- colorV[2] += (color & 1) * weight;
6554		- colorV[1] += ((color & 2) >> 1) * weight;
6555		- colorV[0] += ((color & 4) >> 2) * weight;
6556		- }
6557		- }
6558		- else
6559		- {
6560		- if (drawingstarted)
6561		- {
6562		- // find next point
6563		- if (bRep.GetVertex(0).faceindices == null)
6564		- {
6565		- bRep.InitFaceIndices();
6566		- }
6567		-
6568		- double ymin = p0.y;
6569		-
6570		- Vertex newp = p0;
6571		-
6572		- for (int fii = 0; fii < p0.faceindices.length; fii++)
6573		- {
6574		- int fi = p0.faceindices[fii];
6575		-
6576		- if (fi == -1)
6577		- break;
6578		-
6579		- Face f = bRep.GetFace(fi);
6580		-
6581		- Vertex p = bRep.GetVertex(f.p);
6582		- Vertex q = bRep.GetVertex(f.q);
6583		- Vertex r = bRep.GetVertex(f.r);
6584		-
6585		- int swap = (int)(Math.random()*3);
6586		-
6587		-// for (int s=swap; --s>=0;)
6588		-// {
6589		-// Vertex t = p;
6590		-// p = q;
6591		-// q = r;
6592		-// r = t;
6593		-// }
6594		- if (ymin > p.y)
6595		- {
6596		- ymin = p.y;
6597		- newp = p;
6598		-// break;
6599		- }
6600		- if (ymin > q.y)
6601		- {
6602		- ymin = q.y;
6603		- newp = q;
6604		-// break;
6605		- }
6606		- if (ymin > r.y)
6607		- {
6608		- ymin = r.y;
6609		- newp = r;
6610		-// break;
6611		- }
6612		- }
6613		-
6614		- CameraPane.selectedpoint.toParent[3][0] = newp.x;
6615		- CameraPane.selectedpoint.toParent[3][1] = newp.y;
6616		- CameraPane.selectedpoint.toParent[3][2] = newp.z;
6617		-
6618		- drawingstarted = false;
6619		-
6620		- // return;
6621		- }
6622		-
6623		- if (false) // CameraPane.DRAW
6624		- {
6625		- p0.AO = colorV[0] = 2;
6626		- colorV[1] = 2;
6627		- colorV[2] = 2;
6628		- }
6629		-
6630		- CameraPane.pointflow.add(p0);
6631		- CameraPane.pointflow.Touch();
6632		- }
6633		-
6634		-// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
6635		-// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
6636		-// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
6637		- }
6638		-
6639	6885	void Print(Vertex v)
6640	6886	{
6641	6887	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6642	6888	}
6643	6889
6644		- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6645		- {
6646		- if (!selectmode)
6647		- {
6648		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6649		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6650		-
6651		- if (flipV)
6652		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6653		- else
6654		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6655		- }
6656		-
6657		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6658		- }
6659		-
6660		- void drawFace(Vertex pv, Vertex qv, Vertex rv,
6661		- CameraPane display, Face face)
6662		- {
6663		- if (pv.y == -10000 \|\|
6664		- qv.y == -10000 \|\|
6665		- rv.y == -10000)
6666		- return;
6667		-
6668		-// float b = f.nbiterations & 1;
6669		-// float g = (f.nbiterations>>1) & 1;
6670		-// float r = (f.nbiterations>>2) & 1;
6671		-//
6672		-// //if (f.weight == 10000)
6673		-// //{
6674		-// // r = 1; g = b = 0;
6675		-// //}
6676		-// //else
6677		-// //{
6678		-// // assert(f.weight < 10000);
6679		-// r = g = b = (float)bRep.FaceWeight(f)*100;
6680		-// if (r<0)
6681		-// assert(r>=0);
6682		-// //}
6683		-
6684		- javax.media.opengl.GL gl = display.GetGL();
6685		-
6686		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
6687		-
6688		- //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
6689		- if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
6690		- {
6691		- //gl.glBegin(gl.GL_TRIANGLES);
6692		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
6693		- if (!hasnorm)
6694		- {
6695		- // System.out.println("FUCK!!");
6696		- LA.vecSub(pv/.pos/, qv/.pos/, v0);
6697		- LA.vecSub(pv/.pos/, rv/.pos/, v1);
6698		- LA.vecCross(v0, v1, v2);
6699		- LA.vecNormalize(v2);
6700		- gl.glNormal3f((float) v2.x, (float) v2.y, (float) v2.z);
6701		- }
6702		-
6703		- if (hasnorm)
6704		- {
6705		-// if (!pv.norm.normalized())
6706		-// assert(pv.norm.normalized());
6707		-
6708		- //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
6709		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6710		- }
6711		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6712		- SetColor(display, pv);
6713		- //gl.glColor4f(r, g, b, 1);
6714		- //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
6715		- if (flipV)
6716		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6717		- else
6718		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6719		- //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
6720		- gl.glVertex3f((float) pv./pos./x, (float) pv./pos./y, (float) pv./pos./z);
6721		-// Print(pv);
6722		- if (hasnorm)
6723		- {
6724		-// assert(qv.norm.normalized());
6725		- //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
6726		- gl.glNormal3f((float) qv.norm.x, (float) qv.norm.y, (float) qv.norm.z);
6727		- }
6728		- //System.out.println("vertexq = " + qv.s + ", " + qv.t);
6729		- // boolean locked = false;
6730		- // float eps = 0.1f;
6731		- // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6732		-
6733		- // int dot = 0; //*/ (int)f.dot;
6734		-
6735		- // if ((dot&1) == 0)
6736		- // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6737		-
6738		- // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6739		- if (flipV)
6740		- gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
6741		- else
6742		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6743		- // else
6744		- // {
6745		- // locked = true;
6746		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6747		- // }
6748		- gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
6749		- SetColor(display, qv);
6750		- //gl.glColor4f(r, g, b, 1);
6751		- //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
6752		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6753		- gl.glVertex3f((float) qv./pos./x, (float) qv./pos./y, (float) qv./pos./z);
6754		-// Print(qv);
6755		- if (hasnorm)
6756		- {
6757		-// assert(rv.norm.normalized());
6758		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6759		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6760		- }
6761		-
6762		- // if ((dot&4) == 0)
6763		- // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6764		-
6765		- // if (wrap \|\| !locked && (dot&8) != 0)
6766		- if (flipV)
6767		- gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
6768		- else
6769		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6770		- // else
6771		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6772		-
6773		- // f.dot = dot;
6774		-
6775		- gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
6776		- SetColor(display, rv);
6777		- //gl.glColor4f(r, g, b, 1);
6778		- //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
6779		- //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
6780		- gl.glVertex3f((float) rv./pos./x, (float) rv./pos./y, (float) rv./pos./z);
6781		-// Print(rv);
6782		- //gl.glEnd();
6783		- }
6784		- else
6785		- {
6786		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6787		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6788		- gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
6789		-
6790		- }
6791		-
6792		- if (false) // (attributes & WIREFRAME) != 0)
6793		- {
6794		- gl.glDisable(gl.GL_LIGHTING);
6795		-
6796		- gl.glBegin(gl.GL_LINE_LOOP);
6797		- gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
6798		- gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
6799		- gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
6800		- gl.glEnd();
6801		-
6802		- gl.glEnable(gl.GL_LIGHTING);
6803		- }
6804		- }
6805		-
6806	6890	void drawSelf(ClickInfo info, int level, boolean select)
6807	6891	{
6808	6892	if (bRep == null)
..	..	@@ -7326,20 +7410,23 @@
7326	7410	}
7327	7411	}
7328	7412
7329		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7413	+ static ClickInfo clickInfo = new ClickInfo();
	7414	+
	7415	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7416	+ Point outPt, Rectangle outRec)
7330	7417	{
7331		- int hc = info.bounds.x + info.bounds.width / 2;
7332		- int vc = info.bounds.y + info.bounds.height / 2;
7333		- double[][] toscreen = info.toScreen;
	7418	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7419	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7420	+ double[][] toscreen = clickInfo.toScreen;
7334	7421	if (toscreen == null)
7335	7422	{
7336		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7423	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7337	7424	}
7338	7425	cVector vec = in;
7339	7426	LA.xformPos(in, toscreen, in);
7340	7427	//System.out.println("Distance = " + info.camera.Distance());
7341		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7342		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7428	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7429	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7343	7430	outPt.x = hc + (int) vec.x;
7344	7431	outPt.y = vc - (int) vec.y;
7345	7432	outRec.x = outPt.x - 3;
..	..	@@ -7347,15 +7434,18 @@
7347	7434	outRec.width = outRec.height = 6;
7348	7435	}
7349	7436
7350		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7437	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7438	+ )
7351	7439	{
7352	7440	Point pt = new Point(0, 0);
7353	7441	Rectangle rec = new Rectangle();
7354		- calcHotSpot(in, info, pt, rec);
	7442	+ calcHotSpot(in, //clickInfo,
	7443	+ pt, rec);
7355	7444	return rec;
7356	7445	}
7357	7446
7358		- void drawEditHandles0(ClickInfo info, int level)
	7447	+ void drawEditHandles0(//ClickInfo clickInfo,
	7448	+ int level)
7359	7449	{
7360	7450	if (level == 0)
7361	7451	{
..	..	@@ -7364,98 +7454,104 @@
7364	7454	{
7365	7455	cVector origin = new cVector();
7366	7456	//LA.xformPos(origin, toParent, origin);
7367		- Rectangle spot = calcHotSpot(origin, info);
	7457	+ if (this.clickInfo == null)
	7458	+ this.clickInfo = new ClickInfo();
	7459	+
	7460	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7368	7461	Rectangle boundary = new Rectangle();
7369	7462	boundary.x = spot.x - 30;
7370	7463	boundary.y = spot.y - 30;
7371	7464	boundary.width = spot.width + 60;
7372	7465	boundary.height = spot.height + 60;
7373		- info.g.setColor(Color.red);
	7466	+ clickInfo.g.setColor(Color.white);
7374	7467	int spotw = spot.x + spot.width;
7375	7468	int spoth = spot.y + spot.height;
7376		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7377		- if (CameraPane.Xmin > spot.x)
7378		- {
7379		- CameraPane.Xmin = spot.x;
7380		- }
7381		- if (CameraPane.Xmax < spotw)
7382		- {
7383		- CameraPane.Xmax = spotw;
7384		- }
7385		- if (CameraPane.Ymin > spot.y)
7386		- {
7387		- CameraPane.Ymin = spot.y;
7388		- }
7389		- if (CameraPane.Ymax < spoth)
7390		- {
7391		- CameraPane.Ymax = spoth;
7392		- }
7393		- spot.translate(32, 32);
	7469	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7470	+// if (CameraPane.Xmin > spot.x)
	7471	+// {
	7472	+// CameraPane.Xmin = spot.x;
	7473	+// }
	7474	+// if (CameraPane.Xmax < spotw)
	7475	+// {
	7476	+// CameraPane.Xmax = spotw;
	7477	+// }
	7478	+// if (CameraPane.Ymin > spot.y)
	7479	+// {
	7480	+// CameraPane.Ymin = spot.y;
	7481	+// }
	7482	+// if (CameraPane.Ymax < spoth)
	7483	+// {
	7484	+// CameraPane.Ymax = spoth;
	7485	+// }
	7486	+// if (CameraPane.Xmin > spot.x)
	7487	+// {
	7488	+// CameraPane.Xmin = spot.x;
	7489	+// }
	7490	+// if (CameraPane.Xmax < spotw)
	7491	+// {
	7492	+// CameraPane.Xmax = spotw;
	7493	+// }
	7494	+// if (CameraPane.Ymin > spot.y)
	7495	+// {
	7496	+// CameraPane.Ymin = spot.y;
	7497	+// }
	7498	+// if (CameraPane.Ymax < spoth)
	7499	+// {
	7500	+// CameraPane.Ymax = spoth;
	7501	+// }
	7502	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7503	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
	7504	+ spot.translate(32, 0);
	7505	+ clickInfo.g.setColor(Color.yellow);
	7506	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7507	+
	7508	+ spot.translate(32, 64);
7394	7509	spotw = spot.x + spot.width;
7395	7510	spoth = spot.y + spot.height;
7396		- info.g.setColor(Color.blue);
7397		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7398		- if (CameraPane.Xmin > spot.x)
7399		- {
7400		- CameraPane.Xmin = spot.x;
7401		- }
7402		- if (CameraPane.Xmax < spotw)
7403		- {
7404		- CameraPane.Xmax = spotw;
7405		- }
7406		- if (CameraPane.Ymin > spot.y)
7407		- {
7408		- CameraPane.Ymin = spot.y;
7409		- }
7410		- if (CameraPane.Ymax < spoth)
7411		- {
7412		- CameraPane.Ymax = spoth;
7413		- }
7414		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7415		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7416		- spot.translate(0, -32);
7417		- info.g.setColor(Color.green);
7418		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7419		- if (CameraPane.Xmin > spot.x)
7420		- {
7421		- CameraPane.Xmin = spot.x;
7422		- }
7423		- if (CameraPane.Xmax < spotw)
7424		- {
7425		- CameraPane.Xmax = spotw;
7426		- }
7427		- if (CameraPane.Ymin > spot.y)
7428		- {
7429		- CameraPane.Ymin = spot.y;
7430		- }
7431		- if (CameraPane.Ymax < spoth)
7432		- {
7433		- CameraPane.Ymax = spoth;
7434		- }
7435		- info.g.drawArc(boundary.x, boundary.y,
7436		- boundary.width, boundary.height, 0, 360);
	7511	+ clickInfo.g.setColor(Color.cyan);
	7512	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	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	+ clickInfo.g.setColor(Color.green);
	7530	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7531	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7437	7532	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7438		- if (CameraPane.Xmin > boundary.x)
7439		- {
7440		- CameraPane.Xmin = boundary.x;
7441		- }
7442		- if (CameraPane.Xmax < boundary.x + boundary.width)
7443		- {
7444		- CameraPane.Xmax = boundary.x + boundary.width;
7445		- }
7446		- if (CameraPane.Ymin > boundary.y)
7447		- {
7448		- CameraPane.Ymin = boundary.y;
7449		- }
7450		- if (CameraPane.Ymax < boundary.y + boundary.height)
7451		- {
7452		- CameraPane.Ymax = boundary.y + boundary.height;
7453		- }
	7533	+// if (CameraPane.Xmin > boundary.x)
	7534	+// {
	7535	+// CameraPane.Xmin = boundary.x;
	7536	+// }
	7537	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	7538	+// {
	7539	+// CameraPane.Xmax = boundary.x + boundary.width;
	7540	+// }
	7541	+// if (CameraPane.Ymin > boundary.y)
	7542	+// {
	7543	+// CameraPane.Ymin = boundary.y;
	7544	+// }
	7545	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	7546	+// {
	7547	+// CameraPane.Ymax = boundary.y + boundary.height;
	7548	+// }
7454	7549	return;
7455	7550	}
7456	7551	}
7457	7552
7458		- boolean doEditClick0(ClickInfo info, int level)
	7553	+ boolean doEditClick0(//ClickInfo clickInfo,
	7554	+ int level)
7459	7555	{
7460	7556	if (level == 0)
7461	7557	{
..	..	@@ -7464,10 +7560,10 @@
7464	7560
7465	7561	boolean retval = false;
7466	7562
7467		- startX = info.x;
7468		- startY = info.y;
	7563	+ startX = clickInfo.x;
	7564	+ startY = clickInfo.y;
7469	7565
7470		- hitSomething = 0;
	7566	+ hitSomething = -1;
7471	7567	cVector origin = new cVector();
7472	7568	//LA.xformPos(origin, toParent, origin);
7473	7569	Rectangle spot = new Rectangle();
..	..	@@ -7475,22 +7571,53 @@
7475	7571	{
7476	7572	centerPt = new Point(0, 0);
7477	7573	}
7478		- calcHotSpot(origin, info, centerPt, spot);
7479		- if (spot.contains(info.x, info.y))
	7574	+ calcHotSpot(origin, //info,
	7575	+ centerPt, spot);
	7576	+ if (spot.contains(clickInfo.x, clickInfo.y))
7480	7577	{
7481	7578	hitSomething = hitCenter;
7482	7579	retval = true;
7483	7580	}
7484	7581	spot.translate(32, 0);
7485		- if (spot.contains(info.x, info.y))
	7582	+ if (spot.contains(clickInfo.x, clickInfo.y))
7486	7583	{
7487	7584	hitSomething = hitRotate;
7488	7585	retval = true;
7489	7586	}
7490	7587	spot.translate(0, 32);
7491		- if (spot.contains(info.x, info.y))
	7588	+ spot.translate(32, 0);
	7589	+ spot.translate(0, 32);
	7590	+ if (spot.contains(clickInfo.x, clickInfo.y))
7492	7591	{
7493	7592	hitSomething = hitScale;
	7593	+
	7594	+ double scale = 0.005f * clickInfo.camera.Distance();
	7595	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7596	+ double sign = 1;
	7597	+ if (hScale < 0)
	7598	+ {
	7599	+ sign = -1;
	7600	+ }
	7601	+ hScale = signMath.pow(signhScale, scale * 50);
	7602	+ if (hScale < 0.01)
	7603	+ {
	7604	+ //hScale = 0.01;
	7605	+ }
	7606	+
	7607	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7608	+ sign = 1;
	7609	+ if (vScale < 0)
	7610	+ {
	7611	+ sign = -1;
	7612	+ }
	7613	+ vScale = signMath.pow(signvScale, scale * 50);
	7614	+ if (vScale < 0.01)
	7615	+ {
	7616	+ //vScale = 0.01;
	7617	+ }
	7618	+
	7619	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7620	+
7494	7621	retval = true;
7495	7622	}
7496	7623
..	..	@@ -7500,7 +7627,7 @@
7500	7627	}
7501	7628
7502	7629	//System.out.println("info.modifiers = " + info.modifiers);
7503		- modified = (info.modifiers & CameraPane.META) != 0;
	7630	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7504	7631	//System.out.println("modified = " + modified);
7505	7632	//new Exception().printStackTrace();
7506	7633	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7528,7 +7655,8 @@
7528	7655	return true;
7529	7656	}
7530	7657
7531		- void doEditDrag0(ClickInfo info)
	7658	+ void doEditDrag0(//ClickInfo info,
	7659	+ boolean opposite)
7532	7660	{
7533	7661	if (hitSomething == 0)
7534	7662	{
..	..	@@ -7542,7 +7670,8 @@
7542	7670
7543	7671	//System.out.println("hitSomething = " + hitSomething);
7544	7672
7545		- double scale = 0.005f * info.camera.Distance();
	7673	+ double scale = 0.005f * clickInfo.camera.Distance();
	7674	+
7546	7675	cVector xlate = new cVector();
7547	7676	//cVector xlate2 = new cVector();
7548	7677	switch (hitSomething)
..	..	@@ -7553,9 +7682,9 @@
7553	7682
7554	7683	case hitCenter: // Translate
7555	7684
7556		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7685	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7557	7686
7558		- if (modified)
	7687	+ if (modified \|\| opposite)
7559	7688	{
7560	7689	//assert(false);
7561	7690	/*
..	..	@@ -7575,8 +7704,8 @@
7575	7704	toParent[3][i] = xlate.get(i);
7576	7705	LA.matInvert(toParent, fromParent);
7577	7706	*/
7578		- cVector delta = LA.newVector(0, 0, startY - info.y);
7579		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7707	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7708	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7580	7709
7581	7710	LA.matCopy(startMat, toParent);
7582	7711	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7585,7 +7714,7 @@
7585	7714	} else
7586	7715	{
7587	7716	//LA.xformDir(delta, info.camera.fromScreen, delta);
7588		- cVector up = new cVector(info.camera.up);
	7717	+ cVector up = new cVector(clickInfo.camera.up);
7589	7718	cVector away = new cVector();
7590	7719	//cVector right2 = new cVector();
7591	7720	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7601,20 +7730,20 @@
7601	7730	}
7602	7731	LA.xformDir(up, ClickInfo.matbuffer, up);
7603	7732	// if (!CameraPane.LOCALTRANSFORM)
7604		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
7605		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7733	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
	7734	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7606	7735	// if (!CameraPane.LOCALTRANSFORM)
7607		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7736	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7608	7737	//LA.vecCross(up, cVector.Z, right2);
7609	7738
7610		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7739	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7611	7740
7612	7741	//System.out.println("DELTA0 = " + delta);
7613	7742	//System.out.println("AWAY = " + info.camera.away);
7614	7743	//System.out.println("UP = " + info.camera.up);
7615	7744	if (away.z > 0)
7616	7745	{
7617		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7746	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7618	7747	{
7619	7748	delta.x = -delta.x;
7620	7749	} else
..	..	@@ -7629,7 +7758,7 @@
7629	7758	//System.out.println("DELTA1 = " + delta);
7630	7759	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7631	7760	//System.out.println("DELTA2 = " + delta);
7632		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7761	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7633	7762	LA.matCopy(startMat, toParent);
7634	7763	//System.out.println("DELTA3 = " + delta);
7635	7764	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7639,8 +7768,8 @@
7639	7768	break;
7640	7769
7641	7770	case hitRotate: // rotate
7642		- int dx = info.x - centerPt.x;
7643		- int dy = -(info.y - centerPt.y);
	7771	+ int dx = clickInfo.x - centerPt.x;
	7772	+ int dy = -(clickInfo.y - centerPt.y);
7644	7773	double angle = (double) Math.atan2(dx, dy);
7645	7774	angle = -(1.570796 - angle);
7646	7775
..	..	@@ -7649,6 +7778,7 @@
7649	7778
7650	7779	if (modified)
7651	7780	{
	7781	+ // Rotate 90 degrees
7652	7782	angle /= (Math.PI / 4);
7653	7783	angle = Math.floor(angle + 0.5);
7654	7784	angle *= (Math.PI / 4);
..	..	@@ -7662,7 +7792,7 @@
7662	7792	}
7663	7793	/**/
7664	7794
7665		- switch (info.pane.renderCamera.viewCode)
	7795	+ switch (clickInfo.pane.RenderCamera().viewCode)
7666	7796	{
7667	7797	case 1: // '\001'
7668	7798	LA.matZRotate(toParent, angle);
..	..	@@ -7689,26 +7819,30 @@
7689	7819	break;
7690	7820
7691	7821	case hitScale: // scale
7692		- double hScale = (double) (info.x - centerPt.x) / 32;
	7822	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7823	+ double sign = 1;
	7824	+ if (hScale < 0)
	7825	+ {
	7826	+ sign = -1;
	7827	+ }
	7828	+ hScale = signMath.pow(signhScale, scale * 50);
7693	7829	if (hScale < 0.01)
7694	7830	{
7695		- hScale = 0.01;
	7831	+ //hScale = 0.01;
7696	7832	}
7697		- hScale = Math.pow(hScale, scale * 50);
7698		- if (hScale < 0.01)
	7833	+
	7834	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7835	+ sign = 1;
	7836	+ if (vScale < 0)
7699	7837	{
7700		- hScale = 0.01;
	7838	+ sign = -1;
7701	7839	}
7702		- double vScale = (double) (info.y - centerPt.y) / 32;
	7840	+ vScale = signMath.pow(signvScale, scale * 50);
7703	7841	if (vScale < 0.01)
7704	7842	{
7705		- vScale = 0.01;
	7843	+ //vScale = 0.01;
7706	7844	}
7707		- vScale = Math.pow(vScale, scale * 50);
7708		- if (vScale < 0.01)
7709		- {
7710		- vScale = 0.01;
7711		- }
	7845	+
7712	7846	LA.matCopy(startMat, toParent);
7713	7847	/**/
7714	7848	for (int i = 0; i < 3; i++)
..	..	@@ -7718,39 +7852,56 @@
7718	7852	}
7719	7853	/**/
7720	7854
7721		- switch (info.pane.renderCamera.viewCode)
	7855	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
	7856	+
	7857	+ if (totalScale < 0.01)
	7858	+ {
	7859	+ totalScale = 0.01;
	7860	+ }
	7861	+
	7862	+ switch (clickInfo.pane.RenderCamera().viewCode)
7722	7863	{
7723	7864	case 3: // '\001'
7724		- if (modified)
	7865	+ if (modified \|\| opposite)
7725	7866	{
	7867	+ if (modified && opposite)
	7868	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7869	+ else
7726	7870	//LA.matScale(toParent, 1, hScale, vScale);
7727		- LA.matScale(toParent, vScale, 1, 1);
	7871	+ LA.matScale(toParent, totalScale, 1, 1);
7728	7872	} // vScale, 1);
7729	7873	else
7730	7874	{
7731		- LA.matScale(toParent, vScale, vScale, vScale);
	7875	+ // EXCEPTION!
	7876	+ LA.matScale(toParent, 1, totalScale, totalScale);
7732	7877	} // vScale, 1);
7733	7878	break;
7734	7879
7735	7880	case 2: // '\002'
7736		- if (modified)
	7881	+ if (modified \|\| opposite)
7737	7882	{
7738		- //LA.matScale(toParent, hScale, 1, vScale);
7739		- LA.matScale(toParent, 1, vScale, 1);
	7883	+ if (modified && opposite)
	7884	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7885	+ else
	7886	+ //LA.matScale(toParent, hScale, 1, vScale);
	7887	+ LA.matScale(toParent, 1, totalScale, 1);
7740	7888	} else
7741	7889	{
7742		- LA.matScale(toParent, vScale, 1, vScale);
	7890	+ LA.matScale(toParent, totalScale, 1, totalScale);
7743	7891	}
7744	7892	break;
7745	7893
7746	7894	case 1: // '\003'
7747		- if (modified)
	7895	+ if (modified \|\| opposite)
7748	7896	{
7749		- //LA.matScale(toParent, hScale, vScale, 1);
7750		- LA.matScale(toParent, 1, 1, vScale);
	7897	+ if (modified && opposite)
	7898	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7899	+ else
	7900	+ //LA.matScale(toParent, hScale, vScale, 1);
	7901	+ LA.matScale(toParent, 1, 1, totalScale);
7751	7902	} else
7752	7903	{
7753		- LA.matScale(toParent, vScale, vScale, 1);
	7904	+ LA.matScale(toParent, totalScale, totalScale, 1);
7754	7905	}
7755	7906	break;
7756	7907	}
..	..	@@ -7784,7 +7935,7 @@
7784	7935	} // NEW ...
7785	7936
7786	7937
7787		- info.pane.repaint();
	7938	+ clickInfo.pane.repaint();
7788	7939	}
7789	7940
7790	7941	boolean overflow = false;
..	..	@@ -7883,14 +8034,22 @@
7883	8034	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7884	8035	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7885	8036	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	8037	+
	8038	+ String objname;
	8039	+
7886	8040	if (false) //parent != null)
7887	8041	{
7888		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	8042	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7889	8043	} else
7890	8044	{
7891		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	8045	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7892	8046	} // + super.toString();
7893	8047	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	8048	+
	8049	+ if (!Globals.ADVANCED)
	8050	+ return objname;
	8051	+
	8052	+ return objname + " " + System.identityHashCode(this);
7894	8053	}
7895	8054
7896	8055	public int hashCode()
..	..	@@ -7946,6 +8105,7 @@
7946	8105	objectUI.closeUI();
7947	8106	if (editWindow != null)
7948	8107	{
	8108	+ editWindow.ctrlPanel.FlushUI();
7949	8109	editWindow.refreshContents();
7950	8110	} // ? new
7951	8111	objectUI = null;
..	..	@@ -7954,6 +8114,10 @@
7954	8114	{
7955	8115	editWindow = null;
7956	8116	} // ?
	8117	+ }
	8118	+ else
	8119	+ {
	8120	+ //editWindow.closeUI();
7957	8121	}
7958	8122	}
7959	8123
..	..	@@ -7966,7 +8130,7 @@
7966	8130	/transient/ cVector2[] projectedVertices = new cVector2[0];
7967	8131
7968	8132	Object3D /Composite/ parent;
7969		- Object3D /Composite/ fileparent;
	8133	+ Object3D /Composite/ fileparent; // In the case of FileObject
7970	8134
7971	8135	double[][] toParent; // dynamic matrix
7972	8136	double[][] fromParent;
..	..	@@ -8081,7 +8245,7 @@
8081	8245	{
8082	8246	assert(bRep != null);
8083	8247	if (!(support instanceof GenericJoint)) // support.bRep != null)
8084		- GrafreeD.Assert(support.bRep == bRep.support);
	8248	+ Grafreed.Assert(support.bRep == bRep.support);
8085	8249	}
8086	8250	else
8087	8251	{
..	..	@@ -8112,6 +8276,10 @@
8112	8276	}
8113	8277
8114	8278	transient ObjEditor editWindow;
	8279	+ transient ObjEditor manipWindow;
	8280	+
	8281	+ transient boolean pinned;
	8282	+
8115	8283	transient ObjectUI objectUI;
8116	8284	public static int povDepth = 0;
8117	8285	private static cVector tbMin = new cVector();
..	..	@@ -8130,9 +8298,9 @@
8130	8298	private static cVector edge2 = new cVector();
8131	8299	//private static cVector norm = new cVector();
8132	8300	/transient private/ int hitSomething;
8133		- private static final int hitCenter = 1;
8134		- private static final int hitScale = 2;
8135		- private static final int hitRotate = 3;
	8301	+ static final int hitCenter = 1;
	8302	+ static final int hitScale = 2;
	8303	+ static final int hitRotate = 3;
8136	8304	/transient/ /private/ int viewCode; // Now used for transparency cache flag
8137	8305	/transient/ private Point centerPt;
8138	8306	/transient/ private int startX;
..	..	@@ -8164,6 +8332,8 @@
8164	8332	{
8165	8333	Object3D targ = this;
8166	8334
	8335	+ targ.NORMALPUSH = obj.NORMALPUSH;
	8336	+
8167	8337	if (obj.material != null)
8168	8338	{
8169	8339	if ((mask&MATERIAL)!=0) // ==(COLOR\|MATERIAL))