~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	{
..	..	@@ -142,6 +160,67 @@
142	160	blockloop = true;
143	161	child.RestoreSupports();
144	162	blockloop = false;
	163	+ }
	164	+}
	165	+
	166	+void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	167	+{
	168	+ if (hashtable.containsKey(GetUUID()))
	169	+ {
	170	+ Object3D o = hashtable.get(GetUUID());
	171	+
	172	+ assert(this.bRep == o.bRep);
	173	+ if (this.bRep != null)
	174	+ assert(this.bRep.support == o.transientrep);
	175	+
	176	+ return;
	177	+ }
	178	+
	179	+ Object3D o = new Object3D();
	180	+ o.bRep = this.bRep;
	181	+ if (this.bRep != null)
	182	+ {
	183	+ o.transientrep = this.bRep.support;
	184	+ o.bRep.support = null;
	185	+ }
	186	+
	187	+// o.support = this.support;
	188	+// o.fileparent = this.fileparent;
	189	+// if (this.bRep != null)
	190	+// o.bRep = this.bRep.support;
	191	+
	192	+ hashtable.put(GetUUID(), o);
	193	+
	194	+ this.bRep = null;
	195	+// if (this.bRep != null)
	196	+// this.bRep.support = null;
	197	+// this.support = null;
	198	+// this.fileparent = null;
	199	+
	200	+ for (int i=0; i<Size(); i++)
	201	+ {
	202	+ get(i).ExtractBigData(hashtable);
	203	+ }
	204	+}
	205	+
	206	+void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	207	+{
	208	+ if (!hashtable.containsKey(GetUUID()))
	209	+ return;
	210	+
	211	+ Object3D o = hashtable.get(GetUUID());
	212	+
	213	+ this.bRep = o.bRep;
	214	+ if (this.bRep != null)
	215	+ this.bRep.support = o.transientrep;
	216	+// this.support = o.support;
	217	+// this.fileparent = o.fileparent;
	218	+
	219	+ hashtable.remove(GetUUID());
	220	+
	221	+ for (int i=0; i<Size(); i++)
	222	+ {
	223	+ get(i).RestoreBigData(hashtable);
145	224	}
146	225	}
147	226
..	..	@@ -286,6 +365,7 @@
286	365	}
287	366
288	367	boolean live = false;
	368	+ boolean dontselect = false;
289	369	boolean hide = false;
290	370	boolean link2master = false; // performs reset support/master at each frame
291	371	boolean marked = false; // animation node
..	..	@@ -295,6 +375,8 @@
295	375	boolean random = false;
296	376	boolean speedup = false;
297	377	boolean rewind = false;
	378	+
	379	+ float NORMALPUSH = 0;
298	380
299	381	Object3D support;
300	382
..	..	@@ -355,7 +437,7 @@
355	437
356	438	int MemorySize()
357	439	{
358		- if (memorysize == 0)
	440	+ if (true) // memorysize == 0)
359	441	{
360	442	try
361	443	{
..	..	@@ -415,16 +497,16 @@
415	497	{
416	498	Object3D copy = this;
417	499
418		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	500	+ Camera parentcam = Globals.theRenderer.ManipCamera();
419	501
420		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	502	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
421	503	{
422		- parentcam = CameraPane.theRenderer.cameras[1];
	504	+ parentcam = Globals.theRenderer.Cameras()[1];
423	505	}
424	506
425		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	507	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
426	508	{
427		- parentcam = CameraPane.theRenderer.cameras[0];
	509	+ parentcam = Globals.theRenderer.Cameras()[0];
428	510	}
429	511
430	512	if (this == parentcam)
..	..	@@ -432,7 +514,7 @@
432	514	//assert(this instanceof Camera);
433	515
434	516	for (int count = parentcam.GetTransformCount(); --count>=0;)
435		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	517	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
436	518	}
437	519
438	520	copy.marked ^= true;
..	..	@@ -452,7 +534,7 @@
452	534	//assert(this instanceof Camera);
453	535
454	536	for (int count = parentcam.GetTransformCount(); --count>=0;)
455		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	537	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
456	538	}
457	539
458	540	copy.Touch(); // display list issue
..	..	@@ -587,7 +669,7 @@
587	669	return;
588	670	}
589	671
590		- if (CameraPane.fromscript)
	672	+ if (Globals.fromscript)
591	673	{
592	674	transformcount = 0;
593	675	return;
..	..	@@ -745,7 +827,7 @@
745	827
746	828	int GetTransformCount()
747	829	{
748		- // marde pour serialization de Texture
	830	+ // patch pour serialization de Texture
749	831	resetmaxcount();
750	832	resettransformcount();
751	833	resetstep();
..	..	@@ -758,7 +840,7 @@
758	840	if (step == 0)
759	841	step = 1;
760	842	if (maxcount == 0)
761		- maxcount = 2048; // 4;
	843	+ maxcount = 128; // 2048; // 4;
762	844	// if (acceleration == 0)
763	845	// acceleration = 10;
764	846	if (delay == 0) // serial
..	..	@@ -779,9 +861,12 @@
779	861	// factor = CameraPane.STEP;
780	862	// }
781	863
782		- if (marked && CameraPane.isLIVE() && live && CameraPane.drawMode == CameraPane.SHADOW && currentframe != CameraPane.framecount)
	864	+ if (marked && Globals.isLIVE() && live &&
	865	+ //TEMP21aug2018
	866	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	867	+ currentframe != Globals.framecount)
783	868	{
784		- currentframe = CameraPane.framecount;
	869	+ currentframe = Globals.framecount;
785	870
786	871	// System.err.println("transformcount = " + transformcount);
787	872	// System.err.println("factor = " + factor);
..	..	@@ -893,6 +978,11 @@
893	978	fromParent = null; // LA.newMatrix();
894	979	bRep = null; // new BoundaryRep();
895	980
	981	+ if (oname != null && oname.equals("LeftHand"))
	982	+ {
	983	+ name = oname;
	984	+ }
	985	+
896	986	/*
897	987	float hue = (float)Math.random();
898	988	Color col;
..	..	@@ -935,7 +1025,7 @@
935	1025
936	1026	public Object clone()
937	1027	{
938		- return GrafreeD.clone(this);
	1028	+ return Grafreed.clone(this);
939	1029	}
940	1030
941	1031	Object3D copyExpand()
..	..	@@ -1446,7 +1536,16 @@
1446	1536	// if (other == null)
1447	1537	// return;
1448	1538
1449		- System.out.println("Link support this = " + this + "; other = " + other);
	1539	+ if (other != null)
	1540	+ {
	1541	+ BoundaryRep.SEUIL = other.material.cameralight;
	1542	+
	1543	+ // Set default to 0.1
	1544	+ BoundaryRep.SEUIL /= 4; // 2;
	1545	+ System.out.println("SEUIL = " + BoundaryRep.SEUIL);
	1546	+ }
	1547	+
	1548	+ System.out.println("Link this = " + this + "; support = " + other);
1450	1549
1451	1550	//if (bRep != null)
1452	1551	// bRep.linkVerticesThis(other.bRep);
..	..	@@ -1701,7 +1800,7 @@
1701	1800	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1702	1801	o.bRep = transientrep;
1703	1802	if (clone)
1704		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1803	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1705	1804	o.CreateMaterial();
1706	1805	o.SetAttributes(this, -1);
1707	1806	//parent
..	..	@@ -1714,7 +1813,7 @@
1714	1813	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1715	1814	o.bRep = bRep;
1716	1815	if (clone)
1717		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1816	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1718	1817	o.CreateMaterial();
1719	1818	//o.overwriteThis(this, -1);
1720	1819	o.SetAttributes(this, -1);
..	..	@@ -1801,12 +1900,15 @@
1801	1900	if (obj.name == null)
1802	1901	continue; // can't be a null one
1803	1902
	1903	+ // Try perfect match first.
1804	1904	if (n.equals(obj.name))
1805	1905	{
1806	1906	theobj = obj;
1807	1907	count++;
1808	1908	}
1809	1909	}
	1910	+
	1911	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1810	1912
1811	1913	if (count != 1)
1812	1914	for (int i=Size(); --i>=0;)
..	..	@@ -1816,8 +1918,9 @@
1816	1918	if (obj.name == null)
1817	1919	continue; // can't be a null one
1818	1920
1819		- //if (n.contains(obj.name)) // dec 2013 name.split(":")[0])) // Poser generates a count
1820		- if (n.startsWith(obj.name))
	1921	+ String name = obj.name.split(":")[0]; // Poser generates a count
	1922	+ //if (n.startsWith(obj.name))
	1923	+ if (n.contains(name))
1821	1924	{
1822	1925	theobj = obj;
1823	1926	count++;
..	..	@@ -2120,15 +2223,8 @@
2120	2223	if (/parent != null &&/ material == null)
2121	2224	{
2122	2225	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
	2226	+
	2227	+ InitOthers();
2132	2228
2133	2229	if (this instanceof Camera)
2134	2230	{
..	..	@@ -2278,6 +2374,7 @@
2278	2374	{
2279	2375	if (newWindow)
2280	2376	{
	2377	+ new Exception().printStackTrace();
2281	2378	System.exit(0);
2282	2379	if (parent != null)
2283	2380	{
..	..	@@ -2454,13 +2551,13 @@
2454	2551	return retval;
2455	2552	}
2456	2553
2457		- void doEditDrag(ClickInfo info)
	2554	+ void doEditDrag(ClickInfo info, boolean opposite)
2458	2555	{
2459	2556	switch (doSomething)
2460	2557	{
2461	2558	case 1: // '\001'
2462	2559	//super.
2463		- doEditDrag0(info);
	2560	+ doEditDrag0(info, opposite);
2464	2561	break;
2465	2562
2466	2563	case 2: // '\002'
..	..	@@ -2473,11 +2570,11 @@
2473	2570	{
2474	2571	//sel.hitSomething = childToDrag.hitSomething;
2475	2572	//childToDrag.doEditDrag(info);
2476		- sel.doEditDrag(info);
	2573	+ sel.doEditDrag(info, opposite);
2477	2574	} else
2478	2575	{
2479	2576	//super.
2480		- doEditDrag0(info);
	2577	+ doEditDrag0(info, opposite);
2481	2578	}
2482	2579	}
2483	2580	break;
..	..	@@ -2732,6 +2829,24 @@
2732	2829	blockloop = false;
2733	2830	}
2734	2831
	2832	+ void GenNormalsMINE()
	2833	+ {
	2834	+ if (blockloop)
	2835	+ return;
	2836	+
	2837	+ blockloop = true;
	2838	+ GenNormalsMINE0();
	2839	+ for (int i = 0; i < Children().Size(); i++)
	2840	+ {
	2841	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2842	+ if (child == null)
	2843	+ continue;
	2844	+ child.GenNormalsMINE();
	2845	+// Children().release(i);
	2846	+ }
	2847	+ blockloop = false;
	2848	+ }
	2849	+
2735	2850	void ClearColors()
2736	2851	{
2737	2852	if (blockloop)
..	..	@@ -2866,7 +2981,8 @@
2866	2981	{
2867	2982	if (bRep != null)
2868	2983	{
2869		- bRep.GenUV();
	2984	+ bRep.GenUV(); //1);
	2985	+ //bRep.UnfoldUV();
2870	2986	Touch();
2871	2987	}
2872	2988	}
..	..	@@ -2876,6 +2992,15 @@
2876	2992	if (bRep != null)
2877	2993	{
2878	2994	bRep.GenerateNormals(crease);
	2995	+ Touch();
	2996	+ }
	2997	+ }
	2998	+
	2999	+ void GenNormalsMINE0()
	3000	+ {
	3001	+ if (bRep != null)
	3002	+ {
	3003	+ bRep.GenerateNormalsMINE();
2879	3004	Touch();
2880	3005	}
2881	3006	}
..	..	@@ -2932,6 +3057,33 @@
2932	3057	blockloop = false;
2933	3058	}
2934	3059
	3060	+ void TransformChildren()
	3061	+ {
	3062	+ if (toParent != null)
	3063	+ {
	3064	+ for (int i=Size(); --i>=0;)
	3065	+ {
	3066	+ Object3D v = get(i);
	3067	+
	3068	+ if (v.toParent == null)
	3069	+ {
	3070	+ v.toParent = LA.newMatrix();
	3071	+ v.fromParent = LA.newMatrix();
	3072	+ }
	3073	+
	3074	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3075	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3076	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3077	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3078	+ }
	3079	+
	3080	+ toParent = null; // LA.matIdentity(toParent);
	3081	+ fromParent = null; // LA.matIdentity(fromParent);
	3082	+
	3083	+ Touch();
	3084	+ }
	3085	+ }
	3086	+
2935	3087	void TransformGeometry()
2936	3088	{
2937	3089	Object3D obj = this;
..	..	@@ -3153,9 +3305,11 @@
3153	3305
3154	3306	BoundaryRep sup = bRep.support;
3155	3307	bRep.support = null;
3156		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3308	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3157	3309	// bRep.SplitInTwo(onlyone); // thread...
3158		- temprep.SplitInTwo(reduction34, onlyone);
	3310	+
	3311	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3312	+
3159	3313	bRep = temprep;
3160	3314	bRep.support = sup;
3161	3315	Touch();
..	..	@@ -3677,7 +3831,7 @@
3677	3831	if (child == null)
3678	3832	continue;
3679	3833
3680		- if (GrafreeD.RENDERME > 0)
	3834	+ if (Grafreed.RENDERME > 0)
3681	3835	{
3682	3836	if (child instanceof Merge)
3683	3837	((Merge)child).renderme();
..	..	@@ -3828,7 +3982,7 @@
3828	3982	if (child == null)
3829	3983	continue;
3830	3984
3831		- if (GrafreeD.RENDERME > 0)
	3985	+ if (Grafreed.RENDERME > 0)
3832	3986	{
3833	3987	if (child instanceof Merge)
3834	3988	((Merge)child).renderme();
..	..	@@ -4023,7 +4177,7 @@
4023	4177	if (child == null)
4024	4178	continue;
4025	4179
4026		- if (GrafreeD.RENDERME > 0)
	4180	+ if (Grafreed.RENDERME > 0)
4027	4181	{
4028	4182	if (child instanceof Merge)
4029	4183	((Merge)child).renderme();
..	..	@@ -4111,7 +4265,7 @@
4111	4265	if (blockloop)
4112	4266	return;
4113	4267
4114		- for (int i=0; i<size(); i++)
	4268	+ for (int i=0; i<Size(); i++)
4115	4269	{
4116	4270	if (get(i).parent != this)
4117	4271	{
..	..	@@ -4120,6 +4274,22 @@
4120	4274	}
4121	4275	blockloop = true;
4122	4276	get(i).RepairParent();
	4277	+ blockloop = false;
	4278	+ }
	4279	+ }
	4280	+
	4281	+ void RepairShadow()
	4282	+ {
	4283	+ if (blockloop)
	4284	+ return;
	4285	+
	4286	+ if (this.material != null)
	4287	+ this.InitOthers();
	4288	+
	4289	+ for (int i=0; i<Size(); i++)
	4290	+ {
	4291	+ blockloop = true;
	4292	+ get(i).RepairShadow();
4123	4293	blockloop = false;
4124	4294	}
4125	4295	}
..	..	@@ -4614,7 +4784,7 @@
4614	4784
4615	4785	cTreePath SelectLeaf(int indexcount, boolean deselect)
4616	4786	{
4617		- if (hide)
	4787	+ if (hide \|\| dontselect)
4618	4788	return null;
4619	4789
4620	4790	if (count <= 0)
..	..	@@ -4640,7 +4810,7 @@
4640	4810
4641	4811	cTreePath Select(int indexcount, boolean deselect)
4642	4812	{
4643		- if (hide)
	4813	+ if (hide \|\| dontselect)
4644	4814	return null;
4645	4815
4646	4816	if (count <= 0)
..	..	@@ -4790,7 +4960,7 @@
4790	4960	return globalTransform;
4791	4961	}
4792	4962
4793		- void PreprocessOcclusion(CameraPane cp)
	4963	+ void PreprocessOcclusion(iCameraPane cp)
4794	4964	{
4795	4965	/*
4796	4966	if (AOdone)
..	..	@@ -4937,7 +5107,8 @@
4937	5107	} else //
4938	5108	if (editWindow != null)
4939	5109	{
4940		- editWindow.cameraView.lighttouched = true;
	5110	+ //editWindow.cameraView.lighttouched = true;
	5111	+ Globals.lighttouched = true;
4941	5112	}
4942	5113	}
4943	5114
..	..	@@ -5091,10 +5262,34 @@
5091	5262
5092	5263	// System.out.println("Fullname = " + fullname);
5093	5264
5094		- if (fullname.name.indexOf(":") == -1)
5095		- return fullname.name;
	5265	+ // Does not work on Windows due to C:
	5266	+// if (fullname.name.indexOf(":") == -1)
	5267	+// return fullname.name;
	5268	+//
	5269	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5096	5270
5097		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5271	+ String[] split = fullname.name.split(":");
	5272	+
	5273	+ if (split.length == 0)
	5274	+ {
	5275	+ return "";
	5276	+ }
	5277	+
	5278	+ if (split.length <= 2)
	5279	+ {
	5280	+ if (fullname.name.endsWith(":"))
	5281	+ {
	5282	+ // Windows
	5283	+ return fullname.name.substring(0, fullname.name.length()-1);
	5284	+ }
	5285	+
	5286	+ return split[0];
	5287	+ }
	5288	+
	5289	+ // Windows
	5290	+ assert(split.length == 4);
	5291	+
	5292	+ return split[0] + ":" + split[1];
5098	5293	}
5099	5294
5100	5295	static String GetBump(cTexture fullname)
..	..	@@ -5103,10 +5298,38 @@
5103	5298	return "";
5104	5299
5105	5300	// 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());
	5301	+ // Does not work on Windows due to C:
	5302	+// if (fullname.name.indexOf(":") == -1)
	5303	+// return "";
	5304	+//
	5305	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5306	+ String[] split = fullname.name.split(":");
	5307	+
	5308	+ if (split.length == 0)
	5309	+ {
	5310	+ return "";
	5311	+ }
	5312	+
	5313	+ if (split.length == 1)
	5314	+ {
	5315	+ return "";
	5316	+ }
	5317	+
	5318	+ if (split.length == 2)
	5319	+ {
	5320	+ if (fullname.name.endsWith(":"))
	5321	+ {
	5322	+ // Windows
	5323	+ return "";
	5324	+ }
	5325	+
	5326	+ return split[1];
	5327	+ }
	5328	+
	5329	+ // Windows
	5330	+ assert(split.length == 4);
	5331	+
	5332	+ return split[2] + ":" + split[3];
5110	5333	}
5111	5334
5112	5335	String GetPigmentTexture()
..	..	@@ -5180,7 +5403,7 @@
5180	5403	System.out.print("; textures = " + textures);
5181	5404	System.out.println("; usedtextures = " + usedtextures);
5182	5405
5183		- if (GetTextures() == null)
	5406	+ if (GetTextures() == null) // What is that??
5184	5407	GetTextures().name = ":";
5185	5408
5186	5409	String texname = tex;
..	..	@@ -5211,6 +5434,43 @@
5211	5434	child.ResetPigmentTexture();
5212	5435	blockloop = false;
5213	5436	}
	5437	+ }
	5438	+
	5439	+ UUID GetUUID()
	5440	+ {
	5441	+ if (uuid == null)
	5442	+ {
	5443	+ // Serial
	5444	+ uuid = UUID.randomUUID();
	5445	+ }
	5446	+
	5447	+ return uuid;
	5448	+ }
	5449	+
	5450	+ Object3D GetObject(UUID uid)
	5451	+ {
	5452	+ if (blockloop)
	5453	+ return null;
	5454	+
	5455	+ if (GetUUID().equals(uid))
	5456	+ return this;
	5457	+
	5458	+ int nb = Size();
	5459	+ for (int i = 0; i < nb; i++)
	5460	+ {
	5461	+ Object3D child = (Object3D) get(i);
	5462	+
	5463	+ if (child == null)
	5464	+ continue;
	5465	+
	5466	+ blockloop = true;
	5467	+ Object3D obj = child.GetObject(uid);
	5468	+ blockloop = false;
	5469	+ if (obj != null)
	5470	+ return obj;
	5471	+ }
	5472	+
	5473	+ return null;
5214	5474	}
5215	5475
5216	5476	void SetBumpTexture(String tex)
..	..	@@ -5249,25 +5509,22 @@
5249	5509	}
5250	5510	}
5251	5511
5252		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5512	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5253	5513	{
5254	5514	Draw(display, root, selected, blocked);
5255	5515	}
5256	5516
5257		- static cMaterial[] materialstack = new cMaterial[65536];
5258		- static boolean[] selectedstack = new boolean[65536];
5259		- static int materialdepth = 0;
5260		-
5261	5517	boolean NeedSupport()
5262	5518	{
5263	5519	return
5264		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5520	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
5265	5521	// PROBLEM with CROWD!!
5266		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	5522	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5267	5523	}
5268	5524
	5525	+ static boolean DEBUG_SELECTION = false;
5269	5526
5270		- void Draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5527	+ void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5271	5528	{
5272	5529	Invariants(); // june 2013
5273	5530
..	..	@@ -5276,8 +5533,8 @@
5276	5533	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5277	5534	}
5278	5535
5279		- if (display.drawMode == CameraPane.SELECTION &&
5280		- hide)
	5536	+ if (display.DrawMode() == iCameraPane.SELECTION &&
	5537	+ (hide \|\| dontselect))
5281	5538	return;
5282	5539
5283	5540	if (name != null && name.contains("sclera"))
..	..	@@ -5295,7 +5552,7 @@
5295	5552	if (this instanceof Checker)
5296	5553	return;
5297	5554
5298		- if (display.drawMode == display.SHADOW && PASSTEST)
	5555	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5299	5556	return;
5300	5557
5301	5558	if (count <= 0)
..	..	@@ -5303,13 +5560,13 @@
5303	5560	return;
5304	5561	}
5305	5562
5306		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5307		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5563	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	5564	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5308	5565	{
5309	5566	return;
5310	5567	}
5311	5568
5312		- javax.media.opengl.GL gl = display.GetGL();
	5569	+ //javax.media.opengl.GL gl = display.GetGL();
5313	5570
5314	5571	/*
5315	5572	if (touched)
..	..	@@ -5345,15 +5602,15 @@
5345	5602
5346	5603	boolean compiled = false;
5347	5604
5348		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5605	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5349	5606
5350		- if (!selectmode && //display.drawMode != display.SELECTION &&
	5607	+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
5351	5608	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5352	5609	{
5353		- display.lighttouched = true;
	5610	+ Globals.lighttouched = true;
5354	5611	} // 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 &&
	5612	+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
	5613	+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5357	5614	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5358	5615	{
5359	5616	if (!(this instanceof Composite))
..	..	@@ -5361,7 +5618,7 @@
5361	5618	//if (displaylist == -1 && usecalllists)
5362	5619	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5363	5620	{
5364		- bRep.displaylist = gl.glGenLists(1);
	5621	+ bRep.displaylist = display.GenList();
5365	5622	assert(bRep.displaylist != 0);
5366	5623	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5367	5624	//System.out.println("\tgen list " + list);
..	..	@@ -5373,18 +5630,20 @@
5373	5630	if (usecalllists)
5374	5631	{
5375	5632	// System.err.println("new list " + bRep.displaylist + " for " + this);
5376		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5633	+ display.NewList(bRep.displaylist);
5377	5634	}
	5635	+
5378	5636	CallList(display, root, selected, blocked);
	5637	+
5379	5638	// compiled = true;
5380	5639	if (usecalllists)
5381	5640	{
5382	5641	// System.err.println("end list " + bRep.displaylist + " for " + this);
5383		- gl.glEndList();
	5642	+ display.EndList();
5384	5643	}
5385	5644	//gl.glDrawBuffer(gl.GL_BACK);
5386	5645	// XXX touched = false;
5387		- display.lighttouched = true; // all panes...
	5646	+ Globals.lighttouched = true; // all panes...
5388	5647	}
5389	5648
5390	5649	touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
..	..	@@ -5423,12 +5682,12 @@
5423	5682
5424	5683	// frustum culling
5425	5684	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5426		- && display.drawMode != CameraPane.SELECTION)
	5685	+ && display.DrawMode() != iCameraPane.SELECTION)
5427	5686	{
5428		- if (display.drawMode == CameraPane.SHADOW)
	5687	+ if (display.DrawMode() == iCameraPane.SHADOW)
5429	5688	{
5430	5689	if (!link2master // tricky to cull in shadow mode.
5431		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	5690	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5432	5691	{
5433	5692	//System.out.print("CULLED");
5434	5693	culled = true;
..	..	@@ -5436,7 +5695,7 @@
5436	5695	}
5437	5696	else
5438	5697	//GetBRep().getBounds(v0, v1, this);
5439		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	5698	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5440	5699	culled = true;
5441	5700
5442	5701	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5472,11 +5731,11 @@
5472	5731
5473	5732
5474	5733	if (!culled)
5475		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	5734	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5476	5735	{
5477	5736	if (GetBRep() != null)
5478	5737	{
5479		- CameraPane.NextIndex(this, gl);
	5738	+ display.NextIndex();
5480	5739	// vertex color conflict : gl.glCallList(list);
5481	5740	DrawNode(display, root, selected);
5482	5741	if (this instanceof BezierPatch)
..	..	@@ -5498,53 +5757,7 @@
5498	5757	color[2] /= 2;
5499	5758	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5500	5759	*/
5501		- if (material != null)
5502		- {
5503		- materialstack[materialdepth] = material;
5504		- selectedstack[materialdepth] = selected;
5505		- cStatic.objectstack[materialdepth++] = this;
5506		- //System.out.println("material " + material);
5507		- //Applet3D.tracein(this, selected);
5508		- display.vector2buffer = projectedVertices;
5509		- if (this instanceof Camera)
5510		- {
5511		- display.options1[0] = material.shift;
5512		- //System.out.println("shift " + material.shift);
5513		- display.options1[1] = material.lightarea;
5514		- display.options1[2] = material.shadowbias;
5515		- display.options1[3] = material.aniso;
5516		- display.options1[4] = material.anisoV;
5517		- display.options2[0] = material.opacity;
5518		- display.options2[1] = material.diffuse;
5519		- display.options2[2] = material.factor;
5520		-
5521		- cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
5522		- display.options3[3] = material.cameralight/0.2f;
5523		-
5524		- // if (display.CURRENTANTIALIAS > 0)
5525		- // display.options3[3] /= 4;
5526		-
5527		- /*
5528		- System.out.println("Focus = " + display.options1[0]);
5529		- System.out.println("Aperture = " + display.options1[1]);
5530		- System.out.println("ShadowBlur = " + display.options1[2]);
5531		- System.out.println("Antialiasing = " + display.options1[3]);
5532		- System.out.println("Fog = " + display.options2[0]);
5533		- System.out.println("Intensity = " + display.options2[1]);
5534		- System.out.println("Elevation = " + display.options2[2]);
5535		- /**/
5536		- } else
5537		- {
5538		- material.Draw(display, selected);
5539		- }
5540		- } else
5541		- {
5542		- if (selected && CameraPane.flash)
5543		- {
5544		- display.modelParams4[1] = 100;
5545		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5546		- }
5547		- }
	5760	+ display.PushMaterial(this, selected);
5548	5761
5549	5762	//System.out.println("call list " + list);
5550	5763	//System.out.println();
..	..	@@ -5563,7 +5776,17 @@
5563	5776	tex = GetTextures();
5564	5777	}
5565	5778
5566		- display.BindTextures(tex, texres);
	5779	+ boolean failed = false;
	5780	+
	5781	+ try
	5782	+ {
	5783	+ display.BindTextures(tex, texres);
	5784	+ }
	5785	+ catch (Exception e)
	5786	+ {
	5787	+ System.err.println("FAILED: " + this);
	5788	+ failed = true;
	5789	+ }
5567	5790
5568	5791	if (!compiled)
5569	5792	{
..	..	@@ -5579,30 +5802,16 @@
5579	5802
5580	5803	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5581	5804	assert(bRep.displaylist != 0);
5582		- gl.glCallList(bRep.displaylist);
	5805	+ display.CallList(bRep.displaylist);
5583	5806	// june 2013 drawSelf(display, root, selected);
5584	5807	}
5585	5808	}
5586	5809	}
5587	5810
5588		- display.ReleaseTextures(tex);
5589		-
5590		- //if (parent != null && parent.GetMaterial() != null)
5591		- // parent.GetMaterial().Draw(display, parent.IsSelected(this));
5592		- if (material != null)
5593		- {
5594		- materialdepth -= 1;
5595		- if (materialdepth > 0)
5596		- {
5597		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5598		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5599		- }
5600		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5601		- } else if (selected && CameraPane.flash && GetMaterial() != null)
5602		- {
5603		- display.modelParams4[1] = GetMaterial().cameralight;
5604		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5605		- }
	5811	+ if (!failed)
	5812	+ display.ReleaseTextures(tex);
	5813	+
	5814	+ display.PopMaterial(this, selected);
5606	5815	}
5607	5816
5608	5817	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5644,7 +5853,7 @@
5644	5853	// resetMasterNode();
5645	5854	}
5646	5855
5647		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5856	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5648	5857	{
5649	5858	if (GetBRep() == null)
5650	5859	{
..	..	@@ -5727,8 +5936,11 @@
5727	5936	boolean flipV = false; // true;
5728	5937	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5729	5938
5730		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5939	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5731	5940	{
	5941	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	5942	+ return;
	5943	+
5732	5944	if (hide)
5733	5945	return;
5734	5946	// shadow optimisation
..	..	@@ -5786,16 +5998,7 @@
5786	5998	// // ??????????????????????????? Touch();
5787	5999	// }
5788	6000
5789		- if (material != null)
5790		- {
5791		- materialstack[materialdepth] = material;
5792		- selectedstack[materialdepth] = selected;
5793		- cStatic.objectstack[materialdepth++] = this;
5794		- //System.out.println("material " + material);
5795		- //Applet3D.tracein("selected ", selected);
5796		- display.vector2buffer = projectedVertices;
5797		- material.Draw(display, selected);
5798		- }
	6001	+display.PushMaterial2(this, selected);
5799	6002
5800	6003	Object3D child;
5801	6004	boolean sel;
..	..	@@ -5847,19 +6050,7 @@
5847	6050	*/
5848	6051	//depth += 1;
5849	6052
5850		- if (material != null)
5851		- {
5852		- materialdepth -= 1;
5853		- if (materialdepth > 0)
5854		- {
5855		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5856		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5857		- }
5858		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5859		- //else
5860		- //material.Draw(display, false);
5861		- }
5862		-
	6053	+display.PopMaterial2(this);
5863	6054	/*
5864	6055	display.ReleaseTextures(tex);
5865	6056	*/
..	..	@@ -5870,10 +6061,13 @@
5870	6061
5871	6062	//static cVector min,max;
5872	6063
5873		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	6064	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5874	6065	{
5875		- if (display.drawMode == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	6066	+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5876	6067	return; // no shadow for transparent objects
	6068	+
	6069	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6070	+ return;
5877	6071
5878	6072	if (hide)
5879	6073	return;
..	..	@@ -5915,11 +6109,12 @@
5915	6109	return;
5916	6110	}
5917	6111
	6112	+ //bRep.GenUV(1/material.diffuseness);
5918	6113	// bRep.lock = true;
5919	6114
5920		- javax.media.opengl.GL gl = display.GetGL();
	6115	+ //javax.media.opengl.GL gl = display.GetGL();
5921	6116
5922		- if (CameraPane.BOXMODE) // \|\| CameraPane.movingcamera)
	6117	+ if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5923	6118	{
5924	6119	int fc = bRep.FaceCount();
5925	6120	int vc = bRep.VertexCount();
..	..	@@ -5934,23 +6129,7 @@
5934	6129
5935	6130	bRep.getMinMax(min, max, 100);
5936	6131
5937		- gl.glBegin(gl.GL_LINES);
5938		-
5939		- gl.glVertex3d(min.x, min.y, min.z);
5940		- gl.glVertex3d(min.x, min.y, max.z);
5941		- gl.glVertex3d(min.x, min.y, min.z);
5942		- gl.glVertex3d(min.x, max.y, min.z);
5943		- gl.glVertex3d(min.x, min.y, min.z);
5944		- gl.glVertex3d(max.x, min.y, min.z);
5945		-
5946		- gl.glVertex3d(max.x, max.y, max.z);
5947		- gl.glVertex3d(min.x, max.y, max.z);
5948		- gl.glVertex3d(max.x, max.y, max.z);
5949		- gl.glVertex3d(max.x, min.y, max.z);
5950		- gl.glVertex3d(max.x, max.y, max.z);
5951		- gl.glVertex3d(max.x, max.y, min.z);
5952		-
5953		- gl.glEnd();
	6132	+ display.DrawBox(min, max);
5954	6133
5955	6134	return;
5956	6135	}
..	..	@@ -5994,7 +6173,7 @@
5994	6173	{
5995	6174	//throw new Error();
5996	6175
5997		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6176	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5998	6177
5999	6178	int[] strips = bRep.getRawIndices();
6000	6179
..	..	@@ -6004,178 +6183,14 @@
6004	6183	new Exception().printStackTrace();
6005	6184	return;
6006	6185	}
6007		-
6008		- // TRIANGLE STRIP ARRAY
6009		- if (bRep.trimmed)
6010		- {
6011		- float[] v = bRep.getRawVertices();
6012		- float[] n = bRep.getRawNormals();
6013		- float[] c = bRep.getRawColors();
6014		- float[] uv = bRep.getRawUVMap();
6015		-
6016		- int count2 = 0;
6017		- int count3 = 0;
6018		-
6019		- if (n.length > 0)
6020		- {
6021		- for (int i = 0; i < strips.length; i++)
6022		- {
6023		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6024		-
6025		- /*
6026		- boolean locked = false;
6027		- float eps = 0.1f;
6028		- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6029		-
6030		- int dot = 0;
6031		-
6032		- if ((dot&1) == 0)
6033		- dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6034		-
6035		- if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6036		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6037		- else
6038		- {
6039		- locked = true;
6040		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6041		- }
6042		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6043		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6044		- if (hasnorm)
6045		- {
6046		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6047		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6048		- }
6049		-
6050		- if ((dot&4) == 0)
6051		- dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6052		-
6053		- if (wrap \|\| !locked && (dot&8) != 0)
6054		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6055		- else
6056		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6057		-
6058		- f.dot = dot;
6059		- */
6060		-
6061		- if (!selectmode)
6062		- {
6063		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6064		- {
6065		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6066		- } else
6067		- {
6068		- gl.glNormal3f(0, 0, 1);
6069		- }
6070		-
6071		- if (c != null)
6072		- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
6073		- {
6074		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6075		- }
6076		- }
6077		- if (flipV)
6078		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6079		- else
6080		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6081		- //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6082		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6083		-
6084		- count2 += 2;
6085		- count3 += 3;
6086		- if (!selectmode)
6087		- {
6088		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6089		- {
6090		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6091		- } else
6092		- {
6093		- gl.glNormal3f(0, 0, 1);
6094		- }
6095		- if (c != null)
6096		- {
6097		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6098		- }
6099		- }
6100		- if (flipV)
6101		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6102		- else
6103		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6104		- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6105		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6106		-
6107		- count2 += 2;
6108		- count3 += 3;
6109		- for (int j = 0; j < strips[i] - 2; j++)
6110		- {
6111		- //gl.glTexCoord2d(...);
6112		- if (!selectmode)
6113		- {
6114		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6115		- {
6116		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6117		- } else
6118		- {
6119		- gl.glNormal3f(0, 0, 1);
6120		- }
6121		- if (c != null)
6122		- {
6123		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6124		- }
6125		- }
6126		-
6127		- if (flipV)
6128		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6129		- else
6130		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6131		- //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6132		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6133		- count2 += 2;
6134		- count3 += 3;
6135		- }
6136		-
6137		- gl.glEnd();
6138		- }
6139		- }
6140		-
6141		- assert count3 == v.length;
6142		- }
6143		- else // !trimmed
6144		- {
6145		- int count = 0;
6146		- for (int i = 0; i < strips.length; i++)
6147		- {
6148		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6149		-
6150		- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6151		- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6152		-
6153		- drawVertex(gl, p, selectmode);
6154		- drawVertex(gl, q, selectmode);
6155		-
6156		- for (int j = 0; j < strips[i] - 2; j++)
6157		- {
6158		- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6159		-
6160		-// if (j%2 == 0)
6161		-// drawFace(p, q, r, display, null);
6162		-// else
6163		-// drawFace(p, r, q, display, null);
6164		-
6165		-// p = q;
6166		-// q = r;
6167		- drawVertex(gl, r, selectmode);
6168		- }
6169		-
6170		- gl.glEnd();
6171		- }
6172		- }
	6186	+
	6187	+ display.DrawGeometry(bRep, flipV, selectmode);
6173	6188	} else // catch (Error e)
6174	6189	{
6175	6190	// TRIANGLE ARRAY
6176	6191	if (IsOpaque()) // Static())
6177	6192	{
6178		- gl.glBegin(gl.GL_TRIANGLES);
	6193	+ display.StartTriangles();
6179	6194	int facecount = bRep.FaceCount();
6180	6195	for (int i = 0; i < facecount; i++)
6181	6196	{
..	..	@@ -6238,9 +6253,9 @@
6238	6253	// // r.norm.dot(v3) > -0.5)
6239	6254	// // continue;
6240	6255
6241		- drawFace(p, q, r, display, face);
	6256	+ display.DrawFace(this, p, q, r, face);
6242	6257	}
6243		- gl.glEnd();
	6258	+ display.EndTriangles();
6244	6259	}
6245	6260	else
6246	6261	{
..	..	@@ -6269,8 +6284,8 @@
6269	6284	//System.out.println("SORT");
6270	6285
6271	6286	java.util.Arrays.sort(facescompare);
6272		-
6273		- gl.glBegin(gl.GL_TRIANGLES);
	6287	+
	6288	+ display.StartTriangles();
6274	6289	for (int i = 0; i < facecount; i++)
6275	6290	{
6276	6291	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6282,13 +6297,14 @@
6282	6297	Vertex q = bRep.GetVertex(face.q);
6283	6298	Vertex r = bRep.GetVertex(face.r);
6284	6299
6285		- drawFace(p, q, r, display, face);
	6300	+ display.DrawFace(this, p, q, r, face);
6286	6301	}
6287		- gl.glEnd();
	6302	+ display.EndTriangles();
6288	6303	}
6289	6304
6290	6305	if (false) // live && support != null && support.bRep != null) // debug weights
6291	6306	{
	6307	+ /*
6292	6308	gl.glDisable(gl.GL_LIGHTING);
6293	6309	float[] colorV = new float[3];
6294	6310
..	..	@@ -6367,6 +6383,7 @@
6367	6383	// gl.glEnd();
6368	6384	}
6369	6385	}
	6386	+ */
6370	6387	}
6371	6388	}
6372	6389
..	..	@@ -6411,7 +6428,7 @@
6411	6428	center.add(r);
6412	6429	center.mul(1.0/3);
6413	6430
6414		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6431	+ center.sub(Globals.theRenderer.EyeCamera().location);
6415	6432
6416	6433	distance = center.dot(center);
6417	6434	}
..	..	@@ -6422,347 +6439,11 @@
6422	6439
6423	6440	transient FaceCompare[] facescompare = null;
6424	6441
6425		- void SetColor(CameraPane display, Vertex p0)
6426		- {
6427		- if (display.RENDERPROGRAM == 0)
6428		- {
6429		- float r = 0;
6430		- if (bRep != null)
6431		- {
6432		- if (bRep.stripified)
6433		- {
6434		- r = 1;
6435		- }
6436		- }
6437		- float g = 0;
6438		- if (bRep != null)
6439		- {
6440		- if (bRep.trimmed)
6441		- {
6442		- g = 1;
6443		- }
6444		- }
6445		- float b = 0;
6446		- if (support != null && link2master)
6447		- {
6448		- b = 1;
6449		- }
6450		- display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
6451		- return;
6452		- }
6453		-
6454		- if (display.drawMode != CameraPane.SHADOW)
6455		- return;
6456		-
6457		- javax.media.opengl.GL gl = display.GetGL();
6458		-// if (true) return;
6459		-// float ao = p.AO;
6460		-//
6461		-// // if (ao == 0 && !bRep.AOdone) // transient problem!
6462		-// // ao = 1;
6463		-//
6464		-// gl.glColor4f(ao, ao, ao, 1);
6465		-
6466		-// CameraPane.selectedpoint.
6467		-// getAverage(cStatic.point1, true);
6468		- if (CameraPane.pointflow == null) // !random) // live)
6469		- {
6470		- return;
6471		- }
6472		-
6473		- cStatic.point1.set(0,0,0);
6474		- LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
6475		-
6476		- cStatic.point1.sub(p0);
6477		-
6478		-
6479		-// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
6480		-// {
6481		-// return;
6482		-// }
6483		-
6484		- //if (true)
6485		- if (cStatic.point1.dot(cStatic.point1) > 0.000001)
6486		- {
6487		- return;
6488		- }
6489		-
6490		- float[] colorV = new float[3];
6491		-
6492		- if (false) // marked)
6493		- {
6494		- // debug rigging weights
6495		- for (int object = 0; object < p0.vertexlinks.length; object++)
6496		- {
6497		- float weight = p0.weights[object] / p0.totalweight;
6498		-
6499		- // if (weight < 0.1)
6500		- // {
6501		- // assert(weight == 0);
6502		- // continue;
6503		- // }
6504		-
6505		- if (p0.vertexlinks[object] == -1)
6506		- continue;
6507		-
6508		- Vertex q = support.bRep.GetVertex(p0.vertexlinks[object]);
6509		-
6510		- int color = //1 << object; //
6511		- //p.vertexlinks.length;
6512		- support.bRep.supports[p0.closestsupport].links[object];
6513		- colorV[2] += (color & 1) * weight;
6514		- colorV[1] += ((color & 2) >> 1) * weight;
6515		- colorV[0] += ((color & 4) >> 2) * weight;
6516		- }
6517		- }
6518		- else
6519		- {
6520		- if (drawingstarted)
6521		- {
6522		- // find next point
6523		- if (bRep.GetVertex(0).faceindices == null)
6524		- {
6525		- bRep.InitFaceIndices();
6526		- }
6527		-
6528		- double ymin = p0.y;
6529		-
6530		- Vertex newp = p0;
6531		-
6532		- for (int fii = 0; fii < p0.faceindices.length; fii++)
6533		- {
6534		- int fi = p0.faceindices[fii];
6535		-
6536		- if (fi == -1)
6537		- break;
6538		-
6539		- Face f = bRep.GetFace(fi);
6540		-
6541		- Vertex p = bRep.GetVertex(f.p);
6542		- Vertex q = bRep.GetVertex(f.q);
6543		- Vertex r = bRep.GetVertex(f.r);
6544		-
6545		- int swap = (int)(Math.random()*3);
6546		-
6547		-// for (int s=swap; --s>=0;)
6548		-// {
6549		-// Vertex t = p;
6550		-// p = q;
6551		-// q = r;
6552		-// r = t;
6553		-// }
6554		- if (ymin > p.y)
6555		- {
6556		- ymin = p.y;
6557		- newp = p;
6558		-// break;
6559		- }
6560		- if (ymin > q.y)
6561		- {
6562		- ymin = q.y;
6563		- newp = q;
6564		-// break;
6565		- }
6566		- if (ymin > r.y)
6567		- {
6568		- ymin = r.y;
6569		- newp = r;
6570		-// break;
6571		- }
6572		- }
6573		-
6574		- CameraPane.selectedpoint.toParent[3][0] = newp.x;
6575		- CameraPane.selectedpoint.toParent[3][1] = newp.y;
6576		- CameraPane.selectedpoint.toParent[3][2] = newp.z;
6577		-
6578		- drawingstarted = false;
6579		-
6580		- // return;
6581		- }
6582		-
6583		- if (false) // CameraPane.DRAW
6584		- {
6585		- p0.AO = colorV[0] = 2;
6586		- colorV[1] = 2;
6587		- colorV[2] = 2;
6588		- }
6589		-
6590		- CameraPane.pointflow.add(p0);
6591		- CameraPane.pointflow.Touch();
6592		- }
6593		-
6594		-// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
6595		-// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
6596		-// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
6597		- }
6598		-
6599	6442	void Print(Vertex v)
6600	6443	{
6601	6444	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6602	6445	}
6603	6446
6604		- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6605		- {
6606		- if (!selectmode)
6607		- {
6608		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6609		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6610		-
6611		- if (flipV)
6612		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6613		- else
6614		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6615		- }
6616		-
6617		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6618		- }
6619		-
6620		- void drawFace(Vertex pv, Vertex qv, Vertex rv,
6621		- CameraPane display, Face face)
6622		- {
6623		- if (pv.y == -10000 \|\|
6624		- qv.y == -10000 \|\|
6625		- rv.y == -10000)
6626		- return;
6627		-
6628		-// float b = f.nbiterations & 1;
6629		-// float g = (f.nbiterations>>1) & 1;
6630		-// float r = (f.nbiterations>>2) & 1;
6631		-//
6632		-// //if (f.weight == 10000)
6633		-// //{
6634		-// // r = 1; g = b = 0;
6635		-// //}
6636		-// //else
6637		-// //{
6638		-// // assert(f.weight < 10000);
6639		-// r = g = b = (float)bRep.FaceWeight(f)*100;
6640		-// if (r<0)
6641		-// assert(r>=0);
6642		-// //}
6643		-
6644		- javax.media.opengl.GL gl = display.GetGL();
6645		-
6646		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
6647		-
6648		- //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
6649		- if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
6650		- {
6651		- //gl.glBegin(gl.GL_TRIANGLES);
6652		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
6653		- if (!hasnorm)
6654		- {
6655		- // System.out.println("FUCK!!");
6656		- LA.vecSub(pv/.pos/, qv/.pos/, v0);
6657		- LA.vecSub(pv/.pos/, rv/.pos/, v1);
6658		- LA.vecCross(v0, v1, v2);
6659		- LA.vecNormalize(v2);
6660		- gl.glNormal3f((float) v2.x, (float) v2.y, (float) v2.z);
6661		- }
6662		-
6663		- if (hasnorm)
6664		- {
6665		-// if (!pv.norm.normalized())
6666		-// assert(pv.norm.normalized());
6667		-
6668		- //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
6669		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6670		- }
6671		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6672		- SetColor(display, pv);
6673		- //gl.glColor4f(r, g, b, 1);
6674		- //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
6675		- if (flipV)
6676		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6677		- else
6678		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6679		- //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
6680		- gl.glVertex3f((float) pv./pos./x, (float) pv./pos./y, (float) pv./pos./z);
6681		-// Print(pv);
6682		- if (hasnorm)
6683		- {
6684		-// assert(qv.norm.normalized());
6685		- //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
6686		- gl.glNormal3f((float) qv.norm.x, (float) qv.norm.y, (float) qv.norm.z);
6687		- }
6688		- //System.out.println("vertexq = " + qv.s + ", " + qv.t);
6689		- // boolean locked = false;
6690		- // float eps = 0.1f;
6691		- // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6692		-
6693		- // int dot = 0; //*/ (int)f.dot;
6694		-
6695		- // if ((dot&1) == 0)
6696		- // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6697		-
6698		- // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6699		- if (flipV)
6700		- gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
6701		- else
6702		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6703		- // else
6704		- // {
6705		- // locked = true;
6706		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6707		- // }
6708		- gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
6709		- SetColor(display, qv);
6710		- //gl.glColor4f(r, g, b, 1);
6711		- //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
6712		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6713		- gl.glVertex3f((float) qv./pos./x, (float) qv./pos./y, (float) qv./pos./z);
6714		-// Print(qv);
6715		- if (hasnorm)
6716		- {
6717		-// assert(rv.norm.normalized());
6718		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6719		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6720		- }
6721		-
6722		- // if ((dot&4) == 0)
6723		- // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6724		-
6725		- // if (wrap \|\| !locked && (dot&8) != 0)
6726		- if (flipV)
6727		- gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
6728		- else
6729		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6730		- // else
6731		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6732		-
6733		- // f.dot = dot;
6734		-
6735		- gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
6736		- SetColor(display, rv);
6737		- //gl.glColor4f(r, g, b, 1);
6738		- //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
6739		- //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
6740		- gl.glVertex3f((float) rv./pos./x, (float) rv./pos./y, (float) rv./pos./z);
6741		-// Print(rv);
6742		- //gl.glEnd();
6743		- }
6744		- else
6745		- {
6746		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6747		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6748		- gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
6749		-
6750		- }
6751		-
6752		- if (false) // (attributes & WIREFRAME) != 0)
6753		- {
6754		- gl.glDisable(gl.GL_LIGHTING);
6755		-
6756		- gl.glBegin(gl.GL_LINE_LOOP);
6757		- gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
6758		- gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
6759		- gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
6760		- gl.glEnd();
6761		-
6762		- gl.glEnable(gl.GL_LIGHTING);
6763		- }
6764		- }
6765		-
6766	6447	void drawSelf(ClickInfo info, int level, boolean select)
6767	6448	{
6768	6449	if (bRep == null)
..	..	@@ -7334,83 +7015,83 @@
7334	7015	int spotw = spot.x + spot.width;
7335	7016	int spoth = spot.y + spot.height;
7336	7017	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7337		- if (CameraPane.Xmin > spot.x)
7338		- {
7339		- CameraPane.Xmin = spot.x;
7340		- }
7341		- if (CameraPane.Xmax < spotw)
7342		- {
7343		- CameraPane.Xmax = spotw;
7344		- }
7345		- if (CameraPane.Ymin > spot.y)
7346		- {
7347		- CameraPane.Ymin = spot.y;
7348		- }
7349		- if (CameraPane.Ymax < spoth)
7350		- {
7351		- CameraPane.Ymax = spoth;
7352		- }
	7018	+// if (CameraPane.Xmin > spot.x)
	7019	+// {
	7020	+// CameraPane.Xmin = spot.x;
	7021	+// }
	7022	+// if (CameraPane.Xmax < spotw)
	7023	+// {
	7024	+// CameraPane.Xmax = spotw;
	7025	+// }
	7026	+// if (CameraPane.Ymin > spot.y)
	7027	+// {
	7028	+// CameraPane.Ymin = spot.y;
	7029	+// }
	7030	+// if (CameraPane.Ymax < spoth)
	7031	+// {
	7032	+// CameraPane.Ymax = spoth;
	7033	+// }
7353	7034	spot.translate(32, 32);
7354	7035	spotw = spot.x + spot.width;
7355	7036	spoth = spot.y + spot.height;
7356	7037	info.g.setColor(Color.blue);
7357	7038	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7358		- if (CameraPane.Xmin > spot.x)
7359		- {
7360		- CameraPane.Xmin = spot.x;
7361		- }
7362		- if (CameraPane.Xmax < spotw)
7363		- {
7364		- CameraPane.Xmax = spotw;
7365		- }
7366		- if (CameraPane.Ymin > spot.y)
7367		- {
7368		- CameraPane.Ymin = spot.y;
7369		- }
7370		- if (CameraPane.Ymax < spoth)
7371		- {
7372		- CameraPane.Ymax = spoth;
7373		- }
7374		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7375		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7039	+// if (CameraPane.Xmin > spot.x)
	7040	+// {
	7041	+// CameraPane.Xmin = spot.x;
	7042	+// }
	7043	+// if (CameraPane.Xmax < spotw)
	7044	+// {
	7045	+// CameraPane.Xmax = spotw;
	7046	+// }
	7047	+// if (CameraPane.Ymin > spot.y)
	7048	+// {
	7049	+// CameraPane.Ymin = spot.y;
	7050	+// }
	7051	+// if (CameraPane.Ymax < spoth)
	7052	+// {
	7053	+// CameraPane.Ymax = spoth;
	7054	+// }
	7055	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
	7056	+ //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7376	7057	spot.translate(0, -32);
7377	7058	info.g.setColor(Color.green);
7378	7059	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7379		- if (CameraPane.Xmin > spot.x)
7380		- {
7381		- CameraPane.Xmin = spot.x;
7382		- }
7383		- if (CameraPane.Xmax < spotw)
7384		- {
7385		- CameraPane.Xmax = spotw;
7386		- }
7387		- if (CameraPane.Ymin > spot.y)
7388		- {
7389		- CameraPane.Ymin = spot.y;
7390		- }
7391		- if (CameraPane.Ymax < spoth)
7392		- {
7393		- CameraPane.Ymax = spoth;
7394		- }
	7060	+// if (CameraPane.Xmin > spot.x)
	7061	+// {
	7062	+// CameraPane.Xmin = spot.x;
	7063	+// }
	7064	+// if (CameraPane.Xmax < spotw)
	7065	+// {
	7066	+// CameraPane.Xmax = spotw;
	7067	+// }
	7068	+// if (CameraPane.Ymin > spot.y)
	7069	+// {
	7070	+// CameraPane.Ymin = spot.y;
	7071	+// }
	7072	+// if (CameraPane.Ymax < spoth)
	7073	+// {
	7074	+// CameraPane.Ymax = spoth;
	7075	+// }
7395	7076	info.g.drawArc(boundary.x, boundary.y,
7396	7077	boundary.width, boundary.height, 0, 360);
7397	7078	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7398		- if (CameraPane.Xmin > boundary.x)
7399		- {
7400		- CameraPane.Xmin = boundary.x;
7401		- }
7402		- if (CameraPane.Xmax < boundary.x + boundary.width)
7403		- {
7404		- CameraPane.Xmax = boundary.x + boundary.width;
7405		- }
7406		- if (CameraPane.Ymin > boundary.y)
7407		- {
7408		- CameraPane.Ymin = boundary.y;
7409		- }
7410		- if (CameraPane.Ymax < boundary.y + boundary.height)
7411		- {
7412		- CameraPane.Ymax = boundary.y + boundary.height;
7413		- }
	7079	+// if (CameraPane.Xmin > boundary.x)
	7080	+// {
	7081	+// CameraPane.Xmin = boundary.x;
	7082	+// }
	7083	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	7084	+// {
	7085	+// CameraPane.Xmax = boundary.x + boundary.width;
	7086	+// }
	7087	+// if (CameraPane.Ymin > boundary.y)
	7088	+// {
	7089	+// CameraPane.Ymin = boundary.y;
	7090	+// }
	7091	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	7092	+// {
	7093	+// CameraPane.Ymax = boundary.y + boundary.height;
	7094	+// }
7414	7095	return;
7415	7096	}
7416	7097	}
..	..	@@ -7427,7 +7108,7 @@
7427	7108	startX = info.x;
7428	7109	startY = info.y;
7429	7110
7430		- hitSomething = 0;
	7111	+ hitSomething = -1;
7431	7112	cVector origin = new cVector();
7432	7113	//LA.xformPos(origin, toParent, origin);
7433	7114	Rectangle spot = new Rectangle();
..	..	@@ -7460,7 +7141,7 @@
7460	7141	}
7461	7142
7462	7143	//System.out.println("info.modifiers = " + info.modifiers);
7463		- modified = (info.modifiers & CameraPane.META) != 0;
	7144	+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7464	7145	//System.out.println("modified = " + modified);
7465	7146	//new Exception().printStackTrace();
7466	7147	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7488,7 +7169,7 @@
7488	7169	return true;
7489	7170	}
7490	7171
7491		- void doEditDrag0(ClickInfo info)
	7172	+ void doEditDrag0(ClickInfo info, boolean opposite)
7492	7173	{
7493	7174	if (hitSomething == 0)
7494	7175	{
..	..	@@ -7503,6 +7184,7 @@
7503	7184	//System.out.println("hitSomething = " + hitSomething);
7504	7185
7505	7186	double scale = 0.005f * info.camera.Distance();
	7187	+
7506	7188	cVector xlate = new cVector();
7507	7189	//cVector xlate2 = new cVector();
7508	7190	switch (hitSomething)
..	..	@@ -7513,9 +7195,9 @@
7513	7195
7514	7196	case hitCenter: // Translate
7515	7197
7516		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7198	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7517	7199
7518		- if (modified)
	7200	+ if (modified \|\| opposite)
7519	7201	{
7520	7202	//assert(false);
7521	7203	/*
..	..	@@ -7561,10 +7243,10 @@
7561	7243	}
7562	7244	LA.xformDir(up, ClickInfo.matbuffer, up);
7563	7245	// if (!CameraPane.LOCALTRANSFORM)
7564		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
	7246	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7565	7247	LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7566	7248	// if (!CameraPane.LOCALTRANSFORM)
7567		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7249	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7568	7250	//LA.vecCross(up, cVector.Z, right2);
7569	7251
7570	7252	cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
..	..	@@ -7609,6 +7291,7 @@
7609	7291
7610	7292	if (modified)
7611	7293	{
	7294	+ // Rotate 90 degrees
7612	7295	angle /= (Math.PI / 4);
7613	7296	angle = Math.floor(angle + 0.5);
7614	7297	angle *= (Math.PI / 4);
..	..	@@ -7622,7 +7305,7 @@
7622	7305	}
7623	7306	/**/
7624	7307
7625		- switch (info.pane.renderCamera.viewCode)
	7308	+ switch (info.pane.RenderCamera().viewCode)
7626	7309	{
7627	7310	case 1: // '\001'
7628	7311	LA.matZRotate(toParent, angle);
..	..	@@ -7650,24 +7333,27 @@
7650	7333
7651	7334	case hitScale: // scale
7652	7335	double hScale = (double) (info.x - centerPt.x) / 32;
	7336	+ double sign = 1;
	7337	+ if (hScale < 0)
	7338	+ {
	7339	+ sign = -1;
	7340	+ }
	7341	+ hScale = signMath.pow(signhScale, scale * 50);
7653	7342	if (hScale < 0.01)
7654	7343	{
7655		- hScale = 0.01;
	7344	+ //hScale = 0.01;
7656	7345	}
7657		- hScale = Math.pow(hScale, scale * 50);
7658		- if (hScale < 0.01)
7659		- {
7660		- hScale = 0.01;
7661		- }
	7346	+
7662	7347	double vScale = (double) (info.y - centerPt.y) / 32;
7663		- if (vScale < 0.01)
	7348	+ sign = 1;
	7349	+ if (vScale < 0)
7664	7350	{
7665		- vScale = 0.01;
	7351	+ sign = -1;
7666	7352	}
7667		- vScale = Math.pow(vScale, scale * 50);
	7353	+ vScale = signMath.pow(signvScale, scale * 50);
7668	7354	if (vScale < 0.01)
7669	7355	{
7670		- vScale = 0.01;
	7356	+ //vScale = 0.01;
7671	7357	}
7672	7358	LA.matCopy(startMat, toParent);
7673	7359	/**/
..	..	@@ -7678,17 +7364,24 @@
7678	7364	}
7679	7365	/**/
7680	7366
7681		- switch (info.pane.renderCamera.viewCode)
	7367	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7368	+
	7369	+ if (totalScale < 0.01)
	7370	+ {
	7371	+ totalScale = 0.01;
	7372	+ }
	7373	+
	7374	+ switch (info.pane.RenderCamera().viewCode)
7682	7375	{
7683	7376	case 3: // '\001'
7684	7377	if (modified)
7685	7378	{
7686	7379	//LA.matScale(toParent, 1, hScale, vScale);
7687		- LA.matScale(toParent, vScale, 1, 1);
	7380	+ LA.matScale(toParent, totalScale, 1, 1);
7688	7381	} // vScale, 1);
7689	7382	else
7690	7383	{
7691		- LA.matScale(toParent, vScale, vScale, vScale);
	7384	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7692	7385	} // vScale, 1);
7693	7386	break;
7694	7387
..	..	@@ -7696,10 +7389,10 @@
7696	7389	if (modified)
7697	7390	{
7698	7391	//LA.matScale(toParent, hScale, 1, vScale);
7699		- LA.matScale(toParent, 1, vScale, 1);
	7392	+ LA.matScale(toParent, 1, totalScale, 1);
7700	7393	} else
7701	7394	{
7702		- LA.matScale(toParent, vScale, 1, vScale);
	7395	+ LA.matScale(toParent, totalScale, 1, totalScale);
7703	7396	}
7704	7397	break;
7705	7398
..	..	@@ -7707,10 +7400,10 @@
7707	7400	if (modified)
7708	7401	{
7709	7402	//LA.matScale(toParent, hScale, vScale, 1);
7710		- LA.matScale(toParent, 1, 1, vScale);
	7403	+ LA.matScale(toParent, 1, 1, totalScale);
7711	7404	} else
7712	7405	{
7713		- LA.matScale(toParent, vScale, vScale, 1);
	7406	+ LA.matScale(toParent, totalScale, totalScale, 1);
7714	7407	}
7715	7408	break;
7716	7409	}
..	..	@@ -7731,7 +7424,7 @@
7731	7424	if (parent == null)
7732	7425	{
7733	7426	System.out.println("NULL PARENT");
7734		- new Exception().printStackTrace();
	7427	+ //new Exception().printStackTrace();
7735	7428	} else
7736	7429	{
7737	7430	if (parent instanceof BezierPatch)
..	..	@@ -7843,14 +7536,22 @@
7843	7536	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7844	7537	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7845	7538	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7539	+
	7540	+ String objname;
	7541	+
7846	7542	if (false) //parent != null)
7847	7543	{
7848		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7544	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7849	7545	} else
7850	7546	{
7851		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7547	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7852	7548	} // + super.toString();
7853	7549	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7550	+
	7551	+ if (!Globals.ADVANCED)
	7552	+ return objname;
	7553	+
	7554	+ return objname + " " + System.identityHashCode(this);
7854	7555	}
7855	7556
7856	7557	public int hashCode()
..	..	@@ -7906,6 +7607,7 @@
7906	7607	objectUI.closeUI();
7907	7608	if (editWindow != null)
7908	7609	{
	7610	+ editWindow.ctrlPanel.FlushUI();
7909	7611	editWindow.refreshContents();
7910	7612	} // ? new
7911	7613	objectUI = null;
..	..	@@ -7926,7 +7628,7 @@
7926	7628	/transient/ cVector2[] projectedVertices = new cVector2[0];
7927	7629
7928	7630	Object3D /Composite/ parent;
7929		- Object3D /Composite/ fileparent;
	7631	+ Object3D /Composite/ fileparent; // In the case of FileObject
7930	7632
7931	7633	double[][] toParent; // dynamic matrix
7932	7634	double[][] fromParent;
..	..	@@ -8041,7 +7743,7 @@
8041	7743	{
8042	7744	assert(bRep != null);
8043	7745	if (!(support instanceof GenericJoint)) // support.bRep != null)
8044		- GrafreeD.Assert(support.bRep == bRep.support);
	7746	+ Grafreed.Assert(support.bRep == bRep.support);
8045	7747	}
8046	7748	else
8047	7749	{
..	..	@@ -8090,9 +7792,9 @@
8090	7792	private static cVector edge2 = new cVector();
8091	7793	//private static cVector norm = new cVector();
8092	7794	/transient private/ int hitSomething;
8093		- private static final int hitCenter = 1;
8094		- private static final int hitScale = 2;
8095		- private static final int hitRotate = 3;
	7795	+ static final int hitCenter = 1;
	7796	+ static final int hitScale = 2;
	7797	+ static final int hitRotate = 3;
8096	7798	/transient/ /private/ int viewCode; // Now used for transparency cache flag
8097	7799	/transient/ private Point centerPt;
8098	7800	/transient/ private int startX;
..	..	@@ -8124,6 +7826,8 @@
8124	7826	{
8125	7827	Object3D targ = this;
8126	7828
	7829	+ targ.NORMALPUSH = obj.NORMALPUSH;
	7830	+
8127	7831	if (obj.material != null)
8128	7832	{
8129	7833	if ((mask&MATERIAL)!=0) // ==(COLOR\|MATERIAL))