~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -37,7 +37,6 @@
37	37	static boolean[] selectedstack = new boolean[65536];
38	38	static int materialdepth = 0;
39	39
40		- static boolean DEBUG = false;
41	40	static boolean FRUSTUM = false; // still bogus true; // frustum culling
42	41
43	42	// camera change fix
..	..	@@ -56,8 +55,6 @@
56	55	static int CURRENTANTIALIAS = 0; // 1;
57	56	/static/ boolean RENDERSHADOW = true;
58	57	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
59		- static boolean ANIMATION = false;
60		- static String filename;
61	58
62	59	boolean DISPLAYTEXT = false;
63	60	//boolean REDUCETEXTURE = true;
..	..	@@ -92,6 +89,8 @@
92	89
93	90	static int tickcount = 0; // slow pose issue
94	91
	92	+static boolean BUTTONLESSWHEEL = false;
	93	+static boolean ZOOMBOXMODE = false;
95	94	static boolean BOXMODE = false;
96	95	static boolean IMAGEFLIP = false;
97	96	static boolean SMOOTHFOCUS = false;
..	..	@@ -106,7 +105,7 @@
106	105	static boolean OEIL = true;
107	106	static boolean OEILONCE = false; // do oeilon then oeiloff
108	107	static boolean LOOKAT = true;
109		-static boolean RANDOM = true; // false;
	108	+static boolean SWITCH = true; // false;
110	109	static boolean HANDLES = false; // selection doesn't work!!
111	110	static boolean PAINTMODE = false;
112	111
..	..	@@ -149,12 +148,13 @@
149	148	defaultcaps.setAccumBlueBits(16);
150	149	defaultcaps.setAccumAlphaBits(16);
151	150	}
152		- static CameraPane theRenderer;
153		-
	151	+
	152	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	153	+
154	154	void SetAsGLRenderer(boolean b)
155	155	{
156	156	isRenderer = b;
157		- theRenderer = this;
	157	+ Globals.theRenderer = this;
158	158	}
159	159
160	160	CameraPane(Object3D o, Camera cam, boolean withcontext)
..	..	@@ -192,9 +192,43 @@
192	192
193	193	/// INTERFACE
194	194
	195	+ public javax.media.opengl.GL GetGL0()
	196	+ {
	197	+ return null;
	198	+ }
	199	+
	200	+ public int GenList()
	201	+ {
	202	+ javax.media.opengl.GL gl = GetGL();
	203	+ return gl.glGenLists(1);
	204	+ }
	205	+
	206	+ public void NewList(int id)
	207	+ {
	208	+ javax.media.opengl.GL gl = GetGL();
	209	+ gl.glNewList(id, gl.GL_COMPILE); //_AND_EXECUTE);
	210	+ }
	211	+
	212	+ public void CallList(int id)
	213	+ {
	214	+ javax.media.opengl.GL gl = GetGL();
	215	+ gl.glCallList(id);
	216	+ }
	217	+
	218	+ public void EndList()
	219	+ {
	220	+ javax.media.opengl.GL gl = GetGL();
	221	+ gl.glEndList();
	222	+ }
	223	+
195	224	public boolean IsBoxMode()
196	225	{
197	226	return BOXMODE;
	227	+ }
	228	+
	229	+ public boolean IsZoomBoxMode()
	230	+ {
	231	+ return ZOOMBOXMODE;
198	232	}
199	233
200	234	public void ClearDepth()
..	..	@@ -236,9 +270,14 @@
236	270	return this.ambientOcclusion;
237	271	}
238	272
	273	+ public boolean IsDebugSelection()
	274	+ {
	275	+ return DEBUG_SELECTION;
	276	+ }
	277	+
239	278	public boolean IsFrozen()
240	279	{
241		- boolean selectmode = this.DrawMode() == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	280	+ boolean selectmode = this.DrawMode() == SELECTION \|\| this.IsDebugSelection();
242	281
243	282	return !selectmode && cameracount == 0; // != 0;
244	283	}
..	..	@@ -259,9 +298,19 @@
259	298	return lightCamera;
260	299	}
261	300
	301	+ public Camera ManipCamera()
	302	+ {
	303	+ return manipCamera;
	304	+ }
	305	+
262	306	public Camera RenderCamera()
263	307	{
264	308	return renderCamera;
	309	+ }
	310	+
	311	+ public Camera[] Cameras()
	312	+ {
	313	+ return cameras;
265	314	}
266	315
267	316	public void PushMaterial(Object3D obj, boolean selected)
..	..	@@ -408,16 +457,18 @@
408	457
409	458	javax.media.opengl.GL gl = display.GetGL();
410	459
411		- boolean selectmode = display.DrawMode() == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	460	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
412	461
413	462	//System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
414	463	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
415	464	{
416	465	//gl.glBegin(gl.GL_TRIANGLES);
417		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	466	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	467	+ // TEST LIVE NORMALS && !obj.dontselect
	468	+ ;
418	469	if (!hasnorm)
419	470	{
420		- // System.out.println("FUCK!!");
	471	+ // System.out.println("Mesh normal");
421	472	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
422	473	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
423	474	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -760,7 +811,627 @@
760	811	//// tris.postdraw(this);
761	812	}
762	813
	814	+ static Camera localcamera = new Camera();
	815	+ static cVector from = new cVector();
	816	+ static cVector to = new cVector();
	817	+
	818	+ public void PrepOcclusion(BoundaryRep br, double[][] transform)
	819	+ {
	820	+ CameraPane cp = this;
	821	+
	822	+ Camera keep = cp.RenderCamera();
	823	+ cp.renderCamera = localcamera;
	824	+
	825	+ if (br.trimmed)
	826	+ {
	827	+ float[] colors = new float[br.positions.length / 3];
	828	+
	829	+ int i3 = 0;
	830	+ for (int i = 0; i < br.positions.length / 3; i++, i3 += 3)
	831	+ {
	832	+ if (br.normals[i3] == 0 && br.normals[i3+1] == 0 && br.normals[i3+2] == 0)
	833	+ continue;
	834	+
	835	+ from.set(br.positions[i3], br.positions[i3 + 1], br.positions[i3 + 2]);
	836	+ to.set(br.positions[i3] + br.normals[i3],
	837	+ br.positions[i3 + 1] + br.normals[i3 + 1],
	838	+ br.positions[i3 + 2] + br.normals[i3 + 2]);
	839	+ LA.xformPos(from, transform, from);
	840	+ LA.xformPos(to, transform, to); // RIGID ONLY
	841	+ localcamera.setAim(from, to);
	842	+
	843	+ CameraPane.occlusionbuffer.display();
	844	+
	845	+ if (CameraPane.DEBUG_OCCLUSION)
	846	+ cp.display(); // debug
	847	+
	848	+ colors[i] = cp.vertexOcclusion.r;
	849	+ //colors[i3 + 1] = cp.vertexOcclusion.g;
	850	+ //colors[i3 + 2] = cp.vertexOcclusion.b;
	851	+
	852	+ if ((i % 100) == 0 && i != 0)
	853	+ {
	854	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	855	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	856	+ System.out.println((int) (100.0 * i / (br.positions.length / 3)) + "% (" + i + " of " + (br.positions.length / 3) + ")");
	857	+ }
	858	+ }
	859	+
	860	+ br.colors = colors;
	861	+ }
	862	+ else
	863	+ {
	864	+ for (int i = 0; i < br.VertexCount(); i++)
	865	+ {
	866	+ Vertex v = br.GetVertex(i);
	867	+
	868	+ if (v.norm == null \|\| v.norm.x == 0 && v.norm.y == 0 && v.norm.z == 0)
	869	+ continue;
	870	+
	871	+ from.set(v.x, v.y, v.z);
	872	+ to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
	873	+ LA.xformPos(from, transform, from);
	874	+ LA.xformPos(to, transform, to); // RIGID ONLY
	875	+ localcamera.setAim(from, to);
	876	+
	877	+ CameraPane.occlusionbuffer.display();
	878	+
	879	+ if (CameraPane.DEBUG_OCCLUSION)
	880	+ cp.display(); // debug
	881	+
	882	+ v.AO = cp.vertexOcclusion.r;
	883	+
	884	+ if ((i % 100) == 0 && i != 0)
	885	+ {
	886	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	887	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	888	+ System.out.println((int) (100.0 * i / br.VertexCount()) + "% (" + i + " of " + br.VertexCount() + ")");
	889	+ }
	890	+ }
	891	+ }
	892	+
	893	+ //System.out.println("done.");
	894	+
	895	+ cp.renderCamera = keep;
	896	+ }
	897	+
	898	+ void DrawPointFLow(PointFlow pointFlow, Object3D /Composite/ root, boolean selected, boolean blocked)
	899	+ {
	900	+ CameraPane display = this;
	901	+ pointFlow.CreateHT();
	902	+
	903	+ float r = display.modelParams0[0];
	904	+ float g = display.modelParams0[1];
	905	+ float b = display.modelParams0[2];
	906	+ float opacity = display.modelParams5[1];
	907	+
	908	+ //final GL gl = GLU.getCurrentGL();
	909	+ GL gl = display.GetGL(); // getGL();
	910	+
	911	+ int s = pointFlow.points.size();
	912	+
	913	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	914	+ gl.glEnable(gl.GL_CULL_FACE);
	915	+
	916	+ for (int i=s; --i>=0;)
	917	+ //for (int i=0; i<s; i++)
	918	+ {
	919	+ cVector v = pointFlow.points.get(i);
	920	+
	921	+ double mindist = Double.MAX_VALUE;
	922	+
	923	+ double size = pointFlow.minimumSize;
	924	+
	925	+ double distancenext = 0;
	926	+
	927	+ if (i > 0)
	928	+ {
	929	+ cVector w = pointFlow.points.get(i-1);
	930	+
	931	+ double dist = w.distance(v);
	932	+
	933	+ distancenext = dist;
	934	+
	935	+ if (mindist > dist)
	936	+ {
	937	+ mindist = dist;
	938	+ size = mindist*pointFlow.resizefactor;
	939	+ }
	940	+ }
	941	+
	942	+ if (i < s-1)
	943	+ {
	944	+ cVector w = pointFlow.points.get(i+1);
	945	+
	946	+ double dist = w.distance(v);
	947	+
	948	+ if (mindist > dist)
	949	+ {
	950	+ mindist = dist;
	951	+ size = mindist*pointFlow.resizefactor;
	952	+ }
	953	+ }
	954	+
	955	+ if (size < pointFlow.minimumSize)
	956	+ size = pointFlow.minimumSize;
	957	+ if (size > pointFlow.maximumSize)
	958	+ size = pointFlow.maximumSize;
	959	+
	960	+ double tx = v.x;
	961	+ double ty = v.y;
	962	+ double tz = v.z;
	963	+
	964	+ // if (tx == 0 && ty == 0 && tz == 0)
	965	+ // continue;
	966	+
	967	+ gl.glMatrixMode(gl.GL_TEXTURE);
	968	+ gl.glPushMatrix();
	969	+ pointFlow.texmat[12] = pointFlow.texmat[13] = pointFlow.texmat[14] = i;
	970	+
	971	+ gl.glMultMatrixf(pointFlow.texmat, 0);
	972	+
	973	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	974	+ gl.glPushMatrix();
	975	+
	976	+ gl.glTranslated(tx,ty,tz);
	977	+
	978	+ gl.glScaled(size,size,size);
	979	+
	980	+// float cr = colorBuf.get(index4);
	981	+// float cg = colorBuf.get(index4+1);
	982	+// float cb = colorBuf.get(index4+2);
	983	+// float ca = colorBuf.get(index4+3);
	984	+//
	985	+// display.modelParams0[0] = r * cr;
	986	+// display.modelParams0[1] = g * cg;
	987	+// display.modelParams0[2] = b * cb;
	988	+//
	989	+// display.modelParams5[1] = opacity * ca;
	990	+//
	991	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	992	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	993	+//
	994	+// RandomNode.globalseed = (int)sizeBuf.get(index3+2); // i;
	995	+// RandomNode.globalseed2 = RandomNode.globalseed;
	996	+//
	997	+//// gl.glColor4f(cr,cg,cb,ca);
	998	+// // gl.glScalef(1024/16,1024/16,1024/16);
	999	+ pointFlow.geo.Draw/Node/(display,null,selected, blocked);
	1000	+
	1001	+ gl.glPopMatrix();
	1002	+
	1003	+ double step = size/4; //
	1004	+
	1005	+ if (i == 0 \|\| size == 0 \|\| distancenext > 8*size \|\| distancenext < step)
	1006	+ continue;
	1007	+
	1008	+ int nbsteps = (int)(distancenext/step);
	1009	+
	1010	+ step = distancenext/nbsteps;
	1011	+
	1012	+ cVector next = pointFlow.points.get(i-1);
	1013	+
	1014	+ tmp.set(next);
	1015	+ tmp.sub(v);
	1016	+ tmp.normalize();
	1017	+ tmp.mul(step);
	1018	+
	1019	+ // calculate next size
	1020	+ mindist = Double.MAX_VALUE;
	1021	+
	1022	+ double nextsize = pointFlow.minimumSize;
	1023	+
	1024	+ if (i > 1)
	1025	+ {
	1026	+ cVector w = pointFlow.points.get(i-2);
	1027	+
	1028	+ double dist = w.distance(next);
	1029	+
	1030	+ if (mindist > dist)
	1031	+ {
	1032	+ mindist = dist;
	1033	+ nextsize = mindist*pointFlow.resizefactor;
	1034	+ }
	1035	+ }
	1036	+
	1037	+ double dist = v.distance(next);
	1038	+
	1039	+ if (mindist > dist)
	1040	+ {
	1041	+ mindist = dist;
	1042	+ nextsize = mindist*pointFlow.resizefactor;
	1043	+ }
	1044	+
	1045	+ if (nextsize < pointFlow.minimumSize)
	1046	+ nextsize = pointFlow.minimumSize;
	1047	+ if (nextsize > pointFlow.maximumSize)
	1048	+ nextsize = pointFlow.maximumSize;
	1049	+ //
	1050	+
	1051	+ double count = 0;
	1052	+
	1053	+ while (distancenext > 0.000000001) // step
	1054	+ {
	1055	+ gl.glPushMatrix();
	1056	+
	1057	+ gl.glTranslated(tx + tmp.xcount, ty + tmp.ycount, tz + tmp.z*count);
	1058	+
	1059	+ double K = count/nbsteps;
	1060	+
	1061	+ double intersize = Knextsize + (1-K)size;
	1062	+
	1063	+ gl.glScaled(intersize,intersize,intersize);
	1064	+
	1065	+ pointFlow.geo.Draw/Node/(display,null,selected,blocked);
	1066	+
	1067	+ count++;
	1068	+
	1069	+ distancenext -= step;
	1070	+
	1071	+ gl.glPopMatrix();
	1072	+ }
	1073	+
	1074	+ if (count != nbsteps)
	1075	+ assert(count == nbsteps);
	1076	+
	1077	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	1078	+ //gl.glTranslatef(-tx,-ty,-tz);
	1079	+
	1080	+ gl.glMatrixMode(gl.GL_TEXTURE);
	1081	+ gl.glPopMatrix();
	1082	+ }
	1083	+
	1084	+ if (!cf)
	1085	+ gl.glDisable(gl.GL_CULL_FACE);
	1086	+
	1087	+// display.modelParams0[0] = r;
	1088	+// display.modelParams0[1] = g;
	1089	+// display.modelParams0[2] = b;
	1090	+//
	1091	+// display.modelParams5[1] = opacity;
	1092	+//
	1093	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1094	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1095	+
	1096	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	1097	+ }
	1098	+
	1099	+ public void DrawBox(cVector min, cVector max)
	1100	+ {
	1101	+ javax.media.opengl.GL gl = GetGL();
	1102	+ gl.glBegin(gl.GL_LINES);
	1103	+
	1104	+ gl.glVertex3d(min.x, min.y, min.z);
	1105	+ gl.glVertex3d(min.x, min.y, max.z);
	1106	+ gl.glVertex3d(min.x, min.y, min.z);
	1107	+ gl.glVertex3d(min.x, max.y, min.z);
	1108	+ gl.glVertex3d(min.x, min.y, min.z);
	1109	+ gl.glVertex3d(max.x, min.y, min.z);
	1110	+
	1111	+ gl.glVertex3d(max.x, max.y, max.z);
	1112	+ gl.glVertex3d(min.x, max.y, max.z);
	1113	+ gl.glVertex3d(max.x, max.y, max.z);
	1114	+ gl.glVertex3d(max.x, min.y, max.z);
	1115	+ gl.glVertex3d(max.x, max.y, max.z);
	1116	+ gl.glVertex3d(max.x, max.y, min.z);
	1117	+
	1118	+ gl.glEnd();
	1119	+ }
	1120	+
	1121	+ public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
	1122	+ {
	1123	+ int[] strips = bRep.getRawIndices();
	1124	+
	1125	+ javax.media.opengl.GL gl = GetGL();
	1126	+
	1127	+ // TRIANGLE STRIP ARRAY
	1128	+ if (bRep.trimmed)
	1129	+ {
	1130	+ float[] v = bRep.getRawVertices();
	1131	+ float[] n = bRep.getRawNormals();
	1132	+ float[] c = bRep.getRawColors();
	1133	+ float[] uv = bRep.getRawUVMap();
	1134	+
	1135	+ int count2 = 0;
	1136	+ int count3 = 0;
	1137	+
	1138	+ if (n.length > 0)
	1139	+ {
	1140	+ for (int i = 0; i < strips.length; i++)
	1141	+ {
	1142	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1143	+
	1144	+ /*
	1145	+ boolean locked = false;
	1146	+ float eps = 0.1f;
	1147	+ boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	1148	+
	1149	+ int dot = 0;
	1150	+
	1151	+ if ((dot&1) == 0)
	1152	+ dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	1153	+
	1154	+ if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	1155	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	1156	+ else
	1157	+ {
	1158	+ locked = true;
	1159	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1160	+ }
	1161	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	1162	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	1163	+ if (hasnorm)
	1164	+ {
	1165	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	1166	+ gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
	1167	+ }
	1168	+
	1169	+ if ((dot&4) == 0)
	1170	+ dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	1171	+
	1172	+ if (wrap \|\| !locked && (dot&8) != 0)
	1173	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	1174	+ else
	1175	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1176	+
	1177	+ f.dot = dot;
	1178	+ */
	1179	+
	1180	+ if (!selectmode)
	1181	+ {
	1182	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1183	+ {
	1184	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1185	+ } else
	1186	+ {
	1187	+ gl.glNormal3f(0, 0, 1);
	1188	+ }
	1189	+
	1190	+ if (c != null)
	1191	+ //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
	1192	+ {
	1193	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1194	+ }
	1195	+ }
	1196	+
	1197	+ if (flipV)
	1198	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1199	+ else
	1200	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1201	+
	1202	+ //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1203	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1204	+
	1205	+ count2 += 2;
	1206	+ count3 += 3;
	1207	+ if (!selectmode)
	1208	+ {
	1209	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1210	+ {
	1211	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1212	+ } else
	1213	+ {
	1214	+ gl.glNormal3f(0, 0, 1);
	1215	+ }
	1216	+ if (c != null)
	1217	+ {
	1218	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1219	+ }
	1220	+ }
	1221	+
	1222	+ if (flipV)
	1223	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1224	+ else
	1225	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1226	+
	1227	+ //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1228	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1229	+
	1230	+ count2 += 2;
	1231	+ count3 += 3;
	1232	+ for (int j = 0; j < strips[i] - 2; j++)
	1233	+ {
	1234	+ //gl.glTexCoord2d(...);
	1235	+ if (!selectmode)
	1236	+ {
	1237	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1238	+ {
	1239	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1240	+ } else
	1241	+ {
	1242	+ gl.glNormal3f(0, 0, 1);
	1243	+ }
	1244	+ if (c != null)
	1245	+ {
	1246	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1247	+ }
	1248	+ }
	1249	+
	1250	+ if (flipV)
	1251	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1252	+ else
	1253	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1254	+
	1255	+ //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
	1256	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1257	+
	1258	+ count2 += 2;
	1259	+ count3 += 3;
	1260	+ }
	1261	+
	1262	+ gl.glEnd();
	1263	+ }
	1264	+ }
	1265	+
	1266	+ assert count3 == v.length;
	1267	+ }
	1268	+ else // !trimmed
	1269	+ {
	1270	+ int count = 0;
	1271	+ for (int i = 0; i < strips.length; i++)
	1272	+ {
	1273	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1274	+
	1275	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	1276	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	1277	+
	1278	+ drawVertex(gl, p, flipV, selectmode);
	1279	+ drawVertex(gl, q, flipV, selectmode);
	1280	+
	1281	+ for (int j = 0; j < strips[i] - 2; j++)
	1282	+ {
	1283	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	1284	+
	1285	+ // if (j%2 == 0)
	1286	+ // drawFace(p, q, r, display, null);
	1287	+ // else
	1288	+ // drawFace(p, r, q, display, null);
	1289	+
	1290	+ // p = q;
	1291	+ // q = r;
	1292	+ drawVertex(gl, r, flipV, selectmode);
	1293	+ }
	1294	+
	1295	+ gl.glEnd();
	1296	+ }
	1297	+ }
	1298	+ }
	1299	+
	1300	+ static cSpring.Point3D temp = new cSpring.Point3D();
	1301	+ static cSpring.Point3D temp2 = new cSpring.Point3D();
	1302	+ static cSpring.Point3D temp3 = new cSpring.Point3D();
	1303	+
	1304	+ public void DrawDynamicMesh(cMesh mesh)
	1305	+ {
	1306	+ GL gl = GetGL(); // getGL();
	1307	+
	1308	+ cSpring.PhysicsController3D Phys = mesh.Phys;
	1309	+
	1310	+ gl.glDisable(gl.GL_LIGHTING);
	1311	+
	1312	+ gl.glLineWidth(1);
	1313	+ gl.glColor3f(1,1,1);
	1314	+ gl.glBegin(gl.GL_LINES);
	1315	+ double scale = 0;
	1316	+ int count = 0;
	1317	+ for (int s=0; s<Phys.allSprings.size(); s++)
	1318	+ {
	1319	+ cSpring.Spring spring = Phys.allSprings.get(s);
	1320	+ if(s == 0)
	1321	+ {
	1322	+ //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
	1323	+ }
	1324	+ if (mesh.showsprings)
	1325	+ {
	1326	+ temp.set(spring.a.position);
	1327	+ temp.add(spring.b.position);
	1328	+ temp.mul(0.5);
	1329	+ temp2.set(spring.a.position);
	1330	+ temp2.sub(spring.b.position);
	1331	+ temp2.mul(spring.restLength/2);
	1332	+ temp.sub(temp2);
	1333	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1334	+ temp.add(temp2);
	1335	+ temp.add(temp2);
	1336	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1337	+ }
	1338	+
	1339	+ if (spring.isHandle)
	1340	+ continue;
	1341	+
	1342	+ //if (scale < spring.restLength)
	1343	+ scale += spring.restLength;
	1344	+ count++;
	1345	+ }
	1346	+ gl.glEnd();
	1347	+
	1348	+ if (count == 0)
	1349	+ scale = 0.01;
	1350	+ else
	1351	+ scale /= count * 3;
	1352	+
	1353	+ //scale = 0.25;
	1354	+
	1355	+ if (mesh.ShowInfo())
	1356	+ {
	1357	+ gl.glLineWidth(4);
	1358	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1359	+ {
	1360	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1361	+ if (node.mass == 0)
	1362	+ continue;
	1363	+
	1364	+ int i = node.springs==null?-1:node.springs.size();
	1365	+ gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
	1366	+ //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
	1367	+ //temp.normalize();
	1368	+ //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
	1369	+ gl.glBegin(gl.GL_LINES);
	1370	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1371	+ //gl.glVertex3d(node.position.x + node.normal.xscale, node.position.y + node.normal.yscale, node.position.z + node.normal.z*scale);
	1372	+ gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
	1373	+ node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
	1374	+ node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
	1375	+ gl.glEnd();
	1376	+ }
	1377	+
	1378	+ gl.glLineWidth(8);
	1379	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1380	+ {
	1381	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1382	+
	1383	+ if (node.springs != null)
	1384	+ {
	1385	+ for (int i=0; i<node.springs.size(); i+=1)
	1386	+ {
	1387	+ cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
	1388	+
	1389	+ int c = i+1;
	1390	+ // c = node.springs.get(i).nbcopies;
	1391	+
	1392	+ gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
	1393	+ gl.glBegin(gl.GL_LINES);
	1394	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1395	+ 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);
	1396	+ gl.glEnd();
	1397	+ }
	1398	+ }
	1399	+ }
	1400	+
	1401	+ gl.glLineWidth(1);
	1402	+ }
	1403	+
	1404	+ gl.glEnable(gl.GL_LIGHTING);
	1405	+ }
	1406	+
763	1407	/// INTERFACE
	1408	+
	1409	+ public void StartTriangles()
	1410	+ {
	1411	+ javax.media.opengl.GL gl = GetGL();
	1412	+ gl.glBegin(gl.GL_TRIANGLES);
	1413	+ }
	1414	+
	1415	+ public void EndTriangles()
	1416	+ {
	1417	+ GetGL().glEnd();
	1418	+ }
	1419	+
	1420	+ void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
	1421	+ {
	1422	+ if (!selectmode)
	1423	+ {
	1424	+ gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1425	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	1426	+
	1427	+ if (flipV)
	1428	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	1429	+ else
	1430	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1431	+ }
	1432	+
	1433	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	1434	+ }
764	1435
765	1436	void SetColor(Object3D obj, Vertex p0)
766	1437	{
..	..	@@ -955,18 +1626,18 @@
955	1626	//col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
956	1627	if (!material.multiply)
957	1628	{
958		- display.color = color;
	1629	+ display.color = material.color;
959	1630	display.saturation = material.modulation;
960	1631	}
961	1632	else
962	1633	{
963		- display.color = color2;
	1634	+ display.color = material.color2;
964	1635	display.saturation = material.modulation2;
965	1636	}
966	1637
967	1638	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
968	1639
969		- float[] colorV = GrafreeD.colorV;
	1640	+ float[] colorV = Grafreed.colorV;
970	1641
971	1642	/**/
972	1643	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1226,7 +1897,7 @@
1226	1897	void PushMatrix(double[][] matrix)
1227	1898	{
1228	1899	// GrafreeD.tracein(matrix);
1229		- PushMatrix(matrix,1);
	1900	+ PushMatrix(matrix, 1);
1230	1901	}
1231	1902
1232	1903	void PushMatrix()
..	..	@@ -1323,7 +1994,7 @@
1323	1994
1324	1995	static int camerachangeframe;
1325	1996
1326		- boolean SetCamera(Camera cam)
	1997	+ public boolean SetCamera(Camera cam)
1327	1998	{
1328	1999	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
1329	2000	// return false;
..	..	@@ -1451,33 +2122,6 @@
1451	2122	mainDL ^= true;
1452	2123	}
1453	2124
1454		- void ToggleTexture()
1455		- {
1456		- textureon ^= true;
1457		- }
1458		-
1459		- void ToggleLive()
1460		- {
1461		- Globals.setLIVE(Globals.isLIVE() ^ true);
1462		-
1463		- System.err.println("LIVE = " + Globals.isLIVE());
1464		-
1465		- if (!Globals.isLIVE()) // save sound
1466		- GrafreeD.savesound = true; // wav.save();
1467		- // else
1468		- repaint(); // start loop // may 2013
1469		- }
1470		-
1471		- void ToggleSupport()
1472		- {
1473		- SUPPORT ^= true;
1474		- }
1475		-
1476		- void ToggleAbort()
1477		- {
1478		- ABORTMODE ^= true;
1479		- }
1480		-
1481	2125	void ToggleFullScreen()
1482	2126	{
1483	2127	FULLSCREEN ^= true;
..	..	@@ -1488,72 +2132,94 @@
1488	2132	Globals.CROWD ^= true;
1489	2133	}
1490	2134
1491		- void ToggleInertia()
1492		- {
1493		- INERTIA ^= true;
1494		- }
1495		-
1496	2135	void ToggleLocal()
1497	2136	{
1498	2137	LOCALTRANSFORM ^= true;
1499	2138	}
1500	2139
1501		- void ToggleFast()
	2140	+ public void ToggleTexture()
	2141	+ {
	2142	+ textureon ^= true;
	2143	+ }
	2144	+
	2145	+ public void ToggleLive()
	2146	+ {
	2147	+ Globals.setLIVE(Globals.isLIVE() ^ true);
	2148	+
	2149	+ System.err.println("LIVE = " + Globals.isLIVE());
	2150	+
	2151	+ if (!Globals.isLIVE()) // save sound
	2152	+ Grafreed.savesound = true; // wav.save();
	2153	+ // else
	2154	+ repaint(); // start loop // may 2013
	2155	+ }
	2156	+
	2157	+ public void ToggleSupport()
	2158	+ {
	2159	+ SUPPORT ^= true;
	2160	+ }
	2161	+
	2162	+ public void ToggleAbort()
	2163	+ {
	2164	+ ABORTMODE ^= true;
	2165	+ }
	2166	+
	2167	+ public void ToggleInertia()
	2168	+ {
	2169	+ INERTIA ^= true;
	2170	+ }
	2171	+
	2172	+ public void ToggleFast()
1502	2173	{
1503	2174	FAST ^= true;
1504	2175	}
1505	2176
1506		- void ToggleSlowPose()
	2177	+ public void ToggleSlowPose()
1507	2178	{
1508	2179	SLOWPOSE ^= true;
1509	2180	}
1510	2181
1511		- void ToggleFootContact()
1512		- {
1513		- FOOTCONTACT ^= true;
1514		- }
1515		-
1516		- void ToggleBoxMode()
	2182	+ public void ToggleBoxMode()
1517	2183	{
1518	2184	BOXMODE ^= true;
1519	2185	}
1520	2186
1521		- void ToggleSmoothFocus()
	2187	+ public void ToggleZoomBoxMode()
	2188	+ {
	2189	+ ZOOMBOXMODE ^= true;
	2190	+ }
	2191	+
	2192	+ public void ToggleSmoothFocus()
1522	2193	{
1523	2194	SMOOTHFOCUS ^= true;
1524	2195	}
1525	2196
1526		- void ToggleImageFlip()
	2197	+ public void ToggleImageFlip()
1527	2198	{
1528	2199	IMAGEFLIP ^= true;
1529	2200	}
1530	2201
1531		- void ToggleSpeakerMocap()
	2202	+ public void ToggleSpeakerMocap()
1532	2203	{
1533	2204	SPEAKERMOCAP ^= true;
1534	2205	}
1535	2206
1536		- void ToggleSpeakerCamera()
	2207	+ public void ToggleSpeakerCamera()
1537	2208	{
1538	2209	SPEAKERCAMERA ^= true;
1539	2210	}
1540	2211
1541		- void ToggleSpeakerFocus()
	2212	+ public void ToggleSpeakerFocus()
1542	2213	{
1543	2214	SPEAKERFOCUS ^= true;
1544	2215	}
1545	2216
1546		- void ToggleDebug()
1547		- {
1548		- DEBUG ^= true;
1549		- }
1550		-
1551		- void ToggleFrustum()
	2217	+ public void ToggleFrustum()
1552	2218	{
1553	2219	FRUSTUM ^= true;
1554	2220	}
1555	2221
1556		- void ToggleTrack()
	2222	+ public void ToggleTrack()
1557	2223	{
1558	2224	TRACK ^= true;
1559	2225	if (TRACK)
..	..	@@ -1572,25 +2238,35 @@
1572	2238	repaint();
1573	2239	}
1574	2240
1575		- void ToggleTrackOnce()
	2241	+ public void ToggleTrackOnce()
1576	2242	{
1577	2243	TRACKONCE ^= true;
1578	2244	}
1579	2245
1580		- void ToggleShadowTrack()
	2246	+ public void ToggleShadowTrack()
1581	2247	{
1582	2248	SHADOWTRACK ^= true;
1583	2249	repaint();
1584	2250	}
1585	2251
1586		- void ToggleOeil()
	2252	+ public void ToggleOeil()
1587	2253	{
1588	2254	OEIL ^= true;
1589	2255	}
1590	2256
1591		- void ToggleOeilOnce()
	2257	+ public void ToggleOeilOnce()
1592	2258	{
1593	2259	OEILONCE ^= true;
	2260	+ }
	2261	+
	2262	+ void ToggleFootContact()
	2263	+ {
	2264	+ FOOTCONTACT ^= true;
	2265	+ }
	2266	+
	2267	+ void ToggleDebug()
	2268	+ {
	2269	+ Globals.DEBUG ^= true;
1594	2270	}
1595	2271
1596	2272	void ToggleLookAt()
..	..	@@ -1598,9 +2274,9 @@
1598	2274	LOOKAT ^= true;
1599	2275	}
1600	2276
1601		- void ToggleRandom()
	2277	+ void ToggleSwitch()
1602	2278	{
1603		- RANDOM ^= true;
	2279	+ SWITCH ^= true;
1604	2280	}
1605	2281
1606	2282	void ToggleHandles()
..	..	@@ -1707,7 +2383,7 @@
1707	2383	{
1708	2384	return currentGL;
1709	2385	}
1710		-
	2386	+
1711	2387	/**/
1712	2388	class CacheTexture
1713	2389	{
..	..	@@ -3539,6 +4215,7 @@
3539	4215
3540	4216	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
3541	4217	{
	4218	+ new Exception().printStackTrace();
3542	4219	System.exit(0);
3543	4220	com.sun.opengl.util.texture.Texture texture = null;
3544	4221
..	..	@@ -7251,6 +7928,64 @@
7251	7928	ReleaseTexture(pigment, false);
7252	7929	}
7253	7930
	7931	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	7932	+ {
	7933	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7934	+ {
	7935	+ return;
	7936	+ }
	7937	+
	7938	+ if (tex == null)
	7939	+ {
	7940	+ ReleaseTexture(null, false);
	7941	+ return;
	7942	+ }
	7943	+
	7944	+ String pigment = Object3D.GetPigment(tex);
	7945	+
	7946	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7947	+ {
	7948	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7949	+ // System.out.println("; bump = " + bump);
	7950	+ }
	7951	+
	7952	+ if (pigment.equals(""))
	7953	+ {
	7954	+ pigment = null;
	7955	+ }
	7956	+
	7957	+ ReleaseTexture(pigment, false);
	7958	+ }
	7959	+
	7960	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	7961	+ {
	7962	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7963	+ {
	7964	+ return;
	7965	+ }
	7966	+
	7967	+ if (tex == null)
	7968	+ {
	7969	+ ReleaseTexture(null, true);
	7970	+ return;
	7971	+ }
	7972	+
	7973	+ String bump = Object3D.GetBump(tex);
	7974	+
	7975	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7976	+ {
	7977	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7978	+ // System.out.println("; bump = " + bump);
	7979	+ }
	7980	+
	7981	+ if (bump.equals(""))
	7982	+ {
	7983	+ bump = null;
	7984	+ }
	7985	+
	7986	+ ReleaseTexture(bump, true);
	7987	+ }
	7988	+
7254	7989	void ReleaseTexture(String tex, boolean bump)
7255	7990	{
7256	7991	if (// DrawMode() != 0 \|\| /tex == null \|\|/
..	..	@@ -7354,7 +8089,7 @@
7354	8089	}
7355	8090	}
7356	8091
7357		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8092	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
7358	8093	{
7359	8094	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7360	8095	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7399,7 +8134,94 @@
7399	8134	return; // true;
7400	8135	}
7401	8136
7402		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8137	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8138	+ {
	8139	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8140	+ ambientOcclusion ) // \|\| !textureon)
	8141	+ {
	8142	+ return; // false;
	8143	+ }
	8144	+
	8145	+ if (tex == null)
	8146	+ {
	8147	+ BindTexture(null,false,resolution);
	8148	+ return;
	8149	+ }
	8150	+
	8151	+ String pigment = Object3D.GetPigment(tex);
	8152	+
	8153	+ usedtextures.put(pigment, pigment);
	8154	+
	8155	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8156	+ {
	8157	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8158	+ // System.out.println("; bump = " + bump);
	8159	+ }
	8160	+
	8161	+ if (pigment.equals(""))
	8162	+ {
	8163	+ pigment = null;
	8164	+ }
	8165	+
	8166	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8167	+ BindTexture(pigment, false, resolution);
	8168	+ }
	8169	+
	8170	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8171	+ {
	8172	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8173	+ ambientOcclusion ) // \|\| !textureon)
	8174	+ {
	8175	+ return; // false;
	8176	+ }
	8177	+
	8178	+ if (tex == null)
	8179	+ {
	8180	+ BindTexture(null,true,resolution);
	8181	+ return;
	8182	+ }
	8183	+
	8184	+ String bump = Object3D.GetBump(tex);
	8185	+
	8186	+ usedtextures.put(bump, bump);
	8187	+
	8188	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8189	+ {
	8190	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8191	+ // System.out.println("; bump = " + bump);
	8192	+ }
	8193	+
	8194	+ if (bump.equals(""))
	8195	+ {
	8196	+ bump = null;
	8197	+ }
	8198	+
	8199	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8200	+ BindTexture(bump, true, resolution);
	8201	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8202	+ }
	8203	+
	8204	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8205	+
	8206	+ private boolean FileExists(String tex)
	8207	+ {
	8208	+ if (missingTextures.contains(tex))
	8209	+ {
	8210	+ return false;
	8211	+ }
	8212	+
	8213	+ boolean fileExists = new File(tex).exists();
	8214	+
	8215	+ if (!fileExists)
	8216	+ {
	8217	+ // If file exists, the "new File()" is not executed sgain
	8218	+ missingTextures.add(tex);
	8219	+ }
	8220	+
	8221	+ return fileExists;
	8222	+ }
	8223	+
	8224	+ CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
7403	8225	{
7404	8226	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7405	8227
..	..	@@ -7407,12 +8229,18 @@
7407	8229	{
7408	8230	String texname = tex;
7409	8231
7410		- String[] split = tex.split("Textures");
7411		- if (split.length > 1)
7412		- texname = "/Users/nbriere/Textures" + split[split.length-1];
7413		- else
7414		- if (!texname.startsWith("/"))
7415		- texname = "/Users/nbriere/Textures/" + texname;
	8232	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8233	+
	8234	+// String[] split = tex.split("Textures");
	8235	+// if (split.length > 1)
	8236	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8237	+// else
	8238	+// if (!texname.startsWith("/"))
	8239	+// texname = "/Users/nbriere/Textures/" + texname;
	8240	+ if (!FileExists(tex))
	8241	+ {
	8242	+ texname = fallbackTextureName;
	8243	+ }
7416	8244
7417	8245	if (CACHETEXTURE)
7418	8246	texture = textures.get(texname); // TEXTURE CACHE
..	..	@@ -7481,7 +8309,7 @@
7481	8309	}
7482	8310
7483	8311	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
7484		- if (!new File(cachename).exists())
	8312	+ if (!FileExists(cachename))
7485	8313	cachename = texname;
7486	8314	else
7487	8315	processbump = false; // don't process bump map again
..	..	@@ -7503,7 +8331,7 @@
7503	8331	}
7504	8332
7505	8333	cachename = texname.substring(0, texname.length()-4)+ext+".png";
7506		- if (!new File(cachename).exists())
	8334	+ if (!FileExists(cachename))
7507	8335	cachename = texname;
7508	8336	else
7509	8337	processbump = false; // don't process bump map again
..	..	@@ -7512,7 +8340,9 @@
7512	8340	texturedata = GetFileTexture(cachename, processbump, resolution);
7513	8341
7514	8342
7515		- if (texturedata != null)
	8343	+ if (texturedata == null)
	8344	+ throw new Exception();
	8345	+
7516	8346	texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
7517	8347	//texture = GetTexture(tex, bump);
7518	8348	}
..	..	@@ -7634,7 +8464,7 @@
7634	8464	return texture;
7635	8465	}
7636	8466
7637		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8467	+ com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
7638	8468	{
7639	8469	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7640	8470
..	..	@@ -7652,14 +8482,14 @@
7652	8482	return texture!=null?texture.texture:null;
7653	8483	}
7654	8484
7655		- com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8485	+ public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
7656	8486	{
7657	8487	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7658	8488
7659	8489	return texture!=null?texture.texturedata:null;
7660	8490	}
7661	8491
7662		- boolean BindTexture(String tex, boolean bump, int resolution)
	8492	+ boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
7663	8493	{
7664	8494	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
7665	8495	{
..	..	@@ -8636,8 +9466,8 @@
8636	9466	assert (parentcam != renderCamera);
8637	9467
8638	9468	if (renderCamera != lightCamera)
8639		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8640		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9469	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9470	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
8641	9471
8642	9472	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
8643	9473
..	..	@@ -8652,8 +9482,8 @@
8652	9482	LA.matCopy(renderCamera.fromScreen, matrix);
8653	9483
8654	9484	if (renderCamera != lightCamera)
8655		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8656		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9485	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9486	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
8657	9487
8658	9488	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
8659	9489
..	..	@@ -8725,7 +9555,7 @@
8725	9555	//gl.glFlush();
8726	9556	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
8727	9557
8728		- if (ANIMATION && ABORTED)
	9558	+ if (Globals.ANIMATION && ABORTED)
8729	9559	{
8730	9560	System.err.println(" ABORTED FRAME");
8731	9561	break;
..	..	@@ -8755,7 +9585,7 @@
8755	9585	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
8756	9586
8757	9587	// save image
8758		- if (ANIMATION && !ABORTED)
	9588	+ if (Globals.ANIMATION && !ABORTED)
8759	9589	{
8760	9590	VPwidth = viewport[2];
8761	9591	VPheight = viewport[3];
..	..	@@ -8866,11 +9696,11 @@
8866	9696
8867	9697	// imagecount++;
8868	9698
8869		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9699	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
8870	9700
8871	9701	if (!BOXMODE)
8872	9702	{
8873		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9703	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
8874	9704	}
8875	9705
8876	9706	if (!BOXMODE)
..	..	@@ -8908,7 +9738,7 @@
8908	9738	ABORTED = false;
8909	9739	}
8910	9740	else
8911		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9741	+ Grafreed.wav.cursor += 735 * ACSIZE;
8912	9742
8913	9743	if (false)
8914	9744	{
..	..	@@ -9571,11 +10401,11 @@
9571	10401
9572	10402	public void display(GLAutoDrawable drawable)
9573	10403	{
9574		- if (GrafreeD.savesound && GrafreeD.hassound)
	10404	+ if (Grafreed.savesound && Grafreed.hassound)
9575	10405	{
9576		- GrafreeD.wav.save();
9577		- GrafreeD.savesound = false;
9578		- GrafreeD.hassound = false;
	10406	+ Grafreed.wav.save();
	10407	+ Grafreed.savesound = false;
	10408	+ Grafreed.hassound = false;
9579	10409	}
9580	10410	// if (DEBUG_SELECTION)
9581	10411	// {
..	..	@@ -9705,7 +10535,7 @@
9705	10535	Object3D theobject = object;
9706	10536	Object3D theparent = object.parent;
9707	10537	object.parent = null;
9708		- object = (Object3D)GrafreeD.clone(object);
	10538	+ object = (Object3D)Grafreed.clone(object);
9709	10539	object.Stripify();
9710	10540	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
9711	10541	theobject.PreprocessOcclusion(this);
..	..	@@ -9718,13 +10548,13 @@
9718	10548	ambientOcclusion = false;
9719	10549	}
9720	10550
9721		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10551	+ if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
9722	10552	{
9723	10553	//if (RENDERSHADOW) // ?
9724	10554	if (!IsFrozen())
9725	10555	{
9726	10556	// dec 2012
9727		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10557	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
9728	10558	{
9729	10559	Globals.framecount++;
9730	10560	shadowbuffer.display();
..	..	@@ -9851,8 +10681,8 @@
9851	10681
9852	10682	// if (parentcam != renderCamera) // not a light
9853	10683	if (cam != lightCamera)
9854		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9855		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10684	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10685	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9856	10686
9857	10687	for (int j = 0; j < 4; j++)
9858	10688	{
..	..	@@ -9866,8 +10696,8 @@
9866	10696
9867	10697	// if (parentcam != renderCamera) // not a light
9868	10698	if (cam != lightCamera)
9869		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9870		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10699	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10700	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9871	10701
9872	10702	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
9873	10703
..	..	@@ -10126,7 +10956,16 @@
10126	10956	// Bump noise
10127	10957	gl.glActiveTexture(GL.GL_TEXTURE6);
10128	10958	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10129		- BindTexture(NOISE_TEXTURE, false, 2);
	10959	+
	10960	+ try
	10961	+ {
	10962	+ BindTexture(NOISE_TEXTURE, false, 2);
	10963	+ }
	10964	+ catch (Exception e)
	10965	+ {
	10966	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	10967	+ }
	10968	+
10130	10969
10131	10970	gl.glActiveTexture(GL.GL_TEXTURE0);
10132	10971	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10251,8 +11090,8 @@
10251	11090	System.err.println("parentcam != renderCamera");
10252	11091
10253	11092	// if (cam != lightCamera)
10254		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10255		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11093	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11094	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10256	11095	}
10257	11096
10258	11097	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10273,8 +11112,8 @@
10273	11112	if (true) // TODO
10274	11113	{
10275	11114	if (cam != lightCamera)
10276		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10277		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11115	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11116	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10278	11117	}
10279	11118
10280	11119	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -10340,7 +11179,7 @@
10340	11179	fragmentMode \|= (lightslot - 64) << 2; // 1; // first bit is available for aniso
10341	11180	//System.out.println("fragmentMode = " + fragmentMode);
10342	11181
10343		- if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| DEBUG_SELECTION)
	11182	+ if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| IsDebugSelection())
10344	11183	{
10345	11184	/*
10346	11185	if (CULLFACE \|\| (ambientOcclusion && OCCLUSION_CULLING))
..	..	@@ -10590,8 +11429,14 @@
10590	11429	{
10591	11430	renderpass++;
10592	11431	// System.out.println("Draw object... ");
	11432	+ STEP = 1;
10593	11433	if (FAST) // in case there is no script
10594		- STEP = 16;
	11434	+ STEP = 8;
	11435	+
	11436	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11437	+ {
	11438	+ STEP *= 4;
	11439	+ }
10595	11440
10596	11441	//object.FullInvariants();
10597	11442
..	..	@@ -10605,13 +11450,31 @@
10605	11450	e.printStackTrace();
10606	11451	}
10607	11452
10608		- if (GrafreeD.RENDERME > 0)
10609		- GrafreeD.RENDERME--; // mechante magouille
	11453	+ if (Grafreed.RENDERME > 0)
	11454	+ Grafreed.RENDERME--; // mechante magouille
10610	11455
10611	11456	Globals.ONESTEP = false;
10612	11457	}
10613	11458
10614	11459	static boolean zoomonce = false;
	11460	+
	11461	+ void CreateSelectedPoint()
	11462	+ {
	11463	+ if (selectedpoint == null)
	11464	+ {
	11465	+ debugpointG = new Sphere();
	11466	+ debugpointP = new Sphere();
	11467	+ debugpointC = new Sphere();
	11468	+ debugpointR = new Sphere();
	11469	+
	11470	+ selectedpoint = new Superellipsoid();
	11471	+
	11472	+ for (int i=0; i<8; i++)
	11473	+ {
	11474	+ debugpoints[i] = new Sphere();
	11475	+ }
	11476	+ }
	11477	+ }
10615	11478
10616	11479	void DrawObject(GL gl, boolean draw)
10617	11480	{
..	..	@@ -10641,7 +11504,7 @@
10641	11504	callist = gl.glGenLists(1);
10642	11505	}
10643	11506
10644		- boolean selectmode = DrawMode() == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	11507	+ boolean selectmode = DrawMode() == SELECTION \|\| IsDebugSelection();
10645	11508
10646	11509	boolean active = !selectmode; // DrawMode() != SELECTION; // mouseDown;
10647	11510
..	..	@@ -10676,7 +11539,14 @@
10676	11539
10677	11540	usedtextures.clear();
10678	11541
10679		- BindTextures(DEFAULT_TEXTURES, 2);
	11542	+ try
	11543	+ {
	11544	+ BindTextures(DEFAULT_TEXTURES, 2);
	11545	+ }
	11546	+ catch (Exception e)
	11547	+ {
	11548	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11549	+ }
10680	11550	}
10681	11551	//System.out.println("--> " + stackdepth);
10682	11552	// GrafreeD.traceon();
..	..	@@ -10686,8 +11556,9 @@
10686	11556
10687	11557	if (DrawMode() == DEFAULT)
10688	11558	{
10689		- if (DEBUG)
	11559	+ if (Globals.DEBUG)
10690	11560	{
	11561	+ CreateSelectedPoint();
10691	11562	float radius = 0.05f;
10692	11563	if (selectedpoint.radius != radius)
10693	11564	{
..	..	@@ -10767,7 +11638,14 @@
10767	11638	if (checker != null && DrawMode() == DEFAULT)
10768	11639	{
10769	11640	//BindTexture(IMMORTAL_TEXTURE);
10770		- BindTextures(checker.GetTextures(), checker.texres);
	11641	+ try
	11642	+ {
	11643	+ BindTextures(checker.GetTextures(), checker.texres);
	11644	+ }
	11645	+ catch (Exception e)
	11646	+ {
	11647	+ System.err.println("FAILED: " + checker.GetTextures());
	11648	+ }
10771	11649	// NEAREST
10772	11650	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
10773	11651	DrawChecker(gl);
..	..	@@ -10849,7 +11727,7 @@
10849	11727	return;
10850	11728	}
10851	11729
10852		- String string = obj.GetToolTip();
	11730	+ String string = obj.toString(); //.GetToolTip();
10853	11731
10854	11732	GL gl = GetGL();
10855	11733
..	..	@@ -11166,8 +12044,8 @@
11166	12044	//obj.TransformToWorld(light, light);
11167	12045	for (int i = tp.size(); --i >= 0;)
11168	12046	{
11169		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11170		- LA.xformPos(light, tp.get(i).toParent, light);
	12047	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12048	+ LA.xformPos(light, tp.get(i).GlobalTransform(), light);
11171	12049	}
11172	12050
11173	12051
..	..	@@ -11184,8 +12062,8 @@
11184	12062	parentcam = cameras[0];
11185	12063	}
11186	12064
11187		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11188		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12065	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12066	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11189	12067
11190	12068	LA.xformPos(light, renderCamera.toScreen, light);
11191	12069
..	..	@@ -11799,8 +12677,8 @@
11799	12677
11800	12678	// display shadow only (bump == 0)
11801	12679	"SUB temp.x, half.x, shadow.x;" +
11802		- "MOV temp.y, -params6.x;" +
11803		- "SLT temp.z, temp.y, zero.x;" +
	12680	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12681	+ "SLT temp.z, temp.y, -one2048th.x;" +
11804	12682	"SUB temp.y, one.x, temp.z;" +
11805	12683	"MUL temp.x, temp.x, temp.y;" +
11806	12684	"KIL temp.x;" +
..	..	@@ -11929,8 +12807,10 @@
11929	12807	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
11930	12808
11931	12809	"SUB temp.x, one.x, ndotl.x;" +
11932		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
11933		- "ADD temp.y, one.y, options2.y;" + // sursurface
	12810	+ // Tuning for default skin
	12811	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12812	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12813	+ "ADD temp.y, one.y, options2.y;" + // subsurface
11934	12814	"MUL temp.x, temp.x, temp.y;" +
11935	12815
11936	12816	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12129,7 +13009,7 @@
12129	13009	//once = true;
12130	13010	}
12131	13011
12132		- System.out.print("Program #" + mode + "; length = " + program.length());
	13012	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12133	13013	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12134	13014	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12135	13015
..	..	@@ -12262,12 +13142,16 @@
12262	13142
12263	13143	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12264	13144	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13145	+
	13146	+ // Compare fragment depth in light space with shadowmap.
12265	13147	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12266	13148	"SGE temp.y, temp.x, zero.x;" +
12267		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13149	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13150	+
	13151	+ // Reverse comparison
12268	13152	"SUB temp.x, one.x, temp.x;" +
12269	13153	"MUL " + shadow + ".x, temp.x, temp.y;" +
12270		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13154	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12271	13155	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12272	13156
12273	13157	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12281,6 +13165,10 @@
12281	13165	// No shadow for backface
12282	13166	"DP3 temp.x, normal, lightd;" +
12283	13167	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13168	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13169	+
	13170	+ // No shadow when out of frustrum
	13171	+ "SGE temp.x, " + depth + ".z, one.z;" +
12284	13172	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12285	13173	"";
12286	13174	}
..	..	@@ -12839,7 +13727,7 @@
12839	13727	public void mousePressed(MouseEvent e)
12840	13728	{
12841	13729	//System.out.println("mousePressed: " + e);
12842		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13730	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
12843	13731	}
12844	13732
12845	13733	static long prevtime = 0;
..	..	@@ -12866,6 +13754,7 @@
12866	13754
12867	13755	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
12868	13756
	13757	+ if (BUTTONLESSWHEEL)
12869	13758	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
12870	13759	{
12871	13760	return;
..	..	@@ -12874,7 +13763,7 @@
12874	13763	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
12875	13764
12876	13765	// TIMER
12877		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	13766	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
12878	13767	{
12879	13768	keepboxmode = BOXMODE;
12880	13769	keepsupport = SUPPORT;
..	..	@@ -12914,8 +13803,8 @@
12914	13803	// mode \|= META;
12915	13804	//}
12916	13805
12917		- SetMouseMode(WHEEL \| e.getModifiersEx());
12918		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13806	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13807	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
12919	13808	anchorX = ax;
12920	13809	anchorY = ay;
12921	13810	prevX = px;
..	..	@@ -12975,6 +13864,10 @@
12975	13864	// wasliveok = true;
12976	13865	// waslive = false;
12977	13866
	13867	+ // May 2019 Forget it:
	13868	+ if (true)
	13869	+ return;
	13870	+
12978	13871	// source == timer
12979	13872	if (mouseDown)
12980	13873	{
..	..	@@ -13013,7 +13906,7 @@
13013	13906
13014	13907	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13015	13908
13016		- void clickStart(int x, int y, int modifiers)
	13909	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13017	13910	{
13018	13911	if (!wasliveok)
13019	13912	return;
..	..	@@ -13030,7 +13923,7 @@
13030	13923	// touched = true; // main DL
13031	13924	if (isRenderer)
13032	13925	{
13033		- SetMouseMode(modifiers);
	13926	+ SetMouseMode(modifiers, modifiersex);
13034	13927	}
13035	13928
13036	13929	selectX = anchorX = x;
..	..	@@ -13043,7 +13936,7 @@
13043	13936	clicked = true;
13044	13937	hold = false;
13045	13938
13046		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	13939	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13047	13940	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13048	13941	{
13049	13942	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13074,7 +13967,7 @@
13074	13967	info.camera = renderCamera;
13075	13968	info.x = x;
13076	13969	info.y = y;
13077		- info.modifiers = modifiers;
	13970	+ info.modifiers = modifiersex;
13078	13971	editObj = object.doEditClick(info, 0);
13079	13972	if (!editObj)
13080	13973	{
..	..	@@ -13091,11 +13984,14 @@
13091	13984
13092	13985	public void mouseDragged(MouseEvent e)
13093	13986	{
	13987	+ Globals.MOUSEDRAGGED = true;
	13988	+
	13989	+ //System.out.println("mouseDragged: " + e);
13094	13990	if (isRenderer)
13095	13991	movingcamera = true;
	13992	+
13096	13993	//if (drawing)
13097	13994	//return;
13098		- //System.out.println("mouseDragged: " + e);
13099	13995	if ((e.getModifiersEx() & CTRL) != 0
13100	13996	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
13101	13997	{
..	..	@@ -13103,7 +13999,7 @@
13103	13999	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13104	14000	}
13105	14001	else
13106		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14002	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13107	14003
13108	14004	//try { Thread.sleep(1); } catch (Exception ex) {}
13109	14005	}
..	..	@@ -13115,6 +14011,11 @@
13115	14011	cVector tmp = new cVector();
13116	14012	cVector tmp2 = new cVector();
13117	14013	boolean isMoving;
	14014	+
	14015	+ public cVector TargetLookAt()
	14016	+ {
	14017	+ return targetLookAt;
	14018	+ }
13118	14019
13119	14020	class PingThread extends Thread
13120	14021	{
..	..	@@ -13271,6 +14172,7 @@
13271	14172
13272	14173	public void run()
13273	14174	{
	14175	+ new Exception().printStackTrace();
13274	14176	System.exit(0);
13275	14177	for (;;)
13276	14178	{
..	..	@@ -13334,7 +14236,7 @@
13334	14236	{
13335	14237	Globals.lighttouched = true;
13336	14238	}
13337		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14239	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
13338	14240	}
13339	14241	//else
13340	14242	}
..	..	@@ -13434,7 +14336,7 @@
13434	14336	int X, Y;
13435	14337	boolean SX, SY;
13436	14338
13437		- void drag(int x, int y, int modifiers)
	14339	+ void drag(int x, int y, int modifiers, int modifiersex)
13438	14340	{
13439	14341	if (IsFrozen())
13440	14342	{
..	..	@@ -13443,17 +14345,17 @@
13443	14345
13444	14346	drag = true; // NEW
13445	14347
13446		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14348	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
13447	14349
13448	14350	X = x;
13449	14351	Y = y;
13450	14352	// floating state for animation
13451		- MODIFIERS = modifiers;
13452		- modifiers &= ~1024;
	14353	+ MODIFIERS = modifiersex;
	14354	+ modifiersex &= ~1024;
13453	14355	if (false) // modifiers != 0)
13454	14356	{
13455	14357	//new Exception().printStackTrace();
13456		- System.out.println("mouseDragged: " + modifiers);
	14358	+ System.out.println("mouseDragged: " + modifiersex);
13457	14359	System.out.println("SHIFT = " + SHIFT);
13458	14360	System.out.println("CONTROL = " + COMMAND);
13459	14361	System.out.println("META = " + META);
..	..	@@ -13473,7 +14375,7 @@
13473	14375	info.camera = renderCamera;
13474	14376	info.x = x;
13475	14377	info.y = y;
13476		- object.editWindow.copy.doEditDrag(info);
	14378	+ object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
13477	14379	} else
13478	14380	{
13479	14381	if (x < startX)
..	..	@@ -13625,7 +14527,6 @@
13625	14527	public void mouseMoved(MouseEvent e)
13626	14528	{
13627	14529	//System.out.println("mouseMoved: " + e);
13628		-
13629	14530	if (isRenderer)
13630	14531	return;
13631	14532
..	..	@@ -13650,7 +14551,10 @@
13650	14551
13651	14552	public void mouseReleased(MouseEvent e)
13652	14553	{
	14554	+ Globals.MOUSEDRAGGED = false;
	14555	+
13653	14556	movingcamera = false;
	14557	+ X = Y = 0;
13654	14558	//System.out.println("mouseReleased: " + e);
13655	14559	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13656	14560	}
..	..	@@ -13673,9 +14577,9 @@
13673	14577	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
13674	14578	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
13675	14579
13676		- if (control \|\| command \|\| IsFrozen())
	14580	+// No delay if (control \|\| command \|\| IsFrozen())
13677	14581	timeout = true;
13678		- else
	14582	+// ?? May 2019 else
13679	14583	// timer.setDelay((modifiers & 128) != 0?0:350);
13680	14584	mouseDown = false;
13681	14585	if (!control && !command) // june 2013
..	..	@@ -13785,7 +14689,7 @@
13785	14689	System.out.println("keyReleased: " + e);
13786	14690	}
13787	14691
13788		- void SetMouseMode(int modifiers)
	14692	+ void SetMouseMode(int modifiers, int modifiersex)
13789	14693	{
13790	14694	//System.out.println("SetMouseMode = " + modifiers);
13791	14695	//modifiers &= ~1024;
..	..	@@ -13797,25 +14701,25 @@
13797	14701	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
13798	14702	// return;
13799	14703	//System.out.println("SetMode = " + modifiers);
13800		- if ((modifiers & WHEEL) == WHEEL)
	14704	+ if ((modifiersex & WHEEL) == WHEEL)
13801	14705	{
13802	14706	mouseMode \|= ZOOM;
13803	14707	}
13804	14708
13805	14709	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13806		- if (capsLocked \|\| (modifiers & META) == META)
	14710	+ if (capsLocked) // \|\| (modifiers & META) == META)
13807	14711	{
13808	14712	mouseMode \|= VR; // BACKFORTH;
13809	14713	}
13810		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14714	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
13811	14715	{
13812	14716	mouseMode \|= SELECT;
13813	14717	}
13814		- if ((modifiers & COMMAND) == COMMAND)
	14718	+ if ((modifiersex & COMMAND) == COMMAND)
13815	14719	{
13816	14720	mouseMode \|= SELECT;
13817	14721	}
13818		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14722	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
13819	14723	{
13820	14724	mouseMode &= ~VR;
13821	14725	mouseMode \|= TRANSLATE;
..	..	@@ -13844,10 +14748,10 @@
13844	14748
13845	14749	if (isRenderer) //
13846	14750	{
13847		- SetMouseMode(modifiers);
	14751	+ SetMouseMode(0, modifiers);
13848	14752	}
13849	14753
13850		- theRenderer.keyPressed(key);
	14754	+ Globals.theRenderer.keyPressed(key);
13851	14755	}
13852	14756
13853	14757	int kompactbit = 4; // power bit
..	..	@@ -13859,7 +14763,7 @@
13859	14763	float SATPOW = 1; // 2; // 0.5f;
13860	14764	float BRIPOW = 1; // 0.5f; // 0.5f;
13861	14765
13862		- void keyPressed(int key)
	14766	+ public void keyPressed(int key)
13863	14767	{
13864	14768	if (key >= '0' && key <= '5')
13865	14769	clampbit = (key-'0');
..	..	@@ -14016,8 +14920,14 @@
14016	14920	RevertCamera();
14017	14921	repaint();
14018	14922	break;
14019		- case 'L':
14020	14923	case 'l':
	14924	+ lightMode ^= true;
	14925	+ Globals.lighttouched = true;
	14926	+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
	14927	+ targetLookAt.set(manipCamera.lookAt);
	14928	+ repaint();
	14929	+ break;
	14930	+ case 'L':
14021	14931	if (lightMode)
14022	14932	{
14023	14933	lightMode = false;
..	..	@@ -14164,23 +15074,21 @@
14164	15074	kompactbit = 6;
14165	15075	break;
14166	15076	case ' ':
14167		- lightMode ^= true;
14168		- Globals.lighttouched = true;
14169		- manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14170		- targetLookAt.set(manipCamera.lookAt);
	15077	+ ObjEditor.theFrame.ToggleFullScreen();
14171	15078	repaint();
14172	15079	break;
14173	15080	//case '`' :
14174	15081	case ESC:
14175	15082	RENDERPROGRAM += 1;
14176	15083	RENDERPROGRAM %= 3;
	15084	+
14177	15085	repaint();
14178	15086	break;
14179	15087	case 'Z':
14180	15088	//RESIZETEXTURE ^= true;
14181	15089	//break;
14182	15090	case 'z':
14183		- RENDERSHADOW ^= true;
	15091	+ Globals.RENDERSHADOW ^= true;
14184	15092	Globals.lighttouched = true;
14185	15093	repaint();
14186	15094	break;
..	..	@@ -14296,6 +15204,7 @@
14296	15204	}
14297	15205	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
14298	15206	}
	15207	+
14299	15208	static double OCCLUSIONBOOST = 1; // 0.5;
14300	15209
14301	15210	void keyReleased(int key, int modifiers)
..	..	@@ -14303,11 +15212,11 @@
14303	15212	//mode = ROTATE;
14304	15213	if ((MODIFIERS & COMMAND) == 0) // VR??
14305	15214	{
14306		- SetMouseMode(modifiers);
	15215	+ SetMouseMode(0, modifiers);
14307	15216	}
14308	15217	}
14309	15218
14310		- protected void processKeyEvent(KeyEvent e)
	15219	+ public void processKeyEvent(KeyEvent e)
14311	15220	{
14312	15221	switch (e.getID())
14313	15222	{
..	..	@@ -14437,8 +15346,9 @@
14437	15346
14438	15347	protected void processMouseMotionEvent(MouseEvent e)
14439	15348	{
14440		- //System.out.println("processMouseMotionEvent: " + mouseMode);
14441		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15349	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15350	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15351	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
14442	15352	{
14443	15353	mouseMoved(e);
14444	15354	} else
..	..	@@ -14468,6 +15378,7 @@
14468	15378
14469	15379	void SelectParent()
14470	15380	{
	15381	+ new Exception().printStackTrace();
14471	15382	System.exit(0);
14472	15383	Composite group = (Composite) object;
14473	15384	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -14491,6 +15402,7 @@
14491	15402
14492	15403	void SelectChildren()
14493	15404	{
	15405	+ new Exception().printStackTrace();
14494	15406	System.exit(0);
14495	15407	/*
14496	15408	Composite group = (Composite) object;
..	..	@@ -14655,7 +15567,9 @@
14655	15567	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
14656	15568	//Image img = CreateImage(width, height);
14657	15569	//System.out.println("width = " + width + "; height = " + height + "\n");
	15570	+
14658	15571	Graphics gr = g; // img.getGraphics();
	15572	+
14659	15573	if (!hasMarquee)
14660	15574	{
14661	15575	if (Xmin < Xmax) // !locked)
..	..	@@ -14753,14 +15667,33 @@
14753	15667	if (!isRenderer)
14754	15668	{
14755	15669	object.drawEditHandles(info, 0);
	15670	+
	15671	+ if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	15672	+ {
	15673	+ switch (object.selection.get(0).hitSomething)
	15674	+ {
	15675	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15676	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15677	+ break;
	15678	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15679	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15680	+ break;
	15681	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15682	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15683	+ break;
	15684	+ }
	15685	+
	15686	+ }
14756	15687	}
14757	15688	}
	15689	+
14758	15690	if (isRenderer)
14759	15691	{
14760	15692	//gr.setColor(Color.black);
14761	15693	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
14762	15694	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
14763	15695	}
	15696	+
14764	15697	if (hasMarquee)
14765	15698	{
14766	15699	gr.setXORMode(Color.white);
..	..	@@ -14873,6 +15806,7 @@
14873	15806	public boolean mouseDown(Event evt, int x, int y)
14874	15807	{
14875	15808	System.out.println("mouseDown: " + evt);
	15809	+ System.exit(0);
14876	15810	/*
14877	15811	locked = true;
14878	15812	drag = false;
..	..	@@ -14916,7 +15850,7 @@
14916	15850	{
14917	15851	keyPressed(0, modifiers);
14918	15852	}
14919		- clickStart(x, y, modifiers);
	15853	+ // clickStart(x, y, modifiers);
14920	15854	return true;
14921	15855	}
14922	15856
..	..	@@ -15034,7 +15968,7 @@
15034	15968	{
15035	15969	keyReleased(0, 0);
15036	15970	}
15037		- drag(x, y, modifiers);
	15971	+ drag(x, y, 0, modifiers);
15038	15972	return true;
15039	15973	}
15040	15974
..	..	@@ -15166,7 +16100,7 @@
15166	16100	Object3D object;
15167	16101	static Object3D trackedobject;
15168	16102	Camera renderCamera; // Light or Eye (or Occlusion)
15169		- /static/ Camera manipCamera; // Light or Eye
	16103	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15170	16104	/static/ Camera eyeCamera;
15171	16105	/static/ Camera lightCamera;
15172	16106	int cameracount;
..	..	@@ -15604,6 +16538,7 @@
15604	16538	{
15605	16539	if (!selection)
15606	16540	{
	16541	+ new Exception().printStackTrace();
15607	16542	System.exit(0);
15608	16543	return;
15609	16544	}
..	..	@@ -15731,16 +16666,16 @@
15731	16666	System.out.println("; fromto " + sel + " " + Trunk(previousselectedpoint.toParent[3][0]) + " " + Trunk(previousselectedpoint.toParent[3][2]) + " " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][2]));
15732	16667	}
15733	16668
15734		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16669	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
15735	16670	}
15736	16671	}
15737	16672
15738	16673	if (!movingcamera && !PAINTMODE)
15739	16674	object.editWindow.ScreenFitPoint(); // fev 2014
15740	16675
15741		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16676	+ if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
15742	16677	{
15743		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16678	+ Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
15744	16679
15745	16680	Object3D group = new Object3D("inst" + paintcount++);
15746	16681
..	..	@@ -15896,7 +16831,7 @@
15896	16831	gl.glDisable(gl.GL_CULL_FACE);
15897	16832	}
15898	16833
15899		- if (!RENDERSHADOW)
	16834	+ if (!Globals.RENDERSHADOW)
15900	16835	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
15901	16836
15902	16837	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -15906,7 +16841,7 @@
15906	16841	//gl.glColorMask(false, false, false, false);
15907	16842
15908	16843	//render_scene_from_light_view(gl, drawable, 0, 0);
15909		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	16844	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
15910	16845	{
15911	16846	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
15912	16847
..	..	@@ -15966,7 +16901,6 @@
15966	16901
15967	16902	class AntialiasBuffer implements GLEventListener
15968	16903	{
15969		-
15970	16904	CameraPane parent = null;
15971	16905
15972	16906	AntialiasBuffer(CameraPane p)
..	..	@@ -16323,23 +17257,15 @@
16323	17257	int AAbuffersize = 0;
16324	17258
16325	17259	//double[] selectedpoint = new double[3];
16326		- static Superellipsoid selectedpoint = new Superellipsoid();
	17260	+ static Superellipsoid selectedpoint;
16327	17261	static Sphere previousselectedpoint = null;
16328		- static Sphere debugpointG = new Sphere();
16329		- static Sphere debugpointP = new Sphere();
16330		- static Sphere debugpointC = new Sphere();
16331		- static Sphere debugpointR = new Sphere();
	17262	+ static Sphere debugpointG;
	17263	+ static Sphere debugpointP;
	17264	+ static Sphere debugpointC;
	17265	+ static Sphere debugpointR;
16332	17266
16333	17267	static Sphere debugpoints[] = new Sphere[8];
16334	17268
16335		- static
16336		- {
16337		- for (int i=0; i<8; i++)
16338		- {
16339		- debugpoints[i] = new Sphere();
16340		- }
16341		- }
16342		-
16343	17269	static void InitPoints(float radius)
16344	17270	{
16345	17271	for (int i=0; i<8; i++)
..	..	@@ -16359,7 +17285,7 @@
16359	17285	}
16360	17286	}
16361	17287
16362		- static void DrawPoints(CameraPane cpane)
	17288	+ static void DrawPoints(iCameraPane cpane)
16363	17289	{
16364	17290	for (int i=0; i<8; i++) // first and last are red
16365	17291	{
..	..	@@ -16391,10 +17317,11 @@
16391	17317	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
16392	17318	// Depth buffer format
16393	17319	//private int depth_format;
16394		- static public void NextIndex(Object3D o, GL gl)
	17320	+
	17321	+ public void NextIndex()
16395	17322	{
16396	17323	indexcount+=16;
16397		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17324	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
16398	17325	//objects[indexcount] = o;
16399	17326	//System.out.println("indexcount = " + indexcount);
16400	17327	}