~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,67 @@
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	+ {
	170	+ Object3D o = hashtable.get(GetUUID());
	171	+
	172	+ assert(this.bRep == o.bRep);
	173	+ if (this.bRep != null)
	174	+ assert(this.bRep.support == o.transientrep);
	175	+
	176	+ return;
	177	+ }
	178	+
	179	+ Object3D o = new Object3D();
	180	+ o.bRep = this.bRep;
	181	+ if (this.bRep != null)
	182	+ {
	183	+ o.transientrep = this.bRep.support;
	184	+ o.bRep.support = null;
	185	+ }
	186	+
	187	+// o.support = this.support;
	188	+// o.fileparent = this.fileparent;
	189	+// if (this.bRep != null)
	190	+// o.bRep = this.bRep.support;
	191	+
	192	+ hashtable.put(GetUUID(), o);
	193	+
	194	+ this.bRep = null;
	195	+// if (this.bRep != null)
	196	+// this.bRep.support = null;
	197	+// this.support = null;
	198	+// this.fileparent = null;
	199	+
	200	+ for (int i=0; i<Size(); i++)
	201	+ {
	202	+ get(i).ExtractBigData(hashtable);
	203	+ }
	204	+}
	205	+
	206	+void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	207	+{
	208	+ if (!hashtable.containsKey(GetUUID()))
	209	+ return;
	210	+
	211	+ Object3D o = hashtable.get(GetUUID());
	212	+
	213	+ this.bRep = o.bRep;
	214	+ if (this.bRep != null)
	215	+ this.bRep.support = o.transientrep;
	216	+// this.support = o.support;
	217	+// this.fileparent = o.fileparent;
	218	+
	219	+ hashtable.remove(GetUUID());
	220	+
	221	+ for (int i=0; i<Size(); i++)
	222	+ {
	223	+ get(i).RestoreBigData(hashtable);
158	224	}
159	225	}
160	226
..	..	@@ -299,6 +365,7 @@
299	365	}
300	366
301	367	boolean live = false;
	368	+ boolean dontselect = false;
302	369	boolean hide = false;
303	370	boolean link2master = false; // performs reset support/master at each frame
304	371	boolean marked = false; // animation node
..	..	@@ -430,16 +497,16 @@
430	497	{
431	498	Object3D copy = this;
432	499
433		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	500	+ Camera parentcam = Globals.theRenderer.ManipCamera();
434	501
435		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	502	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
436	503	{
437		- parentcam = CameraPane.theRenderer.cameras[1];
	504	+ parentcam = Globals.theRenderer.Cameras()[1];
438	505	}
439	506
440		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	507	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
441	508	{
442		- parentcam = CameraPane.theRenderer.cameras[0];
	509	+ parentcam = Globals.theRenderer.Cameras()[0];
443	510	}
444	511
445	512	if (this == parentcam)
..	..	@@ -447,7 +514,7 @@
447	514	//assert(this instanceof Camera);
448	515
449	516	for (int count = parentcam.GetTransformCount(); --count>=0;)
450		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	517	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
451	518	}
452	519
453	520	copy.marked ^= true;
..	..	@@ -467,7 +534,7 @@
467	534	//assert(this instanceof Camera);
468	535
469	536	for (int count = parentcam.GetTransformCount(); --count>=0;)
470		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	537	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
471	538	}
472	539
473	540	copy.Touch(); // display list issue
..	..	@@ -602,7 +669,7 @@
602	669	return;
603	670	}
604	671
605		- if (CameraPane.fromscript)
	672	+ if (Globals.fromscript)
606	673	{
607	674	transformcount = 0;
608	675	return;
..	..	@@ -773,7 +840,7 @@
773	840	if (step == 0)
774	841	step = 1;
775	842	if (maxcount == 0)
776		- maxcount = 2048; // 4;
	843	+ maxcount = 128; // 2048; // 4;
777	844	// if (acceleration == 0)
778	845	// acceleration = 10;
779	846	if (delay == 0) // serial
..	..	@@ -796,7 +863,7 @@
796	863
797	864	if (marked && Globals.isLIVE() && live &&
798	865	//TEMP21aug2018
799		- Globals.DrawMode() == iCameraPane.SHADOW &&
	866	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
800	867	currentframe != Globals.framecount)
801	868	{
802	869	currentframe = Globals.framecount;
..	..	@@ -911,6 +978,11 @@
911	978	fromParent = null; // LA.newMatrix();
912	979	bRep = null; // new BoundaryRep();
913	980
	981	+ if (oname != null && oname.equals("LeftHand"))
	982	+ {
	983	+ name = oname;
	984	+ }
	985	+
914	986	/*
915	987	float hue = (float)Math.random();
916	988	Color col;
..	..	@@ -953,7 +1025,7 @@
953	1025
954	1026	public Object clone()
955	1027	{
956		- return GrafreeD.clone(this);
	1028	+ return Grafreed.clone(this);
957	1029	}
958	1030
959	1031	Object3D copyExpand()
..	..	@@ -1469,7 +1541,7 @@
1469	1541	BoundaryRep.SEUIL = other.material.cameralight;
1470	1542
1471	1543	// Set default to 0.1
1472		- BoundaryRep.SEUIL /= 2;
	1544	+ BoundaryRep.SEUIL /= 4; // 2;
1473	1545	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1474	1546	}
1475	1547
..	..	@@ -1728,7 +1800,7 @@
1728	1800	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1729	1801	o.bRep = transientrep;
1730	1802	if (clone)
1731		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1803	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1732	1804	o.CreateMaterial();
1733	1805	o.SetAttributes(this, -1);
1734	1806	//parent
..	..	@@ -1741,7 +1813,7 @@
1741	1813	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1742	1814	o.bRep = bRep;
1743	1815	if (clone)
1744		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1816	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1745	1817	o.CreateMaterial();
1746	1818	//o.overwriteThis(this, -1);
1747	1819	o.SetAttributes(this, -1);
..	..	@@ -1828,12 +1900,15 @@
1828	1900	if (obj.name == null)
1829	1901	continue; // can't be a null one
1830	1902
	1903	+ // Try perfect match first.
1831	1904	if (n.equals(obj.name))
1832	1905	{
1833	1906	theobj = obj;
1834	1907	count++;
1835	1908	}
1836	1909	}
	1910	+
	1911	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1837	1912
1838	1913	if (count != 1)
1839	1914	for (int i=Size(); --i>=0;)
..	..	@@ -2299,6 +2374,7 @@
2299	2374	{
2300	2375	if (newWindow)
2301	2376	{
	2377	+ new Exception().printStackTrace();
2302	2378	System.exit(0);
2303	2379	if (parent != null)
2304	2380	{
..	..	@@ -2475,13 +2551,13 @@
2475	2551	return retval;
2476	2552	}
2477	2553
2478		- void doEditDrag(ClickInfo info)
	2554	+ void doEditDrag(ClickInfo info, boolean opposite)
2479	2555	{
2480	2556	switch (doSomething)
2481	2557	{
2482	2558	case 1: // '\001'
2483	2559	//super.
2484		- doEditDrag0(info);
	2560	+ doEditDrag0(info, opposite);
2485	2561	break;
2486	2562
2487	2563	case 2: // '\002'
..	..	@@ -2494,11 +2570,11 @@
2494	2570	{
2495	2571	//sel.hitSomething = childToDrag.hitSomething;
2496	2572	//childToDrag.doEditDrag(info);
2497		- sel.doEditDrag(info);
	2573	+ sel.doEditDrag(info, opposite);
2498	2574	} else
2499	2575	{
2500	2576	//super.
2501		- doEditDrag0(info);
	2577	+ doEditDrag0(info, opposite);
2502	2578	}
2503	2579	}
2504	2580	break;
..	..	@@ -2905,7 +2981,8 @@
2905	2981	{
2906	2982	if (bRep != null)
2907	2983	{
2908		- bRep.GenUV();
	2984	+ bRep.GenUV(); //1);
	2985	+ //bRep.UnfoldUV();
2909	2986	Touch();
2910	2987	}
2911	2988	}
..	..	@@ -2980,6 +3057,33 @@
2980	3057	blockloop = false;
2981	3058	}
2982	3059
	3060	+ void TransformChildren()
	3061	+ {
	3062	+ if (toParent != null)
	3063	+ {
	3064	+ for (int i=Size(); --i>=0;)
	3065	+ {
	3066	+ Object3D v = get(i);
	3067	+
	3068	+ if (v.toParent == null)
	3069	+ {
	3070	+ v.toParent = LA.newMatrix();
	3071	+ v.fromParent = LA.newMatrix();
	3072	+ }
	3073	+
	3074	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3075	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3076	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3077	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3078	+ }
	3079	+
	3080	+ toParent = null; // LA.matIdentity(toParent);
	3081	+ fromParent = null; // LA.matIdentity(fromParent);
	3082	+
	3083	+ Touch();
	3084	+ }
	3085	+ }
	3086	+
2983	3087	void TransformGeometry()
2984	3088	{
2985	3089	Object3D obj = this;
..	..	@@ -3201,9 +3305,11 @@
3201	3305
3202	3306	BoundaryRep sup = bRep.support;
3203	3307	bRep.support = null;
3204		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3308	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3205	3309	// bRep.SplitInTwo(onlyone); // thread...
3206		- temprep.SplitInTwo(reduction34, onlyone);
	3310	+
	3311	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3312	+
3207	3313	bRep = temprep;
3208	3314	bRep.support = sup;
3209	3315	Touch();
..	..	@@ -3725,7 +3831,7 @@
3725	3831	if (child == null)
3726	3832	continue;
3727	3833
3728		- if (GrafreeD.RENDERME > 0)
	3834	+ if (Grafreed.RENDERME > 0)
3729	3835	{
3730	3836	if (child instanceof Merge)
3731	3837	((Merge)child).renderme();
..	..	@@ -3876,7 +3982,7 @@
3876	3982	if (child == null)
3877	3983	continue;
3878	3984
3879		- if (GrafreeD.RENDERME > 0)
	3985	+ if (Grafreed.RENDERME > 0)
3880	3986	{
3881	3987	if (child instanceof Merge)
3882	3988	((Merge)child).renderme();
..	..	@@ -4071,7 +4177,7 @@
4071	4177	if (child == null)
4072	4178	continue;
4073	4179
4074		- if (GrafreeD.RENDERME > 0)
	4180	+ if (Grafreed.RENDERME > 0)
4075	4181	{
4076	4182	if (child instanceof Merge)
4077	4183	((Merge)child).renderme();
..	..	@@ -4678,7 +4784,7 @@
4678	4784
4679	4785	cTreePath SelectLeaf(int indexcount, boolean deselect)
4680	4786	{
4681		- if (hide)
	4787	+ if (hide \|\| dontselect)
4682	4788	return null;
4683	4789
4684	4790	if (count <= 0)
..	..	@@ -4704,7 +4810,7 @@
4704	4810
4705	4811	cTreePath Select(int indexcount, boolean deselect)
4706	4812	{
4707		- if (hide)
	4813	+ if (hide \|\| dontselect)
4708	4814	return null;
4709	4815
4710	4816	if (count <= 0)
..	..	@@ -4854,7 +4960,7 @@
4854	4960	return globalTransform;
4855	4961	}
4856	4962
4857		- void PreprocessOcclusion(CameraPane cp)
	4963	+ void PreprocessOcclusion(iCameraPane cp)
4858	4964	{
4859	4965	/*
4860	4966	if (AOdone)
..	..	@@ -5156,10 +5262,34 @@
5156	5262
5157	5263	// System.out.println("Fullname = " + fullname);
5158	5264
5159		- if (fullname.name.indexOf(":") == -1)
5160		- return fullname.name;
	5265	+ // Does not work on Windows due to C:
	5266	+// if (fullname.name.indexOf(":") == -1)
	5267	+// return fullname.name;
	5268	+//
	5269	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5161	5270
5162		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5271	+ String[] split = fullname.name.split(":");
	5272	+
	5273	+ if (split.length == 0)
	5274	+ {
	5275	+ return "";
	5276	+ }
	5277	+
	5278	+ if (split.length <= 2)
	5279	+ {
	5280	+ if (fullname.name.endsWith(":"))
	5281	+ {
	5282	+ // Windows
	5283	+ return fullname.name.substring(0, fullname.name.length()-1);
	5284	+ }
	5285	+
	5286	+ return split[0];
	5287	+ }
	5288	+
	5289	+ // Windows
	5290	+ assert(split.length == 4);
	5291	+
	5292	+ return split[0] + ":" + split[1];
5163	5293	}
5164	5294
5165	5295	static String GetBump(cTexture fullname)
..	..	@@ -5168,10 +5298,38 @@
5168	5298	return "";
5169	5299
5170	5300	// 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());
	5301	+ // Does not work on Windows due to C:
	5302	+// if (fullname.name.indexOf(":") == -1)
	5303	+// return "";
	5304	+//
	5305	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5306	+ String[] split = fullname.name.split(":");
	5307	+
	5308	+ if (split.length == 0)
	5309	+ {
	5310	+ return "";
	5311	+ }
	5312	+
	5313	+ if (split.length == 1)
	5314	+ {
	5315	+ return "";
	5316	+ }
	5317	+
	5318	+ if (split.length == 2)
	5319	+ {
	5320	+ if (fullname.name.endsWith(":"))
	5321	+ {
	5322	+ // Windows
	5323	+ return "";
	5324	+ }
	5325	+
	5326	+ return split[1];
	5327	+ }
	5328	+
	5329	+ // Windows
	5330	+ assert(split.length == 4);
	5331	+
	5332	+ return split[2] + ":" + split[3];
5175	5333	}
5176	5334
5177	5335	String GetPigmentTexture()
..	..	@@ -5245,7 +5403,7 @@
5245	5403	System.out.print("; textures = " + textures);
5246	5404	System.out.println("; usedtextures = " + usedtextures);
5247	5405
5248		- if (GetTextures() == null)
	5406	+ if (GetTextures() == null) // What is that??
5249	5407	GetTextures().name = ":";
5250	5408
5251	5409	String texname = tex;
..	..	@@ -5276,6 +5434,43 @@
5276	5434	child.ResetPigmentTexture();
5277	5435	blockloop = false;
5278	5436	}
	5437	+ }
	5438	+
	5439	+ UUID GetUUID()
	5440	+ {
	5441	+ if (uuid == null)
	5442	+ {
	5443	+ // Serial
	5444	+ uuid = UUID.randomUUID();
	5445	+ }
	5446	+
	5447	+ return uuid;
	5448	+ }
	5449	+
	5450	+ Object3D GetObject(UUID uid)
	5451	+ {
	5452	+ if (blockloop)
	5453	+ return null;
	5454	+
	5455	+ if (GetUUID().equals(uid))
	5456	+ return this;
	5457	+
	5458	+ int nb = Size();
	5459	+ for (int i = 0; i < nb; i++)
	5460	+ {
	5461	+ Object3D child = (Object3D) get(i);
	5462	+
	5463	+ if (child == null)
	5464	+ continue;
	5465	+
	5466	+ blockloop = true;
	5467	+ Object3D obj = child.GetObject(uid);
	5468	+ blockloop = false;
	5469	+ if (obj != null)
	5470	+ return obj;
	5471	+ }
	5472	+
	5473	+ return null;
5279	5474	}
5280	5475
5281	5476	void SetBumpTexture(String tex)
..	..	@@ -5322,11 +5517,12 @@
5322	5517	boolean NeedSupport()
5323	5518	{
5324	5519	return
5325		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5520	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
5326	5521	// PROBLEM with CROWD!!
5327		- && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
	5522	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5328	5523	}
5329	5524
	5525	+ static boolean DEBUG_SELECTION = false;
5330	5526
5331	5527	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5332	5528	{
..	..	@@ -5338,7 +5534,7 @@
5338	5534	}
5339	5535
5340	5536	if (display.DrawMode() == iCameraPane.SELECTION &&
5341		- hide)
	5537	+ (hide \|\| dontselect))
5342	5538	return;
5343	5539
5344	5540	if (name != null && name.contains("sclera"))
..	..	@@ -5365,12 +5561,12 @@
5365	5561	}
5366	5562
5367	5563	if ((//display.DrawMode() == CameraPane.SHADOW \|\|
5368		- display.DrawMode() == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5564	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5369	5565	{
5370	5566	return;
5371	5567	}
5372	5568
5373		- javax.media.opengl.GL gl = display.GetGL();
	5569	+ //javax.media.opengl.GL gl = display.GetGL();
5374	5570
5375	5571	/*
5376	5572	if (touched)
..	..	@@ -5406,7 +5602,7 @@
5406	5602
5407	5603	boolean compiled = false;
5408	5604
5409		- boolean selectmode = display.DrawMode() == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5605	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5410	5606
5411	5607	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5412	5608	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5422,7 +5618,7 @@
5422	5618	//if (displaylist == -1 && usecalllists)
5423	5619	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5424	5620	{
5425		- bRep.displaylist = gl.glGenLists(1);
	5621	+ bRep.displaylist = display.GenList();
5426	5622	assert(bRep.displaylist != 0);
5427	5623	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5428	5624	//System.out.println("\tgen list " + list);
..	..	@@ -5434,14 +5630,16 @@
5434	5630	if (usecalllists)
5435	5631	{
5436	5632	// System.err.println("new list " + bRep.displaylist + " for " + this);
5437		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5633	+ display.NewList(bRep.displaylist);
5438	5634	}
	5635	+
5439	5636	CallList(display, root, selected, blocked);
	5637	+
5440	5638	// compiled = true;
5441	5639	if (usecalllists)
5442	5640	{
5443	5641	// System.err.println("end list " + bRep.displaylist + " for " + this);
5444		- gl.glEndList();
	5642	+ display.EndList();
5445	5643	}
5446	5644	//gl.glDrawBuffer(gl.GL_BACK);
5447	5645	// XXX touched = false;
..	..	@@ -5484,12 +5682,12 @@
5484	5682
5485	5683	// frustum culling
5486	5684	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5487		- && display.DrawMode() != CameraPane.SELECTION)
	5685	+ && display.DrawMode() != iCameraPane.SELECTION)
5488	5686	{
5489		- if (display.DrawMode() == CameraPane.SHADOW)
	5687	+ if (display.DrawMode() == iCameraPane.SHADOW)
5490	5688	{
5491	5689	if (!link2master // tricky to cull in shadow mode.
5492		- && GetBRep().FrustumCull(this, gl, display.LightCamera(), true))
	5690	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5493	5691	{
5494	5692	//System.out.print("CULLED");
5495	5693	culled = true;
..	..	@@ -5497,7 +5695,7 @@
5497	5695	}
5498	5696	else
5499	5697	//GetBRep().getBounds(v0, v1, this);
5500		- if (GetBRep().FrustumCull(this, gl, display.RenderCamera(), false))
	5698	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5501	5699	culled = true;
5502	5700
5503	5701	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5533,11 +5731,11 @@
5533	5731
5534	5732
5535	5733	if (!culled)
5536		- if (display.DrawMode() == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	5734	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5537	5735	{
5538	5736	if (GetBRep() != null)
5539	5737	{
5540		- CameraPane.NextIndex(this, gl);
	5738	+ display.NextIndex();
5541	5739	// vertex color conflict : gl.glCallList(list);
5542	5740	DrawNode(display, root, selected);
5543	5741	if (this instanceof BezierPatch)
..	..	@@ -5578,7 +5776,17 @@
5578	5776	tex = GetTextures();
5579	5777	}
5580	5778
5581		- display.BindTextures(tex, texres);
	5779	+ boolean failed = false;
	5780	+
	5781	+ try
	5782	+ {
	5783	+ display.BindTextures(tex, texres);
	5784	+ }
	5785	+ catch (Exception e)
	5786	+ {
	5787	+ System.err.println("FAILED: " + this);
	5788	+ failed = true;
	5789	+ }
5582	5790
5583	5791	if (!compiled)
5584	5792	{
..	..	@@ -5594,13 +5802,14 @@
5594	5802
5595	5803	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5596	5804	assert(bRep.displaylist != 0);
5597		- gl.glCallList(bRep.displaylist);
	5805	+ display.CallList(bRep.displaylist);
5598	5806	// june 2013 drawSelf(display, root, selected);
5599	5807	}
5600	5808	}
5601	5809	}
5602	5810
5603		- display.ReleaseTextures(tex);
	5811	+ if (!failed)
	5812	+ display.ReleaseTextures(tex);
5604	5813
5605	5814	display.PopMaterial(this, selected);
5606	5815	}
..	..	@@ -5729,6 +5938,9 @@
5729	5938
5730	5939	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5731	5940	{
	5941	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	5942	+ return;
	5943	+
5732	5944	if (hide)
5733	5945	return;
5734	5946	// shadow optimisation
..	..	@@ -5854,6 +6066,9 @@
5854	6066	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5855	6067	return; // no shadow for transparent objects
5856	6068
	6069	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6070	+ return;
	6071	+
5857	6072	if (hide)
5858	6073	return;
5859	6074
..	..	@@ -5894,9 +6109,10 @@
5894	6109	return;
5895	6110	}
5896	6111
	6112	+ //bRep.GenUV(1/material.diffuseness);
5897	6113	// bRep.lock = true;
5898	6114
5899		- javax.media.opengl.GL gl = display.GetGL();
	6115	+ //javax.media.opengl.GL gl = display.GetGL();
5900	6116
5901	6117	if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5902	6118	{
..	..	@@ -5913,23 +6129,7 @@
5913	6129
5914	6130	bRep.getMinMax(min, max, 100);
5915	6131
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();
	6132	+ display.DrawBox(min, max);
5933	6133
5934	6134	return;
5935	6135	}
..	..	@@ -5973,7 +6173,7 @@
5973	6173	{
5974	6174	//throw new Error();
5975	6175
5976		- boolean selectmode = display.DrawMode() == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6176	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5977	6177
5978	6178	int[] strips = bRep.getRawIndices();
5979	6179
..	..	@@ -5983,178 +6183,14 @@
5983	6183	new Exception().printStackTrace();
5984	6184	return;
5985	6185	}
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		- }
	6186	+
	6187	+ display.DrawGeometry(bRep, flipV, selectmode);
6152	6188	} else // catch (Error e)
6153	6189	{
6154	6190	// TRIANGLE ARRAY
6155	6191	if (IsOpaque()) // Static())
6156	6192	{
6157		- gl.glBegin(gl.GL_TRIANGLES);
	6193	+ display.StartTriangles();
6158	6194	int facecount = bRep.FaceCount();
6159	6195	for (int i = 0; i < facecount; i++)
6160	6196	{
..	..	@@ -6219,7 +6255,7 @@
6219	6255
6220	6256	display.DrawFace(this, p, q, r, face);
6221	6257	}
6222		- gl.glEnd();
	6258	+ display.EndTriangles();
6223	6259	}
6224	6260	else
6225	6261	{
..	..	@@ -6248,8 +6284,8 @@
6248	6284	//System.out.println("SORT");
6249	6285
6250	6286	java.util.Arrays.sort(facescompare);
6251		-
6252		- gl.glBegin(gl.GL_TRIANGLES);
	6287	+
	6288	+ display.StartTriangles();
6253	6289	for (int i = 0; i < facecount; i++)
6254	6290	{
6255	6291	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6263,11 +6299,12 @@
6263	6299
6264	6300	display.DrawFace(this, p, q, r, face);
6265	6301	}
6266		- gl.glEnd();
	6302	+ display.EndTriangles();
6267	6303	}
6268	6304
6269	6305	if (false) // live && support != null && support.bRep != null) // debug weights
6270	6306	{
	6307	+ /*
6271	6308	gl.glDisable(gl.GL_LIGHTING);
6272	6309	float[] colorV = new float[3];
6273	6310
..	..	@@ -6346,6 +6383,7 @@
6346	6383	// gl.glEnd();
6347	6384	}
6348	6385	}
	6386	+ */
6349	6387	}
6350	6388	}
6351	6389
..	..	@@ -6390,7 +6428,7 @@
6390	6428	center.add(r);
6391	6429	center.mul(1.0/3);
6392	6430
6393		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6431	+ center.sub(Globals.theRenderer.EyeCamera().location);
6394	6432
6395	6433	distance = center.dot(center);
6396	6434	}
..	..	@@ -6404,22 +6442,6 @@
6404	6442	void Print(Vertex v)
6405	6443	{
6406	6444	//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	6445	}
6424	6446
6425	6447	void drawSelf(ClickInfo info, int level, boolean select)
..	..	@@ -6993,83 +7015,83 @@
6993	7015	int spotw = spot.x + spot.width;
6994	7016	int spoth = spot.y + spot.height;
6995	7017	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		- }
	7018	+// if (CameraPane.Xmin > spot.x)
	7019	+// {
	7020	+// CameraPane.Xmin = spot.x;
	7021	+// }
	7022	+// if (CameraPane.Xmax < spotw)
	7023	+// {
	7024	+// CameraPane.Xmax = spotw;
	7025	+// }
	7026	+// if (CameraPane.Ymin > spot.y)
	7027	+// {
	7028	+// CameraPane.Ymin = spot.y;
	7029	+// }
	7030	+// if (CameraPane.Ymax < spoth)
	7031	+// {
	7032	+// CameraPane.Ymax = spoth;
	7033	+// }
7012	7034	spot.translate(32, 32);
7013	7035	spotw = spot.x + spot.width;
7014	7036	spoth = spot.y + spot.height;
7015	7037	info.g.setColor(Color.blue);
7016	7038	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);
	7039	+// if (CameraPane.Xmin > spot.x)
	7040	+// {
	7041	+// CameraPane.Xmin = spot.x;
	7042	+// }
	7043	+// if (CameraPane.Xmax < spotw)
	7044	+// {
	7045	+// CameraPane.Xmax = spotw;
	7046	+// }
	7047	+// if (CameraPane.Ymin > spot.y)
	7048	+// {
	7049	+// CameraPane.Ymin = spot.y;
	7050	+// }
	7051	+// if (CameraPane.Ymax < spoth)
	7052	+// {
	7053	+// CameraPane.Ymax = spoth;
	7054	+// }
	7055	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
	7056	+ //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7035	7057	spot.translate(0, -32);
7036	7058	info.g.setColor(Color.green);
7037	7059	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		- }
	7060	+// if (CameraPane.Xmin > spot.x)
	7061	+// {
	7062	+// CameraPane.Xmin = spot.x;
	7063	+// }
	7064	+// if (CameraPane.Xmax < spotw)
	7065	+// {
	7066	+// CameraPane.Xmax = spotw;
	7067	+// }
	7068	+// if (CameraPane.Ymin > spot.y)
	7069	+// {
	7070	+// CameraPane.Ymin = spot.y;
	7071	+// }
	7072	+// if (CameraPane.Ymax < spoth)
	7073	+// {
	7074	+// CameraPane.Ymax = spoth;
	7075	+// }
7054	7076	info.g.drawArc(boundary.x, boundary.y,
7055	7077	boundary.width, boundary.height, 0, 360);
7056	7078	//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		- }
	7079	+// if (CameraPane.Xmin > boundary.x)
	7080	+// {
	7081	+// CameraPane.Xmin = boundary.x;
	7082	+// }
	7083	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	7084	+// {
	7085	+// CameraPane.Xmax = boundary.x + boundary.width;
	7086	+// }
	7087	+// if (CameraPane.Ymin > boundary.y)
	7088	+// {
	7089	+// CameraPane.Ymin = boundary.y;
	7090	+// }
	7091	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	7092	+// {
	7093	+// CameraPane.Ymax = boundary.y + boundary.height;
	7094	+// }
7073	7095	return;
7074	7096	}
7075	7097	}
..	..	@@ -7086,7 +7108,7 @@
7086	7108	startX = info.x;
7087	7109	startY = info.y;
7088	7110
7089		- hitSomething = 0;
	7111	+ hitSomething = -1;
7090	7112	cVector origin = new cVector();
7091	7113	//LA.xformPos(origin, toParent, origin);
7092	7114	Rectangle spot = new Rectangle();
..	..	@@ -7119,7 +7141,7 @@
7119	7141	}
7120	7142
7121	7143	//System.out.println("info.modifiers = " + info.modifiers);
7122		- modified = (info.modifiers & CameraPane.META) != 0;
	7144	+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7123	7145	//System.out.println("modified = " + modified);
7124	7146	//new Exception().printStackTrace();
7125	7147	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7147,7 +7169,7 @@
7147	7169	return true;
7148	7170	}
7149	7171
7150		- void doEditDrag0(ClickInfo info)
	7172	+ void doEditDrag0(ClickInfo info, boolean opposite)
7151	7173	{
7152	7174	if (hitSomething == 0)
7153	7175	{
..	..	@@ -7162,6 +7184,7 @@
7162	7184	//System.out.println("hitSomething = " + hitSomething);
7163	7185
7164	7186	double scale = 0.005f * info.camera.Distance();
	7187	+
7165	7188	cVector xlate = new cVector();
7166	7189	//cVector xlate2 = new cVector();
7167	7190	switch (hitSomething)
..	..	@@ -7172,9 +7195,9 @@
7172	7195
7173	7196	case hitCenter: // Translate
7174	7197
7175		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7198	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7176	7199
7177		- if (modified)
	7200	+ if (modified \|\| opposite)
7178	7201	{
7179	7202	//assert(false);
7180	7203	/*
..	..	@@ -7220,10 +7243,10 @@
7220	7243	}
7221	7244	LA.xformDir(up, ClickInfo.matbuffer, up);
7222	7245	// if (!CameraPane.LOCALTRANSFORM)
7223		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
	7246	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7224	7247	LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7225	7248	// if (!CameraPane.LOCALTRANSFORM)
7226		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7249	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7227	7250	//LA.vecCross(up, cVector.Z, right2);
7228	7251
7229	7252	cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
..	..	@@ -7268,6 +7291,7 @@
7268	7291
7269	7292	if (modified)
7270	7293	{
	7294	+ // Rotate 90 degrees
7271	7295	angle /= (Math.PI / 4);
7272	7296	angle = Math.floor(angle + 0.5);
7273	7297	angle *= (Math.PI / 4);
..	..	@@ -7281,7 +7305,7 @@
7281	7305	}
7282	7306	/**/
7283	7307
7284		- switch (info.pane.renderCamera.viewCode)
	7308	+ switch (info.pane.RenderCamera().viewCode)
7285	7309	{
7286	7310	case 1: // '\001'
7287	7311	LA.matZRotate(toParent, angle);
..	..	@@ -7309,24 +7333,27 @@
7309	7333
7310	7334	case hitScale: // scale
7311	7335	double hScale = (double) (info.x - centerPt.x) / 32;
	7336	+ double sign = 1;
	7337	+ if (hScale < 0)
	7338	+ {
	7339	+ sign = -1;
	7340	+ }
	7341	+ hScale = signMath.pow(signhScale, scale * 50);
7312	7342	if (hScale < 0.01)
7313	7343	{
7314		- hScale = 0.01;
	7344	+ //hScale = 0.01;
7315	7345	}
7316		- hScale = Math.pow(hScale, scale * 50);
7317		- if (hScale < 0.01)
7318		- {
7319		- hScale = 0.01;
7320		- }
	7346	+
7321	7347	double vScale = (double) (info.y - centerPt.y) / 32;
7322		- if (vScale < 0.01)
	7348	+ sign = 1;
	7349	+ if (vScale < 0)
7323	7350	{
7324		- vScale = 0.01;
	7351	+ sign = -1;
7325	7352	}
7326		- vScale = Math.pow(vScale, scale * 50);
	7353	+ vScale = signMath.pow(signvScale, scale * 50);
7327	7354	if (vScale < 0.01)
7328	7355	{
7329		- vScale = 0.01;
	7356	+ //vScale = 0.01;
7330	7357	}
7331	7358	LA.matCopy(startMat, toParent);
7332	7359	/**/
..	..	@@ -7337,17 +7364,24 @@
7337	7364	}
7338	7365	/**/
7339	7366
7340		- switch (info.pane.renderCamera.viewCode)
	7367	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7368	+
	7369	+ if (totalScale < 0.01)
	7370	+ {
	7371	+ totalScale = 0.01;
	7372	+ }
	7373	+
	7374	+ switch (info.pane.RenderCamera().viewCode)
7341	7375	{
7342	7376	case 3: // '\001'
7343	7377	if (modified)
7344	7378	{
7345	7379	//LA.matScale(toParent, 1, hScale, vScale);
7346		- LA.matScale(toParent, vScale, 1, 1);
	7380	+ LA.matScale(toParent, totalScale, 1, 1);
7347	7381	} // vScale, 1);
7348	7382	else
7349	7383	{
7350		- LA.matScale(toParent, vScale, vScale, vScale);
	7384	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7351	7385	} // vScale, 1);
7352	7386	break;
7353	7387
..	..	@@ -7355,10 +7389,10 @@
7355	7389	if (modified)
7356	7390	{
7357	7391	//LA.matScale(toParent, hScale, 1, vScale);
7358		- LA.matScale(toParent, 1, vScale, 1);
	7392	+ LA.matScale(toParent, 1, totalScale, 1);
7359	7393	} else
7360	7394	{
7361		- LA.matScale(toParent, vScale, 1, vScale);
	7395	+ LA.matScale(toParent, totalScale, 1, totalScale);
7362	7396	}
7363	7397	break;
7364	7398
..	..	@@ -7366,10 +7400,10 @@
7366	7400	if (modified)
7367	7401	{
7368	7402	//LA.matScale(toParent, hScale, vScale, 1);
7369		- LA.matScale(toParent, 1, 1, vScale);
	7403	+ LA.matScale(toParent, 1, 1, totalScale);
7370	7404	} else
7371	7405	{
7372		- LA.matScale(toParent, vScale, vScale, 1);
	7406	+ LA.matScale(toParent, totalScale, totalScale, 1);
7373	7407	}
7374	7408	break;
7375	7409	}
..	..	@@ -7502,14 +7536,22 @@
7502	7536	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7503	7537	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7504	7538	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7539	+
	7540	+ String objname;
	7541	+
7505	7542	if (false) //parent != null)
7506	7543	{
7507		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7544	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7508	7545	} else
7509	7546	{
7510		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7547	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7511	7548	} // + super.toString();
7512	7549	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7550	+
	7551	+ if (!Globals.ADVANCED)
	7552	+ return objname;
	7553	+
	7554	+ return objname + " " + System.identityHashCode(this);
7513	7555	}
7514	7556
7515	7557	public int hashCode()
..	..	@@ -7565,6 +7607,7 @@
7565	7607	objectUI.closeUI();
7566	7608	if (editWindow != null)
7567	7609	{
	7610	+ editWindow.ctrlPanel.FlushUI();
7568	7611	editWindow.refreshContents();
7569	7612	} // ? new
7570	7613	objectUI = null;
..	..	@@ -7585,7 +7628,7 @@
7585	7628	/transient/ cVector2[] projectedVertices = new cVector2[0];
7586	7629
7587	7630	Object3D /Composite/ parent;
7588		- Object3D /Composite/ fileparent;
	7631	+ Object3D /Composite/ fileparent; // In the case of FileObject
7589	7632
7590	7633	double[][] toParent; // dynamic matrix
7591	7634	double[][] fromParent;
..	..	@@ -7700,7 +7743,7 @@
7700	7743	{
7701	7744	assert(bRep != null);
7702	7745	if (!(support instanceof GenericJoint)) // support.bRep != null)
7703		- GrafreeD.Assert(support.bRep == bRep.support);
	7746	+ Grafreed.Assert(support.bRep == bRep.support);
7704	7747	}
7705	7748	else
7706	7749	{
..	..	@@ -7749,9 +7792,9 @@
7749	7792	private static cVector edge2 = new cVector();
7750	7793	//private static cVector norm = new cVector();
7751	7794	/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;
	7795	+ static final int hitCenter = 1;
	7796	+ static final int hitScale = 2;
	7797	+ static final int hitRotate = 3;
7755	7798	/transient/ /private/ int viewCode; // Now used for transparency cache flag
7756	7799	/transient/ private Point centerPt;
7757	7800	/transient/ private int startX;