~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;
..	..	@@ -760,7 +827,7 @@
760	827
761	828	int GetTransformCount()
762	829	{
763		- // marde pour serialization de Texture
	830	+ // patch pour serialization de Texture
764	831	resetmaxcount();
765	832	resettransformcount();
766	833	resetstep();
..	..	@@ -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
..	..	@@ -794,12 +861,12 @@
794	861	// factor = CameraPane.STEP;
795	862	// }
796	863
797		- if (marked && CameraPane.isLIVE() && live &&
	864	+ if (marked && Globals.isLIVE() && live &&
798	865	//TEMP21aug2018
799		- CameraPane.drawMode == CameraPane.SHADOW &&
800		- currentframe != CameraPane.framecount)
	866	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	867	+ currentframe != Globals.framecount)
801	868	{
802		- currentframe = CameraPane.framecount;
	869	+ currentframe = Globals.framecount;
803	870
804	871	// System.err.println("transformcount = " + transformcount);
805	872	// System.err.println("factor = " + factor);
..	..	@@ -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)
..	..	@@ -5001,7 +5107,8 @@
5001	5107	} else //
5002	5108	if (editWindow != null)
5003	5109	{
5004		- editWindow.cameraView.lighttouched = true;
	5110	+ //editWindow.cameraView.lighttouched = true;
	5111	+ Globals.lighttouched = true;
5005	5112	}
5006	5113	}
5007	5114
..	..	@@ -5155,10 +5262,34 @@
5155	5262
5156	5263	// System.out.println("Fullname = " + fullname);
5157	5264
5158		- if (fullname.name.indexOf(":") == -1)
5159		- 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(":"));
5160	5270
5161		- 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];
5162	5293	}
5163	5294
5164	5295	static String GetBump(cTexture fullname)
..	..	@@ -5167,10 +5298,38 @@
5167	5298	return "";
5168	5299
5169	5300	// System.out.println("Fullname = " + fullname);
5170		- if (fullname.name.indexOf(":") == -1)
5171		- return "";
5172		-
5173		- 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];
5174	5333	}
5175	5334
5176	5335	String GetPigmentTexture()
..	..	@@ -5244,7 +5403,7 @@
5244	5403	System.out.print("; textures = " + textures);
5245	5404	System.out.println("; usedtextures = " + usedtextures);
5246	5405
5247		- if (GetTextures() == null)
	5406	+ if (GetTextures() == null) // What is that??
5248	5407	GetTextures().name = ":";
5249	5408
5250	5409	String texname = tex;
..	..	@@ -5275,6 +5434,43 @@
5275	5434	child.ResetPigmentTexture();
5276	5435	blockloop = false;
5277	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;
5278	5474	}
5279	5475
5280	5476	void SetBumpTexture(String tex)
..	..	@@ -5313,25 +5509,22 @@
5313	5509	}
5314	5510	}
5315	5511
5316		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5512	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5317	5513	{
5318	5514	Draw(display, root, selected, blocked);
5319	5515	}
5320	5516
5321		- static cMaterial[] materialstack = new cMaterial[65536];
5322		- static boolean[] selectedstack = new boolean[65536];
5323		- static int materialdepth = 0;
5324		-
5325	5517	boolean NeedSupport()
5326	5518	{
5327	5519	return
5328		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5520	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
5329	5521	// PROBLEM with CROWD!!
5330		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	5522	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5331	5523	}
5332	5524
	5525	+ static boolean DEBUG_SELECTION = false;
5333	5526
5334		- void Draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5527	+ void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5335	5528	{
5336	5529	Invariants(); // june 2013
5337	5530
..	..	@@ -5340,8 +5533,8 @@
5340	5533	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5341	5534	}
5342	5535
5343		- if (display.drawMode == CameraPane.SELECTION &&
5344		- hide)
	5536	+ if (display.DrawMode() == iCameraPane.SELECTION &&
	5537	+ (hide \|\| dontselect))
5345	5538	return;
5346	5539
5347	5540	if (name != null && name.contains("sclera"))
..	..	@@ -5359,7 +5552,7 @@
5359	5552	if (this instanceof Checker)
5360	5553	return;
5361	5554
5362		- if (display.drawMode == display.SHADOW && PASSTEST)
	5555	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5363	5556	return;
5364	5557
5365	5558	if (count <= 0)
..	..	@@ -5367,13 +5560,13 @@
5367	5560	return;
5368	5561	}
5369	5562
5370		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5371		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5563	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	5564	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5372	5565	{
5373	5566	return;
5374	5567	}
5375	5568
5376		- javax.media.opengl.GL gl = display.GetGL();
	5569	+ //javax.media.opengl.GL gl = display.GetGL();
5377	5570
5378	5571	/*
5379	5572	if (touched)
..	..	@@ -5409,15 +5602,15 @@
5409	5602
5410	5603	boolean compiled = false;
5411	5604
5412		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5605	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5413	5606
5414		- if (!selectmode && //display.drawMode != display.SELECTION &&
	5607	+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
5415	5608	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5416	5609	{
5417		- display.lighttouched = true;
	5610	+ Globals.lighttouched = true;
5418	5611	} // all panes...
5419		- //if (usecalllists && display.drawMode != display.SELECTION && display.drawMode != display.SHADOW &&
5420		- if (bRep != null && usecalllists && !selectmode && // june 2013 display.drawMode != display.SHADOW &&
	5612	+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
	5613	+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5421	5614	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5422	5615	{
5423	5616	if (!(this instanceof Composite))
..	..	@@ -5425,7 +5618,7 @@
5425	5618	//if (displaylist == -1 && usecalllists)
5426	5619	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5427	5620	{
5428		- bRep.displaylist = gl.glGenLists(1);
	5621	+ bRep.displaylist = display.GenList();
5429	5622	assert(bRep.displaylist != 0);
5430	5623	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5431	5624	//System.out.println("\tgen list " + list);
..	..	@@ -5437,18 +5630,20 @@
5437	5630	if (usecalllists)
5438	5631	{
5439	5632	// System.err.println("new list " + bRep.displaylist + " for " + this);
5440		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5633	+ display.NewList(bRep.displaylist);
5441	5634	}
	5635	+
5442	5636	CallList(display, root, selected, blocked);
	5637	+
5443	5638	// compiled = true;
5444	5639	if (usecalllists)
5445	5640	{
5446	5641	// System.err.println("end list " + bRep.displaylist + " for " + this);
5447		- gl.glEndList();
	5642	+ display.EndList();
5448	5643	}
5449	5644	//gl.glDrawBuffer(gl.GL_BACK);
5450	5645	// XXX touched = false;
5451		- display.lighttouched = true; // all panes...
	5646	+ Globals.lighttouched = true; // all panes...
5452	5647	}
5453	5648
5454	5649	touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
..	..	@@ -5487,12 +5682,12 @@
5487	5682
5488	5683	// frustum culling
5489	5684	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5490		- && display.drawMode != CameraPane.SELECTION)
	5685	+ && display.DrawMode() != iCameraPane.SELECTION)
5491	5686	{
5492		- if (display.drawMode == CameraPane.SHADOW)
	5687	+ if (display.DrawMode() == iCameraPane.SHADOW)
5493	5688	{
5494	5689	if (!link2master // tricky to cull in shadow mode.
5495		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	5690	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5496	5691	{
5497	5692	//System.out.print("CULLED");
5498	5693	culled = true;
..	..	@@ -5500,7 +5695,7 @@
5500	5695	}
5501	5696	else
5502	5697	//GetBRep().getBounds(v0, v1, this);
5503		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	5698	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5504	5699	culled = true;
5505	5700
5506	5701	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5536,11 +5731,11 @@
5536	5731
5537	5732
5538	5733	if (!culled)
5539		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	5734	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5540	5735	{
5541	5736	if (GetBRep() != null)
5542	5737	{
5543		- CameraPane.NextIndex(this, gl);
	5738	+ display.NextIndex();
5544	5739	// vertex color conflict : gl.glCallList(list);
5545	5740	DrawNode(display, root, selected);
5546	5741	if (this instanceof BezierPatch)
..	..	@@ -5562,55 +5757,7 @@
5562	5757	color[2] /= 2;
5563	5758	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5564	5759	*/
5565		- if (material != null)
5566		- {
5567		- materialstack[materialdepth] = material;
5568		- selectedstack[materialdepth] = selected;
5569		- cStatic.objectstack[materialdepth++] = this;
5570		- //System.out.println("material " + material);
5571		- //Applet3D.tracein(this, selected);
5572		- display.vector2buffer = projectedVertices;
5573		- if (this instanceof Camera)
5574		- {
5575		- display.options1[0] = material.shift;
5576		- //System.out.println("shift " + material.shift);
5577		- display.options1[1] = material.lightarea;
5578		- display.options1[2] = material.shadowbias;
5579		- display.options1[3] = material.aniso;
5580		- display.options1[4] = material.anisoV;
5581		- display.options2[0] = material.opacity;
5582		- display.options2[1] = material.diffuse;
5583		- display.options2[2] = material.factor;
5584		-
5585		- cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
5586		- display.options4[0] = material.cameralight/0.2f;
5587		- display.options4[1] = material.subsurface;
5588		- display.options4[2] = material.sheen;
5589		-
5590		- // if (display.CURRENTANTIALIAS > 0)
5591		- // display.options3[3] /= 4;
5592		-
5593		- /*
5594		- System.out.println("Focus = " + display.options1[0]);
5595		- System.out.println("Aperture = " + display.options1[1]);
5596		- System.out.println("ShadowBlur = " + display.options1[2]);
5597		- System.out.println("Antialiasing = " + display.options1[3]);
5598		- System.out.println("Fog = " + display.options2[0]);
5599		- System.out.println("Intensity = " + display.options2[1]);
5600		- System.out.println("Elevation = " + display.options2[2]);
5601		- /**/
5602		- } else
5603		- {
5604		- material.Draw(display, selected);
5605		- }
5606		- } else
5607		- {
5608		- if (selected && CameraPane.flash)
5609		- {
5610		- display.modelParams4[1] = 100;
5611		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5612		- }
5613		- }
	5760	+ display.PushMaterial(this, selected);
5614	5761
5615	5762	//System.out.println("call list " + list);
5616	5763	//System.out.println();
..	..	@@ -5629,7 +5776,17 @@
5629	5776	tex = GetTextures();
5630	5777	}
5631	5778
5632		- 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	+ }
5633	5790
5634	5791	if (!compiled)
5635	5792	{
..	..	@@ -5645,30 +5802,16 @@
5645	5802
5646	5803	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5647	5804	assert(bRep.displaylist != 0);
5648		- gl.glCallList(bRep.displaylist);
	5805	+ display.CallList(bRep.displaylist);
5649	5806	// june 2013 drawSelf(display, root, selected);
5650	5807	}
5651	5808	}
5652	5809	}
5653	5810
5654		- display.ReleaseTextures(tex);
5655		-
5656		- //if (parent != null && parent.GetMaterial() != null)
5657		- // parent.GetMaterial().Draw(display, parent.IsSelected(this));
5658		- if (material != null)
5659		- {
5660		- materialdepth -= 1;
5661		- if (materialdepth > 0)
5662		- {
5663		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5664		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5665		- }
5666		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5667		- } else if (selected && CameraPane.flash && GetMaterial() != null)
5668		- {
5669		- display.modelParams4[1] = GetMaterial().cameralight;
5670		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5671		- }
	5811	+ if (!failed)
	5812	+ display.ReleaseTextures(tex);
	5813	+
	5814	+ display.PopMaterial(this, selected);
5672	5815	}
5673	5816
5674	5817	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5710,7 +5853,7 @@
5710	5853	// resetMasterNode();
5711	5854	}
5712	5855
5713		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5856	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5714	5857	{
5715	5858	if (GetBRep() == null)
5716	5859	{
..	..	@@ -5793,8 +5936,11 @@
5793	5936	boolean flipV = false; // true;
5794	5937	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5795	5938
5796		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5939	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5797	5940	{
	5941	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	5942	+ return;
	5943	+
5798	5944	if (hide)
5799	5945	return;
5800	5946	// shadow optimisation
..	..	@@ -5852,16 +5998,7 @@
5852	5998	// // ??????????????????????????? Touch();
5853	5999	// }
5854	6000
5855		- if (material != null)
5856		- {
5857		- materialstack[materialdepth] = material;
5858		- selectedstack[materialdepth] = selected;
5859		- cStatic.objectstack[materialdepth++] = this;
5860		- //System.out.println("material " + material);
5861		- //Applet3D.tracein("selected ", selected);
5862		- display.vector2buffer = projectedVertices;
5863		- material.Draw(display, selected);
5864		- }
	6001	+display.PushMaterial2(this, selected);
5865	6002
5866	6003	Object3D child;
5867	6004	boolean sel;
..	..	@@ -5913,19 +6050,7 @@
5913	6050	*/
5914	6051	//depth += 1;
5915	6052
5916		- if (material != null)
5917		- {
5918		- materialdepth -= 1;
5919		- if (materialdepth > 0)
5920		- {
5921		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5922		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5923		- }
5924		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5925		- //else
5926		- //material.Draw(display, false);
5927		- }
5928		-
	6053	+display.PopMaterial2(this);
5929	6054	/*
5930	6055	display.ReleaseTextures(tex);
5931	6056	*/
..	..	@@ -5936,10 +6061,13 @@
5936	6061
5937	6062	//static cVector min,max;
5938	6063
5939		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	6064	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5940	6065	{
5941		- if (display.drawMode == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	6066	+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5942	6067	return; // no shadow for transparent objects
	6068	+
	6069	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6070	+ return;
5943	6071
5944	6072	if (hide)
5945	6073	return;
..	..	@@ -5981,9 +6109,10 @@
5981	6109	return;
5982	6110	}
5983	6111
	6112	+ //bRep.GenUV(1/material.diffuseness);
5984	6113	// bRep.lock = true;
5985	6114
5986		- javax.media.opengl.GL gl = display.GetGL();
	6115	+ //javax.media.opengl.GL gl = display.GetGL();
5987	6116
5988	6117	if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5989	6118	{
..	..	@@ -6000,23 +6129,7 @@
6000	6129
6001	6130	bRep.getMinMax(min, max, 100);
6002	6131
6003		- gl.glBegin(gl.GL_LINES);
6004		-
6005		- gl.glVertex3d(min.x, min.y, min.z);
6006		- gl.glVertex3d(min.x, min.y, max.z);
6007		- gl.glVertex3d(min.x, min.y, min.z);
6008		- gl.glVertex3d(min.x, max.y, min.z);
6009		- gl.glVertex3d(min.x, min.y, min.z);
6010		- gl.glVertex3d(max.x, min.y, min.z);
6011		-
6012		- gl.glVertex3d(max.x, max.y, max.z);
6013		- gl.glVertex3d(min.x, max.y, max.z);
6014		- gl.glVertex3d(max.x, max.y, max.z);
6015		- gl.glVertex3d(max.x, min.y, max.z);
6016		- gl.glVertex3d(max.x, max.y, max.z);
6017		- gl.glVertex3d(max.x, max.y, min.z);
6018		-
6019		- gl.glEnd();
	6132	+ display.DrawBox(min, max);
6020	6133
6021	6134	return;
6022	6135	}
..	..	@@ -6060,7 +6173,7 @@
6060	6173	{
6061	6174	//throw new Error();
6062	6175
6063		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6176	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
6064	6177
6065	6178	int[] strips = bRep.getRawIndices();
6066	6179
..	..	@@ -6070,178 +6183,14 @@
6070	6183	new Exception().printStackTrace();
6071	6184	return;
6072	6185	}
6073		-
6074		- // TRIANGLE STRIP ARRAY
6075		- if (bRep.trimmed)
6076		- {
6077		- float[] v = bRep.getRawVertices();
6078		- float[] n = bRep.getRawNormals();
6079		- float[] c = bRep.getRawColors();
6080		- float[] uv = bRep.getRawUVMap();
6081		-
6082		- int count2 = 0;
6083		- int count3 = 0;
6084		-
6085		- if (n.length > 0)
6086		- {
6087		- for (int i = 0; i < strips.length; i++)
6088		- {
6089		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6090		-
6091		- /*
6092		- boolean locked = false;
6093		- float eps = 0.1f;
6094		- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6095		-
6096		- int dot = 0;
6097		-
6098		- if ((dot&1) == 0)
6099		- dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6100		-
6101		- if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6102		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6103		- else
6104		- {
6105		- locked = true;
6106		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6107		- }
6108		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6109		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6110		- if (hasnorm)
6111		- {
6112		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6113		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6114		- }
6115		-
6116		- if ((dot&4) == 0)
6117		- dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6118		-
6119		- if (wrap \|\| !locked && (dot&8) != 0)
6120		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6121		- else
6122		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6123		-
6124		- f.dot = dot;
6125		- */
6126		-
6127		- if (!selectmode)
6128		- {
6129		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6130		- {
6131		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6132		- } else
6133		- {
6134		- gl.glNormal3f(0, 0, 1);
6135		- }
6136		-
6137		- if (c != null)
6138		- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
6139		- {
6140		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6141		- }
6142		- }
6143		- if (flipV)
6144		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6145		- else
6146		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6147		- //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6148		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6149		-
6150		- count2 += 2;
6151		- count3 += 3;
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		- if (flipV)
6167		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6168		- else
6169		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6170		- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6171		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6172		-
6173		- count2 += 2;
6174		- count3 += 3;
6175		- for (int j = 0; j < strips[i] - 2; j++)
6176		- {
6177		- //gl.glTexCoord2d(...);
6178		- if (!selectmode)
6179		- {
6180		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6181		- {
6182		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6183		- } else
6184		- {
6185		- gl.glNormal3f(0, 0, 1);
6186		- }
6187		- if (c != null)
6188		- {
6189		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6190		- }
6191		- }
6192		-
6193		- if (flipV)
6194		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6195		- else
6196		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6197		- //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6198		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6199		- count2 += 2;
6200		- count3 += 3;
6201		- }
6202		-
6203		- gl.glEnd();
6204		- }
6205		- }
6206		-
6207		- assert count3 == v.length;
6208		- }
6209		- else // !trimmed
6210		- {
6211		- int count = 0;
6212		- for (int i = 0; i < strips.length; i++)
6213		- {
6214		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6215		-
6216		- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6217		- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6218		-
6219		- drawVertex(gl, p, selectmode);
6220		- drawVertex(gl, q, selectmode);
6221		-
6222		- for (int j = 0; j < strips[i] - 2; j++)
6223		- {
6224		- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6225		-
6226		-// if (j%2 == 0)
6227		-// drawFace(p, q, r, display, null);
6228		-// else
6229		-// drawFace(p, r, q, display, null);
6230		-
6231		-// p = q;
6232		-// q = r;
6233		- drawVertex(gl, r, selectmode);
6234		- }
6235		-
6236		- gl.glEnd();
6237		- }
6238		- }
	6186	+
	6187	+ display.DrawGeometry(bRep, flipV, selectmode);
6239	6188	} else // catch (Error e)
6240	6189	{
6241	6190	// TRIANGLE ARRAY
6242	6191	if (IsOpaque()) // Static())
6243	6192	{
6244		- gl.glBegin(gl.GL_TRIANGLES);
	6193	+ display.StartTriangles();
6245	6194	int facecount = bRep.FaceCount();
6246	6195	for (int i = 0; i < facecount; i++)
6247	6196	{
..	..	@@ -6304,9 +6253,9 @@
6304	6253	// // r.norm.dot(v3) > -0.5)
6305	6254	// // continue;
6306	6255
6307		- drawFace(p, q, r, display, face);
	6256	+ display.DrawFace(this, p, q, r, face);
6308	6257	}
6309		- gl.glEnd();
	6258	+ display.EndTriangles();
6310	6259	}
6311	6260	else
6312	6261	{
..	..	@@ -6335,8 +6284,8 @@
6335	6284	//System.out.println("SORT");
6336	6285
6337	6286	java.util.Arrays.sort(facescompare);
6338		-
6339		- gl.glBegin(gl.GL_TRIANGLES);
	6287	+
	6288	+ display.StartTriangles();
6340	6289	for (int i = 0; i < facecount; i++)
6341	6290	{
6342	6291	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6348,13 +6297,14 @@
6348	6297	Vertex q = bRep.GetVertex(face.q);
6349	6298	Vertex r = bRep.GetVertex(face.r);
6350	6299
6351		- drawFace(p, q, r, display, face);
	6300	+ display.DrawFace(this, p, q, r, face);
6352	6301	}
6353		- gl.glEnd();
	6302	+ display.EndTriangles();
6354	6303	}
6355	6304
6356	6305	if (false) // live && support != null && support.bRep != null) // debug weights
6357	6306	{
	6307	+ /*
6358	6308	gl.glDisable(gl.GL_LIGHTING);
6359	6309	float[] colorV = new float[3];
6360	6310
..	..	@@ -6433,6 +6383,7 @@
6433	6383	// gl.glEnd();
6434	6384	}
6435	6385	}
	6386	+ */
6436	6387	}
6437	6388	}
6438	6389
..	..	@@ -6477,7 +6428,7 @@
6477	6428	center.add(r);
6478	6429	center.mul(1.0/3);
6479	6430
6480		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6431	+ center.sub(Globals.theRenderer.EyeCamera().location);
6481	6432
6482	6433	distance = center.dot(center);
6483	6434	}
..	..	@@ -6488,390 +6439,11 @@
6488	6439
6489	6440	transient FaceCompare[] facescompare = null;
6490	6441
6491		- void SetColor(CameraPane display, Vertex p0)
6492		- {
6493		- if (display.RENDERPROGRAM == 0)
6494		- {
6495		- float r = 0;
6496		- if (bRep != null)
6497		- {
6498		- if (bRep.stripified)
6499		- {
6500		- r = 1;
6501		- }
6502		- }
6503		- float g = 0;
6504		- if (bRep != null)
6505		- {
6506		- if (bRep.trimmed)
6507		- {
6508		- g = 1;
6509		- }
6510		- }
6511		- float b = 0;
6512		- if (support != null && link2master)
6513		- {
6514		- b = 1;
6515		- }
6516		- display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
6517		- return;
6518		- }
6519		-
6520		- if (display.drawMode != CameraPane.SHADOW)
6521		- return;
6522		-
6523		- javax.media.opengl.GL gl = display.GetGL();
6524		-// if (true) return;
6525		-// float ao = p.AO;
6526		-//
6527		-// // if (ao == 0 && !bRep.AOdone) // transient problem!
6528		-// // ao = 1;
6529		-//
6530		-// gl.glColor4f(ao, ao, ao, 1);
6531		-
6532		-// CameraPane.selectedpoint.
6533		-// getAverage(cStatic.point1, true);
6534		- if (CameraPane.pointflow == null) // !random) // live)
6535		- {
6536		- return;
6537		- }
6538		-
6539		- cStatic.point1.set(0,0,0);
6540		- LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
6541		-
6542		- cStatic.point1.sub(p0);
6543		-
6544		-
6545		-// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
6546		-// {
6547		-// return;
6548		-// }
6549		-
6550		- //if (true)
6551		- if (cStatic.point1.dot(cStatic.point1) > 0.000001)
6552		- {
6553		- return;
6554		- }
6555		-
6556		- float[] colorV = new float[3];
6557		-
6558		- if (false) // marked)
6559		- {
6560		- // debug rigging weights
6561		- for (int object = 0; object < p0.vertexlinks.length; object++)
6562		- {
6563		- float weight = p0.weights[object] / p0.totalweight;
6564		-
6565		- // if (weight < 0.1)
6566		- // {
6567		- // assert(weight == 0);
6568		- // continue;
6569		- // }
6570		-
6571		- if (p0.vertexlinks[object] == -1)
6572		- continue;
6573		-
6574		- Vertex q = support.bRep.GetVertex(p0.vertexlinks[object]);
6575		-
6576		- int color = //1 << object; //
6577		- //p.vertexlinks.length;
6578		- support.bRep.supports[p0.closestsupport].links[object];
6579		- colorV[2] += (color & 1) * weight;
6580		- colorV[1] += ((color & 2) >> 1) * weight;
6581		- colorV[0] += ((color & 4) >> 2) * weight;
6582		- }
6583		- }
6584		- else
6585		- {
6586		- if (drawingstarted)
6587		- {
6588		- // find next point
6589		- if (bRep.GetVertex(0).faceindices == null)
6590		- {
6591		- bRep.InitFaceIndices();
6592		- }
6593		-
6594		- double ymin = p0.y;
6595		-
6596		- Vertex newp = p0;
6597		-
6598		- for (int fii = 0; fii < p0.faceindices.length; fii++)
6599		- {
6600		- int fi = p0.faceindices[fii];
6601		-
6602		- if (fi == -1)
6603		- break;
6604		-
6605		- Face f = bRep.GetFace(fi);
6606		-
6607		- Vertex p = bRep.GetVertex(f.p);
6608		- Vertex q = bRep.GetVertex(f.q);
6609		- Vertex r = bRep.GetVertex(f.r);
6610		-
6611		- int swap = (int)(Math.random()*3);
6612		-
6613		-// for (int s=swap; --s>=0;)
6614		-// {
6615		-// Vertex t = p;
6616		-// p = q;
6617		-// q = r;
6618		-// r = t;
6619		-// }
6620		- if (ymin > p.y)
6621		- {
6622		- ymin = p.y;
6623		- newp = p;
6624		-// break;
6625		- }
6626		- if (ymin > q.y)
6627		- {
6628		- ymin = q.y;
6629		- newp = q;
6630		-// break;
6631		- }
6632		- if (ymin > r.y)
6633		- {
6634		- ymin = r.y;
6635		- newp = r;
6636		-// break;
6637		- }
6638		- }
6639		-
6640		- CameraPane.selectedpoint.toParent[3][0] = newp.x;
6641		- CameraPane.selectedpoint.toParent[3][1] = newp.y;
6642		- CameraPane.selectedpoint.toParent[3][2] = newp.z;
6643		-
6644		- drawingstarted = false;
6645		-
6646		- // return;
6647		- }
6648		-
6649		- if (false) // CameraPane.DRAW
6650		- {
6651		- p0.AO = colorV[0] = 2;
6652		- colorV[1] = 2;
6653		- colorV[2] = 2;
6654		- }
6655		-
6656		- CameraPane.pointflow.add(p0);
6657		- CameraPane.pointflow.Touch();
6658		- }
6659		-
6660		-// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
6661		-// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
6662		-// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
6663		- }
6664		-
6665	6442	void Print(Vertex v)
6666	6443	{
6667	6444	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6668	6445	}
6669	6446
6670		- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6671		- {
6672		- if (!selectmode)
6673		- {
6674		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6675		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6676		-
6677		- if (flipV)
6678		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6679		- else
6680		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6681		- }
6682		-
6683		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6684		- }
6685		-
6686		- void drawFace(Vertex pv, Vertex qv, Vertex rv,
6687		- CameraPane display, Face face)
6688		- {
6689		- if (pv.y == -10000 \|\|
6690		- qv.y == -10000 \|\|
6691		- rv.y == -10000)
6692		- return;
6693		-
6694		-// float b = f.nbiterations & 1;
6695		-// float g = (f.nbiterations>>1) & 1;
6696		-// float r = (f.nbiterations>>2) & 1;
6697		-//
6698		-// //if (f.weight == 10000)
6699		-// //{
6700		-// // r = 1; g = b = 0;
6701		-// //}
6702		-// //else
6703		-// //{
6704		-// // assert(f.weight < 10000);
6705		-// r = g = b = (float)bRep.FaceWeight(f)*100;
6706		-// if (r<0)
6707		-// assert(r>=0);
6708		-// //}
6709		-
6710		- javax.media.opengl.GL gl = display.GetGL();
6711		-
6712		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
6713		-
6714		- //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
6715		- if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
6716		- {
6717		- //gl.glBegin(gl.GL_TRIANGLES);
6718		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
6719		- if (!hasnorm)
6720		- {
6721		- // System.out.println("FUCK!!");
6722		- LA.vecSub(pv/.pos/, qv/.pos/, v0);
6723		- LA.vecSub(pv/.pos/, rv/.pos/, v1);
6724		- LA.vecCross(v0, v1, v2);
6725		- LA.vecNormalize(v2);
6726		- gl.glNormal3f((float) v2.x, (float) v2.y, (float) v2.z);
6727		- }
6728		-
6729		- // P
6730		- float x = (float)pv.x;
6731		- float y = (float)pv.y;
6732		- float z = (float)pv.z;
6733		-
6734		- if (hasnorm)
6735		- {
6736		-// if (!pv.norm.normalized())
6737		-// assert(pv.norm.normalized());
6738		-
6739		- //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
6740		- float nx = (float)pv.norm.x;
6741		- float ny = (float)pv.norm.y;
6742		- float nz = (float)pv.norm.z;
6743		-
6744		- x += nx * NORMALPUSH;
6745		- y += ny * NORMALPUSH;
6746		- z += nz * NORMALPUSH;
6747		-
6748		- gl.glNormal3f(nx, ny, nz);
6749		- }
6750		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6751		- SetColor(display, pv);
6752		- //gl.glColor4f(r, g, b, 1);
6753		- //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
6754		- if (flipV)
6755		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6756		- else
6757		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6758		- //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
6759		-
6760		- gl.glVertex3f(x, y, z);
6761		-
6762		- // Q
6763		- x = (float)qv.x;
6764		- y = (float)qv.y;
6765		- z = (float)qv.z;
6766		-
6767		-// Print(pv);
6768		- if (hasnorm)
6769		- {
6770		-// assert(qv.norm.normalized());
6771		- //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
6772		- float nx = (float)qv.norm.x;
6773		- float ny = (float)qv.norm.y;
6774		- float nz = (float)qv.norm.z;
6775		-
6776		- x += nx * NORMALPUSH;
6777		- y += ny * NORMALPUSH;
6778		- z += nz * NORMALPUSH;
6779		-
6780		- gl.glNormal3f(nx, ny, nz);
6781		- }
6782		- //System.out.println("vertexq = " + qv.s + ", " + qv.t);
6783		- // boolean locked = false;
6784		- // float eps = 0.1f;
6785		- // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6786		-
6787		- // int dot = 0; //*/ (int)f.dot;
6788		-
6789		- // if ((dot&1) == 0)
6790		- // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6791		-
6792		- // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6793		- if (flipV)
6794		- gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
6795		- else
6796		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6797		- // else
6798		- // {
6799		- // locked = true;
6800		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6801		- // }
6802		- gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
6803		- SetColor(display, qv);
6804		-
6805		- gl.glVertex3f(x, y, z);
6806		- //gl.glColor4f(r, g, b, 1);
6807		- //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
6808		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6809		-// Print(qv);
6810		-
6811		- // R
6812		- x = (float)rv.x;
6813		- y = (float)rv.y;
6814		- z = (float)rv.z;
6815		-
6816		- if (hasnorm)
6817		- {
6818		-// assert(rv.norm.normalized());
6819		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6820		- float nx = (float)rv.norm.x;
6821		- float ny = (float)rv.norm.y;
6822		- float nz = (float)rv.norm.z;
6823		-
6824		- x += nx * NORMALPUSH;
6825		- y += ny * NORMALPUSH;
6826		- z += nz * NORMALPUSH;
6827		-
6828		- gl.glNormal3f(nx, ny, nz);
6829		- }
6830		-
6831		- // if ((dot&4) == 0)
6832		- // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6833		-
6834		- // if (wrap \|\| !locked && (dot&8) != 0)
6835		- if (flipV)
6836		- gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
6837		- else
6838		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6839		- // else
6840		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6841		-
6842		- // f.dot = dot;
6843		-
6844		- gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
6845		- SetColor(display, rv);
6846		- //gl.glColor4f(r, g, b, 1);
6847		- //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
6848		- //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
6849		- gl.glVertex3f(x, y, z);
6850		-// Print(rv);
6851		- //gl.glEnd();
6852		- }
6853		- else
6854		- {
6855		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6856		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6857		- gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
6858		-
6859		- }
6860		-
6861		- if (false) // (attributes & WIREFRAME) != 0)
6862		- {
6863		- gl.glDisable(gl.GL_LIGHTING);
6864		-
6865		- gl.glBegin(gl.GL_LINE_LOOP);
6866		- gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
6867		- gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
6868		- gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
6869		- gl.glEnd();
6870		-
6871		- gl.glEnable(gl.GL_LIGHTING);
6872		- }
6873		- }
6874		-
6875	6447	void drawSelf(ClickInfo info, int level, boolean select)
6876	6448	{
6877	6449	if (bRep == null)
..	..	@@ -7443,83 +7015,83 @@
7443	7015	int spotw = spot.x + spot.width;
7444	7016	int spoth = spot.y + spot.height;
7445	7017	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7446		- if (CameraPane.Xmin > spot.x)
7447		- {
7448		- CameraPane.Xmin = spot.x;
7449		- }
7450		- if (CameraPane.Xmax < spotw)
7451		- {
7452		- CameraPane.Xmax = spotw;
7453		- }
7454		- if (CameraPane.Ymin > spot.y)
7455		- {
7456		- CameraPane.Ymin = spot.y;
7457		- }
7458		- if (CameraPane.Ymax < spoth)
7459		- {
7460		- CameraPane.Ymax = spoth;
7461		- }
	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	+// }
7462	7034	spot.translate(32, 32);
7463	7035	spotw = spot.x + spot.width;
7464	7036	spoth = spot.y + spot.height;
7465	7037	info.g.setColor(Color.blue);
7466	7038	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7467		- if (CameraPane.Xmin > spot.x)
7468		- {
7469		- CameraPane.Xmin = spot.x;
7470		- }
7471		- if (CameraPane.Xmax < spotw)
7472		- {
7473		- CameraPane.Xmax = spotw;
7474		- }
7475		- if (CameraPane.Ymin > spot.y)
7476		- {
7477		- CameraPane.Ymin = spot.y;
7478		- }
7479		- if (CameraPane.Ymax < spoth)
7480		- {
7481		- CameraPane.Ymax = spoth;
7482		- }
7483		- info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7484		- 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);
7485	7057	spot.translate(0, -32);
7486	7058	info.g.setColor(Color.green);
7487	7059	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7488		- if (CameraPane.Xmin > spot.x)
7489		- {
7490		- CameraPane.Xmin = spot.x;
7491		- }
7492		- if (CameraPane.Xmax < spotw)
7493		- {
7494		- CameraPane.Xmax = spotw;
7495		- }
7496		- if (CameraPane.Ymin > spot.y)
7497		- {
7498		- CameraPane.Ymin = spot.y;
7499		- }
7500		- if (CameraPane.Ymax < spoth)
7501		- {
7502		- CameraPane.Ymax = spoth;
7503		- }
	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	+// }
7504	7076	info.g.drawArc(boundary.x, boundary.y,
7505	7077	boundary.width, boundary.height, 0, 360);
7506	7078	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7507		- if (CameraPane.Xmin > boundary.x)
7508		- {
7509		- CameraPane.Xmin = boundary.x;
7510		- }
7511		- if (CameraPane.Xmax < boundary.x + boundary.width)
7512		- {
7513		- CameraPane.Xmax = boundary.x + boundary.width;
7514		- }
7515		- if (CameraPane.Ymin > boundary.y)
7516		- {
7517		- CameraPane.Ymin = boundary.y;
7518		- }
7519		- if (CameraPane.Ymax < boundary.y + boundary.height)
7520		- {
7521		- CameraPane.Ymax = boundary.y + boundary.height;
7522		- }
	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	+// }
7523	7095	return;
7524	7096	}
7525	7097	}
..	..	@@ -7536,7 +7108,7 @@
7536	7108	startX = info.x;
7537	7109	startY = info.y;
7538	7110
7539		- hitSomething = 0;
	7111	+ hitSomething = -1;
7540	7112	cVector origin = new cVector();
7541	7113	//LA.xformPos(origin, toParent, origin);
7542	7114	Rectangle spot = new Rectangle();
..	..	@@ -7569,7 +7141,7 @@
7569	7141	}
7570	7142
7571	7143	//System.out.println("info.modifiers = " + info.modifiers);
7572		- modified = (info.modifiers & CameraPane.META) != 0;
	7144	+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7573	7145	//System.out.println("modified = " + modified);
7574	7146	//new Exception().printStackTrace();
7575	7147	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7597,7 +7169,7 @@
7597	7169	return true;
7598	7170	}
7599	7171
7600		- void doEditDrag0(ClickInfo info)
	7172	+ void doEditDrag0(ClickInfo info, boolean opposite)
7601	7173	{
7602	7174	if (hitSomething == 0)
7603	7175	{
..	..	@@ -7612,6 +7184,7 @@
7612	7184	//System.out.println("hitSomething = " + hitSomething);
7613	7185
7614	7186	double scale = 0.005f * info.camera.Distance();
	7187	+
7615	7188	cVector xlate = new cVector();
7616	7189	//cVector xlate2 = new cVector();
7617	7190	switch (hitSomething)
..	..	@@ -7622,9 +7195,9 @@
7622	7195
7623	7196	case hitCenter: // Translate
7624	7197
7625		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7198	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7626	7199
7627		- if (modified)
	7200	+ if (modified \|\| opposite)
7628	7201	{
7629	7202	//assert(false);
7630	7203	/*
..	..	@@ -7670,10 +7243,10 @@
7670	7243	}
7671	7244	LA.xformDir(up, ClickInfo.matbuffer, up);
7672	7245	// if (!CameraPane.LOCALTRANSFORM)
7673		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
	7246	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7674	7247	LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7675	7248	// if (!CameraPane.LOCALTRANSFORM)
7676		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7249	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7677	7250	//LA.vecCross(up, cVector.Z, right2);
7678	7251
7679	7252	cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
..	..	@@ -7718,6 +7291,7 @@
7718	7291
7719	7292	if (modified)
7720	7293	{
	7294	+ // Rotate 90 degrees
7721	7295	angle /= (Math.PI / 4);
7722	7296	angle = Math.floor(angle + 0.5);
7723	7297	angle *= (Math.PI / 4);
..	..	@@ -7731,7 +7305,7 @@
7731	7305	}
7732	7306	/**/
7733	7307
7734		- switch (info.pane.renderCamera.viewCode)
	7308	+ switch (info.pane.RenderCamera().viewCode)
7735	7309	{
7736	7310	case 1: // '\001'
7737	7311	LA.matZRotate(toParent, angle);
..	..	@@ -7759,24 +7333,27 @@
7759	7333
7760	7334	case hitScale: // scale
7761	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);
7762	7342	if (hScale < 0.01)
7763	7343	{
7764		- hScale = 0.01;
	7344	+ //hScale = 0.01;
7765	7345	}
7766		- hScale = Math.pow(hScale, scale * 50);
7767		- if (hScale < 0.01)
7768		- {
7769		- hScale = 0.01;
7770		- }
	7346	+
7771	7347	double vScale = (double) (info.y - centerPt.y) / 32;
7772		- if (vScale < 0.01)
	7348	+ sign = 1;
	7349	+ if (vScale < 0)
7773	7350	{
7774		- vScale = 0.01;
	7351	+ sign = -1;
7775	7352	}
7776		- vScale = Math.pow(vScale, scale * 50);
	7353	+ vScale = signMath.pow(signvScale, scale * 50);
7777	7354	if (vScale < 0.01)
7778	7355	{
7779		- vScale = 0.01;
	7356	+ //vScale = 0.01;
7780	7357	}
7781	7358	LA.matCopy(startMat, toParent);
7782	7359	/**/
..	..	@@ -7787,17 +7364,24 @@
7787	7364	}
7788	7365	/**/
7789	7366
7790		- 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)
7791	7375	{
7792	7376	case 3: // '\001'
7793	7377	if (modified)
7794	7378	{
7795	7379	//LA.matScale(toParent, 1, hScale, vScale);
7796		- LA.matScale(toParent, vScale, 1, 1);
	7380	+ LA.matScale(toParent, totalScale, 1, 1);
7797	7381	} // vScale, 1);
7798	7382	else
7799	7383	{
7800		- LA.matScale(toParent, vScale, vScale, vScale);
	7384	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7801	7385	} // vScale, 1);
7802	7386	break;
7803	7387
..	..	@@ -7805,10 +7389,10 @@
7805	7389	if (modified)
7806	7390	{
7807	7391	//LA.matScale(toParent, hScale, 1, vScale);
7808		- LA.matScale(toParent, 1, vScale, 1);
	7392	+ LA.matScale(toParent, 1, totalScale, 1);
7809	7393	} else
7810	7394	{
7811		- LA.matScale(toParent, vScale, 1, vScale);
	7395	+ LA.matScale(toParent, totalScale, 1, totalScale);
7812	7396	}
7813	7397	break;
7814	7398
..	..	@@ -7816,10 +7400,10 @@
7816	7400	if (modified)
7817	7401	{
7818	7402	//LA.matScale(toParent, hScale, vScale, 1);
7819		- LA.matScale(toParent, 1, 1, vScale);
	7403	+ LA.matScale(toParent, 1, 1, totalScale);
7820	7404	} else
7821	7405	{
7822		- LA.matScale(toParent, vScale, vScale, 1);
	7406	+ LA.matScale(toParent, totalScale, totalScale, 1);
7823	7407	}
7824	7408	break;
7825	7409	}
..	..	@@ -7952,14 +7536,22 @@
7952	7536	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7953	7537	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7954	7538	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7539	+
	7540	+ String objname;
	7541	+
7955	7542	if (false) //parent != null)
7956	7543	{
7957		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7544	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7958	7545	} else
7959	7546	{
7960		- 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) ":"") / "";
7961	7548	} // + super.toString();
7962	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);
7963	7555	}
7964	7556
7965	7557	public int hashCode()
..	..	@@ -8015,6 +7607,7 @@
8015	7607	objectUI.closeUI();
8016	7608	if (editWindow != null)
8017	7609	{
	7610	+ editWindow.ctrlPanel.FlushUI();
8018	7611	editWindow.refreshContents();
8019	7612	} // ? new
8020	7613	objectUI = null;
..	..	@@ -8035,7 +7628,7 @@
8035	7628	/transient/ cVector2[] projectedVertices = new cVector2[0];
8036	7629
8037	7630	Object3D /Composite/ parent;
8038		- Object3D /Composite/ fileparent;
	7631	+ Object3D /Composite/ fileparent; // In the case of FileObject
8039	7632
8040	7633	double[][] toParent; // dynamic matrix
8041	7634	double[][] fromParent;
..	..	@@ -8150,7 +7743,7 @@
8150	7743	{
8151	7744	assert(bRep != null);
8152	7745	if (!(support instanceof GenericJoint)) // support.bRep != null)
8153		- GrafreeD.Assert(support.bRep == bRep.support);
	7746	+ Grafreed.Assert(support.bRep == bRep.support);
8154	7747	}
8155	7748	else
8156	7749	{
..	..	@@ -8199,9 +7792,9 @@
8199	7792	private static cVector edge2 = new cVector();
8200	7793	//private static cVector norm = new cVector();
8201	7794	/transient private/ int hitSomething;
8202		- private static final int hitCenter = 1;
8203		- private static final int hitScale = 2;
8204		- private static final int hitRotate = 3;
	7795	+ static final int hitCenter = 1;
	7796	+ static final int hitScale = 2;
	7797	+ static final int hitRotate = 3;
8205	7798	/transient/ /private/ int viewCode; // Now used for transparency cache flag
8206	7799	/transient/ private Point centerPt;
8207	7800	/transient/ private int startX;