~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;
..	..	@@ -20,6 +21,19 @@
20	21	static final long serialVersionUID = 5022536242724664900L;
21	22
22	23	ScriptNode scriptnode;
	24	+
	25	+ void InitOthers()
	26	+ {
	27	+ if (projectedVertices == null \|\| projectedVertices.length <= 2)
	28	+ {
	29	+ projectedVertices = new Object3D.cVector2[3];
	30	+ }
	31	+ for (int i = 0; i < 3; i++)
	32	+ {
	33	+ projectedVertices[i] = new cVector2(); // Others
	34	+ }
	35	+ projectedVertices[0].x = 100; // bump
	36	+ }
23	37
24	38	void MinMax(cVector minima, cVector maxima)
25	39	{
..	..	@@ -296,6 +310,8 @@
296	310	boolean speedup = false;
297	311	boolean rewind = false;
298	312
	313	+ float NORMALPUSH = 0;
	314	+
299	315	Object3D support;
300	316
301	317	Object3D GetObject()
..	..	@@ -355,7 +371,7 @@
355	371
356	372	int MemorySize()
357	373	{
358		- if (memorysize == 0)
	374	+ if (true) // memorysize == 0)
359	375	{
360	376	try
361	377	{
..	..	@@ -415,16 +431,16 @@
415	431	{
416	432	Object3D copy = this;
417	433
418		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	434	+ Camera parentcam = Globals.theRenderer.ManipCamera();
419	435
420		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	436	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
421	437	{
422		- parentcam = CameraPane.theRenderer.cameras[1];
	438	+ parentcam = Globals.theRenderer.Cameras()[1];
423	439	}
424	440
425		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	441	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
426	442	{
427		- parentcam = CameraPane.theRenderer.cameras[0];
	443	+ parentcam = Globals.theRenderer.Cameras()[0];
428	444	}
429	445
430	446	if (this == parentcam)
..	..	@@ -432,7 +448,7 @@
432	448	//assert(this instanceof Camera);
433	449
434	450	for (int count = parentcam.GetTransformCount(); --count>=0;)
435		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	451	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
436	452	}
437	453
438	454	copy.marked ^= true;
..	..	@@ -452,7 +468,7 @@
452	468	//assert(this instanceof Camera);
453	469
454	470	for (int count = parentcam.GetTransformCount(); --count>=0;)
455		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	471	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
456	472	}
457	473
458	474	copy.Touch(); // display list issue
..	..	@@ -587,7 +603,7 @@
587	603	return;
588	604	}
589	605
590		- if (CameraPane.fromscript)
	606	+ if (Globals.fromscript)
591	607	{
592	608	transformcount = 0;
593	609	return;
..	..	@@ -745,7 +761,7 @@
745	761
746	762	int GetTransformCount()
747	763	{
748		- // marde pour serialization de Texture
	764	+ // patch pour serialization de Texture
749	765	resetmaxcount();
750	766	resettransformcount();
751	767	resetstep();
..	..	@@ -779,9 +795,12 @@
779	795	// factor = CameraPane.STEP;
780	796	// }
781	797
782		- if (marked && CameraPane.isLIVE() && live && CameraPane.drawMode == CameraPane.SHADOW && currentframe != CameraPane.framecount)
	798	+ if (marked && Globals.isLIVE() && live &&
	799	+ //TEMP21aug2018
	800	+ Globals.DrawMode() == iCameraPane.SHADOW &&
	801	+ currentframe != Globals.framecount)
783	802	{
784		- currentframe = CameraPane.framecount;
	803	+ currentframe = Globals.framecount;
785	804
786	805	// System.err.println("transformcount = " + transformcount);
787	806	// System.err.println("factor = " + factor);
..	..	@@ -935,7 +954,7 @@
935	954
936	955	public Object clone()
937	956	{
938		- return GraphreeD.clone(this);
	957	+ return GrafreeD.clone(this);
939	958	}
940	959
941	960	Object3D copyExpand()
..	..	@@ -1446,7 +1465,16 @@
1446	1465	// if (other == null)
1447	1466	// return;
1448	1467
1449		- System.out.println("Link support this = " + this + "; other = " + other);
	1468	+ if (other != null)
	1469	+ {
	1470	+ BoundaryRep.SEUIL = other.material.cameralight;
	1471	+
	1472	+ // Set default to 0.1
	1473	+ BoundaryRep.SEUIL /= 2;
	1474	+ System.out.println("SEUIL = " + BoundaryRep.SEUIL);
	1475	+ }
	1476	+
	1477	+ System.out.println("Link this = " + this + "; support = " + other);
1450	1478
1451	1479	//if (bRep != null)
1452	1480	// bRep.linkVerticesThis(other.bRep);
..	..	@@ -1701,7 +1729,7 @@
1701	1729	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1702	1730	o.bRep = transientrep;
1703	1731	if (clone)
1704		- o.bRep = (BoundaryRep) GraphreeD.clone(transientrep);
	1732	+ o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
1705	1733	o.CreateMaterial();
1706	1734	o.SetAttributes(this, -1);
1707	1735	//parent
..	..	@@ -1714,7 +1742,7 @@
1714	1742	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1715	1743	o.bRep = bRep;
1716	1744	if (clone)
1717		- o.bRep = (BoundaryRep) GraphreeD.clone(bRep);
	1745	+ o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
1718	1746	o.CreateMaterial();
1719	1747	//o.overwriteThis(this, -1);
1720	1748	o.SetAttributes(this, -1);
..	..	@@ -1756,7 +1784,7 @@
1756	1784	// {
1757	1785	// assert(bRep == null);
1758	1786	// Object3D o = new Object3D("Geometry:" + this.name);
1759		-// o.bRep = (BoundaryRep) GraphreeD.clone(transientrep);
	1787	+// o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
1760	1788	// o.CreateMaterial();
1761	1789	// parent.addChild(o);
1762	1790	// }
..	..	@@ -1765,7 +1793,7 @@
1765	1793	// {
1766	1794	// assert(transientrep == null);
1767	1795	// Object3D o = new Object3D("Geometry:" + this.name);
1768		-// o.bRep = (BoundaryRep) GraphreeD.clone(bRep);
	1796	+// o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
1769	1797	// o.CreateMaterial();
1770	1798	// parent.addChild(o);
1771	1799	// }
..	..	@@ -1816,8 +1844,9 @@
1816	1844	if (obj.name == null)
1817	1845	continue; // can't be a null one
1818	1846
1819		- //if (n.contains(obj.name)) // dec 2013 name.split(":")[0])) // Poser generates a count
1820		- if (n.startsWith(obj.name))
	1847	+ String name = obj.name.split(":")[0]; // Poser generates a count
	1848	+ //if (n.startsWith(obj.name))
	1849	+ if (n.contains(name))
1821	1850	{
1822	1851	theobj = obj;
1823	1852	count++;
..	..	@@ -2120,15 +2149,8 @@
2120	2149	if (/parent != null &&/ material == null)
2121	2150	{
2122	2151	material = new cMaterial(GetMaterial());
2123		- if (projectedVertices == null \|\| projectedVertices.length <= 2)
2124		- {
2125		- projectedVertices = new Object3D.cVector2[3];
2126		- }
2127		- for (int i = 0; i < 3; i++)
2128		- {
2129		- projectedVertices[i] = new cVector2(); // Others
2130		- }
2131		- projectedVertices[0].x = 100; // bump
	2152	+
	2153	+ InitOthers();
2132	2154
2133	2155	if (this instanceof Camera)
2134	2156	{
..	..	@@ -2732,6 +2754,24 @@
2732	2754	blockloop = false;
2733	2755	}
2734	2756
	2757	+ void GenNormalsMINE()
	2758	+ {
	2759	+ if (blockloop)
	2760	+ return;
	2761	+
	2762	+ blockloop = true;
	2763	+ GenNormalsMINE0();
	2764	+ for (int i = 0; i < Children().Size(); i++)
	2765	+ {
	2766	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2767	+ if (child == null)
	2768	+ continue;
	2769	+ child.GenNormalsMINE();
	2770	+// Children().release(i);
	2771	+ }
	2772	+ blockloop = false;
	2773	+ }
	2774	+
2735	2775	void ClearColors()
2736	2776	{
2737	2777	if (blockloop)
..	..	@@ -2866,7 +2906,8 @@
2866	2906	{
2867	2907	if (bRep != null)
2868	2908	{
2869		- bRep.GenUV();
	2909	+ bRep.GenUV(); //1);
	2910	+ //bRep.UnfoldUV();
2870	2911	Touch();
2871	2912	}
2872	2913	}
..	..	@@ -2876,6 +2917,15 @@
2876	2917	if (bRep != null)
2877	2918	{
2878	2919	bRep.GenerateNormals(crease);
	2920	+ Touch();
	2921	+ }
	2922	+ }
	2923	+
	2924	+ void GenNormalsMINE0()
	2925	+ {
	2926	+ if (bRep != null)
	2927	+ {
	2928	+ bRep.GenerateNormalsMINE();
2879	2929	Touch();
2880	2930	}
2881	2931	}
..	..	@@ -3153,7 +3203,7 @@
3153	3203
3154	3204	BoundaryRep sup = bRep.support;
3155	3205	bRep.support = null;
3156		- BoundaryRep temprep = (BoundaryRep) GraphreeD.clone(bRep);
	3206	+ BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
3157	3207	// bRep.SplitInTwo(onlyone); // thread...
3158	3208	temprep.SplitInTwo(reduction34, onlyone);
3159	3209	bRep = temprep;
..	..	@@ -3677,7 +3727,7 @@
3677	3727	if (child == null)
3678	3728	continue;
3679	3729
3680		- if (GraphreeD.RENDERME > 0)
	3730	+ if (GrafreeD.RENDERME > 0)
3681	3731	{
3682	3732	if (child instanceof Merge)
3683	3733	((Merge)child).renderme();
..	..	@@ -3717,7 +3767,7 @@
3717	3767
3718	3768	boolean getCentroid(cVector centroid, boolean xform)
3719	3769	{
3720		- assert(false);
	3770	+// for speaker assert(false);
3721	3771	if (blockloop)
3722	3772	return false;
3723	3773
..	..	@@ -3828,7 +3878,7 @@
3828	3878	if (child == null)
3829	3879	continue;
3830	3880
3831		- if (GraphreeD.RENDERME > 0)
	3881	+ if (GrafreeD.RENDERME > 0)
3832	3882	{
3833	3883	if (child instanceof Merge)
3834	3884	((Merge)child).renderme();
..	..	@@ -4023,7 +4073,7 @@
4023	4073	if (child == null)
4024	4074	continue;
4025	4075
4026		- if (GraphreeD.RENDERME > 0)
	4076	+ if (GrafreeD.RENDERME > 0)
4027	4077	{
4028	4078	if (child instanceof Merge)
4029	4079	((Merge)child).renderme();
..	..	@@ -4111,7 +4161,7 @@
4111	4161	if (blockloop)
4112	4162	return;
4113	4163
4114		- for (int i=0; i<size(); i++)
	4164	+ for (int i=0; i<Size(); i++)
4115	4165	{
4116	4166	if (get(i).parent != this)
4117	4167	{
..	..	@@ -4120,6 +4170,22 @@
4120	4170	}
4121	4171	blockloop = true;
4122	4172	get(i).RepairParent();
	4173	+ blockloop = false;
	4174	+ }
	4175	+ }
	4176	+
	4177	+ void RepairShadow()
	4178	+ {
	4179	+ if (blockloop)
	4180	+ return;
	4181	+
	4182	+ if (this.material != null)
	4183	+ this.InitOthers();
	4184	+
	4185	+ for (int i=0; i<Size(); i++)
	4186	+ {
	4187	+ blockloop = true;
	4188	+ get(i).RepairShadow();
4123	4189	blockloop = false;
4124	4190	}
4125	4191	}
..	..	@@ -4515,16 +4581,28 @@
4515	4581
4516	4582	Object3D GetFileRoot()
4517	4583	{
	4584	+ if (overflow)
	4585	+ return null;
	4586	+
	4587	+ overflow = true;
	4588	+
	4589	+ Object3D pfr = null;
	4590	+
4518	4591	if (parent == null && fileparent == null)
4519		- return this;
	4592	+ pfr = this;
4520	4593
4521	4594	if (parent == null && fileparent != null) // V4.gfd???
4522		- return fileparent;
	4595	+ pfr = fileparent;
4523	4596
4524		- if (parent == null)
4525		- return this;
	4597	+ if (pfr == null && parent == null)
	4598	+ pfr = this;
4526	4599
4527		- return parent.GetFileRoot();
	4600	+ if (pfr == null)
	4601	+ pfr = parent.GetFileRoot();
	4602	+
	4603	+ overflow = false;
	4604	+
	4605	+ return pfr;
4528	4606	}
4529	4607
4530	4608	cTreePath GetPath()
..	..	@@ -4778,7 +4856,7 @@
4778	4856	return globalTransform;
4779	4857	}
4780	4858
4781		- void PreprocessOcclusion(CameraPane cp)
	4859	+ void PreprocessOcclusion(iCameraPane cp)
4782	4860	{
4783	4861	/*
4784	4862	if (AOdone)
..	..	@@ -4925,7 +5003,8 @@
4925	5003	} else //
4926	5004	if (editWindow != null)
4927	5005	{
4928		- editWindow.cameraView.lighttouched = true;
	5006	+ //editWindow.cameraView.lighttouched = true;
	5007	+ Globals.lighttouched = true;
4929	5008	}
4930	5009	}
4931	5010
..	..	@@ -5237,25 +5316,22 @@
5237	5316	}
5238	5317	}
5239	5318
5240		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5319	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5241	5320	{
5242	5321	Draw(display, root, selected, blocked);
5243	5322	}
5244	5323
5245		- static cMaterial[] materialstack = new cMaterial[65536];
5246		- static boolean[] selectedstack = new boolean[65536];
5247		- static int materialdepth = 0;
5248		-
5249	5324	boolean NeedSupport()
5250	5325	{
5251	5326	return
5252	5327	CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
5253	5328	// PROBLEM with CROWD!!
5254		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	5329	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
5255	5330	}
5256	5331
	5332	+ static boolean DEBUG_SELECTION = false;
5257	5333
5258		- void Draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5334	+ void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5259	5335	{
5260	5336	Invariants(); // june 2013
5261	5337
..	..	@@ -5264,7 +5340,7 @@
5264	5340	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5265	5341	}
5266	5342
5267		- if (display.drawMode == CameraPane.SELECTION &&
	5343	+ if (display.DrawMode() == iCameraPane.SELECTION &&
5268	5344	hide)
5269	5345	return;
5270	5346
..	..	@@ -5280,10 +5356,10 @@
5280	5356	if (name != null && name.contains("sclera"))
5281	5357	name = name;
5282	5358
5283		- if (this instanceof CheckerIG)
	5359	+ if (this instanceof Checker)
5284	5360	return;
5285	5361
5286		- if (display.drawMode == display.SHADOW && PASSTEST)
	5362	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5287	5363	return;
5288	5364
5289	5365	if (count <= 0)
..	..	@@ -5291,13 +5367,13 @@
5291	5367	return;
5292	5368	}
5293	5369
5294		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5295		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5370	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	5371	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5296	5372	{
5297	5373	return;
5298	5374	}
5299	5375
5300		- javax.media.opengl.GL gl = display.GetGL();
	5376	+ //javax.media.opengl.GL gl = display.GetGL();
5301	5377
5302	5378	/*
5303	5379	if (touched)
..	..	@@ -5333,15 +5409,15 @@
5333	5409
5334	5410	boolean compiled = false;
5335	5411
5336		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5412	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5337	5413
5338		- if (!selectmode && //display.drawMode != display.SELECTION &&
	5414	+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
5339	5415	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5340	5416	{
5341		- display.lighttouched = true;
	5417	+ Globals.lighttouched = true;
5342	5418	} // all panes...
5343		- //if (usecalllists && display.drawMode != display.SELECTION && display.drawMode != display.SHADOW &&
5344		- if (bRep != null && usecalllists && !selectmode && // june 2013 display.drawMode != display.SHADOW &&
	5419	+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
	5420	+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5345	5421	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5346	5422	{
5347	5423	if (!(this instanceof Composite))
..	..	@@ -5349,7 +5425,7 @@
5349	5425	//if (displaylist == -1 && usecalllists)
5350	5426	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5351	5427	{
5352		- bRep.displaylist = gl.glGenLists(1);
	5428	+ bRep.displaylist = display.GenList();
5353	5429	assert(bRep.displaylist != 0);
5354	5430	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5355	5431	//System.out.println("\tgen list " + list);
..	..	@@ -5361,18 +5437,20 @@
5361	5437	if (usecalllists)
5362	5438	{
5363	5439	// System.err.println("new list " + bRep.displaylist + " for " + this);
5364		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5440	+ display.NewList(bRep.displaylist);
5365	5441	}
	5442	+
5366	5443	CallList(display, root, selected, blocked);
	5444	+
5367	5445	// compiled = true;
5368	5446	if (usecalllists)
5369	5447	{
5370	5448	// System.err.println("end list " + bRep.displaylist + " for " + this);
5371		- gl.glEndList();
	5449	+ display.EndList();
5372	5450	}
5373	5451	//gl.glDrawBuffer(gl.GL_BACK);
5374	5452	// XXX touched = false;
5375		- display.lighttouched = true; // all panes...
	5453	+ Globals.lighttouched = true; // all panes...
5376	5454	}
5377	5455
5378	5456	touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
..	..	@@ -5411,12 +5489,12 @@
5411	5489
5412	5490	// frustum culling
5413	5491	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5414		- && display.drawMode != CameraPane.SELECTION)
	5492	+ && display.DrawMode() != iCameraPane.SELECTION)
5415	5493	{
5416		- if (display.drawMode == CameraPane.SHADOW)
	5494	+ if (display.DrawMode() == iCameraPane.SHADOW)
5417	5495	{
5418	5496	if (!link2master // tricky to cull in shadow mode.
5419		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	5497	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5420	5498	{
5421	5499	//System.out.print("CULLED");
5422	5500	culled = true;
..	..	@@ -5424,7 +5502,7 @@
5424	5502	}
5425	5503	else
5426	5504	//GetBRep().getBounds(v0, v1, this);
5427		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	5505	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5428	5506	culled = true;
5429	5507
5430	5508	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5460,11 +5538,11 @@
5460	5538
5461	5539
5462	5540	if (!culled)
5463		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	5541	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5464	5542	{
5465	5543	if (GetBRep() != null)
5466	5544	{
5467		- CameraPane.NextIndex(this, gl);
	5545	+ display.NextIndex();
5468	5546	// vertex color conflict : gl.glCallList(list);
5469	5547	DrawNode(display, root, selected);
5470	5548	if (this instanceof BezierPatch)
..	..	@@ -5486,53 +5564,7 @@
5486	5564	color[2] /= 2;
5487	5565	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5488	5566	*/
5489		- if (material != null)
5490		- {
5491		- materialstack[materialdepth] = material;
5492		- selectedstack[materialdepth] = selected;
5493		- cStatic.objectstack[materialdepth++] = this;
5494		- //System.out.println("material " + material);
5495		- //Applet3D.tracein(this, selected);
5496		- display.vector2buffer = projectedVertices;
5497		- if (this instanceof Camera)
5498		- {
5499		- display.options1[0] = material.shift;
5500		- //System.out.println("shift " + material.shift);
5501		- display.options1[1] = material.lightarea;
5502		- display.options1[2] = material.shadowbias;
5503		- display.options1[3] = material.aniso;
5504		- display.options1[4] = material.anisoV;
5505		- display.options2[0] = material.opacity;
5506		- display.options2[1] = material.diffuse;
5507		- display.options2[2] = material.factor;
5508		-
5509		- cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
5510		- display.options3[3] = material.cameralight/0.2f;
5511		-
5512		- // if (display.CURRENTANTIALIAS > 0)
5513		- // display.options3[3] /= 4;
5514		-
5515		- /*
5516		- System.out.println("Focus = " + display.options1[0]);
5517		- System.out.println("Aperture = " + display.options1[1]);
5518		- System.out.println("ShadowBlur = " + display.options1[2]);
5519		- System.out.println("Antialiasing = " + display.options1[3]);
5520		- System.out.println("Fog = " + display.options2[0]);
5521		- System.out.println("Intensity = " + display.options2[1]);
5522		- System.out.println("Elevation = " + display.options2[2]);
5523		- /**/
5524		- } else
5525		- {
5526		- material.Draw(display, selected);
5527		- }
5528		- } else
5529		- {
5530		- if (selected && CameraPane.flash)
5531		- {
5532		- display.modelParams4[1] = 100;
5533		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5534		- }
5535		- }
	5567	+ display.PushMaterial(this, selected);
5536	5568
5537	5569	//System.out.println("call list " + list);
5538	5570	//System.out.println();
..	..	@@ -5567,30 +5599,15 @@
5567	5599
5568	5600	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5569	5601	assert(bRep.displaylist != 0);
5570		- gl.glCallList(bRep.displaylist);
	5602	+ display.CallList(bRep.displaylist);
5571	5603	// june 2013 drawSelf(display, root, selected);
5572	5604	}
5573	5605	}
5574	5606	}
5575	5607
5576	5608	display.ReleaseTextures(tex);
5577		-
5578		- //if (parent != null && parent.GetMaterial() != null)
5579		- // parent.GetMaterial().Draw(display, parent.IsSelected(this));
5580		- if (material != null)
5581		- {
5582		- materialdepth -= 1;
5583		- if (materialdepth > 0)
5584		- {
5585		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5586		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5587		- }
5588		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5589		- } else if (selected && CameraPane.flash && GetMaterial() != null)
5590		- {
5591		- display.modelParams4[1] = GetMaterial().cameralight;
5592		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5593		- }
	5609	+
	5610	+ display.PopMaterial(this, selected);
5594	5611	}
5595	5612
5596	5613	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5632,7 +5649,7 @@
5632	5649	// resetMasterNode();
5633	5650	}
5634	5651
5635		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5652	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5636	5653	{
5637	5654	if (GetBRep() == null)
5638	5655	{
..	..	@@ -5715,7 +5732,7 @@
5715	5732	boolean flipV = false; // true;
5716	5733	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5717	5734
5718		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5735	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5719	5736	{
5720	5737	if (hide)
5721	5738	return;
..	..	@@ -5774,16 +5791,7 @@
5774	5791	// // ??????????????????????????? Touch();
5775	5792	// }
5776	5793
5777		- if (material != null)
5778		- {
5779		- materialstack[materialdepth] = material;
5780		- selectedstack[materialdepth] = selected;
5781		- cStatic.objectstack[materialdepth++] = this;
5782		- //System.out.println("material " + material);
5783		- //Applet3D.tracein("selected ", selected);
5784		- display.vector2buffer = projectedVertices;
5785		- material.Draw(display, selected);
5786		- }
	5794	+display.PushMaterial2(this, selected);
5787	5795
5788	5796	Object3D child;
5789	5797	boolean sel;
..	..	@@ -5807,12 +5815,12 @@
5807	5815	if (!child.HasTransparency())
5808	5816	{
5809	5817	sel = root != null && root.selection != null && root.selection.indexOf(child) != -1;
5810		- // GraphreeD.tracein("draw ", child);
	5818	+ // GrafreeD.tracein("draw ", child);
5811	5819	boolean wasblocked = blockdraw;
5812	5820	blockdraw = true;
5813	5821	child.draw(display, root, selected \|\| sel, wasblocked \|\| blocked); // \|\| child.IsSelected());
5814	5822	blockdraw = false;
5815		- // GraphreeD.traceout("draw ", child);
	5823	+ // GrafreeD.traceout("draw ", child);
5816	5824	}
5817	5825
5818	5826	release(i);
..	..	@@ -5835,19 +5843,7 @@
5835	5843	*/
5836	5844	//depth += 1;
5837	5845
5838		- if (material != null)
5839		- {
5840		- materialdepth -= 1;
5841		- if (materialdepth > 0)
5842		- {
5843		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5844		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5845		- }
5846		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5847		- //else
5848		- //material.Draw(display, false);
5849		- }
5850		-
	5846	+display.PopMaterial2(this);
5851	5847	/*
5852	5848	display.ReleaseTextures(tex);
5853	5849	*/
..	..	@@ -5858,9 +5854,9 @@
5858	5854
5859	5855	//static cVector min,max;
5860	5856
5861		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	5857	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5862	5858	{
5863		- if (display.drawMode == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	5859	+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5864	5860	return; // no shadow for transparent objects
5865	5861
5866	5862	if (hide)
..	..	@@ -5903,11 +5899,12 @@
5903	5899	return;
5904	5900	}
5905	5901
	5902	+ //bRep.GenUV(1/material.diffuseness);
5906	5903	// bRep.lock = true;
5907	5904
5908		- javax.media.opengl.GL gl = display.GetGL();
	5905	+ //javax.media.opengl.GL gl = display.GetGL();
5909	5906
5910		- if (CameraPane.BOXMODE) // \|\| CameraPane.movingcamera)
	5907	+ if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5911	5908	{
5912	5909	int fc = bRep.FaceCount();
5913	5910	int vc = bRep.VertexCount();
..	..	@@ -5922,23 +5919,7 @@
5922	5919
5923	5920	bRep.getMinMax(min, max, 100);
5924	5921
5925		- gl.glBegin(gl.GL_LINES);
5926		-
5927		- gl.glVertex3d(min.x, min.y, min.z);
5928		- gl.glVertex3d(min.x, min.y, max.z);
5929		- gl.glVertex3d(min.x, min.y, min.z);
5930		- gl.glVertex3d(min.x, max.y, min.z);
5931		- gl.glVertex3d(min.x, min.y, min.z);
5932		- gl.glVertex3d(max.x, min.y, min.z);
5933		-
5934		- gl.glVertex3d(max.x, max.y, max.z);
5935		- gl.glVertex3d(min.x, max.y, max.z);
5936		- gl.glVertex3d(max.x, max.y, max.z);
5937		- gl.glVertex3d(max.x, min.y, max.z);
5938		- gl.glVertex3d(max.x, max.y, max.z);
5939		- gl.glVertex3d(max.x, max.y, min.z);
5940		-
5941		- gl.glEnd();
	5922	+ display.DrawBox(min, max);
5942	5923
5943	5924	return;
5944	5925	}
..	..	@@ -5982,7 +5963,7 @@
5982	5963	{
5983	5964	//throw new Error();
5984	5965
5985		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5966	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5986	5967
5987	5968	int[] strips = bRep.getRawIndices();
5988	5969
..	..	@@ -5992,178 +5973,14 @@
5992	5973	new Exception().printStackTrace();
5993	5974	return;
5994	5975	}
5995		-
5996		- // TRIANGLE STRIP ARRAY
5997		- if (bRep.trimmed)
5998		- {
5999		- float[] v = bRep.getRawVertices();
6000		- float[] n = bRep.getRawNormals();
6001		- float[] c = bRep.getRawColors();
6002		- float[] uv = bRep.getRawUVMap();
6003		-
6004		- int count2 = 0;
6005		- int count3 = 0;
6006		-
6007		- if (n.length > 0)
6008		- {
6009		- for (int i = 0; i < strips.length; i++)
6010		- {
6011		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6012		-
6013		- /*
6014		- boolean locked = false;
6015		- float eps = 0.1f;
6016		- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6017		-
6018		- int dot = 0;
6019		-
6020		- if ((dot&1) == 0)
6021		- dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6022		-
6023		- if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6024		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6025		- else
6026		- {
6027		- locked = true;
6028		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6029		- }
6030		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6031		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6032		- if (hasnorm)
6033		- {
6034		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6035		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6036		- }
6037		-
6038		- if ((dot&4) == 0)
6039		- dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6040		-
6041		- if (wrap \|\| !locked && (dot&8) != 0)
6042		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6043		- else
6044		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6045		-
6046		- f.dot = dot;
6047		- */
6048		-
6049		- if (!selectmode)
6050		- {
6051		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6052		- {
6053		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6054		- } else
6055		- {
6056		- gl.glNormal3f(0, 0, 1);
6057		- }
6058		-
6059		- if (c != null)
6060		- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
6061		- {
6062		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6063		- }
6064		- }
6065		- if (flipV)
6066		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6067		- else
6068		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6069		- //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6070		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6071		-
6072		- count2 += 2;
6073		- count3 += 3;
6074		- if (!selectmode)
6075		- {
6076		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6077		- {
6078		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6079		- } else
6080		- {
6081		- gl.glNormal3f(0, 0, 1);
6082		- }
6083		- if (c != null)
6084		- {
6085		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6086		- }
6087		- }
6088		- if (flipV)
6089		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6090		- else
6091		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6092		- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6093		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6094		-
6095		- count2 += 2;
6096		- count3 += 3;
6097		- for (int j = 0; j < strips[i] - 2; j++)
6098		- {
6099		- //gl.glTexCoord2d(...);
6100		- if (!selectmode)
6101		- {
6102		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6103		- {
6104		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6105		- } else
6106		- {
6107		- gl.glNormal3f(0, 0, 1);
6108		- }
6109		- if (c != null)
6110		- {
6111		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6112		- }
6113		- }
6114		-
6115		- if (flipV)
6116		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6117		- else
6118		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6119		- //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6120		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6121		- count2 += 2;
6122		- count3 += 3;
6123		- }
6124		-
6125		- gl.glEnd();
6126		- }
6127		- }
6128		-
6129		- assert count3 == v.length;
6130		- }
6131		- else // !trimmed
6132		- {
6133		- int count = 0;
6134		- for (int i = 0; i < strips.length; i++)
6135		- {
6136		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6137		-
6138		- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6139		- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6140		-
6141		- drawVertex(gl, p, selectmode);
6142		- drawVertex(gl, q, selectmode);
6143		-
6144		- for (int j = 0; j < strips[i] - 2; j++)
6145		- {
6146		- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6147		-
6148		-// if (j%2 == 0)
6149		-// drawFace(p, q, r, display, null);
6150		-// else
6151		-// drawFace(p, r, q, display, null);
6152		-
6153		-// p = q;
6154		-// q = r;
6155		- drawVertex(gl, r, selectmode);
6156		- }
6157		-
6158		- gl.glEnd();
6159		- }
6160		- }
	5976	+
	5977	+ display.DrawGeometry(bRep, flipV, selectmode);
6161	5978	} else // catch (Error e)
6162	5979	{
6163	5980	// TRIANGLE ARRAY
6164	5981	if (IsOpaque()) // Static())
6165	5982	{
6166		- gl.glBegin(gl.GL_TRIANGLES);
	5983	+ display.StartTriangles();
6167	5984	int facecount = bRep.FaceCount();
6168	5985	for (int i = 0; i < facecount; i++)
6169	5986	{
..	..	@@ -6226,9 +6043,9 @@
6226	6043	// // r.norm.dot(v3) > -0.5)
6227	6044	// // continue;
6228	6045
6229		- drawFace(p, q, r, display, face);
	6046	+ display.DrawFace(this, p, q, r, face);
6230	6047	}
6231		- gl.glEnd();
	6048	+ display.EndTriangles();
6232	6049	}
6233	6050	else
6234	6051	{
..	..	@@ -6257,8 +6074,8 @@
6257	6074	//System.out.println("SORT");
6258	6075
6259	6076	java.util.Arrays.sort(facescompare);
6260		-
6261		- gl.glBegin(gl.GL_TRIANGLES);
	6077	+
	6078	+ display.StartTriangles();
6262	6079	for (int i = 0; i < facecount; i++)
6263	6080	{
6264	6081	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6270,13 +6087,14 @@
6270	6087	Vertex q = bRep.GetVertex(face.q);
6271	6088	Vertex r = bRep.GetVertex(face.r);
6272	6089
6273		- drawFace(p, q, r, display, face);
	6090	+ display.DrawFace(this, p, q, r, face);
6274	6091	}
6275		- gl.glEnd();
	6092	+ display.EndTriangles();
6276	6093	}
6277	6094
6278	6095	if (false) // live && support != null && support.bRep != null) // debug weights
6279	6096	{
	6097	+ /*
6280	6098	gl.glDisable(gl.GL_LIGHTING);
6281	6099	float[] colorV = new float[3];
6282	6100
..	..	@@ -6355,6 +6173,7 @@
6355	6173	// gl.glEnd();
6356	6174	}
6357	6175	}
	6176	+ */
6358	6177	}
6359	6178	}
6360	6179
..	..	@@ -6399,7 +6218,7 @@
6399	6218	center.add(r);
6400	6219	center.mul(1.0/3);
6401	6220
6402		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6221	+ center.sub(Globals.theRenderer.EyeCamera().location);
6403	6222
6404	6223	distance = center.dot(center);
6405	6224	}
..	..	@@ -6410,347 +6229,11 @@
6410	6229
6411	6230	transient FaceCompare[] facescompare = null;
6412	6231
6413		- void SetColor(CameraPane display, Vertex p0)
6414		- {
6415		- if (display.RENDERPROGRAM == 0)
6416		- {
6417		- float r = 0;
6418		- if (bRep != null)
6419		- {
6420		- if (bRep.stripified)
6421		- {
6422		- r = 1;
6423		- }
6424		- }
6425		- float g = 0;
6426		- if (bRep != null)
6427		- {
6428		- if (bRep.trimmed)
6429		- {
6430		- g = 1;
6431		- }
6432		- }
6433		- float b = 0;
6434		- if (support != null && link2master)
6435		- {
6436		- b = 1;
6437		- }
6438		- display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
6439		- return;
6440		- }
6441		-
6442		- if (display.drawMode != CameraPane.SHADOW)
6443		- return;
6444		-
6445		- javax.media.opengl.GL gl = display.GetGL();
6446		-// if (true) return;
6447		-// float ao = p.AO;
6448		-//
6449		-// // if (ao == 0 && !bRep.AOdone) // transient problem!
6450		-// // ao = 1;
6451		-//
6452		-// gl.glColor4f(ao, ao, ao, 1);
6453		-
6454		-// CameraPane.selectedpoint.
6455		-// getAverage(cStatic.point1, true);
6456		- if (CameraPane.pointflow == null) // !random) // live)
6457		- {
6458		- return;
6459		- }
6460		-
6461		- cStatic.point1.set(0,0,0);
6462		- LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
6463		-
6464		- cStatic.point1.sub(p0);
6465		-
6466		-
6467		-// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
6468		-// {
6469		-// return;
6470		-// }
6471		-
6472		- //if (true)
6473		- if (cStatic.point1.dot(cStatic.point1) > 0.000001)
6474		- {
6475		- return;
6476		- }
6477		-
6478		- float[] colorV = new float[3];
6479		-
6480		- if (false) // marked)
6481		- {
6482		- // debug rigging weights
6483		- for (int object = 0; object < p0.vertexlinks.length; object++)
6484		- {
6485		- float weight = p0.weights[object] / p0.totalweight;
6486		-
6487		- // if (weight < 0.1)
6488		- // {
6489		- // assert(weight == 0);
6490		- // continue;
6491		- // }
6492		-
6493		- if (p0.vertexlinks[object] == -1)
6494		- continue;
6495		-
6496		- Vertex q = support.bRep.GetVertex(p0.vertexlinks[object]);
6497		-
6498		- int color = //1 << object; //
6499		- //p.vertexlinks.length;
6500		- support.bRep.supports[p0.closestsupport].links[object];
6501		- colorV[2] += (color & 1) * weight;
6502		- colorV[1] += ((color & 2) >> 1) * weight;
6503		- colorV[0] += ((color & 4) >> 2) * weight;
6504		- }
6505		- }
6506		- else
6507		- {
6508		- if (drawingstarted)
6509		- {
6510		- // find next point
6511		- if (bRep.GetVertex(0).faceindices == null)
6512		- {
6513		- bRep.InitFaceIndices();
6514		- }
6515		-
6516		- double ymin = p0.y;
6517		-
6518		- Vertex newp = p0;
6519		-
6520		- for (int fii = 0; fii < p0.faceindices.length; fii++)
6521		- {
6522		- int fi = p0.faceindices[fii];
6523		-
6524		- if (fi == -1)
6525		- break;
6526		-
6527		- Face f = bRep.GetFace(fi);
6528		-
6529		- Vertex p = bRep.GetVertex(f.p);
6530		- Vertex q = bRep.GetVertex(f.q);
6531		- Vertex r = bRep.GetVertex(f.r);
6532		-
6533		- int swap = (int)(Math.random()*3);
6534		-
6535		-// for (int s=swap; --s>=0;)
6536		-// {
6537		-// Vertex t = p;
6538		-// p = q;
6539		-// q = r;
6540		-// r = t;
6541		-// }
6542		- if (ymin > p.y)
6543		- {
6544		- ymin = p.y;
6545		- newp = p;
6546		-// break;
6547		- }
6548		- if (ymin > q.y)
6549		- {
6550		- ymin = q.y;
6551		- newp = q;
6552		-// break;
6553		- }
6554		- if (ymin > r.y)
6555		- {
6556		- ymin = r.y;
6557		- newp = r;
6558		-// break;
6559		- }
6560		- }
6561		-
6562		- CameraPane.selectedpoint.toParent[3][0] = newp.x;
6563		- CameraPane.selectedpoint.toParent[3][1] = newp.y;
6564		- CameraPane.selectedpoint.toParent[3][2] = newp.z;
6565		-
6566		- drawingstarted = false;
6567		-
6568		- // return;
6569		- }
6570		-
6571		- if (false) // CameraPane.DRAW
6572		- {
6573		- p0.AO = colorV[0] = 2;
6574		- colorV[1] = 2;
6575		- colorV[2] = 2;
6576		- }
6577		-
6578		- CameraPane.pointflow.add(p0);
6579		- CameraPane.pointflow.Touch();
6580		- }
6581		-
6582		-// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
6583		-// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
6584		-// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
6585		- }
6586		-
6587	6232	void Print(Vertex v)
6588	6233	{
6589	6234	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6590	6235	}
6591	6236
6592		- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6593		- {
6594		- if (!selectmode)
6595		- {
6596		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6597		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6598		-
6599		- if (flipV)
6600		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6601		- else
6602		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6603		- }
6604		-
6605		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6606		- }
6607		-
6608		- void drawFace(Vertex pv, Vertex qv, Vertex rv,
6609		- CameraPane display, Face face)
6610		- {
6611		- if (pv.y == -10000 \|\|
6612		- qv.y == -10000 \|\|
6613		- rv.y == -10000)
6614		- return;
6615		-
6616		-// float b = f.nbiterations & 1;
6617		-// float g = (f.nbiterations>>1) & 1;
6618		-// float r = (f.nbiterations>>2) & 1;
6619		-//
6620		-// //if (f.weight == 10000)
6621		-// //{
6622		-// // r = 1; g = b = 0;
6623		-// //}
6624		-// //else
6625		-// //{
6626		-// // assert(f.weight < 10000);
6627		-// r = g = b = (float)bRep.FaceWeight(f)*100;
6628		-// if (r<0)
6629		-// assert(r>=0);
6630		-// //}
6631		-
6632		- javax.media.opengl.GL gl = display.GetGL();
6633		-
6634		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
6635		-
6636		- //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
6637		- if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
6638		- {
6639		- //gl.glBegin(gl.GL_TRIANGLES);
6640		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
6641		- if (!hasnorm)
6642		- {
6643		- // System.out.println("FUCK!!");
6644		- LA.vecSub(pv/.pos/, qv/.pos/, v0);
6645		- LA.vecSub(pv/.pos/, rv/.pos/, v1);
6646		- LA.vecCross(v0, v1, v2);
6647		- LA.vecNormalize(v2);
6648		- gl.glNormal3f((float) v2.x, (float) v2.y, (float) v2.z);
6649		- }
6650		-
6651		- if (hasnorm)
6652		- {
6653		-// if (!pv.norm.normalized())
6654		-// assert(pv.norm.normalized());
6655		-
6656		- //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
6657		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6658		- }
6659		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6660		- SetColor(display, pv);
6661		- //gl.glColor4f(r, g, b, 1);
6662		- //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
6663		- if (flipV)
6664		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6665		- else
6666		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6667		- //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
6668		- gl.glVertex3f((float) pv./pos./x, (float) pv./pos./y, (float) pv./pos./z);
6669		-// Print(pv);
6670		- if (hasnorm)
6671		- {
6672		-// assert(qv.norm.normalized());
6673		- //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
6674		- gl.glNormal3f((float) qv.norm.x, (float) qv.norm.y, (float) qv.norm.z);
6675		- }
6676		- //System.out.println("vertexq = " + qv.s + ", " + qv.t);
6677		- // boolean locked = false;
6678		- // float eps = 0.1f;
6679		- // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6680		-
6681		- // int dot = 0; //*/ (int)f.dot;
6682		-
6683		- // if ((dot&1) == 0)
6684		- // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6685		-
6686		- // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6687		- if (flipV)
6688		- gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
6689		- else
6690		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6691		- // else
6692		- // {
6693		- // locked = true;
6694		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6695		- // }
6696		- gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
6697		- SetColor(display, qv);
6698		- //gl.glColor4f(r, g, b, 1);
6699		- //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
6700		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6701		- gl.glVertex3f((float) qv./pos./x, (float) qv./pos./y, (float) qv./pos./z);
6702		-// Print(qv);
6703		- if (hasnorm)
6704		- {
6705		-// assert(rv.norm.normalized());
6706		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6707		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6708		- }
6709		-
6710		- // if ((dot&4) == 0)
6711		- // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6712		-
6713		- // if (wrap \|\| !locked && (dot&8) != 0)
6714		- if (flipV)
6715		- gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
6716		- else
6717		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6718		- // else
6719		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6720		-
6721		- // f.dot = dot;
6722		-
6723		- gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
6724		- SetColor(display, rv);
6725		- //gl.glColor4f(r, g, b, 1);
6726		- //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
6727		- //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
6728		- gl.glVertex3f((float) rv./pos./x, (float) rv./pos./y, (float) rv./pos./z);
6729		-// Print(rv);
6730		- //gl.glEnd();
6731		- }
6732		- else
6733		- {
6734		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6735		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6736		- gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
6737		-
6738		- }
6739		-
6740		- if (false) // (attributes & WIREFRAME) != 0)
6741		- {
6742		- gl.glDisable(gl.GL_LIGHTING);
6743		-
6744		- gl.glBegin(gl.GL_LINE_LOOP);
6745		- gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
6746		- gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
6747		- gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
6748		- gl.glEnd();
6749		-
6750		- gl.glEnable(gl.GL_LIGHTING);
6751		- }
6752		- }
6753		-
6754	6237	void drawSelf(ClickInfo info, int level, boolean select)
6755	6238	{
6756	6239	if (bRep == null)
..	..	@@ -7322,83 +6805,83 @@
7322	6805	int spotw = spot.x + spot.width;
7323	6806	int spoth = spot.y + spot.height;
7324	6807	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7325		- if (CameraPane.Xmin > spot.x)
7326		- {
7327		- CameraPane.Xmin = spot.x;
7328		- }
7329		- if (CameraPane.Xmax < spotw)
7330		- {
7331		- CameraPane.Xmax = spotw;
7332		- }
7333		- if (CameraPane.Ymin > spot.y)
7334		- {
7335		- CameraPane.Ymin = spot.y;
7336		- }
7337		- if (CameraPane.Ymax < spoth)
7338		- {
7339		- CameraPane.Ymax = spoth;
7340		- }
	6808	+// if (CameraPane.Xmin > spot.x)
	6809	+// {
	6810	+// CameraPane.Xmin = spot.x;
	6811	+// }
	6812	+// if (CameraPane.Xmax < spotw)
	6813	+// {
	6814	+// CameraPane.Xmax = spotw;
	6815	+// }
	6816	+// if (CameraPane.Ymin > spot.y)
	6817	+// {
	6818	+// CameraPane.Ymin = spot.y;
	6819	+// }
	6820	+// if (CameraPane.Ymax < spoth)
	6821	+// {
	6822	+// CameraPane.Ymax = spoth;
	6823	+// }
7341	6824	spot.translate(32, 32);
7342	6825	spotw = spot.x + spot.width;
7343	6826	spoth = spot.y + spot.height;
7344	6827	info.g.setColor(Color.blue);
7345	6828	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7346		- if (CameraPane.Xmin > spot.x)
7347		- {
7348		- CameraPane.Xmin = spot.x;
7349		- }
7350		- if (CameraPane.Xmax < spotw)
7351		- {
7352		- CameraPane.Xmax = spotw;
7353		- }
7354		- if (CameraPane.Ymin > spot.y)
7355		- {
7356		- CameraPane.Ymin = spot.y;
7357		- }
7358		- if (CameraPane.Ymax < spoth)
7359		- {
7360		- CameraPane.Ymax = spoth;
7361		- }
	6829	+// if (CameraPane.Xmin > spot.x)
	6830	+// {
	6831	+// CameraPane.Xmin = spot.x;
	6832	+// }
	6833	+// if (CameraPane.Xmax < spotw)
	6834	+// {
	6835	+// CameraPane.Xmax = spotw;
	6836	+// }
	6837	+// if (CameraPane.Ymin > spot.y)
	6838	+// {
	6839	+// CameraPane.Ymin = spot.y;
	6840	+// }
	6841	+// if (CameraPane.Ymax < spoth)
	6842	+// {
	6843	+// CameraPane.Ymax = spoth;
	6844	+// }
7362	6845	info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7363	6846	info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7364	6847	spot.translate(0, -32);
7365	6848	info.g.setColor(Color.green);
7366	6849	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7367		- if (CameraPane.Xmin > spot.x)
7368		- {
7369		- CameraPane.Xmin = spot.x;
7370		- }
7371		- if (CameraPane.Xmax < spotw)
7372		- {
7373		- CameraPane.Xmax = spotw;
7374		- }
7375		- if (CameraPane.Ymin > spot.y)
7376		- {
7377		- CameraPane.Ymin = spot.y;
7378		- }
7379		- if (CameraPane.Ymax < spoth)
7380		- {
7381		- CameraPane.Ymax = spoth;
7382		- }
	6850	+// if (CameraPane.Xmin > spot.x)
	6851	+// {
	6852	+// CameraPane.Xmin = spot.x;
	6853	+// }
	6854	+// if (CameraPane.Xmax < spotw)
	6855	+// {
	6856	+// CameraPane.Xmax = spotw;
	6857	+// }
	6858	+// if (CameraPane.Ymin > spot.y)
	6859	+// {
	6860	+// CameraPane.Ymin = spot.y;
	6861	+// }
	6862	+// if (CameraPane.Ymax < spoth)
	6863	+// {
	6864	+// CameraPane.Ymax = spoth;
	6865	+// }
7383	6866	info.g.drawArc(boundary.x, boundary.y,
7384	6867	boundary.width, boundary.height, 0, 360);
7385	6868	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7386		- if (CameraPane.Xmin > boundary.x)
7387		- {
7388		- CameraPane.Xmin = boundary.x;
7389		- }
7390		- if (CameraPane.Xmax < boundary.x + boundary.width)
7391		- {
7392		- CameraPane.Xmax = boundary.x + boundary.width;
7393		- }
7394		- if (CameraPane.Ymin > boundary.y)
7395		- {
7396		- CameraPane.Ymin = boundary.y;
7397		- }
7398		- if (CameraPane.Ymax < boundary.y + boundary.height)
7399		- {
7400		- CameraPane.Ymax = boundary.y + boundary.height;
7401		- }
	6869	+// if (CameraPane.Xmin > boundary.x)
	6870	+// {
	6871	+// CameraPane.Xmin = boundary.x;
	6872	+// }
	6873	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	6874	+// {
	6875	+// CameraPane.Xmax = boundary.x + boundary.width;
	6876	+// }
	6877	+// if (CameraPane.Ymin > boundary.y)
	6878	+// {
	6879	+// CameraPane.Ymin = boundary.y;
	6880	+// }
	6881	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	6882	+// {
	6883	+// CameraPane.Ymax = boundary.y + boundary.height;
	6884	+// }
7402	6885	return;
7403	6886	}
7404	6887	}
..	..	@@ -7501,7 +6984,7 @@
7501	6984
7502	6985	case hitCenter: // Translate
7503	6986
7504		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	6987	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7505	6988
7506	6989	if (modified)
7507	6990	{
..	..	@@ -7549,10 +7032,10 @@
7549	7032	}
7550	7033	LA.xformDir(up, ClickInfo.matbuffer, up);
7551	7034	// if (!CameraPane.LOCALTRANSFORM)
7552		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
	7035	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7553	7036	LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7554	7037	// if (!CameraPane.LOCALTRANSFORM)
7555		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7038	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7556	7039	//LA.vecCross(up, cVector.Z, right2);
7557	7040
7558	7041	cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
..	..	@@ -7610,7 +7093,7 @@
7610	7093	}
7611	7094	/**/
7612	7095
7613		- switch (info.pane.renderCamera.viewCode)
	7096	+ switch (info.pane.RenderCamera().viewCode)
7614	7097	{
7615	7098	case 1: // '\001'
7616	7099	LA.matZRotate(toParent, angle);
..	..	@@ -7666,7 +7149,7 @@
7666	7149	}
7667	7150	/**/
7668	7151
7669		- switch (info.pane.renderCamera.viewCode)
	7152	+ switch (info.pane.RenderCamera().viewCode)
7670	7153	{
7671	7154	case 3: // '\001'
7672	7155	if (modified)
..	..	@@ -7719,7 +7202,7 @@
7719	7202	if (parent == null)
7720	7203	{
7721	7204	System.out.println("NULL PARENT");
7722		- new Exception().printStackTrace();
	7205	+ //new Exception().printStackTrace();
7723	7206	} else
7724	7207	{
7725	7208	if (parent instanceof BezierPatch)
..	..	@@ -7735,8 +7218,15 @@
7735	7218	info.pane.repaint();
7736	7219	}
7737	7220
	7221	+ boolean overflow = false;
	7222	+
7738	7223	void TransformToWorld(cVector out) // , cVector out)
7739	7224	{
	7225	+ if (overflow)
	7226	+ return;
	7227	+
	7228	+ overflow = true;
	7229	+
7740	7230	// june 2013 ??? assert (in == out);
7741	7231	cVector in = out;
7742	7232	if (toParent != null && !(this instanceof Texture \|\| this instanceof TextureNode))
..	..	@@ -7753,6 +7243,8 @@
7753	7243	{
7754	7244	(parent!=null?parent:fileparent).TransformToWorld(out); //, out);
7755	7245	}
	7246	+
	7247	+ overflow = false;
7756	7248	}
7757	7249
7758	7250	void TransformToLocal(cVector out) //, cVector out)
..	..	@@ -7995,19 +7487,22 @@
7995	7487	max = new cVector();
7996	7488	}
7997	7489
7998		- Object3D sourcenode = GetFileRoot();
7999		-
8000		- if (!sourcenode.name.contains("rclab"))
	7490	+ if (false) // Can crawl!!
8001	7491	{
8002		- getBounds(min, max, true);
	7492	+ Object3D sourcenode = GetFileRoot();
8003	7493
8004		- if (min.y != Double.POSITIVE_INFINITY && min.y > 2)
	7494	+ if (sourcenode != null && !sourcenode.name.contains("rclab"))
8005	7495	{
8006		-// sourcenode.getBounds(min, max, true);
8007		- sourcenode.getBounds(v0, v1, true);
8008		-// sourcenode.toParent = sourcenode.toParent;
8009		-// get(0).toParent = get(0).toParent;
8010		-// sourcenode.GlobalTransform();
	7496	+ getBounds(min, max, true);
	7497	+
	7498	+ if (min.y != Double.POSITIVE_INFINITY && min.y > 2)
	7499	+ {
	7500	+ // sourcenode.getBounds(min, max, true);
	7501	+ sourcenode.getBounds(v0, v1, true);
	7502	+ // sourcenode.toParent = sourcenode.toParent;
	7503	+ // get(0).toParent = get(0).toParent;
	7504	+ // sourcenode.GlobalTransform();
	7505	+ }
8011	7506	}
8012	7507	}
8013	7508
..	..	@@ -8016,7 +7511,8 @@
8016	7511	if (support != null)
8017	7512	{
8018	7513	assert(bRep != null);
8019		- GraphreeD.Assert(support.bRep == bRep.support);
	7514	+ if (!(support instanceof GenericJoint)) // support.bRep != null)
	7515	+ GrafreeD.Assert(support.bRep == bRep.support);
8020	7516	}
8021	7517	else
8022	7518	{
..	..	@@ -8099,6 +7595,8 @@
8099	7595	{
8100	7596	Object3D targ = this;
8101	7597
	7598	+ targ.NORMALPUSH = obj.NORMALPUSH;
	7599	+
8102	7600	if (obj.material != null)
8103	7601	{
8104	7602	if ((mask&MATERIAL)!=0) // ==(COLOR\|MATERIAL))