~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -149,12 +149,11 @@
149	149	defaultcaps.setAccumBlueBits(16);
150	150	defaultcaps.setAccumAlphaBits(16);
151	151	}
152		- static CameraPane theRenderer;
153		-
	152	+
154	153	void SetAsGLRenderer(boolean b)
155	154	{
156	155	isRenderer = b;
157		- theRenderer = this;
	156	+ Globals.theRenderer = this;
158	157	}
159	158
160	159	CameraPane(Object3D o, Camera cam, boolean withcontext)
..	..	@@ -191,6 +190,35 @@
191	190	}
192	191
193	192	/// INTERFACE
	193	+
	194	+ public javax.media.opengl.GL GetGL0()
	195	+ {
	196	+ return null;
	197	+ }
	198	+
	199	+ public int GenList()
	200	+ {
	201	+ javax.media.opengl.GL gl = GetGL();
	202	+ return gl.glGenLists(1);
	203	+ }
	204	+
	205	+ public void NewList(int id)
	206	+ {
	207	+ javax.media.opengl.GL gl = GetGL();
	208	+ gl.glNewList(id, gl.GL_COMPILE); //_AND_EXECUTE);
	209	+ }
	210	+
	211	+ public void CallList(int id)
	212	+ {
	213	+ javax.media.opengl.GL gl = GetGL();
	214	+ gl.glCallList(id);
	215	+ }
	216	+
	217	+ public void EndList()
	218	+ {
	219	+ javax.media.opengl.GL gl = GetGL();
	220	+ gl.glEndList();
	221	+ }
194	222
195	223	public boolean IsBoxMode()
196	224	{
..	..	@@ -236,9 +264,14 @@
236	264	return this.ambientOcclusion;
237	265	}
238	266
	267	+ public boolean IsDebugSelection()
	268	+ {
	269	+ return DEBUG_SELECTION;
	270	+ }
	271	+
239	272	public boolean IsFrozen()
240	273	{
241		- boolean selectmode = this.DrawMode() == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	274	+ boolean selectmode = this.DrawMode() == SELECTION \|\| this.IsDebugSelection();
242	275
243	276	return !selectmode && cameracount == 0; // != 0;
244	277	}
..	..	@@ -259,9 +292,19 @@
259	292	return lightCamera;
260	293	}
261	294
	295	+ public Camera ManipCamera()
	296	+ {
	297	+ return manipCamera;
	298	+ }
	299	+
262	300	public Camera RenderCamera()
263	301	{
264	302	return renderCamera;
	303	+ }
	304	+
	305	+ public Camera[] Cameras()
	306	+ {
	307	+ return cameras;
265	308	}
266	309
267	310	public void PushMaterial(Object3D obj, boolean selected)
..	..	@@ -408,7 +451,7 @@
408	451
409	452	javax.media.opengl.GL gl = display.GetGL();
410	453
411		- boolean selectmode = display.DrawMode() == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	454	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
412	455
413	456	//System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
414	457	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
..	..	@@ -760,7 +803,621 @@
760	803	//// tris.postdraw(this);
761	804	}
762	805
	806	+ static Camera localcamera = new Camera();
	807	+ static cVector from = new cVector();
	808	+ static cVector to = new cVector();
	809	+
	810	+ public void PrepOcclusion(BoundaryRep br, double[][] transform)
	811	+ {
	812	+ CameraPane cp = this;
	813	+
	814	+ Camera keep = cp.RenderCamera();
	815	+ cp.renderCamera = localcamera;
	816	+
	817	+ if (br.trimmed)
	818	+ {
	819	+ float[] colors = new float[br.positions.length / 3];
	820	+
	821	+ int i3 = 0;
	822	+ for (int i = 0; i < br.positions.length / 3; i++, i3 += 3)
	823	+ {
	824	+ if (br.normals[i3] == 0 && br.normals[i3+1] == 0 && br.normals[i3+2] == 0)
	825	+ continue;
	826	+
	827	+ from.set(br.positions[i3], br.positions[i3 + 1], br.positions[i3 + 2]);
	828	+ to.set(br.positions[i3] + br.normals[i3],
	829	+ br.positions[i3 + 1] + br.normals[i3 + 1],
	830	+ br.positions[i3 + 2] + br.normals[i3 + 2]);
	831	+ LA.xformPos(from, transform, from);
	832	+ LA.xformPos(to, transform, to); // RIGID ONLY
	833	+ localcamera.setAim(from, to);
	834	+
	835	+ CameraPane.occlusionbuffer.display();
	836	+
	837	+ if (CameraPane.DEBUG_OCCLUSION)
	838	+ cp.display(); // debug
	839	+
	840	+ colors[i] = cp.vertexOcclusion.r;
	841	+ //colors[i3 + 1] = cp.vertexOcclusion.g;
	842	+ //colors[i3 + 2] = cp.vertexOcclusion.b;
	843	+
	844	+ if ((i % 100) == 0 && i != 0)
	845	+ {
	846	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	847	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	848	+ System.out.println((int) (100.0 * i / (br.positions.length / 3)) + "% (" + i + " of " + (br.positions.length / 3) + ")");
	849	+ }
	850	+ }
	851	+
	852	+ br.colors = colors;
	853	+ }
	854	+ else
	855	+ {
	856	+ for (int i = 0; i < br.VertexCount(); i++)
	857	+ {
	858	+ Vertex v = br.GetVertex(i);
	859	+
	860	+ if (v.norm == null \|\| v.norm.x == 0 && v.norm.y == 0 && v.norm.z == 0)
	861	+ continue;
	862	+
	863	+ from.set(v.x, v.y, v.z);
	864	+ to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
	865	+ LA.xformPos(from, transform, from);
	866	+ LA.xformPos(to, transform, to); // RIGID ONLY
	867	+ localcamera.setAim(from, to);
	868	+
	869	+ CameraPane.occlusionbuffer.display();
	870	+
	871	+ if (CameraPane.DEBUG_OCCLUSION)
	872	+ cp.display(); // debug
	873	+
	874	+ v.AO = cp.vertexOcclusion.r;
	875	+
	876	+ if ((i % 100) == 0 && i != 0)
	877	+ {
	878	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	879	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	880	+ System.out.println((int) (100.0 * i / br.VertexCount()) + "% (" + i + " of " + br.VertexCount() + ")");
	881	+ }
	882	+ }
	883	+ }
	884	+
	885	+ //System.out.println("done.");
	886	+
	887	+ cp.renderCamera = keep;
	888	+ }
	889	+
	890	+ void DrawPointFLow(PointFlow pointFlow, Object3D /Composite/ root, boolean selected, boolean blocked)
	891	+ {
	892	+ CameraPane display = this;
	893	+ pointFlow.CreateHT();
	894	+
	895	+ float r = display.modelParams0[0];
	896	+ float g = display.modelParams0[1];
	897	+ float b = display.modelParams0[2];
	898	+ float opacity = display.modelParams5[1];
	899	+
	900	+ //final GL gl = GLU.getCurrentGL();
	901	+ GL gl = display.GetGL(); // getGL();
	902	+
	903	+ int s = pointFlow.points.size();
	904	+
	905	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	906	+ gl.glEnable(gl.GL_CULL_FACE);
	907	+
	908	+ for (int i=s; --i>=0;)
	909	+ //for (int i=0; i<s; i++)
	910	+ {
	911	+ cVector v = pointFlow.points.get(i);
	912	+
	913	+ double mindist = Double.MAX_VALUE;
	914	+
	915	+ double size = pointFlow.minimumSize;
	916	+
	917	+ double distancenext = 0;
	918	+
	919	+ if (i > 0)
	920	+ {
	921	+ cVector w = pointFlow.points.get(i-1);
	922	+
	923	+ double dist = w.distance(v);
	924	+
	925	+ distancenext = dist;
	926	+
	927	+ if (mindist > dist)
	928	+ {
	929	+ mindist = dist;
	930	+ size = mindist*pointFlow.resizefactor;
	931	+ }
	932	+ }
	933	+
	934	+ if (i < s-1)
	935	+ {
	936	+ cVector w = pointFlow.points.get(i+1);
	937	+
	938	+ double dist = w.distance(v);
	939	+
	940	+ if (mindist > dist)
	941	+ {
	942	+ mindist = dist;
	943	+ size = mindist*pointFlow.resizefactor;
	944	+ }
	945	+ }
	946	+
	947	+ if (size < pointFlow.minimumSize)
	948	+ size = pointFlow.minimumSize;
	949	+ if (size > pointFlow.maximumSize)
	950	+ size = pointFlow.maximumSize;
	951	+
	952	+ double tx = v.x;
	953	+ double ty = v.y;
	954	+ double tz = v.z;
	955	+
	956	+ // if (tx == 0 && ty == 0 && tz == 0)
	957	+ // continue;
	958	+
	959	+ gl.glMatrixMode(gl.GL_TEXTURE);
	960	+ gl.glPushMatrix();
	961	+ pointFlow.texmat[12] = pointFlow.texmat[13] = pointFlow.texmat[14] = i;
	962	+
	963	+ gl.glMultMatrixf(pointFlow.texmat, 0);
	964	+
	965	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	966	+ gl.glPushMatrix();
	967	+
	968	+ gl.glTranslated(tx,ty,tz);
	969	+
	970	+ gl.glScaled(size,size,size);
	971	+
	972	+// float cr = colorBuf.get(index4);
	973	+// float cg = colorBuf.get(index4+1);
	974	+// float cb = colorBuf.get(index4+2);
	975	+// float ca = colorBuf.get(index4+3);
	976	+//
	977	+// display.modelParams0[0] = r * cr;
	978	+// display.modelParams0[1] = g * cg;
	979	+// display.modelParams0[2] = b * cb;
	980	+//
	981	+// display.modelParams5[1] = opacity * ca;
	982	+//
	983	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	984	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	985	+//
	986	+// RandomNode.globalseed = (int)sizeBuf.get(index3+2); // i;
	987	+// RandomNode.globalseed2 = RandomNode.globalseed;
	988	+//
	989	+//// gl.glColor4f(cr,cg,cb,ca);
	990	+// // gl.glScalef(1024/16,1024/16,1024/16);
	991	+ pointFlow.geo.Draw/Node/(display,null,selected, blocked);
	992	+
	993	+ gl.glPopMatrix();
	994	+
	995	+ double step = size/4; //
	996	+
	997	+ if (i == 0 \|\| size == 0 \|\| distancenext > 8*size \|\| distancenext < step)
	998	+ continue;
	999	+
	1000	+ int nbsteps = (int)(distancenext/step);
	1001	+
	1002	+ step = distancenext/nbsteps;
	1003	+
	1004	+ cVector next = pointFlow.points.get(i-1);
	1005	+
	1006	+ tmp.set(next);
	1007	+ tmp.sub(v);
	1008	+ tmp.normalize();
	1009	+ tmp.mul(step);
	1010	+
	1011	+ // calculate next size
	1012	+ mindist = Double.MAX_VALUE;
	1013	+
	1014	+ double nextsize = pointFlow.minimumSize;
	1015	+
	1016	+ if (i > 1)
	1017	+ {
	1018	+ cVector w = pointFlow.points.get(i-2);
	1019	+
	1020	+ double dist = w.distance(next);
	1021	+
	1022	+ if (mindist > dist)
	1023	+ {
	1024	+ mindist = dist;
	1025	+ nextsize = mindist*pointFlow.resizefactor;
	1026	+ }
	1027	+ }
	1028	+
	1029	+ double dist = v.distance(next);
	1030	+
	1031	+ if (mindist > dist)
	1032	+ {
	1033	+ mindist = dist;
	1034	+ nextsize = mindist*pointFlow.resizefactor;
	1035	+ }
	1036	+
	1037	+ if (nextsize < pointFlow.minimumSize)
	1038	+ nextsize = pointFlow.minimumSize;
	1039	+ if (nextsize > pointFlow.maximumSize)
	1040	+ nextsize = pointFlow.maximumSize;
	1041	+ //
	1042	+
	1043	+ double count = 0;
	1044	+
	1045	+ while (distancenext > 0.000000001) // step
	1046	+ {
	1047	+ gl.glPushMatrix();
	1048	+
	1049	+ gl.glTranslated(tx + tmp.xcount, ty + tmp.ycount, tz + tmp.z*count);
	1050	+
	1051	+ double K = count/nbsteps;
	1052	+
	1053	+ double intersize = Knextsize + (1-K)size;
	1054	+
	1055	+ gl.glScaled(intersize,intersize,intersize);
	1056	+
	1057	+ pointFlow.geo.Draw/Node/(display,null,selected,blocked);
	1058	+
	1059	+ count++;
	1060	+
	1061	+ distancenext -= step;
	1062	+
	1063	+ gl.glPopMatrix();
	1064	+ }
	1065	+
	1066	+ if (count != nbsteps)
	1067	+ assert(count == nbsteps);
	1068	+
	1069	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	1070	+ //gl.glTranslatef(-tx,-ty,-tz);
	1071	+
	1072	+ gl.glMatrixMode(gl.GL_TEXTURE);
	1073	+ gl.glPopMatrix();
	1074	+ }
	1075	+
	1076	+ if (!cf)
	1077	+ gl.glDisable(gl.GL_CULL_FACE);
	1078	+
	1079	+// display.modelParams0[0] = r;
	1080	+// display.modelParams0[1] = g;
	1081	+// display.modelParams0[2] = b;
	1082	+//
	1083	+// display.modelParams5[1] = opacity;
	1084	+//
	1085	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1086	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1087	+
	1088	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	1089	+ }
	1090	+
	1091	+ public void DrawBox(cVector min, cVector max)
	1092	+ {
	1093	+ javax.media.opengl.GL gl = GetGL();
	1094	+ gl.glBegin(gl.GL_LINES);
	1095	+
	1096	+ gl.glVertex3d(min.x, min.y, min.z);
	1097	+ gl.glVertex3d(min.x, min.y, max.z);
	1098	+ gl.glVertex3d(min.x, min.y, min.z);
	1099	+ gl.glVertex3d(min.x, max.y, min.z);
	1100	+ gl.glVertex3d(min.x, min.y, min.z);
	1101	+ gl.glVertex3d(max.x, min.y, min.z);
	1102	+
	1103	+ gl.glVertex3d(max.x, max.y, max.z);
	1104	+ gl.glVertex3d(min.x, max.y, max.z);
	1105	+ gl.glVertex3d(max.x, max.y, max.z);
	1106	+ gl.glVertex3d(max.x, min.y, max.z);
	1107	+ gl.glVertex3d(max.x, max.y, max.z);
	1108	+ gl.glVertex3d(max.x, max.y, min.z);
	1109	+
	1110	+ gl.glEnd();
	1111	+ }
	1112	+
	1113	+ public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
	1114	+ {
	1115	+ int[] strips = bRep.getRawIndices();
	1116	+
	1117	+ javax.media.opengl.GL gl = GetGL();
	1118	+
	1119	+ // TRIANGLE STRIP ARRAY
	1120	+ if (bRep.trimmed)
	1121	+ {
	1122	+ float[] v = bRep.getRawVertices();
	1123	+ float[] n = bRep.getRawNormals();
	1124	+ float[] c = bRep.getRawColors();
	1125	+ float[] uv = bRep.getRawUVMap();
	1126	+
	1127	+ int count2 = 0;
	1128	+ int count3 = 0;
	1129	+
	1130	+ if (n.length > 0)
	1131	+ {
	1132	+ for (int i = 0; i < strips.length; i++)
	1133	+ {
	1134	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1135	+
	1136	+ /*
	1137	+ boolean locked = false;
	1138	+ float eps = 0.1f;
	1139	+ boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	1140	+
	1141	+ int dot = 0;
	1142	+
	1143	+ if ((dot&1) == 0)
	1144	+ dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	1145	+
	1146	+ if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	1147	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	1148	+ else
	1149	+ {
	1150	+ locked = true;
	1151	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1152	+ }
	1153	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	1154	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	1155	+ if (hasnorm)
	1156	+ {
	1157	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	1158	+ gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
	1159	+ }
	1160	+
	1161	+ if ((dot&4) == 0)
	1162	+ dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	1163	+
	1164	+ if (wrap \|\| !locked && (dot&8) != 0)
	1165	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	1166	+ else
	1167	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1168	+
	1169	+ f.dot = dot;
	1170	+ */
	1171	+
	1172	+ if (!selectmode)
	1173	+ {
	1174	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1175	+ {
	1176	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1177	+ } else
	1178	+ {
	1179	+ gl.glNormal3f(0, 0, 1);
	1180	+ }
	1181	+
	1182	+ if (c != null)
	1183	+ //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
	1184	+ {
	1185	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1186	+ }
	1187	+ }
	1188	+ if (flipV)
	1189	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1190	+ else
	1191	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1192	+ //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1193	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1194	+
	1195	+ count2 += 2;
	1196	+ count3 += 3;
	1197	+ if (!selectmode)
	1198	+ {
	1199	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1200	+ {
	1201	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1202	+ } else
	1203	+ {
	1204	+ gl.glNormal3f(0, 0, 1);
	1205	+ }
	1206	+ if (c != null)
	1207	+ {
	1208	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1209	+ }
	1210	+ }
	1211	+ if (flipV)
	1212	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1213	+ else
	1214	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1215	+ //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1216	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1217	+
	1218	+ count2 += 2;
	1219	+ count3 += 3;
	1220	+ for (int j = 0; j < strips[i] - 2; j++)
	1221	+ {
	1222	+ //gl.glTexCoord2d(...);
	1223	+ if (!selectmode)
	1224	+ {
	1225	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1226	+ {
	1227	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1228	+ } else
	1229	+ {
	1230	+ gl.glNormal3f(0, 0, 1);
	1231	+ }
	1232	+ if (c != null)
	1233	+ {
	1234	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1235	+ }
	1236	+ }
	1237	+
	1238	+ if (flipV)
	1239	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1240	+ else
	1241	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1242	+ //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
	1243	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1244	+ count2 += 2;
	1245	+ count3 += 3;
	1246	+ }
	1247	+
	1248	+ gl.glEnd();
	1249	+ }
	1250	+ }
	1251	+
	1252	+ assert count3 == v.length;
	1253	+ }
	1254	+ else // !trimmed
	1255	+ {
	1256	+ int count = 0;
	1257	+ for (int i = 0; i < strips.length; i++)
	1258	+ {
	1259	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1260	+
	1261	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	1262	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	1263	+
	1264	+ drawVertex(gl, p, flipV, selectmode);
	1265	+ drawVertex(gl, q, flipV, selectmode);
	1266	+
	1267	+ for (int j = 0; j < strips[i] - 2; j++)
	1268	+ {
	1269	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	1270	+
	1271	+ // if (j%2 == 0)
	1272	+ // drawFace(p, q, r, display, null);
	1273	+ // else
	1274	+ // drawFace(p, r, q, display, null);
	1275	+
	1276	+ // p = q;
	1277	+ // q = r;
	1278	+ drawVertex(gl, r, flipV, selectmode);
	1279	+ }
	1280	+
	1281	+ gl.glEnd();
	1282	+ }
	1283	+ }
	1284	+ }
	1285	+
	1286	+ static cSpring.Point3D temp = new cSpring.Point3D();
	1287	+ static cSpring.Point3D temp2 = new cSpring.Point3D();
	1288	+ static cSpring.Point3D temp3 = new cSpring.Point3D();
	1289	+
	1290	+ public void DrawDynamicMesh(cMesh mesh)
	1291	+ {
	1292	+ GL gl = GetGL(); // getGL();
	1293	+
	1294	+ cSpring.PhysicsController3D Phys = mesh.Phys;
	1295	+
	1296	+ gl.glDisable(gl.GL_LIGHTING);
	1297	+
	1298	+ gl.glLineWidth(1);
	1299	+ gl.glColor3f(1,1,1);
	1300	+ gl.glBegin(gl.GL_LINES);
	1301	+ double scale = 0;
	1302	+ int count = 0;
	1303	+ for (int s=0; s<Phys.allSprings.size(); s++)
	1304	+ {
	1305	+ cSpring.Spring spring = Phys.allSprings.get(s);
	1306	+ if(s == 0)
	1307	+ {
	1308	+ //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
	1309	+ }
	1310	+ if (mesh.showsprings)
	1311	+ {
	1312	+ temp.set(spring.a.position);
	1313	+ temp.add(spring.b.position);
	1314	+ temp.mul(0.5);
	1315	+ temp2.set(spring.a.position);
	1316	+ temp2.sub(spring.b.position);
	1317	+ temp2.mul(spring.restLength/2);
	1318	+ temp.sub(temp2);
	1319	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1320	+ temp.add(temp2);
	1321	+ temp.add(temp2);
	1322	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1323	+ }
	1324	+
	1325	+ if (spring.isHandle)
	1326	+ continue;
	1327	+
	1328	+ //if (scale < spring.restLength)
	1329	+ scale += spring.restLength;
	1330	+ count++;
	1331	+ }
	1332	+ gl.glEnd();
	1333	+
	1334	+ if (count == 0)
	1335	+ scale = 0.01;
	1336	+ else
	1337	+ scale /= count * 3;
	1338	+
	1339	+ //scale = 0.25;
	1340	+
	1341	+ if (mesh.ShowInfo())
	1342	+ {
	1343	+ gl.glLineWidth(4);
	1344	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1345	+ {
	1346	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1347	+ if (node.mass == 0)
	1348	+ continue;
	1349	+
	1350	+ int i = node.springs==null?-1:node.springs.size();
	1351	+ gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
	1352	+ //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
	1353	+ //temp.normalize();
	1354	+ //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
	1355	+ gl.glBegin(gl.GL_LINES);
	1356	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1357	+ //gl.glVertex3d(node.position.x + node.normal.xscale, node.position.y + node.normal.yscale, node.position.z + node.normal.z*scale);
	1358	+ gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
	1359	+ node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
	1360	+ node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
	1361	+ gl.glEnd();
	1362	+ }
	1363	+
	1364	+ gl.glLineWidth(8);
	1365	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1366	+ {
	1367	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1368	+
	1369	+ if (node.springs != null)
	1370	+ {
	1371	+ for (int i=0; i<node.springs.size(); i+=1)
	1372	+ {
	1373	+ cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
	1374	+
	1375	+ int c = i+1;
	1376	+ // c = node.springs.get(i).nbcopies;
	1377	+
	1378	+ gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
	1379	+ gl.glBegin(gl.GL_LINES);
	1380	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1381	+ gl.glVertex3d(f.position.x/3+node.position.x2/3, f.position.y/3+node.position.y2/3, f.position.z/3+node.position.z*2/3);
	1382	+ gl.glEnd();
	1383	+ }
	1384	+ }
	1385	+ }
	1386	+
	1387	+ gl.glLineWidth(1);
	1388	+ }
	1389	+
	1390	+ gl.glEnable(gl.GL_LIGHTING);
	1391	+ }
	1392	+
763	1393	/// INTERFACE
	1394	+
	1395	+ public void StartTriangles()
	1396	+ {
	1397	+ javax.media.opengl.GL gl = GetGL();
	1398	+ gl.glBegin(gl.GL_TRIANGLES);
	1399	+ }
	1400	+
	1401	+ public void EndTriangles()
	1402	+ {
	1403	+ GetGL().glEnd();
	1404	+ }
	1405	+
	1406	+ void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
	1407	+ {
	1408	+ if (!selectmode)
	1409	+ {
	1410	+ gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1411	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	1412	+
	1413	+ if (flipV)
	1414	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	1415	+ else
	1416	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1417	+ }
	1418	+
	1419	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	1420	+ }
764	1421
765	1422	void SetColor(Object3D obj, Vertex p0)
766	1423	{
..	..	@@ -1323,7 +1980,7 @@
1323	1980
1324	1981	static int camerachangeframe;
1325	1982
1326		- boolean SetCamera(Camera cam)
	1983	+ public boolean SetCamera(Camera cam)
1327	1984	{
1328	1985	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
1329	1986	// return false;
..	..	@@ -1451,12 +2108,27 @@
1451	2108	mainDL ^= true;
1452	2109	}
1453	2110
1454		- void ToggleTexture()
	2111	+ void ToggleFullScreen()
	2112	+ {
	2113	+ FULLSCREEN ^= true;
	2114	+ }
	2115	+
	2116	+ void ToggleCrowd()
	2117	+ {
	2118	+ Globals.CROWD ^= true;
	2119	+ }
	2120	+
	2121	+ void ToggleLocal()
	2122	+ {
	2123	+ LOCALTRANSFORM ^= true;
	2124	+ }
	2125	+
	2126	+ public void ToggleTexture()
1455	2127	{
1456	2128	textureon ^= true;
1457	2129	}
1458	2130
1459		- void ToggleLive()
	2131	+ public void ToggleLive()
1460	2132	{
1461	2133	Globals.setLIVE(Globals.isLIVE() ^ true);
1462	2134
..	..	@@ -1468,92 +2140,67 @@
1468	2140	repaint(); // start loop // may 2013
1469	2141	}
1470	2142
1471		- void ToggleSupport()
	2143	+ public void ToggleSupport()
1472	2144	{
1473	2145	SUPPORT ^= true;
1474	2146	}
1475	2147
1476		- void ToggleAbort()
	2148	+ public void ToggleAbort()
1477	2149	{
1478	2150	ABORTMODE ^= true;
1479	2151	}
1480	2152
1481		- void ToggleFullScreen()
1482		- {
1483		- FULLSCREEN ^= true;
1484		- }
1485		-
1486		- void ToggleCrowd()
1487		- {
1488		- Globals.CROWD ^= true;
1489		- }
1490		-
1491		- void ToggleInertia()
	2153	+ public void ToggleInertia()
1492	2154	{
1493	2155	INERTIA ^= true;
1494	2156	}
1495	2157
1496		- void ToggleLocal()
1497		- {
1498		- LOCALTRANSFORM ^= true;
1499		- }
1500		-
1501		- void ToggleFast()
	2158	+ public void ToggleFast()
1502	2159	{
1503	2160	FAST ^= true;
1504	2161	}
1505	2162
1506		- void ToggleSlowPose()
	2163	+ public void ToggleSlowPose()
1507	2164	{
1508	2165	SLOWPOSE ^= true;
1509	2166	}
1510	2167
1511		- void ToggleFootContact()
1512		- {
1513		- FOOTCONTACT ^= true;
1514		- }
1515		-
1516		- void ToggleBoxMode()
	2168	+ public void ToggleBoxMode()
1517	2169	{
1518	2170	BOXMODE ^= true;
1519	2171	}
1520	2172
1521		- void ToggleSmoothFocus()
	2173	+ public void ToggleSmoothFocus()
1522	2174	{
1523	2175	SMOOTHFOCUS ^= true;
1524	2176	}
1525	2177
1526		- void ToggleImageFlip()
	2178	+ public void ToggleImageFlip()
1527	2179	{
1528	2180	IMAGEFLIP ^= true;
1529	2181	}
1530	2182
1531		- void ToggleSpeakerMocap()
	2183	+ public void ToggleSpeakerMocap()
1532	2184	{
1533	2185	SPEAKERMOCAP ^= true;
1534	2186	}
1535	2187
1536		- void ToggleSpeakerCamera()
	2188	+ public void ToggleSpeakerCamera()
1537	2189	{
1538	2190	SPEAKERCAMERA ^= true;
1539	2191	}
1540	2192
1541		- void ToggleSpeakerFocus()
	2193	+ public void ToggleSpeakerFocus()
1542	2194	{
1543	2195	SPEAKERFOCUS ^= true;
1544	2196	}
1545	2197
1546		- void ToggleDebug()
1547		- {
1548		- DEBUG ^= true;
1549		- }
1550		-
1551		- void ToggleFrustum()
	2198	+ public void ToggleFrustum()
1552	2199	{
1553	2200	FRUSTUM ^= true;
1554	2201	}
1555	2202
1556		- void ToggleTrack()
	2203	+ public void ToggleTrack()
1557	2204	{
1558	2205	TRACK ^= true;
1559	2206	if (TRACK)
..	..	@@ -1572,25 +2219,35 @@
1572	2219	repaint();
1573	2220	}
1574	2221
1575		- void ToggleTrackOnce()
	2222	+ public void ToggleTrackOnce()
1576	2223	{
1577	2224	TRACKONCE ^= true;
1578	2225	}
1579	2226
1580		- void ToggleShadowTrack()
	2227	+ public void ToggleShadowTrack()
1581	2228	{
1582	2229	SHADOWTRACK ^= true;
1583	2230	repaint();
1584	2231	}
1585	2232
1586		- void ToggleOeil()
	2233	+ public void ToggleOeil()
1587	2234	{
1588	2235	OEIL ^= true;
1589	2236	}
1590	2237
1591		- void ToggleOeilOnce()
	2238	+ public void ToggleOeilOnce()
1592	2239	{
1593	2240	OEILONCE ^= true;
	2241	+ }
	2242	+
	2243	+ void ToggleFootContact()
	2244	+ {
	2245	+ FOOTCONTACT ^= true;
	2246	+ }
	2247	+
	2248	+ void ToggleDebug()
	2249	+ {
	2250	+ DEBUG ^= true;
1594	2251	}
1595	2252
1596	2253	void ToggleLookAt()
..	..	@@ -7652,7 +8309,7 @@
7652	8309	return texture!=null?texture.texture:null;
7653	8310	}
7654	8311
7655		- com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8312	+ public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
7656	8313	{
7657	8314	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7658	8315
..	..	@@ -10340,7 +10997,7 @@
10340	10997	fragmentMode \|= (lightslot - 64) << 2; // 1; // first bit is available for aniso
10341	10998	//System.out.println("fragmentMode = " + fragmentMode);
10342	10999
10343		- if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| DEBUG_SELECTION)
	11000	+ if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| IsDebugSelection())
10344	11001	{
10345	11002	/*
10346	11003	if (CULLFACE \|\| (ambientOcclusion && OCCLUSION_CULLING))
..	..	@@ -10641,7 +11298,7 @@
10641	11298	callist = gl.glGenLists(1);
10642	11299	}
10643	11300
10644		- boolean selectmode = DrawMode() == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	11301	+ boolean selectmode = DrawMode() == SELECTION \|\| IsDebugSelection();
10645	11302
10646	11303	boolean active = !selectmode; // DrawMode() != SELECTION; // mouseDown;
10647	11304
..	..	@@ -13116,6 +13773,11 @@
13116	13773	cVector tmp2 = new cVector();
13117	13774	boolean isMoving;
13118	13775
	13776	+ public cVector TargetLookAt()
	13777	+ {
	13778	+ return targetLookAt;
	13779	+ }
	13780	+
13119	13781	class PingThread extends Thread
13120	13782	{
13121	13783	boolean jump;
..	..	@@ -13847,7 +14509,7 @@
13847	14509	SetMouseMode(modifiers);
13848	14510	}
13849	14511
13850		- theRenderer.keyPressed(key);
	14512	+ Globals.theRenderer.keyPressed(key);
13851	14513	}
13852	14514
13853	14515	int kompactbit = 4; // power bit
..	..	@@ -13859,7 +14521,7 @@
13859	14521	float SATPOW = 1; // 2; // 0.5f;
13860	14522	float BRIPOW = 1; // 0.5f; // 0.5f;
13861	14523
13862		- void keyPressed(int key)
	14524	+ public void keyPressed(int key)
13863	14525	{
13864	14526	if (key >= '0' && key <= '5')
13865	14527	clampbit = (key-'0');
..	..	@@ -14296,6 +14958,7 @@
14296	14958	}
14297	14959	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
14298	14960	}
	14961	+
14299	14962	static double OCCLUSIONBOOST = 1; // 0.5;
14300	14963
14301	14964	void keyReleased(int key, int modifiers)
..	..	@@ -14307,7 +14970,7 @@
14307	14970	}
14308	14971	}
14309	14972
14310		- protected void processKeyEvent(KeyEvent e)
	14973	+ public void processKeyEvent(KeyEvent e)
14311	14974	{
14312	14975	switch (e.getID())
14313	14976	{
..	..	@@ -15966,7 +16629,6 @@
15966	16629
15967	16630	class AntialiasBuffer implements GLEventListener
15968	16631	{
15969		-
15970	16632	CameraPane parent = null;
15971	16633
15972	16634	AntialiasBuffer(CameraPane p)
..	..	@@ -16359,7 +17021,7 @@
16359	17021	}
16360	17022	}
16361	17023
16362		- static void DrawPoints(CameraPane cpane)
	17024	+ static void DrawPoints(iCameraPane cpane)
16363	17025	{
16364	17026	for (int i=0; i<8; i++) // first and last are red
16365	17027	{
..	..	@@ -16391,10 +17053,11 @@
16391	17053	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
16392	17054	// Depth buffer format
16393	17055	//private int depth_format;
16394		- static public void NextIndex(Object3D o, GL gl)
	17056	+
	17057	+ public void NextIndex()
16395	17058	{
16396	17059	indexcount+=16;
16397		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17060	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
16398	17061	//objects[indexcount] = o;
16399	17062	//System.out.println("indexcount = " + indexcount);
16400	17063	}