~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,30 @@
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	+
22	27	ScriptNode scriptnode;
	28	+
	29	+ void InitOthers()
	30	+ {
	31	+ if (projectedVertices == null \|\| projectedVertices.length <= 2)
	32	+ {
	33	+ projectedVertices = new Object3D.cVector2[3];
	34	+ }
	35	+ for (int i = 0; i < 3; i++)
	36	+ {
	37	+ projectedVertices[i] = new cVector2(); // Others
	38	+ }
	39	+ projectedVertices[0].x = 100; // bump
	40	+ }
23	41
24	42	void MinMax(cVector minima, cVector maxima)
25	43	{
..	..	@@ -286,6 +304,7 @@
286	304	}
287	305
288	306	boolean live = false;
	307	+ boolean dontselect = false;
289	308	boolean hide = false;
290	309	boolean link2master = false; // performs reset support/master at each frame
291	310	boolean marked = false; // animation node
..	..	@@ -295,6 +314,8 @@
295	314	boolean random = false;
296	315	boolean speedup = false;
297	316	boolean rewind = false;
	317	+
	318	+ float NORMALPUSH = 0;
298	319
299	320	Object3D support;
300	321
..	..	@@ -355,7 +376,7 @@
355	376
356	377	int MemorySize()
357	378	{
358		- if (memorysize == 0)
	379	+ if (true) // memorysize == 0)
359	380	{
360	381	try
361	382	{
..	..	@@ -415,16 +436,16 @@
415	436	{
416	437	Object3D copy = this;
417	438
418		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	439	+ Camera parentcam = Globals.theRenderer.ManipCamera();
419	440
420		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	441	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
421	442	{
422		- parentcam = CameraPane.theRenderer.cameras[1];
	443	+ parentcam = Globals.theRenderer.Cameras()[1];
423	444	}
424	445
425		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	446	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
426	447	{
427		- parentcam = CameraPane.theRenderer.cameras[0];
	448	+ parentcam = Globals.theRenderer.Cameras()[0];
428	449	}
429	450
430	451	if (this == parentcam)
..	..	@@ -432,7 +453,7 @@
432	453	//assert(this instanceof Camera);
433	454
434	455	for (int count = parentcam.GetTransformCount(); --count>=0;)
435		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	456	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
436	457	}
437	458
438	459	copy.marked ^= true;
..	..	@@ -452,7 +473,7 @@
452	473	//assert(this instanceof Camera);
453	474
454	475	for (int count = parentcam.GetTransformCount(); --count>=0;)
455		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	476	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
456	477	}
457	478
458	479	copy.Touch(); // display list issue
..	..	@@ -587,7 +608,7 @@
587	608	return;
588	609	}
589	610
590		- if (CameraPane.fromscript)
	611	+ if (Globals.fromscript)
591	612	{
592	613	transformcount = 0;
593	614	return;
..	..	@@ -745,7 +766,7 @@
745	766
746	767	int GetTransformCount()
747	768	{
748		- // marde pour serialization de Texture
	769	+ // patch pour serialization de Texture
749	770	resetmaxcount();
750	771	resettransformcount();
751	772	resetstep();
..	..	@@ -758,7 +779,7 @@
758	779	if (step == 0)
759	780	step = 1;
760	781	if (maxcount == 0)
761		- maxcount = 2048; // 4;
	782	+ maxcount = 128; // 2048; // 4;
762	783	// if (acceleration == 0)
763	784	// acceleration = 10;
764	785	if (delay == 0) // serial
..	..	@@ -779,9 +800,12 @@
779	800	// factor = CameraPane.STEP;
780	801	// }
781	802
782		- if (marked && CameraPane.isLIVE() && live && CameraPane.drawMode == CameraPane.SHADOW && currentframe != CameraPane.framecount)
	803	+ if (marked && Globals.isLIVE() && live &&
	804	+ //TEMP21aug2018
	805	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	806	+ currentframe != Globals.framecount)
783	807	{
784		- currentframe = CameraPane.framecount;
	808	+ currentframe = Globals.framecount;
785	809
786	810	// System.err.println("transformcount = " + transformcount);
787	811	// System.err.println("factor = " + factor);
..	..	@@ -893,6 +917,11 @@
893	917	fromParent = null; // LA.newMatrix();
894	918	bRep = null; // new BoundaryRep();
895	919
	920	+ if (oname != null && oname.equals("LeftHand"))
	921	+ {
	922	+ name = oname;
	923	+ }
	924	+
896	925	/*
897	926	float hue = (float)Math.random();
898	927	Color col;
..	..	@@ -935,7 +964,7 @@
935	964
936	965	public Object clone()
937	966	{
938		- return GrafreeD.clone(this);
	967	+ return Grafreed.clone(this);
939	968	}
940	969
941	970	Object3D copyExpand()
..	..	@@ -1446,7 +1475,16 @@
1446	1475	// if (other == null)
1447	1476	// return;
1448	1477
1449		- System.out.println("Link support this = " + this + "; other = " + other);
	1478	+ if (other != null)
	1479	+ {
	1480	+ BoundaryRep.SEUIL = other.material.cameralight;
	1481	+
	1482	+ // Set default to 0.1
	1483	+ BoundaryRep.SEUIL /= 4; // 2;
	1484	+ System.out.println("SEUIL = " + BoundaryRep.SEUIL);
	1485	+ }
	1486	+
	1487	+ System.out.println("Link this = " + this + "; support = " + other);
1450	1488
1451	1489	//if (bRep != null)
1452	1490	// bRep.linkVerticesThis(other.bRep);
..	..	@@ -1701,7 +1739,7 @@
1701	1739	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1702	1740	o.bRep = transientrep;
1703	1741	if (clone)
1704		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1742	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1705	1743	o.CreateMaterial();
1706	1744	o.SetAttributes(this, -1);
1707	1745	//parent
..	..	@@ -1714,7 +1752,7 @@
1714	1752	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1715	1753	o.bRep = bRep;
1716	1754	if (clone)
1717		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1755	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1718	1756	o.CreateMaterial();
1719	1757	//o.overwriteThis(this, -1);
1720	1758	o.SetAttributes(this, -1);
..	..	@@ -1801,12 +1839,15 @@
1801	1839	if (obj.name == null)
1802	1840	continue; // can't be a null one
1803	1841
	1842	+ // Try perfect match first.
1804	1843	if (n.equals(obj.name))
1805	1844	{
1806	1845	theobj = obj;
1807	1846	count++;
1808	1847	}
1809	1848	}
	1849	+
	1850	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1810	1851
1811	1852	if (count != 1)
1812	1853	for (int i=Size(); --i>=0;)
..	..	@@ -1816,8 +1857,9 @@
1816	1857	if (obj.name == null)
1817	1858	continue; // can't be a null one
1818	1859
1819		- //if (n.contains(obj.name)) // dec 2013 name.split(":")[0])) // Poser generates a count
1820		- if (n.startsWith(obj.name))
	1860	+ String name = obj.name.split(":")[0]; // Poser generates a count
	1861	+ //if (n.startsWith(obj.name))
	1862	+ if (n.contains(name))
1821	1863	{
1822	1864	theobj = obj;
1823	1865	count++;
..	..	@@ -2120,15 +2162,8 @@
2120	2162	if (/parent != null &&/ material == null)
2121	2163	{
2122	2164	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
	2165	+
	2166	+ InitOthers();
2132	2167
2133	2168	if (this instanceof Camera)
2134	2169	{
..	..	@@ -2278,6 +2313,7 @@
2278	2313	{
2279	2314	if (newWindow)
2280	2315	{
	2316	+ new Exception().printStackTrace();
2281	2317	System.exit(0);
2282	2318	if (parent != null)
2283	2319	{
..	..	@@ -2454,13 +2490,13 @@
2454	2490	return retval;
2455	2491	}
2456	2492
2457		- void doEditDrag(ClickInfo info)
	2493	+ void doEditDrag(ClickInfo info, boolean opposite)
2458	2494	{
2459	2495	switch (doSomething)
2460	2496	{
2461	2497	case 1: // '\001'
2462	2498	//super.
2463		- doEditDrag0(info);
	2499	+ doEditDrag0(info, opposite);
2464	2500	break;
2465	2501
2466	2502	case 2: // '\002'
..	..	@@ -2473,11 +2509,11 @@
2473	2509	{
2474	2510	//sel.hitSomething = childToDrag.hitSomething;
2475	2511	//childToDrag.doEditDrag(info);
2476		- sel.doEditDrag(info);
	2512	+ sel.doEditDrag(info, opposite);
2477	2513	} else
2478	2514	{
2479	2515	//super.
2480		- doEditDrag0(info);
	2516	+ doEditDrag0(info, opposite);
2481	2517	}
2482	2518	}
2483	2519	break;
..	..	@@ -2732,6 +2768,24 @@
2732	2768	blockloop = false;
2733	2769	}
2734	2770
	2771	+ void GenNormalsMINE()
	2772	+ {
	2773	+ if (blockloop)
	2774	+ return;
	2775	+
	2776	+ blockloop = true;
	2777	+ GenNormalsMINE0();
	2778	+ for (int i = 0; i < Children().Size(); i++)
	2779	+ {
	2780	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2781	+ if (child == null)
	2782	+ continue;
	2783	+ child.GenNormalsMINE();
	2784	+// Children().release(i);
	2785	+ }
	2786	+ blockloop = false;
	2787	+ }
	2788	+
2735	2789	void ClearColors()
2736	2790	{
2737	2791	if (blockloop)
..	..	@@ -2866,7 +2920,8 @@
2866	2920	{
2867	2921	if (bRep != null)
2868	2922	{
2869		- bRep.GenUV();
	2923	+ bRep.GenUV(); //1);
	2924	+ //bRep.UnfoldUV();
2870	2925	Touch();
2871	2926	}
2872	2927	}
..	..	@@ -2876,6 +2931,15 @@
2876	2931	if (bRep != null)
2877	2932	{
2878	2933	bRep.GenerateNormals(crease);
	2934	+ Touch();
	2935	+ }
	2936	+ }
	2937	+
	2938	+ void GenNormalsMINE0()
	2939	+ {
	2940	+ if (bRep != null)
	2941	+ {
	2942	+ bRep.GenerateNormalsMINE();
2879	2943	Touch();
2880	2944	}
2881	2945	}
..	..	@@ -2932,6 +2996,33 @@
2932	2996	blockloop = false;
2933	2997	}
2934	2998
	2999	+ void TransformChildren()
	3000	+ {
	3001	+ if (toParent != null)
	3002	+ {
	3003	+ for (int i=Size(); --i>=0;)
	3004	+ {
	3005	+ Object3D v = get(i);
	3006	+
	3007	+ if (v.toParent == null)
	3008	+ {
	3009	+ v.toParent = LA.newMatrix();
	3010	+ v.fromParent = LA.newMatrix();
	3011	+ }
	3012	+
	3013	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3014	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3015	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3016	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3017	+ }
	3018	+
	3019	+ toParent = null; // LA.matIdentity(toParent);
	3020	+ fromParent = null; // LA.matIdentity(fromParent);
	3021	+
	3022	+ Touch();
	3023	+ }
	3024	+ }
	3025	+
2935	3026	void TransformGeometry()
2936	3027	{
2937	3028	Object3D obj = this;
..	..	@@ -3153,9 +3244,11 @@
3153	3244
3154	3245	BoundaryRep sup = bRep.support;
3155	3246	bRep.support = null;
3156		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3247	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3157	3248	// bRep.SplitInTwo(onlyone); // thread...
3158		- temprep.SplitInTwo(reduction34, onlyone);
	3249	+
	3250	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3251	+
3159	3252	bRep = temprep;
3160	3253	bRep.support = sup;
3161	3254	Touch();
..	..	@@ -3677,7 +3770,7 @@
3677	3770	if (child == null)
3678	3771	continue;
3679	3772
3680		- if (GrafreeD.RENDERME > 0)
	3773	+ if (Grafreed.RENDERME > 0)
3681	3774	{
3682	3775	if (child instanceof Merge)
3683	3776	((Merge)child).renderme();
..	..	@@ -3828,7 +3921,7 @@
3828	3921	if (child == null)
3829	3922	continue;
3830	3923
3831		- if (GrafreeD.RENDERME > 0)
	3924	+ if (Grafreed.RENDERME > 0)
3832	3925	{
3833	3926	if (child instanceof Merge)
3834	3927	((Merge)child).renderme();
..	..	@@ -4023,7 +4116,7 @@
4023	4116	if (child == null)
4024	4117	continue;
4025	4118
4026		- if (GrafreeD.RENDERME > 0)
	4119	+ if (Grafreed.RENDERME > 0)
4027	4120	{
4028	4121	if (child instanceof Merge)
4029	4122	((Merge)child).renderme();
..	..	@@ -4111,7 +4204,7 @@
4111	4204	if (blockloop)
4112	4205	return;
4113	4206
4114		- for (int i=0; i<size(); i++)
	4207	+ for (int i=0; i<Size(); i++)
4115	4208	{
4116	4209	if (get(i).parent != this)
4117	4210	{
..	..	@@ -4120,6 +4213,22 @@
4120	4213	}
4121	4214	blockloop = true;
4122	4215	get(i).RepairParent();
	4216	+ blockloop = false;
	4217	+ }
	4218	+ }
	4219	+
	4220	+ void RepairShadow()
	4221	+ {
	4222	+ if (blockloop)
	4223	+ return;
	4224	+
	4225	+ if (this.material != null)
	4226	+ this.InitOthers();
	4227	+
	4228	+ for (int i=0; i<Size(); i++)
	4229	+ {
	4230	+ blockloop = true;
	4231	+ get(i).RepairShadow();
4123	4232	blockloop = false;
4124	4233	}
4125	4234	}
..	..	@@ -4614,7 +4723,7 @@
4614	4723
4615	4724	cTreePath SelectLeaf(int indexcount, boolean deselect)
4616	4725	{
4617		- if (hide)
	4726	+ if (hide \|\| dontselect)
4618	4727	return null;
4619	4728
4620	4729	if (count <= 0)
..	..	@@ -4640,7 +4749,7 @@
4640	4749
4641	4750	cTreePath Select(int indexcount, boolean deselect)
4642	4751	{
4643		- if (hide)
	4752	+ if (hide \|\| dontselect)
4644	4753	return null;
4645	4754
4646	4755	if (count <= 0)
..	..	@@ -4790,7 +4899,7 @@
4790	4899	return globalTransform;
4791	4900	}
4792	4901
4793		- void PreprocessOcclusion(CameraPane cp)
	4902	+ void PreprocessOcclusion(iCameraPane cp)
4794	4903	{
4795	4904	/*
4796	4905	if (AOdone)
..	..	@@ -4937,7 +5046,8 @@
4937	5046	} else //
4938	5047	if (editWindow != null)
4939	5048	{
4940		- editWindow.cameraView.lighttouched = true;
	5049	+ //editWindow.cameraView.lighttouched = true;
	5050	+ Globals.lighttouched = true;
4941	5051	}
4942	5052	}
4943	5053
..	..	@@ -5091,10 +5201,34 @@
5091	5201
5092	5202	// System.out.println("Fullname = " + fullname);
5093	5203
5094		- if (fullname.name.indexOf(":") == -1)
5095		- return fullname.name;
	5204	+ // Does not work on Windows due to C:
	5205	+// if (fullname.name.indexOf(":") == -1)
	5206	+// return fullname.name;
	5207	+//
	5208	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5096	5209
5097		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5210	+ String[] split = fullname.name.split(":");
	5211	+
	5212	+ if (split.length == 0)
	5213	+ {
	5214	+ return "";
	5215	+ }
	5216	+
	5217	+ if (split.length <= 2)
	5218	+ {
	5219	+ if (fullname.name.endsWith(":"))
	5220	+ {
	5221	+ // Windows
	5222	+ return fullname.name.substring(0, fullname.name.length()-1);
	5223	+ }
	5224	+
	5225	+ return split[0];
	5226	+ }
	5227	+
	5228	+ // Windows
	5229	+ assert(split.length == 4);
	5230	+
	5231	+ return split[0] + ":" + split[1];
5098	5232	}
5099	5233
5100	5234	static String GetBump(cTexture fullname)
..	..	@@ -5103,10 +5237,38 @@
5103	5237	return "";
5104	5238
5105	5239	// 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());
	5240	+ // Does not work on Windows due to C:
	5241	+// if (fullname.name.indexOf(":") == -1)
	5242	+// return "";
	5243	+//
	5244	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5245	+ String[] split = fullname.name.split(":");
	5246	+
	5247	+ if (split.length == 0)
	5248	+ {
	5249	+ return "";
	5250	+ }
	5251	+
	5252	+ if (split.length == 1)
	5253	+ {
	5254	+ return "";
	5255	+ }
	5256	+
	5257	+ if (split.length == 2)
	5258	+ {
	5259	+ if (fullname.name.endsWith(":"))
	5260	+ {
	5261	+ // Windows
	5262	+ return "";
	5263	+ }
	5264	+
	5265	+ return split[1];
	5266	+ }
	5267	+
	5268	+ // Windows
	5269	+ assert(split.length == 4);
	5270	+
	5271	+ return split[2] + ":" + split[3];
5110	5272	}
5111	5273
5112	5274	String GetPigmentTexture()
..	..	@@ -5180,7 +5342,7 @@
5180	5342	System.out.print("; textures = " + textures);
5181	5343	System.out.println("; usedtextures = " + usedtextures);
5182	5344
5183		- if (GetTextures() == null)
	5345	+ if (GetTextures() == null) // What is that??
5184	5346	GetTextures().name = ":";
5185	5347
5186	5348	String texname = tex;
..	..	@@ -5211,6 +5373,43 @@
5211	5373	child.ResetPigmentTexture();
5212	5374	blockloop = false;
5213	5375	}
	5376	+ }
	5377	+
	5378	+ UUID GetUUID()
	5379	+ {
	5380	+ if (uuid == null)
	5381	+ {
	5382	+ // Serial
	5383	+ uuid = UUID.randomUUID();
	5384	+ }
	5385	+
	5386	+ return uuid;
	5387	+ }
	5388	+
	5389	+ Object3D GetObject(UUID uid)
	5390	+ {
	5391	+ if (blockloop)
	5392	+ return null;
	5393	+
	5394	+ if (GetUUID().equals(uid))
	5395	+ return this;
	5396	+
	5397	+ int nb = Size();
	5398	+ for (int i = 0; i < nb; i++)
	5399	+ {
	5400	+ Object3D child = (Object3D) get(i);
	5401	+
	5402	+ if (child == null)
	5403	+ continue;
	5404	+
	5405	+ blockloop = true;
	5406	+ Object3D obj = child.GetObject(uid);
	5407	+ blockloop = false;
	5408	+ if (obj != null)
	5409	+ return obj;
	5410	+ }
	5411	+
	5412	+ return null;
5214	5413	}
5215	5414
5216	5415	void SetBumpTexture(String tex)
..	..	@@ -5249,25 +5448,22 @@
5249	5448	}
5250	5449	}
5251	5450
5252		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5451	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5253	5452	{
5254	5453	Draw(display, root, selected, blocked);
5255	5454	}
5256	5455
5257		- static cMaterial[] materialstack = new cMaterial[65536];
5258		- static boolean[] selectedstack = new boolean[65536];
5259		- static int materialdepth = 0;
5260		-
5261	5456	boolean NeedSupport()
5262	5457	{
5263	5458	return
5264		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5459	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
5265	5460	// PROBLEM with CROWD!!
5266		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	5461	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5267	5462	}
5268	5463
	5464	+ static boolean DEBUG_SELECTION = false;
5269	5465
5270		- void Draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5466	+ void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5271	5467	{
5272	5468	Invariants(); // june 2013
5273	5469
..	..	@@ -5276,8 +5472,8 @@
5276	5472	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5277	5473	}
5278	5474
5279		- if (display.drawMode == CameraPane.SELECTION &&
5280		- hide)
	5475	+ if (display.DrawMode() == iCameraPane.SELECTION &&
	5476	+ (hide \|\| dontselect))
5281	5477	return;
5282	5478
5283	5479	if (name != null && name.contains("sclera"))
..	..	@@ -5295,7 +5491,7 @@
5295	5491	if (this instanceof Checker)
5296	5492	return;
5297	5493
5298		- if (display.drawMode == display.SHADOW && PASSTEST)
	5494	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5299	5495	return;
5300	5496
5301	5497	if (count <= 0)
..	..	@@ -5303,13 +5499,13 @@
5303	5499	return;
5304	5500	}
5305	5501
5306		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5307		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5502	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	5503	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5308	5504	{
5309	5505	return;
5310	5506	}
5311	5507
5312		- javax.media.opengl.GL gl = display.GetGL();
	5508	+ //javax.media.opengl.GL gl = display.GetGL();
5313	5509
5314	5510	/*
5315	5511	if (touched)
..	..	@@ -5345,15 +5541,15 @@
5345	5541
5346	5542	boolean compiled = false;
5347	5543
5348		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5544	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5349	5545
5350		- if (!selectmode && //display.drawMode != display.SELECTION &&
	5546	+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
5351	5547	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5352	5548	{
5353		- display.lighttouched = true;
	5549	+ Globals.lighttouched = true;
5354	5550	} // 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 &&
	5551	+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
	5552	+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5357	5553	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5358	5554	{
5359	5555	if (!(this instanceof Composite))
..	..	@@ -5361,7 +5557,7 @@
5361	5557	//if (displaylist == -1 && usecalllists)
5362	5558	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5363	5559	{
5364		- bRep.displaylist = gl.glGenLists(1);
	5560	+ bRep.displaylist = display.GenList();
5365	5561	assert(bRep.displaylist != 0);
5366	5562	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5367	5563	//System.out.println("\tgen list " + list);
..	..	@@ -5373,18 +5569,20 @@
5373	5569	if (usecalllists)
5374	5570	{
5375	5571	// System.err.println("new list " + bRep.displaylist + " for " + this);
5376		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5572	+ display.NewList(bRep.displaylist);
5377	5573	}
	5574	+
5378	5575	CallList(display, root, selected, blocked);
	5576	+
5379	5577	// compiled = true;
5380	5578	if (usecalllists)
5381	5579	{
5382	5580	// System.err.println("end list " + bRep.displaylist + " for " + this);
5383		- gl.glEndList();
	5581	+ display.EndList();
5384	5582	}
5385	5583	//gl.glDrawBuffer(gl.GL_BACK);
5386	5584	// XXX touched = false;
5387		- display.lighttouched = true; // all panes...
	5585	+ Globals.lighttouched = true; // all panes...
5388	5586	}
5389	5587
5390	5588	touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
..	..	@@ -5423,12 +5621,12 @@
5423	5621
5424	5622	// frustum culling
5425	5623	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5426		- && display.drawMode != CameraPane.SELECTION)
	5624	+ && display.DrawMode() != iCameraPane.SELECTION)
5427	5625	{
5428		- if (display.drawMode == CameraPane.SHADOW)
	5626	+ if (display.DrawMode() == iCameraPane.SHADOW)
5429	5627	{
5430	5628	if (!link2master // tricky to cull in shadow mode.
5431		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	5629	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5432	5630	{
5433	5631	//System.out.print("CULLED");
5434	5632	culled = true;
..	..	@@ -5436,7 +5634,7 @@
5436	5634	}
5437	5635	else
5438	5636	//GetBRep().getBounds(v0, v1, this);
5439		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	5637	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5440	5638	culled = true;
5441	5639
5442	5640	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5472,11 +5670,11 @@
5472	5670
5473	5671
5474	5672	if (!culled)
5475		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	5673	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5476	5674	{
5477	5675	if (GetBRep() != null)
5478	5676	{
5479		- CameraPane.NextIndex(this, gl);
	5677	+ display.NextIndex();
5480	5678	// vertex color conflict : gl.glCallList(list);
5481	5679	DrawNode(display, root, selected);
5482	5680	if (this instanceof BezierPatch)
..	..	@@ -5498,55 +5696,7 @@
5498	5696	color[2] /= 2;
5499	5697	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5500	5698	*/
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		- }
	5699	+ display.PushMaterial(this, selected);
5550	5700
5551	5701	//System.out.println("call list " + list);
5552	5702	//System.out.println();
..	..	@@ -5565,7 +5715,17 @@
5565	5715	tex = GetTextures();
5566	5716	}
5567	5717
5568		- display.BindTextures(tex, texres);
	5718	+ boolean failed = false;
	5719	+
	5720	+ try
	5721	+ {
	5722	+ display.BindTextures(tex, texres);
	5723	+ }
	5724	+ catch (Exception e)
	5725	+ {
	5726	+ System.err.println("FAILED: " + this);
	5727	+ failed = true;
	5728	+ }
5569	5729
5570	5730	if (!compiled)
5571	5731	{
..	..	@@ -5581,30 +5741,16 @@
5581	5741
5582	5742	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5583	5743	assert(bRep.displaylist != 0);
5584		- gl.glCallList(bRep.displaylist);
	5744	+ display.CallList(bRep.displaylist);
5585	5745	// june 2013 drawSelf(display, root, selected);
5586	5746	}
5587	5747	}
5588	5748	}
5589	5749
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		- }
	5750	+ if (!failed)
	5751	+ display.ReleaseTextures(tex);
	5752	+
	5753	+ display.PopMaterial(this, selected);
5608	5754	}
5609	5755
5610	5756	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5646,7 +5792,7 @@
5646	5792	// resetMasterNode();
5647	5793	}
5648	5794
5649		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5795	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5650	5796	{
5651	5797	if (GetBRep() == null)
5652	5798	{
..	..	@@ -5729,8 +5875,11 @@
5729	5875	boolean flipV = false; // true;
5730	5876	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5731	5877
5732		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5878	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5733	5879	{
	5880	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	5881	+ return;
	5882	+
5734	5883	if (hide)
5735	5884	return;
5736	5885	// shadow optimisation
..	..	@@ -5788,16 +5937,7 @@
5788	5937	// // ??????????????????????????? Touch();
5789	5938	// }
5790	5939
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		- }
	5940	+display.PushMaterial2(this, selected);
5801	5941
5802	5942	Object3D child;
5803	5943	boolean sel;
..	..	@@ -5849,19 +5989,7 @@
5849	5989	*/
5850	5990	//depth += 1;
5851	5991
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		-
	5992	+display.PopMaterial2(this);
5865	5993	/*
5866	5994	display.ReleaseTextures(tex);
5867	5995	*/
..	..	@@ -5872,10 +6000,13 @@
5872	6000
5873	6001	//static cVector min,max;
5874	6002
5875		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	6003	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5876	6004	{
5877		- if (display.drawMode == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	6005	+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5878	6006	return; // no shadow for transparent objects
	6007	+
	6008	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6009	+ return;
5879	6010
5880	6011	if (hide)
5881	6012	return;
..	..	@@ -5917,11 +6048,12 @@
5917	6048	return;
5918	6049	}
5919	6050
	6051	+ //bRep.GenUV(1/material.diffuseness);
5920	6052	// bRep.lock = true;
5921	6053
5922		- javax.media.opengl.GL gl = display.GetGL();
	6054	+ //javax.media.opengl.GL gl = display.GetGL();
5923	6055
5924		- if (CameraPane.BOXMODE) // \|\| CameraPane.movingcamera)
	6056	+ if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5925	6057	{
5926	6058	int fc = bRep.FaceCount();
5927	6059	int vc = bRep.VertexCount();
..	..	@@ -5936,23 +6068,7 @@
5936	6068
5937	6069	bRep.getMinMax(min, max, 100);
5938	6070
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();
	6071	+ display.DrawBox(min, max);
5956	6072
5957	6073	return;
5958	6074	}
..	..	@@ -5996,7 +6112,7 @@
5996	6112	{
5997	6113	//throw new Error();
5998	6114
5999		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6115	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
6000	6116
6001	6117	int[] strips = bRep.getRawIndices();
6002	6118
..	..	@@ -6006,178 +6122,14 @@
6006	6122	new Exception().printStackTrace();
6007	6123	return;
6008	6124	}
6009		-
6010		- // TRIANGLE STRIP ARRAY
6011		- if (bRep.trimmed)
6012		- {
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;
6144		- }
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		- }
	6125	+
	6126	+ display.DrawGeometry(bRep, flipV, selectmode);
6175	6127	} else // catch (Error e)
6176	6128	{
6177	6129	// TRIANGLE ARRAY
6178	6130	if (IsOpaque()) // Static())
6179	6131	{
6180		- gl.glBegin(gl.GL_TRIANGLES);
	6132	+ display.StartTriangles();
6181	6133	int facecount = bRep.FaceCount();
6182	6134	for (int i = 0; i < facecount; i++)
6183	6135	{
..	..	@@ -6240,9 +6192,9 @@
6240	6192	// // r.norm.dot(v3) > -0.5)
6241	6193	// // continue;
6242	6194
6243		- drawFace(p, q, r, display, face);
	6195	+ display.DrawFace(this, p, q, r, face);
6244	6196	}
6245		- gl.glEnd();
	6197	+ display.EndTriangles();
6246	6198	}
6247	6199	else
6248	6200	{
..	..	@@ -6271,8 +6223,8 @@
6271	6223	//System.out.println("SORT");
6272	6224
6273	6225	java.util.Arrays.sort(facescompare);
6274		-
6275		- gl.glBegin(gl.GL_TRIANGLES);
	6226	+
	6227	+ display.StartTriangles();
6276	6228	for (int i = 0; i < facecount; i++)
6277	6229	{
6278	6230	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6284,13 +6236,14 @@
6284	6236	Vertex q = bRep.GetVertex(face.q);
6285	6237	Vertex r = bRep.GetVertex(face.r);
6286	6238
6287		- drawFace(p, q, r, display, face);
	6239	+ display.DrawFace(this, p, q, r, face);
6288	6240	}
6289		- gl.glEnd();
	6241	+ display.EndTriangles();
6290	6242	}
6291	6243
6292	6244	if (false) // live && support != null && support.bRep != null) // debug weights
6293	6245	{
	6246	+ /*
6294	6247	gl.glDisable(gl.GL_LIGHTING);
6295	6248	float[] colorV = new float[3];
6296	6249
..	..	@@ -6369,6 +6322,7 @@
6369	6322	// gl.glEnd();
6370	6323	}
6371	6324	}
	6325	+ */
6372	6326	}
6373	6327	}
6374	6328
..	..	@@ -6413,7 +6367,7 @@
6413	6367	center.add(r);
6414	6368	center.mul(1.0/3);
6415	6369
6416		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6370	+ center.sub(Globals.theRenderer.EyeCamera().location);
6417	6371
6418	6372	distance = center.dot(center);
6419	6373	}
..	..	@@ -6424,347 +6378,11 @@
6424	6378
6425	6379	transient FaceCompare[] facescompare = null;
6426	6380
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	6381	void Print(Vertex v)
6602	6382	{
6603	6383	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6604	6384	}
6605	6385
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	6386	void drawSelf(ClickInfo info, int level, boolean select)
6769	6387	{
6770	6388	if (bRep == null)
..	..	@@ -7336,83 +6954,83 @@
7336	6954	int spotw = spot.x + spot.width;
7337	6955	int spoth = spot.y + spot.height;
7338	6956	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		- }
	6957	+// if (CameraPane.Xmin > spot.x)
	6958	+// {
	6959	+// CameraPane.Xmin = spot.x;
	6960	+// }
	6961	+// if (CameraPane.Xmax < spotw)
	6962	+// {
	6963	+// CameraPane.Xmax = spotw;
	6964	+// }
	6965	+// if (CameraPane.Ymin > spot.y)
	6966	+// {
	6967	+// CameraPane.Ymin = spot.y;
	6968	+// }
	6969	+// if (CameraPane.Ymax < spoth)
	6970	+// {
	6971	+// CameraPane.Ymax = spoth;
	6972	+// }
7355	6973	spot.translate(32, 32);
7356	6974	spotw = spot.x + spot.width;
7357	6975	spoth = spot.y + spot.height;
7358	6976	info.g.setColor(Color.blue);
7359	6977	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);
	6978	+// if (CameraPane.Xmin > spot.x)
	6979	+// {
	6980	+// CameraPane.Xmin = spot.x;
	6981	+// }
	6982	+// if (CameraPane.Xmax < spotw)
	6983	+// {
	6984	+// CameraPane.Xmax = spotw;
	6985	+// }
	6986	+// if (CameraPane.Ymin > spot.y)
	6987	+// {
	6988	+// CameraPane.Ymin = spot.y;
	6989	+// }
	6990	+// if (CameraPane.Ymax < spoth)
	6991	+// {
	6992	+// CameraPane.Ymax = spoth;
	6993	+// }
	6994	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
	6995	+ //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7378	6996	spot.translate(0, -32);
7379	6997	info.g.setColor(Color.green);
7380	6998	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		- }
	6999	+// if (CameraPane.Xmin > spot.x)
	7000	+// {
	7001	+// CameraPane.Xmin = spot.x;
	7002	+// }
	7003	+// if (CameraPane.Xmax < spotw)
	7004	+// {
	7005	+// CameraPane.Xmax = spotw;
	7006	+// }
	7007	+// if (CameraPane.Ymin > spot.y)
	7008	+// {
	7009	+// CameraPane.Ymin = spot.y;
	7010	+// }
	7011	+// if (CameraPane.Ymax < spoth)
	7012	+// {
	7013	+// CameraPane.Ymax = spoth;
	7014	+// }
7397	7015	info.g.drawArc(boundary.x, boundary.y,
7398	7016	boundary.width, boundary.height, 0, 360);
7399	7017	//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		- }
	7018	+// if (CameraPane.Xmin > boundary.x)
	7019	+// {
	7020	+// CameraPane.Xmin = boundary.x;
	7021	+// }
	7022	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	7023	+// {
	7024	+// CameraPane.Xmax = boundary.x + boundary.width;
	7025	+// }
	7026	+// if (CameraPane.Ymin > boundary.y)
	7027	+// {
	7028	+// CameraPane.Ymin = boundary.y;
	7029	+// }
	7030	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	7031	+// {
	7032	+// CameraPane.Ymax = boundary.y + boundary.height;
	7033	+// }
7416	7034	return;
7417	7035	}
7418	7036	}
..	..	@@ -7429,7 +7047,7 @@
7429	7047	startX = info.x;
7430	7048	startY = info.y;
7431	7049
7432		- hitSomething = 0;
	7050	+ hitSomething = -1;
7433	7051	cVector origin = new cVector();
7434	7052	//LA.xformPos(origin, toParent, origin);
7435	7053	Rectangle spot = new Rectangle();
..	..	@@ -7462,7 +7080,7 @@
7462	7080	}
7463	7081
7464	7082	//System.out.println("info.modifiers = " + info.modifiers);
7465		- modified = (info.modifiers & CameraPane.META) != 0;
	7083	+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7466	7084	//System.out.println("modified = " + modified);
7467	7085	//new Exception().printStackTrace();
7468	7086	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7490,7 +7108,7 @@
7490	7108	return true;
7491	7109	}
7492	7110
7493		- void doEditDrag0(ClickInfo info)
	7111	+ void doEditDrag0(ClickInfo info, boolean opposite)
7494	7112	{
7495	7113	if (hitSomething == 0)
7496	7114	{
..	..	@@ -7505,6 +7123,7 @@
7505	7123	//System.out.println("hitSomething = " + hitSomething);
7506	7124
7507	7125	double scale = 0.005f * info.camera.Distance();
	7126	+
7508	7127	cVector xlate = new cVector();
7509	7128	//cVector xlate2 = new cVector();
7510	7129	switch (hitSomething)
..	..	@@ -7515,9 +7134,9 @@
7515	7134
7516	7135	case hitCenter: // Translate
7517	7136
7518		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7137	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7519	7138
7520		- if (modified)
	7139	+ if (modified \|\| opposite)
7521	7140	{
7522	7141	//assert(false);
7523	7142	/*
..	..	@@ -7563,10 +7182,10 @@
7563	7182	}
7564	7183	LA.xformDir(up, ClickInfo.matbuffer, up);
7565	7184	// if (!CameraPane.LOCALTRANSFORM)
7566		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
	7185	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7567	7186	LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7568	7187	// if (!CameraPane.LOCALTRANSFORM)
7569		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7188	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7570	7189	//LA.vecCross(up, cVector.Z, right2);
7571	7190
7572	7191	cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
..	..	@@ -7611,6 +7230,7 @@
7611	7230
7612	7231	if (modified)
7613	7232	{
	7233	+ // Rotate 90 degrees
7614	7234	angle /= (Math.PI / 4);
7615	7235	angle = Math.floor(angle + 0.5);
7616	7236	angle *= (Math.PI / 4);
..	..	@@ -7624,7 +7244,7 @@
7624	7244	}
7625	7245	/**/
7626	7246
7627		- switch (info.pane.renderCamera.viewCode)
	7247	+ switch (info.pane.RenderCamera().viewCode)
7628	7248	{
7629	7249	case 1: // '\001'
7630	7250	LA.matZRotate(toParent, angle);
..	..	@@ -7652,24 +7272,27 @@
7652	7272
7653	7273	case hitScale: // scale
7654	7274	double hScale = (double) (info.x - centerPt.x) / 32;
	7275	+ double sign = 1;
	7276	+ if (hScale < 0)
	7277	+ {
	7278	+ sign = -1;
	7279	+ }
	7280	+ hScale = signMath.pow(signhScale, scale * 50);
7655	7281	if (hScale < 0.01)
7656	7282	{
7657		- hScale = 0.01;
	7283	+ //hScale = 0.01;
7658	7284	}
7659		- hScale = Math.pow(hScale, scale * 50);
7660		- if (hScale < 0.01)
7661		- {
7662		- hScale = 0.01;
7663		- }
	7285	+
7664	7286	double vScale = (double) (info.y - centerPt.y) / 32;
7665		- if (vScale < 0.01)
	7287	+ sign = 1;
	7288	+ if (vScale < 0)
7666	7289	{
7667		- vScale = 0.01;
	7290	+ sign = -1;
7668	7291	}
7669		- vScale = Math.pow(vScale, scale * 50);
	7292	+ vScale = signMath.pow(signvScale, scale * 50);
7670	7293	if (vScale < 0.01)
7671	7294	{
7672		- vScale = 0.01;
	7295	+ //vScale = 0.01;
7673	7296	}
7674	7297	LA.matCopy(startMat, toParent);
7675	7298	/**/
..	..	@@ -7680,17 +7303,24 @@
7680	7303	}
7681	7304	/**/
7682	7305
7683		- switch (info.pane.renderCamera.viewCode)
	7306	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7307	+
	7308	+ if (totalScale < 0.01)
	7309	+ {
	7310	+ totalScale = 0.01;
	7311	+ }
	7312	+
	7313	+ switch (info.pane.RenderCamera().viewCode)
7684	7314	{
7685	7315	case 3: // '\001'
7686	7316	if (modified)
7687	7317	{
7688	7318	//LA.matScale(toParent, 1, hScale, vScale);
7689		- LA.matScale(toParent, vScale, 1, 1);
	7319	+ LA.matScale(toParent, totalScale, 1, 1);
7690	7320	} // vScale, 1);
7691	7321	else
7692	7322	{
7693		- LA.matScale(toParent, vScale, vScale, vScale);
	7323	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7694	7324	} // vScale, 1);
7695	7325	break;
7696	7326
..	..	@@ -7698,10 +7328,10 @@
7698	7328	if (modified)
7699	7329	{
7700	7330	//LA.matScale(toParent, hScale, 1, vScale);
7701		- LA.matScale(toParent, 1, vScale, 1);
	7331	+ LA.matScale(toParent, 1, totalScale, 1);
7702	7332	} else
7703	7333	{
7704		- LA.matScale(toParent, vScale, 1, vScale);
	7334	+ LA.matScale(toParent, totalScale, 1, totalScale);
7705	7335	}
7706	7336	break;
7707	7337
..	..	@@ -7709,10 +7339,10 @@
7709	7339	if (modified)
7710	7340	{
7711	7341	//LA.matScale(toParent, hScale, vScale, 1);
7712		- LA.matScale(toParent, 1, 1, vScale);
	7342	+ LA.matScale(toParent, 1, 1, totalScale);
7713	7343	} else
7714	7344	{
7715		- LA.matScale(toParent, vScale, vScale, 1);
	7345	+ LA.matScale(toParent, totalScale, totalScale, 1);
7716	7346	}
7717	7347	break;
7718	7348	}
..	..	@@ -7733,7 +7363,7 @@
7733	7363	if (parent == null)
7734	7364	{
7735	7365	System.out.println("NULL PARENT");
7736		- new Exception().printStackTrace();
	7366	+ //new Exception().printStackTrace();
7737	7367	} else
7738	7368	{
7739	7369	if (parent instanceof BezierPatch)
..	..	@@ -7845,14 +7475,22 @@
7845	7475	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7846	7476	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7847	7477	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7478	+
	7479	+ String objname;
	7480	+
7848	7481	if (false) //parent != null)
7849	7482	{
7850		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7483	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7851	7484	} else
7852	7485	{
7853		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7486	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7854	7487	} // + super.toString();
7855	7488	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7489	+
	7490	+ if (!Globals.ADVANCED)
	7491	+ return objname;
	7492	+
	7493	+ return objname + " " + System.identityHashCode(this);
7856	7494	}
7857	7495
7858	7496	public int hashCode()
..	..	@@ -7908,6 +7546,7 @@
7908	7546	objectUI.closeUI();
7909	7547	if (editWindow != null)
7910	7548	{
	7549	+ editWindow.ctrlPanel.FlushUI();
7911	7550	editWindow.refreshContents();
7912	7551	} // ? new
7913	7552	objectUI = null;
..	..	@@ -8043,7 +7682,7 @@
8043	7682	{
8044	7683	assert(bRep != null);
8045	7684	if (!(support instanceof GenericJoint)) // support.bRep != null)
8046		- GrafreeD.Assert(support.bRep == bRep.support);
	7685	+ Grafreed.Assert(support.bRep == bRep.support);
8047	7686	}
8048	7687	else
8049	7688	{
..	..	@@ -8092,9 +7731,9 @@
8092	7731	private static cVector edge2 = new cVector();
8093	7732	//private static cVector norm = new cVector();
8094	7733	/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;
	7734	+ static final int hitCenter = 1;
	7735	+ static final int hitScale = 2;
	7736	+ static final int hitRotate = 3;
8098	7737	/transient/ /private/ int viewCode; // Now used for transparency cache flag
8099	7738	/transient/ private Point centerPt;
8100	7739	/transient/ private int startX;
..	..	@@ -8126,6 +7765,8 @@
8126	7765	{
8127	7766	Object3D targ = this;
8128	7767
	7768	+ targ.NORMALPUSH = obj.NORMALPUSH;
	7769	+
8129	7770	if (obj.material != null)
8130	7771	{
8131	7772	if ((mask&MATERIAL)!=0) // ==(COLOR\|MATERIAL))