~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -37,7 +37,6 @@
37	37	static boolean[] selectedstack = new boolean[65536];
38	38	static int materialdepth = 0;
39	39
40		- static boolean DEBUG = false;
41	40	static boolean FRUSTUM = false; // still bogus true; // frustum culling
42	41
43	42	// camera change fix
..	..	@@ -56,8 +55,6 @@
56	55	static int CURRENTANTIALIAS = 0; // 1;
57	56	/static/ boolean RENDERSHADOW = true;
58	57	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
59		- static boolean ANIMATION = false;
60		- static String filename;
61	58
62	59	boolean DISPLAYTEXT = false;
63	60	//boolean REDUCETEXTURE = true;
..	..	@@ -92,6 +89,8 @@
92	89
93	90	static int tickcount = 0; // slow pose issue
94	91
	92	+static boolean BUTTONLESSWHEEL = false;
	93	+static boolean ZOOMBOXMODE = false;
95	94	static boolean BOXMODE = false;
96	95	static boolean IMAGEFLIP = false;
97	96	static boolean SMOOTHFOCUS = false;
..	..	@@ -106,7 +105,7 @@
106	105	static boolean OEIL = true;
107	106	static boolean OEILONCE = false; // do oeilon then oeiloff
108	107	static boolean LOOKAT = true;
109		-static boolean RANDOM = true; // false;
	108	+static boolean SWITCH = true; // false;
110	109	static boolean HANDLES = false; // selection doesn't work!!
111	110	static boolean PAINTMODE = false;
112	111
..	..	@@ -149,12 +148,13 @@
149	148	defaultcaps.setAccumBlueBits(16);
150	149	defaultcaps.setAccumAlphaBits(16);
151	150	}
152		- static CameraPane theRenderer;
153		-
	151	+
	152	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	153	+
154	154	void SetAsGLRenderer(boolean b)
155	155	{
156	156	isRenderer = b;
157		- theRenderer = this;
	157	+ Globals.theRenderer = this;
158	158	}
159	159
160	160	CameraPane(Object3D o, Camera cam, boolean withcontext)
..	..	@@ -191,6 +191,45 @@
191	191	}
192	192
193	193	/// INTERFACE
	194	+
	195	+ public javax.media.opengl.GL GetGL0()
	196	+ {
	197	+ return null;
	198	+ }
	199	+
	200	+ public int GenList()
	201	+ {
	202	+ javax.media.opengl.GL gl = GetGL();
	203	+ return gl.glGenLists(1);
	204	+ }
	205	+
	206	+ public void NewList(int id)
	207	+ {
	208	+ javax.media.opengl.GL gl = GetGL();
	209	+ gl.glNewList(id, gl.GL_COMPILE); //_AND_EXECUTE);
	210	+ }
	211	+
	212	+ public void CallList(int id)
	213	+ {
	214	+ javax.media.opengl.GL gl = GetGL();
	215	+ gl.glCallList(id);
	216	+ }
	217	+
	218	+ public void EndList()
	219	+ {
	220	+ javax.media.opengl.GL gl = GetGL();
	221	+ gl.glEndList();
	222	+ }
	223	+
	224	+ public boolean IsBoxMode()
	225	+ {
	226	+ return BOXMODE;
	227	+ }
	228	+
	229	+ public boolean IsZoomBoxMode()
	230	+ {
	231	+ return ZOOMBOXMODE;
	232	+ }
194	233
195	234	public void ClearDepth()
196	235	{
..	..	@@ -231,9 +270,14 @@
231	270	return this.ambientOcclusion;
232	271	}
233	272
	273	+ public boolean IsDebugSelection()
	274	+ {
	275	+ return DEBUG_SELECTION;
	276	+ }
	277	+
234	278	public boolean IsFrozen()
235	279	{
236		- boolean selectmode = this.DrawMode() == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	280	+ boolean selectmode = this.DrawMode() == SELECTION \|\| this.IsDebugSelection();
237	281
238	282	return !selectmode && cameracount == 0; // != 0;
239	283	}
..	..	@@ -254,9 +298,19 @@
254	298	return lightCamera;
255	299	}
256	300
	301	+ public Camera ManipCamera()
	302	+ {
	303	+ return manipCamera;
	304	+ }
	305	+
257	306	public Camera RenderCamera()
258	307	{
259	308	return renderCamera;
	309	+ }
	310	+
	311	+ public Camera[] Cameras()
	312	+ {
	313	+ return cameras;
260	314	}
261	315
262	316	public void PushMaterial(Object3D obj, boolean selected)
..	..	@@ -272,7 +326,7 @@
272	326	cStatic.objectstack[materialdepth++] = obj;
273	327	//System.out.println("material " + material);
274	328	//Applet3D.tracein(this, selected);
275		- display.vector2buffer = obj.projectedVertices;
	329	+ //display.vector2buffer = obj.projectedVertices;
276	330	if (obj instanceof Camera)
277	331	{
278	332	display.options1[0] = material.shift;
..	..	@@ -304,7 +358,7 @@
304	358	/**/
305	359	} else
306	360	{
307		- DrawMaterial(material, selected);
	361	+ DrawMaterial(material, selected, obj.projectedVertices);
308	362	}
309	363	} else
310	364	{
..	..	@@ -328,8 +382,8 @@
328	382	cStatic.objectstack[materialdepth++] = obj;
329	383	//System.out.println("material " + material);
330	384	//Applet3D.tracein("selected ", selected);
331		- display.vector2buffer = obj.projectedVertices;
332		- display.DrawMaterial(material, selected);
	385	+ //display.vector2buffer = obj.projectedVertices;
	386	+ display.DrawMaterial(material, selected, obj.projectedVertices);
333	387	}
334	388	}
335	389
..	..	@@ -346,8 +400,8 @@
346	400	materialdepth -= 1;
347	401	if (materialdepth > 0)
348	402	{
349		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
350		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	403	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	404	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
351	405	}
352	406	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
353	407	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -367,8 +421,8 @@
367	421	materialdepth -= 1;
368	422	if (materialdepth > 0)
369	423	{
370		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
371		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	424	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	425	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
372	426	}
373	427	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
374	428	//else
..	..	@@ -403,16 +457,18 @@
403	457
404	458	javax.media.opengl.GL gl = display.GetGL();
405	459
406		- boolean selectmode = display.DrawMode() == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	460	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
407	461
408	462	//System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
409	463	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
410	464	{
411	465	//gl.glBegin(gl.GL_TRIANGLES);
412		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	466	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	467	+ // TEST LIVE NORMALS && !obj.dontselect
	468	+ ;
413	469	if (!hasnorm)
414	470	{
415		- // System.out.println("FUCK!!");
	471	+ // System.out.println("Mesh normal");
416	472	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
417	473	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
418	474	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -566,7 +622,816 @@
566	622	}
567	623	}
568	624
	625	+ /**
	626	+ * <code>draw</code> renders a <code>TriMesh</code> object including
	627	+ * it's normals, colors, textures and vertices.
	628	+ *
	629	+ * @see Renderer#draw(TriMesh)
	630	+ * @param tris
	631	+ * the mesh to render.
	632	+ */
	633	+ public void DrawParticles(TriMesh geo, Object3D shape, boolean selected, boolean rotate) // TriMesh tris)
	634	+ {
	635	+ CameraPane display = this;
	636	+
	637	+ float r = display.modelParams0[0];
	638	+ float g = display.modelParams0[1];
	639	+ float b = display.modelParams0[2];
	640	+ float opacity = display.modelParams5[1];
	641	+
	642	+ //final GL gl = GLU.getCurrentGL();
	643	+ GL gl = display.GetGL(); // getGL();
	644	+
	645	+ FloatBuffer vertBuf = geo.vertBuf;
	646	+
	647	+ int v = vertBuf.capacity();
	648	+
	649	+ int count = 0;
	650	+
	651	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	652	+ gl.glEnable(gl.GL_CULL_FACE);
	653	+ // gl.glScalef(1.0f/1024,1.0f/1024,1.0f/1024);
	654	+ for (int i=0; i<v/3; i++)
	655	+ {
	656	+ int index3 = i*3;
	657	+
	658	+ if (geo.sizeBuf.get(index3+1) == 0)
	659	+ continue;
	660	+
	661	+ count++;
	662	+
	663	+ int index4 = i*4;
	664	+
	665	+ float tx = vertBuf.get(index3);
	666	+ float ty = vertBuf.get(index3+1);
	667	+ float tz = vertBuf.get(index3+2);
	668	+
	669	+ // if (tx == 0 && ty == 0 && tz == 0)
	670	+ // continue;
	671	+
	672	+ gl.glMatrixMode(gl.GL_TEXTURE);
	673	+ gl.glPushMatrix();
	674	+
	675	+ float[] texmat = geo.texmat;
	676	+ texmat[12] = texmat[13] = texmat[14] = i;
	677	+
	678	+ gl.glMultMatrixf(texmat, 0);
	679	+
	680	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	681	+ gl.glPushMatrix();
	682	+
	683	+ gl.glTranslatef(tx,ty,tz);
	684	+
	685	+ if (rotate)
	686	+ gl.glRotatef(i, 0, 1, 0);
	687	+
	688	+ float size = geo.sizeBuf.get(index3) / 100;
	689	+ gl.glScalef(size,size,size);
	690	+
	691	+ float cr = geo.colorBuf.get(index4);
	692	+ float cg = geo.colorBuf.get(index4+1);
	693	+ float cb = geo.colorBuf.get(index4+2);
	694	+ float ca = geo.colorBuf.get(index4+3);
	695	+
	696	+ display.modelParams0[0] = r * cr;
	697	+ display.modelParams0[1] = g * cg;
	698	+ display.modelParams0[2] = b * cb;
	699	+
	700	+ display.modelParams5[1] = opacity * ca;
	701	+
	702	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	703	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	704	+
	705	+ RandomNode.globalseed = (int)geo.sizeBuf.get(index3+2); // i;
	706	+ RandomNode.globalseed2 = RandomNode.globalseed;
	707	+
	708	+// gl.glColor4f(cr,cg,cb,ca);
	709	+ // gl.glScalef(1024/16,1024/16,1024/16);
	710	+ shape.Draw/Node/(display,null,selected,false); // blocked
	711	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	712	+ //gl.glTranslatef(-tx,-ty,-tz);
	713	+ gl.glPopMatrix();
	714	+
	715	+ gl.glMatrixMode(gl.GL_TEXTURE);
	716	+ gl.glPopMatrix();
	717	+ }
	718	+ // gl.glScalef(1024,1024,1024);
	719	+ if (!cf)
	720	+ gl.glDisable(gl.GL_CULL_FACE);
	721	+
	722	+ display.modelParams0[0] = r;
	723	+ display.modelParams0[1] = g;
	724	+ display.modelParams0[2] = b;
	725	+
	726	+ display.modelParams5[1] = opacity;
	727	+
	728	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	729	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	730	+
	731	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	732	+
	733	+// System.err.println("total = " + v/3 + "; displayed = " + count);
	734	+ if (true)
	735	+ return;
	736	+
	737	+//// if (!tris.predraw(this))
	738	+//// {
	739	+//// return;
	740	+//// }
	741	+//// if (Debug.stats)
	742	+//// {
	743	+//// StatCollector.addStat(StatType.STAT_TRIANGLE_COUNT, tris.getTriangleCount());
	744	+//// StatCollector.addStat(StatType.STAT_VERTEX_COUNT, tris.getVertexCount());
	745	+//// StatCollector.addStat(StatType.STAT_GEOM_COUNT, 1);
	746	+//// }
	747	+////
	748	+//// if (tris.getDisplayListID() != -1)
	749	+//// {
	750	+//// renderDisplayList(tris);
	751	+//// return;
	752	+//// }
	753	+////
	754	+//// if (!generatingDisplayList)
	755	+//// {
	756	+//// applyStates(tris.states, tris);
	757	+//// }
	758	+//// if (Debug.stats)
	759	+//// {
	760	+//// StatCollector.startStat(StatType.STAT_RENDER_TIMER);
	761	+//// }
	762	+//// boolean transformed = doTransforms(tris);
	763	+//
	764	+// int glMode = GL.GL_TRIANGLES;
	765	+// switch (getMode())
	766	+// {
	767	+// case Triangles:
	768	+// glMode = GL.GL_TRIANGLES;
	769	+// break;
	770	+// case Strip:
	771	+// glMode = GL.GL_TRIANGLE_STRIP;
	772	+// break;
	773	+// case Fan:
	774	+// glMode = GL.GL_TRIANGLE_FAN;
	775	+// break;
	776	+// }
	777	+//
	778	+// if (!predrawGeometry(gl))
	779	+// {
	780	+// // make sure only the necessary indices are sent through on old
	781	+// // cards.
	782	+// IntBuffer indices = this.getIndexBuffer();
	783	+// if (indices == null)
	784	+// {
	785	+// logger.severe("missing indices on geometry object: " + this.toString());
	786	+// } else
	787	+// {
	788	+// indices.rewind();
	789	+// indices.limit(this.getMaxIndex());
	790	+//
	791	+// gl.glDrawElements(glMode, indices.limit(), GL.GL_UNSIGNED_INT, indices); // TODO Check <count> and assumed <type> of GL_UNSIGNED_INT
	792	+//
	793	+// indices.clear();
	794	+// }
	795	+// } else
	796	+// {
	797	+// gl.glDrawElements(glMode, this.getIndexBuffer().limit(),
	798	+// GL.GL_UNSIGNED_INT, 0);
	799	+// }
	800	+//
	801	+//// postdrawGeometry(tris);
	802	+//// if (transformed)
	803	+//// {
	804	+//// undoTransforms(tris);
	805	+//// }
	806	+////
	807	+//// if (Debug.stats)
	808	+//// {
	809	+//// StatCollector.endStat(StatType.STAT_RENDER_TIMER);
	810	+//// }
	811	+//// tris.postdraw(this);
	812	+ }
	813	+
	814	+ static Camera localcamera = new Camera();
	815	+ static cVector from = new cVector();
	816	+ static cVector to = new cVector();
	817	+
	818	+ public void PrepOcclusion(BoundaryRep br, double[][] transform)
	819	+ {
	820	+ CameraPane cp = this;
	821	+
	822	+ Camera keep = cp.RenderCamera();
	823	+ cp.renderCamera = localcamera;
	824	+
	825	+ if (br.trimmed)
	826	+ {
	827	+ float[] colors = new float[br.positions.length / 3];
	828	+
	829	+ int i3 = 0;
	830	+ for (int i = 0; i < br.positions.length / 3; i++, i3 += 3)
	831	+ {
	832	+ if (br.normals[i3] == 0 && br.normals[i3+1] == 0 && br.normals[i3+2] == 0)
	833	+ continue;
	834	+
	835	+ from.set(br.positions[i3], br.positions[i3 + 1], br.positions[i3 + 2]);
	836	+ to.set(br.positions[i3] + br.normals[i3],
	837	+ br.positions[i3 + 1] + br.normals[i3 + 1],
	838	+ br.positions[i3 + 2] + br.normals[i3 + 2]);
	839	+ LA.xformPos(from, transform, from);
	840	+ LA.xformPos(to, transform, to); // RIGID ONLY
	841	+ localcamera.setAim(from, to);
	842	+
	843	+ CameraPane.occlusionbuffer.display();
	844	+
	845	+ if (CameraPane.DEBUG_OCCLUSION)
	846	+ cp.display(); // debug
	847	+
	848	+ colors[i] = cp.vertexOcclusion.r;
	849	+ //colors[i3 + 1] = cp.vertexOcclusion.g;
	850	+ //colors[i3 + 2] = cp.vertexOcclusion.b;
	851	+
	852	+ if ((i % 100) == 0 && i != 0)
	853	+ {
	854	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	855	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	856	+ System.out.println((int) (100.0 * i / (br.positions.length / 3)) + "% (" + i + " of " + (br.positions.length / 3) + ")");
	857	+ }
	858	+ }
	859	+
	860	+ br.colors = colors;
	861	+ }
	862	+ else
	863	+ {
	864	+ for (int i = 0; i < br.VertexCount(); i++)
	865	+ {
	866	+ Vertex v = br.GetVertex(i);
	867	+
	868	+ if (v.norm == null \|\| v.norm.x == 0 && v.norm.y == 0 && v.norm.z == 0)
	869	+ continue;
	870	+
	871	+ from.set(v.x, v.y, v.z);
	872	+ to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
	873	+ LA.xformPos(from, transform, from);
	874	+ LA.xformPos(to, transform, to); // RIGID ONLY
	875	+ localcamera.setAim(from, to);
	876	+
	877	+ CameraPane.occlusionbuffer.display();
	878	+
	879	+ if (CameraPane.DEBUG_OCCLUSION)
	880	+ cp.display(); // debug
	881	+
	882	+ v.AO = cp.vertexOcclusion.r;
	883	+
	884	+ if ((i % 100) == 0 && i != 0)
	885	+ {
	886	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	887	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	888	+ System.out.println((int) (100.0 * i / br.VertexCount()) + "% (" + i + " of " + br.VertexCount() + ")");
	889	+ }
	890	+ }
	891	+ }
	892	+
	893	+ //System.out.println("done.");
	894	+
	895	+ cp.renderCamera = keep;
	896	+ }
	897	+
	898	+ void DrawPointFLow(PointFlow pointFlow, Object3D /Composite/ root, boolean selected, boolean blocked)
	899	+ {
	900	+ CameraPane display = this;
	901	+ pointFlow.CreateHT();
	902	+
	903	+ float r = display.modelParams0[0];
	904	+ float g = display.modelParams0[1];
	905	+ float b = display.modelParams0[2];
	906	+ float opacity = display.modelParams5[1];
	907	+
	908	+ //final GL gl = GLU.getCurrentGL();
	909	+ GL gl = display.GetGL(); // getGL();
	910	+
	911	+ int s = pointFlow.points.size();
	912	+
	913	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	914	+ gl.glEnable(gl.GL_CULL_FACE);
	915	+
	916	+ for (int i=s; --i>=0;)
	917	+ //for (int i=0; i<s; i++)
	918	+ {
	919	+ cVector v = pointFlow.points.get(i);
	920	+
	921	+ double mindist = Double.MAX_VALUE;
	922	+
	923	+ double size = pointFlow.minimumSize;
	924	+
	925	+ double distancenext = 0;
	926	+
	927	+ if (i > 0)
	928	+ {
	929	+ cVector w = pointFlow.points.get(i-1);
	930	+
	931	+ double dist = w.distance(v);
	932	+
	933	+ distancenext = dist;
	934	+
	935	+ if (mindist > dist)
	936	+ {
	937	+ mindist = dist;
	938	+ size = mindist*pointFlow.resizefactor;
	939	+ }
	940	+ }
	941	+
	942	+ if (i < s-1)
	943	+ {
	944	+ cVector w = pointFlow.points.get(i+1);
	945	+
	946	+ double dist = w.distance(v);
	947	+
	948	+ if (mindist > dist)
	949	+ {
	950	+ mindist = dist;
	951	+ size = mindist*pointFlow.resizefactor;
	952	+ }
	953	+ }
	954	+
	955	+ if (size < pointFlow.minimumSize)
	956	+ size = pointFlow.minimumSize;
	957	+ if (size > pointFlow.maximumSize)
	958	+ size = pointFlow.maximumSize;
	959	+
	960	+ double tx = v.x;
	961	+ double ty = v.y;
	962	+ double tz = v.z;
	963	+
	964	+ // if (tx == 0 && ty == 0 && tz == 0)
	965	+ // continue;
	966	+
	967	+ gl.glMatrixMode(gl.GL_TEXTURE);
	968	+ gl.glPushMatrix();
	969	+ pointFlow.texmat[12] = pointFlow.texmat[13] = pointFlow.texmat[14] = i;
	970	+
	971	+ gl.glMultMatrixf(pointFlow.texmat, 0);
	972	+
	973	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	974	+ gl.glPushMatrix();
	975	+
	976	+ gl.glTranslated(tx,ty,tz);
	977	+
	978	+ gl.glScaled(size,size,size);
	979	+
	980	+// float cr = colorBuf.get(index4);
	981	+// float cg = colorBuf.get(index4+1);
	982	+// float cb = colorBuf.get(index4+2);
	983	+// float ca = colorBuf.get(index4+3);
	984	+//
	985	+// display.modelParams0[0] = r * cr;
	986	+// display.modelParams0[1] = g * cg;
	987	+// display.modelParams0[2] = b * cb;
	988	+//
	989	+// display.modelParams5[1] = opacity * ca;
	990	+//
	991	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	992	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	993	+//
	994	+// RandomNode.globalseed = (int)sizeBuf.get(index3+2); // i;
	995	+// RandomNode.globalseed2 = RandomNode.globalseed;
	996	+//
	997	+//// gl.glColor4f(cr,cg,cb,ca);
	998	+// // gl.glScalef(1024/16,1024/16,1024/16);
	999	+ pointFlow.geo.Draw/Node/(display,null,selected, blocked);
	1000	+
	1001	+ gl.glPopMatrix();
	1002	+
	1003	+ double step = size/4; //
	1004	+
	1005	+ if (i == 0 \|\| size == 0 \|\| distancenext > 8*size \|\| distancenext < step)
	1006	+ continue;
	1007	+
	1008	+ int nbsteps = (int)(distancenext/step);
	1009	+
	1010	+ step = distancenext/nbsteps;
	1011	+
	1012	+ cVector next = pointFlow.points.get(i-1);
	1013	+
	1014	+ tmp.set(next);
	1015	+ tmp.sub(v);
	1016	+ tmp.normalize();
	1017	+ tmp.mul(step);
	1018	+
	1019	+ // calculate next size
	1020	+ mindist = Double.MAX_VALUE;
	1021	+
	1022	+ double nextsize = pointFlow.minimumSize;
	1023	+
	1024	+ if (i > 1)
	1025	+ {
	1026	+ cVector w = pointFlow.points.get(i-2);
	1027	+
	1028	+ double dist = w.distance(next);
	1029	+
	1030	+ if (mindist > dist)
	1031	+ {
	1032	+ mindist = dist;
	1033	+ nextsize = mindist*pointFlow.resizefactor;
	1034	+ }
	1035	+ }
	1036	+
	1037	+ double dist = v.distance(next);
	1038	+
	1039	+ if (mindist > dist)
	1040	+ {
	1041	+ mindist = dist;
	1042	+ nextsize = mindist*pointFlow.resizefactor;
	1043	+ }
	1044	+
	1045	+ if (nextsize < pointFlow.minimumSize)
	1046	+ nextsize = pointFlow.minimumSize;
	1047	+ if (nextsize > pointFlow.maximumSize)
	1048	+ nextsize = pointFlow.maximumSize;
	1049	+ //
	1050	+
	1051	+ double count = 0;
	1052	+
	1053	+ while (distancenext > 0.000000001) // step
	1054	+ {
	1055	+ gl.glPushMatrix();
	1056	+
	1057	+ gl.glTranslated(tx + tmp.xcount, ty + tmp.ycount, tz + tmp.z*count);
	1058	+
	1059	+ double K = count/nbsteps;
	1060	+
	1061	+ double intersize = Knextsize + (1-K)size;
	1062	+
	1063	+ gl.glScaled(intersize,intersize,intersize);
	1064	+
	1065	+ pointFlow.geo.Draw/Node/(display,null,selected,blocked);
	1066	+
	1067	+ count++;
	1068	+
	1069	+ distancenext -= step;
	1070	+
	1071	+ gl.glPopMatrix();
	1072	+ }
	1073	+
	1074	+ if (count != nbsteps)
	1075	+ assert(count == nbsteps);
	1076	+
	1077	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	1078	+ //gl.glTranslatef(-tx,-ty,-tz);
	1079	+
	1080	+ gl.glMatrixMode(gl.GL_TEXTURE);
	1081	+ gl.glPopMatrix();
	1082	+ }
	1083	+
	1084	+ if (!cf)
	1085	+ gl.glDisable(gl.GL_CULL_FACE);
	1086	+
	1087	+// display.modelParams0[0] = r;
	1088	+// display.modelParams0[1] = g;
	1089	+// display.modelParams0[2] = b;
	1090	+//
	1091	+// display.modelParams5[1] = opacity;
	1092	+//
	1093	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1094	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1095	+
	1096	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	1097	+ }
	1098	+
	1099	+ public void DrawBox(cVector min, cVector max)
	1100	+ {
	1101	+ javax.media.opengl.GL gl = GetGL();
	1102	+ gl.glBegin(gl.GL_LINES);
	1103	+
	1104	+ gl.glVertex3d(min.x, min.y, min.z);
	1105	+ gl.glVertex3d(min.x, min.y, max.z);
	1106	+ gl.glVertex3d(min.x, min.y, min.z);
	1107	+ gl.glVertex3d(min.x, max.y, min.z);
	1108	+ gl.glVertex3d(min.x, min.y, min.z);
	1109	+ gl.glVertex3d(max.x, min.y, min.z);
	1110	+
	1111	+ gl.glVertex3d(max.x, max.y, max.z);
	1112	+ gl.glVertex3d(min.x, max.y, max.z);
	1113	+ gl.glVertex3d(max.x, max.y, max.z);
	1114	+ gl.glVertex3d(max.x, min.y, max.z);
	1115	+ gl.glVertex3d(max.x, max.y, max.z);
	1116	+ gl.glVertex3d(max.x, max.y, min.z);
	1117	+
	1118	+ gl.glEnd();
	1119	+ }
	1120	+
	1121	+ public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
	1122	+ {
	1123	+ int[] strips = bRep.getRawIndices();
	1124	+
	1125	+ javax.media.opengl.GL gl = GetGL();
	1126	+
	1127	+ // TRIANGLE STRIP ARRAY
	1128	+ if (bRep.trimmed)
	1129	+ {
	1130	+ float[] v = bRep.getRawVertices();
	1131	+ float[] n = bRep.getRawNormals();
	1132	+ float[] c = bRep.getRawColors();
	1133	+ float[] uv = bRep.getRawUVMap();
	1134	+
	1135	+ int count2 = 0;
	1136	+ int count3 = 0;
	1137	+
	1138	+ if (n.length > 0)
	1139	+ {
	1140	+ for (int i = 0; i < strips.length; i++)
	1141	+ {
	1142	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1143	+
	1144	+ /*
	1145	+ boolean locked = false;
	1146	+ float eps = 0.1f;
	1147	+ boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	1148	+
	1149	+ int dot = 0;
	1150	+
	1151	+ if ((dot&1) == 0)
	1152	+ dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	1153	+
	1154	+ if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	1155	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	1156	+ else
	1157	+ {
	1158	+ locked = true;
	1159	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1160	+ }
	1161	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	1162	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	1163	+ if (hasnorm)
	1164	+ {
	1165	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	1166	+ gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
	1167	+ }
	1168	+
	1169	+ if ((dot&4) == 0)
	1170	+ dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	1171	+
	1172	+ if (wrap \|\| !locked && (dot&8) != 0)
	1173	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	1174	+ else
	1175	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1176	+
	1177	+ f.dot = dot;
	1178	+ */
	1179	+
	1180	+ if (!selectmode)
	1181	+ {
	1182	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1183	+ {
	1184	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1185	+ } else
	1186	+ {
	1187	+ gl.glNormal3f(0, 0, 1);
	1188	+ }
	1189	+
	1190	+ if (c != null)
	1191	+ //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
	1192	+ {
	1193	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1194	+ }
	1195	+ }
	1196	+
	1197	+ if (flipV)
	1198	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1199	+ else
	1200	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1201	+
	1202	+ //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1203	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1204	+
	1205	+ count2 += 2;
	1206	+ count3 += 3;
	1207	+ if (!selectmode)
	1208	+ {
	1209	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1210	+ {
	1211	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1212	+ } else
	1213	+ {
	1214	+ gl.glNormal3f(0, 0, 1);
	1215	+ }
	1216	+ if (c != null)
	1217	+ {
	1218	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1219	+ }
	1220	+ }
	1221	+
	1222	+ if (flipV)
	1223	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1224	+ else
	1225	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1226	+
	1227	+ //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1228	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1229	+
	1230	+ count2 += 2;
	1231	+ count3 += 3;
	1232	+ for (int j = 0; j < strips[i] - 2; j++)
	1233	+ {
	1234	+ //gl.glTexCoord2d(...);
	1235	+ if (!selectmode)
	1236	+ {
	1237	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1238	+ {
	1239	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1240	+ } else
	1241	+ {
	1242	+ gl.glNormal3f(0, 0, 1);
	1243	+ }
	1244	+ if (c != null)
	1245	+ {
	1246	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1247	+ }
	1248	+ }
	1249	+
	1250	+ if (flipV)
	1251	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1252	+ else
	1253	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1254	+
	1255	+ //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
	1256	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1257	+
	1258	+ count2 += 2;
	1259	+ count3 += 3;
	1260	+ }
	1261	+
	1262	+ gl.glEnd();
	1263	+ }
	1264	+ }
	1265	+
	1266	+ assert count3 == v.length;
	1267	+ }
	1268	+ else // !trimmed
	1269	+ {
	1270	+ int count = 0;
	1271	+ for (int i = 0; i < strips.length; i++)
	1272	+ {
	1273	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1274	+
	1275	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	1276	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	1277	+
	1278	+ drawVertex(gl, p, flipV, selectmode);
	1279	+ drawVertex(gl, q, flipV, selectmode);
	1280	+
	1281	+ for (int j = 0; j < strips[i] - 2; j++)
	1282	+ {
	1283	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	1284	+
	1285	+ // if (j%2 == 0)
	1286	+ // drawFace(p, q, r, display, null);
	1287	+ // else
	1288	+ // drawFace(p, r, q, display, null);
	1289	+
	1290	+ // p = q;
	1291	+ // q = r;
	1292	+ drawVertex(gl, r, flipV, selectmode);
	1293	+ }
	1294	+
	1295	+ gl.glEnd();
	1296	+ }
	1297	+ }
	1298	+ }
	1299	+
	1300	+ static cSpring.Point3D temp = new cSpring.Point3D();
	1301	+ static cSpring.Point3D temp2 = new cSpring.Point3D();
	1302	+ static cSpring.Point3D temp3 = new cSpring.Point3D();
	1303	+
	1304	+ public void DrawDynamicMesh(cMesh mesh)
	1305	+ {
	1306	+ GL gl = GetGL(); // getGL();
	1307	+
	1308	+ cSpring.PhysicsController3D Phys = mesh.Phys;
	1309	+
	1310	+ gl.glDisable(gl.GL_LIGHTING);
	1311	+
	1312	+ gl.glLineWidth(1);
	1313	+ gl.glColor3f(1,1,1);
	1314	+ gl.glBegin(gl.GL_LINES);
	1315	+ double scale = 0;
	1316	+ int count = 0;
	1317	+ for (int s=0; s<Phys.allSprings.size(); s++)
	1318	+ {
	1319	+ cSpring.Spring spring = Phys.allSprings.get(s);
	1320	+ if(s == 0)
	1321	+ {
	1322	+ //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
	1323	+ }
	1324	+ if (mesh.showsprings)
	1325	+ {
	1326	+ temp.set(spring.a.position);
	1327	+ temp.add(spring.b.position);
	1328	+ temp.mul(0.5);
	1329	+ temp2.set(spring.a.position);
	1330	+ temp2.sub(spring.b.position);
	1331	+ temp2.mul(spring.restLength/2);
	1332	+ temp.sub(temp2);
	1333	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1334	+ temp.add(temp2);
	1335	+ temp.add(temp2);
	1336	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1337	+ }
	1338	+
	1339	+ if (spring.isHandle)
	1340	+ continue;
	1341	+
	1342	+ //if (scale < spring.restLength)
	1343	+ scale += spring.restLength;
	1344	+ count++;
	1345	+ }
	1346	+ gl.glEnd();
	1347	+
	1348	+ if (count == 0)
	1349	+ scale = 0.01;
	1350	+ else
	1351	+ scale /= count * 3;
	1352	+
	1353	+ //scale = 0.25;
	1354	+
	1355	+ if (mesh.ShowInfo())
	1356	+ {
	1357	+ gl.glLineWidth(4);
	1358	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1359	+ {
	1360	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1361	+ if (node.mass == 0)
	1362	+ continue;
	1363	+
	1364	+ int i = node.springs==null?-1:node.springs.size();
	1365	+ gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
	1366	+ //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
	1367	+ //temp.normalize();
	1368	+ //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
	1369	+ gl.glBegin(gl.GL_LINES);
	1370	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1371	+ //gl.glVertex3d(node.position.x + node.normal.xscale, node.position.y + node.normal.yscale, node.position.z + node.normal.z*scale);
	1372	+ gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
	1373	+ node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
	1374	+ node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
	1375	+ gl.glEnd();
	1376	+ }
	1377	+
	1378	+ gl.glLineWidth(8);
	1379	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1380	+ {
	1381	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1382	+
	1383	+ if (node.springs != null)
	1384	+ {
	1385	+ for (int i=0; i<node.springs.size(); i+=1)
	1386	+ {
	1387	+ cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
	1388	+
	1389	+ int c = i+1;
	1390	+ // c = node.springs.get(i).nbcopies;
	1391	+
	1392	+ gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
	1393	+ gl.glBegin(gl.GL_LINES);
	1394	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1395	+ gl.glVertex3d(f.position.x/3+node.position.x2/3, f.position.y/3+node.position.y2/3, f.position.z/3+node.position.z*2/3);
	1396	+ gl.glEnd();
	1397	+ }
	1398	+ }
	1399	+ }
	1400	+
	1401	+ gl.glLineWidth(1);
	1402	+ }
	1403	+
	1404	+ gl.glEnable(gl.GL_LIGHTING);
	1405	+ }
	1406	+
569	1407	/// INTERFACE
	1408	+
	1409	+ public void StartTriangles()
	1410	+ {
	1411	+ javax.media.opengl.GL gl = GetGL();
	1412	+ gl.glBegin(gl.GL_TRIANGLES);
	1413	+ }
	1414	+
	1415	+ public void EndTriangles()
	1416	+ {
	1417	+ GetGL().glEnd();
	1418	+ }
	1419	+
	1420	+ void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
	1421	+ {
	1422	+ if (!selectmode)
	1423	+ {
	1424	+ gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1425	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	1426	+
	1427	+ if (flipV)
	1428	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	1429	+ else
	1430	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1431	+ }
	1432	+
	1433	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	1434	+ }
570	1435
571	1436	void SetColor(Object3D obj, Vertex p0)
572	1437	{
..	..	@@ -745,7 +1610,7 @@
745	1610	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
746	1611	}
747	1612
748		- void DrawMaterial(cMaterial material, boolean selected)
	1613	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
749	1614	{
750	1615	CameraPane display = this;
751	1616	//new Exception().printStackTrace();
..	..	@@ -761,18 +1626,18 @@
761	1626	//col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
762	1627	if (!material.multiply)
763	1628	{
764		- display.color = color;
	1629	+ display.color = material.color;
765	1630	display.saturation = material.modulation;
766	1631	}
767	1632	else
768	1633	{
769		- display.color = color2;
	1634	+ display.color = material.color2;
770	1635	display.saturation = material.modulation2;
771	1636	}
772	1637
773	1638	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
774	1639
775		- float[] colorV = GrafreeD.colorV;
	1640	+ float[] colorV = Grafreed.colorV;
776	1641
777	1642	/**/
778	1643	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -780,7 +1645,7 @@
780	1645	colorV[0] = display.modelParams0[0] * material.diffuse;
781	1646	colorV[1] = display.modelParams0[1] * material.diffuse;
782	1647	colorV[2] = display.modelParams0[2] * material.diffuse;
783		- colorV[3] = material.opacity;
	1648	+ colorV[3] = 1; // material.opacity;
784	1649
785	1650	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
786	1651	//System.out.println("Opacity = " + opacity);
..	..	@@ -888,9 +1753,9 @@
888	1753	display.modelParams7[2] = 0;
889	1754	display.modelParams7[3] = 0;
890	1755
891		- display.modelParams6[0] = 100; // criss de bug de bump
	1756	+ //display.modelParams6[0] = 100; // criss de bug de bump
892	1757
893		- Object3D.cVector2[] extparams = display.vector2buffer;
	1758	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
894	1759	if (extparams != null && extparams.length > 0 && extparams[0] != null)
895	1760	{
896	1761	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1032,7 +1897,7 @@
1032	1897	void PushMatrix(double[][] matrix)
1033	1898	{
1034	1899	// GrafreeD.tracein(matrix);
1035		- PushMatrix(matrix,1);
	1900	+ PushMatrix(matrix, 1);
1036	1901	}
1037	1902
1038	1903	void PushMatrix()
..	..	@@ -1129,7 +1994,7 @@
1129	1994
1130	1995	static int camerachangeframe;
1131	1996
1132		- boolean SetCamera(Camera cam)
	1997	+ public boolean SetCamera(Camera cam)
1133	1998	{
1134	1999	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
1135	2000	// return false;
..	..	@@ -1257,33 +2122,6 @@
1257	2122	mainDL ^= true;
1258	2123	}
1259	2124
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	2125	void ToggleFullScreen()
1288	2126	{
1289	2127	FULLSCREEN ^= true;
..	..	@@ -1294,72 +2132,94 @@
1294	2132	Globals.CROWD ^= true;
1295	2133	}
1296	2134
1297		- void ToggleInertia()
1298		- {
1299		- INERTIA ^= true;
1300		- }
1301		-
1302	2135	void ToggleLocal()
1303	2136	{
1304	2137	LOCALTRANSFORM ^= true;
1305	2138	}
1306	2139
1307		- void ToggleFast()
	2140	+ public void ToggleTexture()
	2141	+ {
	2142	+ textureon ^= true;
	2143	+ }
	2144	+
	2145	+ public void ToggleLive()
	2146	+ {
	2147	+ Globals.setLIVE(Globals.isLIVE() ^ true);
	2148	+
	2149	+ System.err.println("LIVE = " + Globals.isLIVE());
	2150	+
	2151	+ if (!Globals.isLIVE()) // save sound
	2152	+ Grafreed.savesound = true; // wav.save();
	2153	+ // else
	2154	+ repaint(); // start loop // may 2013
	2155	+ }
	2156	+
	2157	+ public void ToggleSupport()
	2158	+ {
	2159	+ SUPPORT ^= true;
	2160	+ }
	2161	+
	2162	+ public void ToggleAbort()
	2163	+ {
	2164	+ ABORTMODE ^= true;
	2165	+ }
	2166	+
	2167	+ public void ToggleInertia()
	2168	+ {
	2169	+ INERTIA ^= true;
	2170	+ }
	2171	+
	2172	+ public void ToggleFast()
1308	2173	{
1309	2174	FAST ^= true;
1310	2175	}
1311	2176
1312		- void ToggleSlowPose()
	2177	+ public void ToggleSlowPose()
1313	2178	{
1314	2179	SLOWPOSE ^= true;
1315	2180	}
1316	2181
1317		- void ToggleFootContact()
1318		- {
1319		- FOOTCONTACT ^= true;
1320		- }
1321		-
1322		- void ToggleBoxMode()
	2182	+ public void ToggleBoxMode()
1323	2183	{
1324	2184	BOXMODE ^= true;
1325	2185	}
1326	2186
1327		- void ToggleSmoothFocus()
	2187	+ public void ToggleZoomBoxMode()
	2188	+ {
	2189	+ ZOOMBOXMODE ^= true;
	2190	+ }
	2191	+
	2192	+ public void ToggleSmoothFocus()
1328	2193	{
1329	2194	SMOOTHFOCUS ^= true;
1330	2195	}
1331	2196
1332		- void ToggleImageFlip()
	2197	+ public void ToggleImageFlip()
1333	2198	{
1334	2199	IMAGEFLIP ^= true;
1335	2200	}
1336	2201
1337		- void ToggleSpeakerMocap()
	2202	+ public void ToggleSpeakerMocap()
1338	2203	{
1339	2204	SPEAKERMOCAP ^= true;
1340	2205	}
1341	2206
1342		- void ToggleSpeakerCamera()
	2207	+ public void ToggleSpeakerCamera()
1343	2208	{
1344	2209	SPEAKERCAMERA ^= true;
1345	2210	}
1346	2211
1347		- void ToggleSpeakerFocus()
	2212	+ public void ToggleSpeakerFocus()
1348	2213	{
1349	2214	SPEAKERFOCUS ^= true;
1350	2215	}
1351	2216
1352		- void ToggleDebug()
1353		- {
1354		- DEBUG ^= true;
1355		- }
1356		-
1357		- void ToggleFrustum()
	2217	+ public void ToggleFrustum()
1358	2218	{
1359	2219	FRUSTUM ^= true;
1360	2220	}
1361	2221
1362		- void ToggleTrack()
	2222	+ public void ToggleTrack()
1363	2223	{
1364	2224	TRACK ^= true;
1365	2225	if (TRACK)
..	..	@@ -1378,25 +2238,35 @@
1378	2238	repaint();
1379	2239	}
1380	2240
1381		- void ToggleTrackOnce()
	2241	+ public void ToggleTrackOnce()
1382	2242	{
1383	2243	TRACKONCE ^= true;
1384	2244	}
1385	2245
1386		- void ToggleShadowTrack()
	2246	+ public void ToggleShadowTrack()
1387	2247	{
1388	2248	SHADOWTRACK ^= true;
1389	2249	repaint();
1390	2250	}
1391	2251
1392		- void ToggleOeil()
	2252	+ public void ToggleOeil()
1393	2253	{
1394	2254	OEIL ^= true;
1395	2255	}
1396	2256
1397		- void ToggleOeilOnce()
	2257	+ public void ToggleOeilOnce()
1398	2258	{
1399	2259	OEILONCE ^= true;
	2260	+ }
	2261	+
	2262	+ void ToggleFootContact()
	2263	+ {
	2264	+ FOOTCONTACT ^= true;
	2265	+ }
	2266	+
	2267	+ void ToggleDebug()
	2268	+ {
	2269	+ Globals.DEBUG ^= true;
1400	2270	}
1401	2271
1402	2272	void ToggleLookAt()
..	..	@@ -1404,9 +2274,9 @@
1404	2274	LOOKAT ^= true;
1405	2275	}
1406	2276
1407		- void ToggleRandom()
	2277	+ void ToggleSwitch()
1408	2278	{
1409		- RANDOM ^= true;
	2279	+ SWITCH ^= true;
1410	2280	}
1411	2281
1412	2282	void ToggleHandles()
..	..	@@ -1513,7 +2383,7 @@
1513	2383	{
1514	2384	return currentGL;
1515	2385	}
1516		-
	2386	+
1517	2387	/**/
1518	2388	class CacheTexture
1519	2389	{
..	..	@@ -3345,6 +4215,7 @@
3345	4215
3346	4216	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
3347	4217	{
	4218	+ new Exception().printStackTrace();
3348	4219	System.exit(0);
3349	4220	com.sun.opengl.util.texture.Texture texture = null;
3350	4221
..	..	@@ -7057,6 +7928,64 @@
7057	7928	ReleaseTexture(pigment, false);
7058	7929	}
7059	7930
	7931	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	7932	+ {
	7933	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7934	+ {
	7935	+ return;
	7936	+ }
	7937	+
	7938	+ if (tex == null)
	7939	+ {
	7940	+ ReleaseTexture(null, false);
	7941	+ return;
	7942	+ }
	7943	+
	7944	+ String pigment = Object3D.GetPigment(tex);
	7945	+
	7946	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7947	+ {
	7948	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7949	+ // System.out.println("; bump = " + bump);
	7950	+ }
	7951	+
	7952	+ if (pigment.equals(""))
	7953	+ {
	7954	+ pigment = null;
	7955	+ }
	7956	+
	7957	+ ReleaseTexture(pigment, false);
	7958	+ }
	7959	+
	7960	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	7961	+ {
	7962	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7963	+ {
	7964	+ return;
	7965	+ }
	7966	+
	7967	+ if (tex == null)
	7968	+ {
	7969	+ ReleaseTexture(null, true);
	7970	+ return;
	7971	+ }
	7972	+
	7973	+ String bump = Object3D.GetBump(tex);
	7974	+
	7975	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7976	+ {
	7977	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7978	+ // System.out.println("; bump = " + bump);
	7979	+ }
	7980	+
	7981	+ if (bump.equals(""))
	7982	+ {
	7983	+ bump = null;
	7984	+ }
	7985	+
	7986	+ ReleaseTexture(bump, true);
	7987	+ }
	7988	+
7060	7989	void ReleaseTexture(String tex, boolean bump)
7061	7990	{
7062	7991	if (// DrawMode() != 0 \|\| /tex == null \|\|/
..	..	@@ -7160,7 +8089,7 @@
7160	8089	}
7161	8090	}
7162	8091
7163		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8092	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
7164	8093	{
7165	8094	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7166	8095	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7205,7 +8134,94 @@
7205	8134	return; // true;
7206	8135	}
7207	8136
7208		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8137	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8138	+ {
	8139	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8140	+ ambientOcclusion ) // \|\| !textureon)
	8141	+ {
	8142	+ return; // false;
	8143	+ }
	8144	+
	8145	+ if (tex == null)
	8146	+ {
	8147	+ BindTexture(null,false,resolution);
	8148	+ return;
	8149	+ }
	8150	+
	8151	+ String pigment = Object3D.GetPigment(tex);
	8152	+
	8153	+ usedtextures.put(pigment, pigment);
	8154	+
	8155	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8156	+ {
	8157	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8158	+ // System.out.println("; bump = " + bump);
	8159	+ }
	8160	+
	8161	+ if (pigment.equals(""))
	8162	+ {
	8163	+ pigment = null;
	8164	+ }
	8165	+
	8166	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8167	+ BindTexture(pigment, false, resolution);
	8168	+ }
	8169	+
	8170	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8171	+ {
	8172	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8173	+ ambientOcclusion ) // \|\| !textureon)
	8174	+ {
	8175	+ return; // false;
	8176	+ }
	8177	+
	8178	+ if (tex == null)
	8179	+ {
	8180	+ BindTexture(null,true,resolution);
	8181	+ return;
	8182	+ }
	8183	+
	8184	+ String bump = Object3D.GetBump(tex);
	8185	+
	8186	+ usedtextures.put(bump, bump);
	8187	+
	8188	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8189	+ {
	8190	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8191	+ // System.out.println("; bump = " + bump);
	8192	+ }
	8193	+
	8194	+ if (bump.equals(""))
	8195	+ {
	8196	+ bump = null;
	8197	+ }
	8198	+
	8199	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8200	+ BindTexture(bump, true, resolution);
	8201	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8202	+ }
	8203	+
	8204	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8205	+
	8206	+ private boolean FileExists(String tex)
	8207	+ {
	8208	+ if (missingTextures.contains(tex))
	8209	+ {
	8210	+ return false;
	8211	+ }
	8212	+
	8213	+ boolean fileExists = new File(tex).exists();
	8214	+
	8215	+ if (!fileExists)
	8216	+ {
	8217	+ // If file exists, the "new File()" is not executed sgain
	8218	+ missingTextures.add(tex);
	8219	+ }
	8220	+
	8221	+ return fileExists;
	8222	+ }
	8223	+
	8224	+ CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
7209	8225	{
7210	8226	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7211	8227
..	..	@@ -7213,12 +8229,18 @@
7213	8229	{
7214	8230	String texname = tex;
7215	8231
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;
	8232	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8233	+
	8234	+// String[] split = tex.split("Textures");
	8235	+// if (split.length > 1)
	8236	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8237	+// else
	8238	+// if (!texname.startsWith("/"))
	8239	+// texname = "/Users/nbriere/Textures/" + texname;
	8240	+ if (!FileExists(tex))
	8241	+ {
	8242	+ texname = fallbackTextureName;
	8243	+ }
7222	8244
7223	8245	if (CACHETEXTURE)
7224	8246	texture = textures.get(texname); // TEXTURE CACHE
..	..	@@ -7287,7 +8309,7 @@
7287	8309	}
7288	8310
7289	8311	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
7290		- if (!new File(cachename).exists())
	8312	+ if (!FileExists(cachename))
7291	8313	cachename = texname;
7292	8314	else
7293	8315	processbump = false; // don't process bump map again
..	..	@@ -7309,7 +8331,7 @@
7309	8331	}
7310	8332
7311	8333	cachename = texname.substring(0, texname.length()-4)+ext+".png";
7312		- if (!new File(cachename).exists())
	8334	+ if (!FileExists(cachename))
7313	8335	cachename = texname;
7314	8336	else
7315	8337	processbump = false; // don't process bump map again
..	..	@@ -7318,7 +8340,9 @@
7318	8340	texturedata = GetFileTexture(cachename, processbump, resolution);
7319	8341
7320	8342
7321		- if (texturedata != null)
	8343	+ if (texturedata == null)
	8344	+ throw new Exception();
	8345	+
7322	8346	texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
7323	8347	//texture = GetTexture(tex, bump);
7324	8348	}
..	..	@@ -7440,7 +8464,7 @@
7440	8464	return texture;
7441	8465	}
7442	8466
7443		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8467	+ com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
7444	8468	{
7445	8469	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7446	8470
..	..	@@ -7458,14 +8482,14 @@
7458	8482	return texture!=null?texture.texture:null;
7459	8483	}
7460	8484
7461		- com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8485	+ public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
7462	8486	{
7463	8487	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7464	8488
7465	8489	return texture!=null?texture.texturedata:null;
7466	8490	}
7467	8491
7468		- boolean BindTexture(String tex, boolean bump, int resolution)
	8492	+ boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
7469	8493	{
7470	8494	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
7471	8495	{
..	..	@@ -8442,8 +9466,8 @@
8442	9466	assert (parentcam != renderCamera);
8443	9467
8444	9468	if (renderCamera != lightCamera)
8445		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8446		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9469	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9470	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
8447	9471
8448	9472	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
8449	9473
..	..	@@ -8458,8 +9482,8 @@
8458	9482	LA.matCopy(renderCamera.fromScreen, matrix);
8459	9483
8460	9484	if (renderCamera != lightCamera)
8461		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8462		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9485	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9486	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
8463	9487
8464	9488	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
8465	9489
..	..	@@ -8531,7 +9555,7 @@
8531	9555	//gl.glFlush();
8532	9556	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
8533	9557
8534		- if (ANIMATION && ABORTED)
	9558	+ if (Globals.ANIMATION && ABORTED)
8535	9559	{
8536	9560	System.err.println(" ABORTED FRAME");
8537	9561	break;
..	..	@@ -8561,7 +9585,7 @@
8561	9585	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
8562	9586
8563	9587	// save image
8564		- if (ANIMATION && !ABORTED)
	9588	+ if (Globals.ANIMATION && !ABORTED)
8565	9589	{
8566	9590	VPwidth = viewport[2];
8567	9591	VPheight = viewport[3];
..	..	@@ -8672,11 +9696,11 @@
8672	9696
8673	9697	// imagecount++;
8674	9698
8675		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9699	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
8676	9700
8677	9701	if (!BOXMODE)
8678	9702	{
8679		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9703	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
8680	9704	}
8681	9705
8682	9706	if (!BOXMODE)
..	..	@@ -8714,7 +9738,7 @@
8714	9738	ABORTED = false;
8715	9739	}
8716	9740	else
8717		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9741	+ Grafreed.wav.cursor += 735 * ACSIZE;
8718	9742
8719	9743	if (false)
8720	9744	{
..	..	@@ -9377,11 +10401,11 @@
9377	10401
9378	10402	public void display(GLAutoDrawable drawable)
9379	10403	{
9380		- if (GrafreeD.savesound && GrafreeD.hassound)
	10404	+ if (Grafreed.savesound && Grafreed.hassound)
9381	10405	{
9382		- GrafreeD.wav.save();
9383		- GrafreeD.savesound = false;
9384		- GrafreeD.hassound = false;
	10406	+ Grafreed.wav.save();
	10407	+ Grafreed.savesound = false;
	10408	+ Grafreed.hassound = false;
9385	10409	}
9386	10410	// if (DEBUG_SELECTION)
9387	10411	// {
..	..	@@ -9511,7 +10535,7 @@
9511	10535	Object3D theobject = object;
9512	10536	Object3D theparent = object.parent;
9513	10537	object.parent = null;
9514		- object = (Object3D)GrafreeD.clone(object);
	10538	+ object = (Object3D)Grafreed.clone(object);
9515	10539	object.Stripify();
9516	10540	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
9517	10541	theobject.PreprocessOcclusion(this);
..	..	@@ -9524,13 +10548,14 @@
9524	10548	ambientOcclusion = false;
9525	10549	}
9526	10550
9527		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10551	+ if (//Globals.lighttouched &&
	10552	+ 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,13 +11451,31 @@
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	}
10419	11459
10420	11460	static boolean zoomonce = false;
	11461	+
	11462	+ static void CreateSelectedPoint()
	11463	+ {
	11464	+ if (selectedpoint == null)
	11465	+ {
	11466	+ debugpointG = new Sphere();
	11467	+ debugpointP = new Sphere();
	11468	+ debugpointC = new Sphere();
	11469	+ debugpointR = new Sphere();
	11470	+
	11471	+ selectedpoint = new Superellipsoid();
	11472	+
	11473	+ for (int i=0; i<8; i++)
	11474	+ {
	11475	+ debugpoints[i] = new Sphere();
	11476	+ }
	11477	+ }
	11478	+ }
10421	11479
10422	11480	void DrawObject(GL gl, boolean draw)
10423	11481	{
..	..	@@ -10447,7 +11505,7 @@
10447	11505	callist = gl.glGenLists(1);
10448	11506	}
10449	11507
10450		- boolean selectmode = DrawMode() == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	11508	+ boolean selectmode = DrawMode() == SELECTION \|\| IsDebugSelection();
10451	11509
10452	11510	boolean active = !selectmode; // DrawMode() != SELECTION; // mouseDown;
10453	11511
..	..	@@ -10482,7 +11540,14 @@
10482	11540
10483	11541	usedtextures.clear();
10484	11542
10485		- BindTextures(DEFAULT_TEXTURES, 2);
	11543	+ try
	11544	+ {
	11545	+ BindTextures(DEFAULT_TEXTURES, 2);
	11546	+ }
	11547	+ catch (Exception e)
	11548	+ {
	11549	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11550	+ }
10486	11551	}
10487	11552	//System.out.println("--> " + stackdepth);
10488	11553	// GrafreeD.traceon();
..	..	@@ -10492,8 +11557,9 @@
10492	11557
10493	11558	if (DrawMode() == DEFAULT)
10494	11559	{
10495		- if (DEBUG)
	11560	+ if (Globals.DEBUG)
10496	11561	{
	11562	+ CreateSelectedPoint();
10497	11563	float radius = 0.05f;
10498	11564	if (selectedpoint.radius != radius)
10499	11565	{
..	..	@@ -10573,7 +11639,14 @@
10573	11639	if (checker != null && DrawMode() == DEFAULT)
10574	11640	{
10575	11641	//BindTexture(IMMORTAL_TEXTURE);
10576		- BindTextures(checker.GetTextures(), checker.texres);
	11642	+ try
	11643	+ {
	11644	+ BindTextures(checker.GetTextures(), checker.texres);
	11645	+ }
	11646	+ catch (Exception e)
	11647	+ {
	11648	+ System.err.println("FAILED: " + checker.GetTextures());
	11649	+ }
10577	11650	// NEAREST
10578	11651	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
10579	11652	DrawChecker(gl);
..	..	@@ -10655,7 +11728,7 @@
10655	11728	return;
10656	11729	}
10657	11730
10658		- String string = obj.GetToolTip();
	11731	+ String string = obj.toString(); //.GetToolTip();
10659	11732
10660	11733	GL gl = GetGL();
10661	11734
..	..	@@ -10972,8 +12045,8 @@
10972	12045	//obj.TransformToWorld(light, light);
10973	12046	for (int i = tp.size(); --i >= 0;)
10974	12047	{
10975		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
10976		- LA.xformPos(light, tp.get(i).toParent, light);
	12048	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12049	+ LA.xformPos(light, tp.get(i).GlobalTransform(), light);
10977	12050	}
10978	12051
10979	12052
..	..	@@ -10990,8 +12063,8 @@
10990	12063	parentcam = cameras[0];
10991	12064	}
10992	12065
10993		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10994		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12066	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12067	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
10995	12068
10996	12069	LA.xformPos(light, renderCamera.toScreen, light);
10997	12070
..	..	@@ -11605,8 +12678,8 @@
11605	12678
11606	12679	// display shadow only (bump == 0)
11607	12680	"SUB temp.x, half.x, shadow.x;" +
11608		- "MOV temp.y, -params6.x;" +
11609		- "SLT temp.z, temp.y, zero.x;" +
	12681	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12682	+ "SLT temp.z, temp.y, -one2048th.x;" +
11610	12683	"SUB temp.y, one.x, temp.z;" +
11611	12684	"MUL temp.x, temp.x, temp.y;" +
11612	12685	"KIL temp.x;" +
..	..	@@ -11735,8 +12808,10 @@
11735	12808	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
11736	12809
11737	12810	"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
	12811	+ // Tuning for default skin
	12812	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12813	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12814	+ "ADD temp.y, one.y, options2.y;" + // subsurface
11740	12815	"MUL temp.x, temp.x, temp.y;" +
11741	12816
11742	12817	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -11935,7 +13010,7 @@
11935	13010	//once = true;
11936	13011	}
11937	13012
11938		- System.out.print("Program #" + mode + "; length = " + program.length());
	13013	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
11939	13014	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
11940	13015	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
11941	13016
..	..	@@ -12068,12 +13143,16 @@
12068	13143
12069	13144	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12070	13145	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13146	+
	13147	+ // Compare fragment depth in light space with shadowmap.
12071	13148	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12072	13149	"SGE temp.y, temp.x, zero.x;" +
12073		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13150	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13151	+
	13152	+ // Reverse comparison
12074	13153	"SUB temp.x, one.x, temp.x;" +
12075	13154	"MUL " + shadow + ".x, temp.x, temp.y;" +
12076		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13155	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12077	13156	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12078	13157
12079	13158	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12087,6 +13166,10 @@
12087	13166	// No shadow for backface
12088	13167	"DP3 temp.x, normal, lightd;" +
12089	13168	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13169	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13170	+
	13171	+ // No shadow when out of frustrum
	13172	+ "SGE temp.x, " + depth + ".z, one.z;" +
12090	13173	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12091	13174	"";
12092	13175	}
..	..	@@ -12233,7 +13316,8 @@
12233	13316	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
12234	13317	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
12235	13318	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
12236		- Object3D.cVector2[] vector2buffer;
	13319	+
	13320	+ //Object3D.cVector2[] vector2buffer;
12237	13321
12238	13322	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
12239	13323	// OUT : diff, spec
..	..	@@ -12645,7 +13729,7 @@
12645	13729	public void mousePressed(MouseEvent e)
12646	13730	{
12647	13731	//System.out.println("mousePressed: " + e);
12648		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13732	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
12649	13733	}
12650	13734
12651	13735	static long prevtime = 0;
..	..	@@ -12672,6 +13756,7 @@
12672	13756
12673	13757	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
12674	13758
	13759	+ if (BUTTONLESSWHEEL)
12675	13760	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
12676	13761	{
12677	13762	return;
..	..	@@ -12680,7 +13765,7 @@
12680	13765	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
12681	13766
12682	13767	// TIMER
12683		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	13768	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
12684	13769	{
12685	13770	keepboxmode = BOXMODE;
12686	13771	keepsupport = SUPPORT;
..	..	@@ -12720,8 +13805,8 @@
12720	13805	// mode \|= META;
12721	13806	//}
12722	13807
12723		- SetMouseMode(WHEEL \| e.getModifiersEx());
12724		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13808	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13809	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
12725	13810	anchorX = ax;
12726	13811	anchorY = ay;
12727	13812	prevX = px;
..	..	@@ -12781,6 +13866,10 @@
12781	13866	// wasliveok = true;
12782	13867	// waslive = false;
12783	13868
	13869	+ // May 2019 Forget it:
	13870	+ if (true)
	13871	+ return;
	13872	+
12784	13873	// source == timer
12785	13874	if (mouseDown)
12786	13875	{
..	..	@@ -12819,7 +13908,7 @@
12819	13908
12820	13909	javax.swing.Timer timer = new javax.swing.Timer(350, this);
12821	13910
12822		- void clickStart(int x, int y, int modifiers)
	13911	+ void clickStart(int x, int y, int modifiers, int modifiersex)
12823	13912	{
12824	13913	if (!wasliveok)
12825	13914	return;
..	..	@@ -12836,7 +13925,7 @@
12836	13925	// touched = true; // main DL
12837	13926	if (isRenderer)
12838	13927	{
12839		- SetMouseMode(modifiers);
	13928	+ SetMouseMode(modifiers, modifiersex);
12840	13929	}
12841	13930
12842	13931	selectX = anchorX = x;
..	..	@@ -12849,7 +13938,7 @@
12849	13938	clicked = true;
12850	13939	hold = false;
12851	13940
12852		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	13941	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
12853	13942	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
12854	13943	{
12855	13944	// System.out.println("RESTART II " + modifiers);
..	..	@@ -12880,7 +13969,7 @@
12880	13969	info.camera = renderCamera;
12881	13970	info.x = x;
12882	13971	info.y = y;
12883		- info.modifiers = modifiers;
	13972	+ info.modifiers = modifiersex;
12884	13973	editObj = object.doEditClick(info, 0);
12885	13974	if (!editObj)
12886	13975	{
..	..	@@ -12897,11 +13986,14 @@
12897	13986
12898	13987	public void mouseDragged(MouseEvent e)
12899	13988	{
	13989	+ Globals.MOUSEDRAGGED = true;
	13990	+
	13991	+ //System.out.println("mouseDragged: " + e);
12900	13992	if (isRenderer)
12901	13993	movingcamera = true;
	13994	+
12902	13995	//if (drawing)
12903	13996	//return;
12904		- //System.out.println("mouseDragged: " + e);
12905	13997	if ((e.getModifiersEx() & CTRL) != 0
12906	13998	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
12907	13999	{
..	..	@@ -12909,7 +14001,7 @@
12909	14001	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12910	14002	}
12911	14003	else
12912		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14004	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
12913	14005
12914	14006	//try { Thread.sleep(1); } catch (Exception ex) {}
12915	14007	}
..	..	@@ -12921,6 +14013,11 @@
12921	14013	cVector tmp = new cVector();
12922	14014	cVector tmp2 = new cVector();
12923	14015	boolean isMoving;
	14016	+
	14017	+ public cVector TargetLookAt()
	14018	+ {
	14019	+ return targetLookAt;
	14020	+ }
12924	14021
12925	14022	class PingThread extends Thread
12926	14023	{
..	..	@@ -13077,6 +14174,7 @@
13077	14174
13078	14175	public void run()
13079	14176	{
	14177	+ new Exception().printStackTrace();
13080	14178	System.exit(0);
13081	14179	for (;;)
13082	14180	{
..	..	@@ -13140,7 +14238,7 @@
13140	14238	{
13141	14239	Globals.lighttouched = true;
13142	14240	}
13143		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14241	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
13144	14242	}
13145	14243	//else
13146	14244	}
..	..	@@ -13240,7 +14338,7 @@
13240	14338	int X, Y;
13241	14339	boolean SX, SY;
13242	14340
13243		- void drag(int x, int y, int modifiers)
	14341	+ void drag(int x, int y, int modifiers, int modifiersex)
13244	14342	{
13245	14343	if (IsFrozen())
13246	14344	{
..	..	@@ -13249,17 +14347,17 @@
13249	14347
13250	14348	drag = true; // NEW
13251	14349
13252		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14350	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
13253	14351
13254	14352	X = x;
13255	14353	Y = y;
13256	14354	// floating state for animation
13257		- MODIFIERS = modifiers;
13258		- modifiers &= ~1024;
	14355	+ MODIFIERS = modifiersex;
	14356	+ modifiersex &= ~1024;
13259	14357	if (false) // modifiers != 0)
13260	14358	{
13261	14359	//new Exception().printStackTrace();
13262		- System.out.println("mouseDragged: " + modifiers);
	14360	+ System.out.println("mouseDragged: " + modifiersex);
13263	14361	System.out.println("SHIFT = " + SHIFT);
13264	14362	System.out.println("CONTROL = " + COMMAND);
13265	14363	System.out.println("META = " + META);
..	..	@@ -13279,7 +14377,8 @@
13279	14377	info.camera = renderCamera;
13280	14378	info.x = x;
13281	14379	info.y = y;
13282		- object.editWindow.copy.doEditDrag(info);
	14380	+ object.GetWindow().copy
	14381	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
13283	14382	} else
13284	14383	{
13285	14384	if (x < startX)
..	..	@@ -13431,7 +14530,6 @@
13431	14530	public void mouseMoved(MouseEvent e)
13432	14531	{
13433	14532	//System.out.println("mouseMoved: " + e);
13434		-
13435	14533	if (isRenderer)
13436	14534	return;
13437	14535
..	..	@@ -13444,7 +14542,9 @@
13444	14542	ci.camera = renderCamera;
13445	14543	if (!isRenderer)
13446	14544	{
13447		- if (object.editWindow.copy.doEditClick(ci, 0))
	14545	+ //ObjEditor editWindow = object.editWindow;
	14546	+ //Object3D copy = editWindow.copy;
	14547	+ if (object.doEditClick(ci, 0))
13448	14548	{
13449	14549	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
13450	14550	} else
..	..	@@ -13456,7 +14556,10 @@
13456	14556
13457	14557	public void mouseReleased(MouseEvent e)
13458	14558	{
	14559	+ Globals.MOUSEDRAGGED = false;
	14560	+
13459	14561	movingcamera = false;
	14562	+ X = Y = 0;
13460	14563	//System.out.println("mouseReleased: " + e);
13461	14564	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13462	14565	}
..	..	@@ -13479,9 +14582,9 @@
13479	14582	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
13480	14583	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
13481	14584
13482		- if (control \|\| command \|\| IsFrozen())
	14585	+// No delay if (control \|\| command \|\| IsFrozen())
13483	14586	timeout = true;
13484		- else
	14587	+// ?? May 2019 else
13485	14588	// timer.setDelay((modifiers & 128) != 0?0:350);
13486	14589	mouseDown = false;
13487	14590	if (!control && !command) // june 2013
..	..	@@ -13591,7 +14694,7 @@
13591	14694	System.out.println("keyReleased: " + e);
13592	14695	}
13593	14696
13594		- void SetMouseMode(int modifiers)
	14697	+ void SetMouseMode(int modifiers, int modifiersex)
13595	14698	{
13596	14699	//System.out.println("SetMouseMode = " + modifiers);
13597	14700	//modifiers &= ~1024;
..	..	@@ -13603,25 +14706,25 @@
13603	14706	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
13604	14707	// return;
13605	14708	//System.out.println("SetMode = " + modifiers);
13606		- if ((modifiers & WHEEL) == WHEEL)
	14709	+ if ((modifiersex & WHEEL) == WHEEL)
13607	14710	{
13608	14711	mouseMode \|= ZOOM;
13609	14712	}
13610	14713
13611	14714	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13612		- if (capsLocked \|\| (modifiers & META) == META)
	14715	+ if (capsLocked) // \|\| (modifiers & META) == META)
13613	14716	{
13614	14717	mouseMode \|= VR; // BACKFORTH;
13615	14718	}
13616		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14719	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
13617	14720	{
13618	14721	mouseMode \|= SELECT;
13619	14722	}
13620		- if ((modifiers & COMMAND) == COMMAND)
	14723	+ if ((modifiersex & COMMAND) == COMMAND)
13621	14724	{
13622	14725	mouseMode \|= SELECT;
13623	14726	}
13624		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14727	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
13625	14728	{
13626	14729	mouseMode &= ~VR;
13627	14730	mouseMode \|= TRANSLATE;
..	..	@@ -13650,10 +14753,10 @@
13650	14753
13651	14754	if (isRenderer) //
13652	14755	{
13653		- SetMouseMode(modifiers);
	14756	+ SetMouseMode(0, modifiers);
13654	14757	}
13655	14758
13656		- theRenderer.keyPressed(key);
	14759	+ Globals.theRenderer.keyPressed(key);
13657	14760	}
13658	14761
13659	14762	int kompactbit = 4; // power bit
..	..	@@ -13665,7 +14768,7 @@
13665	14768	float SATPOW = 1; // 2; // 0.5f;
13666	14769	float BRIPOW = 1; // 0.5f; // 0.5f;
13667	14770
13668		- void keyPressed(int key)
	14771	+ public void keyPressed(int key)
13669	14772	{
13670	14773	if (key >= '0' && key <= '5')
13671	14774	clampbit = (key-'0');
..	..	@@ -13822,8 +14925,14 @@
13822	14925	RevertCamera();
13823	14926	repaint();
13824	14927	break;
13825		- case 'L':
13826	14928	case 'l':
	14929	+ lightMode ^= true;
	14930	+ Globals.lighttouched = true;
	14931	+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
	14932	+ targetLookAt.set(manipCamera.lookAt);
	14933	+ repaint();
	14934	+ break;
	14935	+ case 'L':
13827	14936	if (lightMode)
13828	14937	{
13829	14938	lightMode = false;
..	..	@@ -13970,23 +15079,21 @@
13970	15079	kompactbit = 6;
13971	15080	break;
13972	15081	case ' ':
13973		- lightMode ^= true;
13974		- Globals.lighttouched = true;
13975		- manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
13976		- targetLookAt.set(manipCamera.lookAt);
	15082	+ ObjEditor.theFrame.ToggleFullScreen();
13977	15083	repaint();
13978	15084	break;
13979	15085	//case '`' :
13980	15086	case ESC:
13981	15087	RENDERPROGRAM += 1;
13982	15088	RENDERPROGRAM %= 3;
	15089	+
13983	15090	repaint();
13984	15091	break;
13985	15092	case 'Z':
13986	15093	//RESIZETEXTURE ^= true;
13987	15094	//break;
13988	15095	case 'z':
13989		- RENDERSHADOW ^= true;
	15096	+ Globals.RENDERSHADOW ^= true;
13990	15097	Globals.lighttouched = true;
13991	15098	repaint();
13992	15099	break;
..	..	@@ -14102,6 +15209,7 @@
14102	15209	}
14103	15210	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
14104	15211	}
	15212	+
14105	15213	static double OCCLUSIONBOOST = 1; // 0.5;
14106	15214
14107	15215	void keyReleased(int key, int modifiers)
..	..	@@ -14109,11 +15217,11 @@
14109	15217	//mode = ROTATE;
14110	15218	if ((MODIFIERS & COMMAND) == 0) // VR??
14111	15219	{
14112		- SetMouseMode(modifiers);
	15220	+ SetMouseMode(0, modifiers);
14113	15221	}
14114	15222	}
14115	15223
14116		- protected void processKeyEvent(KeyEvent e)
	15224	+ public void processKeyEvent(KeyEvent e)
14117	15225	{
14118	15226	switch (e.getID())
14119	15227	{
..	..	@@ -14243,8 +15351,9 @@
14243	15351
14244	15352	protected void processMouseMotionEvent(MouseEvent e)
14245	15353	{
14246		- //System.out.println("processMouseMotionEvent: " + mouseMode);
14247		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15354	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15355	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15356	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
14248	15357	{
14249	15358	mouseMoved(e);
14250	15359	} else
..	..	@@ -14269,11 +15378,12 @@
14269	15378	}
14270	15379	*/
14271	15380
14272		- object.editWindow.EditSelection();
	15381	+ object.editWindow.EditSelection(false);
14273	15382	}
14274	15383
14275	15384	void SelectParent()
14276	15385	{
	15386	+ new Exception().printStackTrace();
14277	15387	System.exit(0);
14278	15388	Composite group = (Composite) object;
14279	15389	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -14297,6 +15407,7 @@
14297	15407
14298	15408	void SelectChildren()
14299	15409	{
	15410	+ new Exception().printStackTrace();
14300	15411	System.exit(0);
14301	15412	/*
14302	15413	Composite group = (Composite) object;
..	..	@@ -14461,7 +15572,9 @@
14461	15572	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
14462	15573	//Image img = CreateImage(width, height);
14463	15574	//System.out.println("width = " + width + "; height = " + height + "\n");
	15575	+
14464	15576	Graphics gr = g; // img.getGraphics();
	15577	+
14465	15578	if (!hasMarquee)
14466	15579	{
14467	15580	if (Xmin < Xmax) // !locked)
..	..	@@ -14559,14 +15672,33 @@
14559	15672	if (!isRenderer)
14560	15673	{
14561	15674	object.drawEditHandles(info, 0);
	15675	+
	15676	+ if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	15677	+ {
	15678	+ switch (object.selection.get(0).hitSomething)
	15679	+ {
	15680	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15681	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15682	+ break;
	15683	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15684	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15685	+ break;
	15686	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15687	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15688	+ break;
	15689	+ }
	15690	+
	15691	+ }
14562	15692	}
14563	15693	}
	15694	+
14564	15695	if (isRenderer)
14565	15696	{
14566	15697	//gr.setColor(Color.black);
14567	15698	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
14568	15699	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
14569	15700	}
	15701	+
14570	15702	if (hasMarquee)
14571	15703	{
14572	15704	gr.setXORMode(Color.white);
..	..	@@ -14679,6 +15811,7 @@
14679	15811	public boolean mouseDown(Event evt, int x, int y)
14680	15812	{
14681	15813	System.out.println("mouseDown: " + evt);
	15814	+ System.exit(0);
14682	15815	/*
14683	15816	locked = true;
14684	15817	drag = false;
..	..	@@ -14722,7 +15855,7 @@
14722	15855	{
14723	15856	keyPressed(0, modifiers);
14724	15857	}
14725		- clickStart(x, y, modifiers);
	15858	+ // clickStart(x, y, modifiers);
14726	15859	return true;
14727	15860	}
14728	15861
..	..	@@ -14840,7 +15973,7 @@
14840	15973	{
14841	15974	keyReleased(0, 0);
14842	15975	}
14843		- drag(x, y, modifiers);
	15976	+ drag(x, y, 0, modifiers);
14844	15977	return true;
14845	15978	}
14846	15979
..	..	@@ -14972,7 +16105,7 @@
14972	16105	Object3D object;
14973	16106	static Object3D trackedobject;
14974	16107	Camera renderCamera; // Light or Eye (or Occlusion)
14975		- /static/ Camera manipCamera; // Light or Eye
	16108	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
14976	16109	/static/ Camera eyeCamera;
14977	16110	/static/ Camera lightCamera;
14978	16111	int cameracount;
..	..	@@ -15257,16 +16390,16 @@
15257	16390	cStatic.objectstack[materialdepth++] = checker;
15258	16391	//System.out.println("material " + material);
15259	16392	//Applet3D.tracein(this, selected);
15260		- vector2buffer = checker.projectedVertices;
	16393	+ //vector2buffer = checker.projectedVertices;
15261	16394
15262	16395	//checker.GetMaterial().Draw(this, false); // true);
15263		- DrawMaterial(checker.GetMaterial(), false); // true);
	16396	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
15264	16397
15265	16398	materialdepth -= 1;
15266	16399	if (materialdepth > 0)
15267	16400	{
15268		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
15269		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16401	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16402	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
15270	16403	}
15271	16404	//checker.GetMaterial().opacity = 1f;
15272	16405	////checker.GetMaterial().ambient = 1f;
..	..	@@ -15410,6 +16543,7 @@
15410	16543	{
15411	16544	if (!selection)
15412	16545	{
	16546	+ new Exception().printStackTrace();
15413	16547	System.exit(0);
15414	16548	return;
15415	16549	}
..	..	@@ -15489,6 +16623,8 @@
15489	16623	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
15490	16624	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
15491	16625
	16626	+ CreateSelectedPoint();
	16627	+
15492	16628	// Will fit the mesh !!!
15493	16629	selectedpoint.toParent[0][0] = 0.0001;
15494	16630	selectedpoint.toParent[1][1] = 0.0001;
..	..	@@ -15537,16 +16673,16 @@
15537	16673	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	16674	}
15539	16675
15540		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16676	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
15541	16677	}
15542	16678	}
15543	16679
15544	16680	if (!movingcamera && !PAINTMODE)
15545	16681	object.editWindow.ScreenFitPoint(); // fev 2014
15546	16682
15547		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16683	+ if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
15548	16684	{
15549		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16685	+ Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
15550	16686
15551	16687	Object3D group = new Object3D("inst" + paintcount++);
15552	16688
..	..	@@ -15702,7 +16838,7 @@
15702	16838	gl.glDisable(gl.GL_CULL_FACE);
15703	16839	}
15704	16840
15705		- if (!RENDERSHADOW)
	16841	+ if (!Globals.RENDERSHADOW)
15706	16842	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
15707	16843
15708	16844	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -15712,7 +16848,7 @@
15712	16848	//gl.glColorMask(false, false, false, false);
15713	16849
15714	16850	//render_scene_from_light_view(gl, drawable, 0, 0);
15715		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	16851	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
15716	16852	{
15717	16853	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
15718	16854
..	..	@@ -15772,7 +16908,6 @@
15772	16908
15773	16909	class AntialiasBuffer implements GLEventListener
15774	16910	{
15775		-
15776	16911	CameraPane parent = null;
15777	16912
15778	16913	AntialiasBuffer(CameraPane p)
..	..	@@ -16129,23 +17264,15 @@
16129	17264	int AAbuffersize = 0;
16130	17265
16131	17266	//double[] selectedpoint = new double[3];
16132		- static Superellipsoid selectedpoint = new Superellipsoid();
	17267	+ static Superellipsoid selectedpoint;
16133	17268	static Sphere previousselectedpoint = null;
16134		- static Sphere debugpointG = new Sphere();
16135		- static Sphere debugpointP = new Sphere();
16136		- static Sphere debugpointC = new Sphere();
16137		- static Sphere debugpointR = new Sphere();
	17269	+ static Sphere debugpointG;
	17270	+ static Sphere debugpointP;
	17271	+ static Sphere debugpointC;
	17272	+ static Sphere debugpointR;
16138	17273
16139	17274	static Sphere debugpoints[] = new Sphere[8];
16140	17275
16141		- static
16142		- {
16143		- for (int i=0; i<8; i++)
16144		- {
16145		- debugpoints[i] = new Sphere();
16146		- }
16147		- }
16148		-
16149	17276	static void InitPoints(float radius)
16150	17277	{
16151	17278	for (int i=0; i<8; i++)
..	..	@@ -16165,7 +17292,7 @@
16165	17292	}
16166	17293	}
16167	17294
16168		- static void DrawPoints(CameraPane cpane)
	17295	+ static void DrawPoints(iCameraPane cpane)
16169	17296	{
16170	17297	for (int i=0; i<8; i++) // first and last are red
16171	17298	{
..	..	@@ -16197,10 +17324,11 @@
16197	17324	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
16198	17325	// Depth buffer format
16199	17326	//private int depth_format;
16200		- static public void NextIndex(Object3D o, GL gl)
	17327	+
	17328	+ public void NextIndex()
16201	17329	{
16202	17330	indexcount+=16;
16203		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17331	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
16204	17332	//objects[indexcount] = o;
16205	17333	//System.out.println("indexcount = " + indexcount);
16206	17334	}