~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,59 @@
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	+ return;
	170	+
	171	+ Object3D o = new Object3D();
	172	+ o.bRep = this.bRep;
	173	+ if (this.bRep != null)
	174	+ {
	175	+ o.transientrep = this.bRep.support;
	176	+ o.bRep.support = null;
	177	+ }
	178	+
	179	+// o.support = this.support;
	180	+// o.fileparent = this.fileparent;
	181	+// if (this.bRep != null)
	182	+// o.bRep = this.bRep.support;
	183	+
	184	+ hashtable.put(GetUUID(), o);
	185	+
	186	+ this.bRep = null;
	187	+// if (this.bRep != null)
	188	+// this.bRep.support = null;
	189	+// this.support = null;
	190	+// this.fileparent = null;
	191	+
	192	+ for (int i=0; i<Size(); i++)
	193	+ {
	194	+ get(i).ExtractBigData(hashtable);
	195	+ }
	196	+}
	197	+
	198	+void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	199	+{
	200	+ if (!hashtable.containsKey(GetUUID()))
	201	+ return;
	202	+
	203	+ Object3D o = hashtable.get(GetUUID());
	204	+
	205	+ this.bRep = o.bRep;
	206	+ if (this.bRep != null)
	207	+ this.bRep.support = o.transientrep;
	208	+// this.support = o.support;
	209	+// this.fileparent = o.fileparent;
	210	+
	211	+ hashtable.remove(GetUUID());
	212	+
	213	+ for (int i=0; i<Size(); i++)
	214	+ {
	215	+ get(i).RestoreBigData(hashtable);
145	216	}
146	217	}
147	218
..	..	@@ -285,8 +356,8 @@
285	356	return parent.GetName() + "#";
286	357	}
287	358
288		- boolean timeline = false;
289	359	boolean live = false;
	360	+ boolean dontselect = false;
290	361	boolean hide = false;
291	362	boolean link2master = false; // performs reset support/master at each frame
292	363	boolean marked = false; // animation node
..	..	@@ -296,6 +367,8 @@
296	367	boolean random = false;
297	368	boolean speedup = false;
298	369	boolean rewind = false;
	370	+
	371	+ float NORMALPUSH = 0;
299	372
300	373	Object3D support;
301	374
..	..	@@ -416,16 +489,16 @@
416	489	{
417	490	Object3D copy = this;
418	491
419		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	492	+ Camera parentcam = Globals.theRenderer.ManipCamera();
420	493
421		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	494	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
422	495	{
423		- parentcam = CameraPane.theRenderer.cameras[1];
	496	+ parentcam = Globals.theRenderer.Cameras()[1];
424	497	}
425	498
426		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	499	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
427	500	{
428		- parentcam = CameraPane.theRenderer.cameras[0];
	501	+ parentcam = Globals.theRenderer.Cameras()[0];
429	502	}
430	503
431	504	if (this == parentcam)
..	..	@@ -433,7 +506,7 @@
433	506	//assert(this instanceof Camera);
434	507
435	508	for (int count = parentcam.GetTransformCount(); --count>=0;)
436		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	509	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
437	510	}
438	511
439	512	copy.marked ^= true;
..	..	@@ -453,7 +526,7 @@
453	526	//assert(this instanceof Camera);
454	527
455	528	for (int count = parentcam.GetTransformCount(); --count>=0;)
456		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	529	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
457	530	}
458	531
459	532	copy.Touch(); // display list issue
..	..	@@ -588,7 +661,7 @@
588	661	return;
589	662	}
590	663
591		- if (CameraPane.fromscript)
	664	+ if (Globals.fromscript)
592	665	{
593	666	transformcount = 0;
594	667	return;
..	..	@@ -746,7 +819,7 @@
746	819
747	820	int GetTransformCount()
748	821	{
749		- // marde pour serialization de Texture
	822	+ // patch pour serialization de Texture
750	823	resetmaxcount();
751	824	resettransformcount();
752	825	resetstep();
..	..	@@ -759,7 +832,7 @@
759	832	if (step == 0)
760	833	step = 1;
761	834	if (maxcount == 0)
762		- maxcount = 2048; // 4;
	835	+ maxcount = 128; // 2048; // 4;
763	836	// if (acceleration == 0)
764	837	// acceleration = 10;
765	838	if (delay == 0) // serial
..	..	@@ -780,9 +853,12 @@
780	853	// factor = CameraPane.STEP;
781	854	// }
782	855
783		- if (marked && CameraPane.isLIVE() && live && CameraPane.drawMode == CameraPane.SHADOW && currentframe != CameraPane.framecount)
	856	+ if (marked && Globals.isLIVE() && live &&
	857	+ //TEMP21aug2018
	858	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	859	+ currentframe != Globals.framecount)
784	860	{
785		- currentframe = CameraPane.framecount;
	861	+ currentframe = Globals.framecount;
786	862
787	863	// System.err.println("transformcount = " + transformcount);
788	864	// System.err.println("factor = " + factor);
..	..	@@ -894,6 +970,11 @@
894	970	fromParent = null; // LA.newMatrix();
895	971	bRep = null; // new BoundaryRep();
896	972
	973	+ if (oname != null && oname.equals("LeftHand"))
	974	+ {
	975	+ name = oname;
	976	+ }
	977	+
897	978	/*
898	979	float hue = (float)Math.random();
899	980	Color col;
..	..	@@ -936,7 +1017,7 @@
936	1017
937	1018	public Object clone()
938	1019	{
939		- return GrafreeD.clone(this);
	1020	+ return Grafreed.clone(this);
940	1021	}
941	1022
942	1023	Object3D copyExpand()
..	..	@@ -1452,7 +1533,7 @@
1452	1533	BoundaryRep.SEUIL = other.material.cameralight;
1453	1534
1454	1535	// Set default to 0.1
1455		- BoundaryRep.SEUIL /= 2;
	1536	+ BoundaryRep.SEUIL /= 4; // 2;
1456	1537	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1457	1538	}
1458	1539
..	..	@@ -1711,7 +1792,7 @@
1711	1792	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1712	1793	o.bRep = transientrep;
1713	1794	if (clone)
1714		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1795	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1715	1796	o.CreateMaterial();
1716	1797	o.SetAttributes(this, -1);
1717	1798	//parent
..	..	@@ -1724,7 +1805,7 @@
1724	1805	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1725	1806	o.bRep = bRep;
1726	1807	if (clone)
1727		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1808	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1728	1809	o.CreateMaterial();
1729	1810	//o.overwriteThis(this, -1);
1730	1811	o.SetAttributes(this, -1);
..	..	@@ -1811,12 +1892,15 @@
1811	1892	if (obj.name == null)
1812	1893	continue; // can't be a null one
1813	1894
	1895	+ // Try perfect match first.
1814	1896	if (n.equals(obj.name))
1815	1897	{
1816	1898	theobj = obj;
1817	1899	count++;
1818	1900	}
1819	1901	}
	1902	+
	1903	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1820	1904
1821	1905	if (count != 1)
1822	1906	for (int i=Size(); --i>=0;)
..	..	@@ -2131,15 +2215,8 @@
2131	2215	if (/parent != null &&/ material == null)
2132	2216	{
2133	2217	material = new cMaterial(GetMaterial());
2134		- if (projectedVertices == null \|\| projectedVertices.length <= 2)
2135		- {
2136		- projectedVertices = new Object3D.cVector2[3];
2137		- }
2138		- for (int i = 0; i < 3; i++)
2139		- {
2140		- projectedVertices[i] = new cVector2(); // Others
2141		- }
2142		- projectedVertices[0].x = 100; // bump
	2218	+
	2219	+ InitOthers();
2143	2220
2144	2221	if (this instanceof Camera)
2145	2222	{
..	..	@@ -2289,6 +2366,7 @@
2289	2366	{
2290	2367	if (newWindow)
2291	2368	{
	2369	+ new Exception().printStackTrace();
2292	2370	System.exit(0);
2293	2371	if (parent != null)
2294	2372	{
..	..	@@ -2465,13 +2543,13 @@
2465	2543	return retval;
2466	2544	}
2467	2545
2468		- void doEditDrag(ClickInfo info)
	2546	+ void doEditDrag(ClickInfo info, boolean opposite)
2469	2547	{
2470	2548	switch (doSomething)
2471	2549	{
2472	2550	case 1: // '\001'
2473	2551	//super.
2474		- doEditDrag0(info);
	2552	+ doEditDrag0(info, opposite);
2475	2553	break;
2476	2554
2477	2555	case 2: // '\002'
..	..	@@ -2484,11 +2562,11 @@
2484	2562	{
2485	2563	//sel.hitSomething = childToDrag.hitSomething;
2486	2564	//childToDrag.doEditDrag(info);
2487		- sel.doEditDrag(info);
	2565	+ sel.doEditDrag(info, opposite);
2488	2566	} else
2489	2567	{
2490	2568	//super.
2491		- doEditDrag0(info);
	2569	+ doEditDrag0(info, opposite);
2492	2570	}
2493	2571	}
2494	2572	break;
..	..	@@ -2895,7 +2973,8 @@
2895	2973	{
2896	2974	if (bRep != null)
2897	2975	{
2898		- bRep.GenUV();
	2976	+ bRep.GenUV(); //1);
	2977	+ //bRep.UnfoldUV();
2899	2978	Touch();
2900	2979	}
2901	2980	}
..	..	@@ -2970,6 +3049,33 @@
2970	3049	blockloop = false;
2971	3050	}
2972	3051
	3052	+ void TransformChildren()
	3053	+ {
	3054	+ if (toParent != null)
	3055	+ {
	3056	+ for (int i=Size(); --i>=0;)
	3057	+ {
	3058	+ Object3D v = get(i);
	3059	+
	3060	+ if (v.toParent == null)
	3061	+ {
	3062	+ v.toParent = LA.newMatrix();
	3063	+ v.fromParent = LA.newMatrix();
	3064	+ }
	3065	+
	3066	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3067	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3068	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3069	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3070	+ }
	3071	+
	3072	+ toParent = null; // LA.matIdentity(toParent);
	3073	+ fromParent = null; // LA.matIdentity(fromParent);
	3074	+
	3075	+ Touch();
	3076	+ }
	3077	+ }
	3078	+
2973	3079	void TransformGeometry()
2974	3080	{
2975	3081	Object3D obj = this;
..	..	@@ -3191,9 +3297,11 @@
3191	3297
3192	3298	BoundaryRep sup = bRep.support;
3193	3299	bRep.support = null;
3194		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3300	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3195	3301	// bRep.SplitInTwo(onlyone); // thread...
3196		- temprep.SplitInTwo(reduction34, onlyone);
	3302	+
	3303	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3304	+
3197	3305	bRep = temprep;
3198	3306	bRep.support = sup;
3199	3307	Touch();
..	..	@@ -3715,7 +3823,7 @@
3715	3823	if (child == null)
3716	3824	continue;
3717	3825
3718		- if (GrafreeD.RENDERME > 0)
	3826	+ if (Grafreed.RENDERME > 0)
3719	3827	{
3720	3828	if (child instanceof Merge)
3721	3829	((Merge)child).renderme();
..	..	@@ -3866,7 +3974,7 @@
3866	3974	if (child == null)
3867	3975	continue;
3868	3976
3869		- if (GrafreeD.RENDERME > 0)
	3977	+ if (Grafreed.RENDERME > 0)
3870	3978	{
3871	3979	if (child instanceof Merge)
3872	3980	((Merge)child).renderme();
..	..	@@ -4061,7 +4169,7 @@
4061	4169	if (child == null)
4062	4170	continue;
4063	4171
4064		- if (GrafreeD.RENDERME > 0)
	4172	+ if (Grafreed.RENDERME > 0)
4065	4173	{
4066	4174	if (child instanceof Merge)
4067	4175	((Merge)child).renderme();
..	..	@@ -4158,6 +4266,22 @@
4158	4266	}
4159	4267	blockloop = true;
4160	4268	get(i).RepairParent();
	4269	+ blockloop = false;
	4270	+ }
	4271	+ }
	4272	+
	4273	+ void RepairShadow()
	4274	+ {
	4275	+ if (blockloop)
	4276	+ return;
	4277	+
	4278	+ if (this.material != null)
	4279	+ this.InitOthers();
	4280	+
	4281	+ for (int i=0; i<Size(); i++)
	4282	+ {
	4283	+ blockloop = true;
	4284	+ get(i).RepairShadow();
4161	4285	blockloop = false;
4162	4286	}
4163	4287	}
..	..	@@ -4652,7 +4776,7 @@
4652	4776
4653	4777	cTreePath SelectLeaf(int indexcount, boolean deselect)
4654	4778	{
4655		- if (hide)
	4779	+ if (hide \|\| dontselect)
4656	4780	return null;
4657	4781
4658	4782	if (count <= 0)
..	..	@@ -4678,7 +4802,7 @@
4678	4802
4679	4803	cTreePath Select(int indexcount, boolean deselect)
4680	4804	{
4681		- if (hide)
	4805	+ if (hide \|\| dontselect)
4682	4806	return null;
4683	4807
4684	4808	if (count <= 0)
..	..	@@ -4828,7 +4952,7 @@
4828	4952	return globalTransform;
4829	4953	}
4830	4954
4831		- void PreprocessOcclusion(CameraPane cp)
	4955	+ void PreprocessOcclusion(iCameraPane cp)
4832	4956	{
4833	4957	/*
4834	4958	if (AOdone)
..	..	@@ -4975,7 +5099,8 @@
4975	5099	} else //
4976	5100	if (editWindow != null)
4977	5101	{
4978		- editWindow.cameraView.lighttouched = true;
	5102	+ //editWindow.cameraView.lighttouched = true;
	5103	+ Globals.lighttouched = true;
4979	5104	}
4980	5105	}
4981	5106
..	..	@@ -5129,10 +5254,34 @@
5129	5254
5130	5255	// System.out.println("Fullname = " + fullname);
5131	5256
5132		- if (fullname.name.indexOf(":") == -1)
5133		- return fullname.name;
	5257	+ // Does not work on Windows due to C:
	5258	+// if (fullname.name.indexOf(":") == -1)
	5259	+// return fullname.name;
	5260	+//
	5261	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5134	5262
5135		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5263	+ String[] split = fullname.name.split(":");
	5264	+
	5265	+ if (split.length == 0)
	5266	+ {
	5267	+ return "";
	5268	+ }
	5269	+
	5270	+ if (split.length <= 2)
	5271	+ {
	5272	+ if (fullname.name.endsWith(":"))
	5273	+ {
	5274	+ // Windows
	5275	+ return fullname.name.substring(0, fullname.name.length()-1);
	5276	+ }
	5277	+
	5278	+ return split[0];
	5279	+ }
	5280	+
	5281	+ // Windows
	5282	+ assert(split.length == 4);
	5283	+
	5284	+ return split[0] + ":" + split[1];
5136	5285	}
5137	5286
5138	5287	static String GetBump(cTexture fullname)
..	..	@@ -5141,10 +5290,38 @@
5141	5290	return "";
5142	5291
5143	5292	// System.out.println("Fullname = " + fullname);
5144		- if (fullname.name.indexOf(":") == -1)
5145		- return "";
5146		-
5147		- return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5293	+ // Does not work on Windows due to C:
	5294	+// if (fullname.name.indexOf(":") == -1)
	5295	+// return "";
	5296	+//
	5297	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5298	+ String[] split = fullname.name.split(":");
	5299	+
	5300	+ if (split.length == 0)
	5301	+ {
	5302	+ return "";
	5303	+ }
	5304	+
	5305	+ if (split.length == 1)
	5306	+ {
	5307	+ return "";
	5308	+ }
	5309	+
	5310	+ if (split.length == 2)
	5311	+ {
	5312	+ if (fullname.name.endsWith(":"))
	5313	+ {
	5314	+ // Windows
	5315	+ return "";
	5316	+ }
	5317	+
	5318	+ return split[1];
	5319	+ }
	5320	+
	5321	+ // Windows
	5322	+ assert(split.length == 4);
	5323	+
	5324	+ return split[2] + ":" + split[3];
5148	5325	}
5149	5326
5150	5327	String GetPigmentTexture()
..	..	@@ -5218,7 +5395,7 @@
5218	5395	System.out.print("; textures = " + textures);
5219	5396	System.out.println("; usedtextures = " + usedtextures);
5220	5397
5221		- if (GetTextures() == null)
	5398	+ if (GetTextures() == null) // What is that??
5222	5399	GetTextures().name = ":";
5223	5400
5224	5401	String texname = tex;
..	..	@@ -5249,6 +5426,43 @@
5249	5426	child.ResetPigmentTexture();
5250	5427	blockloop = false;
5251	5428	}
	5429	+ }
	5430	+
	5431	+ UUID GetUUID()
	5432	+ {
	5433	+ if (uuid == null)
	5434	+ {
	5435	+ // Serial
	5436	+ uuid = UUID.randomUUID();
	5437	+ }
	5438	+
	5439	+ return uuid;
	5440	+ }
	5441	+
	5442	+ Object3D GetObject(UUID uid)
	5443	+ {
	5444	+ if (blockloop)
	5445	+ return null;
	5446	+
	5447	+ if (GetUUID().equals(uid))
	5448	+ return this;
	5449	+
	5450	+ int nb = Size();
	5451	+ for (int i = 0; i < nb; i++)
	5452	+ {
	5453	+ Object3D child = (Object3D) get(i);
	5454	+
	5455	+ if (child == null)
	5456	+ continue;
	5457	+
	5458	+ blockloop = true;
	5459	+ Object3D obj = child.GetObject(uid);
	5460	+ blockloop = false;
	5461	+ if (obj != null)
	5462	+ return obj;
	5463	+ }
	5464	+
	5465	+ return null;
5252	5466	}
5253	5467
5254	5468	void SetBumpTexture(String tex)
..	..	@@ -5287,25 +5501,22 @@
5287	5501	}
5288	5502	}
5289	5503
5290		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5504	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5291	5505	{
5292	5506	Draw(display, root, selected, blocked);
5293	5507	}
5294	5508
5295		- static cMaterial[] materialstack = new cMaterial[65536];
5296		- static boolean[] selectedstack = new boolean[65536];
5297		- static int materialdepth = 0;
5298		-
5299	5509	boolean NeedSupport()
5300	5510	{
5301	5511	return
5302		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5512	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
5303	5513	// PROBLEM with CROWD!!
5304		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	5514	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5305	5515	}
5306	5516
	5517	+ static boolean DEBUG_SELECTION = false;
5307	5518
5308		- void Draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5519	+ void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5309	5520	{
5310	5521	Invariants(); // june 2013
5311	5522
..	..	@@ -5314,8 +5525,8 @@
5314	5525	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5315	5526	}
5316	5527
5317		- if (display.drawMode == CameraPane.SELECTION &&
5318		- hide)
	5528	+ if (display.DrawMode() == iCameraPane.SELECTION &&
	5529	+ (hide \|\| dontselect))
5319	5530	return;
5320	5531
5321	5532	if (name != null && name.contains("sclera"))
..	..	@@ -5333,7 +5544,7 @@
5333	5544	if (this instanceof Checker)
5334	5545	return;
5335	5546
5336		- if (display.drawMode == display.SHADOW && PASSTEST)
	5547	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5337	5548	return;
5338	5549
5339	5550	if (count <= 0)
..	..	@@ -5341,13 +5552,13 @@
5341	5552	return;
5342	5553	}
5343	5554
5344		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5345		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5555	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	5556	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5346	5557	{
5347	5558	return;
5348	5559	}
5349	5560
5350		- javax.media.opengl.GL gl = display.GetGL();
	5561	+ //javax.media.opengl.GL gl = display.GetGL();
5351	5562
5352	5563	/*
5353	5564	if (touched)
..	..	@@ -5383,15 +5594,15 @@
5383	5594
5384	5595	boolean compiled = false;
5385	5596
5386		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5597	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5387	5598
5388		- if (!selectmode && //display.drawMode != display.SELECTION &&
	5599	+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
5389	5600	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5390	5601	{
5391		- display.lighttouched = true;
	5602	+ Globals.lighttouched = true;
5392	5603	} // all panes...
5393		- //if (usecalllists && display.drawMode != display.SELECTION && display.drawMode != display.SHADOW &&
5394		- if (bRep != null && usecalllists && !selectmode && // june 2013 display.drawMode != display.SHADOW &&
	5604	+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
	5605	+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5395	5606	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5396	5607	{
5397	5608	if (!(this instanceof Composite))
..	..	@@ -5399,7 +5610,7 @@
5399	5610	//if (displaylist == -1 && usecalllists)
5400	5611	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5401	5612	{
5402		- bRep.displaylist = gl.glGenLists(1);
	5613	+ bRep.displaylist = display.GenList();
5403	5614	assert(bRep.displaylist != 0);
5404	5615	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5405	5616	//System.out.println("\tgen list " + list);
..	..	@@ -5411,18 +5622,20 @@
5411	5622	if (usecalllists)
5412	5623	{
5413	5624	// System.err.println("new list " + bRep.displaylist + " for " + this);
5414		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5625	+ display.NewList(bRep.displaylist);
5415	5626	}
	5627	+
5416	5628	CallList(display, root, selected, blocked);
	5629	+
5417	5630	// compiled = true;
5418	5631	if (usecalllists)
5419	5632	{
5420	5633	// System.err.println("end list " + bRep.displaylist + " for " + this);
5421		- gl.glEndList();
	5634	+ display.EndList();
5422	5635	}
5423	5636	//gl.glDrawBuffer(gl.GL_BACK);
5424	5637	// XXX touched = false;
5425		- display.lighttouched = true; // all panes...
	5638	+ Globals.lighttouched = true; // all panes...
5426	5639	}
5427	5640
5428	5641	touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
..	..	@@ -5461,12 +5674,12 @@
5461	5674
5462	5675	// frustum culling
5463	5676	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5464		- && display.drawMode != CameraPane.SELECTION)
	5677	+ && display.DrawMode() != iCameraPane.SELECTION)
5465	5678	{
5466		- if (display.drawMode == CameraPane.SHADOW)
	5679	+ if (display.DrawMode() == iCameraPane.SHADOW)
5467	5680	{
5468	5681	if (!link2master // tricky to cull in shadow mode.
5469		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	5682	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5470	5683	{
5471	5684	//System.out.print("CULLED");
5472	5685	culled = true;
..	..	@@ -5474,7 +5687,7 @@
5474	5687	}
5475	5688	else
5476	5689	//GetBRep().getBounds(v0, v1, this);
5477		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	5690	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5478	5691	culled = true;
5479	5692
5480	5693	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5510,11 +5723,11 @@
5510	5723
5511	5724
5512	5725	if (!culled)
5513		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	5726	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5514	5727	{
5515	5728	if (GetBRep() != null)
5516	5729	{
5517		- CameraPane.NextIndex(this, gl);
	5730	+ display.NextIndex();
5518	5731	// vertex color conflict : gl.glCallList(list);
5519	5732	DrawNode(display, root, selected);
5520	5733	if (this instanceof BezierPatch)
..	..	@@ -5536,55 +5749,7 @@
5536	5749	color[2] /= 2;
5537	5750	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5538	5751	*/
5539		- if (material != null)
5540		- {
5541		- materialstack[materialdepth] = material;
5542		- selectedstack[materialdepth] = selected;
5543		- cStatic.objectstack[materialdepth++] = this;
5544		- //System.out.println("material " + material);
5545		- //Applet3D.tracein(this, selected);
5546		- display.vector2buffer = projectedVertices;
5547		- if (this instanceof Camera)
5548		- {
5549		- display.options1[0] = material.shift;
5550		- //System.out.println("shift " + material.shift);
5551		- display.options1[1] = material.lightarea;
5552		- display.options1[2] = material.shadowbias;
5553		- display.options1[3] = material.aniso;
5554		- display.options1[4] = material.anisoV;
5555		- display.options2[0] = material.opacity;
5556		- display.options2[1] = material.diffuse;
5557		- display.options2[2] = material.factor;
5558		-
5559		- cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
5560		- display.options4[0] = material.cameralight/0.2f;
5561		- display.options4[1] = material.subsurface;
5562		- display.options4[2] = material.sheen;
5563		-
5564		- // if (display.CURRENTANTIALIAS > 0)
5565		- // display.options3[3] /= 4;
5566		-
5567		- /*
5568		- System.out.println("Focus = " + display.options1[0]);
5569		- System.out.println("Aperture = " + display.options1[1]);
5570		- System.out.println("ShadowBlur = " + display.options1[2]);
5571		- System.out.println("Antialiasing = " + display.options1[3]);
5572		- System.out.println("Fog = " + display.options2[0]);
5573		- System.out.println("Intensity = " + display.options2[1]);
5574		- System.out.println("Elevation = " + display.options2[2]);
5575		- /**/
5576		- } else
5577		- {
5578		- material.Draw(display, selected);
5579		- }
5580		- } else
5581		- {
5582		- if (selected && CameraPane.flash)
5583		- {
5584		- display.modelParams4[1] = 100;
5585		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5586		- }
5587		- }
	5752	+ display.PushMaterial(this, selected);
5588	5753
5589	5754	//System.out.println("call list " + list);
5590	5755	//System.out.println();
..	..	@@ -5603,7 +5768,17 @@
5603	5768	tex = GetTextures();
5604	5769	}
5605	5770
5606		- display.BindTextures(tex, texres);
	5771	+ boolean failed = false;
	5772	+
	5773	+ try
	5774	+ {
	5775	+ display.BindTextures(tex, texres);
	5776	+ }
	5777	+ catch (Exception e)
	5778	+ {
	5779	+ System.err.println("FAILED: " + this);
	5780	+ failed = true;
	5781	+ }
5607	5782
5608	5783	if (!compiled)
5609	5784	{
..	..	@@ -5619,30 +5794,16 @@
5619	5794
5620	5795	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5621	5796	assert(bRep.displaylist != 0);
5622		- gl.glCallList(bRep.displaylist);
	5797	+ display.CallList(bRep.displaylist);
5623	5798	// june 2013 drawSelf(display, root, selected);
5624	5799	}
5625	5800	}
5626	5801	}
5627	5802
5628		- display.ReleaseTextures(tex);
5629		-
5630		- //if (parent != null && parent.GetMaterial() != null)
5631		- // parent.GetMaterial().Draw(display, parent.IsSelected(this));
5632		- if (material != null)
5633		- {
5634		- materialdepth -= 1;
5635		- if (materialdepth > 0)
5636		- {
5637		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5638		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5639		- }
5640		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5641		- } else if (selected && CameraPane.flash && GetMaterial() != null)
5642		- {
5643		- display.modelParams4[1] = GetMaterial().cameralight;
5644		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5645		- }
	5803	+ if (!failed)
	5804	+ display.ReleaseTextures(tex);
	5805	+
	5806	+ display.PopMaterial(this, selected);
5646	5807	}
5647	5808
5648	5809	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5684,7 +5845,7 @@
5684	5845	// resetMasterNode();
5685	5846	}
5686	5847
5687		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5848	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5688	5849	{
5689	5850	if (GetBRep() == null)
5690	5851	{
..	..	@@ -5767,8 +5928,11 @@
5767	5928	boolean flipV = false; // true;
5768	5929	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5769	5930
5770		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5931	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5771	5932	{
	5933	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	5934	+ return;
	5935	+
5772	5936	if (hide)
5773	5937	return;
5774	5938	// shadow optimisation
..	..	@@ -5826,16 +5990,7 @@
5826	5990	// // ??????????????????????????? Touch();
5827	5991	// }
5828	5992
5829		- if (material != null)
5830		- {
5831		- materialstack[materialdepth] = material;
5832		- selectedstack[materialdepth] = selected;
5833		- cStatic.objectstack[materialdepth++] = this;
5834		- //System.out.println("material " + material);
5835		- //Applet3D.tracein("selected ", selected);
5836		- display.vector2buffer = projectedVertices;
5837		- material.Draw(display, selected);
5838		- }
	5993	+display.PushMaterial2(this, selected);
5839	5994
5840	5995	Object3D child;
5841	5996	boolean sel;
..	..	@@ -5887,19 +6042,7 @@
5887	6042	*/
5888	6043	//depth += 1;
5889	6044
5890		- if (material != null)
5891		- {
5892		- materialdepth -= 1;
5893		- if (materialdepth > 0)
5894		- {
5895		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5896		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5897		- }
5898		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5899		- //else
5900		- //material.Draw(display, false);
5901		- }
5902		-
	6045	+display.PopMaterial2(this);
5903	6046	/*
5904	6047	display.ReleaseTextures(tex);
5905	6048	*/
..	..	@@ -5910,10 +6053,13 @@
5910	6053
5911	6054	//static cVector min,max;
5912	6055
5913		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	6056	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5914	6057	{
5915		- if (display.drawMode == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	6058	+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5916	6059	return; // no shadow for transparent objects
	6060	+
	6061	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6062	+ return;
5917	6063
5918	6064	if (hide)
5919	6065	return;
..	..	@@ -5955,11 +6101,12 @@
5955	6101	return;
5956	6102	}
5957	6103
	6104	+ //bRep.GenUV(1/material.diffuseness);
5958	6105	// bRep.lock = true;
5959	6106
5960		- javax.media.opengl.GL gl = display.GetGL();
	6107	+ //javax.media.opengl.GL gl = display.GetGL();
5961	6108
5962		- if (CameraPane.BOXMODE) // \|\| CameraPane.movingcamera)
	6109	+ if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5963	6110	{
5964	6111	int fc = bRep.FaceCount();
5965	6112	int vc = bRep.VertexCount();
..	..	@@ -5974,23 +6121,7 @@
5974	6121
5975	6122	bRep.getMinMax(min, max, 100);
5976	6123
5977		- gl.glBegin(gl.GL_LINES);
5978		-
5979		- gl.glVertex3d(min.x, min.y, min.z);
5980		- gl.glVertex3d(min.x, min.y, max.z);
5981		- gl.glVertex3d(min.x, min.y, min.z);
5982		- gl.glVertex3d(min.x, max.y, min.z);
5983		- gl.glVertex3d(min.x, min.y, min.z);
5984		- gl.glVertex3d(max.x, min.y, min.z);
5985		-
5986		- gl.glVertex3d(max.x, max.y, max.z);
5987		- gl.glVertex3d(min.x, max.y, max.z);
5988		- gl.glVertex3d(max.x, max.y, max.z);
5989		- gl.glVertex3d(max.x, min.y, max.z);
5990		- gl.glVertex3d(max.x, max.y, max.z);
5991		- gl.glVertex3d(max.x, max.y, min.z);
5992		-
5993		- gl.glEnd();
	6124	+ display.DrawBox(min, max);
5994	6125
5995	6126	return;
5996	6127	}
..	..	@@ -6034,7 +6165,7 @@
6034	6165	{
6035	6166	//throw new Error();
6036	6167
6037		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6168	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
6038	6169
6039	6170	int[] strips = bRep.getRawIndices();
6040	6171
..	..	@@ -6044,178 +6175,14 @@
6044	6175	new Exception().printStackTrace();
6045	6176	return;
6046	6177	}
6047		-
6048		- // TRIANGLE STRIP ARRAY
6049		- if (bRep.trimmed)
6050		- {
6051		- float[] v = bRep.getRawVertices();
6052		- float[] n = bRep.getRawNormals();
6053		- float[] c = bRep.getRawColors();
6054		- float[] uv = bRep.getRawUVMap();
6055		-
6056		- int count2 = 0;
6057		- int count3 = 0;
6058		-
6059		- if (n.length > 0)
6060		- {
6061		- for (int i = 0; i < strips.length; i++)
6062		- {
6063		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6064		-
6065		- /*
6066		- boolean locked = false;
6067		- float eps = 0.1f;
6068		- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6069		-
6070		- int dot = 0;
6071		-
6072		- if ((dot&1) == 0)
6073		- dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6074		-
6075		- if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6076		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6077		- else
6078		- {
6079		- locked = true;
6080		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6081		- }
6082		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6083		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6084		- if (hasnorm)
6085		- {
6086		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6087		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6088		- }
6089		-
6090		- if ((dot&4) == 0)
6091		- dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6092		-
6093		- if (wrap \|\| !locked && (dot&8) != 0)
6094		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6095		- else
6096		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6097		-
6098		- f.dot = dot;
6099		- */
6100		-
6101		- if (!selectmode)
6102		- {
6103		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6104		- {
6105		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6106		- } else
6107		- {
6108		- gl.glNormal3f(0, 0, 1);
6109		- }
6110		-
6111		- if (c != null)
6112		- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
6113		- {
6114		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6115		- }
6116		- }
6117		- if (flipV)
6118		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6119		- else
6120		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6121		- //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6122		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6123		-
6124		- count2 += 2;
6125		- count3 += 3;
6126		- if (!selectmode)
6127		- {
6128		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6129		- {
6130		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6131		- } else
6132		- {
6133		- gl.glNormal3f(0, 0, 1);
6134		- }
6135		- if (c != null)
6136		- {
6137		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6138		- }
6139		- }
6140		- if (flipV)
6141		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6142		- else
6143		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6144		- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6145		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6146		-
6147		- count2 += 2;
6148		- count3 += 3;
6149		- for (int j = 0; j < strips[i] - 2; j++)
6150		- {
6151		- //gl.glTexCoord2d(...);
6152		- if (!selectmode)
6153		- {
6154		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6155		- {
6156		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6157		- } else
6158		- {
6159		- gl.glNormal3f(0, 0, 1);
6160		- }
6161		- if (c != null)
6162		- {
6163		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6164		- }
6165		- }
6166		-
6167		- if (flipV)
6168		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6169		- else
6170		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6171		- //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6172		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6173		- count2 += 2;
6174		- count3 += 3;
6175		- }
6176		-
6177		- gl.glEnd();
6178		- }
6179		- }
6180		-
6181		- assert count3 == v.length;
6182		- }
6183		- else // !trimmed
6184		- {
6185		- int count = 0;
6186		- for (int i = 0; i < strips.length; i++)
6187		- {
6188		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6189		-
6190		- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6191		- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6192		-
6193		- drawVertex(gl, p, selectmode);
6194		- drawVertex(gl, q, selectmode);
6195		-
6196		- for (int j = 0; j < strips[i] - 2; j++)
6197		- {
6198		- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6199		-
6200		-// if (j%2 == 0)
6201		-// drawFace(p, q, r, display, null);
6202		-// else
6203		-// drawFace(p, r, q, display, null);
6204		-
6205		-// p = q;
6206		-// q = r;
6207		- drawVertex(gl, r, selectmode);
6208		- }
6209		-
6210		- gl.glEnd();
6211		- }
6212		- }
	6178	+
	6179	+ display.DrawGeometry(bRep, flipV, selectmode);
6213	6180	} else // catch (Error e)
6214	6181	{
6215	6182	// TRIANGLE ARRAY
6216	6183	if (IsOpaque()) // Static())
6217	6184	{
6218		- gl.glBegin(gl.GL_TRIANGLES);
	6185	+ display.StartTriangles();
6219	6186	int facecount = bRep.FaceCount();
6220	6187	for (int i = 0; i < facecount; i++)
6221	6188	{
..	..	@@ -6278,9 +6245,9 @@
6278	6245	// // r.norm.dot(v3) > -0.5)
6279	6246	// // continue;
6280	6247
6281		- drawFace(p, q, r, display, face);
	6248	+ display.DrawFace(this, p, q, r, face);
6282	6249	}
6283		- gl.glEnd();
	6250	+ display.EndTriangles();
6284	6251	}
6285	6252	else
6286	6253	{
..	..	@@ -6309,8 +6276,8 @@
6309	6276	//System.out.println("SORT");
6310	6277
6311	6278	java.util.Arrays.sort(facescompare);
6312		-
6313		- gl.glBegin(gl.GL_TRIANGLES);
	6279	+
	6280	+ display.StartTriangles();
6314	6281	for (int i = 0; i < facecount; i++)
6315	6282	{
6316	6283	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6322,13 +6289,14 @@
6322	6289	Vertex q = bRep.GetVertex(face.q);
6323	6290	Vertex r = bRep.GetVertex(face.r);
6324	6291
6325		- drawFace(p, q, r, display, face);
	6292	+ display.DrawFace(this, p, q, r, face);
6326	6293	}
6327		- gl.glEnd();
	6294	+ display.EndTriangles();
6328	6295	}
6329	6296
6330	6297	if (false) // live && support != null && support.bRep != null) // debug weights
6331	6298	{
	6299	+ /*
6332	6300	gl.glDisable(gl.GL_LIGHTING);
6333	6301	float[] colorV = new float[3];
6334	6302
..	..	@@ -6407,6 +6375,7 @@
6407	6375	// gl.glEnd();
6408	6376	}
6409	6377	}
	6378	+ */
6410	6379	}
6411	6380	}
6412	6381
..	..	@@ -6451,7 +6420,7 @@
6451	6420	center.add(r);
6452	6421	center.mul(1.0/3);
6453	6422
6454		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6423	+ center.sub(Globals.theRenderer.EyeCamera().location);
6455	6424
6456	6425	distance = center.dot(center);
6457	6426	}
..	..	@@ -6462,347 +6431,11 @@
6462	6431
6463	6432	transient FaceCompare[] facescompare = null;
6464	6433
6465		- void SetColor(CameraPane display, Vertex p0)
6466		- {
6467		- if (display.RENDERPROGRAM == 0)
6468		- {
6469		- float r = 0;
6470		- if (bRep != null)
6471		- {
6472		- if (bRep.stripified)
6473		- {
6474		- r = 1;
6475		- }
6476		- }
6477		- float g = 0;
6478		- if (bRep != null)
6479		- {
6480		- if (bRep.trimmed)
6481		- {
6482		- g = 1;
6483		- }
6484		- }
6485		- float b = 0;
6486		- if (support != null && link2master)
6487		- {
6488		- b = 1;
6489		- }
6490		- display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
6491		- return;
6492		- }
6493		-
6494		- if (display.drawMode != CameraPane.SHADOW)
6495		- return;
6496		-
6497		- javax.media.opengl.GL gl = display.GetGL();
6498		-// if (true) return;
6499		-// float ao = p.AO;
6500		-//
6501		-// // if (ao == 0 && !bRep.AOdone) // transient problem!
6502		-// // ao = 1;
6503		-//
6504		-// gl.glColor4f(ao, ao, ao, 1);
6505		-
6506		-// CameraPane.selectedpoint.
6507		-// getAverage(cStatic.point1, true);
6508		- if (CameraPane.pointflow == null) // !random) // live)
6509		- {
6510		- return;
6511		- }
6512		-
6513		- cStatic.point1.set(0,0,0);
6514		- LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
6515		-
6516		- cStatic.point1.sub(p0);
6517		-
6518		-
6519		-// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
6520		-// {
6521		-// return;
6522		-// }
6523		-
6524		- //if (true)
6525		- if (cStatic.point1.dot(cStatic.point1) > 0.000001)
6526		- {
6527		- return;
6528		- }
6529		-
6530		- float[] colorV = new float[3];
6531		-
6532		- if (false) // marked)
6533		- {
6534		- // debug rigging weights
6535		- for (int object = 0; object < p0.vertexlinks.length; object++)
6536		- {
6537		- float weight = p0.weights[object] / p0.totalweight;
6538		-
6539		- // if (weight < 0.1)
6540		- // {
6541		- // assert(weight == 0);
6542		- // continue;
6543		- // }
6544		-
6545		- if (p0.vertexlinks[object] == -1)
6546		- continue;
6547		-
6548		- Vertex q = support.bRep.GetVertex(p0.vertexlinks[object]);
6549		-
6550		- int color = //1 << object; //
6551		- //p.vertexlinks.length;
6552		- support.bRep.supports[p0.closestsupport].links[object];
6553		- colorV[2] += (color & 1) * weight;
6554		- colorV[1] += ((color & 2) >> 1) * weight;
6555		- colorV[0] += ((color & 4) >> 2) * weight;
6556		- }
6557		- }
6558		- else
6559		- {
6560		- if (drawingstarted)
6561		- {
6562		- // find next point
6563		- if (bRep.GetVertex(0).faceindices == null)
6564		- {
6565		- bRep.InitFaceIndices();
6566		- }
6567		-
6568		- double ymin = p0.y;
6569		-
6570		- Vertex newp = p0;
6571		-
6572		- for (int fii = 0; fii < p0.faceindices.length; fii++)
6573		- {
6574		- int fi = p0.faceindices[fii];
6575		-
6576		- if (fi == -1)
6577		- break;
6578		-
6579		- Face f = bRep.GetFace(fi);
6580		-
6581		- Vertex p = bRep.GetVertex(f.p);
6582		- Vertex q = bRep.GetVertex(f.q);
6583		- Vertex r = bRep.GetVertex(f.r);
6584		-
6585		- int swap = (int)(Math.random()*3);
6586		-
6587		-// for (int s=swap; --s>=0;)
6588		-// {
6589		-// Vertex t = p;
6590		-// p = q;
6591		-// q = r;
6592		-// r = t;
6593		-// }
6594		- if (ymin > p.y)
6595		- {
6596		- ymin = p.y;
6597		- newp = p;
6598		-// break;
6599		- }
6600		- if (ymin > q.y)
6601		- {
6602		- ymin = q.y;
6603		- newp = q;
6604		-// break;
6605		- }
6606		- if (ymin > r.y)
6607		- {
6608		- ymin = r.y;
6609		- newp = r;
6610		-// break;
6611		- }
6612		- }
6613		-
6614		- CameraPane.selectedpoint.toParent[3][0] = newp.x;
6615		- CameraPane.selectedpoint.toParent[3][1] = newp.y;
6616		- CameraPane.selectedpoint.toParent[3][2] = newp.z;
6617		-
6618		- drawingstarted = false;
6619		-
6620		- // return;
6621		- }
6622		-
6623		- if (false) // CameraPane.DRAW
6624		- {
6625		- p0.AO = colorV[0] = 2;
6626		- colorV[1] = 2;
6627		- colorV[2] = 2;
6628		- }
6629		-
6630		- CameraPane.pointflow.add(p0);
6631		- CameraPane.pointflow.Touch();
6632		- }
6633		-
6634		-// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
6635		-// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
6636		-// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
6637		- }
6638		-
6639	6434	void Print(Vertex v)
6640	6435	{
6641	6436	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6642	6437	}
6643	6438
6644		- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6645		- {
6646		- if (!selectmode)
6647		- {
6648		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6649		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6650		-
6651		- if (flipV)
6652		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6653		- else
6654		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6655		- }
6656		-
6657		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6658		- }
6659		-
6660		- void drawFace(Vertex pv, Vertex qv, Vertex rv,
6661		- CameraPane display, Face face)
6662		- {
6663		- if (pv.y == -10000 \|\|
6664		- qv.y == -10000 \|\|
6665		- rv.y == -10000)
6666		- return;
6667		-
6668		-// float b = f.nbiterations & 1;
6669		-// float g = (f.nbiterations>>1) & 1;
6670		-// float r = (f.nbiterations>>2) & 1;
6671		-//
6672		-// //if (f.weight == 10000)
6673		-// //{
6674		-// // r = 1; g = b = 0;
6675		-// //}
6676		-// //else
6677		-// //{
6678		-// // assert(f.weight < 10000);
6679		-// r = g = b = (float)bRep.FaceWeight(f)*100;
6680		-// if (r<0)
6681		-// assert(r>=0);
6682		-// //}
6683		-
6684		- javax.media.opengl.GL gl = display.GetGL();
6685		-
6686		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
6687		-
6688		- //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
6689		- if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
6690		- {
6691		- //gl.glBegin(gl.GL_TRIANGLES);
6692		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
6693		- if (!hasnorm)
6694		- {
6695		- // System.out.println("FUCK!!");
6696		- LA.vecSub(pv/.pos/, qv/.pos/, v0);
6697		- LA.vecSub(pv/.pos/, rv/.pos/, v1);
6698		- LA.vecCross(v0, v1, v2);
6699		- LA.vecNormalize(v2);
6700		- gl.glNormal3f((float) v2.x, (float) v2.y, (float) v2.z);
6701		- }
6702		-
6703		- if (hasnorm)
6704		- {
6705		-// if (!pv.norm.normalized())
6706		-// assert(pv.norm.normalized());
6707		-
6708		- //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
6709		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6710		- }
6711		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6712		- SetColor(display, pv);
6713		- //gl.glColor4f(r, g, b, 1);
6714		- //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
6715		- if (flipV)
6716		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6717		- else
6718		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6719		- //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
6720		- gl.glVertex3f((float) pv./pos./x, (float) pv./pos./y, (float) pv./pos./z);
6721		-// Print(pv);
6722		- if (hasnorm)
6723		- {
6724		-// assert(qv.norm.normalized());
6725		- //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
6726		- gl.glNormal3f((float) qv.norm.x, (float) qv.norm.y, (float) qv.norm.z);
6727		- }
6728		- //System.out.println("vertexq = " + qv.s + ", " + qv.t);
6729		- // boolean locked = false;
6730		- // float eps = 0.1f;
6731		- // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6732		-
6733		- // int dot = 0; //*/ (int)f.dot;
6734		-
6735		- // if ((dot&1) == 0)
6736		- // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6737		-
6738		- // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6739		- if (flipV)
6740		- gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
6741		- else
6742		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6743		- // else
6744		- // {
6745		- // locked = true;
6746		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6747		- // }
6748		- gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
6749		- SetColor(display, qv);
6750		- //gl.glColor4f(r, g, b, 1);
6751		- //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
6752		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6753		- gl.glVertex3f((float) qv./pos./x, (float) qv./pos./y, (float) qv./pos./z);
6754		-// Print(qv);
6755		- if (hasnorm)
6756		- {
6757		-// assert(rv.norm.normalized());
6758		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6759		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6760		- }
6761		-
6762		- // if ((dot&4) == 0)
6763		- // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6764		-
6765		- // if (wrap \|\| !locked && (dot&8) != 0)
6766		- if (flipV)
6767		- gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
6768		- else
6769		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6770		- // else
6771		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6772		-
6773		- // f.dot = dot;
6774		-
6775		- gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
6776		- SetColor(display, rv);
6777		- //gl.glColor4f(r, g, b, 1);
6778		- //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
6779		- //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
6780		- gl.glVertex3f((float) rv./pos./x, (float) rv./pos./y, (float) rv./pos./z);
6781		-// Print(rv);
6782		- //gl.glEnd();
6783		- }
6784		- else
6785		- {
6786		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6787		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6788		- gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
6789		-
6790		- }
6791		-
6792		- if (false) // (attributes & WIREFRAME) != 0)
6793		- {
6794		- gl.glDisable(gl.GL_LIGHTING);
6795		-
6796		- gl.glBegin(gl.GL_LINE_LOOP);
6797		- gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
6798		- gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
6799		- gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
6800		- gl.glEnd();
6801		-
6802		- gl.glEnable(gl.GL_LIGHTING);
6803		- }
6804		- }
6805		-
6806	6439	void drawSelf(ClickInfo info, int level, boolean select)
6807	6440	{
6808	6441	if (bRep == null)
..	..	@@ -7374,83 +7007,83 @@
7374	7007	int spotw = spot.x + spot.width;
7375	7008	int spoth = spot.y + spot.height;
7376	7009	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7377		- if (CameraPane.Xmin > spot.x)
7378		- {
7379		- CameraPane.Xmin = spot.x;
7380		- }
7381		- if (CameraPane.Xmax < spotw)
7382		- {
7383		- CameraPane.Xmax = spotw;
7384		- }
7385		- if (CameraPane.Ymin > spot.y)
7386		- {
7387		- CameraPane.Ymin = spot.y;
7388		- }
7389		- if (CameraPane.Ymax < spoth)
7390		- {
7391		- CameraPane.Ymax = spoth;
7392		- }
	7010	+// if (CameraPane.Xmin > spot.x)
	7011	+// {
	7012	+// CameraPane.Xmin = spot.x;
	7013	+// }
	7014	+// if (CameraPane.Xmax < spotw)
	7015	+// {
	7016	+// CameraPane.Xmax = spotw;
	7017	+// }
	7018	+// if (CameraPane.Ymin > spot.y)
	7019	+// {
	7020	+// CameraPane.Ymin = spot.y;
	7021	+// }
	7022	+// if (CameraPane.Ymax < spoth)
	7023	+// {
	7024	+// CameraPane.Ymax = spoth;
	7025	+// }
7393	7026	spot.translate(32, 32);
7394	7027	spotw = spot.x + spot.width;
7395	7028	spoth = spot.y + spot.height;
7396	7029	info.g.setColor(Color.blue);
7397	7030	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7398		- if (CameraPane.Xmin > spot.x)
7399		- {
7400		- CameraPane.Xmin = spot.x;
7401		- }
7402		- if (CameraPane.Xmax < spotw)
7403		- {
7404		- CameraPane.Xmax = spotw;
7405		- }
7406		- if (CameraPane.Ymin > spot.y)
7407		- {
7408		- CameraPane.Ymin = spot.y;
7409		- }
7410		- if (CameraPane.Ymax < spoth)
7411		- {
7412		- CameraPane.Ymax = spoth;
7413		- }
7414		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7415		- info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7031	+// if (CameraPane.Xmin > spot.x)
	7032	+// {
	7033	+// CameraPane.Xmin = spot.x;
	7034	+// }
	7035	+// if (CameraPane.Xmax < spotw)
	7036	+// {
	7037	+// CameraPane.Xmax = spotw;
	7038	+// }
	7039	+// if (CameraPane.Ymin > spot.y)
	7040	+// {
	7041	+// CameraPane.Ymin = spot.y;
	7042	+// }
	7043	+// if (CameraPane.Ymax < spoth)
	7044	+// {
	7045	+// CameraPane.Ymax = spoth;
	7046	+// }
	7047	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
	7048	+ //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7416	7049	spot.translate(0, -32);
7417	7050	info.g.setColor(Color.green);
7418	7051	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7419		- if (CameraPane.Xmin > spot.x)
7420		- {
7421		- CameraPane.Xmin = spot.x;
7422		- }
7423		- if (CameraPane.Xmax < spotw)
7424		- {
7425		- CameraPane.Xmax = spotw;
7426		- }
7427		- if (CameraPane.Ymin > spot.y)
7428		- {
7429		- CameraPane.Ymin = spot.y;
7430		- }
7431		- if (CameraPane.Ymax < spoth)
7432		- {
7433		- CameraPane.Ymax = spoth;
7434		- }
	7052	+// if (CameraPane.Xmin > spot.x)
	7053	+// {
	7054	+// CameraPane.Xmin = spot.x;
	7055	+// }
	7056	+// if (CameraPane.Xmax < spotw)
	7057	+// {
	7058	+// CameraPane.Xmax = spotw;
	7059	+// }
	7060	+// if (CameraPane.Ymin > spot.y)
	7061	+// {
	7062	+// CameraPane.Ymin = spot.y;
	7063	+// }
	7064	+// if (CameraPane.Ymax < spoth)
	7065	+// {
	7066	+// CameraPane.Ymax = spoth;
	7067	+// }
7435	7068	info.g.drawArc(boundary.x, boundary.y,
7436	7069	boundary.width, boundary.height, 0, 360);
7437	7070	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7438		- if (CameraPane.Xmin > boundary.x)
7439		- {
7440		- CameraPane.Xmin = boundary.x;
7441		- }
7442		- if (CameraPane.Xmax < boundary.x + boundary.width)
7443		- {
7444		- CameraPane.Xmax = boundary.x + boundary.width;
7445		- }
7446		- if (CameraPane.Ymin > boundary.y)
7447		- {
7448		- CameraPane.Ymin = boundary.y;
7449		- }
7450		- if (CameraPane.Ymax < boundary.y + boundary.height)
7451		- {
7452		- CameraPane.Ymax = boundary.y + boundary.height;
7453		- }
	7071	+// if (CameraPane.Xmin > boundary.x)
	7072	+// {
	7073	+// CameraPane.Xmin = boundary.x;
	7074	+// }
	7075	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	7076	+// {
	7077	+// CameraPane.Xmax = boundary.x + boundary.width;
	7078	+// }
	7079	+// if (CameraPane.Ymin > boundary.y)
	7080	+// {
	7081	+// CameraPane.Ymin = boundary.y;
	7082	+// }
	7083	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	7084	+// {
	7085	+// CameraPane.Ymax = boundary.y + boundary.height;
	7086	+// }
7454	7087	return;
7455	7088	}
7456	7089	}
..	..	@@ -7467,7 +7100,7 @@
7467	7100	startX = info.x;
7468	7101	startY = info.y;
7469	7102
7470		- hitSomething = 0;
	7103	+ hitSomething = -1;
7471	7104	cVector origin = new cVector();
7472	7105	//LA.xformPos(origin, toParent, origin);
7473	7106	Rectangle spot = new Rectangle();
..	..	@@ -7500,7 +7133,7 @@
7500	7133	}
7501	7134
7502	7135	//System.out.println("info.modifiers = " + info.modifiers);
7503		- modified = (info.modifiers & CameraPane.META) != 0;
	7136	+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7504	7137	//System.out.println("modified = " + modified);
7505	7138	//new Exception().printStackTrace();
7506	7139	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7528,7 +7161,7 @@
7528	7161	return true;
7529	7162	}
7530	7163
7531		- void doEditDrag0(ClickInfo info)
	7164	+ void doEditDrag0(ClickInfo info, boolean opposite)
7532	7165	{
7533	7166	if (hitSomething == 0)
7534	7167	{
..	..	@@ -7543,6 +7176,7 @@
7543	7176	//System.out.println("hitSomething = " + hitSomething);
7544	7177
7545	7178	double scale = 0.005f * info.camera.Distance();
	7179	+
7546	7180	cVector xlate = new cVector();
7547	7181	//cVector xlate2 = new cVector();
7548	7182	switch (hitSomething)
..	..	@@ -7553,9 +7187,9 @@
7553	7187
7554	7188	case hitCenter: // Translate
7555	7189
7556		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7190	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7557	7191
7558		- if (modified)
	7192	+ if (modified \|\| opposite)
7559	7193	{
7560	7194	//assert(false);
7561	7195	/*
..	..	@@ -7601,10 +7235,10 @@
7601	7235	}
7602	7236	LA.xformDir(up, ClickInfo.matbuffer, up);
7603	7237	// if (!CameraPane.LOCALTRANSFORM)
7604		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
	7238	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7605	7239	LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7606	7240	// if (!CameraPane.LOCALTRANSFORM)
7607		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7241	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7608	7242	//LA.vecCross(up, cVector.Z, right2);
7609	7243
7610	7244	cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
..	..	@@ -7649,6 +7283,7 @@
7649	7283
7650	7284	if (modified)
7651	7285	{
	7286	+ // Rotate 90 degrees
7652	7287	angle /= (Math.PI / 4);
7653	7288	angle = Math.floor(angle + 0.5);
7654	7289	angle *= (Math.PI / 4);
..	..	@@ -7662,7 +7297,7 @@
7662	7297	}
7663	7298	/**/
7664	7299
7665		- switch (info.pane.renderCamera.viewCode)
	7300	+ switch (info.pane.RenderCamera().viewCode)
7666	7301	{
7667	7302	case 1: // '\001'
7668	7303	LA.matZRotate(toParent, angle);
..	..	@@ -7690,24 +7325,27 @@
7690	7325
7691	7326	case hitScale: // scale
7692	7327	double hScale = (double) (info.x - centerPt.x) / 32;
	7328	+ double sign = 1;
	7329	+ if (hScale < 0)
	7330	+ {
	7331	+ sign = -1;
	7332	+ }
	7333	+ hScale = signMath.pow(signhScale, scale * 50);
7693	7334	if (hScale < 0.01)
7694	7335	{
7695		- hScale = 0.01;
	7336	+ //hScale = 0.01;
7696	7337	}
7697		- hScale = Math.pow(hScale, scale * 50);
7698		- if (hScale < 0.01)
7699		- {
7700		- hScale = 0.01;
7701		- }
	7338	+
7702	7339	double vScale = (double) (info.y - centerPt.y) / 32;
7703		- if (vScale < 0.01)
	7340	+ sign = 1;
	7341	+ if (vScale < 0)
7704	7342	{
7705		- vScale = 0.01;
	7343	+ sign = -1;
7706	7344	}
7707		- vScale = Math.pow(vScale, scale * 50);
	7345	+ vScale = signMath.pow(signvScale, scale * 50);
7708	7346	if (vScale < 0.01)
7709	7347	{
7710		- vScale = 0.01;
	7348	+ //vScale = 0.01;
7711	7349	}
7712	7350	LA.matCopy(startMat, toParent);
7713	7351	/**/
..	..	@@ -7718,17 +7356,24 @@
7718	7356	}
7719	7357	/**/
7720	7358
7721		- switch (info.pane.renderCamera.viewCode)
	7359	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7360	+
	7361	+ if (totalScale < 0.01)
	7362	+ {
	7363	+ totalScale = 0.01;
	7364	+ }
	7365	+
	7366	+ switch (info.pane.RenderCamera().viewCode)
7722	7367	{
7723	7368	case 3: // '\001'
7724	7369	if (modified)
7725	7370	{
7726	7371	//LA.matScale(toParent, 1, hScale, vScale);
7727		- LA.matScale(toParent, vScale, 1, 1);
	7372	+ LA.matScale(toParent, totalScale, 1, 1);
7728	7373	} // vScale, 1);
7729	7374	else
7730	7375	{
7731		- LA.matScale(toParent, vScale, vScale, vScale);
	7376	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7732	7377	} // vScale, 1);
7733	7378	break;
7734	7379
..	..	@@ -7736,10 +7381,10 @@
7736	7381	if (modified)
7737	7382	{
7738	7383	//LA.matScale(toParent, hScale, 1, vScale);
7739		- LA.matScale(toParent, 1, vScale, 1);
	7384	+ LA.matScale(toParent, 1, totalScale, 1);
7740	7385	} else
7741	7386	{
7742		- LA.matScale(toParent, vScale, 1, vScale);
	7387	+ LA.matScale(toParent, totalScale, 1, totalScale);
7743	7388	}
7744	7389	break;
7745	7390
..	..	@@ -7747,10 +7392,10 @@
7747	7392	if (modified)
7748	7393	{
7749	7394	//LA.matScale(toParent, hScale, vScale, 1);
7750		- LA.matScale(toParent, 1, 1, vScale);
	7395	+ LA.matScale(toParent, 1, 1, totalScale);
7751	7396	} else
7752	7397	{
7753		- LA.matScale(toParent, vScale, vScale, 1);
	7398	+ LA.matScale(toParent, totalScale, totalScale, 1);
7754	7399	}
7755	7400	break;
7756	7401	}
..	..	@@ -7883,14 +7528,22 @@
7883	7528	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7884	7529	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7885	7530	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7531	+
	7532	+ String objname;
	7533	+
7886	7534	if (false) //parent != null)
7887	7535	{
7888		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7536	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7889	7537	} else
7890	7538	{
7891		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7539	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7892	7540	} // + super.toString();
7893	7541	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7542	+
	7543	+ if (!Globals.ADVANCED)
	7544	+ return objname;
	7545	+
	7546	+ return objname + " " + System.identityHashCode(this);
7894	7547	}
7895	7548
7896	7549	public int hashCode()
..	..	@@ -7946,6 +7599,7 @@
7946	7599	objectUI.closeUI();
7947	7600	if (editWindow != null)
7948	7601	{
	7602	+ editWindow.ctrlPanel.FlushUI();
7949	7603	editWindow.refreshContents();
7950	7604	} // ? new
7951	7605	objectUI = null;
..	..	@@ -7966,7 +7620,7 @@
7966	7620	/transient/ cVector2[] projectedVertices = new cVector2[0];
7967	7621
7968	7622	Object3D /Composite/ parent;
7969		- Object3D /Composite/ fileparent;
	7623	+ Object3D /Composite/ fileparent; // In the case of FileObject
7970	7624
7971	7625	double[][] toParent; // dynamic matrix
7972	7626	double[][] fromParent;
..	..	@@ -8081,7 +7735,7 @@
8081	7735	{
8082	7736	assert(bRep != null);
8083	7737	if (!(support instanceof GenericJoint)) // support.bRep != null)
8084		- GrafreeD.Assert(support.bRep == bRep.support);
	7738	+ Grafreed.Assert(support.bRep == bRep.support);
8085	7739	}
8086	7740	else
8087	7741	{
..	..	@@ -8130,9 +7784,9 @@
8130	7784	private static cVector edge2 = new cVector();
8131	7785	//private static cVector norm = new cVector();
8132	7786	/transient private/ int hitSomething;
8133		- private static final int hitCenter = 1;
8134		- private static final int hitScale = 2;
8135		- private static final int hitRotate = 3;
	7787	+ static final int hitCenter = 1;
	7788	+ static final int hitScale = 2;
	7789	+ static final int hitRotate = 3;
8136	7790	/transient/ /private/ int viewCode; // Now used for transparency cache flag
8137	7791	/transient/ private Point centerPt;
8138	7792	/transient/ private int startX;
..	..	@@ -8164,6 +7818,8 @@
8164	7818	{
8165	7819	Object3D targ = this;
8166	7820
	7821	+ targ.NORMALPUSH = obj.NORMALPUSH;
	7822	+
8167	7823	if (obj.material != null)
8168	7824	{
8169	7825	if ((mask&MATERIAL)!=0) // ==(COLOR\|MATERIAL))