~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
..	..	@@ -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()
..	..	@@ -1451,7 +1541,7 @@
1451	1541	BoundaryRep.SEUIL = other.material.cameralight;
1452	1542
1453	1543	// Set default to 0.1
1454		- BoundaryRep.SEUIL /= 2;
	1544	+ BoundaryRep.SEUIL /= 4; // 2;
1455	1545	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1456	1546	}
1457	1547
..	..	@@ -1710,7 +1800,7 @@
1710	1800	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1711	1801	o.bRep = transientrep;
1712	1802	if (clone)
1713		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1803	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1714	1804	o.CreateMaterial();
1715	1805	o.SetAttributes(this, -1);
1716	1806	//parent
..	..	@@ -1723,7 +1813,7 @@
1723	1813	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1724	1814	o.bRep = bRep;
1725	1815	if (clone)
1726		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1816	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1727	1817	o.CreateMaterial();
1728	1818	//o.overwriteThis(this, -1);
1729	1819	o.SetAttributes(this, -1);
..	..	@@ -1810,12 +1900,15 @@
1810	1900	if (obj.name == null)
1811	1901	continue; // can't be a null one
1812	1902
	1903	+ // Try perfect match first.
1813	1904	if (n.equals(obj.name))
1814	1905	{
1815	1906	theobj = obj;
1816	1907	count++;
1817	1908	}
1818	1909	}
	1910	+
	1911	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1819	1912
1820	1913	if (count != 1)
1821	1914	for (int i=Size(); --i>=0;)
..	..	@@ -2130,15 +2223,8 @@
2130	2223	if (/parent != null &&/ material == null)
2131	2224	{
2132	2225	material = new cMaterial(GetMaterial());
2133		- if (projectedVertices == null \|\| projectedVertices.length <= 2)
2134		- {
2135		- projectedVertices = new Object3D.cVector2[3];
2136		- }
2137		- for (int i = 0; i < 3; i++)
2138		- {
2139		- projectedVertices[i] = new cVector2(); // Others
2140		- }
2141		- projectedVertices[0].x = 100; // bump
	2226	+
	2227	+ InitOthers();
2142	2228
2143	2229	if (this instanceof Camera)
2144	2230	{
..	..	@@ -2288,6 +2374,7 @@
2288	2374	{
2289	2375	if (newWindow)
2290	2376	{
	2377	+ new Exception().printStackTrace();
2291	2378	System.exit(0);
2292	2379	if (parent != null)
2293	2380	{
..	..	@@ -2464,13 +2551,13 @@
2464	2551	return retval;
2465	2552	}
2466	2553
2467		- void doEditDrag(ClickInfo info)
	2554	+ void doEditDrag(ClickInfo info, boolean opposite)
2468	2555	{
2469	2556	switch (doSomething)
2470	2557	{
2471	2558	case 1: // '\001'
2472	2559	//super.
2473		- doEditDrag0(info);
	2560	+ doEditDrag0(info, opposite);
2474	2561	break;
2475	2562
2476	2563	case 2: // '\002'
..	..	@@ -2483,11 +2570,11 @@
2483	2570	{
2484	2571	//sel.hitSomething = childToDrag.hitSomething;
2485	2572	//childToDrag.doEditDrag(info);
2486		- sel.doEditDrag(info);
	2573	+ sel.doEditDrag(info, opposite);
2487	2574	} else
2488	2575	{
2489	2576	//super.
2490		- doEditDrag0(info);
	2577	+ doEditDrag0(info, opposite);
2491	2578	}
2492	2579	}
2493	2580	break;
..	..	@@ -2894,7 +2981,8 @@
2894	2981	{
2895	2982	if (bRep != null)
2896	2983	{
2897		- bRep.GenUV();
	2984	+ bRep.GenUV(); //1);
	2985	+ //bRep.UnfoldUV();
2898	2986	Touch();
2899	2987	}
2900	2988	}
..	..	@@ -2969,6 +3057,33 @@
2969	3057	blockloop = false;
2970	3058	}
2971	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	+
2972	3087	void TransformGeometry()
2973	3088	{
2974	3089	Object3D obj = this;
..	..	@@ -3190,9 +3305,11 @@
3190	3305
3191	3306	BoundaryRep sup = bRep.support;
3192	3307	bRep.support = null;
3193		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3308	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3194	3309	// bRep.SplitInTwo(onlyone); // thread...
3195		- temprep.SplitInTwo(reduction34, onlyone);
	3310	+
	3311	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3312	+
3196	3313	bRep = temprep;
3197	3314	bRep.support = sup;
3198	3315	Touch();
..	..	@@ -3714,7 +3831,7 @@
3714	3831	if (child == null)
3715	3832	continue;
3716	3833
3717		- if (GrafreeD.RENDERME > 0)
	3834	+ if (Grafreed.RENDERME > 0)
3718	3835	{
3719	3836	if (child instanceof Merge)
3720	3837	((Merge)child).renderme();
..	..	@@ -3865,7 +3982,7 @@
3865	3982	if (child == null)
3866	3983	continue;
3867	3984
3868		- if (GrafreeD.RENDERME > 0)
	3985	+ if (Grafreed.RENDERME > 0)
3869	3986	{
3870	3987	if (child instanceof Merge)
3871	3988	((Merge)child).renderme();
..	..	@@ -4060,7 +4177,7 @@
4060	4177	if (child == null)
4061	4178	continue;
4062	4179
4063		- if (GrafreeD.RENDERME > 0)
	4180	+ if (Grafreed.RENDERME > 0)
4064	4181	{
4065	4182	if (child instanceof Merge)
4066	4183	((Merge)child).renderme();
..	..	@@ -4157,6 +4274,22 @@
4157	4274	}
4158	4275	blockloop = true;
4159	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();
4160	4293	blockloop = false;
4161	4294	}
4162	4295	}
..	..	@@ -4651,7 +4784,7 @@
4651	4784
4652	4785	cTreePath SelectLeaf(int indexcount, boolean deselect)
4653	4786	{
4654		- if (hide)
	4787	+ if (hide \|\| dontselect)
4655	4788	return null;
4656	4789
4657	4790	if (count <= 0)
..	..	@@ -4677,7 +4810,7 @@
4677	4810
4678	4811	cTreePath Select(int indexcount, boolean deselect)
4679	4812	{
4680		- if (hide)
	4813	+ if (hide \|\| dontselect)
4681	4814	return null;
4682	4815
4683	4816	if (count <= 0)
..	..	@@ -4827,7 +4960,7 @@
4827	4960	return globalTransform;
4828	4961	}
4829	4962
4830		- void PreprocessOcclusion(CameraPane cp)
	4963	+ void PreprocessOcclusion(iCameraPane cp)
4831	4964	{
4832	4965	/*
4833	4966	if (AOdone)
..	..	@@ -4974,7 +5107,8 @@
4974	5107	} else //
4975	5108	if (editWindow != null)
4976	5109	{
4977		- editWindow.cameraView.lighttouched = true;
	5110	+ //editWindow.cameraView.lighttouched = true;
	5111	+ Globals.lighttouched = true;
4978	5112	}
4979	5113	}
4980	5114
..	..	@@ -5128,10 +5262,34 @@
5128	5262
5129	5263	// System.out.println("Fullname = " + fullname);
5130	5264
5131		- if (fullname.name.indexOf(":") == -1)
5132		- 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(":"));
5133	5270
5134		- 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];
5135	5293	}
5136	5294
5137	5295	static String GetBump(cTexture fullname)
..	..	@@ -5140,10 +5298,38 @@
5140	5298	return "";
5141	5299
5142	5300	// System.out.println("Fullname = " + fullname);
5143		- if (fullname.name.indexOf(":") == -1)
5144		- return "";
5145		-
5146		- 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];
5147	5333	}
5148	5334
5149	5335	String GetPigmentTexture()
..	..	@@ -5217,7 +5403,7 @@
5217	5403	System.out.print("; textures = " + textures);
5218	5404	System.out.println("; usedtextures = " + usedtextures);
5219	5405
5220		- if (GetTextures() == null)
	5406	+ if (GetTextures() == null) // What is that??
5221	5407	GetTextures().name = ":";
5222	5408
5223	5409	String texname = tex;
..	..	@@ -5248,6 +5434,43 @@
5248	5434	child.ResetPigmentTexture();
5249	5435	blockloop = false;
5250	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;
5251	5474	}
5252	5475
5253	5476	void SetBumpTexture(String tex)
..	..	@@ -5286,25 +5509,22 @@
5286	5509	}
5287	5510	}
5288	5511
5289		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5512	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5290	5513	{
5291	5514	Draw(display, root, selected, blocked);
5292	5515	}
5293	5516
5294		- static cMaterial[] materialstack = new cMaterial[65536];
5295		- static boolean[] selectedstack = new boolean[65536];
5296		- static int materialdepth = 0;
5297		-
5298	5517	boolean NeedSupport()
5299	5518	{
5300	5519	return
5301		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5520	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
5302	5521	// PROBLEM with CROWD!!
5303		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	5522	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5304	5523	}
5305	5524
	5525	+ static boolean DEBUG_SELECTION = false;
5306	5526
5307		- void Draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5527	+ void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5308	5528	{
5309	5529	Invariants(); // june 2013
5310	5530
..	..	@@ -5313,8 +5533,8 @@
5313	5533	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5314	5534	}
5315	5535
5316		- if (display.drawMode == CameraPane.SELECTION &&
5317		- hide)
	5536	+ if (display.DrawMode() == iCameraPane.SELECTION &&
	5537	+ (hide \|\| dontselect))
5318	5538	return;
5319	5539
5320	5540	if (name != null && name.contains("sclera"))
..	..	@@ -5332,7 +5552,7 @@
5332	5552	if (this instanceof Checker)
5333	5553	return;
5334	5554
5335		- if (display.drawMode == display.SHADOW && PASSTEST)
	5555	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5336	5556	return;
5337	5557
5338	5558	if (count <= 0)
..	..	@@ -5340,13 +5560,13 @@
5340	5560	return;
5341	5561	}
5342	5562
5343		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5344		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5563	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	5564	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5345	5565	{
5346	5566	return;
5347	5567	}
5348	5568
5349		- javax.media.opengl.GL gl = display.GetGL();
	5569	+ //javax.media.opengl.GL gl = display.GetGL();
5350	5570
5351	5571	/*
5352	5572	if (touched)
..	..	@@ -5382,15 +5602,15 @@
5382	5602
5383	5603	boolean compiled = false;
5384	5604
5385		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5605	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5386	5606
5387		- if (!selectmode && //display.drawMode != display.SELECTION &&
	5607	+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
5388	5608	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5389	5609	{
5390		- display.lighttouched = true;
	5610	+ Globals.lighttouched = true;
5391	5611	} // all panes...
5392		- //if (usecalllists && display.drawMode != display.SELECTION && display.drawMode != display.SHADOW &&
5393		- 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 &&
5394	5614	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5395	5615	{
5396	5616	if (!(this instanceof Composite))
..	..	@@ -5398,7 +5618,7 @@
5398	5618	//if (displaylist == -1 && usecalllists)
5399	5619	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5400	5620	{
5401		- bRep.displaylist = gl.glGenLists(1);
	5621	+ bRep.displaylist = display.GenList();
5402	5622	assert(bRep.displaylist != 0);
5403	5623	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5404	5624	//System.out.println("\tgen list " + list);
..	..	@@ -5410,18 +5630,20 @@
5410	5630	if (usecalllists)
5411	5631	{
5412	5632	// System.err.println("new list " + bRep.displaylist + " for " + this);
5413		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5633	+ display.NewList(bRep.displaylist);
5414	5634	}
	5635	+
5415	5636	CallList(display, root, selected, blocked);
	5637	+
5416	5638	// compiled = true;
5417	5639	if (usecalllists)
5418	5640	{
5419	5641	// System.err.println("end list " + bRep.displaylist + " for " + this);
5420		- gl.glEndList();
	5642	+ display.EndList();
5421	5643	}
5422	5644	//gl.glDrawBuffer(gl.GL_BACK);
5423	5645	// XXX touched = false;
5424		- display.lighttouched = true; // all panes...
	5646	+ Globals.lighttouched = true; // all panes...
5425	5647	}
5426	5648
5427	5649	touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
..	..	@@ -5460,12 +5682,12 @@
5460	5682
5461	5683	// frustum culling
5462	5684	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5463		- && display.drawMode != CameraPane.SELECTION)
	5685	+ && display.DrawMode() != iCameraPane.SELECTION)
5464	5686	{
5465		- if (display.drawMode == CameraPane.SHADOW)
	5687	+ if (display.DrawMode() == iCameraPane.SHADOW)
5466	5688	{
5467	5689	if (!link2master // tricky to cull in shadow mode.
5468		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	5690	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5469	5691	{
5470	5692	//System.out.print("CULLED");
5471	5693	culled = true;
..	..	@@ -5473,7 +5695,7 @@
5473	5695	}
5474	5696	else
5475	5697	//GetBRep().getBounds(v0, v1, this);
5476		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	5698	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5477	5699	culled = true;
5478	5700
5479	5701	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5509,11 +5731,11 @@
5509	5731
5510	5732
5511	5733	if (!culled)
5512		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	5734	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5513	5735	{
5514	5736	if (GetBRep() != null)
5515	5737	{
5516		- CameraPane.NextIndex(this, gl);
	5738	+ display.NextIndex();
5517	5739	// vertex color conflict : gl.glCallList(list);
5518	5740	DrawNode(display, root, selected);
5519	5741	if (this instanceof BezierPatch)
..	..	@@ -5535,55 +5757,7 @@
5535	5757	color[2] /= 2;
5536	5758	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5537	5759	*/
5538		- if (material != null)
5539		- {
5540		- materialstack[materialdepth] = material;
5541		- selectedstack[materialdepth] = selected;
5542		- cStatic.objectstack[materialdepth++] = this;
5543		- //System.out.println("material " + material);
5544		- //Applet3D.tracein(this, selected);
5545		- display.vector2buffer = projectedVertices;
5546		- if (this instanceof Camera)
5547		- {
5548		- display.options1[0] = material.shift;
5549		- //System.out.println("shift " + material.shift);
5550		- display.options1[1] = material.lightarea;
5551		- display.options1[2] = material.shadowbias;
5552		- display.options1[3] = material.aniso;
5553		- display.options1[4] = material.anisoV;
5554		- display.options2[0] = material.opacity;
5555		- display.options2[1] = material.diffuse;
5556		- display.options2[2] = material.factor;
5557		-
5558		- cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
5559		- display.options4[0] = material.cameralight/0.2f;
5560		- display.options4[1] = material.subsurface;
5561		- display.options4[2] = material.sheen;
5562		-
5563		- // if (display.CURRENTANTIALIAS > 0)
5564		- // display.options3[3] /= 4;
5565		-
5566		- /*
5567		- System.out.println("Focus = " + display.options1[0]);
5568		- System.out.println("Aperture = " + display.options1[1]);
5569		- System.out.println("ShadowBlur = " + display.options1[2]);
5570		- System.out.println("Antialiasing = " + display.options1[3]);
5571		- System.out.println("Fog = " + display.options2[0]);
5572		- System.out.println("Intensity = " + display.options2[1]);
5573		- System.out.println("Elevation = " + display.options2[2]);
5574		- /**/
5575		- } else
5576		- {
5577		- material.Draw(display, selected);
5578		- }
5579		- } else
5580		- {
5581		- if (selected && CameraPane.flash)
5582		- {
5583		- display.modelParams4[1] = 100;
5584		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5585		- }
5586		- }
	5760	+ display.PushMaterial(this, selected);
5587	5761
5588	5762	//System.out.println("call list " + list);
5589	5763	//System.out.println();
..	..	@@ -5602,7 +5776,17 @@
5602	5776	tex = GetTextures();
5603	5777	}
5604	5778
5605		- 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	+ }
5606	5790
5607	5791	if (!compiled)
5608	5792	{
..	..	@@ -5618,30 +5802,16 @@
5618	5802
5619	5803	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5620	5804	assert(bRep.displaylist != 0);
5621		- gl.glCallList(bRep.displaylist);
	5805	+ display.CallList(bRep.displaylist);
5622	5806	// june 2013 drawSelf(display, root, selected);
5623	5807	}
5624	5808	}
5625	5809	}
5626	5810
5627		- display.ReleaseTextures(tex);
5628		-
5629		- //if (parent != null && parent.GetMaterial() != null)
5630		- // parent.GetMaterial().Draw(display, parent.IsSelected(this));
5631		- if (material != null)
5632		- {
5633		- materialdepth -= 1;
5634		- if (materialdepth > 0)
5635		- {
5636		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5637		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5638		- }
5639		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5640		- } else if (selected && CameraPane.flash && GetMaterial() != null)
5641		- {
5642		- display.modelParams4[1] = GetMaterial().cameralight;
5643		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5644		- }
	5811	+ if (!failed)
	5812	+ display.ReleaseTextures(tex);
	5813	+
	5814	+ display.PopMaterial(this, selected);
5645	5815	}
5646	5816
5647	5817	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5683,7 +5853,7 @@
5683	5853	// resetMasterNode();
5684	5854	}
5685	5855
5686		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5856	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5687	5857	{
5688	5858	if (GetBRep() == null)
5689	5859	{
..	..	@@ -5766,8 +5936,11 @@
5766	5936	boolean flipV = false; // true;
5767	5937	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5768	5938
5769		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5939	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5770	5940	{
	5941	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	5942	+ return;
	5943	+
5771	5944	if (hide)
5772	5945	return;
5773	5946	// shadow optimisation
..	..	@@ -5825,16 +5998,7 @@
5825	5998	// // ??????????????????????????? Touch();
5826	5999	// }
5827	6000
5828		- if (material != null)
5829		- {
5830		- materialstack[materialdepth] = material;
5831		- selectedstack[materialdepth] = selected;
5832		- cStatic.objectstack[materialdepth++] = this;
5833		- //System.out.println("material " + material);
5834		- //Applet3D.tracein("selected ", selected);
5835		- display.vector2buffer = projectedVertices;
5836		- material.Draw(display, selected);
5837		- }
	6001	+display.PushMaterial2(this, selected);
5838	6002
5839	6003	Object3D child;
5840	6004	boolean sel;
..	..	@@ -5886,19 +6050,7 @@
5886	6050	*/
5887	6051	//depth += 1;
5888	6052
5889		- if (material != null)
5890		- {
5891		- materialdepth -= 1;
5892		- if (materialdepth > 0)
5893		- {
5894		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5895		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5896		- }
5897		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5898		- //else
5899		- //material.Draw(display, false);
5900		- }
5901		-
	6053	+display.PopMaterial2(this);
5902	6054	/*
5903	6055	display.ReleaseTextures(tex);
5904	6056	*/
..	..	@@ -5909,10 +6061,13 @@
5909	6061
5910	6062	//static cVector min,max;
5911	6063
5912		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	6064	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5913	6065	{
5914		- 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)
5915	6067	return; // no shadow for transparent objects
	6068	+
	6069	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6070	+ return;
5916	6071
5917	6072	if (hide)
5918	6073	return;
..	..	@@ -5954,11 +6109,12 @@
5954	6109	return;
5955	6110	}
5956	6111
	6112	+ //bRep.GenUV(1/material.diffuseness);
5957	6113	// bRep.lock = true;
5958	6114
5959		- javax.media.opengl.GL gl = display.GetGL();
	6115	+ //javax.media.opengl.GL gl = display.GetGL();
5960	6116
5961		- if (CameraPane.BOXMODE) // \|\| CameraPane.movingcamera)
	6117	+ if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5962	6118	{
5963	6119	int fc = bRep.FaceCount();
5964	6120	int vc = bRep.VertexCount();
..	..	@@ -5973,23 +6129,7 @@
5973	6129
5974	6130	bRep.getMinMax(min, max, 100);
5975	6131
5976		- gl.glBegin(gl.GL_LINES);
5977		-
5978		- gl.glVertex3d(min.x, min.y, min.z);
5979		- gl.glVertex3d(min.x, min.y, max.z);
5980		- gl.glVertex3d(min.x, min.y, min.z);
5981		- gl.glVertex3d(min.x, max.y, min.z);
5982		- gl.glVertex3d(min.x, min.y, min.z);
5983		- gl.glVertex3d(max.x, min.y, min.z);
5984		-
5985		- gl.glVertex3d(max.x, max.y, max.z);
5986		- gl.glVertex3d(min.x, max.y, max.z);
5987		- gl.glVertex3d(max.x, max.y, max.z);
5988		- gl.glVertex3d(max.x, min.y, max.z);
5989		- gl.glVertex3d(max.x, max.y, max.z);
5990		- gl.glVertex3d(max.x, max.y, min.z);
5991		-
5992		- gl.glEnd();
	6132	+ display.DrawBox(min, max);
5993	6133
5994	6134	return;
5995	6135	}
..	..	@@ -6033,7 +6173,7 @@
6033	6173	{
6034	6174	//throw new Error();
6035	6175
6036		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6176	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
6037	6177
6038	6178	int[] strips = bRep.getRawIndices();
6039	6179
..	..	@@ -6043,178 +6183,14 @@
6043	6183	new Exception().printStackTrace();
6044	6184	return;
6045	6185	}
6046		-
6047		- // TRIANGLE STRIP ARRAY
6048		- if (bRep.trimmed)
6049		- {
6050		- float[] v = bRep.getRawVertices();
6051		- float[] n = bRep.getRawNormals();
6052		- float[] c = bRep.getRawColors();
6053		- float[] uv = bRep.getRawUVMap();
6054		-
6055		- int count2 = 0;
6056		- int count3 = 0;
6057		-
6058		- if (n.length > 0)
6059		- {
6060		- for (int i = 0; i < strips.length; i++)
6061		- {
6062		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6063		-
6064		- /*
6065		- boolean locked = false;
6066		- float eps = 0.1f;
6067		- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6068		-
6069		- int dot = 0;
6070		-
6071		- if ((dot&1) == 0)
6072		- dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6073		-
6074		- if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6075		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6076		- else
6077		- {
6078		- locked = true;
6079		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6080		- }
6081		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6082		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6083		- if (hasnorm)
6084		- {
6085		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6086		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6087		- }
6088		-
6089		- if ((dot&4) == 0)
6090		- dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6091		-
6092		- if (wrap \|\| !locked && (dot&8) != 0)
6093		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6094		- else
6095		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6096		-
6097		- f.dot = dot;
6098		- */
6099		-
6100		- if (!selectmode)
6101		- {
6102		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6103		- {
6104		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6105		- } else
6106		- {
6107		- gl.glNormal3f(0, 0, 1);
6108		- }
6109		-
6110		- if (c != null)
6111		- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
6112		- {
6113		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6114		- }
6115		- }
6116		- if (flipV)
6117		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6118		- else
6119		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6120		- //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6121		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6122		-
6123		- count2 += 2;
6124		- count3 += 3;
6125		- if (!selectmode)
6126		- {
6127		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6128		- {
6129		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6130		- } else
6131		- {
6132		- gl.glNormal3f(0, 0, 1);
6133		- }
6134		- if (c != null)
6135		- {
6136		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6137		- }
6138		- }
6139		- if (flipV)
6140		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6141		- else
6142		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6143		- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6144		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6145		-
6146		- count2 += 2;
6147		- count3 += 3;
6148		- for (int j = 0; j < strips[i] - 2; j++)
6149		- {
6150		- //gl.glTexCoord2d(...);
6151		- if (!selectmode)
6152		- {
6153		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6154		- {
6155		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6156		- } else
6157		- {
6158		- gl.glNormal3f(0, 0, 1);
6159		- }
6160		- if (c != null)
6161		- {
6162		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6163		- }
6164		- }
6165		-
6166		- if (flipV)
6167		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6168		- else
6169		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6170		- //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6171		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6172		- count2 += 2;
6173		- count3 += 3;
6174		- }
6175		-
6176		- gl.glEnd();
6177		- }
6178		- }
6179		-
6180		- assert count3 == v.length;
6181		- }
6182		- else // !trimmed
6183		- {
6184		- int count = 0;
6185		- for (int i = 0; i < strips.length; i++)
6186		- {
6187		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6188		-
6189		- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6190		- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6191		-
6192		- drawVertex(gl, p, selectmode);
6193		- drawVertex(gl, q, selectmode);
6194		-
6195		- for (int j = 0; j < strips[i] - 2; j++)
6196		- {
6197		- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6198		-
6199		-// if (j%2 == 0)
6200		-// drawFace(p, q, r, display, null);
6201		-// else
6202		-// drawFace(p, r, q, display, null);
6203		-
6204		-// p = q;
6205		-// q = r;
6206		- drawVertex(gl, r, selectmode);
6207		- }
6208		-
6209		- gl.glEnd();
6210		- }
6211		- }
	6186	+
	6187	+ display.DrawGeometry(bRep, flipV, selectmode);
6212	6188	} else // catch (Error e)
6213	6189	{
6214	6190	// TRIANGLE ARRAY
6215	6191	if (IsOpaque()) // Static())
6216	6192	{
6217		- gl.glBegin(gl.GL_TRIANGLES);
	6193	+ display.StartTriangles();
6218	6194	int facecount = bRep.FaceCount();
6219	6195	for (int i = 0; i < facecount; i++)
6220	6196	{
..	..	@@ -6277,9 +6253,9 @@
6277	6253	// // r.norm.dot(v3) > -0.5)
6278	6254	// // continue;
6279	6255
6280		- drawFace(p, q, r, display, face);
	6256	+ display.DrawFace(this, p, q, r, face);
6281	6257	}
6282		- gl.glEnd();
	6258	+ display.EndTriangles();
6283	6259	}
6284	6260	else
6285	6261	{
..	..	@@ -6308,8 +6284,8 @@
6308	6284	//System.out.println("SORT");
6309	6285
6310	6286	java.util.Arrays.sort(facescompare);
6311		-
6312		- gl.glBegin(gl.GL_TRIANGLES);
	6287	+
	6288	+ display.StartTriangles();
6313	6289	for (int i = 0; i < facecount; i++)
6314	6290	{
6315	6291	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6321,13 +6297,14 @@
6321	6297	Vertex q = bRep.GetVertex(face.q);
6322	6298	Vertex r = bRep.GetVertex(face.r);
6323	6299
6324		- drawFace(p, q, r, display, face);
	6300	+ display.DrawFace(this, p, q, r, face);
6325	6301	}
6326		- gl.glEnd();
	6302	+ display.EndTriangles();
6327	6303	}
6328	6304
6329	6305	if (false) // live && support != null && support.bRep != null) // debug weights
6330	6306	{
	6307	+ /*
6331	6308	gl.glDisable(gl.GL_LIGHTING);
6332	6309	float[] colorV = new float[3];
6333	6310
..	..	@@ -6406,6 +6383,7 @@
6406	6383	// gl.glEnd();
6407	6384	}
6408	6385	}
	6386	+ */
6409	6387	}
6410	6388	}
6411	6389
..	..	@@ -6450,7 +6428,7 @@
6450	6428	center.add(r);
6451	6429	center.mul(1.0/3);
6452	6430
6453		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6431	+ center.sub(Globals.theRenderer.EyeCamera().location);
6454	6432
6455	6433	distance = center.dot(center);
6456	6434	}
..	..	@@ -6461,347 +6439,11 @@
6461	6439
6462	6440	transient FaceCompare[] facescompare = null;
6463	6441
6464		- void SetColor(CameraPane display, Vertex p0)
6465		- {
6466		- if (display.RENDERPROGRAM == 0)
6467		- {
6468		- float r = 0;
6469		- if (bRep != null)
6470		- {
6471		- if (bRep.stripified)
6472		- {
6473		- r = 1;
6474		- }
6475		- }
6476		- float g = 0;
6477		- if (bRep != null)
6478		- {
6479		- if (bRep.trimmed)
6480		- {
6481		- g = 1;
6482		- }
6483		- }
6484		- float b = 0;
6485		- if (support != null && link2master)
6486		- {
6487		- b = 1;
6488		- }
6489		- display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
6490		- return;
6491		- }
6492		-
6493		- if (display.drawMode != CameraPane.SHADOW)
6494		- return;
6495		-
6496		- javax.media.opengl.GL gl = display.GetGL();
6497		-// if (true) return;
6498		-// float ao = p.AO;
6499		-//
6500		-// // if (ao == 0 && !bRep.AOdone) // transient problem!
6501		-// // ao = 1;
6502		-//
6503		-// gl.glColor4f(ao, ao, ao, 1);
6504		-
6505		-// CameraPane.selectedpoint.
6506		-// getAverage(cStatic.point1, true);
6507		- if (CameraPane.pointflow == null) // !random) // live)
6508		- {
6509		- return;
6510		- }
6511		-
6512		- cStatic.point1.set(0,0,0);
6513		- LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
6514		-
6515		- cStatic.point1.sub(p0);
6516		-
6517		-
6518		-// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
6519		-// {
6520		-// return;
6521		-// }
6522		-
6523		- //if (true)
6524		- if (cStatic.point1.dot(cStatic.point1) > 0.000001)
6525		- {
6526		- return;
6527		- }
6528		-
6529		- float[] colorV = new float[3];
6530		-
6531		- if (false) // marked)
6532		- {
6533		- // debug rigging weights
6534		- for (int object = 0; object < p0.vertexlinks.length; object++)
6535		- {
6536		- float weight = p0.weights[object] / p0.totalweight;
6537		-
6538		- // if (weight < 0.1)
6539		- // {
6540		- // assert(weight == 0);
6541		- // continue;
6542		- // }
6543		-
6544		- if (p0.vertexlinks[object] == -1)
6545		- continue;
6546		-
6547		- Vertex q = support.bRep.GetVertex(p0.vertexlinks[object]);
6548		-
6549		- int color = //1 << object; //
6550		- //p.vertexlinks.length;
6551		- support.bRep.supports[p0.closestsupport].links[object];
6552		- colorV[2] += (color & 1) * weight;
6553		- colorV[1] += ((color & 2) >> 1) * weight;
6554		- colorV[0] += ((color & 4) >> 2) * weight;
6555		- }
6556		- }
6557		- else
6558		- {
6559		- if (drawingstarted)
6560		- {
6561		- // find next point
6562		- if (bRep.GetVertex(0).faceindices == null)
6563		- {
6564		- bRep.InitFaceIndices();
6565		- }
6566		-
6567		- double ymin = p0.y;
6568		-
6569		- Vertex newp = p0;
6570		-
6571		- for (int fii = 0; fii < p0.faceindices.length; fii++)
6572		- {
6573		- int fi = p0.faceindices[fii];
6574		-
6575		- if (fi == -1)
6576		- break;
6577		-
6578		- Face f = bRep.GetFace(fi);
6579		-
6580		- Vertex p = bRep.GetVertex(f.p);
6581		- Vertex q = bRep.GetVertex(f.q);
6582		- Vertex r = bRep.GetVertex(f.r);
6583		-
6584		- int swap = (int)(Math.random()*3);
6585		-
6586		-// for (int s=swap; --s>=0;)
6587		-// {
6588		-// Vertex t = p;
6589		-// p = q;
6590		-// q = r;
6591		-// r = t;
6592		-// }
6593		- if (ymin > p.y)
6594		- {
6595		- ymin = p.y;
6596		- newp = p;
6597		-// break;
6598		- }
6599		- if (ymin > q.y)
6600		- {
6601		- ymin = q.y;
6602		- newp = q;
6603		-// break;
6604		- }
6605		- if (ymin > r.y)
6606		- {
6607		- ymin = r.y;
6608		- newp = r;
6609		-// break;
6610		- }
6611		- }
6612		-
6613		- CameraPane.selectedpoint.toParent[3][0] = newp.x;
6614		- CameraPane.selectedpoint.toParent[3][1] = newp.y;
6615		- CameraPane.selectedpoint.toParent[3][2] = newp.z;
6616		-
6617		- drawingstarted = false;
6618		-
6619		- // return;
6620		- }
6621		-
6622		- if (false) // CameraPane.DRAW
6623		- {
6624		- p0.AO = colorV[0] = 2;
6625		- colorV[1] = 2;
6626		- colorV[2] = 2;
6627		- }
6628		-
6629		- CameraPane.pointflow.add(p0);
6630		- CameraPane.pointflow.Touch();
6631		- }
6632		-
6633		-// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
6634		-// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
6635		-// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
6636		- }
6637		-
6638	6442	void Print(Vertex v)
6639	6443	{
6640	6444	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6641	6445	}
6642	6446
6643		- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6644		- {
6645		- if (!selectmode)
6646		- {
6647		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6648		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6649		-
6650		- if (flipV)
6651		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6652		- else
6653		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6654		- }
6655		-
6656		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6657		- }
6658		-
6659		- void drawFace(Vertex pv, Vertex qv, Vertex rv,
6660		- CameraPane display, Face face)
6661		- {
6662		- if (pv.y == -10000 \|\|
6663		- qv.y == -10000 \|\|
6664		- rv.y == -10000)
6665		- return;
6666		-
6667		-// float b = f.nbiterations & 1;
6668		-// float g = (f.nbiterations>>1) & 1;
6669		-// float r = (f.nbiterations>>2) & 1;
6670		-//
6671		-// //if (f.weight == 10000)
6672		-// //{
6673		-// // r = 1; g = b = 0;
6674		-// //}
6675		-// //else
6676		-// //{
6677		-// // assert(f.weight < 10000);
6678		-// r = g = b = (float)bRep.FaceWeight(f)*100;
6679		-// if (r<0)
6680		-// assert(r>=0);
6681		-// //}
6682		-
6683		- javax.media.opengl.GL gl = display.GetGL();
6684		-
6685		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
6686		-
6687		- //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
6688		- if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
6689		- {
6690		- //gl.glBegin(gl.GL_TRIANGLES);
6691		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
6692		- if (!hasnorm)
6693		- {
6694		- // System.out.println("FUCK!!");
6695		- LA.vecSub(pv/.pos/, qv/.pos/, v0);
6696		- LA.vecSub(pv/.pos/, rv/.pos/, v1);
6697		- LA.vecCross(v0, v1, v2);
6698		- LA.vecNormalize(v2);
6699		- gl.glNormal3f((float) v2.x, (float) v2.y, (float) v2.z);
6700		- }
6701		-
6702		- if (hasnorm)
6703		- {
6704		-// if (!pv.norm.normalized())
6705		-// assert(pv.norm.normalized());
6706		-
6707		- //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
6708		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6709		- }
6710		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6711		- SetColor(display, pv);
6712		- //gl.glColor4f(r, g, b, 1);
6713		- //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
6714		- if (flipV)
6715		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6716		- else
6717		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6718		- //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
6719		- gl.glVertex3f((float) pv./pos./x, (float) pv./pos./y, (float) pv./pos./z);
6720		-// Print(pv);
6721		- if (hasnorm)
6722		- {
6723		-// assert(qv.norm.normalized());
6724		- //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
6725		- gl.glNormal3f((float) qv.norm.x, (float) qv.norm.y, (float) qv.norm.z);
6726		- }
6727		- //System.out.println("vertexq = " + qv.s + ", " + qv.t);
6728		- // boolean locked = false;
6729		- // float eps = 0.1f;
6730		- // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6731		-
6732		- // int dot = 0; //*/ (int)f.dot;
6733		-
6734		- // if ((dot&1) == 0)
6735		- // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6736		-
6737		- // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6738		- if (flipV)
6739		- gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
6740		- else
6741		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6742		- // else
6743		- // {
6744		- // locked = true;
6745		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6746		- // }
6747		- gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
6748		- SetColor(display, qv);
6749		- //gl.glColor4f(r, g, b, 1);
6750		- //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
6751		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6752		- gl.glVertex3f((float) qv./pos./x, (float) qv./pos./y, (float) qv./pos./z);
6753		-// Print(qv);
6754		- if (hasnorm)
6755		- {
6756		-// assert(rv.norm.normalized());
6757		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6758		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6759		- }
6760		-
6761		- // if ((dot&4) == 0)
6762		- // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6763		-
6764		- // if (wrap \|\| !locked && (dot&8) != 0)
6765		- if (flipV)
6766		- gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
6767		- else
6768		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6769		- // else
6770		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6771		-
6772		- // f.dot = dot;
6773		-
6774		- gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
6775		- SetColor(display, rv);
6776		- //gl.glColor4f(r, g, b, 1);
6777		- //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
6778		- //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
6779		- gl.glVertex3f((float) rv./pos./x, (float) rv./pos./y, (float) rv./pos./z);
6780		-// Print(rv);
6781		- //gl.glEnd();
6782		- }
6783		- else
6784		- {
6785		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6786		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6787		- gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
6788		-
6789		- }
6790		-
6791		- if (false) // (attributes & WIREFRAME) != 0)
6792		- {
6793		- gl.glDisable(gl.GL_LIGHTING);
6794		-
6795		- gl.glBegin(gl.GL_LINE_LOOP);
6796		- gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
6797		- gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
6798		- gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
6799		- gl.glEnd();
6800		-
6801		- gl.glEnable(gl.GL_LIGHTING);
6802		- }
6803		- }
6804		-
6805	6447	void drawSelf(ClickInfo info, int level, boolean select)
6806	6448	{
6807	6449	if (bRep == null)
..	..	@@ -7373,83 +7015,83 @@
7373	7015	int spotw = spot.x + spot.width;
7374	7016	int spoth = spot.y + spot.height;
7375	7017	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7376		- if (CameraPane.Xmin > spot.x)
7377		- {
7378		- CameraPane.Xmin = spot.x;
7379		- }
7380		- if (CameraPane.Xmax < spotw)
7381		- {
7382		- CameraPane.Xmax = spotw;
7383		- }
7384		- if (CameraPane.Ymin > spot.y)
7385		- {
7386		- CameraPane.Ymin = spot.y;
7387		- }
7388		- if (CameraPane.Ymax < spoth)
7389		- {
7390		- CameraPane.Ymax = spoth;
7391		- }
	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	+// }
7392	7034	spot.translate(32, 32);
7393	7035	spotw = spot.x + spot.width;
7394	7036	spoth = spot.y + spot.height;
7395	7037	info.g.setColor(Color.blue);
7396	7038	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7397		- if (CameraPane.Xmin > spot.x)
7398		- {
7399		- CameraPane.Xmin = spot.x;
7400		- }
7401		- if (CameraPane.Xmax < spotw)
7402		- {
7403		- CameraPane.Xmax = spotw;
7404		- }
7405		- if (CameraPane.Ymin > spot.y)
7406		- {
7407		- CameraPane.Ymin = spot.y;
7408		- }
7409		- if (CameraPane.Ymax < spoth)
7410		- {
7411		- CameraPane.Ymax = spoth;
7412		- }
7413		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7414		- 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);
7415	7057	spot.translate(0, -32);
7416	7058	info.g.setColor(Color.green);
7417	7059	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7418		- if (CameraPane.Xmin > spot.x)
7419		- {
7420		- CameraPane.Xmin = spot.x;
7421		- }
7422		- if (CameraPane.Xmax < spotw)
7423		- {
7424		- CameraPane.Xmax = spotw;
7425		- }
7426		- if (CameraPane.Ymin > spot.y)
7427		- {
7428		- CameraPane.Ymin = spot.y;
7429		- }
7430		- if (CameraPane.Ymax < spoth)
7431		- {
7432		- CameraPane.Ymax = spoth;
7433		- }
	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	+// }
7434	7076	info.g.drawArc(boundary.x, boundary.y,
7435	7077	boundary.width, boundary.height, 0, 360);
7436	7078	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7437		- if (CameraPane.Xmin > boundary.x)
7438		- {
7439		- CameraPane.Xmin = boundary.x;
7440		- }
7441		- if (CameraPane.Xmax < boundary.x + boundary.width)
7442		- {
7443		- CameraPane.Xmax = boundary.x + boundary.width;
7444		- }
7445		- if (CameraPane.Ymin > boundary.y)
7446		- {
7447		- CameraPane.Ymin = boundary.y;
7448		- }
7449		- if (CameraPane.Ymax < boundary.y + boundary.height)
7450		- {
7451		- CameraPane.Ymax = boundary.y + boundary.height;
7452		- }
	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	+// }
7453	7095	return;
7454	7096	}
7455	7097	}
..	..	@@ -7466,7 +7108,7 @@
7466	7108	startX = info.x;
7467	7109	startY = info.y;
7468	7110
7469		- hitSomething = 0;
	7111	+ hitSomething = -1;
7470	7112	cVector origin = new cVector();
7471	7113	//LA.xformPos(origin, toParent, origin);
7472	7114	Rectangle spot = new Rectangle();
..	..	@@ -7499,7 +7141,7 @@
7499	7141	}
7500	7142
7501	7143	//System.out.println("info.modifiers = " + info.modifiers);
7502		- modified = (info.modifiers & CameraPane.META) != 0;
	7144	+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7503	7145	//System.out.println("modified = " + modified);
7504	7146	//new Exception().printStackTrace();
7505	7147	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7527,7 +7169,7 @@
7527	7169	return true;
7528	7170	}
7529	7171
7530		- void doEditDrag0(ClickInfo info)
	7172	+ void doEditDrag0(ClickInfo info, boolean opposite)
7531	7173	{
7532	7174	if (hitSomething == 0)
7533	7175	{
..	..	@@ -7542,6 +7184,7 @@
7542	7184	//System.out.println("hitSomething = " + hitSomething);
7543	7185
7544	7186	double scale = 0.005f * info.camera.Distance();
	7187	+
7545	7188	cVector xlate = new cVector();
7546	7189	//cVector xlate2 = new cVector();
7547	7190	switch (hitSomething)
..	..	@@ -7552,9 +7195,9 @@
7552	7195
7553	7196	case hitCenter: // Translate
7554	7197
7555		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7198	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7556	7199
7557		- if (modified)
	7200	+ if (modified \|\| opposite)
7558	7201	{
7559	7202	//assert(false);
7560	7203	/*
..	..	@@ -7600,10 +7243,10 @@
7600	7243	}
7601	7244	LA.xformDir(up, ClickInfo.matbuffer, up);
7602	7245	// if (!CameraPane.LOCALTRANSFORM)
7603		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
	7246	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7604	7247	LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7605	7248	// if (!CameraPane.LOCALTRANSFORM)
7606		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7249	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7607	7250	//LA.vecCross(up, cVector.Z, right2);
7608	7251
7609	7252	cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
..	..	@@ -7648,6 +7291,7 @@
7648	7291
7649	7292	if (modified)
7650	7293	{
	7294	+ // Rotate 90 degrees
7651	7295	angle /= (Math.PI / 4);
7652	7296	angle = Math.floor(angle + 0.5);
7653	7297	angle *= (Math.PI / 4);
..	..	@@ -7661,7 +7305,7 @@
7661	7305	}
7662	7306	/**/
7663	7307
7664		- switch (info.pane.renderCamera.viewCode)
	7308	+ switch (info.pane.RenderCamera().viewCode)
7665	7309	{
7666	7310	case 1: // '\001'
7667	7311	LA.matZRotate(toParent, angle);
..	..	@@ -7689,24 +7333,27 @@
7689	7333
7690	7334	case hitScale: // scale
7691	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);
7692	7342	if (hScale < 0.01)
7693	7343	{
7694		- hScale = 0.01;
	7344	+ //hScale = 0.01;
7695	7345	}
7696		- hScale = Math.pow(hScale, scale * 50);
7697		- if (hScale < 0.01)
7698		- {
7699		- hScale = 0.01;
7700		- }
	7346	+
7701	7347	double vScale = (double) (info.y - centerPt.y) / 32;
7702		- if (vScale < 0.01)
	7348	+ sign = 1;
	7349	+ if (vScale < 0)
7703	7350	{
7704		- vScale = 0.01;
	7351	+ sign = -1;
7705	7352	}
7706		- vScale = Math.pow(vScale, scale * 50);
	7353	+ vScale = signMath.pow(signvScale, scale * 50);
7707	7354	if (vScale < 0.01)
7708	7355	{
7709		- vScale = 0.01;
	7356	+ //vScale = 0.01;
7710	7357	}
7711	7358	LA.matCopy(startMat, toParent);
7712	7359	/**/
..	..	@@ -7717,17 +7364,24 @@
7717	7364	}
7718	7365	/**/
7719	7366
7720		- 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)
7721	7375	{
7722	7376	case 3: // '\001'
7723	7377	if (modified)
7724	7378	{
7725	7379	//LA.matScale(toParent, 1, hScale, vScale);
7726		- LA.matScale(toParent, vScale, 1, 1);
	7380	+ LA.matScale(toParent, totalScale, 1, 1);
7727	7381	} // vScale, 1);
7728	7382	else
7729	7383	{
7730		- LA.matScale(toParent, vScale, vScale, vScale);
	7384	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7731	7385	} // vScale, 1);
7732	7386	break;
7733	7387
..	..	@@ -7735,10 +7389,10 @@
7735	7389	if (modified)
7736	7390	{
7737	7391	//LA.matScale(toParent, hScale, 1, vScale);
7738		- LA.matScale(toParent, 1, vScale, 1);
	7392	+ LA.matScale(toParent, 1, totalScale, 1);
7739	7393	} else
7740	7394	{
7741		- LA.matScale(toParent, vScale, 1, vScale);
	7395	+ LA.matScale(toParent, totalScale, 1, totalScale);
7742	7396	}
7743	7397	break;
7744	7398
..	..	@@ -7746,10 +7400,10 @@
7746	7400	if (modified)
7747	7401	{
7748	7402	//LA.matScale(toParent, hScale, vScale, 1);
7749		- LA.matScale(toParent, 1, 1, vScale);
	7403	+ LA.matScale(toParent, 1, 1, totalScale);
7750	7404	} else
7751	7405	{
7752		- LA.matScale(toParent, vScale, vScale, 1);
	7406	+ LA.matScale(toParent, totalScale, totalScale, 1);
7753	7407	}
7754	7408	break;
7755	7409	}
..	..	@@ -7882,14 +7536,22 @@
7882	7536	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7883	7537	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7884	7538	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7539	+
	7540	+ String objname;
	7541	+
7885	7542	if (false) //parent != null)
7886	7543	{
7887		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7544	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7888	7545	} else
7889	7546	{
7890		- 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) ":"") / "";
7891	7548	} // + super.toString();
7892	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);
7893	7555	}
7894	7556
7895	7557	public int hashCode()
..	..	@@ -7945,6 +7607,7 @@
7945	7607	objectUI.closeUI();
7946	7608	if (editWindow != null)
7947	7609	{
	7610	+ editWindow.ctrlPanel.FlushUI();
7948	7611	editWindow.refreshContents();
7949	7612	} // ? new
7950	7613	objectUI = null;
..	..	@@ -7965,7 +7628,7 @@
7965	7628	/transient/ cVector2[] projectedVertices = new cVector2[0];
7966	7629
7967	7630	Object3D /Composite/ parent;
7968		- Object3D /Composite/ fileparent;
	7631	+ Object3D /Composite/ fileparent; // In the case of FileObject
7969	7632
7970	7633	double[][] toParent; // dynamic matrix
7971	7634	double[][] fromParent;
..	..	@@ -8080,7 +7743,7 @@
8080	7743	{
8081	7744	assert(bRep != null);
8082	7745	if (!(support instanceof GenericJoint)) // support.bRep != null)
8083		- GrafreeD.Assert(support.bRep == bRep.support);
	7746	+ Grafreed.Assert(support.bRep == bRep.support);
8084	7747	}
8085	7748	else
8086	7749	{
..	..	@@ -8129,9 +7792,9 @@
8129	7792	private static cVector edge2 = new cVector();
8130	7793	//private static cVector norm = new cVector();
8131	7794	/transient private/ int hitSomething;
8132		- private static final int hitCenter = 1;
8133		- private static final int hitScale = 2;
8134		- private static final int hitRotate = 3;
	7795	+ static final int hitCenter = 1;
	7796	+ static final int hitScale = 2;
	7797	+ static final int hitRotate = 3;
8135	7798	/transient/ /private/ int viewCode; // Now used for transparency cache flag
8136	7799	/transient/ private Point centerPt;
8137	7800	/transient/ private int startX;
..	..	@@ -8163,6 +7826,8 @@
8163	7826	{
8164	7827	Object3D targ = this;
8165	7828
	7829	+ targ.NORMALPUSH = obj.NORMALPUSH;
	7830	+
8166	7831	if (obj.material != null)
8167	7832	{
8168	7833	if ((mask&MATERIAL)!=0) // ==(COLOR\|MATERIAL))