~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,11 +14,29 @@
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;
	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>();
21	40
22	41	ScriptNode scriptnode;
23	42
..	..	@@ -99,64 +118,245 @@
99	118
100	119	// transient boolean reduced; // for morph reduction
101	120
102		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
103		-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
104	123
105		-transient Object3D transientsupport; // for cloning
106		-transient boolean transientlink2master;
	124	+ transient Object3D transientsupport; // for cloning
	125	+ transient boolean transientlink2master;
107	126
108		-void SaveSupports()
109		-{
110		- if (blockloop)
111		- return;
112		-
113		- transientsupport = support;
114		- transientlink2master = link2master;
115		-
116		- support = null;
117		- link2master = false;
118		-
119		- if (bRep != null)
	127	+ void SaveSupports()
120	128	{
121		- 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	+ }
122	152	}
123		-
124		- for (int i = 0; i < Size(); i++)
	153	+
	154	+ void RestoreSupports()
125	155	{
126		- Object3D child = (Object3D) get(i);
127		- if (child == null)
128		- continue;
	156	+ if (blockloop)
	157	+ return;
	158	+
	159	+ support = transientsupport;
	160	+ link2master = transientlink2master;
	161	+ transientsupport = null;
	162	+ transientlink2master = false;
	163	+
	164	+ if (bRep != null)
	165	+ {
	166	+ bRep.RestoreSupports();
	167	+ }
	168	+
	169	+ for (int i = 0; i < Size(); i++)
	170	+ {
	171	+ Object3D child = (Object3D) get(i);
	172	+ if (child == null)
	173	+ continue;
	174	+ blockloop = true;
	175	+ child.RestoreSupports();
	176	+ blockloop = false;
	177	+ }
	178	+ }
	179	+
	180	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	181	+ {
	182	+ Object3D o;
	183	+
	184	+ if (hashtable.containsKey(GetUUID()))
	185	+ {
	186	+ o = hashtable.get(GetUUID());
	187	+
	188	+ Grafreed.Assert(this.bRep == o.bRep);
	189	+ //if (this.bRep != null)
	190	+ // assert(this.bRep.support == o.transientrep);
	191	+ if (this.support != null)
	192	+ assert(this.support.bRep == o.transientrep);
	193	+ }
	194	+ else
	195	+ {
	196	+ o = new Object3D("copy of " + this.name);
	197	+
	198	+ hashtable.put(GetUUID(), o);
	199	+ }
	200	+
	201	+ if (!blockloop)
	202	+ {
	203	+ blockloop = true;
	204	+
	205	+ for (int i=0; i<Size(); i++)
	206	+ {
	207	+ get(i).ExtractBigData(hashtable);
	208	+ }
	209	+
	210	+ blockloop = false;
	211	+ }
	212	+
	213	+ ExtractBigData(o);
	214	+ }
	215	+
	216	+ void ExtractBigData(Object3D o)
	217	+ {
	218	+ if (o.bRep != null)
	219	+ Grafreed.Assert(o.bRep == this.bRep);
	220	+
	221	+ o.bRep = this.bRep;
	222	+// July 2019 if (this.bRep != null)
	223	+// {
	224	+// o.transientrep = this.bRep.support;
	225	+// o.bRep.support = null;
	226	+// }
	227	+ o.selection = this.selection;
	228	+ o.versionlist = this.versionlist;
	229	+ o.versionindex = this.versionindex;
	230	+
	231	+ if (this.support != null)
	232	+ {
	233	+ if (o.transientrep != null)
	234	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	235	+
	236	+ o.transientrep = this.support.bRep;
	237	+ this.support.bRep = null;
	238	+ }
	239	+
	240	+ // o.support = this.support;
	241	+ // o.fileparent = this.fileparent;
	242	+ // if (this.bRep != null)
	243	+ // o.bRep = this.bRep.support;
	244	+
	245	+ this.bRep = null;
	246	+ // if (this.bRep != null)
	247	+ // this.bRep.support = null;
	248	+ // this.support = null;
	249	+ // this.fileparent = null;
	250	+ }
	251	+
	252	+// Object3D GetObject(java.util.UUID uuid)
	253	+// {
	254	+// if (this.uuid.equals(uuid))
	255	+// return this;
	256	+//
	257	+// if (blockloop)
	258	+// return null;
	259	+//
	260	+// blockloop = true;
	261	+//
	262	+// for (int i=0; i<Size(); i++)
	263	+// {
	264	+// Object3D o = get(i).GetObject(uuid);
	265	+//
	266	+// if (o != null)
	267	+// return o;
	268	+// }
	269	+//
	270	+// blockloop = false;
	271	+//
	272	+// return null;
	273	+// }
	274	+
	275	+ transient boolean tag;
	276	+
	277	+ void TagObjects(Object3D o, boolean tag)
	278	+ {
	279	+ if (blockloop)
	280	+ return;
	281	+
	282	+ o.tag = tag;
	283	+
	284	+ if (o == this)
	285	+ return;
	286	+
129	287	blockloop = true;
130		- child.SaveSupports();
	288	+
	289	+ for (int i=0; i<Size(); i++)
	290	+ {
	291	+ get(i).TagObjects(o, tag);
	292	+ }
	293	+
131	294	blockloop = false;
132	295	}
133		-}
134	296
135		-void RestoreSupports()
136		-{
137		- if (blockloop)
138		- return;
	297	+ boolean HasTags()
	298	+ {
	299	+ if (blockloop)
	300	+ return false;
139	301
140		- support = transientsupport;
141		- link2master = transientlink2master;
142		- transientsupport = null;
143		- transientlink2master = false;
144		-
145		- if (bRep != null)
146		- {
147		- bRep.RestoreSupports();
148		- }
149		-
150		- for (int i = 0; i < Size(); i++)
151		- {
152		- Object3D child = (Object3D) get(i);
153		- if (child == null)
154		- continue;
155	302	blockloop = true;
156		- child.RestoreSupports();
	303	+
	304	+ boolean hasTags = false;
	305	+
	306	+ for (int i=0; i<Size(); i++)
	307	+ {
	308	+ hasTags \|= get(i).tag \|\| get(i).HasTags();
	309	+
	310	+ if (hasTags)
	311	+ break;
	312	+ }
	313	+
	314	+ blockloop = false;
	315	+
	316	+ return hasTags;
	317	+ }
	318	+
	319	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	320	+ {
	321	+ if (!hashtable.containsKey(GetUUID()))
	322	+ return;
	323	+
	324	+ Object3D o = hashtable.get(GetUUID());
	325	+
	326	+ RestoreBigData(o);
	327	+
	328	+ if (blockloop)
	329	+ return;
	330	+
	331	+ blockloop = true;
	332	+
	333	+ //hashtable.remove(GetUUID());
	334	+
	335	+ for (int i=0; i<Size(); i++)
	336	+ {
	337	+ get(i).RestoreBigData(hashtable);
	338	+ }
	339	+
157	340	blockloop = false;
158	341	}
159		-}
	342	+
	343	+ void RestoreBigData(Object3D o)
	344	+ {
	345	+ this.bRep = o.bRep;
	346	+ if (this.support != null && o.transientrep != null)
	347	+ {
	348	+ this.support.bRep = o.transientrep;
	349	+ }
	350	+
	351	+ this.selection = o.selection;
	352	+
	353	+ this.versionlist = o.versionlist;
	354	+ this.versionindex = o.versionindex;
	355	+// July 2019 if (this.bRep != null)
	356	+// this.bRep.support = o.transientrep;
	357	+ // this.support = o.support;
	358	+ // this.fileparent = o.fileparent;
	359	+ }
160	360
161	361	// MOCAP SUPPORT
162	362	double tx,ty,tz,rx,ry,rz;
..	..	@@ -299,6 +499,8 @@
299	499	}
300	500
301	501	boolean live = false;
	502	+ transient boolean keepdontselect;
	503	+ boolean dontselect = false;
302	504	boolean hide = false;
303	505	boolean link2master = false; // performs reset support/master at each frame
304	506	boolean marked = false; // animation node
..	..	@@ -430,16 +632,16 @@
430	632	{
431	633	Object3D copy = this;
432	634
433		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	635	+ Camera parentcam = Globals.theRenderer.ManipCamera();
434	636
435		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	637	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
436	638	{
437		- parentcam = CameraPane.theRenderer.cameras[1];
	639	+ parentcam = Globals.theRenderer.Cameras()[1];
438	640	}
439	641
440		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	642	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
441	643	{
442		- parentcam = CameraPane.theRenderer.cameras[0];
	644	+ parentcam = Globals.theRenderer.Cameras()[0];
443	645	}
444	646
445	647	if (this == parentcam)
..	..	@@ -447,7 +649,7 @@
447	649	//assert(this instanceof Camera);
448	650
449	651	for (int count = parentcam.GetTransformCount(); --count>=0;)
450		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	652	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
451	653	}
452	654
453	655	copy.marked ^= true;
..	..	@@ -467,7 +669,7 @@
467	669	//assert(this instanceof Camera);
468	670
469	671	for (int count = parentcam.GetTransformCount(); --count>=0;)
470		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	672	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
471	673	}
472	674
473	675	copy.Touch(); // display list issue
..	..	@@ -480,12 +682,14 @@
480	682	toParent = LA.newMatrix();
481	683	fromParent = LA.newMatrix();
482	684	}
	685	+
483	686	if (toParentMarked == null)
484	687	{
485	688	if (maxcount != 1)
486	689	{
487	690	new Exception().printStackTrace();
488	691	}
	692	+
489	693	toParentMarked = LA.newMatrix();
490	694	fromParentMarked = LA.newMatrix();
491	695	}
..	..	@@ -602,7 +806,7 @@
602	806	return;
603	807	}
604	808
605		- if (CameraPane.fromscript)
	809	+ if (Globals.fromscript)
606	810	{
607	811	transformcount = 0;
608	812	return;
..	..	@@ -760,7 +964,7 @@
760	964
761	965	int GetTransformCount()
762	966	{
763		- // marde pour serialization de Texture
	967	+ // patch pour serialization de Texture
764	968	resetmaxcount();
765	969	resettransformcount();
766	970	resetstep();
..	..	@@ -773,7 +977,7 @@
773	977	if (step == 0)
774	978	step = 1;
775	979	if (maxcount == 0)
776		- maxcount = 2048; // 4;
	980	+ maxcount = 128; // 2048; // 4;
777	981	// if (acceleration == 0)
778	982	// acceleration = 10;
779	983	if (delay == 0) // serial
..	..	@@ -794,12 +998,12 @@
794	998	// factor = CameraPane.STEP;
795	999	// }
796	1000
797		- if (marked && CameraPane.isLIVE() && live &&
	1001	+ if (marked && Globals.isLIVE() && live &&
798	1002	//TEMP21aug2018
799		- CameraPane.drawMode == CameraPane.SHADOW &&
800		- currentframe != CameraPane.framecount)
	1003	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
	1004	+ currentframe != Globals.framecount)
801	1005	{
802		- currentframe = CameraPane.framecount;
	1006	+ currentframe = Globals.framecount;
803	1007
804	1008	// System.err.println("transformcount = " + transformcount);
805	1009	// System.err.println("factor = " + factor);
..	..	@@ -808,7 +1012,8 @@
808	1012
809	1013	boolean changedir = random && Math.random() < 0.01; // && !link2master;
810	1014
811		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	1015	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	1016	+ (step == 1 && changedir))
812	1017	{
813	1018	countdown = 1;
814	1019	delay = speedup?8:1;
..	..	@@ -880,6 +1085,10 @@
880	1085	if (material == null \|\| material.multiply)
881	1086	return true;
882	1087
	1088	+ if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	1089	+ return false;
	1090	+
	1091	+ // Transparent objects are dynamic because we have to sort the triangles.
883	1092	return material.opacity > 0.99;
884	1093	}
885	1094
..	..	@@ -911,6 +1120,11 @@
911	1120	fromParent = null; // LA.newMatrix();
912	1121	bRep = null; // new BoundaryRep();
913	1122
	1123	+ if (oname != null && oname.equals("LeftHand"))
	1124	+ {
	1125	+ name = oname;
	1126	+ }
	1127	+
914	1128	/*
915	1129	float hue = (float)Math.random();
916	1130	Color col;
..	..	@@ -953,7 +1167,7 @@
953	1167
954	1168	public Object clone()
955	1169	{
956		- return GrafreeD.clone(this);
	1170	+ return Grafreed.clone(this);
957	1171	}
958	1172
959	1173	Object3D copyExpand()
..	..	@@ -1275,6 +1489,7 @@
1275	1489	toParent = LA.newMatrix();
1276	1490	fromParent = LA.newMatrix();
1277	1491	}
	1492	+
1278	1493	LA.matCopy(other.toParent, toParent);
1279	1494	LA.matCopy(other.fromParent, fromParent);
1280	1495
..	..	@@ -1469,7 +1684,7 @@
1469	1684	BoundaryRep.SEUIL = other.material.cameralight;
1470	1685
1471	1686	// Set default to 0.1
1472		- BoundaryRep.SEUIL /= 2;
	1687	+ BoundaryRep.SEUIL /= 4; // 2;
1473	1688	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1474	1689	}
1475	1690
..	..	@@ -1728,7 +1943,7 @@
1728	1943	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1729	1944	o.bRep = transientrep;
1730	1945	if (clone)
1731		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1946	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1732	1947	o.CreateMaterial();
1733	1948	o.SetAttributes(this, -1);
1734	1949	//parent
..	..	@@ -1741,7 +1956,7 @@
1741	1956	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1742	1957	o.bRep = bRep;
1743	1958	if (clone)
1744		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1959	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1745	1960	o.CreateMaterial();
1746	1961	//o.overwriteThis(this, -1);
1747	1962	o.SetAttributes(this, -1);
..	..	@@ -1828,12 +2043,15 @@
1828	2043	if (obj.name == null)
1829	2044	continue; // can't be a null one
1830	2045
	2046	+ // Try perfect match first.
1831	2047	if (n.equals(obj.name))
1832	2048	{
1833	2049	theobj = obj;
1834	2050	count++;
1835	2051	}
1836	2052	}
	2053	+
	2054	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1837	2055
1838	2056	if (count != 1)
1839	2057	for (int i=Size(); --i>=0;)
..	..	@@ -2293,12 +2511,22 @@
2293	2511	}
2294	2512	*/
2295	2513	}
	2514	+ else
	2515	+ {
	2516	+ //((ObjEditor)editWindow).SetupUI2(null);
	2517	+ if (objectUI != null)
	2518	+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
	2519	+ else
	2520	+ //new Exception().printStackTrace();
	2521	+ System.err.println("objectUI is null");
	2522	+ }
2296	2523	}
2297	2524
2298	2525	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2299	2526	{
2300	2527	if (newWindow)
2301	2528	{
	2529	+ new Exception().printStackTrace();
2302	2530	System.exit(0);
2303	2531	if (parent != null)
2304	2532	{
..	..	@@ -2333,6 +2561,14 @@
2333	2561	{
2334	2562	editWindow.refreshContents();
2335	2563	}
	2564	+ else
	2565	+ {
	2566	+ if (manipWindow != null)
	2567	+ {
	2568	+ manipWindow.refreshContents();
	2569	+ }
	2570	+ }
	2571	+
2336	2572	//if (parent != null)
2337	2573	//parent.refreshEditWindow();
2338	2574	}
..	..	@@ -2412,7 +2648,8 @@
2412	2648	private static final int editSelf = 1;
2413	2649	private static final int editChild = 2;
2414	2650
2415		- void drawEditHandles(ClickInfo info, int level)
	2651	+ void drawEditHandles(//ClickInfo info,
	2652	+ int level)
2416	2653	{
2417	2654	if (level == 0)
2418	2655	{
..	..	@@ -2420,7 +2657,8 @@
2420	2657	return;
2421	2658
2422	2659	Object3D selectee;
2423		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2660	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2661	+ level + 1))
2424	2662	{
2425	2663	selectee = (Object3D) e.nextElement();
2426	2664	}
..	..	@@ -2428,19 +2666,22 @@
2428	2666	} else
2429	2667	{
2430	2668	//super.
2431		- drawEditHandles0(info, level + 1);
	2669	+ drawEditHandles0(//info,
	2670	+ level + 1);
2432	2671	}
2433	2672	}
2434	2673
2435		- boolean doEditClick(ClickInfo info, int level)
	2674	+ boolean doEditClick(//ClickInfo info,
	2675	+ int level)
2436	2676	{
2437	2677	doSomething = 0;
2438	2678	if (level == 0)
2439	2679	{
2440		- return doParentClick(info);
	2680	+ return doParentClick(); //info);
2441	2681	}
2442	2682	if (//super.
2443		- doEditClick0(info, level))
	2683	+ doEditClick0(//info,
	2684	+ level))
2444	2685	{
2445	2686	doSomething = 1;
2446	2687	return true;
..	..	@@ -2450,7 +2691,7 @@
2450	2691	}
2451	2692	}
2452	2693
2453		- boolean doParentClick(ClickInfo info)
	2694	+ boolean doParentClick() //ClickInfo info)
2454	2695	{
2455	2696	if (selection == null)
2456	2697	{
..	..	@@ -2463,7 +2704,8 @@
2463	2704	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2464	2705	{
2465	2706	Object3D selectee = (Object3D) e.nextElement();
2466		- if (selectee.doEditClick(info, 1))
	2707	+ if (selectee.doEditClick(//info,
	2708	+ 1))
2467	2709	{
2468	2710	childToDrag = selectee;
2469	2711	doSomething = 2;
..	..	@@ -2475,13 +2717,15 @@
2475	2717	return retval;
2476	2718	}
2477	2719
2478		- void doEditDrag(ClickInfo info)
	2720	+ void doEditDrag(//ClickInfo clickInfo,
	2721	+ boolean opposite)
2479	2722	{
2480	2723	switch (doSomething)
2481	2724	{
2482	2725	case 1: // '\001'
2483	2726	//super.
2484		- doEditDrag0(info);
	2727	+ doEditDrag0(//clickInfo,
	2728	+ opposite);
2485	2729	break;
2486	2730
2487	2731	case 2: // '\002'
..	..	@@ -2494,11 +2738,13 @@
2494	2738	{
2495	2739	//sel.hitSomething = childToDrag.hitSomething;
2496	2740	//childToDrag.doEditDrag(info);
2497		- sel.doEditDrag(info);
	2741	+ sel.doEditDrag(//clickInfo,
	2742	+ opposite);
2498	2743	} else
2499	2744	{
2500	2745	//super.
2501		- doEditDrag0(info);
	2746	+ doEditDrag0(//clickInfo,
	2747	+ opposite);
2502	2748	}
2503	2749	}
2504	2750	break;
..	..	@@ -2516,6 +2762,9 @@
2516	2762	{
2517	2763	deselectAll();
2518	2764	}
	2765	+
	2766	+ new Exception().printStackTrace();
	2767	+
2519	2768	ClickInfo newInfo = new ClickInfo();
2520	2769	newInfo.flags = info.flags;
2521	2770	newInfo.bounds = info.bounds;
..	..	@@ -2608,6 +2857,18 @@
2608	2857	void GenNormalsS(boolean crease)
2609	2858	{
2610	2859	selection.GenNormals(crease);
	2860	+// for (int i=0; i<selection.size(); i++)
	2861	+// {
	2862	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2863	+// selectee.GenNormals(crease);
	2864	+// }
	2865	+
	2866	+ //Touch();
	2867	+ }
	2868	+
	2869	+ void GenNormalsMeshS()
	2870	+ {
	2871	+ selection.GenNormalsMesh();
2611	2872	// for (int i=0; i<selection.size(); i++)
2612	2873	// {
2613	2874	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2748,6 +3009,24 @@
2748	3009	if (child == null)
2749	3010	continue;
2750	3011	child.GenNormals(crease);
	3012	+// Children().release(i);
	3013	+ }
	3014	+ blockloop = false;
	3015	+ }
	3016	+
	3017	+ void GenNormalsMesh()
	3018	+ {
	3019	+ if (blockloop)
	3020	+ return;
	3021	+
	3022	+ blockloop = true;
	3023	+ GenNormalsMesh0();
	3024	+ for (int i = 0; i < Children().Size(); i++)
	3025	+ {
	3026	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	3027	+ if (child == null)
	3028	+ continue;
	3029	+ child.GenNormalsMesh();
2751	3030	// Children().release(i);
2752	3031	}
2753	3032	blockloop = false;
..	..	@@ -2905,7 +3184,8 @@
2905	3184	{
2906	3185	if (bRep != null)
2907	3186	{
2908		- bRep.GenUV();
	3187	+ bRep.GenUV(); //1);
	3188	+ //bRep.UnfoldUV();
2909	3189	Touch();
2910	3190	}
2911	3191	}
..	..	@@ -2919,11 +3199,20 @@
2919	3199	}
2920	3200	}
2921	3201
	3202	+ void GenNormalsMesh0()
	3203	+ {
	3204	+ if (bRep != null)
	3205	+ {
	3206	+ bRep.GenerateNormalsMesh();
	3207	+ Touch();
	3208	+ }
	3209	+ }
	3210	+
2922	3211	void GenNormalsMINE0()
2923	3212	{
2924	3213	if (bRep != null)
2925	3214	{
2926		- bRep.GenerateNormalsMINE();
	3215	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2927	3216	Touch();
2928	3217	}
2929	3218	}
..	..	@@ -2980,6 +3269,33 @@
2980	3269	blockloop = false;
2981	3270	}
2982	3271
	3272	+ void TransformChildren()
	3273	+ {
	3274	+ if (toParent != null)
	3275	+ {
	3276	+ for (int i=Size(); --i>=0;)
	3277	+ {
	3278	+ Object3D v = get(i);
	3279	+
	3280	+ if (v.toParent == null)
	3281	+ {
	3282	+ v.toParent = LA.newMatrix();
	3283	+ v.fromParent = LA.newMatrix();
	3284	+ }
	3285	+
	3286	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3287	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3288	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3289	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3290	+ }
	3291	+
	3292	+ toParent = null; // LA.matIdentity(toParent);
	3293	+ fromParent = null; // LA.matIdentity(fromParent);
	3294	+
	3295	+ Touch();
	3296	+ }
	3297	+ }
	3298	+
2983	3299	void TransformGeometry()
2984	3300	{
2985	3301	Object3D obj = this;
..	..	@@ -3201,9 +3517,11 @@
3201	3517
3202	3518	BoundaryRep sup = bRep.support;
3203	3519	bRep.support = null;
3204		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3520	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3205	3521	// bRep.SplitInTwo(onlyone); // thread...
3206		- temprep.SplitInTwo(reduction34, onlyone);
	3522	+
	3523	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3524	+
3207	3525	bRep = temprep;
3208	3526	bRep.support = sup;
3209	3527	Touch();
..	..	@@ -3304,15 +3622,47 @@
3304	3622
3305	3623	void ClearMaterials()
3306	3624	{
	3625	+ if (blockloop)
	3626	+ return;
	3627	+
	3628	+ blockloop = true;
	3629	+
3307	3630	ClearMaterial();
3308		- for (int i = 0; i < size(); i++)
	3631	+ for (int i = 0; i < Size(); i++)
3309	3632	{
3310		- Object3D child = (Object3D) reserve(i);
	3633	+ Object3D child = (Object3D) get(i);
3311	3634	if (child == null)
3312	3635	continue;
3313	3636	child.ClearMaterials();
3314		- release(i);
3315	3637	}
	3638	+
	3639	+ blockloop = false;
	3640	+ }
	3641	+
	3642	+ void ClearVersionList()
	3643	+ {
	3644	+ this.versionlist = null;
	3645	+ this.versionindex = -1;
	3646	+ this.versiontable = null;
	3647	+ }
	3648	+
	3649	+ void ClearVersions()
	3650	+ {
	3651	+ if (blockloop)
	3652	+ return;
	3653	+
	3654	+ blockloop = true;
	3655	+
	3656	+ ClearVersionList();
	3657	+ for (int i = 0; i < Size(); i++)
	3658	+ {
	3659	+ Object3D child = (Object3D) get(i);
	3660	+ if (child == null)
	3661	+ continue;
	3662	+ child.ClearVersions();
	3663	+ }
	3664	+
	3665	+ blockloop = false;
3316	3666	}
3317	3667
3318	3668	void FlipV(boolean flip)
..	..	@@ -3340,7 +3690,8 @@
3340	3690	if (blockloop)
3341	3691	return;
3342	3692
3343		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3693	+ if (//marked \|\| // does not make sense
	3694	+ (bRep != null \|\| material != null)) // borderline...
3344	3695	live = h;
3345	3696
3346	3697	for (int i = 0; i < Size(); i++)
..	..	@@ -3361,7 +3712,8 @@
3361	3712	return;
3362	3713
3363	3714	//if (bRep != null)
3364		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3715	+ if (//marked \|\| // does not make sense
	3716	+ (bRep != null \|\| material != null)) // borderline...
3365	3717	link2master = h;
3366	3718
3367	3719	for (int i = 0; i < Size(); i++)
..	..	@@ -3381,7 +3733,8 @@
3381	3733	if (blockloop)
3382	3734	return;
3383	3735
3384		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3736	+ if (//marked \|\| // does not make sense
	3737	+ (bRep != null \|\| material != null)) // borderline...
3385	3738	hide = h;
3386	3739
3387	3740	for (int i = 0; i < Size(); i++)
..	..	@@ -3401,7 +3754,7 @@
3401	3754	if (blockloop)
3402	3755	return;
3403	3756
3404		- if (bRep != null && material != null) // borderline...
	3757	+ if (bRep != null \|\| material != null) // borderline...
3405	3758	marked = h;
3406	3759
3407	3760	for (int i = 0; i < Size(); i++)
..	..	@@ -3411,6 +3764,46 @@
3411	3764	continue;
3412	3765	blockloop = true;
3413	3766	child.MarkLeaves(h);
	3767	+ blockloop = false;
	3768	+ // release(i);
	3769	+ }
	3770	+ }
	3771	+
	3772	+ void RewindLeaves(boolean h)
	3773	+ {
	3774	+ if (blockloop)
	3775	+ return;
	3776	+
	3777	+ if (bRep != null \|\| material != null) // borderline...
	3778	+ rewind = h;
	3779	+
	3780	+ for (int i = 0; i < Size(); i++)
	3781	+ {
	3782	+ Object3D child = (Object3D) get(i); // reserve(i);
	3783	+ if (child == null)
	3784	+ continue;
	3785	+ blockloop = true;
	3786	+ child.RewindLeaves(h);
	3787	+ blockloop = false;
	3788	+ // release(i);
	3789	+ }
	3790	+ }
	3791	+
	3792	+ void RandomLeaves(boolean h)
	3793	+ {
	3794	+ if (blockloop)
	3795	+ return;
	3796	+
	3797	+ if (bRep != null \|\| material != null) // borderline...
	3798	+ random = h;
	3799	+
	3800	+ for (int i = 0; i < Size(); i++)
	3801	+ {
	3802	+ Object3D child = (Object3D) get(i); // reserve(i);
	3803	+ if (child == null)
	3804	+ continue;
	3805	+ blockloop = true;
	3806	+ child.RandomLeaves(h);
3414	3807	blockloop = false;
3415	3808	// release(i);
3416	3809	}
..	..	@@ -3725,7 +4118,7 @@
3725	4118	if (child == null)
3726	4119	continue;
3727	4120
3728		- if (GrafreeD.RENDERME > 0)
	4121	+ if (Grafreed.RENDERME > 0)
3729	4122	{
3730	4123	if (child instanceof Merge)
3731	4124	((Merge)child).renderme();
..	..	@@ -3876,7 +4269,7 @@
3876	4269	if (child == null)
3877	4270	continue;
3878	4271
3879		- if (GrafreeD.RENDERME > 0)
	4272	+ if (Grafreed.RENDERME > 0)
3880	4273	{
3881	4274	if (child instanceof Merge)
3882	4275	((Merge)child).renderme();
..	..	@@ -4071,7 +4464,7 @@
4071	4464	if (child == null)
4072	4465	continue;
4073	4466
4074		- if (GrafreeD.RENDERME > 0)
	4467	+ if (Grafreed.RENDERME > 0)
4075	4468	{
4076	4469	if (child instanceof Merge)
4077	4470	((Merge)child).renderme();
..	..	@@ -4184,6 +4577,55 @@
4184	4577	{
4185	4578	blockloop = true;
4186	4579	get(i).RepairShadow();
	4580	+ blockloop = false;
	4581	+ }
	4582	+ }
	4583	+
	4584	+ void RepairSOV()
	4585	+ {
	4586	+ if (blockloop)
	4587	+ return;
	4588	+
	4589	+ String texname = this.GetPigmentTexture();
	4590	+
	4591	+ if (texname.startsWith("sov"))
	4592	+ {
	4593	+ String[] s = texname.split("/");
	4594	+
	4595	+ String[] sname = s[1].split("Color.pn");
	4596	+
	4597	+ texname = sname[0];
	4598	+
	4599	+ if (sname.length > 1)
	4600	+ {
	4601	+ texname += "Color.jpg";
	4602	+ }
	4603	+
	4604	+ this.SetPigmentTexture("sov/" + texname);
	4605	+ }
	4606	+
	4607	+ texname = this.GetBumpTexture();
	4608	+
	4609	+ if (texname.startsWith("sov"))
	4610	+ {
	4611	+ String[] s = texname.split("/");
	4612	+
	4613	+ String[] sname = s[1].split("Bump.pn");
	4614	+
	4615	+ texname = sname[0];
	4616	+
	4617	+ if (sname.length > 1)
	4618	+ {
	4619	+ texname += "Bump.jpg";
	4620	+ }
	4621	+
	4622	+ this.SetBumpTexture("sov/" + texname);
	4623	+ }
	4624	+
	4625	+ for (int i=0; i<Size(); i++)
	4626	+ {
	4627	+ blockloop = true;
	4628	+ get(i).RepairSOV();
4187	4629	blockloop = false;
4188	4630	}
4189	4631	}
..	..	@@ -4678,7 +5120,7 @@
4678	5120
4679	5121	cTreePath SelectLeaf(int indexcount, boolean deselect)
4680	5122	{
4681		- if (hide)
	5123	+ if (hide \|\| dontselect)
4682	5124	return null;
4683	5125
4684	5126	if (count <= 0)
..	..	@@ -4702,9 +5144,17 @@
4702	5144	}
4703	5145	}
4704	5146
	5147	+ ObjEditor GetWindow()
	5148	+ {
	5149	+ if (editWindow != null)
	5150	+ return editWindow;
	5151	+
	5152	+ return manipWindow;
	5153	+ }
	5154	+
4705	5155	cTreePath Select(int indexcount, boolean deselect)
4706	5156	{
4707		- if (hide)
	5157	+ if (hide \|\| dontselect)
4708	5158	return null;
4709	5159
4710	5160	if (count <= 0)
..	..	@@ -4738,10 +5188,11 @@
4738	5188	if (leaf != null)
4739	5189	{
4740	5190	cTreePath tp = new cTreePath(this, leaf);
4741		- if (editWindow != null)
	5191	+ ObjEditor window = GetWindow();
	5192	+ if (window != null)
4742	5193	{
4743	5194	//System.out.println("editWindow = " + editWindow + " vs " + this);
4744		- editWindow.Select(tp, deselect, true);
	5195	+ window.Select(tp, deselect, true);
4745	5196	}
4746	5197
4747	5198	return tp;
..	..	@@ -4758,6 +5209,7 @@
4758	5209
4759	5210	if (child == null)
4760	5211	continue;
	5212	+
4761	5213	if (child.HasTransparency() && child.size() != 0)
4762	5214	{
4763	5215	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4767,9 +5219,10 @@
4767	5219	if (leaf != null)
4768	5220	{
4769	5221	cTreePath tp = new cTreePath(this, leaf);
4770		- if (editWindow != null)
	5222	+ ObjEditor window = GetWindow();
	5223	+ if (window != null)
4771	5224	{
4772		- editWindow.Select(tp, deselect, true);
	5225	+ window.Select(tp, deselect, true);
4773	5226	}
4774	5227
4775	5228	return tp;
..	..	@@ -4854,7 +5307,7 @@
4854	5307	return globalTransform;
4855	5308	}
4856	5309
4857		- void PreprocessOcclusion(CameraPane cp)
	5310	+ void PreprocessOcclusion(iCameraPane cp)
4858	5311	{
4859	5312	/*
4860	5313	if (AOdone)
..	..	@@ -5001,7 +5454,8 @@
5001	5454	} else //
5002	5455	if (editWindow != null)
5003	5456	{
5004		- editWindow.cameraView.lighttouched = true;
	5457	+ //editWindow.cameraView.lighttouched = true;
	5458	+ Globals.lighttouched = true;
5005	5459	}
5006	5460	}
5007	5461
..	..	@@ -5093,6 +5547,51 @@
5093	5547	blockloop = false;
5094	5548	}
5095	5549
	5550	+ void ResetSelectable()
	5551	+ {
	5552	+ if (blockloop)
	5553	+ return;
	5554	+
	5555	+ blockloop = true;
	5556	+
	5557	+ keepdontselect = dontselect;
	5558	+ dontselect = true;
	5559	+
	5560	+ Object3D child;
	5561	+ int nb = Size();
	5562	+ for (int i = 0; i < nb; i++)
	5563	+ {
	5564	+ child = (Object3D) get(i);
	5565	+ if (child == null)
	5566	+ continue;
	5567	+ child.ResetSelectable();
	5568	+ }
	5569	+
	5570	+ blockloop = false;
	5571	+ }
	5572	+
	5573	+ void RestoreSelectable()
	5574	+ {
	5575	+ if (blockloop)
	5576	+ return;
	5577	+
	5578	+ blockloop = true;
	5579	+
	5580	+ dontselect = keepdontselect;
	5581	+
	5582	+ Object3D child;
	5583	+ int nb = Size();
	5584	+ for (int i = 0; i < nb; i++)
	5585	+ {
	5586	+ child = (Object3D) get(i);
	5587	+ if (child == null)
	5588	+ continue;
	5589	+ child.RestoreSelectable();
	5590	+ }
	5591	+
	5592	+ blockloop = false;
	5593	+ }
	5594	+
5096	5595	boolean IsSelected()
5097	5596	{
5098	5597	if (parent == null)
..	..	@@ -5153,12 +5652,41 @@
5153	5652	if (fullname == null)
5154	5653	return "";
5155	5654
	5655	+ if (fullname.pigment != null)
	5656	+ {
	5657	+ return fullname.pigment;
	5658	+ }
	5659	+
5156	5660	// System.out.println("Fullname = " + fullname);
5157	5661
5158		- if (fullname.name.indexOf(":") == -1)
5159		- return fullname.name;
	5662	+ // Does not work on Windows due to C:
	5663	+// if (fullname.name.indexOf(":") == -1)
	5664	+// return fullname.name;
	5665	+//
	5666	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5160	5667
5161		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5668	+ String[] split = fullname.name.split(":");
	5669	+
	5670	+ if (split.length == 0)
	5671	+ {
	5672	+ return fullname.pigment = "";
	5673	+ }
	5674	+
	5675	+ if (split.length <= 2)
	5676	+ {
	5677	+ if (fullname.name.endsWith(":"))
	5678	+ {
	5679	+ // Windows
	5680	+ return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
	5681	+ }
	5682	+
	5683	+ return fullname.pigment = split[0];
	5684	+ }
	5685	+
	5686	+ // Windows
	5687	+ assert(split.length == 4);
	5688	+
	5689	+ return fullname.pigment = split[0] + ":" + split[1];
5162	5690	}
5163	5691
5164	5692	static String GetBump(cTexture fullname)
..	..	@@ -5166,11 +5694,44 @@
5166	5694	if (fullname == null)
5167	5695	return "";
5168	5696
	5697	+ if (fullname.bump != null)
	5698	+ {
	5699	+ return fullname.bump;
	5700	+ }
	5701	+
5169	5702	// System.out.println("Fullname = " + fullname);
5170		- if (fullname.name.indexOf(":") == -1)
5171		- return "";
5172		-
5173		- return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5703	+ // Does not work on Windows due to C:
	5704	+// if (fullname.name.indexOf(":") == -1)
	5705	+// return "";
	5706	+//
	5707	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5708	+ String[] split = fullname.name.split(":");
	5709	+
	5710	+ if (split.length == 0)
	5711	+ {
	5712	+ return fullname.bump = "";
	5713	+ }
	5714	+
	5715	+ if (split.length == 1)
	5716	+ {
	5717	+ return fullname.bump = "";
	5718	+ }
	5719	+
	5720	+ if (split.length == 2)
	5721	+ {
	5722	+ if (fullname.name.endsWith(":"))
	5723	+ {
	5724	+ // Windows
	5725	+ return fullname.bump = "";
	5726	+ }
	5727	+
	5728	+ return fullname.bump = split[1];
	5729	+ }
	5730	+
	5731	+ // Windows
	5732	+ assert(split.length == 4);
	5733	+
	5734	+ return fullname.bump = split[2] + ":" + split[3];
5174	5735	}
5175	5736
5176	5737	String GetPigmentTexture()
..	..	@@ -5244,7 +5805,7 @@
5244	5805	System.out.print("; textures = " + textures);
5245	5806	System.out.println("; usedtextures = " + usedtextures);
5246	5807
5247		- if (GetTextures() == null)
	5808	+ if (GetTextures() == null) // What is that??
5248	5809	GetTextures().name = ":";
5249	5810
5250	5811	String texname = tex;
..	..	@@ -5253,6 +5814,9 @@
5253	5814	texname = "";
5254	5815
5255	5816	GetTextures().name = texname + ":" + GetBump(GetTextures());
	5817	+
	5818	+ GetTextures().pigment = null;
	5819	+
5256	5820	Touch();
5257	5821	}
5258	5822
..	..	@@ -5277,6 +5841,43 @@
5277	5841	}
5278	5842	}
5279	5843
	5844	+ UUID GetUUID()
	5845	+ {
	5846	+ if (uuid == null)
	5847	+ {
	5848	+ // Serial
	5849	+ uuid = UUID.randomUUID();
	5850	+ }
	5851	+
	5852	+ return uuid;
	5853	+ }
	5854	+
	5855	+ Object3D GetObject(UUID uid)
	5856	+ {
	5857	+ if (blockloop)
	5858	+ return null;
	5859	+
	5860	+ if (GetUUID().equals(uid))
	5861	+ return this;
	5862	+
	5863	+ int nb = Size();
	5864	+ for (int i = 0; i < nb; i++)
	5865	+ {
	5866	+ Object3D child = (Object3D) get(i);
	5867	+
	5868	+ if (child == null)
	5869	+ continue;
	5870	+
	5871	+ blockloop = true;
	5872	+ Object3D obj = child.GetObject(uid);
	5873	+ blockloop = false;
	5874	+ if (obj != null)
	5875	+ return obj;
	5876	+ }
	5877	+
	5878	+ return null;
	5879	+ }
	5880	+
5280	5881	void SetBumpTexture(String tex)
5281	5882	{
5282	5883	if (GetTextures() == null)
..	..	@@ -5288,6 +5889,8 @@
5288	5889	texname = "";
5289	5890
5290	5891	GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
	5892	+
	5893	+ GetTextures().bump = null;
5291	5894
5292	5895	Touch();
5293	5896	}
..	..	@@ -5313,25 +5916,65 @@
5313	5916	}
5314	5917	}
5315	5918
5316		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5919	+ void EmbedTextures(boolean embed)
	5920	+ {
	5921	+ if (blockloop)
	5922	+ return;
	5923	+
	5924	+ //if (GetTextures() != null)
	5925	+ if (embed)
	5926	+ CameraPane.EmbedTextures(GetTextures());
	5927	+ else
	5928	+ {
	5929	+ GetTextures().pigmentdata = null;
	5930	+ GetTextures().bumpdata = null;
	5931	+ GetTextures().pw = 0;
	5932	+ GetTextures().ph = 0;
	5933	+ GetTextures().bw = 0;
	5934	+ GetTextures().bh = 0;
	5935	+ }
	5936	+
	5937	+ int nb = Size();
	5938	+ for (int i = 0; i < nb; i++)
	5939	+ {
	5940	+ Object3D child = (Object3D) get(i);
	5941	+
	5942	+ if (child == null)
	5943	+ continue;
	5944	+
	5945	+ blockloop = true;
	5946	+ child.EmbedTextures(embed);
	5947	+ blockloop = false;
	5948	+ }
	5949	+ }
	5950	+
	5951	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5317	5952	{
5318	5953	Draw(display, root, selected, blocked);
5319	5954	}
5320	5955
5321		- static cMaterial[] materialstack = new cMaterial[65536];
5322		- static boolean[] selectedstack = new boolean[65536];
5323		- static int materialdepth = 0;
5324		-
5325	5956	boolean NeedSupport()
5326	5957	{
5327	5958	return
5328		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5959	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5329	5960	// PROBLEM with CROWD!!
5330		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	5961	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5331	5962	}
5332	5963
	5964	+ static boolean DEBUG_SELECTION = false;
5333	5965
5334		- void Draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5966	+ boolean IsLive()
	5967	+ {
	5968	+ if (live)
	5969	+ return true;
	5970	+
	5971	+ if (parent == null)
	5972	+ return false;
	5973	+
	5974	+ return parent.IsLive();
	5975	+ }
	5976	+
	5977	+ void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5335	5978	{
5336	5979	Invariants(); // june 2013
5337	5980
..	..	@@ -5340,8 +5983,8 @@
5340	5983	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5341	5984	}
5342	5985
5343		- if (display.drawMode == CameraPane.SELECTION &&
5344		- hide)
	5986	+ if (display.DrawMode() == iCameraPane.SELECTION &&
	5987	+ (hide \|\| dontselect))
5345	5988	return;
5346	5989
5347	5990	if (name != null && name.contains("sclera"))
..	..	@@ -5359,7 +6002,7 @@
5359	6002	if (this instanceof Checker)
5360	6003	return;
5361	6004
5362		- if (display.drawMode == display.SHADOW && PASSTEST)
	6005	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5363	6006	return;
5364	6007
5365	6008	if (count <= 0)
..	..	@@ -5367,13 +6010,13 @@
5367	6010	return;
5368	6011	}
5369	6012
5370		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5371		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	6013	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	6014	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5372	6015	{
5373	6016	return;
5374	6017	}
5375	6018
5376		- javax.media.opengl.GL gl = display.GetGL();
	6019	+ //javax.media.opengl.GL gl = display.GetGL();
5377	6020
5378	6021	/*
5379	6022	if (touched)
..	..	@@ -5391,8 +6034,10 @@
5391	6034	if (support != null)
5392	6035	support = support;
5393	6036
5394		- //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5395		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6037	+ boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6038	+ //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	6039	+
	6040	+ //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
5396	6041
5397	6042	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5398	6043	{
..	..	@@ -5402,30 +6047,33 @@
5402	6047	// usecalllists &= !(parent instanceof RandomNode);
5403	6048	// usecalllists = false;
5404	6049
5405		- if (GetBRep() != null)
5406		- usecalllists = usecalllists;
	6050	+ if (display.DrawMode() == display.SHADOW)
	6051	+ //GetBRep() != null)
	6052	+ usecalllists = !!usecalllists;
5407	6053	//System.out.println("draw " + this);
5408	6054	//new Exception().printStackTrace();
5409	6055
5410	6056	boolean compiled = false;
5411	6057
5412		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6058	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5413	6059
5414		- if (!selectmode && //display.drawMode != display.SELECTION &&
5415		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	6060	+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
	6061	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	6062	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5416	6063	{
5417		- display.lighttouched = true;
	6064	+ Globals.lighttouched = true;
5418	6065	} // all panes...
5419		- //if (usecalllists && display.drawMode != display.SELECTION && display.drawMode != display.SHADOW &&
5420		- if (bRep != null && usecalllists && !selectmode && // june 2013 display.drawMode != display.SHADOW &&
	6066	+
	6067	+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
	6068	+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5421	6069	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5422	6070	{
5423	6071	if (!(this instanceof Composite))
5424	6072	touched = false;
5425	6073	//if (displaylist == -1 && usecalllists)
5426		- if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
	6074	+ if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
5427	6075	{
5428		- bRep.displaylist = gl.glGenLists(1);
	6076	+ bRep.displaylist = display.GenList();
5429	6077	assert(bRep.displaylist != 0);
5430	6078	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5431	6079	//System.out.println("\tgen list " + list);
..	..	@@ -5434,21 +6082,23 @@
5434	6082
5435	6083	//System.out.println("\tnew list " + list);
5436	6084	//gl.glDrawBuffer(gl.GL_NONE);
5437		- if (usecalllists)
	6085	+ if (usecalllists && bRep.displaylist > 0)
5438	6086	{
5439	6087	// System.err.println("new list " + bRep.displaylist + " for " + this);
5440		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	6088	+ display.NewList(bRep.displaylist);
5441	6089	}
	6090	+
5442	6091	CallList(display, root, selected, blocked);
	6092	+
5443	6093	// compiled = true;
5444		- if (usecalllists)
	6094	+ if (usecalllists && bRep.displaylist > 0)
5445	6095	{
5446	6096	// System.err.println("end list " + bRep.displaylist + " for " + this);
5447		- gl.glEndList();
	6097	+ display.EndList();
5448	6098	}
5449	6099	//gl.glDrawBuffer(gl.GL_BACK);
5450	6100	// XXX touched = false;
5451		- display.lighttouched = true; // all panes...
	6101	+ Globals.lighttouched = true; // all panes...
5452	6102	}
5453	6103
5454	6104	touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
..	..	@@ -5487,12 +6137,12 @@
5487	6137
5488	6138	// frustum culling
5489	6139	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5490		- && display.drawMode != CameraPane.SELECTION)
	6140	+ && display.DrawMode() != iCameraPane.SELECTION)
5491	6141	{
5492		- if (display.drawMode == CameraPane.SHADOW)
	6142	+ if (display.DrawMode() == iCameraPane.SHADOW)
5493	6143	{
5494	6144	if (!link2master // tricky to cull in shadow mode.
5495		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	6145	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5496	6146	{
5497	6147	//System.out.print("CULLED");
5498	6148	culled = true;
..	..	@@ -5500,7 +6150,7 @@
5500	6150	}
5501	6151	else
5502	6152	//GetBRep().getBounds(v0, v1, this);
5503		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	6153	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5504	6154	culled = true;
5505	6155
5506	6156	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5536,11 +6186,12 @@
5536	6186
5537	6187
5538	6188	if (!culled)
5539		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	6189	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5540	6190	{
5541	6191	if (GetBRep() != null)
5542	6192	{
5543		- CameraPane.NextIndex(this, gl);
	6193	+ display.NextIndex();
	6194	+
5544	6195	// vertex color conflict : gl.glCallList(list);
5545	6196	DrawNode(display, root, selected);
5546	6197	if (this instanceof BezierPatch)
..	..	@@ -5562,55 +6213,7 @@
5562	6213	color[2] /= 2;
5563	6214	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5564	6215	*/
5565		- if (material != null)
5566		- {
5567		- materialstack[materialdepth] = material;
5568		- selectedstack[materialdepth] = selected;
5569		- cStatic.objectstack[materialdepth++] = this;
5570		- //System.out.println("material " + material);
5571		- //Applet3D.tracein(this, selected);
5572		- display.vector2buffer = projectedVertices;
5573		- if (this instanceof Camera)
5574		- {
5575		- display.options1[0] = material.shift;
5576		- //System.out.println("shift " + material.shift);
5577		- display.options1[1] = material.lightarea;
5578		- display.options1[2] = material.shadowbias;
5579		- display.options1[3] = material.aniso;
5580		- display.options1[4] = material.anisoV;
5581		- display.options2[0] = material.opacity;
5582		- display.options2[1] = material.diffuse;
5583		- display.options2[2] = material.factor;
5584		-
5585		- cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
5586		- display.options4[0] = material.cameralight/0.2f;
5587		- display.options4[1] = material.subsurface;
5588		- display.options4[2] = material.sheen;
5589		-
5590		- // if (display.CURRENTANTIALIAS > 0)
5591		- // display.options3[3] /= 4;
5592		-
5593		- /*
5594		- System.out.println("Focus = " + display.options1[0]);
5595		- System.out.println("Aperture = " + display.options1[1]);
5596		- System.out.println("ShadowBlur = " + display.options1[2]);
5597		- System.out.println("Antialiasing = " + display.options1[3]);
5598		- System.out.println("Fog = " + display.options2[0]);
5599		- System.out.println("Intensity = " + display.options2[1]);
5600		- System.out.println("Elevation = " + display.options2[2]);
5601		- /**/
5602		- } else
5603		- {
5604		- material.Draw(display, selected);
5605		- }
5606		- } else
5607		- {
5608		- if (selected && CameraPane.flash)
5609		- {
5610		- display.modelParams4[1] = 100;
5611		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5612		- }
5613		- }
	6216	+ display.PushMaterial(this, selected);
5614	6217
5615	6218	//System.out.println("call list " + list);
5616	6219	//System.out.println();
..	..	@@ -5629,7 +6232,28 @@
5629	6232	tex = GetTextures();
5630	6233	}
5631	6234
5632		- display.BindTextures(tex, texres);
	6235	+ boolean failedPigment = false;
	6236	+ boolean failedBump = false;
	6237	+
	6238	+ try
	6239	+ {
	6240	+ display.BindPigmentTexture(tex, texres);
	6241	+ }
	6242	+ catch (Exception e)
	6243	+ {
	6244	+ System.err.println("FAILED: " + this);
	6245	+ failedPigment = true;
	6246	+ }
	6247	+
	6248	+ try
	6249	+ {
	6250	+ display.BindBumpTexture(tex, texres);
	6251	+ }
	6252	+ catch (Exception e)
	6253	+ {
	6254	+ //System.err.println("FAILED: " + this);
	6255	+ failedBump = true;
	6256	+ }
5633	6257
5634	6258	if (!compiled)
5635	6259	{
..	..	@@ -5645,30 +6269,19 @@
5645	6269
5646	6270	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5647	6271	assert(bRep.displaylist != 0);
5648		- gl.glCallList(bRep.displaylist);
	6272	+ display.CallList(bRep.displaylist);
5649	6273	// june 2013 drawSelf(display, root, selected);
5650	6274	}
5651	6275	}
5652	6276	}
5653	6277
5654		- display.ReleaseTextures(tex);
5655		-
5656		- //if (parent != null && parent.GetMaterial() != null)
5657		- // parent.GetMaterial().Draw(display, parent.IsSelected(this));
5658		- if (material != null)
5659		- {
5660		- materialdepth -= 1;
5661		- if (materialdepth > 0)
5662		- {
5663		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5664		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5665		- }
5666		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5667		- } else if (selected && CameraPane.flash && GetMaterial() != null)
5668		- {
5669		- display.modelParams4[1] = GetMaterial().cameralight;
5670		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5671		- }
	6278	+ if (!failedBump)
	6279	+ display.ReleaseBumpTexture(tex);
	6280	+
	6281	+ if (!failedPigment)
	6282	+ display.ReleasePigmentTexture(tex);
	6283	+
	6284	+ display.PopMaterial(this, selected);
5672	6285	}
5673	6286
5674	6287	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5710,7 +6323,7 @@
5710	6323	// resetMasterNode();
5711	6324	}
5712	6325
5713		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6326	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5714	6327	{
5715	6328	if (GetBRep() == null)
5716	6329	{
..	..	@@ -5793,8 +6406,11 @@
5793	6406	boolean flipV = false; // true;
5794	6407	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5795	6408
5796		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6409	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5797	6410	{
	6411	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6412	+ return;
	6413	+
5798	6414	if (hide)
5799	6415	return;
5800	6416	// shadow optimisation
..	..	@@ -5852,16 +6468,7 @@
5852	6468	// // ??????????????????????????? Touch();
5853	6469	// }
5854	6470
5855		- if (material != null)
5856		- {
5857		- materialstack[materialdepth] = material;
5858		- selectedstack[materialdepth] = selected;
5859		- cStatic.objectstack[materialdepth++] = this;
5860		- //System.out.println("material " + material);
5861		- //Applet3D.tracein("selected ", selected);
5862		- display.vector2buffer = projectedVertices;
5863		- material.Draw(display, selected);
5864		- }
	6471	+display.PushMaterial2(this, selected);
5865	6472
5866	6473	Object3D child;
5867	6474	boolean sel;
..	..	@@ -5913,19 +6520,7 @@
5913	6520	*/
5914	6521	//depth += 1;
5915	6522
5916		- if (material != null)
5917		- {
5918		- materialdepth -= 1;
5919		- if (materialdepth > 0)
5920		- {
5921		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5922		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5923		- }
5924		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5925		- //else
5926		- //material.Draw(display, false);
5927		- }
5928		-
	6523	+display.PopMaterial2(this);
5929	6524	/*
5930	6525	display.ReleaseTextures(tex);
5931	6526	*/
..	..	@@ -5936,10 +6531,13 @@
5936	6531
5937	6532	//static cVector min,max;
5938	6533
5939		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	6534	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5940	6535	{
5941		- if (display.drawMode == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	6536	+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5942	6537	return; // no shadow for transparent objects
	6538	+
	6539	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6540	+ return;
5943	6541
5944	6542	if (hide)
5945	6543	return;
..	..	@@ -5981,9 +6579,10 @@
5981	6579	return;
5982	6580	}
5983	6581
	6582	+ //bRep.GenUV(1/material.diffuseness);
5984	6583	// bRep.lock = true;
5985	6584
5986		- javax.media.opengl.GL gl = display.GetGL();
	6585	+ //javax.media.opengl.GL gl = display.GetGL();
5987	6586
5988	6587	if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5989	6588	{
..	..	@@ -6000,23 +6599,7 @@
6000	6599
6001	6600	bRep.getMinMax(min, max, 100);
6002	6601
6003		- gl.glBegin(gl.GL_LINES);
6004		-
6005		- gl.glVertex3d(min.x, min.y, min.z);
6006		- gl.glVertex3d(min.x, min.y, max.z);
6007		- gl.glVertex3d(min.x, min.y, min.z);
6008		- gl.glVertex3d(min.x, max.y, min.z);
6009		- gl.glVertex3d(min.x, min.y, min.z);
6010		- gl.glVertex3d(max.x, min.y, min.z);
6011		-
6012		- gl.glVertex3d(max.x, max.y, max.z);
6013		- gl.glVertex3d(min.x, max.y, max.z);
6014		- gl.glVertex3d(max.x, max.y, max.z);
6015		- gl.glVertex3d(max.x, min.y, max.z);
6016		- gl.glVertex3d(max.x, max.y, max.z);
6017		- gl.glVertex3d(max.x, max.y, min.z);
6018		-
6019		- gl.glEnd();
	6602	+ display.DrawBox(min, max);
6020	6603
6021	6604	return;
6022	6605	}
..	..	@@ -6060,7 +6643,7 @@
6060	6643	{
6061	6644	//throw new Error();
6062	6645
6063		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6646	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
6064	6647
6065	6648	int[] strips = bRep.getRawIndices();
6066	6649
..	..	@@ -6070,178 +6653,19 @@
6070	6653	new Exception().printStackTrace();
6071	6654	return;
6072	6655	}
6073		-
6074		- // TRIANGLE STRIP ARRAY
6075		- if (bRep.trimmed)
	6656	+
	6657	+ if (dontselect)
6076	6658	{
6077		- float[] v = bRep.getRawVertices();
6078		- float[] n = bRep.getRawNormals();
6079		- float[] c = bRep.getRawColors();
6080		- float[] uv = bRep.getRawUVMap();
6081		-
6082		- int count2 = 0;
6083		- int count3 = 0;
6084		-
6085		- if (n.length > 0)
6086		- {
6087		- for (int i = 0; i < strips.length; i++)
6088		- {
6089		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6090		-
6091		- /*
6092		- boolean locked = false;
6093		- float eps = 0.1f;
6094		- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6095		-
6096		- int dot = 0;
6097		-
6098		- if ((dot&1) == 0)
6099		- dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6100		-
6101		- if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6102		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6103		- else
6104		- {
6105		- locked = true;
6106		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6107		- }
6108		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6109		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6110		- if (hasnorm)
6111		- {
6112		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6113		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6114		- }
6115		-
6116		- if ((dot&4) == 0)
6117		- dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6118		-
6119		- if (wrap \|\| !locked && (dot&8) != 0)
6120		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6121		- else
6122		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6123		-
6124		- f.dot = dot;
6125		- */
6126		-
6127		- if (!selectmode)
6128		- {
6129		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6130		- {
6131		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6132		- } else
6133		- {
6134		- gl.glNormal3f(0, 0, 1);
6135		- }
6136		-
6137		- if (c != null)
6138		- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
6139		- {
6140		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6141		- }
6142		- }
6143		- if (flipV)
6144		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6145		- else
6146		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6147		- //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6148		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6149		-
6150		- count2 += 2;
6151		- count3 += 3;
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		- if (flipV)
6167		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6168		- else
6169		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6170		- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6171		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6172		-
6173		- count2 += 2;
6174		- count3 += 3;
6175		- for (int j = 0; j < strips[i] - 2; j++)
6176		- {
6177		- //gl.glTexCoord2d(...);
6178		- if (!selectmode)
6179		- {
6180		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6181		- {
6182		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6183		- } else
6184		- {
6185		- gl.glNormal3f(0, 0, 1);
6186		- }
6187		- if (c != null)
6188		- {
6189		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6190		- }
6191		- }
6192		-
6193		- if (flipV)
6194		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6195		- else
6196		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6197		- //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6198		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6199		- count2 += 2;
6200		- count3 += 3;
6201		- }
6202		-
6203		- gl.glEnd();
6204		- }
6205		- }
6206		-
6207		- assert count3 == v.length;
	6659	+ //bRep.GenerateNormalsMINE();
6208	6660	}
6209		- else // !trimmed
6210		- {
6211		- int count = 0;
6212		- for (int i = 0; i < strips.length; i++)
6213		- {
6214		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6215		-
6216		- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6217		- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6218		-
6219		- drawVertex(gl, p, selectmode);
6220		- drawVertex(gl, q, selectmode);
6221		-
6222		- for (int j = 0; j < strips[i] - 2; j++)
6223		- {
6224		- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6225		-
6226		-// if (j%2 == 0)
6227		-// drawFace(p, q, r, display, null);
6228		-// else
6229		-// drawFace(p, r, q, display, null);
6230		-
6231		-// p = q;
6232		-// q = r;
6233		- drawVertex(gl, r, selectmode);
6234		- }
6235		-
6236		- gl.glEnd();
6237		- }
6238		- }
	6661	+
	6662	+ display.DrawGeometry(bRep, flipV, selectmode);
6239	6663	} else // catch (Error e)
6240	6664	{
6241	6665	// TRIANGLE ARRAY
6242	6666	if (IsOpaque()) // Static())
6243	6667	{
6244		- gl.glBegin(gl.GL_TRIANGLES);
	6668	+ display.StartTriangles();
6245	6669	int facecount = bRep.FaceCount();
6246	6670	for (int i = 0; i < facecount; i++)
6247	6671	{
..	..	@@ -6304,9 +6728,9 @@
6304	6728	// // r.norm.dot(v3) > -0.5)
6305	6729	// // continue;
6306	6730
6307		- drawFace(p, q, r, display, face);
	6731	+ display.DrawFace(this, p, q, r, face);
6308	6732	}
6309		- gl.glEnd();
	6733	+ display.EndTriangles();
6310	6734	}
6311	6735	else
6312	6736	{
..	..	@@ -6335,8 +6759,8 @@
6335	6759	//System.out.println("SORT");
6336	6760
6337	6761	java.util.Arrays.sort(facescompare);
6338		-
6339		- gl.glBegin(gl.GL_TRIANGLES);
	6762	+
	6763	+ display.StartTriangles();
6340	6764	for (int i = 0; i < facecount; i++)
6341	6765	{
6342	6766	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6348,13 +6772,14 @@
6348	6772	Vertex q = bRep.GetVertex(face.q);
6349	6773	Vertex r = bRep.GetVertex(face.r);
6350	6774
6351		- drawFace(p, q, r, display, face);
	6775	+ display.DrawFace(this, p, q, r, face);
6352	6776	}
6353		- gl.glEnd();
	6777	+ display.EndTriangles();
6354	6778	}
6355	6779
6356	6780	if (false) // live && support != null && support.bRep != null) // debug weights
6357	6781	{
	6782	+ /*
6358	6783	gl.glDisable(gl.GL_LIGHTING);
6359	6784	float[] colorV = new float[3];
6360	6785
..	..	@@ -6433,6 +6858,7 @@
6433	6858	// gl.glEnd();
6434	6859	}
6435	6860	}
	6861	+ */
6436	6862	}
6437	6863	}
6438	6864
..	..	@@ -6477,7 +6903,7 @@
6477	6903	center.add(r);
6478	6904	center.mul(1.0/3);
6479	6905
6480		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6906	+ center.sub(Globals.theRenderer.EyeCamera().location);
6481	6907
6482	6908	distance = center.dot(center);
6483	6909	}
..	..	@@ -6488,390 +6914,11 @@
6488	6914
6489	6915	transient FaceCompare[] facescompare = null;
6490	6916
6491		- void SetColor(CameraPane display, Vertex p0)
6492		- {
6493		- if (display.RENDERPROGRAM == 0)
6494		- {
6495		- float r = 0;
6496		- if (bRep != null)
6497		- {
6498		- if (bRep.stripified)
6499		- {
6500		- r = 1;
6501		- }
6502		- }
6503		- float g = 0;
6504		- if (bRep != null)
6505		- {
6506		- if (bRep.trimmed)
6507		- {
6508		- g = 1;
6509		- }
6510		- }
6511		- float b = 0;
6512		- if (support != null && link2master)
6513		- {
6514		- b = 1;
6515		- }
6516		- display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
6517		- return;
6518		- }
6519		-
6520		- if (display.drawMode != CameraPane.SHADOW)
6521		- return;
6522		-
6523		- javax.media.opengl.GL gl = display.GetGL();
6524		-// if (true) return;
6525		-// float ao = p.AO;
6526		-//
6527		-// // if (ao == 0 && !bRep.AOdone) // transient problem!
6528		-// // ao = 1;
6529		-//
6530		-// gl.glColor4f(ao, ao, ao, 1);
6531		-
6532		-// CameraPane.selectedpoint.
6533		-// getAverage(cStatic.point1, true);
6534		- if (CameraPane.pointflow == null) // !random) // live)
6535		- {
6536		- return;
6537		- }
6538		-
6539		- cStatic.point1.set(0,0,0);
6540		- LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
6541		-
6542		- cStatic.point1.sub(p0);
6543		-
6544		-
6545		-// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
6546		-// {
6547		-// return;
6548		-// }
6549		-
6550		- //if (true)
6551		- if (cStatic.point1.dot(cStatic.point1) > 0.000001)
6552		- {
6553		- return;
6554		- }
6555		-
6556		- float[] colorV = new float[3];
6557		-
6558		- if (false) // marked)
6559		- {
6560		- // debug rigging weights
6561		- for (int object = 0; object < p0.vertexlinks.length; object++)
6562		- {
6563		- float weight = p0.weights[object] / p0.totalweight;
6564		-
6565		- // if (weight < 0.1)
6566		- // {
6567		- // assert(weight == 0);
6568		- // continue;
6569		- // }
6570		-
6571		- if (p0.vertexlinks[object] == -1)
6572		- continue;
6573		-
6574		- Vertex q = support.bRep.GetVertex(p0.vertexlinks[object]);
6575		-
6576		- int color = //1 << object; //
6577		- //p.vertexlinks.length;
6578		- support.bRep.supports[p0.closestsupport].links[object];
6579		- colorV[2] += (color & 1) * weight;
6580		- colorV[1] += ((color & 2) >> 1) * weight;
6581		- colorV[0] += ((color & 4) >> 2) * weight;
6582		- }
6583		- }
6584		- else
6585		- {
6586		- if (drawingstarted)
6587		- {
6588		- // find next point
6589		- if (bRep.GetVertex(0).faceindices == null)
6590		- {
6591		- bRep.InitFaceIndices();
6592		- }
6593		-
6594		- double ymin = p0.y;
6595		-
6596		- Vertex newp = p0;
6597		-
6598		- for (int fii = 0; fii < p0.faceindices.length; fii++)
6599		- {
6600		- int fi = p0.faceindices[fii];
6601		-
6602		- if (fi == -1)
6603		- break;
6604		-
6605		- Face f = bRep.GetFace(fi);
6606		-
6607		- Vertex p = bRep.GetVertex(f.p);
6608		- Vertex q = bRep.GetVertex(f.q);
6609		- Vertex r = bRep.GetVertex(f.r);
6610		-
6611		- int swap = (int)(Math.random()*3);
6612		-
6613		-// for (int s=swap; --s>=0;)
6614		-// {
6615		-// Vertex t = p;
6616		-// p = q;
6617		-// q = r;
6618		-// r = t;
6619		-// }
6620		- if (ymin > p.y)
6621		- {
6622		- ymin = p.y;
6623		- newp = p;
6624		-// break;
6625		- }
6626		- if (ymin > q.y)
6627		- {
6628		- ymin = q.y;
6629		- newp = q;
6630		-// break;
6631		- }
6632		- if (ymin > r.y)
6633		- {
6634		- ymin = r.y;
6635		- newp = r;
6636		-// break;
6637		- }
6638		- }
6639		-
6640		- CameraPane.selectedpoint.toParent[3][0] = newp.x;
6641		- CameraPane.selectedpoint.toParent[3][1] = newp.y;
6642		- CameraPane.selectedpoint.toParent[3][2] = newp.z;
6643		-
6644		- drawingstarted = false;
6645		-
6646		- // return;
6647		- }
6648		-
6649		- if (false) // CameraPane.DRAW
6650		- {
6651		- p0.AO = colorV[0] = 2;
6652		- colorV[1] = 2;
6653		- colorV[2] = 2;
6654		- }
6655		-
6656		- CameraPane.pointflow.add(p0);
6657		- CameraPane.pointflow.Touch();
6658		- }
6659		-
6660		-// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
6661		-// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
6662		-// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
6663		- }
6664		-
6665	6917	void Print(Vertex v)
6666	6918	{
6667	6919	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6668	6920	}
6669	6921
6670		- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6671		- {
6672		- if (!selectmode)
6673		- {
6674		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6675		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6676		-
6677		- if (flipV)
6678		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6679		- else
6680		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6681		- }
6682		-
6683		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6684		- }
6685		-
6686		- void drawFace(Vertex pv, Vertex qv, Vertex rv,
6687		- CameraPane display, Face face)
6688		- {
6689		- if (pv.y == -10000 \|\|
6690		- qv.y == -10000 \|\|
6691		- rv.y == -10000)
6692		- return;
6693		-
6694		-// float b = f.nbiterations & 1;
6695		-// float g = (f.nbiterations>>1) & 1;
6696		-// float r = (f.nbiterations>>2) & 1;
6697		-//
6698		-// //if (f.weight == 10000)
6699		-// //{
6700		-// // r = 1; g = b = 0;
6701		-// //}
6702		-// //else
6703		-// //{
6704		-// // assert(f.weight < 10000);
6705		-// r = g = b = (float)bRep.FaceWeight(f)*100;
6706		-// if (r<0)
6707		-// assert(r>=0);
6708		-// //}
6709		-
6710		- javax.media.opengl.GL gl = display.GetGL();
6711		-
6712		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
6713		-
6714		- //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
6715		- if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
6716		- {
6717		- //gl.glBegin(gl.GL_TRIANGLES);
6718		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
6719		- if (!hasnorm)
6720		- {
6721		- // System.out.println("FUCK!!");
6722		- LA.vecSub(pv/.pos/, qv/.pos/, v0);
6723		- LA.vecSub(pv/.pos/, rv/.pos/, v1);
6724		- LA.vecCross(v0, v1, v2);
6725		- LA.vecNormalize(v2);
6726		- gl.glNormal3f((float) v2.x, (float) v2.y, (float) v2.z);
6727		- }
6728		-
6729		- // P
6730		- float x = (float)pv.x;
6731		- float y = (float)pv.y;
6732		- float z = (float)pv.z;
6733		-
6734		- if (hasnorm)
6735		- {
6736		-// if (!pv.norm.normalized())
6737		-// assert(pv.norm.normalized());
6738		-
6739		- //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
6740		- float nx = (float)pv.norm.x;
6741		- float ny = (float)pv.norm.y;
6742		- float nz = (float)pv.norm.z;
6743		-
6744		- x += nx * NORMALPUSH;
6745		- y += ny * NORMALPUSH;
6746		- z += nz * NORMALPUSH;
6747		-
6748		- gl.glNormal3f(nx, ny, nz);
6749		- }
6750		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6751		- SetColor(display, pv);
6752		- //gl.glColor4f(r, g, b, 1);
6753		- //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
6754		- if (flipV)
6755		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6756		- else
6757		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6758		- //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
6759		-
6760		- gl.glVertex3f(x, y, z);
6761		-
6762		- // Q
6763		- x = (float)qv.x;
6764		- y = (float)qv.y;
6765		- z = (float)qv.z;
6766		-
6767		-// Print(pv);
6768		- if (hasnorm)
6769		- {
6770		-// assert(qv.norm.normalized());
6771		- //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
6772		- float nx = (float)qv.norm.x;
6773		- float ny = (float)qv.norm.y;
6774		- float nz = (float)qv.norm.z;
6775		-
6776		- x += nx * NORMALPUSH;
6777		- y += ny * NORMALPUSH;
6778		- z += nz * NORMALPUSH;
6779		-
6780		- gl.glNormal3f(nx, ny, nz);
6781		- }
6782		- //System.out.println("vertexq = " + qv.s + ", " + qv.t);
6783		- // boolean locked = false;
6784		- // float eps = 0.1f;
6785		- // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6786		-
6787		- // int dot = 0; //*/ (int)f.dot;
6788		-
6789		- // if ((dot&1) == 0)
6790		- // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6791		-
6792		- // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6793		- if (flipV)
6794		- gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
6795		- else
6796		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6797		- // else
6798		- // {
6799		- // locked = true;
6800		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6801		- // }
6802		- gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
6803		- SetColor(display, qv);
6804		-
6805		- gl.glVertex3f(x, y, z);
6806		- //gl.glColor4f(r, g, b, 1);
6807		- //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
6808		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6809		-// Print(qv);
6810		-
6811		- // R
6812		- x = (float)rv.x;
6813		- y = (float)rv.y;
6814		- z = (float)rv.z;
6815		-
6816		- if (hasnorm)
6817		- {
6818		-// assert(rv.norm.normalized());
6819		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6820		- float nx = (float)rv.norm.x;
6821		- float ny = (float)rv.norm.y;
6822		- float nz = (float)rv.norm.z;
6823		-
6824		- x += nx * NORMALPUSH;
6825		- y += ny * NORMALPUSH;
6826		- z += nz * NORMALPUSH;
6827		-
6828		- gl.glNormal3f(nx, ny, nz);
6829		- }
6830		-
6831		- // if ((dot&4) == 0)
6832		- // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6833		-
6834		- // if (wrap \|\| !locked && (dot&8) != 0)
6835		- if (flipV)
6836		- gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
6837		- else
6838		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6839		- // else
6840		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6841		-
6842		- // f.dot = dot;
6843		-
6844		- gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
6845		- SetColor(display, rv);
6846		- //gl.glColor4f(r, g, b, 1);
6847		- //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
6848		- //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
6849		- gl.glVertex3f(x, y, z);
6850		-// Print(rv);
6851		- //gl.glEnd();
6852		- }
6853		- else
6854		- {
6855		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6856		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6857		- gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
6858		-
6859		- }
6860		-
6861		- if (false) // (attributes & WIREFRAME) != 0)
6862		- {
6863		- gl.glDisable(gl.GL_LIGHTING);
6864		-
6865		- gl.glBegin(gl.GL_LINE_LOOP);
6866		- gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
6867		- gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
6868		- gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
6869		- gl.glEnd();
6870		-
6871		- gl.glEnable(gl.GL_LIGHTING);
6872		- }
6873		- }
6874		-
6875	6922	void drawSelf(ClickInfo info, int level, boolean select)
6876	6923	{
6877	6924	if (bRep == null)
..	..	@@ -7395,20 +7442,23 @@
7395	7442	}
7396	7443	}
7397	7444
7398		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7445	+ static ClickInfo clickInfo = new ClickInfo();
	7446	+
	7447	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7448	+ Point outPt, Rectangle outRec)
7399	7449	{
7400		- int hc = info.bounds.x + info.bounds.width / 2;
7401		- int vc = info.bounds.y + info.bounds.height / 2;
7402		- double[][] toscreen = info.toScreen;
	7450	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7451	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7452	+ double[][] toscreen = clickInfo.toScreen;
7403	7453	if (toscreen == null)
7404	7454	{
7405		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7455	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
7406	7456	}
7407	7457	cVector vec = in;
7408	7458	LA.xformPos(in, toscreen, in);
7409	7459	//System.out.println("Distance = " + info.camera.Distance());
7410		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
7411		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7460	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7461	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
7412	7462	outPt.x = hc + (int) vec.x;
7413	7463	outPt.y = vc - (int) vec.y;
7414	7464	outRec.x = outPt.x - 3;
..	..	@@ -7416,15 +7466,18 @@
7416	7466	outRec.width = outRec.height = 6;
7417	7467	}
7418	7468
7419		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7469	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7470	+ )
7420	7471	{
7421	7472	Point pt = new Point(0, 0);
7422	7473	Rectangle rec = new Rectangle();
7423		- calcHotSpot(in, info, pt, rec);
	7474	+ calcHotSpot(in, //clickInfo,
	7475	+ pt, rec);
7424	7476	return rec;
7425	7477	}
7426	7478
7427		- void drawEditHandles0(ClickInfo info, int level)
	7479	+ void drawEditHandles0(//ClickInfo clickInfo,
	7480	+ int level)
7428	7481	{
7429	7482	if (level == 0)
7430	7483	{
..	..	@@ -7433,98 +7486,104 @@
7433	7486	{
7434	7487	cVector origin = new cVector();
7435	7488	//LA.xformPos(origin, toParent, origin);
7436		- Rectangle spot = calcHotSpot(origin, info);
	7489	+ if (this.clickInfo == null)
	7490	+ this.clickInfo = new ClickInfo();
	7491	+
	7492	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7437	7493	Rectangle boundary = new Rectangle();
7438	7494	boundary.x = spot.x - 30;
7439	7495	boundary.y = spot.y - 30;
7440	7496	boundary.width = spot.width + 60;
7441	7497	boundary.height = spot.height + 60;
7442		- info.g.setColor(Color.red);
	7498	+ clickInfo.g.setColor(Color.white);
7443	7499	int spotw = spot.x + spot.width;
7444	7500	int spoth = spot.y + spot.height;
7445		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7446		- if (CameraPane.Xmin > spot.x)
7447		- {
7448		- CameraPane.Xmin = spot.x;
7449		- }
7450		- if (CameraPane.Xmax < spotw)
7451		- {
7452		- CameraPane.Xmax = spotw;
7453		- }
7454		- if (CameraPane.Ymin > spot.y)
7455		- {
7456		- CameraPane.Ymin = spot.y;
7457		- }
7458		- if (CameraPane.Ymax < spoth)
7459		- {
7460		- CameraPane.Ymax = spoth;
7461		- }
7462		- spot.translate(32, 32);
	7501	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7502	+// if (CameraPane.Xmin > spot.x)
	7503	+// {
	7504	+// CameraPane.Xmin = spot.x;
	7505	+// }
	7506	+// if (CameraPane.Xmax < spotw)
	7507	+// {
	7508	+// CameraPane.Xmax = spotw;
	7509	+// }
	7510	+// if (CameraPane.Ymin > spot.y)
	7511	+// {
	7512	+// CameraPane.Ymin = spot.y;
	7513	+// }
	7514	+// if (CameraPane.Ymax < spoth)
	7515	+// {
	7516	+// CameraPane.Ymax = spoth;
	7517	+// }
	7518	+// if (CameraPane.Xmin > spot.x)
	7519	+// {
	7520	+// CameraPane.Xmin = spot.x;
	7521	+// }
	7522	+// if (CameraPane.Xmax < spotw)
	7523	+// {
	7524	+// CameraPane.Xmax = spotw;
	7525	+// }
	7526	+// if (CameraPane.Ymin > spot.y)
	7527	+// {
	7528	+// CameraPane.Ymin = spot.y;
	7529	+// }
	7530	+// if (CameraPane.Ymax < spoth)
	7531	+// {
	7532	+// CameraPane.Ymax = spoth;
	7533	+// }
	7534	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7535	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
	7536	+ spot.translate(32, 0);
	7537	+ clickInfo.g.setColor(Color.yellow);
	7538	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7539	+
	7540	+ spot.translate(32, 64);
7463	7541	spotw = spot.x + spot.width;
7464	7542	spoth = spot.y + spot.height;
7465		- info.g.setColor(Color.blue);
7466		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7467		- if (CameraPane.Xmin > spot.x)
7468		- {
7469		- CameraPane.Xmin = spot.x;
7470		- }
7471		- if (CameraPane.Xmax < spotw)
7472		- {
7473		- CameraPane.Xmax = spotw;
7474		- }
7475		- if (CameraPane.Ymin > spot.y)
7476		- {
7477		- CameraPane.Ymin = spot.y;
7478		- }
7479		- if (CameraPane.Ymax < spoth)
7480		- {
7481		- CameraPane.Ymax = spoth;
7482		- }
7483		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7484		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7485		- spot.translate(0, -32);
7486		- info.g.setColor(Color.green);
7487		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7488		- if (CameraPane.Xmin > spot.x)
7489		- {
7490		- CameraPane.Xmin = spot.x;
7491		- }
7492		- if (CameraPane.Xmax < spotw)
7493		- {
7494		- CameraPane.Xmax = spotw;
7495		- }
7496		- if (CameraPane.Ymin > spot.y)
7497		- {
7498		- CameraPane.Ymin = spot.y;
7499		- }
7500		- if (CameraPane.Ymax < spoth)
7501		- {
7502		- CameraPane.Ymax = spoth;
7503		- }
7504		- info.g.drawArc(boundary.x, boundary.y,
7505		- boundary.width, boundary.height, 0, 360);
	7543	+ clickInfo.g.setColor(Color.cyan);
	7544	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7545	+// if (CameraPane.Xmin > spot.x)
	7546	+// {
	7547	+// CameraPane.Xmin = spot.x;
	7548	+// }
	7549	+// if (CameraPane.Xmax < spotw)
	7550	+// {
	7551	+// CameraPane.Xmax = spotw;
	7552	+// }
	7553	+// if (CameraPane.Ymin > spot.y)
	7554	+// {
	7555	+// CameraPane.Ymin = spot.y;
	7556	+// }
	7557	+// if (CameraPane.Ymax < spoth)
	7558	+// {
	7559	+// CameraPane.Ymax = spoth;
	7560	+// }
	7561	+ clickInfo.g.setColor(Color.green);
	7562	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7563	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7506	7564	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7507		- if (CameraPane.Xmin > boundary.x)
7508		- {
7509		- CameraPane.Xmin = boundary.x;
7510		- }
7511		- if (CameraPane.Xmax < boundary.x + boundary.width)
7512		- {
7513		- CameraPane.Xmax = boundary.x + boundary.width;
7514		- }
7515		- if (CameraPane.Ymin > boundary.y)
7516		- {
7517		- CameraPane.Ymin = boundary.y;
7518		- }
7519		- if (CameraPane.Ymax < boundary.y + boundary.height)
7520		- {
7521		- CameraPane.Ymax = boundary.y + boundary.height;
7522		- }
	7565	+// if (CameraPane.Xmin > boundary.x)
	7566	+// {
	7567	+// CameraPane.Xmin = boundary.x;
	7568	+// }
	7569	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	7570	+// {
	7571	+// CameraPane.Xmax = boundary.x + boundary.width;
	7572	+// }
	7573	+// if (CameraPane.Ymin > boundary.y)
	7574	+// {
	7575	+// CameraPane.Ymin = boundary.y;
	7576	+// }
	7577	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	7578	+// {
	7579	+// CameraPane.Ymax = boundary.y + boundary.height;
	7580	+// }
7523	7581	return;
7524	7582	}
7525	7583	}
7526	7584
7527		- boolean doEditClick0(ClickInfo info, int level)
	7585	+ boolean doEditClick0(//ClickInfo clickInfo,
	7586	+ int level)
7528	7587	{
7529	7588	if (level == 0)
7530	7589	{
..	..	@@ -7533,10 +7592,10 @@
7533	7592
7534	7593	boolean retval = false;
7535	7594
7536		- startX = info.x;
7537		- startY = info.y;
	7595	+ startX = clickInfo.x;
	7596	+ startY = clickInfo.y;
7538	7597
7539		- hitSomething = 0;
	7598	+ hitSomething = -1;
7540	7599	cVector origin = new cVector();
7541	7600	//LA.xformPos(origin, toParent, origin);
7542	7601	Rectangle spot = new Rectangle();
..	..	@@ -7544,22 +7603,53 @@
7544	7603	{
7545	7604	centerPt = new Point(0, 0);
7546	7605	}
7547		- calcHotSpot(origin, info, centerPt, spot);
7548		- if (spot.contains(info.x, info.y))
	7606	+ calcHotSpot(origin, //info,
	7607	+ centerPt, spot);
	7608	+ if (spot.contains(clickInfo.x, clickInfo.y))
7549	7609	{
7550	7610	hitSomething = hitCenter;
7551	7611	retval = true;
7552	7612	}
7553	7613	spot.translate(32, 0);
7554		- if (spot.contains(info.x, info.y))
	7614	+ if (spot.contains(clickInfo.x, clickInfo.y))
7555	7615	{
7556	7616	hitSomething = hitRotate;
7557	7617	retval = true;
7558	7618	}
7559	7619	spot.translate(0, 32);
7560		- if (spot.contains(info.x, info.y))
	7620	+ spot.translate(32, 0);
	7621	+ spot.translate(0, 32);
	7622	+ if (spot.contains(clickInfo.x, clickInfo.y))
7561	7623	{
7562	7624	hitSomething = hitScale;
	7625	+
	7626	+ double scale = 0.005f * clickInfo.camera.Distance();
	7627	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7628	+ double sign = 1;
	7629	+ if (hScale < 0)
	7630	+ {
	7631	+ sign = -1;
	7632	+ }
	7633	+ hScale = signMath.pow(signhScale, scale * 50);
	7634	+ if (hScale < 0.01)
	7635	+ {
	7636	+ //hScale = 0.01;
	7637	+ }
	7638	+
	7639	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7640	+ sign = 1;
	7641	+ if (vScale < 0)
	7642	+ {
	7643	+ sign = -1;
	7644	+ }
	7645	+ vScale = signMath.pow(signvScale, scale * 50);
	7646	+ if (vScale < 0.01)
	7647	+ {
	7648	+ //vScale = 0.01;
	7649	+ }
	7650	+
	7651	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7652	+
7563	7653	retval = true;
7564	7654	}
7565	7655
..	..	@@ -7569,7 +7659,7 @@
7569	7659	}
7570	7660
7571	7661	//System.out.println("info.modifiers = " + info.modifiers);
7572		- modified = (info.modifiers & CameraPane.META) != 0;
	7662	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7573	7663	//System.out.println("modified = " + modified);
7574	7664	//new Exception().printStackTrace();
7575	7665	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7597,7 +7687,8 @@
7597	7687	return true;
7598	7688	}
7599	7689
7600		- void doEditDrag0(ClickInfo info)
	7690	+ void doEditDrag0(//ClickInfo info,
	7691	+ boolean opposite)
7601	7692	{
7602	7693	if (hitSomething == 0)
7603	7694	{
..	..	@@ -7611,7 +7702,8 @@
7611	7702
7612	7703	//System.out.println("hitSomething = " + hitSomething);
7613	7704
7614		- double scale = 0.005f * info.camera.Distance();
	7705	+ double scale = 0.005f * clickInfo.camera.Distance();
	7706	+
7615	7707	cVector xlate = new cVector();
7616	7708	//cVector xlate2 = new cVector();
7617	7709	switch (hitSomething)
..	..	@@ -7622,9 +7714,9 @@
7622	7714
7623	7715	case hitCenter: // Translate
7624	7716
7625		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7717	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7626	7718
7627		- if (modified)
	7719	+ if (modified \|\| opposite)
7628	7720	{
7629	7721	//assert(false);
7630	7722	/*
..	..	@@ -7644,8 +7736,8 @@
7644	7736	toParent[3][i] = xlate.get(i);
7645	7737	LA.matInvert(toParent, fromParent);
7646	7738	*/
7647		- cVector delta = LA.newVector(0, 0, startY - info.y);
7648		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7739	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7740	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7649	7741
7650	7742	LA.matCopy(startMat, toParent);
7651	7743	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7654,7 +7746,7 @@
7654	7746	} else
7655	7747	{
7656	7748	//LA.xformDir(delta, info.camera.fromScreen, delta);
7657		- cVector up = new cVector(info.camera.up);
	7749	+ cVector up = new cVector(clickInfo.camera.up);
7658	7750	cVector away = new cVector();
7659	7751	//cVector right2 = new cVector();
7660	7752	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7670,20 +7762,20 @@
7670	7762	}
7671	7763	LA.xformDir(up, ClickInfo.matbuffer, up);
7672	7764	// if (!CameraPane.LOCALTRANSFORM)
7673		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
7674		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7765	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
	7766	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7675	7767	// if (!CameraPane.LOCALTRANSFORM)
7676		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7768	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7677	7769	//LA.vecCross(up, cVector.Z, right2);
7678	7770
7679		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7771	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7680	7772
7681	7773	//System.out.println("DELTA0 = " + delta);
7682	7774	//System.out.println("AWAY = " + info.camera.away);
7683	7775	//System.out.println("UP = " + info.camera.up);
7684	7776	if (away.z > 0)
7685	7777	{
7686		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7778	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7687	7779	{
7688	7780	delta.x = -delta.x;
7689	7781	} else
..	..	@@ -7698,7 +7790,7 @@
7698	7790	//System.out.println("DELTA1 = " + delta);
7699	7791	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7700	7792	//System.out.println("DELTA2 = " + delta);
7701		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7793	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7702	7794	LA.matCopy(startMat, toParent);
7703	7795	//System.out.println("DELTA3 = " + delta);
7704	7796	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7708,8 +7800,8 @@
7708	7800	break;
7709	7801
7710	7802	case hitRotate: // rotate
7711		- int dx = info.x - centerPt.x;
7712		- int dy = -(info.y - centerPt.y);
	7803	+ int dx = clickInfo.x - centerPt.x;
	7804	+ int dy = -(clickInfo.y - centerPt.y);
7713	7805	double angle = (double) Math.atan2(dx, dy);
7714	7806	angle = -(1.570796 - angle);
7715	7807
..	..	@@ -7718,6 +7810,7 @@
7718	7810
7719	7811	if (modified)
7720	7812	{
	7813	+ // Rotate 90 degrees
7721	7814	angle /= (Math.PI / 4);
7722	7815	angle = Math.floor(angle + 0.5);
7723	7816	angle *= (Math.PI / 4);
..	..	@@ -7731,7 +7824,7 @@
7731	7824	}
7732	7825	/**/
7733	7826
7734		- switch (info.pane.renderCamera.viewCode)
	7827	+ switch (clickInfo.pane.RenderCamera().viewCode)
7735	7828	{
7736	7829	case 1: // '\001'
7737	7830	LA.matZRotate(toParent, angle);
..	..	@@ -7758,26 +7851,30 @@
7758	7851	break;
7759	7852
7760	7853	case hitScale: // scale
7761		- double hScale = (double) (info.x - centerPt.x) / 32;
	7854	+ double hScale = (double) (clickInfo.x - centerPt.x) / 64;
	7855	+ double sign = 1;
	7856	+ if (hScale < 0)
	7857	+ {
	7858	+ sign = -1;
	7859	+ }
	7860	+ hScale = signMath.pow(signhScale, scale * 50);
7762	7861	if (hScale < 0.01)
7763	7862	{
7764		- hScale = 0.01;
	7863	+ //hScale = 0.01;
7765	7864	}
7766		- hScale = Math.pow(hScale, scale * 50);
7767		- if (hScale < 0.01)
	7865	+
	7866	+ double vScale = (double) (clickInfo.y - centerPt.y) / 64;
	7867	+ sign = 1;
	7868	+ if (vScale < 0)
7768	7869	{
7769		- hScale = 0.01;
	7870	+ sign = -1;
7770	7871	}
7771		- double vScale = (double) (info.y - centerPt.y) / 32;
	7872	+ vScale = signMath.pow(signvScale, scale * 50);
7772	7873	if (vScale < 0.01)
7773	7874	{
7774		- vScale = 0.01;
	7875	+ //vScale = 0.01;
7775	7876	}
7776		- vScale = Math.pow(vScale, scale * 50);
7777		- if (vScale < 0.01)
7778		- {
7779		- vScale = 0.01;
7780		- }
	7877	+
7781	7878	LA.matCopy(startMat, toParent);
7782	7879	/**/
7783	7880	for (int i = 0; i < 3; i++)
..	..	@@ -7787,39 +7884,56 @@
7787	7884	}
7788	7885	/**/
7789	7886
7790		- switch (info.pane.renderCamera.viewCode)
	7887	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
	7888	+
	7889	+ if (totalScale < 0.01)
	7890	+ {
	7891	+ totalScale = 0.01;
	7892	+ }
	7893	+
	7894	+ switch (clickInfo.pane.RenderCamera().viewCode)
7791	7895	{
7792	7896	case 3: // '\001'
7793		- if (modified)
	7897	+ if (modified \|\| opposite)
7794	7898	{
	7899	+ if (modified && opposite)
	7900	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7901	+ else
7795	7902	//LA.matScale(toParent, 1, hScale, vScale);
7796		- LA.matScale(toParent, vScale, 1, 1);
	7903	+ LA.matScale(toParent, totalScale, 1, 1);
7797	7904	} // vScale, 1);
7798	7905	else
7799	7906	{
7800		- LA.matScale(toParent, vScale, vScale, vScale);
	7907	+ // EXCEPTION!
	7908	+ LA.matScale(toParent, 1, totalScale, totalScale);
7801	7909	} // vScale, 1);
7802	7910	break;
7803	7911
7804	7912	case 2: // '\002'
7805		- if (modified)
	7913	+ if (modified \|\| opposite)
7806	7914	{
7807		- //LA.matScale(toParent, hScale, 1, vScale);
7808		- LA.matScale(toParent, 1, vScale, 1);
	7915	+ if (modified && opposite)
	7916	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7917	+ else
	7918	+ //LA.matScale(toParent, hScale, 1, vScale);
	7919	+ LA.matScale(toParent, 1, totalScale, 1);
7809	7920	} else
7810	7921	{
7811		- LA.matScale(toParent, vScale, 1, vScale);
	7922	+ LA.matScale(toParent, totalScale, 1, totalScale);
7812	7923	}
7813	7924	break;
7814	7925
7815	7926	case 1: // '\003'
7816		- if (modified)
	7927	+ if (modified \|\| opposite)
7817	7928	{
7818		- //LA.matScale(toParent, hScale, vScale, 1);
7819		- LA.matScale(toParent, 1, 1, vScale);
	7929	+ if (modified && opposite)
	7930	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
	7931	+ else
	7932	+ //LA.matScale(toParent, hScale, vScale, 1);
	7933	+ LA.matScale(toParent, 1, 1, totalScale);
7820	7934	} else
7821	7935	{
7822		- LA.matScale(toParent, vScale, vScale, 1);
	7936	+ LA.matScale(toParent, totalScale, totalScale, 1);
7823	7937	}
7824	7938	break;
7825	7939	}
..	..	@@ -7853,7 +7967,7 @@
7853	7967	} // NEW ...
7854	7968
7855	7969
7856		- info.pane.repaint();
	7970	+ clickInfo.pane.repaint();
7857	7971	}
7858	7972
7859	7973	boolean overflow = false;
..	..	@@ -7952,14 +8066,22 @@
7952	8066	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7953	8067	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7954	8068	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	8069	+
	8070	+ String objname;
	8071	+
7955	8072	if (false) //parent != null)
7956	8073	{
7957		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	8074	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7958	8075	} else
7959	8076	{
7960		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	8077	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7961	8078	} // + super.toString();
7962	8079	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	8080	+
	8081	+ if (!Globals.ADVANCED)
	8082	+ return objname;
	8083	+
	8084	+ return objname + " " + System.identityHashCode(this);
7963	8085	}
7964	8086
7965	8087	public int hashCode()
..	..	@@ -8015,6 +8137,7 @@
8015	8137	objectUI.closeUI();
8016	8138	if (editWindow != null)
8017	8139	{
	8140	+ editWindow.ctrlPanel.FlushUI();
8018	8141	editWindow.refreshContents();
8019	8142	} // ? new
8020	8143	objectUI = null;
..	..	@@ -8023,6 +8146,10 @@
8023	8146	{
8024	8147	editWindow = null;
8025	8148	} // ?
	8149	+ }
	8150	+ else
	8151	+ {
	8152	+ //editWindow.closeUI();
8026	8153	}
8027	8154	}
8028	8155
..	..	@@ -8035,7 +8162,7 @@
8035	8162	/transient/ cVector2[] projectedVertices = new cVector2[0];
8036	8163
8037	8164	Object3D /Composite/ parent;
8038		- Object3D /Composite/ fileparent;
	8165	+ Object3D /Composite/ fileparent; // In the case of FileObject
8039	8166
8040	8167	double[][] toParent; // dynamic matrix
8041	8168	double[][] fromParent;
..	..	@@ -8150,7 +8277,7 @@
8150	8277	{
8151	8278	assert(bRep != null);
8152	8279	if (!(support instanceof GenericJoint)) // support.bRep != null)
8153		- GrafreeD.Assert(support.bRep == bRep.support);
	8280	+ Grafreed.Assert(support.bRep == bRep.support);
8154	8281	}
8155	8282	else
8156	8283	{
..	..	@@ -8181,6 +8308,10 @@
8181	8308	}
8182	8309
8183	8310	transient ObjEditor editWindow;
	8311	+ transient ObjEditor manipWindow;
	8312	+
	8313	+ transient boolean pinned;
	8314	+
8184	8315	transient ObjectUI objectUI;
8185	8316	public static int povDepth = 0;
8186	8317	private static cVector tbMin = new cVector();
..	..	@@ -8199,9 +8330,9 @@
8199	8330	private static cVector edge2 = new cVector();
8200	8331	//private static cVector norm = new cVector();
8201	8332	/transient private/ int hitSomething;
8202		- private static final int hitCenter = 1;
8203		- private static final int hitScale = 2;
8204		- private static final int hitRotate = 3;
	8333	+ static final int hitCenter = 1;
	8334	+ static final int hitScale = 2;
	8335	+ static final int hitRotate = 3;
8205	8336	/transient/ /private/ int viewCode; // Now used for transparency cache flag
8206	8337	/transient/ private Point centerPt;
8207	8338	/transient/ private int startX;