~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()
..	..	@@ -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 \|\| !Globals.RENDERSHADOW) &&
	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);
..	..	@@ -893,6 +912,11 @@
893	912	fromParent = null; // LA.newMatrix();
894	913	bRep = null; // new BoundaryRep();
895	914
	915	+ if (oname != null && oname.equals("LeftHand"))
	916	+ {
	917	+ name = oname;
	918	+ }
	919	+
896	920	/*
897	921	float hue = (float)Math.random();
898	922	Color col;
..	..	@@ -935,7 +959,7 @@
935	959
936	960	public Object clone()
937	961	{
938		- return GrafreeD.clone(this);
	962	+ return Grafreed.clone(this);
939	963	}
940	964
941	965	Object3D copyExpand()
..	..	@@ -1451,7 +1475,7 @@
1451	1475	BoundaryRep.SEUIL = other.material.cameralight;
1452	1476
1453	1477	// Set default to 0.1
1454		- BoundaryRep.SEUIL /= 2;
	1478	+ BoundaryRep.SEUIL /= 4; // 2;
1455	1479	System.out.println("SEUIL = " + BoundaryRep.SEUIL);
1456	1480	}
1457	1481
..	..	@@ -1710,7 +1734,7 @@
1710	1734	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1711	1735	o.bRep = transientrep;
1712	1736	if (clone)
1713		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1737	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1714	1738	o.CreateMaterial();
1715	1739	o.SetAttributes(this, -1);
1716	1740	//parent
..	..	@@ -1723,7 +1747,7 @@
1723	1747	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1724	1748	o.bRep = bRep;
1725	1749	if (clone)
1726		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1750	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1727	1751	o.CreateMaterial();
1728	1752	//o.overwriteThis(this, -1);
1729	1753	o.SetAttributes(this, -1);
..	..	@@ -2130,15 +2154,8 @@
2130	2154	if (/parent != null &&/ material == null)
2131	2155	{
2132	2156	material = new cMaterial(GetMaterial());
2133		- if (projectedVertices == null \|\| projectedVertices.length <= 2)
2134		- {
2135		- projectedVertices = new Object3D.cVector2[3];
2136		- }
2137		- for (int i = 0; i < 3; i++)
2138		- {
2139		- projectedVertices[i] = new cVector2(); // Others
2140		- }
2141		- projectedVertices[0].x = 100; // bump
	2157	+
	2158	+ InitOthers();
2142	2159
2143	2160	if (this instanceof Camera)
2144	2161	{
..	..	@@ -2288,6 +2305,7 @@
2288	2305	{
2289	2306	if (newWindow)
2290	2307	{
	2308	+ new Exception().printStackTrace();
2291	2309	System.exit(0);
2292	2310	if (parent != null)
2293	2311	{
..	..	@@ -2464,13 +2482,13 @@
2464	2482	return retval;
2465	2483	}
2466	2484
2467		- void doEditDrag(ClickInfo info)
	2485	+ void doEditDrag(ClickInfo info, boolean opposite)
2468	2486	{
2469	2487	switch (doSomething)
2470	2488	{
2471	2489	case 1: // '\001'
2472	2490	//super.
2473		- doEditDrag0(info);
	2491	+ doEditDrag0(info, opposite);
2474	2492	break;
2475	2493
2476	2494	case 2: // '\002'
..	..	@@ -2483,11 +2501,11 @@
2483	2501	{
2484	2502	//sel.hitSomething = childToDrag.hitSomething;
2485	2503	//childToDrag.doEditDrag(info);
2486		- sel.doEditDrag(info);
	2504	+ sel.doEditDrag(info, opposite);
2487	2505	} else
2488	2506	{
2489	2507	//super.
2490		- doEditDrag0(info);
	2508	+ doEditDrag0(info, opposite);
2491	2509	}
2492	2510	}
2493	2511	break;
..	..	@@ -2894,7 +2912,8 @@
2894	2912	{
2895	2913	if (bRep != null)
2896	2914	{
2897		- bRep.GenUV();
	2915	+ bRep.GenUV(); //1);
	2916	+ //bRep.UnfoldUV();
2898	2917	Touch();
2899	2918	}
2900	2919	}
..	..	@@ -2969,6 +2988,31 @@
2969	2988	blockloop = false;
2970	2989	}
2971	2990
	2991	+ void TransformChildren()
	2992	+ {
	2993	+ if (toParent != null)
	2994	+ {
	2995	+ for (int i=Size(); --i>=0;)
	2996	+ {
	2997	+ Object3D v = get(i);
	2998	+
	2999	+ if (v.toParent == null)
	3000	+ {
	3001	+ v.toParent = LA.newMatrix();
	3002	+ v.fromParent = LA.newMatrix();
	3003	+ }
	3004	+
	3005	+ LA.matConcat(v.toParent, toParent, v.toParent);
	3006	+ LA.matConcat(fromParent, v.fromParent, v.fromParent);
	3007	+ }
	3008	+
	3009	+ toParent = null; // LA.matIdentity(toParent);
	3010	+ fromParent = null; // LA.matIdentity(fromParent);
	3011	+
	3012	+ Touch();
	3013	+ }
	3014	+ }
	3015	+
2972	3016	void TransformGeometry()
2973	3017	{
2974	3018	Object3D obj = this;
..	..	@@ -3190,7 +3234,7 @@
3190	3234
3191	3235	BoundaryRep sup = bRep.support;
3192	3236	bRep.support = null;
3193		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3237	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3194	3238	// bRep.SplitInTwo(onlyone); // thread...
3195	3239	temprep.SplitInTwo(reduction34, onlyone);
3196	3240	bRep = temprep;
..	..	@@ -3714,7 +3758,7 @@
3714	3758	if (child == null)
3715	3759	continue;
3716	3760
3717		- if (GrafreeD.RENDERME > 0)
	3761	+ if (Grafreed.RENDERME > 0)
3718	3762	{
3719	3763	if (child instanceof Merge)
3720	3764	((Merge)child).renderme();
..	..	@@ -3865,7 +3909,7 @@
3865	3909	if (child == null)
3866	3910	continue;
3867	3911
3868		- if (GrafreeD.RENDERME > 0)
	3912	+ if (Grafreed.RENDERME > 0)
3869	3913	{
3870	3914	if (child instanceof Merge)
3871	3915	((Merge)child).renderme();
..	..	@@ -4060,7 +4104,7 @@
4060	4104	if (child == null)
4061	4105	continue;
4062	4106
4063		- if (GrafreeD.RENDERME > 0)
	4107	+ if (Grafreed.RENDERME > 0)
4064	4108	{
4065	4109	if (child instanceof Merge)
4066	4110	((Merge)child).renderme();
..	..	@@ -4157,6 +4201,22 @@
4157	4201	}
4158	4202	blockloop = true;
4159	4203	get(i).RepairParent();
	4204	+ blockloop = false;
	4205	+ }
	4206	+ }
	4207	+
	4208	+ void RepairShadow()
	4209	+ {
	4210	+ if (blockloop)
	4211	+ return;
	4212	+
	4213	+ if (this.material != null)
	4214	+ this.InitOthers();
	4215	+
	4216	+ for (int i=0; i<Size(); i++)
	4217	+ {
	4218	+ blockloop = true;
	4219	+ get(i).RepairShadow();
4160	4220	blockloop = false;
4161	4221	}
4162	4222	}
..	..	@@ -4827,7 +4887,7 @@
4827	4887	return globalTransform;
4828	4888	}
4829	4889
4830		- void PreprocessOcclusion(CameraPane cp)
	4890	+ void PreprocessOcclusion(iCameraPane cp)
4831	4891	{
4832	4892	/*
4833	4893	if (AOdone)
..	..	@@ -4974,7 +5034,8 @@
4974	5034	} else //
4975	5035	if (editWindow != null)
4976	5036	{
4977		- editWindow.cameraView.lighttouched = true;
	5037	+ //editWindow.cameraView.lighttouched = true;
	5038	+ Globals.lighttouched = true;
4978	5039	}
4979	5040	}
4980	5041
..	..	@@ -5128,10 +5189,34 @@
5128	5189
5129	5190	// System.out.println("Fullname = " + fullname);
5130	5191
5131		- if (fullname.name.indexOf(":") == -1)
5132		- return fullname.name;
	5192	+ // Does not work on Windows due to C:
	5193	+// if (fullname.name.indexOf(":") == -1)
	5194	+// return fullname.name;
	5195	+//
	5196	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5133	5197
5134		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5198	+ String[] split = fullname.name.split(":");
	5199	+
	5200	+ if (split.length == 0)
	5201	+ {
	5202	+ return "";
	5203	+ }
	5204	+
	5205	+ if (split.length <= 2)
	5206	+ {
	5207	+ if (fullname.name.endsWith(":"))
	5208	+ {
	5209	+ // Windows
	5210	+ return fullname.name.substring(0, fullname.name.length()-1);
	5211	+ }
	5212	+
	5213	+ return split[0];
	5214	+ }
	5215	+
	5216	+ // Windows
	5217	+ assert(split.length == 4);
	5218	+
	5219	+ return split[0] + ":" + split[1];
5135	5220	}
5136	5221
5137	5222	static String GetBump(cTexture fullname)
..	..	@@ -5140,10 +5225,38 @@
5140	5225	return "";
5141	5226
5142	5227	// System.out.println("Fullname = " + fullname);
5143		- if (fullname.name.indexOf(":") == -1)
5144		- return "";
5145		-
5146		- return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5228	+ // Does not work on Windows due to C:
	5229	+// if (fullname.name.indexOf(":") == -1)
	5230	+// return "";
	5231	+//
	5232	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5233	+ String[] split = fullname.name.split(":");
	5234	+
	5235	+ if (split.length == 0)
	5236	+ {
	5237	+ return "";
	5238	+ }
	5239	+
	5240	+ if (split.length == 1)
	5241	+ {
	5242	+ return "";
	5243	+ }
	5244	+
	5245	+ if (split.length == 2)
	5246	+ {
	5247	+ if (fullname.name.endsWith(":"))
	5248	+ {
	5249	+ // Windows
	5250	+ return "";
	5251	+ }
	5252	+
	5253	+ return split[1];
	5254	+ }
	5255	+
	5256	+ // Windows
	5257	+ assert(split.length == 4);
	5258	+
	5259	+ return split[2] + ":" + split[3];
5147	5260	}
5148	5261
5149	5262	String GetPigmentTexture()
..	..	@@ -5217,7 +5330,7 @@
5217	5330	System.out.print("; textures = " + textures);
5218	5331	System.out.println("; usedtextures = " + usedtextures);
5219	5332
5220		- if (GetTextures() == null)
	5333	+ if (GetTextures() == null) // What is that??
5221	5334	GetTextures().name = ":";
5222	5335
5223	5336	String texname = tex;
..	..	@@ -5286,25 +5399,22 @@
5286	5399	}
5287	5400	}
5288	5401
5289		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5402	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5290	5403	{
5291	5404	Draw(display, root, selected, blocked);
5292	5405	}
5293	5406
5294		- static cMaterial[] materialstack = new cMaterial[65536];
5295		- static boolean[] selectedstack = new boolean[65536];
5296		- static int materialdepth = 0;
5297		-
5298	5407	boolean NeedSupport()
5299	5408	{
5300	5409	return
5301	5410	CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
5302	5411	// PROBLEM with CROWD!!
5303		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	5412	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5304	5413	}
5305	5414
	5415	+ static boolean DEBUG_SELECTION = false;
5306	5416
5307		- void Draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5417	+ void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5308	5418	{
5309	5419	Invariants(); // june 2013
5310	5420
..	..	@@ -5313,7 +5423,7 @@
5313	5423	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5314	5424	}
5315	5425
5316		- if (display.drawMode == CameraPane.SELECTION &&
	5426	+ if (display.DrawMode() == iCameraPane.SELECTION &&
5317	5427	hide)
5318	5428	return;
5319	5429
..	..	@@ -5332,7 +5442,7 @@
5332	5442	if (this instanceof Checker)
5333	5443	return;
5334	5444
5335		- if (display.drawMode == display.SHADOW && PASSTEST)
	5445	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5336	5446	return;
5337	5447
5338	5448	if (count <= 0)
..	..	@@ -5340,13 +5450,13 @@
5340	5450	return;
5341	5451	}
5342	5452
5343		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5344		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5453	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	5454	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5345	5455	{
5346	5456	return;
5347	5457	}
5348	5458
5349		- javax.media.opengl.GL gl = display.GetGL();
	5459	+ //javax.media.opengl.GL gl = display.GetGL();
5350	5460
5351	5461	/*
5352	5462	if (touched)
..	..	@@ -5382,15 +5492,15 @@
5382	5492
5383	5493	boolean compiled = false;
5384	5494
5385		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5495	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5386	5496
5387		- if (!selectmode && //display.drawMode != display.SELECTION &&
	5497	+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
5388	5498	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5389	5499	{
5390		- display.lighttouched = true;
	5500	+ Globals.lighttouched = true;
5391	5501	} // all panes...
5392		- //if (usecalllists && display.drawMode != display.SELECTION && display.drawMode != display.SHADOW &&
5393		- if (bRep != null && usecalllists && !selectmode && // june 2013 display.drawMode != display.SHADOW &&
	5502	+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
	5503	+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5394	5504	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5395	5505	{
5396	5506	if (!(this instanceof Composite))
..	..	@@ -5398,7 +5508,7 @@
5398	5508	//if (displaylist == -1 && usecalllists)
5399	5509	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5400	5510	{
5401		- bRep.displaylist = gl.glGenLists(1);
	5511	+ bRep.displaylist = display.GenList();
5402	5512	assert(bRep.displaylist != 0);
5403	5513	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5404	5514	//System.out.println("\tgen list " + list);
..	..	@@ -5410,18 +5520,20 @@
5410	5520	if (usecalllists)
5411	5521	{
5412	5522	// System.err.println("new list " + bRep.displaylist + " for " + this);
5413		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5523	+ display.NewList(bRep.displaylist);
5414	5524	}
	5525	+
5415	5526	CallList(display, root, selected, blocked);
	5527	+
5416	5528	// compiled = true;
5417	5529	if (usecalllists)
5418	5530	{
5419	5531	// System.err.println("end list " + bRep.displaylist + " for " + this);
5420		- gl.glEndList();
	5532	+ display.EndList();
5421	5533	}
5422	5534	//gl.glDrawBuffer(gl.GL_BACK);
5423	5535	// XXX touched = false;
5424		- display.lighttouched = true; // all panes...
	5536	+ Globals.lighttouched = true; // all panes...
5425	5537	}
5426	5538
5427	5539	touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
..	..	@@ -5460,12 +5572,12 @@
5460	5572
5461	5573	// frustum culling
5462	5574	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5463		- && display.drawMode != CameraPane.SELECTION)
	5575	+ && display.DrawMode() != iCameraPane.SELECTION)
5464	5576	{
5465		- if (display.drawMode == CameraPane.SHADOW)
	5577	+ if (display.DrawMode() == iCameraPane.SHADOW)
5466	5578	{
5467	5579	if (!link2master // tricky to cull in shadow mode.
5468		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	5580	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5469	5581	{
5470	5582	//System.out.print("CULLED");
5471	5583	culled = true;
..	..	@@ -5473,7 +5585,7 @@
5473	5585	}
5474	5586	else
5475	5587	//GetBRep().getBounds(v0, v1, this);
5476		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	5588	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5477	5589	culled = true;
5478	5590
5479	5591	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5509,11 +5621,11 @@
5509	5621
5510	5622
5511	5623	if (!culled)
5512		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	5624	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5513	5625	{
5514	5626	if (GetBRep() != null)
5515	5627	{
5516		- CameraPane.NextIndex(this, gl);
	5628	+ display.NextIndex();
5517	5629	// vertex color conflict : gl.glCallList(list);
5518	5630	DrawNode(display, root, selected);
5519	5631	if (this instanceof BezierPatch)
..	..	@@ -5535,55 +5647,7 @@
5535	5647	color[2] /= 2;
5536	5648	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5537	5649	*/
5538		- if (material != null)
5539		- {
5540		- materialstack[materialdepth] = material;
5541		- selectedstack[materialdepth] = selected;
5542		- cStatic.objectstack[materialdepth++] = this;
5543		- //System.out.println("material " + material);
5544		- //Applet3D.tracein(this, selected);
5545		- display.vector2buffer = projectedVertices;
5546		- if (this instanceof Camera)
5547		- {
5548		- display.options1[0] = material.shift;
5549		- //System.out.println("shift " + material.shift);
5550		- display.options1[1] = material.lightarea;
5551		- display.options1[2] = material.shadowbias;
5552		- display.options1[3] = material.aniso;
5553		- display.options1[4] = material.anisoV;
5554		- display.options2[0] = material.opacity;
5555		- display.options2[1] = material.diffuse;
5556		- display.options2[2] = material.factor;
5557		-
5558		- cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
5559		- display.options4[0] = material.cameralight/0.2f;
5560		- display.options4[1] = material.subsurface;
5561		- display.options4[2] = material.sheen;
5562		-
5563		- // if (display.CURRENTANTIALIAS > 0)
5564		- // display.options3[3] /= 4;
5565		-
5566		- /*
5567		- System.out.println("Focus = " + display.options1[0]);
5568		- System.out.println("Aperture = " + display.options1[1]);
5569		- System.out.println("ShadowBlur = " + display.options1[2]);
5570		- System.out.println("Antialiasing = " + display.options1[3]);
5571		- System.out.println("Fog = " + display.options2[0]);
5572		- System.out.println("Intensity = " + display.options2[1]);
5573		- System.out.println("Elevation = " + display.options2[2]);
5574		- /**/
5575		- } else
5576		- {
5577		- material.Draw(display, selected);
5578		- }
5579		- } else
5580		- {
5581		- if (selected && CameraPane.flash)
5582		- {
5583		- display.modelParams4[1] = 100;
5584		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5585		- }
5586		- }
	5650	+ display.PushMaterial(this, selected);
5587	5651
5588	5652	//System.out.println("call list " + list);
5589	5653	//System.out.println();
..	..	@@ -5618,30 +5682,15 @@
5618	5682
5619	5683	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5620	5684	assert(bRep.displaylist != 0);
5621		- gl.glCallList(bRep.displaylist);
	5685	+ display.CallList(bRep.displaylist);
5622	5686	// june 2013 drawSelf(display, root, selected);
5623	5687	}
5624	5688	}
5625	5689	}
5626	5690
5627	5691	display.ReleaseTextures(tex);
5628		-
5629		- //if (parent != null && parent.GetMaterial() != null)
5630		- // parent.GetMaterial().Draw(display, parent.IsSelected(this));
5631		- if (material != null)
5632		- {
5633		- materialdepth -= 1;
5634		- if (materialdepth > 0)
5635		- {
5636		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5637		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5638		- }
5639		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5640		- } else if (selected && CameraPane.flash && GetMaterial() != null)
5641		- {
5642		- display.modelParams4[1] = GetMaterial().cameralight;
5643		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5644		- }
	5692	+
	5693	+ display.PopMaterial(this, selected);
5645	5694	}
5646	5695
5647	5696	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5683,7 +5732,7 @@
5683	5732	// resetMasterNode();
5684	5733	}
5685	5734
5686		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5735	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5687	5736	{
5688	5737	if (GetBRep() == null)
5689	5738	{
..	..	@@ -5766,7 +5815,7 @@
5766	5815	boolean flipV = false; // true;
5767	5816	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5768	5817
5769		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5818	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5770	5819	{
5771	5820	if (hide)
5772	5821	return;
..	..	@@ -5825,16 +5874,7 @@
5825	5874	// // ??????????????????????????? Touch();
5826	5875	// }
5827	5876
5828		- if (material != null)
5829		- {
5830		- materialstack[materialdepth] = material;
5831		- selectedstack[materialdepth] = selected;
5832		- cStatic.objectstack[materialdepth++] = this;
5833		- //System.out.println("material " + material);
5834		- //Applet3D.tracein("selected ", selected);
5835		- display.vector2buffer = projectedVertices;
5836		- material.Draw(display, selected);
5837		- }
	5877	+display.PushMaterial2(this, selected);
5838	5878
5839	5879	Object3D child;
5840	5880	boolean sel;
..	..	@@ -5886,19 +5926,7 @@
5886	5926	*/
5887	5927	//depth += 1;
5888	5928
5889		- if (material != null)
5890		- {
5891		- materialdepth -= 1;
5892		- if (materialdepth > 0)
5893		- {
5894		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5895		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5896		- }
5897		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5898		- //else
5899		- //material.Draw(display, false);
5900		- }
5901		-
	5929	+display.PopMaterial2(this);
5902	5930	/*
5903	5931	display.ReleaseTextures(tex);
5904	5932	*/
..	..	@@ -5909,9 +5937,9 @@
5909	5937
5910	5938	//static cVector min,max;
5911	5939
5912		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	5940	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5913	5941	{
5914		- if (display.drawMode == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	5942	+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5915	5943	return; // no shadow for transparent objects
5916	5944
5917	5945	if (hide)
..	..	@@ -5954,11 +5982,12 @@
5954	5982	return;
5955	5983	}
5956	5984
	5985	+ //bRep.GenUV(1/material.diffuseness);
5957	5986	// bRep.lock = true;
5958	5987
5959		- javax.media.opengl.GL gl = display.GetGL();
	5988	+ //javax.media.opengl.GL gl = display.GetGL();
5960	5989
5961		- if (CameraPane.BOXMODE) // \|\| CameraPane.movingcamera)
	5990	+ if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5962	5991	{
5963	5992	int fc = bRep.FaceCount();
5964	5993	int vc = bRep.VertexCount();
..	..	@@ -5973,23 +6002,7 @@
5973	6002
5974	6003	bRep.getMinMax(min, max, 100);
5975	6004
5976		- gl.glBegin(gl.GL_LINES);
5977		-
5978		- gl.glVertex3d(min.x, min.y, min.z);
5979		- gl.glVertex3d(min.x, min.y, max.z);
5980		- gl.glVertex3d(min.x, min.y, min.z);
5981		- gl.glVertex3d(min.x, max.y, min.z);
5982		- gl.glVertex3d(min.x, min.y, min.z);
5983		- gl.glVertex3d(max.x, min.y, min.z);
5984		-
5985		- gl.glVertex3d(max.x, max.y, max.z);
5986		- gl.glVertex3d(min.x, max.y, max.z);
5987		- gl.glVertex3d(max.x, max.y, max.z);
5988		- gl.glVertex3d(max.x, min.y, max.z);
5989		- gl.glVertex3d(max.x, max.y, max.z);
5990		- gl.glVertex3d(max.x, max.y, min.z);
5991		-
5992		- gl.glEnd();
	6005	+ display.DrawBox(min, max);
5993	6006
5994	6007	return;
5995	6008	}
..	..	@@ -6033,7 +6046,7 @@
6033	6046	{
6034	6047	//throw new Error();
6035	6048
6036		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6049	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
6037	6050
6038	6051	int[] strips = bRep.getRawIndices();
6039	6052
..	..	@@ -6043,178 +6056,14 @@
6043	6056	new Exception().printStackTrace();
6044	6057	return;
6045	6058	}
6046		-
6047		- // TRIANGLE STRIP ARRAY
6048		- if (bRep.trimmed)
6049		- {
6050		- float[] v = bRep.getRawVertices();
6051		- float[] n = bRep.getRawNormals();
6052		- float[] c = bRep.getRawColors();
6053		- float[] uv = bRep.getRawUVMap();
6054		-
6055		- int count2 = 0;
6056		- int count3 = 0;
6057		-
6058		- if (n.length > 0)
6059		- {
6060		- for (int i = 0; i < strips.length; i++)
6061		- {
6062		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6063		-
6064		- /*
6065		- boolean locked = false;
6066		- float eps = 0.1f;
6067		- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6068		-
6069		- int dot = 0;
6070		-
6071		- if ((dot&1) == 0)
6072		- dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6073		-
6074		- if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6075		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6076		- else
6077		- {
6078		- locked = true;
6079		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6080		- }
6081		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6082		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6083		- if (hasnorm)
6084		- {
6085		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6086		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6087		- }
6088		-
6089		- if ((dot&4) == 0)
6090		- dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6091		-
6092		- if (wrap \|\| !locked && (dot&8) != 0)
6093		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6094		- else
6095		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6096		-
6097		- f.dot = dot;
6098		- */
6099		-
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		-
6110		- if (c != null)
6111		- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
6112		- {
6113		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6114		- }
6115		- }
6116		- if (flipV)
6117		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6118		- else
6119		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6120		- //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6121		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6122		-
6123		- count2 += 2;
6124		- count3 += 3;
6125		- if (!selectmode)
6126		- {
6127		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6128		- {
6129		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6130		- } else
6131		- {
6132		- gl.glNormal3f(0, 0, 1);
6133		- }
6134		- if (c != null)
6135		- {
6136		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6137		- }
6138		- }
6139		- if (flipV)
6140		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6141		- else
6142		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6143		- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6144		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6145		-
6146		- count2 += 2;
6147		- count3 += 3;
6148		- for (int j = 0; j < strips[i] - 2; j++)
6149		- {
6150		- //gl.glTexCoord2d(...);
6151		- if (!selectmode)
6152		- {
6153		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6154		- {
6155		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6156		- } else
6157		- {
6158		- gl.glNormal3f(0, 0, 1);
6159		- }
6160		- if (c != null)
6161		- {
6162		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6163		- }
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("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6171		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6172		- count2 += 2;
6173		- count3 += 3;
6174		- }
6175		-
6176		- gl.glEnd();
6177		- }
6178		- }
6179		-
6180		- assert count3 == v.length;
6181		- }
6182		- else // !trimmed
6183		- {
6184		- int count = 0;
6185		- for (int i = 0; i < strips.length; i++)
6186		- {
6187		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6188		-
6189		- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6190		- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6191		-
6192		- drawVertex(gl, p, selectmode);
6193		- drawVertex(gl, q, selectmode);
6194		-
6195		- for (int j = 0; j < strips[i] - 2; j++)
6196		- {
6197		- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6198		-
6199		-// if (j%2 == 0)
6200		-// drawFace(p, q, r, display, null);
6201		-// else
6202		-// drawFace(p, r, q, display, null);
6203		-
6204		-// p = q;
6205		-// q = r;
6206		- drawVertex(gl, r, selectmode);
6207		- }
6208		-
6209		- gl.glEnd();
6210		- }
6211		- }
	6059	+
	6060	+ display.DrawGeometry(bRep, flipV, selectmode);
6212	6061	} else // catch (Error e)
6213	6062	{
6214	6063	// TRIANGLE ARRAY
6215	6064	if (IsOpaque()) // Static())
6216	6065	{
6217		- gl.glBegin(gl.GL_TRIANGLES);
	6066	+ display.StartTriangles();
6218	6067	int facecount = bRep.FaceCount();
6219	6068	for (int i = 0; i < facecount; i++)
6220	6069	{
..	..	@@ -6277,9 +6126,9 @@
6277	6126	// // r.norm.dot(v3) > -0.5)
6278	6127	// // continue;
6279	6128
6280		- drawFace(p, q, r, display, face);
	6129	+ display.DrawFace(this, p, q, r, face);
6281	6130	}
6282		- gl.glEnd();
	6131	+ display.EndTriangles();
6283	6132	}
6284	6133	else
6285	6134	{
..	..	@@ -6308,8 +6157,8 @@
6308	6157	//System.out.println("SORT");
6309	6158
6310	6159	java.util.Arrays.sort(facescompare);
6311		-
6312		- gl.glBegin(gl.GL_TRIANGLES);
	6160	+
	6161	+ display.StartTriangles();
6313	6162	for (int i = 0; i < facecount; i++)
6314	6163	{
6315	6164	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6321,13 +6170,14 @@
6321	6170	Vertex q = bRep.GetVertex(face.q);
6322	6171	Vertex r = bRep.GetVertex(face.r);
6323	6172
6324		- drawFace(p, q, r, display, face);
	6173	+ display.DrawFace(this, p, q, r, face);
6325	6174	}
6326		- gl.glEnd();
	6175	+ display.EndTriangles();
6327	6176	}
6328	6177
6329	6178	if (false) // live && support != null && support.bRep != null) // debug weights
6330	6179	{
	6180	+ /*
6331	6181	gl.glDisable(gl.GL_LIGHTING);
6332	6182	float[] colorV = new float[3];
6333	6183
..	..	@@ -6406,6 +6256,7 @@
6406	6256	// gl.glEnd();
6407	6257	}
6408	6258	}
	6259	+ */
6409	6260	}
6410	6261	}
6411	6262
..	..	@@ -6450,7 +6301,7 @@
6450	6301	center.add(r);
6451	6302	center.mul(1.0/3);
6452	6303
6453		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6304	+ center.sub(Globals.theRenderer.EyeCamera().location);
6454	6305
6455	6306	distance = center.dot(center);
6456	6307	}
..	..	@@ -6461,347 +6312,11 @@
6461	6312
6462	6313	transient FaceCompare[] facescompare = null;
6463	6314
6464		- void SetColor(CameraPane display, Vertex p0)
6465		- {
6466		- if (display.RENDERPROGRAM == 0)
6467		- {
6468		- float r = 0;
6469		- if (bRep != null)
6470		- {
6471		- if (bRep.stripified)
6472		- {
6473		- r = 1;
6474		- }
6475		- }
6476		- float g = 0;
6477		- if (bRep != null)
6478		- {
6479		- if (bRep.trimmed)
6480		- {
6481		- g = 1;
6482		- }
6483		- }
6484		- float b = 0;
6485		- if (support != null && link2master)
6486		- {
6487		- b = 1;
6488		- }
6489		- display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
6490		- return;
6491		- }
6492		-
6493		- if (display.drawMode != CameraPane.SHADOW)
6494		- return;
6495		-
6496		- javax.media.opengl.GL gl = display.GetGL();
6497		-// if (true) return;
6498		-// float ao = p.AO;
6499		-//
6500		-// // if (ao == 0 && !bRep.AOdone) // transient problem!
6501		-// // ao = 1;
6502		-//
6503		-// gl.glColor4f(ao, ao, ao, 1);
6504		-
6505		-// CameraPane.selectedpoint.
6506		-// getAverage(cStatic.point1, true);
6507		- if (CameraPane.pointflow == null) // !random) // live)
6508		- {
6509		- return;
6510		- }
6511		-
6512		- cStatic.point1.set(0,0,0);
6513		- LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
6514		-
6515		- cStatic.point1.sub(p0);
6516		-
6517		-
6518		-// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
6519		-// {
6520		-// return;
6521		-// }
6522		-
6523		- //if (true)
6524		- if (cStatic.point1.dot(cStatic.point1) > 0.000001)
6525		- {
6526		- return;
6527		- }
6528		-
6529		- float[] colorV = new float[3];
6530		-
6531		- if (false) // marked)
6532		- {
6533		- // debug rigging weights
6534		- for (int object = 0; object < p0.vertexlinks.length; object++)
6535		- {
6536		- float weight = p0.weights[object] / p0.totalweight;
6537		-
6538		- // if (weight < 0.1)
6539		- // {
6540		- // assert(weight == 0);
6541		- // continue;
6542		- // }
6543		-
6544		- if (p0.vertexlinks[object] == -1)
6545		- continue;
6546		-
6547		- Vertex q = support.bRep.GetVertex(p0.vertexlinks[object]);
6548		-
6549		- int color = //1 << object; //
6550		- //p.vertexlinks.length;
6551		- support.bRep.supports[p0.closestsupport].links[object];
6552		- colorV[2] += (color & 1) * weight;
6553		- colorV[1] += ((color & 2) >> 1) * weight;
6554		- colorV[0] += ((color & 4) >> 2) * weight;
6555		- }
6556		- }
6557		- else
6558		- {
6559		- if (drawingstarted)
6560		- {
6561		- // find next point
6562		- if (bRep.GetVertex(0).faceindices == null)
6563		- {
6564		- bRep.InitFaceIndices();
6565		- }
6566		-
6567		- double ymin = p0.y;
6568		-
6569		- Vertex newp = p0;
6570		-
6571		- for (int fii = 0; fii < p0.faceindices.length; fii++)
6572		- {
6573		- int fi = p0.faceindices[fii];
6574		-
6575		- if (fi == -1)
6576		- break;
6577		-
6578		- Face f = bRep.GetFace(fi);
6579		-
6580		- Vertex p = bRep.GetVertex(f.p);
6581		- Vertex q = bRep.GetVertex(f.q);
6582		- Vertex r = bRep.GetVertex(f.r);
6583		-
6584		- int swap = (int)(Math.random()*3);
6585		-
6586		-// for (int s=swap; --s>=0;)
6587		-// {
6588		-// Vertex t = p;
6589		-// p = q;
6590		-// q = r;
6591		-// r = t;
6592		-// }
6593		- if (ymin > p.y)
6594		- {
6595		- ymin = p.y;
6596		- newp = p;
6597		-// break;
6598		- }
6599		- if (ymin > q.y)
6600		- {
6601		- ymin = q.y;
6602		- newp = q;
6603		-// break;
6604		- }
6605		- if (ymin > r.y)
6606		- {
6607		- ymin = r.y;
6608		- newp = r;
6609		-// break;
6610		- }
6611		- }
6612		-
6613		- CameraPane.selectedpoint.toParent[3][0] = newp.x;
6614		- CameraPane.selectedpoint.toParent[3][1] = newp.y;
6615		- CameraPane.selectedpoint.toParent[3][2] = newp.z;
6616		-
6617		- drawingstarted = false;
6618		-
6619		- // return;
6620		- }
6621		-
6622		- if (false) // CameraPane.DRAW
6623		- {
6624		- p0.AO = colorV[0] = 2;
6625		- colorV[1] = 2;
6626		- colorV[2] = 2;
6627		- }
6628		-
6629		- CameraPane.pointflow.add(p0);
6630		- CameraPane.pointflow.Touch();
6631		- }
6632		-
6633		-// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
6634		-// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
6635		-// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
6636		- }
6637		-
6638	6315	void Print(Vertex v)
6639	6316	{
6640	6317	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6641	6318	}
6642	6319
6643		- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6644		- {
6645		- if (!selectmode)
6646		- {
6647		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6648		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6649		-
6650		- if (flipV)
6651		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6652		- else
6653		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6654		- }
6655		-
6656		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6657		- }
6658		-
6659		- void drawFace(Vertex pv, Vertex qv, Vertex rv,
6660		- CameraPane display, Face face)
6661		- {
6662		- if (pv.y == -10000 \|\|
6663		- qv.y == -10000 \|\|
6664		- rv.y == -10000)
6665		- return;
6666		-
6667		-// float b = f.nbiterations & 1;
6668		-// float g = (f.nbiterations>>1) & 1;
6669		-// float r = (f.nbiterations>>2) & 1;
6670		-//
6671		-// //if (f.weight == 10000)
6672		-// //{
6673		-// // r = 1; g = b = 0;
6674		-// //}
6675		-// //else
6676		-// //{
6677		-// // assert(f.weight < 10000);
6678		-// r = g = b = (float)bRep.FaceWeight(f)*100;
6679		-// if (r<0)
6680		-// assert(r>=0);
6681		-// //}
6682		-
6683		- javax.media.opengl.GL gl = display.GetGL();
6684		-
6685		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
6686		-
6687		- //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
6688		- if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
6689		- {
6690		- //gl.glBegin(gl.GL_TRIANGLES);
6691		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
6692		- if (!hasnorm)
6693		- {
6694		- // System.out.println("FUCK!!");
6695		- LA.vecSub(pv/.pos/, qv/.pos/, v0);
6696		- LA.vecSub(pv/.pos/, rv/.pos/, v1);
6697		- LA.vecCross(v0, v1, v2);
6698		- LA.vecNormalize(v2);
6699		- gl.glNormal3f((float) v2.x, (float) v2.y, (float) v2.z);
6700		- }
6701		-
6702		- if (hasnorm)
6703		- {
6704		-// if (!pv.norm.normalized())
6705		-// assert(pv.norm.normalized());
6706		-
6707		- //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
6708		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6709		- }
6710		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6711		- SetColor(display, pv);
6712		- //gl.glColor4f(r, g, b, 1);
6713		- //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
6714		- if (flipV)
6715		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6716		- else
6717		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6718		- //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
6719		- gl.glVertex3f((float) pv./pos./x, (float) pv./pos./y, (float) pv./pos./z);
6720		-// Print(pv);
6721		- if (hasnorm)
6722		- {
6723		-// assert(qv.norm.normalized());
6724		- //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
6725		- gl.glNormal3f((float) qv.norm.x, (float) qv.norm.y, (float) qv.norm.z);
6726		- }
6727		- //System.out.println("vertexq = " + qv.s + ", " + qv.t);
6728		- // boolean locked = false;
6729		- // float eps = 0.1f;
6730		- // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6731		-
6732		- // int dot = 0; //*/ (int)f.dot;
6733		-
6734		- // if ((dot&1) == 0)
6735		- // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6736		-
6737		- // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6738		- if (flipV)
6739		- gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
6740		- else
6741		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6742		- // else
6743		- // {
6744		- // locked = true;
6745		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6746		- // }
6747		- gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
6748		- SetColor(display, qv);
6749		- //gl.glColor4f(r, g, b, 1);
6750		- //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
6751		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6752		- gl.glVertex3f((float) qv./pos./x, (float) qv./pos./y, (float) qv./pos./z);
6753		-// Print(qv);
6754		- if (hasnorm)
6755		- {
6756		-// assert(rv.norm.normalized());
6757		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6758		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6759		- }
6760		-
6761		- // if ((dot&4) == 0)
6762		- // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6763		-
6764		- // if (wrap \|\| !locked && (dot&8) != 0)
6765		- if (flipV)
6766		- gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
6767		- else
6768		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6769		- // else
6770		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6771		-
6772		- // f.dot = dot;
6773		-
6774		- gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
6775		- SetColor(display, rv);
6776		- //gl.glColor4f(r, g, b, 1);
6777		- //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
6778		- //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
6779		- gl.glVertex3f((float) rv./pos./x, (float) rv./pos./y, (float) rv./pos./z);
6780		-// Print(rv);
6781		- //gl.glEnd();
6782		- }
6783		- else
6784		- {
6785		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6786		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6787		- gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
6788		-
6789		- }
6790		-
6791		- if (false) // (attributes & WIREFRAME) != 0)
6792		- {
6793		- gl.glDisable(gl.GL_LIGHTING);
6794		-
6795		- gl.glBegin(gl.GL_LINE_LOOP);
6796		- gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
6797		- gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
6798		- gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
6799		- gl.glEnd();
6800		-
6801		- gl.glEnable(gl.GL_LIGHTING);
6802		- }
6803		- }
6804		-
6805	6320	void drawSelf(ClickInfo info, int level, boolean select)
6806	6321	{
6807	6322	if (bRep == null)
..	..	@@ -7373,83 +6888,83 @@
7373	6888	int spotw = spot.x + spot.width;
7374	6889	int spoth = spot.y + spot.height;
7375	6890	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7376		- if (CameraPane.Xmin > spot.x)
7377		- {
7378		- CameraPane.Xmin = spot.x;
7379		- }
7380		- if (CameraPane.Xmax < spotw)
7381		- {
7382		- CameraPane.Xmax = spotw;
7383		- }
7384		- if (CameraPane.Ymin > spot.y)
7385		- {
7386		- CameraPane.Ymin = spot.y;
7387		- }
7388		- if (CameraPane.Ymax < spoth)
7389		- {
7390		- CameraPane.Ymax = spoth;
7391		- }
	6891	+// if (CameraPane.Xmin > spot.x)
	6892	+// {
	6893	+// CameraPane.Xmin = spot.x;
	6894	+// }
	6895	+// if (CameraPane.Xmax < spotw)
	6896	+// {
	6897	+// CameraPane.Xmax = spotw;
	6898	+// }
	6899	+// if (CameraPane.Ymin > spot.y)
	6900	+// {
	6901	+// CameraPane.Ymin = spot.y;
	6902	+// }
	6903	+// if (CameraPane.Ymax < spoth)
	6904	+// {
	6905	+// CameraPane.Ymax = spoth;
	6906	+// }
7392	6907	spot.translate(32, 32);
7393	6908	spotw = spot.x + spot.width;
7394	6909	spoth = spot.y + spot.height;
7395	6910	info.g.setColor(Color.blue);
7396	6911	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7397		- if (CameraPane.Xmin > spot.x)
7398		- {
7399		- CameraPane.Xmin = spot.x;
7400		- }
7401		- if (CameraPane.Xmax < spotw)
7402		- {
7403		- CameraPane.Xmax = spotw;
7404		- }
7405		- if (CameraPane.Ymin > spot.y)
7406		- {
7407		- CameraPane.Ymin = spot.y;
7408		- }
7409		- if (CameraPane.Ymax < spoth)
7410		- {
7411		- CameraPane.Ymax = spoth;
7412		- }
	6912	+// if (CameraPane.Xmin > spot.x)
	6913	+// {
	6914	+// CameraPane.Xmin = spot.x;
	6915	+// }
	6916	+// if (CameraPane.Xmax < spotw)
	6917	+// {
	6918	+// CameraPane.Xmax = spotw;
	6919	+// }
	6920	+// if (CameraPane.Ymin > spot.y)
	6921	+// {
	6922	+// CameraPane.Ymin = spot.y;
	6923	+// }
	6924	+// if (CameraPane.Ymax < spoth)
	6925	+// {
	6926	+// CameraPane.Ymax = spoth;
	6927	+// }
7413	6928	info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7414	6929	info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7415	6930	spot.translate(0, -32);
7416	6931	info.g.setColor(Color.green);
7417	6932	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7418		- if (CameraPane.Xmin > spot.x)
7419		- {
7420		- CameraPane.Xmin = spot.x;
7421		- }
7422		- if (CameraPane.Xmax < spotw)
7423		- {
7424		- CameraPane.Xmax = spotw;
7425		- }
7426		- if (CameraPane.Ymin > spot.y)
7427		- {
7428		- CameraPane.Ymin = spot.y;
7429		- }
7430		- if (CameraPane.Ymax < spoth)
7431		- {
7432		- CameraPane.Ymax = spoth;
7433		- }
	6933	+// if (CameraPane.Xmin > spot.x)
	6934	+// {
	6935	+// CameraPane.Xmin = spot.x;
	6936	+// }
	6937	+// if (CameraPane.Xmax < spotw)
	6938	+// {
	6939	+// CameraPane.Xmax = spotw;
	6940	+// }
	6941	+// if (CameraPane.Ymin > spot.y)
	6942	+// {
	6943	+// CameraPane.Ymin = spot.y;
	6944	+// }
	6945	+// if (CameraPane.Ymax < spoth)
	6946	+// {
	6947	+// CameraPane.Ymax = spoth;
	6948	+// }
7434	6949	info.g.drawArc(boundary.x, boundary.y,
7435	6950	boundary.width, boundary.height, 0, 360);
7436	6951	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7437		- if (CameraPane.Xmin > boundary.x)
7438		- {
7439		- CameraPane.Xmin = boundary.x;
7440		- }
7441		- if (CameraPane.Xmax < boundary.x + boundary.width)
7442		- {
7443		- CameraPane.Xmax = boundary.x + boundary.width;
7444		- }
7445		- if (CameraPane.Ymin > boundary.y)
7446		- {
7447		- CameraPane.Ymin = boundary.y;
7448		- }
7449		- if (CameraPane.Ymax < boundary.y + boundary.height)
7450		- {
7451		- CameraPane.Ymax = boundary.y + boundary.height;
7452		- }
	6952	+// if (CameraPane.Xmin > boundary.x)
	6953	+// {
	6954	+// CameraPane.Xmin = boundary.x;
	6955	+// }
	6956	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	6957	+// {
	6958	+// CameraPane.Xmax = boundary.x + boundary.width;
	6959	+// }
	6960	+// if (CameraPane.Ymin > boundary.y)
	6961	+// {
	6962	+// CameraPane.Ymin = boundary.y;
	6963	+// }
	6964	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	6965	+// {
	6966	+// CameraPane.Ymax = boundary.y + boundary.height;
	6967	+// }
7453	6968	return;
7454	6969	}
7455	6970	}
..	..	@@ -7499,7 +7014,7 @@
7499	7014	}
7500	7015
7501	7016	//System.out.println("info.modifiers = " + info.modifiers);
7502		- modified = (info.modifiers & CameraPane.META) != 0;
	7017	+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7503	7018	//System.out.println("modified = " + modified);
7504	7019	//new Exception().printStackTrace();
7505	7020	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7527,7 +7042,7 @@
7527	7042	return true;
7528	7043	}
7529	7044
7530		- void doEditDrag0(ClickInfo info)
	7045	+ void doEditDrag0(ClickInfo info, boolean opposite)
7531	7046	{
7532	7047	if (hitSomething == 0)
7533	7048	{
..	..	@@ -7552,9 +7067,9 @@
7552	7067
7553	7068	case hitCenter: // Translate
7554	7069
7555		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7070	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7556	7071
7557		- if (modified)
	7072	+ if (modified \|\| opposite)
7558	7073	{
7559	7074	//assert(false);
7560	7075	/*
..	..	@@ -7600,10 +7115,10 @@
7600	7115	}
7601	7116	LA.xformDir(up, ClickInfo.matbuffer, up);
7602	7117	// if (!CameraPane.LOCALTRANSFORM)
7603		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
	7118	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7604	7119	LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7605	7120	// if (!CameraPane.LOCALTRANSFORM)
7606		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7121	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7607	7122	//LA.vecCross(up, cVector.Z, right2);
7608	7123
7609	7124	cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
..	..	@@ -7648,6 +7163,7 @@
7648	7163
7649	7164	if (modified)
7650	7165	{
	7166	+ // Rotate 90 degrees
7651	7167	angle /= (Math.PI / 4);
7652	7168	angle = Math.floor(angle + 0.5);
7653	7169	angle *= (Math.PI / 4);
..	..	@@ -7661,7 +7177,7 @@
7661	7177	}
7662	7178	/**/
7663	7179
7664		- switch (info.pane.renderCamera.viewCode)
	7180	+ switch (info.pane.RenderCamera().viewCode)
7665	7181	{
7666	7182	case 1: // '\001'
7667	7183	LA.matZRotate(toParent, angle);
..	..	@@ -7717,7 +7233,7 @@
7717	7233	}
7718	7234	/**/
7719	7235
7720		- switch (info.pane.renderCamera.viewCode)
	7236	+ switch (info.pane.RenderCamera().viewCode)
7721	7237	{
7722	7238	case 3: // '\001'
7723	7239	if (modified)
..	..	@@ -7882,14 +7398,22 @@
7882	7398	//return super.toString() + " (id=" + list + ")" + " (brep=" + bRep + ")";
7883	7399	//return name + " (id=" + list + ")" + " (brep=" + bRep + ") " + super.toString();
7884	7400	//return name + " (#tri = " + (bRep==null?0:bRep.VertexCount()) + ") " + super.toString();
	7401	+
	7402	+ String objname;
	7403	+
7885	7404	if (false) //parent != null)
7886	7405	{
7887		- return name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
	7406	+ objname = name + " " + System.identityHashCode(this) + " (" + parent.name + " " + System.identityHashCode(parent) + ")";
7888	7407	} else
7889	7408	{
7890		- return GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ") ")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / +System.identityHashCode(this);
	7409	+ objname = GetName() + (Math.abs(count) == 1000 ? (count == 1000 ? " " : " * ") : (" (" + (count /- 1/) + ")")) + /(IsSelected()?"(selected) ":"") + (touched?"(touched) ":"") / "";
7891	7410	} // + super.toString();
7892	7411	//return name + " (" + (SizeOf.deepSizeOf(this)/1024) + "K) " + this.getClass().getName();
	7412	+
	7413	+ if (!Globals.ADVANCED)
	7414	+ return objname;
	7415	+
	7416	+ return objname + " " + System.identityHashCode(this);
7893	7417	}
7894	7418
7895	7419	public int hashCode()
..	..	@@ -7945,6 +7469,7 @@
7945	7469	objectUI.closeUI();
7946	7470	if (editWindow != null)
7947	7471	{
	7472	+ editWindow.ctrlPanel.FlushUI();
7948	7473	editWindow.refreshContents();
7949	7474	} // ? new
7950	7475	objectUI = null;
..	..	@@ -8080,7 +7605,7 @@
8080	7605	{
8081	7606	assert(bRep != null);
8082	7607	if (!(support instanceof GenericJoint)) // support.bRep != null)
8083		- GrafreeD.Assert(support.bRep == bRep.support);
	7608	+ Grafreed.Assert(support.bRep == bRep.support);
8084	7609	}
8085	7610	else
8086	7611	{
..	..	@@ -8163,6 +7688,8 @@
8163	7688	{
8164	7689	Object3D targ = this;
8165	7690
	7691	+ targ.NORMALPUSH = obj.NORMALPUSH;
	7692	+
8166	7693	if (obj.material != null)
8167	7694	{
8168	7695	if ((mask&MATERIAL)!=0) // ==(COLOR\|MATERIAL))