~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -5,6 +5,7 @@
5	5	import java.util.Vector;
6	6
7	7	import javax.media.j3d.Transform3D;
	8	+import javax.media.opengl.GL;
8	9	import javax.vecmath.Vector3d;
9	10
10	11	import javax.imageio.ImageIO;
..	..	@@ -430,16 +431,16 @@
430	431	{
431	432	Object3D copy = this;
432	433
433		- Camera parentcam = CameraPane.theRenderer.manipCamera;
	434	+ Camera parentcam = Globals.theRenderer.ManipCamera();
434	435
435		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[0])
	436	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[0])
436	437	{
437		- parentcam = CameraPane.theRenderer.cameras[1];
	438	+ parentcam = Globals.theRenderer.Cameras()[1];
438	439	}
439	440
440		- if (CameraPane.theRenderer.manipCamera == CameraPane.theRenderer.cameras[1])
	441	+ if (Globals.theRenderer.ManipCamera() == Globals.theRenderer.Cameras()[1])
441	442	{
442		- parentcam = CameraPane.theRenderer.cameras[0];
	443	+ parentcam = Globals.theRenderer.Cameras()[0];
443	444	}
444	445
445	446	if (this == parentcam)
..	..	@@ -447,7 +448,7 @@
447	448	//assert(this instanceof Camera);
448	449
449	450	for (int count = parentcam.GetTransformCount(); --count>=0;)
450		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.toParent, CameraPane.theRenderer.targetLookAt);
	451	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.toParent, Globals.theRenderer.TargetLookAt());
451	452	}
452	453
453	454	copy.marked ^= true;
..	..	@@ -467,7 +468,7 @@
467	468	//assert(this instanceof Camera);
468	469
469	470	for (int count = parentcam.GetTransformCount(); --count>=0;)
470		- LA.xformPos(CameraPane.theRenderer.targetLookAt, parentcam.fromParent, CameraPane.theRenderer.targetLookAt);
	471	+ LA.xformPos(Globals.theRenderer.TargetLookAt(), parentcam.fromParent, Globals.theRenderer.TargetLookAt());
471	472	}
472	473
473	474	copy.Touch(); // display list issue
..	..	@@ -602,7 +603,7 @@
602	603	return;
603	604	}
604	605
605		- if (CameraPane.fromscript)
	606	+ if (Globals.fromscript)
606	607	{
607	608	transformcount = 0;
608	609	return;
..	..	@@ -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	}
..	..	@@ -4854,7 +4857,7 @@
4854	4857	return globalTransform;
4855	4858	}
4856	4859
4857		- void PreprocessOcclusion(CameraPane cp)
	4860	+ void PreprocessOcclusion(iCameraPane cp)
4858	4861	{
4859	4862	/*
4860	4863	if (AOdone)
..	..	@@ -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;
..	..	@@ -5327,6 +5382,7 @@
5327	5382	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| Globals.CROWD);
5328	5383	}
5329	5384
	5385	+ static boolean DEBUG_SELECTION = false;
5330	5386
5331	5387	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5332	5388	{
..	..	@@ -5365,12 +5421,12 @@
5365	5421	}
5366	5422
5367	5423	if ((//display.DrawMode() == CameraPane.SHADOW \|\|
5368		- display.DrawMode() == CameraPane.SELECTION \|\| CameraPane.DEBUG_SELECTION) && HasTransparency())
	5424	+ display.DrawMode() == iCameraPane.SELECTION \|\| display.IsDebugSelection()) && HasTransparency())
5369	5425	{
5370	5426	return;
5371	5427	}
5372	5428
5373		- javax.media.opengl.GL gl = display.GetGL();
	5429	+ //javax.media.opengl.GL gl = display.GetGL();
5374	5430
5375	5431	/*
5376	5432	if (touched)
..	..	@@ -5406,7 +5462,7 @@
5406	5462
5407	5463	boolean compiled = false;
5408	5464
5409		- boolean selectmode = display.DrawMode() == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	5465	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5410	5466
5411	5467	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5412	5468	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5422,7 +5478,7 @@
5422	5478	//if (displaylist == -1 && usecalllists)
5423	5479	if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5424	5480	{
5425		- bRep.displaylist = gl.glGenLists(1);
	5481	+ bRep.displaylist = display.GenList();
5426	5482	assert(bRep.displaylist != 0);
5427	5483	// System.err.println("glGenLists: " + bRep.displaylist + " for " + this);
5428	5484	//System.out.println("\tgen list " + list);
..	..	@@ -5434,14 +5490,16 @@
5434	5490	if (usecalllists)
5435	5491	{
5436	5492	// System.err.println("new list " + bRep.displaylist + " for " + this);
5437		- gl.glNewList(bRep.displaylist, gl.GL_COMPILE); //_AND_EXECUTE);
	5493	+ display.NewList(bRep.displaylist);
5438	5494	}
	5495	+
5439	5496	CallList(display, root, selected, blocked);
	5497	+
5440	5498	// compiled = true;
5441	5499	if (usecalllists)
5442	5500	{
5443	5501	// System.err.println("end list " + bRep.displaylist + " for " + this);
5444		- gl.glEndList();
	5502	+ display.EndList();
5445	5503	}
5446	5504	//gl.glDrawBuffer(gl.GL_BACK);
5447	5505	// XXX touched = false;
..	..	@@ -5484,12 +5542,12 @@
5484	5542
5485	5543	// frustum culling
5486	5544	if (CameraPane.FRUSTUM && !blocked && !IsInfinite() && GetBRep() != null // && GetBRep().VertexCount() != 1260 // default grid
5487		- && display.DrawMode() != CameraPane.SELECTION)
	5545	+ && display.DrawMode() != iCameraPane.SELECTION)
5488	5546	{
5489		- if (display.DrawMode() == CameraPane.SHADOW)
	5547	+ if (display.DrawMode() == iCameraPane.SHADOW)
5490	5548	{
5491	5549	if (!link2master // tricky to cull in shadow mode.
5492		- && GetBRep().FrustumCull(this, gl, display.LightCamera(), true))
	5550	+ && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
5493	5551	{
5494	5552	//System.out.print("CULLED");
5495	5553	culled = true;
..	..	@@ -5497,7 +5555,7 @@
5497	5555	}
5498	5556	else
5499	5557	//GetBRep().getBounds(v0, v1, this);
5500		- if (GetBRep().FrustumCull(this, gl, display.RenderCamera(), false))
	5558	+ if (GetBRep().FrustumCull(this, null, display.RenderCamera(), false))
5501	5559	culled = true;
5502	5560
5503	5561	// LA.xformPos(v0, display.renderCamera.toScreen, v0);
..	..	@@ -5533,11 +5591,11 @@
5533	5591
5534	5592
5535	5593	if (!culled)
5536		- if (display.DrawMode() == display.SELECTION \|\| CameraPane.DEBUG_SELECTION)
	5594	+ if (display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection())
5537	5595	{
5538	5596	if (GetBRep() != null)
5539	5597	{
5540		- CameraPane.NextIndex(this, gl);
	5598	+ display.NextIndex();
5541	5599	// vertex color conflict : gl.glCallList(list);
5542	5600	DrawNode(display, root, selected);
5543	5601	if (this instanceof BezierPatch)
..	..	@@ -5594,7 +5652,7 @@
5594	5652
5595	5653	// System.err.println("glCallList: " + bRep.displaylist + " for " + this);
5596	5654	assert(bRep.displaylist != 0);
5597		- gl.glCallList(bRep.displaylist);
	5655	+ display.CallList(bRep.displaylist);
5598	5656	// june 2013 drawSelf(display, root, selected);
5599	5657	}
5600	5658	}
..	..	@@ -5894,9 +5952,10 @@
5894	5952	return;
5895	5953	}
5896	5954
	5955	+ //bRep.GenUV(1/material.diffuseness);
5897	5956	// bRep.lock = true;
5898	5957
5899		- javax.media.opengl.GL gl = display.GetGL();
	5958	+ //javax.media.opengl.GL gl = display.GetGL();
5900	5959
5901	5960	if (CameraPane.BOXMODE && !selected) // \|\| CameraPane.movingcamera)
5902	5961	{
..	..	@@ -5913,23 +5972,7 @@
5913	5972
5914	5973	bRep.getMinMax(min, max, 100);
5915	5974
5916		- gl.glBegin(gl.GL_LINES);
5917		-
5918		- gl.glVertex3d(min.x, min.y, min.z);
5919		- gl.glVertex3d(min.x, min.y, max.z);
5920		- gl.glVertex3d(min.x, min.y, min.z);
5921		- gl.glVertex3d(min.x, max.y, min.z);
5922		- gl.glVertex3d(min.x, min.y, min.z);
5923		- gl.glVertex3d(max.x, min.y, min.z);
5924		-
5925		- gl.glVertex3d(max.x, max.y, max.z);
5926		- gl.glVertex3d(min.x, max.y, max.z);
5927		- gl.glVertex3d(max.x, max.y, max.z);
5928		- gl.glVertex3d(max.x, min.y, max.z);
5929		- gl.glVertex3d(max.x, max.y, max.z);
5930		- gl.glVertex3d(max.x, max.y, min.z);
5931		-
5932		- gl.glEnd();
	5975	+ display.DrawBox(min, max);
5933	5976
5934	5977	return;
5935	5978	}
..	..	@@ -5973,7 +6016,7 @@
5973	6016	{
5974	6017	//throw new Error();
5975	6018
5976		- boolean selectmode = display.DrawMode() == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	6019	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5977	6020
5978	6021	int[] strips = bRep.getRawIndices();
5979	6022
..	..	@@ -5983,178 +6026,14 @@
5983	6026	new Exception().printStackTrace();
5984	6027	return;
5985	6028	}
5986		-
5987		- // TRIANGLE STRIP ARRAY
5988		- if (bRep.trimmed)
5989		- {
5990		- float[] v = bRep.getRawVertices();
5991		- float[] n = bRep.getRawNormals();
5992		- float[] c = bRep.getRawColors();
5993		- float[] uv = bRep.getRawUVMap();
5994		-
5995		- int count2 = 0;
5996		- int count3 = 0;
5997		-
5998		- if (n.length > 0)
5999		- {
6000		- for (int i = 0; i < strips.length; i++)
6001		- {
6002		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6003		-
6004		- /*
6005		- boolean locked = false;
6006		- float eps = 0.1f;
6007		- boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
6008		-
6009		- int dot = 0;
6010		-
6011		- if ((dot&1) == 0)
6012		- dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
6013		-
6014		- if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
6015		- gl.glTexCoord2f((float) qv.s, (float) qv.t);
6016		- else
6017		- {
6018		- locked = true;
6019		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6020		- }
6021		- //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
6022		- gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
6023		- if (hasnorm)
6024		- {
6025		- //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
6026		- gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
6027		- }
6028		-
6029		- if ((dot&4) == 0)
6030		- dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
6031		-
6032		- if (wrap \|\| !locked && (dot&8) != 0)
6033		- gl.glTexCoord2f((float) rv.s, (float) rv.t);
6034		- else
6035		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6036		-
6037		- f.dot = dot;
6038		- */
6039		-
6040		- if (!selectmode)
6041		- {
6042		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6043		- {
6044		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6045		- } else
6046		- {
6047		- gl.glNormal3f(0, 0, 1);
6048		- }
6049		-
6050		- if (c != null)
6051		- //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
6052		- {
6053		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6054		- }
6055		- }
6056		- if (flipV)
6057		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6058		- else
6059		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6060		- //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6061		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6062		-
6063		- count2 += 2;
6064		- count3 += 3;
6065		- if (!selectmode)
6066		- {
6067		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6068		- {
6069		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6070		- } else
6071		- {
6072		- gl.glNormal3f(0, 0, 1);
6073		- }
6074		- if (c != null)
6075		- {
6076		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6077		- }
6078		- }
6079		- if (flipV)
6080		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6081		- else
6082		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6083		- //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
6084		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6085		-
6086		- count2 += 2;
6087		- count3 += 3;
6088		- for (int j = 0; j < strips[i] - 2; j++)
6089		- {
6090		- //gl.glTexCoord2d(...);
6091		- if (!selectmode)
6092		- {
6093		- if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
6094		- {
6095		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
6096		- } else
6097		- {
6098		- gl.glNormal3f(0, 0, 1);
6099		- }
6100		- if (c != null)
6101		- {
6102		- gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
6103		- }
6104		- }
6105		-
6106		- if (flipV)
6107		- gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
6108		- else
6109		- gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
6110		- //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
6111		- gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
6112		- count2 += 2;
6113		- count3 += 3;
6114		- }
6115		-
6116		- gl.glEnd();
6117		- }
6118		- }
6119		-
6120		- assert count3 == v.length;
6121		- }
6122		- else // !trimmed
6123		- {
6124		- int count = 0;
6125		- for (int i = 0; i < strips.length; i++)
6126		- {
6127		- gl.glBegin(gl.GL_TRIANGLE_STRIP);
6128		-
6129		- Vertex p = bRep.GetVertex(bRep.indices[count++]);
6130		- Vertex q = bRep.GetVertex(bRep.indices[count++]);
6131		-
6132		- drawVertex(gl, p, selectmode);
6133		- drawVertex(gl, q, selectmode);
6134		-
6135		- for (int j = 0; j < strips[i] - 2; j++)
6136		- {
6137		- Vertex r = bRep.GetVertex(bRep.indices[count++]);
6138		-
6139		-// if (j%2 == 0)
6140		-// drawFace(p, q, r, display, null);
6141		-// else
6142		-// drawFace(p, r, q, display, null);
6143		-
6144		-// p = q;
6145		-// q = r;
6146		- drawVertex(gl, r, selectmode);
6147		- }
6148		-
6149		- gl.glEnd();
6150		- }
6151		- }
	6029	+
	6030	+ display.DrawGeometry(bRep, flipV, selectmode);
6152	6031	} else // catch (Error e)
6153	6032	{
6154	6033	// TRIANGLE ARRAY
6155	6034	if (IsOpaque()) // Static())
6156	6035	{
6157		- gl.glBegin(gl.GL_TRIANGLES);
	6036	+ display.StartTriangles();
6158	6037	int facecount = bRep.FaceCount();
6159	6038	for (int i = 0; i < facecount; i++)
6160	6039	{
..	..	@@ -6219,7 +6098,7 @@
6219	6098
6220	6099	display.DrawFace(this, p, q, r, face);
6221	6100	}
6222		- gl.glEnd();
	6101	+ display.EndTriangles();
6223	6102	}
6224	6103	else
6225	6104	{
..	..	@@ -6248,8 +6127,8 @@
6248	6127	//System.out.println("SORT");
6249	6128
6250	6129	java.util.Arrays.sort(facescompare);
6251		-
6252		- gl.glBegin(gl.GL_TRIANGLES);
	6130	+
	6131	+ display.StartTriangles();
6253	6132	for (int i = 0; i < facecount; i++)
6254	6133	{
6255	6134	Face face = bRep.GetFace(facescompare[i].index);
..	..	@@ -6263,11 +6142,12 @@
6263	6142
6264	6143	display.DrawFace(this, p, q, r, face);
6265	6144	}
6266		- gl.glEnd();
	6145	+ display.EndTriangles();
6267	6146	}
6268	6147
6269	6148	if (false) // live && support != null && support.bRep != null) // debug weights
6270	6149	{
	6150	+ /*
6271	6151	gl.glDisable(gl.GL_LIGHTING);
6272	6152	float[] colorV = new float[3];
6273	6153
..	..	@@ -6346,6 +6226,7 @@
6346	6226	// gl.glEnd();
6347	6227	}
6348	6228	}
	6229	+ */
6349	6230	}
6350	6231	}
6351	6232
..	..	@@ -6390,7 +6271,7 @@
6390	6271	center.add(r);
6391	6272	center.mul(1.0/3);
6392	6273
6393		- center.sub(CameraPane.theRenderer.eyeCamera.location);
	6274	+ center.sub(Globals.theRenderer.EyeCamera().location);
6394	6275
6395	6276	distance = center.dot(center);
6396	6277	}
..	..	@@ -6404,22 +6285,6 @@
6404	6285	void Print(Vertex v)
6405	6286	{
6406	6287	//System.err.println("(" + v.x + ", " + v.y + ", " + v.z + ")");
6407		- }
6408		-
6409		- void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean selectmode)
6410		- {
6411		- if (!selectmode)
6412		- {
6413		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
6414		- gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
6415		-
6416		- if (flipV)
6417		- gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
6418		- else
6419		- gl.glTexCoord2f((float) pv.s, (float) pv.t);
6420		- }
6421		-
6422		- gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
6423	6288	}
6424	6289
6425	6290	void drawSelf(ClickInfo info, int level, boolean select)
..	..	@@ -6993,83 +6858,83 @@
6993	6858	int spotw = spot.x + spot.width;
6994	6859	int spoth = spot.y + spot.height;
6995	6860	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6996		- if (CameraPane.Xmin > spot.x)
6997		- {
6998		- CameraPane.Xmin = spot.x;
6999		- }
7000		- if (CameraPane.Xmax < spotw)
7001		- {
7002		- CameraPane.Xmax = spotw;
7003		- }
7004		- if (CameraPane.Ymin > spot.y)
7005		- {
7006		- CameraPane.Ymin = spot.y;
7007		- }
7008		- if (CameraPane.Ymax < spoth)
7009		- {
7010		- CameraPane.Ymax = spoth;
7011		- }
	6861	+// if (CameraPane.Xmin > spot.x)
	6862	+// {
	6863	+// CameraPane.Xmin = spot.x;
	6864	+// }
	6865	+// if (CameraPane.Xmax < spotw)
	6866	+// {
	6867	+// CameraPane.Xmax = spotw;
	6868	+// }
	6869	+// if (CameraPane.Ymin > spot.y)
	6870	+// {
	6871	+// CameraPane.Ymin = spot.y;
	6872	+// }
	6873	+// if (CameraPane.Ymax < spoth)
	6874	+// {
	6875	+// CameraPane.Ymax = spoth;
	6876	+// }
7012	6877	spot.translate(32, 32);
7013	6878	spotw = spot.x + spot.width;
7014	6879	spoth = spot.y + spot.height;
7015	6880	info.g.setColor(Color.blue);
7016	6881	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7017		- if (CameraPane.Xmin > spot.x)
7018		- {
7019		- CameraPane.Xmin = spot.x;
7020		- }
7021		- if (CameraPane.Xmax < spotw)
7022		- {
7023		- CameraPane.Xmax = spotw;
7024		- }
7025		- if (CameraPane.Ymin > spot.y)
7026		- {
7027		- CameraPane.Ymin = spot.y;
7028		- }
7029		- if (CameraPane.Ymax < spoth)
7030		- {
7031		- CameraPane.Ymax = spoth;
7032		- }
	6882	+// if (CameraPane.Xmin > spot.x)
	6883	+// {
	6884	+// CameraPane.Xmin = spot.x;
	6885	+// }
	6886	+// if (CameraPane.Xmax < spotw)
	6887	+// {
	6888	+// CameraPane.Xmax = spotw;
	6889	+// }
	6890	+// if (CameraPane.Ymin > spot.y)
	6891	+// {
	6892	+// CameraPane.Ymin = spot.y;
	6893	+// }
	6894	+// if (CameraPane.Ymax < spoth)
	6895	+// {
	6896	+// CameraPane.Ymax = spoth;
	6897	+// }
7033	6898	info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7034	6899	info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7035	6900	spot.translate(0, -32);
7036	6901	info.g.setColor(Color.green);
7037	6902	info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7038		- if (CameraPane.Xmin > spot.x)
7039		- {
7040		- CameraPane.Xmin = spot.x;
7041		- }
7042		- if (CameraPane.Xmax < spotw)
7043		- {
7044		- CameraPane.Xmax = spotw;
7045		- }
7046		- if (CameraPane.Ymin > spot.y)
7047		- {
7048		- CameraPane.Ymin = spot.y;
7049		- }
7050		- if (CameraPane.Ymax < spoth)
7051		- {
7052		- CameraPane.Ymax = spoth;
7053		- }
	6903	+// if (CameraPane.Xmin > spot.x)
	6904	+// {
	6905	+// CameraPane.Xmin = spot.x;
	6906	+// }
	6907	+// if (CameraPane.Xmax < spotw)
	6908	+// {
	6909	+// CameraPane.Xmax = spotw;
	6910	+// }
	6911	+// if (CameraPane.Ymin > spot.y)
	6912	+// {
	6913	+// CameraPane.Ymin = spot.y;
	6914	+// }
	6915	+// if (CameraPane.Ymax < spoth)
	6916	+// {
	6917	+// CameraPane.Ymax = spoth;
	6918	+// }
7054	6919	info.g.drawArc(boundary.x, boundary.y,
7055	6920	boundary.width, boundary.height, 0, 360);
7056	6921	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7057		- if (CameraPane.Xmin > boundary.x)
7058		- {
7059		- CameraPane.Xmin = boundary.x;
7060		- }
7061		- if (CameraPane.Xmax < boundary.x + boundary.width)
7062		- {
7063		- CameraPane.Xmax = boundary.x + boundary.width;
7064		- }
7065		- if (CameraPane.Ymin > boundary.y)
7066		- {
7067		- CameraPane.Ymin = boundary.y;
7068		- }
7069		- if (CameraPane.Ymax < boundary.y + boundary.height)
7070		- {
7071		- CameraPane.Ymax = boundary.y + boundary.height;
7072		- }
	6922	+// if (CameraPane.Xmin > boundary.x)
	6923	+// {
	6924	+// CameraPane.Xmin = boundary.x;
	6925	+// }
	6926	+// if (CameraPane.Xmax < boundary.x + boundary.width)
	6927	+// {
	6928	+// CameraPane.Xmax = boundary.x + boundary.width;
	6929	+// }
	6930	+// if (CameraPane.Ymin > boundary.y)
	6931	+// {
	6932	+// CameraPane.Ymin = boundary.y;
	6933	+// }
	6934	+// if (CameraPane.Ymax < boundary.y + boundary.height)
	6935	+// {
	6936	+// CameraPane.Ymax = boundary.y + boundary.height;
	6937	+// }
7073	6938	return;
7074	6939	}
7075	6940	}
..	..	@@ -7119,7 +6984,7 @@
7119	6984	}
7120	6985
7121	6986	//System.out.println("info.modifiers = " + info.modifiers);
7122		- modified = (info.modifiers & CameraPane.META) != 0;
	6987	+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7123	6988	//System.out.println("modified = " + modified);
7124	6989	//new Exception().printStackTrace();
7125	6990	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7147,7 +7012,7 @@
7147	7012	return true;
7148	7013	}
7149	7014
7150		- void doEditDrag0(ClickInfo info)
	7015	+ void doEditDrag0(ClickInfo info, boolean opposite)
7151	7016	{
7152	7017	if (hitSomething == 0)
7153	7018	{
..	..	@@ -7172,9 +7037,9 @@
7172	7037
7173	7038	case hitCenter: // Translate
7174	7039
7175		- scale = 0.05f info.pane.theRenderer.renderCamera.Distance();
	7040	+ scale = 0.05f Globals.theRenderer.RenderCamera().Distance();
7176	7041
7177		- if (modified)
	7042	+ if (modified \|\| opposite)
7178	7043	{
7179	7044	//assert(false);
7180	7045	/*
..	..	@@ -7220,10 +7085,10 @@
7220	7085	}
7221	7086	LA.xformDir(up, ClickInfo.matbuffer, up);
7222	7087	// if (!CameraPane.LOCALTRANSFORM)
7223		- LA.xformDir(up, info.pane.theRenderer.renderCamera.toScreen, up);
	7088	+ LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7224	7089	LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7225	7090	// if (!CameraPane.LOCALTRANSFORM)
7226		- LA.xformDir(away, info.pane.theRenderer.renderCamera.toScreen, away);
	7091	+ LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7227	7092	//LA.vecCross(up, cVector.Z, right2);
7228	7093
7229	7094	cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
..	..	@@ -7268,6 +7133,7 @@
7268	7133
7269	7134	if (modified)
7270	7135	{
	7136	+ // Rotate 90 degrees
7271	7137	angle /= (Math.PI / 4);
7272	7138	angle = Math.floor(angle + 0.5);
7273	7139	angle *= (Math.PI / 4);
..	..	@@ -7281,7 +7147,7 @@
7281	7147	}
7282	7148	/**/
7283	7149
7284		- switch (info.pane.renderCamera.viewCode)
	7150	+ switch (info.pane.RenderCamera().viewCode)
7285	7151	{
7286	7152	case 1: // '\001'
7287	7153	LA.matZRotate(toParent, angle);
..	..	@@ -7337,7 +7203,7 @@
7337	7203	}
7338	7204	/**/
7339	7205
7340		- switch (info.pane.renderCamera.viewCode)
	7206	+ switch (info.pane.RenderCamera().viewCode)
7341	7207	{
7342	7208	case 3: // '\001'
7343	7209	if (modified)
..	..	@@ -7565,6 +7431,7 @@
7565	7431	objectUI.closeUI();
7566	7432	if (editWindow != null)
7567	7433	{
	7434	+ editWindow.ctrlPanel.FlushUI();
7568	7435	editWindow.refreshContents();
7569	7436	} // ? new
7570	7437	objectUI = null;