~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;
..	..	@@ -430,16 +431,16 @@
430	431	{
431	432	Object3D copy = this;
432	433
433		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	434	+ Camera parentcam = Globals.theRenderer.ManipCamera();
434	435
435		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	436	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
436	437	{
437		- parentcam = CameraPane.theRenderer.cameras[1];
	438	+ parentcam = Globals.theRenderer.Cameras()[1];
438	439	}
439	440
440		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	441	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
441	442	{
442		- parentcam = CameraPane.theRenderer.cameras[0];
	443	+ parentcam = Globals.theRenderer.Cameras()[0];
443	444	}
444	445
445	446	if (this == parentcam)
..	..	@@ -447,7 +448,7 @@
447	448	//assert(this instanceof Camera);
448	449
449	450	for (int count = parentcam.GetTransformCount(); --count>=0;)
450		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	451	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
451	452	}
452	453
453	454	copy.marked ^= true;
..	..	@@ -467,7 +468,7 @@
467	468	//assert(this instanceof Camera);
468	469
469	470	for (int count = parentcam.GetTransformCount(); --count>=0;)
470		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	471	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
471	472	}
472	473
473	474	copy.Touch(); // display list issue
..	..	@@ -602,7 +603,7 @@
602	603	return;
603	604	}
604	605
605		- if (CameraPane.fromscript)
	606	+ if (Globals.fromscript)
606	607	{
607	608	transformcount = 0;
608	609	return;
..	..	@@ -760,7 +761,7 @@
760	761
761	762	int GetTransformCount()
762	763	{
763		- // marde pour serialization de Texture
	764	+ // patch pour serialization de Texture
764	765	resetmaxcount();
765	766	resettransformcount();
766	767	resetstep();
..	..	@@ -794,12 +795,12 @@
794	795	// factor = CameraPane.STEP;
795	796	// }
796	797
797		- if (marked && CameraPane.isLIVE() && live &&
	798	+ if (marked && Globals.isLIVE() && live &&
798	799	//TEMP21aug2018
799		- CameraPane.drawMode == CameraPane.SHADOW &&
800		- currentframe != CameraPane.framecount)
	800	+ Globals.DrawMode() == iCameraPane.SHADOW &&
	801	+ currentframe != Globals.framecount)
801	802	{
802		- currentframe = CameraPane.framecount;
	803	+ currentframe = Globals.framecount;
803	804
804	805	// System.err.println("transformcount = " + transformcount);
805	806	// System.err.println("factor = " + factor);
..	..	@@ -2299,6 +2300,7 @@
2299	2300	{
2300	2301	if (newWindow)
2301	2302	{
	2303	+ new Exception().printStackTrace();
2302	2304	System.exit(0);
2303	2305	if (parent != null)
2304	2306	{
..	..	@@ -2905,7 +2907,8 @@
2905	2907	{
2906	2908	if (bRep != null)
2907	2909	{
2908		- bRep.GenUV();
	2910	+ bRep.GenUV(); //1);
	2911	+ //bRep.UnfoldUV();
2909	2912	Touch();
2910	2913	}
2911	2914	}
..	..	@@ -4854,7 +4857,7 @@
4854	4857	return globalTransform;
4855	4858	}
4856	4859
4857		- void PreprocessOcclusion(CameraPane cp)
	4860	+ void PreprocessOcclusion(iCameraPane cp)
4858	4861	{
4859	4862	/*
4860	4863	if (AOdone)
..	..	@@ -5001,7 +5004,8 @@
5001	5004	} else //
5002	5005	if (editWindow != null)
5003	5006	{
5004		- editWindow.cameraView.lighttouched = true;
	5007	+ //editWindow.cameraView.lighttouched = true;
	5008	+ Globals.lighttouched = true;
5005	5009	}
5006	5010	}
5007	5011
..	..	@@ -5313,25 +5317,22 @@
5313	5317	}
5314	5318	}
5315	5319
5316		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5320	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5317	5321	{
5318	5322	Draw(display, root, selected, blocked);
5319	5323	}
5320	5324
5321		- static cMaterial[] materialstack = new cMaterial[65536];
5322		- static boolean[] selectedstack = new boolean[65536];
5323		- static int materialdepth = 0;
5324		-
5325	5325	boolean NeedSupport()
5326	5326	{
5327	5327	return
5328	5328	CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
5329	5329	// PROBLEM with CROWD!!
5330		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	5330	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
5331	5331	}
5332	5332
	5333	+ static boolean DEBUG_SELECTION = false;
5333	5334
5334		- void Draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5335	+ void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5335	5336	{
5336	5337	Invariants(); // june 2013
5337	5338
..	..	@@ -5340,7 +5341,7 @@
5340	5341	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5341	5342	}
5342	5343
5343		- if (display.drawMode == CameraPane.SELECTION &&
	5344	+ if (display.DrawMode() == iCameraPane.SELECTION &&
5344	5345	hide)
5345	5346	return;
5346	5347
..	..	@@ -5359,7 +5360,7 @@
5359	5360	if (this instanceof Checker)
5360	5361	return;
5361	5362
5362		- if (display.drawMode == display.SHADOW && PASSTEST)
	5363	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5363	5364	return;
5364	5365
5365	5366	if (count <= 0)
..	..	@@ -5367,13 +5368,13 @@
5367	5368	return;
5368	5369	}
5369	5370
5370		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5371		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5371	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	5372	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5372	5373	{
5373	5374	return;
5374	5375	}
5375	5376
5376		- javax.media.opengl.GL gl = display.GetGL();
	5377	+ //javax.media.opengl.GL gl = display.GetGL();
5377	5378
5378	5379	/*
5379	5380	if (touched)
..	..	@@ -5409,15 +5410,15 @@
5409	5410
5410	5411	boolean compiled = false;
5411	5412
5412		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5413	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5413	5414
5414		- if (!selectmode && //display.drawMode != display.SELECTION &&
	5415	+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
5415	5416	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5416	5417	{
5417		- display.lighttouched = true;
	5418	+ Globals.lighttouched = true;
5418	5419	} // all panes...
5419		- //if (usecalllists && display.drawMode != display.SELECTION && display.drawMode != display.SHADOW &&
5420		- if (bRep != null && usecalllists && !selectmode && // june 2013 display.drawMode != display.SHADOW &&
	5420	+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
	5421	+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5421	5422	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5422	5423	{
5423	5424	if (!(this instanceof Composite))
..	..	@@ -5425,7 +5426,7 @@
5425	5426	//if (displaylist == -1 && usecalllists)
5426	5427	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5427	5428	{
5428		- bRep.displaylist = gl.glGenLists(1);
	5429	+ bRep.displaylist = display.GenList();
5429	5430	assert(bRep.displaylist != 0);
5430	5431	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5431	5432	//System.out.println("\tgen list " + list);
..	..	@@ -5437,18 +5438,20 @@
5437	5438	if (usecalllists)
5438	5439	{
5439	5440	// System.err.println("new list " + bRep.displaylist + " for " + this);
5440		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5441	+ display.NewList(bRep.displaylist);
5441	5442	}
	5443	+
5442	5444	CallList(display, root, selected, blocked);
	5445	+
5443	5446	// compiled = true;
5444	5447	if (usecalllists)
5445	5448	{
5446	5449	// System.err.println("end list " + bRep.displaylist + " for " + this);
5447		- gl.glEndList();
	5450	+ display.EndList();
5448	5451	}
5449	5452	//gl.glDrawBuffer(gl.GL_BACK);
5450	5453	// XXX touched = false;
5451		- display.lighttouched = true; // all panes...
	5454	+ Globals.lighttouched = true; // all panes...
5452	5455	}
5453	5456
5454	5457	touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
..	..	@@ -5487,12 +5490,12 @@
5487	5490
5488	5491	// frustum culling
5489	5492	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5490		- && display.drawMode != CameraPane.SELECTION)
	5493	+ && display.DrawMode() != iCameraPane.SELECTION)
5491	5494	{
5492		- if (display.drawMode == CameraPane.SHADOW)
	5495	+ if (display.DrawMode() == iCameraPane.SHADOW)
5493	5496	{
5494	5497	if (!link2master // tricky to cull in shadow mode.
5495		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	5498	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5496	5499	{
5497	5500	//System.out.print("CULLED");
5498	5501	culled = true;
..	..	@@ -5500,7 +5503,7 @@
5500	5503	}
5501	5504	else
5502	5505	//GetBRep().getBounds(v0, v1, this);
5503		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	5506	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5504	5507	culled = true;
5505	5508
5506	5509	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5536,11 +5539,11 @@
5536	5539
5537	5540
5538	5541	if (!culled)
5539		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	5542	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5540	5543	{
5541	5544	if (GetBRep() != null)
5542	5545	{
5543		- CameraPane.NextIndex(this, gl);
	5546	+ display.NextIndex();
5544	5547	// vertex color conflict : gl.glCallList(list);
5545	5548	DrawNode(display, root, selected);
5546	5549	if (this instanceof BezierPatch)
..	..	@@ -5562,55 +5565,7 @@
5562	5565	color[2] /= 2;
5563	5566	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5564	5567	*/
5565		- if (material != null)
5566		- {
5567		- materialstack[materialdepth] = material;
5568		- selectedstack[materialdepth] = selected;
5569		- cStatic.objectstack[materialdepth++] = this;
5570		- //System.out.println("material " + material);
5571		- //Applet3D.tracein(this, selected);
5572		- display.vector2buffer = projectedVertices;
5573		- if (this instanceof Camera)
5574		- {
5575		- display.options1[0] = material.shift;
5576		- //System.out.println("shift " + material.shift);
5577		- display.options1[1] = material.lightarea;
5578		- display.options1[2] = material.shadowbias;
5579		- display.options1[3] = material.aniso;
5580		- display.options1[4] = material.anisoV;
5581		- display.options2[0] = material.opacity;
5582		- display.options2[1] = material.diffuse;
5583		- display.options2[2] = material.factor;
5584		-
5585		- cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
5586		- display.options4[0] = material.cameralight/0.2f;
5587		- display.options4[1] = material.subsurface;
5588		- display.options4[2] = material.sheen;
5589		-
5590		- // if (display.CURRENTANTIALIAS > 0)
5591		- // display.options3[3] /= 4;
5592		-
5593		- /*
5594		- System.out.println("Focus = " + display.options1[0]);
5595		- System.out.println("Aperture = " + display.options1[1]);
5596		- System.out.println("ShadowBlur = " + display.options1[2]);
5597		- System.out.println("Antialiasing = " + display.options1[3]);
5598		- System.out.println("Fog = " + display.options2[0]);
5599		- System.out.println("Intensity = " + display.options2[1]);
5600		- System.out.println("Elevation = " + display.options2[2]);
5601		- /**/
5602		- } else
5603		- {
5604		- material.Draw(display, selected);
5605		- }
5606		- } else
5607		- {
5608		- if (selected && CameraPane.flash)
5609		- {
5610		- display.modelParams4[1] = 100;
5611		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5612		- }
5613		- }
	5568	+ display.PushMaterial(this, selected);
5614	5569
5615	5570	//System.out.println("call list " + list);
5616	5571	//System.out.println();
..	..	@@ -5645,30 +5600,15 @@
5645	5600
5646	5601	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5647	5602	assert(bRep.displaylist != 0);
5648		- gl.glCallList(bRep.displaylist);
	5603	+ display.CallList(bRep.displaylist);
5649	5604	// june 2013 drawSelf(display, root, selected);
5650	5605	}
5651	5606	}
5652	5607	}
5653	5608
5654	5609	display.ReleaseTextures(tex);
5655		-
5656		- //if (parent != null && parent.GetMaterial() != null)
5657		- // parent.GetMaterial().Draw(display, parent.IsSelected(this));
5658		- if (material != null)
5659		- {
5660		- materialdepth -= 1;
5661		- if (materialdepth > 0)
5662		- {
5663		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5664		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5665		- }
5666		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5667		- } else if (selected && CameraPane.flash && GetMaterial() != null)
5668		- {
5669		- display.modelParams4[1] = GetMaterial().cameralight;
5670		- gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
5671		- }
	5610	+
	5611	+ display.PopMaterial(this, selected);
5672	5612	}
5673	5613
5674	5614	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5710,7 +5650,7 @@
5710	5650	// resetMasterNode();
5711	5651	}
5712	5652
5713		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5653	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5714	5654	{
5715	5655	if (GetBRep() == null)
5716	5656	{
..	..	@@ -5793,7 +5733,7 @@
5793	5733	boolean flipV = false; // true;
5794	5734	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5795	5735
5796		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5736	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5797	5737	{
5798	5738	if (hide)
5799	5739	return;
..	..	@@ -5852,16 +5792,7 @@
5852	5792	// // ??????????????????????????? Touch();
5853	5793	// }
5854	5794
5855		- if (material != null)
5856		- {
5857		- materialstack[materialdepth] = material;
5858		- selectedstack[materialdepth] = selected;
5859		- cStatic.objectstack[materialdepth++] = this;
5860		- //System.out.println("material " + material);
5861		- //Applet3D.tracein("selected ", selected);
5862		- display.vector2buffer = projectedVertices;
5863		- material.Draw(display, selected);
5864		- }
	5795	+display.PushMaterial2(this, selected);
5865	5796
5866	5797	Object3D child;
5867	5798	boolean sel;
..	..	@@ -5913,19 +5844,7 @@
5913	5844	*/
5914	5845	//depth += 1;
5915	5846
5916		- if (material != null)
5917		- {
5918		- materialdepth -= 1;
5919		- if (materialdepth > 0)
5920		- {
5921		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
5922		- materialstack[materialdepth - 1].Draw(display, selectedstack[materialdepth - 1]);
5923		- }
5924		- //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
5925		- //else
5926		- //material.Draw(display, false);
5927		- }
5928		-
	5847	+display.PopMaterial2(this);
5929	5848	/*
5930	5849	display.ReleaseTextures(tex);
5931	5850	*/
..	..	@@ -5936,9 +5855,9 @@
5936	5855
5937	5856	//static cVector min,max;
5938	5857
5939		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	5858	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5940	5859	{
5941		- if (display.drawMode == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	5860	+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5942	5861	return; // no shadow for transparent objects
5943	5862
5944	5863	if (hide)
..	..	@@ -5981,9 +5900,10 @@
5981	5900	return;
5982	5901	}
5983	5902
	5903	+ //bRep.GenUV(1/material.diffuseness);
5984	5904	// bRep.lock = true;
5985	5905
5986		- javax.media.opengl.GL gl = display.GetGL();
	5906	+ //javax.media.opengl.GL gl = display.GetGL();
5987	5907
5988	5908	if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5989	5909	{
..	..	@@ -6000,23 +5920,7 @@
6000	5920
6001	5921	bRep.getMinMax(min, max, 100);
6002	5922
6003		- gl.glBegin(gl.GL_LINES);
6004		-
6005		- gl.glVertex3d(min.x, min.y, min.z);
6006		- gl.glVertex3d(min.x, min.y, max.z);
6007		- gl.glVertex3d(min.x, min.y, min.z);
6008		- gl.glVertex3d(min.x, max.y, min.z);
6009		- gl.glVertex3d(min.x, min.y, min.z);
6010		- gl.glVertex3d(max.x, min.y, min.z);
6011		-
6012		- gl.glVertex3d(max.x, max.y, max.z);
6013		- gl.glVertex3d(min.x, max.y, max.z);
6014		- gl.glVertex3d(max.x, max.y, max.z);
6015		- gl.glVertex3d(max.x, min.y, max.z);
6016		- gl.glVertex3d(max.x, max.y, max.z);
6017		- gl.glVertex3d(max.x, max.y, min.z);
6018		-
6019		- gl.glEnd();
	5923	+ display.DrawBox(min, max);
6020	5924
6021	5925	return;
6022	5926	}
..	..	@@ -6060,7 +5964,7 @@
6060	5964	{
6061	5965	//throw new Error();
6062	5966
6063		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5967	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
6064	5968
6065	5969	int[] strips = bRep.getRawIndices();
6066	5970
..	..	@@ -6070,178 +5974,14 @@
6070	5974	new Exception().printStackTrace();
6071	5975	return;
6072	5976	}
6073		-
6074		- // TRIANGLE STRIP ARRAY
6075		- if (bRep.trimmed)
6076		- {
6077		- float[] v = bRep.getRawVertices();
6078		- float[] n = bRep.getRawNormals();
6079		- float[] c = bRep.getRawColors();
6080		- float[] uv = bRep.getRawUVMap();
6081		-
6082		- int count2 = 0;
6083		- int count3 = 0;
6084		-
6085		- if (n.length > 0)
6086		- {
6087		- for (int i = 0; i < strips.length; i++)
6088		- {
6089		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6090		-
6091		- /*
6092		- boolean locked = false;
6093		- float eps = 0.1f;
6094		- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6095		-
6096		- int dot = 0;
6097		-
6098		- if ((dot&1) == 0)
6099		- dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6100		-
6101		- if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6102		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6103		- else
6104		- {
6105		- locked = true;
6106		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6107		- }
6108		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6109		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6110		- if (hasnorm)
6111		- {
6112		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6113		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6114		- }
6115		-
6116		- if ((dot&4) == 0)
6117		- dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6118		-
6119		- if (wrap \|\| !locked && (dot&8) != 0)
6120		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6121		- else
6122		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6123		-
6124		- f.dot = dot;
6125		- */
6126		-
6127		- if (!selectmode)
6128		- {
6129		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6130		- {
6131		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6132		- } else
6133		- {
6134		- gl.glNormal3f(0, 0, 1);
6135		- }
6136		-
6137		- if (c != null)
6138		- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
6139		- {
6140		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6141		- }
6142		- }
6143		- if (flipV)
6144		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6145		- else
6146		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6147		- //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6148		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6149		-
6150		- count2 += 2;
6151		- count3 += 3;
6152		- if (!selectmode)
6153		- {
6154		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6155		- {
6156		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6157		- } else
6158		- {
6159		- gl.glNormal3f(0, 0, 1);
6160		- }
6161		- if (c != null)
6162		- {
6163		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6164		- }
6165		- }
6166		- if (flipV)
6167		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6168		- else
6169		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6170		- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6171		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6172		-
6173		- count2 += 2;
6174		- count3 += 3;
6175		- for (int j = 0; j < strips[i] - 2; j++)
6176		- {
6177		- //gl.glTexCoord2d(...);
6178		- if (!selectmode)
6179		- {
6180		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6181		- {
6182		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6183		- } else
6184		- {
6185		- gl.glNormal3f(0, 0, 1);
6186		- }
6187		- if (c != null)
6188		- {
6189		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6190		- }
6191		- }
6192		-
6193		- if (flipV)
6194		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6195		- else
6196		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6197		- //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6198		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6199		- count2 += 2;
6200		- count3 += 3;
6201		- }
6202		-
6203		- gl.glEnd();
6204		- }
6205		- }
6206		-
6207		- assert count3 == v.length;
6208		- }
6209		- else // !trimmed
6210		- {
6211		- int count = 0;
6212		- for (int i = 0; i < strips.length; i++)
6213		- {
6214		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6215		-
6216		- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6217		- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6218		-
6219		- drawVertex(gl, p, selectmode);
6220		- drawVertex(gl, q, selectmode);
6221		-
6222		- for (int j = 0; j < strips[i] - 2; j++)
6223		- {
6224		- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6225		-
6226		-// if (j%2 == 0)
6227		-// drawFace(p, q, r, display, null);
6228		-// else
6229		-// drawFace(p, r, q, display, null);
6230		-
6231		-// p = q;
6232		-// q = r;
6233		- drawVertex(gl, r, selectmode);
6234		- }
6235		-
6236		- gl.glEnd();
6237		- }
6238		- }
	5977	+
	5978	+ display.DrawGeometry(bRep, flipV, selectmode);
6239	5979	} else // catch (Error e)
6240	5980	{
6241	5981	// TRIANGLE ARRAY
6242	5982	if (IsOpaque()) // Static())
6243	5983	{
6244		- gl.glBegin(gl.GL_TRIANGLES);
	5984	+ display.StartTriangles();
6245	5985	int facecount = bRep.FaceCount();
6246	5986	for (int i = 0; i < facecount; i++)
6247	5987	{
..	..	@@ -6304,9 +6044,9 @@
6304	6044	// // r.norm.dot(v3) > -0.5)
6305	6045	// // continue;
6306	6046
6307		- drawFace(p, q, r, display, face);
	6047	+ display.DrawFace(this, p, q, r, face);
6308	6048	}
6309		- gl.glEnd();
	6049	+ display.EndTriangles();
6310	6050	}
6311	6051	else
6312	6052	{
..	..	@@ -6335,8 +6075,8 @@
6335	6075	//System.out.println("SORT");
6336	6076
6337	6077	java.util.Arrays.sort(facescompare);
6338		-
6339		- gl.glBegin(gl.GL_TRIANGLES);
	6078	+
	6079	+ display.StartTriangles();
6340	6080	for (int i = 0; i < facecount; i++)
6341	6081	{
6342	6082	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6348,13 +6088,14 @@
6348	6088	Vertex q = bRep.GetVertex(face.q);
6349	6089	Vertex r = bRep.GetVertex(face.r);
6350	6090
6351		- drawFace(p, q, r, display, face);
	6091	+ display.DrawFace(this, p, q, r, face);
6352	6092	}
6353		- gl.glEnd();
	6093	+ display.EndTriangles();
6354	6094	}
6355	6095
6356	6096	if (false) // live && support != null && support.bRep != null) // debug weights
6357	6097	{
	6098	+ /*
6358	6099	gl.glDisable(gl.GL_LIGHTING);
6359	6100	float[] colorV = new float[3];
6360	6101
..	..	@@ -6433,6 +6174,7 @@
6433	6174	// gl.glEnd();
6434	6175	}
6435	6176	}
	6177	+ */
6436	6178	}
6437	6179	}
6438	6180
..	..	@@ -6477,7 +6219,7 @@
6477	6219	center.add(r);
6478	6220	center.mul(1.0/3);
6479	6221
6480		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6222	+ center.sub(Globals.theRenderer.EyeCamera().location);
6481	6223
6482	6224	distance = center.dot(center);
6483	6225	}
..	..	@@ -6488,390 +6230,11 @@
6488	6230
6489	6231	transient FaceCompare[] facescompare = null;
6490	6232
6491		- void SetColor(CameraPane display, Vertex p0)
6492		- {
6493		- if (display.RENDERPROGRAM == 0)
6494		- {
6495		- float r = 0;
6496		- if (bRep != null)
6497		- {
6498		- if (bRep.stripified)
6499		- {
6500		- r = 1;
6501		- }
6502		- }
6503		- float g = 0;
6504		- if (bRep != null)
6505		- {
6506		- if (bRep.trimmed)
6507		- {
6508		- g = 1;
6509		- }
6510		- }
6511		- float b = 0;
6512		- if (support != null && link2master)
6513		- {
6514		- b = 1;
6515		- }
6516		- display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
6517		- return;
6518		- }
6519		-
6520		- if (display.drawMode != CameraPane.SHADOW)
6521		- return;
6522		-
6523		- javax.media.opengl.GL gl = display.GetGL();
6524		-// if (true) return;
6525		-// float ao = p.AO;
6526		-//
6527		-// // if (ao == 0 && !bRep.AOdone) // transient problem!
6528		-// // ao = 1;
6529		-//
6530		-// gl.glColor4f(ao, ao, ao, 1);
6531		-
6532		-// CameraPane.selectedpoint.
6533		-// getAverage(cStatic.point1, true);
6534		- if (CameraPane.pointflow == null) // !random) // live)
6535		- {
6536		- return;
6537		- }
6538		-
6539		- cStatic.point1.set(0,0,0);
6540		- LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
6541		-
6542		- cStatic.point1.sub(p0);
6543		-
6544		-
6545		-// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
6546		-// {
6547		-// return;
6548		-// }
6549		-
6550		- //if (true)
6551		- if (cStatic.point1.dot(cStatic.point1) > 0.000001)
6552		- {
6553		- return;
6554		- }
6555		-
6556		- float[] colorV = new float[3];
6557		-
6558		- if (false) // marked)
6559		- {
6560		- // debug rigging weights
6561		- for (int object = 0; object < p0.vertexlinks.length; object++)
6562		- {
6563		- float weight = p0.weights[object] / p0.totalweight;
6564		-
6565		- // if (weight < 0.1)
6566		- // {
6567		- // assert(weight == 0);
6568		- // continue;
6569		- // }
6570		-
6571		- if (p0.vertexlinks[object] == -1)
6572		- continue;
6573		-
6574		- Vertex q = support.bRep.GetVertex(p0.vertexlinks[object]);
6575		-
6576		- int color = //1 << object; //
6577		- //p.vertexlinks.length;
6578		- support.bRep.supports[p0.closestsupport].links[object];
6579		- colorV[2] += (color & 1) * weight;
6580		- colorV[1] += ((color & 2) >> 1) * weight;
6581		- colorV[0] += ((color & 4) >> 2) * weight;
6582		- }
6583		- }
6584		- else
6585		- {
6586		- if (drawingstarted)
6587		- {
6588		- // find next point
6589		- if (bRep.GetVertex(0).faceindices == null)
6590		- {
6591		- bRep.InitFaceIndices();
6592		- }
6593		-
6594		- double ymin = p0.y;
6595		-
6596		- Vertex newp = p0;
6597		-
6598		- for (int fii = 0; fii < p0.faceindices.length; fii++)
6599		- {
6600		- int fi = p0.faceindices[fii];
6601		-
6602		- if (fi == -1)
6603		- break;
6604		-
6605		- Face f = bRep.GetFace(fi);
6606		-
6607		- Vertex p = bRep.GetVertex(f.p);
6608		- Vertex q = bRep.GetVertex(f.q);
6609		- Vertex r = bRep.GetVertex(f.r);
6610		-
6611		- int swap = (int)(Math.random()*3);
6612		-
6613		-// for (int s=swap; --s>=0;)
6614		-// {
6615		-// Vertex t = p;
6616		-// p = q;
6617		-// q = r;
6618		-// r = t;
6619		-// }
6620		- if (ymin > p.y)
6621		- {
6622		- ymin = p.y;
6623		- newp = p;
6624		-// break;
6625		- }
6626		- if (ymin > q.y)
6627		- {
6628		- ymin = q.y;
6629		- newp = q;
6630		-// break;
6631		- }
6632		- if (ymin > r.y)
6633		- {
6634		- ymin = r.y;
6635		- newp = r;
6636		-// break;
6637		- }
6638		- }
6639		-
6640		- CameraPane.selectedpoint.toParent[3][0] = newp.x;
6641		- CameraPane.selectedpoint.toParent[3][1] = newp.y;
6642		- CameraPane.selectedpoint.toParent[3][2] = newp.z;
6643		-
6644		- drawingstarted = false;
6645		-
6646		- // return;
6647		- }
6648		-
6649		- if (false) // CameraPane.DRAW
6650		- {
6651		- p0.AO = colorV[0] = 2;
6652		- colorV[1] = 2;
6653		- colorV[2] = 2;
6654		- }
6655		-
6656		- CameraPane.pointflow.add(p0);
6657		- CameraPane.pointflow.Touch();
6658		- }
6659		-
6660		-// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
6661		-// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
6662		-// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
6663		- }
6664		-
6665	6233	void Print(Vertex v)
6666	6234	{
6667	6235	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6668	6236	}
6669	6237
6670		- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6671		- {
6672		- if (!selectmode)
6673		- {
6674		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6675		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6676		-
6677		- if (flipV)
6678		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6679		- else
6680		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6681		- }
6682		-
6683		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6684		- }
6685		-
6686		- void drawFace(Vertex pv, Vertex qv, Vertex rv,
6687		- CameraPane display, Face face)
6688		- {
6689		- if (pv.y == -10000 \|\|
6690		- qv.y == -10000 \|\|
6691		- rv.y == -10000)
6692		- return;
6693		-
6694		-// float b = f.nbiterations & 1;
6695		-// float g = (f.nbiterations>>1) & 1;
6696		-// float r = (f.nbiterations>>2) & 1;
6697		-//
6698		-// //if (f.weight == 10000)
6699		-// //{
6700		-// // r = 1; g = b = 0;
6701		-// //}
6702		-// //else
6703		-// //{
6704		-// // assert(f.weight < 10000);
6705		-// r = g = b = (float)bRep.FaceWeight(f)*100;
6706		-// if (r<0)
6707		-// assert(r>=0);
6708		-// //}
6709		-
6710		- javax.media.opengl.GL gl = display.GetGL();
6711		-
6712		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
6713		-
6714		- //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
6715		- if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
6716		- {
6717		- //gl.glBegin(gl.GL_TRIANGLES);
6718		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
6719		- if (!hasnorm)
6720		- {
6721		- // System.out.println("FUCK!!");
6722		- LA.vecSub(pv/.pos/, qv/.pos/, v0);
6723		- LA.vecSub(pv/.pos/, rv/.pos/, v1);
6724		- LA.vecCross(v0, v1, v2);
6725		- LA.vecNormalize(v2);
6726		- gl.glNormal3f((float) v2.x, (float) v2.y, (float) v2.z);
6727		- }
6728		-
6729		- // P
6730		- float x = (float)pv.x;
6731		- float y = (float)pv.y;
6732		- float z = (float)pv.z;
6733		-
6734		- if (hasnorm)
6735		- {
6736		-// if (!pv.norm.normalized())
6737		-// assert(pv.norm.normalized());
6738		-
6739		- //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
6740		- float nx = (float)pv.norm.x;
6741		- float ny = (float)pv.norm.y;
6742		- float nz = (float)pv.norm.z;
6743		-
6744		- x += nx * NORMALPUSH;
6745		- y += ny * NORMALPUSH;
6746		- z += nz * NORMALPUSH;
6747		-
6748		- gl.glNormal3f(nx, ny, nz);
6749		- }
6750		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6751		- SetColor(display, pv);
6752		- //gl.glColor4f(r, g, b, 1);
6753		- //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
6754		- if (flipV)
6755		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6756		- else
6757		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6758		- //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
6759		-
6760		- gl.glVertex3f(x, y, z);
6761		-
6762		- // Q
6763		- x = (float)qv.x;
6764		- y = (float)qv.y;
6765		- z = (float)qv.z;
6766		-
6767		-// Print(pv);
6768		- if (hasnorm)
6769		- {
6770		-// assert(qv.norm.normalized());
6771		- //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
6772		- float nx = (float)qv.norm.x;
6773		- float ny = (float)qv.norm.y;
6774		- float nz = (float)qv.norm.z;
6775		-
6776		- x += nx * NORMALPUSH;
6777		- y += ny * NORMALPUSH;
6778		- z += nz * NORMALPUSH;
6779		-
6780		- gl.glNormal3f(nx, ny, nz);
6781		- }
6782		- //System.out.println("vertexq = " + qv.s + ", " + qv.t);
6783		- // boolean locked = false;
6784		- // float eps = 0.1f;
6785		- // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6786		-
6787		- // int dot = 0; //*/ (int)f.dot;
6788		-
6789		- // if ((dot&1) == 0)
6790		- // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6791		-
6792		- // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6793		- if (flipV)
6794		- gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
6795		- else
6796		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6797		- // else
6798		- // {
6799		- // locked = true;
6800		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6801		- // }
6802		- gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
6803		- SetColor(display, qv);
6804		-
6805		- gl.glVertex3f(x, y, z);
6806		- //gl.glColor4f(r, g, b, 1);
6807		- //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
6808		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6809		-// Print(qv);
6810		-
6811		- // R
6812		- x = (float)rv.x;
6813		- y = (float)rv.y;
6814		- z = (float)rv.z;
6815		-
6816		- if (hasnorm)
6817		- {
6818		-// assert(rv.norm.normalized());
6819		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6820		- float nx = (float)rv.norm.x;
6821		- float ny = (float)rv.norm.y;
6822		- float nz = (float)rv.norm.z;
6823		-
6824		- x += nx * NORMALPUSH;
6825		- y += ny * NORMALPUSH;
6826		- z += nz * NORMALPUSH;
6827		-
6828		- gl.glNormal3f(nx, ny, nz);
6829		- }
6830		-
6831		- // if ((dot&4) == 0)
6832		- // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6833		-
6834		- // if (wrap \|\| !locked && (dot&8) != 0)
6835		- if (flipV)
6836		- gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
6837		- else
6838		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6839		- // else
6840		- // gl.glTexCoord2f((float) pv.s, (float) pv.t);
6841		-
6842		- // f.dot = dot;
6843		-
6844		- gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
6845		- SetColor(display, rv);
6846		- //gl.glColor4f(r, g, b, 1);
6847		- //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
6848		- //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
6849		- gl.glVertex3f(x, y, z);
6850		-// Print(rv);
6851		- //gl.glEnd();
6852		- }
6853		- else
6854		- {
6855		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6856		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6857		- gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
6858		-
6859		- }
6860		-
6861		- if (false) // (attributes & WIREFRAME) != 0)
6862		- {
6863		- gl.glDisable(gl.GL_LIGHTING);
6864		-
6865		- gl.glBegin(gl.GL_LINE_LOOP);
6866		- gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
6867		- gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
6868		- gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
6869		- gl.glEnd();
6870		-
6871		- gl.glEnable(gl.GL_LIGHTING);
6872		- }
6873		- }
6874		-
6875	6238	void drawSelf(ClickInfo info, int level, boolean select)
6876	6239	{
6877	6240	if (bRep == null)
..	..	@@ -7443,83 +6806,83 @@
7443	6806	int spotw = spot.x + spot.width;
7444	6807	int spoth = spot.y + spot.height;
7445	6808	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7446		- if (CameraPane.Xmin > spot.x)
7447		- {
7448		- CameraPane.Xmin = spot.x;
7449		- }
7450		- if (CameraPane.Xmax < spotw)
7451		- {
7452		- CameraPane.Xmax = spotw;
7453		- }
7454		- if (CameraPane.Ymin > spot.y)
7455		- {
7456		- CameraPane.Ymin = spot.y;
7457		- }
7458		- if (CameraPane.Ymax < spoth)
7459		- {
7460		- CameraPane.Ymax = spoth;
7461		- }
	6809	+// if (CameraPane.Xmin > spot.x)
	6810	+// {
	6811	+// CameraPane.Xmin = spot.x;
	6812	+// }
	6813	+// if (CameraPane.Xmax < spotw)
	6814	+// {
	6815	+// CameraPane.Xmax = spotw;
	6816	+// }
	6817	+// if (CameraPane.Ymin > spot.y)
	6818	+// {
	6819	+// CameraPane.Ymin = spot.y;
	6820	+// }
	6821	+// if (CameraPane.Ymax < spoth)
	6822	+// {
	6823	+// CameraPane.Ymax = spoth;
	6824	+// }
7462	6825	spot.translate(32, 32);
7463	6826	spotw = spot.x + spot.width;
7464	6827	spoth = spot.y + spot.height;
7465	6828	info.g.setColor(Color.blue);
7466	6829	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7467		- if (CameraPane.Xmin > spot.x)
7468		- {
7469		- CameraPane.Xmin = spot.x;
7470		- }
7471		- if (CameraPane.Xmax < spotw)
7472		- {
7473		- CameraPane.Xmax = spotw;
7474		- }
7475		- if (CameraPane.Ymin > spot.y)
7476		- {
7477		- CameraPane.Ymin = spot.y;
7478		- }
7479		- if (CameraPane.Ymax < spoth)
7480		- {
7481		- CameraPane.Ymax = spoth;
7482		- }
	6830	+// if (CameraPane.Xmin > spot.x)
	6831	+// {
	6832	+// CameraPane.Xmin = spot.x;
	6833	+// }
	6834	+// if (CameraPane.Xmax < spotw)
	6835	+// {
	6836	+// CameraPane.Xmax = spotw;
	6837	+// }
	6838	+// if (CameraPane.Ymin > spot.y)
	6839	+// {
	6840	+// CameraPane.Ymin = spot.y;
	6841	+// }
	6842	+// if (CameraPane.Ymax < spoth)
	6843	+// {
	6844	+// CameraPane.Ymax = spoth;
	6845	+// }
7483	6846	info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7484	6847	info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7485	6848	spot.translate(0, -32);
7486	6849	info.g.setColor(Color.green);
7487	6850	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7488		- if (CameraPane.Xmin > spot.x)
7489		- {
7490		- CameraPane.Xmin = spot.x;
7491		- }
7492		- if (CameraPane.Xmax < spotw)
7493		- {
7494		- CameraPane.Xmax = spotw;
7495		- }
7496		- if (CameraPane.Ymin > spot.y)
7497		- {
7498		- CameraPane.Ymin = spot.y;
7499		- }
7500		- if (CameraPane.Ymax < spoth)
7501		- {
7502		- CameraPane.Ymax = spoth;
7503		- }
	6851	+// if (CameraPane.Xmin > spot.x)
	6852	+// {
	6853	+// CameraPane.Xmin = spot.x;
	6854	+// }
	6855	+// if (CameraPane.Xmax < spotw)
	6856	+// {
	6857	+// CameraPane.Xmax = spotw;
	6858	+// }
	6859	+// if (CameraPane.Ymin > spot.y)
	6860	+// {
	6861	+// CameraPane.Ymin = spot.y;
	6862	+// }
	6863	+// if (CameraPane.Ymax < spoth)
	6864	+// {
	6865	+// CameraPane.Ymax = spoth;
	6866	+// }
7504	6867	info.g.drawArc(boundary.x, boundary.y,
7505	6868	boundary.width, boundary.height, 0, 360);
7506	6869	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7507		- if (CameraPane.Xmin > boundary.x)
7508		- {
7509		- CameraPane.Xmin = boundary.x;
7510		- }
7511		- if (CameraPane.Xmax < boundary.x + boundary.width)
7512		- {
7513		- CameraPane.Xmax = boundary.x + boundary.width;
7514		- }
7515		- if (CameraPane.Ymin > boundary.y)
7516		- {
7517		- CameraPane.Ymin = boundary.y;
7518		- }
7519		- if (CameraPane.Ymax < boundary.y + boundary.height)
7520		- {
7521		- CameraPane.Ymax = boundary.y + boundary.height;
7522		- }
	6870	+// if (CameraPane.Xmin > boundary.x)
	6871	+// {
	6872	+// CameraPane.Xmin = boundary.x;
	6873	+// }
	6874	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	6875	+// {
	6876	+// CameraPane.Xmax = boundary.x + boundary.width;
	6877	+// }
	6878	+// if (CameraPane.Ymin > boundary.y)
	6879	+// {
	6880	+// CameraPane.Ymin = boundary.y;
	6881	+// }
	6882	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	6883	+// {
	6884	+// CameraPane.Ymax = boundary.y + boundary.height;
	6885	+// }
7523	6886	return;
7524	6887	}
7525	6888	}
..	..	@@ -7622,7 +6985,7 @@
7622	6985
7623	6986	case hitCenter: // Translate
7624	6987
7625		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	6988	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7626	6989
7627	6990	if (modified)
7628	6991	{
..	..	@@ -7670,10 +7033,10 @@
7670	7033	}
7671	7034	LA.xformDir(up, ClickInfo.matbuffer, up);
7672	7035	// if (!CameraPane.LOCALTRANSFORM)
7673		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
	7036	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7674	7037	LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7675	7038	// if (!CameraPane.LOCALTRANSFORM)
7676		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7039	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7677	7040	//LA.vecCross(up, cVector.Z, right2);
7678	7041
7679	7042	cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
..	..	@@ -7731,7 +7094,7 @@
7731	7094	}
7732	7095	/**/
7733	7096
7734		- switch (info.pane.renderCamera.viewCode)
	7097	+ switch (info.pane.RenderCamera().viewCode)
7735	7098	{
7736	7099	case 1: // '\001'
7737	7100	LA.matZRotate(toParent, angle);
..	..	@@ -7787,7 +7150,7 @@
7787	7150	}
7788	7151	/**/
7789	7152
7790		- switch (info.pane.renderCamera.viewCode)
	7153	+ switch (info.pane.RenderCamera().viewCode)
7791	7154	{
7792	7155	case 3: // '\001'
7793	7156	if (modified)
..	..	@@ -8015,6 +7378,7 @@
8015	7378	objectUI.closeUI();
8016	7379	if (editWindow != null)
8017	7380	{
	7381	+ editWindow.ctrlPanel.FlushUI();
8018	7382	editWindow.refreshContents();
8019	7383	} // ? new
8020	7384	objectUI = null;