~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -21,6 +21,19 @@
21	21
22	22	ScriptNode scriptnode;
23	23
	24	+ void InitOthers()
	25	+ {
	26	+ if (projectedVertices == null \|\| projectedVertices.length <= 2)
	27	+ {
	28	+ projectedVertices = new Object3D.cVector2[3];
	29	+ }
	30	+ for (int i = 0; i < 3; i++)
	31	+ {
	32	+ projectedVertices[i] = new cVector2(); // Others
	33	+ }
	34	+ projectedVertices[0].x = 100; // bump
	35	+ }
	36	+
24	37	void MinMax(cVector minima, cVector maxima)
25	38	{
26	39	for (int xyz = 0; xyz < 3; xyz++)
..	..	@@ -296,6 +309,8 @@
296	309	boolean speedup = false;
297	310	boolean rewind = false;
298	311
	312	+ float NORMALPUSH = 0;
	313	+
299	314	Object3D support;
300	315
301	316	Object3D GetObject()
..	..	@@ -415,16 +430,16 @@
415	430	{
416	431	Object3D copy = this;
417	432
418		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	433	+ Camera parentcam = CameraPane.theRenderer.ManipCamera();
419	434
420		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	435	+ if (CameraPane.theRenderer.ManipCamera() == CameraPane.theRenderer.Cameras()[0])
421	436	{
422		- parentcam = CameraPane.theRenderer.cameras[1];
	437	+ parentcam = CameraPane.theRenderer.Cameras()[1];
423	438	}
424	439
425		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	440	+ if (CameraPane.theRenderer.ManipCamera() == CameraPane.theRenderer.Cameras()[1])
426	441	{
427		- parentcam = CameraPane.theRenderer.cameras[0];
	442	+ parentcam = CameraPane.theRenderer.Cameras()[0];
428	443	}
429	444
430	445	if (this == parentcam)
..	..	@@ -432,7 +447,7 @@
432	447	//assert(this instanceof Camera);
433	448
434	449	for (int count = parentcam.GetTransformCount(); --count>=0;)
435		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	450	+ LA.xformPos(CameraPane.theRenderer.TargetLookAt(), parentcam.toParent, CameraPane.theRenderer.TargetLookAt());
436	451	}
437	452
438	453	copy.marked ^= true;
..	..	@@ -452,7 +467,7 @@
452	467	//assert(this instanceof Camera);
453	468
454	469	for (int count = parentcam.GetTransformCount(); --count>=0;)
455		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	470	+ LA.xformPos(CameraPane.theRenderer.TargetLookAt(), parentcam.fromParent, CameraPane.theRenderer.TargetLookAt());
456	471	}
457	472
458	473	copy.Touch(); // display list issue
..	..	@@ -587,7 +602,7 @@
587	602	return;
588	603	}
589	604
590		- if (CameraPane.fromscript)
	605	+ if (Globals.fromscript)
591	606	{
592	607	transformcount = 0;
593	608	return;
..	..	@@ -745,7 +760,7 @@
745	760
746	761	int GetTransformCount()
747	762	{
748		- // marde pour serialization de Texture
	763	+ // patch pour serialization de Texture
749	764	resetmaxcount();
750	765	resettransformcount();
751	766	resetstep();
..	..	@@ -779,9 +794,12 @@
779	794	// factor = CameraPane.STEP;
780	795	// }
781	796
782		- if (marked && CameraPane.isLIVE() && live && CameraPane.drawMode == CameraPane.SHADOW && currentframe != CameraPane.framecount)
	797	+ if (marked && Globals.isLIVE() && live &&
	798	+ //TEMP21aug2018
	799	+ Globals.DrawMode() == iCameraPane.SHADOW &&
	800	+ currentframe != Globals.framecount)
783	801	{
784		- currentframe = CameraPane.framecount;
	802	+ currentframe = Globals.framecount;
785	803
786	804	// System.err.println("transformcount = " + transformcount);
787	805	// System.err.println("factor = " + factor);
..	..	@@ -2130,15 +2148,8 @@
2130	2148	if (/parent != null &&/ material == null)
2131	2149	{
2132	2150	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
	2151	+
	2152	+ InitOthers();
2142	2153
2143	2154	if (this instanceof Camera)
2144	2155	{
..	..	@@ -4161,6 +4172,22 @@
4161	4172	}
4162	4173	}
4163	4174
	4175	+ void RepairShadow()
	4176	+ {
	4177	+ if (blockloop)
	4178	+ return;
	4179	+
	4180	+ if (this.material != null)
	4181	+ this.InitOthers();
	4182	+
	4183	+ for (int i=0; i<Size(); i++)
	4184	+ {
	4185	+ blockloop = true;
	4186	+ get(i).RepairShadow();
	4187	+ blockloop = false;
	4188	+ }
	4189	+ }
	4190	+
4164	4191	void RepairTexture()
4165	4192	{
4166	4193	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4827,7 +4854,7 @@
4827	4854	return globalTransform;
4828	4855	}
4829	4856
4830		- void PreprocessOcclusion(CameraPane cp)
	4857	+ void PreprocessOcclusion(iCameraPane cp)
4831	4858	{
4832	4859	/*
4833	4860	if (AOdone)
..	..	@@ -4974,7 +5001,8 @@
4974	5001	} else //
4975	5002	if (editWindow != null)
4976	5003	{
4977		- editWindow.cameraView.lighttouched = true;
	5004	+ //editWindow.cameraView.lighttouched = true;
	5005	+ Globals.lighttouched = true;
4978	5006	}
4979	5007	}
4980	5008
..	..	@@ -5286,25 +5314,22 @@
5286	5314	}
5287	5315	}
5288	5316
5289		- void draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5317	+ void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5290	5318	{
5291	5319	Draw(display, root, selected, blocked);
5292	5320	}
5293	5321
5294		- static cMaterial[] materialstack = new cMaterial[65536];
5295		- static boolean[] selectedstack = new boolean[65536];
5296		- static int materialdepth = 0;
5297		-
5298	5322	boolean NeedSupport()
5299	5323	{
5300	5324	return
5301	5325	CameraPane.SUPPORT && !CameraPane.movingcamera && link2master && /live &&/ support != null
5302	5326	// PROBLEM with CROWD!!
5303		- && (CameraPane.drawMode == CameraPane.SHADOW \|\| CameraPane.CROWD);
	5327	+ && (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
5304	5328	}
5305	5329
	5330	+ static boolean DEBUG_SELECTION = false;
5306	5331
5307		- void Draw(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5332	+ void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5308	5333	{
5309	5334	Invariants(); // june 2013
5310	5335
..	..	@@ -5313,7 +5338,7 @@
5313	5338	// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
5314	5339	}
5315	5340
5316		- if (display.drawMode == CameraPane.SELECTION &&
	5341	+ if (display.DrawMode() == iCameraPane.SELECTION &&
5317	5342	hide)
5318	5343	return;
5319	5344
..	..	@@ -5332,7 +5357,7 @@
5332	5357	if (this instanceof Checker)
5333	5358	return;
5334	5359
5335		- if (display.drawMode == display.SHADOW && PASSTEST)
	5360	+ if (display.DrawMode() == display.SHADOW && PASSTEST)
5336	5361	return;
5337	5362
5338	5363	if (count <= 0)
..	..	@@ -5340,8 +5365,8 @@
5340	5365	return;
5341	5366	}
5342	5367
5343		- if ((//display.drawMode == CameraPane.SHADOW \|\|
5344		- display.drawMode == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5368	+ if ((//display.DrawMode() == CameraPane.SHADOW \|\|
	5369	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5345	5370	{
5346	5371	return;
5347	5372	}
..	..	@@ -5382,15 +5407,15 @@
5382	5407
5383	5408	boolean compiled = false;
5384	5409
5385		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5410	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5386	5411
5387		- if (!selectmode && //display.drawMode != display.SELECTION &&
	5412	+ if (!selectmode && //display.DrawMode() != display.SELECTION &&
5388	5413	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5389	5414	{
5390		- display.lighttouched = true;
	5415	+ Globals.lighttouched = true;
5391	5416	} // 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 &&
	5417	+ //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
	5418	+ if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5394	5419	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
5395	5420	{
5396	5421	if (!(this instanceof Composite))
..	..	@@ -5421,7 +5446,7 @@
5421	5446	}
5422	5447	//gl.glDrawBuffer(gl.GL_BACK);
5423	5448	// XXX touched = false;
5424		- display.lighttouched = true; // all panes...
	5449	+ Globals.lighttouched = true; // all panes...
5425	5450	}
5426	5451
5427	5452	touched = GetBRep() == null; // this instanceof Composite \|\| this instanceof FileObject; // false;
..	..	@@ -5460,12 +5485,12 @@
5460	5485
5461	5486	// frustum culling
5462	5487	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5463		- && display.drawMode != CameraPane.SELECTION)
	5488	+ && display.DrawMode() != iCameraPane.SELECTION)
5464	5489	{
5465		- if (display.drawMode == CameraPane.SHADOW)
	5490	+ if (display.DrawMode() == iCameraPane.SHADOW)
5466	5491	{
5467	5492	if (!link2master // tricky to cull in shadow mode.
5468		- && GetBRep().FrustumCull(this, gl, display.lightCamera, true))
	5493	+ && GetBRep().FrustumCull(this, gl, display.LightCamera(), true))
5469	5494	{
5470	5495	//System.out.print("CULLED");
5471	5496	culled = true;
..	..	@@ -5473,7 +5498,7 @@
5473	5498	}
5474	5499	else
5475	5500	//GetBRep().getBounds(v0, v1, this);
5476		- if (GetBRep().FrustumCull(this, gl, display.renderCamera, false))
	5501	+ if (GetBRep().FrustumCull(this, gl, display.RenderCamera(), false))
5477	5502	culled = true;
5478	5503
5479	5504	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5509,7 +5534,7 @@
5509	5534
5510	5535
5511	5536	if (!culled)
5512		- if (display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	5537	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5513	5538	{
5514	5539	if (GetBRep() != null)
5515	5540	{
..	..	@@ -5535,55 +5560,7 @@
5535	5560	color[2] /= 2;
5536	5561	gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT_AND_DIFFUSE, color, 0);
5537	5562	*/
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		- }
	5563	+ display.PushMaterial(this, selected);
5587	5564
5588	5565	//System.out.println("call list " + list);
5589	5566	//System.out.println();
..	..	@@ -5625,23 +5602,8 @@
5625	5602	}
5626	5603
5627	5604	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		- }
	5605	+
	5606	+ display.PopMaterial(this, selected);
5645	5607	}
5646	5608
5647	5609	if (this instanceof Texture \|\| this instanceof TextureNode)
..	..	@@ -5683,7 +5645,7 @@
5683	5645	// resetMasterNode();
5684	5646	}
5685	5647
5686		- void CallList(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5648	+ void CallList(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5687	5649	{
5688	5650	if (GetBRep() == null)
5689	5651	{
..	..	@@ -5766,7 +5728,7 @@
5766	5728	boolean flipV = false; // true;
5767	5729	int texres = 0; // 0 = low, 1 = normal, 2 = high res texture
5768	5730
5769		- void drawSelf(CameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
	5731	+ void drawSelf(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5770	5732	{
5771	5733	if (hide)
5772	5734	return;
..	..	@@ -5825,16 +5787,7 @@
5825	5787	// // ??????????????????????????? Touch();
5826	5788	// }
5827	5789
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		- }
	5790	+display.PushMaterial2(this, selected);
5838	5791
5839	5792	Object3D child;
5840	5793	boolean sel;
..	..	@@ -5886,19 +5839,7 @@
5886	5839	*/
5887	5840	//depth += 1;
5888	5841
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		-
	5842	+display.PopMaterial2(this);
5902	5843	/*
5903	5844	display.ReleaseTextures(tex);
5904	5845	*/
..	..	@@ -5909,9 +5850,9 @@
5909	5850
5910	5851	//static cVector min,max;
5911	5852
5912		- void DrawNode(CameraPane display, Object3D /Composite/ root, boolean selected)
	5853	+ void DrawNode(iCameraPane display, Object3D /Composite/ root, boolean selected)
5913	5854	{
5914		- 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)
5915	5856	return; // no shadow for transparent objects
5916	5857
5917	5858	if (hide)
..	..	@@ -5958,7 +5899,7 @@
5958	5899
5959	5900	javax.media.opengl.GL gl = display.GetGL();
5960	5901
5961		- if (CameraPane.BOXMODE) // \|\| CameraPane.movingcamera)
	5902	+ if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5962	5903	{
5963	5904	int fc = bRep.FaceCount();
5964	5905	int vc = bRep.VertexCount();
..	..	@@ -6033,7 +5974,7 @@
6033	5974	{
6034	5975	//throw new Error();
6035	5976
6036		- boolean selectmode = display.drawMode == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5977	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
6037	5978
6038	5979	int[] strips = bRep.getRawIndices();
6039	5980
..	..	@@ -6277,7 +6218,7 @@
6277	6218	// // r.norm.dot(v3) > -0.5)
6278	6219	// // continue;
6279	6220
6280		- drawFace(p, q, r, display, face);
	6221	+ display.DrawFace(this, p, q, r, face);
6281	6222	}
6282	6223	gl.glEnd();
6283	6224	}
..	..	@@ -6321,7 +6262,7 @@
6321	6262	Vertex q = bRep.GetVertex(face.q);
6322	6263	Vertex r = bRep.GetVertex(face.r);
6323	6264
6324		- drawFace(p, q, r, display, face);
	6265	+ display.DrawFace(this, p, q, r, face);
6325	6266	}
6326	6267	gl.glEnd();
6327	6268	}
..	..	@@ -6461,180 +6402,6 @@
6461	6402
6462	6403	transient FaceCompare[] facescompare = null;
6463	6404
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	6405	void Print(Vertex v)
6639	6406	{
6640	6407	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
..	..	@@ -6656,152 +6423,6 @@
6656	6423	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6657	6424	}
6658	6425
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	6426	void drawSelf(ClickInfo info, int level, boolean select)
6806	6427	{
6807	6428	if (bRep == null)
..	..	@@ -7373,83 +6994,83 @@
7373	6994	int spotw = spot.x + spot.width;
7374	6995	int spoth = spot.y + spot.height;
7375	6996	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		- }
	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	+// }
7392	7013	spot.translate(32, 32);
7393	7014	spotw = spot.x + spot.width;
7394	7015	spoth = spot.y + spot.height;
7395	7016	info.g.setColor(Color.blue);
7396	7017	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		- }
	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	+// }
7413	7034	info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7414	7035	info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7415	7036	spot.translate(0, -32);
7416	7037	info.g.setColor(Color.green);
7417	7038	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		- }
	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	+// }
7434	7055	info.g.drawArc(boundary.x, boundary.y,
7435	7056	boundary.width, boundary.height, 0, 360);
7436	7057	//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		- }
	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	+// }
7453	7074	return;
7454	7075	}
7455	7076	}
..	..	@@ -8163,6 +7784,8 @@
8163	7784	{
8164	7785	Object3D targ = this;
8165	7786
	7787	+ targ.NORMALPUSH = obj.NORMALPUSH;
	7788	+
8166	7789	if (obj.material != null)
8167	7790	{
8168	7791	if ((mask&MATERIAL)!=0) // ==(COLOR\|MATERIAL))