~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,33 @@
5249	5775	}
5250	5776	}
5251	5777
5252		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5778	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5253	5779	{
5254	5780	Draw(display, root, selected, blocked);
5255	5781	}
5256	5782
5257		- static cMaterial[] materialstack = new cMaterial[65536];
5258		- static boolean[] selectedstack = new boolean[65536];
5259		- static int materialdepth = 0;
5260		-
5261	5783	boolean NeedSupport()
5262	5784	{
5263	5785	return
5264		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5786	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5265	5787	// PROBLEM with CROWD!!
5266		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	5788	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5267	5789	}
5268	5790
	5791	+ static boolean DEBUG_SELECTION = false;
5269	5792
5270		- void Draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5793	+ boolean IsLive()
	5794	+ {
	5795	+ if (live)
	5796	+ return true;
	5797	+
	5798	+ if (parent == null)
	5799	+ return false;
	5800	+
	5801	+ return parent.IsLive();
	5802	+ }
	5803	+
	5804	+ void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5271	5805	{
5272	5806	Invariants(); // june 2013
5273	5807
..	..	@@ -5276,8 +5810,8 @@
5276	5810	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5277	5811	}
5278	5812
5279		- if (display.drawMode == CameraPane.SELECTION &&
5280		- hide)
	5813	+ if (display.DrawMode() == iCameraPane.SELECTION &&
	5814	+ (hide \|\| dontselect))
5281	5815	return;
5282	5816
5283	5817	if (name != null && name.contains("sclera"))
..	..	@@ -5295,7 +5829,7 @@
5295	5829	if (this instanceof Checker)
5296	5830	return;
5297	5831
5298		- if (display.drawMode == display.SHADOW && PASSTEST)
	5832	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5299	5833	return;
5300	5834
5301	5835	if (count <= 0)
..	..	@@ -5303,13 +5837,13 @@
5303	5837	return;
5304	5838	}
5305	5839
5306		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5307		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5840	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	5841	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5308	5842	{
5309	5843	return;
5310	5844	}
5311	5845
5312		- javax.media.opengl.GL gl = display.GetGL();
	5846	+ //javax.media.opengl.GL gl = display.GetGL();
5313	5847
5314	5848	/*
5315	5849	if (touched)
..	..	@@ -5328,7 +5862,7 @@
5328	5862	support = support;
5329	5863
5330	5864	//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);
	5865	+ boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5332	5866
5333	5867	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5334	5868	{
..	..	@@ -5345,15 +5879,17 @@
5345	5879
5346	5880	boolean compiled = false;
5347	5881
5348		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5882	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5349	5883
5350		- if (!selectmode && //display.drawMode != display.SELECTION &&
5351		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5884	+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
	5885	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5886	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5352	5887	{
5353		- display.lighttouched = true;
	5888	+ Globals.lighttouched = true;
5354	5889	} // 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 &&
	5890	+
	5891	+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
	5892	+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5357	5893	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5358	5894	{
5359	5895	if (!(this instanceof Composite))
..	..	@@ -5361,7 +5897,7 @@
5361	5897	//if (displaylist == -1 && usecalllists)
5362	5898	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5363	5899	{
5364		- bRep.displaylist = gl.glGenLists(1);
	5900	+ bRep.displaylist = display.GenList();
5365	5901	assert(bRep.displaylist != 0);
5366	5902	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5367	5903	//System.out.println("\tgen list " + list);
..	..	@@ -5373,18 +5909,20 @@
5373	5909	if (usecalllists)
5374	5910	{
5375	5911	// System.err.println("new list " + bRep.displaylist + " for " + this);
5376		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5912	+ display.NewList(bRep.displaylist);
5377	5913	}
	5914	+
5378	5915	CallList(display, root, selected, blocked);
	5916	+
5379	5917	// compiled = true;
5380	5918	if (usecalllists)
5381	5919	{
5382	5920	// System.err.println("end list " + bRep.displaylist + " for " + this);
5383		- gl.glEndList();
	5921	+ display.EndList();
5384	5922	}
5385	5923	//gl.glDrawBuffer(gl.GL_BACK);
5386	5924	// XXX touched = false;
5387		- display.lighttouched = true; // all panes...
	5925	+ Globals.lighttouched = true; // all panes...
5388	5926	}
5389	5927
5390	5928	touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
..	..	@@ -5423,12 +5961,12 @@
5423	5961
5424	5962	// frustum culling
5425	5963	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5426		- && display.drawMode != CameraPane.SELECTION)
	5964	+ && display.DrawMode() != iCameraPane.SELECTION)
5427	5965	{
5428		- if (display.drawMode == CameraPane.SHADOW)
	5966	+ if (display.DrawMode() == iCameraPane.SHADOW)
5429	5967	{
5430	5968	if (!link2master // tricky to cull in shadow mode.
5431		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	5969	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5432	5970	{
5433	5971	//System.out.print("CULLED");
5434	5972	culled = true;
..	..	@@ -5436,7 +5974,7 @@
5436	5974	}
5437	5975	else
5438	5976	//GetBRep().getBounds(v0, v1, this);
5439		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	5977	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5440	5978	culled = true;
5441	5979
5442	5980	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5472,11 +6010,12 @@
5472	6010
5473	6011
5474	6012	if (!culled)
5475		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	6013	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5476	6014	{
5477	6015	if (GetBRep() != null)
5478	6016	{
5479		- CameraPane.NextIndex(this, gl);
	6017	+ display.NextIndex();
	6018	+
5480	6019	// vertex color conflict : gl.glCallList(list);
5481	6020	DrawNode(display, root, selected);
5482	6021	if (this instanceof BezierPatch)
..	..	@@ -5498,55 +6037,7 @@
5498	6037	color[2] /= 2;
5499	6038	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5500	6039	*/
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.options4[0] = material.cameralight/0.2f;
5523		- display.options4[1] = material.subsurface;
5524		- display.options4[2] = material.sheen;
5525		-
5526		- // if (display.CURRENTANTIALIAS > 0)
5527		- // display.options3[3] /= 4;
5528		-
5529		- /*
5530		- System.out.println("Focus = " + display.options1[0]);
5531		- System.out.println("Aperture = " + display.options1[1]);
5532		- System.out.println("ShadowBlur = " + display.options1[2]);
5533		- System.out.println("Antialiasing = " + display.options1[3]);
5534		- System.out.println("Fog = " + display.options2[0]);
5535		- System.out.println("Intensity = " + display.options2[1]);
5536		- System.out.println("Elevation = " + display.options2[2]);
5537		- /**/
5538		- } else
5539		- {
5540		- material.Draw(display, selected);
5541		- }
5542		- } else
5543		- {
5544		- if (selected && CameraPane.flash)
5545		- {
5546		- display.modelParams4[1] = 100;
5547		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5548		- }
5549		- }
	6040	+ display.PushMaterial(this, selected);
5550	6041
5551	6042	//System.out.println("call list " + list);
5552	6043	//System.out.println();
..	..	@@ -5565,7 +6056,28 @@
5565	6056	tex = GetTextures();
5566	6057	}
5567	6058
5568		- display.BindTextures(tex, texres);
	6059	+ boolean failedPigment = false;
	6060	+ boolean failedBump = false;
	6061	+
	6062	+ try
	6063	+ {
	6064	+ display.BindPigmentTexture(tex, texres);
	6065	+ }
	6066	+ catch (Exception e)
	6067	+ {
	6068	+ System.err.println("FAILED: " + this);
	6069	+ failedPigment = true;
	6070	+ }
	6071	+
	6072	+ try
	6073	+ {
	6074	+ display.BindBumpTexture(tex, texres);
	6075	+ }
	6076	+ catch (Exception e)
	6077	+ {
	6078	+ //System.err.println("FAILED: " + this);
	6079	+ failedBump = true;
	6080	+ }
5569	6081
5570	6082	if (!compiled)
5571	6083	{
..	..	@@ -5581,30 +6093,19 @@
5581	6093
5582	6094	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5583	6095	assert(bRep.displaylist != 0);
5584		- gl.glCallList(bRep.displaylist);
	6096	+ display.CallList(bRep.displaylist);
5585	6097	// june 2013 drawSelf(display, root, selected);
5586	6098	}
5587	6099	}
5588	6100	}
5589	6101
5590		- display.ReleaseTextures(tex);
5591		-
5592		- //if (parent != null && parent.GetMaterial() != null)
5593		- // parent.GetMaterial().Draw(display, parent.IsSelected(this));
5594		- if (material != null)
5595		- {
5596		- materialdepth -= 1;
5597		- if (materialdepth > 0)
5598		- {
5599		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5600		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5601		- }
5602		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5603		- } else if (selected && CameraPane.flash && GetMaterial() != null)
5604		- {
5605		- display.modelParams4[1] = GetMaterial().cameralight;
5606		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5607		- }
	6102	+ if (!failedBump)
	6103	+ display.ReleaseBumpTexture(tex);
	6104	+
	6105	+ if (!failedPigment)
	6106	+ display.ReleasePigmentTexture(tex);
	6107	+
	6108	+ display.PopMaterial(this, selected);
5608	6109	}
5609	6110
5610	6111	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5646,7 +6147,7 @@
5646	6147	// resetMasterNode();
5647	6148	}
5648	6149
5649		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6150	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5650	6151	{
5651	6152	if (GetBRep() == null)
5652	6153	{
..	..	@@ -5729,8 +6230,11 @@
5729	6230	boolean flipV = false; // true;
5730	6231	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5731	6232
5732		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	6233	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5733	6234	{
	6235	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6236	+ return;
	6237	+
5734	6238	if (hide)
5735	6239	return;
5736	6240	// shadow optimisation
..	..	@@ -5788,16 +6292,7 @@
5788	6292	// // ??????????????????????????? Touch();
5789	6293	// }
5790	6294
5791		- if (material != null)
5792		- {
5793		- materialstack[materialdepth] = material;
5794		- selectedstack[materialdepth] = selected;
5795		- cStatic.objectstack[materialdepth++] = this;
5796		- //System.out.println("material " + material);
5797		- //Applet3D.tracein("selected ", selected);
5798		- display.vector2buffer = projectedVertices;
5799		- material.Draw(display, selected);
5800		- }
	6295	+display.PushMaterial2(this, selected);
5801	6296
5802	6297	Object3D child;
5803	6298	boolean sel;
..	..	@@ -5849,19 +6344,7 @@
5849	6344	*/
5850	6345	//depth += 1;
5851	6346
5852		- if (material != null)
5853		- {
5854		- materialdepth -= 1;
5855		- if (materialdepth > 0)
5856		- {
5857		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5858		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5859		- }
5860		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5861		- //else
5862		- //material.Draw(display, false);
5863		- }
5864		-
	6347	+display.PopMaterial2(this);
5865	6348	/*
5866	6349	display.ReleaseTextures(tex);
5867	6350	*/
..	..	@@ -5872,10 +6355,13 @@
5872	6355
5873	6356	//static cVector min,max;
5874	6357
5875		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	6358	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5876	6359	{
5877		- if (display.drawMode == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	6360	+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5878	6361	return; // no shadow for transparent objects
	6362	+
	6363	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6364	+ return;
5879	6365
5880	6366	if (hide)
5881	6367	return;
..	..	@@ -5917,11 +6403,12 @@
5917	6403	return;
5918	6404	}
5919	6405
	6406	+ //bRep.GenUV(1/material.diffuseness);
5920	6407	// bRep.lock = true;
5921	6408
5922		- javax.media.opengl.GL gl = display.GetGL();
	6409	+ //javax.media.opengl.GL gl = display.GetGL();
5923	6410
5924		- if (CameraPane.BOXMODE) // \|\| CameraPane.movingcamera)
	6411	+ if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5925	6412	{
5926	6413	int fc = bRep.FaceCount();
5927	6414	int vc = bRep.VertexCount();
..	..	@@ -5936,23 +6423,7 @@
5936	6423
5937	6424	bRep.getMinMax(min, max, 100);
5938	6425
5939		- gl.glBegin(gl.GL_LINES);
5940		-
5941		- gl.glVertex3d(min.x, min.y, min.z);
5942		- gl.glVertex3d(min.x, min.y, max.z);
5943		- gl.glVertex3d(min.x, min.y, min.z);
5944		- gl.glVertex3d(min.x, max.y, min.z);
5945		- gl.glVertex3d(min.x, min.y, min.z);
5946		- gl.glVertex3d(max.x, min.y, min.z);
5947		-
5948		- gl.glVertex3d(max.x, max.y, max.z);
5949		- gl.glVertex3d(min.x, max.y, max.z);
5950		- gl.glVertex3d(max.x, max.y, max.z);
5951		- gl.glVertex3d(max.x, min.y, max.z);
5952		- gl.glVertex3d(max.x, max.y, max.z);
5953		- gl.glVertex3d(max.x, max.y, min.z);
5954		-
5955		- gl.glEnd();
	6426	+ display.DrawBox(min, max);
5956	6427
5957	6428	return;
5958	6429	}
..	..	@@ -5996,7 +6467,7 @@
5996	6467	{
5997	6468	//throw new Error();
5998	6469
5999		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6470	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
6000	6471
6001	6472	int[] strips = bRep.getRawIndices();
6002	6473
..	..	@@ -6006,178 +6477,19 @@
6006	6477	new Exception().printStackTrace();
6007	6478	return;
6008	6479	}
6009		-
6010		- // TRIANGLE STRIP ARRAY
6011		- if (bRep.trimmed)
	6480	+
	6481	+ if (dontselect)
6012	6482	{
6013		- float[] v = bRep.getRawVertices();
6014		- float[] n = bRep.getRawNormals();
6015		- float[] c = bRep.getRawColors();
6016		- float[] uv = bRep.getRawUVMap();
6017		-
6018		- int count2 = 0;
6019		- int count3 = 0;
6020		-
6021		- if (n.length > 0)
6022		- {
6023		- for (int i = 0; i < strips.length; i++)
6024		- {
6025		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6026		-
6027		- /*
6028		- boolean locked = false;
6029		- float eps = 0.1f;
6030		- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6031		-
6032		- int dot = 0;
6033		-
6034		- if ((dot&1) == 0)
6035		- dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6036		-
6037		- if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6038		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6039		- else
6040		- {
6041		- locked = true;
6042		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6043		- }
6044		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6045		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6046		- if (hasnorm)
6047		- {
6048		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6049		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6050		- }
6051		-
6052		- if ((dot&4) == 0)
6053		- dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6054		-
6055		- if (wrap \|\| !locked && (dot&8) != 0)
6056		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6057		- else
6058		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6059		-
6060		- f.dot = dot;
6061		- */
6062		-
6063		- if (!selectmode)
6064		- {
6065		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6066		- {
6067		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6068		- } else
6069		- {
6070		- gl.glNormal3f(0, 0, 1);
6071		- }
6072		-
6073		- if (c != null)
6074		- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
6075		- {
6076		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6077		- }
6078		- }
6079		- if (flipV)
6080		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6081		- else
6082		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6083		- //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6084		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6085		-
6086		- count2 += 2;
6087		- count3 += 3;
6088		- if (!selectmode)
6089		- {
6090		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6091		- {
6092		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6093		- } else
6094		- {
6095		- gl.glNormal3f(0, 0, 1);
6096		- }
6097		- if (c != null)
6098		- {
6099		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6100		- }
6101		- }
6102		- if (flipV)
6103		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6104		- else
6105		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6106		- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6107		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6108		-
6109		- count2 += 2;
6110		- count3 += 3;
6111		- for (int j = 0; j < strips[i] - 2; j++)
6112		- {
6113		- //gl.glTexCoord2d(...);
6114		- if (!selectmode)
6115		- {
6116		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6117		- {
6118		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6119		- } else
6120		- {
6121		- gl.glNormal3f(0, 0, 1);
6122		- }
6123		- if (c != null)
6124		- {
6125		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6126		- }
6127		- }
6128		-
6129		- if (flipV)
6130		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6131		- else
6132		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6133		- //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6134		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6135		- count2 += 2;
6136		- count3 += 3;
6137		- }
6138		-
6139		- gl.glEnd();
6140		- }
6141		- }
6142		-
6143		- assert count3 == v.length;
	6483	+ //bRep.GenerateNormalsMINE();
6144	6484	}
6145		- else // !trimmed
6146		- {
6147		- int count = 0;
6148		- for (int i = 0; i < strips.length; i++)
6149		- {
6150		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6151		-
6152		- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6153		- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6154		-
6155		- drawVertex(gl, p, selectmode);
6156		- drawVertex(gl, q, selectmode);
6157		-
6158		- for (int j = 0; j < strips[i] - 2; j++)
6159		- {
6160		- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6161		-
6162		-// if (j%2 == 0)
6163		-// drawFace(p, q, r, display, null);
6164		-// else
6165		-// drawFace(p, r, q, display, null);
6166		-
6167		-// p = q;
6168		-// q = r;
6169		- drawVertex(gl, r, selectmode);
6170		- }
6171		-
6172		- gl.glEnd();
6173		- }
6174		- }
	6485	+
	6486	+ display.DrawGeometry(bRep, flipV, selectmode);
6175	6487	} else // catch (Error e)
6176	6488	{
6177	6489	// TRIANGLE ARRAY
6178	6490	if (IsOpaque()) // Static())
6179	6491	{
6180		- gl.glBegin(gl.GL_TRIANGLES);
	6492	+ display.StartTriangles();
6181	6493	int facecount = bRep.FaceCount();
6182	6494	for (int i = 0; i < facecount; i++)
6183	6495	{
..	..	@@ -6240,9 +6552,9 @@
6240	6552	// // r.norm.dot(v3) > -0.5)
6241	6553	// // continue;
6242	6554
6243		- drawFace(p, q, r, display, face);
	6555	+ display.DrawFace(this, p, q, r, face);
6244	6556	}
6245		- gl.glEnd();
	6557	+ display.EndTriangles();
6246	6558	}
6247	6559	else
6248	6560	{
..	..	@@ -6271,8 +6583,8 @@
6271	6583	//System.out.println("SORT");
6272	6584
6273	6585	java.util.Arrays.sort(facescompare);
6274		-
6275		- gl.glBegin(gl.GL_TRIANGLES);
	6586	+
	6587	+ display.StartTriangles();
6276	6588	for (int i = 0; i < facecount; i++)
6277	6589	{
6278	6590	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6284,13 +6596,14 @@
6284	6596	Vertex q = bRep.GetVertex(face.q);
6285	6597	Vertex r = bRep.GetVertex(face.r);
6286	6598
6287		- drawFace(p, q, r, display, face);
	6599	+ display.DrawFace(this, p, q, r, face);
6288	6600	}
6289		- gl.glEnd();
	6601	+ display.EndTriangles();
6290	6602	}
6291	6603
6292	6604	if (false) // live && support != null && support.bRep != null) // debug weights
6293	6605	{
	6606	+ /*
6294	6607	gl.glDisable(gl.GL_LIGHTING);
6295	6608	float[] colorV = new float[3];
6296	6609
..	..	@@ -6369,6 +6682,7 @@
6369	6682	// gl.glEnd();
6370	6683	}
6371	6684	}
	6685	+ */
6372	6686	}
6373	6687	}
6374	6688
..	..	@@ -6413,7 +6727,7 @@
6413	6727	center.add(r);
6414	6728	center.mul(1.0/3);
6415	6729
6416		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6730	+ center.sub(Globals.theRenderer.EyeCamera().location);
6417	6731
6418	6732	distance = center.dot(center);
6419	6733	}
..	..	@@ -6424,347 +6738,11 @@
6424	6738
6425	6739	transient FaceCompare[] facescompare = null;
6426	6740
6427		- void SetColor(CameraPane display, Vertex p0)
6428		- {
6429		- if (display.RENDERPROGRAM == 0)
6430		- {
6431		- float r = 0;
6432		- if (bRep != null)
6433		- {
6434		- if (bRep.stripified)
6435		- {
6436		- r = 1;
6437		- }
6438		- }
6439		- float g = 0;
6440		- if (bRep != null)
6441		- {
6442		- if (bRep.trimmed)
6443		- {
6444		- g = 1;
6445		- }
6446		- }
6447		- float b = 0;
6448		- if (support != null && link2master)
6449		- {
6450		- b = 1;
6451		- }
6452		- display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
6453		- return;
6454		- }
6455		-
6456		- if (display.drawMode != CameraPane.SHADOW)
6457		- return;
6458		-
6459		- javax.media.opengl.GL gl = display.GetGL();
6460		-// if (true) return;
6461		-// float ao = p.AO;
6462		-//
6463		-// // if (ao == 0 && !bRep.AOdone) // transient problem!
6464		-// // ao = 1;
6465		-//
6466		-// gl.glColor4f(ao, ao, ao, 1);
6467		-
6468		-// CameraPane.selectedpoint.
6469		-// getAverage(cStatic.point1, true);
6470		- if (CameraPane.pointflow == null) // !random) // live)
6471		- {
6472		- return;
6473		- }
6474		-
6475		- cStatic.point1.set(0,0,0);
6476		- LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
6477		-
6478		- cStatic.point1.sub(p0);
6479		-
6480		-
6481		-// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
6482		-// {
6483		-// return;
6484		-// }
6485		-
6486		- //if (true)
6487		- if (cStatic.point1.dot(cStatic.point1) > 0.000001)
6488		- {
6489		- return;
6490		- }
6491		-
6492		- float[] colorV = new float[3];
6493		-
6494		- if (false) // marked)
6495		- {
6496		- // debug rigging weights
6497		- for (int object = 0; object < p0.vertexlinks.length; object++)
6498		- {
6499		- float weight = p0.weights[object] / p0.totalweight;
6500		-
6501		- // if (weight < 0.1)
6502		- // {
6503		- // assert(weight == 0);
6504		- // continue;
6505		- // }
6506		-
6507		- if (p0.vertexlinks[object] == -1)
6508		- continue;
6509		-
6510		- Vertex q = support.bRep.GetVertex(p0.vertexlinks[object]);
6511		-
6512		- int color = //1 << object; //
6513		- //p.vertexlinks.length;
6514		- support.bRep.supports[p0.closestsupport].links[object];
6515		- colorV[2] += (color & 1) * weight;
6516		- colorV[1] += ((color & 2) >> 1) * weight;
6517		- colorV[0] += ((color & 4) >> 2) * weight;
6518		- }
6519		- }
6520		- else
6521		- {
6522		- if (drawingstarted)
6523		- {
6524		- // find next point
6525		- if (bRep.GetVertex(0).faceindices == null)
6526		- {
6527		- bRep.InitFaceIndices();
6528		- }
6529		-
6530		- double ymin = p0.y;
6531		-
6532		- Vertex newp = p0;
6533		-
6534		- for (int fii = 0; fii < p0.faceindices.length; fii++)
6535		- {
6536		- int fi = p0.faceindices[fii];
6537		-
6538		- if (fi == -1)
6539		- break;
6540		-
6541		- Face f = bRep.GetFace(fi);
6542		-
6543		- Vertex p = bRep.GetVertex(f.p);
6544		- Vertex q = bRep.GetVertex(f.q);
6545		- Vertex r = bRep.GetVertex(f.r);
6546		-
6547		- int swap = (int)(Math.random()*3);
6548		-
6549		-// for (int s=swap; --s>=0;)
6550		-// {
6551		-// Vertex t = p;
6552		-// p = q;
6553		-// q = r;
6554		-// r = t;
6555		-// }
6556		- if (ymin > p.y)
6557		- {
6558		- ymin = p.y;
6559		- newp = p;
6560		-// break;
6561		- }
6562		- if (ymin > q.y)
6563		- {
6564		- ymin = q.y;
6565		- newp = q;
6566		-// break;
6567		- }
6568		- if (ymin > r.y)
6569		- {
6570		- ymin = r.y;
6571		- newp = r;
6572		-// break;
6573		- }
6574		- }
6575		-
6576		- CameraPane.selectedpoint.toParent[3][0] = newp.x;
6577		- CameraPane.selectedpoint.toParent[3][1] = newp.y;
6578		- CameraPane.selectedpoint.toParent[3][2] = newp.z;
6579		-
6580		- drawingstarted = false;
6581		-
6582		- // return;
6583		- }
6584		-
6585		- if (false) // CameraPane.DRAW
6586		- {
6587		- p0.AO = colorV[0] = 2;
6588		- colorV[1] = 2;
6589		- colorV[2] = 2;
6590		- }
6591		-
6592		- CameraPane.pointflow.add(p0);
6593		- CameraPane.pointflow.Touch();
6594		- }
6595		-
6596		-// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
6597		-// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
6598		-// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
6599		- }
6600		-
6601	6741	void Print(Vertex v)
6602	6742	{
6603	6743	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6604	6744	}
6605	6745
6606		- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6607		- {
6608		- if (!selectmode)
6609		- {
6610		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6611		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6612		-
6613		- if (flipV)
6614		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6615		- else
6616		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6617		- }
6618		-
6619		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6620		- }
6621		-
6622		- void drawFace(Vertex pv, Vertex qv, Vertex rv,
6623		- CameraPane display, Face face)
6624		- {
6625		- if (pv.y == -10000 \|\|
6626		- qv.y == -10000 \|\|
6627		- rv.y == -10000)
6628		- return;
6629		-
6630		-// float b = f.nbiterations & 1;
6631		-// float g = (f.nbiterations>>1) & 1;
6632		-// float r = (f.nbiterations>>2) & 1;
6633		-//
6634		-// //if (f.weight == 10000)
6635		-// //{
6636		-// // r = 1; g = b = 0;
6637		-// //}
6638		-// //else
6639		-// //{
6640		-// // assert(f.weight < 10000);
6641		-// r = g = b = (float)bRep.FaceWeight(f)*100;
6642		-// if (r<0)
6643		-// assert(r>=0);
6644		-// //}
6645		-
6646		- javax.media.opengl.GL gl = display.GetGL();
6647		-
6648		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
6649		-
6650		- //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
6651		- if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
6652		- {
6653		- //gl.glBegin(gl.GL_TRIANGLES);
6654		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
6655		- if (!hasnorm)
6656		- {
6657		- // System.out.println("FUCK!!");
6658		- LA.vecSub(pv/.pos/, qv/.pos/, v0);
6659		- LA.vecSub(pv/.pos/, rv/.pos/, v1);
6660		- LA.vecCross(v0, v1, v2);
6661		- LA.vecNormalize(v2);
6662		- gl.glNormal3f((float) v2.x, (float) v2.y, (float) v2.z);
6663		- }
6664		-
6665		- if (hasnorm)
6666		- {
6667		-// if (!pv.norm.normalized())
6668		-// assert(pv.norm.normalized());
6669		-
6670		- //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
6671		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6672		- }
6673		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6674		- SetColor(display, pv);
6675		- //gl.glColor4f(r, g, b, 1);
6676		- //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
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		- //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
6682		- gl.glVertex3f((float) pv./pos./x, (float) pv./pos./y, (float) pv./pos./z);
6683		-// Print(pv);
6684		- if (hasnorm)
6685		- {
6686		-// assert(qv.norm.normalized());
6687		- //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
6688		- gl.glNormal3f((float) qv.norm.x, (float) qv.norm.y, (float) qv.norm.z);
6689		- }
6690		- //System.out.println("vertexq = " + qv.s + ", " + qv.t);
6691		- // boolean locked = false;
6692		- // float eps = 0.1f;
6693		- // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6694		-
6695		- // int dot = 0; //*/ (int)f.dot;
6696		-
6697		- // if ((dot&1) == 0)
6698		- // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6699		-
6700		- // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6701		- if (flipV)
6702		- gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
6703		- else
6704		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6705		- // else
6706		- // {
6707		- // locked = true;
6708		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6709		- // }
6710		- gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
6711		- SetColor(display, qv);
6712		- //gl.glColor4f(r, g, b, 1);
6713		- //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
6714		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6715		- gl.glVertex3f((float) qv./pos./x, (float) qv./pos./y, (float) qv./pos./z);
6716		-// Print(qv);
6717		- if (hasnorm)
6718		- {
6719		-// assert(rv.norm.normalized());
6720		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6721		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6722		- }
6723		-
6724		- // if ((dot&4) == 0)
6725		- // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6726		-
6727		- // if (wrap \|\| !locked && (dot&8) != 0)
6728		- if (flipV)
6729		- gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
6730		- else
6731		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6732		- // else
6733		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6734		-
6735		- // f.dot = dot;
6736		-
6737		- gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
6738		- SetColor(display, rv);
6739		- //gl.glColor4f(r, g, b, 1);
6740		- //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
6741		- //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
6742		- gl.glVertex3f((float) rv./pos./x, (float) rv./pos./y, (float) rv./pos./z);
6743		-// Print(rv);
6744		- //gl.glEnd();
6745		- }
6746		- else
6747		- {
6748		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6749		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6750		- gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
6751		-
6752		- }
6753		-
6754		- if (false) // (attributes & WIREFRAME) != 0)
6755		- {
6756		- gl.glDisable(gl.GL_LIGHTING);
6757		-
6758		- gl.glBegin(gl.GL_LINE_LOOP);
6759		- gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
6760		- gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
6761		- gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
6762		- gl.glEnd();
6763		-
6764		- gl.glEnable(gl.GL_LIGHTING);
6765		- }
6766		- }
6767		-
6768	6746	void drawSelf(ClickInfo info, int level, boolean select)
6769	6747	{
6770	6748	if (bRep == null)
..	..	@@ -7336,83 +7314,84 @@
7336	7314	int spotw = spot.x + spot.width;
7337	7315	int spoth = spot.y + spot.height;
7338	7316	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7339		- if (CameraPane.Xmin > spot.x)
7340		- {
7341		- CameraPane.Xmin = spot.x;
7342		- }
7343		- if (CameraPane.Xmax < spotw)
7344		- {
7345		- CameraPane.Xmax = spotw;
7346		- }
7347		- if (CameraPane.Ymin > spot.y)
7348		- {
7349		- CameraPane.Ymin = spot.y;
7350		- }
7351		- if (CameraPane.Ymax < spoth)
7352		- {
7353		- CameraPane.Ymax = spoth;
7354		- }
	7317	+// if (CameraPane.Xmin > spot.x)
	7318	+// {
	7319	+// CameraPane.Xmin = spot.x;
	7320	+// }
	7321	+// if (CameraPane.Xmax < spotw)
	7322	+// {
	7323	+// CameraPane.Xmax = spotw;
	7324	+// }
	7325	+// if (CameraPane.Ymin > spot.y)
	7326	+// {
	7327	+// CameraPane.Ymin = spot.y;
	7328	+// }
	7329	+// if (CameraPane.Ymax < spoth)
	7330	+// {
	7331	+// CameraPane.Ymax = spoth;
	7332	+// }
7355	7333	spot.translate(32, 32);
7356	7334	spotw = spot.x + spot.width;
7357	7335	spoth = spot.y + spot.height;
7358		- info.g.setColor(Color.blue);
	7336	+ info.g.setColor(Color.cyan);
7359	7337	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7360		- if (CameraPane.Xmin > spot.x)
7361		- {
7362		- CameraPane.Xmin = spot.x;
7363		- }
7364		- if (CameraPane.Xmax < spotw)
7365		- {
7366		- CameraPane.Xmax = spotw;
7367		- }
7368		- if (CameraPane.Ymin > spot.y)
7369		- {
7370		- CameraPane.Ymin = spot.y;
7371		- }
7372		- if (CameraPane.Ymax < spoth)
7373		- {
7374		- CameraPane.Ymax = spoth;
7375		- }
7376		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7377		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7338	+// if (CameraPane.Xmin > spot.x)
	7339	+// {
	7340	+// CameraPane.Xmin = spot.x;
	7341	+// }
	7342	+// if (CameraPane.Xmax < spotw)
	7343	+// {
	7344	+// CameraPane.Xmax = spotw;
	7345	+// }
	7346	+// if (CameraPane.Ymin > spot.y)
	7347	+// {
	7348	+// CameraPane.Ymin = spot.y;
	7349	+// }
	7350	+// if (CameraPane.Ymax < spoth)
	7351	+// {
	7352	+// CameraPane.Ymax = spoth;
	7353	+// }
	7354	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7355	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7378	7356	spot.translate(0, -32);
7379		- info.g.setColor(Color.green);
	7357	+ info.g.setColor(Color.yellow);
7380	7358	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7381		- if (CameraPane.Xmin > spot.x)
7382		- {
7383		- CameraPane.Xmin = spot.x;
7384		- }
7385		- if (CameraPane.Xmax < spotw)
7386		- {
7387		- CameraPane.Xmax = spotw;
7388		- }
7389		- if (CameraPane.Ymin > spot.y)
7390		- {
7391		- CameraPane.Ymin = spot.y;
7392		- }
7393		- if (CameraPane.Ymax < spoth)
7394		- {
7395		- CameraPane.Ymax = spoth;
7396		- }
7397		- info.g.drawArc(boundary.x, boundary.y,
7398		- boundary.width, boundary.height, 0, 360);
	7359	+ info.g.setColor(Color.green);
	7360	+// if (CameraPane.Xmin > spot.x)
	7361	+// {
	7362	+// CameraPane.Xmin = spot.x;
	7363	+// }
	7364	+// if (CameraPane.Xmax < spotw)
	7365	+// {
	7366	+// CameraPane.Xmax = spotw;
	7367	+// }
	7368	+// if (CameraPane.Ymin > spot.y)
	7369	+// {
	7370	+// CameraPane.Ymin = spot.y;
	7371	+// }
	7372	+// if (CameraPane.Ymax < spoth)
	7373	+// {
	7374	+// CameraPane.Ymax = spoth;
	7375	+// }
	7376	+ info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
	7377	+ (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
7399	7378	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7400		- if (CameraPane.Xmin > boundary.x)
7401		- {
7402		- CameraPane.Xmin = boundary.x;
7403		- }
7404		- if (CameraPane.Xmax < boundary.x + boundary.width)
7405		- {
7406		- CameraPane.Xmax = boundary.x + boundary.width;
7407		- }
7408		- if (CameraPane.Ymin > boundary.y)
7409		- {
7410		- CameraPane.Ymin = boundary.y;
7411		- }
7412		- if (CameraPane.Ymax < boundary.y + boundary.height)
7413		- {
7414		- CameraPane.Ymax = boundary.y + boundary.height;
7415		- }
	7379	+// if (CameraPane.Xmin > boundary.x)
	7380	+// {
	7381	+// CameraPane.Xmin = boundary.x;
	7382	+// }
	7383	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	7384	+// {
	7385	+// CameraPane.Xmax = boundary.x + boundary.width;
	7386	+// }
	7387	+// if (CameraPane.Ymin > boundary.y)
	7388	+// {
	7389	+// CameraPane.Ymin = boundary.y;
	7390	+// }
	7391	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	7392	+// {
	7393	+// CameraPane.Ymax = boundary.y + boundary.height;
	7394	+// }
7416	7395	return;
7417	7396	}
7418	7397	}
..	..	@@ -7429,7 +7408,7 @@
7429	7408	startX = info.x;
7430	7409	startY = info.y;
7431	7410
7432		- hitSomething = 0;
	7411	+ hitSomething = -1;
7433	7412	cVector origin = new cVector();
7434	7413	//LA.xformPos(origin, toParent, origin);
7435	7414	Rectangle spot = new Rectangle();
..	..	@@ -7462,7 +7441,7 @@
7462	7441	}
7463	7442
7464	7443	//System.out.println("info.modifiers = " + info.modifiers);
7465		- modified = (info.modifiers & CameraPane.META) != 0;
	7444	+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7466	7445	//System.out.println("modified = " + modified);
7467	7446	//new Exception().printStackTrace();
7468	7447	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7490,7 +7469,7 @@
7490	7469	return true;
7491	7470	}
7492	7471
7493		- void doEditDrag0(ClickInfo info)
	7472	+ void doEditDrag0(ClickInfo info, boolean opposite)
7494	7473	{
7495	7474	if (hitSomething == 0)
7496	7475	{
..	..	@@ -7505,6 +7484,7 @@
7505	7484	//System.out.println("hitSomething = " + hitSomething);
7506	7485
7507	7486	double scale = 0.005f * info.camera.Distance();
	7487	+
7508	7488	cVector xlate = new cVector();
7509	7489	//cVector xlate2 = new cVector();
7510	7490	switch (hitSomething)
..	..	@@ -7515,9 +7495,9 @@
7515	7495
7516	7496	case hitCenter: // Translate
7517	7497
7518		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7498	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7519	7499
7520		- if (modified)
	7500	+ if (modified \|\| opposite)
7521	7501	{
7522	7502	//assert(false);
7523	7503	/*
..	..	@@ -7563,10 +7543,10 @@
7563	7543	}
7564	7544	LA.xformDir(up, ClickInfo.matbuffer, up);
7565	7545	// if (!CameraPane.LOCALTRANSFORM)
7566		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
	7546	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7567	7547	LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7568	7548	// if (!CameraPane.LOCALTRANSFORM)
7569		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7549	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7570	7550	//LA.vecCross(up, cVector.Z, right2);
7571	7551
7572	7552	cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
..	..	@@ -7611,6 +7591,7 @@
7611	7591
7612	7592	if (modified)
7613	7593	{
	7594	+ // Rotate 90 degrees
7614	7595	angle /= (Math.PI / 4);
7615	7596	angle = Math.floor(angle + 0.5);
7616	7597	angle *= (Math.PI / 4);
..	..	@@ -7624,7 +7605,7 @@
7624	7605	}
7625	7606	/**/
7626	7607
7627		- switch (info.pane.renderCamera.viewCode)
	7608	+ switch (info.pane.RenderCamera().viewCode)
7628	7609	{
7629	7610	case 1: // '\001'
7630	7611	LA.matZRotate(toParent, angle);
..	..	@@ -7652,24 +7633,27 @@
7652	7633
7653	7634	case hitScale: // scale
7654	7635	double hScale = (double) (info.x - centerPt.x) / 32;
	7636	+ double sign = 1;
	7637	+ if (hScale < 0)
	7638	+ {
	7639	+ sign = -1;
	7640	+ }
	7641	+ hScale = signMath.pow(signhScale, scale * 50);
7655	7642	if (hScale < 0.01)
7656	7643	{
7657		- hScale = 0.01;
	7644	+ //hScale = 0.01;
7658	7645	}
7659		- hScale = Math.pow(hScale, scale * 50);
7660		- if (hScale < 0.01)
7661		- {
7662		- hScale = 0.01;
7663		- }
	7646	+
7664	7647	double vScale = (double) (info.y - centerPt.y) / 32;
7665		- if (vScale < 0.01)
	7648	+ sign = 1;
	7649	+ if (vScale < 0)
7666	7650	{
7667		- vScale = 0.01;
	7651	+ sign = -1;
7668	7652	}
7669		- vScale = Math.pow(vScale, scale * 50);
	7653	+ vScale = signMath.pow(signvScale, scale * 50);
7670	7654	if (vScale < 0.01)
7671	7655	{
7672		- vScale = 0.01;
	7656	+ //vScale = 0.01;
7673	7657	}
7674	7658	LA.matCopy(startMat, toParent);
7675	7659	/**/
..	..	@@ -7680,39 +7664,47 @@
7680	7664	}
7681	7665	/**/
7682	7666
7683		- switch (info.pane.renderCamera.viewCode)
	7667	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7668	+
	7669	+ if (totalScale < 0.01)
	7670	+ {
	7671	+ totalScale = 0.01;
	7672	+ }
	7673	+
	7674	+ switch (info.pane.RenderCamera().viewCode)
7684	7675	{
7685	7676	case 3: // '\001'
7686		- if (modified)
	7677	+ if (modified \|\| opposite)
7687	7678	{
7688	7679	//LA.matScale(toParent, 1, hScale, vScale);
7689		- LA.matScale(toParent, vScale, 1, 1);
	7680	+ LA.matScale(toParent, totalScale, 1, 1);
7690	7681	} // vScale, 1);
7691	7682	else
7692	7683	{
7693		- LA.matScale(toParent, vScale, vScale, vScale);
	7684	+ // EXCEPTION!
	7685	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7694	7686	} // vScale, 1);
7695	7687	break;
7696	7688
7697	7689	case 2: // '\002'
7698		- if (modified)
	7690	+ if (modified \|\| opposite)
7699	7691	{
7700	7692	//LA.matScale(toParent, hScale, 1, vScale);
7701		- LA.matScale(toParent, 1, vScale, 1);
	7693	+ LA.matScale(toParent, 1, totalScale, 1);
7702	7694	} else
7703	7695	{
7704		- LA.matScale(toParent, vScale, 1, vScale);
	7696	+ LA.matScale(toParent, totalScale, 1, totalScale);
7705	7697	}
7706	7698	break;
7707	7699
7708	7700	case 1: // '\003'
7709		- if (modified)
	7701	+ if (modified \|\| opposite)
7710	7702	{
7711	7703	//LA.matScale(toParent, hScale, vScale, 1);
7712		- LA.matScale(toParent, 1, 1, vScale);
	7704	+ LA.matScale(toParent, 1, 1, totalScale);
7713	7705	} else
7714	7706	{
7715		- LA.matScale(toParent, vScale, vScale, 1);
	7707	+ LA.matScale(toParent, totalScale, totalScale, 1);
7716	7708	}
7717	7709	break;
7718	7710	}
..	..	@@ -7733,7 +7725,7 @@
7733	7725	if (parent == null)
7734	7726	{
7735	7727	System.out.println("NULL PARENT");
7736		- new Exception().printStackTrace();
	7728	+ //new Exception().printStackTrace();
7737	7729	} else
7738	7730	{
7739	7731	if (parent instanceof BezierPatch)
..	..	@@ -7845,14 +7837,22 @@
7845	7837	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7846	7838	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7847	7839	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7840	+
	7841	+ String objname;
	7842	+
7848	7843	if (false) //parent != null)
7849	7844	{
7850		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7845	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7851	7846	} else
7852	7847	{
7853		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7848	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7854	7849	} // + super.toString();
7855	7850	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7851	+
	7852	+ if (!Globals.ADVANCED)
	7853	+ return objname;
	7854	+
	7855	+ return objname + " " + System.identityHashCode(this);
7856	7856	}
7857	7857
7858	7858	public int hashCode()
..	..	@@ -7908,6 +7908,7 @@
7908	7908	objectUI.closeUI();
7909	7909	if (editWindow != null)
7910	7910	{
	7911	+ editWindow.ctrlPanel.FlushUI();
7911	7912	editWindow.refreshContents();
7912	7913	} // ? new
7913	7914	objectUI = null;
..	..	@@ -7916,6 +7917,10 @@
7916	7917	{
7917	7918	editWindow = null;
7918	7919	} // ?
	7920	+ }
	7921	+ else
	7922	+ {
	7923	+ //editWindow.closeUI();
7919	7924	}
7920	7925	}
7921	7926
..	..	@@ -7928,7 +7933,7 @@
7928	7933	/transient/ cVector2[] projectedVertices = new cVector2[0];
7929	7934
7930	7935	Object3D /Composite/ parent;
7931		- Object3D /Composite/ fileparent;
	7936	+ Object3D /Composite/ fileparent; // In the case of FileObject
7932	7937
7933	7938	double[][] toParent; // dynamic matrix
7934	7939	double[][] fromParent;
..	..	@@ -8043,7 +8048,7 @@
8043	8048	{
8044	8049	assert(bRep != null);
8045	8050	if (!(support instanceof GenericJoint)) // support.bRep != null)
8046		- GrafreeD.Assert(support.bRep == bRep.support);
	8051	+ Grafreed.Assert(support.bRep == bRep.support);
8047	8052	}
8048	8053	else
8049	8054	{
..	..	@@ -8074,6 +8079,10 @@
8074	8079	}
8075	8080
8076	8081	transient ObjEditor editWindow;
	8082	+ transient ObjEditor manipWindow;
	8083	+
	8084	+ transient boolean pinned;
	8085	+
8077	8086	transient ObjectUI objectUI;
8078	8087	public static int povDepth = 0;
8079	8088	private static cVector tbMin = new cVector();
..	..	@@ -8092,9 +8101,9 @@
8092	8101	private static cVector edge2 = new cVector();
8093	8102	//private static cVector norm = new cVector();
8094	8103	/transient private/ int hitSomething;
8095		- private static final int hitCenter = 1;
8096		- private static final int hitScale = 2;
8097		- private static final int hitRotate = 3;
	8104	+ static final int hitCenter = 1;
	8105	+ static final int hitScale = 2;
	8106	+ static final int hitRotate = 3;
8098	8107	/transient/ /private/ int viewCode; // Now used for transparency cache flag
8099	8108	/transient/ private Point centerPt;
8100	8109	/transient/ private int startX;
..	..	@@ -8126,6 +8135,8 @@
8126	8135	{
8127	8136	Object3D targ = this;
8128	8137
	8138	+ targ.NORMALPUSH = obj.NORMALPUSH;
	8139	+
8129	8140	if (obj.material != null)
8130	8141	{
8131	8142	if ((mask&MATERIAL)!=0) // ==(COLOR\|MATERIAL))