~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -56,8 +56,6 @@
56	56	static int CURRENTANTIALIAS = 0; // 1;
57	57	/static/ boolean RENDERSHADOW = true;
58	58	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
59		- static boolean ANIMATION = false;
60		- static String filename;
61	59
62	60	boolean DISPLAYTEXT = false;
63	61	//boolean REDUCETEXTURE = true;
..	..	@@ -92,6 +90,8 @@
92	90
93	91	static int tickcount = 0; // slow pose issue
94	92
	93	+static boolean BUTTONLESSWHEEL = false;
	94	+static boolean ZOOMBOXMODE = false;
95	95	static boolean BOXMODE = false;
96	96	static boolean IMAGEFLIP = false;
97	97	static boolean SMOOTHFOCUS = false;
..	..	@@ -106,7 +106,7 @@
106	106	static boolean OEIL = true;
107	107	static boolean OEILONCE = false; // do oeilon then oeiloff
108	108	static boolean LOOKAT = true;
109		-static boolean RANDOM = true; // false;
	109	+static boolean SWITCH = true; // false;
110	110	static boolean HANDLES = false; // selection doesn't work!!
111	111	static boolean PAINTMODE = false;
112	112
..	..	@@ -149,12 +149,13 @@
149	149	defaultcaps.setAccumBlueBits(16);
150	150	defaultcaps.setAccumAlphaBits(16);
151	151	}
152		- static CameraPane theRenderer;
153		-
	152	+
	153	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	154	+
154	155	void SetAsGLRenderer(boolean b)
155	156	{
156	157	isRenderer = b;
157		- theRenderer = this;
	158	+ Globals.theRenderer = this;
158	159	}
159	160
160	161	CameraPane(Object3D o, Camera cam, boolean withcontext)
..	..	@@ -192,9 +193,43 @@
192	193
193	194	/// INTERFACE
194	195
	196	+ public javax.media.opengl.GL GetGL0()
	197	+ {
	198	+ return null;
	199	+ }
	200	+
	201	+ public int GenList()
	202	+ {
	203	+ javax.media.opengl.GL gl = GetGL();
	204	+ return gl.glGenLists(1);
	205	+ }
	206	+
	207	+ public void NewList(int id)
	208	+ {
	209	+ javax.media.opengl.GL gl = GetGL();
	210	+ gl.glNewList(id, gl.GL_COMPILE); //_AND_EXECUTE);
	211	+ }
	212	+
	213	+ public void CallList(int id)
	214	+ {
	215	+ javax.media.opengl.GL gl = GetGL();
	216	+ gl.glCallList(id);
	217	+ }
	218	+
	219	+ public void EndList()
	220	+ {
	221	+ javax.media.opengl.GL gl = GetGL();
	222	+ gl.glEndList();
	223	+ }
	224	+
195	225	public boolean IsBoxMode()
196	226	{
197	227	return BOXMODE;
	228	+ }
	229	+
	230	+ public boolean IsZoomBoxMode()
	231	+ {
	232	+ return ZOOMBOXMODE;
198	233	}
199	234
200	235	public void ClearDepth()
..	..	@@ -236,9 +271,14 @@
236	271	return this.ambientOcclusion;
237	272	}
238	273
	274	+ public boolean IsDebugSelection()
	275	+ {
	276	+ return DEBUG_SELECTION;
	277	+ }
	278	+
239	279	public boolean IsFrozen()
240	280	{
241		- boolean selectmode = this.DrawMode() == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	281	+ boolean selectmode = this.DrawMode() == SELECTION \|\| this.IsDebugSelection();
242	282
243	283	return !selectmode && cameracount == 0; // != 0;
244	284	}
..	..	@@ -259,9 +299,19 @@
259	299	return lightCamera;
260	300	}
261	301
	302	+ public Camera ManipCamera()
	303	+ {
	304	+ return manipCamera;
	305	+ }
	306	+
262	307	public Camera RenderCamera()
263	308	{
264	309	return renderCamera;
	310	+ }
	311	+
	312	+ public Camera[] Cameras()
	313	+ {
	314	+ return cameras;
265	315	}
266	316
267	317	public void PushMaterial(Object3D obj, boolean selected)
..	..	@@ -408,13 +458,13 @@
408	458
409	459	javax.media.opengl.GL gl = display.GetGL();
410	460
411		- boolean selectmode = display.DrawMode() == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	461	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
412	462
413	463	//System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
414	464	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
415	465	{
416	466	//gl.glBegin(gl.GL_TRIANGLES);
417		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	467	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
418	468	if (!hasnorm)
419	469	{
420	470	// System.out.println("FUCK!!");
..	..	@@ -760,7 +810,621 @@
760	810	//// tris.postdraw(this);
761	811	}
762	812
	813	+ static Camera localcamera = new Camera();
	814	+ static cVector from = new cVector();
	815	+ static cVector to = new cVector();
	816	+
	817	+ public void PrepOcclusion(BoundaryRep br, double[][] transform)
	818	+ {
	819	+ CameraPane cp = this;
	820	+
	821	+ Camera keep = cp.RenderCamera();
	822	+ cp.renderCamera = localcamera;
	823	+
	824	+ if (br.trimmed)
	825	+ {
	826	+ float[] colors = new float[br.positions.length / 3];
	827	+
	828	+ int i3 = 0;
	829	+ for (int i = 0; i < br.positions.length / 3; i++, i3 += 3)
	830	+ {
	831	+ if (br.normals[i3] == 0 && br.normals[i3+1] == 0 && br.normals[i3+2] == 0)
	832	+ continue;
	833	+
	834	+ from.set(br.positions[i3], br.positions[i3 + 1], br.positions[i3 + 2]);
	835	+ to.set(br.positions[i3] + br.normals[i3],
	836	+ br.positions[i3 + 1] + br.normals[i3 + 1],
	837	+ br.positions[i3 + 2] + br.normals[i3 + 2]);
	838	+ LA.xformPos(from, transform, from);
	839	+ LA.xformPos(to, transform, to); // RIGID ONLY
	840	+ localcamera.setAim(from, to);
	841	+
	842	+ CameraPane.occlusionbuffer.display();
	843	+
	844	+ if (CameraPane.DEBUG_OCCLUSION)
	845	+ cp.display(); // debug
	846	+
	847	+ colors[i] = cp.vertexOcclusion.r;
	848	+ //colors[i3 + 1] = cp.vertexOcclusion.g;
	849	+ //colors[i3 + 2] = cp.vertexOcclusion.b;
	850	+
	851	+ if ((i % 100) == 0 && i != 0)
	852	+ {
	853	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	854	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	855	+ System.out.println((int) (100.0 * i / (br.positions.length / 3)) + "% (" + i + " of " + (br.positions.length / 3) + ")");
	856	+ }
	857	+ }
	858	+
	859	+ br.colors = colors;
	860	+ }
	861	+ else
	862	+ {
	863	+ for (int i = 0; i < br.VertexCount(); i++)
	864	+ {
	865	+ Vertex v = br.GetVertex(i);
	866	+
	867	+ if (v.norm == null \|\| v.norm.x == 0 && v.norm.y == 0 && v.norm.z == 0)
	868	+ continue;
	869	+
	870	+ from.set(v.x, v.y, v.z);
	871	+ to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
	872	+ LA.xformPos(from, transform, from);
	873	+ LA.xformPos(to, transform, to); // RIGID ONLY
	874	+ localcamera.setAim(from, to);
	875	+
	876	+ CameraPane.occlusionbuffer.display();
	877	+
	878	+ if (CameraPane.DEBUG_OCCLUSION)
	879	+ cp.display(); // debug
	880	+
	881	+ v.AO = cp.vertexOcclusion.r;
	882	+
	883	+ if ((i % 100) == 0 && i != 0)
	884	+ {
	885	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	886	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	887	+ System.out.println((int) (100.0 * i / br.VertexCount()) + "% (" + i + " of " + br.VertexCount() + ")");
	888	+ }
	889	+ }
	890	+ }
	891	+
	892	+ //System.out.println("done.");
	893	+
	894	+ cp.renderCamera = keep;
	895	+ }
	896	+
	897	+ void DrawPointFLow(PointFlow pointFlow, Object3D /Composite/ root, boolean selected, boolean blocked)
	898	+ {
	899	+ CameraPane display = this;
	900	+ pointFlow.CreateHT();
	901	+
	902	+ float r = display.modelParams0[0];
	903	+ float g = display.modelParams0[1];
	904	+ float b = display.modelParams0[2];
	905	+ float opacity = display.modelParams5[1];
	906	+
	907	+ //final GL gl = GLU.getCurrentGL();
	908	+ GL gl = display.GetGL(); // getGL();
	909	+
	910	+ int s = pointFlow.points.size();
	911	+
	912	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	913	+ gl.glEnable(gl.GL_CULL_FACE);
	914	+
	915	+ for (int i=s; --i>=0;)
	916	+ //for (int i=0; i<s; i++)
	917	+ {
	918	+ cVector v = pointFlow.points.get(i);
	919	+
	920	+ double mindist = Double.MAX_VALUE;
	921	+
	922	+ double size = pointFlow.minimumSize;
	923	+
	924	+ double distancenext = 0;
	925	+
	926	+ if (i > 0)
	927	+ {
	928	+ cVector w = pointFlow.points.get(i-1);
	929	+
	930	+ double dist = w.distance(v);
	931	+
	932	+ distancenext = dist;
	933	+
	934	+ if (mindist > dist)
	935	+ {
	936	+ mindist = dist;
	937	+ size = mindist*pointFlow.resizefactor;
	938	+ }
	939	+ }
	940	+
	941	+ if (i < s-1)
	942	+ {
	943	+ cVector w = pointFlow.points.get(i+1);
	944	+
	945	+ double dist = w.distance(v);
	946	+
	947	+ if (mindist > dist)
	948	+ {
	949	+ mindist = dist;
	950	+ size = mindist*pointFlow.resizefactor;
	951	+ }
	952	+ }
	953	+
	954	+ if (size < pointFlow.minimumSize)
	955	+ size = pointFlow.minimumSize;
	956	+ if (size > pointFlow.maximumSize)
	957	+ size = pointFlow.maximumSize;
	958	+
	959	+ double tx = v.x;
	960	+ double ty = v.y;
	961	+ double tz = v.z;
	962	+
	963	+ // if (tx == 0 && ty == 0 && tz == 0)
	964	+ // continue;
	965	+
	966	+ gl.glMatrixMode(gl.GL_TEXTURE);
	967	+ gl.glPushMatrix();
	968	+ pointFlow.texmat[12] = pointFlow.texmat[13] = pointFlow.texmat[14] = i;
	969	+
	970	+ gl.glMultMatrixf(pointFlow.texmat, 0);
	971	+
	972	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	973	+ gl.glPushMatrix();
	974	+
	975	+ gl.glTranslated(tx,ty,tz);
	976	+
	977	+ gl.glScaled(size,size,size);
	978	+
	979	+// float cr = colorBuf.get(index4);
	980	+// float cg = colorBuf.get(index4+1);
	981	+// float cb = colorBuf.get(index4+2);
	982	+// float ca = colorBuf.get(index4+3);
	983	+//
	984	+// display.modelParams0[0] = r * cr;
	985	+// display.modelParams0[1] = g * cg;
	986	+// display.modelParams0[2] = b * cb;
	987	+//
	988	+// display.modelParams5[1] = opacity * ca;
	989	+//
	990	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	991	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	992	+//
	993	+// RandomNode.globalseed = (int)sizeBuf.get(index3+2); // i;
	994	+// RandomNode.globalseed2 = RandomNode.globalseed;
	995	+//
	996	+//// gl.glColor4f(cr,cg,cb,ca);
	997	+// // gl.glScalef(1024/16,1024/16,1024/16);
	998	+ pointFlow.geo.Draw/Node/(display,null,selected, blocked);
	999	+
	1000	+ gl.glPopMatrix();
	1001	+
	1002	+ double step = size/4; //
	1003	+
	1004	+ if (i == 0 \|\| size == 0 \|\| distancenext > 8*size \|\| distancenext < step)
	1005	+ continue;
	1006	+
	1007	+ int nbsteps = (int)(distancenext/step);
	1008	+
	1009	+ step = distancenext/nbsteps;
	1010	+
	1011	+ cVector next = pointFlow.points.get(i-1);
	1012	+
	1013	+ tmp.set(next);
	1014	+ tmp.sub(v);
	1015	+ tmp.normalize();
	1016	+ tmp.mul(step);
	1017	+
	1018	+ // calculate next size
	1019	+ mindist = Double.MAX_VALUE;
	1020	+
	1021	+ double nextsize = pointFlow.minimumSize;
	1022	+
	1023	+ if (i > 1)
	1024	+ {
	1025	+ cVector w = pointFlow.points.get(i-2);
	1026	+
	1027	+ double dist = w.distance(next);
	1028	+
	1029	+ if (mindist > dist)
	1030	+ {
	1031	+ mindist = dist;
	1032	+ nextsize = mindist*pointFlow.resizefactor;
	1033	+ }
	1034	+ }
	1035	+
	1036	+ double dist = v.distance(next);
	1037	+
	1038	+ if (mindist > dist)
	1039	+ {
	1040	+ mindist = dist;
	1041	+ nextsize = mindist*pointFlow.resizefactor;
	1042	+ }
	1043	+
	1044	+ if (nextsize < pointFlow.minimumSize)
	1045	+ nextsize = pointFlow.minimumSize;
	1046	+ if (nextsize > pointFlow.maximumSize)
	1047	+ nextsize = pointFlow.maximumSize;
	1048	+ //
	1049	+
	1050	+ double count = 0;
	1051	+
	1052	+ while (distancenext > 0.000000001) // step
	1053	+ {
	1054	+ gl.glPushMatrix();
	1055	+
	1056	+ gl.glTranslated(tx + tmp.xcount, ty + tmp.ycount, tz + tmp.z*count);
	1057	+
	1058	+ double K = count/nbsteps;
	1059	+
	1060	+ double intersize = Knextsize + (1-K)size;
	1061	+
	1062	+ gl.glScaled(intersize,intersize,intersize);
	1063	+
	1064	+ pointFlow.geo.Draw/Node/(display,null,selected,blocked);
	1065	+
	1066	+ count++;
	1067	+
	1068	+ distancenext -= step;
	1069	+
	1070	+ gl.glPopMatrix();
	1071	+ }
	1072	+
	1073	+ if (count != nbsteps)
	1074	+ assert(count == nbsteps);
	1075	+
	1076	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	1077	+ //gl.glTranslatef(-tx,-ty,-tz);
	1078	+
	1079	+ gl.glMatrixMode(gl.GL_TEXTURE);
	1080	+ gl.glPopMatrix();
	1081	+ }
	1082	+
	1083	+ if (!cf)
	1084	+ gl.glDisable(gl.GL_CULL_FACE);
	1085	+
	1086	+// display.modelParams0[0] = r;
	1087	+// display.modelParams0[1] = g;
	1088	+// display.modelParams0[2] = b;
	1089	+//
	1090	+// display.modelParams5[1] = opacity;
	1091	+//
	1092	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1093	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1094	+
	1095	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	1096	+ }
	1097	+
	1098	+ public void DrawBox(cVector min, cVector max)
	1099	+ {
	1100	+ javax.media.opengl.GL gl = GetGL();
	1101	+ gl.glBegin(gl.GL_LINES);
	1102	+
	1103	+ gl.glVertex3d(min.x, min.y, min.z);
	1104	+ gl.glVertex3d(min.x, min.y, max.z);
	1105	+ gl.glVertex3d(min.x, min.y, min.z);
	1106	+ gl.glVertex3d(min.x, max.y, min.z);
	1107	+ gl.glVertex3d(min.x, min.y, min.z);
	1108	+ gl.glVertex3d(max.x, min.y, min.z);
	1109	+
	1110	+ gl.glVertex3d(max.x, max.y, max.z);
	1111	+ gl.glVertex3d(min.x, max.y, max.z);
	1112	+ gl.glVertex3d(max.x, max.y, max.z);
	1113	+ gl.glVertex3d(max.x, min.y, max.z);
	1114	+ gl.glVertex3d(max.x, max.y, max.z);
	1115	+ gl.glVertex3d(max.x, max.y, min.z);
	1116	+
	1117	+ gl.glEnd();
	1118	+ }
	1119	+
	1120	+ public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
	1121	+ {
	1122	+ int[] strips = bRep.getRawIndices();
	1123	+
	1124	+ javax.media.opengl.GL gl = GetGL();
	1125	+
	1126	+ // TRIANGLE STRIP ARRAY
	1127	+ if (bRep.trimmed)
	1128	+ {
	1129	+ float[] v = bRep.getRawVertices();
	1130	+ float[] n = bRep.getRawNormals();
	1131	+ float[] c = bRep.getRawColors();
	1132	+ float[] uv = bRep.getRawUVMap();
	1133	+
	1134	+ int count2 = 0;
	1135	+ int count3 = 0;
	1136	+
	1137	+ if (n.length > 0)
	1138	+ {
	1139	+ for (int i = 0; i < strips.length; i++)
	1140	+ {
	1141	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1142	+
	1143	+ /*
	1144	+ boolean locked = false;
	1145	+ float eps = 0.1f;
	1146	+ boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	1147	+
	1148	+ int dot = 0;
	1149	+
	1150	+ if ((dot&1) == 0)
	1151	+ dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	1152	+
	1153	+ if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	1154	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	1155	+ else
	1156	+ {
	1157	+ locked = true;
	1158	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1159	+ }
	1160	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	1161	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	1162	+ if (hasnorm)
	1163	+ {
	1164	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	1165	+ gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
	1166	+ }
	1167	+
	1168	+ if ((dot&4) == 0)
	1169	+ dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	1170	+
	1171	+ if (wrap \|\| !locked && (dot&8) != 0)
	1172	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	1173	+ else
	1174	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1175	+
	1176	+ f.dot = dot;
	1177	+ */
	1178	+
	1179	+ if (!selectmode)
	1180	+ {
	1181	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1182	+ {
	1183	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1184	+ } else
	1185	+ {
	1186	+ gl.glNormal3f(0, 0, 1);
	1187	+ }
	1188	+
	1189	+ if (c != null)
	1190	+ //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
	1191	+ {
	1192	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1193	+ }
	1194	+ }
	1195	+ if (flipV)
	1196	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1197	+ else
	1198	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1199	+ //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1200	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1201	+
	1202	+ count2 += 2;
	1203	+ count3 += 3;
	1204	+ if (!selectmode)
	1205	+ {
	1206	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1207	+ {
	1208	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1209	+ } else
	1210	+ {
	1211	+ gl.glNormal3f(0, 0, 1);
	1212	+ }
	1213	+ if (c != null)
	1214	+ {
	1215	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1216	+ }
	1217	+ }
	1218	+ if (flipV)
	1219	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1220	+ else
	1221	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1222	+ //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1223	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1224	+
	1225	+ count2 += 2;
	1226	+ count3 += 3;
	1227	+ for (int j = 0; j < strips[i] - 2; j++)
	1228	+ {
	1229	+ //gl.glTexCoord2d(...);
	1230	+ if (!selectmode)
	1231	+ {
	1232	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1233	+ {
	1234	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1235	+ } else
	1236	+ {
	1237	+ gl.glNormal3f(0, 0, 1);
	1238	+ }
	1239	+ if (c != null)
	1240	+ {
	1241	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1242	+ }
	1243	+ }
	1244	+
	1245	+ if (flipV)
	1246	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1247	+ else
	1248	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1249	+ //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
	1250	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1251	+ count2 += 2;
	1252	+ count3 += 3;
	1253	+ }
	1254	+
	1255	+ gl.glEnd();
	1256	+ }
	1257	+ }
	1258	+
	1259	+ assert count3 == v.length;
	1260	+ }
	1261	+ else // !trimmed
	1262	+ {
	1263	+ int count = 0;
	1264	+ for (int i = 0; i < strips.length; i++)
	1265	+ {
	1266	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1267	+
	1268	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	1269	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	1270	+
	1271	+ drawVertex(gl, p, flipV, selectmode);
	1272	+ drawVertex(gl, q, flipV, selectmode);
	1273	+
	1274	+ for (int j = 0; j < strips[i] - 2; j++)
	1275	+ {
	1276	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	1277	+
	1278	+ // if (j%2 == 0)
	1279	+ // drawFace(p, q, r, display, null);
	1280	+ // else
	1281	+ // drawFace(p, r, q, display, null);
	1282	+
	1283	+ // p = q;
	1284	+ // q = r;
	1285	+ drawVertex(gl, r, flipV, selectmode);
	1286	+ }
	1287	+
	1288	+ gl.glEnd();
	1289	+ }
	1290	+ }
	1291	+ }
	1292	+
	1293	+ static cSpring.Point3D temp = new cSpring.Point3D();
	1294	+ static cSpring.Point3D temp2 = new cSpring.Point3D();
	1295	+ static cSpring.Point3D temp3 = new cSpring.Point3D();
	1296	+
	1297	+ public void DrawDynamicMesh(cMesh mesh)
	1298	+ {
	1299	+ GL gl = GetGL(); // getGL();
	1300	+
	1301	+ cSpring.PhysicsController3D Phys = mesh.Phys;
	1302	+
	1303	+ gl.glDisable(gl.GL_LIGHTING);
	1304	+
	1305	+ gl.glLineWidth(1);
	1306	+ gl.glColor3f(1,1,1);
	1307	+ gl.glBegin(gl.GL_LINES);
	1308	+ double scale = 0;
	1309	+ int count = 0;
	1310	+ for (int s=0; s<Phys.allSprings.size(); s++)
	1311	+ {
	1312	+ cSpring.Spring spring = Phys.allSprings.get(s);
	1313	+ if(s == 0)
	1314	+ {
	1315	+ //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
	1316	+ }
	1317	+ if (mesh.showsprings)
	1318	+ {
	1319	+ temp.set(spring.a.position);
	1320	+ temp.add(spring.b.position);
	1321	+ temp.mul(0.5);
	1322	+ temp2.set(spring.a.position);
	1323	+ temp2.sub(spring.b.position);
	1324	+ temp2.mul(spring.restLength/2);
	1325	+ temp.sub(temp2);
	1326	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1327	+ temp.add(temp2);
	1328	+ temp.add(temp2);
	1329	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1330	+ }
	1331	+
	1332	+ if (spring.isHandle)
	1333	+ continue;
	1334	+
	1335	+ //if (scale < spring.restLength)
	1336	+ scale += spring.restLength;
	1337	+ count++;
	1338	+ }
	1339	+ gl.glEnd();
	1340	+
	1341	+ if (count == 0)
	1342	+ scale = 0.01;
	1343	+ else
	1344	+ scale /= count * 3;
	1345	+
	1346	+ //scale = 0.25;
	1347	+
	1348	+ if (mesh.ShowInfo())
	1349	+ {
	1350	+ gl.glLineWidth(4);
	1351	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1352	+ {
	1353	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1354	+ if (node.mass == 0)
	1355	+ continue;
	1356	+
	1357	+ int i = node.springs==null?-1:node.springs.size();
	1358	+ gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
	1359	+ //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
	1360	+ //temp.normalize();
	1361	+ //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
	1362	+ gl.glBegin(gl.GL_LINES);
	1363	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1364	+ //gl.glVertex3d(node.position.x + node.normal.xscale, node.position.y + node.normal.yscale, node.position.z + node.normal.z*scale);
	1365	+ gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
	1366	+ node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
	1367	+ node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
	1368	+ gl.glEnd();
	1369	+ }
	1370	+
	1371	+ gl.glLineWidth(8);
	1372	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1373	+ {
	1374	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1375	+
	1376	+ if (node.springs != null)
	1377	+ {
	1378	+ for (int i=0; i<node.springs.size(); i+=1)
	1379	+ {
	1380	+ cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
	1381	+
	1382	+ int c = i+1;
	1383	+ // c = node.springs.get(i).nbcopies;
	1384	+
	1385	+ gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
	1386	+ gl.glBegin(gl.GL_LINES);
	1387	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1388	+ 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);
	1389	+ gl.glEnd();
	1390	+ }
	1391	+ }
	1392	+ }
	1393	+
	1394	+ gl.glLineWidth(1);
	1395	+ }
	1396	+
	1397	+ gl.glEnable(gl.GL_LIGHTING);
	1398	+ }
	1399	+
763	1400	/// INTERFACE
	1401	+
	1402	+ public void StartTriangles()
	1403	+ {
	1404	+ javax.media.opengl.GL gl = GetGL();
	1405	+ gl.glBegin(gl.GL_TRIANGLES);
	1406	+ }
	1407	+
	1408	+ public void EndTriangles()
	1409	+ {
	1410	+ GetGL().glEnd();
	1411	+ }
	1412	+
	1413	+ void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
	1414	+ {
	1415	+ if (!selectmode)
	1416	+ {
	1417	+ gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1418	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	1419	+
	1420	+ if (flipV)
	1421	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	1422	+ else
	1423	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1424	+ }
	1425	+
	1426	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	1427	+ }
764	1428
765	1429	void SetColor(Object3D obj, Vertex p0)
766	1430	{
..	..	@@ -955,18 +1619,18 @@
955	1619	//col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
956	1620	if (!material.multiply)
957	1621	{
958		- display.color = color;
	1622	+ display.color = material.color;
959	1623	display.saturation = material.modulation;
960	1624	}
961	1625	else
962	1626	{
963		- display.color = color2;
	1627	+ display.color = material.color2;
964	1628	display.saturation = material.modulation2;
965	1629	}
966	1630
967	1631	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
968	1632
969		- float[] colorV = GrafreeD.colorV;
	1633	+ float[] colorV = Grafreed.colorV;
970	1634
971	1635	/**/
972	1636	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1226,7 +1890,7 @@
1226	1890	void PushMatrix(double[][] matrix)
1227	1891	{
1228	1892	// GrafreeD.tracein(matrix);
1229		- PushMatrix(matrix,1);
	1893	+ PushMatrix(matrix, 1);
1230	1894	}
1231	1895
1232	1896	void PushMatrix()
..	..	@@ -1323,7 +1987,7 @@
1323	1987
1324	1988	static int camerachangeframe;
1325	1989
1326		- boolean SetCamera(Camera cam)
	1990	+ public boolean SetCamera(Camera cam)
1327	1991	{
1328	1992	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
1329	1993	// return false;
..	..	@@ -1451,33 +2115,6 @@
1451	2115	mainDL ^= true;
1452	2116	}
1453	2117
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	2118	void ToggleFullScreen()
1482	2119	{
1483	2120	FULLSCREEN ^= true;
..	..	@@ -1488,72 +2125,94 @@
1488	2125	Globals.CROWD ^= true;
1489	2126	}
1490	2127
1491		- void ToggleInertia()
1492		- {
1493		- INERTIA ^= true;
1494		- }
1495		-
1496	2128	void ToggleLocal()
1497	2129	{
1498	2130	LOCALTRANSFORM ^= true;
1499	2131	}
1500	2132
1501		- void ToggleFast()
	2133	+ public void ToggleTexture()
	2134	+ {
	2135	+ textureon ^= true;
	2136	+ }
	2137	+
	2138	+ public void ToggleLive()
	2139	+ {
	2140	+ Globals.setLIVE(Globals.isLIVE() ^ true);
	2141	+
	2142	+ System.err.println("LIVE = " + Globals.isLIVE());
	2143	+
	2144	+ if (!Globals.isLIVE()) // save sound
	2145	+ Grafreed.savesound = true; // wav.save();
	2146	+ // else
	2147	+ repaint(); // start loop // may 2013
	2148	+ }
	2149	+
	2150	+ public void ToggleSupport()
	2151	+ {
	2152	+ SUPPORT ^= true;
	2153	+ }
	2154	+
	2155	+ public void ToggleAbort()
	2156	+ {
	2157	+ ABORTMODE ^= true;
	2158	+ }
	2159	+
	2160	+ public void ToggleInertia()
	2161	+ {
	2162	+ INERTIA ^= true;
	2163	+ }
	2164	+
	2165	+ public void ToggleFast()
1502	2166	{
1503	2167	FAST ^= true;
1504	2168	}
1505	2169
1506		- void ToggleSlowPose()
	2170	+ public void ToggleSlowPose()
1507	2171	{
1508	2172	SLOWPOSE ^= true;
1509	2173	}
1510	2174
1511		- void ToggleFootContact()
1512		- {
1513		- FOOTCONTACT ^= true;
1514		- }
1515		-
1516		- void ToggleBoxMode()
	2175	+ public void ToggleBoxMode()
1517	2176	{
1518	2177	BOXMODE ^= true;
1519	2178	}
1520	2179
1521		- void ToggleSmoothFocus()
	2180	+ public void ToggleZoomBoxMode()
	2181	+ {
	2182	+ ZOOMBOXMODE ^= true;
	2183	+ }
	2184	+
	2185	+ public void ToggleSmoothFocus()
1522	2186	{
1523	2187	SMOOTHFOCUS ^= true;
1524	2188	}
1525	2189
1526		- void ToggleImageFlip()
	2190	+ public void ToggleImageFlip()
1527	2191	{
1528	2192	IMAGEFLIP ^= true;
1529	2193	}
1530	2194
1531		- void ToggleSpeakerMocap()
	2195	+ public void ToggleSpeakerMocap()
1532	2196	{
1533	2197	SPEAKERMOCAP ^= true;
1534	2198	}
1535	2199
1536		- void ToggleSpeakerCamera()
	2200	+ public void ToggleSpeakerCamera()
1537	2201	{
1538	2202	SPEAKERCAMERA ^= true;
1539	2203	}
1540	2204
1541		- void ToggleSpeakerFocus()
	2205	+ public void ToggleSpeakerFocus()
1542	2206	{
1543	2207	SPEAKERFOCUS ^= true;
1544	2208	}
1545	2209
1546		- void ToggleDebug()
1547		- {
1548		- DEBUG ^= true;
1549		- }
1550		-
1551		- void ToggleFrustum()
	2210	+ public void ToggleFrustum()
1552	2211	{
1553	2212	FRUSTUM ^= true;
1554	2213	}
1555	2214
1556		- void ToggleTrack()
	2215	+ public void ToggleTrack()
1557	2216	{
1558	2217	TRACK ^= true;
1559	2218	if (TRACK)
..	..	@@ -1572,25 +2231,35 @@
1572	2231	repaint();
1573	2232	}
1574	2233
1575		- void ToggleTrackOnce()
	2234	+ public void ToggleTrackOnce()
1576	2235	{
1577	2236	TRACKONCE ^= true;
1578	2237	}
1579	2238
1580		- void ToggleShadowTrack()
	2239	+ public void ToggleShadowTrack()
1581	2240	{
1582	2241	SHADOWTRACK ^= true;
1583	2242	repaint();
1584	2243	}
1585	2244
1586		- void ToggleOeil()
	2245	+ public void ToggleOeil()
1587	2246	{
1588	2247	OEIL ^= true;
1589	2248	}
1590	2249
1591		- void ToggleOeilOnce()
	2250	+ public void ToggleOeilOnce()
1592	2251	{
1593	2252	OEILONCE ^= true;
	2253	+ }
	2254	+
	2255	+ void ToggleFootContact()
	2256	+ {
	2257	+ FOOTCONTACT ^= true;
	2258	+ }
	2259	+
	2260	+ void ToggleDebug()
	2261	+ {
	2262	+ DEBUG ^= true;
1594	2263	}
1595	2264
1596	2265	void ToggleLookAt()
..	..	@@ -1598,9 +2267,9 @@
1598	2267	LOOKAT ^= true;
1599	2268	}
1600	2269
1601		- void ToggleRandom()
	2270	+ void ToggleSwitch()
1602	2271	{
1603		- RANDOM ^= true;
	2272	+ SWITCH ^= true;
1604	2273	}
1605	2274
1606	2275	void ToggleHandles()
..	..	@@ -1707,7 +2376,7 @@
1707	2376	{
1708	2377	return currentGL;
1709	2378	}
1710		-
	2379	+
1711	2380	/**/
1712	2381	class CacheTexture
1713	2382	{
..	..	@@ -3539,6 +4208,7 @@
3539	4208
3540	4209	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
3541	4210	{
	4211	+ new Exception().printStackTrace();
3542	4212	System.exit(0);
3543	4213	com.sun.opengl.util.texture.Texture texture = null;
3544	4214
..	..	@@ -7251,6 +7921,64 @@
7251	7921	ReleaseTexture(pigment, false);
7252	7922	}
7253	7923
	7924	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	7925	+ {
	7926	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7927	+ {
	7928	+ return;
	7929	+ }
	7930	+
	7931	+ if (tex == null)
	7932	+ {
	7933	+ ReleaseTexture(null, false);
	7934	+ return;
	7935	+ }
	7936	+
	7937	+ String pigment = Object3D.GetPigment(tex);
	7938	+
	7939	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7940	+ {
	7941	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7942	+ // System.out.println("; bump = " + bump);
	7943	+ }
	7944	+
	7945	+ if (pigment.equals(""))
	7946	+ {
	7947	+ pigment = null;
	7948	+ }
	7949	+
	7950	+ ReleaseTexture(pigment, false);
	7951	+ }
	7952	+
	7953	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	7954	+ {
	7955	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7956	+ {
	7957	+ return;
	7958	+ }
	7959	+
	7960	+ if (tex == null)
	7961	+ {
	7962	+ ReleaseTexture(null, true);
	7963	+ return;
	7964	+ }
	7965	+
	7966	+ String bump = Object3D.GetBump(tex);
	7967	+
	7968	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7969	+ {
	7970	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7971	+ // System.out.println("; bump = " + bump);
	7972	+ }
	7973	+
	7974	+ if (bump.equals(""))
	7975	+ {
	7976	+ bump = null;
	7977	+ }
	7978	+
	7979	+ ReleaseTexture(bump, true);
	7980	+ }
	7981	+
7254	7982	void ReleaseTexture(String tex, boolean bump)
7255	7983	{
7256	7984	if (// DrawMode() != 0 \|\| /tex == null \|\|/
..	..	@@ -7354,7 +8082,7 @@
7354	8082	}
7355	8083	}
7356	8084
7357		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8085	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
7358	8086	{
7359	8087	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7360	8088	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7399,7 +8127,94 @@
7399	8127	return; // true;
7400	8128	}
7401	8129
7402		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8130	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8131	+ {
	8132	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8133	+ ambientOcclusion ) // \|\| !textureon)
	8134	+ {
	8135	+ return; // false;
	8136	+ }
	8137	+
	8138	+ if (tex == null)
	8139	+ {
	8140	+ BindTexture(null,false,resolution);
	8141	+ return;
	8142	+ }
	8143	+
	8144	+ String pigment = Object3D.GetPigment(tex);
	8145	+
	8146	+ usedtextures.put(pigment, pigment);
	8147	+
	8148	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8149	+ {
	8150	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8151	+ // System.out.println("; bump = " + bump);
	8152	+ }
	8153	+
	8154	+ if (pigment.equals(""))
	8155	+ {
	8156	+ pigment = null;
	8157	+ }
	8158	+
	8159	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8160	+ BindTexture(pigment, false, resolution);
	8161	+ }
	8162	+
	8163	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8164	+ {
	8165	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8166	+ ambientOcclusion ) // \|\| !textureon)
	8167	+ {
	8168	+ return; // false;
	8169	+ }
	8170	+
	8171	+ if (tex == null)
	8172	+ {
	8173	+ BindTexture(null,true,resolution);
	8174	+ return;
	8175	+ }
	8176	+
	8177	+ String bump = Object3D.GetBump(tex);
	8178	+
	8179	+ usedtextures.put(bump, bump);
	8180	+
	8181	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8182	+ {
	8183	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8184	+ // System.out.println("; bump = " + bump);
	8185	+ }
	8186	+
	8187	+ if (bump.equals(""))
	8188	+ {
	8189	+ bump = null;
	8190	+ }
	8191	+
	8192	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8193	+ BindTexture(bump, true, resolution);
	8194	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8195	+ }
	8196	+
	8197	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8198	+
	8199	+ private boolean FileExists(String tex)
	8200	+ {
	8201	+ if (missingTextures.contains(tex))
	8202	+ {
	8203	+ return false;
	8204	+ }
	8205	+
	8206	+ boolean fileExists = new File(tex).exists();
	8207	+
	8208	+ if (!fileExists)
	8209	+ {
	8210	+ // If file exists, the "new File()" is not executed sgain
	8211	+ missingTextures.add(tex);
	8212	+ }
	8213	+
	8214	+ return fileExists;
	8215	+ }
	8216	+
	8217	+ CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
7403	8218	{
7404	8219	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7405	8220
..	..	@@ -7407,12 +8222,18 @@
7407	8222	{
7408	8223	String texname = tex;
7409	8224
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;
	8225	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8226	+
	8227	+// String[] split = tex.split("Textures");
	8228	+// if (split.length > 1)
	8229	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8230	+// else
	8231	+// if (!texname.startsWith("/"))
	8232	+// texname = "/Users/nbriere/Textures/" + texname;
	8233	+ if (!FileExists(tex))
	8234	+ {
	8235	+ texname = fallbackTextureName;
	8236	+ }
7416	8237
7417	8238	if (CACHETEXTURE)
7418	8239	texture = textures.get(texname); // TEXTURE CACHE
..	..	@@ -7481,7 +8302,7 @@
7481	8302	}
7482	8303
7483	8304	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
7484		- if (!new File(cachename).exists())
	8305	+ if (!FileExists(cachename))
7485	8306	cachename = texname;
7486	8307	else
7487	8308	processbump = false; // don't process bump map again
..	..	@@ -7503,7 +8324,7 @@
7503	8324	}
7504	8325
7505	8326	cachename = texname.substring(0, texname.length()-4)+ext+".png";
7506		- if (!new File(cachename).exists())
	8327	+ if (!FileExists(cachename))
7507	8328	cachename = texname;
7508	8329	else
7509	8330	processbump = false; // don't process bump map again
..	..	@@ -7512,7 +8333,9 @@
7512	8333	texturedata = GetFileTexture(cachename, processbump, resolution);
7513	8334
7514	8335
7515		- if (texturedata != null)
	8336	+ if (texturedata == null)
	8337	+ throw new Exception();
	8338	+
7516	8339	texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
7517	8340	//texture = GetTexture(tex, bump);
7518	8341	}
..	..	@@ -7634,7 +8457,7 @@
7634	8457	return texture;
7635	8458	}
7636	8459
7637		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8460	+ com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
7638	8461	{
7639	8462	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7640	8463
..	..	@@ -7652,14 +8475,14 @@
7652	8475	return texture!=null?texture.texture:null;
7653	8476	}
7654	8477
7655		- com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8478	+ public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
7656	8479	{
7657	8480	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7658	8481
7659	8482	return texture!=null?texture.texturedata:null;
7660	8483	}
7661	8484
7662		- boolean BindTexture(String tex, boolean bump, int resolution)
	8485	+ boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
7663	8486	{
7664	8487	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
7665	8488	{
..	..	@@ -8636,8 +9459,8 @@
8636	9459	assert (parentcam != renderCamera);
8637	9460
8638	9461	if (renderCamera != lightCamera)
8639		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8640		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9462	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9463	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
8641	9464
8642	9465	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
8643	9466
..	..	@@ -8652,8 +9475,8 @@
8652	9475	LA.matCopy(renderCamera.fromScreen, matrix);
8653	9476
8654	9477	if (renderCamera != lightCamera)
8655		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8656		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9478	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9479	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
8657	9480
8658	9481	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
8659	9482
..	..	@@ -8725,7 +9548,7 @@
8725	9548	//gl.glFlush();
8726	9549	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
8727	9550
8728		- if (ANIMATION && ABORTED)
	9551	+ if (Globals.ANIMATION && ABORTED)
8729	9552	{
8730	9553	System.err.println(" ABORTED FRAME");
8731	9554	break;
..	..	@@ -8755,7 +9578,7 @@
8755	9578	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
8756	9579
8757	9580	// save image
8758		- if (ANIMATION && !ABORTED)
	9581	+ if (Globals.ANIMATION && !ABORTED)
8759	9582	{
8760	9583	VPwidth = viewport[2];
8761	9584	VPheight = viewport[3];
..	..	@@ -8866,11 +9689,11 @@
8866	9689
8867	9690	// imagecount++;
8868	9691
8869		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9692	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
8870	9693
8871	9694	if (!BOXMODE)
8872	9695	{
8873		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9696	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
8874	9697	}
8875	9698
8876	9699	if (!BOXMODE)
..	..	@@ -8908,7 +9731,7 @@
8908	9731	ABORTED = false;
8909	9732	}
8910	9733	else
8911		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9734	+ Grafreed.wav.cursor += 735 * ACSIZE;
8912	9735
8913	9736	if (false)
8914	9737	{
..	..	@@ -9571,11 +10394,11 @@
9571	10394
9572	10395	public void display(GLAutoDrawable drawable)
9573	10396	{
9574		- if (GrafreeD.savesound && GrafreeD.hassound)
	10397	+ if (Grafreed.savesound && Grafreed.hassound)
9575	10398	{
9576		- GrafreeD.wav.save();
9577		- GrafreeD.savesound = false;
9578		- GrafreeD.hassound = false;
	10399	+ Grafreed.wav.save();
	10400	+ Grafreed.savesound = false;
	10401	+ Grafreed.hassound = false;
9579	10402	}
9580	10403	// if (DEBUG_SELECTION)
9581	10404	// {
..	..	@@ -9705,7 +10528,7 @@
9705	10528	Object3D theobject = object;
9706	10529	Object3D theparent = object.parent;
9707	10530	object.parent = null;
9708		- object = (Object3D)GrafreeD.clone(object);
	10531	+ object = (Object3D)Grafreed.clone(object);
9709	10532	object.Stripify();
9710	10533	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
9711	10534	theobject.PreprocessOcclusion(this);
..	..	@@ -9718,13 +10541,13 @@
9718	10541	ambientOcclusion = false;
9719	10542	}
9720	10543
9721		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10544	+ if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
9722	10545	{
9723	10546	//if (RENDERSHADOW) // ?
9724	10547	if (!IsFrozen())
9725	10548	{
9726	10549	// dec 2012
9727		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10550	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
9728	10551	{
9729	10552	Globals.framecount++;
9730	10553	shadowbuffer.display();
..	..	@@ -9851,8 +10674,8 @@
9851	10674
9852	10675	// if (parentcam != renderCamera) // not a light
9853	10676	if (cam != lightCamera)
9854		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9855		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10677	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10678	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9856	10679
9857	10680	for (int j = 0; j < 4; j++)
9858	10681	{
..	..	@@ -9866,8 +10689,8 @@
9866	10689
9867	10690	// if (parentcam != renderCamera) // not a light
9868	10691	if (cam != lightCamera)
9869		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9870		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10692	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10693	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9871	10694
9872	10695	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
9873	10696
..	..	@@ -10126,7 +10949,16 @@
10126	10949	// Bump noise
10127	10950	gl.glActiveTexture(GL.GL_TEXTURE6);
10128	10951	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10129		- BindTexture(NOISE_TEXTURE, false, 2);
	10952	+
	10953	+ try
	10954	+ {
	10955	+ BindTexture(NOISE_TEXTURE, false, 2);
	10956	+ }
	10957	+ catch (Exception e)
	10958	+ {
	10959	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	10960	+ }
	10961	+
10130	10962
10131	10963	gl.glActiveTexture(GL.GL_TEXTURE0);
10132	10964	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10251,8 +11083,8 @@
10251	11083	System.err.println("parentcam != renderCamera");
10252	11084
10253	11085	// if (cam != lightCamera)
10254		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10255		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11086	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11087	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10256	11088	}
10257	11089
10258	11090	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10273,8 +11105,8 @@
10273	11105	if (true) // TODO
10274	11106	{
10275	11107	if (cam != lightCamera)
10276		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10277		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11108	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11109	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10278	11110	}
10279	11111
10280	11112	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -10340,7 +11172,7 @@
10340	11172	fragmentMode \|= (lightslot - 64) << 2; // 1; // first bit is available for aniso
10341	11173	//System.out.println("fragmentMode = " + fragmentMode);
10342	11174
10343		- if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| DEBUG_SELECTION)
	11175	+ if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| IsDebugSelection())
10344	11176	{
10345	11177	/*
10346	11178	if (CULLFACE \|\| (ambientOcclusion && OCCLUSION_CULLING))
..	..	@@ -10590,8 +11422,14 @@
10590	11422	{
10591	11423	renderpass++;
10592	11424	// System.out.println("Draw object... ");
	11425	+ STEP = 1;
10593	11426	if (FAST) // in case there is no script
10594		- STEP = 16;
	11427	+ STEP = 8;
	11428	+
	11429	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11430	+ {
	11431	+ STEP *= 4;
	11432	+ }
10595	11433
10596	11434	//object.FullInvariants();
10597	11435
..	..	@@ -10605,8 +11443,8 @@
10605	11443	e.printStackTrace();
10606	11444	}
10607	11445
10608		- if (GrafreeD.RENDERME > 0)
10609		- GrafreeD.RENDERME--; // mechante magouille
	11446	+ if (Grafreed.RENDERME > 0)
	11447	+ Grafreed.RENDERME--; // mechante magouille
10610	11448
10611	11449	Globals.ONESTEP = false;
10612	11450	}
..	..	@@ -10641,7 +11479,7 @@
10641	11479	callist = gl.glGenLists(1);
10642	11480	}
10643	11481
10644		- boolean selectmode = DrawMode() == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	11482	+ boolean selectmode = DrawMode() == SELECTION \|\| IsDebugSelection();
10645	11483
10646	11484	boolean active = !selectmode; // DrawMode() != SELECTION; // mouseDown;
10647	11485
..	..	@@ -10676,7 +11514,14 @@
10676	11514
10677	11515	usedtextures.clear();
10678	11516
10679		- BindTextures(DEFAULT_TEXTURES, 2);
	11517	+ try
	11518	+ {
	11519	+ BindTextures(DEFAULT_TEXTURES, 2);
	11520	+ }
	11521	+ catch (Exception e)
	11522	+ {
	11523	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11524	+ }
10680	11525	}
10681	11526	//System.out.println("--> " + stackdepth);
10682	11527	// GrafreeD.traceon();
..	..	@@ -10767,7 +11612,14 @@
10767	11612	if (checker != null && DrawMode() == DEFAULT)
10768	11613	{
10769	11614	//BindTexture(IMMORTAL_TEXTURE);
10770		- BindTextures(checker.GetTextures(), checker.texres);
	11615	+ try
	11616	+ {
	11617	+ BindTextures(checker.GetTextures(), checker.texres);
	11618	+ }
	11619	+ catch (Exception e)
	11620	+ {
	11621	+ System.err.println("FAILED: " + checker.GetTextures());
	11622	+ }
10771	11623	// NEAREST
10772	11624	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
10773	11625	DrawChecker(gl);
..	..	@@ -10849,7 +11701,7 @@
10849	11701	return;
10850	11702	}
10851	11703
10852		- String string = obj.GetToolTip();
	11704	+ String string = obj.toString(); //.GetToolTip();
10853	11705
10854	11706	GL gl = GetGL();
10855	11707
..	..	@@ -11166,8 +12018,8 @@
11166	12018	//obj.TransformToWorld(light, light);
11167	12019	for (int i = tp.size(); --i >= 0;)
11168	12020	{
11169		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11170		- LA.xformPos(light, tp.get(i).toParent, light);
	12021	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12022	+ LA.xformPos(light, tp.get(i).GlobalTransform(), light);
11171	12023	}
11172	12024
11173	12025
..	..	@@ -11184,8 +12036,8 @@
11184	12036	parentcam = cameras[0];
11185	12037	}
11186	12038
11187		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11188		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12039	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12040	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11189	12041
11190	12042	LA.xformPos(light, renderCamera.toScreen, light);
11191	12043
..	..	@@ -11799,8 +12651,8 @@
11799	12651
11800	12652	// display shadow only (bump == 0)
11801	12653	"SUB temp.x, half.x, shadow.x;" +
11802		- "MOV temp.y, -params6.x;" +
11803		- "SLT temp.z, temp.y, zero.x;" +
	12654	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12655	+ "SLT temp.z, temp.y, -one2048th.x;" +
11804	12656	"SUB temp.y, one.x, temp.z;" +
11805	12657	"MUL temp.x, temp.x, temp.y;" +
11806	12658	"KIL temp.x;" +
..	..	@@ -11929,8 +12781,10 @@
11929	12781	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
11930	12782
11931	12783	"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
	12784	+ // Tuning for default skin
	12785	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12786	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12787	+ "ADD temp.y, one.y, options2.y;" + // subsurface
11934	12788	"MUL temp.x, temp.x, temp.y;" +
11935	12789
11936	12790	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12129,7 +12983,7 @@
12129	12983	//once = true;
12130	12984	}
12131	12985
12132		- System.out.print("Program #" + mode + "; length = " + program.length());
	12986	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12133	12987	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12134	12988	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12135	12989
..	..	@@ -12262,12 +13116,16 @@
12262	13116
12263	13117	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12264	13118	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13119	+
	13120	+ // Compare fragment depth in light space with shadowmap.
12265	13121	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12266	13122	"SGE temp.y, temp.x, zero.x;" +
12267		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13123	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13124	+
	13125	+ // Reverse comparison
12268	13126	"SUB temp.x, one.x, temp.x;" +
12269	13127	"MUL " + shadow + ".x, temp.x, temp.y;" +
12270		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13128	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12271	13129	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12272	13130
12273	13131	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12281,6 +13139,10 @@
12281	13139	// No shadow for backface
12282	13140	"DP3 temp.x, normal, lightd;" +
12283	13141	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13142	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13143	+
	13144	+ // No shadow when out of frustrum
	13145	+ "SGE temp.x, " + depth + ".z, one.z;" +
12284	13146	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12285	13147	"";
12286	13148	}
..	..	@@ -12839,7 +13701,7 @@
12839	13701	public void mousePressed(MouseEvent e)
12840	13702	{
12841	13703	//System.out.println("mousePressed: " + e);
12842		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13704	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
12843	13705	}
12844	13706
12845	13707	static long prevtime = 0;
..	..	@@ -12866,6 +13728,7 @@
12866	13728
12867	13729	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
12868	13730
	13731	+ if (BUTTONLESSWHEEL)
12869	13732	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
12870	13733	{
12871	13734	return;
..	..	@@ -12874,7 +13737,7 @@
12874	13737	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
12875	13738
12876	13739	// TIMER
12877		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	13740	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
12878	13741	{
12879	13742	keepboxmode = BOXMODE;
12880	13743	keepsupport = SUPPORT;
..	..	@@ -12914,8 +13777,8 @@
12914	13777	// mode \|= META;
12915	13778	//}
12916	13779
12917		- SetMouseMode(WHEEL \| e.getModifiersEx());
12918		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13780	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13781	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
12919	13782	anchorX = ax;
12920	13783	anchorY = ay;
12921	13784	prevX = px;
..	..	@@ -12975,6 +13838,10 @@
12975	13838	// wasliveok = true;
12976	13839	// waslive = false;
12977	13840
	13841	+ // May 2019 Forget it:
	13842	+ if (true)
	13843	+ return;
	13844	+
12978	13845	// source == timer
12979	13846	if (mouseDown)
12980	13847	{
..	..	@@ -13013,7 +13880,7 @@
13013	13880
13014	13881	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13015	13882
13016		- void clickStart(int x, int y, int modifiers)
	13883	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13017	13884	{
13018	13885	if (!wasliveok)
13019	13886	return;
..	..	@@ -13030,7 +13897,7 @@
13030	13897	// touched = true; // main DL
13031	13898	if (isRenderer)
13032	13899	{
13033		- SetMouseMode(modifiers);
	13900	+ SetMouseMode(modifiers, modifiersex);
13034	13901	}
13035	13902
13036	13903	selectX = anchorX = x;
..	..	@@ -13043,7 +13910,7 @@
13043	13910	clicked = true;
13044	13911	hold = false;
13045	13912
13046		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	13913	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13047	13914	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13048	13915	{
13049	13916	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13074,7 +13941,7 @@
13074	13941	info.camera = renderCamera;
13075	13942	info.x = x;
13076	13943	info.y = y;
13077		- info.modifiers = modifiers;
	13944	+ info.modifiers = modifiersex;
13078	13945	editObj = object.doEditClick(info, 0);
13079	13946	if (!editObj)
13080	13947	{
..	..	@@ -13091,11 +13958,14 @@
13091	13958
13092	13959	public void mouseDragged(MouseEvent e)
13093	13960	{
	13961	+ Globals.MOUSEDRAGGED = true;
	13962	+
	13963	+ //System.out.println("mouseDragged: " + e);
13094	13964	if (isRenderer)
13095	13965	movingcamera = true;
	13966	+
13096	13967	//if (drawing)
13097	13968	//return;
13098		- //System.out.println("mouseDragged: " + e);
13099	13969	if ((e.getModifiersEx() & CTRL) != 0
13100	13970	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
13101	13971	{
..	..	@@ -13103,7 +13973,7 @@
13103	13973	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13104	13974	}
13105	13975	else
13106		- drag(e.getX(), e.getY(), e.getModifiersEx());
	13976	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13107	13977
13108	13978	//try { Thread.sleep(1); } catch (Exception ex) {}
13109	13979	}
..	..	@@ -13115,6 +13985,11 @@
13115	13985	cVector tmp = new cVector();
13116	13986	cVector tmp2 = new cVector();
13117	13987	boolean isMoving;
	13988	+
	13989	+ public cVector TargetLookAt()
	13990	+ {
	13991	+ return targetLookAt;
	13992	+ }
13118	13993
13119	13994	class PingThread extends Thread
13120	13995	{
..	..	@@ -13271,6 +14146,7 @@
13271	14146
13272	14147	public void run()
13273	14148	{
	14149	+ new Exception().printStackTrace();
13274	14150	System.exit(0);
13275	14151	for (;;)
13276	14152	{
..	..	@@ -13334,7 +14210,7 @@
13334	14210	{
13335	14211	Globals.lighttouched = true;
13336	14212	}
13337		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14213	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
13338	14214	}
13339	14215	//else
13340	14216	}
..	..	@@ -13434,7 +14310,7 @@
13434	14310	int X, Y;
13435	14311	boolean SX, SY;
13436	14312
13437		- void drag(int x, int y, int modifiers)
	14313	+ void drag(int x, int y, int modifiers, int modifiersex)
13438	14314	{
13439	14315	if (IsFrozen())
13440	14316	{
..	..	@@ -13443,17 +14319,17 @@
13443	14319
13444	14320	drag = true; // NEW
13445	14321
13446		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14322	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
13447	14323
13448	14324	X = x;
13449	14325	Y = y;
13450	14326	// floating state for animation
13451		- MODIFIERS = modifiers;
13452		- modifiers &= ~1024;
	14327	+ MODIFIERS = modifiersex;
	14328	+ modifiersex &= ~1024;
13453	14329	if (false) // modifiers != 0)
13454	14330	{
13455	14331	//new Exception().printStackTrace();
13456		- System.out.println("mouseDragged: " + modifiers);
	14332	+ System.out.println("mouseDragged: " + modifiersex);
13457	14333	System.out.println("SHIFT = " + SHIFT);
13458	14334	System.out.println("CONTROL = " + COMMAND);
13459	14335	System.out.println("META = " + META);
..	..	@@ -13473,7 +14349,7 @@
13473	14349	info.camera = renderCamera;
13474	14350	info.x = x;
13475	14351	info.y = y;
13476		- object.editWindow.copy.doEditDrag(info);
	14352	+ object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
13477	14353	} else
13478	14354	{
13479	14355	if (x < startX)
..	..	@@ -13625,7 +14501,6 @@
13625	14501	public void mouseMoved(MouseEvent e)
13626	14502	{
13627	14503	//System.out.println("mouseMoved: " + e);
13628		-
13629	14504	if (isRenderer)
13630	14505	return;
13631	14506
..	..	@@ -13650,7 +14525,10 @@
13650	14525
13651	14526	public void mouseReleased(MouseEvent e)
13652	14527	{
	14528	+ Globals.MOUSEDRAGGED = false;
	14529	+
13653	14530	movingcamera = false;
	14531	+ X = Y = 0;
13654	14532	//System.out.println("mouseReleased: " + e);
13655	14533	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13656	14534	}
..	..	@@ -13673,9 +14551,9 @@
13673	14551	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
13674	14552	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
13675	14553
13676		- if (control \|\| command \|\| IsFrozen())
	14554	+// No delay if (control \|\| command \|\| IsFrozen())
13677	14555	timeout = true;
13678		- else
	14556	+// ?? May 2019 else
13679	14557	// timer.setDelay((modifiers & 128) != 0?0:350);
13680	14558	mouseDown = false;
13681	14559	if (!control && !command) // june 2013
..	..	@@ -13785,7 +14663,7 @@
13785	14663	System.out.println("keyReleased: " + e);
13786	14664	}
13787	14665
13788		- void SetMouseMode(int modifiers)
	14666	+ void SetMouseMode(int modifiers, int modifiersex)
13789	14667	{
13790	14668	//System.out.println("SetMouseMode = " + modifiers);
13791	14669	//modifiers &= ~1024;
..	..	@@ -13797,25 +14675,25 @@
13797	14675	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
13798	14676	// return;
13799	14677	//System.out.println("SetMode = " + modifiers);
13800		- if ((modifiers & WHEEL) == WHEEL)
	14678	+ if ((modifiersex & WHEEL) == WHEEL)
13801	14679	{
13802	14680	mouseMode \|= ZOOM;
13803	14681	}
13804	14682
13805	14683	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13806		- if (capsLocked \|\| (modifiers & META) == META)
	14684	+ if (capsLocked) // \|\| (modifiers & META) == META)
13807	14685	{
13808	14686	mouseMode \|= VR; // BACKFORTH;
13809	14687	}
13810		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14688	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
13811	14689	{
13812	14690	mouseMode \|= SELECT;
13813	14691	}
13814		- if ((modifiers & COMMAND) == COMMAND)
	14692	+ if ((modifiersex & COMMAND) == COMMAND)
13815	14693	{
13816	14694	mouseMode \|= SELECT;
13817	14695	}
13818		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14696	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
13819	14697	{
13820	14698	mouseMode &= ~VR;
13821	14699	mouseMode \|= TRANSLATE;
..	..	@@ -13844,10 +14722,10 @@
13844	14722
13845	14723	if (isRenderer) //
13846	14724	{
13847		- SetMouseMode(modifiers);
	14725	+ SetMouseMode(0, modifiers);
13848	14726	}
13849	14727
13850		- theRenderer.keyPressed(key);
	14728	+ Globals.theRenderer.keyPressed(key);
13851	14729	}
13852	14730
13853	14731	int kompactbit = 4; // power bit
..	..	@@ -13859,7 +14737,7 @@
13859	14737	float SATPOW = 1; // 2; // 0.5f;
13860	14738	float BRIPOW = 1; // 0.5f; // 0.5f;
13861	14739
13862		- void keyPressed(int key)
	14740	+ public void keyPressed(int key)
13863	14741	{
13864	14742	if (key >= '0' && key <= '5')
13865	14743	clampbit = (key-'0');
..	..	@@ -14180,7 +15058,7 @@
14180	15058	//RESIZETEXTURE ^= true;
14181	15059	//break;
14182	15060	case 'z':
14183		- RENDERSHADOW ^= true;
	15061	+ Globals.RENDERSHADOW ^= true;
14184	15062	Globals.lighttouched = true;
14185	15063	repaint();
14186	15064	break;
..	..	@@ -14296,6 +15174,7 @@
14296	15174	}
14297	15175	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
14298	15176	}
	15177	+
14299	15178	static double OCCLUSIONBOOST = 1; // 0.5;
14300	15179
14301	15180	void keyReleased(int key, int modifiers)
..	..	@@ -14303,11 +15182,11 @@
14303	15182	//mode = ROTATE;
14304	15183	if ((MODIFIERS & COMMAND) == 0) // VR??
14305	15184	{
14306		- SetMouseMode(modifiers);
	15185	+ SetMouseMode(0, modifiers);
14307	15186	}
14308	15187	}
14309	15188
14310		- protected void processKeyEvent(KeyEvent e)
	15189	+ public void processKeyEvent(KeyEvent e)
14311	15190	{
14312	15191	switch (e.getID())
14313	15192	{
..	..	@@ -14437,8 +15316,9 @@
14437	15316
14438	15317	protected void processMouseMotionEvent(MouseEvent e)
14439	15318	{
14440		- //System.out.println("processMouseMotionEvent: " + mouseMode);
14441		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15319	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15320	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15321	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
14442	15322	{
14443	15323	mouseMoved(e);
14444	15324	} else
..	..	@@ -14468,6 +15348,7 @@
14468	15348
14469	15349	void SelectParent()
14470	15350	{
	15351	+ new Exception().printStackTrace();
14471	15352	System.exit(0);
14472	15353	Composite group = (Composite) object;
14473	15354	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -14491,6 +15372,7 @@
14491	15372
14492	15373	void SelectChildren()
14493	15374	{
	15375	+ new Exception().printStackTrace();
14494	15376	System.exit(0);
14495	15377	/*
14496	15378	Composite group = (Composite) object;
..	..	@@ -14655,7 +15537,9 @@
14655	15537	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
14656	15538	//Image img = CreateImage(width, height);
14657	15539	//System.out.println("width = " + width + "; height = " + height + "\n");
	15540	+
14658	15541	Graphics gr = g; // img.getGraphics();
	15542	+
14659	15543	if (!hasMarquee)
14660	15544	{
14661	15545	if (Xmin < Xmax) // !locked)
..	..	@@ -14753,14 +15637,33 @@
14753	15637	if (!isRenderer)
14754	15638	{
14755	15639	object.drawEditHandles(info, 0);
	15640	+
	15641	+ if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	15642	+ {
	15643	+ switch (object.selection.get(0).hitSomething)
	15644	+ {
	15645	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15646	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15647	+ break;
	15648	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15649	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15650	+ break;
	15651	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15652	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15653	+ break;
	15654	+ }
	15655	+
	15656	+ }
14756	15657	}
14757	15658	}
	15659	+
14758	15660	if (isRenderer)
14759	15661	{
14760	15662	//gr.setColor(Color.black);
14761	15663	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
14762	15664	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
14763	15665	}
	15666	+
14764	15667	if (hasMarquee)
14765	15668	{
14766	15669	gr.setXORMode(Color.white);
..	..	@@ -14873,6 +15776,7 @@
14873	15776	public boolean mouseDown(Event evt, int x, int y)
14874	15777	{
14875	15778	System.out.println("mouseDown: " + evt);
	15779	+ System.exit(0);
14876	15780	/*
14877	15781	locked = true;
14878	15782	drag = false;
..	..	@@ -14916,7 +15820,7 @@
14916	15820	{
14917	15821	keyPressed(0, modifiers);
14918	15822	}
14919		- clickStart(x, y, modifiers);
	15823	+ // clickStart(x, y, modifiers);
14920	15824	return true;
14921	15825	}
14922	15826
..	..	@@ -15034,7 +15938,7 @@
15034	15938	{
15035	15939	keyReleased(0, 0);
15036	15940	}
15037		- drag(x, y, modifiers);
	15941	+ drag(x, y, 0, modifiers);
15038	15942	return true;
15039	15943	}
15040	15944
..	..	@@ -15166,7 +16070,7 @@
15166	16070	Object3D object;
15167	16071	static Object3D trackedobject;
15168	16072	Camera renderCamera; // Light or Eye (or Occlusion)
15169		- /static/ Camera manipCamera; // Light or Eye
	16073	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15170	16074	/static/ Camera eyeCamera;
15171	16075	/static/ Camera lightCamera;
15172	16076	int cameracount;
..	..	@@ -15604,6 +16508,7 @@
15604	16508	{
15605	16509	if (!selection)
15606	16510	{
	16511	+ new Exception().printStackTrace();
15607	16512	System.exit(0);
15608	16513	return;
15609	16514	}
..	..	@@ -15731,16 +16636,16 @@
15731	16636	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	16637	}
15733	16638
15734		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16639	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
15735	16640	}
15736	16641	}
15737	16642
15738	16643	if (!movingcamera && !PAINTMODE)
15739	16644	object.editWindow.ScreenFitPoint(); // fev 2014
15740	16645
15741		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16646	+ if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
15742	16647	{
15743		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16648	+ Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
15744	16649
15745	16650	Object3D group = new Object3D("inst" + paintcount++);
15746	16651
..	..	@@ -15896,7 +16801,7 @@
15896	16801	gl.glDisable(gl.GL_CULL_FACE);
15897	16802	}
15898	16803
15899		- if (!RENDERSHADOW)
	16804	+ if (!Globals.RENDERSHADOW)
15900	16805	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
15901	16806
15902	16807	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -15906,7 +16811,7 @@
15906	16811	//gl.glColorMask(false, false, false, false);
15907	16812
15908	16813	//render_scene_from_light_view(gl, drawable, 0, 0);
15909		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	16814	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
15910	16815	{
15911	16816	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
15912	16817
..	..	@@ -15966,7 +16871,6 @@
15966	16871
15967	16872	class AntialiasBuffer implements GLEventListener
15968	16873	{
15969		-
15970	16874	CameraPane parent = null;
15971	16875
15972	16876	AntialiasBuffer(CameraPane p)
..	..	@@ -16359,7 +17263,7 @@
16359	17263	}
16360	17264	}
16361	17265
16362		- static void DrawPoints(CameraPane cpane)
	17266	+ static void DrawPoints(iCameraPane cpane)
16363	17267	{
16364	17268	for (int i=0; i<8; i++) // first and last are red
16365	17269	{
..	..	@@ -16391,10 +17295,11 @@
16391	17295	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
16392	17296	// Depth buffer format
16393	17297	//private int depth_format;
16394		- static public void NextIndex(Object3D o, GL gl)
	17298	+
	17299	+ public void NextIndex()
16395	17300	{
16396	17301	indexcount+=16;
16397		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17302	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
16398	17303	//objects[indexcount] = o;
16399	17304	//System.out.println("indexcount = " + indexcount);
16400	17305	}