~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
..	..	@@ -299,6 +304,7 @@
299	304	}
300	305
301	306	boolean live = false;
	307	+ boolean dontselect = false;
302	308	boolean hide = false;
303	309	boolean link2master = false; // performs reset support/master at each frame
304	310	boolean marked = false; // animation node
..	..	@@ -430,16 +436,16 @@
430	436	{
431	437	Object3D copy = this;
432	438
433		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	439	+ Camera parentcam = Globals.theRenderer.ManipCamera();
434	440
435		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	441	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
436	442	{
437		- parentcam = CameraPane.theRenderer.cameras[1];
	443	+ parentcam = Globals.theRenderer.Cameras()[1];
438	444	}
439	445
440		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	446	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
441	447	{
442		- parentcam = CameraPane.theRenderer.cameras[0];
	448	+ parentcam = Globals.theRenderer.Cameras()[0];
443	449	}
444	450
445	451	if (this == parentcam)
..	..	@@ -447,7 +453,7 @@
447	453	//assert(this instanceof Camera);
448	454
449	455	for (int count = parentcam.GetTransformCount(); --count>=0;)
450		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	456	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
451	457	}
452	458
453	459	copy.marked ^= true;
..	..	@@ -467,7 +473,7 @@
467	473	//assert(this instanceof Camera);
468	474
469	475	for (int count = parentcam.GetTransformCount(); --count>=0;)
470		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	476	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
471	477	}
472	478
473	479	copy.Touch(); // display list issue
..	..	@@ -602,7 +608,7 @@
602	608	return;
603	609	}
604	610
605		- if (CameraPane.fromscript)
	611	+ if (Globals.fromscript)
606	612	{
607	613	transformcount = 0;
608	614	return;
..	..	@@ -760,7 +766,7 @@
760	766
761	767	int GetTransformCount()
762	768	{
763		- // marde pour serialization de Texture
	769	+ // patch pour serialization de Texture
764	770	resetmaxcount();
765	771	resettransformcount();
766	772	resetstep();
..	..	@@ -773,7 +779,7 @@
773	779	if (step == 0)
774	780	step = 1;
775	781	if (maxcount == 0)
776		- maxcount = 2048; // 4;
	782	+ maxcount = 128; // 2048; // 4;
777	783	// if (acceleration == 0)
778	784	// acceleration = 10;
779	785	if (delay == 0) // serial
..	..	@@ -794,12 +800,12 @@
794	800	// factor = CameraPane.STEP;
795	801	// }
796	802
797		- if (marked && CameraPane.isLIVE() && live &&
	803	+ if (marked && Globals.isLIVE() && live &&
798	804	//TEMP21aug2018
799		- CameraPane.drawMode == CameraPane.SHADOW &&
800		- currentframe != CameraPane.framecount)
	805	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	806	+ currentframe != Globals.framecount)
801	807	{
802		- currentframe = CameraPane.framecount;
	808	+ currentframe = Globals.framecount;
803	809
804	810	// System.err.println("transformcount = " + transformcount);
805	811	// System.err.println("factor = " + factor);
..	..	@@ -911,6 +917,11 @@
911	917	fromParent = null; // LA.newMatrix();
912	918	bRep = null; // new BoundaryRep();
913	919
	920	+ if (oname != null && oname.equals("LeftHand"))
	921	+ {
	922	+ name = oname;
	923	+ }
	924	+
914	925	/*
915	926	float hue = (float)Math.random();
916	927	Color col;
..	..	@@ -953,7 +964,7 @@
953	964
954	965	public Object clone()
955	966	{
956		- return GrafreeD.clone(this);
	967	+ return Grafreed.clone(this);
957	968	}
958	969
959	970	Object3D copyExpand()
..	..	@@ -1469,7 +1480,7 @@
1469	1480	BoundaryRep.SEUIL = other.material.cameralight;
1470	1481
1471	1482	// Set default to 0.1
1472		- BoundaryRep.SEUIL /= 2;
	1483	+ BoundaryRep.SEUIL /= 4; // 2;
1473	1484	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1474	1485	}
1475	1486
..	..	@@ -1728,7 +1739,7 @@
1728	1739	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1729	1740	o.bRep = transientrep;
1730	1741	if (clone)
1731		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1742	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1732	1743	o.CreateMaterial();
1733	1744	o.SetAttributes(this, -1);
1734	1745	//parent
..	..	@@ -1741,7 +1752,7 @@
1741	1752	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1742	1753	o.bRep = bRep;
1743	1754	if (clone)
1744		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1755	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1745	1756	o.CreateMaterial();
1746	1757	//o.overwriteThis(this, -1);
1747	1758	o.SetAttributes(this, -1);
..	..	@@ -1828,12 +1839,15 @@
1828	1839	if (obj.name == null)
1829	1840	continue; // can't be a null one
1830	1841
	1842	+ // Try perfect match first.
1831	1843	if (n.equals(obj.name))
1832	1844	{
1833	1845	theobj = obj;
1834	1846	count++;
1835	1847	}
1836	1848	}
	1849	+
	1850	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1837	1851
1838	1852	if (count != 1)
1839	1853	for (int i=Size(); --i>=0;)
..	..	@@ -2299,6 +2313,7 @@
2299	2313	{
2300	2314	if (newWindow)
2301	2315	{
	2316	+ new Exception().printStackTrace();
2302	2317	System.exit(0);
2303	2318	if (parent != null)
2304	2319	{
..	..	@@ -2475,13 +2490,13 @@
2475	2490	return retval;
2476	2491	}
2477	2492
2478		- void doEditDrag(ClickInfo info)
	2493	+ void doEditDrag(ClickInfo info, boolean opposite)
2479	2494	{
2480	2495	switch (doSomething)
2481	2496	{
2482	2497	case 1: // '\001'
2483	2498	//super.
2484		- doEditDrag0(info);
	2499	+ doEditDrag0(info, opposite);
2485	2500	break;
2486	2501
2487	2502	case 2: // '\002'
..	..	@@ -2494,11 +2509,11 @@
2494	2509	{
2495	2510	//sel.hitSomething = childToDrag.hitSomething;
2496	2511	//childToDrag.doEditDrag(info);
2497		- sel.doEditDrag(info);
	2512	+ sel.doEditDrag(info, opposite);
2498	2513	} else
2499	2514	{
2500	2515	//super.
2501		- doEditDrag0(info);
	2516	+ doEditDrag0(info, opposite);
2502	2517	}
2503	2518	}
2504	2519	break;
..	..	@@ -2905,7 +2920,8 @@
2905	2920	{
2906	2921	if (bRep != null)
2907	2922	{
2908		- bRep.GenUV();
	2923	+ bRep.GenUV(); //1);
	2924	+ //bRep.UnfoldUV();
2909	2925	Touch();
2910	2926	}
2911	2927	}
..	..	@@ -2980,6 +2996,33 @@
2980	2996	blockloop = false;
2981	2997	}
2982	2998
	2999	+ void TransformChildren()
	3000	+ {
	3001	+ if (toParent != null)
	3002	+ {
	3003	+ for (int i=Size(); --i>=0;)
	3004	+ {
	3005	+ Object3D v = get(i);
	3006	+
	3007	+ if (v.toParent == null)
	3008	+ {
	3009	+ v.toParent = LA.newMatrix();
	3010	+ v.fromParent = LA.newMatrix();
	3011	+ }
	3012	+
	3013	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3014	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3015	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3016	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3017	+ }
	3018	+
	3019	+ toParent = null; // LA.matIdentity(toParent);
	3020	+ fromParent = null; // LA.matIdentity(fromParent);
	3021	+
	3022	+ Touch();
	3023	+ }
	3024	+ }
	3025	+
2983	3026	void TransformGeometry()
2984	3027	{
2985	3028	Object3D obj = this;
..	..	@@ -3201,9 +3244,11 @@
3201	3244
3202	3245	BoundaryRep sup = bRep.support;
3203	3246	bRep.support = null;
3204		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3247	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3205	3248	// bRep.SplitInTwo(onlyone); // thread...
3206		- temprep.SplitInTwo(reduction34, onlyone);
	3249	+
	3250	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3251	+
3207	3252	bRep = temprep;
3208	3253	bRep.support = sup;
3209	3254	Touch();
..	..	@@ -3725,7 +3770,7 @@
3725	3770	if (child == null)
3726	3771	continue;
3727	3772
3728		- if (GrafreeD.RENDERME > 0)
	3773	+ if (Grafreed.RENDERME > 0)
3729	3774	{
3730	3775	if (child instanceof Merge)
3731	3776	((Merge)child).renderme();
..	..	@@ -3876,7 +3921,7 @@
3876	3921	if (child == null)
3877	3922	continue;
3878	3923
3879		- if (GrafreeD.RENDERME > 0)
	3924	+ if (Grafreed.RENDERME > 0)
3880	3925	{
3881	3926	if (child instanceof Merge)
3882	3927	((Merge)child).renderme();
..	..	@@ -4071,7 +4116,7 @@
4071	4116	if (child == null)
4072	4117	continue;
4073	4118
4074		- if (GrafreeD.RENDERME > 0)
	4119	+ if (Grafreed.RENDERME > 0)
4075	4120	{
4076	4121	if (child instanceof Merge)
4077	4122	((Merge)child).renderme();
..	..	@@ -4678,7 +4723,7 @@
4678	4723
4679	4724	cTreePath SelectLeaf(int indexcount, boolean deselect)
4680	4725	{
4681		- if (hide)
	4726	+ if (hide \|\| dontselect)
4682	4727	return null;
4683	4728
4684	4729	if (count <= 0)
..	..	@@ -4704,7 +4749,7 @@
4704	4749
4705	4750	cTreePath Select(int indexcount, boolean deselect)
4706	4751	{
4707		- if (hide)
	4752	+ if (hide \|\| dontselect)
4708	4753	return null;
4709	4754
4710	4755	if (count <= 0)
..	..	@@ -4854,7 +4899,7 @@
4854	4899	return globalTransform;
4855	4900	}
4856	4901
4857		- void PreprocessOcclusion(CameraPane cp)
	4902	+ void PreprocessOcclusion(iCameraPane cp)
4858	4903	{
4859	4904	/*
4860	4905	if (AOdone)
..	..	@@ -5001,7 +5046,8 @@
5001	5046	} else //
5002	5047	if (editWindow != null)
5003	5048	{
5004		- editWindow.cameraView.lighttouched = true;
	5049	+ //editWindow.cameraView.lighttouched = true;
	5050	+ Globals.lighttouched = true;
5005	5051	}
5006	5052	}
5007	5053
..	..	@@ -5155,10 +5201,34 @@
5155	5201
5156	5202	// System.out.println("Fullname = " + fullname);
5157	5203
5158		- if (fullname.name.indexOf(":") == -1)
5159		- return fullname.name;
	5204	+ // Does not work on Windows due to C:
	5205	+// if (fullname.name.indexOf(":") == -1)
	5206	+// return fullname.name;
	5207	+//
	5208	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5160	5209
5161		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5210	+ String[] split = fullname.name.split(":");
	5211	+
	5212	+ if (split.length == 0)
	5213	+ {
	5214	+ return "";
	5215	+ }
	5216	+
	5217	+ if (split.length <= 2)
	5218	+ {
	5219	+ if (fullname.name.endsWith(":"))
	5220	+ {
	5221	+ // Windows
	5222	+ return fullname.name.substring(0, fullname.name.length()-1);
	5223	+ }
	5224	+
	5225	+ return split[0];
	5226	+ }
	5227	+
	5228	+ // Windows
	5229	+ assert(split.length == 4);
	5230	+
	5231	+ return split[0] + ":" + split[1];
5162	5232	}
5163	5233
5164	5234	static String GetBump(cTexture fullname)
..	..	@@ -5167,10 +5237,38 @@
5167	5237	return "";
5168	5238
5169	5239	// 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());
	5240	+ // Does not work on Windows due to C:
	5241	+// if (fullname.name.indexOf(":") == -1)
	5242	+// return "";
	5243	+//
	5244	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5245	+ String[] split = fullname.name.split(":");
	5246	+
	5247	+ if (split.length == 0)
	5248	+ {
	5249	+ return "";
	5250	+ }
	5251	+
	5252	+ if (split.length == 1)
	5253	+ {
	5254	+ return "";
	5255	+ }
	5256	+
	5257	+ if (split.length == 2)
	5258	+ {
	5259	+ if (fullname.name.endsWith(":"))
	5260	+ {
	5261	+ // Windows
	5262	+ return "";
	5263	+ }
	5264	+
	5265	+ return split[1];
	5266	+ }
	5267	+
	5268	+ // Windows
	5269	+ assert(split.length == 4);
	5270	+
	5271	+ return split[2] + ":" + split[3];
5174	5272	}
5175	5273
5176	5274	String GetPigmentTexture()
..	..	@@ -5244,7 +5342,7 @@
5244	5342	System.out.print("; textures = " + textures);
5245	5343	System.out.println("; usedtextures = " + usedtextures);
5246	5344
5247		- if (GetTextures() == null)
	5345	+ if (GetTextures() == null) // What is that??
5248	5346	GetTextures().name = ":";
5249	5347
5250	5348	String texname = tex;
..	..	@@ -5275,6 +5373,43 @@
5275	5373	child.ResetPigmentTexture();
5276	5374	blockloop = false;
5277	5375	}
	5376	+ }
	5377	+
	5378	+ UUID GetUUID()
	5379	+ {
	5380	+ if (uuid == null)
	5381	+ {
	5382	+ // Serial
	5383	+ uuid = UUID.randomUUID();
	5384	+ }
	5385	+
	5386	+ return uuid;
	5387	+ }
	5388	+
	5389	+ Object3D GetObject(UUID uid)
	5390	+ {
	5391	+ if (blockloop)
	5392	+ return null;
	5393	+
	5394	+ if (GetUUID().equals(uid))
	5395	+ return this;
	5396	+
	5397	+ int nb = Size();
	5398	+ for (int i = 0; i < nb; i++)
	5399	+ {
	5400	+ Object3D child = (Object3D) get(i);
	5401	+
	5402	+ if (child == null)
	5403	+ continue;
	5404	+
	5405	+ blockloop = true;
	5406	+ Object3D obj = child.GetObject(uid);
	5407	+ blockloop = false;
	5408	+ if (obj != null)
	5409	+ return obj;
	5410	+ }
	5411	+
	5412	+ return null;
5278	5413	}
5279	5414
5280	5415	void SetBumpTexture(String tex)
..	..	@@ -5313,25 +5448,22 @@
5313	5448	}
5314	5449	}
5315	5450
5316		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5451	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5317	5452	{
5318	5453	Draw(display, root, selected, blocked);
5319	5454	}
5320	5455
5321		- static cMaterial[] materialstack = new cMaterial[65536];
5322		- static boolean[] selectedstack = new boolean[65536];
5323		- static int materialdepth = 0;
5324		-
5325	5456	boolean NeedSupport()
5326	5457	{
5327	5458	return
5328		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5459	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
5329	5460	// PROBLEM with CROWD!!
5330		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	5461	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5331	5462	}
5332	5463
	5464	+ static boolean DEBUG_SELECTION = false;
5333	5465
5334		- void Draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5466	+ void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5335	5467	{
5336	5468	Invariants(); // june 2013
5337	5469
..	..	@@ -5340,8 +5472,8 @@
5340	5472	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5341	5473	}
5342	5474
5343		- if (display.drawMode == CameraPane.SELECTION &&
5344		- hide)
	5475	+ if (display.DrawMode() == iCameraPane.SELECTION &&
	5476	+ (hide \|\| dontselect))
5345	5477	return;
5346	5478
5347	5479	if (name != null && name.contains("sclera"))
..	..	@@ -5359,7 +5491,7 @@
5359	5491	if (this instanceof Checker)
5360	5492	return;
5361	5493
5362		- if (display.drawMode == display.SHADOW && PASSTEST)
	5494	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5363	5495	return;
5364	5496
5365	5497	if (count <= 0)
..	..	@@ -5367,13 +5499,13 @@
5367	5499	return;
5368	5500	}
5369	5501
5370		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5371		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5502	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	5503	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5372	5504	{
5373	5505	return;
5374	5506	}
5375	5507
5376		- javax.media.opengl.GL gl = display.GetGL();
	5508	+ //javax.media.opengl.GL gl = display.GetGL();
5377	5509
5378	5510	/*
5379	5511	if (touched)
..	..	@@ -5409,15 +5541,15 @@
5409	5541
5410	5542	boolean compiled = false;
5411	5543
5412		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5544	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5413	5545
5414		- if (!selectmode && //display.drawMode != display.SELECTION &&
	5546	+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
5415	5547	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5416	5548	{
5417		- display.lighttouched = true;
	5549	+ Globals.lighttouched = true;
5418	5550	} // 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 &&
	5551	+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
	5552	+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5421	5553	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5422	5554	{
5423	5555	if (!(this instanceof Composite))
..	..	@@ -5425,7 +5557,7 @@
5425	5557	//if (displaylist == -1 && usecalllists)
5426	5558	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5427	5559	{
5428		- bRep.displaylist = gl.glGenLists(1);
	5560	+ bRep.displaylist = display.GenList();
5429	5561	assert(bRep.displaylist != 0);
5430	5562	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5431	5563	//System.out.println("\tgen list " + list);
..	..	@@ -5437,18 +5569,20 @@
5437	5569	if (usecalllists)
5438	5570	{
5439	5571	// System.err.println("new list " + bRep.displaylist + " for " + this);
5440		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5572	+ display.NewList(bRep.displaylist);
5441	5573	}
	5574	+
5442	5575	CallList(display, root, selected, blocked);
	5576	+
5443	5577	// compiled = true;
5444	5578	if (usecalllists)
5445	5579	{
5446	5580	// System.err.println("end list " + bRep.displaylist + " for " + this);
5447		- gl.glEndList();
	5581	+ display.EndList();
5448	5582	}
5449	5583	//gl.glDrawBuffer(gl.GL_BACK);
5450	5584	// XXX touched = false;
5451		- display.lighttouched = true; // all panes...
	5585	+ Globals.lighttouched = true; // all panes...
5452	5586	}
5453	5587
5454	5588	touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
..	..	@@ -5487,12 +5621,12 @@
5487	5621
5488	5622	// frustum culling
5489	5623	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5490		- && display.drawMode != CameraPane.SELECTION)
	5624	+ && display.DrawMode() != iCameraPane.SELECTION)
5491	5625	{
5492		- if (display.drawMode == CameraPane.SHADOW)
	5626	+ if (display.DrawMode() == iCameraPane.SHADOW)
5493	5627	{
5494	5628	if (!link2master // tricky to cull in shadow mode.
5495		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	5629	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5496	5630	{
5497	5631	//System.out.print("CULLED");
5498	5632	culled = true;
..	..	@@ -5500,7 +5634,7 @@
5500	5634	}
5501	5635	else
5502	5636	//GetBRep().getBounds(v0, v1, this);
5503		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	5637	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5504	5638	culled = true;
5505	5639
5506	5640	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5536,11 +5670,11 @@
5536	5670
5537	5671
5538	5672	if (!culled)
5539		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	5673	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5540	5674	{
5541	5675	if (GetBRep() != null)
5542	5676	{
5543		- CameraPane.NextIndex(this, gl);
	5677	+ display.NextIndex();
5544	5678	// vertex color conflict : gl.glCallList(list);
5545	5679	DrawNode(display, root, selected);
5546	5680	if (this instanceof BezierPatch)
..	..	@@ -5562,55 +5696,7 @@
5562	5696	color[2] /= 2;
5563	5697	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5564	5698	*/
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		- }
	5699	+ display.PushMaterial(this, selected);
5614	5700
5615	5701	//System.out.println("call list " + list);
5616	5702	//System.out.println();
..	..	@@ -5629,7 +5715,17 @@
5629	5715	tex = GetTextures();
5630	5716	}
5631	5717
5632		- display.BindTextures(tex, texres);
	5718	+ boolean failed = false;
	5719	+
	5720	+ try
	5721	+ {
	5722	+ display.BindTextures(tex, texres);
	5723	+ }
	5724	+ catch (Exception e)
	5725	+ {
	5726	+ System.err.println("FAILED: " + this);
	5727	+ failed = true;
	5728	+ }
5633	5729
5634	5730	if (!compiled)
5635	5731	{
..	..	@@ -5645,30 +5741,16 @@
5645	5741
5646	5742	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5647	5743	assert(bRep.displaylist != 0);
5648		- gl.glCallList(bRep.displaylist);
	5744	+ display.CallList(bRep.displaylist);
5649	5745	// june 2013 drawSelf(display, root, selected);
5650	5746	}
5651	5747	}
5652	5748	}
5653	5749
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		- }
	5750	+ if (!failed)
	5751	+ display.ReleaseTextures(tex);
	5752	+
	5753	+ display.PopMaterial(this, selected);
5672	5754	}
5673	5755
5674	5756	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5710,7 +5792,7 @@
5710	5792	// resetMasterNode();
5711	5793	}
5712	5794
5713		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5795	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5714	5796	{
5715	5797	if (GetBRep() == null)
5716	5798	{
..	..	@@ -5793,8 +5875,11 @@
5793	5875	boolean flipV = false; // true;
5794	5876	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5795	5877
5796		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5878	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5797	5879	{
	5880	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	5881	+ return;
	5882	+
5798	5883	if (hide)
5799	5884	return;
5800	5885	// shadow optimisation
..	..	@@ -5852,16 +5937,7 @@
5852	5937	// // ??????????????????????????? Touch();
5853	5938	// }
5854	5939
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		- }
	5940	+display.PushMaterial2(this, selected);
5865	5941
5866	5942	Object3D child;
5867	5943	boolean sel;
..	..	@@ -5913,19 +5989,7 @@
5913	5989	*/
5914	5990	//depth += 1;
5915	5991
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		-
	5992	+display.PopMaterial2(this);
5929	5993	/*
5930	5994	display.ReleaseTextures(tex);
5931	5995	*/
..	..	@@ -5936,10 +6000,13 @@
5936	6000
5937	6001	//static cVector min,max;
5938	6002
5939		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	6003	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5940	6004	{
5941		- if (display.drawMode == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	6005	+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5942	6006	return; // no shadow for transparent objects
	6007	+
	6008	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	6009	+ return;
5943	6010
5944	6011	if (hide)
5945	6012	return;
..	..	@@ -5981,9 +6048,10 @@
5981	6048	return;
5982	6049	}
5983	6050
	6051	+ //bRep.GenUV(1/material.diffuseness);
5984	6052	// bRep.lock = true;
5985	6053
5986		- javax.media.opengl.GL gl = display.GetGL();
	6054	+ //javax.media.opengl.GL gl = display.GetGL();
5987	6055
5988	6056	if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5989	6057	{
..	..	@@ -6000,23 +6068,7 @@
6000	6068
6001	6069	bRep.getMinMax(min, max, 100);
6002	6070
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();
	6071	+ display.DrawBox(min, max);
6020	6072
6021	6073	return;
6022	6074	}
..	..	@@ -6060,7 +6112,7 @@
6060	6112	{
6061	6113	//throw new Error();
6062	6114
6063		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6115	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
6064	6116
6065	6117	int[] strips = bRep.getRawIndices();
6066	6118
..	..	@@ -6070,178 +6122,14 @@
6070	6122	new Exception().printStackTrace();
6071	6123	return;
6072	6124	}
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		- }
	6125	+
	6126	+ display.DrawGeometry(bRep, flipV, selectmode);
6239	6127	} else // catch (Error e)
6240	6128	{
6241	6129	// TRIANGLE ARRAY
6242	6130	if (IsOpaque()) // Static())
6243	6131	{
6244		- gl.glBegin(gl.GL_TRIANGLES);
	6132	+ display.StartTriangles();
6245	6133	int facecount = bRep.FaceCount();
6246	6134	for (int i = 0; i < facecount; i++)
6247	6135	{
..	..	@@ -6304,9 +6192,9 @@
6304	6192	// // r.norm.dot(v3) > -0.5)
6305	6193	// // continue;
6306	6194
6307		- drawFace(p, q, r, display, face);
	6195	+ display.DrawFace(this, p, q, r, face);
6308	6196	}
6309		- gl.glEnd();
	6197	+ display.EndTriangles();
6310	6198	}
6311	6199	else
6312	6200	{
..	..	@@ -6335,8 +6223,8 @@
6335	6223	//System.out.println("SORT");
6336	6224
6337	6225	java.util.Arrays.sort(facescompare);
6338		-
6339		- gl.glBegin(gl.GL_TRIANGLES);
	6226	+
	6227	+ display.StartTriangles();
6340	6228	for (int i = 0; i < facecount; i++)
6341	6229	{
6342	6230	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6348,13 +6236,14 @@
6348	6236	Vertex q = bRep.GetVertex(face.q);
6349	6237	Vertex r = bRep.GetVertex(face.r);
6350	6238
6351		- drawFace(p, q, r, display, face);
	6239	+ display.DrawFace(this, p, q, r, face);
6352	6240	}
6353		- gl.glEnd();
	6241	+ display.EndTriangles();
6354	6242	}
6355	6243
6356	6244	if (false) // live && support != null && support.bRep != null) // debug weights
6357	6245	{
	6246	+ /*
6358	6247	gl.glDisable(gl.GL_LIGHTING);
6359	6248	float[] colorV = new float[3];
6360	6249
..	..	@@ -6433,6 +6322,7 @@
6433	6322	// gl.glEnd();
6434	6323	}
6435	6324	}
	6325	+ */
6436	6326	}
6437	6327	}
6438	6328
..	..	@@ -6477,7 +6367,7 @@
6477	6367	center.add(r);
6478	6368	center.mul(1.0/3);
6479	6369
6480		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6370	+ center.sub(Globals.theRenderer.EyeCamera().location);
6481	6371
6482	6372	distance = center.dot(center);
6483	6373	}
..	..	@@ -6488,390 +6378,11 @@
6488	6378
6489	6379	transient FaceCompare[] facescompare = null;
6490	6380
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	6381	void Print(Vertex v)
6666	6382	{
6667	6383	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6668	6384	}
6669	6385
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	6386	void drawSelf(ClickInfo info, int level, boolean select)
6876	6387	{
6877	6388	if (bRep == null)
..	..	@@ -7443,83 +6954,83 @@
7443	6954	int spotw = spot.x + spot.width;
7444	6955	int spoth = spot.y + spot.height;
7445	6956	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		- }
	6957	+// if (CameraPane.Xmin > spot.x)
	6958	+// {
	6959	+// CameraPane.Xmin = spot.x;
	6960	+// }
	6961	+// if (CameraPane.Xmax < spotw)
	6962	+// {
	6963	+// CameraPane.Xmax = spotw;
	6964	+// }
	6965	+// if (CameraPane.Ymin > spot.y)
	6966	+// {
	6967	+// CameraPane.Ymin = spot.y;
	6968	+// }
	6969	+// if (CameraPane.Ymax < spoth)
	6970	+// {
	6971	+// CameraPane.Ymax = spoth;
	6972	+// }
7462	6973	spot.translate(32, 32);
7463	6974	spotw = spot.x + spot.width;
7464	6975	spoth = spot.y + spot.height;
7465	6976	info.g.setColor(Color.blue);
7466	6977	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);
	6978	+// if (CameraPane.Xmin > spot.x)
	6979	+// {
	6980	+// CameraPane.Xmin = spot.x;
	6981	+// }
	6982	+// if (CameraPane.Xmax < spotw)
	6983	+// {
	6984	+// CameraPane.Xmax = spotw;
	6985	+// }
	6986	+// if (CameraPane.Ymin > spot.y)
	6987	+// {
	6988	+// CameraPane.Ymin = spot.y;
	6989	+// }
	6990	+// if (CameraPane.Ymax < spoth)
	6991	+// {
	6992	+// CameraPane.Ymax = spoth;
	6993	+// }
	6994	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
	6995	+ //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7485	6996	spot.translate(0, -32);
7486	6997	info.g.setColor(Color.green);
7487	6998	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		- }
	6999	+// if (CameraPane.Xmin > spot.x)
	7000	+// {
	7001	+// CameraPane.Xmin = spot.x;
	7002	+// }
	7003	+// if (CameraPane.Xmax < spotw)
	7004	+// {
	7005	+// CameraPane.Xmax = spotw;
	7006	+// }
	7007	+// if (CameraPane.Ymin > spot.y)
	7008	+// {
	7009	+// CameraPane.Ymin = spot.y;
	7010	+// }
	7011	+// if (CameraPane.Ymax < spoth)
	7012	+// {
	7013	+// CameraPane.Ymax = spoth;
	7014	+// }
7504	7015	info.g.drawArc(boundary.x, boundary.y,
7505	7016	boundary.width, boundary.height, 0, 360);
7506	7017	//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		- }
	7018	+// if (CameraPane.Xmin > boundary.x)
	7019	+// {
	7020	+// CameraPane.Xmin = boundary.x;
	7021	+// }
	7022	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	7023	+// {
	7024	+// CameraPane.Xmax = boundary.x + boundary.width;
	7025	+// }
	7026	+// if (CameraPane.Ymin > boundary.y)
	7027	+// {
	7028	+// CameraPane.Ymin = boundary.y;
	7029	+// }
	7030	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	7031	+// {
	7032	+// CameraPane.Ymax = boundary.y + boundary.height;
	7033	+// }
7523	7034	return;
7524	7035	}
7525	7036	}
..	..	@@ -7536,7 +7047,7 @@
7536	7047	startX = info.x;
7537	7048	startY = info.y;
7538	7049
7539		- hitSomething = 0;
	7050	+ hitSomething = -1;
7540	7051	cVector origin = new cVector();
7541	7052	//LA.xformPos(origin, toParent, origin);
7542	7053	Rectangle spot = new Rectangle();
..	..	@@ -7569,7 +7080,7 @@
7569	7080	}
7570	7081
7571	7082	//System.out.println("info.modifiers = " + info.modifiers);
7572		- modified = (info.modifiers & CameraPane.META) != 0;
	7083	+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7573	7084	//System.out.println("modified = " + modified);
7574	7085	//new Exception().printStackTrace();
7575	7086	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7597,7 +7108,7 @@
7597	7108	return true;
7598	7109	}
7599	7110
7600		- void doEditDrag0(ClickInfo info)
	7111	+ void doEditDrag0(ClickInfo info, boolean opposite)
7601	7112	{
7602	7113	if (hitSomething == 0)
7603	7114	{
..	..	@@ -7612,6 +7123,7 @@
7612	7123	//System.out.println("hitSomething = " + hitSomething);
7613	7124
7614	7125	double scale = 0.005f * info.camera.Distance();
	7126	+
7615	7127	cVector xlate = new cVector();
7616	7128	//cVector xlate2 = new cVector();
7617	7129	switch (hitSomething)
..	..	@@ -7622,9 +7134,9 @@
7622	7134
7623	7135	case hitCenter: // Translate
7624	7136
7625		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7137	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7626	7138
7627		- if (modified)
	7139	+ if (modified \|\| opposite)
7628	7140	{
7629	7141	//assert(false);
7630	7142	/*
..	..	@@ -7670,10 +7182,10 @@
7670	7182	}
7671	7183	LA.xformDir(up, ClickInfo.matbuffer, up);
7672	7184	// if (!CameraPane.LOCALTRANSFORM)
7673		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
	7185	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7674	7186	LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7675	7187	// if (!CameraPane.LOCALTRANSFORM)
7676		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7188	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7677	7189	//LA.vecCross(up, cVector.Z, right2);
7678	7190
7679	7191	cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
..	..	@@ -7718,6 +7230,7 @@
7718	7230
7719	7231	if (modified)
7720	7232	{
	7233	+ // Rotate 90 degrees
7721	7234	angle /= (Math.PI / 4);
7722	7235	angle = Math.floor(angle + 0.5);
7723	7236	angle *= (Math.PI / 4);
..	..	@@ -7731,7 +7244,7 @@
7731	7244	}
7732	7245	/**/
7733	7246
7734		- switch (info.pane.renderCamera.viewCode)
	7247	+ switch (info.pane.RenderCamera().viewCode)
7735	7248	{
7736	7249	case 1: // '\001'
7737	7250	LA.matZRotate(toParent, angle);
..	..	@@ -7759,24 +7272,27 @@
7759	7272
7760	7273	case hitScale: // scale
7761	7274	double hScale = (double) (info.x - centerPt.x) / 32;
	7275	+ double sign = 1;
	7276	+ if (hScale < 0)
	7277	+ {
	7278	+ sign = -1;
	7279	+ }
	7280	+ hScale = signMath.pow(signhScale, scale * 50);
7762	7281	if (hScale < 0.01)
7763	7282	{
7764		- hScale = 0.01;
	7283	+ //hScale = 0.01;
7765	7284	}
7766		- hScale = Math.pow(hScale, scale * 50);
7767		- if (hScale < 0.01)
7768		- {
7769		- hScale = 0.01;
7770		- }
	7285	+
7771	7286	double vScale = (double) (info.y - centerPt.y) / 32;
7772		- if (vScale < 0.01)
	7287	+ sign = 1;
	7288	+ if (vScale < 0)
7773	7289	{
7774		- vScale = 0.01;
	7290	+ sign = -1;
7775	7291	}
7776		- vScale = Math.pow(vScale, scale * 50);
	7292	+ vScale = signMath.pow(signvScale, scale * 50);
7777	7293	if (vScale < 0.01)
7778	7294	{
7779		- vScale = 0.01;
	7295	+ //vScale = 0.01;
7780	7296	}
7781	7297	LA.matCopy(startMat, toParent);
7782	7298	/**/
..	..	@@ -7787,17 +7303,24 @@
7787	7303	}
7788	7304	/**/
7789	7305
7790		- switch (info.pane.renderCamera.viewCode)
	7306	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7307	+
	7308	+ if (totalScale < 0.01)
	7309	+ {
	7310	+ totalScale = 0.01;
	7311	+ }
	7312	+
	7313	+ switch (info.pane.RenderCamera().viewCode)
7791	7314	{
7792	7315	case 3: // '\001'
7793	7316	if (modified)
7794	7317	{
7795	7318	//LA.matScale(toParent, 1, hScale, vScale);
7796		- LA.matScale(toParent, vScale, 1, 1);
	7319	+ LA.matScale(toParent, totalScale, 1, 1);
7797	7320	} // vScale, 1);
7798	7321	else
7799	7322	{
7800		- LA.matScale(toParent, vScale, vScale, vScale);
	7323	+ LA.matScale(toParent, totalScale, totalScale, totalScale);
7801	7324	} // vScale, 1);
7802	7325	break;
7803	7326
..	..	@@ -7805,10 +7328,10 @@
7805	7328	if (modified)
7806	7329	{
7807	7330	//LA.matScale(toParent, hScale, 1, vScale);
7808		- LA.matScale(toParent, 1, vScale, 1);
	7331	+ LA.matScale(toParent, 1, totalScale, 1);
7809	7332	} else
7810	7333	{
7811		- LA.matScale(toParent, vScale, 1, vScale);
	7334	+ LA.matScale(toParent, totalScale, 1, totalScale);
7812	7335	}
7813	7336	break;
7814	7337
..	..	@@ -7816,10 +7339,10 @@
7816	7339	if (modified)
7817	7340	{
7818	7341	//LA.matScale(toParent, hScale, vScale, 1);
7819		- LA.matScale(toParent, 1, 1, vScale);
	7342	+ LA.matScale(toParent, 1, 1, totalScale);
7820	7343	} else
7821	7344	{
7822		- LA.matScale(toParent, vScale, vScale, 1);
	7345	+ LA.matScale(toParent, totalScale, totalScale, 1);
7823	7346	}
7824	7347	break;
7825	7348	}
..	..	@@ -7952,14 +7475,22 @@
7952	7475	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7953	7476	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7954	7477	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7478	+
	7479	+ String objname;
	7480	+
7955	7481	if (false) //parent != null)
7956	7482	{
7957		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7483	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7958	7484	} else
7959	7485	{
7960		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7486	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count - 1) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7961	7487	} // + super.toString();
7962	7488	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7489	+
	7490	+ if (!Globals.ADVANCED)
	7491	+ return objname;
	7492	+
	7493	+ return objname + " " + System.identityHashCode(this);
7963	7494	}
7964	7495
7965	7496	public int hashCode()
..	..	@@ -8015,6 +7546,7 @@
8015	7546	objectUI.closeUI();
8016	7547	if (editWindow != null)
8017	7548	{
	7549	+ editWindow.ctrlPanel.FlushUI();
8018	7550	editWindow.refreshContents();
8019	7551	} // ? new
8020	7552	objectUI = null;
..	..	@@ -8150,7 +7682,7 @@
8150	7682	{
8151	7683	assert(bRep != null);
8152	7684	if (!(support instanceof GenericJoint)) // support.bRep != null)
8153		- GrafreeD.Assert(support.bRep == bRep.support);
	7685	+ Grafreed.Assert(support.bRep == bRep.support);
8154	7686	}
8155	7687	else
8156	7688	{
..	..	@@ -8199,9 +7731,9 @@
8199	7731	private static cVector edge2 = new cVector();
8200	7732	//private static cVector norm = new cVector();
8201	7733	/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;
	7734	+ static final int hitCenter = 1;
	7735	+ static final int hitScale = 2;
	7736	+ static final int hitRotate = 3;
8205	7737	/transient/ /private/ int viewCode; // Now used for transparency cache flag
8206	7738	/transient/ private Point centerPt;
8207	7739	/transient/ private int startX;