~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,42 @@
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	+
22	39	ScriptNode scriptnode;
	40	+
	41	+ void InitOthers()
	42	+ {
	43	+ if (projectedVertices == null \|\| projectedVertices.length <= 2)
	44	+ {
	45	+ projectedVertices = new Object3D.cVector2[3];
	46	+ }
	47	+ for (int i = 0; i < 3; i++)
	48	+ {
	49	+ projectedVertices[i] = new cVector2(); // Others
	50	+ }
	51	+ projectedVertices[0].x = 100; // bump
	52	+ }
23	53
24	54	void MinMax(cVector minima, cVector maxima)
25	55	{
..	..	@@ -86,64 +116,201 @@
86	116
87	117	// transient boolean reduced; // for morph reduction
88	118
89		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
90		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	119	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	120	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
91	121
92		-transient Object3D transientsupport; // for cloning
93		-transient boolean transientlink2master;
	122	+ transient Object3D transientsupport; // for cloning
	123	+ transient boolean transientlink2master;
94	124
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)
	125	+ void SaveSupports()
107	126	{
108		- bRep.SaveSupports();
	127	+ if (blockloop)
	128	+ return;
	129	+
	130	+ transientsupport = support;
	131	+ transientlink2master = link2master;
	132	+
	133	+ support = null;
	134	+ link2master = false;
	135	+
	136	+ if (bRep != null)
	137	+ {
	138	+ bRep.SaveSupports();
	139	+ }
	140	+
	141	+ for (int i = 0; i < Size(); i++)
	142	+ {
	143	+ Object3D child = (Object3D) get(i);
	144	+ if (child == null)
	145	+ continue;
	146	+ blockloop = true;
	147	+ child.SaveSupports();
	148	+ blockloop = false;
	149	+ }
109	150	}
110		-
111		- for (int i = 0; i < Size(); i++)
	151	+
	152	+ void RestoreSupports()
112	153	{
113		- Object3D child = (Object3D) get(i);
114		- if (child == null)
115		- continue;
	154	+ if (blockloop)
	155	+ return;
	156	+
	157	+ support = transientsupport;
	158	+ link2master = transientlink2master;
	159	+ transientsupport = null;
	160	+ transientlink2master = false;
	161	+
	162	+ if (bRep != null)
	163	+ {
	164	+ bRep.RestoreSupports();
	165	+ }
	166	+
	167	+ for (int i = 0; i < Size(); i++)
	168	+ {
	169	+ Object3D child = (Object3D) get(i);
	170	+ if (child == null)
	171	+ continue;
	172	+ blockloop = true;
	173	+ child.RestoreSupports();
	174	+ blockloop = false;
	175	+ }
	176	+ }
	177	+
	178	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	179	+ {
	180	+ Object3D o;
	181	+
	182	+ if (hashtable.containsKey(GetUUID()))
	183	+ {
	184	+ o = hashtable.get(GetUUID());
	185	+
	186	+ Grafreed.Assert(this.bRep == o.bRep);
	187	+ //if (this.bRep != null)
	188	+ // assert(this.bRep.support == o.transientrep);
	189	+ if (this.support != null)
	190	+ assert(this.support.bRep == o.transientrep);
	191	+ }
	192	+ else
	193	+ {
	194	+ o = new Object3D("copy of " + this.name);
	195	+
	196	+ hashtable.put(GetUUID(), o);
	197	+ }
	198	+
	199	+ if (!blockloop)
	200	+ {
	201	+ blockloop = true;
	202	+
	203	+ for (int i=0; i<Size(); i++)
	204	+ {
	205	+ get(i).ExtractBigData(hashtable);
	206	+ }
	207	+
	208	+ blockloop = false;
	209	+ }
	210	+
	211	+ ExtractBigData(o);
	212	+ }
	213	+
	214	+ void ExtractBigData(Object3D o)
	215	+ {
	216	+ if (o.bRep != null)
	217	+ Grafreed.Assert(o.bRep == this.bRep);
	218	+
	219	+ o.bRep = this.bRep;
	220	+// July 2019 if (this.bRep != null)
	221	+// {
	222	+// o.transientrep = this.bRep.support;
	223	+// o.bRep.support = null;
	224	+// }
	225	+ o.selection = this.selection;
	226	+ o.versionlist = this.versionlist;
	227	+ o.versionindex = this.versionindex;
	228	+
	229	+ if (this.support != null)
	230	+ {
	231	+ if (o.transientrep != null)
	232	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	233	+
	234	+ o.transientrep = this.support.bRep;
	235	+ this.support.bRep = null;
	236	+ }
	237	+
	238	+ // o.support = this.support;
	239	+ // o.fileparent = this.fileparent;
	240	+ // if (this.bRep != null)
	241	+ // o.bRep = this.bRep.support;
	242	+
	243	+ this.bRep = null;
	244	+ // if (this.bRep != null)
	245	+ // this.bRep.support = null;
	246	+ // this.support = null;
	247	+ // this.fileparent = null;
	248	+ }
	249	+
	250	+// Object3D GetObject(java.util.UUID uuid)
	251	+// {
	252	+// if (this.uuid.equals(uuid))
	253	+// return this;
	254	+//
	255	+// if (blockloop)
	256	+// return null;
	257	+//
	258	+// blockloop = true;
	259	+//
	260	+// for (int i=0; i<Size(); i++)
	261	+// {
	262	+// Object3D o = get(i).GetObject(uuid);
	263	+//
	264	+// if (o != null)
	265	+// return o;
	266	+// }
	267	+//
	268	+// blockloop = false;
	269	+//
	270	+// return null;
	271	+// }
	272	+
	273	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	274	+ {
	275	+ if (!hashtable.containsKey(GetUUID()))
	276	+ return;
	277	+
	278	+ Object3D o = hashtable.get(GetUUID());
	279	+
	280	+ RestoreBigData(o);
	281	+
	282	+ if (blockloop)
	283	+ return;
	284	+
116	285	blockloop = true;
117		- child.SaveSupports();
	286	+
	287	+ //hashtable.remove(GetUUID());
	288	+
	289	+ for (int i=0; i<Size(); i++)
	290	+ {
	291	+ get(i).RestoreBigData(hashtable);
	292	+ }
	293	+
118	294	blockloop = false;
119	295	}
120		-}
121	296
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)
	297	+ void RestoreBigData(Object3D o)
133	298	{
134		- bRep.RestoreSupports();
	299	+ this.bRep = o.bRep;
	300	+ if (this.support != null && o.transientrep != null)
	301	+ {
	302	+ this.support.bRep = o.transientrep;
	303	+ }
	304	+
	305	+ this.selection = o.selection;
	306	+
	307	+ this.versionlist = o.versionlist;
	308	+ this.versionindex = o.versionindex;
	309	+// July 2019 if (this.bRep != null)
	310	+// this.bRep.support = o.transientrep;
	311	+ // this.support = o.support;
	312	+ // this.fileparent = o.fileparent;
135	313	}
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	314
148	315	// MOCAP SUPPORT
149	316	double tx,ty,tz,rx,ry,rz;
..	..	@@ -285,8 +452,9 @@
285	452	return parent.GetName() + "#";
286	453	}
287	454
288		- boolean timeline = false;
289	455	boolean live = false;
	456	+ transient boolean keepdontselect;
	457	+ boolean dontselect = false;
290	458	boolean hide = false;
291	459	boolean link2master = false; // performs reset support/master at each frame
292	460	boolean marked = false; // animation node
..	..	@@ -296,6 +464,8 @@
296	464	boolean random = false;
297	465	boolean speedup = false;
298	466	boolean rewind = false;
	467	+
	468	+ float NORMALPUSH = 0;
299	469
300	470	Object3D support;
301	471
..	..	@@ -416,16 +586,16 @@
416	586	{
417	587	Object3D copy = this;
418	588
419		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	589	+ Camera parentcam = Globals.theRenderer.ManipCamera();
420	590
421		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	591	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
422	592	{
423		- parentcam = CameraPane.theRenderer.cameras[1];
	593	+ parentcam = Globals.theRenderer.Cameras()[1];
424	594	}
425	595
426		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	596	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
427	597	{
428		- parentcam = CameraPane.theRenderer.cameras[0];
	598	+ parentcam = Globals.theRenderer.Cameras()[0];
429	599	}
430	600
431	601	if (this == parentcam)
..	..	@@ -433,7 +603,7 @@
433	603	//assert(this instanceof Camera);
434	604
435	605	for (int count = parentcam.GetTransformCount(); --count>=0;)
436		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	606	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
437	607	}
438	608
439	609	copy.marked ^= true;
..	..	@@ -453,7 +623,7 @@
453	623	//assert(this instanceof Camera);
454	624
455	625	for (int count = parentcam.GetTransformCount(); --count>=0;)
456		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	626	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
457	627	}
458	628
459	629	copy.Touch(); // display list issue
..	..	@@ -466,12 +636,14 @@
466	636	toParent = LA.newMatrix();
467	637	fromParent = LA.newMatrix();
468	638	}
	639	+
469	640	if (toParentMarked == null)
470	641	{
471	642	if (maxcount != 1)
472	643	{
473	644	new Exception().printStackTrace();
474	645	}
	646	+
475	647	toParentMarked = LA.newMatrix();
476	648	fromParentMarked = LA.newMatrix();
477	649	}
..	..	@@ -588,7 +760,7 @@
588	760	return;
589	761	}
590	762
591		- if (CameraPane.fromscript)
	763	+ if (Globals.fromscript)
592	764	{
593	765	transformcount = 0;
594	766	return;
..	..	@@ -746,7 +918,7 @@
746	918
747	919	int GetTransformCount()
748	920	{
749		- // marde pour serialization de Texture
	921	+ // patch pour serialization de Texture
750	922	resetmaxcount();
751	923	resettransformcount();
752	924	resetstep();
..	..	@@ -759,7 +931,7 @@
759	931	if (step == 0)
760	932	step = 1;
761	933	if (maxcount == 0)
762		- maxcount = 2048; // 4;
	934	+ maxcount = 128; // 2048; // 4;
763	935	// if (acceleration == 0)
764	936	// acceleration = 10;
765	937	if (delay == 0) // serial
..	..	@@ -780,9 +952,12 @@
780	952	// factor = CameraPane.STEP;
781	953	// }
782	954
783		- if (marked && CameraPane.isLIVE() && live && CameraPane.drawMode == CameraPane.SHADOW && currentframe != CameraPane.framecount)
	955	+ if (marked && Globals.isLIVE() && live &&
	956	+ //TEMP21aug2018
	957	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
	958	+ currentframe != Globals.framecount)
784	959	{
785		- currentframe = CameraPane.framecount;
	960	+ currentframe = Globals.framecount;
786	961
787	962	// System.err.println("transformcount = " + transformcount);
788	963	// System.err.println("factor = " + factor);
..	..	@@ -791,7 +966,8 @@
791	966
792	967	boolean changedir = random && Math.random() < 0.01; // && !link2master;
793	968
794		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	969	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	970	+ (step == 1 && changedir))
795	971	{
796	972	countdown = 1;
797	973	delay = speedup?8:1;
..	..	@@ -863,6 +1039,10 @@
863	1039	if (material == null \|\| material.multiply)
864	1040	return true;
865	1041
	1042	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1043	+ return false;
	1044	+
	1045	+ // Transparent objects are dynamic because we have to sort the triangles.
866	1046	return material.opacity > 0.99;
867	1047	}
868	1048
..	..	@@ -894,6 +1074,11 @@
894	1074	fromParent = null; // LA.newMatrix();
895	1075	bRep = null; // new BoundaryRep();
896	1076
	1077	+ if (oname != null && oname.equals("LeftHand"))
	1078	+ {
	1079	+ name = oname;
	1080	+ }
	1081	+
897	1082	/*
898	1083	float hue = (float)Math.random();
899	1084	Color col;
..	..	@@ -936,7 +1121,7 @@
936	1121
937	1122	public Object clone()
938	1123	{
939		- return GrafreeD.clone(this);
	1124	+ return Grafreed.clone(this);
940	1125	}
941	1126
942	1127	Object3D copyExpand()
..	..	@@ -1258,6 +1443,7 @@
1258	1443	toParent = LA.newMatrix();
1259	1444	fromParent = LA.newMatrix();
1260	1445	}
	1446	+
1261	1447	LA.matCopy(other.toParent, toParent);
1262	1448	LA.matCopy(other.fromParent, fromParent);
1263	1449
..	..	@@ -1452,7 +1638,7 @@
1452	1638	BoundaryRep.SEUIL = other.material.cameralight;
1453	1639
1454	1640	// Set default to 0.1
1455		- BoundaryRep.SEUIL /= 2;
	1641	+ BoundaryRep.SEUIL /= 4; // 2;
1456	1642	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1457	1643	}
1458	1644
..	..	@@ -1711,7 +1897,7 @@
1711	1897	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1712	1898	o.bRep = transientrep;
1713	1899	if (clone)
1714		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1900	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1715	1901	o.CreateMaterial();
1716	1902	o.SetAttributes(this, -1);
1717	1903	//parent
..	..	@@ -1724,7 +1910,7 @@
1724	1910	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1725	1911	o.bRep = bRep;
1726	1912	if (clone)
1727		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1913	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1728	1914	o.CreateMaterial();
1729	1915	//o.overwriteThis(this, -1);
1730	1916	o.SetAttributes(this, -1);
..	..	@@ -1811,12 +1997,15 @@
1811	1997	if (obj.name == null)
1812	1998	continue; // can't be a null one
1813	1999
	2000	+ // Try perfect match first.
1814	2001	if (n.equals(obj.name))
1815	2002	{
1816	2003	theobj = obj;
1817	2004	count++;
1818	2005	}
1819	2006	}
	2007	+
	2008	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1820	2009
1821	2010	if (count != 1)
1822	2011	for (int i=Size(); --i>=0;)
..	..	@@ -2131,15 +2320,8 @@
2131	2320	if (/parent != null &&/ material == null)
2132	2321	{
2133	2322	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
	2323	+
	2324	+ InitOthers();
2143	2325
2144	2326	if (this instanceof Camera)
2145	2327	{
..	..	@@ -2283,12 +2465,17 @@
2283	2465	}
2284	2466	*/
2285	2467	}
	2468	+ else
	2469	+ {
	2470	+ //((ObjEditor)editWindow).SetupUI2(null);
	2471	+ }
2286	2472	}
2287	2473
2288	2474	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2289	2475	{
2290	2476	if (newWindow)
2291	2477	{
	2478	+ new Exception().printStackTrace();
2292	2479	System.exit(0);
2293	2480	if (parent != null)
2294	2481	{
..	..	@@ -2323,6 +2510,14 @@
2323	2510	{
2324	2511	editWindow.refreshContents();
2325	2512	}
	2513	+ else
	2514	+ {
	2515	+ if (manipWindow != null)
	2516	+ {
	2517	+ manipWindow.refreshContents();
	2518	+ }
	2519	+ }
	2520	+
2326	2521	//if (parent != null)
2327	2522	//parent.refreshEditWindow();
2328	2523	}
..	..	@@ -2402,7 +2597,8 @@
2402	2597	private static final int editSelf = 1;
2403	2598	private static final int editChild = 2;
2404	2599
2405		- void drawEditHandles(ClickInfo info, int level)
	2600	+ void drawEditHandles(//ClickInfo info,
	2601	+ int level)
2406	2602	{
2407	2603	if (level == 0)
2408	2604	{
..	..	@@ -2410,7 +2606,8 @@
2410	2606	return;
2411	2607
2412	2608	Object3D selectee;
2413		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2609	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2610	+ level + 1))
2414	2611	{
2415	2612	selectee = (Object3D) e.nextElement();
2416	2613	}
..	..	@@ -2418,19 +2615,22 @@
2418	2615	} else
2419	2616	{
2420	2617	//super.
2421		- drawEditHandles0(info, level + 1);
	2618	+ drawEditHandles0(//info,
	2619	+ level + 1);
2422	2620	}
2423	2621	}
2424	2622
2425		- boolean doEditClick(ClickInfo info, int level)
	2623	+ boolean doEditClick(//ClickInfo info,
	2624	+ int level)
2426	2625	{
2427	2626	doSomething = 0;
2428	2627	if (level == 0)
2429	2628	{
2430		- return doParentClick(info);
	2629	+ return doParentClick(); //info);
2431	2630	}
2432	2631	if (//super.
2433		- doEditClick0(info, level))
	2632	+ doEditClick0(//info,
	2633	+ level))
2434	2634	{
2435	2635	doSomething = 1;
2436	2636	return true;
..	..	@@ -2440,7 +2640,7 @@
2440	2640	}
2441	2641	}
2442	2642
2443		- boolean doParentClick(ClickInfo info)
	2643	+ boolean doParentClick() //ClickInfo info)
2444	2644	{
2445	2645	if (selection == null)
2446	2646	{
..	..	@@ -2453,7 +2653,8 @@
2453	2653	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2454	2654	{
2455	2655	Object3D selectee = (Object3D) e.nextElement();
2456		- if (selectee.doEditClick(info, 1))
	2656	+ if (selectee.doEditClick(//info,
	2657	+ 1))
2457	2658	{
2458	2659	childToDrag = selectee;
2459	2660	doSomething = 2;
..	..	@@ -2465,13 +2666,15 @@
2465	2666	return retval;
2466	2667	}
2467	2668
2468		- void doEditDrag(ClickInfo info)
	2669	+ void doEditDrag(//ClickInfo clickInfo,
	2670	+ boolean opposite)
2469	2671	{
2470	2672	switch (doSomething)
2471	2673	{
2472	2674	case 1: // '\001'
2473	2675	//super.
2474		- doEditDrag0(info);
	2676	+ doEditDrag0(//clickInfo,
	2677	+ opposite);
2475	2678	break;
2476	2679
2477	2680	case 2: // '\002'
..	..	@@ -2484,11 +2687,13 @@
2484	2687	{
2485	2688	//sel.hitSomething = childToDrag.hitSomething;
2486	2689	//childToDrag.doEditDrag(info);
2487		- sel.doEditDrag(info);
	2690	+ sel.doEditDrag(//clickInfo,
	2691	+ opposite);
2488	2692	} else
2489	2693	{
2490	2694	//super.
2491		- doEditDrag0(info);
	2695	+ doEditDrag0(//clickInfo,
	2696	+ opposite);
2492	2697	}
2493	2698	}
2494	2699	break;
..	..	@@ -2506,6 +2711,9 @@
2506	2711	{
2507	2712	deselectAll();
2508	2713	}
	2714	+
	2715	+ new Exception().printStackTrace();
	2716	+
2509	2717	ClickInfo newInfo = new ClickInfo();
2510	2718	newInfo.flags = info.flags;
2511	2719	newInfo.bounds = info.bounds;
..	..	@@ -2598,6 +2806,18 @@
2598	2806	void GenNormalsS(boolean crease)
2599	2807	{
2600	2808	selection.GenNormals(crease);
	2809	+// for (int i=0; i<selection.size(); i++)
	2810	+// {
	2811	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2812	+// selectee.GenNormals(crease);
	2813	+// }
	2814	+
	2815	+ //Touch();
	2816	+ }
	2817	+
	2818	+ void GenNormalsMeshS()
	2819	+ {
	2820	+ selection.GenNormalsMesh();
2601	2821	// for (int i=0; i<selection.size(); i++)
2602	2822	// {
2603	2823	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2738,6 +2958,24 @@
2738	2958	if (child == null)
2739	2959	continue;
2740	2960	child.GenNormals(crease);
	2961	+// Children().release(i);
	2962	+ }
	2963	+ blockloop = false;
	2964	+ }
	2965	+
	2966	+ void GenNormalsMesh()
	2967	+ {
	2968	+ if (blockloop)
	2969	+ return;
	2970	+
	2971	+ blockloop = true;
	2972	+ GenNormalsMesh0();
	2973	+ for (int i = 0; i < Children().Size(); i++)
	2974	+ {
	2975	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2976	+ if (child == null)
	2977	+ continue;
	2978	+ child.GenNormalsMesh();
2741	2979	// Children().release(i);
2742	2980	}
2743	2981	blockloop = false;
..	..	@@ -2895,7 +3133,8 @@
2895	3133	{
2896	3134	if (bRep != null)
2897	3135	{
2898		- bRep.GenUV();
	3136	+ bRep.GenUV(); //1);
	3137	+ //bRep.UnfoldUV();
2899	3138	Touch();
2900	3139	}
2901	3140	}
..	..	@@ -2909,11 +3148,20 @@
2909	3148	}
2910	3149	}
2911	3150
	3151	+ void GenNormalsMesh0()
	3152	+ {
	3153	+ if (bRep != null)
	3154	+ {
	3155	+ bRep.GenerateNormalsMesh();
	3156	+ Touch();
	3157	+ }
	3158	+ }
	3159	+
2912	3160	void GenNormalsMINE0()
2913	3161	{
2914	3162	if (bRep != null)
2915	3163	{
2916		- bRep.GenerateNormalsMINE();
	3164	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2917	3165	Touch();
2918	3166	}
2919	3167	}
..	..	@@ -2970,6 +3218,33 @@
2970	3218	blockloop = false;
2971	3219	}
2972	3220
	3221	+ void TransformChildren()
	3222	+ {
	3223	+ if (toParent != null)
	3224	+ {
	3225	+ for (int i=Size(); --i>=0;)
	3226	+ {
	3227	+ Object3D v = get(i);
	3228	+
	3229	+ if (v.toParent == null)
	3230	+ {
	3231	+ v.toParent = LA.newMatrix();
	3232	+ v.fromParent = LA.newMatrix();
	3233	+ }
	3234	+
	3235	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3236	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3237	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3238	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3239	+ }
	3240	+
	3241	+ toParent = null; // LA.matIdentity(toParent);
	3242	+ fromParent = null; // LA.matIdentity(fromParent);
	3243	+
	3244	+ Touch();
	3245	+ }
	3246	+ }
	3247	+
2973	3248	void TransformGeometry()
2974	3249	{
2975	3250	Object3D obj = this;
..	..	@@ -3191,9 +3466,11 @@
3191	3466
3192	3467	BoundaryRep sup = bRep.support;
3193	3468	bRep.support = null;
3194		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3469	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3195	3470	// bRep.SplitInTwo(onlyone); // thread...
3196		- temprep.SplitInTwo(reduction34, onlyone);
	3471	+
	3472	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3473	+
3197	3474	bRep = temprep;
3198	3475	bRep.support = sup;
3199	3476	Touch();
..	..	@@ -3330,7 +3607,8 @@
3330	3607	if (blockloop)
3331	3608	return;
3332	3609
3333		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3610	+ if (//marked \|\| // does not make sense
	3611	+ (bRep != null \|\| material != null)) // borderline...
3334	3612	live = h;
3335	3613
3336	3614	for (int i = 0; i < Size(); i++)
..	..	@@ -3351,7 +3629,8 @@
3351	3629	return;
3352	3630
3353	3631	//if (bRep != null)
3354		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3632	+ if (//marked \|\| // does not make sense
	3633	+ (bRep != null \|\| material != null)) // borderline...
3355	3634	link2master = h;
3356	3635
3357	3636	for (int i = 0; i < Size(); i++)
..	..	@@ -3371,7 +3650,8 @@
3371	3650	if (blockloop)
3372	3651	return;
3373	3652
3374		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3653	+ if (//marked \|\| // does not make sense
	3654	+ (bRep != null \|\| material != null)) // borderline...
3375	3655	hide = h;
3376	3656
3377	3657	for (int i = 0; i < Size(); i++)
..	..	@@ -3391,7 +3671,7 @@
3391	3671	if (blockloop)
3392	3672	return;
3393	3673
3394		- if (bRep != null && material != null) // borderline...
	3674	+ if (bRep != null \|\| material != null) // borderline...
3395	3675	marked = h;
3396	3676
3397	3677	for (int i = 0; i < Size(); i++)
..	..	@@ -3401,6 +3681,46 @@
3401	3681	continue;
3402	3682	blockloop = true;
3403	3683	child.MarkLeaves(h);
	3684	+ blockloop = false;
	3685	+ // release(i);
	3686	+ }
	3687	+ }
	3688	+
	3689	+ void RewindLeaves(boolean h)
	3690	+ {
	3691	+ if (blockloop)
	3692	+ return;
	3693	+
	3694	+ if (bRep != null \|\| material != null) // borderline...
	3695	+ rewind = h;
	3696	+
	3697	+ for (int i = 0; i < Size(); i++)
	3698	+ {
	3699	+ Object3D child = (Object3D) get(i); // reserve(i);
	3700	+ if (child == null)
	3701	+ continue;
	3702	+ blockloop = true;
	3703	+ child.RewindLeaves(h);
	3704	+ blockloop = false;
	3705	+ // release(i);
	3706	+ }
	3707	+ }
	3708	+
	3709	+ void RandomLeaves(boolean h)
	3710	+ {
	3711	+ if (blockloop)
	3712	+ return;
	3713	+
	3714	+ if (bRep != null \|\| material != null) // borderline...
	3715	+ random = h;
	3716	+
	3717	+ for (int i = 0; i < Size(); i++)
	3718	+ {
	3719	+ Object3D child = (Object3D) get(i); // reserve(i);
	3720	+ if (child == null)
	3721	+ continue;
	3722	+ blockloop = true;
	3723	+ child.RandomLeaves(h);
3404	3724	blockloop = false;
3405	3725	// release(i);
3406	3726	}
..	..	@@ -3715,7 +4035,7 @@
3715	4035	if (child == null)
3716	4036	continue;
3717	4037
3718		- if (GrafreeD.RENDERME > 0)
	4038	+ if (Grafreed.RENDERME > 0)
3719	4039	{
3720	4040	if (child instanceof Merge)
3721	4041	((Merge)child).renderme();
..	..	@@ -3866,7 +4186,7 @@
3866	4186	if (child == null)
3867	4187	continue;
3868	4188
3869		- if (GrafreeD.RENDERME > 0)
	4189	+ if (Grafreed.RENDERME > 0)
3870	4190	{
3871	4191	if (child instanceof Merge)
3872	4192	((Merge)child).renderme();
..	..	@@ -4061,7 +4381,7 @@
4061	4381	if (child == null)
4062	4382	continue;
4063	4383
4064		- if (GrafreeD.RENDERME > 0)
	4384	+ if (Grafreed.RENDERME > 0)
4065	4385	{
4066	4386	if (child instanceof Merge)
4067	4387	((Merge)child).renderme();
..	..	@@ -4158,6 +4478,71 @@
4158	4478	}
4159	4479	blockloop = true;
4160	4480	get(i).RepairParent();
	4481	+ blockloop = false;
	4482	+ }
	4483	+ }
	4484	+
	4485	+ void RepairShadow()
	4486	+ {
	4487	+ if (blockloop)
	4488	+ return;
	4489	+
	4490	+ if (this.material != null)
	4491	+ this.InitOthers();
	4492	+
	4493	+ for (int i=0; i<Size(); i++)
	4494	+ {
	4495	+ blockloop = true;
	4496	+ get(i).RepairShadow();
	4497	+ blockloop = false;
	4498	+ }
	4499	+ }
	4500	+
	4501	+ void RepairSOV()
	4502	+ {
	4503	+ if (blockloop)
	4504	+ return;
	4505	+
	4506	+ String texname = this.GetPigmentTexture();
	4507	+
	4508	+ if (texname.startsWith("sov"))
	4509	+ {
	4510	+ String[] s = texname.split("/");
	4511	+
	4512	+ String[] sname = s[1].split("Color.pn");
	4513	+
	4514	+ texname = sname[0];
	4515	+
	4516	+ if (sname.length > 1)
	4517	+ {
	4518	+ texname += "Color.jpg";
	4519	+ }
	4520	+
	4521	+ this.SetPigmentTexture("sov/" + texname);
	4522	+ }
	4523	+
	4524	+ texname = this.GetBumpTexture();
	4525	+
	4526	+ if (texname.startsWith("sov"))
	4527	+ {
	4528	+ String[] s = texname.split("/");
	4529	+
	4530	+ String[] sname = s[1].split("Bump.pn");
	4531	+
	4532	+ texname = sname[0];
	4533	+
	4534	+ if (sname.length > 1)
	4535	+ {
	4536	+ texname += "Bump.jpg";
	4537	+ }
	4538	+
	4539	+ this.SetBumpTexture("sov/" + texname);
	4540	+ }
	4541	+
	4542	+ for (int i=0; i<Size(); i++)
	4543	+ {
	4544	+ blockloop = true;
	4545	+ get(i).RepairSOV();
4161	4546	blockloop = false;
4162	4547	}
4163	4548	}
..	..	@@ -4652,7 +5037,7 @@
4652	5037
4653	5038	cTreePath SelectLeaf(int indexcount, boolean deselect)
4654	5039	{
4655		- if (hide)
	5040	+ if (hide \|\| dontselect)
4656	5041	return null;
4657	5042
4658	5043	if (count <= 0)
..	..	@@ -4676,9 +5061,17 @@
4676	5061	}
4677	5062	}
4678	5063
	5064	+ ObjEditor GetWindow()
	5065	+ {
	5066	+ if (editWindow != null)
	5067	+ return editWindow;
	5068	+
	5069	+ return manipWindow;
	5070	+ }
	5071	+
4679	5072	cTreePath Select(int indexcount, boolean deselect)
4680	5073	{
4681		- if (hide)
	5074	+ if (hide \|\| dontselect)
4682	5075	return null;
4683	5076
4684	5077	if (count <= 0)
..	..	@@ -4712,10 +5105,11 @@
4712	5105	if (leaf != null)
4713	5106	{
4714	5107	cTreePath tp = new cTreePath(this, leaf);
4715		- if (editWindow != null)
	5108	+ ObjEditor window = GetWindow();
	5109	+ if (window != null)
4716	5110	{
4717	5111	//System.out.println("editWindow = " + editWindow + " vs " + this);
4718		- editWindow.Select(tp, deselect, true);
	5112	+ window.Select(tp, deselect, true);
4719	5113	}
4720	5114
4721	5115	return tp;
..	..	@@ -4732,6 +5126,7 @@
4732	5126
4733	5127	if (child == null)
4734	5128	continue;
	5129	+
4735	5130	if (child.HasTransparency() && child.size() != 0)
4736	5131	{
4737	5132	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4741,9 +5136,10 @@
4741	5136	if (leaf != null)
4742	5137	{
4743	5138	cTreePath tp = new cTreePath(this, leaf);
4744		- if (editWindow != null)
	5139	+ ObjEditor window = GetWindow();
	5140	+ if (window != null)
4745	5141	{
4746		- editWindow.Select(tp, deselect, true);
	5142	+ window.Select(tp, deselect, true);
4747	5143	}
4748	5144
4749	5145	return tp;
..	..	@@ -4828,7 +5224,7 @@
4828	5224	return globalTransform;
4829	5225	}
4830	5226
4831		- void PreprocessOcclusion(CameraPane cp)
	5227	+ void PreprocessOcclusion(iCameraPane cp)
4832	5228	{
4833	5229	/*
4834	5230	if (AOdone)
..	..	@@ -4975,7 +5371,8 @@
4975	5371	} else //
4976	5372	if (editWindow != null)
4977	5373	{
4978		- editWindow.cameraView.lighttouched = true;
	5374	+ //editWindow.cameraView.lighttouched = true;
	5375	+ Globals.lighttouched = true;
4979	5376	}
4980	5377	}
4981	5378
..	..	@@ -5067,6 +5464,51 @@
5067	5464	blockloop = false;
5068	5465	}
5069	5466
	5467	+ void ResetSelectable()
	5468	+ {
	5469	+ if (blockloop)
	5470	+ return;
	5471	+
	5472	+ blockloop = true;
	5473	+
	5474	+ keepdontselect = dontselect;
	5475	+ dontselect = true;
	5476	+
	5477	+ Object3D child;
	5478	+ int nb = Size();
	5479	+ for (int i = 0; i < nb; i++)
	5480	+ {
	5481	+ child = (Object3D) get(i);
	5482	+ if (child == null)
	5483	+ continue;
	5484	+ child.ResetSelectable();
	5485	+ }
	5486	+
	5487	+ blockloop = false;
	5488	+ }
	5489	+
	5490	+ void RestoreSelectable()
	5491	+ {
	5492	+ if (blockloop)
	5493	+ return;
	5494	+
	5495	+ blockloop = true;
	5496	+
	5497	+ dontselect = keepdontselect;
	5498	+
	5499	+ Object3D child;
	5500	+ int nb = Size();
	5501	+ for (int i = 0; i < nb; i++)
	5502	+ {
	5503	+ child = (Object3D) get(i);
	5504	+ if (child == null)
	5505	+ continue;
	5506	+ child.RestoreSelectable();
	5507	+ }
	5508	+
	5509	+ blockloop = false;
	5510	+ }
	5511	+
5070	5512	boolean IsSelected()
5071	5513	{
5072	5514	if (parent == null)
..	..	@@ -5129,10 +5571,34 @@
5129	5571
5130	5572	// System.out.println("Fullname = " + fullname);
5131	5573
5132		- if (fullname.name.indexOf(":") == -1)
5133		- return fullname.name;
	5574	+ // Does not work on Windows due to C:
	5575	+// if (fullname.name.indexOf(":") == -1)
	5576	+// return fullname.name;
	5577	+//
	5578	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5134	5579
5135		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5580	+ String[] split = fullname.name.split(":");
	5581	+
	5582	+ if (split.length == 0)
	5583	+ {
	5584	+ return "";
	5585	+ }
	5586	+
	5587	+ if (split.length <= 2)
	5588	+ {
	5589	+ if (fullname.name.endsWith(":"))
	5590	+ {
	5591	+ // Windows
	5592	+ return fullname.name.substring(0, fullname.name.length()-1);
	5593	+ }
	5594	+
	5595	+ return split[0];
	5596	+ }
	5597	+
	5598	+ // Windows
	5599	+ assert(split.length == 4);
	5600	+
	5601	+ return split[0] + ":" + split[1];
5136	5602	}
5137	5603
5138	5604	static String GetBump(cTexture fullname)
..	..	@@ -5141,10 +5607,38 @@
5141	5607	return "";
5142	5608
5143	5609	// 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());
	5610	+ // Does not work on Windows due to C:
	5611	+// if (fullname.name.indexOf(":") == -1)
	5612	+// return "";
	5613	+//
	5614	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5615	+ String[] split = fullname.name.split(":");
	5616	+
	5617	+ if (split.length == 0)
	5618	+ {
	5619	+ return "";
	5620	+ }
	5621	+
	5622	+ if (split.length == 1)
	5623	+ {
	5624	+ return "";
	5625	+ }
	5626	+
	5627	+ if (split.length == 2)
	5628	+ {
	5629	+ if (fullname.name.endsWith(":"))
	5630	+ {
	5631	+ // Windows
	5632	+ return "";
	5633	+ }
	5634	+
	5635	+ return split[1];
	5636	+ }
	5637	+
	5638	+ // Windows
	5639	+ assert(split.length == 4);
	5640	+
	5641	+ return split[2] + ":" + split[3];
5148	5642	}
5149	5643
5150	5644	String GetPigmentTexture()
..	..	@@ -5218,7 +5712,7 @@
5218	5712	System.out.print("; textures = " + textures);
5219	5713	System.out.println("; usedtextures = " + usedtextures);
5220	5714
5221		- if (GetTextures() == null)
	5715	+ if (GetTextures() == null) // What is that??
5222	5716	GetTextures().name = ":";
5223	5717
5224	5718	String texname = tex;
..	..	@@ -5249,6 +5743,43 @@
5249	5743	child.ResetPigmentTexture();
5250	5744	blockloop = false;
5251	5745	}
	5746	+ }
	5747	+
	5748	+ UUID GetUUID()
	5749	+ {
	5750	+ if (uuid == null)
	5751	+ {
	5752	+ // Serial
	5753	+ uuid = UUID.randomUUID();
	5754	+ }
	5755	+
	5756	+ return uuid;
	5757	+ }
	5758	+
	5759	+ Object3D GetObject(UUID uid)
	5760	+ {
	5761	+ if (blockloop)
	5762	+ return null;
	5763	+
	5764	+ if (GetUUID().equals(uid))
	5765	+ return this;
	5766	+
	5767	+ int nb = Size();
	5768	+ for (int i = 0; i < nb; i++)
	5769	+ {
	5770	+ Object3D child = (Object3D) get(i);
	5771	+
	5772	+ if (child == null)
	5773	+ continue;
	5774	+
	5775	+ blockloop = true;
	5776	+ Object3D obj = child.GetObject(uid);
	5777	+ blockloop = false;
	5778	+ if (obj != null)
	5779	+ return obj;
	5780	+ }
	5781	+
	5782	+ return null;
5252	5783	}
5253	5784
5254	5785	void SetBumpTexture(String tex)
..	..	@@ -5287,25 +5818,65 @@
5287	5818	}
5288	5819	}
5289	5820
5290		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5821	+ void EmbedTextures(boolean embed)
	5822	+ {
	5823	+ if (blockloop)
	5824	+ return;
	5825	+
	5826	+ //if (GetTextures() != null)
	5827	+ if (embed)
	5828	+ CameraPane.EmbedTextures(GetTextures());
	5829	+ else
	5830	+ {
	5831	+ GetTextures().pigmentdata = null;
	5832	+ GetTextures().bumpdata = null;
	5833	+ GetTextures().pw = 0;
	5834	+ GetTextures().ph = 0;
	5835	+ GetTextures().bw = 0;
	5836	+ GetTextures().bh = 0;
	5837	+ }
	5838	+
	5839	+ int nb = Size();
	5840	+ for (int i = 0; i < nb; i++)
	5841	+ {
	5842	+ Object3D child = (Object3D) get(i);
	5843	+
	5844	+ if (child == null)
	5845	+ continue;
	5846	+
	5847	+ blockloop = true;
	5848	+ child.EmbedTextures(embed);
	5849	+ blockloop = false;
	5850	+ }
	5851	+ }
	5852	+
	5853	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5291	5854	{
5292	5855	Draw(display, root, selected, blocked);
5293	5856	}
5294	5857
5295		- static cMaterial[] materialstack = new cMaterial[65536];
5296		- static boolean[] selectedstack = new boolean[65536];
5297		- static int materialdepth = 0;
5298		-
5299	5858	boolean NeedSupport()
5300	5859	{
5301	5860	return
5302		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5861	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5303	5862	// PROBLEM with CROWD!!
5304		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	5863	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5305	5864	}
5306	5865
	5866	+ static boolean DEBUG_SELECTION = false;
5307	5867
5308		- void Draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5868	+ boolean IsLive()
	5869	+ {
	5870	+ if (live)
	5871	+ return true;
	5872	+
	5873	+ if (parent == null)
	5874	+ return false;
	5875	+
	5876	+ return parent.IsLive();
	5877	+ }
	5878	+
	5879	+ void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5309	5880	{
5310	5881	Invariants(); // june 2013
5311	5882
..	..	@@ -5314,8 +5885,8 @@
5314	5885	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5315	5886	}
5316	5887
5317		- if (display.drawMode == CameraPane.SELECTION &&
5318		- hide)
	5888	+ if (display.DrawMode() == iCameraPane.SELECTION &&
	5889	+ (hide \|\| dontselect))
5319	5890	return;
5320	5891
5321	5892	if (name != null && name.contains("sclera"))
..	..	@@ -5333,7 +5904,7 @@
5333	5904	if (this instanceof Checker)
5334	5905	return;
5335	5906
5336		- if (display.drawMode == display.SHADOW && PASSTEST)
	5907	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5337	5908	return;
5338	5909
5339	5910	if (count <= 0)
..	..	@@ -5341,13 +5912,13 @@
5341	5912	return;
5342	5913	}
5343	5914
5344		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5345		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5915	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	5916	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5346	5917	{
5347	5918	return;
5348	5919	}
5349	5920
5350		- javax.media.opengl.GL gl = display.GetGL();
	5921	+ //javax.media.opengl.GL gl = display.GetGL();
5351	5922
5352	5923	/*
5353	5924	if (touched)
..	..	@@ -5365,8 +5936,10 @@
5365	5936	if (support != null)
5366	5937	support = support;
5367	5938
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);
	5939	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5940	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5941	+
	5942	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5370	5943
5371	5944	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5372	5945	{
..	..	@@ -5376,30 +5949,33 @@
5376	5949	// usecalllists &= !(parent instanceof RandomNode);
5377	5950	// usecalllists = false;
5378	5951
5379		- if (GetBRep() != null)
5380		- usecalllists = usecalllists;
	5952	+ if (display.DrawMode() == display.SHADOW)
	5953	+ //GetBRep() != null)
	5954	+ usecalllists = !!usecalllists;
5381	5955	//System.out.println("draw " + this);
5382	5956	//new Exception().printStackTrace();
5383	5957
5384	5958	boolean compiled = false;
5385	5959
5386		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5960	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5387	5961
5388		- if (!selectmode && //display.drawMode != display.SELECTION &&
5389		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5962	+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
	5963	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5964	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5390	5965	{
5391		- display.lighttouched = true;
	5966	+ Globals.lighttouched = true;
5392	5967	} // 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 &&
	5968	+
	5969	+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
	5970	+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5395	5971	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5396	5972	{
5397	5973	if (!(this instanceof Composite))
5398	5974	touched = false;
5399	5975	//if (displaylist == -1 && usecalllists)
5400		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	5976	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5401	5977	{
5402		- bRep.displaylist = gl.glGenLists(1);
	5978	+ bRep.displaylist = display.GenList();
5403	5979	assert(bRep.displaylist != 0);
5404	5980	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5405	5981	//System.out.println("\tgen list " + list);
..	..	@@ -5408,21 +5984,23 @@
5408	5984
5409	5985	//System.out.println("\tnew list " + list);
5410	5986	//gl.glDrawBuffer(gl.GL_NONE);
5411		- if (usecalllists)
	5987	+ if (usecalllists && bRep.displaylist > 0)
5412	5988	{
5413	5989	// System.err.println("new list " + bRep.displaylist + " for " + this);
5414		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5990	+ display.NewList(bRep.displaylist);
5415	5991	}
	5992	+
5416	5993	CallList(display, root, selected, blocked);
	5994	+
5417	5995	// compiled = true;
5418		- if (usecalllists)
	5996	+ if (usecalllists && bRep.displaylist > 0)
5419	5997	{
5420	5998	// System.err.println("end list " + bRep.displaylist + " for " + this);
5421		- gl.glEndList();
	5999	+ display.EndList();
5422	6000	}
5423	6001	//gl.glDrawBuffer(gl.GL_BACK);
5424	6002	// XXX touched = false;
5425		- display.lighttouched = true; // all panes...
	6003	+ Globals.lighttouched = true; // all panes...
5426	6004	}
5427	6005
5428	6006	touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
..	..	@@ -5461,12 +6039,12 @@
5461	6039
5462	6040	// frustum culling
5463	6041	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5464		- && display.drawMode != CameraPane.SELECTION)
	6042	+ && display.DrawMode() != iCameraPane.SELECTION)
5465	6043	{
5466		- if (display.drawMode == CameraPane.SHADOW)
	6044	+ if (display.DrawMode() == iCameraPane.SHADOW)
5467	6045	{
5468	6046	if (!link2master // tricky to cull in shadow mode.
5469		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	6047	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5470	6048	{
5471	6049	//System.out.print("CULLED");
5472	6050	culled = true;
..	..	@@ -5474,7 +6052,7 @@
5474	6052	}
5475	6053	else
5476	6054	//GetBRep().getBounds(v0, v1, this);
5477		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	6055	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5478	6056	culled = true;
5479	6057
5480	6058	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5510,11 +6088,12 @@
5510	6088
5511	6089
5512	6090	if (!culled)
5513		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	6091	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5514	6092	{
5515	6093	if (GetBRep() != null)
5516	6094	{
5517		- CameraPane.NextIndex(this, gl);
	6095	+ display.NextIndex();
	6096	+
5518	6097	// vertex color conflict : gl.glCallList(list);
5519	6098	DrawNode(display, root, selected);
5520	6099	if (this instanceof BezierPatch)
..	..	@@ -5536,55 +6115,7 @@
5536	6115	color[2] /= 2;
5537	6116	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5538	6117	*/
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		- }
	6118	+ display.PushMaterial(this, selected);
5588	6119
5589	6120	//System.out.println("call list " + list);
5590	6121	//System.out.println();
..	..	@@ -5603,7 +6134,28 @@
5603	6134	tex = GetTextures();
5604	6135	}
5605	6136
5606		- display.BindTextures(tex, texres);
	6137	+ boolean failedPigment = false;
	6138	+ boolean failedBump = false;
	6139	+
	6140	+ try
	6141	+ {
	6142	+ display.BindPigmentTexture(tex, texres);
	6143	+ }
	6144	+ catch (Exception e)
	6145	+ {
	6146	+ System.err.println("FAILED: " + this);
	6147	+ failedPigment = true;
	6148	+ }
	6149	+
	6150	+ try
	6151	+ {
	6152	+ display.BindBumpTexture(tex, texres);
	6153	+ }
	6154	+ catch (Exception e)
	6155	+ {
	6156	+ //System.err.println("FAILED: " + this);
	6157	+ failedBump = true;
	6158	+ }
5607	6159
5608	6160	if (!compiled)
5609	6161	{
..	..	@@ -5619,30 +6171,19 @@
5619	6171
5620	6172	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5621	6173	assert(bRep.displaylist != 0);
5622		- gl.glCallList(bRep.displaylist);
	6174	+ display.CallList(bRep.displaylist);
5623	6175	// june 2013 drawSelf(display, root, selected);
5624	6176	}
5625	6177	}
5626	6178	}
5627	6179
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		- }
	6180	+ if (!failedBump)
	6181	+ display.ReleaseBumpTexture(tex);
	6182	+
	6183	+ if (!failedPigment)
	6184	+ display.ReleasePigmentTexture(tex);
	6185	+
	6186	+ display.PopMaterial(this, selected);
5646	6187	}
5647	6188
5648	6189	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5684,7 +6225,7 @@
5684	6225	// resetMasterNode();
5685	6226	}
5686	6227
5687		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6228	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5688	6229	{
5689	6230	if (GetBRep() == null)
5690	6231	{
..	..	@@ -5767,8 +6308,11 @@
5767	6308	boolean flipV = false; // true;
5768	6309	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5769	6310
5770		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6311	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5771	6312	{
	6313	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6314	+ return;
	6315	+
5772	6316	if (hide)
5773	6317	return;
5774	6318	// shadow optimisation
..	..	@@ -5826,16 +6370,7 @@
5826	6370	// // ??????????????????????????? Touch();
5827	6371	// }
5828	6372
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		- }
	6373	+display.PushMaterial2(this, selected);
5839	6374
5840	6375	Object3D child;
5841	6376	boolean sel;
..	..	@@ -5887,19 +6422,7 @@
5887	6422	*/
5888	6423	//depth += 1;
5889	6424
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		-
	6425	+display.PopMaterial2(this);
5903	6426	/*
5904	6427	display.ReleaseTextures(tex);
5905	6428	*/
..	..	@@ -5910,10 +6433,13 @@
5910	6433
5911	6434	//static cVector min,max;
5912	6435
5913		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	6436	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5914	6437	{
5915		- if (display.drawMode == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	6438	+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5916	6439	return; // no shadow for transparent objects
	6440	+
	6441	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6442	+ return;
5917	6443
5918	6444	if (hide)
5919	6445	return;
..	..	@@ -5955,11 +6481,12 @@
5955	6481	return;
5956	6482	}
5957	6483
	6484	+ //bRep.GenUV(1/material.diffuseness);
5958	6485	// bRep.lock = true;
5959	6486
5960		- javax.media.opengl.GL gl = display.GetGL();
	6487	+ //javax.media.opengl.GL gl = display.GetGL();
5961	6488
5962		- if (CameraPane.BOXMODE) // \|\| CameraPane.movingcamera)
	6489	+ if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5963	6490	{
5964	6491	int fc = bRep.FaceCount();
5965	6492	int vc = bRep.VertexCount();
..	..	@@ -5974,23 +6501,7 @@
5974	6501
5975	6502	bRep.getMinMax(min, max, 100);
5976	6503
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();
	6504	+ display.DrawBox(min, max);
5994	6505
5995	6506	return;
5996	6507	}
..	..	@@ -6034,7 +6545,7 @@
6034	6545	{
6035	6546	//throw new Error();
6036	6547
6037		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6548	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
6038	6549
6039	6550	int[] strips = bRep.getRawIndices();
6040	6551
..	..	@@ -6044,178 +6555,19 @@
6044	6555	new Exception().printStackTrace();
6045	6556	return;
6046	6557	}
6047		-
6048		- // TRIANGLE STRIP ARRAY
6049		- if (bRep.trimmed)
	6558	+
	6559	+ if (dontselect)
6050	6560	{
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;
	6561	+ //bRep.GenerateNormalsMINE();
6182	6562	}
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		- }
	6563	+
	6564	+ display.DrawGeometry(bRep, flipV, selectmode);
6213	6565	} else // catch (Error e)
6214	6566	{
6215	6567	// TRIANGLE ARRAY
6216	6568	if (IsOpaque()) // Static())
6217	6569	{
6218		- gl.glBegin(gl.GL_TRIANGLES);
	6570	+ display.StartTriangles();
6219	6571	int facecount = bRep.FaceCount();
6220	6572	for (int i = 0; i < facecount; i++)
6221	6573	{
..	..	@@ -6278,9 +6630,9 @@
6278	6630	// // r.norm.dot(v3) > -0.5)
6279	6631	// // continue;
6280	6632
6281		- drawFace(p, q, r, display, face);
	6633	+ display.DrawFace(this, p, q, r, face);
6282	6634	}
6283		- gl.glEnd();
	6635	+ display.EndTriangles();
6284	6636	}
6285	6637	else
6286	6638	{
..	..	@@ -6309,8 +6661,8 @@
6309	6661	//System.out.println("SORT");
6310	6662
6311	6663	java.util.Arrays.sort(facescompare);
6312		-
6313		- gl.glBegin(gl.GL_TRIANGLES);
	6664	+
	6665	+ display.StartTriangles();
6314	6666	for (int i = 0; i < facecount; i++)
6315	6667	{
6316	6668	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6322,13 +6674,14 @@
6322	6674	Vertex q = bRep.GetVertex(face.q);
6323	6675	Vertex r = bRep.GetVertex(face.r);
6324	6676
6325		- drawFace(p, q, r, display, face);
	6677	+ display.DrawFace(this, p, q, r, face);
6326	6678	}
6327		- gl.glEnd();
	6679	+ display.EndTriangles();
6328	6680	}
6329	6681
6330	6682	if (false) // live && support != null && support.bRep != null) // debug weights
6331	6683	{
	6684	+ /*
6332	6685	gl.glDisable(gl.GL_LIGHTING);
6333	6686	float[] colorV = new float[3];
6334	6687
..	..	@@ -6407,6 +6760,7 @@
6407	6760	// gl.glEnd();
6408	6761	}
6409	6762	}
	6763	+ */
6410	6764	}
6411	6765	}
6412	6766
..	..	@@ -6451,7 +6805,7 @@
6451	6805	center.add(r);
6452	6806	center.mul(1.0/3);
6453	6807
6454		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6808	+ center.sub(Globals.theRenderer.EyeCamera().location);
6455	6809
6456	6810	distance = center.dot(center);
6457	6811	}
..	..	@@ -6462,347 +6816,11 @@
6462	6816
6463	6817	transient FaceCompare[] facescompare = null;
6464	6818
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	6819	void Print(Vertex v)
6640	6820	{
6641	6821	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6642	6822	}
6643	6823
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	6824	void drawSelf(ClickInfo info, int level, boolean select)
6807	6825	{
6808	6826	if (bRep == null)
..	..	@@ -7326,20 +7344,23 @@
7326	7344	}
7327	7345	}
7328	7346
7329		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7347	+ static ClickInfo clickInfo = new ClickInfo();
	7348	+
	7349	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7350	+ Point outPt, Rectangle outRec)
7330	7351	{
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;
	7352	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7353	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7354	+ double[][] toscreen = clickInfo.toScreen;
7334	7355	if (toscreen == null)
7335	7356	{
7336		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7357	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7337	7358	}
7338	7359	cVector vec = in;
7339	7360	LA.xformPos(in, toscreen, in);
7340	7361	//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();
	7362	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7363	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7343	7364	outPt.x = hc + (int) vec.x;
7344	7365	outPt.y = vc - (int) vec.y;
7345	7366	outRec.x = outPt.x - 3;
..	..	@@ -7347,15 +7368,18 @@
7347	7368	outRec.width = outRec.height = 6;
7348	7369	}
7349	7370
7350		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7371	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7372	+ )
7351	7373	{
7352	7374	Point pt = new Point(0, 0);
7353	7375	Rectangle rec = new Rectangle();
7354		- calcHotSpot(in, info, pt, rec);
	7376	+ calcHotSpot(in, //clickInfo,
	7377	+ pt, rec);
7355	7378	return rec;
7356	7379	}
7357	7380
7358		- void drawEditHandles0(ClickInfo info, int level)
	7381	+ void drawEditHandles0(//ClickInfo clickInfo,
	7382	+ int level)
7359	7383	{
7360	7384	if (level == 0)
7361	7385	{
..	..	@@ -7364,98 +7388,103 @@
7364	7388	{
7365	7389	cVector origin = new cVector();
7366	7390	//LA.xformPos(origin, toParent, origin);
7367		- Rectangle spot = calcHotSpot(origin, info);
	7391	+ if (this.clickInfo == null)
	7392	+ this.clickInfo = new ClickInfo();
	7393	+
	7394	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7368	7395	Rectangle boundary = new Rectangle();
7369	7396	boundary.x = spot.x - 30;
7370	7397	boundary.y = spot.y - 30;
7371	7398	boundary.width = spot.width + 60;
7372	7399	boundary.height = spot.height + 60;
7373		- info.g.setColor(Color.red);
	7400	+ clickInfo.g.setColor(Color.red);
7374	7401	int spotw = spot.x + spot.width;
7375	7402	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		- }
	7403	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7404	+// if (CameraPane.Xmin > spot.x)
	7405	+// {
	7406	+// CameraPane.Xmin = spot.x;
	7407	+// }
	7408	+// if (CameraPane.Xmax < spotw)
	7409	+// {
	7410	+// CameraPane.Xmax = spotw;
	7411	+// }
	7412	+// if (CameraPane.Ymin > spot.y)
	7413	+// {
	7414	+// CameraPane.Ymin = spot.y;
	7415	+// }
	7416	+// if (CameraPane.Ymax < spoth)
	7417	+// {
	7418	+// CameraPane.Ymax = spoth;
	7419	+// }
7393	7420	spot.translate(32, 32);
7394	7421	spotw = spot.x + spot.width;
7395	7422	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);
	7423	+ clickInfo.g.setColor(Color.cyan);
	7424	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7425	+// if (CameraPane.Xmin > spot.x)
	7426	+// {
	7427	+// CameraPane.Xmin = spot.x;
	7428	+// }
	7429	+// if (CameraPane.Xmax < spotw)
	7430	+// {
	7431	+// CameraPane.Xmax = spotw;
	7432	+// }
	7433	+// if (CameraPane.Ymin > spot.y)
	7434	+// {
	7435	+// CameraPane.Ymin = spot.y;
	7436	+// }
	7437	+// if (CameraPane.Ymax < spoth)
	7438	+// {
	7439	+// CameraPane.Ymax = spoth;
	7440	+// }
	7441	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7442	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7416	7443	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);
	7444	+ clickInfo.g.setColor(Color.yellow);
	7445	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7446	+ clickInfo.g.setColor(Color.green);
	7447	+// if (CameraPane.Xmin > spot.x)
	7448	+// {
	7449	+// CameraPane.Xmin = spot.x;
	7450	+// }
	7451	+// if (CameraPane.Xmax < spotw)
	7452	+// {
	7453	+// CameraPane.Xmax = spotw;
	7454	+// }
	7455	+// if (CameraPane.Ymin > spot.y)
	7456	+// {
	7457	+// CameraPane.Ymin = spot.y;
	7458	+// }
	7459	+// if (CameraPane.Ymax < spoth)
	7460	+// {
	7461	+// CameraPane.Ymax = spoth;
	7462	+// }
	7463	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7464	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7437	7465	//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		- }
	7466	+// if (CameraPane.Xmin > boundary.x)
	7467	+// {
	7468	+// CameraPane.Xmin = boundary.x;
	7469	+// }
	7470	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	7471	+// {
	7472	+// CameraPane.Xmax = boundary.x + boundary.width;
	7473	+// }
	7474	+// if (CameraPane.Ymin > boundary.y)
	7475	+// {
	7476	+// CameraPane.Ymin = boundary.y;
	7477	+// }
	7478	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	7479	+// {
	7480	+// CameraPane.Ymax = boundary.y + boundary.height;
	7481	+// }
7454	7482	return;
7455	7483	}
7456	7484	}
7457	7485
7458		- boolean doEditClick0(ClickInfo info, int level)
	7486	+ boolean doEditClick0(//ClickInfo clickInfo,
	7487	+ int level)
7459	7488	{
7460	7489	if (level == 0)
7461	7490	{
..	..	@@ -7464,10 +7493,10 @@
7464	7493
7465	7494	boolean retval = false;
7466	7495
7467		- startX = info.x;
7468		- startY = info.y;
	7496	+ startX = clickInfo.x;
	7497	+ startY = clickInfo.y;
7469	7498
7470		- hitSomething = 0;
	7499	+ hitSomething = -1;
7471	7500	cVector origin = new cVector();
7472	7501	//LA.xformPos(origin, toParent, origin);
7473	7502	Rectangle spot = new Rectangle();
..	..	@@ -7475,22 +7504,51 @@
7475	7504	{
7476	7505	centerPt = new Point(0, 0);
7477	7506	}
7478		- calcHotSpot(origin, info, centerPt, spot);
7479		- if (spot.contains(info.x, info.y))
	7507	+ calcHotSpot(origin, //info,
	7508	+ centerPt, spot);
	7509	+ if (spot.contains(clickInfo.x, clickInfo.y))
7480	7510	{
7481	7511	hitSomething = hitCenter;
7482	7512	retval = true;
7483	7513	}
7484	7514	spot.translate(32, 0);
7485		- if (spot.contains(info.x, info.y))
	7515	+ if (spot.contains(clickInfo.x, clickInfo.y))
7486	7516	{
7487	7517	hitSomething = hitRotate;
7488	7518	retval = true;
7489	7519	}
7490	7520	spot.translate(0, 32);
7491		- if (spot.contains(info.x, info.y))
	7521	+ if (spot.contains(clickInfo.x, clickInfo.y))
7492	7522	{
7493	7523	hitSomething = hitScale;
	7524	+
	7525	+ double scale = 0.005f * clickInfo.camera.Distance();
	7526	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7527	+ double sign = 1;
	7528	+ if (hScale < 0)
	7529	+ {
	7530	+ sign = -1;
	7531	+ }
	7532	+ hScale = signMath.pow(signhScale, scale * 50);
	7533	+ if (hScale < 0.01)
	7534	+ {
	7535	+ //hScale = 0.01;
	7536	+ }
	7537	+
	7538	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7539	+ sign = 1;
	7540	+ if (vScale < 0)
	7541	+ {
	7542	+ sign = -1;
	7543	+ }
	7544	+ vScale = signMath.pow(signvScale, scale * 50);
	7545	+ if (vScale < 0.01)
	7546	+ {
	7547	+ //vScale = 0.01;
	7548	+ }
	7549	+
	7550	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7551	+
7494	7552	retval = true;
7495	7553	}
7496	7554
..	..	@@ -7500,7 +7558,7 @@
7500	7558	}
7501	7559
7502	7560	//System.out.println("info.modifiers = " + info.modifiers);
7503		- modified = (info.modifiers & CameraPane.META) != 0;
	7561	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7504	7562	//System.out.println("modified = " + modified);
7505	7563	//new Exception().printStackTrace();
7506	7564	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7528,7 +7586,8 @@
7528	7586	return true;
7529	7587	}
7530	7588
7531		- void doEditDrag0(ClickInfo info)
	7589	+ void doEditDrag0(//ClickInfo info,
	7590	+ boolean opposite)
7532	7591	{
7533	7592	if (hitSomething == 0)
7534	7593	{
..	..	@@ -7542,7 +7601,8 @@
7542	7601
7543	7602	//System.out.println("hitSomething = " + hitSomething);
7544	7603
7545		- double scale = 0.005f * info.camera.Distance();
	7604	+ double scale = 0.005f * clickInfo.camera.Distance();
	7605	+
7546	7606	cVector xlate = new cVector();
7547	7607	//cVector xlate2 = new cVector();
7548	7608	switch (hitSomething)
..	..	@@ -7553,9 +7613,9 @@
7553	7613
7554	7614	case hitCenter: // Translate
7555	7615
7556		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7616	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7557	7617
7558		- if (modified)
	7618	+ if (modified \|\| opposite)
7559	7619	{
7560	7620	//assert(false);
7561	7621	/*
..	..	@@ -7575,8 +7635,8 @@
7575	7635	toParent[3][i] = xlate.get(i);
7576	7636	LA.matInvert(toParent, fromParent);
7577	7637	*/
7578		- cVector delta = LA.newVector(0, 0, startY - info.y);
7579		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7638	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7639	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7580	7640
7581	7641	LA.matCopy(startMat, toParent);
7582	7642	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7585,7 +7645,7 @@
7585	7645	} else
7586	7646	{
7587	7647	//LA.xformDir(delta, info.camera.fromScreen, delta);
7588		- cVector up = new cVector(info.camera.up);
	7648	+ cVector up = new cVector(clickInfo.camera.up);
7589	7649	cVector away = new cVector();
7590	7650	//cVector right2 = new cVector();
7591	7651	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7601,20 +7661,20 @@
7601	7661	}
7602	7662	LA.xformDir(up, ClickInfo.matbuffer, up);
7603	7663	// if (!CameraPane.LOCALTRANSFORM)
7604		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
7605		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7664	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
	7665	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7606	7666	// if (!CameraPane.LOCALTRANSFORM)
7607		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7667	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7608	7668	//LA.vecCross(up, cVector.Z, right2);
7609	7669
7610		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7670	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7611	7671
7612	7672	//System.out.println("DELTA0 = " + delta);
7613	7673	//System.out.println("AWAY = " + info.camera.away);
7614	7674	//System.out.println("UP = " + info.camera.up);
7615	7675	if (away.z > 0)
7616	7676	{
7617		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7677	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7618	7678	{
7619	7679	delta.x = -delta.x;
7620	7680	} else
..	..	@@ -7629,7 +7689,7 @@
7629	7689	//System.out.println("DELTA1 = " + delta);
7630	7690	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7631	7691	//System.out.println("DELTA2 = " + delta);
7632		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7692	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7633	7693	LA.matCopy(startMat, toParent);
7634	7694	//System.out.println("DELTA3 = " + delta);
7635	7695	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7639,8 +7699,8 @@
7639	7699	break;
7640	7700
7641	7701	case hitRotate: // rotate
7642		- int dx = info.x - centerPt.x;
7643		- int dy = -(info.y - centerPt.y);
	7702	+ int dx = clickInfo.x - centerPt.x;
	7703	+ int dy = -(clickInfo.y - centerPt.y);
7644	7704	double angle = (double) Math.atan2(dx, dy);
7645	7705	angle = -(1.570796 - angle);
7646	7706
..	..	@@ -7649,6 +7709,7 @@
7649	7709
7650	7710	if (modified)
7651	7711	{
	7712	+ // Rotate 90 degrees
7652	7713	angle /= (Math.PI / 4);
7653	7714	angle = Math.floor(angle + 0.5);
7654	7715	angle *= (Math.PI / 4);
..	..	@@ -7662,7 +7723,7 @@
7662	7723	}
7663	7724	/**/
7664	7725
7665		- switch (info.pane.renderCamera.viewCode)
	7726	+ switch (clickInfo.pane.RenderCamera().viewCode)
7666	7727	{
7667	7728	case 1: // '\001'
7668	7729	LA.matZRotate(toParent, angle);
..	..	@@ -7689,26 +7750,30 @@
7689	7750	break;
7690	7751
7691	7752	case hitScale: // scale
7692		- double hScale = (double) (info.x - centerPt.x) / 32;
	7753	+ double hScale = (double) (clickInfo.x - centerPt.x) / 32;
	7754	+ double sign = 1;
	7755	+ if (hScale < 0)
	7756	+ {
	7757	+ sign = -1;
	7758	+ }
	7759	+ hScale = signMath.pow(signhScale, scale * 50);
7693	7760	if (hScale < 0.01)
7694	7761	{
7695		- hScale = 0.01;
	7762	+ //hScale = 0.01;
7696	7763	}
7697		- hScale = Math.pow(hScale, scale * 50);
7698		- if (hScale < 0.01)
	7764	+
	7765	+ double vScale = (double) (clickInfo.y - centerPt.y) / 32;
	7766	+ sign = 1;
	7767	+ if (vScale < 0)
7699	7768	{
7700		- hScale = 0.01;
	7769	+ sign = -1;
7701	7770	}
7702		- double vScale = (double) (info.y - centerPt.y) / 32;
	7771	+ vScale = signMath.pow(signvScale, scale * 50);
7703	7772	if (vScale < 0.01)
7704	7773	{
7705		- vScale = 0.01;
	7774	+ //vScale = 0.01;
7706	7775	}
7707		- vScale = Math.pow(vScale, scale * 50);
7708		- if (vScale < 0.01)
7709		- {
7710		- vScale = 0.01;
7711		- }
	7776	+
7712	7777	LA.matCopy(startMat, toParent);
7713	7778	/**/
7714	7779	for (int i = 0; i < 3; i++)
..	..	@@ -7718,39 +7783,47 @@
7718	7783	}
7719	7784	/**/
7720	7785
7721		- switch (info.pane.renderCamera.viewCode)
	7786	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
	7787	+
	7788	+ if (totalScale < 0.01)
	7789	+ {
	7790	+ totalScale = 0.01;
	7791	+ }
	7792	+
	7793	+ switch (clickInfo.pane.RenderCamera().viewCode)
7722	7794	{
7723	7795	case 3: // '\001'
7724		- if (modified)
	7796	+ if (modified \|\| opposite)
7725	7797	{
7726	7798	//LA.matScale(toParent, 1, hScale, vScale);
7727		- LA.matScale(toParent, vScale, 1, 1);
	7799	+ LA.matScale(toParent, totalScale, 1, 1);
7728	7800	} // vScale, 1);
7729	7801	else
7730	7802	{
7731		- LA.matScale(toParent, vScale, vScale, vScale);
	7803	+ // EXCEPTION!
	7804	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7732	7805	} // vScale, 1);
7733	7806	break;
7734	7807
7735	7808	case 2: // '\002'
7736		- if (modified)
	7809	+ if (modified \|\| opposite)
7737	7810	{
7738	7811	//LA.matScale(toParent, hScale, 1, vScale);
7739		- LA.matScale(toParent, 1, vScale, 1);
	7812	+ LA.matScale(toParent, 1, totalScale, 1);
7740	7813	} else
7741	7814	{
7742		- LA.matScale(toParent, vScale, 1, vScale);
	7815	+ LA.matScale(toParent, totalScale, 1, totalScale);
7743	7816	}
7744	7817	break;
7745	7818
7746	7819	case 1: // '\003'
7747		- if (modified)
	7820	+ if (modified \|\| opposite)
7748	7821	{
7749	7822	//LA.matScale(toParent, hScale, vScale, 1);
7750		- LA.matScale(toParent, 1, 1, vScale);
	7823	+ LA.matScale(toParent, 1, 1, totalScale);
7751	7824	} else
7752	7825	{
7753		- LA.matScale(toParent, vScale, vScale, 1);
	7826	+ LA.matScale(toParent, totalScale, totalScale, 1);
7754	7827	}
7755	7828	break;
7756	7829	}
..	..	@@ -7784,7 +7857,7 @@
7784	7857	} // NEW ...
7785	7858
7786	7859
7787		- info.pane.repaint();
	7860	+ clickInfo.pane.repaint();
7788	7861	}
7789	7862
7790	7863	boolean overflow = false;
..	..	@@ -7883,14 +7956,22 @@
7883	7956	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7884	7957	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7885	7958	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7959	+
	7960	+ String objname;
	7961	+
7886	7962	if (false) //parent != null)
7887	7963	{
7888		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7964	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7889	7965	} else
7890	7966	{
7891		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7967	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7892	7968	} // + super.toString();
7893	7969	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7970	+
	7971	+ if (!Globals.ADVANCED)
	7972	+ return objname;
	7973	+
	7974	+ return objname + " " + System.identityHashCode(this);
7894	7975	}
7895	7976
7896	7977	public int hashCode()
..	..	@@ -7946,6 +8027,7 @@
7946	8027	objectUI.closeUI();
7947	8028	if (editWindow != null)
7948	8029	{
	8030	+ editWindow.ctrlPanel.FlushUI();
7949	8031	editWindow.refreshContents();
7950	8032	} // ? new
7951	8033	objectUI = null;
..	..	@@ -7954,6 +8036,10 @@
7954	8036	{
7955	8037	editWindow = null;
7956	8038	} // ?
	8039	+ }
	8040	+ else
	8041	+ {
	8042	+ //editWindow.closeUI();
7957	8043	}
7958	8044	}
7959	8045
..	..	@@ -7966,7 +8052,7 @@
7966	8052	/transient/ cVector2[] projectedVertices = new cVector2[0];
7967	8053
7968	8054	Object3D /Composite/ parent;
7969		- Object3D /Composite/ fileparent;
	8055	+ Object3D /Composite/ fileparent; // In the case of FileObject
7970	8056
7971	8057	double[][] toParent; // dynamic matrix
7972	8058	double[][] fromParent;
..	..	@@ -8081,7 +8167,7 @@
8081	8167	{
8082	8168	assert(bRep != null);
8083	8169	if (!(support instanceof GenericJoint)) // support.bRep != null)
8084		- GrafreeD.Assert(support.bRep == bRep.support);
	8170	+ Grafreed.Assert(support.bRep == bRep.support);
8085	8171	}
8086	8172	else
8087	8173	{
..	..	@@ -8112,6 +8198,10 @@
8112	8198	}
8113	8199
8114	8200	transient ObjEditor editWindow;
	8201	+ transient ObjEditor manipWindow;
	8202	+
	8203	+ transient boolean pinned;
	8204	+
8115	8205	transient ObjectUI objectUI;
8116	8206	public static int povDepth = 0;
8117	8207	private static cVector tbMin = new cVector();
..	..	@@ -8130,9 +8220,9 @@
8130	8220	private static cVector edge2 = new cVector();
8131	8221	//private static cVector norm = new cVector();
8132	8222	/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;
	8223	+ static final int hitCenter = 1;
	8224	+ static final int hitScale = 2;
	8225	+ static final int hitRotate = 3;
8136	8226	/transient/ /private/ int viewCode; // Now used for transparency cache flag
8137	8227	/transient/ private Point centerPt;
8138	8228	/transient/ private int startX;
..	..	@@ -8164,6 +8254,8 @@
8164	8254	{
8165	8255	Object3D targ = this;
8166	8256
	8257	+ targ.NORMALPUSH = obj.NORMALPUSH;
	8258	+
8167	8259	if (obj.material != null)
8168	8260	{
8169	8261	if ((mask&MATERIAL)!=0) // ==(COLOR\|MATERIAL))