~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
..	..	@@ -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	}
..	..	@@ -5371,7 +5374,7 @@
5371	5374	return;
5372	5375	}
5373	5376
5374		- javax.media.opengl.GL gl = display.GetGL();
	5377	+ //javax.media.opengl.GL gl = display.GetGL();
5375	5378
5376	5379	/*
5377	5380	if (touched)
..	..	@@ -5423,7 +5426,7 @@
5423	5426	//if (displaylist == -1 && usecalllists)
5424	5427	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5425	5428	{
5426		- bRep.displaylist = gl.glGenLists(1);
	5429	+ bRep.displaylist = display.GenList();
5427	5430	assert(bRep.displaylist != 0);
5428	5431	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5429	5432	//System.out.println("\tgen list " + list);
..	..	@@ -5435,14 +5438,16 @@
5435	5438	if (usecalllists)
5436	5439	{
5437	5440	// System.err.println("new list " + bRep.displaylist + " for " + this);
5438		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5441	+ display.NewList(bRep.displaylist);
5439	5442	}
	5443	+
5440	5444	CallList(display, root, selected, blocked);
	5445	+
5441	5446	// compiled = true;
5442	5447	if (usecalllists)
5443	5448	{
5444	5449	// System.err.println("end list " + bRep.displaylist + " for " + this);
5445		- gl.glEndList();
	5450	+ display.EndList();
5446	5451	}
5447	5452	//gl.glDrawBuffer(gl.GL_BACK);
5448	5453	// XXX touched = false;
..	..	@@ -5490,7 +5495,7 @@
5490	5495	if (display.DrawMode() == iCameraPane.SHADOW)
5491	5496	{
5492	5497	if (!link2master // tricky to cull in shadow mode.
5493		- && GetBRep().FrustumCull(this, gl, display.LightCamera(), true))
	5498	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5494	5499	{
5495	5500	//System.out.print("CULLED");
5496	5501	culled = true;
..	..	@@ -5498,7 +5503,7 @@
5498	5503	}
5499	5504	else
5500	5505	//GetBRep().getBounds(v0, v1, this);
5501		- if (GetBRep().FrustumCull(this, gl, display.RenderCamera(), false))
	5506	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5502	5507	culled = true;
5503	5508
5504	5509	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5538,7 +5543,7 @@
5538	5543	{
5539	5544	if (GetBRep() != null)
5540	5545	{
5541		- CameraPane.NextIndex(this, gl);
	5546	+ display.NextIndex();
5542	5547	// vertex color conflict : gl.glCallList(list);
5543	5548	DrawNode(display, root, selected);
5544	5549	if (this instanceof BezierPatch)
..	..	@@ -5595,7 +5600,7 @@
5595	5600
5596	5601	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5597	5602	assert(bRep.displaylist != 0);
5598		- gl.glCallList(bRep.displaylist);
	5603	+ display.CallList(bRep.displaylist);
5599	5604	// june 2013 drawSelf(display, root, selected);
5600	5605	}
5601	5606	}
..	..	@@ -5895,9 +5900,10 @@
5895	5900	return;
5896	5901	}
5897	5902
	5903	+ //bRep.GenUV(1/material.diffuseness);
5898	5904	// bRep.lock = true;
5899	5905
5900		- javax.media.opengl.GL gl = display.GetGL();
	5906	+ //javax.media.opengl.GL gl = display.GetGL();
5901	5907
5902	5908	if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5903	5909	{
..	..	@@ -5914,23 +5920,7 @@
5914	5920
5915	5921	bRep.getMinMax(min, max, 100);
5916	5922
5917		- gl.glBegin(gl.GL_LINES);
5918		-
5919		- gl.glVertex3d(min.x, min.y, min.z);
5920		- gl.glVertex3d(min.x, min.y, max.z);
5921		- gl.glVertex3d(min.x, min.y, min.z);
5922		- gl.glVertex3d(min.x, max.y, min.z);
5923		- gl.glVertex3d(min.x, min.y, min.z);
5924		- gl.glVertex3d(max.x, min.y, min.z);
5925		-
5926		- gl.glVertex3d(max.x, max.y, max.z);
5927		- gl.glVertex3d(min.x, max.y, max.z);
5928		- gl.glVertex3d(max.x, max.y, max.z);
5929		- gl.glVertex3d(max.x, min.y, max.z);
5930		- gl.glVertex3d(max.x, max.y, max.z);
5931		- gl.glVertex3d(max.x, max.y, min.z);
5932		-
5933		- gl.glEnd();
	5923	+ display.DrawBox(min, max);
5934	5924
5935	5925	return;
5936	5926	}
..	..	@@ -5984,178 +5974,14 @@
5984	5974	new Exception().printStackTrace();
5985	5975	return;
5986	5976	}
5987		-
5988		- // TRIANGLE STRIP ARRAY
5989		- if (bRep.trimmed)
5990		- {
5991		- float[] v = bRep.getRawVertices();
5992		- float[] n = bRep.getRawNormals();
5993		- float[] c = bRep.getRawColors();
5994		- float[] uv = bRep.getRawUVMap();
5995		-
5996		- int count2 = 0;
5997		- int count3 = 0;
5998		-
5999		- if (n.length > 0)
6000		- {
6001		- for (int i = 0; i < strips.length; i++)
6002		- {
6003		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6004		-
6005		- /*
6006		- boolean locked = false;
6007		- float eps = 0.1f;
6008		- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6009		-
6010		- int dot = 0;
6011		-
6012		- if ((dot&1) == 0)
6013		- dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6014		-
6015		- if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6016		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6017		- else
6018		- {
6019		- locked = true;
6020		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6021		- }
6022		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6023		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6024		- if (hasnorm)
6025		- {
6026		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6027		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6028		- }
6029		-
6030		- if ((dot&4) == 0)
6031		- dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6032		-
6033		- if (wrap \|\| !locked && (dot&8) != 0)
6034		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6035		- else
6036		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6037		-
6038		- f.dot = dot;
6039		- */
6040		-
6041		- if (!selectmode)
6042		- {
6043		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6044		- {
6045		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6046		- } else
6047		- {
6048		- gl.glNormal3f(0, 0, 1);
6049		- }
6050		-
6051		- if (c != null)
6052		- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
6053		- {
6054		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6055		- }
6056		- }
6057		- if (flipV)
6058		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6059		- else
6060		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6061		- //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6062		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6063		-
6064		- count2 += 2;
6065		- count3 += 3;
6066		- if (!selectmode)
6067		- {
6068		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6069		- {
6070		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6071		- } else
6072		- {
6073		- gl.glNormal3f(0, 0, 1);
6074		- }
6075		- if (c != null)
6076		- {
6077		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6078		- }
6079		- }
6080		- if (flipV)
6081		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6082		- else
6083		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6084		- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6085		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6086		-
6087		- count2 += 2;
6088		- count3 += 3;
6089		- for (int j = 0; j < strips[i] - 2; j++)
6090		- {
6091		- //gl.glTexCoord2d(...);
6092		- if (!selectmode)
6093		- {
6094		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6095		- {
6096		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6097		- } else
6098		- {
6099		- gl.glNormal3f(0, 0, 1);
6100		- }
6101		- if (c != null)
6102		- {
6103		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6104		- }
6105		- }
6106		-
6107		- if (flipV)
6108		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6109		- else
6110		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6111		- //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6112		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6113		- count2 += 2;
6114		- count3 += 3;
6115		- }
6116		-
6117		- gl.glEnd();
6118		- }
6119		- }
6120		-
6121		- assert count3 == v.length;
6122		- }
6123		- else // !trimmed
6124		- {
6125		- int count = 0;
6126		- for (int i = 0; i < strips.length; i++)
6127		- {
6128		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6129		-
6130		- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6131		- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6132		-
6133		- drawVertex(gl, p, selectmode);
6134		- drawVertex(gl, q, selectmode);
6135		-
6136		- for (int j = 0; j < strips[i] - 2; j++)
6137		- {
6138		- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6139		-
6140		-// if (j%2 == 0)
6141		-// drawFace(p, q, r, display, null);
6142		-// else
6143		-// drawFace(p, r, q, display, null);
6144		-
6145		-// p = q;
6146		-// q = r;
6147		- drawVertex(gl, r, selectmode);
6148		- }
6149		-
6150		- gl.glEnd();
6151		- }
6152		- }
	5977	+
	5978	+ display.DrawGeometry(bRep, flipV, selectmode);
6153	5979	} else // catch (Error e)
6154	5980	{
6155	5981	// TRIANGLE ARRAY
6156	5982	if (IsOpaque()) // Static())
6157	5983	{
6158		- gl.glBegin(gl.GL_TRIANGLES);
	5984	+ display.StartTriangles();
6159	5985	int facecount = bRep.FaceCount();
6160	5986	for (int i = 0; i < facecount; i++)
6161	5987	{
..	..	@@ -6220,7 +6046,7 @@
6220	6046
6221	6047	display.DrawFace(this, p, q, r, face);
6222	6048	}
6223		- gl.glEnd();
	6049	+ display.EndTriangles();
6224	6050	}
6225	6051	else
6226	6052	{
..	..	@@ -6249,8 +6075,8 @@
6249	6075	//System.out.println("SORT");
6250	6076
6251	6077	java.util.Arrays.sort(facescompare);
6252		-
6253		- gl.glBegin(gl.GL_TRIANGLES);
	6078	+
	6079	+ display.StartTriangles();
6254	6080	for (int i = 0; i < facecount; i++)
6255	6081	{
6256	6082	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6264,11 +6090,12 @@
6264	6090
6265	6091	display.DrawFace(this, p, q, r, face);
6266	6092	}
6267		- gl.glEnd();
	6093	+ display.EndTriangles();
6268	6094	}
6269	6095
6270	6096	if (false) // live && support != null && support.bRep != null) // debug weights
6271	6097	{
	6098	+ /*
6272	6099	gl.glDisable(gl.GL_LIGHTING);
6273	6100	float[] colorV = new float[3];
6274	6101
..	..	@@ -6347,6 +6174,7 @@
6347	6174	// gl.glEnd();
6348	6175	}
6349	6176	}
	6177	+ */
6350	6178	}
6351	6179	}
6352	6180
..	..	@@ -6391,7 +6219,7 @@
6391	6219	center.add(r);
6392	6220	center.mul(1.0/3);
6393	6221
6394		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6222	+ center.sub(Globals.theRenderer.EyeCamera().location);
6395	6223
6396	6224	distance = center.dot(center);
6397	6225	}
..	..	@@ -6405,22 +6233,6 @@
6405	6233	void Print(Vertex v)
6406	6234	{
6407	6235	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6408		- }
6409		-
6410		- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6411		- {
6412		- if (!selectmode)
6413		- {
6414		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6415		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6416		-
6417		- if (flipV)
6418		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6419		- else
6420		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6421		- }
6422		-
6423		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6424	6236	}
6425	6237
6426	6238	void drawSelf(ClickInfo info, int level, boolean select)
..	..	@@ -7173,7 +6985,7 @@
7173	6985
7174	6986	case hitCenter: // Translate
7175	6987
7176		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	6988	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7177	6989
7178	6990	if (modified)
7179	6991	{
..	..	@@ -7221,10 +7033,10 @@
7221	7033	}
7222	7034	LA.xformDir(up, ClickInfo.matbuffer, up);
7223	7035	// if (!CameraPane.LOCALTRANSFORM)
7224		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
	7036	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7225	7037	LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7226	7038	// if (!CameraPane.LOCALTRANSFORM)
7227		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7039	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7228	7040	//LA.vecCross(up, cVector.Z, right2);
7229	7041
7230	7042	cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
..	..	@@ -7282,7 +7094,7 @@
7282	7094	}
7283	7095	/**/
7284	7096
7285		- switch (info.pane.renderCamera.viewCode)
	7097	+ switch (info.pane.RenderCamera().viewCode)
7286	7098	{
7287	7099	case 1: // '\001'
7288	7100	LA.matZRotate(toParent, angle);
..	..	@@ -7338,7 +7150,7 @@
7338	7150	}
7339	7151	/**/
7340	7152
7341		- switch (info.pane.renderCamera.viewCode)
	7153	+ switch (info.pane.RenderCamera().viewCode)
7342	7154	{
7343	7155	case 3: // '\001'
7344	7156	if (modified)