~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -5,6 +5,7 @@
5	5	import java.util.Vector;
6	6
7	7	import javax.media.j3d.Transform3D;
	8	+import javax.media.opengl.GL;
8	9	import javax.vecmath.Vector3d;
9	10
10	11	import javax.imageio.ImageIO;
..	..	@@ -13,13 +14,38 @@
13	14	import //weka.core.
14	15	matrix.Matrix;
15	16
	17	+import java.util.UUID;
	18	+
16	19	//import net.sourceforge.sizeof.SizeOf;
17	20	public class Object3D extends Vector<Object3D> implements java.io.Serializable, iSendInfo //, aurelienribon.tweenengine.TweenAccessor<Object3D>
18	21	{
19	22	//static final long serialVersionUID = -607422624994562685L;
20	23	static final long serialVersionUID = 5022536242724664900L;
21	24
	25	+ private UUID uuid = UUID.randomUUID();
	26	+
	27	+ // TEMPORARY for mocap undo. No need to be transient.
	28	+ mocap.reader.BVHReader.BVHResult savebvh;
	29	+ Object3D saveskeleton;
	30	+ //
	31	+
	32	+ byte[] versions[];
	33	+ int versionindex = -1;
	34	+
22	35	ScriptNode scriptnode;
	36	+
	37	+ void InitOthers()
	38	+ {
	39	+ if (projectedVertices == null \|\| projectedVertices.length <= 2)
	40	+ {
	41	+ projectedVertices = new Object3D.cVector2[3];
	42	+ }
	43	+ for (int i = 0; i < 3; i++)
	44	+ {
	45	+ projectedVertices[i] = new cVector2(); // Others
	46	+ }
	47	+ projectedVertices[0].x = 100; // bump
	48	+ }
23	49
24	50	void MinMax(cVector minima, cVector maxima)
25	51	{
..	..	@@ -86,64 +112,178 @@
86	112
87	113	// transient boolean reduced; // for morph reduction
88	114
89		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
90		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	115	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	116	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
91	117
92		-transient Object3D transientsupport; // for cloning
93		-transient boolean transientlink2master;
	118	+ transient Object3D transientsupport; // for cloning
	119	+ transient boolean transientlink2master;
94	120
95		-void SaveSupports()
96		-{
97		- if (blockloop)
98		- return;
99		-
100		- transientsupport = support;
101		- transientlink2master = link2master;
102		-
103		- support = null;
104		- link2master = false;
105		-
106		- if (bRep != null)
	121	+ void SaveSupports()
107	122	{
108		- bRep.SaveSupports();
	123	+ if (blockloop)
	124	+ return;
	125	+
	126	+ transientsupport = support;
	127	+ transientlink2master = link2master;
	128	+
	129	+ support = null;
	130	+ link2master = false;
	131	+
	132	+ if (bRep != null)
	133	+ {
	134	+ bRep.SaveSupports();
	135	+ }
	136	+
	137	+ for (int i = 0; i < Size(); i++)
	138	+ {
	139	+ Object3D child = (Object3D) get(i);
	140	+ if (child == null)
	141	+ continue;
	142	+ blockloop = true;
	143	+ child.SaveSupports();
	144	+ blockloop = false;
	145	+ }
109	146	}
110		-
111		- for (int i = 0; i < Size(); i++)
	147	+
	148	+ void RestoreSupports()
112	149	{
113		- Object3D child = (Object3D) get(i);
114		- if (child == null)
115		- continue;
	150	+ if (blockloop)
	151	+ return;
	152	+
	153	+ support = transientsupport;
	154	+ link2master = transientlink2master;
	155	+ transientsupport = null;
	156	+ transientlink2master = false;
	157	+
	158	+ if (bRep != null)
	159	+ {
	160	+ bRep.RestoreSupports();
	161	+ }
	162	+
	163	+ for (int i = 0; i < Size(); i++)
	164	+ {
	165	+ Object3D child = (Object3D) get(i);
	166	+ if (child == null)
	167	+ continue;
	168	+ blockloop = true;
	169	+ child.RestoreSupports();
	170	+ blockloop = false;
	171	+ }
	172	+ }
	173	+
	174	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	175	+ {
	176	+ Object3D o;
	177	+
	178	+ if (hashtable.containsKey(GetUUID()))
	179	+ {
	180	+ o = hashtable.get(GetUUID());
	181	+
	182	+ Grafreed.Assert(this.bRep == o.bRep);
	183	+ //if (this.bRep != null)
	184	+ // assert(this.bRep.support == o.transientrep);
	185	+ if (this.support != null)
	186	+ assert(this.support.bRep == o.transientrep);
	187	+ }
	188	+ else
	189	+ {
	190	+ o = new Object3D("copy of " + this.name);
	191	+
	192	+ hashtable.put(GetUUID(), o);
	193	+ }
	194	+
	195	+ if (!blockloop)
	196	+ {
	197	+ blockloop = true;
	198	+
	199	+ for (int i=0; i<Size(); i++)
	200	+ {
	201	+ get(i).ExtractBigData(hashtable);
	202	+ }
	203	+
	204	+ blockloop = false;
	205	+ }
	206	+
	207	+ ExtractBigData(o);
	208	+ }
	209	+
	210	+ void ExtractBigData(Object3D o)
	211	+ {
	212	+ if (o.bRep != null)
	213	+ Grafreed.Assert(o.bRep == this.bRep);
	214	+
	215	+ o.bRep = this.bRep;
	216	+// July 2019 if (this.bRep != null)
	217	+// {
	218	+// o.transientrep = this.bRep.support;
	219	+// o.bRep.support = null;
	220	+// }
	221	+ o.selection = this.selection;
	222	+ o.versions = this.versions;
	223	+ o.versionindex = this.versionindex;
	224	+
	225	+ if (this.support != null)
	226	+ {
	227	+ if (o.transientrep != null)
	228	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	229	+
	230	+ o.transientrep = this.support.bRep;
	231	+ this.support.bRep = null;
	232	+ }
	233	+
	234	+ // o.support = this.support;
	235	+ // o.fileparent = this.fileparent;
	236	+ // if (this.bRep != null)
	237	+ // o.bRep = this.bRep.support;
	238	+
	239	+ this.bRep = null;
	240	+ // if (this.bRep != null)
	241	+ // this.bRep.support = null;
	242	+ // this.support = null;
	243	+ // this.fileparent = null;
	244	+ }
	245	+
	246	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	247	+ {
	248	+ if (!hashtable.containsKey(GetUUID()))
	249	+ return;
	250	+
	251	+ Object3D o = hashtable.get(GetUUID());
	252	+
	253	+ RestoreBigData(o);
	254	+
	255	+ if (blockloop)
	256	+ return;
	257	+
116	258	blockloop = true;
117		- child.SaveSupports();
	259	+
	260	+ //hashtable.remove(GetUUID());
	261	+
	262	+ for (int i=0; i<Size(); i++)
	263	+ {
	264	+ get(i).RestoreBigData(hashtable);
	265	+ }
	266	+
118	267	blockloop = false;
119	268	}
120		-}
121	269
122		-void RestoreSupports()
123		-{
124		- if (blockloop)
125		- return;
126		-
127		- support = transientsupport;
128		- link2master = transientlink2master;
129		- transientsupport = null;
130		- transientlink2master = false;
131		-
132		- if (bRep != null)
	270	+ void RestoreBigData(Object3D o)
133	271	{
134		- bRep.RestoreSupports();
	272	+ this.bRep = o.bRep;
	273	+ if (this.support != null && o.transientrep != null)
	274	+ {
	275	+ this.support.bRep = o.transientrep;
	276	+ }
	277	+
	278	+ this.selection = o.selection;
	279	+
	280	+ this.versions = o.versions;
	281	+ this.versionindex = o.versionindex;
	282	+// July 2019 if (this.bRep != null)
	283	+// this.bRep.support = o.transientrep;
	284	+ // this.support = o.support;
	285	+ // this.fileparent = o.fileparent;
135	286	}
136		-
137		- for (int i = 0; i < Size(); i++)
138		- {
139		- Object3D child = (Object3D) get(i);
140		- if (child == null)
141		- continue;
142		- blockloop = true;
143		- child.RestoreSupports();
144		- blockloop = false;
145		- }
146		-}
147	287
148	288	// MOCAP SUPPORT
149	289	double tx,ty,tz,rx,ry,rz;
..	..	@@ -286,6 +426,8 @@
286	426	}
287	427
288	428	boolean live = false;
	429	+ transient boolean keepdontselect;
	430	+ boolean dontselect = false;
289	431	boolean hide = false;
290	432	boolean link2master = false; // performs reset support/master at each frame
291	433	boolean marked = false; // animation node
..	..	@@ -295,6 +437,8 @@
295	437	boolean random = false;
296	438	boolean speedup = false;
297	439	boolean rewind = false;
	440	+
	441	+ float NORMALPUSH = 0;
298	442
299	443	Object3D support;
300	444
..	..	@@ -355,7 +499,7 @@
355	499
356	500	int MemorySize()
357	501	{
358		- if (memorysize == 0)
	502	+ if (true) // memorysize == 0)
359	503	{
360	504	try
361	505	{
..	..	@@ -415,16 +559,16 @@
415	559	{
416	560	Object3D copy = this;
417	561
418		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	562	+ Camera parentcam = Globals.theRenderer.ManipCamera();
419	563
420		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	564	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
421	565	{
422		- parentcam = CameraPane.theRenderer.cameras[1];
	566	+ parentcam = Globals.theRenderer.Cameras()[1];
423	567	}
424	568
425		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	569	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
426	570	{
427		- parentcam = CameraPane.theRenderer.cameras[0];
	571	+ parentcam = Globals.theRenderer.Cameras()[0];
428	572	}
429	573
430	574	if (this == parentcam)
..	..	@@ -432,7 +576,7 @@
432	576	//assert(this instanceof Camera);
433	577
434	578	for (int count = parentcam.GetTransformCount(); --count>=0;)
435		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	579	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
436	580	}
437	581
438	582	copy.marked ^= true;
..	..	@@ -452,7 +596,7 @@
452	596	//assert(this instanceof Camera);
453	597
454	598	for (int count = parentcam.GetTransformCount(); --count>=0;)
455		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	599	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
456	600	}
457	601
458	602	copy.Touch(); // display list issue
..	..	@@ -465,12 +609,14 @@
465	609	toParent = LA.newMatrix();
466	610	fromParent = LA.newMatrix();
467	611	}
	612	+
468	613	if (toParentMarked == null)
469	614	{
470	615	if (maxcount != 1)
471	616	{
472	617	new Exception().printStackTrace();
473	618	}
	619	+
474	620	toParentMarked = LA.newMatrix();
475	621	fromParentMarked = LA.newMatrix();
476	622	}
..	..	@@ -587,7 +733,7 @@
587	733	return;
588	734	}
589	735
590		- if (CameraPane.fromscript)
	736	+ if (Globals.fromscript)
591	737	{
592	738	transformcount = 0;
593	739	return;
..	..	@@ -745,7 +891,7 @@
745	891
746	892	int GetTransformCount()
747	893	{
748		- // marde pour serialization de Texture
	894	+ // patch pour serialization de Texture
749	895	resetmaxcount();
750	896	resettransformcount();
751	897	resetstep();
..	..	@@ -758,7 +904,7 @@
758	904	if (step == 0)
759	905	step = 1;
760	906	if (maxcount == 0)
761		- maxcount = 2048; // 4;
	907	+ maxcount = 128; // 2048; // 4;
762	908	// if (acceleration == 0)
763	909	// acceleration = 10;
764	910	if (delay == 0) // serial
..	..	@@ -779,9 +925,12 @@
779	925	// factor = CameraPane.STEP;
780	926	// }
781	927
782		- if (marked && CameraPane.isLIVE() && live && CameraPane.drawMode == CameraPane.SHADOW && currentframe != CameraPane.framecount)
	928	+ if (marked && Globals.isLIVE() && live &&
	929	+ //TEMP21aug2018
	930	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
	931	+ currentframe != Globals.framecount)
783	932	{
784		- currentframe = CameraPane.framecount;
	933	+ currentframe = Globals.framecount;
785	934
786	935	// System.err.println("transformcount = " + transformcount);
787	936	// System.err.println("factor = " + factor);
..	..	@@ -790,7 +939,8 @@
790	939
791	940	boolean changedir = random && Math.random() < 0.01; // && !link2master;
792	941
793		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	942	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	943	+ (step == 1 && changedir))
794	944	{
795	945	countdown = 1;
796	946	delay = speedup?8:1;
..	..	@@ -862,6 +1012,7 @@
862	1012	if (material == null \|\| material.multiply)
863	1013	return true;
864	1014
	1015	+ // Transparent objects are dynamic because we have to sort the triangles.
865	1016	return material.opacity > 0.99;
866	1017	}
867	1018
..	..	@@ -893,6 +1044,11 @@
893	1044	fromParent = null; // LA.newMatrix();
894	1045	bRep = null; // new BoundaryRep();
895	1046
	1047	+ if (oname != null && oname.equals("LeftHand"))
	1048	+ {
	1049	+ name = oname;
	1050	+ }
	1051	+
896	1052	/*
897	1053	float hue = (float)Math.random();
898	1054	Color col;
..	..	@@ -935,7 +1091,7 @@
935	1091
936	1092	public Object clone()
937	1093	{
938		- return GrafreeD.clone(this);
	1094	+ return Grafreed.clone(this);
939	1095	}
940	1096
941	1097	Object3D copyExpand()
..	..	@@ -1257,6 +1413,7 @@
1257	1413	toParent = LA.newMatrix();
1258	1414	fromParent = LA.newMatrix();
1259	1415	}
	1416	+
1260	1417	LA.matCopy(other.toParent, toParent);
1261	1418	LA.matCopy(other.fromParent, fromParent);
1262	1419
..	..	@@ -1446,7 +1603,16 @@
1446	1603	// if (other == null)
1447	1604	// return;
1448	1605
1449		- System.out.println("Link support this = " + this + "; other = " + other);
	1606	+ if (other != null)
	1607	+ {
	1608	+ BoundaryRep.SEUIL = other.material.cameralight;
	1609	+
	1610	+ // Set default to 0.1
	1611	+ BoundaryRep.SEUIL /= 4; // 2;
	1612	+ System.out.println("SEUIL = " + BoundaryRep.SEUIL);
	1613	+ }
	1614	+
	1615	+ System.out.println("Link this = " + this + "; support = " + other);
1450	1616
1451	1617	//if (bRep != null)
1452	1618	// bRep.linkVerticesThis(other.bRep);
..	..	@@ -1701,7 +1867,7 @@
1701	1867	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1702	1868	o.bRep = transientrep;
1703	1869	if (clone)
1704		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1870	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1705	1871	o.CreateMaterial();
1706	1872	o.SetAttributes(this, -1);
1707	1873	//parent
..	..	@@ -1714,7 +1880,7 @@
1714	1880	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1715	1881	o.bRep = bRep;
1716	1882	if (clone)
1717		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1883	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1718	1884	o.CreateMaterial();
1719	1885	//o.overwriteThis(this, -1);
1720	1886	o.SetAttributes(this, -1);
..	..	@@ -1801,12 +1967,15 @@
1801	1967	if (obj.name == null)
1802	1968	continue; // can't be a null one
1803	1969
	1970	+ // Try perfect match first.
1804	1971	if (n.equals(obj.name))
1805	1972	{
1806	1973	theobj = obj;
1807	1974	count++;
1808	1975	}
1809	1976	}
	1977	+
	1978	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1810	1979
1811	1980	if (count != 1)
1812	1981	for (int i=Size(); --i>=0;)
..	..	@@ -1816,8 +1985,9 @@
1816	1985	if (obj.name == null)
1817	1986	continue; // can't be a null one
1818	1987
1819		- //if (n.contains(obj.name)) // dec 2013 name.split(":")[0])) // Poser generates a count
1820		- if (n.startsWith(obj.name))
	1988	+ String name = obj.name.split(":")[0]; // Poser generates a count
	1989	+ //if (n.startsWith(obj.name))
	1990	+ if (n.contains(name))
1821	1991	{
1822	1992	theobj = obj;
1823	1993	count++;
..	..	@@ -2120,15 +2290,8 @@
2120	2290	if (/parent != null &&/ material == null)
2121	2291	{
2122	2292	material = new cMaterial(GetMaterial());
2123		- if (projectedVertices == null \|\| projectedVertices.length <= 2)
2124		- {
2125		- projectedVertices = new Object3D.cVector2[3];
2126		- }
2127		- for (int i = 0; i < 3; i++)
2128		- {
2129		- projectedVertices[i] = new cVector2(); // Others
2130		- }
2131		- projectedVertices[0].x = 100; // bump
	2293	+
	2294	+ InitOthers();
2132	2295
2133	2296	if (this instanceof Camera)
2134	2297	{
..	..	@@ -2272,12 +2435,17 @@
2272	2435	}
2273	2436	*/
2274	2437	}
	2438	+ else
	2439	+ {
	2440	+ //((ObjEditor)editWindow).SetupUI2(null);
	2441	+ }
2275	2442	}
2276	2443
2277	2444	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
2278	2445	{
2279	2446	if (newWindow)
2280	2447	{
	2448	+ new Exception().printStackTrace();
2281	2449	System.exit(0);
2282	2450	if (parent != null)
2283	2451	{
..	..	@@ -2312,6 +2480,14 @@
2312	2480	{
2313	2481	editWindow.refreshContents();
2314	2482	}
	2483	+ else
	2484	+ {
	2485	+ if (manipWindow != null)
	2486	+ {
	2487	+ manipWindow.refreshContents();
	2488	+ }
	2489	+ }
	2490	+
2315	2491	//if (parent != null)
2316	2492	//parent.refreshEditWindow();
2317	2493	}
..	..	@@ -2454,13 +2630,13 @@
2454	2630	return retval;
2455	2631	}
2456	2632
2457		- void doEditDrag(ClickInfo info)
	2633	+ void doEditDrag(ClickInfo info, boolean opposite)
2458	2634	{
2459	2635	switch (doSomething)
2460	2636	{
2461	2637	case 1: // '\001'
2462	2638	//super.
2463		- doEditDrag0(info);
	2639	+ doEditDrag0(info, opposite);
2464	2640	break;
2465	2641
2466	2642	case 2: // '\002'
..	..	@@ -2473,11 +2649,11 @@
2473	2649	{
2474	2650	//sel.hitSomething = childToDrag.hitSomething;
2475	2651	//childToDrag.doEditDrag(info);
2476		- sel.doEditDrag(info);
	2652	+ sel.doEditDrag(info, opposite);
2477	2653	} else
2478	2654	{
2479	2655	//super.
2480		- doEditDrag0(info);
	2656	+ doEditDrag0(info, opposite);
2481	2657	}
2482	2658	}
2483	2659	break;
..	..	@@ -2587,6 +2763,18 @@
2587	2763	void GenNormalsS(boolean crease)
2588	2764	{
2589	2765	selection.GenNormals(crease);
	2766	+// for (int i=0; i<selection.size(); i++)
	2767	+// {
	2768	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2769	+// selectee.GenNormals(crease);
	2770	+// }
	2771	+
	2772	+ //Touch();
	2773	+ }
	2774	+
	2775	+ void GenNormalsMeshS()
	2776	+ {
	2777	+ selection.GenNormalsMesh();
2590	2778	// for (int i=0; i<selection.size(); i++)
2591	2779	// {
2592	2780	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2732,6 +2920,42 @@
2732	2920	blockloop = false;
2733	2921	}
2734	2922
	2923	+ void GenNormalsMesh()
	2924	+ {
	2925	+ if (blockloop)
	2926	+ return;
	2927	+
	2928	+ blockloop = true;
	2929	+ GenNormalsMesh0();
	2930	+ for (int i = 0; i < Children().Size(); i++)
	2931	+ {
	2932	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2933	+ if (child == null)
	2934	+ continue;
	2935	+ child.GenNormalsMesh();
	2936	+// Children().release(i);
	2937	+ }
	2938	+ blockloop = false;
	2939	+ }
	2940	+
	2941	+ void GenNormalsMINE()
	2942	+ {
	2943	+ if (blockloop)
	2944	+ return;
	2945	+
	2946	+ blockloop = true;
	2947	+ GenNormalsMINE0();
	2948	+ for (int i = 0; i < Children().Size(); i++)
	2949	+ {
	2950	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2951	+ if (child == null)
	2952	+ continue;
	2953	+ child.GenNormalsMINE();
	2954	+// Children().release(i);
	2955	+ }
	2956	+ blockloop = false;
	2957	+ }
	2958	+
2735	2959	void ClearColors()
2736	2960	{
2737	2961	if (blockloop)
..	..	@@ -2866,7 +3090,8 @@
2866	3090	{
2867	3091	if (bRep != null)
2868	3092	{
2869		- bRep.GenUV();
	3093	+ bRep.GenUV(); //1);
	3094	+ //bRep.UnfoldUV();
2870	3095	Touch();
2871	3096	}
2872	3097	}
..	..	@@ -2876,6 +3101,24 @@
2876	3101	if (bRep != null)
2877	3102	{
2878	3103	bRep.GenerateNormals(crease);
	3104	+ Touch();
	3105	+ }
	3106	+ }
	3107	+
	3108	+ void GenNormalsMesh0()
	3109	+ {
	3110	+ if (bRep != null)
	3111	+ {
	3112	+ bRep.GenerateNormalsMesh();
	3113	+ Touch();
	3114	+ }
	3115	+ }
	3116	+
	3117	+ void GenNormalsMINE0()
	3118	+ {
	3119	+ if (bRep != null)
	3120	+ {
	3121	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2879	3122	Touch();
2880	3123	}
2881	3124	}
..	..	@@ -2932,6 +3175,33 @@
2932	3175	blockloop = false;
2933	3176	}
2934	3177
	3178	+ void TransformChildren()
	3179	+ {
	3180	+ if (toParent != null)
	3181	+ {
	3182	+ for (int i=Size(); --i>=0;)
	3183	+ {
	3184	+ Object3D v = get(i);
	3185	+
	3186	+ if (v.toParent == null)
	3187	+ {
	3188	+ v.toParent = LA.newMatrix();
	3189	+ v.fromParent = LA.newMatrix();
	3190	+ }
	3191	+
	3192	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3193	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3194	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3195	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3196	+ }
	3197	+
	3198	+ toParent = null; // LA.matIdentity(toParent);
	3199	+ fromParent = null; // LA.matIdentity(fromParent);
	3200	+
	3201	+ Touch();
	3202	+ }
	3203	+ }
	3204	+
2935	3205	void TransformGeometry()
2936	3206	{
2937	3207	Object3D obj = this;
..	..	@@ -3153,9 +3423,11 @@
3153	3423
3154	3424	BoundaryRep sup = bRep.support;
3155	3425	bRep.support = null;
3156		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3426	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3157	3427	// bRep.SplitInTwo(onlyone); // thread...
3158		- temprep.SplitInTwo(reduction34, onlyone);
	3428	+
	3429	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3430	+
3159	3431	bRep = temprep;
3160	3432	bRep.support = sup;
3161	3433	Touch();
..	..	@@ -3292,7 +3564,8 @@
3292	3564	if (blockloop)
3293	3565	return;
3294	3566
3295		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3567	+ if (//marked \|\| // does not make sense
	3568	+ (bRep != null \|\| material != null)) // borderline...
3296	3569	live = h;
3297	3570
3298	3571	for (int i = 0; i < Size(); i++)
..	..	@@ -3313,7 +3586,8 @@
3313	3586	return;
3314	3587
3315	3588	//if (bRep != null)
3316		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3589	+ if (//marked \|\| // does not make sense
	3590	+ (bRep != null \|\| material != null)) // borderline...
3317	3591	link2master = h;
3318	3592
3319	3593	for (int i = 0; i < Size(); i++)
..	..	@@ -3333,7 +3607,8 @@
3333	3607	if (blockloop)
3334	3608	return;
3335	3609
3336		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3610	+ if (//marked \|\| // does not make sense
	3611	+ (bRep != null \|\| material != null)) // borderline...
3337	3612	hide = h;
3338	3613
3339	3614	for (int i = 0; i < Size(); i++)
..	..	@@ -3353,7 +3628,7 @@
3353	3628	if (blockloop)
3354	3629	return;
3355	3630
3356		- if (bRep != null && material != null) // borderline...
	3631	+ if (bRep != null \|\| material != null) // borderline...
3357	3632	marked = h;
3358	3633
3359	3634	for (int i = 0; i < Size(); i++)
..	..	@@ -3363,6 +3638,46 @@
3363	3638	continue;
3364	3639	blockloop = true;
3365	3640	child.MarkLeaves(h);
	3641	+ blockloop = false;
	3642	+ // release(i);
	3643	+ }
	3644	+ }
	3645	+
	3646	+ void RewindLeaves(boolean h)
	3647	+ {
	3648	+ if (blockloop)
	3649	+ return;
	3650	+
	3651	+ if (bRep != null \|\| material != null) // borderline...
	3652	+ rewind = h;
	3653	+
	3654	+ for (int i = 0; i < Size(); i++)
	3655	+ {
	3656	+ Object3D child = (Object3D) get(i); // reserve(i);
	3657	+ if (child == null)
	3658	+ continue;
	3659	+ blockloop = true;
	3660	+ child.RewindLeaves(h);
	3661	+ blockloop = false;
	3662	+ // release(i);
	3663	+ }
	3664	+ }
	3665	+
	3666	+ void RandomLeaves(boolean h)
	3667	+ {
	3668	+ if (blockloop)
	3669	+ return;
	3670	+
	3671	+ if (bRep != null \|\| material != null) // borderline...
	3672	+ random = h;
	3673	+
	3674	+ for (int i = 0; i < Size(); i++)
	3675	+ {
	3676	+ Object3D child = (Object3D) get(i); // reserve(i);
	3677	+ if (child == null)
	3678	+ continue;
	3679	+ blockloop = true;
	3680	+ child.RandomLeaves(h);
3366	3681	blockloop = false;
3367	3682	// release(i);
3368	3683	}
..	..	@@ -3677,7 +3992,7 @@
3677	3992	if (child == null)
3678	3993	continue;
3679	3994
3680		- if (GrafreeD.RENDERME > 0)
	3995	+ if (Grafreed.RENDERME > 0)
3681	3996	{
3682	3997	if (child instanceof Merge)
3683	3998	((Merge)child).renderme();
..	..	@@ -3828,7 +4143,7 @@
3828	4143	if (child == null)
3829	4144	continue;
3830	4145
3831		- if (GrafreeD.RENDERME > 0)
	4146	+ if (Grafreed.RENDERME > 0)
3832	4147	{
3833	4148	if (child instanceof Merge)
3834	4149	((Merge)child).renderme();
..	..	@@ -4023,7 +4338,7 @@
4023	4338	if (child == null)
4024	4339	continue;
4025	4340
4026		- if (GrafreeD.RENDERME > 0)
	4341	+ if (Grafreed.RENDERME > 0)
4027	4342	{
4028	4343	if (child instanceof Merge)
4029	4344	((Merge)child).renderme();
..	..	@@ -4111,7 +4426,7 @@
4111	4426	if (blockloop)
4112	4427	return;
4113	4428
4114		- for (int i=0; i<size(); i++)
	4429	+ for (int i=0; i<Size(); i++)
4115	4430	{
4116	4431	if (get(i).parent != this)
4117	4432	{
..	..	@@ -4120,6 +4435,71 @@
4120	4435	}
4121	4436	blockloop = true;
4122	4437	get(i).RepairParent();
	4438	+ blockloop = false;
	4439	+ }
	4440	+ }
	4441	+
	4442	+ void RepairShadow()
	4443	+ {
	4444	+ if (blockloop)
	4445	+ return;
	4446	+
	4447	+ if (this.material != null)
	4448	+ this.InitOthers();
	4449	+
	4450	+ for (int i=0; i<Size(); i++)
	4451	+ {
	4452	+ blockloop = true;
	4453	+ get(i).RepairShadow();
	4454	+ blockloop = false;
	4455	+ }
	4456	+ }
	4457	+
	4458	+ void RepairSOV()
	4459	+ {
	4460	+ if (blockloop)
	4461	+ return;
	4462	+
	4463	+ String texname = this.GetPigmentTexture();
	4464	+
	4465	+ if (texname.startsWith("sov"))
	4466	+ {
	4467	+ String[] s = texname.split("/");
	4468	+
	4469	+ String[] sname = s[1].split("Color.pn");
	4470	+
	4471	+ texname = sname[0];
	4472	+
	4473	+ if (sname.length > 1)
	4474	+ {
	4475	+ texname += "Color.jpg";
	4476	+ }
	4477	+
	4478	+ this.SetPigmentTexture("sov/" + texname);
	4479	+ }
	4480	+
	4481	+ texname = this.GetBumpTexture();
	4482	+
	4483	+ if (texname.startsWith("sov"))
	4484	+ {
	4485	+ String[] s = texname.split("/");
	4486	+
	4487	+ String[] sname = s[1].split("Bump.pn");
	4488	+
	4489	+ texname = sname[0];
	4490	+
	4491	+ if (sname.length > 1)
	4492	+ {
	4493	+ texname += "Bump.jpg";
	4494	+ }
	4495	+
	4496	+ this.SetBumpTexture("sov/" + texname);
	4497	+ }
	4498	+
	4499	+ for (int i=0; i<Size(); i++)
	4500	+ {
	4501	+ blockloop = true;
	4502	+ get(i).RepairSOV();
4123	4503	blockloop = false;
4124	4504	}
4125	4505	}
..	..	@@ -4614,7 +4994,7 @@
4614	4994
4615	4995	cTreePath SelectLeaf(int indexcount, boolean deselect)
4616	4996	{
4617		- if (hide)
	4997	+ if (hide \|\| dontselect)
4618	4998	return null;
4619	4999
4620	5000	if (count <= 0)
..	..	@@ -4638,9 +5018,17 @@
4638	5018	}
4639	5019	}
4640	5020
	5021	+ ObjEditor GetWindow()
	5022	+ {
	5023	+ if (editWindow != null)
	5024	+ return editWindow;
	5025	+
	5026	+ return manipWindow;
	5027	+ }
	5028	+
4641	5029	cTreePath Select(int indexcount, boolean deselect)
4642	5030	{
4643		- if (hide)
	5031	+ if (hide \|\| dontselect)
4644	5032	return null;
4645	5033
4646	5034	if (count <= 0)
..	..	@@ -4674,10 +5062,11 @@
4674	5062	if (leaf != null)
4675	5063	{
4676	5064	cTreePath tp = new cTreePath(this, leaf);
4677		- if (editWindow != null)
	5065	+ ObjEditor window = GetWindow();
	5066	+ if (window != null)
4678	5067	{
4679	5068	//System.out.println("editWindow = " + editWindow + " vs " + this);
4680		- editWindow.Select(tp, deselect, true);
	5069	+ window.Select(tp, deselect, true);
4681	5070	}
4682	5071
4683	5072	return tp;
..	..	@@ -4694,6 +5083,7 @@
4694	5083
4695	5084	if (child == null)
4696	5085	continue;
	5086	+
4697	5087	if (child.HasTransparency() && child.size() != 0)
4698	5088	{
4699	5089	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4703,9 +5093,10 @@
4703	5093	if (leaf != null)
4704	5094	{
4705	5095	cTreePath tp = new cTreePath(this, leaf);
4706		- if (editWindow != null)
	5096	+ ObjEditor window = GetWindow();
	5097	+ if (window != null)
4707	5098	{
4708		- editWindow.Select(tp, deselect, true);
	5099	+ window.Select(tp, deselect, true);
4709	5100	}
4710	5101
4711	5102	return tp;
..	..	@@ -4790,7 +5181,7 @@
4790	5181	return globalTransform;
4791	5182	}
4792	5183
4793		- void PreprocessOcclusion(CameraPane cp)
	5184	+ void PreprocessOcclusion(iCameraPane cp)
4794	5185	{
4795	5186	/*
4796	5187	if (AOdone)
..	..	@@ -4937,7 +5328,8 @@
4937	5328	} else //
4938	5329	if (editWindow != null)
4939	5330	{
4940		- editWindow.cameraView.lighttouched = true;
	5331	+ //editWindow.cameraView.lighttouched = true;
	5332	+ Globals.lighttouched = true;
4941	5333	}
4942	5334	}
4943	5335
..	..	@@ -5029,6 +5421,51 @@
5029	5421	blockloop = false;
5030	5422	}
5031	5423
	5424	+ void ResetSelectable()
	5425	+ {
	5426	+ if (blockloop)
	5427	+ return;
	5428	+
	5429	+ blockloop = true;
	5430	+
	5431	+ keepdontselect = dontselect;
	5432	+ dontselect = true;
	5433	+
	5434	+ Object3D child;
	5435	+ int nb = Size();
	5436	+ for (int i = 0; i < nb; i++)
	5437	+ {
	5438	+ child = (Object3D) get(i);
	5439	+ if (child == null)
	5440	+ continue;
	5441	+ child.ResetSelectable();
	5442	+ }
	5443	+
	5444	+ blockloop = false;
	5445	+ }
	5446	+
	5447	+ void RestoreSelectable()
	5448	+ {
	5449	+ if (blockloop)
	5450	+ return;
	5451	+
	5452	+ blockloop = true;
	5453	+
	5454	+ dontselect = keepdontselect;
	5455	+
	5456	+ Object3D child;
	5457	+ int nb = Size();
	5458	+ for (int i = 0; i < nb; i++)
	5459	+ {
	5460	+ child = (Object3D) get(i);
	5461	+ if (child == null)
	5462	+ continue;
	5463	+ child.RestoreSelectable();
	5464	+ }
	5465	+
	5466	+ blockloop = false;
	5467	+ }
	5468	+
5032	5469	boolean IsSelected()
5033	5470	{
5034	5471	if (parent == null)
..	..	@@ -5091,10 +5528,34 @@
5091	5528
5092	5529	// System.out.println("Fullname = " + fullname);
5093	5530
5094		- if (fullname.name.indexOf(":") == -1)
5095		- return fullname.name;
	5531	+ // Does not work on Windows due to C:
	5532	+// if (fullname.name.indexOf(":") == -1)
	5533	+// return fullname.name;
	5534	+//
	5535	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5096	5536
5097		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5537	+ String[] split = fullname.name.split(":");
	5538	+
	5539	+ if (split.length == 0)
	5540	+ {
	5541	+ return "";
	5542	+ }
	5543	+
	5544	+ if (split.length <= 2)
	5545	+ {
	5546	+ if (fullname.name.endsWith(":"))
	5547	+ {
	5548	+ // Windows
	5549	+ return fullname.name.substring(0, fullname.name.length()-1);
	5550	+ }
	5551	+
	5552	+ return split[0];
	5553	+ }
	5554	+
	5555	+ // Windows
	5556	+ assert(split.length == 4);
	5557	+
	5558	+ return split[0] + ":" + split[1];
5098	5559	}
5099	5560
5100	5561	static String GetBump(cTexture fullname)
..	..	@@ -5103,10 +5564,38 @@
5103	5564	return "";
5104	5565
5105	5566	// System.out.println("Fullname = " + fullname);
5106		- if (fullname.name.indexOf(":") == -1)
5107		- return "";
5108		-
5109		- return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5567	+ // Does not work on Windows due to C:
	5568	+// if (fullname.name.indexOf(":") == -1)
	5569	+// return "";
	5570	+//
	5571	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5572	+ String[] split = fullname.name.split(":");
	5573	+
	5574	+ if (split.length == 0)
	5575	+ {
	5576	+ return "";
	5577	+ }
	5578	+
	5579	+ if (split.length == 1)
	5580	+ {
	5581	+ return "";
	5582	+ }
	5583	+
	5584	+ if (split.length == 2)
	5585	+ {
	5586	+ if (fullname.name.endsWith(":"))
	5587	+ {
	5588	+ // Windows
	5589	+ return "";
	5590	+ }
	5591	+
	5592	+ return split[1];
	5593	+ }
	5594	+
	5595	+ // Windows
	5596	+ assert(split.length == 4);
	5597	+
	5598	+ return split[2] + ":" + split[3];
5110	5599	}
5111	5600
5112	5601	String GetPigmentTexture()
..	..	@@ -5180,7 +5669,7 @@
5180	5669	System.out.print("; textures = " + textures);
5181	5670	System.out.println("; usedtextures = " + usedtextures);
5182	5671
5183		- if (GetTextures() == null)
	5672	+ if (GetTextures() == null) // What is that??
5184	5673	GetTextures().name = ":";
5185	5674
5186	5675	String texname = tex;
..	..	@@ -5211,6 +5700,43 @@
5211	5700	child.ResetPigmentTexture();
5212	5701	blockloop = false;
5213	5702	}
	5703	+ }
	5704	+
	5705	+ UUID GetUUID()
	5706	+ {
	5707	+ if (uuid == null)
	5708	+ {
	5709	+ // Serial
	5710	+ uuid = UUID.randomUUID();
	5711	+ }
	5712	+
	5713	+ return uuid;
	5714	+ }
	5715	+
	5716	+ Object3D GetObject(UUID uid)
	5717	+ {
	5718	+ if (blockloop)
	5719	+ return null;
	5720	+
	5721	+ if (GetUUID().equals(uid))
	5722	+ return this;
	5723	+
	5724	+ int nb = Size();
	5725	+ for (int i = 0; i < nb; i++)
	5726	+ {
	5727	+ Object3D child = (Object3D) get(i);
	5728	+
	5729	+ if (child == null)
	5730	+ continue;
	5731	+
	5732	+ blockloop = true;
	5733	+ Object3D obj = child.GetObject(uid);
	5734	+ blockloop = false;
	5735	+ if (obj != null)
	5736	+ return obj;
	5737	+ }
	5738	+
	5739	+ return null;
5214	5740	}
5215	5741
5216	5742	void SetBumpTexture(String tex)
..	..	@@ -5249,25 +5775,65 @@
5249	5775	}
5250	5776	}
5251	5777
5252		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5778	+ void EmbedTextures(boolean embed)
	5779	+ {
	5780	+ if (blockloop)
	5781	+ return;
	5782	+
	5783	+ //if (GetTextures() != null)
	5784	+ if (embed)
	5785	+ CameraPane.EmbedTextures(GetTextures());
	5786	+ else
	5787	+ {
	5788	+ GetTextures().pigmentdata = null;
	5789	+ GetTextures().bumpdata = null;
	5790	+ GetTextures().pw = 0;
	5791	+ GetTextures().ph = 0;
	5792	+ GetTextures().bw = 0;
	5793	+ GetTextures().bh = 0;
	5794	+ }
	5795	+
	5796	+ int nb = Size();
	5797	+ for (int i = 0; i < nb; i++)
	5798	+ {
	5799	+ Object3D child = (Object3D) get(i);
	5800	+
	5801	+ if (child == null)
	5802	+ continue;
	5803	+
	5804	+ blockloop = true;
	5805	+ child.EmbedTextures(embed);
	5806	+ blockloop = false;
	5807	+ }
	5808	+ }
	5809	+
	5810	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5253	5811	{
5254	5812	Draw(display, root, selected, blocked);
5255	5813	}
5256	5814
5257		- static cMaterial[] materialstack = new cMaterial[65536];
5258		- static boolean[] selectedstack = new boolean[65536];
5259		- static int materialdepth = 0;
5260		-
5261	5815	boolean NeedSupport()
5262	5816	{
5263	5817	return
5264		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5818	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5265	5819	// PROBLEM with CROWD!!
5266		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	5820	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5267	5821	}
5268	5822
	5823	+ static boolean DEBUG_SELECTION = false;
5269	5824
5270		- void Draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5825	+ boolean IsLive()
	5826	+ {
	5827	+ if (live)
	5828	+ return true;
	5829	+
	5830	+ if (parent == null)
	5831	+ return false;
	5832	+
	5833	+ return parent.IsLive();
	5834	+ }
	5835	+
	5836	+ void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5271	5837	{
5272	5838	Invariants(); // june 2013
5273	5839
..	..	@@ -5276,8 +5842,8 @@
5276	5842	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5277	5843	}
5278	5844
5279		- if (display.drawMode == CameraPane.SELECTION &&
5280		- hide)
	5845	+ if (display.DrawMode() == iCameraPane.SELECTION &&
	5846	+ (hide \|\| dontselect))
5281	5847	return;
5282	5848
5283	5849	if (name != null && name.contains("sclera"))
..	..	@@ -5295,7 +5861,7 @@
5295	5861	if (this instanceof Checker)
5296	5862	return;
5297	5863
5298		- if (display.drawMode == display.SHADOW && PASSTEST)
	5864	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5299	5865	return;
5300	5866
5301	5867	if (count <= 0)
..	..	@@ -5303,13 +5869,13 @@
5303	5869	return;
5304	5870	}
5305	5871
5306		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5307		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5872	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	5873	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5308	5874	{
5309	5875	return;
5310	5876	}
5311	5877
5312		- javax.media.opengl.GL gl = display.GetGL();
	5878	+ //javax.media.opengl.GL gl = display.GetGL();
5313	5879
5314	5880	/*
5315	5881	if (touched)
..	..	@@ -5328,7 +5894,7 @@
5328	5894	support = support;
5329	5895
5330	5896	//boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5331		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5897	+ boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5332	5898
5333	5899	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5334	5900	{
..	..	@@ -5345,15 +5911,17 @@
5345	5911
5346	5912	boolean compiled = false;
5347	5913
5348		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5914	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5349	5915
5350		- if (!selectmode && //display.drawMode != display.SELECTION &&
5351		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5916	+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
	5917	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5918	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5352	5919	{
5353		- display.lighttouched = true;
	5920	+ Globals.lighttouched = true;
5354	5921	} // all panes...
5355		- //if (usecalllists && display.drawMode != display.SELECTION && display.drawMode != display.SHADOW &&
5356		- if (bRep != null && usecalllists && !selectmode && // june 2013 display.drawMode != display.SHADOW &&
	5922	+
	5923	+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
	5924	+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5357	5925	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5358	5926	{
5359	5927	if (!(this instanceof Composite))
..	..	@@ -5361,7 +5929,7 @@
5361	5929	//if (displaylist == -1 && usecalllists)
5362	5930	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5363	5931	{
5364		- bRep.displaylist = gl.glGenLists(1);
	5932	+ bRep.displaylist = display.GenList();
5365	5933	assert(bRep.displaylist != 0);
5366	5934	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5367	5935	//System.out.println("\tgen list " + list);
..	..	@@ -5373,18 +5941,20 @@
5373	5941	if (usecalllists)
5374	5942	{
5375	5943	// System.err.println("new list " + bRep.displaylist + " for " + this);
5376		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5944	+ display.NewList(bRep.displaylist);
5377	5945	}
	5946	+
5378	5947	CallList(display, root, selected, blocked);
	5948	+
5379	5949	// compiled = true;
5380	5950	if (usecalllists)
5381	5951	{
5382	5952	// System.err.println("end list " + bRep.displaylist + " for " + this);
5383		- gl.glEndList();
	5953	+ display.EndList();
5384	5954	}
5385	5955	//gl.glDrawBuffer(gl.GL_BACK);
5386	5956	// XXX touched = false;
5387		- display.lighttouched = true; // all panes...
	5957	+ Globals.lighttouched = true; // all panes...
5388	5958	}
5389	5959
5390	5960	touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
..	..	@@ -5423,12 +5993,12 @@
5423	5993
5424	5994	// frustum culling
5425	5995	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5426		- && display.drawMode != CameraPane.SELECTION)
	5996	+ && display.DrawMode() != iCameraPane.SELECTION)
5427	5997	{
5428		- if (display.drawMode == CameraPane.SHADOW)
	5998	+ if (display.DrawMode() == iCameraPane.SHADOW)
5429	5999	{
5430	6000	if (!link2master // tricky to cull in shadow mode.
5431		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	6001	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5432	6002	{
5433	6003	//System.out.print("CULLED");
5434	6004	culled = true;
..	..	@@ -5436,7 +6006,7 @@
5436	6006	}
5437	6007	else
5438	6008	//GetBRep().getBounds(v0, v1, this);
5439		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	6009	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5440	6010	culled = true;
5441	6011
5442	6012	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5472,11 +6042,12 @@
5472	6042
5473	6043
5474	6044	if (!culled)
5475		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	6045	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5476	6046	{
5477	6047	if (GetBRep() != null)
5478	6048	{
5479		- CameraPane.NextIndex(this, gl);
	6049	+ display.NextIndex();
	6050	+
5480	6051	// vertex color conflict : gl.glCallList(list);
5481	6052	DrawNode(display, root, selected);
5482	6053	if (this instanceof BezierPatch)
..	..	@@ -5498,53 +6069,7 @@
5498	6069	color[2] /= 2;
5499	6070	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5500	6071	*/
5501		- if (material != null)
5502		- {
5503		- materialstack[materialdepth] = material;
5504		- selectedstack[materialdepth] = selected;
5505		- cStatic.objectstack[materialdepth++] = this;
5506		- //System.out.println("material " + material);
5507		- //Applet3D.tracein(this, selected);
5508		- display.vector2buffer = projectedVertices;
5509		- if (this instanceof Camera)
5510		- {
5511		- display.options1[0] = material.shift;
5512		- //System.out.println("shift " + material.shift);
5513		- display.options1[1] = material.lightarea;
5514		- display.options1[2] = material.shadowbias;
5515		- display.options1[3] = material.aniso;
5516		- display.options1[4] = material.anisoV;
5517		- display.options2[0] = material.opacity;
5518		- display.options2[1] = material.diffuse;
5519		- display.options2[2] = material.factor;
5520		-
5521		- cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
5522		- display.options3[3] = material.cameralight/0.2f;
5523		-
5524		- // if (display.CURRENTANTIALIAS > 0)
5525		- // display.options3[3] /= 4;
5526		-
5527		- /*
5528		- System.out.println("Focus = " + display.options1[0]);
5529		- System.out.println("Aperture = " + display.options1[1]);
5530		- System.out.println("ShadowBlur = " + display.options1[2]);
5531		- System.out.println("Antialiasing = " + display.options1[3]);
5532		- System.out.println("Fog = " + display.options2[0]);
5533		- System.out.println("Intensity = " + display.options2[1]);
5534		- System.out.println("Elevation = " + display.options2[2]);
5535		- /**/
5536		- } else
5537		- {
5538		- material.Draw(display, selected);
5539		- }
5540		- } else
5541		- {
5542		- if (selected && CameraPane.flash)
5543		- {
5544		- display.modelParams4[1] = 100;
5545		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5546		- }
5547		- }
	6072	+ display.PushMaterial(this, selected);
5548	6073
5549	6074	//System.out.println("call list " + list);
5550	6075	//System.out.println();
..	..	@@ -5563,7 +6088,28 @@
5563	6088	tex = GetTextures();
5564	6089	}
5565	6090
5566		- display.BindTextures(tex, texres);
	6091	+ boolean failedPigment = false;
	6092	+ boolean failedBump = false;
	6093	+
	6094	+ try
	6095	+ {
	6096	+ display.BindPigmentTexture(tex, texres);
	6097	+ }
	6098	+ catch (Exception e)
	6099	+ {
	6100	+ System.err.println("FAILED: " + this);
	6101	+ failedPigment = true;
	6102	+ }
	6103	+
	6104	+ try
	6105	+ {
	6106	+ display.BindBumpTexture(tex, texres);
	6107	+ }
	6108	+ catch (Exception e)
	6109	+ {
	6110	+ //System.err.println("FAILED: " + this);
	6111	+ failedBump = true;
	6112	+ }
5567	6113
5568	6114	if (!compiled)
5569	6115	{
..	..	@@ -5579,30 +6125,19 @@
5579	6125
5580	6126	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5581	6127	assert(bRep.displaylist != 0);
5582		- gl.glCallList(bRep.displaylist);
	6128	+ display.CallList(bRep.displaylist);
5583	6129	// june 2013 drawSelf(display, root, selected);
5584	6130	}
5585	6131	}
5586	6132	}
5587	6133
5588		- display.ReleaseTextures(tex);
5589		-
5590		- //if (parent != null && parent.GetMaterial() != null)
5591		- // parent.GetMaterial().Draw(display, parent.IsSelected(this));
5592		- if (material != null)
5593		- {
5594		- materialdepth -= 1;
5595		- if (materialdepth > 0)
5596		- {
5597		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5598		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5599		- }
5600		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5601		- } else if (selected && CameraPane.flash && GetMaterial() != null)
5602		- {
5603		- display.modelParams4[1] = GetMaterial().cameralight;
5604		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5605		- }
	6134	+ if (!failedBump)
	6135	+ display.ReleaseBumpTexture(tex);
	6136	+
	6137	+ if (!failedPigment)
	6138	+ display.ReleasePigmentTexture(tex);
	6139	+
	6140	+ display.PopMaterial(this, selected);
5606	6141	}
5607	6142
5608	6143	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5644,7 +6179,7 @@
5644	6179	// resetMasterNode();
5645	6180	}
5646	6181
5647		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6182	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5648	6183	{
5649	6184	if (GetBRep() == null)
5650	6185	{
..	..	@@ -5727,8 +6262,11 @@
5727	6262	boolean flipV = false; // true;
5728	6263	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5729	6264
5730		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6265	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5731	6266	{
	6267	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6268	+ return;
	6269	+
5732	6270	if (hide)
5733	6271	return;
5734	6272	// shadow optimisation
..	..	@@ -5786,16 +6324,7 @@
5786	6324	// // ??????????????????????????? Touch();
5787	6325	// }
5788	6326
5789		- if (material != null)
5790		- {
5791		- materialstack[materialdepth] = material;
5792		- selectedstack[materialdepth] = selected;
5793		- cStatic.objectstack[materialdepth++] = this;
5794		- //System.out.println("material " + material);
5795		- //Applet3D.tracein("selected ", selected);
5796		- display.vector2buffer = projectedVertices;
5797		- material.Draw(display, selected);
5798		- }
	6327	+display.PushMaterial2(this, selected);
5799	6328
5800	6329	Object3D child;
5801	6330	boolean sel;
..	..	@@ -5847,19 +6376,7 @@
5847	6376	*/
5848	6377	//depth += 1;
5849	6378
5850		- if (material != null)
5851		- {
5852		- materialdepth -= 1;
5853		- if (materialdepth > 0)
5854		- {
5855		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5856		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5857		- }
5858		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5859		- //else
5860		- //material.Draw(display, false);
5861		- }
5862		-
	6379	+display.PopMaterial2(this);
5863	6380	/*
5864	6381	display.ReleaseTextures(tex);
5865	6382	*/
..	..	@@ -5870,10 +6387,13 @@
5870	6387
5871	6388	//static cVector min,max;
5872	6389
5873		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	6390	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5874	6391	{
5875		- if (display.drawMode == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	6392	+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5876	6393	return; // no shadow for transparent objects
	6394	+
	6395	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6396	+ return;
5877	6397
5878	6398	if (hide)
5879	6399	return;
..	..	@@ -5915,11 +6435,12 @@
5915	6435	return;
5916	6436	}
5917	6437
	6438	+ //bRep.GenUV(1/material.diffuseness);
5918	6439	// bRep.lock = true;
5919	6440
5920		- javax.media.opengl.GL gl = display.GetGL();
	6441	+ //javax.media.opengl.GL gl = display.GetGL();
5921	6442
5922		- if (CameraPane.BOXMODE) // \|\| CameraPane.movingcamera)
	6443	+ if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5923	6444	{
5924	6445	int fc = bRep.FaceCount();
5925	6446	int vc = bRep.VertexCount();
..	..	@@ -5934,23 +6455,7 @@
5934	6455
5935	6456	bRep.getMinMax(min, max, 100);
5936	6457
5937		- gl.glBegin(gl.GL_LINES);
5938		-
5939		- gl.glVertex3d(min.x, min.y, min.z);
5940		- gl.glVertex3d(min.x, min.y, max.z);
5941		- gl.glVertex3d(min.x, min.y, min.z);
5942		- gl.glVertex3d(min.x, max.y, min.z);
5943		- gl.glVertex3d(min.x, min.y, min.z);
5944		- gl.glVertex3d(max.x, min.y, min.z);
5945		-
5946		- gl.glVertex3d(max.x, max.y, max.z);
5947		- gl.glVertex3d(min.x, max.y, max.z);
5948		- gl.glVertex3d(max.x, max.y, max.z);
5949		- gl.glVertex3d(max.x, min.y, max.z);
5950		- gl.glVertex3d(max.x, max.y, max.z);
5951		- gl.glVertex3d(max.x, max.y, min.z);
5952		-
5953		- gl.glEnd();
	6458	+ display.DrawBox(min, max);
5954	6459
5955	6460	return;
5956	6461	}
..	..	@@ -5994,7 +6499,7 @@
5994	6499	{
5995	6500	//throw new Error();
5996	6501
5997		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6502	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5998	6503
5999	6504	int[] strips = bRep.getRawIndices();
6000	6505
..	..	@@ -6004,178 +6509,19 @@
6004	6509	new Exception().printStackTrace();
6005	6510	return;
6006	6511	}
6007		-
6008		- // TRIANGLE STRIP ARRAY
6009		- if (bRep.trimmed)
	6512	+
	6513	+ if (dontselect)
6010	6514	{
6011		- float[] v = bRep.getRawVertices();
6012		- float[] n = bRep.getRawNormals();
6013		- float[] c = bRep.getRawColors();
6014		- float[] uv = bRep.getRawUVMap();
6015		-
6016		- int count2 = 0;
6017		- int count3 = 0;
6018		-
6019		- if (n.length > 0)
6020		- {
6021		- for (int i = 0; i < strips.length; i++)
6022		- {
6023		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6024		-
6025		- /*
6026		- boolean locked = false;
6027		- float eps = 0.1f;
6028		- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6029		-
6030		- int dot = 0;
6031		-
6032		- if ((dot&1) == 0)
6033		- dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6034		-
6035		- if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6036		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6037		- else
6038		- {
6039		- locked = true;
6040		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6041		- }
6042		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6043		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6044		- if (hasnorm)
6045		- {
6046		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6047		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6048		- }
6049		-
6050		- if ((dot&4) == 0)
6051		- dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6052		-
6053		- if (wrap \|\| !locked && (dot&8) != 0)
6054		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6055		- else
6056		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6057		-
6058		- f.dot = dot;
6059		- */
6060		-
6061		- if (!selectmode)
6062		- {
6063		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6064		- {
6065		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6066		- } else
6067		- {
6068		- gl.glNormal3f(0, 0, 1);
6069		- }
6070		-
6071		- if (c != null)
6072		- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
6073		- {
6074		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6075		- }
6076		- }
6077		- if (flipV)
6078		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6079		- else
6080		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6081		- //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6082		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6083		-
6084		- count2 += 2;
6085		- count3 += 3;
6086		- if (!selectmode)
6087		- {
6088		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6089		- {
6090		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6091		- } else
6092		- {
6093		- gl.glNormal3f(0, 0, 1);
6094		- }
6095		- if (c != null)
6096		- {
6097		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6098		- }
6099		- }
6100		- if (flipV)
6101		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6102		- else
6103		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6104		- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6105		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6106		-
6107		- count2 += 2;
6108		- count3 += 3;
6109		- for (int j = 0; j < strips[i] - 2; j++)
6110		- {
6111		- //gl.glTexCoord2d(...);
6112		- if (!selectmode)
6113		- {
6114		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6115		- {
6116		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6117		- } else
6118		- {
6119		- gl.glNormal3f(0, 0, 1);
6120		- }
6121		- if (c != null)
6122		- {
6123		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6124		- }
6125		- }
6126		-
6127		- if (flipV)
6128		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6129		- else
6130		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6131		- //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6132		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6133		- count2 += 2;
6134		- count3 += 3;
6135		- }
6136		-
6137		- gl.glEnd();
6138		- }
6139		- }
6140		-
6141		- assert count3 == v.length;
	6515	+ //bRep.GenerateNormalsMINE();
6142	6516	}
6143		- else // !trimmed
6144		- {
6145		- int count = 0;
6146		- for (int i = 0; i < strips.length; i++)
6147		- {
6148		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6149		-
6150		- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6151		- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6152		-
6153		- drawVertex(gl, p, selectmode);
6154		- drawVertex(gl, q, selectmode);
6155		-
6156		- for (int j = 0; j < strips[i] - 2; j++)
6157		- {
6158		- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6159		-
6160		-// if (j%2 == 0)
6161		-// drawFace(p, q, r, display, null);
6162		-// else
6163		-// drawFace(p, r, q, display, null);
6164		-
6165		-// p = q;
6166		-// q = r;
6167		- drawVertex(gl, r, selectmode);
6168		- }
6169		-
6170		- gl.glEnd();
6171		- }
6172		- }
	6517	+
	6518	+ display.DrawGeometry(bRep, flipV, selectmode);
6173	6519	} else // catch (Error e)
6174	6520	{
6175	6521	// TRIANGLE ARRAY
6176	6522	if (IsOpaque()) // Static())
6177	6523	{
6178		- gl.glBegin(gl.GL_TRIANGLES);
	6524	+ display.StartTriangles();
6179	6525	int facecount = bRep.FaceCount();
6180	6526	for (int i = 0; i < facecount; i++)
6181	6527	{
..	..	@@ -6238,9 +6584,9 @@
6238	6584	// // r.norm.dot(v3) > -0.5)
6239	6585	// // continue;
6240	6586
6241		- drawFace(p, q, r, display, face);
	6587	+ display.DrawFace(this, p, q, r, face);
6242	6588	}
6243		- gl.glEnd();
	6589	+ display.EndTriangles();
6244	6590	}
6245	6591	else
6246	6592	{
..	..	@@ -6269,8 +6615,8 @@
6269	6615	//System.out.println("SORT");
6270	6616
6271	6617	java.util.Arrays.sort(facescompare);
6272		-
6273		- gl.glBegin(gl.GL_TRIANGLES);
	6618	+
	6619	+ display.StartTriangles();
6274	6620	for (int i = 0; i < facecount; i++)
6275	6621	{
6276	6622	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6282,13 +6628,14 @@
6282	6628	Vertex q = bRep.GetVertex(face.q);
6283	6629	Vertex r = bRep.GetVertex(face.r);
6284	6630
6285		- drawFace(p, q, r, display, face);
	6631	+ display.DrawFace(this, p, q, r, face);
6286	6632	}
6287		- gl.glEnd();
	6633	+ display.EndTriangles();
6288	6634	}
6289	6635
6290	6636	if (false) // live && support != null && support.bRep != null) // debug weights
6291	6637	{
	6638	+ /*
6292	6639	gl.glDisable(gl.GL_LIGHTING);
6293	6640	float[] colorV = new float[3];
6294	6641
..	..	@@ -6367,6 +6714,7 @@
6367	6714	// gl.glEnd();
6368	6715	}
6369	6716	}
	6717	+ */
6370	6718	}
6371	6719	}
6372	6720
..	..	@@ -6411,7 +6759,7 @@
6411	6759	center.add(r);
6412	6760	center.mul(1.0/3);
6413	6761
6414		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6762	+ center.sub(Globals.theRenderer.EyeCamera().location);
6415	6763
6416	6764	distance = center.dot(center);
6417	6765	}
..	..	@@ -6422,347 +6770,11 @@
6422	6770
6423	6771	transient FaceCompare[] facescompare = null;
6424	6772
6425		- void SetColor(CameraPane display, Vertex p0)
6426		- {
6427		- if (display.RENDERPROGRAM == 0)
6428		- {
6429		- float r = 0;
6430		- if (bRep != null)
6431		- {
6432		- if (bRep.stripified)
6433		- {
6434		- r = 1;
6435		- }
6436		- }
6437		- float g = 0;
6438		- if (bRep != null)
6439		- {
6440		- if (bRep.trimmed)
6441		- {
6442		- g = 1;
6443		- }
6444		- }
6445		- float b = 0;
6446		- if (support != null && link2master)
6447		- {
6448		- b = 1;
6449		- }
6450		- display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
6451		- return;
6452		- }
6453		-
6454		- if (display.drawMode != CameraPane.SHADOW)
6455		- return;
6456		-
6457		- javax.media.opengl.GL gl = display.GetGL();
6458		-// if (true) return;
6459		-// float ao = p.AO;
6460		-//
6461		-// // if (ao == 0 && !bRep.AOdone) // transient problem!
6462		-// // ao = 1;
6463		-//
6464		-// gl.glColor4f(ao, ao, ao, 1);
6465		-
6466		-// CameraPane.selectedpoint.
6467		-// getAverage(cStatic.point1, true);
6468		- if (CameraPane.pointflow == null) // !random) // live)
6469		- {
6470		- return;
6471		- }
6472		-
6473		- cStatic.point1.set(0,0,0);
6474		- LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
6475		-
6476		- cStatic.point1.sub(p0);
6477		-
6478		-
6479		-// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
6480		-// {
6481		-// return;
6482		-// }
6483		-
6484		- //if (true)
6485		- if (cStatic.point1.dot(cStatic.point1) > 0.000001)
6486		- {
6487		- return;
6488		- }
6489		-
6490		- float[] colorV = new float[3];
6491		-
6492		- if (false) // marked)
6493		- {
6494		- // debug rigging weights
6495		- for (int object = 0; object < p0.vertexlinks.length; object++)
6496		- {
6497		- float weight = p0.weights[object] / p0.totalweight;
6498		-
6499		- // if (weight < 0.1)
6500		- // {
6501		- // assert(weight == 0);
6502		- // continue;
6503		- // }
6504		-
6505		- if (p0.vertexlinks[object] == -1)
6506		- continue;
6507		-
6508		- Vertex q = support.bRep.GetVertex(p0.vertexlinks[object]);
6509		-
6510		- int color = //1 << object; //
6511		- //p.vertexlinks.length;
6512		- support.bRep.supports[p0.closestsupport].links[object];
6513		- colorV[2] += (color & 1) * weight;
6514		- colorV[1] += ((color & 2) >> 1) * weight;
6515		- colorV[0] += ((color & 4) >> 2) * weight;
6516		- }
6517		- }
6518		- else
6519		- {
6520		- if (drawingstarted)
6521		- {
6522		- // find next point
6523		- if (bRep.GetVertex(0).faceindices == null)
6524		- {
6525		- bRep.InitFaceIndices();
6526		- }
6527		-
6528		- double ymin = p0.y;
6529		-
6530		- Vertex newp = p0;
6531		-
6532		- for (int fii = 0; fii < p0.faceindices.length; fii++)
6533		- {
6534		- int fi = p0.faceindices[fii];
6535		-
6536		- if (fi == -1)
6537		- break;
6538		-
6539		- Face f = bRep.GetFace(fi);
6540		-
6541		- Vertex p = bRep.GetVertex(f.p);
6542		- Vertex q = bRep.GetVertex(f.q);
6543		- Vertex r = bRep.GetVertex(f.r);
6544		-
6545		- int swap = (int)(Math.random()*3);
6546		-
6547		-// for (int s=swap; --s>=0;)
6548		-// {
6549		-// Vertex t = p;
6550		-// p = q;
6551		-// q = r;
6552		-// r = t;
6553		-// }
6554		- if (ymin > p.y)
6555		- {
6556		- ymin = p.y;
6557		- newp = p;
6558		-// break;
6559		- }
6560		- if (ymin > q.y)
6561		- {
6562		- ymin = q.y;
6563		- newp = q;
6564		-// break;
6565		- }
6566		- if (ymin > r.y)
6567		- {
6568		- ymin = r.y;
6569		- newp = r;
6570		-// break;
6571		- }
6572		- }
6573		-
6574		- CameraPane.selectedpoint.toParent[3][0] = newp.x;
6575		- CameraPane.selectedpoint.toParent[3][1] = newp.y;
6576		- CameraPane.selectedpoint.toParent[3][2] = newp.z;
6577		-
6578		- drawingstarted = false;
6579		-
6580		- // return;
6581		- }
6582		-
6583		- if (false) // CameraPane.DRAW
6584		- {
6585		- p0.AO = colorV[0] = 2;
6586		- colorV[1] = 2;
6587		- colorV[2] = 2;
6588		- }
6589		-
6590		- CameraPane.pointflow.add(p0);
6591		- CameraPane.pointflow.Touch();
6592		- }
6593		-
6594		-// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
6595		-// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
6596		-// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
6597		- }
6598		-
6599	6773	void Print(Vertex v)
6600	6774	{
6601	6775	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6602	6776	}
6603	6777
6604		- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6605		- {
6606		- if (!selectmode)
6607		- {
6608		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6609		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6610		-
6611		- if (flipV)
6612		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6613		- else
6614		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6615		- }
6616		-
6617		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6618		- }
6619		-
6620		- void drawFace(Vertex pv, Vertex qv, Vertex rv,
6621		- CameraPane display, Face face)
6622		- {
6623		- if (pv.y == -10000 \|\|
6624		- qv.y == -10000 \|\|
6625		- rv.y == -10000)
6626		- return;
6627		-
6628		-// float b = f.nbiterations & 1;
6629		-// float g = (f.nbiterations>>1) & 1;
6630		-// float r = (f.nbiterations>>2) & 1;
6631		-//
6632		-// //if (f.weight == 10000)
6633		-// //{
6634		-// // r = 1; g = b = 0;
6635		-// //}
6636		-// //else
6637		-// //{
6638		-// // assert(f.weight < 10000);
6639		-// r = g = b = (float)bRep.FaceWeight(f)*100;
6640		-// if (r<0)
6641		-// assert(r>=0);
6642		-// //}
6643		-
6644		- javax.media.opengl.GL gl = display.GetGL();
6645		-
6646		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
6647		-
6648		- //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
6649		- if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
6650		- {
6651		- //gl.glBegin(gl.GL_TRIANGLES);
6652		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
6653		- if (!hasnorm)
6654		- {
6655		- // System.out.println("FUCK!!");
6656		- LA.vecSub(pv/.pos/, qv/.pos/, v0);
6657		- LA.vecSub(pv/.pos/, rv/.pos/, v1);
6658		- LA.vecCross(v0, v1, v2);
6659		- LA.vecNormalize(v2);
6660		- gl.glNormal3f((float) v2.x, (float) v2.y, (float) v2.z);
6661		- }
6662		-
6663		- if (hasnorm)
6664		- {
6665		-// if (!pv.norm.normalized())
6666		-// assert(pv.norm.normalized());
6667		-
6668		- //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
6669		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6670		- }
6671		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6672		- SetColor(display, pv);
6673		- //gl.glColor4f(r, g, b, 1);
6674		- //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
6675		- if (flipV)
6676		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6677		- else
6678		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6679		- //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
6680		- gl.glVertex3f((float) pv./pos./x, (float) pv./pos./y, (float) pv./pos./z);
6681		-// Print(pv);
6682		- if (hasnorm)
6683		- {
6684		-// assert(qv.norm.normalized());
6685		- //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
6686		- gl.glNormal3f((float) qv.norm.x, (float) qv.norm.y, (float) qv.norm.z);
6687		- }
6688		- //System.out.println("vertexq = " + qv.s + ", " + qv.t);
6689		- // boolean locked = false;
6690		- // float eps = 0.1f;
6691		- // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6692		-
6693		- // int dot = 0; //*/ (int)f.dot;
6694		-
6695		- // if ((dot&1) == 0)
6696		- // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6697		-
6698		- // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6699		- if (flipV)
6700		- gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
6701		- else
6702		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6703		- // else
6704		- // {
6705		- // locked = true;
6706		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6707		- // }
6708		- gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
6709		- SetColor(display, qv);
6710		- //gl.glColor4f(r, g, b, 1);
6711		- //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
6712		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6713		- gl.glVertex3f((float) qv./pos./x, (float) qv./pos./y, (float) qv./pos./z);
6714		-// Print(qv);
6715		- if (hasnorm)
6716		- {
6717		-// assert(rv.norm.normalized());
6718		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6719		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6720		- }
6721		-
6722		- // if ((dot&4) == 0)
6723		- // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6724		-
6725		- // if (wrap \|\| !locked && (dot&8) != 0)
6726		- if (flipV)
6727		- gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
6728		- else
6729		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6730		- // else
6731		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6732		-
6733		- // f.dot = dot;
6734		-
6735		- gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
6736		- SetColor(display, rv);
6737		- //gl.glColor4f(r, g, b, 1);
6738		- //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
6739		- //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
6740		- gl.glVertex3f((float) rv./pos./x, (float) rv./pos./y, (float) rv./pos./z);
6741		-// Print(rv);
6742		- //gl.glEnd();
6743		- }
6744		- else
6745		- {
6746		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6747		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6748		- gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
6749		-
6750		- }
6751		-
6752		- if (false) // (attributes & WIREFRAME) != 0)
6753		- {
6754		- gl.glDisable(gl.GL_LIGHTING);
6755		-
6756		- gl.glBegin(gl.GL_LINE_LOOP);
6757		- gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
6758		- gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
6759		- gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
6760		- gl.glEnd();
6761		-
6762		- gl.glEnable(gl.GL_LIGHTING);
6763		- }
6764		- }
6765		-
6766	6778	void drawSelf(ClickInfo info, int level, boolean select)
6767	6779	{
6768	6780	if (bRep == null)
..	..	@@ -7334,83 +7346,84 @@
7334	7346	int spotw = spot.x + spot.width;
7335	7347	int spoth = spot.y + spot.height;
7336	7348	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7337		- if (CameraPane.Xmin > spot.x)
7338		- {
7339		- CameraPane.Xmin = spot.x;
7340		- }
7341		- if (CameraPane.Xmax < spotw)
7342		- {
7343		- CameraPane.Xmax = spotw;
7344		- }
7345		- if (CameraPane.Ymin > spot.y)
7346		- {
7347		- CameraPane.Ymin = spot.y;
7348		- }
7349		- if (CameraPane.Ymax < spoth)
7350		- {
7351		- CameraPane.Ymax = spoth;
7352		- }
	7349	+// if (CameraPane.Xmin > spot.x)
	7350	+// {
	7351	+// CameraPane.Xmin = spot.x;
	7352	+// }
	7353	+// if (CameraPane.Xmax < spotw)
	7354	+// {
	7355	+// CameraPane.Xmax = spotw;
	7356	+// }
	7357	+// if (CameraPane.Ymin > spot.y)
	7358	+// {
	7359	+// CameraPane.Ymin = spot.y;
	7360	+// }
	7361	+// if (CameraPane.Ymax < spoth)
	7362	+// {
	7363	+// CameraPane.Ymax = spoth;
	7364	+// }
7353	7365	spot.translate(32, 32);
7354	7366	spotw = spot.x + spot.width;
7355	7367	spoth = spot.y + spot.height;
7356		- info.g.setColor(Color.blue);
	7368	+ info.g.setColor(Color.cyan);
7357	7369	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7358		- if (CameraPane.Xmin > spot.x)
7359		- {
7360		- CameraPane.Xmin = spot.x;
7361		- }
7362		- if (CameraPane.Xmax < spotw)
7363		- {
7364		- CameraPane.Xmax = spotw;
7365		- }
7366		- if (CameraPane.Ymin > spot.y)
7367		- {
7368		- CameraPane.Ymin = spot.y;
7369		- }
7370		- if (CameraPane.Ymax < spoth)
7371		- {
7372		- CameraPane.Ymax = spoth;
7373		- }
7374		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7375		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7370	+// if (CameraPane.Xmin > spot.x)
	7371	+// {
	7372	+// CameraPane.Xmin = spot.x;
	7373	+// }
	7374	+// if (CameraPane.Xmax < spotw)
	7375	+// {
	7376	+// CameraPane.Xmax = spotw;
	7377	+// }
	7378	+// if (CameraPane.Ymin > spot.y)
	7379	+// {
	7380	+// CameraPane.Ymin = spot.y;
	7381	+// }
	7382	+// if (CameraPane.Ymax < spoth)
	7383	+// {
	7384	+// CameraPane.Ymax = spoth;
	7385	+// }
	7386	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7387	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7376	7388	spot.translate(0, -32);
7377		- info.g.setColor(Color.green);
	7389	+ info.g.setColor(Color.yellow);
7378	7390	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7379		- if (CameraPane.Xmin > spot.x)
7380		- {
7381		- CameraPane.Xmin = spot.x;
7382		- }
7383		- if (CameraPane.Xmax < spotw)
7384		- {
7385		- CameraPane.Xmax = spotw;
7386		- }
7387		- if (CameraPane.Ymin > spot.y)
7388		- {
7389		- CameraPane.Ymin = spot.y;
7390		- }
7391		- if (CameraPane.Ymax < spoth)
7392		- {
7393		- CameraPane.Ymax = spoth;
7394		- }
7395		- info.g.drawArc(boundary.x, boundary.y,
7396		- boundary.width, boundary.height, 0, 360);
	7391	+ info.g.setColor(Color.green);
	7392	+// if (CameraPane.Xmin > spot.x)
	7393	+// {
	7394	+// CameraPane.Xmin = spot.x;
	7395	+// }
	7396	+// if (CameraPane.Xmax < spotw)
	7397	+// {
	7398	+// CameraPane.Xmax = spotw;
	7399	+// }
	7400	+// if (CameraPane.Ymin > spot.y)
	7401	+// {
	7402	+// CameraPane.Ymin = spot.y;
	7403	+// }
	7404	+// if (CameraPane.Ymax < spoth)
	7405	+// {
	7406	+// CameraPane.Ymax = spoth;
	7407	+// }
	7408	+ info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
	7409	+ (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
7397	7410	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7398		- if (CameraPane.Xmin > boundary.x)
7399		- {
7400		- CameraPane.Xmin = boundary.x;
7401		- }
7402		- if (CameraPane.Xmax < boundary.x + boundary.width)
7403		- {
7404		- CameraPane.Xmax = boundary.x + boundary.width;
7405		- }
7406		- if (CameraPane.Ymin > boundary.y)
7407		- {
7408		- CameraPane.Ymin = boundary.y;
7409		- }
7410		- if (CameraPane.Ymax < boundary.y + boundary.height)
7411		- {
7412		- CameraPane.Ymax = boundary.y + boundary.height;
7413		- }
	7411	+// if (CameraPane.Xmin > boundary.x)
	7412	+// {
	7413	+// CameraPane.Xmin = boundary.x;
	7414	+// }
	7415	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	7416	+// {
	7417	+// CameraPane.Xmax = boundary.x + boundary.width;
	7418	+// }
	7419	+// if (CameraPane.Ymin > boundary.y)
	7420	+// {
	7421	+// CameraPane.Ymin = boundary.y;
	7422	+// }
	7423	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	7424	+// {
	7425	+// CameraPane.Ymax = boundary.y + boundary.height;
	7426	+// }
7414	7427	return;
7415	7428	}
7416	7429	}
..	..	@@ -7427,7 +7440,7 @@
7427	7440	startX = info.x;
7428	7441	startY = info.y;
7429	7442
7430		- hitSomething = 0;
	7443	+ hitSomething = -1;
7431	7444	cVector origin = new cVector();
7432	7445	//LA.xformPos(origin, toParent, origin);
7433	7446	Rectangle spot = new Rectangle();
..	..	@@ -7460,7 +7473,7 @@
7460	7473	}
7461	7474
7462	7475	//System.out.println("info.modifiers = " + info.modifiers);
7463		- modified = (info.modifiers & CameraPane.META) != 0;
	7476	+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7464	7477	//System.out.println("modified = " + modified);
7465	7478	//new Exception().printStackTrace();
7466	7479	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7488,7 +7501,7 @@
7488	7501	return true;
7489	7502	}
7490	7503
7491		- void doEditDrag0(ClickInfo info)
	7504	+ void doEditDrag0(ClickInfo info, boolean opposite)
7492	7505	{
7493	7506	if (hitSomething == 0)
7494	7507	{
..	..	@@ -7503,6 +7516,7 @@
7503	7516	//System.out.println("hitSomething = " + hitSomething);
7504	7517
7505	7518	double scale = 0.005f * info.camera.Distance();
	7519	+
7506	7520	cVector xlate = new cVector();
7507	7521	//cVector xlate2 = new cVector();
7508	7522	switch (hitSomething)
..	..	@@ -7513,9 +7527,9 @@
7513	7527
7514	7528	case hitCenter: // Translate
7515	7529
7516		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7530	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7517	7531
7518		- if (modified)
	7532	+ if (modified \|\| opposite)
7519	7533	{
7520	7534	//assert(false);
7521	7535	/*
..	..	@@ -7561,10 +7575,10 @@
7561	7575	}
7562	7576	LA.xformDir(up, ClickInfo.matbuffer, up);
7563	7577	// if (!CameraPane.LOCALTRANSFORM)
7564		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
	7578	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7565	7579	LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7566	7580	// if (!CameraPane.LOCALTRANSFORM)
7567		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7581	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7568	7582	//LA.vecCross(up, cVector.Z, right2);
7569	7583
7570	7584	cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
..	..	@@ -7609,6 +7623,7 @@
7609	7623
7610	7624	if (modified)
7611	7625	{
	7626	+ // Rotate 90 degrees
7612	7627	angle /= (Math.PI / 4);
7613	7628	angle = Math.floor(angle + 0.5);
7614	7629	angle *= (Math.PI / 4);
..	..	@@ -7622,7 +7637,7 @@
7622	7637	}
7623	7638	/**/
7624	7639
7625		- switch (info.pane.renderCamera.viewCode)
	7640	+ switch (info.pane.RenderCamera().viewCode)
7626	7641	{
7627	7642	case 1: // '\001'
7628	7643	LA.matZRotate(toParent, angle);
..	..	@@ -7650,24 +7665,27 @@
7650	7665
7651	7666	case hitScale: // scale
7652	7667	double hScale = (double) (info.x - centerPt.x) / 32;
	7668	+ double sign = 1;
	7669	+ if (hScale < 0)
	7670	+ {
	7671	+ sign = -1;
	7672	+ }
	7673	+ hScale = signMath.pow(signhScale, scale * 50);
7653	7674	if (hScale < 0.01)
7654	7675	{
7655		- hScale = 0.01;
	7676	+ //hScale = 0.01;
7656	7677	}
7657		- hScale = Math.pow(hScale, scale * 50);
7658		- if (hScale < 0.01)
7659		- {
7660		- hScale = 0.01;
7661		- }
	7678	+
7662	7679	double vScale = (double) (info.y - centerPt.y) / 32;
7663		- if (vScale < 0.01)
	7680	+ sign = 1;
	7681	+ if (vScale < 0)
7664	7682	{
7665		- vScale = 0.01;
	7683	+ sign = -1;
7666	7684	}
7667		- vScale = Math.pow(vScale, scale * 50);
	7685	+ vScale = signMath.pow(signvScale, scale * 50);
7668	7686	if (vScale < 0.01)
7669	7687	{
7670		- vScale = 0.01;
	7688	+ //vScale = 0.01;
7671	7689	}
7672	7690	LA.matCopy(startMat, toParent);
7673	7691	/**/
..	..	@@ -7678,39 +7696,47 @@
7678	7696	}
7679	7697	/**/
7680	7698
7681		- switch (info.pane.renderCamera.viewCode)
	7699	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7700	+
	7701	+ if (totalScale < 0.01)
	7702	+ {
	7703	+ totalScale = 0.01;
	7704	+ }
	7705	+
	7706	+ switch (info.pane.RenderCamera().viewCode)
7682	7707	{
7683	7708	case 3: // '\001'
7684		- if (modified)
	7709	+ if (modified \|\| opposite)
7685	7710	{
7686	7711	//LA.matScale(toParent, 1, hScale, vScale);
7687		- LA.matScale(toParent, vScale, 1, 1);
	7712	+ LA.matScale(toParent, totalScale, 1, 1);
7688	7713	} // vScale, 1);
7689	7714	else
7690	7715	{
7691		- LA.matScale(toParent, vScale, vScale, vScale);
	7716	+ // EXCEPTION!
	7717	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7692	7718	} // vScale, 1);
7693	7719	break;
7694	7720
7695	7721	case 2: // '\002'
7696		- if (modified)
	7722	+ if (modified \|\| opposite)
7697	7723	{
7698	7724	//LA.matScale(toParent, hScale, 1, vScale);
7699		- LA.matScale(toParent, 1, vScale, 1);
	7725	+ LA.matScale(toParent, 1, totalScale, 1);
7700	7726	} else
7701	7727	{
7702		- LA.matScale(toParent, vScale, 1, vScale);
	7728	+ LA.matScale(toParent, totalScale, 1, totalScale);
7703	7729	}
7704	7730	break;
7705	7731
7706	7732	case 1: // '\003'
7707		- if (modified)
	7733	+ if (modified \|\| opposite)
7708	7734	{
7709	7735	//LA.matScale(toParent, hScale, vScale, 1);
7710		- LA.matScale(toParent, 1, 1, vScale);
	7736	+ LA.matScale(toParent, 1, 1, totalScale);
7711	7737	} else
7712	7738	{
7713		- LA.matScale(toParent, vScale, vScale, 1);
	7739	+ LA.matScale(toParent, totalScale, totalScale, 1);
7714	7740	}
7715	7741	break;
7716	7742	}
..	..	@@ -7731,7 +7757,7 @@
7731	7757	if (parent == null)
7732	7758	{
7733	7759	System.out.println("NULL PARENT");
7734		- new Exception().printStackTrace();
	7760	+ //new Exception().printStackTrace();
7735	7761	} else
7736	7762	{
7737	7763	if (parent instanceof BezierPatch)
..	..	@@ -7843,14 +7869,22 @@
7843	7869	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7844	7870	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7845	7871	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7872	+
	7873	+ String objname;
	7874	+
7846	7875	if (false) //parent != null)
7847	7876	{
7848		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7877	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7849	7878	} else
7850	7879	{
7851		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7880	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7852	7881	} // + super.toString();
7853	7882	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7883	+
	7884	+ if (!Globals.ADVANCED)
	7885	+ return objname;
	7886	+
	7887	+ return objname + " " + System.identityHashCode(this);
7854	7888	}
7855	7889
7856	7890	public int hashCode()
..	..	@@ -7906,6 +7940,7 @@
7906	7940	objectUI.closeUI();
7907	7941	if (editWindow != null)
7908	7942	{
	7943	+ editWindow.ctrlPanel.FlushUI();
7909	7944	editWindow.refreshContents();
7910	7945	} // ? new
7911	7946	objectUI = null;
..	..	@@ -7914,6 +7949,10 @@
7914	7949	{
7915	7950	editWindow = null;
7916	7951	} // ?
	7952	+ }
	7953	+ else
	7954	+ {
	7955	+ //editWindow.closeUI();
7917	7956	}
7918	7957	}
7919	7958
..	..	@@ -7926,7 +7965,7 @@
7926	7965	/transient/ cVector2[] projectedVertices = new cVector2[0];
7927	7966
7928	7967	Object3D /Composite/ parent;
7929		- Object3D /Composite/ fileparent;
	7968	+ Object3D /Composite/ fileparent; // In the case of FileObject
7930	7969
7931	7970	double[][] toParent; // dynamic matrix
7932	7971	double[][] fromParent;
..	..	@@ -8041,7 +8080,7 @@
8041	8080	{
8042	8081	assert(bRep != null);
8043	8082	if (!(support instanceof GenericJoint)) // support.bRep != null)
8044		- GrafreeD.Assert(support.bRep == bRep.support);
	8083	+ Grafreed.Assert(support.bRep == bRep.support);
8045	8084	}
8046	8085	else
8047	8086	{
..	..	@@ -8072,6 +8111,10 @@
8072	8111	}
8073	8112
8074	8113	transient ObjEditor editWindow;
	8114	+ transient ObjEditor manipWindow;
	8115	+
	8116	+ transient boolean pinned;
	8117	+
8075	8118	transient ObjectUI objectUI;
8076	8119	public static int povDepth = 0;
8077	8120	private static cVector tbMin = new cVector();
..	..	@@ -8090,9 +8133,9 @@
8090	8133	private static cVector edge2 = new cVector();
8091	8134	//private static cVector norm = new cVector();
8092	8135	/transient private/ int hitSomething;
8093		- private static final int hitCenter = 1;
8094		- private static final int hitScale = 2;
8095		- private static final int hitRotate = 3;
	8136	+ static final int hitCenter = 1;
	8137	+ static final int hitScale = 2;
	8138	+ static final int hitRotate = 3;
8096	8139	/transient/ /private/ int viewCode; // Now used for transparency cache flag
8097	8140	/transient/ private Point centerPt;
8098	8141	/transient/ private int startX;
..	..	@@ -8124,6 +8167,8 @@
8124	8167	{
8125	8168	Object3D targ = this;
8126	8169
	8170	+ targ.NORMALPUSH = obj.NORMALPUSH;
	8171	+
8127	8172	if (obj.material != null)
8128	8173	{
8129	8174	if ((mask&MATERIAL)!=0) // ==(COLOR\|MATERIAL))