~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -430,16 +430,16 @@
430	430	{
431	431	Object3D copy = this;
432	432
433		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	433	+ Camera parentcam = CameraPane.theRenderer.ManipCamera();
434	434
435		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	435	+ if (CameraPane.theRenderer.ManipCamera() == CameraPane.theRenderer.Cameras()[0])
436	436	{
437		- parentcam = CameraPane.theRenderer.cameras[1];
	437	+ parentcam = CameraPane.theRenderer.Cameras()[1];
438	438	}
439	439
440		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	440	+ if (CameraPane.theRenderer.ManipCamera() == CameraPane.theRenderer.Cameras()[1])
441	441	{
442		- parentcam = CameraPane.theRenderer.cameras[0];
	442	+ parentcam = CameraPane.theRenderer.Cameras()[0];
443	443	}
444	444
445	445	if (this == parentcam)
..	..	@@ -447,7 +447,7 @@
447	447	//assert(this instanceof Camera);
448	448
449	449	for (int count = parentcam.GetTransformCount(); --count>=0;)
450		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	450	+ LA.xformPos(CameraPane.theRenderer.TargetLookAt(), parentcam.toParent, CameraPane.theRenderer.TargetLookAt());
451	451	}
452	452
453	453	copy.marked ^= true;
..	..	@@ -467,7 +467,7 @@
467	467	//assert(this instanceof Camera);
468	468
469	469	for (int count = parentcam.GetTransformCount(); --count>=0;)
470		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	470	+ LA.xformPos(CameraPane.theRenderer.TargetLookAt(), parentcam.fromParent, CameraPane.theRenderer.TargetLookAt());
471	471	}
472	472
473	473	copy.Touch(); // display list issue
..	..	@@ -602,7 +602,7 @@
602	602	return;
603	603	}
604	604
605		- if (CameraPane.fromscript)
	605	+ if (Globals.fromscript)
606	606	{
607	607	transformcount = 0;
608	608	return;
..	..	@@ -760,7 +760,7 @@
760	760
761	761	int GetTransformCount()
762	762	{
763		- // marde pour serialization de Texture
	763	+ // patch pour serialization de Texture
764	764	resetmaxcount();
765	765	resettransformcount();
766	766	resetstep();
..	..	@@ -794,12 +794,12 @@
794	794	// factor = CameraPane.STEP;
795	795	// }
796	796
797		- if (marked && CameraPane.isLIVE() && live &&
	797	+ if (marked && Globals.isLIVE() && live &&
798	798	//TEMP21aug2018
799		- CameraPane.drawMode == CameraPane.SHADOW &&
800		- currentframe != CameraPane.framecount)
	799	+ Globals.DrawMode() == iCameraPane.SHADOW &&
	800	+ currentframe != Globals.framecount)
801	801	{
802		- currentframe = CameraPane.framecount;
	802	+ currentframe = Globals.framecount;
803	803
804	804	// System.err.println("transformcount = " + transformcount);
805	805	// System.err.println("factor = " + factor);
..	..	@@ -4854,7 +4854,7 @@
4854	4854	return globalTransform;
4855	4855	}
4856	4856
4857		- void PreprocessOcclusion(CameraPane cp)
	4857	+ void PreprocessOcclusion(iCameraPane cp)
4858	4858	{
4859	4859	/*
4860	4860	if (AOdone)
..	..	@@ -5001,7 +5001,8 @@
5001	5001	} else //
5002	5002	if (editWindow != null)
5003	5003	{
5004		- editWindow.cameraView.lighttouched = true;
	5004	+ //editWindow.cameraView.lighttouched = true;
	5005	+ Globals.lighttouched = true;
5005	5006	}
5006	5007	}
5007	5008
..	..	@@ -5313,25 +5314,22 @@
5313	5314	}
5314	5315	}
5315	5316
5316		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5317	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5317	5318	{
5318	5319	Draw(display, root, selected, blocked);
5319	5320	}
5320	5321
5321		- static cMaterial[] materialstack = new cMaterial[65536];
5322		- static boolean[] selectedstack = new boolean[65536];
5323		- static int materialdepth = 0;
5324		-
5325	5322	boolean NeedSupport()
5326	5323	{
5327	5324	return
5328	5325	CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
5329	5326	// PROBLEM with CROWD!!
5330		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	5327	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
5331	5328	}
5332	5329
	5330	+ static boolean DEBUG_SELECTION = false;
5333	5331
5334		- void Draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5332	+ void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5335	5333	{
5336	5334	Invariants(); // june 2013
5337	5335
..	..	@@ -5340,7 +5338,7 @@
5340	5338	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5341	5339	}
5342	5340
5343		- if (display.drawMode == CameraPane.SELECTION &&
	5341	+ if (display.DrawMode() == iCameraPane.SELECTION &&
5344	5342	hide)
5345	5343	return;
5346	5344
..	..	@@ -5359,7 +5357,7 @@
5359	5357	if (this instanceof Checker)
5360	5358	return;
5361	5359
5362		- if (display.drawMode == display.SHADOW && PASSTEST)
	5360	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5363	5361	return;
5364	5362
5365	5363	if (count <= 0)
..	..	@@ -5367,8 +5365,8 @@
5367	5365	return;
5368	5366	}
5369	5367
5370		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5371		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5368	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	5369	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5372	5370	{
5373	5371	return;
5374	5372	}
..	..	@@ -5409,15 +5407,15 @@
5409	5407
5410	5408	boolean compiled = false;
5411	5409
5412		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5410	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5413	5411
5414		- if (!selectmode && //display.drawMode != display.SELECTION &&
	5412	+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
5415	5413	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5416	5414	{
5417		- display.lighttouched = true;
	5415	+ Globals.lighttouched = true;
5418	5416	} // 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 &&
	5417	+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
	5418	+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5421	5419	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5422	5420	{
5423	5421	if (!(this instanceof Composite))
..	..	@@ -5448,7 +5446,7 @@
5448	5446	}
5449	5447	//gl.glDrawBuffer(gl.GL_BACK);
5450	5448	// XXX touched = false;
5451		- display.lighttouched = true; // all panes...
	5449	+ Globals.lighttouched = true; // all panes...
5452	5450	}
5453	5451
5454	5452	touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
..	..	@@ -5487,12 +5485,12 @@
5487	5485
5488	5486	// frustum culling
5489	5487	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5490		- && display.drawMode != CameraPane.SELECTION)
	5488	+ && display.DrawMode() != iCameraPane.SELECTION)
5491	5489	{
5492		- if (display.drawMode == CameraPane.SHADOW)
	5490	+ if (display.DrawMode() == iCameraPane.SHADOW)
5493	5491	{
5494	5492	if (!link2master // tricky to cull in shadow mode.
5495		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	5493	+ && GetBRep().FrustumCull(this, gl, display.LightCamera(), true))
5496	5494	{
5497	5495	//System.out.print("CULLED");
5498	5496	culled = true;
..	..	@@ -5500,7 +5498,7 @@
5500	5498	}
5501	5499	else
5502	5500	//GetBRep().getBounds(v0, v1, this);
5503		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	5501	+ if (GetBRep().FrustumCull(this, gl, display.RenderCamera(), false))
5504	5502	culled = true;
5505	5503
5506	5504	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5536,7 +5534,7 @@
5536	5534
5537	5535
5538	5536	if (!culled)
5539		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	5537	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5540	5538	{
5541	5539	if (GetBRep() != null)
5542	5540	{
..	..	@@ -5562,55 +5560,7 @@
5562	5560	color[2] /= 2;
5563	5561	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5564	5562	*/
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		- }
	5563	+ display.PushMaterial(this, selected);
5614	5564
5615	5565	//System.out.println("call list " + list);
5616	5566	//System.out.println();
..	..	@@ -5652,23 +5602,8 @@
5652	5602	}
5653	5603
5654	5604	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		- }
	5605	+
	5606	+ display.PopMaterial(this, selected);
5672	5607	}
5673	5608
5674	5609	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5710,7 +5645,7 @@
5710	5645	// resetMasterNode();
5711	5646	}
5712	5647
5713		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5648	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5714	5649	{
5715	5650	if (GetBRep() == null)
5716	5651	{
..	..	@@ -5793,7 +5728,7 @@
5793	5728	boolean flipV = false; // true;
5794	5729	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5795	5730
5796		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5731	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5797	5732	{
5798	5733	if (hide)
5799	5734	return;
..	..	@@ -5852,16 +5787,7 @@
5852	5787	// // ??????????????????????????? Touch();
5853	5788	// }
5854	5789
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		- }
	5790	+display.PushMaterial2(this, selected);
5865	5791
5866	5792	Object3D child;
5867	5793	boolean sel;
..	..	@@ -5913,19 +5839,7 @@
5913	5839	*/
5914	5840	//depth += 1;
5915	5841
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		-
	5842	+display.PopMaterial2(this);
5929	5843	/*
5930	5844	display.ReleaseTextures(tex);
5931	5845	*/
..	..	@@ -5936,9 +5850,9 @@
5936	5850
5937	5851	//static cVector min,max;
5938	5852
5939		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	5853	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5940	5854	{
5941		- if (display.drawMode == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
	5855	+ if (display.DrawMode() == display.SHADOW && projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
5942	5856	return; // no shadow for transparent objects
5943	5857
5944	5858	if (hide)
..	..	@@ -6060,7 +5974,7 @@
6060	5974	{
6061	5975	//throw new Error();
6062	5976
6063		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5977	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
6064	5978
6065	5979	int[] strips = bRep.getRawIndices();
6066	5980
..	..	@@ -6304,7 +6218,7 @@
6304	6218	// // r.norm.dot(v3) > -0.5)
6305	6219	// // continue;
6306	6220
6307		- drawFace(p, q, r, display, face);
	6221	+ display.DrawFace(this, p, q, r, face);
6308	6222	}
6309	6223	gl.glEnd();
6310	6224	}
..	..	@@ -6348,7 +6262,7 @@
6348	6262	Vertex q = bRep.GetVertex(face.q);
6349	6263	Vertex r = bRep.GetVertex(face.r);
6350	6264
6351		- drawFace(p, q, r, display, face);
	6265	+ display.DrawFace(this, p, q, r, face);
6352	6266	}
6353	6267	gl.glEnd();
6354	6268	}
..	..	@@ -6488,180 +6402,6 @@
6488	6402
6489	6403	transient FaceCompare[] facescompare = null;
6490	6404
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	6405	void Print(Vertex v)
6666	6406	{
6667	6407	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
..	..	@@ -6683,195 +6423,6 @@
6683	6423	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6684	6424	}
6685	6425
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	6426	void drawSelf(ClickInfo info, int level, boolean select)
6876	6427	{
6877	6428	if (bRep == null)
..	..	@@ -7443,83 +6994,83 @@
7443	6994	int spotw = spot.x + spot.width;
7444	6995	int spoth = spot.y + spot.height;
7445	6996	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		- }
	6997	+// if (CameraPane.Xmin > spot.x)
	6998	+// {
	6999	+// CameraPane.Xmin = spot.x;
	7000	+// }
	7001	+// if (CameraPane.Xmax < spotw)
	7002	+// {
	7003	+// CameraPane.Xmax = spotw;
	7004	+// }
	7005	+// if (CameraPane.Ymin > spot.y)
	7006	+// {
	7007	+// CameraPane.Ymin = spot.y;
	7008	+// }
	7009	+// if (CameraPane.Ymax < spoth)
	7010	+// {
	7011	+// CameraPane.Ymax = spoth;
	7012	+// }
7462	7013	spot.translate(32, 32);
7463	7014	spotw = spot.x + spot.width;
7464	7015	spoth = spot.y + spot.height;
7465	7016	info.g.setColor(Color.blue);
7466	7017	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		- }
	7018	+// if (CameraPane.Xmin > spot.x)
	7019	+// {
	7020	+// CameraPane.Xmin = spot.x;
	7021	+// }
	7022	+// if (CameraPane.Xmax < spotw)
	7023	+// {
	7024	+// CameraPane.Xmax = spotw;
	7025	+// }
	7026	+// if (CameraPane.Ymin > spot.y)
	7027	+// {
	7028	+// CameraPane.Ymin = spot.y;
	7029	+// }
	7030	+// if (CameraPane.Ymax < spoth)
	7031	+// {
	7032	+// CameraPane.Ymax = spoth;
	7033	+// }
7483	7034	info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7484	7035	info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7485	7036	spot.translate(0, -32);
7486	7037	info.g.setColor(Color.green);
7487	7038	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		- }
	7039	+// if (CameraPane.Xmin > spot.x)
	7040	+// {
	7041	+// CameraPane.Xmin = spot.x;
	7042	+// }
	7043	+// if (CameraPane.Xmax < spotw)
	7044	+// {
	7045	+// CameraPane.Xmax = spotw;
	7046	+// }
	7047	+// if (CameraPane.Ymin > spot.y)
	7048	+// {
	7049	+// CameraPane.Ymin = spot.y;
	7050	+// }
	7051	+// if (CameraPane.Ymax < spoth)
	7052	+// {
	7053	+// CameraPane.Ymax = spoth;
	7054	+// }
7504	7055	info.g.drawArc(boundary.x, boundary.y,
7505	7056	boundary.width, boundary.height, 0, 360);
7506	7057	//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		- }
	7058	+// if (CameraPane.Xmin > boundary.x)
	7059	+// {
	7060	+// CameraPane.Xmin = boundary.x;
	7061	+// }
	7062	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	7063	+// {
	7064	+// CameraPane.Xmax = boundary.x + boundary.width;
	7065	+// }
	7066	+// if (CameraPane.Ymin > boundary.y)
	7067	+// {
	7068	+// CameraPane.Ymin = boundary.y;
	7069	+// }
	7070	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	7071	+// {
	7072	+// CameraPane.Ymax = boundary.y + boundary.height;
	7073	+// }
7523	7074	return;
7524	7075	}
7525	7076	}