~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
..	..	@@ -953,7 +954,7 @@
953	954
954	955	public Object clone()
955	956	{
956		- return GrafreeD.clone(this);
	957	+ return Grafreed.clone(this);
957	958	}
958	959
959	960	Object3D copyExpand()
..	..	@@ -1728,7 +1729,7 @@
1728	1729	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1729	1730	o.bRep = transientrep;
1730	1731	if (clone)
1731		- o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
	1732	+ o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1732	1733	o.CreateMaterial();
1733	1734	o.SetAttributes(this, -1);
1734	1735	//parent
..	..	@@ -1741,7 +1742,7 @@
1741	1742	Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1742	1743	o.bRep = bRep;
1743	1744	if (clone)
1744		- o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
	1745	+ o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1745	1746	o.CreateMaterial();
1746	1747	//o.overwriteThis(this, -1);
1747	1748	o.SetAttributes(this, -1);
..	..	@@ -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	{
..	..	@@ -2475,13 +2477,13 @@
2475	2477	return retval;
2476	2478	}
2477	2479
2478		- void doEditDrag(ClickInfo info)
	2480	+ void doEditDrag(ClickInfo info, boolean opposite)
2479	2481	{
2480	2482	switch (doSomething)
2481	2483	{
2482	2484	case 1: // '\001'
2483	2485	//super.
2484		- doEditDrag0(info);
	2486	+ doEditDrag0(info, opposite);
2485	2487	break;
2486	2488
2487	2489	case 2: // '\002'
..	..	@@ -2494,11 +2496,11 @@
2494	2496	{
2495	2497	//sel.hitSomething = childToDrag.hitSomething;
2496	2498	//childToDrag.doEditDrag(info);
2497		- sel.doEditDrag(info);
	2499	+ sel.doEditDrag(info, opposite);
2498	2500	} else
2499	2501	{
2500	2502	//super.
2501		- doEditDrag0(info);
	2503	+ doEditDrag0(info, opposite);
2502	2504	}
2503	2505	}
2504	2506	break;
..	..	@@ -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	}
..	..	@@ -3201,7 +3204,7 @@
3201	3204
3202	3205	BoundaryRep sup = bRep.support;
3203	3206	bRep.support = null;
3204		- BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
	3207	+ BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3205	3208	// bRep.SplitInTwo(onlyone); // thread...
3206	3209	temprep.SplitInTwo(reduction34, onlyone);
3207	3210	bRep = temprep;
..	..	@@ -3725,7 +3728,7 @@
3725	3728	if (child == null)
3726	3729	continue;
3727	3730
3728		- if (GrafreeD.RENDERME > 0)
	3731	+ if (Grafreed.RENDERME > 0)
3729	3732	{
3730	3733	if (child instanceof Merge)
3731	3734	((Merge)child).renderme();
..	..	@@ -3876,7 +3879,7 @@
3876	3879	if (child == null)
3877	3880	continue;
3878	3881
3879		- if (GrafreeD.RENDERME > 0)
	3882	+ if (Grafreed.RENDERME > 0)
3880	3883	{
3881	3884	if (child instanceof Merge)
3882	3885	((Merge)child).renderme();
..	..	@@ -4071,7 +4074,7 @@
4071	4074	if (child == null)
4072	4075	continue;
4073	4076
4074		- if (GrafreeD.RENDERME > 0)
	4077	+ if (Grafreed.RENDERME > 0)
4075	4078	{
4076	4079	if (child instanceof Merge)
4077	4080	((Merge)child).renderme();
..	..	@@ -5156,10 +5159,34 @@
5156	5159
5157	5160	// System.out.println("Fullname = " + fullname);
5158	5161
5159		- if (fullname.name.indexOf(":") == -1)
5160		- return fullname.name;
	5162	+ // Does not work on Windows due to C:
	5163	+// if (fullname.name.indexOf(":") == -1)
	5164	+// return fullname.name;
	5165	+//
	5166	+// return fullname.name.substring(0,fullname.name.indexOf(":"));
5161	5167
5162		- return fullname.name.substring(0,fullname.name.indexOf(":"));
	5168	+ String[] split = fullname.name.split(":");
	5169	+
	5170	+ if (split.length == 0)
	5171	+ {
	5172	+ return "";
	5173	+ }
	5174	+
	5175	+ if (split.length <= 2)
	5176	+ {
	5177	+ if (fullname.name.endsWith(":"))
	5178	+ {
	5179	+ // Windows
	5180	+ return fullname.name.substring(0, fullname.name.length()-1);
	5181	+ }
	5182	+
	5183	+ return split[0];
	5184	+ }
	5185	+
	5186	+ // Windows
	5187	+ assert(split.length == 4);
	5188	+
	5189	+ return split[0] + ":" + split[1];
5163	5190	}
5164	5191
5165	5192	static String GetBump(cTexture fullname)
..	..	@@ -5168,10 +5195,38 @@
5168	5195	return "";
5169	5196
5170	5197	// System.out.println("Fullname = " + fullname);
5171		- if (fullname.name.indexOf(":") == -1)
5172		- return "";
5173		-
5174		- return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5198	+ // Does not work on Windows due to C:
	5199	+// if (fullname.name.indexOf(":") == -1)
	5200	+// return "";
	5201	+//
	5202	+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
	5203	+ String[] split = fullname.name.split(":");
	5204	+
	5205	+ if (split.length == 0)
	5206	+ {
	5207	+ return "";
	5208	+ }
	5209	+
	5210	+ if (split.length == 1)
	5211	+ {
	5212	+ return "";
	5213	+ }
	5214	+
	5215	+ if (split.length == 2)
	5216	+ {
	5217	+ if (fullname.name.endsWith(":"))
	5218	+ {
	5219	+ // Windows
	5220	+ return "";
	5221	+ }
	5222	+
	5223	+ return split[1];
	5224	+ }
	5225	+
	5226	+ // Windows
	5227	+ assert(split.length == 4);
	5228	+
	5229	+ return split[2] + ":" + split[3];
5175	5230	}
5176	5231
5177	5232	String GetPigmentTexture()
..	..	@@ -5245,7 +5300,7 @@
5245	5300	System.out.print("; textures = " + textures);
5246	5301	System.out.println("; usedtextures = " + usedtextures);
5247	5302
5248		- if (GetTextures() == null)
	5303	+ if (GetTextures() == null) // What is that??
5249	5304	GetTextures().name = ":";
5250	5305
5251	5306	String texname = tex;
..	..	@@ -5371,7 +5426,7 @@
5371	5426	return;
5372	5427	}
5373	5428
5374		- javax.media.opengl.GL gl = display.GetGL();
	5429	+ //javax.media.opengl.GL gl = display.GetGL();
5375	5430
5376	5431	/*
5377	5432	if (touched)
..	..	@@ -5423,7 +5478,7 @@
5423	5478	//if (displaylist == -1 && usecalllists)
5424	5479	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5425	5480	{
5426		- bRep.displaylist = gl.glGenLists(1);
	5481	+ bRep.displaylist = display.GenList();
5427	5482	assert(bRep.displaylist != 0);
5428	5483	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5429	5484	//System.out.println("\tgen list " + list);
..	..	@@ -5435,14 +5490,16 @@
5435	5490	if (usecalllists)
5436	5491	{
5437	5492	// System.err.println("new list " + bRep.displaylist + " for " + this);
5438		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5493	+ display.NewList(bRep.displaylist);
5439	5494	}
	5495	+
5440	5496	CallList(display, root, selected, blocked);
	5497	+
5441	5498	// compiled = true;
5442	5499	if (usecalllists)
5443	5500	{
5444	5501	// System.err.println("end list " + bRep.displaylist + " for " + this);
5445		- gl.glEndList();
	5502	+ display.EndList();
5446	5503	}
5447	5504	//gl.glDrawBuffer(gl.GL_BACK);
5448	5505	// XXX touched = false;
..	..	@@ -5490,7 +5547,7 @@
5490	5547	if (display.DrawMode() == iCameraPane.SHADOW)
5491	5548	{
5492	5549	if (!link2master // tricky to cull in shadow mode.
5493		- && GetBRep().FrustumCull(this, gl, display.LightCamera(), true))
	5550	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5494	5551	{
5495	5552	//System.out.print("CULLED");
5496	5553	culled = true;
..	..	@@ -5498,7 +5555,7 @@
5498	5555	}
5499	5556	else
5500	5557	//GetBRep().getBounds(v0, v1, this);
5501		- if (GetBRep().FrustumCull(this, gl, display.RenderCamera(), false))
	5558	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5502	5559	culled = true;
5503	5560
5504	5561	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5538,7 +5595,7 @@
5538	5595	{
5539	5596	if (GetBRep() != null)
5540	5597	{
5541		- CameraPane.NextIndex(this, gl);
	5598	+ display.NextIndex();
5542	5599	// vertex color conflict : gl.glCallList(list);
5543	5600	DrawNode(display, root, selected);
5544	5601	if (this instanceof BezierPatch)
..	..	@@ -5595,7 +5652,7 @@
5595	5652
5596	5653	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5597	5654	assert(bRep.displaylist != 0);
5598		- gl.glCallList(bRep.displaylist);
	5655	+ display.CallList(bRep.displaylist);
5599	5656	// june 2013 drawSelf(display, root, selected);
5600	5657	}
5601	5658	}
..	..	@@ -5895,9 +5952,10 @@
5895	5952	return;
5896	5953	}
5897	5954
	5955	+ //bRep.GenUV(1/material.diffuseness);
5898	5956	// bRep.lock = true;
5899	5957
5900		- javax.media.opengl.GL gl = display.GetGL();
	5958	+ //javax.media.opengl.GL gl = display.GetGL();
5901	5959
5902	5960	if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5903	5961	{
..	..	@@ -5914,23 +5972,7 @@
5914	5972
5915	5973	bRep.getMinMax(min, max, 100);
5916	5974
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();
	5975	+ display.DrawBox(min, max);
5934	5976
5935	5977	return;
5936	5978	}
..	..	@@ -5984,178 +6026,14 @@
5984	6026	new Exception().printStackTrace();
5985	6027	return;
5986	6028	}
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		- }
	6029	+
	6030	+ display.DrawGeometry(bRep, flipV, selectmode);
6153	6031	} else // catch (Error e)
6154	6032	{
6155	6033	// TRIANGLE ARRAY
6156	6034	if (IsOpaque()) // Static())
6157	6035	{
6158		- gl.glBegin(gl.GL_TRIANGLES);
	6036	+ display.StartTriangles();
6159	6037	int facecount = bRep.FaceCount();
6160	6038	for (int i = 0; i < facecount; i++)
6161	6039	{
..	..	@@ -6220,7 +6098,7 @@
6220	6098
6221	6099	display.DrawFace(this, p, q, r, face);
6222	6100	}
6223		- gl.glEnd();
	6101	+ display.EndTriangles();
6224	6102	}
6225	6103	else
6226	6104	{
..	..	@@ -6249,8 +6127,8 @@
6249	6127	//System.out.println("SORT");
6250	6128
6251	6129	java.util.Arrays.sort(facescompare);
6252		-
6253		- gl.glBegin(gl.GL_TRIANGLES);
	6130	+
	6131	+ display.StartTriangles();
6254	6132	for (int i = 0; i < facecount; i++)
6255	6133	{
6256	6134	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6264,11 +6142,12 @@
6264	6142
6265	6143	display.DrawFace(this, p, q, r, face);
6266	6144	}
6267		- gl.glEnd();
	6145	+ display.EndTriangles();
6268	6146	}
6269	6147
6270	6148	if (false) // live && support != null && support.bRep != null) // debug weights
6271	6149	{
	6150	+ /*
6272	6151	gl.glDisable(gl.GL_LIGHTING);
6273	6152	float[] colorV = new float[3];
6274	6153
..	..	@@ -6347,6 +6226,7 @@
6347	6226	// gl.glEnd();
6348	6227	}
6349	6228	}
	6229	+ */
6350	6230	}
6351	6231	}
6352	6232
..	..	@@ -6391,7 +6271,7 @@
6391	6271	center.add(r);
6392	6272	center.mul(1.0/3);
6393	6273
6394		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6274	+ center.sub(Globals.theRenderer.EyeCamera().location);
6395	6275
6396	6276	distance = center.dot(center);
6397	6277	}
..	..	@@ -6405,22 +6285,6 @@
6405	6285	void Print(Vertex v)
6406	6286	{
6407	6287	//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	6288	}
6425	6289
6426	6290	void drawSelf(ClickInfo info, int level, boolean select)
..	..	@@ -7120,7 +6984,7 @@
7120	6984	}
7121	6985
7122	6986	//System.out.println("info.modifiers = " + info.modifiers);
7123		- modified = (info.modifiers & CameraPane.META) != 0;
	6987	+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7124	6988	//System.out.println("modified = " + modified);
7125	6989	//new Exception().printStackTrace();
7126	6990	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7148,7 +7012,7 @@
7148	7012	return true;
7149	7013	}
7150	7014
7151		- void doEditDrag0(ClickInfo info)
	7015	+ void doEditDrag0(ClickInfo info, boolean opposite)
7152	7016	{
7153	7017	if (hitSomething == 0)
7154	7018	{
..	..	@@ -7173,9 +7037,9 @@
7173	7037
7174	7038	case hitCenter: // Translate
7175	7039
7176		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7040	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7177	7041
7178		- if (modified)
	7042	+ if (modified \|\| opposite)
7179	7043	{
7180	7044	//assert(false);
7181	7045	/*
..	..	@@ -7221,10 +7085,10 @@
7221	7085	}
7222	7086	LA.xformDir(up, ClickInfo.matbuffer, up);
7223	7087	// if (!CameraPane.LOCALTRANSFORM)
7224		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
	7088	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7225	7089	LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7226	7090	// if (!CameraPane.LOCALTRANSFORM)
7227		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7091	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7228	7092	//LA.vecCross(up, cVector.Z, right2);
7229	7093
7230	7094	cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
..	..	@@ -7269,6 +7133,7 @@
7269	7133
7270	7134	if (modified)
7271	7135	{
	7136	+ // Rotate 90 degrees
7272	7137	angle /= (Math.PI / 4);
7273	7138	angle = Math.floor(angle + 0.5);
7274	7139	angle *= (Math.PI / 4);
..	..	@@ -7282,7 +7147,7 @@
7282	7147	}
7283	7148	/**/
7284	7149
7285		- switch (info.pane.renderCamera.viewCode)
	7150	+ switch (info.pane.RenderCamera().viewCode)
7286	7151	{
7287	7152	case 1: // '\001'
7288	7153	LA.matZRotate(toParent, angle);
..	..	@@ -7338,7 +7203,7 @@
7338	7203	}
7339	7204	/**/
7340	7205
7341		- switch (info.pane.renderCamera.viewCode)
	7206	+ switch (info.pane.RenderCamera().viewCode)
7342	7207	{
7343	7208	case 3: // '\001'
7344	7209	if (modified)
..	..	@@ -7566,6 +7431,7 @@
7566	7431	objectUI.closeUI();
7567	7432	if (editWindow != null)
7568	7433	{
	7434	+ editWindow.ctrlPanel.FlushUI();
7569	7435	editWindow.refreshContents();
7570	7436	} // ? new
7571	7437	objectUI = null;
..	..	@@ -7701,7 +7567,7 @@
7701	7567	{
7702	7568	assert(bRep != null);
7703	7569	if (!(support instanceof GenericJoint)) // support.bRep != null)
7704		- GrafreeD.Assert(support.bRep == bRep.support);
	7570	+ Grafreed.Assert(support.bRep == bRep.support);
7705	7571	}
7706	7572	else
7707	7573	{