~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,16 +458,18 @@
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)
	468	+ // TEST LIVE NORMALS && !obj.dontselect
	469	+ ;
413	470	if (!hasnorm)
414	471	{
415		- // System.out.println("FUCK!!");
	472	+ // System.out.println("Mesh normal");
416	473	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
417	474	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
418	475	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -566,7 +623,816 @@
566	623	}
567	624	}
568	625
	626	+ /**
	627	+ * <code>draw</code> renders a <code>TriMesh</code> object including
	628	+ * it's normals, colors, textures and vertices.
	629	+ *
	630	+ * @see Renderer#draw(TriMesh)
	631	+ * @param tris
	632	+ * the mesh to render.
	633	+ */
	634	+ public void DrawParticles(TriMesh geo, Object3D shape, boolean selected, boolean rotate) // TriMesh tris)
	635	+ {
	636	+ CameraPane display = this;
	637	+
	638	+ float r = display.modelParams0[0];
	639	+ float g = display.modelParams0[1];
	640	+ float b = display.modelParams0[2];
	641	+ float opacity = display.modelParams5[1];
	642	+
	643	+ //final GL gl = GLU.getCurrentGL();
	644	+ GL gl = display.GetGL(); // getGL();
	645	+
	646	+ FloatBuffer vertBuf = geo.vertBuf;
	647	+
	648	+ int v = vertBuf.capacity();
	649	+
	650	+ int count = 0;
	651	+
	652	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	653	+ gl.glEnable(gl.GL_CULL_FACE);
	654	+ // gl.glScalef(1.0f/1024,1.0f/1024,1.0f/1024);
	655	+ for (int i=0; i<v/3; i++)
	656	+ {
	657	+ int index3 = i*3;
	658	+
	659	+ if (geo.sizeBuf.get(index3+1) == 0)
	660	+ continue;
	661	+
	662	+ count++;
	663	+
	664	+ int index4 = i*4;
	665	+
	666	+ float tx = vertBuf.get(index3);
	667	+ float ty = vertBuf.get(index3+1);
	668	+ float tz = vertBuf.get(index3+2);
	669	+
	670	+ // if (tx == 0 && ty == 0 && tz == 0)
	671	+ // continue;
	672	+
	673	+ gl.glMatrixMode(gl.GL_TEXTURE);
	674	+ gl.glPushMatrix();
	675	+
	676	+ float[] texmat = geo.texmat;
	677	+ texmat[12] = texmat[13] = texmat[14] = i;
	678	+
	679	+ gl.glMultMatrixf(texmat, 0);
	680	+
	681	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	682	+ gl.glPushMatrix();
	683	+
	684	+ gl.glTranslatef(tx,ty,tz);
	685	+
	686	+ if (rotate)
	687	+ gl.glRotatef(i, 0, 1, 0);
	688	+
	689	+ float size = geo.sizeBuf.get(index3) / 100;
	690	+ gl.glScalef(size,size,size);
	691	+
	692	+ float cr = geo.colorBuf.get(index4);
	693	+ float cg = geo.colorBuf.get(index4+1);
	694	+ float cb = geo.colorBuf.get(index4+2);
	695	+ float ca = geo.colorBuf.get(index4+3);
	696	+
	697	+ display.modelParams0[0] = r * cr;
	698	+ display.modelParams0[1] = g * cg;
	699	+ display.modelParams0[2] = b * cb;
	700	+
	701	+ display.modelParams5[1] = opacity * ca;
	702	+
	703	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	704	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	705	+
	706	+ RandomNode.globalseed = (int)geo.sizeBuf.get(index3+2); // i;
	707	+ RandomNode.globalseed2 = RandomNode.globalseed;
	708	+
	709	+// gl.glColor4f(cr,cg,cb,ca);
	710	+ // gl.glScalef(1024/16,1024/16,1024/16);
	711	+ shape.Draw/Node/(display,null,selected,false); // blocked
	712	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	713	+ //gl.glTranslatef(-tx,-ty,-tz);
	714	+ gl.glPopMatrix();
	715	+
	716	+ gl.glMatrixMode(gl.GL_TEXTURE);
	717	+ gl.glPopMatrix();
	718	+ }
	719	+ // gl.glScalef(1024,1024,1024);
	720	+ if (!cf)
	721	+ gl.glDisable(gl.GL_CULL_FACE);
	722	+
	723	+ display.modelParams0[0] = r;
	724	+ display.modelParams0[1] = g;
	725	+ display.modelParams0[2] = b;
	726	+
	727	+ display.modelParams5[1] = opacity;
	728	+
	729	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	730	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	731	+
	732	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	733	+
	734	+// System.err.println("total = " + v/3 + "; displayed = " + count);
	735	+ if (true)
	736	+ return;
	737	+
	738	+//// if (!tris.predraw(this))
	739	+//// {
	740	+//// return;
	741	+//// }
	742	+//// if (Debug.stats)
	743	+//// {
	744	+//// StatCollector.addStat(StatType.STAT_TRIANGLE_COUNT, tris.getTriangleCount());
	745	+//// StatCollector.addStat(StatType.STAT_VERTEX_COUNT, tris.getVertexCount());
	746	+//// StatCollector.addStat(StatType.STAT_GEOM_COUNT, 1);
	747	+//// }
	748	+////
	749	+//// if (tris.getDisplayListID() != -1)
	750	+//// {
	751	+//// renderDisplayList(tris);
	752	+//// return;
	753	+//// }
	754	+////
	755	+//// if (!generatingDisplayList)
	756	+//// {
	757	+//// applyStates(tris.states, tris);
	758	+//// }
	759	+//// if (Debug.stats)
	760	+//// {
	761	+//// StatCollector.startStat(StatType.STAT_RENDER_TIMER);
	762	+//// }
	763	+//// boolean transformed = doTransforms(tris);
	764	+//
	765	+// int glMode = GL.GL_TRIANGLES;
	766	+// switch (getMode())
	767	+// {
	768	+// case Triangles:
	769	+// glMode = GL.GL_TRIANGLES;
	770	+// break;
	771	+// case Strip:
	772	+// glMode = GL.GL_TRIANGLE_STRIP;
	773	+// break;
	774	+// case Fan:
	775	+// glMode = GL.GL_TRIANGLE_FAN;
	776	+// break;
	777	+// }
	778	+//
	779	+// if (!predrawGeometry(gl))
	780	+// {
	781	+// // make sure only the necessary indices are sent through on old
	782	+// // cards.
	783	+// IntBuffer indices = this.getIndexBuffer();
	784	+// if (indices == null)
	785	+// {
	786	+// logger.severe("missing indices on geometry object: " + this.toString());
	787	+// } else
	788	+// {
	789	+// indices.rewind();
	790	+// indices.limit(this.getMaxIndex());
	791	+//
	792	+// gl.glDrawElements(glMode, indices.limit(), GL.GL_UNSIGNED_INT, indices); // TODO Check <count> and assumed <type> of GL_UNSIGNED_INT
	793	+//
	794	+// indices.clear();
	795	+// }
	796	+// } else
	797	+// {
	798	+// gl.glDrawElements(glMode, this.getIndexBuffer().limit(),
	799	+// GL.GL_UNSIGNED_INT, 0);
	800	+// }
	801	+//
	802	+//// postdrawGeometry(tris);
	803	+//// if (transformed)
	804	+//// {
	805	+//// undoTransforms(tris);
	806	+//// }
	807	+////
	808	+//// if (Debug.stats)
	809	+//// {
	810	+//// StatCollector.endStat(StatType.STAT_RENDER_TIMER);
	811	+//// }
	812	+//// tris.postdraw(this);
	813	+ }
	814	+
	815	+ static Camera localcamera = new Camera();
	816	+ static cVector from = new cVector();
	817	+ static cVector to = new cVector();
	818	+
	819	+ public void PrepOcclusion(BoundaryRep br, double[][] transform)
	820	+ {
	821	+ CameraPane cp = this;
	822	+
	823	+ Camera keep = cp.RenderCamera();
	824	+ cp.renderCamera = localcamera;
	825	+
	826	+ if (br.trimmed)
	827	+ {
	828	+ float[] colors = new float[br.positions.length / 3];
	829	+
	830	+ int i3 = 0;
	831	+ for (int i = 0; i < br.positions.length / 3; i++, i3 += 3)
	832	+ {
	833	+ if (br.normals[i3] == 0 && br.normals[i3+1] == 0 && br.normals[i3+2] == 0)
	834	+ continue;
	835	+
	836	+ from.set(br.positions[i3], br.positions[i3 + 1], br.positions[i3 + 2]);
	837	+ to.set(br.positions[i3] + br.normals[i3],
	838	+ br.positions[i3 + 1] + br.normals[i3 + 1],
	839	+ br.positions[i3 + 2] + br.normals[i3 + 2]);
	840	+ LA.xformPos(from, transform, from);
	841	+ LA.xformPos(to, transform, to); // RIGID ONLY
	842	+ localcamera.setAim(from, to);
	843	+
	844	+ CameraPane.occlusionbuffer.display();
	845	+
	846	+ if (CameraPane.DEBUG_OCCLUSION)
	847	+ cp.display(); // debug
	848	+
	849	+ colors[i] = cp.vertexOcclusion.r;
	850	+ //colors[i3 + 1] = cp.vertexOcclusion.g;
	851	+ //colors[i3 + 2] = cp.vertexOcclusion.b;
	852	+
	853	+ if ((i % 100) == 0 && i != 0)
	854	+ {
	855	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	856	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	857	+ System.out.println((int) (100.0 * i / (br.positions.length / 3)) + "% (" + i + " of " + (br.positions.length / 3) + ")");
	858	+ }
	859	+ }
	860	+
	861	+ br.colors = colors;
	862	+ }
	863	+ else
	864	+ {
	865	+ for (int i = 0; i < br.VertexCount(); i++)
	866	+ {
	867	+ Vertex v = br.GetVertex(i);
	868	+
	869	+ if (v.norm == null \|\| v.norm.x == 0 && v.norm.y == 0 && v.norm.z == 0)
	870	+ continue;
	871	+
	872	+ from.set(v.x, v.y, v.z);
	873	+ to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
	874	+ LA.xformPos(from, transform, from);
	875	+ LA.xformPos(to, transform, to); // RIGID ONLY
	876	+ localcamera.setAim(from, to);
	877	+
	878	+ CameraPane.occlusionbuffer.display();
	879	+
	880	+ if (CameraPane.DEBUG_OCCLUSION)
	881	+ cp.display(); // debug
	882	+
	883	+ v.AO = cp.vertexOcclusion.r;
	884	+
	885	+ if ((i % 100) == 0 && i != 0)
	886	+ {
	887	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	888	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	889	+ System.out.println((int) (100.0 * i / br.VertexCount()) + "% (" + i + " of " + br.VertexCount() + ")");
	890	+ }
	891	+ }
	892	+ }
	893	+
	894	+ //System.out.println("done.");
	895	+
	896	+ cp.renderCamera = keep;
	897	+ }
	898	+
	899	+ void DrawPointFLow(PointFlow pointFlow, Object3D /Composite/ root, boolean selected, boolean blocked)
	900	+ {
	901	+ CameraPane display = this;
	902	+ pointFlow.CreateHT();
	903	+
	904	+ float r = display.modelParams0[0];
	905	+ float g = display.modelParams0[1];
	906	+ float b = display.modelParams0[2];
	907	+ float opacity = display.modelParams5[1];
	908	+
	909	+ //final GL gl = GLU.getCurrentGL();
	910	+ GL gl = display.GetGL(); // getGL();
	911	+
	912	+ int s = pointFlow.points.size();
	913	+
	914	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	915	+ gl.glEnable(gl.GL_CULL_FACE);
	916	+
	917	+ for (int i=s; --i>=0;)
	918	+ //for (int i=0; i<s; i++)
	919	+ {
	920	+ cVector v = pointFlow.points.get(i);
	921	+
	922	+ double mindist = Double.MAX_VALUE;
	923	+
	924	+ double size = pointFlow.minimumSize;
	925	+
	926	+ double distancenext = 0;
	927	+
	928	+ if (i > 0)
	929	+ {
	930	+ cVector w = pointFlow.points.get(i-1);
	931	+
	932	+ double dist = w.distance(v);
	933	+
	934	+ distancenext = dist;
	935	+
	936	+ if (mindist > dist)
	937	+ {
	938	+ mindist = dist;
	939	+ size = mindist*pointFlow.resizefactor;
	940	+ }
	941	+ }
	942	+
	943	+ if (i < s-1)
	944	+ {
	945	+ cVector w = pointFlow.points.get(i+1);
	946	+
	947	+ double dist = w.distance(v);
	948	+
	949	+ if (mindist > dist)
	950	+ {
	951	+ mindist = dist;
	952	+ size = mindist*pointFlow.resizefactor;
	953	+ }
	954	+ }
	955	+
	956	+ if (size < pointFlow.minimumSize)
	957	+ size = pointFlow.minimumSize;
	958	+ if (size > pointFlow.maximumSize)
	959	+ size = pointFlow.maximumSize;
	960	+
	961	+ double tx = v.x;
	962	+ double ty = v.y;
	963	+ double tz = v.z;
	964	+
	965	+ // if (tx == 0 && ty == 0 && tz == 0)
	966	+ // continue;
	967	+
	968	+ gl.glMatrixMode(gl.GL_TEXTURE);
	969	+ gl.glPushMatrix();
	970	+ pointFlow.texmat[12] = pointFlow.texmat[13] = pointFlow.texmat[14] = i;
	971	+
	972	+ gl.glMultMatrixf(pointFlow.texmat, 0);
	973	+
	974	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	975	+ gl.glPushMatrix();
	976	+
	977	+ gl.glTranslated(tx,ty,tz);
	978	+
	979	+ gl.glScaled(size,size,size);
	980	+
	981	+// float cr = colorBuf.get(index4);
	982	+// float cg = colorBuf.get(index4+1);
	983	+// float cb = colorBuf.get(index4+2);
	984	+// float ca = colorBuf.get(index4+3);
	985	+//
	986	+// display.modelParams0[0] = r * cr;
	987	+// display.modelParams0[1] = g * cg;
	988	+// display.modelParams0[2] = b * cb;
	989	+//
	990	+// display.modelParams5[1] = opacity * ca;
	991	+//
	992	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	993	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	994	+//
	995	+// RandomNode.globalseed = (int)sizeBuf.get(index3+2); // i;
	996	+// RandomNode.globalseed2 = RandomNode.globalseed;
	997	+//
	998	+//// gl.glColor4f(cr,cg,cb,ca);
	999	+// // gl.glScalef(1024/16,1024/16,1024/16);
	1000	+ pointFlow.geo.Draw/Node/(display,null,selected, blocked);
	1001	+
	1002	+ gl.glPopMatrix();
	1003	+
	1004	+ double step = size/4; //
	1005	+
	1006	+ if (i == 0 \|\| size == 0 \|\| distancenext > 8*size \|\| distancenext < step)
	1007	+ continue;
	1008	+
	1009	+ int nbsteps = (int)(distancenext/step);
	1010	+
	1011	+ step = distancenext/nbsteps;
	1012	+
	1013	+ cVector next = pointFlow.points.get(i-1);
	1014	+
	1015	+ tmp.set(next);
	1016	+ tmp.sub(v);
	1017	+ tmp.normalize();
	1018	+ tmp.mul(step);
	1019	+
	1020	+ // calculate next size
	1021	+ mindist = Double.MAX_VALUE;
	1022	+
	1023	+ double nextsize = pointFlow.minimumSize;
	1024	+
	1025	+ if (i > 1)
	1026	+ {
	1027	+ cVector w = pointFlow.points.get(i-2);
	1028	+
	1029	+ double dist = w.distance(next);
	1030	+
	1031	+ if (mindist > dist)
	1032	+ {
	1033	+ mindist = dist;
	1034	+ nextsize = mindist*pointFlow.resizefactor;
	1035	+ }
	1036	+ }
	1037	+
	1038	+ double dist = v.distance(next);
	1039	+
	1040	+ if (mindist > dist)
	1041	+ {
	1042	+ mindist = dist;
	1043	+ nextsize = mindist*pointFlow.resizefactor;
	1044	+ }
	1045	+
	1046	+ if (nextsize < pointFlow.minimumSize)
	1047	+ nextsize = pointFlow.minimumSize;
	1048	+ if (nextsize > pointFlow.maximumSize)
	1049	+ nextsize = pointFlow.maximumSize;
	1050	+ //
	1051	+
	1052	+ double count = 0;
	1053	+
	1054	+ while (distancenext > 0.000000001) // step
	1055	+ {
	1056	+ gl.glPushMatrix();
	1057	+
	1058	+ gl.glTranslated(tx + tmp.xcount, ty + tmp.ycount, tz + tmp.z*count);
	1059	+
	1060	+ double K = count/nbsteps;
	1061	+
	1062	+ double intersize = Knextsize + (1-K)size;
	1063	+
	1064	+ gl.glScaled(intersize,intersize,intersize);
	1065	+
	1066	+ pointFlow.geo.Draw/Node/(display,null,selected,blocked);
	1067	+
	1068	+ count++;
	1069	+
	1070	+ distancenext -= step;
	1071	+
	1072	+ gl.glPopMatrix();
	1073	+ }
	1074	+
	1075	+ if (count != nbsteps)
	1076	+ assert(count == nbsteps);
	1077	+
	1078	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	1079	+ //gl.glTranslatef(-tx,-ty,-tz);
	1080	+
	1081	+ gl.glMatrixMode(gl.GL_TEXTURE);
	1082	+ gl.glPopMatrix();
	1083	+ }
	1084	+
	1085	+ if (!cf)
	1086	+ gl.glDisable(gl.GL_CULL_FACE);
	1087	+
	1088	+// display.modelParams0[0] = r;
	1089	+// display.modelParams0[1] = g;
	1090	+// display.modelParams0[2] = b;
	1091	+//
	1092	+// display.modelParams5[1] = opacity;
	1093	+//
	1094	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1095	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1096	+
	1097	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	1098	+ }
	1099	+
	1100	+ public void DrawBox(cVector min, cVector max)
	1101	+ {
	1102	+ javax.media.opengl.GL gl = GetGL();
	1103	+ gl.glBegin(gl.GL_LINES);
	1104	+
	1105	+ gl.glVertex3d(min.x, min.y, min.z);
	1106	+ gl.glVertex3d(min.x, min.y, max.z);
	1107	+ gl.glVertex3d(min.x, min.y, min.z);
	1108	+ gl.glVertex3d(min.x, max.y, min.z);
	1109	+ gl.glVertex3d(min.x, min.y, min.z);
	1110	+ gl.glVertex3d(max.x, min.y, min.z);
	1111	+
	1112	+ gl.glVertex3d(max.x, max.y, max.z);
	1113	+ gl.glVertex3d(min.x, max.y, max.z);
	1114	+ gl.glVertex3d(max.x, max.y, max.z);
	1115	+ gl.glVertex3d(max.x, min.y, max.z);
	1116	+ gl.glVertex3d(max.x, max.y, max.z);
	1117	+ gl.glVertex3d(max.x, max.y, min.z);
	1118	+
	1119	+ gl.glEnd();
	1120	+ }
	1121	+
	1122	+ public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
	1123	+ {
	1124	+ int[] strips = bRep.getRawIndices();
	1125	+
	1126	+ javax.media.opengl.GL gl = GetGL();
	1127	+
	1128	+ // TRIANGLE STRIP ARRAY
	1129	+ if (bRep.trimmed)
	1130	+ {
	1131	+ float[] v = bRep.getRawVertices();
	1132	+ float[] n = bRep.getRawNormals();
	1133	+ float[] c = bRep.getRawColors();
	1134	+ float[] uv = bRep.getRawUVMap();
	1135	+
	1136	+ int count2 = 0;
	1137	+ int count3 = 0;
	1138	+
	1139	+ if (n.length > 0)
	1140	+ {
	1141	+ for (int i = 0; i < strips.length; i++)
	1142	+ {
	1143	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1144	+
	1145	+ /*
	1146	+ boolean locked = false;
	1147	+ float eps = 0.1f;
	1148	+ boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	1149	+
	1150	+ int dot = 0;
	1151	+
	1152	+ if ((dot&1) == 0)
	1153	+ dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	1154	+
	1155	+ if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	1156	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	1157	+ else
	1158	+ {
	1159	+ locked = true;
	1160	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1161	+ }
	1162	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	1163	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	1164	+ if (hasnorm)
	1165	+ {
	1166	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	1167	+ gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
	1168	+ }
	1169	+
	1170	+ if ((dot&4) == 0)
	1171	+ dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	1172	+
	1173	+ if (wrap \|\| !locked && (dot&8) != 0)
	1174	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	1175	+ else
	1176	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1177	+
	1178	+ f.dot = dot;
	1179	+ */
	1180	+
	1181	+ if (!selectmode)
	1182	+ {
	1183	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1184	+ {
	1185	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1186	+ } else
	1187	+ {
	1188	+ gl.glNormal3f(0, 0, 1);
	1189	+ }
	1190	+
	1191	+ if (c != null)
	1192	+ //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
	1193	+ {
	1194	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1195	+ }
	1196	+ }
	1197	+
	1198	+ if (flipV)
	1199	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1200	+ else
	1201	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1202	+
	1203	+ //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1204	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1205	+
	1206	+ count2 += 2;
	1207	+ count3 += 3;
	1208	+ if (!selectmode)
	1209	+ {
	1210	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1211	+ {
	1212	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1213	+ } else
	1214	+ {
	1215	+ gl.glNormal3f(0, 0, 1);
	1216	+ }
	1217	+ if (c != null)
	1218	+ {
	1219	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1220	+ }
	1221	+ }
	1222	+
	1223	+ if (flipV)
	1224	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1225	+ else
	1226	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1227	+
	1228	+ //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1229	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1230	+
	1231	+ count2 += 2;
	1232	+ count3 += 3;
	1233	+ for (int j = 0; j < strips[i] - 2; j++)
	1234	+ {
	1235	+ //gl.glTexCoord2d(...);
	1236	+ if (!selectmode)
	1237	+ {
	1238	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1239	+ {
	1240	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1241	+ } else
	1242	+ {
	1243	+ gl.glNormal3f(0, 0, 1);
	1244	+ }
	1245	+ if (c != null)
	1246	+ {
	1247	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1248	+ }
	1249	+ }
	1250	+
	1251	+ if (flipV)
	1252	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1253	+ else
	1254	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1255	+
	1256	+ //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
	1257	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1258	+
	1259	+ count2 += 2;
	1260	+ count3 += 3;
	1261	+ }
	1262	+
	1263	+ gl.glEnd();
	1264	+ }
	1265	+ }
	1266	+
	1267	+ assert count3 == v.length;
	1268	+ }
	1269	+ else // !trimmed
	1270	+ {
	1271	+ int count = 0;
	1272	+ for (int i = 0; i < strips.length; i++)
	1273	+ {
	1274	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1275	+
	1276	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	1277	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	1278	+
	1279	+ drawVertex(gl, p, flipV, selectmode);
	1280	+ drawVertex(gl, q, flipV, selectmode);
	1281	+
	1282	+ for (int j = 0; j < strips[i] - 2; j++)
	1283	+ {
	1284	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	1285	+
	1286	+ // if (j%2 == 0)
	1287	+ // drawFace(p, q, r, display, null);
	1288	+ // else
	1289	+ // drawFace(p, r, q, display, null);
	1290	+
	1291	+ // p = q;
	1292	+ // q = r;
	1293	+ drawVertex(gl, r, flipV, selectmode);
	1294	+ }
	1295	+
	1296	+ gl.glEnd();
	1297	+ }
	1298	+ }
	1299	+ }
	1300	+
	1301	+ static cSpring.Point3D temp = new cSpring.Point3D();
	1302	+ static cSpring.Point3D temp2 = new cSpring.Point3D();
	1303	+ static cSpring.Point3D temp3 = new cSpring.Point3D();
	1304	+
	1305	+ public void DrawDynamicMesh(cMesh mesh)
	1306	+ {
	1307	+ GL gl = GetGL(); // getGL();
	1308	+
	1309	+ cSpring.PhysicsController3D Phys = mesh.Phys;
	1310	+
	1311	+ gl.glDisable(gl.GL_LIGHTING);
	1312	+
	1313	+ gl.glLineWidth(1);
	1314	+ gl.glColor3f(1,1,1);
	1315	+ gl.glBegin(gl.GL_LINES);
	1316	+ double scale = 0;
	1317	+ int count = 0;
	1318	+ for (int s=0; s<Phys.allSprings.size(); s++)
	1319	+ {
	1320	+ cSpring.Spring spring = Phys.allSprings.get(s);
	1321	+ if(s == 0)
	1322	+ {
	1323	+ //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
	1324	+ }
	1325	+ if (mesh.showsprings)
	1326	+ {
	1327	+ temp.set(spring.a.position);
	1328	+ temp.add(spring.b.position);
	1329	+ temp.mul(0.5);
	1330	+ temp2.set(spring.a.position);
	1331	+ temp2.sub(spring.b.position);
	1332	+ temp2.mul(spring.restLength/2);
	1333	+ temp.sub(temp2);
	1334	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1335	+ temp.add(temp2);
	1336	+ temp.add(temp2);
	1337	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1338	+ }
	1339	+
	1340	+ if (spring.isHandle)
	1341	+ continue;
	1342	+
	1343	+ //if (scale < spring.restLength)
	1344	+ scale += spring.restLength;
	1345	+ count++;
	1346	+ }
	1347	+ gl.glEnd();
	1348	+
	1349	+ if (count == 0)
	1350	+ scale = 0.01;
	1351	+ else
	1352	+ scale /= count * 3;
	1353	+
	1354	+ //scale = 0.25;
	1355	+
	1356	+ if (mesh.ShowInfo())
	1357	+ {
	1358	+ gl.glLineWidth(4);
	1359	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1360	+ {
	1361	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1362	+ if (node.mass == 0)
	1363	+ continue;
	1364	+
	1365	+ int i = node.springs==null?-1:node.springs.size();
	1366	+ gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
	1367	+ //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
	1368	+ //temp.normalize();
	1369	+ //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
	1370	+ gl.glBegin(gl.GL_LINES);
	1371	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1372	+ //gl.glVertex3d(node.position.x + node.normal.xscale, node.position.y + node.normal.yscale, node.position.z + node.normal.z*scale);
	1373	+ gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
	1374	+ node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
	1375	+ node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
	1376	+ gl.glEnd();
	1377	+ }
	1378	+
	1379	+ gl.glLineWidth(8);
	1380	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1381	+ {
	1382	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1383	+
	1384	+ if (node.springs != null)
	1385	+ {
	1386	+ for (int i=0; i<node.springs.size(); i+=1)
	1387	+ {
	1388	+ cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
	1389	+
	1390	+ int c = i+1;
	1391	+ // c = node.springs.get(i).nbcopies;
	1392	+
	1393	+ gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
	1394	+ gl.glBegin(gl.GL_LINES);
	1395	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1396	+ 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);
	1397	+ gl.glEnd();
	1398	+ }
	1399	+ }
	1400	+ }
	1401	+
	1402	+ gl.glLineWidth(1);
	1403	+ }
	1404	+
	1405	+ gl.glEnable(gl.GL_LIGHTING);
	1406	+ }
	1407	+
569	1408	/// INTERFACE
	1409	+
	1410	+ public void StartTriangles()
	1411	+ {
	1412	+ javax.media.opengl.GL gl = GetGL();
	1413	+ gl.glBegin(gl.GL_TRIANGLES);
	1414	+ }
	1415	+
	1416	+ public void EndTriangles()
	1417	+ {
	1418	+ GetGL().glEnd();
	1419	+ }
	1420	+
	1421	+ void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
	1422	+ {
	1423	+ if (!selectmode)
	1424	+ {
	1425	+ gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1426	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	1427	+
	1428	+ if (flipV)
	1429	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	1430	+ else
	1431	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1432	+ }
	1433	+
	1434	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	1435	+ }
570	1436
571	1437	void SetColor(Object3D obj, Vertex p0)
572	1438	{
..	..	@@ -761,18 +1627,18 @@
761	1627	//col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
762	1628	if (!material.multiply)
763	1629	{
764		- display.color = color;
	1630	+ display.color = material.color;
765	1631	display.saturation = material.modulation;
766	1632	}
767	1633	else
768	1634	{
769		- display.color = color2;
	1635	+ display.color = material.color2;
770	1636	display.saturation = material.modulation2;
771	1637	}
772	1638
773	1639	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
774	1640
775		- float[] colorV = GrafreeD.colorV;
	1641	+ float[] colorV = Grafreed.colorV;
776	1642
777	1643	/**/
778	1644	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1032,7 +1898,7 @@
1032	1898	void PushMatrix(double[][] matrix)
1033	1899	{
1034	1900	// GrafreeD.tracein(matrix);
1035		- PushMatrix(matrix,1);
	1901	+ PushMatrix(matrix, 1);
1036	1902	}
1037	1903
1038	1904	void PushMatrix()
..	..	@@ -1129,7 +1995,7 @@
1129	1995
1130	1996	static int camerachangeframe;
1131	1997
1132		- boolean SetCamera(Camera cam)
	1998	+ public boolean SetCamera(Camera cam)
1133	1999	{
1134	2000	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
1135	2001	// return false;
..	..	@@ -1257,33 +2123,6 @@
1257	2123	mainDL ^= true;
1258	2124	}
1259	2125
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	2126	void ToggleFullScreen()
1288	2127	{
1289	2128	FULLSCREEN ^= true;
..	..	@@ -1294,72 +2133,94 @@
1294	2133	Globals.CROWD ^= true;
1295	2134	}
1296	2135
1297		- void ToggleInertia()
1298		- {
1299		- INERTIA ^= true;
1300		- }
1301		-
1302	2136	void ToggleLocal()
1303	2137	{
1304	2138	LOCALTRANSFORM ^= true;
1305	2139	}
1306	2140
1307		- void ToggleFast()
	2141	+ public void ToggleTexture()
	2142	+ {
	2143	+ textureon ^= true;
	2144	+ }
	2145	+
	2146	+ public void ToggleLive()
	2147	+ {
	2148	+ Globals.setLIVE(Globals.isLIVE() ^ true);
	2149	+
	2150	+ System.err.println("LIVE = " + Globals.isLIVE());
	2151	+
	2152	+ if (!Globals.isLIVE()) // save sound
	2153	+ Grafreed.savesound = true; // wav.save();
	2154	+ // else
	2155	+ repaint(); // start loop // may 2013
	2156	+ }
	2157	+
	2158	+ public void ToggleSupport()
	2159	+ {
	2160	+ SUPPORT ^= true;
	2161	+ }
	2162	+
	2163	+ public void ToggleAbort()
	2164	+ {
	2165	+ ABORTMODE ^= true;
	2166	+ }
	2167	+
	2168	+ public void ToggleInertia()
	2169	+ {
	2170	+ INERTIA ^= true;
	2171	+ }
	2172	+
	2173	+ public void ToggleFast()
1308	2174	{
1309	2175	FAST ^= true;
1310	2176	}
1311	2177
1312		- void ToggleSlowPose()
	2178	+ public void ToggleSlowPose()
1313	2179	{
1314	2180	SLOWPOSE ^= true;
1315	2181	}
1316	2182
1317		- void ToggleFootContact()
1318		- {
1319		- FOOTCONTACT ^= true;
1320		- }
1321		-
1322		- void ToggleBoxMode()
	2183	+ public void ToggleBoxMode()
1323	2184	{
1324	2185	BOXMODE ^= true;
1325	2186	}
1326	2187
1327		- void ToggleSmoothFocus()
	2188	+ public void ToggleZoomBoxMode()
	2189	+ {
	2190	+ ZOOMBOXMODE ^= true;
	2191	+ }
	2192	+
	2193	+ public void ToggleSmoothFocus()
1328	2194	{
1329	2195	SMOOTHFOCUS ^= true;
1330	2196	}
1331	2197
1332		- void ToggleImageFlip()
	2198	+ public void ToggleImageFlip()
1333	2199	{
1334	2200	IMAGEFLIP ^= true;
1335	2201	}
1336	2202
1337		- void ToggleSpeakerMocap()
	2203	+ public void ToggleSpeakerMocap()
1338	2204	{
1339	2205	SPEAKERMOCAP ^= true;
1340	2206	}
1341	2207
1342		- void ToggleSpeakerCamera()
	2208	+ public void ToggleSpeakerCamera()
1343	2209	{
1344	2210	SPEAKERCAMERA ^= true;
1345	2211	}
1346	2212
1347		- void ToggleSpeakerFocus()
	2213	+ public void ToggleSpeakerFocus()
1348	2214	{
1349	2215	SPEAKERFOCUS ^= true;
1350	2216	}
1351	2217
1352		- void ToggleDebug()
1353		- {
1354		- DEBUG ^= true;
1355		- }
1356		-
1357		- void ToggleFrustum()
	2218	+ public void ToggleFrustum()
1358	2219	{
1359	2220	FRUSTUM ^= true;
1360	2221	}
1361	2222
1362		- void ToggleTrack()
	2223	+ public void ToggleTrack()
1363	2224	{
1364	2225	TRACK ^= true;
1365	2226	if (TRACK)
..	..	@@ -1378,25 +2239,35 @@
1378	2239	repaint();
1379	2240	}
1380	2241
1381		- void ToggleTrackOnce()
	2242	+ public void ToggleTrackOnce()
1382	2243	{
1383	2244	TRACKONCE ^= true;
1384	2245	}
1385	2246
1386		- void ToggleShadowTrack()
	2247	+ public void ToggleShadowTrack()
1387	2248	{
1388	2249	SHADOWTRACK ^= true;
1389	2250	repaint();
1390	2251	}
1391	2252
1392		- void ToggleOeil()
	2253	+ public void ToggleOeil()
1393	2254	{
1394	2255	OEIL ^= true;
1395	2256	}
1396	2257
1397		- void ToggleOeilOnce()
	2258	+ public void ToggleOeilOnce()
1398	2259	{
1399	2260	OEILONCE ^= true;
	2261	+ }
	2262	+
	2263	+ void ToggleFootContact()
	2264	+ {
	2265	+ FOOTCONTACT ^= true;
	2266	+ }
	2267	+
	2268	+ void ToggleDebug()
	2269	+ {
	2270	+ DEBUG ^= true;
1400	2271	}
1401	2272
1402	2273	void ToggleLookAt()
..	..	@@ -1404,9 +2275,9 @@
1404	2275	LOOKAT ^= true;
1405	2276	}
1406	2277
1407		- void ToggleRandom()
	2278	+ void ToggleSwitch()
1408	2279	{
1409		- RANDOM ^= true;
	2280	+ SWITCH ^= true;
1410	2281	}
1411	2282
1412	2283	void ToggleHandles()
..	..	@@ -1513,7 +2384,7 @@
1513	2384	{
1514	2385	return currentGL;
1515	2386	}
1516		-
	2387	+
1517	2388	/**/
1518	2389	class CacheTexture
1519	2390	{
..	..	@@ -3345,6 +4216,7 @@
3345	4216
3346	4217	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
3347	4218	{
	4219	+ new Exception().printStackTrace();
3348	4220	System.exit(0);
3349	4221	com.sun.opengl.util.texture.Texture texture = null;
3350	4222
..	..	@@ -7057,6 +7929,64 @@
7057	7929	ReleaseTexture(pigment, false);
7058	7930	}
7059	7931
	7932	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	7933	+ {
	7934	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7935	+ {
	7936	+ return;
	7937	+ }
	7938	+
	7939	+ if (tex == null)
	7940	+ {
	7941	+ ReleaseTexture(null, false);
	7942	+ return;
	7943	+ }
	7944	+
	7945	+ String pigment = Object3D.GetPigment(tex);
	7946	+
	7947	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7948	+ {
	7949	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7950	+ // System.out.println("; bump = " + bump);
	7951	+ }
	7952	+
	7953	+ if (pigment.equals(""))
	7954	+ {
	7955	+ pigment = null;
	7956	+ }
	7957	+
	7958	+ ReleaseTexture(pigment, false);
	7959	+ }
	7960	+
	7961	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	7962	+ {
	7963	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7964	+ {
	7965	+ return;
	7966	+ }
	7967	+
	7968	+ if (tex == null)
	7969	+ {
	7970	+ ReleaseTexture(null, true);
	7971	+ return;
	7972	+ }
	7973	+
	7974	+ String bump = Object3D.GetBump(tex);
	7975	+
	7976	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7977	+ {
	7978	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7979	+ // System.out.println("; bump = " + bump);
	7980	+ }
	7981	+
	7982	+ if (bump.equals(""))
	7983	+ {
	7984	+ bump = null;
	7985	+ }
	7986	+
	7987	+ ReleaseTexture(bump, true);
	7988	+ }
	7989	+
7060	7990	void ReleaseTexture(String tex, boolean bump)
7061	7991	{
7062	7992	if (// DrawMode() != 0 \|\| /tex == null \|\|/
..	..	@@ -7160,7 +8090,7 @@
7160	8090	}
7161	8091	}
7162	8092
7163		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8093	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
7164	8094	{
7165	8095	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7166	8096	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7205,7 +8135,94 @@
7205	8135	return; // true;
7206	8136	}
7207	8137
7208		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8138	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8139	+ {
	8140	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8141	+ ambientOcclusion ) // \|\| !textureon)
	8142	+ {
	8143	+ return; // false;
	8144	+ }
	8145	+
	8146	+ if (tex == null)
	8147	+ {
	8148	+ BindTexture(null,false,resolution);
	8149	+ return;
	8150	+ }
	8151	+
	8152	+ String pigment = Object3D.GetPigment(tex);
	8153	+
	8154	+ usedtextures.put(pigment, pigment);
	8155	+
	8156	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8157	+ {
	8158	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8159	+ // System.out.println("; bump = " + bump);
	8160	+ }
	8161	+
	8162	+ if (pigment.equals(""))
	8163	+ {
	8164	+ pigment = null;
	8165	+ }
	8166	+
	8167	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8168	+ BindTexture(pigment, false, resolution);
	8169	+ }
	8170	+
	8171	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8172	+ {
	8173	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8174	+ ambientOcclusion ) // \|\| !textureon)
	8175	+ {
	8176	+ return; // false;
	8177	+ }
	8178	+
	8179	+ if (tex == null)
	8180	+ {
	8181	+ BindTexture(null,true,resolution);
	8182	+ return;
	8183	+ }
	8184	+
	8185	+ String bump = Object3D.GetBump(tex);
	8186	+
	8187	+ usedtextures.put(bump, bump);
	8188	+
	8189	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8190	+ {
	8191	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8192	+ // System.out.println("; bump = " + bump);
	8193	+ }
	8194	+
	8195	+ if (bump.equals(""))
	8196	+ {
	8197	+ bump = null;
	8198	+ }
	8199	+
	8200	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8201	+ BindTexture(bump, true, resolution);
	8202	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8203	+ }
	8204	+
	8205	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8206	+
	8207	+ private boolean FileExists(String tex)
	8208	+ {
	8209	+ if (missingTextures.contains(tex))
	8210	+ {
	8211	+ return false;
	8212	+ }
	8213	+
	8214	+ boolean fileExists = new File(tex).exists();
	8215	+
	8216	+ if (!fileExists)
	8217	+ {
	8218	+ // If file exists, the "new File()" is not executed sgain
	8219	+ missingTextures.add(tex);
	8220	+ }
	8221	+
	8222	+ return fileExists;
	8223	+ }
	8224	+
	8225	+ CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
7209	8226	{
7210	8227	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7211	8228
..	..	@@ -7213,12 +8230,18 @@
7213	8230	{
7214	8231	String texname = tex;
7215	8232
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;
	8233	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8234	+
	8235	+// String[] split = tex.split("Textures");
	8236	+// if (split.length > 1)
	8237	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8238	+// else
	8239	+// if (!texname.startsWith("/"))
	8240	+// texname = "/Users/nbriere/Textures/" + texname;
	8241	+ if (!FileExists(tex))
	8242	+ {
	8243	+ texname = fallbackTextureName;
	8244	+ }
7222	8245
7223	8246	if (CACHETEXTURE)
7224	8247	texture = textures.get(texname); // TEXTURE CACHE
..	..	@@ -7287,7 +8310,7 @@
7287	8310	}
7288	8311
7289	8312	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
7290		- if (!new File(cachename).exists())
	8313	+ if (!FileExists(cachename))
7291	8314	cachename = texname;
7292	8315	else
7293	8316	processbump = false; // don't process bump map again
..	..	@@ -7309,7 +8332,7 @@
7309	8332	}
7310	8333
7311	8334	cachename = texname.substring(0, texname.length()-4)+ext+".png";
7312		- if (!new File(cachename).exists())
	8335	+ if (!FileExists(cachename))
7313	8336	cachename = texname;
7314	8337	else
7315	8338	processbump = false; // don't process bump map again
..	..	@@ -7318,7 +8341,9 @@
7318	8341	texturedata = GetFileTexture(cachename, processbump, resolution);
7319	8342
7320	8343
7321		- if (texturedata != null)
	8344	+ if (texturedata == null)
	8345	+ throw new Exception();
	8346	+
7322	8347	texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
7323	8348	//texture = GetTexture(tex, bump);
7324	8349	}
..	..	@@ -7440,7 +8465,7 @@
7440	8465	return texture;
7441	8466	}
7442	8467
7443		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8468	+ com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
7444	8469	{
7445	8470	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7446	8471
..	..	@@ -7458,14 +8483,14 @@
7458	8483	return texture!=null?texture.texture:null;
7459	8484	}
7460	8485
7461		- com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8486	+ public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
7462	8487	{
7463	8488	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7464	8489
7465	8490	return texture!=null?texture.texturedata:null;
7466	8491	}
7467	8492
7468		- boolean BindTexture(String tex, boolean bump, int resolution)
	8493	+ boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
7469	8494	{
7470	8495	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
7471	8496	{
..	..	@@ -8442,8 +9467,8 @@
8442	9467	assert (parentcam != renderCamera);
8443	9468
8444	9469	if (renderCamera != lightCamera)
8445		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8446		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9470	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9471	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
8447	9472
8448	9473	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
8449	9474
..	..	@@ -8458,8 +9483,8 @@
8458	9483	LA.matCopy(renderCamera.fromScreen, matrix);
8459	9484
8460	9485	if (renderCamera != lightCamera)
8461		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8462		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9486	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9487	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
8463	9488
8464	9489	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
8465	9490
..	..	@@ -8531,7 +9556,7 @@
8531	9556	//gl.glFlush();
8532	9557	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
8533	9558
8534		- if (ANIMATION && ABORTED)
	9559	+ if (Globals.ANIMATION && ABORTED)
8535	9560	{
8536	9561	System.err.println(" ABORTED FRAME");
8537	9562	break;
..	..	@@ -8561,7 +9586,7 @@
8561	9586	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
8562	9587
8563	9588	// save image
8564		- if (ANIMATION && !ABORTED)
	9589	+ if (Globals.ANIMATION && !ABORTED)
8565	9590	{
8566	9591	VPwidth = viewport[2];
8567	9592	VPheight = viewport[3];
..	..	@@ -8672,11 +9697,11 @@
8672	9697
8673	9698	// imagecount++;
8674	9699
8675		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9700	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
8676	9701
8677	9702	if (!BOXMODE)
8678	9703	{
8679		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9704	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
8680	9705	}
8681	9706
8682	9707	if (!BOXMODE)
..	..	@@ -8714,7 +9739,7 @@
8714	9739	ABORTED = false;
8715	9740	}
8716	9741	else
8717		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9742	+ Grafreed.wav.cursor += 735 * ACSIZE;
8718	9743
8719	9744	if (false)
8720	9745	{
..	..	@@ -9377,11 +10402,11 @@
9377	10402
9378	10403	public void display(GLAutoDrawable drawable)
9379	10404	{
9380		- if (GrafreeD.savesound && GrafreeD.hassound)
	10405	+ if (Grafreed.savesound && Grafreed.hassound)
9381	10406	{
9382		- GrafreeD.wav.save();
9383		- GrafreeD.savesound = false;
9384		- GrafreeD.hassound = false;
	10407	+ Grafreed.wav.save();
	10408	+ Grafreed.savesound = false;
	10409	+ Grafreed.hassound = false;
9385	10410	}
9386	10411	// if (DEBUG_SELECTION)
9387	10412	// {
..	..	@@ -9511,7 +10536,7 @@
9511	10536	Object3D theobject = object;
9512	10537	Object3D theparent = object.parent;
9513	10538	object.parent = null;
9514		- object = (Object3D)GrafreeD.clone(object);
	10539	+ object = (Object3D)Grafreed.clone(object);
9515	10540	object.Stripify();
9516	10541	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
9517	10542	theobject.PreprocessOcclusion(this);
..	..	@@ -9524,13 +10549,13 @@
9524	10549	ambientOcclusion = false;
9525	10550	}
9526	10551
9527		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10552	+ if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
9528	10553	{
9529	10554	//if (RENDERSHADOW) // ?
9530	10555	if (!IsFrozen())
9531	10556	{
9532	10557	// dec 2012
9533		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10558	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
9534	10559	{
9535	10560	Globals.framecount++;
9536	10561	shadowbuffer.display();
..	..	@@ -9657,8 +10682,8 @@
9657	10682
9658	10683	// if (parentcam != renderCamera) // not a light
9659	10684	if (cam != lightCamera)
9660		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9661		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10685	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10686	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9662	10687
9663	10688	for (int j = 0; j < 4; j++)
9664	10689	{
..	..	@@ -9672,8 +10697,8 @@
9672	10697
9673	10698	// if (parentcam != renderCamera) // not a light
9674	10699	if (cam != lightCamera)
9675		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9676		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10700	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10701	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9677	10702
9678	10703	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
9679	10704
..	..	@@ -9932,7 +10957,16 @@
9932	10957	// Bump noise
9933	10958	gl.glActiveTexture(GL.GL_TEXTURE6);
9934	10959	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
9935		- BindTexture(NOISE_TEXTURE, false, 2);
	10960	+
	10961	+ try
	10962	+ {
	10963	+ BindTexture(NOISE_TEXTURE, false, 2);
	10964	+ }
	10965	+ catch (Exception e)
	10966	+ {
	10967	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	10968	+ }
	10969	+
9936	10970
9937	10971	gl.glActiveTexture(GL.GL_TEXTURE0);
9938	10972	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10057,8 +11091,8 @@
10057	11091	System.err.println("parentcam != renderCamera");
10058	11092
10059	11093	// if (cam != lightCamera)
10060		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10061		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11094	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11095	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10062	11096	}
10063	11097
10064	11098	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10079,8 +11113,8 @@
10079	11113	if (true) // TODO
10080	11114	{
10081	11115	if (cam != lightCamera)
10082		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10083		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11116	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11117	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10084	11118	}
10085	11119
10086	11120	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -10146,7 +11180,7 @@
10146	11180	fragmentMode \|= (lightslot - 64) << 2; // 1; // first bit is available for aniso
10147	11181	//System.out.println("fragmentMode = " + fragmentMode);
10148	11182
10149		- if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| DEBUG_SELECTION)
	11183	+ if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| IsDebugSelection())
10150	11184	{
10151	11185	/*
10152	11186	if (CULLFACE \|\| (ambientOcclusion && OCCLUSION_CULLING))
..	..	@@ -10396,8 +11430,14 @@
10396	11430	{
10397	11431	renderpass++;
10398	11432	// System.out.println("Draw object... ");
	11433	+ STEP = 1;
10399	11434	if (FAST) // in case there is no script
10400		- STEP = 16;
	11435	+ STEP = 8;
	11436	+
	11437	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11438	+ {
	11439	+ STEP *= 4;
	11440	+ }
10401	11441
10402	11442	//object.FullInvariants();
10403	11443
..	..	@@ -10411,8 +11451,8 @@
10411	11451	e.printStackTrace();
10412	11452	}
10413	11453
10414		- if (GrafreeD.RENDERME > 0)
10415		- GrafreeD.RENDERME--; // mechante magouille
	11454	+ if (Grafreed.RENDERME > 0)
	11455	+ Grafreed.RENDERME--; // mechante magouille
10416	11456
10417	11457	Globals.ONESTEP = false;
10418	11458	}
..	..	@@ -10447,7 +11487,7 @@
10447	11487	callist = gl.glGenLists(1);
10448	11488	}
10449	11489
10450		- boolean selectmode = DrawMode() == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	11490	+ boolean selectmode = DrawMode() == SELECTION \|\| IsDebugSelection();
10451	11491
10452	11492	boolean active = !selectmode; // DrawMode() != SELECTION; // mouseDown;
10453	11493
..	..	@@ -10482,7 +11522,14 @@
10482	11522
10483	11523	usedtextures.clear();
10484	11524
10485		- BindTextures(DEFAULT_TEXTURES, 2);
	11525	+ try
	11526	+ {
	11527	+ BindTextures(DEFAULT_TEXTURES, 2);
	11528	+ }
	11529	+ catch (Exception e)
	11530	+ {
	11531	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11532	+ }
10486	11533	}
10487	11534	//System.out.println("--> " + stackdepth);
10488	11535	// GrafreeD.traceon();
..	..	@@ -10573,7 +11620,14 @@
10573	11620	if (checker != null && DrawMode() == DEFAULT)
10574	11621	{
10575	11622	//BindTexture(IMMORTAL_TEXTURE);
10576		- BindTextures(checker.GetTextures(), checker.texres);
	11623	+ try
	11624	+ {
	11625	+ BindTextures(checker.GetTextures(), checker.texres);
	11626	+ }
	11627	+ catch (Exception e)
	11628	+ {
	11629	+ System.err.println("FAILED: " + checker.GetTextures());
	11630	+ }
10577	11631	// NEAREST
10578	11632	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
10579	11633	DrawChecker(gl);
..	..	@@ -10655,7 +11709,7 @@
10655	11709	return;
10656	11710	}
10657	11711
10658		- String string = obj.GetToolTip();
	11712	+ String string = obj.toString(); //.GetToolTip();
10659	11713
10660	11714	GL gl = GetGL();
10661	11715
..	..	@@ -10972,8 +12026,8 @@
10972	12026	//obj.TransformToWorld(light, light);
10973	12027	for (int i = tp.size(); --i >= 0;)
10974	12028	{
10975		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
10976		- LA.xformPos(light, tp.get(i).toParent, light);
	12029	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12030	+ LA.xformPos(light, tp.get(i).GlobalTransform(), light);
10977	12031	}
10978	12032
10979	12033
..	..	@@ -10990,8 +12044,8 @@
10990	12044	parentcam = cameras[0];
10991	12045	}
10992	12046
10993		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10994		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12047	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12048	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
10995	12049
10996	12050	LA.xformPos(light, renderCamera.toScreen, light);
10997	12051
..	..	@@ -11605,8 +12659,8 @@
11605	12659
11606	12660	// display shadow only (bump == 0)
11607	12661	"SUB temp.x, half.x, shadow.x;" +
11608		- "MOV temp.y, -params6.x;" +
11609		- "SLT temp.z, temp.y, zero.x;" +
	12662	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12663	+ "SLT temp.z, temp.y, -one2048th.x;" +
11610	12664	"SUB temp.y, one.x, temp.z;" +
11611	12665	"MUL temp.x, temp.x, temp.y;" +
11612	12666	"KIL temp.x;" +
..	..	@@ -11735,8 +12789,10 @@
11735	12789	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
11736	12790
11737	12791	"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
	12792	+ // Tuning for default skin
	12793	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12794	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12795	+ "ADD temp.y, one.y, options2.y;" + // subsurface
11740	12796	"MUL temp.x, temp.x, temp.y;" +
11741	12797
11742	12798	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -11935,7 +12991,7 @@
11935	12991	//once = true;
11936	12992	}
11937	12993
11938		- System.out.print("Program #" + mode + "; length = " + program.length());
	12994	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
11939	12995	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
11940	12996	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
11941	12997
..	..	@@ -12068,12 +13124,16 @@
12068	13124
12069	13125	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12070	13126	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13127	+
	13128	+ // Compare fragment depth in light space with shadowmap.
12071	13129	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12072	13130	"SGE temp.y, temp.x, zero.x;" +
12073		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13131	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13132	+
	13133	+ // Reverse comparison
12074	13134	"SUB temp.x, one.x, temp.x;" +
12075	13135	"MUL " + shadow + ".x, temp.x, temp.y;" +
12076		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13136	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12077	13137	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12078	13138
12079	13139	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12087,6 +13147,10 @@
12087	13147	// No shadow for backface
12088	13148	"DP3 temp.x, normal, lightd;" +
12089	13149	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13150	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13151	+
	13152	+ // No shadow when out of frustrum
	13153	+ "SGE temp.x, " + depth + ".z, one.z;" +
12090	13154	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12091	13155	"";
12092	13156	}
..	..	@@ -12645,7 +13709,7 @@
12645	13709	public void mousePressed(MouseEvent e)
12646	13710	{
12647	13711	//System.out.println("mousePressed: " + e);
12648		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13712	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
12649	13713	}
12650	13714
12651	13715	static long prevtime = 0;
..	..	@@ -12672,6 +13736,7 @@
12672	13736
12673	13737	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
12674	13738
	13739	+ if (BUTTONLESSWHEEL)
12675	13740	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
12676	13741	{
12677	13742	return;
..	..	@@ -12680,7 +13745,7 @@
12680	13745	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
12681	13746
12682	13747	// TIMER
12683		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	13748	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
12684	13749	{
12685	13750	keepboxmode = BOXMODE;
12686	13751	keepsupport = SUPPORT;
..	..	@@ -12720,8 +13785,8 @@
12720	13785	// mode \|= META;
12721	13786	//}
12722	13787
12723		- SetMouseMode(WHEEL \| e.getModifiersEx());
12724		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13788	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13789	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
12725	13790	anchorX = ax;
12726	13791	anchorY = ay;
12727	13792	prevX = px;
..	..	@@ -12781,6 +13846,10 @@
12781	13846	// wasliveok = true;
12782	13847	// waslive = false;
12783	13848
	13849	+ // May 2019 Forget it:
	13850	+ if (true)
	13851	+ return;
	13852	+
12784	13853	// source == timer
12785	13854	if (mouseDown)
12786	13855	{
..	..	@@ -12819,7 +13888,7 @@
12819	13888
12820	13889	javax.swing.Timer timer = new javax.swing.Timer(350, this);
12821	13890
12822		- void clickStart(int x, int y, int modifiers)
	13891	+ void clickStart(int x, int y, int modifiers, int modifiersex)
12823	13892	{
12824	13893	if (!wasliveok)
12825	13894	return;
..	..	@@ -12836,7 +13905,7 @@
12836	13905	// touched = true; // main DL
12837	13906	if (isRenderer)
12838	13907	{
12839		- SetMouseMode(modifiers);
	13908	+ SetMouseMode(modifiers, modifiersex);
12840	13909	}
12841	13910
12842	13911	selectX = anchorX = x;
..	..	@@ -12849,7 +13918,7 @@
12849	13918	clicked = true;
12850	13919	hold = false;
12851	13920
12852		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	13921	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
12853	13922	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
12854	13923	{
12855	13924	// System.out.println("RESTART II " + modifiers);
..	..	@@ -12880,7 +13949,7 @@
12880	13949	info.camera = renderCamera;
12881	13950	info.x = x;
12882	13951	info.y = y;
12883		- info.modifiers = modifiers;
	13952	+ info.modifiers = modifiersex;
12884	13953	editObj = object.doEditClick(info, 0);
12885	13954	if (!editObj)
12886	13955	{
..	..	@@ -12897,11 +13966,14 @@
12897	13966
12898	13967	public void mouseDragged(MouseEvent e)
12899	13968	{
	13969	+ Globals.MOUSEDRAGGED = true;
	13970	+
	13971	+ //System.out.println("mouseDragged: " + e);
12900	13972	if (isRenderer)
12901	13973	movingcamera = true;
	13974	+
12902	13975	//if (drawing)
12903	13976	//return;
12904		- //System.out.println("mouseDragged: " + e);
12905	13977	if ((e.getModifiersEx() & CTRL) != 0
12906	13978	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
12907	13979	{
..	..	@@ -12909,7 +13981,7 @@
12909	13981	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12910	13982	}
12911	13983	else
12912		- drag(e.getX(), e.getY(), e.getModifiersEx());
	13984	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
12913	13985
12914	13986	//try { Thread.sleep(1); } catch (Exception ex) {}
12915	13987	}
..	..	@@ -12921,6 +13993,11 @@
12921	13993	cVector tmp = new cVector();
12922	13994	cVector tmp2 = new cVector();
12923	13995	boolean isMoving;
	13996	+
	13997	+ public cVector TargetLookAt()
	13998	+ {
	13999	+ return targetLookAt;
	14000	+ }
12924	14001
12925	14002	class PingThread extends Thread
12926	14003	{
..	..	@@ -13077,6 +14154,7 @@
13077	14154
13078	14155	public void run()
13079	14156	{
	14157	+ new Exception().printStackTrace();
13080	14158	System.exit(0);
13081	14159	for (;;)
13082	14160	{
..	..	@@ -13140,7 +14218,7 @@
13140	14218	{
13141	14219	Globals.lighttouched = true;
13142	14220	}
13143		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14221	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
13144	14222	}
13145	14223	//else
13146	14224	}
..	..	@@ -13240,7 +14318,7 @@
13240	14318	int X, Y;
13241	14319	boolean SX, SY;
13242	14320
13243		- void drag(int x, int y, int modifiers)
	14321	+ void drag(int x, int y, int modifiers, int modifiersex)
13244	14322	{
13245	14323	if (IsFrozen())
13246	14324	{
..	..	@@ -13249,17 +14327,17 @@
13249	14327
13250	14328	drag = true; // NEW
13251	14329
13252		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14330	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
13253	14331
13254	14332	X = x;
13255	14333	Y = y;
13256	14334	// floating state for animation
13257		- MODIFIERS = modifiers;
13258		- modifiers &= ~1024;
	14335	+ MODIFIERS = modifiersex;
	14336	+ modifiersex &= ~1024;
13259	14337	if (false) // modifiers != 0)
13260	14338	{
13261	14339	//new Exception().printStackTrace();
13262		- System.out.println("mouseDragged: " + modifiers);
	14340	+ System.out.println("mouseDragged: " + modifiersex);
13263	14341	System.out.println("SHIFT = " + SHIFT);
13264	14342	System.out.println("CONTROL = " + COMMAND);
13265	14343	System.out.println("META = " + META);
..	..	@@ -13279,7 +14357,7 @@
13279	14357	info.camera = renderCamera;
13280	14358	info.x = x;
13281	14359	info.y = y;
13282		- object.editWindow.copy.doEditDrag(info);
	14360	+ object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
13283	14361	} else
13284	14362	{
13285	14363	if (x < startX)
..	..	@@ -13431,7 +14509,6 @@
13431	14509	public void mouseMoved(MouseEvent e)
13432	14510	{
13433	14511	//System.out.println("mouseMoved: " + e);
13434		-
13435	14512	if (isRenderer)
13436	14513	return;
13437	14514
..	..	@@ -13456,7 +14533,10 @@
13456	14533
13457	14534	public void mouseReleased(MouseEvent e)
13458	14535	{
	14536	+ Globals.MOUSEDRAGGED = false;
	14537	+
13459	14538	movingcamera = false;
	14539	+ X = Y = 0;
13460	14540	//System.out.println("mouseReleased: " + e);
13461	14541	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13462	14542	}
..	..	@@ -13479,9 +14559,9 @@
13479	14559	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
13480	14560	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
13481	14561
13482		- if (control \|\| command \|\| IsFrozen())
	14562	+// No delay if (control \|\| command \|\| IsFrozen())
13483	14563	timeout = true;
13484		- else
	14564	+// ?? May 2019 else
13485	14565	// timer.setDelay((modifiers & 128) != 0?0:350);
13486	14566	mouseDown = false;
13487	14567	if (!control && !command) // june 2013
..	..	@@ -13591,7 +14671,7 @@
13591	14671	System.out.println("keyReleased: " + e);
13592	14672	}
13593	14673
13594		- void SetMouseMode(int modifiers)
	14674	+ void SetMouseMode(int modifiers, int modifiersex)
13595	14675	{
13596	14676	//System.out.println("SetMouseMode = " + modifiers);
13597	14677	//modifiers &= ~1024;
..	..	@@ -13603,25 +14683,25 @@
13603	14683	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
13604	14684	// return;
13605	14685	//System.out.println("SetMode = " + modifiers);
13606		- if ((modifiers & WHEEL) == WHEEL)
	14686	+ if ((modifiersex & WHEEL) == WHEEL)
13607	14687	{
13608	14688	mouseMode \|= ZOOM;
13609	14689	}
13610	14690
13611	14691	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13612		- if (capsLocked \|\| (modifiers & META) == META)
	14692	+ if (capsLocked) // \|\| (modifiers & META) == META)
13613	14693	{
13614	14694	mouseMode \|= VR; // BACKFORTH;
13615	14695	}
13616		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14696	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
13617	14697	{
13618	14698	mouseMode \|= SELECT;
13619	14699	}
13620		- if ((modifiers & COMMAND) == COMMAND)
	14700	+ if ((modifiersex & COMMAND) == COMMAND)
13621	14701	{
13622	14702	mouseMode \|= SELECT;
13623	14703	}
13624		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14704	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
13625	14705	{
13626	14706	mouseMode &= ~VR;
13627	14707	mouseMode \|= TRANSLATE;
..	..	@@ -13650,10 +14730,10 @@
13650	14730
13651	14731	if (isRenderer) //
13652	14732	{
13653		- SetMouseMode(modifiers);
	14733	+ SetMouseMode(0, modifiers);
13654	14734	}
13655	14735
13656		- theRenderer.keyPressed(key);
	14736	+ Globals.theRenderer.keyPressed(key);
13657	14737	}
13658	14738
13659	14739	int kompactbit = 4; // power bit
..	..	@@ -13665,7 +14745,7 @@
13665	14745	float SATPOW = 1; // 2; // 0.5f;
13666	14746	float BRIPOW = 1; // 0.5f; // 0.5f;
13667	14747
13668		- void keyPressed(int key)
	14748	+ public void keyPressed(int key)
13669	14749	{
13670	14750	if (key >= '0' && key <= '5')
13671	14751	clampbit = (key-'0');
..	..	@@ -13986,7 +15066,7 @@
13986	15066	//RESIZETEXTURE ^= true;
13987	15067	//break;
13988	15068	case 'z':
13989		- RENDERSHADOW ^= true;
	15069	+ Globals.RENDERSHADOW ^= true;
13990	15070	Globals.lighttouched = true;
13991	15071	repaint();
13992	15072	break;
..	..	@@ -14102,6 +15182,7 @@
14102	15182	}
14103	15183	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
14104	15184	}
	15185	+
14105	15186	static double OCCLUSIONBOOST = 1; // 0.5;
14106	15187
14107	15188	void keyReleased(int key, int modifiers)
..	..	@@ -14109,11 +15190,11 @@
14109	15190	//mode = ROTATE;
14110	15191	if ((MODIFIERS & COMMAND) == 0) // VR??
14111	15192	{
14112		- SetMouseMode(modifiers);
	15193	+ SetMouseMode(0, modifiers);
14113	15194	}
14114	15195	}
14115	15196
14116		- protected void processKeyEvent(KeyEvent e)
	15197	+ public void processKeyEvent(KeyEvent e)
14117	15198	{
14118	15199	switch (e.getID())
14119	15200	{
..	..	@@ -14243,8 +15324,9 @@
14243	15324
14244	15325	protected void processMouseMotionEvent(MouseEvent e)
14245	15326	{
14246		- //System.out.println("processMouseMotionEvent: " + mouseMode);
14247		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15327	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15328	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15329	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
14248	15330	{
14249	15331	mouseMoved(e);
14250	15332	} else
..	..	@@ -14274,6 +15356,7 @@
14274	15356
14275	15357	void SelectParent()
14276	15358	{
	15359	+ new Exception().printStackTrace();
14277	15360	System.exit(0);
14278	15361	Composite group = (Composite) object;
14279	15362	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -14297,6 +15380,7 @@
14297	15380
14298	15381	void SelectChildren()
14299	15382	{
	15383	+ new Exception().printStackTrace();
14300	15384	System.exit(0);
14301	15385	/*
14302	15386	Composite group = (Composite) object;
..	..	@@ -14461,7 +15545,9 @@
14461	15545	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
14462	15546	//Image img = CreateImage(width, height);
14463	15547	//System.out.println("width = " + width + "; height = " + height + "\n");
	15548	+
14464	15549	Graphics gr = g; // img.getGraphics();
	15550	+
14465	15551	if (!hasMarquee)
14466	15552	{
14467	15553	if (Xmin < Xmax) // !locked)
..	..	@@ -14559,14 +15645,33 @@
14559	15645	if (!isRenderer)
14560	15646	{
14561	15647	object.drawEditHandles(info, 0);
	15648	+
	15649	+ if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	15650	+ {
	15651	+ switch (object.selection.get(0).hitSomething)
	15652	+ {
	15653	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15654	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15655	+ break;
	15656	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15657	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15658	+ break;
	15659	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15660	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15661	+ break;
	15662	+ }
	15663	+
	15664	+ }
14562	15665	}
14563	15666	}
	15667	+
14564	15668	if (isRenderer)
14565	15669	{
14566	15670	//gr.setColor(Color.black);
14567	15671	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
14568	15672	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
14569	15673	}
	15674	+
14570	15675	if (hasMarquee)
14571	15676	{
14572	15677	gr.setXORMode(Color.white);
..	..	@@ -14679,6 +15784,7 @@
14679	15784	public boolean mouseDown(Event evt, int x, int y)
14680	15785	{
14681	15786	System.out.println("mouseDown: " + evt);
	15787	+ System.exit(0);
14682	15788	/*
14683	15789	locked = true;
14684	15790	drag = false;
..	..	@@ -14722,7 +15828,7 @@
14722	15828	{
14723	15829	keyPressed(0, modifiers);
14724	15830	}
14725		- clickStart(x, y, modifiers);
	15831	+ // clickStart(x, y, modifiers);
14726	15832	return true;
14727	15833	}
14728	15834
..	..	@@ -14840,7 +15946,7 @@
14840	15946	{
14841	15947	keyReleased(0, 0);
14842	15948	}
14843		- drag(x, y, modifiers);
	15949	+ drag(x, y, 0, modifiers);
14844	15950	return true;
14845	15951	}
14846	15952
..	..	@@ -14972,7 +16078,7 @@
14972	16078	Object3D object;
14973	16079	static Object3D trackedobject;
14974	16080	Camera renderCamera; // Light or Eye (or Occlusion)
14975		- /static/ Camera manipCamera; // Light or Eye
	16081	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
14976	16082	/static/ Camera eyeCamera;
14977	16083	/static/ Camera lightCamera;
14978	16084	int cameracount;
..	..	@@ -15410,6 +16516,7 @@
15410	16516	{
15411	16517	if (!selection)
15412	16518	{
	16519	+ new Exception().printStackTrace();
15413	16520	System.exit(0);
15414	16521	return;
15415	16522	}
..	..	@@ -15537,16 +16644,16 @@
15537	16644	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	16645	}
15539	16646
15540		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16647	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
15541	16648	}
15542	16649	}
15543	16650
15544	16651	if (!movingcamera && !PAINTMODE)
15545	16652	object.editWindow.ScreenFitPoint(); // fev 2014
15546	16653
15547		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16654	+ if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
15548	16655	{
15549		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16656	+ Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
15550	16657
15551	16658	Object3D group = new Object3D("inst" + paintcount++);
15552	16659
..	..	@@ -15702,7 +16809,7 @@
15702	16809	gl.glDisable(gl.GL_CULL_FACE);
15703	16810	}
15704	16811
15705		- if (!RENDERSHADOW)
	16812	+ if (!Globals.RENDERSHADOW)
15706	16813	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
15707	16814
15708	16815	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -15712,7 +16819,7 @@
15712	16819	//gl.glColorMask(false, false, false, false);
15713	16820
15714	16821	//render_scene_from_light_view(gl, drawable, 0, 0);
15715		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	16822	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
15716	16823	{
15717	16824	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
15718	16825
..	..	@@ -15772,7 +16879,6 @@
15772	16879
15773	16880	class AntialiasBuffer implements GLEventListener
15774	16881	{
15775		-
15776	16882	CameraPane parent = null;
15777	16883
15778	16884	AntialiasBuffer(CameraPane p)
..	..	@@ -16165,7 +17271,7 @@
16165	17271	}
16166	17272	}
16167	17273
16168		- static void DrawPoints(CameraPane cpane)
	17274	+ static void DrawPoints(iCameraPane cpane)
16169	17275	{
16170	17276	for (int i=0; i<8; i++) // first and last are red
16171	17277	{
..	..	@@ -16197,10 +17303,11 @@
16197	17303	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
16198	17304	// Depth buffer format
16199	17305	//private int depth_format;
16200		- static public void NextIndex(Object3D o, GL gl)
	17306	+
	17307	+ public void NextIndex()
16201	17308	{
16202	17309	indexcount+=16;
16203		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17310	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
16204	17311	//objects[indexcount] = o;
16205	17312	//System.out.println("indexcount = " + indexcount);
16206	17313	}