~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,11 +14,15 @@
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;
	24	+
	25	+ private UUID uuid = UUID.randomUUID();
21	26
22	27	ScriptNode scriptnode;
23	28
..	..	@@ -155,6 +160,59 @@
155	160	blockloop = true;
156	161	child.RestoreSupports();
157	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);
158	216	}
159	217	}
160	218
..	..	@@ -299,6 +357,7 @@
299	357	}
300	358
301	359	boolean live = false;
	360	+ boolean dontselect = false;
302	361	boolean hide = false;
303	362	boolean link2master = false; // performs reset support/master at each frame
304	363	boolean marked = false; // animation node
..	..	@@ -430,16 +489,16 @@
430	489	{
431	490	Object3D copy = this;
432	491
433		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	492	+ Camera parentcam = Globals.theRenderer.ManipCamera();
434	493
435		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	494	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
436	495	{
437		- parentcam = CameraPane.theRenderer.cameras[1];
	496	+ parentcam = Globals.theRenderer.Cameras()[1];
438	497	}
439	498
440		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	499	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
441	500	{
442		- parentcam = CameraPane.theRenderer.cameras[0];
	501	+ parentcam = Globals.theRenderer.Cameras()[0];
443	502	}
444	503
445	504	if (this == parentcam)
..	..	@@ -447,7 +506,7 @@
447	506	//assert(this instanceof Camera);
448	507
449	508	for (int count = parentcam.GetTransformCount(); --count>=0;)
450		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	509	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
451	510	}
452	511
453	512	copy.marked ^= true;
..	..	@@ -467,7 +526,7 @@
467	526	//assert(this instanceof Camera);
468	527
469	528	for (int count = parentcam.GetTransformCount(); --count>=0;)
470		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	529	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
471	530	}
472	531
473	532	copy.Touch(); // display list issue
..	..	@@ -602,7 +661,7 @@
602	661	return;
603	662	}
604	663
605		- if (CameraPane.fromscript)
	664	+ if (Globals.fromscript)
606	665	{
607	666	transformcount = 0;
608	667	return;
..	..	@@ -773,7 +832,7 @@
773	832	if (step == 0)
774	833	step = 1;
775	834	if (maxcount == 0)
776		- maxcount = 2048; // 4;
	835	+ maxcount = 128; // 2048; // 4;
777	836	// if (acceleration == 0)
778	837	// acceleration = 10;
779	838	if (delay == 0) // serial
..	..	@@ -796,7 +855,7 @@
796	855
797	856	if (marked && Globals.isLIVE() && live &&
798	857	//TEMP21aug2018
799		- Globals.DrawMode() == iCameraPane.SHADOW &&
	858	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
800	859	currentframe != Globals.framecount)
801	860	{
802	861	currentframe = Globals.framecount;
..	..	@@ -911,6 +970,11 @@
911	970	fromParent = null; // LA.newMatrix();
912	971	bRep = null; // new BoundaryRep();
913	972
	973	+ if (oname != null && oname.equals("LeftHand"))
	974	+ {
	975	+ name = oname;
	976	+ }
	977	+
914	978	/*
915	979	float hue = (float)Math.random();
916	980	Color col;
..	..	@@ -953,7 +1017,7 @@
953	1017
954	1018	public Object clone()
955	1019	{
956		- return GrafreeD.clone(this);
	1020	+ return Grafreed.clone(this);
957	1021	}
958	1022
959	1023	Object3D copyExpand()
..	..	@@ -1469,7 +1533,7 @@
1469	1533	BoundaryRep.SEUIL = other.material.cameralight;
1470	1534
1471	1535	// Set default to 0.1
1472		- BoundaryRep.SEUIL /= 2;
	1536	+ BoundaryRep.SEUIL /= 4; // 2;
1473	1537	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1474	1538	}
1475	1539
..	..	@@ -1728,7 +1792,7 @@
1728	1792	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1729	1793	o.bRep = transientrep;
1730	1794	if (clone)
1731		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1795	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1732	1796	o.CreateMaterial();
1733	1797	o.SetAttributes(this, -1);
1734	1798	//parent
..	..	@@ -1741,7 +1805,7 @@
1741	1805	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1742	1806	o.bRep = bRep;
1743	1807	if (clone)
1744		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1808	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1745	1809	o.CreateMaterial();
1746	1810	//o.overwriteThis(this, -1);
1747	1811	o.SetAttributes(this, -1);
..	..	@@ -1828,12 +1892,15 @@
1828	1892	if (obj.name == null)
1829	1893	continue; // can't be a null one
1830	1894
	1895	+ // Try perfect match first.
1831	1896	if (n.equals(obj.name))
1832	1897	{
1833	1898	theobj = obj;
1834	1899	count++;
1835	1900	}
1836	1901	}
	1902	+
	1903	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1837	1904
1838	1905	if (count != 1)
1839	1906	for (int i=Size(); --i>=0;)
..	..	@@ -2299,6 +2366,7 @@
2299	2366	{
2300	2367	if (newWindow)
2301	2368	{
	2369	+ new Exception().printStackTrace();
2302	2370	System.exit(0);
2303	2371	if (parent != null)
2304	2372	{
..	..	@@ -2475,13 +2543,13 @@
2475	2543	return retval;
2476	2544	}
2477	2545
2478		- void doEditDrag(ClickInfo info)
	2546	+ void doEditDrag(ClickInfo info, boolean opposite)
2479	2547	{
2480	2548	switch (doSomething)
2481	2549	{
2482	2550	case 1: // '\001'
2483	2551	//super.
2484		- doEditDrag0(info);
	2552	+ doEditDrag0(info, opposite);
2485	2553	break;
2486	2554
2487	2555	case 2: // '\002'
..	..	@@ -2494,11 +2562,11 @@
2494	2562	{
2495	2563	//sel.hitSomething = childToDrag.hitSomething;
2496	2564	//childToDrag.doEditDrag(info);
2497		- sel.doEditDrag(info);
	2565	+ sel.doEditDrag(info, opposite);
2498	2566	} else
2499	2567	{
2500	2568	//super.
2501		- doEditDrag0(info);
	2569	+ doEditDrag0(info, opposite);
2502	2570	}
2503	2571	}
2504	2572	break;
..	..	@@ -2905,7 +2973,8 @@
2905	2973	{
2906	2974	if (bRep != null)
2907	2975	{
2908		- bRep.GenUV();
	2976	+ bRep.GenUV(); //1);
	2977	+ //bRep.UnfoldUV();
2909	2978	Touch();
2910	2979	}
2911	2980	}
..	..	@@ -2980,6 +3049,33 @@
2980	3049	blockloop = false;
2981	3050	}
2982	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	+
2983	3079	void TransformGeometry()
2984	3080	{
2985	3081	Object3D obj = this;
..	..	@@ -3201,9 +3297,11 @@
3201	3297
3202	3298	BoundaryRep sup = bRep.support;
3203	3299	bRep.support = null;
3204		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3300	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3205	3301	// bRep.SplitInTwo(onlyone); // thread...
3206		- temprep.SplitInTwo(reduction34, onlyone);
	3302	+
	3303	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3304	+
3207	3305	bRep = temprep;
3208	3306	bRep.support = sup;
3209	3307	Touch();
..	..	@@ -3725,7 +3823,7 @@
3725	3823	if (child == null)
3726	3824	continue;
3727	3825
3728		- if (GrafreeD.RENDERME > 0)
	3826	+ if (Grafreed.RENDERME > 0)
3729	3827	{
3730	3828	if (child instanceof Merge)
3731	3829	((Merge)child).renderme();
..	..	@@ -3876,7 +3974,7 @@
3876	3974	if (child == null)
3877	3975	continue;
3878	3976
3879		- if (GrafreeD.RENDERME > 0)
	3977	+ if (Grafreed.RENDERME > 0)
3880	3978	{
3881	3979	if (child instanceof Merge)
3882	3980	((Merge)child).renderme();
..	..	@@ -4071,7 +4169,7 @@
4071	4169	if (child == null)
4072	4170	continue;
4073	4171
4074		- if (GrafreeD.RENDERME > 0)
	4172	+ if (Grafreed.RENDERME > 0)
4075	4173	{
4076	4174	if (child instanceof Merge)
4077	4175	((Merge)child).renderme();
..	..	@@ -4678,7 +4776,7 @@
4678	4776
4679	4777	cTreePath SelectLeaf(int indexcount, boolean deselect)
4680	4778	{
4681		- if (hide)
	4779	+ if (hide \|\| dontselect)
4682	4780	return null;
4683	4781
4684	4782	if (count <= 0)
..	..	@@ -4704,7 +4802,7 @@
4704	4802
4705	4803	cTreePath Select(int indexcount, boolean deselect)
4706	4804	{
4707		- if (hide)
	4805	+ if (hide \|\| dontselect)
4708	4806	return null;
4709	4807
4710	4808	if (count <= 0)
..	..	@@ -4854,7 +4952,7 @@
4854	4952	return globalTransform;
4855	4953	}
4856	4954
4857		- void PreprocessOcclusion(CameraPane cp)
	4955	+ void PreprocessOcclusion(iCameraPane cp)
4858	4956	{
4859	4957	/*
4860	4958	if (AOdone)
..	..	@@ -5156,10 +5254,34 @@
5156	5254
5157	5255	// System.out.println("Fullname = " + fullname);
5158	5256
5159		- if (fullname.name.indexOf(":") == -1)
5160		- 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(":"));
5161	5262
5162		- 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];
5163	5285	}
5164	5286
5165	5287	static String GetBump(cTexture fullname)
..	..	@@ -5168,10 +5290,38 @@
5168	5290	return "";
5169	5291
5170	5292	// System.out.println("Fullname = " + fullname);
5171		- if (fullname.name.indexOf(":") == -1)
5172		- return "";
5173		-
5174		- 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];
5175	5325	}
5176	5326
5177	5327	String GetPigmentTexture()
..	..	@@ -5245,7 +5395,7 @@
5245	5395	System.out.print("; textures = " + textures);
5246	5396	System.out.println("; usedtextures = " + usedtextures);
5247	5397
5248		- if (GetTextures() == null)
	5398	+ if (GetTextures() == null) // What is that??
5249	5399	GetTextures().name = ":";
5250	5400
5251	5401	String texname = tex;
..	..	@@ -5276,6 +5426,43 @@
5276	5426	child.ResetPigmentTexture();
5277	5427	blockloop = false;
5278	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;
5279	5466	}
5280	5467
5281	5468	void SetBumpTexture(String tex)
..	..	@@ -5322,11 +5509,12 @@
5322	5509	boolean NeedSupport()
5323	5510	{
5324	5511	return
5325		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5512	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
5326	5513	// PROBLEM with CROWD!!
5327		- && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
	5514	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5328	5515	}
5329	5516
	5517	+ static boolean DEBUG_SELECTION = false;
5330	5518
5331	5519	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5332	5520	{
..	..	@@ -5338,7 +5526,7 @@
5338	5526	}
5339	5527
5340	5528	if (display.DrawMode() == iCameraPane.SELECTION &&
5341		- hide)
	5529	+ (hide \|\| dontselect))
5342	5530	return;
5343	5531
5344	5532	if (name != null && name.contains("sclera"))
..	..	@@ -5365,12 +5553,12 @@
5365	5553	}
5366	5554
5367	5555	if ((//display.DrawMode() == CameraPane.SHADOW \|\|
5368		- display.DrawMode() == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5556	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5369	5557	{
5370	5558	return;
5371	5559	}
5372	5560
5373		- javax.media.opengl.GL gl = display.GetGL();
	5561	+ //javax.media.opengl.GL gl = display.GetGL();
5374	5562
5375	5563	/*
5376	5564	if (touched)
..	..	@@ -5406,7 +5594,7 @@
5406	5594
5407	5595	boolean compiled = false;
5408	5596
5409		- boolean selectmode = display.DrawMode() == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5597	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5410	5598
5411	5599	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5412	5600	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5422,7 +5610,7 @@
5422	5610	//if (displaylist == -1 && usecalllists)
5423	5611	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5424	5612	{
5425		- bRep.displaylist = gl.glGenLists(1);
	5613	+ bRep.displaylist = display.GenList();
5426	5614	assert(bRep.displaylist != 0);
5427	5615	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5428	5616	//System.out.println("\tgen list " + list);
..	..	@@ -5434,14 +5622,16 @@
5434	5622	if (usecalllists)
5435	5623	{
5436	5624	// System.err.println("new list " + bRep.displaylist + " for " + this);
5437		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5625	+ display.NewList(bRep.displaylist);
5438	5626	}
	5627	+
5439	5628	CallList(display, root, selected, blocked);
	5629	+
5440	5630	// compiled = true;
5441	5631	if (usecalllists)
5442	5632	{
5443	5633	// System.err.println("end list " + bRep.displaylist + " for " + this);
5444		- gl.glEndList();
	5634	+ display.EndList();
5445	5635	}
5446	5636	//gl.glDrawBuffer(gl.GL_BACK);
5447	5637	// XXX touched = false;
..	..	@@ -5484,12 +5674,12 @@
5484	5674
5485	5675	// frustum culling
5486	5676	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5487		- && display.DrawMode() != CameraPane.SELECTION)
	5677	+ && display.DrawMode() != iCameraPane.SELECTION)
5488	5678	{
5489		- if (display.DrawMode() == CameraPane.SHADOW)
	5679	+ if (display.DrawMode() == iCameraPane.SHADOW)
5490	5680	{
5491	5681	if (!link2master // tricky to cull in shadow mode.
5492		- && GetBRep().FrustumCull(this, gl, display.LightCamera(), true))
	5682	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5493	5683	{
5494	5684	//System.out.print("CULLED");
5495	5685	culled = true;
..	..	@@ -5497,7 +5687,7 @@
5497	5687	}
5498	5688	else
5499	5689	//GetBRep().getBounds(v0, v1, this);
5500		- if (GetBRep().FrustumCull(this, gl, display.RenderCamera(), false))
	5690	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5501	5691	culled = true;
5502	5692
5503	5693	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5533,11 +5723,11 @@
5533	5723
5534	5724
5535	5725	if (!culled)
5536		- if (display.DrawMode() == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	5726	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5537	5727	{
5538	5728	if (GetBRep() != null)
5539	5729	{
5540		- CameraPane.NextIndex(this, gl);
	5730	+ display.NextIndex();
5541	5731	// vertex color conflict : gl.glCallList(list);
5542	5732	DrawNode(display, root, selected);
5543	5733	if (this instanceof BezierPatch)
..	..	@@ -5578,7 +5768,17 @@
5578	5768	tex = GetTextures();
5579	5769	}
5580	5770
5581		- 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	+ }
5582	5782
5583	5783	if (!compiled)
5584	5784	{
..	..	@@ -5594,13 +5794,14 @@
5594	5794
5595	5795	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5596	5796	assert(bRep.displaylist != 0);
5597		- gl.glCallList(bRep.displaylist);
	5797	+ display.CallList(bRep.displaylist);
5598	5798	// june 2013 drawSelf(display, root, selected);
5599	5799	}
5600	5800	}
5601	5801	}
5602	5802
5603		- display.ReleaseTextures(tex);
	5803	+ if (!failed)
	5804	+ display.ReleaseTextures(tex);
5604	5805
5605	5806	display.PopMaterial(this, selected);
5606	5807	}
..	..	@@ -5729,6 +5930,9 @@
5729	5930
5730	5931	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5731	5932	{
	5933	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	5934	+ return;
	5935	+
5732	5936	if (hide)
5733	5937	return;
5734	5938	// shadow optimisation
..	..	@@ -5854,6 +6058,9 @@
5854	6058	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5855	6059	return; // no shadow for transparent objects
5856	6060
	6061	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6062	+ return;
	6063	+
5857	6064	if (hide)
5858	6065	return;
5859	6066
..	..	@@ -5894,9 +6101,10 @@
5894	6101	return;
5895	6102	}
5896	6103
	6104	+ //bRep.GenUV(1/material.diffuseness);
5897	6105	// bRep.lock = true;
5898	6106
5899		- javax.media.opengl.GL gl = display.GetGL();
	6107	+ //javax.media.opengl.GL gl = display.GetGL();
5900	6108
5901	6109	if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5902	6110	{
..	..	@@ -5913,23 +6121,7 @@
5913	6121
5914	6122	bRep.getMinMax(min, max, 100);
5915	6123
5916		- gl.glBegin(gl.GL_LINES);
5917		-
5918		- gl.glVertex3d(min.x, min.y, min.z);
5919		- gl.glVertex3d(min.x, min.y, max.z);
5920		- gl.glVertex3d(min.x, min.y, min.z);
5921		- gl.glVertex3d(min.x, max.y, min.z);
5922		- gl.glVertex3d(min.x, min.y, min.z);
5923		- gl.glVertex3d(max.x, min.y, min.z);
5924		-
5925		- gl.glVertex3d(max.x, max.y, max.z);
5926		- gl.glVertex3d(min.x, max.y, max.z);
5927		- gl.glVertex3d(max.x, max.y, max.z);
5928		- gl.glVertex3d(max.x, min.y, max.z);
5929		- gl.glVertex3d(max.x, max.y, max.z);
5930		- gl.glVertex3d(max.x, max.y, min.z);
5931		-
5932		- gl.glEnd();
	6124	+ display.DrawBox(min, max);
5933	6125
5934	6126	return;
5935	6127	}
..	..	@@ -5973,7 +6165,7 @@
5973	6165	{
5974	6166	//throw new Error();
5975	6167
5976		- boolean selectmode = display.DrawMode() == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6168	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5977	6169
5978	6170	int[] strips = bRep.getRawIndices();
5979	6171
..	..	@@ -5983,178 +6175,14 @@
5983	6175	new Exception().printStackTrace();
5984	6176	return;
5985	6177	}
5986		-
5987		- // TRIANGLE STRIP ARRAY
5988		- if (bRep.trimmed)
5989		- {
5990		- float[] v = bRep.getRawVertices();
5991		- float[] n = bRep.getRawNormals();
5992		- float[] c = bRep.getRawColors();
5993		- float[] uv = bRep.getRawUVMap();
5994		-
5995		- int count2 = 0;
5996		- int count3 = 0;
5997		-
5998		- if (n.length > 0)
5999		- {
6000		- for (int i = 0; i < strips.length; i++)
6001		- {
6002		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6003		-
6004		- /*
6005		- boolean locked = false;
6006		- float eps = 0.1f;
6007		- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6008		-
6009		- int dot = 0;
6010		-
6011		- if ((dot&1) == 0)
6012		- dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6013		-
6014		- if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6015		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6016		- else
6017		- {
6018		- locked = true;
6019		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6020		- }
6021		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6022		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6023		- if (hasnorm)
6024		- {
6025		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6026		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6027		- }
6028		-
6029		- if ((dot&4) == 0)
6030		- dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6031		-
6032		- if (wrap \|\| !locked && (dot&8) != 0)
6033		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6034		- else
6035		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6036		-
6037		- f.dot = dot;
6038		- */
6039		-
6040		- if (!selectmode)
6041		- {
6042		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6043		- {
6044		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6045		- } else
6046		- {
6047		- gl.glNormal3f(0, 0, 1);
6048		- }
6049		-
6050		- if (c != null)
6051		- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
6052		- {
6053		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6054		- }
6055		- }
6056		- if (flipV)
6057		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6058		- else
6059		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6060		- //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6061		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6062		-
6063		- count2 += 2;
6064		- count3 += 3;
6065		- if (!selectmode)
6066		- {
6067		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6068		- {
6069		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6070		- } else
6071		- {
6072		- gl.glNormal3f(0, 0, 1);
6073		- }
6074		- if (c != null)
6075		- {
6076		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6077		- }
6078		- }
6079		- if (flipV)
6080		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6081		- else
6082		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6083		- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6084		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6085		-
6086		- count2 += 2;
6087		- count3 += 3;
6088		- for (int j = 0; j < strips[i] - 2; j++)
6089		- {
6090		- //gl.glTexCoord2d(...);
6091		- if (!selectmode)
6092		- {
6093		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6094		- {
6095		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6096		- } else
6097		- {
6098		- gl.glNormal3f(0, 0, 1);
6099		- }
6100		- if (c != null)
6101		- {
6102		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6103		- }
6104		- }
6105		-
6106		- if (flipV)
6107		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6108		- else
6109		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6110		- //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6111		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6112		- count2 += 2;
6113		- count3 += 3;
6114		- }
6115		-
6116		- gl.glEnd();
6117		- }
6118		- }
6119		-
6120		- assert count3 == v.length;
6121		- }
6122		- else // !trimmed
6123		- {
6124		- int count = 0;
6125		- for (int i = 0; i < strips.length; i++)
6126		- {
6127		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6128		-
6129		- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6130		- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6131		-
6132		- drawVertex(gl, p, selectmode);
6133		- drawVertex(gl, q, selectmode);
6134		-
6135		- for (int j = 0; j < strips[i] - 2; j++)
6136		- {
6137		- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6138		-
6139		-// if (j%2 == 0)
6140		-// drawFace(p, q, r, display, null);
6141		-// else
6142		-// drawFace(p, r, q, display, null);
6143		-
6144		-// p = q;
6145		-// q = r;
6146		- drawVertex(gl, r, selectmode);
6147		- }
6148		-
6149		- gl.glEnd();
6150		- }
6151		- }
	6178	+
	6179	+ display.DrawGeometry(bRep, flipV, selectmode);
6152	6180	} else // catch (Error e)
6153	6181	{
6154	6182	// TRIANGLE ARRAY
6155	6183	if (IsOpaque()) // Static())
6156	6184	{
6157		- gl.glBegin(gl.GL_TRIANGLES);
	6185	+ display.StartTriangles();
6158	6186	int facecount = bRep.FaceCount();
6159	6187	for (int i = 0; i < facecount; i++)
6160	6188	{
..	..	@@ -6219,7 +6247,7 @@
6219	6247
6220	6248	display.DrawFace(this, p, q, r, face);
6221	6249	}
6222		- gl.glEnd();
	6250	+ display.EndTriangles();
6223	6251	}
6224	6252	else
6225	6253	{
..	..	@@ -6248,8 +6276,8 @@
6248	6276	//System.out.println("SORT");
6249	6277
6250	6278	java.util.Arrays.sort(facescompare);
6251		-
6252		- gl.glBegin(gl.GL_TRIANGLES);
	6279	+
	6280	+ display.StartTriangles();
6253	6281	for (int i = 0; i < facecount; i++)
6254	6282	{
6255	6283	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6263,11 +6291,12 @@
6263	6291
6264	6292	display.DrawFace(this, p, q, r, face);
6265	6293	}
6266		- gl.glEnd();
	6294	+ display.EndTriangles();
6267	6295	}
6268	6296
6269	6297	if (false) // live && support != null && support.bRep != null) // debug weights
6270	6298	{
	6299	+ /*
6271	6300	gl.glDisable(gl.GL_LIGHTING);
6272	6301	float[] colorV = new float[3];
6273	6302
..	..	@@ -6346,6 +6375,7 @@
6346	6375	// gl.glEnd();
6347	6376	}
6348	6377	}
	6378	+ */
6349	6379	}
6350	6380	}
6351	6381
..	..	@@ -6390,7 +6420,7 @@
6390	6420	center.add(r);
6391	6421	center.mul(1.0/3);
6392	6422
6393		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6423	+ center.sub(Globals.theRenderer.EyeCamera().location);
6394	6424
6395	6425	distance = center.dot(center);
6396	6426	}
..	..	@@ -6404,22 +6434,6 @@
6404	6434	void Print(Vertex v)
6405	6435	{
6406	6436	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6407		- }
6408		-
6409		- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6410		- {
6411		- if (!selectmode)
6412		- {
6413		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6414		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6415		-
6416		- if (flipV)
6417		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6418		- else
6419		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6420		- }
6421		-
6422		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6423	6437	}
6424	6438
6425	6439	void drawSelf(ClickInfo info, int level, boolean select)
..	..	@@ -6993,83 +7007,83 @@
6993	7007	int spotw = spot.x + spot.width;
6994	7008	int spoth = spot.y + spot.height;
6995	7009	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6996		- if (CameraPane.Xmin > spot.x)
6997		- {
6998		- CameraPane.Xmin = spot.x;
6999		- }
7000		- if (CameraPane.Xmax < spotw)
7001		- {
7002		- CameraPane.Xmax = spotw;
7003		- }
7004		- if (CameraPane.Ymin > spot.y)
7005		- {
7006		- CameraPane.Ymin = spot.y;
7007		- }
7008		- if (CameraPane.Ymax < spoth)
7009		- {
7010		- CameraPane.Ymax = spoth;
7011		- }
	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	+// }
7012	7026	spot.translate(32, 32);
7013	7027	spotw = spot.x + spot.width;
7014	7028	spoth = spot.y + spot.height;
7015	7029	info.g.setColor(Color.blue);
7016	7030	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7017		- if (CameraPane.Xmin > spot.x)
7018		- {
7019		- CameraPane.Xmin = spot.x;
7020		- }
7021		- if (CameraPane.Xmax < spotw)
7022		- {
7023		- CameraPane.Xmax = spotw;
7024		- }
7025		- if (CameraPane.Ymin > spot.y)
7026		- {
7027		- CameraPane.Ymin = spot.y;
7028		- }
7029		- if (CameraPane.Ymax < spoth)
7030		- {
7031		- CameraPane.Ymax = spoth;
7032		- }
7033		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7034		- 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);
7035	7049	spot.translate(0, -32);
7036	7050	info.g.setColor(Color.green);
7037	7051	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7038		- if (CameraPane.Xmin > spot.x)
7039		- {
7040		- CameraPane.Xmin = spot.x;
7041		- }
7042		- if (CameraPane.Xmax < spotw)
7043		- {
7044		- CameraPane.Xmax = spotw;
7045		- }
7046		- if (CameraPane.Ymin > spot.y)
7047		- {
7048		- CameraPane.Ymin = spot.y;
7049		- }
7050		- if (CameraPane.Ymax < spoth)
7051		- {
7052		- CameraPane.Ymax = spoth;
7053		- }
	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	+// }
7054	7068	info.g.drawArc(boundary.x, boundary.y,
7055	7069	boundary.width, boundary.height, 0, 360);
7056	7070	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7057		- if (CameraPane.Xmin > boundary.x)
7058		- {
7059		- CameraPane.Xmin = boundary.x;
7060		- }
7061		- if (CameraPane.Xmax < boundary.x + boundary.width)
7062		- {
7063		- CameraPane.Xmax = boundary.x + boundary.width;
7064		- }
7065		- if (CameraPane.Ymin > boundary.y)
7066		- {
7067		- CameraPane.Ymin = boundary.y;
7068		- }
7069		- if (CameraPane.Ymax < boundary.y + boundary.height)
7070		- {
7071		- CameraPane.Ymax = boundary.y + boundary.height;
7072		- }
	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	+// }
7073	7087	return;
7074	7088	}
7075	7089	}
..	..	@@ -7086,7 +7100,7 @@
7086	7100	startX = info.x;
7087	7101	startY = info.y;
7088	7102
7089		- hitSomething = 0;
	7103	+ hitSomething = -1;
7090	7104	cVector origin = new cVector();
7091	7105	//LA.xformPos(origin, toParent, origin);
7092	7106	Rectangle spot = new Rectangle();
..	..	@@ -7119,7 +7133,7 @@
7119	7133	}
7120	7134
7121	7135	//System.out.println("info.modifiers = " + info.modifiers);
7122		- modified = (info.modifiers & CameraPane.META) != 0;
	7136	+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7123	7137	//System.out.println("modified = " + modified);
7124	7138	//new Exception().printStackTrace();
7125	7139	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7147,7 +7161,7 @@
7147	7161	return true;
7148	7162	}
7149	7163
7150		- void doEditDrag0(ClickInfo info)
	7164	+ void doEditDrag0(ClickInfo info, boolean opposite)
7151	7165	{
7152	7166	if (hitSomething == 0)
7153	7167	{
..	..	@@ -7162,6 +7176,7 @@
7162	7176	//System.out.println("hitSomething = " + hitSomething);
7163	7177
7164	7178	double scale = 0.005f * info.camera.Distance();
	7179	+
7165	7180	cVector xlate = new cVector();
7166	7181	//cVector xlate2 = new cVector();
7167	7182	switch (hitSomething)
..	..	@@ -7172,9 +7187,9 @@
7172	7187
7173	7188	case hitCenter: // Translate
7174	7189
7175		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7190	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7176	7191
7177		- if (modified)
	7192	+ if (modified \|\| opposite)
7178	7193	{
7179	7194	//assert(false);
7180	7195	/*
..	..	@@ -7220,10 +7235,10 @@
7220	7235	}
7221	7236	LA.xformDir(up, ClickInfo.matbuffer, up);
7222	7237	// if (!CameraPane.LOCALTRANSFORM)
7223		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
	7238	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7224	7239	LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7225	7240	// if (!CameraPane.LOCALTRANSFORM)
7226		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7241	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7227	7242	//LA.vecCross(up, cVector.Z, right2);
7228	7243
7229	7244	cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
..	..	@@ -7268,6 +7283,7 @@
7268	7283
7269	7284	if (modified)
7270	7285	{
	7286	+ // Rotate 90 degrees
7271	7287	angle /= (Math.PI / 4);
7272	7288	angle = Math.floor(angle + 0.5);
7273	7289	angle *= (Math.PI / 4);
..	..	@@ -7281,7 +7297,7 @@
7281	7297	}
7282	7298	/**/
7283	7299
7284		- switch (info.pane.renderCamera.viewCode)
	7300	+ switch (info.pane.RenderCamera().viewCode)
7285	7301	{
7286	7302	case 1: // '\001'
7287	7303	LA.matZRotate(toParent, angle);
..	..	@@ -7309,24 +7325,27 @@
7309	7325
7310	7326	case hitScale: // scale
7311	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);
7312	7334	if (hScale < 0.01)
7313	7335	{
7314		- hScale = 0.01;
	7336	+ //hScale = 0.01;
7315	7337	}
7316		- hScale = Math.pow(hScale, scale * 50);
7317		- if (hScale < 0.01)
7318		- {
7319		- hScale = 0.01;
7320		- }
	7338	+
7321	7339	double vScale = (double) (info.y - centerPt.y) / 32;
7322		- if (vScale < 0.01)
	7340	+ sign = 1;
	7341	+ if (vScale < 0)
7323	7342	{
7324		- vScale = 0.01;
	7343	+ sign = -1;
7325	7344	}
7326		- vScale = Math.pow(vScale, scale * 50);
	7345	+ vScale = signMath.pow(signvScale, scale * 50);
7327	7346	if (vScale < 0.01)
7328	7347	{
7329		- vScale = 0.01;
	7348	+ //vScale = 0.01;
7330	7349	}
7331	7350	LA.matCopy(startMat, toParent);
7332	7351	/**/
..	..	@@ -7337,17 +7356,24 @@
7337	7356	}
7338	7357	/**/
7339	7358
7340		- 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)
7341	7367	{
7342	7368	case 3: // '\001'
7343	7369	if (modified)
7344	7370	{
7345	7371	//LA.matScale(toParent, 1, hScale, vScale);
7346		- LA.matScale(toParent, vScale, 1, 1);
	7372	+ LA.matScale(toParent, totalScale, 1, 1);
7347	7373	} // vScale, 1);
7348	7374	else
7349	7375	{
7350		- LA.matScale(toParent, vScale, vScale, vScale);
	7376	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7351	7377	} // vScale, 1);
7352	7378	break;
7353	7379
..	..	@@ -7355,10 +7381,10 @@
7355	7381	if (modified)
7356	7382	{
7357	7383	//LA.matScale(toParent, hScale, 1, vScale);
7358		- LA.matScale(toParent, 1, vScale, 1);
	7384	+ LA.matScale(toParent, 1, totalScale, 1);
7359	7385	} else
7360	7386	{
7361		- LA.matScale(toParent, vScale, 1, vScale);
	7387	+ LA.matScale(toParent, totalScale, 1, totalScale);
7362	7388	}
7363	7389	break;
7364	7390
..	..	@@ -7366,10 +7392,10 @@
7366	7392	if (modified)
7367	7393	{
7368	7394	//LA.matScale(toParent, hScale, vScale, 1);
7369		- LA.matScale(toParent, 1, 1, vScale);
	7395	+ LA.matScale(toParent, 1, 1, totalScale);
7370	7396	} else
7371	7397	{
7372		- LA.matScale(toParent, vScale, vScale, 1);
	7398	+ LA.matScale(toParent, totalScale, totalScale, 1);
7373	7399	}
7374	7400	break;
7375	7401	}
..	..	@@ -7502,14 +7528,22 @@
7502	7528	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7503	7529	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7504	7530	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7531	+
	7532	+ String objname;
	7533	+
7505	7534	if (false) //parent != null)
7506	7535	{
7507		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7536	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7508	7537	} else
7509	7538	{
7510		- 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) ":"") / "";
7511	7540	} // + super.toString();
7512	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);
7513	7547	}
7514	7548
7515	7549	public int hashCode()
..	..	@@ -7565,6 +7599,7 @@
7565	7599	objectUI.closeUI();
7566	7600	if (editWindow != null)
7567	7601	{
	7602	+ editWindow.ctrlPanel.FlushUI();
7568	7603	editWindow.refreshContents();
7569	7604	} // ? new
7570	7605	objectUI = null;
..	..	@@ -7585,7 +7620,7 @@
7585	7620	/transient/ cVector2[] projectedVertices = new cVector2[0];
7586	7621
7587	7622	Object3D /Composite/ parent;
7588		- Object3D /Composite/ fileparent;
	7623	+ Object3D /Composite/ fileparent; // In the case of FileObject
7589	7624
7590	7625	double[][] toParent; // dynamic matrix
7591	7626	double[][] fromParent;
..	..	@@ -7700,7 +7735,7 @@
7700	7735	{
7701	7736	assert(bRep != null);
7702	7737	if (!(support instanceof GenericJoint)) // support.bRep != null)
7703		- GrafreeD.Assert(support.bRep == bRep.support);
	7738	+ Grafreed.Assert(support.bRep == bRep.support);
7704	7739	}
7705	7740	else
7706	7741	{
..	..	@@ -7749,9 +7784,9 @@
7749	7784	private static cVector edge2 = new cVector();
7750	7785	//private static cVector norm = new cVector();
7751	7786	/transient private/ int hitSomething;
7752		- private static final int hitCenter = 1;
7753		- private static final int hitScale = 2;
7754		- private static final int hitRotate = 3;
	7787	+ static final int hitCenter = 1;
	7788	+ static final int hitScale = 2;
	7789	+ static final int hitRotate = 3;
7755	7790	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7756	7791	/transient/ private Point centerPt;
7757	7792	/transient/ private int startX;