~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,201 @@
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	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	276	+ {
	277	+ if (!hashtable.containsKey(GetUUID()))
	278	+ return;
	279	+
	280	+ Object3D o = hashtable.get(GetUUID());
	281	+
	282	+ RestoreBigData(o);
	283	+
	284	+ if (blockloop)
	285	+ return;
	286	+
116	287	blockloop = true;
117		- child.SaveSupports();
	288	+
	289	+ //hashtable.remove(GetUUID());
	290	+
	291	+ for (int i=0; i<Size(); i++)
	292	+ {
	293	+ get(i).RestoreBigData(hashtable);
	294	+ }
	295	+
118	296	blockloop = false;
119	297	}
120		-}
121	298
122		-void RestoreSupports()
123		-{
124		- if (blockloop)
125		- return;
126		-
127		- support = transientsupport;
128		- link2master = transientlink2master;
129		- transientsupport = null;
130		- transientlink2master = false;
131		-
132		- if (bRep != null)
	299	+ void RestoreBigData(Object3D o)
133	300	{
134		- bRep.RestoreSupports();
	301	+ this.bRep = o.bRep;
	302	+ if (this.support != null && o.transientrep != null)
	303	+ {
	304	+ this.support.bRep = o.transientrep;
	305	+ }
	306	+
	307	+ this.selection = o.selection;
	308	+
	309	+ this.versionlist = o.versionlist;
	310	+ this.versionindex = o.versionindex;
	311	+// July 2019 if (this.bRep != null)
	312	+// this.bRep.support = o.transientrep;
	313	+ // this.support = o.support;
	314	+ // this.fileparent = o.fileparent;
135	315	}
136		-
137		- for (int i = 0; i < Size(); i++)
138		- {
139		- Object3D child = (Object3D) get(i);
140		- if (child == null)
141		- continue;
142		- blockloop = true;
143		- child.RestoreSupports();
144		- blockloop = false;
145		- }
146		-}
147	316
148	317	// MOCAP SUPPORT
149	318	double tx,ty,tz,rx,ry,rz;
..	..	@@ -285,8 +454,9 @@
285	454	return parent.GetName() + "#";
286	455	}
287	456
288		- boolean timeline = false;
289	457	boolean live = false;
	458	+ transient boolean keepdontselect;
	459	+ boolean dontselect = false;
290	460	boolean hide = false;
291	461	boolean link2master = false; // performs reset support/master at each frame
292	462	boolean marked = false; // animation node
..	..	@@ -296,6 +466,8 @@
296	466	boolean random = false;
297	467	boolean speedup = false;
298	468	boolean rewind = false;
	469	+
	470	+ float NORMALPUSH = 0;
299	471
300	472	Object3D support;
301	473
..	..	@@ -416,16 +588,16 @@
416	588	{
417	589	Object3D copy = this;
418	590
419		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	591	+ Camera parentcam = Globals.theRenderer.ManipCamera();
420	592
421		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	593	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
422	594	{
423		- parentcam = CameraPane.theRenderer.cameras[1];
	595	+ parentcam = Globals.theRenderer.Cameras()[1];
424	596	}
425	597
426		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	598	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
427	599	{
428		- parentcam = CameraPane.theRenderer.cameras[0];
	600	+ parentcam = Globals.theRenderer.Cameras()[0];
429	601	}
430	602
431	603	if (this == parentcam)
..	..	@@ -433,7 +605,7 @@
433	605	//assert(this instanceof Camera);
434	606
435	607	for (int count = parentcam.GetTransformCount(); --count>=0;)
436		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	608	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
437	609	}
438	610
439	611	copy.marked ^= true;
..	..	@@ -453,7 +625,7 @@
453	625	//assert(this instanceof Camera);
454	626
455	627	for (int count = parentcam.GetTransformCount(); --count>=0;)
456		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	628	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
457	629	}
458	630
459	631	copy.Touch(); // display list issue
..	..	@@ -466,12 +638,14 @@
466	638	toParent = LA.newMatrix();
467	639	fromParent = LA.newMatrix();
468	640	}
	641	+
469	642	if (toParentMarked == null)
470	643	{
471	644	if (maxcount != 1)
472	645	{
473	646	new Exception().printStackTrace();
474	647	}
	648	+
475	649	toParentMarked = LA.newMatrix();
476	650	fromParentMarked = LA.newMatrix();
477	651	}
..	..	@@ -588,7 +762,7 @@
588	762	return;
589	763	}
590	764
591		- if (CameraPane.fromscript)
	765	+ if (Globals.fromscript)
592	766	{
593	767	transformcount = 0;
594	768	return;
..	..	@@ -746,7 +920,7 @@
746	920
747	921	int GetTransformCount()
748	922	{
749		- // marde pour serialization de Texture
	923	+ // patch pour serialization de Texture
750	924	resetmaxcount();
751	925	resettransformcount();
752	926	resetstep();
..	..	@@ -759,7 +933,7 @@
759	933	if (step == 0)
760	934	step = 1;
761	935	if (maxcount == 0)
762		- maxcount = 2048; // 4;
	936	+ maxcount = 128; // 2048; // 4;
763	937	// if (acceleration == 0)
764	938	// acceleration = 10;
765	939	if (delay == 0) // serial
..	..	@@ -780,9 +954,12 @@
780	954	// factor = CameraPane.STEP;
781	955	// }
782	956
783		- if (marked && CameraPane.isLIVE() && live && CameraPane.drawMode == CameraPane.SHADOW && currentframe != CameraPane.framecount)
	957	+ if (marked && Globals.isLIVE() && live &&
	958	+ //TEMP21aug2018
	959	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
	960	+ currentframe != Globals.framecount)
784	961	{
785		- currentframe = CameraPane.framecount;
	962	+ currentframe = Globals.framecount;
786	963
787	964	// System.err.println("transformcount = " + transformcount);
788	965	// System.err.println("factor = " + factor);
..	..	@@ -791,7 +968,8 @@
791	968
792	969	boolean changedir = random && Math.random() < 0.01; // && !link2master;
793	970
794		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	971	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	972	+ (step == 1 && changedir))
795	973	{
796	974	countdown = 1;
797	975	delay = speedup?8:1;
..	..	@@ -863,6 +1041,10 @@
863	1041	if (material == null \|\| material.multiply)
864	1042	return true;
865	1043
	1044	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1045	+ return false;
	1046	+
	1047	+ // Transparent objects are dynamic because we have to sort the triangles.
866	1048	return material.opacity > 0.99;
867	1049	}
868	1050
..	..	@@ -894,6 +1076,11 @@
894	1076	fromParent = null; // LA.newMatrix();
895	1077	bRep = null; // new BoundaryRep();
896	1078
	1079	+ if (oname != null && oname.equals("LeftHand"))
	1080	+ {
	1081	+ name = oname;
	1082	+ }
	1083	+
897	1084	/*
898	1085	float hue = (float)Math.random();
899	1086	Color col;
..	..	@@ -936,7 +1123,7 @@
936	1123
937	1124	public Object clone()
938	1125	{
939		- return GrafreeD.clone(this);
	1126	+ return Grafreed.clone(this);
940	1127	}
941	1128
942	1129	Object3D copyExpand()
..	..	@@ -1258,6 +1445,7 @@
1258	1445	toParent = LA.newMatrix();
1259	1446	fromParent = LA.newMatrix();
1260	1447	}
	1448	+
1261	1449	LA.matCopy(other.toParent, toParent);
1262	1450	LA.matCopy(other.fromParent, fromParent);
1263	1451
..	..	@@ -1452,7 +1640,7 @@
1452	1640	BoundaryRep.SEUIL = other.material.cameralight;
1453	1641
1454	1642	// Set default to 0.1
1455		- BoundaryRep.SEUIL /= 2;
	1643	+ BoundaryRep.SEUIL /= 4; // 2;
1456	1644	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1457	1645	}
1458	1646
..	..	@@ -1711,7 +1899,7 @@
1711	1899	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1712	1900	o.bRep = transientrep;
1713	1901	if (clone)
1714		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1902	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1715	1903	o.CreateMaterial();
1716	1904	o.SetAttributes(this, -1);
1717	1905	//parent
..	..	@@ -1724,7 +1912,7 @@
1724	1912	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1725	1913	o.bRep = bRep;
1726	1914	if (clone)
1727		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1915	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1728	1916	o.CreateMaterial();
1729	1917	//o.overwriteThis(this, -1);
1730	1918	o.SetAttributes(this, -1);
..	..	@@ -1811,12 +1999,15 @@
1811	1999	if (obj.name == null)
1812	2000	continue; // can't be a null one
1813	2001
	2002	+ // Try perfect match first.
1814	2003	if (n.equals(obj.name))
1815	2004	{
1816	2005	theobj = obj;
1817	2006	count++;
1818	2007	}
1819	2008	}
	2009	+
	2010	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1820	2011
1821	2012	if (count != 1)
1822	2013	for (int i=Size(); --i>=0;)
..	..	@@ -2131,15 +2322,8 @@
2131	2322	if (/parent != null &&/ material == null)
2132	2323	{
2133	2324	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
	2325	+
	2326	+ InitOthers();
2143	2327
2144	2328	if (this instanceof Camera)
2145	2329	{
..	..	@@ -2283,12 +2467,22 @@
2283	2467	}
2284	2468	*/
2285	2469	}
	2470	+ else
	2471	+ {
	2472	+ //((ObjEditor)editWindow).SetupUI2(null);
	2473	+ if (objectUI != null)
	2474	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2475	+ else
	2476	+ //new Exception().printStackTrace();
	2477	+ System.err.println("objectUI is null");
	2478	+ }
2286	2479	}
2287	2480
2288	2481	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2289	2482	{
2290	2483	if (newWindow)
2291	2484	{
	2485	+ new Exception().printStackTrace();
2292	2486	System.exit(0);
2293	2487	if (parent != null)
2294	2488	{
..	..	@@ -2323,6 +2517,14 @@
2323	2517	{
2324	2518	editWindow.refreshContents();
2325	2519	}
	2520	+ else
	2521	+ {
	2522	+ if (manipWindow != null)
	2523	+ {
	2524	+ manipWindow.refreshContents();
	2525	+ }
	2526	+ }
	2527	+
2326	2528	//if (parent != null)
2327	2529	//parent.refreshEditWindow();
2328	2530	}
..	..	@@ -2402,7 +2604,8 @@
2402	2604	private static final int editSelf = 1;
2403	2605	private static final int editChild = 2;
2404	2606
2405		- void drawEditHandles(ClickInfo info, int level)
	2607	+ void drawEditHandles(//ClickInfo info,
	2608	+ int level)
2406	2609	{
2407	2610	if (level == 0)
2408	2611	{
..	..	@@ -2410,7 +2613,8 @@
2410	2613	return;
2411	2614
2412	2615	Object3D selectee;
2413		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2616	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2617	+ level + 1))
2414	2618	{
2415	2619	selectee = (Object3D) e.nextElement();
2416	2620	}
..	..	@@ -2418,19 +2622,22 @@
2418	2622	} else
2419	2623	{
2420	2624	//super.
2421		- drawEditHandles0(info, level + 1);
	2625	+ drawEditHandles0(//info,
	2626	+ level + 1);
2422	2627	}
2423	2628	}
2424	2629
2425		- boolean doEditClick(ClickInfo info, int level)
	2630	+ boolean doEditClick(//ClickInfo info,
	2631	+ int level)
2426	2632	{
2427	2633	doSomething = 0;
2428	2634	if (level == 0)
2429	2635	{
2430		- return doParentClick(info);
	2636	+ return doParentClick(); //info);
2431	2637	}
2432	2638	if (//super.
2433		- doEditClick0(info, level))
	2639	+ doEditClick0(//info,
	2640	+ level))
2434	2641	{
2435	2642	doSomething = 1;
2436	2643	return true;
..	..	@@ -2440,7 +2647,7 @@
2440	2647	}
2441	2648	}
2442	2649
2443		- boolean doParentClick(ClickInfo info)
	2650	+ boolean doParentClick() //ClickInfo info)
2444	2651	{
2445	2652	if (selection == null)
2446	2653	{
..	..	@@ -2453,7 +2660,8 @@
2453	2660	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2454	2661	{
2455	2662	Object3D selectee = (Object3D) e.nextElement();
2456		- if (selectee.doEditClick(info, 1))
	2663	+ if (selectee.doEditClick(//info,
	2664	+ 1))
2457	2665	{
2458	2666	childToDrag = selectee;
2459	2667	doSomething = 2;
..	..	@@ -2465,13 +2673,15 @@
2465	2673	return retval;
2466	2674	}
2467	2675
2468		- void doEditDrag(ClickInfo info)
	2676	+ void doEditDrag(//ClickInfo clickInfo,
	2677	+ boolean opposite)
2469	2678	{
2470	2679	switch (doSomething)
2471	2680	{
2472	2681	case 1: // '\001'
2473	2682	//super.
2474		- doEditDrag0(info);
	2683	+ doEditDrag0(//clickInfo,
	2684	+ opposite);
2475	2685	break;
2476	2686
2477	2687	case 2: // '\002'
..	..	@@ -2484,11 +2694,13 @@
2484	2694	{
2485	2695	//sel.hitSomething = childToDrag.hitSomething;
2486	2696	//childToDrag.doEditDrag(info);
2487		- sel.doEditDrag(info);
	2697	+ sel.doEditDrag(//clickInfo,
	2698	+ opposite);
2488	2699	} else
2489	2700	{
2490	2701	//super.
2491		- doEditDrag0(info);
	2702	+ doEditDrag0(//clickInfo,
	2703	+ opposite);
2492	2704	}
2493	2705	}
2494	2706	break;
..	..	@@ -2506,6 +2718,9 @@
2506	2718	{
2507	2719	deselectAll();
2508	2720	}
	2721	+
	2722	+ new Exception().printStackTrace();
	2723	+
2509	2724	ClickInfo newInfo = new ClickInfo();
2510	2725	newInfo.flags = info.flags;
2511	2726	newInfo.bounds = info.bounds;
..	..	@@ -2598,6 +2813,18 @@
2598	2813	void GenNormalsS(boolean crease)
2599	2814	{
2600	2815	selection.GenNormals(crease);
	2816	+// for (int i=0; i<selection.size(); i++)
	2817	+// {
	2818	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2819	+// selectee.GenNormals(crease);
	2820	+// }
	2821	+
	2822	+ //Touch();
	2823	+ }
	2824	+
	2825	+ void GenNormalsMeshS()
	2826	+ {
	2827	+ selection.GenNormalsMesh();
2601	2828	// for (int i=0; i<selection.size(); i++)
2602	2829	// {
2603	2830	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2738,6 +2965,24 @@
2738	2965	if (child == null)
2739	2966	continue;
2740	2967	child.GenNormals(crease);
	2968	+// Children().release(i);
	2969	+ }
	2970	+ blockloop = false;
	2971	+ }
	2972	+
	2973	+ void GenNormalsMesh()
	2974	+ {
	2975	+ if (blockloop)
	2976	+ return;
	2977	+
	2978	+ blockloop = true;
	2979	+ GenNormalsMesh0();
	2980	+ for (int i = 0; i < Children().Size(); i++)
	2981	+ {
	2982	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2983	+ if (child == null)
	2984	+ continue;
	2985	+ child.GenNormalsMesh();
2741	2986	// Children().release(i);
2742	2987	}
2743	2988	blockloop = false;
..	..	@@ -2895,7 +3140,8 @@
2895	3140	{
2896	3141	if (bRep != null)
2897	3142	{
2898		- bRep.GenUV();
	3143	+ bRep.GenUV(); //1);
	3144	+ //bRep.UnfoldUV();
2899	3145	Touch();
2900	3146	}
2901	3147	}
..	..	@@ -2909,11 +3155,20 @@
2909	3155	}
2910	3156	}
2911	3157
	3158	+ void GenNormalsMesh0()
	3159	+ {
	3160	+ if (bRep != null)
	3161	+ {
	3162	+ bRep.GenerateNormalsMesh();
	3163	+ Touch();
	3164	+ }
	3165	+ }
	3166	+
2912	3167	void GenNormalsMINE0()
2913	3168	{
2914	3169	if (bRep != null)
2915	3170	{
2916		- bRep.GenerateNormalsMINE();
	3171	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2917	3172	Touch();
2918	3173	}
2919	3174	}
..	..	@@ -2970,6 +3225,33 @@
2970	3225	blockloop = false;
2971	3226	}
2972	3227
	3228	+ void TransformChildren()
	3229	+ {
	3230	+ if (toParent != null)
	3231	+ {
	3232	+ for (int i=Size(); --i>=0;)
	3233	+ {
	3234	+ Object3D v = get(i);
	3235	+
	3236	+ if (v.toParent == null)
	3237	+ {
	3238	+ v.toParent = LA.newMatrix();
	3239	+ v.fromParent = LA.newMatrix();
	3240	+ }
	3241	+
	3242	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3243	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3244	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3245	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3246	+ }
	3247	+
	3248	+ toParent = null; // LA.matIdentity(toParent);
	3249	+ fromParent = null; // LA.matIdentity(fromParent);
	3250	+
	3251	+ Touch();
	3252	+ }
	3253	+ }
	3254	+
2973	3255	void TransformGeometry()
2974	3256	{
2975	3257	Object3D obj = this;
..	..	@@ -3191,9 +3473,11 @@
3191	3473
3192	3474	BoundaryRep sup = bRep.support;
3193	3475	bRep.support = null;
3194		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3476	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3195	3477	// bRep.SplitInTwo(onlyone); // thread...
3196		- temprep.SplitInTwo(reduction34, onlyone);
	3478	+
	3479	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3480	+
3197	3481	bRep = temprep;
3198	3482	bRep.support = sup;
3199	3483	Touch();
..	..	@@ -3330,7 +3614,8 @@
3330	3614	if (blockloop)
3331	3615	return;
3332	3616
3333		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3617	+ if (//marked \|\| // does not make sense
	3618	+ (bRep != null \|\| material != null)) // borderline...
3334	3619	live = h;
3335	3620
3336	3621	for (int i = 0; i < Size(); i++)
..	..	@@ -3351,7 +3636,8 @@
3351	3636	return;
3352	3637
3353	3638	//if (bRep != null)
3354		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3639	+ if (//marked \|\| // does not make sense
	3640	+ (bRep != null \|\| material != null)) // borderline...
3355	3641	link2master = h;
3356	3642
3357	3643	for (int i = 0; i < Size(); i++)
..	..	@@ -3371,7 +3657,8 @@
3371	3657	if (blockloop)
3372	3658	return;
3373	3659
3374		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3660	+ if (//marked \|\| // does not make sense
	3661	+ (bRep != null \|\| material != null)) // borderline...
3375	3662	hide = h;
3376	3663
3377	3664	for (int i = 0; i < Size(); i++)
..	..	@@ -3391,7 +3678,7 @@
3391	3678	if (blockloop)
3392	3679	return;
3393	3680
3394		- if (bRep != null && material != null) // borderline...
	3681	+ if (bRep != null \|\| material != null) // borderline...
3395	3682	marked = h;
3396	3683
3397	3684	for (int i = 0; i < Size(); i++)
..	..	@@ -3401,6 +3688,46 @@
3401	3688	continue;
3402	3689	blockloop = true;
3403	3690	child.MarkLeaves(h);
	3691	+ blockloop = false;
	3692	+ // release(i);
	3693	+ }
	3694	+ }
	3695	+
	3696	+ void RewindLeaves(boolean h)
	3697	+ {
	3698	+ if (blockloop)
	3699	+ return;
	3700	+
	3701	+ if (bRep != null \|\| material != null) // borderline...
	3702	+ rewind = h;
	3703	+
	3704	+ for (int i = 0; i < Size(); i++)
	3705	+ {
	3706	+ Object3D child = (Object3D) get(i); // reserve(i);
	3707	+ if (child == null)
	3708	+ continue;
	3709	+ blockloop = true;
	3710	+ child.RewindLeaves(h);
	3711	+ blockloop = false;
	3712	+ // release(i);
	3713	+ }
	3714	+ }
	3715	+
	3716	+ void RandomLeaves(boolean h)
	3717	+ {
	3718	+ if (blockloop)
	3719	+ return;
	3720	+
	3721	+ if (bRep != null \|\| material != null) // borderline...
	3722	+ random = h;
	3723	+
	3724	+ for (int i = 0; i < Size(); i++)
	3725	+ {
	3726	+ Object3D child = (Object3D) get(i); // reserve(i);
	3727	+ if (child == null)
	3728	+ continue;
	3729	+ blockloop = true;
	3730	+ child.RandomLeaves(h);
3404	3731	blockloop = false;
3405	3732	// release(i);
3406	3733	}
..	..	@@ -3715,7 +4042,7 @@
3715	4042	if (child == null)
3716	4043	continue;
3717	4044
3718		- if (GrafreeD.RENDERME > 0)
	4045	+ if (Grafreed.RENDERME > 0)
3719	4046	{
3720	4047	if (child instanceof Merge)
3721	4048	((Merge)child).renderme();
..	..	@@ -3866,7 +4193,7 @@
3866	4193	if (child == null)
3867	4194	continue;
3868	4195
3869		- if (GrafreeD.RENDERME > 0)
	4196	+ if (Grafreed.RENDERME > 0)
3870	4197	{
3871	4198	if (child instanceof Merge)
3872	4199	((Merge)child).renderme();
..	..	@@ -4061,7 +4388,7 @@
4061	4388	if (child == null)
4062	4389	continue;
4063	4390
4064		- if (GrafreeD.RENDERME > 0)
	4391	+ if (Grafreed.RENDERME > 0)
4065	4392	{
4066	4393	if (child instanceof Merge)
4067	4394	((Merge)child).renderme();
..	..	@@ -4158,6 +4485,71 @@
4158	4485	}
4159	4486	blockloop = true;
4160	4487	get(i).RepairParent();
	4488	+ blockloop = false;
	4489	+ }
	4490	+ }
	4491	+
	4492	+ void RepairShadow()
	4493	+ {
	4494	+ if (blockloop)
	4495	+ return;
	4496	+
	4497	+ if (this.material != null)
	4498	+ this.InitOthers();
	4499	+
	4500	+ for (int i=0; i<Size(); i++)
	4501	+ {
	4502	+ blockloop = true;
	4503	+ get(i).RepairShadow();
	4504	+ blockloop = false;
	4505	+ }
	4506	+ }
	4507	+
	4508	+ void RepairSOV()
	4509	+ {
	4510	+ if (blockloop)
	4511	+ return;
	4512	+
	4513	+ String texname = this.GetPigmentTexture();
	4514	+
	4515	+ if (texname.startsWith("sov"))
	4516	+ {
	4517	+ String[] s = texname.split("/");
	4518	+
	4519	+ String[] sname = s[1].split("Color.pn");
	4520	+
	4521	+ texname = sname[0];
	4522	+
	4523	+ if (sname.length > 1)
	4524	+ {
	4525	+ texname += "Color.jpg";
	4526	+ }
	4527	+
	4528	+ this.SetPigmentTexture("sov/" + texname);
	4529	+ }
	4530	+
	4531	+ texname = this.GetBumpTexture();
	4532	+
	4533	+ if (texname.startsWith("sov"))
	4534	+ {
	4535	+ String[] s = texname.split("/");
	4536	+
	4537	+ String[] sname = s[1].split("Bump.pn");
	4538	+
	4539	+ texname = sname[0];
	4540	+
	4541	+ if (sname.length > 1)
	4542	+ {
	4543	+ texname += "Bump.jpg";
	4544	+ }
	4545	+
	4546	+ this.SetBumpTexture("sov/" + texname);
	4547	+ }
	4548	+
	4549	+ for (int i=0; i<Size(); i++)
	4550	+ {
	4551	+ blockloop = true;
	4552	+ get(i).RepairSOV();
4161	4553	blockloop = false;
4162	4554	}
4163	4555	}
..	..	@@ -4652,7 +5044,7 @@
4652	5044
4653	5045	cTreePath SelectLeaf(int indexcount, boolean deselect)
4654	5046	{
4655		- if (hide)
	5047	+ if (hide \|\| dontselect)
4656	5048	return null;
4657	5049
4658	5050	if (count <= 0)
..	..	@@ -4676,9 +5068,17 @@
4676	5068	}
4677	5069	}
4678	5070
	5071	+ ObjEditor GetWindow()
	5072	+ {
	5073	+ if (editWindow != null)
	5074	+ return editWindow;
	5075	+
	5076	+ return manipWindow;
	5077	+ }
	5078	+
4679	5079	cTreePath Select(int indexcount, boolean deselect)
4680	5080	{
4681		- if (hide)
	5081	+ if (hide \|\| dontselect)
4682	5082	return null;
4683	5083
4684	5084	if (count <= 0)
..	..	@@ -4712,10 +5112,11 @@
4712	5112	if (leaf != null)
4713	5113	{
4714	5114	cTreePath tp = new cTreePath(this, leaf);
4715		- if (editWindow != null)
	5115	+ ObjEditor window = GetWindow();
	5116	+ if (window != null)
4716	5117	{
4717	5118	//System.out.println("editWindow = " + editWindow + " vs " + this);
4718		- editWindow.Select(tp, deselect, true);
	5119	+ window.Select(tp, deselect, true);
4719	5120	}
4720	5121
4721	5122	return tp;
..	..	@@ -4732,6 +5133,7 @@
4732	5133
4733	5134	if (child == null)
4734	5135	continue;
	5136	+
4735	5137	if (child.HasTransparency() && child.size() != 0)
4736	5138	{
4737	5139	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4741,9 +5143,10 @@
4741	5143	if (leaf != null)
4742	5144	{
4743	5145	cTreePath tp = new cTreePath(this, leaf);
4744		- if (editWindow != null)
	5146	+ ObjEditor window = GetWindow();
	5147	+ if (window != null)
4745	5148	{
4746		- editWindow.Select(tp, deselect, true);
	5149	+ window.Select(tp, deselect, true);
4747	5150	}
4748	5151
4749	5152	return tp;
..	..	@@ -4828,7 +5231,7 @@
4828	5231	return globalTransform;
4829	5232	}
4830	5233
4831		- void PreprocessOcclusion(CameraPane cp)
	5234	+ void PreprocessOcclusion(iCameraPane cp)
4832	5235	{
4833	5236	/*
4834	5237	if (AOdone)
..	..	@@ -4975,7 +5378,8 @@
4975	5378	} else //
4976	5379	if (editWindow != null)
4977	5380	{
4978		- editWindow.cameraView.lighttouched = true;
	5381	+ //editWindow.cameraView.lighttouched = true;
	5382	+ Globals.lighttouched = true;
4979	5383	}
4980	5384	}
4981	5385
..	..	@@ -5067,6 +5471,51 @@
5067	5471	blockloop = false;
5068	5472	}
5069	5473
	5474	+ void ResetSelectable()
	5475	+ {
	5476	+ if (blockloop)
	5477	+ return;
	5478	+
	5479	+ blockloop = true;
	5480	+
	5481	+ keepdontselect = dontselect;
	5482	+ dontselect = true;
	5483	+
	5484	+ Object3D child;
	5485	+ int nb = Size();
	5486	+ for (int i = 0; i < nb; i++)
	5487	+ {
	5488	+ child = (Object3D) get(i);
	5489	+ if (child == null)
	5490	+ continue;
	5491	+ child.ResetSelectable();
	5492	+ }
	5493	+
	5494	+ blockloop = false;
	5495	+ }
	5496	+
	5497	+ void RestoreSelectable()
	5498	+ {
	5499	+ if (blockloop)
	5500	+ return;
	5501	+
	5502	+ blockloop = true;
	5503	+
	5504	+ dontselect = keepdontselect;
	5505	+
	5506	+ Object3D child;
	5507	+ int nb = Size();
	5508	+ for (int i = 0; i < nb; i++)
	5509	+ {
	5510	+ child = (Object3D) get(i);
	5511	+ if (child == null)
	5512	+ continue;
	5513	+ child.RestoreSelectable();
	5514	+ }
	5515	+
	5516	+ blockloop = false;
	5517	+ }
	5518	+
5070	5519	boolean IsSelected()
5071	5520	{
5072	5521	if (parent == null)
..	..	@@ -5127,12 +5576,41 @@
5127	5576	if (fullname == null)
5128	5577	return "";
5129	5578
	5579	+ if (fullname.pigment != null)
	5580	+ {
	5581	+ return fullname.pigment;
	5582	+ }
	5583	+
5130	5584	// System.out.println("Fullname = " + fullname);
5131	5585
5132		- if (fullname.name.indexOf(":") == -1)
5133		- return fullname.name;
	5586	+ // Does not work on Windows due to C:
	5587	+// if (fullname.name.indexOf(":") == -1)
	5588	+// return fullname.name;
	5589	+//
	5590	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5134	5591
5135		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5592	+ String[] split = fullname.name.split(":");
	5593	+
	5594	+ if (split.length == 0)
	5595	+ {
	5596	+ return fullname.pigment = "";
	5597	+ }
	5598	+
	5599	+ if (split.length <= 2)
	5600	+ {
	5601	+ if (fullname.name.endsWith(":"))
	5602	+ {
	5603	+ // Windows
	5604	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
	5605	+ }
	5606	+
	5607	+ return fullname.pigment = split[0];
	5608	+ }
	5609	+
	5610	+ // Windows
	5611	+ assert(split.length == 4);
	5612	+
	5613	+ return fullname.pigment = split[0] + ":" + split[1];
5136	5614	}
5137	5615
5138	5616	static String GetBump(cTexture fullname)
..	..	@@ -5140,11 +5618,44 @@
5140	5618	if (fullname == null)
5141	5619	return "";
5142	5620
	5621	+ if (fullname.bump != null)
	5622	+ {
	5623	+ return fullname.bump;
	5624	+ }
	5625	+
5143	5626	// 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());
	5627	+ // Does not work on Windows due to C:
	5628	+// if (fullname.name.indexOf(":") == -1)
	5629	+// return "";
	5630	+//
	5631	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5632	+ String[] split = fullname.name.split(":");
	5633	+
	5634	+ if (split.length == 0)
	5635	+ {
	5636	+ return fullname.bump = "";
	5637	+ }
	5638	+
	5639	+ if (split.length == 1)
	5640	+ {
	5641	+ return fullname.bump = "";
	5642	+ }
	5643	+
	5644	+ if (split.length == 2)
	5645	+ {
	5646	+ if (fullname.name.endsWith(":"))
	5647	+ {
	5648	+ // Windows
	5649	+ return fullname.bump = "";
	5650	+ }
	5651	+
	5652	+ return fullname.bump = split[1];
	5653	+ }
	5654	+
	5655	+ // Windows
	5656	+ assert(split.length == 4);
	5657	+
	5658	+ return fullname.bump = split[2] + ":" + split[3];
5148	5659	}
5149	5660
5150	5661	String GetPigmentTexture()
..	..	@@ -5218,7 +5729,7 @@
5218	5729	System.out.print("; textures = " + textures);
5219	5730	System.out.println("; usedtextures = " + usedtextures);
5220	5731
5221		- if (GetTextures() == null)
	5732	+ if (GetTextures() == null) // What is that??
5222	5733	GetTextures().name = ":";
5223	5734
5224	5735	String texname = tex;
..	..	@@ -5227,6 +5738,9 @@
5227	5738	texname = "";
5228	5739
5229	5740	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5741	+
	5742	+ GetTextures().pigment = null;
	5743	+
5230	5744	Touch();
5231	5745	}
5232	5746
..	..	@@ -5251,6 +5765,43 @@
5251	5765	}
5252	5766	}
5253	5767
	5768	+ UUID GetUUID()
	5769	+ {
	5770	+ if (uuid == null)
	5771	+ {
	5772	+ // Serial
	5773	+ uuid = UUID.randomUUID();
	5774	+ }
	5775	+
	5776	+ return uuid;
	5777	+ }
	5778	+
	5779	+ Object3D GetObject(UUID uid)
	5780	+ {
	5781	+ if (blockloop)
	5782	+ return null;
	5783	+
	5784	+ if (GetUUID().equals(uid))
	5785	+ return this;
	5786	+
	5787	+ int nb = Size();
	5788	+ for (int i = 0; i < nb; i++)
	5789	+ {
	5790	+ Object3D child = (Object3D) get(i);
	5791	+
	5792	+ if (child == null)
	5793	+ continue;
	5794	+
	5795	+ blockloop = true;
	5796	+ Object3D obj = child.GetObject(uid);
	5797	+ blockloop = false;
	5798	+ if (obj != null)
	5799	+ return obj;
	5800	+ }
	5801	+
	5802	+ return null;
	5803	+ }
	5804	+
5254	5805	void SetBumpTexture(String tex)
5255	5806	{
5256	5807	if (GetTextures() == null)
..	..	@@ -5262,6 +5813,8 @@
5262	5813	texname = "";
5263	5814
5264	5815	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
	5816	+
	5817	+ GetTextures().bump = null;
5265	5818
5266	5819	Touch();
5267	5820	}
..	..	@@ -5287,25 +5840,65 @@
5287	5840	}
5288	5841	}
5289	5842
5290		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5843	+ void EmbedTextures(boolean embed)
	5844	+ {
	5845	+ if (blockloop)
	5846	+ return;
	5847	+
	5848	+ //if (GetTextures() != null)
	5849	+ if (embed)
	5850	+ CameraPane.EmbedTextures(GetTextures());
	5851	+ else
	5852	+ {
	5853	+ GetTextures().pigmentdata = null;
	5854	+ GetTextures().bumpdata = null;
	5855	+ GetTextures().pw = 0;
	5856	+ GetTextures().ph = 0;
	5857	+ GetTextures().bw = 0;
	5858	+ GetTextures().bh = 0;
	5859	+ }
	5860	+
	5861	+ int nb = Size();
	5862	+ for (int i = 0; i < nb; i++)
	5863	+ {
	5864	+ Object3D child = (Object3D) get(i);
	5865	+
	5866	+ if (child == null)
	5867	+ continue;
	5868	+
	5869	+ blockloop = true;
	5870	+ child.EmbedTextures(embed);
	5871	+ blockloop = false;
	5872	+ }
	5873	+ }
	5874	+
	5875	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5291	5876	{
5292	5877	Draw(display, root, selected, blocked);
5293	5878	}
5294	5879
5295		- static cMaterial[] materialstack = new cMaterial[65536];
5296		- static boolean[] selectedstack = new boolean[65536];
5297		- static int materialdepth = 0;
5298		-
5299	5880	boolean NeedSupport()
5300	5881	{
5301	5882	return
5302		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5883	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5303	5884	// PROBLEM with CROWD!!
5304		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	5885	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5305	5886	}
5306	5887
	5888	+ static boolean DEBUG_SELECTION = false;
5307	5889
5308		- void Draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5890	+ boolean IsLive()
	5891	+ {
	5892	+ if (live)
	5893	+ return true;
	5894	+
	5895	+ if (parent == null)
	5896	+ return false;
	5897	+
	5898	+ return parent.IsLive();
	5899	+ }
	5900	+
	5901	+ void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5309	5902	{
5310	5903	Invariants(); // june 2013
5311	5904
..	..	@@ -5314,8 +5907,8 @@
5314	5907	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5315	5908	}
5316	5909
5317		- if (display.drawMode == CameraPane.SELECTION &&
5318		- hide)
	5910	+ if (display.DrawMode() == iCameraPane.SELECTION &&
	5911	+ (hide \|\| dontselect))
5319	5912	return;
5320	5913
5321	5914	if (name != null && name.contains("sclera"))
..	..	@@ -5333,7 +5926,7 @@
5333	5926	if (this instanceof Checker)
5334	5927	return;
5335	5928
5336		- if (display.drawMode == display.SHADOW && PASSTEST)
	5929	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5337	5930	return;
5338	5931
5339	5932	if (count <= 0)
..	..	@@ -5341,13 +5934,13 @@
5341	5934	return;
5342	5935	}
5343	5936
5344		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5345		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5937	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	5938	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5346	5939	{
5347	5940	return;
5348	5941	}
5349	5942
5350		- javax.media.opengl.GL gl = display.GetGL();
	5943	+ //javax.media.opengl.GL gl = display.GetGL();
5351	5944
5352	5945	/*
5353	5946	if (touched)
..	..	@@ -5365,8 +5958,10 @@
5365	5958	if (support != null)
5366	5959	support = support;
5367	5960
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);
	5961	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5962	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5963	+
	5964	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5370	5965
5371	5966	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5372	5967	{
..	..	@@ -5376,30 +5971,33 @@
5376	5971	// usecalllists &= !(parent instanceof RandomNode);
5377	5972	// usecalllists = false;
5378	5973
5379		- if (GetBRep() != null)
5380		- usecalllists = usecalllists;
	5974	+ if (display.DrawMode() == display.SHADOW)
	5975	+ //GetBRep() != null)
	5976	+ usecalllists = !!usecalllists;
5381	5977	//System.out.println("draw " + this);
5382	5978	//new Exception().printStackTrace();
5383	5979
5384	5980	boolean compiled = false;
5385	5981
5386		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5982	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5387	5983
5388		- if (!selectmode && //display.drawMode != display.SELECTION &&
5389		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5984	+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
	5985	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5986	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5390	5987	{
5391		- display.lighttouched = true;
	5988	+ Globals.lighttouched = true;
5392	5989	} // 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 &&
	5990	+
	5991	+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
	5992	+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5395	5993	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5396	5994	{
5397	5995	if (!(this instanceof Composite))
5398	5996	touched = false;
5399	5997	//if (displaylist == -1 && usecalllists)
5400		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5998	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5401	5999	{
5402		- bRep.displaylist = gl.glGenLists(1);
	6000	+ bRep.displaylist = display.GenList();
5403	6001	assert(bRep.displaylist != 0);
5404	6002	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5405	6003	//System.out.println("\tgen list " + list);
..	..	@@ -5408,21 +6006,23 @@
5408	6006
5409	6007	//System.out.println("\tnew list " + list);
5410	6008	//gl.glDrawBuffer(gl.GL_NONE);
5411		- if (usecalllists)
	6009	+ if (usecalllists && bRep.displaylist > 0)
5412	6010	{
5413	6011	// System.err.println("new list " + bRep.displaylist + " for " + this);
5414		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	6012	+ display.NewList(bRep.displaylist);
5415	6013	}
	6014	+
5416	6015	CallList(display, root, selected, blocked);
	6016	+
5417	6017	// compiled = true;
5418		- if (usecalllists)
	6018	+ if (usecalllists && bRep.displaylist > 0)
5419	6019	{
5420	6020	// System.err.println("end list " + bRep.displaylist + " for " + this);
5421		- gl.glEndList();
	6021	+ display.EndList();
5422	6022	}
5423	6023	//gl.glDrawBuffer(gl.GL_BACK);
5424	6024	// XXX touched = false;
5425		- display.lighttouched = true; // all panes...
	6025	+ Globals.lighttouched = true; // all panes...
5426	6026	}
5427	6027
5428	6028	touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
..	..	@@ -5461,12 +6061,12 @@
5461	6061
5462	6062	// frustum culling
5463	6063	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5464		- && display.drawMode != CameraPane.SELECTION)
	6064	+ && display.DrawMode() != iCameraPane.SELECTION)
5465	6065	{
5466		- if (display.drawMode == CameraPane.SHADOW)
	6066	+ if (display.DrawMode() == iCameraPane.SHADOW)
5467	6067	{
5468	6068	if (!link2master // tricky to cull in shadow mode.
5469		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	6069	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5470	6070	{
5471	6071	//System.out.print("CULLED");
5472	6072	culled = true;
..	..	@@ -5474,7 +6074,7 @@
5474	6074	}
5475	6075	else
5476	6076	//GetBRep().getBounds(v0, v1, this);
5477		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	6077	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5478	6078	culled = true;
5479	6079
5480	6080	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5510,11 +6110,12 @@
5510	6110
5511	6111
5512	6112	if (!culled)
5513		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	6113	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5514	6114	{
5515	6115	if (GetBRep() != null)
5516	6116	{
5517		- CameraPane.NextIndex(this, gl);
	6117	+ display.NextIndex();
	6118	+
5518	6119	// vertex color conflict : gl.glCallList(list);
5519	6120	DrawNode(display, root, selected);
5520	6121	if (this instanceof BezierPatch)
..	..	@@ -5536,55 +6137,7 @@
5536	6137	color[2] /= 2;
5537	6138	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5538	6139	*/
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		- }
	6140	+ display.PushMaterial(this, selected);
5588	6141
5589	6142	//System.out.println("call list " + list);
5590	6143	//System.out.println();
..	..	@@ -5603,7 +6156,28 @@
5603	6156	tex = GetTextures();
5604	6157	}
5605	6158
5606		- display.BindTextures(tex, texres);
	6159	+ boolean failedPigment = false;
	6160	+ boolean failedBump = false;
	6161	+
	6162	+ try
	6163	+ {
	6164	+ display.BindPigmentTexture(tex, texres);
	6165	+ }
	6166	+ catch (Exception e)
	6167	+ {
	6168	+ System.err.println("FAILED: " + this);
	6169	+ failedPigment = true;
	6170	+ }
	6171	+
	6172	+ try
	6173	+ {
	6174	+ display.BindBumpTexture(tex, texres);
	6175	+ }
	6176	+ catch (Exception e)
	6177	+ {
	6178	+ //System.err.println("FAILED: " + this);
	6179	+ failedBump = true;
	6180	+ }
5607	6181
5608	6182	if (!compiled)
5609	6183	{
..	..	@@ -5619,30 +6193,19 @@
5619	6193
5620	6194	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5621	6195	assert(bRep.displaylist != 0);
5622		- gl.glCallList(bRep.displaylist);
	6196	+ display.CallList(bRep.displaylist);
5623	6197	// june 2013 drawSelf(display, root, selected);
5624	6198	}
5625	6199	}
5626	6200	}
5627	6201
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		- }
	6202	+ if (!failedBump)
	6203	+ display.ReleaseBumpTexture(tex);
	6204	+
	6205	+ if (!failedPigment)
	6206	+ display.ReleasePigmentTexture(tex);
	6207	+
	6208	+ display.PopMaterial(this, selected);
5646	6209	}
5647	6210
5648	6211	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5684,7 +6247,7 @@
5684	6247	// resetMasterNode();
5685	6248	}
5686	6249
5687		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6250	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5688	6251	{
5689	6252	if (GetBRep() == null)
5690	6253	{
..	..	@@ -5767,8 +6330,11 @@
5767	6330	boolean flipV = false; // true;
5768	6331	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5769	6332
5770		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6333	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5771	6334	{
	6335	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6336	+ return;
	6337	+
5772	6338	if (hide)
5773	6339	return;
5774	6340	// shadow optimisation
..	..	@@ -5826,16 +6392,7 @@
5826	6392	// // ??????????????????????????? Touch();
5827	6393	// }
5828	6394
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		- }
	6395	+display.PushMaterial2(this, selected);
5839	6396
5840	6397	Object3D child;
5841	6398	boolean sel;
..	..	@@ -5887,19 +6444,7 @@
5887	6444	*/
5888	6445	//depth += 1;
5889	6446
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		-
	6447	+display.PopMaterial2(this);
5903	6448	/*
5904	6449	display.ReleaseTextures(tex);
5905	6450	*/
..	..	@@ -5910,10 +6455,13 @@
5910	6455
5911	6456	//static cVector min,max;
5912	6457
5913		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	6458	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5914	6459	{
5915		- if (display.drawMode == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	6460	+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5916	6461	return; // no shadow for transparent objects
	6462	+
	6463	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6464	+ return;
5917	6465
5918	6466	if (hide)
5919	6467	return;
..	..	@@ -5955,11 +6503,12 @@
5955	6503	return;
5956	6504	}
5957	6505
	6506	+ //bRep.GenUV(1/material.diffuseness);
5958	6507	// bRep.lock = true;
5959	6508
5960		- javax.media.opengl.GL gl = display.GetGL();
	6509	+ //javax.media.opengl.GL gl = display.GetGL();
5961	6510
5962		- if (CameraPane.BOXMODE) // \|\| CameraPane.movingcamera)
	6511	+ if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5963	6512	{
5964	6513	int fc = bRep.FaceCount();
5965	6514	int vc = bRep.VertexCount();
..	..	@@ -5974,23 +6523,7 @@
5974	6523
5975	6524	bRep.getMinMax(min, max, 100);
5976	6525
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();
	6526	+ display.DrawBox(min, max);
5994	6527
5995	6528	return;
5996	6529	}
..	..	@@ -6034,7 +6567,7 @@
6034	6567	{
6035	6568	//throw new Error();
6036	6569
6037		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6570	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
6038	6571
6039	6572	int[] strips = bRep.getRawIndices();
6040	6573
..	..	@@ -6044,178 +6577,19 @@
6044	6577	new Exception().printStackTrace();
6045	6578	return;
6046	6579	}
6047		-
6048		- // TRIANGLE STRIP ARRAY
6049		- if (bRep.trimmed)
	6580	+
	6581	+ if (dontselect)
6050	6582	{
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;
	6583	+ //bRep.GenerateNormalsMINE();
6182	6584	}
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		- }
	6585	+
	6586	+ display.DrawGeometry(bRep, flipV, selectmode);
6213	6587	} else // catch (Error e)
6214	6588	{
6215	6589	// TRIANGLE ARRAY
6216	6590	if (IsOpaque()) // Static())
6217	6591	{
6218		- gl.glBegin(gl.GL_TRIANGLES);
	6592	+ display.StartTriangles();
6219	6593	int facecount = bRep.FaceCount();
6220	6594	for (int i = 0; i < facecount; i++)
6221	6595	{
..	..	@@ -6278,9 +6652,9 @@
6278	6652	// // r.norm.dot(v3) > -0.5)
6279	6653	// // continue;
6280	6654
6281		- drawFace(p, q, r, display, face);
	6655	+ display.DrawFace(this, p, q, r, face);
6282	6656	}
6283		- gl.glEnd();
	6657	+ display.EndTriangles();
6284	6658	}
6285	6659	else
6286	6660	{
..	..	@@ -6309,8 +6683,8 @@
6309	6683	//System.out.println("SORT");
6310	6684
6311	6685	java.util.Arrays.sort(facescompare);
6312		-
6313		- gl.glBegin(gl.GL_TRIANGLES);
	6686	+
	6687	+ display.StartTriangles();
6314	6688	for (int i = 0; i < facecount; i++)
6315	6689	{
6316	6690	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6322,13 +6696,14 @@
6322	6696	Vertex q = bRep.GetVertex(face.q);
6323	6697	Vertex r = bRep.GetVertex(face.r);
6324	6698
6325		- drawFace(p, q, r, display, face);
	6699	+ display.DrawFace(this, p, q, r, face);
6326	6700	}
6327		- gl.glEnd();
	6701	+ display.EndTriangles();
6328	6702	}
6329	6703
6330	6704	if (false) // live && support != null && support.bRep != null) // debug weights
6331	6705	{
	6706	+ /*
6332	6707	gl.glDisable(gl.GL_LIGHTING);
6333	6708	float[] colorV = new float[3];
6334	6709
..	..	@@ -6407,6 +6782,7 @@
6407	6782	// gl.glEnd();
6408	6783	}
6409	6784	}
	6785	+ */
6410	6786	}
6411	6787	}
6412	6788
..	..	@@ -6451,7 +6827,7 @@
6451	6827	center.add(r);
6452	6828	center.mul(1.0/3);
6453	6829
6454		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6830	+ center.sub(Globals.theRenderer.EyeCamera().location);
6455	6831
6456	6832	distance = center.dot(center);
6457	6833	}
..	..	@@ -6462,347 +6838,11 @@
6462	6838
6463	6839	transient FaceCompare[] facescompare = null;
6464	6840
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	6841	void Print(Vertex v)
6640	6842	{
6641	6843	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6642	6844	}
6643	6845
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	6846	void drawSelf(ClickInfo info, int level, boolean select)
6807	6847	{
6808	6848	if (bRep == null)
..	..	@@ -7326,20 +7366,23 @@
7326	7366	}
7327	7367	}
7328	7368
7329		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7369	+ static ClickInfo clickInfo = new ClickInfo();
	7370	+
	7371	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7372	+ Point outPt, Rectangle outRec)
7330	7373	{
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;
	7374	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7375	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7376	+ double[][] toscreen = clickInfo.toScreen;
7334	7377	if (toscreen == null)
7335	7378	{
7336		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7379	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7337	7380	}
7338	7381	cVector vec = in;
7339	7382	LA.xformPos(in, toscreen, in);
7340	7383	//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();
	7384	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7385	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7343	7386	outPt.x = hc + (int) vec.x;
7344	7387	outPt.y = vc - (int) vec.y;
7345	7388	outRec.x = outPt.x - 3;
..	..	@@ -7347,15 +7390,18 @@
7347	7390	outRec.width = outRec.height = 6;
7348	7391	}
7349	7392
7350		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7393	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7394	+ )
7351	7395	{
7352	7396	Point pt = new Point(0, 0);
7353	7397	Rectangle rec = new Rectangle();
7354		- calcHotSpot(in, info, pt, rec);
	7398	+ calcHotSpot(in, //clickInfo,
	7399	+ pt, rec);
7355	7400	return rec;
7356	7401	}
7357	7402
7358		- void drawEditHandles0(ClickInfo info, int level)
	7403	+ void drawEditHandles0(//ClickInfo clickInfo,
	7404	+ int level)
7359	7405	{
7360	7406	if (level == 0)
7361	7407	{
..	..	@@ -7364,98 +7410,104 @@
7364	7410	{
7365	7411	cVector origin = new cVector();
7366	7412	//LA.xformPos(origin, toParent, origin);
7367		- Rectangle spot = calcHotSpot(origin, info);
	7413	+ if (this.clickInfo == null)
	7414	+ this.clickInfo = new ClickInfo();
	7415	+
	7416	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7368	7417	Rectangle boundary = new Rectangle();
7369	7418	boundary.x = spot.x - 30;
7370	7419	boundary.y = spot.y - 30;
7371	7420	boundary.width = spot.width + 60;
7372	7421	boundary.height = spot.height + 60;
7373		- info.g.setColor(Color.red);
	7422	+ clickInfo.g.setColor(Color.white);
7374	7423	int spotw = spot.x + spot.width;
7375	7424	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);
	7425	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7426	+// if (CameraPane.Xmin > spot.x)
	7427	+// {
	7428	+// CameraPane.Xmin = spot.x;
	7429	+// }
	7430	+// if (CameraPane.Xmax < spotw)
	7431	+// {
	7432	+// CameraPane.Xmax = spotw;
	7433	+// }
	7434	+// if (CameraPane.Ymin > spot.y)
	7435	+// {
	7436	+// CameraPane.Ymin = spot.y;
	7437	+// }
	7438	+// if (CameraPane.Ymax < spoth)
	7439	+// {
	7440	+// CameraPane.Ymax = spoth;
	7441	+// }
	7442	+// if (CameraPane.Xmin > spot.x)
	7443	+// {
	7444	+// CameraPane.Xmin = spot.x;
	7445	+// }
	7446	+// if (CameraPane.Xmax < spotw)
	7447	+// {
	7448	+// CameraPane.Xmax = spotw;
	7449	+// }
	7450	+// if (CameraPane.Ymin > spot.y)
	7451	+// {
	7452	+// CameraPane.Ymin = spot.y;
	7453	+// }
	7454	+// if (CameraPane.Ymax < spoth)
	7455	+// {
	7456	+// CameraPane.Ymax = spoth;
	7457	+// }
	7458	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7459	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
	7460	+ spot.translate(32, 0);
	7461	+ clickInfo.g.setColor(Color.yellow);
	7462	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7463	+
	7464	+ spot.translate(32, 64);
7394	7465	spotw = spot.x + spot.width;
7395	7466	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);
	7467	+ clickInfo.g.setColor(Color.cyan);
	7468	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7469	+// if (CameraPane.Xmin > spot.x)
	7470	+// {
	7471	+// CameraPane.Xmin = spot.x;
	7472	+// }
	7473	+// if (CameraPane.Xmax < spotw)
	7474	+// {
	7475	+// CameraPane.Xmax = spotw;
	7476	+// }
	7477	+// if (CameraPane.Ymin > spot.y)
	7478	+// {
	7479	+// CameraPane.Ymin = spot.y;
	7480	+// }
	7481	+// if (CameraPane.Ymax < spoth)
	7482	+// {
	7483	+// CameraPane.Ymax = spoth;
	7484	+// }
	7485	+ clickInfo.g.setColor(Color.green);
	7486	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7487	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7437	7488	//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		- }
	7489	+// if (CameraPane.Xmin > boundary.x)
	7490	+// {
	7491	+// CameraPane.Xmin = boundary.x;
	7492	+// }
	7493	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	7494	+// {
	7495	+// CameraPane.Xmax = boundary.x + boundary.width;
	7496	+// }
	7497	+// if (CameraPane.Ymin > boundary.y)
	7498	+// {
	7499	+// CameraPane.Ymin = boundary.y;
	7500	+// }
	7501	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	7502	+// {
	7503	+// CameraPane.Ymax = boundary.y + boundary.height;
	7504	+// }
7454	7505	return;
7455	7506	}
7456	7507	}
7457	7508
7458		- boolean doEditClick0(ClickInfo info, int level)
	7509	+ boolean doEditClick0(//ClickInfo clickInfo,
	7510	+ int level)
7459	7511	{
7460	7512	if (level == 0)
7461	7513	{
..	..	@@ -7464,10 +7516,10 @@
7464	7516
7465	7517	boolean retval = false;
7466	7518
7467		- startX = info.x;
7468		- startY = info.y;
	7519	+ startX = clickInfo.x;
	7520	+ startY = clickInfo.y;
7469	7521
7470		- hitSomething = 0;
	7522	+ hitSomething = -1;
7471	7523	cVector origin = new cVector();
7472	7524	//LA.xformPos(origin, toParent, origin);
7473	7525	Rectangle spot = new Rectangle();
..	..	@@ -7475,22 +7527,53 @@
7475	7527	{
7476	7528	centerPt = new Point(0, 0);
7477	7529	}
7478		- calcHotSpot(origin, info, centerPt, spot);
7479		- if (spot.contains(info.x, info.y))
	7530	+ calcHotSpot(origin, //info,
	7531	+ centerPt, spot);
	7532	+ if (spot.contains(clickInfo.x, clickInfo.y))
7480	7533	{
7481	7534	hitSomething = hitCenter;
7482	7535	retval = true;
7483	7536	}
7484	7537	spot.translate(32, 0);
7485		- if (spot.contains(info.x, info.y))
	7538	+ if (spot.contains(clickInfo.x, clickInfo.y))
7486	7539	{
7487	7540	hitSomething = hitRotate;
7488	7541	retval = true;
7489	7542	}
7490	7543	spot.translate(0, 32);
7491		- if (spot.contains(info.x, info.y))
	7544	+ spot.translate(32, 0);
	7545	+ spot.translate(0, 32);
	7546	+ if (spot.contains(clickInfo.x, clickInfo.y))
7492	7547	{
7493	7548	hitSomething = hitScale;
	7549	+
	7550	+ double scale = 0.005f * clickInfo.camera.Distance();
	7551	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7552	+ double sign = 1;
	7553	+ if (hScale < 0)
	7554	+ {
	7555	+ sign = -1;
	7556	+ }
	7557	+ hScale = signMath.pow(signhScale, scale * 50);
	7558	+ if (hScale < 0.01)
	7559	+ {
	7560	+ //hScale = 0.01;
	7561	+ }
	7562	+
	7563	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7564	+ sign = 1;
	7565	+ if (vScale < 0)
	7566	+ {
	7567	+ sign = -1;
	7568	+ }
	7569	+ vScale = signMath.pow(signvScale, scale * 50);
	7570	+ if (vScale < 0.01)
	7571	+ {
	7572	+ //vScale = 0.01;
	7573	+ }
	7574	+
	7575	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7576	+
7494	7577	retval = true;
7495	7578	}
7496	7579
..	..	@@ -7500,7 +7583,7 @@
7500	7583	}
7501	7584
7502	7585	//System.out.println("info.modifiers = " + info.modifiers);
7503		- modified = (info.modifiers & CameraPane.META) != 0;
	7586	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7504	7587	//System.out.println("modified = " + modified);
7505	7588	//new Exception().printStackTrace();
7506	7589	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7528,7 +7611,8 @@
7528	7611	return true;
7529	7612	}
7530	7613
7531		- void doEditDrag0(ClickInfo info)
	7614	+ void doEditDrag0(//ClickInfo info,
	7615	+ boolean opposite)
7532	7616	{
7533	7617	if (hitSomething == 0)
7534	7618	{
..	..	@@ -7542,7 +7626,8 @@
7542	7626
7543	7627	//System.out.println("hitSomething = " + hitSomething);
7544	7628
7545		- double scale = 0.005f * info.camera.Distance();
	7629	+ double scale = 0.005f * clickInfo.camera.Distance();
	7630	+
7546	7631	cVector xlate = new cVector();
7547	7632	//cVector xlate2 = new cVector();
7548	7633	switch (hitSomething)
..	..	@@ -7553,9 +7638,9 @@
7553	7638
7554	7639	case hitCenter: // Translate
7555	7640
7556		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7641	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7557	7642
7558		- if (modified)
	7643	+ if (modified \|\| opposite)
7559	7644	{
7560	7645	//assert(false);
7561	7646	/*
..	..	@@ -7575,8 +7660,8 @@
7575	7660	toParent[3][i] = xlate.get(i);
7576	7661	LA.matInvert(toParent, fromParent);
7577	7662	*/
7578		- cVector delta = LA.newVector(0, 0, startY - info.y);
7579		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7663	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7664	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7580	7665
7581	7666	LA.matCopy(startMat, toParent);
7582	7667	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7585,7 +7670,7 @@
7585	7670	} else
7586	7671	{
7587	7672	//LA.xformDir(delta, info.camera.fromScreen, delta);
7588		- cVector up = new cVector(info.camera.up);
	7673	+ cVector up = new cVector(clickInfo.camera.up);
7589	7674	cVector away = new cVector();
7590	7675	//cVector right2 = new cVector();
7591	7676	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7601,20 +7686,20 @@
7601	7686	}
7602	7687	LA.xformDir(up, ClickInfo.matbuffer, up);
7603	7688	// if (!CameraPane.LOCALTRANSFORM)
7604		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
7605		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7689	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
	7690	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7606	7691	// if (!CameraPane.LOCALTRANSFORM)
7607		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7692	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7608	7693	//LA.vecCross(up, cVector.Z, right2);
7609	7694
7610		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7695	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7611	7696
7612	7697	//System.out.println("DELTA0 = " + delta);
7613	7698	//System.out.println("AWAY = " + info.camera.away);
7614	7699	//System.out.println("UP = " + info.camera.up);
7615	7700	if (away.z > 0)
7616	7701	{
7617		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7702	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7618	7703	{
7619	7704	delta.x = -delta.x;
7620	7705	} else
..	..	@@ -7629,7 +7714,7 @@
7629	7714	//System.out.println("DELTA1 = " + delta);
7630	7715	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7631	7716	//System.out.println("DELTA2 = " + delta);
7632		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7717	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7633	7718	LA.matCopy(startMat, toParent);
7634	7719	//System.out.println("DELTA3 = " + delta);
7635	7720	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7639,8 +7724,8 @@
7639	7724	break;
7640	7725
7641	7726	case hitRotate: // rotate
7642		- int dx = info.x - centerPt.x;
7643		- int dy = -(info.y - centerPt.y);
	7727	+ int dx = clickInfo.x - centerPt.x;
	7728	+ int dy = -(clickInfo.y - centerPt.y);
7644	7729	double angle = (double) Math.atan2(dx, dy);
7645	7730	angle = -(1.570796 - angle);
7646	7731
..	..	@@ -7649,6 +7734,7 @@
7649	7734
7650	7735	if (modified)
7651	7736	{
	7737	+ // Rotate 90 degrees
7652	7738	angle /= (Math.PI / 4);
7653	7739	angle = Math.floor(angle + 0.5);
7654	7740	angle *= (Math.PI / 4);
..	..	@@ -7662,7 +7748,7 @@
7662	7748	}
7663	7749	/**/
7664	7750
7665		- switch (info.pane.renderCamera.viewCode)
	7751	+ switch (clickInfo.pane.RenderCamera().viewCode)
7666	7752	{
7667	7753	case 1: // '\001'
7668	7754	LA.matZRotate(toParent, angle);
..	..	@@ -7689,26 +7775,30 @@
7689	7775	break;
7690	7776
7691	7777	case hitScale: // scale
7692		- double hScale = (double) (info.x - centerPt.x) / 32;
	7778	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7779	+ double sign = 1;
	7780	+ if (hScale < 0)
	7781	+ {
	7782	+ sign = -1;
	7783	+ }
	7784	+ hScale = signMath.pow(signhScale, scale * 50);
7693	7785	if (hScale < 0.01)
7694	7786	{
7695		- hScale = 0.01;
	7787	+ //hScale = 0.01;
7696	7788	}
7697		- hScale = Math.pow(hScale, scale * 50);
7698		- if (hScale < 0.01)
	7789	+
	7790	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7791	+ sign = 1;
	7792	+ if (vScale < 0)
7699	7793	{
7700		- hScale = 0.01;
	7794	+ sign = -1;
7701	7795	}
7702		- double vScale = (double) (info.y - centerPt.y) / 32;
	7796	+ vScale = signMath.pow(signvScale, scale * 50);
7703	7797	if (vScale < 0.01)
7704	7798	{
7705		- vScale = 0.01;
	7799	+ //vScale = 0.01;
7706	7800	}
7707		- vScale = Math.pow(vScale, scale * 50);
7708		- if (vScale < 0.01)
7709		- {
7710		- vScale = 0.01;
7711		- }
	7801	+
7712	7802	LA.matCopy(startMat, toParent);
7713	7803	/**/
7714	7804	for (int i = 0; i < 3; i++)
..	..	@@ -7718,39 +7808,56 @@
7718	7808	}
7719	7809	/**/
7720	7810
7721		- switch (info.pane.renderCamera.viewCode)
	7811	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
	7812	+
	7813	+ if (totalScale < 0.01)
	7814	+ {
	7815	+ totalScale = 0.01;
	7816	+ }
	7817	+
	7818	+ switch (clickInfo.pane.RenderCamera().viewCode)
7722	7819	{
7723	7820	case 3: // '\001'
7724		- if (modified)
	7821	+ if (modified \|\| opposite)
7725	7822	{
	7823	+ if (modified && opposite)
	7824	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7825	+ else
7726	7826	//LA.matScale(toParent, 1, hScale, vScale);
7727		- LA.matScale(toParent, vScale, 1, 1);
	7827	+ LA.matScale(toParent, totalScale, 1, 1);
7728	7828	} // vScale, 1);
7729	7829	else
7730	7830	{
7731		- LA.matScale(toParent, vScale, vScale, vScale);
	7831	+ // EXCEPTION!
	7832	+ LA.matScale(toParent, 1, totalScale, totalScale);
7732	7833	} // vScale, 1);
7733	7834	break;
7734	7835
7735	7836	case 2: // '\002'
7736		- if (modified)
	7837	+ if (modified \|\| opposite)
7737	7838	{
7738		- //LA.matScale(toParent, hScale, 1, vScale);
7739		- LA.matScale(toParent, 1, vScale, 1);
	7839	+ if (modified && opposite)
	7840	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7841	+ else
	7842	+ //LA.matScale(toParent, hScale, 1, vScale);
	7843	+ LA.matScale(toParent, 1, totalScale, 1);
7740	7844	} else
7741	7845	{
7742		- LA.matScale(toParent, vScale, 1, vScale);
	7846	+ LA.matScale(toParent, totalScale, 1, totalScale);
7743	7847	}
7744	7848	break;
7745	7849
7746	7850	case 1: // '\003'
7747		- if (modified)
	7851	+ if (modified \|\| opposite)
7748	7852	{
7749		- //LA.matScale(toParent, hScale, vScale, 1);
7750		- LA.matScale(toParent, 1, 1, vScale);
	7853	+ if (modified && opposite)
	7854	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7855	+ else
	7856	+ //LA.matScale(toParent, hScale, vScale, 1);
	7857	+ LA.matScale(toParent, 1, 1, totalScale);
7751	7858	} else
7752	7859	{
7753		- LA.matScale(toParent, vScale, vScale, 1);
	7860	+ LA.matScale(toParent, totalScale, totalScale, 1);
7754	7861	}
7755	7862	break;
7756	7863	}
..	..	@@ -7784,7 +7891,7 @@
7784	7891	} // NEW ...
7785	7892
7786	7893
7787		- info.pane.repaint();
	7894	+ clickInfo.pane.repaint();
7788	7895	}
7789	7896
7790	7897	boolean overflow = false;
..	..	@@ -7883,14 +7990,22 @@
7883	7990	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7884	7991	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7885	7992	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7993	+
	7994	+ String objname;
	7995	+
7886	7996	if (false) //parent != null)
7887	7997	{
7888		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7998	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7889	7999	} else
7890	8000	{
7891		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	8001	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7892	8002	} // + super.toString();
7893	8003	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	8004	+
	8005	+ if (!Globals.ADVANCED)
	8006	+ return objname;
	8007	+
	8008	+ return objname + " " + System.identityHashCode(this);
7894	8009	}
7895	8010
7896	8011	public int hashCode()
..	..	@@ -7946,6 +8061,7 @@
7946	8061	objectUI.closeUI();
7947	8062	if (editWindow != null)
7948	8063	{
	8064	+ editWindow.ctrlPanel.FlushUI();
7949	8065	editWindow.refreshContents();
7950	8066	} // ? new
7951	8067	objectUI = null;
..	..	@@ -7954,6 +8070,10 @@
7954	8070	{
7955	8071	editWindow = null;
7956	8072	} // ?
	8073	+ }
	8074	+ else
	8075	+ {
	8076	+ //editWindow.closeUI();
7957	8077	}
7958	8078	}
7959	8079
..	..	@@ -7966,7 +8086,7 @@
7966	8086	/transient/ cVector2[] projectedVertices = new cVector2[0];
7967	8087
7968	8088	Object3D /Composite/ parent;
7969		- Object3D /Composite/ fileparent;
	8089	+ Object3D /Composite/ fileparent; // In the case of FileObject
7970	8090
7971	8091	double[][] toParent; // dynamic matrix
7972	8092	double[][] fromParent;
..	..	@@ -8081,7 +8201,7 @@
8081	8201	{
8082	8202	assert(bRep != null);
8083	8203	if (!(support instanceof GenericJoint)) // support.bRep != null)
8084		- GrafreeD.Assert(support.bRep == bRep.support);
	8204	+ Grafreed.Assert(support.bRep == bRep.support);
8085	8205	}
8086	8206	else
8087	8207	{
..	..	@@ -8112,6 +8232,10 @@
8112	8232	}
8113	8233
8114	8234	transient ObjEditor editWindow;
	8235	+ transient ObjEditor manipWindow;
	8236	+
	8237	+ transient boolean pinned;
	8238	+
8115	8239	transient ObjectUI objectUI;
8116	8240	public static int povDepth = 0;
8117	8241	private static cVector tbMin = new cVector();
..	..	@@ -8130,9 +8254,9 @@
8130	8254	private static cVector edge2 = new cVector();
8131	8255	//private static cVector norm = new cVector();
8132	8256	/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;
	8257	+ static final int hitCenter = 1;
	8258	+ static final int hitScale = 2;
	8259	+ static final int hitRotate = 3;
8136	8260	/transient/ /private/ int viewCode; // Now used for transparency cache flag
8137	8261	/transient/ private Point centerPt;
8138	8262	/transient/ private int startX;
..	..	@@ -8164,6 +8288,8 @@
8164	8288	{
8165	8289	Object3D targ = this;
8166	8290
	8291	+ targ.NORMALPUSH = obj.NORMALPUSH;
	8292	+
8167	8293	if (obj.material != null)
8168	8294	{
8169	8295	if ((mask&MATERIAL)!=0) // ==(COLOR\|MATERIAL))