~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)
..	..	@@ -277,7 +326,7 @@
277	326	cStatic.objectstack[materialdepth++] = obj;
278	327	//System.out.println("material " + material);
279	328	//Applet3D.tracein(this, selected);
280		- display.vector2buffer = obj.projectedVertices;
	329	+ //display.vector2buffer = obj.projectedVertices;
281	330	if (obj instanceof Camera)
282	331	{
283	332	display.options1[0] = material.shift;
..	..	@@ -286,14 +335,28 @@
286	335	display.options1[2] = material.shadowbias;
287	336	display.options1[3] = material.aniso;
288	337	display.options1[4] = material.anisoV;
	338	+// System.out.println("display.options1[0] " + display.options1[0]);
	339	+// System.out.println("display.options1[1] " + display.options1[1]);
	340	+// System.out.println("display.options1[2] " + display.options1[2]);
	341	+// System.out.println("display.options1[3] " + display.options1[3]);
	342	+// System.out.println("display.options1[4] " + display.options1[4]);
289	343	display.options2[0] = material.opacity;
290	344	display.options2[1] = material.diffuse;
291	345	display.options2[2] = material.factor;
	346	+// System.out.println("display.options2[0] " + display.options2[0]);
	347	+// System.out.println("display.options2[1] " + display.options2[1]);
	348	+// System.out.println("display.options2[2] " + display.options2[2]);
292	349
293	350	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	351	+// System.out.println("display.options3[0] " + display.options3[0]);
	352	+// System.out.println("display.options3[1] " + display.options3[1]);
	353	+// System.out.println("display.options3[2] " + display.options3[2]);
294	354	display.options4[0] = material.cameralight/0.2f;
295	355	display.options4[1] = material.subsurface;
296	356	display.options4[2] = material.sheen;
	357	+// System.out.println("display.options4[0] " + display.options4[0]);
	358	+// System.out.println("display.options4[1] " + display.options4[1]);
	359	+// System.out.println("display.options4[2] " + display.options4[2]);
297	360
298	361	// if (display.CURRENTANTIALIAS > 0)
299	362	// display.options3[3] /= 4;
..	..	@@ -309,7 +372,7 @@
309	372	/**/
310	373	} else
311	374	{
312		- DrawMaterial(material, selected);
	375	+ DrawMaterial(material, selected, obj.projectedVertices);
313	376	}
314	377	} else
315	378	{
..	..	@@ -333,8 +396,8 @@
333	396	cStatic.objectstack[materialdepth++] = obj;
334	397	//System.out.println("material " + material);
335	398	//Applet3D.tracein("selected ", selected);
336		- display.vector2buffer = obj.projectedVertices;
337		- display.DrawMaterial(material, selected);
	399	+ //display.vector2buffer = obj.projectedVertices;
	400	+ display.DrawMaterial(material, selected, obj.projectedVertices);
338	401	}
339	402	}
340	403
..	..	@@ -351,8 +414,8 @@
351	414	materialdepth -= 1;
352	415	if (materialdepth > 0)
353	416	{
354		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
355		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	417	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	418	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
356	419	}
357	420	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
358	421	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -372,8 +435,8 @@
372	435	materialdepth -= 1;
373	436	if (materialdepth > 0)
374	437	{
375		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
376		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	438	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	439	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
377	440	}
378	441	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
379	442	//else
..	..	@@ -408,16 +471,18 @@
408	471
409	472	javax.media.opengl.GL gl = display.GetGL();
410	473
411		- boolean selectmode = display.DrawMode() == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	474	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
412	475
413	476	//System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
414	477	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
415	478	{
416	479	//gl.glBegin(gl.GL_TRIANGLES);
417		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	480	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	481	+ // TEST LIVE NORMALS && !obj.dontselect
	482	+ ;
418	483	if (!hasnorm)
419	484	{
420		- // System.out.println("FUCK!!");
	485	+ // System.out.println("Mesh normal");
421	486	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
422	487	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
423	488	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -760,7 +825,627 @@
760	825	//// tris.postdraw(this);
761	826	}
762	827
	828	+ static Camera localcamera = new Camera();
	829	+ static cVector from = new cVector();
	830	+ static cVector to = new cVector();
	831	+
	832	+ public void PrepOcclusion(BoundaryRep br, double[][] transform)
	833	+ {
	834	+ CameraPane cp = this;
	835	+
	836	+ Camera keep = cp.RenderCamera();
	837	+ cp.renderCamera = localcamera;
	838	+
	839	+ if (br.trimmed)
	840	+ {
	841	+ float[] colors = new float[br.positions.length / 3];
	842	+
	843	+ int i3 = 0;
	844	+ for (int i = 0; i < br.positions.length / 3; i++, i3 += 3)
	845	+ {
	846	+ if (br.normals[i3] == 0 && br.normals[i3+1] == 0 && br.normals[i3+2] == 0)
	847	+ continue;
	848	+
	849	+ from.set(br.positions[i3], br.positions[i3 + 1], br.positions[i3 + 2]);
	850	+ to.set(br.positions[i3] + br.normals[i3],
	851	+ br.positions[i3 + 1] + br.normals[i3 + 1],
	852	+ br.positions[i3 + 2] + br.normals[i3 + 2]);
	853	+ LA.xformPos(from, transform, from);
	854	+ LA.xformPos(to, transform, to); // RIGID ONLY
	855	+ localcamera.setAim(from, to);
	856	+
	857	+ CameraPane.occlusionbuffer.display();
	858	+
	859	+ if (CameraPane.DEBUG_OCCLUSION)
	860	+ cp.display(); // debug
	861	+
	862	+ colors[i] = cp.vertexOcclusion.r;
	863	+ //colors[i3 + 1] = cp.vertexOcclusion.g;
	864	+ //colors[i3 + 2] = cp.vertexOcclusion.b;
	865	+
	866	+ if ((i % 100) == 0 && i != 0)
	867	+ {
	868	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	869	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	870	+ System.out.println((int) (100.0 * i / (br.positions.length / 3)) + "% (" + i + " of " + (br.positions.length / 3) + ")");
	871	+ }
	872	+ }
	873	+
	874	+ br.colors = colors;
	875	+ }
	876	+ else
	877	+ {
	878	+ for (int i = 0; i < br.VertexCount(); i++)
	879	+ {
	880	+ Vertex v = br.GetVertex(i);
	881	+
	882	+ if (v.norm == null \|\| v.norm.x == 0 && v.norm.y == 0 && v.norm.z == 0)
	883	+ continue;
	884	+
	885	+ from.set(v.x, v.y, v.z);
	886	+ to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
	887	+ LA.xformPos(from, transform, from);
	888	+ LA.xformPos(to, transform, to); // RIGID ONLY
	889	+ localcamera.setAim(from, to);
	890	+
	891	+ CameraPane.occlusionbuffer.display();
	892	+
	893	+ if (CameraPane.DEBUG_OCCLUSION)
	894	+ cp.display(); // debug
	895	+
	896	+ v.AO = cp.vertexOcclusion.r;
	897	+
	898	+ if ((i % 100) == 0 && i != 0)
	899	+ {
	900	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	901	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	902	+ System.out.println((int) (100.0 * i / br.VertexCount()) + "% (" + i + " of " + br.VertexCount() + ")");
	903	+ }
	904	+ }
	905	+ }
	906	+
	907	+ //System.out.println("done.");
	908	+
	909	+ cp.renderCamera = keep;
	910	+ }
	911	+
	912	+ void DrawPointFLow(PointFlow pointFlow, Object3D /Composite/ root, boolean selected, boolean blocked)
	913	+ {
	914	+ CameraPane display = this;
	915	+ pointFlow.CreateHT();
	916	+
	917	+ float r = display.modelParams0[0];
	918	+ float g = display.modelParams0[1];
	919	+ float b = display.modelParams0[2];
	920	+ float opacity = display.modelParams5[1];
	921	+
	922	+ //final GL gl = GLU.getCurrentGL();
	923	+ GL gl = display.GetGL(); // getGL();
	924	+
	925	+ int s = pointFlow.points.size();
	926	+
	927	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	928	+ gl.glEnable(gl.GL_CULL_FACE);
	929	+
	930	+ for (int i=s; --i>=0;)
	931	+ //for (int i=0; i<s; i++)
	932	+ {
	933	+ cVector v = pointFlow.points.get(i);
	934	+
	935	+ double mindist = Double.MAX_VALUE;
	936	+
	937	+ double size = pointFlow.minimumSize;
	938	+
	939	+ double distancenext = 0;
	940	+
	941	+ if (i > 0)
	942	+ {
	943	+ cVector w = pointFlow.points.get(i-1);
	944	+
	945	+ double dist = w.distance(v);
	946	+
	947	+ distancenext = dist;
	948	+
	949	+ if (mindist > dist)
	950	+ {
	951	+ mindist = dist;
	952	+ size = mindist*pointFlow.resizefactor;
	953	+ }
	954	+ }
	955	+
	956	+ if (i < s-1)
	957	+ {
	958	+ cVector w = pointFlow.points.get(i+1);
	959	+
	960	+ double dist = w.distance(v);
	961	+
	962	+ if (mindist > dist)
	963	+ {
	964	+ mindist = dist;
	965	+ size = mindist*pointFlow.resizefactor;
	966	+ }
	967	+ }
	968	+
	969	+ if (size < pointFlow.minimumSize)
	970	+ size = pointFlow.minimumSize;
	971	+ if (size > pointFlow.maximumSize)
	972	+ size = pointFlow.maximumSize;
	973	+
	974	+ double tx = v.x;
	975	+ double ty = v.y;
	976	+ double tz = v.z;
	977	+
	978	+ // if (tx == 0 && ty == 0 && tz == 0)
	979	+ // continue;
	980	+
	981	+ gl.glMatrixMode(gl.GL_TEXTURE);
	982	+ gl.glPushMatrix();
	983	+ pointFlow.texmat[12] = pointFlow.texmat[13] = pointFlow.texmat[14] = i;
	984	+
	985	+ gl.glMultMatrixf(pointFlow.texmat, 0);
	986	+
	987	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	988	+ gl.glPushMatrix();
	989	+
	990	+ gl.glTranslated(tx,ty,tz);
	991	+
	992	+ gl.glScaled(size,size,size);
	993	+
	994	+// float cr = colorBuf.get(index4);
	995	+// float cg = colorBuf.get(index4+1);
	996	+// float cb = colorBuf.get(index4+2);
	997	+// float ca = colorBuf.get(index4+3);
	998	+//
	999	+// display.modelParams0[0] = r * cr;
	1000	+// display.modelParams0[1] = g * cg;
	1001	+// display.modelParams0[2] = b * cb;
	1002	+//
	1003	+// display.modelParams5[1] = opacity * ca;
	1004	+//
	1005	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1006	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1007	+//
	1008	+// RandomNode.globalseed = (int)sizeBuf.get(index3+2); // i;
	1009	+// RandomNode.globalseed2 = RandomNode.globalseed;
	1010	+//
	1011	+//// gl.glColor4f(cr,cg,cb,ca);
	1012	+// // gl.glScalef(1024/16,1024/16,1024/16);
	1013	+ pointFlow.geo.Draw/Node/(display,null,selected, blocked);
	1014	+
	1015	+ gl.glPopMatrix();
	1016	+
	1017	+ double step = size/4; //
	1018	+
	1019	+ if (i == 0 \|\| size == 0 \|\| distancenext > 8*size \|\| distancenext < step)
	1020	+ continue;
	1021	+
	1022	+ int nbsteps = (int)(distancenext/step);
	1023	+
	1024	+ step = distancenext/nbsteps;
	1025	+
	1026	+ cVector next = pointFlow.points.get(i-1);
	1027	+
	1028	+ tmp.set(next);
	1029	+ tmp.sub(v);
	1030	+ tmp.normalize();
	1031	+ tmp.mul(step);
	1032	+
	1033	+ // calculate next size
	1034	+ mindist = Double.MAX_VALUE;
	1035	+
	1036	+ double nextsize = pointFlow.minimumSize;
	1037	+
	1038	+ if (i > 1)
	1039	+ {
	1040	+ cVector w = pointFlow.points.get(i-2);
	1041	+
	1042	+ double dist = w.distance(next);
	1043	+
	1044	+ if (mindist > dist)
	1045	+ {
	1046	+ mindist = dist;
	1047	+ nextsize = mindist*pointFlow.resizefactor;
	1048	+ }
	1049	+ }
	1050	+
	1051	+ double dist = v.distance(next);
	1052	+
	1053	+ if (mindist > dist)
	1054	+ {
	1055	+ mindist = dist;
	1056	+ nextsize = mindist*pointFlow.resizefactor;
	1057	+ }
	1058	+
	1059	+ if (nextsize < pointFlow.minimumSize)
	1060	+ nextsize = pointFlow.minimumSize;
	1061	+ if (nextsize > pointFlow.maximumSize)
	1062	+ nextsize = pointFlow.maximumSize;
	1063	+ //
	1064	+
	1065	+ double count = 0;
	1066	+
	1067	+ while (distancenext > 0.000000001) // step
	1068	+ {
	1069	+ gl.glPushMatrix();
	1070	+
	1071	+ gl.glTranslated(tx + tmp.xcount, ty + tmp.ycount, tz + tmp.z*count);
	1072	+
	1073	+ double K = count/nbsteps;
	1074	+
	1075	+ double intersize = Knextsize + (1-K)size;
	1076	+
	1077	+ gl.glScaled(intersize,intersize,intersize);
	1078	+
	1079	+ pointFlow.geo.Draw/Node/(display,null,selected,blocked);
	1080	+
	1081	+ count++;
	1082	+
	1083	+ distancenext -= step;
	1084	+
	1085	+ gl.glPopMatrix();
	1086	+ }
	1087	+
	1088	+ if (count != nbsteps)
	1089	+ assert(count == nbsteps);
	1090	+
	1091	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	1092	+ //gl.glTranslatef(-tx,-ty,-tz);
	1093	+
	1094	+ gl.glMatrixMode(gl.GL_TEXTURE);
	1095	+ gl.glPopMatrix();
	1096	+ }
	1097	+
	1098	+ if (!cf)
	1099	+ gl.glDisable(gl.GL_CULL_FACE);
	1100	+
	1101	+// display.modelParams0[0] = r;
	1102	+// display.modelParams0[1] = g;
	1103	+// display.modelParams0[2] = b;
	1104	+//
	1105	+// display.modelParams5[1] = opacity;
	1106	+//
	1107	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1108	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1109	+
	1110	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	1111	+ }
	1112	+
	1113	+ public void DrawBox(cVector min, cVector max)
	1114	+ {
	1115	+ javax.media.opengl.GL gl = GetGL();
	1116	+ gl.glBegin(gl.GL_LINES);
	1117	+
	1118	+ gl.glVertex3d(min.x, min.y, min.z);
	1119	+ gl.glVertex3d(min.x, min.y, max.z);
	1120	+ gl.glVertex3d(min.x, min.y, min.z);
	1121	+ gl.glVertex3d(min.x, max.y, min.z);
	1122	+ gl.glVertex3d(min.x, min.y, min.z);
	1123	+ gl.glVertex3d(max.x, min.y, min.z);
	1124	+
	1125	+ gl.glVertex3d(max.x, max.y, max.z);
	1126	+ gl.glVertex3d(min.x, max.y, max.z);
	1127	+ gl.glVertex3d(max.x, max.y, max.z);
	1128	+ gl.glVertex3d(max.x, min.y, max.z);
	1129	+ gl.glVertex3d(max.x, max.y, max.z);
	1130	+ gl.glVertex3d(max.x, max.y, min.z);
	1131	+
	1132	+ gl.glEnd();
	1133	+ }
	1134	+
	1135	+ public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
	1136	+ {
	1137	+ int[] strips = bRep.getRawIndices();
	1138	+
	1139	+ javax.media.opengl.GL gl = GetGL();
	1140	+
	1141	+ // TRIANGLE STRIP ARRAY
	1142	+ if (bRep.trimmed)
	1143	+ {
	1144	+ float[] v = bRep.getRawVertices();
	1145	+ float[] n = bRep.getRawNormals();
	1146	+ float[] c = bRep.getRawColors();
	1147	+ float[] uv = bRep.getRawUVMap();
	1148	+
	1149	+ int count2 = 0;
	1150	+ int count3 = 0;
	1151	+
	1152	+ if (n.length > 0)
	1153	+ {
	1154	+ for (int i = 0; i < strips.length; i++)
	1155	+ {
	1156	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1157	+
	1158	+ /*
	1159	+ boolean locked = false;
	1160	+ float eps = 0.1f;
	1161	+ boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	1162	+
	1163	+ int dot = 0;
	1164	+
	1165	+ if ((dot&1) == 0)
	1166	+ dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	1167	+
	1168	+ if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	1169	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	1170	+ else
	1171	+ {
	1172	+ locked = true;
	1173	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1174	+ }
	1175	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	1176	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	1177	+ if (hasnorm)
	1178	+ {
	1179	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	1180	+ gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
	1181	+ }
	1182	+
	1183	+ if ((dot&4) == 0)
	1184	+ dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	1185	+
	1186	+ if (wrap \|\| !locked && (dot&8) != 0)
	1187	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	1188	+ else
	1189	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1190	+
	1191	+ f.dot = dot;
	1192	+ */
	1193	+
	1194	+ if (!selectmode)
	1195	+ {
	1196	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1197	+ {
	1198	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1199	+ } else
	1200	+ {
	1201	+ gl.glNormal3f(0, 0, 1);
	1202	+ }
	1203	+
	1204	+ if (c != null)
	1205	+ //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
	1206	+ {
	1207	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1208	+ }
	1209	+ }
	1210	+
	1211	+ if (flipV)
	1212	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1213	+ else
	1214	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1215	+
	1216	+ //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1217	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1218	+
	1219	+ count2 += 2;
	1220	+ count3 += 3;
	1221	+ if (!selectmode)
	1222	+ {
	1223	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1224	+ {
	1225	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1226	+ } else
	1227	+ {
	1228	+ gl.glNormal3f(0, 0, 1);
	1229	+ }
	1230	+ if (c != null)
	1231	+ {
	1232	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1233	+ }
	1234	+ }
	1235	+
	1236	+ if (flipV)
	1237	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1238	+ else
	1239	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1240	+
	1241	+ //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1242	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1243	+
	1244	+ count2 += 2;
	1245	+ count3 += 3;
	1246	+ for (int j = 0; j < strips[i] - 2; j++)
	1247	+ {
	1248	+ //gl.glTexCoord2d(...);
	1249	+ if (!selectmode)
	1250	+ {
	1251	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1252	+ {
	1253	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1254	+ } else
	1255	+ {
	1256	+ gl.glNormal3f(0, 0, 1);
	1257	+ }
	1258	+ if (c != null)
	1259	+ {
	1260	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1261	+ }
	1262	+ }
	1263	+
	1264	+ if (flipV)
	1265	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1266	+ else
	1267	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1268	+
	1269	+ //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
	1270	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1271	+
	1272	+ count2 += 2;
	1273	+ count3 += 3;
	1274	+ }
	1275	+
	1276	+ gl.glEnd();
	1277	+ }
	1278	+ }
	1279	+
	1280	+ assert count3 == v.length;
	1281	+ }
	1282	+ else // !trimmed
	1283	+ {
	1284	+ int count = 0;
	1285	+ for (int i = 0; i < strips.length; i++)
	1286	+ {
	1287	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1288	+
	1289	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	1290	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	1291	+
	1292	+ drawVertex(gl, p, flipV, selectmode);
	1293	+ drawVertex(gl, q, flipV, selectmode);
	1294	+
	1295	+ for (int j = 0; j < strips[i] - 2; j++)
	1296	+ {
	1297	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	1298	+
	1299	+ // if (j%2 == 0)
	1300	+ // drawFace(p, q, r, display, null);
	1301	+ // else
	1302	+ // drawFace(p, r, q, display, null);
	1303	+
	1304	+ // p = q;
	1305	+ // q = r;
	1306	+ drawVertex(gl, r, flipV, selectmode);
	1307	+ }
	1308	+
	1309	+ gl.glEnd();
	1310	+ }
	1311	+ }
	1312	+ }
	1313	+
	1314	+ static cSpring.Point3D temp = new cSpring.Point3D();
	1315	+ static cSpring.Point3D temp2 = new cSpring.Point3D();
	1316	+ static cSpring.Point3D temp3 = new cSpring.Point3D();
	1317	+
	1318	+ public void DrawDynamicMesh(cMesh mesh)
	1319	+ {
	1320	+ GL gl = GetGL(); // getGL();
	1321	+
	1322	+ cSpring.PhysicsController3D Phys = mesh.Phys;
	1323	+
	1324	+ gl.glDisable(gl.GL_LIGHTING);
	1325	+
	1326	+ gl.glLineWidth(1);
	1327	+ gl.glColor3f(1,1,1);
	1328	+ gl.glBegin(gl.GL_LINES);
	1329	+ double scale = 0;
	1330	+ int count = 0;
	1331	+ for (int s=0; s<Phys.allSprings.size(); s++)
	1332	+ {
	1333	+ cSpring.Spring spring = Phys.allSprings.get(s);
	1334	+ if(s == 0)
	1335	+ {
	1336	+ //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
	1337	+ }
	1338	+ if (mesh.showsprings)
	1339	+ {
	1340	+ temp.set(spring.a.position);
	1341	+ temp.add(spring.b.position);
	1342	+ temp.mul(0.5);
	1343	+ temp2.set(spring.a.position);
	1344	+ temp2.sub(spring.b.position);
	1345	+ temp2.mul(spring.restLength/2);
	1346	+ temp.sub(temp2);
	1347	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1348	+ temp.add(temp2);
	1349	+ temp.add(temp2);
	1350	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1351	+ }
	1352	+
	1353	+ if (spring.isHandle)
	1354	+ continue;
	1355	+
	1356	+ //if (scale < spring.restLength)
	1357	+ scale += spring.restLength;
	1358	+ count++;
	1359	+ }
	1360	+ gl.glEnd();
	1361	+
	1362	+ if (count == 0)
	1363	+ scale = 0.01;
	1364	+ else
	1365	+ scale /= count * 3;
	1366	+
	1367	+ //scale = 0.25;
	1368	+
	1369	+ if (mesh.ShowInfo())
	1370	+ {
	1371	+ gl.glLineWidth(4);
	1372	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1373	+ {
	1374	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1375	+ if (node.mass == 0)
	1376	+ continue;
	1377	+
	1378	+ int i = node.springs==null?-1:node.springs.size();
	1379	+ gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
	1380	+ //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
	1381	+ //temp.normalize();
	1382	+ //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
	1383	+ gl.glBegin(gl.GL_LINES);
	1384	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1385	+ //gl.glVertex3d(node.position.x + node.normal.xscale, node.position.y + node.normal.yscale, node.position.z + node.normal.z*scale);
	1386	+ gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
	1387	+ node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
	1388	+ node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
	1389	+ gl.glEnd();
	1390	+ }
	1391	+
	1392	+ gl.glLineWidth(8);
	1393	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1394	+ {
	1395	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1396	+
	1397	+ if (node.springs != null)
	1398	+ {
	1399	+ for (int i=0; i<node.springs.size(); i+=1)
	1400	+ {
	1401	+ cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
	1402	+
	1403	+ int c = i+1;
	1404	+ // c = node.springs.get(i).nbcopies;
	1405	+
	1406	+ gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
	1407	+ gl.glBegin(gl.GL_LINES);
	1408	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1409	+ 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);
	1410	+ gl.glEnd();
	1411	+ }
	1412	+ }
	1413	+ }
	1414	+
	1415	+ gl.glLineWidth(1);
	1416	+ }
	1417	+
	1418	+ gl.glEnable(gl.GL_LIGHTING);
	1419	+ }
	1420	+
763	1421	/// INTERFACE
	1422	+
	1423	+ public void StartTriangles()
	1424	+ {
	1425	+ javax.media.opengl.GL gl = GetGL();
	1426	+ gl.glBegin(gl.GL_TRIANGLES);
	1427	+ }
	1428	+
	1429	+ public void EndTriangles()
	1430	+ {
	1431	+ GetGL().glEnd();
	1432	+ }
	1433	+
	1434	+ void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
	1435	+ {
	1436	+ if (!selectmode)
	1437	+ {
	1438	+ gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1439	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	1440	+
	1441	+ if (flipV)
	1442	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	1443	+ else
	1444	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1445	+ }
	1446	+
	1447	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	1448	+ }
764	1449
765	1450	void SetColor(Object3D obj, Vertex p0)
766	1451	{
..	..	@@ -939,7 +1624,7 @@
939	1624	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
940	1625	}
941	1626
942		- void DrawMaterial(cMaterial material, boolean selected)
	1627	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
943	1628	{
944	1629	CameraPane display = this;
945	1630	//new Exception().printStackTrace();
..	..	@@ -955,18 +1640,18 @@
955	1640	//col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
956	1641	if (!material.multiply)
957	1642	{
958		- display.color = color;
	1643	+ display.color = material.color;
959	1644	display.saturation = material.modulation;
960	1645	}
961	1646	else
962	1647	{
963		- display.color = color2;
	1648	+ display.color = material.color2;
964	1649	display.saturation = material.modulation2;
965	1650	}
966	1651
967	1652	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
968	1653
969		- float[] colorV = GrafreeD.colorV;
	1654	+ float[] colorV = Grafreed.colorV;
970	1655
971	1656	/**/
972	1657	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -974,7 +1659,7 @@
974	1659	colorV[0] = display.modelParams0[0] * material.diffuse;
975	1660	colorV[1] = display.modelParams0[1] * material.diffuse;
976	1661	colorV[2] = display.modelParams0[2] * material.diffuse;
977		- colorV[3] = material.opacity;
	1662	+ colorV[3] = 1; // material.opacity;
978	1663
979	1664	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
980	1665	//System.out.println("Opacity = " + opacity);
..	..	@@ -1082,9 +1767,9 @@
1082	1767	display.modelParams7[2] = 0;
1083	1768	display.modelParams7[3] = 0;
1084	1769
1085		- display.modelParams6[0] = 100; // criss de bug de bump
	1770	+ //display.modelParams6[0] = 100; // criss de bug de bump
1086	1771
1087		- Object3D.cVector2[] extparams = display.vector2buffer;
	1772	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1088	1773	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1089	1774	{
1090	1775	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1226,7 +1911,7 @@
1226	1911	void PushMatrix(double[][] matrix)
1227	1912	{
1228	1913	// GrafreeD.tracein(matrix);
1229		- PushMatrix(matrix,1);
	1914	+ PushMatrix(matrix, 1);
1230	1915	}
1231	1916
1232	1917	void PushMatrix()
..	..	@@ -1323,7 +2008,7 @@
1323	2008
1324	2009	static int camerachangeframe;
1325	2010
1326		- boolean SetCamera(Camera cam)
	2011	+ public boolean SetCamera(Camera cam)
1327	2012	{
1328	2013	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
1329	2014	// return false;
..	..	@@ -1451,33 +2136,6 @@
1451	2136	mainDL ^= true;
1452	2137	}
1453	2138
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	2139	void ToggleFullScreen()
1482	2140	{
1483	2141	FULLSCREEN ^= true;
..	..	@@ -1488,72 +2146,94 @@
1488	2146	Globals.CROWD ^= true;
1489	2147	}
1490	2148
1491		- void ToggleInertia()
1492		- {
1493		- INERTIA ^= true;
1494		- }
1495		-
1496	2149	void ToggleLocal()
1497	2150	{
1498	2151	LOCALTRANSFORM ^= true;
1499	2152	}
1500	2153
1501		- void ToggleFast()
	2154	+ public void ToggleTexture()
	2155	+ {
	2156	+ textureon ^= true;
	2157	+ }
	2158	+
	2159	+ public void ToggleLive()
	2160	+ {
	2161	+ Globals.setLIVE(Globals.isLIVE() ^ true);
	2162	+
	2163	+ System.err.println("LIVE = " + Globals.isLIVE());
	2164	+
	2165	+ if (!Globals.isLIVE()) // save sound
	2166	+ Grafreed.savesound = true; // wav.save();
	2167	+ // else
	2168	+ repaint(); // start loop // may 2013
	2169	+ }
	2170	+
	2171	+ public void ToggleSupport()
	2172	+ {
	2173	+ SUPPORT ^= true;
	2174	+ }
	2175	+
	2176	+ public void ToggleAbort()
	2177	+ {
	2178	+ ABORTMODE ^= true;
	2179	+ }
	2180	+
	2181	+ public void ToggleInertia()
	2182	+ {
	2183	+ INERTIA ^= true;
	2184	+ }
	2185	+
	2186	+ public void ToggleFast()
1502	2187	{
1503	2188	FAST ^= true;
1504	2189	}
1505	2190
1506		- void ToggleSlowPose()
	2191	+ public void ToggleSlowPose()
1507	2192	{
1508	2193	SLOWPOSE ^= true;
1509	2194	}
1510	2195
1511		- void ToggleFootContact()
1512		- {
1513		- FOOTCONTACT ^= true;
1514		- }
1515		-
1516		- void ToggleBoxMode()
	2196	+ public void ToggleBoxMode()
1517	2197	{
1518	2198	BOXMODE ^= true;
1519	2199	}
1520	2200
1521		- void ToggleSmoothFocus()
	2201	+ public void ToggleZoomBoxMode()
	2202	+ {
	2203	+ ZOOMBOXMODE ^= true;
	2204	+ }
	2205	+
	2206	+ public void ToggleSmoothFocus()
1522	2207	{
1523	2208	SMOOTHFOCUS ^= true;
1524	2209	}
1525	2210
1526		- void ToggleImageFlip()
	2211	+ public void ToggleImageFlip()
1527	2212	{
1528	2213	IMAGEFLIP ^= true;
1529	2214	}
1530	2215
1531		- void ToggleSpeakerMocap()
	2216	+ public void ToggleSpeakerMocap()
1532	2217	{
1533	2218	SPEAKERMOCAP ^= true;
1534	2219	}
1535	2220
1536		- void ToggleSpeakerCamera()
	2221	+ public void ToggleSpeakerCamera()
1537	2222	{
1538	2223	SPEAKERCAMERA ^= true;
1539	2224	}
1540	2225
1541		- void ToggleSpeakerFocus()
	2226	+ public void ToggleSpeakerFocus()
1542	2227	{
1543	2228	SPEAKERFOCUS ^= true;
1544	2229	}
1545	2230
1546		- void ToggleDebug()
1547		- {
1548		- DEBUG ^= true;
1549		- }
1550		-
1551		- void ToggleFrustum()
	2231	+ public void ToggleFrustum()
1552	2232	{
1553	2233	FRUSTUM ^= true;
1554	2234	}
1555	2235
1556		- void ToggleTrack()
	2236	+ public void ToggleTrack()
1557	2237	{
1558	2238	TRACK ^= true;
1559	2239	if (TRACK)
..	..	@@ -1572,25 +2252,35 @@
1572	2252	repaint();
1573	2253	}
1574	2254
1575		- void ToggleTrackOnce()
	2255	+ public void ToggleTrackOnce()
1576	2256	{
1577	2257	TRACKONCE ^= true;
1578	2258	}
1579	2259
1580		- void ToggleShadowTrack()
	2260	+ public void ToggleShadowTrack()
1581	2261	{
1582	2262	SHADOWTRACK ^= true;
1583	2263	repaint();
1584	2264	}
1585	2265
1586		- void ToggleOeil()
	2266	+ public void ToggleOeil()
1587	2267	{
1588	2268	OEIL ^= true;
1589	2269	}
1590	2270
1591		- void ToggleOeilOnce()
	2271	+ public void ToggleOeilOnce()
1592	2272	{
1593	2273	OEILONCE ^= true;
	2274	+ }
	2275	+
	2276	+ void ToggleFootContact()
	2277	+ {
	2278	+ FOOTCONTACT ^= true;
	2279	+ }
	2280	+
	2281	+ void ToggleDebug()
	2282	+ {
	2283	+ Globals.DEBUG ^= true;
1594	2284	}
1595	2285
1596	2286	void ToggleLookAt()
..	..	@@ -1598,9 +2288,9 @@
1598	2288	LOOKAT ^= true;
1599	2289	}
1600	2290
1601		- void ToggleRandom()
	2291	+ void ToggleSwitch()
1602	2292	{
1603		- RANDOM ^= true;
	2293	+ SWITCH ^= true;
1604	2294	}
1605	2295
1606	2296	void ToggleHandles()
..	..	@@ -1707,7 +2397,129 @@
1707	2397	{
1708	2398	return currentGL;
1709	2399	}
1710		-
	2400	+
	2401	+ private void GetRemoteZip(String url, String name, boolean unzip, boolean save)
	2402	+ {
	2403	+ java.net.URL u;
	2404	+ InputStream is = null;
	2405	+ DataInputStream dis;
	2406	+ java.util.zip.ZipInputStream zis;
	2407	+ //String s;
	2408	+
	2409	+ System.out.println("GetRemoteZip " + name);
	2410	+
	2411	+ int total = 0; // dis.available();
	2412	+
	2413	+ byte[] bytes = new byte[16384];
	2414	+
	2415	+ try
	2416	+ {
	2417	+ u = new java.net.URL(url + name);
	2418	+ is = u.openStream();
	2419	+
	2420	+ System.out.println(url + name);
	2421	+
	2422	+ if (unzip)
	2423	+ {
	2424	+ //dis = new DataInputStream(new BufferedInputStream(is));
	2425	+ zis = new java.util.zip.ZipInputStream(new BufferedInputStream(is));
	2426	+ //while ((s = dis.readLine()) != null)
	2427	+
	2428	+ if (save)
	2429	+ new java.io.File(name).mkdirs();
	2430	+
	2431	+ // FileOutputStream stream = new FileOutputStream("test.zip");
	2432	+ //
	2433	+ // int count;
	2434	+ //
	2435	+ // while ((count = dis.read(bytes)) != -1)
	2436	+ // {
	2437	+ // //System.out.println(s);
	2438	+ // System.out.println(count);
	2439	+ // total += count;
	2440	+ // stream.write(bytes);
	2441	+ // }
	2442	+ //
	2443	+ // stream.close();
	2444	+
	2445	+ // now iterate through each item in the stream. The get next
	2446	+ // entry call will return a ZipEntry for each file in the
	2447	+ // stream
	2448	+ java.util.zip.ZipEntry entry;
	2449	+ while((entry = zis.getNextEntry())!=null)
	2450	+ {
	2451	+ if (entry.getName().endsWith(".gsm"))
	2452	+ {
	2453	+ continue;
	2454	+ }
	2455	+
	2456	+ String s = String.format("Entry: %s len %d added %TD",
	2457	+ entry.getName(), entry.getSize(),
	2458	+ new java.util.Date(entry.getTime()));
	2459	+ System.out.println(s);
	2460	+
	2461	+ if (save)
	2462	+ {
	2463	+ // Once we get the entry from the stream, the stream is
	2464	+ // positioned read to read the raw data, and we keep
	2465	+ // reading until read returns 0 or less.
	2466	+ String outpath = name + "/" + entry.getName();
	2467	+ FileOutputStream output = null;
	2468	+ try
	2469	+ {
	2470	+ output = new FileOutputStream(outpath);
	2471	+ int len = 0;
	2472	+ while ((len = zis.read(bytes)) > 0)
	2473	+ {
	2474	+ output.write(bytes, 0, len);
	2475	+ }
	2476	+ }
	2477	+ finally
	2478	+ {
	2479	+ // we must always close the output file
	2480	+ if(output!=null) output.close();
	2481	+ }
	2482	+ }
	2483	+ }
	2484	+ }
	2485	+ }
	2486	+ catch (java.net.MalformedURLException mue)
	2487	+ {
	2488	+ System.err.println("Ouch - a MalformedURLException happened.");
	2489	+ mue.printStackTrace();
	2490	+ //System.exit(2);
	2491	+ }
	2492	+ catch (IOException ioe)
	2493	+ {
	2494	+ //System.err.println("Oops - an IOException happened.");
	2495	+ //ioe.printStackTrace();
	2496	+ //System.exit(3);
	2497	+ }
	2498	+ finally
	2499	+ {
	2500	+ try
	2501	+ {
	2502	+ if (is != null)
	2503	+ is.close();
	2504	+ }
	2505	+ catch (IOException ioe)
	2506	+ {
	2507	+ }
	2508	+ }
	2509	+
	2510	+ // System.out.println("length = " + total);
	2511	+
	2512	+// try
	2513	+// {
	2514	+// Runtime.getRuntime().exec("/usr/local/bin/wget https://archive3d.net/?a=download&do=get&id=7caca905");
	2515	+// }
	2516	+// catch (Exception e)
	2517	+// {
	2518	+// e.printStackTrace();
	2519	+// }
	2520	+
	2521	+ }
	2522	+
1711	2523	/**/
1712	2524	class CacheTexture
1713	2525	{
..	..	@@ -3539,6 +4351,7 @@
3539	4351
3540	4352	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
3541	4353	{
	4354	+ new Exception().printStackTrace();
3542	4355	System.exit(0);
3543	4356	com.sun.opengl.util.texture.Texture texture = null;
3544	4357
..	..	@@ -7251,6 +8064,64 @@
7251	8064	ReleaseTexture(pigment, false);
7252	8065	}
7253	8066
	8067	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8068	+ {
	8069	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8070	+ {
	8071	+ return;
	8072	+ }
	8073	+
	8074	+ if (tex == null)
	8075	+ {
	8076	+ ReleaseTexture(null, false);
	8077	+ return;
	8078	+ }
	8079	+
	8080	+ String pigment = Object3D.GetPigment(tex);
	8081	+
	8082	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8083	+ {
	8084	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8085	+ // System.out.println("; bump = " + bump);
	8086	+ }
	8087	+
	8088	+ if (pigment.equals(""))
	8089	+ {
	8090	+ pigment = null;
	8091	+ }
	8092	+
	8093	+ ReleaseTexture(pigment, false);
	8094	+ }
	8095	+
	8096	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8097	+ {
	8098	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8099	+ {
	8100	+ return;
	8101	+ }
	8102	+
	8103	+ if (tex == null)
	8104	+ {
	8105	+ ReleaseTexture(null, true);
	8106	+ return;
	8107	+ }
	8108	+
	8109	+ String bump = Object3D.GetBump(tex);
	8110	+
	8111	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8112	+ {
	8113	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8114	+ // System.out.println("; bump = " + bump);
	8115	+ }
	8116	+
	8117	+ if (bump.equals(""))
	8118	+ {
	8119	+ bump = null;
	8120	+ }
	8121	+
	8122	+ ReleaseTexture(bump, true);
	8123	+ }
	8124	+
7254	8125	void ReleaseTexture(String tex, boolean bump)
7255	8126	{
7256	8127	if (// DrawMode() != 0 \|\| /tex == null \|\|/
..	..	@@ -7354,7 +8225,7 @@
7354	8225	}
7355	8226	}
7356	8227
7357		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8228	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
7358	8229	{
7359	8230	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7360	8231	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7399,7 +8270,94 @@
7399	8270	return; // true;
7400	8271	}
7401	8272
7402		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8273	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8274	+ {
	8275	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8276	+ ambientOcclusion ) // \|\| !textureon)
	8277	+ {
	8278	+ return; // false;
	8279	+ }
	8280	+
	8281	+ if (tex == null)
	8282	+ {
	8283	+ BindTexture(null,false,resolution);
	8284	+ return;
	8285	+ }
	8286	+
	8287	+ String pigment = Object3D.GetPigment(tex);
	8288	+
	8289	+ usedtextures.put(pigment, pigment);
	8290	+
	8291	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8292	+ {
	8293	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8294	+ // System.out.println("; bump = " + bump);
	8295	+ }
	8296	+
	8297	+ if (pigment.equals(""))
	8298	+ {
	8299	+ pigment = null;
	8300	+ }
	8301	+
	8302	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8303	+ BindTexture(pigment, false, resolution);
	8304	+ }
	8305	+
	8306	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8307	+ {
	8308	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8309	+ ambientOcclusion ) // \|\| !textureon)
	8310	+ {
	8311	+ return; // false;
	8312	+ }
	8313	+
	8314	+ if (tex == null)
	8315	+ {
	8316	+ BindTexture(null,true,resolution);
	8317	+ return;
	8318	+ }
	8319	+
	8320	+ String bump = Object3D.GetBump(tex);
	8321	+
	8322	+ usedtextures.put(bump, bump);
	8323	+
	8324	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8325	+ {
	8326	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8327	+ // System.out.println("; bump = " + bump);
	8328	+ }
	8329	+
	8330	+ if (bump.equals(""))
	8331	+ {
	8332	+ bump = null;
	8333	+ }
	8334	+
	8335	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8336	+ BindTexture(bump, true, resolution);
	8337	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8338	+ }
	8339	+
	8340	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8341	+
	8342	+ private boolean FileExists(String tex)
	8343	+ {
	8344	+ if (missingTextures.contains(tex))
	8345	+ {
	8346	+ return false;
	8347	+ }
	8348	+
	8349	+ boolean fileExists = new File(tex).exists();
	8350	+
	8351	+ if (!fileExists)
	8352	+ {
	8353	+ // If file exists, the "new File()" is not executed sgain
	8354	+ missingTextures.add(tex);
	8355	+ }
	8356	+
	8357	+ return fileExists;
	8358	+ }
	8359	+
	8360	+ CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
7403	8361	{
7404	8362	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7405	8363
..	..	@@ -7407,12 +8365,18 @@
7407	8365	{
7408	8366	String texname = tex;
7409	8367
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;
	8368	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8369	+
	8370	+// String[] split = tex.split("Textures");
	8371	+// if (split.length > 1)
	8372	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8373	+// else
	8374	+// if (!texname.startsWith("/"))
	8375	+// texname = "/Users/nbriere/Textures/" + texname;
	8376	+ if (!FileExists(tex))
	8377	+ {
	8378	+ texname = fallbackTextureName;
	8379	+ }
7416	8380
7417	8381	if (CACHETEXTURE)
7418	8382	texture = textures.get(texname); // TEXTURE CACHE
..	..	@@ -7481,7 +8445,7 @@
7481	8445	}
7482	8446
7483	8447	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
7484		- if (!new File(cachename).exists())
	8448	+ if (!FileExists(cachename))
7485	8449	cachename = texname;
7486	8450	else
7487	8451	processbump = false; // don't process bump map again
..	..	@@ -7503,7 +8467,7 @@
7503	8467	}
7504	8468
7505	8469	cachename = texname.substring(0, texname.length()-4)+ext+".png";
7506		- if (!new File(cachename).exists())
	8470	+ if (!FileExists(cachename))
7507	8471	cachename = texname;
7508	8472	else
7509	8473	processbump = false; // don't process bump map again
..	..	@@ -7512,7 +8476,9 @@
7512	8476	texturedata = GetFileTexture(cachename, processbump, resolution);
7513	8477
7514	8478
7515		- if (texturedata != null)
	8479	+ if (texturedata == null)
	8480	+ throw new Exception();
	8481	+
7516	8482	texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
7517	8483	//texture = GetTexture(tex, bump);
7518	8484	}
..	..	@@ -7634,7 +8600,7 @@
7634	8600	return texture;
7635	8601	}
7636	8602
7637		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8603	+ com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
7638	8604	{
7639	8605	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7640	8606
..	..	@@ -7652,14 +8618,14 @@
7652	8618	return texture!=null?texture.texture:null;
7653	8619	}
7654	8620
7655		- com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8621	+ public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
7656	8622	{
7657	8623	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7658	8624
7659	8625	return texture!=null?texture.texturedata:null;
7660	8626	}
7661	8627
7662		- boolean BindTexture(String tex, boolean bump, int resolution)
	8628	+ boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
7663	8629	{
7664	8630	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
7665	8631	{
..	..	@@ -8536,11 +9502,35 @@
8536	9502	jy8[3] = 0.5f;
8537	9503	}
8538	9504
8539		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9505	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
8540	9506	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
8541	9507	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
8542	9508	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
8543	9509
	9510	+ void ResetOptions()
	9511	+ {
	9512	+ options1[0] = 100;
	9513	+ options1[1] = 0.025f;
	9514	+ options1[2] = 0.01f;
	9515	+ options1[3] = 0;
	9516	+ options1[4] = 0;
	9517	+
	9518	+ options2[0] = 0;
	9519	+ options2[1] = 0.75f;
	9520	+ options2[2] = 0;
	9521	+ options2[3] = 0;
	9522	+
	9523	+ options3[0] = 1;
	9524	+ options3[1] = 1;
	9525	+ options3[2] = 1;
	9526	+ options3[3] = 0;
	9527	+
	9528	+ options4[0] = 1;
	9529	+ options4[1] = 0;
	9530	+ options4[2] = 1;
	9531	+ options4[3] = 0;
	9532	+ }
	9533	+
8544	9534	static int imagecount = 0; // movie generation
8545	9535
8546	9536	static int jitter = 0;
..	..	@@ -8636,8 +9626,8 @@
8636	9626	assert (parentcam != renderCamera);
8637	9627
8638	9628	if (renderCamera != lightCamera)
8639		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8640		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9629	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9630	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
8641	9631
8642	9632	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
8643	9633
..	..	@@ -8652,8 +9642,8 @@
8652	9642	LA.matCopy(renderCamera.fromScreen, matrix);
8653	9643
8654	9644	if (renderCamera != lightCamera)
8655		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8656		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9645	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9646	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
8657	9647
8658	9648	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
8659	9649
..	..	@@ -8725,7 +9715,7 @@
8725	9715	//gl.glFlush();
8726	9716	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
8727	9717
8728		- if (ANIMATION && ABORTED)
	9718	+ if (Globals.ANIMATION && ABORTED)
8729	9719	{
8730	9720	System.err.println(" ABORTED FRAME");
8731	9721	break;
..	..	@@ -8755,7 +9745,7 @@
8755	9745	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
8756	9746
8757	9747	// save image
8758		- if (ANIMATION && !ABORTED)
	9748	+ if (Globals.ANIMATION && !ABORTED)
8759	9749	{
8760	9750	VPwidth = viewport[2];
8761	9751	VPheight = viewport[3];
..	..	@@ -8866,11 +9856,11 @@
8866	9856
8867	9857	// imagecount++;
8868	9858
8869		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9859	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
8870	9860
8871	9861	if (!BOXMODE)
8872	9862	{
8873		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9863	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
8874	9864	}
8875	9865
8876	9866	if (!BOXMODE)
..	..	@@ -8908,7 +9898,7 @@
8908	9898	ABORTED = false;
8909	9899	}
8910	9900	else
8911		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9901	+ Grafreed.wav.cursor += 735 * ACSIZE;
8912	9902
8913	9903	if (false)
8914	9904	{
..	..	@@ -9571,11 +10561,11 @@
9571	10561
9572	10562	public void display(GLAutoDrawable drawable)
9573	10563	{
9574		- if (GrafreeD.savesound && GrafreeD.hassound)
	10564	+ if (Grafreed.savesound && Grafreed.hassound)
9575	10565	{
9576		- GrafreeD.wav.save();
9577		- GrafreeD.savesound = false;
9578		- GrafreeD.hassound = false;
	10566	+ Grafreed.wav.save();
	10567	+ Grafreed.savesound = false;
	10568	+ Grafreed.hassound = false;
9579	10569	}
9580	10570	// if (DEBUG_SELECTION)
9581	10571	// {
..	..	@@ -9651,6 +10641,7 @@
9651	10641	ANTIALIAS = 0;
9652	10642	//System.out.println("RESTART");
9653	10643	AAtimer.restart();
	10644	+ Globals.TIMERRUNNING = true;
9654	10645	}
9655	10646	}
9656	10647	}
..	..	@@ -9705,7 +10696,7 @@
9705	10696	Object3D theobject = object;
9706	10697	Object3D theparent = object.parent;
9707	10698	object.parent = null;
9708		- object = (Object3D)GrafreeD.clone(object);
	10699	+ object = (Object3D)Grafreed.clone(object);
9709	10700	object.Stripify();
9710	10701	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
9711	10702	theobject.PreprocessOcclusion(this);
..	..	@@ -9718,13 +10709,14 @@
9718	10709	ambientOcclusion = false;
9719	10710	}
9720	10711
9721		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10712	+ if (//Globals.lighttouched &&
	10713	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
9722	10714	{
9723	10715	//if (RENDERSHADOW) // ?
9724	10716	if (!IsFrozen())
9725	10717	{
9726	10718	// dec 2012
9727		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10719	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
9728	10720	{
9729	10721	Globals.framecount++;
9730	10722	shadowbuffer.display();
..	..	@@ -9851,8 +10843,8 @@
9851	10843
9852	10844	// if (parentcam != renderCamera) // not a light
9853	10845	if (cam != lightCamera)
9854		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9855		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10846	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10847	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9856	10848
9857	10849	for (int j = 0; j < 4; j++)
9858	10850	{
..	..	@@ -9866,8 +10858,8 @@
9866	10858
9867	10859	// if (parentcam != renderCamera) // not a light
9868	10860	if (cam != lightCamera)
9869		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9870		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10861	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10862	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9871	10863
9872	10864	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
9873	10865
..	..	@@ -10126,7 +11118,16 @@
10126	11118	// Bump noise
10127	11119	gl.glActiveTexture(GL.GL_TEXTURE6);
10128	11120	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10129		- BindTexture(NOISE_TEXTURE, false, 2);
	11121	+
	11122	+ try
	11123	+ {
	11124	+ BindTexture(NOISE_TEXTURE, false, 2);
	11125	+ }
	11126	+ catch (Exception e)
	11127	+ {
	11128	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11129	+ }
	11130	+
10130	11131
10131	11132	gl.glActiveTexture(GL.GL_TEXTURE0);
10132	11133	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10251,8 +11252,8 @@
10251	11252	System.err.println("parentcam != renderCamera");
10252	11253
10253	11254	// if (cam != lightCamera)
10254		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10255		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11255	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11256	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10256	11257	}
10257	11258
10258	11259	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10273,8 +11274,8 @@
10273	11274	if (true) // TODO
10274	11275	{
10275	11276	if (cam != lightCamera)
10276		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10277		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11277	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11278	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10278	11279	}
10279	11280
10280	11281	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -10340,7 +11341,7 @@
10340	11341	fragmentMode \|= (lightslot - 64) << 2; // 1; // first bit is available for aniso
10341	11342	//System.out.println("fragmentMode = " + fragmentMode);
10342	11343
10343		- if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| DEBUG_SELECTION)
	11344	+ if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| IsDebugSelection())
10344	11345	{
10345	11346	/*
10346	11347	if (CULLFACE \|\| (ambientOcclusion && OCCLUSION_CULLING))
..	..	@@ -10590,8 +11591,14 @@
10590	11591	{
10591	11592	renderpass++;
10592	11593	// System.out.println("Draw object... ");
	11594	+ STEP = 1;
10593	11595	if (FAST) // in case there is no script
10594		- STEP = 16;
	11596	+ STEP = 8;
	11597	+
	11598	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11599	+ {
	11600	+ STEP *= 4;
	11601	+ }
10595	11602
10596	11603	//object.FullInvariants();
10597	11604
..	..	@@ -10605,16 +11612,37 @@
10605	11612	e.printStackTrace();
10606	11613	}
10607	11614
10608		- if (GrafreeD.RENDERME > 0)
10609		- GrafreeD.RENDERME--; // mechante magouille
	11615	+ if (Grafreed.RENDERME > 0)
	11616	+ Grafreed.RENDERME--; // mechante magouille
10610	11617
10611	11618	Globals.ONESTEP = false;
10612	11619	}
10613	11620
10614	11621	static boolean zoomonce = false;
10615	11622
	11623	+ static void CreateSelectedPoint()
	11624	+ {
	11625	+ if (selectedpoint == null)
	11626	+ {
	11627	+ debugpointG = new Sphere();
	11628	+ debugpointP = new Sphere();
	11629	+ debugpointC = new Sphere();
	11630	+ debugpointR = new Sphere();
	11631	+
	11632	+ selectedpoint = new Superellipsoid();
	11633	+
	11634	+ for (int i=0; i<8; i++)
	11635	+ {
	11636	+ debugpoints[i] = new Sphere();
	11637	+ }
	11638	+ }
	11639	+ }
	11640	+
10616	11641	void DrawObject(GL gl, boolean draw)
10617	11642	{
	11643	+ // To clear camera values
	11644	+ ResetOptions();
	11645	+
10618	11646	//System.out.println("DRAW OBJECT " + mouseDown);
10619	11647	// DrawMode() = SELECTION;
10620	11648	//GL gl = getGL();
..	..	@@ -10641,7 +11669,7 @@
10641	11669	callist = gl.glGenLists(1);
10642	11670	}
10643	11671
10644		- boolean selectmode = DrawMode() == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	11672	+ boolean selectmode = DrawMode() == SELECTION \|\| IsDebugSelection();
10645	11673
10646	11674	boolean active = !selectmode; // DrawMode() != SELECTION; // mouseDown;
10647	11675
..	..	@@ -10676,7 +11704,14 @@
10676	11704
10677	11705	usedtextures.clear();
10678	11706
10679		- BindTextures(DEFAULT_TEXTURES, 2);
	11707	+ try
	11708	+ {
	11709	+ BindTextures(DEFAULT_TEXTURES, 2);
	11710	+ }
	11711	+ catch (Exception e)
	11712	+ {
	11713	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11714	+ }
10680	11715	}
10681	11716	//System.out.println("--> " + stackdepth);
10682	11717	// GrafreeD.traceon();
..	..	@@ -10686,8 +11721,9 @@
10686	11721
10687	11722	if (DrawMode() == DEFAULT)
10688	11723	{
10689		- if (DEBUG)
	11724	+ if (Globals.DEBUG)
10690	11725	{
	11726	+ CreateSelectedPoint();
10691	11727	float radius = 0.05f;
10692	11728	if (selectedpoint.radius != radius)
10693	11729	{
..	..	@@ -10767,7 +11803,14 @@
10767	11803	if (checker != null && DrawMode() == DEFAULT)
10768	11804	{
10769	11805	//BindTexture(IMMORTAL_TEXTURE);
10770		- BindTextures(checker.GetTextures(), checker.texres);
	11806	+ try
	11807	+ {
	11808	+ BindTextures(checker.GetTextures(), checker.texres);
	11809	+ }
	11810	+ catch (Exception e)
	11811	+ {
	11812	+ System.err.println("FAILED: " + checker.GetTextures());
	11813	+ }
10771	11814	// NEAREST
10772	11815	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
10773	11816	DrawChecker(gl);
..	..	@@ -10849,7 +11892,7 @@
10849	11892	return;
10850	11893	}
10851	11894
10852		- String string = obj.GetToolTip();
	11895	+ String string = obj.toString(); //.GetToolTip();
10853	11896
10854	11897	GL gl = GetGL();
10855	11898
..	..	@@ -11166,8 +12209,8 @@
11166	12209	//obj.TransformToWorld(light, light);
11167	12210	for (int i = tp.size(); --i >= 0;)
11168	12211	{
11169		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11170		- LA.xformPos(light, tp.get(i).toParent, light);
	12212	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12213	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11171	12214	}
11172	12215
11173	12216
..	..	@@ -11184,8 +12227,8 @@
11184	12227	parentcam = cameras[0];
11185	12228	}
11186	12229
11187		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11188		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12230	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12231	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11189	12232
11190	12233	LA.xformPos(light, renderCamera.toScreen, light);
11191	12234
..	..	@@ -11799,8 +12842,8 @@
11799	12842
11800	12843	// display shadow only (bump == 0)
11801	12844	"SUB temp.x, half.x, shadow.x;" +
11802		- "MOV temp.y, -params6.x;" +
11803		- "SLT temp.z, temp.y, zero.x;" +
	12845	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12846	+ "SLT temp.z, temp.y, -one2048th.x;" +
11804	12847	"SUB temp.y, one.x, temp.z;" +
11805	12848	"MUL temp.x, temp.x, temp.y;" +
11806	12849	"KIL temp.x;" +
..	..	@@ -11929,8 +12972,10 @@
11929	12972	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
11930	12973
11931	12974	"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
	12975	+ // Tuning for default skin
	12976	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12977	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12978	+ "ADD temp.y, one.y, options2.y;" + // subsurface
11934	12979	"MUL temp.x, temp.x, temp.y;" +
11935	12980
11936	12981	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12129,7 +13174,7 @@
12129	13174	//once = true;
12130	13175	}
12131	13176
12132		- System.out.print("Program #" + mode + "; length = " + program.length());
	13177	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12133	13178	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12134	13179	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12135	13180
..	..	@@ -12262,12 +13307,16 @@
12262	13307
12263	13308	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12264	13309	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13310	+
	13311	+ // Compare fragment depth in light space with shadowmap.
12265	13312	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12266	13313	"SGE temp.y, temp.x, zero.x;" +
12267		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13314	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13315	+
	13316	+ // Reverse comparison
12268	13317	"SUB temp.x, one.x, temp.x;" +
12269	13318	"MUL " + shadow + ".x, temp.x, temp.y;" +
12270		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13319	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12271	13320	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12272	13321
12273	13322	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12281,6 +13330,10 @@
12281	13330	// No shadow for backface
12282	13331	"DP3 temp.x, normal, lightd;" +
12283	13332	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13333	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13334	+
	13335	+ // No shadow when out of frustrum
	13336	+ "SGE temp.x, " + depth + ".z, one.z;" +
12284	13337	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12285	13338	"";
12286	13339	}
..	..	@@ -12427,7 +13480,8 @@
12427	13480	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
12428	13481	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
12429	13482	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
12430		- Object3D.cVector2[] vector2buffer;
	13483	+
	13484	+ //Object3D.cVector2[] vector2buffer;
12431	13485
12432	13486	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
12433	13487	// OUT : diff, spec
..	..	@@ -12443,9 +13497,10 @@
12443	13497	"DP3 " + dest + ".z," + "normals," + "eye;" +
12444	13498	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
12445	13499	//"MOV " + dest + ".w," + "normal.z;" +
12446		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
12447		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
12448		- //"MOV " + dest + ".z," + "params2.w;" +
	13500	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13501	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13502	+
	13503	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
12449	13504	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
12450	13505	"RCP " + dest + ".w," + dest + ".w;" +
12451	13506	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -12839,7 +13894,7 @@
12839	13894	public void mousePressed(MouseEvent e)
12840	13895	{
12841	13896	//System.out.println("mousePressed: " + e);
12842		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13897	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
12843	13898	}
12844	13899
12845	13900	static long prevtime = 0;
..	..	@@ -12866,6 +13921,7 @@
12866	13921
12867	13922	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
12868	13923
	13924	+ if (BUTTONLESSWHEEL)
12869	13925	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
12870	13926	{
12871	13927	return;
..	..	@@ -12874,7 +13930,7 @@
12874	13930	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
12875	13931
12876	13932	// TIMER
12877		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	13933	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
12878	13934	{
12879	13935	keepboxmode = BOXMODE;
12880	13936	keepsupport = SUPPORT;
..	..	@@ -12914,8 +13970,8 @@
12914	13970	// mode \|= META;
12915	13971	//}
12916	13972
12917		- SetMouseMode(WHEEL \| e.getModifiersEx());
12918		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13973	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13974	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
12919	13975	anchorX = ax;
12920	13976	anchorY = ay;
12921	13977	prevX = px;
..	..	@@ -12949,6 +14005,7 @@
12949	14005	else
12950	14006	if (evt.getSource() == AAtimer)
12951	14007	{
	14008	+ Globals.TIMERRUNNING = false;
12952	14009	if (mouseDown)
12953	14010	{
12954	14011	//new Exception().printStackTrace();
..	..	@@ -12974,6 +14031,10 @@
12974	14031	// LIVE = waslive;
12975	14032	// wasliveok = true;
12976	14033	// waslive = false;
	14034	+
	14035	+ // May 2019 Forget it:
	14036	+ if (true)
	14037	+ return;
12977	14038
12978	14039	// source == timer
12979	14040	if (mouseDown)
..	..	@@ -13013,12 +14074,13 @@
13013	14074
13014	14075	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13015	14076
13016		- void clickStart(int x, int y, int modifiers)
	14077	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13017	14078	{
13018	14079	if (!wasliveok)
13019	14080	return;
13020	14081
13021	14082	AAtimer.restart(); //
	14083	+ Globals.TIMERRUNNING = true;
13022	14084
13023	14085	// waslive = LIVE;
13024	14086	// LIVE = false;
..	..	@@ -13030,7 +14092,7 @@
13030	14092	// touched = true; // main DL
13031	14093	if (isRenderer)
13032	14094	{
13033		- SetMouseMode(modifiers);
	14095	+ SetMouseMode(modifiers, modifiersex);
13034	14096	}
13035	14097
13036	14098	selectX = anchorX = x;
..	..	@@ -13043,7 +14105,7 @@
13043	14105	clicked = true;
13044	14106	hold = false;
13045	14107
13046		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14108	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13047	14109	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13048	14110	{
13049	14111	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13074,7 +14136,7 @@
13074	14136	info.camera = renderCamera;
13075	14137	info.x = x;
13076	14138	info.y = y;
13077		- info.modifiers = modifiers;
	14139	+ info.modifiers = modifiersex;
13078	14140	editObj = object.doEditClick(info, 0);
13079	14141	if (!editObj)
13080	14142	{
..	..	@@ -13091,11 +14153,14 @@
13091	14153
13092	14154	public void mouseDragged(MouseEvent e)
13093	14155	{
	14156	+ Globals.MOUSEDRAGGED = true;
	14157	+
	14158	+ //System.out.println("mouseDragged: " + e);
13094	14159	if (isRenderer)
13095	14160	movingcamera = true;
	14161	+
13096	14162	//if (drawing)
13097	14163	//return;
13098		- //System.out.println("mouseDragged: " + e);
13099	14164	if ((e.getModifiersEx() & CTRL) != 0
13100	14165	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
13101	14166	{
..	..	@@ -13103,7 +14168,7 @@
13103	14168	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13104	14169	}
13105	14170	else
13106		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14171	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13107	14172
13108	14173	//try { Thread.sleep(1); } catch (Exception ex) {}
13109	14174	}
..	..	@@ -13115,6 +14180,11 @@
13115	14180	cVector tmp = new cVector();
13116	14181	cVector tmp2 = new cVector();
13117	14182	boolean isMoving;
	14183	+
	14184	+ public cVector TargetLookAt()
	14185	+ {
	14186	+ return targetLookAt;
	14187	+ }
13118	14188
13119	14189	class PingThread extends Thread
13120	14190	{
..	..	@@ -13271,6 +14341,7 @@
13271	14341
13272	14342	public void run()
13273	14343	{
	14344	+ new Exception().printStackTrace();
13274	14345	System.exit(0);
13275	14346	for (;;)
13276	14347	{
..	..	@@ -13334,7 +14405,7 @@
13334	14405	{
13335	14406	Globals.lighttouched = true;
13336	14407	}
13337		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14408	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
13338	14409	}
13339	14410	//else
13340	14411	}
..	..	@@ -13434,7 +14505,7 @@
13434	14505	int X, Y;
13435	14506	boolean SX, SY;
13436	14507
13437		- void drag(int x, int y, int modifiers)
	14508	+ void drag(int x, int y, int modifiers, int modifiersex)
13438	14509	{
13439	14510	if (IsFrozen())
13440	14511	{
..	..	@@ -13443,17 +14514,17 @@
13443	14514
13444	14515	drag = true; // NEW
13445	14516
13446		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14517	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
13447	14518
13448	14519	X = x;
13449	14520	Y = y;
13450	14521	// floating state for animation
13451		- MODIFIERS = modifiers;
13452		- modifiers &= ~1024;
	14522	+ MODIFIERS = modifiersex;
	14523	+ modifiersex &= ~1024;
13453	14524	if (false) // modifiers != 0)
13454	14525	{
13455	14526	//new Exception().printStackTrace();
13456		- System.out.println("mouseDragged: " + modifiers);
	14527	+ System.out.println("mouseDragged: " + modifiersex);
13457	14528	System.out.println("SHIFT = " + SHIFT);
13458	14529	System.out.println("CONTROL = " + COMMAND);
13459	14530	System.out.println("META = " + META);
..	..	@@ -13473,7 +14544,8 @@
13473	14544	info.camera = renderCamera;
13474	14545	info.x = x;
13475	14546	info.y = y;
13476		- object.editWindow.copy.doEditDrag(info);
	14547	+ object.GetWindow().copy
	14548	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
13477	14549	} else
13478	14550	{
13479	14551	if (x < startX)
..	..	@@ -13625,7 +14697,6 @@
13625	14697	public void mouseMoved(MouseEvent e)
13626	14698	{
13627	14699	//System.out.println("mouseMoved: " + e);
13628		-
13629	14700	if (isRenderer)
13630	14701	return;
13631	14702
..	..	@@ -13638,7 +14709,9 @@
13638	14709	ci.camera = renderCamera;
13639	14710	if (!isRenderer)
13640	14711	{
13641		- if (object.editWindow.copy.doEditClick(ci, 0))
	14712	+ //ObjEditor editWindow = object.editWindow;
	14713	+ //Object3D copy = editWindow.copy;
	14714	+ if (object.doEditClick(ci, 0))
13642	14715	{
13643	14716	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
13644	14717	} else
..	..	@@ -13650,7 +14723,10 @@
13650	14723
13651	14724	public void mouseReleased(MouseEvent e)
13652	14725	{
	14726	+ Globals.MOUSEDRAGGED = false;
	14727	+
13653	14728	movingcamera = false;
	14729	+ X = Y = 0;
13654	14730	//System.out.println("mouseReleased: " + e);
13655	14731	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13656	14732	}
..	..	@@ -13673,9 +14749,9 @@
13673	14749	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
13674	14750	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
13675	14751
13676		- if (control \|\| command \|\| IsFrozen())
	14752	+// No delay if (control \|\| command \|\| IsFrozen())
13677	14753	timeout = true;
13678		- else
	14754	+// ?? May 2019 else
13679	14755	// timer.setDelay((modifiers & 128) != 0?0:350);
13680	14756	mouseDown = false;
13681	14757	if (!control && !command) // june 2013
..	..	@@ -13785,7 +14861,7 @@
13785	14861	System.out.println("keyReleased: " + e);
13786	14862	}
13787	14863
13788		- void SetMouseMode(int modifiers)
	14864	+ void SetMouseMode(int modifiers, int modifiersex)
13789	14865	{
13790	14866	//System.out.println("SetMouseMode = " + modifiers);
13791	14867	//modifiers &= ~1024;
..	..	@@ -13797,25 +14873,25 @@
13797	14873	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
13798	14874	// return;
13799	14875	//System.out.println("SetMode = " + modifiers);
13800		- if ((modifiers & WHEEL) == WHEEL)
	14876	+ if ((modifiersex & WHEEL) == WHEEL)
13801	14877	{
13802	14878	mouseMode \|= ZOOM;
13803	14879	}
13804	14880
13805	14881	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13806		- if (capsLocked \|\| (modifiers & META) == META)
	14882	+ if (capsLocked) // \|\| (modifiers & META) == META)
13807	14883	{
13808	14884	mouseMode \|= VR; // BACKFORTH;
13809	14885	}
13810		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14886	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
13811	14887	{
13812	14888	mouseMode \|= SELECT;
13813	14889	}
13814		- if ((modifiers & COMMAND) == COMMAND)
	14890	+ if ((modifiersex & COMMAND) == COMMAND)
13815	14891	{
13816	14892	mouseMode \|= SELECT;
13817	14893	}
13818		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14894	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
13819	14895	{
13820	14896	mouseMode &= ~VR;
13821	14897	mouseMode \|= TRANSLATE;
..	..	@@ -13844,10 +14920,10 @@
13844	14920
13845	14921	if (isRenderer) //
13846	14922	{
13847		- SetMouseMode(modifiers);
	14923	+ SetMouseMode(0, modifiers);
13848	14924	}
13849	14925
13850		- theRenderer.keyPressed(key);
	14926	+ Globals.theRenderer.keyPressed(key);
13851	14927	}
13852	14928
13853	14929	int kompactbit = 4; // power bit
..	..	@@ -13859,7 +14935,7 @@
13859	14935	float SATPOW = 1; // 2; // 0.5f;
13860	14936	float BRIPOW = 1; // 0.5f; // 0.5f;
13861	14937
13862		- void keyPressed(int key)
	14938	+ public void keyPressed(int key)
13863	14939	{
13864	14940	if (key >= '0' && key <= '5')
13865	14941	clampbit = (key-'0');
..	..	@@ -14016,8 +15092,14 @@
14016	15092	RevertCamera();
14017	15093	repaint();
14018	15094	break;
14019		- case 'L':
14020	15095	case 'l':
	15096	+ lightMode ^= true;
	15097	+ Globals.lighttouched = true;
	15098	+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
	15099	+ targetLookAt.set(manipCamera.lookAt);
	15100	+ repaint();
	15101	+ break;
	15102	+ case 'L':
14021	15103	if (lightMode)
14022	15104	{
14023	15105	lightMode = false;
..	..	@@ -14160,27 +15242,25 @@
14160	15242	case '_':
14161	15243	kompactbit = 5;
14162	15244	break;
14163		- case '+':
14164		- kompactbit = 6;
14165		- break;
	15245	+// case '+':
	15246	+// kompactbit = 6;
	15247	+// break;
14166	15248	case ' ':
14167		- lightMode ^= true;
14168		- Globals.lighttouched = true;
14169		- manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14170		- targetLookAt.set(manipCamera.lookAt);
	15249	+ ObjEditor.theFrame.ToggleFullScreen();
14171	15250	repaint();
14172	15251	break;
14173	15252	//case '`' :
14174	15253	case ESC:
14175	15254	RENDERPROGRAM += 1;
14176	15255	RENDERPROGRAM %= 3;
	15256	+
14177	15257	repaint();
14178	15258	break;
14179	15259	case 'Z':
14180	15260	//RESIZETEXTURE ^= true;
14181	15261	//break;
14182	15262	case 'z':
14183		- RENDERSHADOW ^= true;
	15263	+ Globals.RENDERSHADOW ^= true;
14184	15264	Globals.lighttouched = true;
14185	15265	repaint();
14186	15266	break;
..	..	@@ -14213,8 +15293,15 @@
14213	15293	case DELETE:
14214	15294	ClearSelection();
14215	15295	break;
14216		- /*
14217	15296	case '+':
	15297	+
	15298	+ //for (int i=0; i<0x7FFFFFFF; i++)
	15299	+ {
	15300	+ //String.format("%08X", i); // "7caca905"
	15301	+ GetRemoteZip("https://archive3d.net/?a=download&do=get&id=", "7caca905", true, true);
	15302	+ }
	15303	+
	15304	+ /*
14218	15305	//fontsize += 1;
14219	15306	bbzoom *= 2;
14220	15307	repaint();
..	..	@@ -14296,6 +15383,7 @@
14296	15383	}
14297	15384	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
14298	15385	}
	15386	+
14299	15387	static double OCCLUSIONBOOST = 1; // 0.5;
14300	15388
14301	15389	void keyReleased(int key, int modifiers)
..	..	@@ -14303,11 +15391,11 @@
14303	15391	//mode = ROTATE;
14304	15392	if ((MODIFIERS & COMMAND) == 0) // VR??
14305	15393	{
14306		- SetMouseMode(modifiers);
	15394	+ SetMouseMode(0, modifiers);
14307	15395	}
14308	15396	}
14309	15397
14310		- protected void processKeyEvent(KeyEvent e)
	15398	+ public void processKeyEvent(KeyEvent e)
14311	15399	{
14312	15400	switch (e.getID())
14313	15401	{
..	..	@@ -14437,8 +15525,9 @@
14437	15525
14438	15526	protected void processMouseMotionEvent(MouseEvent e)
14439	15527	{
14440		- //System.out.println("processMouseMotionEvent: " + mouseMode);
14441		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15528	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15529	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15530	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
14442	15531	{
14443	15532	mouseMoved(e);
14444	15533	} else
..	..	@@ -14463,11 +15552,12 @@
14463	15552	}
14464	15553	*/
14465	15554
14466		- object.editWindow.EditSelection();
	15555	+ object.editWindow.EditSelection(false);
14467	15556	}
14468	15557
14469	15558	void SelectParent()
14470	15559	{
	15560	+ new Exception().printStackTrace();
14471	15561	System.exit(0);
14472	15562	Composite group = (Composite) object;
14473	15563	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -14491,6 +15581,7 @@
14491	15581
14492	15582	void SelectChildren()
14493	15583	{
	15584	+ new Exception().printStackTrace();
14494	15585	System.exit(0);
14495	15586	/*
14496	15587	Composite group = (Composite) object;
..	..	@@ -14655,7 +15746,9 @@
14655	15746	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
14656	15747	//Image img = CreateImage(width, height);
14657	15748	//System.out.println("width = " + width + "; height = " + height + "\n");
	15749	+
14658	15750	Graphics gr = g; // img.getGraphics();
	15751	+
14659	15752	if (!hasMarquee)
14660	15753	{
14661	15754	if (Xmin < Xmax) // !locked)
..	..	@@ -14753,14 +15846,33 @@
14753	15846	if (!isRenderer)
14754	15847	{
14755	15848	object.drawEditHandles(info, 0);
	15849	+
	15850	+ if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	15851	+ {
	15852	+ switch (object.selection.get(0).hitSomething)
	15853	+ {
	15854	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15855	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15856	+ break;
	15857	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15858	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15859	+ break;
	15860	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15861	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15862	+ break;
	15863	+ }
	15864	+
	15865	+ }
14756	15866	}
14757	15867	}
	15868	+
14758	15869	if (isRenderer)
14759	15870	{
14760	15871	//gr.setColor(Color.black);
14761	15872	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
14762	15873	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
14763	15874	}
	15875	+
14764	15876	if (hasMarquee)
14765	15877	{
14766	15878	gr.setXORMode(Color.white);
..	..	@@ -14873,6 +15985,7 @@
14873	15985	public boolean mouseDown(Event evt, int x, int y)
14874	15986	{
14875	15987	System.out.println("mouseDown: " + evt);
	15988	+ System.exit(0);
14876	15989	/*
14877	15990	locked = true;
14878	15991	drag = false;
..	..	@@ -14916,7 +16029,7 @@
14916	16029	{
14917	16030	keyPressed(0, modifiers);
14918	16031	}
14919		- clickStart(x, y, modifiers);
	16032	+ // clickStart(x, y, modifiers);
14920	16033	return true;
14921	16034	}
14922	16035
..	..	@@ -15034,7 +16147,7 @@
15034	16147	{
15035	16148	keyReleased(0, 0);
15036	16149	}
15037		- drag(x, y, modifiers);
	16150	+ drag(x, y, 0, modifiers);
15038	16151	return true;
15039	16152	}
15040	16153
..	..	@@ -15166,7 +16279,7 @@
15166	16279	Object3D object;
15167	16280	static Object3D trackedobject;
15168	16281	Camera renderCamera; // Light or Eye (or Occlusion)
15169		- /static/ Camera manipCamera; // Light or Eye
	16282	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15170	16283	/static/ Camera eyeCamera;
15171	16284	/static/ Camera lightCamera;
15172	16285	int cameracount;
..	..	@@ -15451,16 +16564,16 @@
15451	16564	cStatic.objectstack[materialdepth++] = checker;
15452	16565	//System.out.println("material " + material);
15453	16566	//Applet3D.tracein(this, selected);
15454		- vector2buffer = checker.projectedVertices;
	16567	+ //vector2buffer = checker.projectedVertices;
15455	16568
15456	16569	//checker.GetMaterial().Draw(this, false); // true);
15457		- DrawMaterial(checker.GetMaterial(), false); // true);
	16570	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
15458	16571
15459	16572	materialdepth -= 1;
15460	16573	if (materialdepth > 0)
15461	16574	{
15462		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
15463		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16575	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16576	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
15464	16577	}
15465	16578	//checker.GetMaterial().opacity = 1f;
15466	16579	////checker.GetMaterial().ambient = 1f;
..	..	@@ -15604,6 +16717,7 @@
15604	16717	{
15605	16718	if (!selection)
15606	16719	{
	16720	+ new Exception().printStackTrace();
15607	16721	System.exit(0);
15608	16722	return;
15609	16723	}
..	..	@@ -15683,6 +16797,8 @@
15683	16797	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
15684	16798	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
15685	16799
	16800	+ CreateSelectedPoint();
	16801	+
15686	16802	// Will fit the mesh !!!
15687	16803	selectedpoint.toParent[0][0] = 0.0001;
15688	16804	selectedpoint.toParent[1][1] = 0.0001;
..	..	@@ -15731,16 +16847,16 @@
15731	16847	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	16848	}
15733	16849
15734		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16850	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
15735	16851	}
15736	16852	}
15737	16853
15738	16854	if (!movingcamera && !PAINTMODE)
15739	16855	object.editWindow.ScreenFitPoint(); // fev 2014
15740	16856
15741		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16857	+ if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
15742	16858	{
15743		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16859	+ Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
15744	16860
15745	16861	Object3D group = new Object3D("inst" + paintcount++);
15746	16862
..	..	@@ -15797,6 +16913,11 @@
15797	16913	//System.out.println("objects[color] = " + objects[color]);
15798	16914	//objects[color].Select();
15799	16915	indexcount = 0;
	16916	+ ObjEditor window = object.GetWindow();
	16917	+ if (window != null && deselect)
	16918	+ {
	16919	+ window.Select(null, deselect, true);
	16920	+ }
15800	16921	object.Select(color, deselect);
15801	16922	}
15802	16923
..	..	@@ -15896,7 +17017,7 @@
15896	17017	gl.glDisable(gl.GL_CULL_FACE);
15897	17018	}
15898	17019
15899		- if (!RENDERSHADOW)
	17020	+ if (!Globals.RENDERSHADOW)
15900	17021	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
15901	17022
15902	17023	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -15906,7 +17027,7 @@
15906	17027	//gl.glColorMask(false, false, false, false);
15907	17028
15908	17029	//render_scene_from_light_view(gl, drawable, 0, 0);
15909		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17030	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
15910	17031	{
15911	17032	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
15912	17033
..	..	@@ -15966,7 +17087,6 @@
15966	17087
15967	17088	class AntialiasBuffer implements GLEventListener
15968	17089	{
15969		-
15970	17090	CameraPane parent = null;
15971	17091
15972	17092	AntialiasBuffer(CameraPane p)
..	..	@@ -16323,23 +17443,15 @@
16323	17443	int AAbuffersize = 0;
16324	17444
16325	17445	//double[] selectedpoint = new double[3];
16326		- static Superellipsoid selectedpoint = new Superellipsoid();
	17446	+ static Superellipsoid selectedpoint;
16327	17447	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();
	17448	+ static Sphere debugpointG;
	17449	+ static Sphere debugpointP;
	17450	+ static Sphere debugpointC;
	17451	+ static Sphere debugpointR;
16332	17452
16333	17453	static Sphere debugpoints[] = new Sphere[8];
16334	17454
16335		- static
16336		- {
16337		- for (int i=0; i<8; i++)
16338		- {
16339		- debugpoints[i] = new Sphere();
16340		- }
16341		- }
16342		-
16343	17455	static void InitPoints(float radius)
16344	17456	{
16345	17457	for (int i=0; i<8; i++)
..	..	@@ -16359,7 +17471,7 @@
16359	17471	}
16360	17472	}
16361	17473
16362		- static void DrawPoints(CameraPane cpane)
	17474	+ static void DrawPoints(iCameraPane cpane)
16363	17475	{
16364	17476	for (int i=0; i<8; i++) // first and last are red
16365	17477	{
..	..	@@ -16391,10 +17503,11 @@
16391	17503	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
16392	17504	// Depth buffer format
16393	17505	//private int depth_format;
16394		- static public void NextIndex(Object3D o, GL gl)
	17506	+
	17507	+ public void NextIndex()
16395	17508	{
16396	17509	indexcount+=16;
16397		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17510	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
16398	17511	//objects[indexcount] = o;
16399	17512	//System.out.println("indexcount = " + indexcount);
16400	17513	}