~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)
..	..	@@ -191,6 +192,45 @@
191	192	}
192	193
193	194	/// INTERFACE
	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	+
	225	+ public boolean IsBoxMode()
	226	+ {
	227	+ return BOXMODE;
	228	+ }
	229	+
	230	+ public boolean IsZoomBoxMode()
	231	+ {
	232	+ return ZOOMBOXMODE;
	233	+ }
194	234
195	235	public void ClearDepth()
196	236	{
..	..	@@ -231,9 +271,14 @@
231	271	return this.ambientOcclusion;
232	272	}
233	273
	274	+ public boolean IsDebugSelection()
	275	+ {
	276	+ return DEBUG_SELECTION;
	277	+ }
	278	+
234	279	public boolean IsFrozen()
235	280	{
236		- boolean selectmode = this.DrawMode() == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	281	+ boolean selectmode = this.DrawMode() == SELECTION \|\| this.IsDebugSelection();
237	282
238	283	return !selectmode && cameracount == 0; // != 0;
239	284	}
..	..	@@ -254,9 +299,19 @@
254	299	return lightCamera;
255	300	}
256	301
	302	+ public Camera ManipCamera()
	303	+ {
	304	+ return manipCamera;
	305	+ }
	306	+
257	307	public Camera RenderCamera()
258	308	{
259	309	return renderCamera;
	310	+ }
	311	+
	312	+ public Camera[] Cameras()
	313	+ {
	314	+ return cameras;
260	315	}
261	316
262	317	public void PushMaterial(Object3D obj, boolean selected)
..	..	@@ -403,13 +458,13 @@
403	458
404	459	javax.media.opengl.GL gl = display.GetGL();
405	460
406		- boolean selectmode = display.DrawMode() == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	461	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
407	462
408	463	//System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
409	464	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
410	465	{
411	466	//gl.glBegin(gl.GL_TRIANGLES);
412		- 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);
413	468	if (!hasnorm)
414	469	{
415	470	// System.out.println("FUCK!!");
..	..	@@ -566,7 +621,810 @@
566	621	}
567	622	}
568	623
	624	+ /**
	625	+ * <code>draw</code> renders a <code>TriMesh</code> object including
	626	+ * it's normals, colors, textures and vertices.
	627	+ *
	628	+ * @see Renderer#draw(TriMesh)
	629	+ * @param tris
	630	+ * the mesh to render.
	631	+ */
	632	+ public void DrawParticles(TriMesh geo, Object3D shape, boolean selected, boolean rotate) // TriMesh tris)
	633	+ {
	634	+ CameraPane display = this;
	635	+
	636	+ float r = display.modelParams0[0];
	637	+ float g = display.modelParams0[1];
	638	+ float b = display.modelParams0[2];
	639	+ float opacity = display.modelParams5[1];
	640	+
	641	+ //final GL gl = GLU.getCurrentGL();
	642	+ GL gl = display.GetGL(); // getGL();
	643	+
	644	+ FloatBuffer vertBuf = geo.vertBuf;
	645	+
	646	+ int v = vertBuf.capacity();
	647	+
	648	+ int count = 0;
	649	+
	650	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	651	+ gl.glEnable(gl.GL_CULL_FACE);
	652	+ // gl.glScalef(1.0f/1024,1.0f/1024,1.0f/1024);
	653	+ for (int i=0; i<v/3; i++)
	654	+ {
	655	+ int index3 = i*3;
	656	+
	657	+ if (geo.sizeBuf.get(index3+1) == 0)
	658	+ continue;
	659	+
	660	+ count++;
	661	+
	662	+ int index4 = i*4;
	663	+
	664	+ float tx = vertBuf.get(index3);
	665	+ float ty = vertBuf.get(index3+1);
	666	+ float tz = vertBuf.get(index3+2);
	667	+
	668	+ // if (tx == 0 && ty == 0 && tz == 0)
	669	+ // continue;
	670	+
	671	+ gl.glMatrixMode(gl.GL_TEXTURE);
	672	+ gl.glPushMatrix();
	673	+
	674	+ float[] texmat = geo.texmat;
	675	+ texmat[12] = texmat[13] = texmat[14] = i;
	676	+
	677	+ gl.glMultMatrixf(texmat, 0);
	678	+
	679	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	680	+ gl.glPushMatrix();
	681	+
	682	+ gl.glTranslatef(tx,ty,tz);
	683	+
	684	+ if (rotate)
	685	+ gl.glRotatef(i, 0, 1, 0);
	686	+
	687	+ float size = geo.sizeBuf.get(index3) / 100;
	688	+ gl.glScalef(size,size,size);
	689	+
	690	+ float cr = geo.colorBuf.get(index4);
	691	+ float cg = geo.colorBuf.get(index4+1);
	692	+ float cb = geo.colorBuf.get(index4+2);
	693	+ float ca = geo.colorBuf.get(index4+3);
	694	+
	695	+ display.modelParams0[0] = r * cr;
	696	+ display.modelParams0[1] = g * cg;
	697	+ display.modelParams0[2] = b * cb;
	698	+
	699	+ display.modelParams5[1] = opacity * ca;
	700	+
	701	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	702	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	703	+
	704	+ RandomNode.globalseed = (int)geo.sizeBuf.get(index3+2); // i;
	705	+ RandomNode.globalseed2 = RandomNode.globalseed;
	706	+
	707	+// gl.glColor4f(cr,cg,cb,ca);
	708	+ // gl.glScalef(1024/16,1024/16,1024/16);
	709	+ shape.Draw/Node/(display,null,selected,false); // blocked
	710	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	711	+ //gl.glTranslatef(-tx,-ty,-tz);
	712	+ gl.glPopMatrix();
	713	+
	714	+ gl.glMatrixMode(gl.GL_TEXTURE);
	715	+ gl.glPopMatrix();
	716	+ }
	717	+ // gl.glScalef(1024,1024,1024);
	718	+ if (!cf)
	719	+ gl.glDisable(gl.GL_CULL_FACE);
	720	+
	721	+ display.modelParams0[0] = r;
	722	+ display.modelParams0[1] = g;
	723	+ display.modelParams0[2] = b;
	724	+
	725	+ display.modelParams5[1] = opacity;
	726	+
	727	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	728	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	729	+
	730	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	731	+
	732	+// System.err.println("total = " + v/3 + "; displayed = " + count);
	733	+ if (true)
	734	+ return;
	735	+
	736	+//// if (!tris.predraw(this))
	737	+//// {
	738	+//// return;
	739	+//// }
	740	+//// if (Debug.stats)
	741	+//// {
	742	+//// StatCollector.addStat(StatType.STAT_TRIANGLE_COUNT, tris.getTriangleCount());
	743	+//// StatCollector.addStat(StatType.STAT_VERTEX_COUNT, tris.getVertexCount());
	744	+//// StatCollector.addStat(StatType.STAT_GEOM_COUNT, 1);
	745	+//// }
	746	+////
	747	+//// if (tris.getDisplayListID() != -1)
	748	+//// {
	749	+//// renderDisplayList(tris);
	750	+//// return;
	751	+//// }
	752	+////
	753	+//// if (!generatingDisplayList)
	754	+//// {
	755	+//// applyStates(tris.states, tris);
	756	+//// }
	757	+//// if (Debug.stats)
	758	+//// {
	759	+//// StatCollector.startStat(StatType.STAT_RENDER_TIMER);
	760	+//// }
	761	+//// boolean transformed = doTransforms(tris);
	762	+//
	763	+// int glMode = GL.GL_TRIANGLES;
	764	+// switch (getMode())
	765	+// {
	766	+// case Triangles:
	767	+// glMode = GL.GL_TRIANGLES;
	768	+// break;
	769	+// case Strip:
	770	+// glMode = GL.GL_TRIANGLE_STRIP;
	771	+// break;
	772	+// case Fan:
	773	+// glMode = GL.GL_TRIANGLE_FAN;
	774	+// break;
	775	+// }
	776	+//
	777	+// if (!predrawGeometry(gl))
	778	+// {
	779	+// // make sure only the necessary indices are sent through on old
	780	+// // cards.
	781	+// IntBuffer indices = this.getIndexBuffer();
	782	+// if (indices == null)
	783	+// {
	784	+// logger.severe("missing indices on geometry object: " + this.toString());
	785	+// } else
	786	+// {
	787	+// indices.rewind();
	788	+// indices.limit(this.getMaxIndex());
	789	+//
	790	+// gl.glDrawElements(glMode, indices.limit(), GL.GL_UNSIGNED_INT, indices); // TODO Check <count> and assumed <type> of GL_UNSIGNED_INT
	791	+//
	792	+// indices.clear();
	793	+// }
	794	+// } else
	795	+// {
	796	+// gl.glDrawElements(glMode, this.getIndexBuffer().limit(),
	797	+// GL.GL_UNSIGNED_INT, 0);
	798	+// }
	799	+//
	800	+//// postdrawGeometry(tris);
	801	+//// if (transformed)
	802	+//// {
	803	+//// undoTransforms(tris);
	804	+//// }
	805	+////
	806	+//// if (Debug.stats)
	807	+//// {
	808	+//// StatCollector.endStat(StatType.STAT_RENDER_TIMER);
	809	+//// }
	810	+//// tris.postdraw(this);
	811	+ }
	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	+
569	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	+ }
570	1428
571	1429	void SetColor(Object3D obj, Vertex p0)
572	1430	{
..	..	@@ -761,18 +1619,18 @@
761	1619	//col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
762	1620	if (!material.multiply)
763	1621	{
764		- display.color = color;
	1622	+ display.color = material.color;
765	1623	display.saturation = material.modulation;
766	1624	}
767	1625	else
768	1626	{
769		- display.color = color2;
	1627	+ display.color = material.color2;
770	1628	display.saturation = material.modulation2;
771	1629	}
772	1630
773	1631	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
774	1632
775		- float[] colorV = GrafreeD.colorV;
	1633	+ float[] colorV = Grafreed.colorV;
776	1634
777	1635	/**/
778	1636	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1032,7 +1890,7 @@
1032	1890	void PushMatrix(double[][] matrix)
1033	1891	{
1034	1892	// GrafreeD.tracein(matrix);
1035		- PushMatrix(matrix,1);
	1893	+ PushMatrix(matrix, 1);
1036	1894	}
1037	1895
1038	1896	void PushMatrix()
..	..	@@ -1129,7 +1987,7 @@
1129	1987
1130	1988	static int camerachangeframe;
1131	1989
1132		- boolean SetCamera(Camera cam)
	1990	+ public boolean SetCamera(Camera cam)
1133	1991	{
1134	1992	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
1135	1993	// return false;
..	..	@@ -1257,33 +2115,6 @@
1257	2115	mainDL ^= true;
1258	2116	}
1259	2117
1260		- void ToggleTexture()
1261		- {
1262		- textureon ^= true;
1263		- }
1264		-
1265		- void ToggleLive()
1266		- {
1267		- Globals.setLIVE(Globals.isLIVE() ^ true);
1268		-
1269		- System.err.println("LIVE = " + Globals.isLIVE());
1270		-
1271		- if (!Globals.isLIVE()) // save sound
1272		- GrafreeD.savesound = true; // wav.save();
1273		- // else
1274		- repaint(); // start loop // may 2013
1275		- }
1276		-
1277		- void ToggleSupport()
1278		- {
1279		- SUPPORT ^= true;
1280		- }
1281		-
1282		- void ToggleAbort()
1283		- {
1284		- ABORTMODE ^= true;
1285		- }
1286		-
1287	2118	void ToggleFullScreen()
1288	2119	{
1289	2120	FULLSCREEN ^= true;
..	..	@@ -1294,72 +2125,94 @@
1294	2125	Globals.CROWD ^= true;
1295	2126	}
1296	2127
1297		- void ToggleInertia()
1298		- {
1299		- INERTIA ^= true;
1300		- }
1301		-
1302	2128	void ToggleLocal()
1303	2129	{
1304	2130	LOCALTRANSFORM ^= true;
1305	2131	}
1306	2132
1307		- 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()
1308	2166	{
1309	2167	FAST ^= true;
1310	2168	}
1311	2169
1312		- void ToggleSlowPose()
	2170	+ public void ToggleSlowPose()
1313	2171	{
1314	2172	SLOWPOSE ^= true;
1315	2173	}
1316	2174
1317		- void ToggleFootContact()
1318		- {
1319		- FOOTCONTACT ^= true;
1320		- }
1321		-
1322		- void ToggleBoxMode()
	2175	+ public void ToggleBoxMode()
1323	2176	{
1324	2177	BOXMODE ^= true;
1325	2178	}
1326	2179
1327		- void ToggleSmoothFocus()
	2180	+ public void ToggleZoomBoxMode()
	2181	+ {
	2182	+ ZOOMBOXMODE ^= true;
	2183	+ }
	2184	+
	2185	+ public void ToggleSmoothFocus()
1328	2186	{
1329	2187	SMOOTHFOCUS ^= true;
1330	2188	}
1331	2189
1332		- void ToggleImageFlip()
	2190	+ public void ToggleImageFlip()
1333	2191	{
1334	2192	IMAGEFLIP ^= true;
1335	2193	}
1336	2194
1337		- void ToggleSpeakerMocap()
	2195	+ public void ToggleSpeakerMocap()
1338	2196	{
1339	2197	SPEAKERMOCAP ^= true;
1340	2198	}
1341	2199
1342		- void ToggleSpeakerCamera()
	2200	+ public void ToggleSpeakerCamera()
1343	2201	{
1344	2202	SPEAKERCAMERA ^= true;
1345	2203	}
1346	2204
1347		- void ToggleSpeakerFocus()
	2205	+ public void ToggleSpeakerFocus()
1348	2206	{
1349	2207	SPEAKERFOCUS ^= true;
1350	2208	}
1351	2209
1352		- void ToggleDebug()
1353		- {
1354		- DEBUG ^= true;
1355		- }
1356		-
1357		- void ToggleFrustum()
	2210	+ public void ToggleFrustum()
1358	2211	{
1359	2212	FRUSTUM ^= true;
1360	2213	}
1361	2214
1362		- void ToggleTrack()
	2215	+ public void ToggleTrack()
1363	2216	{
1364	2217	TRACK ^= true;
1365	2218	if (TRACK)
..	..	@@ -1378,25 +2231,35 @@
1378	2231	repaint();
1379	2232	}
1380	2233
1381		- void ToggleTrackOnce()
	2234	+ public void ToggleTrackOnce()
1382	2235	{
1383	2236	TRACKONCE ^= true;
1384	2237	}
1385	2238
1386		- void ToggleShadowTrack()
	2239	+ public void ToggleShadowTrack()
1387	2240	{
1388	2241	SHADOWTRACK ^= true;
1389	2242	repaint();
1390	2243	}
1391	2244
1392		- void ToggleOeil()
	2245	+ public void ToggleOeil()
1393	2246	{
1394	2247	OEIL ^= true;
1395	2248	}
1396	2249
1397		- void ToggleOeilOnce()
	2250	+ public void ToggleOeilOnce()
1398	2251	{
1399	2252	OEILONCE ^= true;
	2253	+ }
	2254	+
	2255	+ void ToggleFootContact()
	2256	+ {
	2257	+ FOOTCONTACT ^= true;
	2258	+ }
	2259	+
	2260	+ void ToggleDebug()
	2261	+ {
	2262	+ DEBUG ^= true;
1400	2263	}
1401	2264
1402	2265	void ToggleLookAt()
..	..	@@ -1404,9 +2267,9 @@
1404	2267	LOOKAT ^= true;
1405	2268	}
1406	2269
1407		- void ToggleRandom()
	2270	+ void ToggleSwitch()
1408	2271	{
1409		- RANDOM ^= true;
	2272	+ SWITCH ^= true;
1410	2273	}
1411	2274
1412	2275	void ToggleHandles()
..	..	@@ -1513,7 +2376,7 @@
1513	2376	{
1514	2377	return currentGL;
1515	2378	}
1516		-
	2379	+
1517	2380	/**/
1518	2381	class CacheTexture
1519	2382	{
..	..	@@ -3345,6 +4208,7 @@
3345	4208
3346	4209	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
3347	4210	{
	4211	+ new Exception().printStackTrace();
3348	4212	System.exit(0);
3349	4213	com.sun.opengl.util.texture.Texture texture = null;
3350	4214
..	..	@@ -7160,7 +8024,7 @@
7160	8024	}
7161	8025	}
7162	8026
7163		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8027	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
7164	8028	{
7165	8029	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7166	8030	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7205,7 +8069,27 @@
7205	8069	return; // true;
7206	8070	}
7207	8071
7208		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8072	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8073	+
	8074	+ private boolean FileExists(String tex)
	8075	+ {
	8076	+ if (missingTextures.contains(tex))
	8077	+ {
	8078	+ return false;
	8079	+ }
	8080	+
	8081	+ boolean fileExists = new File(tex).exists();
	8082	+
	8083	+ if (!fileExists)
	8084	+ {
	8085	+ // If file exists, the "new File()" is not executed sgain
	8086	+ missingTextures.add(tex);
	8087	+ }
	8088	+
	8089	+ return fileExists;
	8090	+ }
	8091	+
	8092	+ CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
7209	8093	{
7210	8094	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7211	8095
..	..	@@ -7213,12 +8097,18 @@
7213	8097	{
7214	8098	String texname = tex;
7215	8099
7216		- String[] split = tex.split("Textures");
7217		- if (split.length > 1)
7218		- texname = "/Users/nbriere/Textures" + split[split.length-1];
7219		- else
7220		- if (!texname.startsWith("/"))
7221		- texname = "/Users/nbriere/Textures/" + texname;
	8100	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8101	+
	8102	+// String[] split = tex.split("Textures");
	8103	+// if (split.length > 1)
	8104	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8105	+// else
	8106	+// if (!texname.startsWith("/"))
	8107	+// texname = "/Users/nbriere/Textures/" + texname;
	8108	+ if (!FileExists(tex))
	8109	+ {
	8110	+ texname = fallbackTextureName;
	8111	+ }
7222	8112
7223	8113	if (CACHETEXTURE)
7224	8114	texture = textures.get(texname); // TEXTURE CACHE
..	..	@@ -7287,7 +8177,7 @@
7287	8177	}
7288	8178
7289	8179	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
7290		- if (!new File(cachename).exists())
	8180	+ if (!FileExists(cachename))
7291	8181	cachename = texname;
7292	8182	else
7293	8183	processbump = false; // don't process bump map again
..	..	@@ -7309,7 +8199,7 @@
7309	8199	}
7310	8200
7311	8201	cachename = texname.substring(0, texname.length()-4)+ext+".png";
7312		- if (!new File(cachename).exists())
	8202	+ if (!FileExists(cachename))
7313	8203	cachename = texname;
7314	8204	else
7315	8205	processbump = false; // don't process bump map again
..	..	@@ -7318,7 +8208,9 @@
7318	8208	texturedata = GetFileTexture(cachename, processbump, resolution);
7319	8209
7320	8210
7321		- if (texturedata != null)
	8211	+ if (texturedata == null)
	8212	+ throw new Exception();
	8213	+
7322	8214	texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
7323	8215	//texture = GetTexture(tex, bump);
7324	8216	}
..	..	@@ -7440,7 +8332,7 @@
7440	8332	return texture;
7441	8333	}
7442	8334
7443		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8335	+ com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
7444	8336	{
7445	8337	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7446	8338
..	..	@@ -7458,14 +8350,14 @@
7458	8350	return texture!=null?texture.texture:null;
7459	8351	}
7460	8352
7461		- com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8353	+ public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
7462	8354	{
7463	8355	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7464	8356
7465	8357	return texture!=null?texture.texturedata:null;
7466	8358	}
7467	8359
7468		- boolean BindTexture(String tex, boolean bump, int resolution)
	8360	+ boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
7469	8361	{
7470	8362	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
7471	8363	{
..	..	@@ -8442,8 +9334,8 @@
8442	9334	assert (parentcam != renderCamera);
8443	9335
8444	9336	if (renderCamera != lightCamera)
8445		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8446		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9337	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9338	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
8447	9339
8448	9340	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
8449	9341
..	..	@@ -8458,8 +9350,8 @@
8458	9350	LA.matCopy(renderCamera.fromScreen, matrix);
8459	9351
8460	9352	if (renderCamera != lightCamera)
8461		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8462		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9353	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9354	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
8463	9355
8464	9356	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
8465	9357
..	..	@@ -8531,7 +9423,7 @@
8531	9423	//gl.glFlush();
8532	9424	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
8533	9425
8534		- if (ANIMATION && ABORTED)
	9426	+ if (Globals.ANIMATION && ABORTED)
8535	9427	{
8536	9428	System.err.println(" ABORTED FRAME");
8537	9429	break;
..	..	@@ -8561,7 +9453,7 @@
8561	9453	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
8562	9454
8563	9455	// save image
8564		- if (ANIMATION && !ABORTED)
	9456	+ if (Globals.ANIMATION && !ABORTED)
8565	9457	{
8566	9458	VPwidth = viewport[2];
8567	9459	VPheight = viewport[3];
..	..	@@ -8672,11 +9564,11 @@
8672	9564
8673	9565	// imagecount++;
8674	9566
8675		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9567	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
8676	9568
8677	9569	if (!BOXMODE)
8678	9570	{
8679		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9571	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
8680	9572	}
8681	9573
8682	9574	if (!BOXMODE)
..	..	@@ -8714,7 +9606,7 @@
8714	9606	ABORTED = false;
8715	9607	}
8716	9608	else
8717		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9609	+ Grafreed.wav.cursor += 735 * ACSIZE;
8718	9610
8719	9611	if (false)
8720	9612	{
..	..	@@ -9377,11 +10269,11 @@
9377	10269
9378	10270	public void display(GLAutoDrawable drawable)
9379	10271	{
9380		- if (GrafreeD.savesound && GrafreeD.hassound)
	10272	+ if (Grafreed.savesound && Grafreed.hassound)
9381	10273	{
9382		- GrafreeD.wav.save();
9383		- GrafreeD.savesound = false;
9384		- GrafreeD.hassound = false;
	10274	+ Grafreed.wav.save();
	10275	+ Grafreed.savesound = false;
	10276	+ Grafreed.hassound = false;
9385	10277	}
9386	10278	// if (DEBUG_SELECTION)
9387	10279	// {
..	..	@@ -9511,7 +10403,7 @@
9511	10403	Object3D theobject = object;
9512	10404	Object3D theparent = object.parent;
9513	10405	object.parent = null;
9514		- object = (Object3D)GrafreeD.clone(object);
	10406	+ object = (Object3D)Grafreed.clone(object);
9515	10407	object.Stripify();
9516	10408	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
9517	10409	theobject.PreprocessOcclusion(this);
..	..	@@ -9524,13 +10416,13 @@
9524	10416	ambientOcclusion = false;
9525	10417	}
9526	10418
9527		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10419	+ if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
9528	10420	{
9529	10421	//if (RENDERSHADOW) // ?
9530	10422	if (!IsFrozen())
9531	10423	{
9532	10424	// dec 2012
9533		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10425	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
9534	10426	{
9535	10427	Globals.framecount++;
9536	10428	shadowbuffer.display();
..	..	@@ -9657,8 +10549,8 @@
9657	10549
9658	10550	// if (parentcam != renderCamera) // not a light
9659	10551	if (cam != lightCamera)
9660		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9661		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10552	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10553	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9662	10554
9663	10555	for (int j = 0; j < 4; j++)
9664	10556	{
..	..	@@ -9672,8 +10564,8 @@
9672	10564
9673	10565	// if (parentcam != renderCamera) // not a light
9674	10566	if (cam != lightCamera)
9675		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9676		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10567	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10568	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9677	10569
9678	10570	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
9679	10571
..	..	@@ -9932,7 +10824,16 @@
9932	10824	// Bump noise
9933	10825	gl.glActiveTexture(GL.GL_TEXTURE6);
9934	10826	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
9935		- BindTexture(NOISE_TEXTURE, false, 2);
	10827	+
	10828	+ try
	10829	+ {
	10830	+ BindTexture(NOISE_TEXTURE, false, 2);
	10831	+ }
	10832	+ catch (Exception e)
	10833	+ {
	10834	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	10835	+ }
	10836	+
9936	10837
9937	10838	gl.glActiveTexture(GL.GL_TEXTURE0);
9938	10839	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10057,8 +10958,8 @@
10057	10958	System.err.println("parentcam != renderCamera");
10058	10959
10059	10960	// if (cam != lightCamera)
10060		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10061		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	10961	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10962	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10062	10963	}
10063	10964
10064	10965	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10079,8 +10980,8 @@
10079	10980	if (true) // TODO
10080	10981	{
10081	10982	if (cam != lightCamera)
10082		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10083		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	10983	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10984	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10084	10985	}
10085	10986
10086	10987	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -10146,7 +11047,7 @@
10146	11047	fragmentMode \|= (lightslot - 64) << 2; // 1; // first bit is available for aniso
10147	11048	//System.out.println("fragmentMode = " + fragmentMode);
10148	11049
10149		- if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| DEBUG_SELECTION)
	11050	+ if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| IsDebugSelection())
10150	11051	{
10151	11052	/*
10152	11053	if (CULLFACE \|\| (ambientOcclusion && OCCLUSION_CULLING))
..	..	@@ -10396,8 +11297,14 @@
10396	11297	{
10397	11298	renderpass++;
10398	11299	// System.out.println("Draw object... ");
	11300	+ STEP = 1;
10399	11301	if (FAST) // in case there is no script
10400		- STEP = 16;
	11302	+ STEP = 8;
	11303	+
	11304	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11305	+ {
	11306	+ STEP *= 4;
	11307	+ }
10401	11308
10402	11309	//object.FullInvariants();
10403	11310
..	..	@@ -10411,8 +11318,8 @@
10411	11318	e.printStackTrace();
10412	11319	}
10413	11320
10414		- if (GrafreeD.RENDERME > 0)
10415		- GrafreeD.RENDERME--; // mechante magouille
	11321	+ if (Grafreed.RENDERME > 0)
	11322	+ Grafreed.RENDERME--; // mechante magouille
10416	11323
10417	11324	Globals.ONESTEP = false;
10418	11325	}
..	..	@@ -10447,7 +11354,7 @@
10447	11354	callist = gl.glGenLists(1);
10448	11355	}
10449	11356
10450		- boolean selectmode = DrawMode() == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	11357	+ boolean selectmode = DrawMode() == SELECTION \|\| IsDebugSelection();
10451	11358
10452	11359	boolean active = !selectmode; // DrawMode() != SELECTION; // mouseDown;
10453	11360
..	..	@@ -10482,7 +11389,14 @@
10482	11389
10483	11390	usedtextures.clear();
10484	11391
10485		- BindTextures(DEFAULT_TEXTURES, 2);
	11392	+ try
	11393	+ {
	11394	+ BindTextures(DEFAULT_TEXTURES, 2);
	11395	+ }
	11396	+ catch (Exception e)
	11397	+ {
	11398	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11399	+ }
10486	11400	}
10487	11401	//System.out.println("--> " + stackdepth);
10488	11402	// GrafreeD.traceon();
..	..	@@ -10573,7 +11487,14 @@
10573	11487	if (checker != null && DrawMode() == DEFAULT)
10574	11488	{
10575	11489	//BindTexture(IMMORTAL_TEXTURE);
10576		- BindTextures(checker.GetTextures(), checker.texres);
	11490	+ try
	11491	+ {
	11492	+ BindTextures(checker.GetTextures(), checker.texres);
	11493	+ }
	11494	+ catch (Exception e)
	11495	+ {
	11496	+ System.err.println("FAILED: " + checker.GetTextures());
	11497	+ }
10577	11498	// NEAREST
10578	11499	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
10579	11500	DrawChecker(gl);
..	..	@@ -10655,7 +11576,7 @@
10655	11576	return;
10656	11577	}
10657	11578
10658		- String string = obj.GetToolTip();
	11579	+ String string = obj.toString(); //.GetToolTip();
10659	11580
10660	11581	GL gl = GetGL();
10661	11582
..	..	@@ -10972,8 +11893,8 @@
10972	11893	//obj.TransformToWorld(light, light);
10973	11894	for (int i = tp.size(); --i >= 0;)
10974	11895	{
10975		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
10976		- LA.xformPos(light, tp.get(i).toParent, light);
	11896	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	11897	+ LA.xformPos(light, tp.get(i).GlobalTransform(), light);
10977	11898	}
10978	11899
10979	11900
..	..	@@ -10990,8 +11911,8 @@
10990	11911	parentcam = cameras[0];
10991	11912	}
10992	11913
10993		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10994		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	11914	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11915	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
10995	11916
10996	11917	LA.xformPos(light, renderCamera.toScreen, light);
10997	11918
..	..	@@ -11605,8 +12526,8 @@
11605	12526
11606	12527	// display shadow only (bump == 0)
11607	12528	"SUB temp.x, half.x, shadow.x;" +
11608		- "MOV temp.y, -params6.x;" +
11609		- "SLT temp.z, temp.y, zero.x;" +
	12529	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12530	+ "SLT temp.z, temp.y, -one2048th.x;" +
11610	12531	"SUB temp.y, one.x, temp.z;" +
11611	12532	"MUL temp.x, temp.x, temp.y;" +
11612	12533	"KIL temp.x;" +
..	..	@@ -11735,8 +12656,10 @@
11735	12656	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
11736	12657
11737	12658	"SUB temp.x, one.x, ndotl.x;" +
11738		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
11739		- "ADD temp.y, one.y, options2.y;" + // sursurface
	12659	+ // Tuning for default skin
	12660	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12661	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12662	+ "ADD temp.y, one.y, options2.y;" + // subsurface
11740	12663	"MUL temp.x, temp.x, temp.y;" +
11741	12664
11742	12665	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -11935,7 +12858,7 @@
11935	12858	//once = true;
11936	12859	}
11937	12860
11938		- System.out.print("Program #" + mode + "; length = " + program.length());
	12861	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
11939	12862	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
11940	12863	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
11941	12864
..	..	@@ -12068,12 +12991,16 @@
12068	12991
12069	12992	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12070	12993	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	12994	+
	12995	+ // Compare fragment depth in light space with shadowmap.
12071	12996	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12072	12997	"SGE temp.y, temp.x, zero.x;" +
12073		- "SUB " + shadow + ".y, one.x, temp.y;" +
	12998	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	12999	+
	13000	+ // Reverse comparison
12074	13001	"SUB temp.x, one.x, temp.x;" +
12075	13002	"MUL " + shadow + ".x, temp.x, temp.y;" +
12076		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13003	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12077	13004	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12078	13005
12079	13006	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12087,6 +13014,10 @@
12087	13014	// No shadow for backface
12088	13015	"DP3 temp.x, normal, lightd;" +
12089	13016	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13017	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13018	+
	13019	+ // No shadow when out of frustrum
	13020	+ "SGE temp.x, " + depth + ".z, one.z;" +
12090	13021	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12091	13022	"";
12092	13023	}
..	..	@@ -12645,7 +13576,7 @@
12645	13576	public void mousePressed(MouseEvent e)
12646	13577	{
12647	13578	//System.out.println("mousePressed: " + e);
12648		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13579	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
12649	13580	}
12650	13581
12651	13582	static long prevtime = 0;
..	..	@@ -12672,6 +13603,7 @@
12672	13603
12673	13604	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
12674	13605
	13606	+ if (BUTTONLESSWHEEL)
12675	13607	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
12676	13608	{
12677	13609	return;
..	..	@@ -12680,7 +13612,7 @@
12680	13612	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
12681	13613
12682	13614	// TIMER
12683		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	13615	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
12684	13616	{
12685	13617	keepboxmode = BOXMODE;
12686	13618	keepsupport = SUPPORT;
..	..	@@ -12720,8 +13652,8 @@
12720	13652	// mode \|= META;
12721	13653	//}
12722	13654
12723		- SetMouseMode(WHEEL \| e.getModifiersEx());
12724		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13655	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13656	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
12725	13657	anchorX = ax;
12726	13658	anchorY = ay;
12727	13659	prevX = px;
..	..	@@ -12781,6 +13713,10 @@
12781	13713	// wasliveok = true;
12782	13714	// waslive = false;
12783	13715
	13716	+ // May 2019 Forget it:
	13717	+ if (true)
	13718	+ return;
	13719	+
12784	13720	// source == timer
12785	13721	if (mouseDown)
12786	13722	{
..	..	@@ -12819,7 +13755,7 @@
12819	13755
12820	13756	javax.swing.Timer timer = new javax.swing.Timer(350, this);
12821	13757
12822		- void clickStart(int x, int y, int modifiers)
	13758	+ void clickStart(int x, int y, int modifiers, int modifiersex)
12823	13759	{
12824	13760	if (!wasliveok)
12825	13761	return;
..	..	@@ -12836,7 +13772,7 @@
12836	13772	// touched = true; // main DL
12837	13773	if (isRenderer)
12838	13774	{
12839		- SetMouseMode(modifiers);
	13775	+ SetMouseMode(modifiers, modifiersex);
12840	13776	}
12841	13777
12842	13778	selectX = anchorX = x;
..	..	@@ -12849,7 +13785,7 @@
12849	13785	clicked = true;
12850	13786	hold = false;
12851	13787
12852		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	13788	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
12853	13789	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
12854	13790	{
12855	13791	// System.out.println("RESTART II " + modifiers);
..	..	@@ -12880,7 +13816,7 @@
12880	13816	info.camera = renderCamera;
12881	13817	info.x = x;
12882	13818	info.y = y;
12883		- info.modifiers = modifiers;
	13819	+ info.modifiers = modifiersex;
12884	13820	editObj = object.doEditClick(info, 0);
12885	13821	if (!editObj)
12886	13822	{
..	..	@@ -12897,11 +13833,14 @@
12897	13833
12898	13834	public void mouseDragged(MouseEvent e)
12899	13835	{
	13836	+ Globals.MOUSEDRAGGED = true;
	13837	+
	13838	+ //System.out.println("mouseDragged: " + e);
12900	13839	if (isRenderer)
12901	13840	movingcamera = true;
	13841	+
12902	13842	//if (drawing)
12903	13843	//return;
12904		- //System.out.println("mouseDragged: " + e);
12905	13844	if ((e.getModifiersEx() & CTRL) != 0
12906	13845	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
12907	13846	{
..	..	@@ -12909,7 +13848,7 @@
12909	13848	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12910	13849	}
12911	13850	else
12912		- drag(e.getX(), e.getY(), e.getModifiersEx());
	13851	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
12913	13852
12914	13853	//try { Thread.sleep(1); } catch (Exception ex) {}
12915	13854	}
..	..	@@ -12921,6 +13860,11 @@
12921	13860	cVector tmp = new cVector();
12922	13861	cVector tmp2 = new cVector();
12923	13862	boolean isMoving;
	13863	+
	13864	+ public cVector TargetLookAt()
	13865	+ {
	13866	+ return targetLookAt;
	13867	+ }
12924	13868
12925	13869	class PingThread extends Thread
12926	13870	{
..	..	@@ -13077,6 +14021,7 @@
13077	14021
13078	14022	public void run()
13079	14023	{
	14024	+ new Exception().printStackTrace();
13080	14025	System.exit(0);
13081	14026	for (;;)
13082	14027	{
..	..	@@ -13140,7 +14085,7 @@
13140	14085	{
13141	14086	Globals.lighttouched = true;
13142	14087	}
13143		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14088	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
13144	14089	}
13145	14090	//else
13146	14091	}
..	..	@@ -13240,7 +14185,7 @@
13240	14185	int X, Y;
13241	14186	boolean SX, SY;
13242	14187
13243		- void drag(int x, int y, int modifiers)
	14188	+ void drag(int x, int y, int modifiers, int modifiersex)
13244	14189	{
13245	14190	if (IsFrozen())
13246	14191	{
..	..	@@ -13249,17 +14194,17 @@
13249	14194
13250	14195	drag = true; // NEW
13251	14196
13252		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14197	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
13253	14198
13254	14199	X = x;
13255	14200	Y = y;
13256	14201	// floating state for animation
13257		- MODIFIERS = modifiers;
13258		- modifiers &= ~1024;
	14202	+ MODIFIERS = modifiersex;
	14203	+ modifiersex &= ~1024;
13259	14204	if (false) // modifiers != 0)
13260	14205	{
13261	14206	//new Exception().printStackTrace();
13262		- System.out.println("mouseDragged: " + modifiers);
	14207	+ System.out.println("mouseDragged: " + modifiersex);
13263	14208	System.out.println("SHIFT = " + SHIFT);
13264	14209	System.out.println("CONTROL = " + COMMAND);
13265	14210	System.out.println("META = " + META);
..	..	@@ -13279,7 +14224,7 @@
13279	14224	info.camera = renderCamera;
13280	14225	info.x = x;
13281	14226	info.y = y;
13282		- object.editWindow.copy.doEditDrag(info);
	14227	+ object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
13283	14228	} else
13284	14229	{
13285	14230	if (x < startX)
..	..	@@ -13431,7 +14376,6 @@
13431	14376	public void mouseMoved(MouseEvent e)
13432	14377	{
13433	14378	//System.out.println("mouseMoved: " + e);
13434		-
13435	14379	if (isRenderer)
13436	14380	return;
13437	14381
..	..	@@ -13456,7 +14400,10 @@
13456	14400
13457	14401	public void mouseReleased(MouseEvent e)
13458	14402	{
	14403	+ Globals.MOUSEDRAGGED = false;
	14404	+
13459	14405	movingcamera = false;
	14406	+ X = Y = 0;
13460	14407	//System.out.println("mouseReleased: " + e);
13461	14408	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13462	14409	}
..	..	@@ -13479,9 +14426,9 @@
13479	14426	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
13480	14427	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
13481	14428
13482		- if (control \|\| command \|\| IsFrozen())
	14429	+// No delay if (control \|\| command \|\| IsFrozen())
13483	14430	timeout = true;
13484		- else
	14431	+// ?? May 2019 else
13485	14432	// timer.setDelay((modifiers & 128) != 0?0:350);
13486	14433	mouseDown = false;
13487	14434	if (!control && !command) // june 2013
..	..	@@ -13591,7 +14538,7 @@
13591	14538	System.out.println("keyReleased: " + e);
13592	14539	}
13593	14540
13594		- void SetMouseMode(int modifiers)
	14541	+ void SetMouseMode(int modifiers, int modifiersex)
13595	14542	{
13596	14543	//System.out.println("SetMouseMode = " + modifiers);
13597	14544	//modifiers &= ~1024;
..	..	@@ -13603,25 +14550,25 @@
13603	14550	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
13604	14551	// return;
13605	14552	//System.out.println("SetMode = " + modifiers);
13606		- if ((modifiers & WHEEL) == WHEEL)
	14553	+ if ((modifiersex & WHEEL) == WHEEL)
13607	14554	{
13608	14555	mouseMode \|= ZOOM;
13609	14556	}
13610	14557
13611	14558	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13612		- if (capsLocked \|\| (modifiers & META) == META)
	14559	+ if (capsLocked) // \|\| (modifiers & META) == META)
13613	14560	{
13614	14561	mouseMode \|= VR; // BACKFORTH;
13615	14562	}
13616		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14563	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
13617	14564	{
13618	14565	mouseMode \|= SELECT;
13619	14566	}
13620		- if ((modifiers & COMMAND) == COMMAND)
	14567	+ if ((modifiersex & COMMAND) == COMMAND)
13621	14568	{
13622	14569	mouseMode \|= SELECT;
13623	14570	}
13624		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14571	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
13625	14572	{
13626	14573	mouseMode &= ~VR;
13627	14574	mouseMode \|= TRANSLATE;
..	..	@@ -13650,10 +14597,10 @@
13650	14597
13651	14598	if (isRenderer) //
13652	14599	{
13653		- SetMouseMode(modifiers);
	14600	+ SetMouseMode(0, modifiers);
13654	14601	}
13655	14602
13656		- theRenderer.keyPressed(key);
	14603	+ Globals.theRenderer.keyPressed(key);
13657	14604	}
13658	14605
13659	14606	int kompactbit = 4; // power bit
..	..	@@ -13665,7 +14612,7 @@
13665	14612	float SATPOW = 1; // 2; // 0.5f;
13666	14613	float BRIPOW = 1; // 0.5f; // 0.5f;
13667	14614
13668		- void keyPressed(int key)
	14615	+ public void keyPressed(int key)
13669	14616	{
13670	14617	if (key >= '0' && key <= '5')
13671	14618	clampbit = (key-'0');
..	..	@@ -13986,7 +14933,7 @@
13986	14933	//RESIZETEXTURE ^= true;
13987	14934	//break;
13988	14935	case 'z':
13989		- RENDERSHADOW ^= true;
	14936	+ Globals.RENDERSHADOW ^= true;
13990	14937	Globals.lighttouched = true;
13991	14938	repaint();
13992	14939	break;
..	..	@@ -14102,6 +15049,7 @@
14102	15049	}
14103	15050	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
14104	15051	}
	15052	+
14105	15053	static double OCCLUSIONBOOST = 1; // 0.5;
14106	15054
14107	15055	void keyReleased(int key, int modifiers)
..	..	@@ -14109,11 +15057,11 @@
14109	15057	//mode = ROTATE;
14110	15058	if ((MODIFIERS & COMMAND) == 0) // VR??
14111	15059	{
14112		- SetMouseMode(modifiers);
	15060	+ SetMouseMode(0, modifiers);
14113	15061	}
14114	15062	}
14115	15063
14116		- protected void processKeyEvent(KeyEvent e)
	15064	+ public void processKeyEvent(KeyEvent e)
14117	15065	{
14118	15066	switch (e.getID())
14119	15067	{
..	..	@@ -14243,8 +15191,9 @@
14243	15191
14244	15192	protected void processMouseMotionEvent(MouseEvent e)
14245	15193	{
14246		- //System.out.println("processMouseMotionEvent: " + mouseMode);
14247		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15194	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15195	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15196	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
14248	15197	{
14249	15198	mouseMoved(e);
14250	15199	} else
..	..	@@ -14274,6 +15223,7 @@
14274	15223
14275	15224	void SelectParent()
14276	15225	{
	15226	+ new Exception().printStackTrace();
14277	15227	System.exit(0);
14278	15228	Composite group = (Composite) object;
14279	15229	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -14297,6 +15247,7 @@
14297	15247
14298	15248	void SelectChildren()
14299	15249	{
	15250	+ new Exception().printStackTrace();
14300	15251	System.exit(0);
14301	15252	/*
14302	15253	Composite group = (Composite) object;
..	..	@@ -14461,7 +15412,9 @@
14461	15412	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
14462	15413	//Image img = CreateImage(width, height);
14463	15414	//System.out.println("width = " + width + "; height = " + height + "\n");
	15415	+
14464	15416	Graphics gr = g; // img.getGraphics();
	15417	+
14465	15418	if (!hasMarquee)
14466	15419	{
14467	15420	if (Xmin < Xmax) // !locked)
..	..	@@ -14559,14 +15512,33 @@
14559	15512	if (!isRenderer)
14560	15513	{
14561	15514	object.drawEditHandles(info, 0);
	15515	+
	15516	+ if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	15517	+ {
	15518	+ switch (object.selection.get(0).hitSomething)
	15519	+ {
	15520	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15521	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15522	+ break;
	15523	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15524	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15525	+ break;
	15526	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15527	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15528	+ break;
	15529	+ }
	15530	+
	15531	+ }
14562	15532	}
14563	15533	}
	15534	+
14564	15535	if (isRenderer)
14565	15536	{
14566	15537	//gr.setColor(Color.black);
14567	15538	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
14568	15539	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
14569	15540	}
	15541	+
14570	15542	if (hasMarquee)
14571	15543	{
14572	15544	gr.setXORMode(Color.white);
..	..	@@ -14679,6 +15651,7 @@
14679	15651	public boolean mouseDown(Event evt, int x, int y)
14680	15652	{
14681	15653	System.out.println("mouseDown: " + evt);
	15654	+ System.exit(0);
14682	15655	/*
14683	15656	locked = true;
14684	15657	drag = false;
..	..	@@ -14722,7 +15695,7 @@
14722	15695	{
14723	15696	keyPressed(0, modifiers);
14724	15697	}
14725		- clickStart(x, y, modifiers);
	15698	+ // clickStart(x, y, modifiers);
14726	15699	return true;
14727	15700	}
14728	15701
..	..	@@ -14840,7 +15813,7 @@
14840	15813	{
14841	15814	keyReleased(0, 0);
14842	15815	}
14843		- drag(x, y, modifiers);
	15816	+ drag(x, y, 0, modifiers);
14844	15817	return true;
14845	15818	}
14846	15819
..	..	@@ -14972,7 +15945,7 @@
14972	15945	Object3D object;
14973	15946	static Object3D trackedobject;
14974	15947	Camera renderCamera; // Light or Eye (or Occlusion)
14975		- /static/ Camera manipCamera; // Light or Eye
	15948	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
14976	15949	/static/ Camera eyeCamera;
14977	15950	/static/ Camera lightCamera;
14978	15951	int cameracount;
..	..	@@ -15410,6 +16383,7 @@
15410	16383	{
15411	16384	if (!selection)
15412	16385	{
	16386	+ new Exception().printStackTrace();
15413	16387	System.exit(0);
15414	16388	return;
15415	16389	}
..	..	@@ -15537,16 +16511,16 @@
15537	16511	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]));
15538	16512	}
15539	16513
15540		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16514	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
15541	16515	}
15542	16516	}
15543	16517
15544	16518	if (!movingcamera && !PAINTMODE)
15545	16519	object.editWindow.ScreenFitPoint(); // fev 2014
15546	16520
15547		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16521	+ if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
15548	16522	{
15549		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16523	+ Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
15550	16524
15551	16525	Object3D group = new Object3D("inst" + paintcount++);
15552	16526
..	..	@@ -15702,7 +16676,7 @@
15702	16676	gl.glDisable(gl.GL_CULL_FACE);
15703	16677	}
15704	16678
15705		- if (!RENDERSHADOW)
	16679	+ if (!Globals.RENDERSHADOW)
15706	16680	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
15707	16681
15708	16682	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -15712,7 +16686,7 @@
15712	16686	//gl.glColorMask(false, false, false, false);
15713	16687
15714	16688	//render_scene_from_light_view(gl, drawable, 0, 0);
15715		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	16689	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
15716	16690	{
15717	16691	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
15718	16692
..	..	@@ -15772,7 +16746,6 @@
15772	16746
15773	16747	class AntialiasBuffer implements GLEventListener
15774	16748	{
15775		-
15776	16749	CameraPane parent = null;
15777	16750
15778	16751	AntialiasBuffer(CameraPane p)
..	..	@@ -16165,7 +17138,7 @@
16165	17138	}
16166	17139	}
16167	17140
16168		- static void DrawPoints(CameraPane cpane)
	17141	+ static void DrawPoints(iCameraPane cpane)
16169	17142	{
16170	17143	for (int i=0; i<8; i++) // first and last are red
16171	17144	{
..	..	@@ -16197,10 +17170,11 @@
16197	17170	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
16198	17171	// Depth buffer format
16199	17172	//private int depth_format;
16200		- static public void NextIndex(Object3D o, GL gl)
	17173	+
	17174	+ public void NextIndex()
16201	17175	{
16202	17176	indexcount+=16;
16203		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17177	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
16204	17178	//objects[indexcount] = o;
16205	17179	//System.out.println("indexcount = " + indexcount);
16206	17180	}