~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;
..	..	@@ -299,6 +300,7 @@
299	300	}
300	301
301	302	boolean live = false;
	303	+ boolean dontselect = false;
302	304	boolean hide = false;
303	305	boolean link2master = false; // performs reset support/master at each frame
304	306	boolean marked = false; // animation node
..	..	@@ -430,16 +432,16 @@
430	432	{
431	433	Object3D copy = this;
432	434
433		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	435	+ Camera parentcam = Globals.theRenderer.ManipCamera();
434	436
435		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	437	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
436	438	{
437		- parentcam = CameraPane.theRenderer.cameras[1];
	439	+ parentcam = Globals.theRenderer.Cameras()[1];
438	440	}
439	441
440		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	442	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
441	443	{
442		- parentcam = CameraPane.theRenderer.cameras[0];
	444	+ parentcam = Globals.theRenderer.Cameras()[0];
443	445	}
444	446
445	447	if (this == parentcam)
..	..	@@ -447,7 +449,7 @@
447	449	//assert(this instanceof Camera);
448	450
449	451	for (int count = parentcam.GetTransformCount(); --count>=0;)
450		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	452	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
451	453	}
452	454
453	455	copy.marked ^= true;
..	..	@@ -467,7 +469,7 @@
467	469	//assert(this instanceof Camera);
468	470
469	471	for (int count = parentcam.GetTransformCount(); --count>=0;)
470		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	472	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
471	473	}
472	474
473	475	copy.Touch(); // display list issue
..	..	@@ -602,7 +604,7 @@
602	604	return;
603	605	}
604	606
605		- if (CameraPane.fromscript)
	607	+ if (Globals.fromscript)
606	608	{
607	609	transformcount = 0;
608	610	return;
..	..	@@ -796,7 +798,7 @@
796	798
797	799	if (marked && Globals.isLIVE() && live &&
798	800	//TEMP21aug2018
799		- Globals.DrawMode() == iCameraPane.SHADOW &&
	801	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
800	802	currentframe != Globals.framecount)
801	803	{
802	804	currentframe = Globals.framecount;
..	..	@@ -911,6 +913,11 @@
911	913	fromParent = null; // LA.newMatrix();
912	914	bRep = null; // new BoundaryRep();
913	915
	916	+ if (oname != null && oname.equals("LeftHand"))
	917	+ {
	918	+ name = oname;
	919	+ }
	920	+
914	921	/*
915	922	float hue = (float)Math.random();
916	923	Color col;
..	..	@@ -953,7 +960,7 @@
953	960
954	961	public Object clone()
955	962	{
956		- return GrafreeD.clone(this);
	963	+ return Grafreed.clone(this);
957	964	}
958	965
959	966	Object3D copyExpand()
..	..	@@ -1469,7 +1476,7 @@
1469	1476	BoundaryRep.SEUIL = other.material.cameralight;
1470	1477
1471	1478	// Set default to 0.1
1472		- BoundaryRep.SEUIL /= 2;
	1479	+ BoundaryRep.SEUIL /= 4; // 2;
1473	1480	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1474	1481	}
1475	1482
..	..	@@ -1728,7 +1735,7 @@
1728	1735	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1729	1736	o.bRep = transientrep;
1730	1737	if (clone)
1731		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1738	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1732	1739	o.CreateMaterial();
1733	1740	o.SetAttributes(this, -1);
1734	1741	//parent
..	..	@@ -1741,7 +1748,7 @@
1741	1748	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1742	1749	o.bRep = bRep;
1743	1750	if (clone)
1744		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1751	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1745	1752	o.CreateMaterial();
1746	1753	//o.overwriteThis(this, -1);
1747	1754	o.SetAttributes(this, -1);
..	..	@@ -1828,12 +1835,15 @@
1828	1835	if (obj.name == null)
1829	1836	continue; // can't be a null one
1830	1837
	1838	+ // Try perfect match first.
1831	1839	if (n.equals(obj.name))
1832	1840	{
1833	1841	theobj = obj;
1834	1842	count++;
1835	1843	}
1836	1844	}
	1845	+
	1846	+ // not needed: n = n.split(":")[0]; // Poser generates a count
1837	1847
1838	1848	if (count != 1)
1839	1849	for (int i=Size(); --i>=0;)
..	..	@@ -2299,6 +2309,7 @@
2299	2309	{
2300	2310	if (newWindow)
2301	2311	{
	2312	+ new Exception().printStackTrace();
2302	2313	System.exit(0);
2303	2314	if (parent != null)
2304	2315	{
..	..	@@ -2475,13 +2486,13 @@
2475	2486	return retval;
2476	2487	}
2477	2488
2478		- void doEditDrag(ClickInfo info)
	2489	+ void doEditDrag(ClickInfo info, boolean opposite)
2479	2490	{
2480	2491	switch (doSomething)
2481	2492	{
2482	2493	case 1: // '\001'
2483	2494	//super.
2484		- doEditDrag0(info);
	2495	+ doEditDrag0(info, opposite);
2485	2496	break;
2486	2497
2487	2498	case 2: // '\002'
..	..	@@ -2494,11 +2505,11 @@
2494	2505	{
2495	2506	//sel.hitSomething = childToDrag.hitSomething;
2496	2507	//childToDrag.doEditDrag(info);
2497		- sel.doEditDrag(info);
	2508	+ sel.doEditDrag(info, opposite);
2498	2509	} else
2499	2510	{
2500	2511	//super.
2501		- doEditDrag0(info);
	2512	+ doEditDrag0(info, opposite);
2502	2513	}
2503	2514	}
2504	2515	break;
..	..	@@ -2905,7 +2916,8 @@
2905	2916	{
2906	2917	if (bRep != null)
2907	2918	{
2908		- bRep.GenUV();
	2919	+ bRep.GenUV(); //1);
	2920	+ //bRep.UnfoldUV();
2909	2921	Touch();
2910	2922	}
2911	2923	}
..	..	@@ -2980,6 +2992,33 @@
2980	2992	blockloop = false;
2981	2993	}
2982	2994
	2995	+ void TransformChildren()
	2996	+ {
	2997	+ if (toParent != null)
	2998	+ {
	2999	+ for (int i=Size(); --i>=0;)
	3000	+ {
	3001	+ Object3D v = get(i);
	3002	+
	3003	+ if (v.toParent == null)
	3004	+ {
	3005	+ v.toParent = LA.newMatrix();
	3006	+ v.fromParent = LA.newMatrix();
	3007	+ }
	3008	+
	3009	+// LA.matConcat(v.toParent, toParent, v.toParent);
	3010	+// LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3011	+ LA.matConcat(toParent, v.toParent, v.toParent);
	3012	+ LA.matConcat(v.fromParent, fromParent, v.fromParent);
	3013	+ }
	3014	+
	3015	+ toParent = null; // LA.matIdentity(toParent);
	3016	+ fromParent = null; // LA.matIdentity(fromParent);
	3017	+
	3018	+ Touch();
	3019	+ }
	3020	+ }
	3021	+
2983	3022	void TransformGeometry()
2984	3023	{
2985	3024	Object3D obj = this;
..	..	@@ -3201,9 +3240,11 @@
3201	3240
3202	3241	BoundaryRep sup = bRep.support;
3203	3242	bRep.support = null;
3204		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3243	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3205	3244	// bRep.SplitInTwo(onlyone); // thread...
3206		- temprep.SplitInTwo(reduction34, onlyone);
	3245	+
	3246	+ while(temprep.SplitInTwo(reduction34, onlyone));
	3247	+
3207	3248	bRep = temprep;
3208	3249	bRep.support = sup;
3209	3250	Touch();
..	..	@@ -3725,7 +3766,7 @@
3725	3766	if (child == null)
3726	3767	continue;
3727	3768
3728		- if (GrafreeD.RENDERME > 0)
	3769	+ if (Grafreed.RENDERME > 0)
3729	3770	{
3730	3771	if (child instanceof Merge)
3731	3772	((Merge)child).renderme();
..	..	@@ -3876,7 +3917,7 @@
3876	3917	if (child == null)
3877	3918	continue;
3878	3919
3879		- if (GrafreeD.RENDERME > 0)
	3920	+ if (Grafreed.RENDERME > 0)
3880	3921	{
3881	3922	if (child instanceof Merge)
3882	3923	((Merge)child).renderme();
..	..	@@ -4071,7 +4112,7 @@
4071	4112	if (child == null)
4072	4113	continue;
4073	4114
4074		- if (GrafreeD.RENDERME > 0)
	4115	+ if (Grafreed.RENDERME > 0)
4075	4116	{
4076	4117	if (child instanceof Merge)
4077	4118	((Merge)child).renderme();
..	..	@@ -4678,7 +4719,7 @@
4678	4719
4679	4720	cTreePath SelectLeaf(int indexcount, boolean deselect)
4680	4721	{
4681		- if (hide)
	4722	+ if (hide \|\| dontselect)
4682	4723	return null;
4683	4724
4684	4725	if (count <= 0)
..	..	@@ -4704,7 +4745,7 @@
4704	4745
4705	4746	cTreePath Select(int indexcount, boolean deselect)
4706	4747	{
4707		- if (hide)
	4748	+ if (hide \|\| dontselect)
4708	4749	return null;
4709	4750
4710	4751	if (count <= 0)
..	..	@@ -4854,7 +4895,7 @@
4854	4895	return globalTransform;
4855	4896	}
4856	4897
4857		- void PreprocessOcclusion(CameraPane cp)
	4898	+ void PreprocessOcclusion(iCameraPane cp)
4858	4899	{
4859	4900	/*
4860	4901	if (AOdone)
..	..	@@ -5156,10 +5197,34 @@
5156	5197
5157	5198	// System.out.println("Fullname = " + fullname);
5158	5199
5159		- if (fullname.name.indexOf(":") == -1)
5160		- return fullname.name;
	5200	+ // Does not work on Windows due to C:
	5201	+// if (fullname.name.indexOf(":") == -1)
	5202	+// return fullname.name;
	5203	+//
	5204	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5161	5205
5162		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5206	+ String[] split = fullname.name.split(":");
	5207	+
	5208	+ if (split.length == 0)
	5209	+ {
	5210	+ return "";
	5211	+ }
	5212	+
	5213	+ if (split.length <= 2)
	5214	+ {
	5215	+ if (fullname.name.endsWith(":"))
	5216	+ {
	5217	+ // Windows
	5218	+ return fullname.name.substring(0, fullname.name.length()-1);
	5219	+ }
	5220	+
	5221	+ return split[0];
	5222	+ }
	5223	+
	5224	+ // Windows
	5225	+ assert(split.length == 4);
	5226	+
	5227	+ return split[0] + ":" + split[1];
5163	5228	}
5164	5229
5165	5230	static String GetBump(cTexture fullname)
..	..	@@ -5168,10 +5233,38 @@
5168	5233	return "";
5169	5234
5170	5235	// System.out.println("Fullname = " + fullname);
5171		- if (fullname.name.indexOf(":") == -1)
5172		- return "";
5173		-
5174		- return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5236	+ // Does not work on Windows due to C:
	5237	+// if (fullname.name.indexOf(":") == -1)
	5238	+// return "";
	5239	+//
	5240	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5241	+ String[] split = fullname.name.split(":");
	5242	+
	5243	+ if (split.length == 0)
	5244	+ {
	5245	+ return "";
	5246	+ }
	5247	+
	5248	+ if (split.length == 1)
	5249	+ {
	5250	+ return "";
	5251	+ }
	5252	+
	5253	+ if (split.length == 2)
	5254	+ {
	5255	+ if (fullname.name.endsWith(":"))
	5256	+ {
	5257	+ // Windows
	5258	+ return "";
	5259	+ }
	5260	+
	5261	+ return split[1];
	5262	+ }
	5263	+
	5264	+ // Windows
	5265	+ assert(split.length == 4);
	5266	+
	5267	+ return split[2] + ":" + split[3];
5175	5268	}
5176	5269
5177	5270	String GetPigmentTexture()
..	..	@@ -5245,7 +5338,7 @@
5245	5338	System.out.print("; textures = " + textures);
5246	5339	System.out.println("; usedtextures = " + usedtextures);
5247	5340
5248		- if (GetTextures() == null)
	5341	+ if (GetTextures() == null) // What is that??
5249	5342	GetTextures().name = ":";
5250	5343
5251	5344	String texname = tex;
..	..	@@ -5322,11 +5415,12 @@
5322	5415	boolean NeedSupport()
5323	5416	{
5324	5417	return
5325		- CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
	5418	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
5326	5419	// PROBLEM with CROWD!!
5327		- && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
	5420	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5328	5421	}
5329	5422
	5423	+ static boolean DEBUG_SELECTION = false;
5330	5424
5331	5425	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5332	5426	{
..	..	@@ -5338,7 +5432,7 @@
5338	5432	}
5339	5433
5340	5434	if (display.DrawMode() == iCameraPane.SELECTION &&
5341		- hide)
	5435	+ (hide \|\| dontselect))
5342	5436	return;
5343	5437
5344	5438	if (name != null && name.contains("sclera"))
..	..	@@ -5365,12 +5459,12 @@
5365	5459	}
5366	5460
5367	5461	if ((//display.DrawMode() == CameraPane.SHADOW \|\|
5368		- display.DrawMode() == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5462	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5369	5463	{
5370	5464	return;
5371	5465	}
5372	5466
5373		- javax.media.opengl.GL gl = display.GetGL();
	5467	+ //javax.media.opengl.GL gl = display.GetGL();
5374	5468
5375	5469	/*
5376	5470	if (touched)
..	..	@@ -5406,7 +5500,7 @@
5406	5500
5407	5501	boolean compiled = false;
5408	5502
5409		- boolean selectmode = display.DrawMode() == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5503	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5410	5504
5411	5505	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5412	5506	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5422,7 +5516,7 @@
5422	5516	//if (displaylist == -1 && usecalllists)
5423	5517	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5424	5518	{
5425		- bRep.displaylist = gl.glGenLists(1);
	5519	+ bRep.displaylist = display.GenList();
5426	5520	assert(bRep.displaylist != 0);
5427	5521	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5428	5522	//System.out.println("\tgen list " + list);
..	..	@@ -5434,14 +5528,16 @@
5434	5528	if (usecalllists)
5435	5529	{
5436	5530	// System.err.println("new list " + bRep.displaylist + " for " + this);
5437		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5531	+ display.NewList(bRep.displaylist);
5438	5532	}
	5533	+
5439	5534	CallList(display, root, selected, blocked);
	5535	+
5440	5536	// compiled = true;
5441	5537	if (usecalllists)
5442	5538	{
5443	5539	// System.err.println("end list " + bRep.displaylist + " for " + this);
5444		- gl.glEndList();
	5540	+ display.EndList();
5445	5541	}
5446	5542	//gl.glDrawBuffer(gl.GL_BACK);
5447	5543	// XXX touched = false;
..	..	@@ -5484,12 +5580,12 @@
5484	5580
5485	5581	// frustum culling
5486	5582	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5487		- && display.DrawMode() != CameraPane.SELECTION)
	5583	+ && display.DrawMode() != iCameraPane.SELECTION)
5488	5584	{
5489		- if (display.DrawMode() == CameraPane.SHADOW)
	5585	+ if (display.DrawMode() == iCameraPane.SHADOW)
5490	5586	{
5491	5587	if (!link2master // tricky to cull in shadow mode.
5492		- && GetBRep().FrustumCull(this, gl, display.LightCamera(), true))
	5588	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5493	5589	{
5494	5590	//System.out.print("CULLED");
5495	5591	culled = true;
..	..	@@ -5497,7 +5593,7 @@
5497	5593	}
5498	5594	else
5499	5595	//GetBRep().getBounds(v0, v1, this);
5500		- if (GetBRep().FrustumCull(this, gl, display.RenderCamera(), false))
	5596	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5501	5597	culled = true;
5502	5598
5503	5599	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5533,11 +5629,11 @@
5533	5629
5534	5630
5535	5631	if (!culled)
5536		- if (display.DrawMode() == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	5632	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5537	5633	{
5538	5634	if (GetBRep() != null)
5539	5635	{
5540		- CameraPane.NextIndex(this, gl);
	5636	+ display.NextIndex();
5541	5637	// vertex color conflict : gl.glCallList(list);
5542	5638	DrawNode(display, root, selected);
5543	5639	if (this instanceof BezierPatch)
..	..	@@ -5578,7 +5674,17 @@
5578	5674	tex = GetTextures();
5579	5675	}
5580	5676
5581		- display.BindTextures(tex, texres);
	5677	+ boolean failed = false;
	5678	+
	5679	+ try
	5680	+ {
	5681	+ display.BindTextures(tex, texres);
	5682	+ }
	5683	+ catch (Exception e)
	5684	+ {
	5685	+ System.err.println("FAILED: " + this);
	5686	+ failed = true;
	5687	+ }
5582	5688
5583	5689	if (!compiled)
5584	5690	{
..	..	@@ -5594,13 +5700,14 @@
5594	5700
5595	5701	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5596	5702	assert(bRep.displaylist != 0);
5597		- gl.glCallList(bRep.displaylist);
	5703	+ display.CallList(bRep.displaylist);
5598	5704	// june 2013 drawSelf(display, root, selected);
5599	5705	}
5600	5706	}
5601	5707	}
5602	5708
5603		- display.ReleaseTextures(tex);
	5709	+ if (!failed)
	5710	+ display.ReleaseTextures(tex);
5604	5711
5605	5712	display.PopMaterial(this, selected);
5606	5713	}
..	..	@@ -5729,6 +5836,9 @@
5729	5836
5730	5837	void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5731	5838	{
	5839	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	5840	+ return;
	5841	+
5732	5842	if (hide)
5733	5843	return;
5734	5844	// shadow optimisation
..	..	@@ -5854,6 +5964,9 @@
5854	5964	if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5855	5965	return; // no shadow for transparent objects
5856	5966
	5967	+ if (display.DrawMode() == iCameraPane.SELECTION && dontselect)
	5968	+ return;
	5969	+
5857	5970	if (hide)
5858	5971	return;
5859	5972
..	..	@@ -5894,9 +6007,10 @@
5894	6007	return;
5895	6008	}
5896	6009
	6010	+ //bRep.GenUV(1/material.diffuseness);
5897	6011	// bRep.lock = true;
5898	6012
5899		- javax.media.opengl.GL gl = display.GetGL();
	6013	+ //javax.media.opengl.GL gl = display.GetGL();
5900	6014
5901	6015	if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5902	6016	{
..	..	@@ -5913,23 +6027,7 @@
5913	6027
5914	6028	bRep.getMinMax(min, max, 100);
5915	6029
5916		- gl.glBegin(gl.GL_LINES);
5917		-
5918		- gl.glVertex3d(min.x, min.y, min.z);
5919		- gl.glVertex3d(min.x, min.y, max.z);
5920		- gl.glVertex3d(min.x, min.y, min.z);
5921		- gl.glVertex3d(min.x, max.y, min.z);
5922		- gl.glVertex3d(min.x, min.y, min.z);
5923		- gl.glVertex3d(max.x, min.y, min.z);
5924		-
5925		- gl.glVertex3d(max.x, max.y, max.z);
5926		- gl.glVertex3d(min.x, max.y, max.z);
5927		- gl.glVertex3d(max.x, max.y, max.z);
5928		- gl.glVertex3d(max.x, min.y, max.z);
5929		- gl.glVertex3d(max.x, max.y, max.z);
5930		- gl.glVertex3d(max.x, max.y, min.z);
5931		-
5932		- gl.glEnd();
	6030	+ display.DrawBox(min, max);
5933	6031
5934	6032	return;
5935	6033	}
..	..	@@ -5973,7 +6071,7 @@
5973	6071	{
5974	6072	//throw new Error();
5975	6073
5976		- boolean selectmode = display.DrawMode() == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6074	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5977	6075
5978	6076	int[] strips = bRep.getRawIndices();
5979	6077
..	..	@@ -5983,178 +6081,14 @@
5983	6081	new Exception().printStackTrace();
5984	6082	return;
5985	6083	}
5986		-
5987		- // TRIANGLE STRIP ARRAY
5988		- if (bRep.trimmed)
5989		- {
5990		- float[] v = bRep.getRawVertices();
5991		- float[] n = bRep.getRawNormals();
5992		- float[] c = bRep.getRawColors();
5993		- float[] uv = bRep.getRawUVMap();
5994		-
5995		- int count2 = 0;
5996		- int count3 = 0;
5997		-
5998		- if (n.length > 0)
5999		- {
6000		- for (int i = 0; i < strips.length; i++)
6001		- {
6002		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6003		-
6004		- /*
6005		- boolean locked = false;
6006		- float eps = 0.1f;
6007		- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6008		-
6009		- int dot = 0;
6010		-
6011		- if ((dot&1) == 0)
6012		- dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6013		-
6014		- if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6015		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6016		- else
6017		- {
6018		- locked = true;
6019		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6020		- }
6021		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6022		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6023		- if (hasnorm)
6024		- {
6025		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6026		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6027		- }
6028		-
6029		- if ((dot&4) == 0)
6030		- dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6031		-
6032		- if (wrap \|\| !locked && (dot&8) != 0)
6033		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6034		- else
6035		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6036		-
6037		- f.dot = dot;
6038		- */
6039		-
6040		- if (!selectmode)
6041		- {
6042		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6043		- {
6044		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6045		- } else
6046		- {
6047		- gl.glNormal3f(0, 0, 1);
6048		- }
6049		-
6050		- if (c != null)
6051		- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
6052		- {
6053		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6054		- }
6055		- }
6056		- if (flipV)
6057		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6058		- else
6059		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6060		- //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6061		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6062		-
6063		- count2 += 2;
6064		- count3 += 3;
6065		- if (!selectmode)
6066		- {
6067		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6068		- {
6069		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6070		- } else
6071		- {
6072		- gl.glNormal3f(0, 0, 1);
6073		- }
6074		- if (c != null)
6075		- {
6076		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6077		- }
6078		- }
6079		- if (flipV)
6080		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6081		- else
6082		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6083		- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6084		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6085		-
6086		- count2 += 2;
6087		- count3 += 3;
6088		- for (int j = 0; j < strips[i] - 2; j++)
6089		- {
6090		- //gl.glTexCoord2d(...);
6091		- if (!selectmode)
6092		- {
6093		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6094		- {
6095		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6096		- } else
6097		- {
6098		- gl.glNormal3f(0, 0, 1);
6099		- }
6100		- if (c != null)
6101		- {
6102		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6103		- }
6104		- }
6105		-
6106		- if (flipV)
6107		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6108		- else
6109		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6110		- //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6111		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6112		- count2 += 2;
6113		- count3 += 3;
6114		- }
6115		-
6116		- gl.glEnd();
6117		- }
6118		- }
6119		-
6120		- assert count3 == v.length;
6121		- }
6122		- else // !trimmed
6123		- {
6124		- int count = 0;
6125		- for (int i = 0; i < strips.length; i++)
6126		- {
6127		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6128		-
6129		- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6130		- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6131		-
6132		- drawVertex(gl, p, selectmode);
6133		- drawVertex(gl, q, selectmode);
6134		-
6135		- for (int j = 0; j < strips[i] - 2; j++)
6136		- {
6137		- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6138		-
6139		-// if (j%2 == 0)
6140		-// drawFace(p, q, r, display, null);
6141		-// else
6142		-// drawFace(p, r, q, display, null);
6143		-
6144		-// p = q;
6145		-// q = r;
6146		- drawVertex(gl, r, selectmode);
6147		- }
6148		-
6149		- gl.glEnd();
6150		- }
6151		- }
	6084	+
	6085	+ display.DrawGeometry(bRep, flipV, selectmode);
6152	6086	} else // catch (Error e)
6153	6087	{
6154	6088	// TRIANGLE ARRAY
6155	6089	if (IsOpaque()) // Static())
6156	6090	{
6157		- gl.glBegin(gl.GL_TRIANGLES);
	6091	+ display.StartTriangles();
6158	6092	int facecount = bRep.FaceCount();
6159	6093	for (int i = 0; i < facecount; i++)
6160	6094	{
..	..	@@ -6219,7 +6153,7 @@
6219	6153
6220	6154	display.DrawFace(this, p, q, r, face);
6221	6155	}
6222		- gl.glEnd();
	6156	+ display.EndTriangles();
6223	6157	}
6224	6158	else
6225	6159	{
..	..	@@ -6248,8 +6182,8 @@
6248	6182	//System.out.println("SORT");
6249	6183
6250	6184	java.util.Arrays.sort(facescompare);
6251		-
6252		- gl.glBegin(gl.GL_TRIANGLES);
	6185	+
	6186	+ display.StartTriangles();
6253	6187	for (int i = 0; i < facecount; i++)
6254	6188	{
6255	6189	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6263,11 +6197,12 @@
6263	6197
6264	6198	display.DrawFace(this, p, q, r, face);
6265	6199	}
6266		- gl.glEnd();
	6200	+ display.EndTriangles();
6267	6201	}
6268	6202
6269	6203	if (false) // live && support != null && support.bRep != null) // debug weights
6270	6204	{
	6205	+ /*
6271	6206	gl.glDisable(gl.GL_LIGHTING);
6272	6207	float[] colorV = new float[3];
6273	6208
..	..	@@ -6346,6 +6281,7 @@
6346	6281	// gl.glEnd();
6347	6282	}
6348	6283	}
	6284	+ */
6349	6285	}
6350	6286	}
6351	6287
..	..	@@ -6390,7 +6326,7 @@
6390	6326	center.add(r);
6391	6327	center.mul(1.0/3);
6392	6328
6393		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6329	+ center.sub(Globals.theRenderer.EyeCamera().location);
6394	6330
6395	6331	distance = center.dot(center);
6396	6332	}
..	..	@@ -6404,22 +6340,6 @@
6404	6340	void Print(Vertex v)
6405	6341	{
6406	6342	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6407		- }
6408		-
6409		- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6410		- {
6411		- if (!selectmode)
6412		- {
6413		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6414		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6415		-
6416		- if (flipV)
6417		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6418		- else
6419		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6420		- }
6421		-
6422		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6423	6343	}
6424	6344
6425	6345	void drawSelf(ClickInfo info, int level, boolean select)
..	..	@@ -6993,83 +6913,83 @@
6993	6913	int spotw = spot.x + spot.width;
6994	6914	int spoth = spot.y + spot.height;
6995	6915	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6996		- if (CameraPane.Xmin > spot.x)
6997		- {
6998		- CameraPane.Xmin = spot.x;
6999		- }
7000		- if (CameraPane.Xmax < spotw)
7001		- {
7002		- CameraPane.Xmax = spotw;
7003		- }
7004		- if (CameraPane.Ymin > spot.y)
7005		- {
7006		- CameraPane.Ymin = spot.y;
7007		- }
7008		- if (CameraPane.Ymax < spoth)
7009		- {
7010		- CameraPane.Ymax = spoth;
7011		- }
	6916	+// if (CameraPane.Xmin > spot.x)
	6917	+// {
	6918	+// CameraPane.Xmin = spot.x;
	6919	+// }
	6920	+// if (CameraPane.Xmax < spotw)
	6921	+// {
	6922	+// CameraPane.Xmax = spotw;
	6923	+// }
	6924	+// if (CameraPane.Ymin > spot.y)
	6925	+// {
	6926	+// CameraPane.Ymin = spot.y;
	6927	+// }
	6928	+// if (CameraPane.Ymax < spoth)
	6929	+// {
	6930	+// CameraPane.Ymax = spoth;
	6931	+// }
7012	6932	spot.translate(32, 32);
7013	6933	spotw = spot.x + spot.width;
7014	6934	spoth = spot.y + spot.height;
7015	6935	info.g.setColor(Color.blue);
7016	6936	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7017		- if (CameraPane.Xmin > spot.x)
7018		- {
7019		- CameraPane.Xmin = spot.x;
7020		- }
7021		- if (CameraPane.Xmax < spotw)
7022		- {
7023		- CameraPane.Xmax = spotw;
7024		- }
7025		- if (CameraPane.Ymin > spot.y)
7026		- {
7027		- CameraPane.Ymin = spot.y;
7028		- }
7029		- if (CameraPane.Ymax < spoth)
7030		- {
7031		- CameraPane.Ymax = spoth;
7032		- }
	6937	+// if (CameraPane.Xmin > spot.x)
	6938	+// {
	6939	+// CameraPane.Xmin = spot.x;
	6940	+// }
	6941	+// if (CameraPane.Xmax < spotw)
	6942	+// {
	6943	+// CameraPane.Xmax = spotw;
	6944	+// }
	6945	+// if (CameraPane.Ymin > spot.y)
	6946	+// {
	6947	+// CameraPane.Ymin = spot.y;
	6948	+// }
	6949	+// if (CameraPane.Ymax < spoth)
	6950	+// {
	6951	+// CameraPane.Ymax = spoth;
	6952	+// }
7033	6953	info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7034	6954	info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7035	6955	spot.translate(0, -32);
7036	6956	info.g.setColor(Color.green);
7037	6957	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7038		- if (CameraPane.Xmin > spot.x)
7039		- {
7040		- CameraPane.Xmin = spot.x;
7041		- }
7042		- if (CameraPane.Xmax < spotw)
7043		- {
7044		- CameraPane.Xmax = spotw;
7045		- }
7046		- if (CameraPane.Ymin > spot.y)
7047		- {
7048		- CameraPane.Ymin = spot.y;
7049		- }
7050		- if (CameraPane.Ymax < spoth)
7051		- {
7052		- CameraPane.Ymax = spoth;
7053		- }
	6958	+// if (CameraPane.Xmin > spot.x)
	6959	+// {
	6960	+// CameraPane.Xmin = spot.x;
	6961	+// }
	6962	+// if (CameraPane.Xmax < spotw)
	6963	+// {
	6964	+// CameraPane.Xmax = spotw;
	6965	+// }
	6966	+// if (CameraPane.Ymin > spot.y)
	6967	+// {
	6968	+// CameraPane.Ymin = spot.y;
	6969	+// }
	6970	+// if (CameraPane.Ymax < spoth)
	6971	+// {
	6972	+// CameraPane.Ymax = spoth;
	6973	+// }
7054	6974	info.g.drawArc(boundary.x, boundary.y,
7055	6975	boundary.width, boundary.height, 0, 360);
7056	6976	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7057		- if (CameraPane.Xmin > boundary.x)
7058		- {
7059		- CameraPane.Xmin = boundary.x;
7060		- }
7061		- if (CameraPane.Xmax < boundary.x + boundary.width)
7062		- {
7063		- CameraPane.Xmax = boundary.x + boundary.width;
7064		- }
7065		- if (CameraPane.Ymin > boundary.y)
7066		- {
7067		- CameraPane.Ymin = boundary.y;
7068		- }
7069		- if (CameraPane.Ymax < boundary.y + boundary.height)
7070		- {
7071		- CameraPane.Ymax = boundary.y + boundary.height;
7072		- }
	6977	+// if (CameraPane.Xmin > boundary.x)
	6978	+// {
	6979	+// CameraPane.Xmin = boundary.x;
	6980	+// }
	6981	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	6982	+// {
	6983	+// CameraPane.Xmax = boundary.x + boundary.width;
	6984	+// }
	6985	+// if (CameraPane.Ymin > boundary.y)
	6986	+// {
	6987	+// CameraPane.Ymin = boundary.y;
	6988	+// }
	6989	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	6990	+// {
	6991	+// CameraPane.Ymax = boundary.y + boundary.height;
	6992	+// }
7073	6993	return;
7074	6994	}
7075	6995	}
..	..	@@ -7119,7 +7039,7 @@
7119	7039	}
7120	7040
7121	7041	//System.out.println("info.modifiers = " + info.modifiers);
7122		- modified = (info.modifiers & CameraPane.META) != 0;
	7042	+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7123	7043	//System.out.println("modified = " + modified);
7124	7044	//new Exception().printStackTrace();
7125	7045	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7147,7 +7067,7 @@
7147	7067	return true;
7148	7068	}
7149	7069
7150		- void doEditDrag0(ClickInfo info)
	7070	+ void doEditDrag0(ClickInfo info, boolean opposite)
7151	7071	{
7152	7072	if (hitSomething == 0)
7153	7073	{
..	..	@@ -7172,9 +7092,9 @@
7172	7092
7173	7093	case hitCenter: // Translate
7174	7094
7175		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7095	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7176	7096
7177		- if (modified)
	7097	+ if (modified \|\| opposite)
7178	7098	{
7179	7099	//assert(false);
7180	7100	/*
..	..	@@ -7220,10 +7140,10 @@
7220	7140	}
7221	7141	LA.xformDir(up, ClickInfo.matbuffer, up);
7222	7142	// if (!CameraPane.LOCALTRANSFORM)
7223		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
	7143	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7224	7144	LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7225	7145	// if (!CameraPane.LOCALTRANSFORM)
7226		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7146	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7227	7147	//LA.vecCross(up, cVector.Z, right2);
7228	7148
7229	7149	cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
..	..	@@ -7268,6 +7188,7 @@
7268	7188
7269	7189	if (modified)
7270	7190	{
	7191	+ // Rotate 90 degrees
7271	7192	angle /= (Math.PI / 4);
7272	7193	angle = Math.floor(angle + 0.5);
7273	7194	angle *= (Math.PI / 4);
..	..	@@ -7281,7 +7202,7 @@
7281	7202	}
7282	7203	/**/
7283	7204
7284		- switch (info.pane.renderCamera.viewCode)
	7205	+ switch (info.pane.RenderCamera().viewCode)
7285	7206	{
7286	7207	case 1: // '\001'
7287	7208	LA.matZRotate(toParent, angle);
..	..	@@ -7337,7 +7258,7 @@
7337	7258	}
7338	7259	/**/
7339	7260
7340		- switch (info.pane.renderCamera.viewCode)
	7261	+ switch (info.pane.RenderCamera().viewCode)
7341	7262	{
7342	7263	case 3: // '\001'
7343	7264	if (modified)
..	..	@@ -7502,14 +7423,22 @@
7502	7423	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7503	7424	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7504	7425	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7426	+
	7427	+ String objname;
	7428	+
7505	7429	if (false) //parent != null)
7506	7430	{
7507		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7431	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7508	7432	} else
7509	7433	{
7510		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7434	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7511	7435	} // + super.toString();
7512	7436	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7437	+
	7438	+ if (!Globals.ADVANCED)
	7439	+ return objname;
	7440	+
	7441	+ return objname + " " + System.identityHashCode(this);
7513	7442	}
7514	7443
7515	7444	public int hashCode()
..	..	@@ -7565,6 +7494,7 @@
7565	7494	objectUI.closeUI();
7566	7495	if (editWindow != null)
7567	7496	{
	7497	+ editWindow.ctrlPanel.FlushUI();
7568	7498	editWindow.refreshContents();
7569	7499	} // ? new
7570	7500	objectUI = null;
..	..	@@ -7700,7 +7630,7 @@
7700	7630	{
7701	7631	assert(bRep != null);
7702	7632	if (!(support instanceof GenericJoint)) // support.bRep != null)
7703		- GrafreeD.Assert(support.bRep == bRep.support);
	7633	+ Grafreed.Assert(support.bRep == bRep.support);
7704	7634	}
7705	7635	else
7706	7636	{