~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,14 +55,12 @@
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;
64	61	boolean CACHETEXTURE = true;
65	62	boolean CLEANCACHE = false; // true;
66		- boolean MIPMAP = false; // true;
	63	+ boolean MIPMAP = true; // false; // true;
67	64	boolean COMPRESSTEXTURE = false;
68	65	boolean KOMPACTTEXTURE = false; // true;
69	66	boolean RESIZETEXTURE = false;
..	..	@@ -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;
..	..	@@ -281,14 +335,28 @@
281	335	display.options1[2] = material.shadowbias;
282	336	display.options1[3] = material.aniso;
283	337	display.options1[4] = material.anisoV;
	338	+// System.out.println("display.options1[0] " + display.options1[0]);
	339	+// System.out.println("display.options1[1] " + display.options1[1]);
	340	+// System.out.println("display.options1[2] " + display.options1[2]);
	341	+// System.out.println("display.options1[3] " + display.options1[3]);
	342	+// System.out.println("display.options1[4] " + display.options1[4]);
284	343	display.options2[0] = material.opacity;
285	344	display.options2[1] = material.diffuse;
286	345	display.options2[2] = material.factor;
	346	+// System.out.println("display.options2[0] " + display.options2[0]);
	347	+// System.out.println("display.options2[1] " + display.options2[1]);
	348	+// System.out.println("display.options2[2] " + display.options2[2]);
287	349
288	350	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	351	+// System.out.println("display.options3[0] " + display.options3[0]);
	352	+// System.out.println("display.options3[1] " + display.options3[1]);
	353	+// System.out.println("display.options3[2] " + display.options3[2]);
289	354	display.options4[0] = material.cameralight/0.2f;
290	355	display.options4[1] = material.subsurface;
291	356	display.options4[2] = material.sheen;
	357	+// System.out.println("display.options4[0] " + display.options4[0]);
	358	+// System.out.println("display.options4[1] " + display.options4[1]);
	359	+// System.out.println("display.options4[2] " + display.options4[2]);
292	360
293	361	// if (display.CURRENTANTIALIAS > 0)
294	362	// display.options3[3] /= 4;
..	..	@@ -304,7 +372,7 @@
304	372	/**/
305	373	} else
306	374	{
307		- DrawMaterial(material, selected);
	375	+ DrawMaterial(material, selected, obj.projectedVertices);
308	376	}
309	377	} else
310	378	{
..	..	@@ -328,8 +396,8 @@
328	396	cStatic.objectstack[materialdepth++] = obj;
329	397	//System.out.println("material " + material);
330	398	//Applet3D.tracein("selected ", selected);
331		- display.vector2buffer = obj.projectedVertices;
332		- display.DrawMaterial(material, selected);
	399	+ //display.vector2buffer = obj.projectedVertices;
	400	+ display.DrawMaterial(material, selected, obj.projectedVertices);
333	401	}
334	402	}
335	403
..	..	@@ -346,8 +414,8 @@
346	414	materialdepth -= 1;
347	415	if (materialdepth > 0)
348	416	{
349		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
350		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	417	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	418	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
351	419	}
352	420	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
353	421	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -367,8 +435,8 @@
367	435	materialdepth -= 1;
368	436	if (materialdepth > 0)
369	437	{
370		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
371		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	438	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	439	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
372	440	}
373	441	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
374	442	//else
..	..	@@ -403,16 +471,18 @@
403	471
404	472	javax.media.opengl.GL gl = display.GetGL();
405	473
406		- boolean selectmode = display.DrawMode() == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	474	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
407	475
408	476	//System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
409	477	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
410	478	{
411	479	//gl.glBegin(gl.GL_TRIANGLES);
412		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	480	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	481	+ // TEST LIVE NORMALS && !obj.dontselect
	482	+ ;
413	483	if (!hasnorm)
414	484	{
415		- // System.out.println("FUCK!!");
	485	+ // System.out.println("Mesh normal");
416	486	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
417	487	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
418	488	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -566,7 +636,816 @@
566	636	}
567	637	}
568	638
	639	+ /**
	640	+ * <code>draw</code> renders a <code>TriMesh</code> object including
	641	+ * it's normals, colors, textures and vertices.
	642	+ *
	643	+ * @see Renderer#draw(TriMesh)
	644	+ * @param tris
	645	+ * the mesh to render.
	646	+ */
	647	+ public void DrawParticles(TriMesh geo, Object3D shape, boolean selected, boolean rotate) // TriMesh tris)
	648	+ {
	649	+ CameraPane display = this;
	650	+
	651	+ float r = display.modelParams0[0];
	652	+ float g = display.modelParams0[1];
	653	+ float b = display.modelParams0[2];
	654	+ float opacity = display.modelParams5[1];
	655	+
	656	+ //final GL gl = GLU.getCurrentGL();
	657	+ GL gl = display.GetGL(); // getGL();
	658	+
	659	+ FloatBuffer vertBuf = geo.vertBuf;
	660	+
	661	+ int v = vertBuf.capacity();
	662	+
	663	+ int count = 0;
	664	+
	665	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	666	+ gl.glEnable(gl.GL_CULL_FACE);
	667	+ // gl.glScalef(1.0f/1024,1.0f/1024,1.0f/1024);
	668	+ for (int i=0; i<v/3; i++)
	669	+ {
	670	+ int index3 = i*3;
	671	+
	672	+ if (geo.sizeBuf.get(index3+1) == 0)
	673	+ continue;
	674	+
	675	+ count++;
	676	+
	677	+ int index4 = i*4;
	678	+
	679	+ float tx = vertBuf.get(index3);
	680	+ float ty = vertBuf.get(index3+1);
	681	+ float tz = vertBuf.get(index3+2);
	682	+
	683	+ // if (tx == 0 && ty == 0 && tz == 0)
	684	+ // continue;
	685	+
	686	+ gl.glMatrixMode(gl.GL_TEXTURE);
	687	+ gl.glPushMatrix();
	688	+
	689	+ float[] texmat = geo.texmat;
	690	+ texmat[12] = texmat[13] = texmat[14] = i;
	691	+
	692	+ gl.glMultMatrixf(texmat, 0);
	693	+
	694	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	695	+ gl.glPushMatrix();
	696	+
	697	+ gl.glTranslatef(tx,ty,tz);
	698	+
	699	+ if (rotate)
	700	+ gl.glRotatef(i, 0, 1, 0);
	701	+
	702	+ float size = geo.sizeBuf.get(index3) / 100;
	703	+ gl.glScalef(size,size,size);
	704	+
	705	+ float cr = geo.colorBuf.get(index4);
	706	+ float cg = geo.colorBuf.get(index4+1);
	707	+ float cb = geo.colorBuf.get(index4+2);
	708	+ float ca = geo.colorBuf.get(index4+3);
	709	+
	710	+ display.modelParams0[0] = r * cr;
	711	+ display.modelParams0[1] = g * cg;
	712	+ display.modelParams0[2] = b * cb;
	713	+
	714	+ display.modelParams5[1] = opacity * ca;
	715	+
	716	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	717	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	718	+
	719	+ RandomNode.globalseed = (int)geo.sizeBuf.get(index3+2); // i;
	720	+ RandomNode.globalseed2 = RandomNode.globalseed;
	721	+
	722	+// gl.glColor4f(cr,cg,cb,ca);
	723	+ // gl.glScalef(1024/16,1024/16,1024/16);
	724	+ shape.Draw/Node/(display,null,selected,false); // blocked
	725	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	726	+ //gl.glTranslatef(-tx,-ty,-tz);
	727	+ gl.glPopMatrix();
	728	+
	729	+ gl.glMatrixMode(gl.GL_TEXTURE);
	730	+ gl.glPopMatrix();
	731	+ }
	732	+ // gl.glScalef(1024,1024,1024);
	733	+ if (!cf)
	734	+ gl.glDisable(gl.GL_CULL_FACE);
	735	+
	736	+ display.modelParams0[0] = r;
	737	+ display.modelParams0[1] = g;
	738	+ display.modelParams0[2] = b;
	739	+
	740	+ display.modelParams5[1] = opacity;
	741	+
	742	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	743	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	744	+
	745	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	746	+
	747	+// System.err.println("total = " + v/3 + "; displayed = " + count);
	748	+ if (true)
	749	+ return;
	750	+
	751	+//// if (!tris.predraw(this))
	752	+//// {
	753	+//// return;
	754	+//// }
	755	+//// if (Debug.stats)
	756	+//// {
	757	+//// StatCollector.addStat(StatType.STAT_TRIANGLE_COUNT, tris.getTriangleCount());
	758	+//// StatCollector.addStat(StatType.STAT_VERTEX_COUNT, tris.getVertexCount());
	759	+//// StatCollector.addStat(StatType.STAT_GEOM_COUNT, 1);
	760	+//// }
	761	+////
	762	+//// if (tris.getDisplayListID() != -1)
	763	+//// {
	764	+//// renderDisplayList(tris);
	765	+//// return;
	766	+//// }
	767	+////
	768	+//// if (!generatingDisplayList)
	769	+//// {
	770	+//// applyStates(tris.states, tris);
	771	+//// }
	772	+//// if (Debug.stats)
	773	+//// {
	774	+//// StatCollector.startStat(StatType.STAT_RENDER_TIMER);
	775	+//// }
	776	+//// boolean transformed = doTransforms(tris);
	777	+//
	778	+// int glMode = GL.GL_TRIANGLES;
	779	+// switch (getMode())
	780	+// {
	781	+// case Triangles:
	782	+// glMode = GL.GL_TRIANGLES;
	783	+// break;
	784	+// case Strip:
	785	+// glMode = GL.GL_TRIANGLE_STRIP;
	786	+// break;
	787	+// case Fan:
	788	+// glMode = GL.GL_TRIANGLE_FAN;
	789	+// break;
	790	+// }
	791	+//
	792	+// if (!predrawGeometry(gl))
	793	+// {
	794	+// // make sure only the necessary indices are sent through on old
	795	+// // cards.
	796	+// IntBuffer indices = this.getIndexBuffer();
	797	+// if (indices == null)
	798	+// {
	799	+// logger.severe("missing indices on geometry object: " + this.toString());
	800	+// } else
	801	+// {
	802	+// indices.rewind();
	803	+// indices.limit(this.getMaxIndex());
	804	+//
	805	+// gl.glDrawElements(glMode, indices.limit(), GL.GL_UNSIGNED_INT, indices); // TODO Check <count> and assumed <type> of GL_UNSIGNED_INT
	806	+//
	807	+// indices.clear();
	808	+// }
	809	+// } else
	810	+// {
	811	+// gl.glDrawElements(glMode, this.getIndexBuffer().limit(),
	812	+// GL.GL_UNSIGNED_INT, 0);
	813	+// }
	814	+//
	815	+//// postdrawGeometry(tris);
	816	+//// if (transformed)
	817	+//// {
	818	+//// undoTransforms(tris);
	819	+//// }
	820	+////
	821	+//// if (Debug.stats)
	822	+//// {
	823	+//// StatCollector.endStat(StatType.STAT_RENDER_TIMER);
	824	+//// }
	825	+//// tris.postdraw(this);
	826	+ }
	827	+
	828	+ static Camera localcamera = new Camera();
	829	+ static cVector from = new cVector();
	830	+ static cVector to = new cVector();
	831	+
	832	+ public void PrepOcclusion(BoundaryRep br, double[][] transform)
	833	+ {
	834	+ CameraPane cp = this;
	835	+
	836	+ Camera keep = cp.RenderCamera();
	837	+ cp.renderCamera = localcamera;
	838	+
	839	+ if (br.trimmed)
	840	+ {
	841	+ float[] colors = new float[br.positions.length / 3];
	842	+
	843	+ int i3 = 0;
	844	+ for (int i = 0; i < br.positions.length / 3; i++, i3 += 3)
	845	+ {
	846	+ if (br.normals[i3] == 0 && br.normals[i3+1] == 0 && br.normals[i3+2] == 0)
	847	+ continue;
	848	+
	849	+ from.set(br.positions[i3], br.positions[i3 + 1], br.positions[i3 + 2]);
	850	+ to.set(br.positions[i3] + br.normals[i3],
	851	+ br.positions[i3 + 1] + br.normals[i3 + 1],
	852	+ br.positions[i3 + 2] + br.normals[i3 + 2]);
	853	+ LA.xformPos(from, transform, from);
	854	+ LA.xformPos(to, transform, to); // RIGID ONLY
	855	+ localcamera.setAim(from, to);
	856	+
	857	+ CameraPane.occlusionbuffer.display();
	858	+
	859	+ if (CameraPane.DEBUG_OCCLUSION)
	860	+ cp.display(); // debug
	861	+
	862	+ colors[i] = cp.vertexOcclusion.r;
	863	+ //colors[i3 + 1] = cp.vertexOcclusion.g;
	864	+ //colors[i3 + 2] = cp.vertexOcclusion.b;
	865	+
	866	+ if ((i % 100) == 0 && i != 0)
	867	+ {
	868	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	869	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	870	+ System.out.println((int) (100.0 * i / (br.positions.length / 3)) + "% (" + i + " of " + (br.positions.length / 3) + ")");
	871	+ }
	872	+ }
	873	+
	874	+ br.colors = colors;
	875	+ }
	876	+ else
	877	+ {
	878	+ for (int i = 0; i < br.VertexCount(); i++)
	879	+ {
	880	+ Vertex v = br.GetVertex(i);
	881	+
	882	+ if (v.norm == null \|\| v.norm.x == 0 && v.norm.y == 0 && v.norm.z == 0)
	883	+ continue;
	884	+
	885	+ from.set(v.x, v.y, v.z);
	886	+ to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
	887	+ LA.xformPos(from, transform, from);
	888	+ LA.xformPos(to, transform, to); // RIGID ONLY
	889	+ localcamera.setAim(from, to);
	890	+
	891	+ CameraPane.occlusionbuffer.display();
	892	+
	893	+ if (CameraPane.DEBUG_OCCLUSION)
	894	+ cp.display(); // debug
	895	+
	896	+ v.AO = cp.vertexOcclusion.r;
	897	+
	898	+ if ((i % 100) == 0 && i != 0)
	899	+ {
	900	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	901	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	902	+ System.out.println((int) (100.0 * i / br.VertexCount()) + "% (" + i + " of " + br.VertexCount() + ")");
	903	+ }
	904	+ }
	905	+ }
	906	+
	907	+ //System.out.println("done.");
	908	+
	909	+ cp.renderCamera = keep;
	910	+ }
	911	+
	912	+ void DrawPointFLow(PointFlow pointFlow, Object3D /Composite/ root, boolean selected, boolean blocked)
	913	+ {
	914	+ CameraPane display = this;
	915	+ pointFlow.CreateHT();
	916	+
	917	+ float r = display.modelParams0[0];
	918	+ float g = display.modelParams0[1];
	919	+ float b = display.modelParams0[2];
	920	+ float opacity = display.modelParams5[1];
	921	+
	922	+ //final GL gl = GLU.getCurrentGL();
	923	+ GL gl = display.GetGL(); // getGL();
	924	+
	925	+ int s = pointFlow.points.size();
	926	+
	927	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	928	+ gl.glEnable(gl.GL_CULL_FACE);
	929	+
	930	+ for (int i=s; --i>=0;)
	931	+ //for (int i=0; i<s; i++)
	932	+ {
	933	+ cVector v = pointFlow.points.get(i);
	934	+
	935	+ double mindist = Double.MAX_VALUE;
	936	+
	937	+ double size = pointFlow.minimumSize;
	938	+
	939	+ double distancenext = 0;
	940	+
	941	+ if (i > 0)
	942	+ {
	943	+ cVector w = pointFlow.points.get(i-1);
	944	+
	945	+ double dist = w.distance(v);
	946	+
	947	+ distancenext = dist;
	948	+
	949	+ if (mindist > dist)
	950	+ {
	951	+ mindist = dist;
	952	+ size = mindist*pointFlow.resizefactor;
	953	+ }
	954	+ }
	955	+
	956	+ if (i < s-1)
	957	+ {
	958	+ cVector w = pointFlow.points.get(i+1);
	959	+
	960	+ double dist = w.distance(v);
	961	+
	962	+ if (mindist > dist)
	963	+ {
	964	+ mindist = dist;
	965	+ size = mindist*pointFlow.resizefactor;
	966	+ }
	967	+ }
	968	+
	969	+ if (size < pointFlow.minimumSize)
	970	+ size = pointFlow.minimumSize;
	971	+ if (size > pointFlow.maximumSize)
	972	+ size = pointFlow.maximumSize;
	973	+
	974	+ double tx = v.x;
	975	+ double ty = v.y;
	976	+ double tz = v.z;
	977	+
	978	+ // if (tx == 0 && ty == 0 && tz == 0)
	979	+ // continue;
	980	+
	981	+ gl.glMatrixMode(gl.GL_TEXTURE);
	982	+ gl.glPushMatrix();
	983	+ pointFlow.texmat[12] = pointFlow.texmat[13] = pointFlow.texmat[14] = i;
	984	+
	985	+ gl.glMultMatrixf(pointFlow.texmat, 0);
	986	+
	987	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	988	+ gl.glPushMatrix();
	989	+
	990	+ gl.glTranslated(tx,ty,tz);
	991	+
	992	+ gl.glScaled(size,size,size);
	993	+
	994	+// float cr = colorBuf.get(index4);
	995	+// float cg = colorBuf.get(index4+1);
	996	+// float cb = colorBuf.get(index4+2);
	997	+// float ca = colorBuf.get(index4+3);
	998	+//
	999	+// display.modelParams0[0] = r * cr;
	1000	+// display.modelParams0[1] = g * cg;
	1001	+// display.modelParams0[2] = b * cb;
	1002	+//
	1003	+// display.modelParams5[1] = opacity * ca;
	1004	+//
	1005	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1006	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1007	+//
	1008	+// RandomNode.globalseed = (int)sizeBuf.get(index3+2); // i;
	1009	+// RandomNode.globalseed2 = RandomNode.globalseed;
	1010	+//
	1011	+//// gl.glColor4f(cr,cg,cb,ca);
	1012	+// // gl.glScalef(1024/16,1024/16,1024/16);
	1013	+ pointFlow.geo.Draw/Node/(display,null,selected, blocked);
	1014	+
	1015	+ gl.glPopMatrix();
	1016	+
	1017	+ double step = size/4; //
	1018	+
	1019	+ if (i == 0 \|\| size == 0 \|\| distancenext > 8*size \|\| distancenext < step)
	1020	+ continue;
	1021	+
	1022	+ int nbsteps = (int)(distancenext/step);
	1023	+
	1024	+ step = distancenext/nbsteps;
	1025	+
	1026	+ cVector next = pointFlow.points.get(i-1);
	1027	+
	1028	+ tmp.set(next);
	1029	+ tmp.sub(v);
	1030	+ tmp.normalize();
	1031	+ tmp.mul(step);
	1032	+
	1033	+ // calculate next size
	1034	+ mindist = Double.MAX_VALUE;
	1035	+
	1036	+ double nextsize = pointFlow.minimumSize;
	1037	+
	1038	+ if (i > 1)
	1039	+ {
	1040	+ cVector w = pointFlow.points.get(i-2);
	1041	+
	1042	+ double dist = w.distance(next);
	1043	+
	1044	+ if (mindist > dist)
	1045	+ {
	1046	+ mindist = dist;
	1047	+ nextsize = mindist*pointFlow.resizefactor;
	1048	+ }
	1049	+ }
	1050	+
	1051	+ double dist = v.distance(next);
	1052	+
	1053	+ if (mindist > dist)
	1054	+ {
	1055	+ mindist = dist;
	1056	+ nextsize = mindist*pointFlow.resizefactor;
	1057	+ }
	1058	+
	1059	+ if (nextsize < pointFlow.minimumSize)
	1060	+ nextsize = pointFlow.minimumSize;
	1061	+ if (nextsize > pointFlow.maximumSize)
	1062	+ nextsize = pointFlow.maximumSize;
	1063	+ //
	1064	+
	1065	+ double count = 0;
	1066	+
	1067	+ while (distancenext > 0.000000001) // step
	1068	+ {
	1069	+ gl.glPushMatrix();
	1070	+
	1071	+ gl.glTranslated(tx + tmp.xcount, ty + tmp.ycount, tz + tmp.z*count);
	1072	+
	1073	+ double K = count/nbsteps;
	1074	+
	1075	+ double intersize = Knextsize + (1-K)size;
	1076	+
	1077	+ gl.glScaled(intersize,intersize,intersize);
	1078	+
	1079	+ pointFlow.geo.Draw/Node/(display,null,selected,blocked);
	1080	+
	1081	+ count++;
	1082	+
	1083	+ distancenext -= step;
	1084	+
	1085	+ gl.glPopMatrix();
	1086	+ }
	1087	+
	1088	+ if (count != nbsteps)
	1089	+ assert(count == nbsteps);
	1090	+
	1091	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	1092	+ //gl.glTranslatef(-tx,-ty,-tz);
	1093	+
	1094	+ gl.glMatrixMode(gl.GL_TEXTURE);
	1095	+ gl.glPopMatrix();
	1096	+ }
	1097	+
	1098	+ if (!cf)
	1099	+ gl.glDisable(gl.GL_CULL_FACE);
	1100	+
	1101	+// display.modelParams0[0] = r;
	1102	+// display.modelParams0[1] = g;
	1103	+// display.modelParams0[2] = b;
	1104	+//
	1105	+// display.modelParams5[1] = opacity;
	1106	+//
	1107	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1108	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1109	+
	1110	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	1111	+ }
	1112	+
	1113	+ public void DrawBox(cVector min, cVector max)
	1114	+ {
	1115	+ javax.media.opengl.GL gl = GetGL();
	1116	+ gl.glBegin(gl.GL_LINES);
	1117	+
	1118	+ gl.glVertex3d(min.x, min.y, min.z);
	1119	+ gl.glVertex3d(min.x, min.y, max.z);
	1120	+ gl.glVertex3d(min.x, min.y, min.z);
	1121	+ gl.glVertex3d(min.x, max.y, min.z);
	1122	+ gl.glVertex3d(min.x, min.y, min.z);
	1123	+ gl.glVertex3d(max.x, min.y, min.z);
	1124	+
	1125	+ gl.glVertex3d(max.x, max.y, max.z);
	1126	+ gl.glVertex3d(min.x, max.y, max.z);
	1127	+ gl.glVertex3d(max.x, max.y, max.z);
	1128	+ gl.glVertex3d(max.x, min.y, max.z);
	1129	+ gl.glVertex3d(max.x, max.y, max.z);
	1130	+ gl.glVertex3d(max.x, max.y, min.z);
	1131	+
	1132	+ gl.glEnd();
	1133	+ }
	1134	+
	1135	+ public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
	1136	+ {
	1137	+ int[] strips = bRep.getRawIndices();
	1138	+
	1139	+ javax.media.opengl.GL gl = GetGL();
	1140	+
	1141	+ // TRIANGLE STRIP ARRAY
	1142	+ if (bRep.trimmed)
	1143	+ {
	1144	+ float[] v = bRep.getRawVertices();
	1145	+ float[] n = bRep.getRawNormals();
	1146	+ float[] c = bRep.getRawColors();
	1147	+ float[] uv = bRep.getRawUVMap();
	1148	+
	1149	+ int count2 = 0;
	1150	+ int count3 = 0;
	1151	+
	1152	+ if (n.length > 0)
	1153	+ {
	1154	+ for (int i = 0; i < strips.length; i++)
	1155	+ {
	1156	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1157	+
	1158	+ /*
	1159	+ boolean locked = false;
	1160	+ float eps = 0.1f;
	1161	+ boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	1162	+
	1163	+ int dot = 0;
	1164	+
	1165	+ if ((dot&1) == 0)
	1166	+ dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	1167	+
	1168	+ if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	1169	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	1170	+ else
	1171	+ {
	1172	+ locked = true;
	1173	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1174	+ }
	1175	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	1176	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	1177	+ if (hasnorm)
	1178	+ {
	1179	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	1180	+ gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
	1181	+ }
	1182	+
	1183	+ if ((dot&4) == 0)
	1184	+ dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	1185	+
	1186	+ if (wrap \|\| !locked && (dot&8) != 0)
	1187	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	1188	+ else
	1189	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1190	+
	1191	+ f.dot = dot;
	1192	+ */
	1193	+
	1194	+ if (!selectmode)
	1195	+ {
	1196	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1197	+ {
	1198	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1199	+ } else
	1200	+ {
	1201	+ gl.glNormal3f(0, 0, 1);
	1202	+ }
	1203	+
	1204	+ if (c != null)
	1205	+ //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
	1206	+ {
	1207	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1208	+ }
	1209	+ }
	1210	+
	1211	+ if (flipV)
	1212	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1213	+ else
	1214	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1215	+
	1216	+ //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1217	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1218	+
	1219	+ count2 += 2;
	1220	+ count3 += 3;
	1221	+ if (!selectmode)
	1222	+ {
	1223	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1224	+ {
	1225	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1226	+ } else
	1227	+ {
	1228	+ gl.glNormal3f(0, 0, 1);
	1229	+ }
	1230	+ if (c != null)
	1231	+ {
	1232	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1233	+ }
	1234	+ }
	1235	+
	1236	+ if (flipV)
	1237	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1238	+ else
	1239	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1240	+
	1241	+ //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1242	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1243	+
	1244	+ count2 += 2;
	1245	+ count3 += 3;
	1246	+ for (int j = 0; j < strips[i] - 2; j++)
	1247	+ {
	1248	+ //gl.glTexCoord2d(...);
	1249	+ if (!selectmode)
	1250	+ {
	1251	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1252	+ {
	1253	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1254	+ } else
	1255	+ {
	1256	+ gl.glNormal3f(0, 0, 1);
	1257	+ }
	1258	+ if (c != null)
	1259	+ {
	1260	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1261	+ }
	1262	+ }
	1263	+
	1264	+ if (flipV)
	1265	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1266	+ else
	1267	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1268	+
	1269	+ //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
	1270	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1271	+
	1272	+ count2 += 2;
	1273	+ count3 += 3;
	1274	+ }
	1275	+
	1276	+ gl.glEnd();
	1277	+ }
	1278	+ }
	1279	+
	1280	+ assert count3 == v.length;
	1281	+ }
	1282	+ else // !trimmed
	1283	+ {
	1284	+ int count = 0;
	1285	+ for (int i = 0; i < strips.length; i++)
	1286	+ {
	1287	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1288	+
	1289	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	1290	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	1291	+
	1292	+ drawVertex(gl, p, flipV, selectmode);
	1293	+ drawVertex(gl, q, flipV, selectmode);
	1294	+
	1295	+ for (int j = 0; j < strips[i] - 2; j++)
	1296	+ {
	1297	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	1298	+
	1299	+ // if (j%2 == 0)
	1300	+ // drawFace(p, q, r, display, null);
	1301	+ // else
	1302	+ // drawFace(p, r, q, display, null);
	1303	+
	1304	+ // p = q;
	1305	+ // q = r;
	1306	+ drawVertex(gl, r, flipV, selectmode);
	1307	+ }
	1308	+
	1309	+ gl.glEnd();
	1310	+ }
	1311	+ }
	1312	+ }
	1313	+
	1314	+ static cSpring.Point3D temp = new cSpring.Point3D();
	1315	+ static cSpring.Point3D temp2 = new cSpring.Point3D();
	1316	+ static cSpring.Point3D temp3 = new cSpring.Point3D();
	1317	+
	1318	+ public void DrawDynamicMesh(cMesh mesh)
	1319	+ {
	1320	+ GL gl = GetGL(); // getGL();
	1321	+
	1322	+ cSpring.PhysicsController3D Phys = mesh.Phys;
	1323	+
	1324	+ gl.glDisable(gl.GL_LIGHTING);
	1325	+
	1326	+ gl.glLineWidth(1);
	1327	+ gl.glColor3f(1,1,1);
	1328	+ gl.glBegin(gl.GL_LINES);
	1329	+ double scale = 0;
	1330	+ int count = 0;
	1331	+ for (int s=0; s<Phys.allSprings.size(); s++)
	1332	+ {
	1333	+ cSpring.Spring spring = Phys.allSprings.get(s);
	1334	+ if(s == 0)
	1335	+ {
	1336	+ //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
	1337	+ }
	1338	+ if (mesh.showsprings)
	1339	+ {
	1340	+ temp.set(spring.a.position);
	1341	+ temp.add(spring.b.position);
	1342	+ temp.mul(0.5);
	1343	+ temp2.set(spring.a.position);
	1344	+ temp2.sub(spring.b.position);
	1345	+ temp2.mul(spring.restLength/2);
	1346	+ temp.sub(temp2);
	1347	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1348	+ temp.add(temp2);
	1349	+ temp.add(temp2);
	1350	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1351	+ }
	1352	+
	1353	+ if (spring.isHandle)
	1354	+ continue;
	1355	+
	1356	+ //if (scale < spring.restLength)
	1357	+ scale += spring.restLength;
	1358	+ count++;
	1359	+ }
	1360	+ gl.glEnd();
	1361	+
	1362	+ if (count == 0)
	1363	+ scale = 0.01;
	1364	+ else
	1365	+ scale /= count * 3;
	1366	+
	1367	+ //scale = 0.25;
	1368	+
	1369	+ if (mesh.ShowInfo())
	1370	+ {
	1371	+ gl.glLineWidth(4);
	1372	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1373	+ {
	1374	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1375	+ if (node.mass == 0)
	1376	+ continue;
	1377	+
	1378	+ int i = node.springs==null?-1:node.springs.size();
	1379	+ gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
	1380	+ //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
	1381	+ //temp.normalize();
	1382	+ //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
	1383	+ gl.glBegin(gl.GL_LINES);
	1384	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1385	+ //gl.glVertex3d(node.position.x + node.normal.xscale, node.position.y + node.normal.yscale, node.position.z + node.normal.z*scale);
	1386	+ gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
	1387	+ node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
	1388	+ node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
	1389	+ gl.glEnd();
	1390	+ }
	1391	+
	1392	+ gl.glLineWidth(8);
	1393	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1394	+ {
	1395	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1396	+
	1397	+ if (node.springs != null)
	1398	+ {
	1399	+ for (int i=0; i<node.springs.size(); i+=1)
	1400	+ {
	1401	+ cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
	1402	+
	1403	+ int c = i+1;
	1404	+ // c = node.springs.get(i).nbcopies;
	1405	+
	1406	+ gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
	1407	+ gl.glBegin(gl.GL_LINES);
	1408	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1409	+ gl.glVertex3d(f.position.x/3+node.position.x2/3, f.position.y/3+node.position.y2/3, f.position.z/3+node.position.z*2/3);
	1410	+ gl.glEnd();
	1411	+ }
	1412	+ }
	1413	+ }
	1414	+
	1415	+ gl.glLineWidth(1);
	1416	+ }
	1417	+
	1418	+ gl.glEnable(gl.GL_LIGHTING);
	1419	+ }
	1420	+
569	1421	/// INTERFACE
	1422	+
	1423	+ public void StartTriangles()
	1424	+ {
	1425	+ javax.media.opengl.GL gl = GetGL();
	1426	+ gl.glBegin(gl.GL_TRIANGLES);
	1427	+ }
	1428	+
	1429	+ public void EndTriangles()
	1430	+ {
	1431	+ GetGL().glEnd();
	1432	+ }
	1433	+
	1434	+ void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
	1435	+ {
	1436	+ if (!selectmode)
	1437	+ {
	1438	+ gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1439	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	1440	+
	1441	+ if (flipV)
	1442	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	1443	+ else
	1444	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1445	+ }
	1446	+
	1447	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	1448	+ }
570	1449
571	1450	void SetColor(Object3D obj, Vertex p0)
572	1451	{
..	..	@@ -745,7 +1624,7 @@
745	1624	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
746	1625	}
747	1626
748		- void DrawMaterial(cMaterial material, boolean selected)
	1627	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
749	1628	{
750	1629	CameraPane display = this;
751	1630	//new Exception().printStackTrace();
..	..	@@ -761,18 +1640,18 @@
761	1640	//col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
762	1641	if (!material.multiply)
763	1642	{
764		- display.color = color;
	1643	+ display.color = material.color;
765	1644	display.saturation = material.modulation;
766	1645	}
767	1646	else
768	1647	{
769		- display.color = color2;
	1648	+ display.color = material.color2;
770	1649	display.saturation = material.modulation2;
771	1650	}
772	1651
773	1652	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
774	1653
775		- float[] colorV = GrafreeD.colorV;
	1654	+ float[] colorV = Grafreed.colorV;
776	1655
777	1656	/**/
778	1657	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -780,7 +1659,7 @@
780	1659	colorV[0] = display.modelParams0[0] * material.diffuse;
781	1660	colorV[1] = display.modelParams0[1] * material.diffuse;
782	1661	colorV[2] = display.modelParams0[2] * material.diffuse;
783		- colorV[3] = material.opacity;
	1662	+ colorV[3] = 1; // material.opacity;
784	1663
785	1664	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
786	1665	//System.out.println("Opacity = " + opacity);
..	..	@@ -888,9 +1767,9 @@
888	1767	display.modelParams7[2] = 0;
889	1768	display.modelParams7[3] = 0;
890	1769
891		- display.modelParams6[0] = 100; // criss de bug de bump
	1770	+ //display.modelParams6[0] = 100; // criss de bug de bump
892	1771
893		- Object3D.cVector2[] extparams = display.vector2buffer;
	1772	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
894	1773	if (extparams != null && extparams.length > 0 && extparams[0] != null)
895	1774	{
896	1775	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1032,7 +1911,7 @@
1032	1911	void PushMatrix(double[][] matrix)
1033	1912	{
1034	1913	// GrafreeD.tracein(matrix);
1035		- PushMatrix(matrix,1);
	1914	+ PushMatrix(matrix, 1);
1036	1915	}
1037	1916
1038	1917	void PushMatrix()
..	..	@@ -1129,7 +2008,7 @@
1129	2008
1130	2009	static int camerachangeframe;
1131	2010
1132		- boolean SetCamera(Camera cam)
	2011	+ public boolean SetCamera(Camera cam)
1133	2012	{
1134	2013	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
1135	2014	// return false;
..	..	@@ -1186,7 +2065,7 @@
1186	2065	//System.err.println("Oeil on");
1187	2066	OEIL = true;
1188	2067	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
1189		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2068	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
1190	2069	//pingthread.StepToTarget(true);
1191	2070	}
1192	2071
..	..	@@ -1257,33 +2136,6 @@
1257	2136	mainDL ^= true;
1258	2137	}
1259	2138
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	2139	void ToggleFullScreen()
1288	2140	{
1289	2141	FULLSCREEN ^= true;
..	..	@@ -1294,72 +2146,94 @@
1294	2146	Globals.CROWD ^= true;
1295	2147	}
1296	2148
1297		- void ToggleInertia()
1298		- {
1299		- INERTIA ^= true;
1300		- }
1301		-
1302	2149	void ToggleLocal()
1303	2150	{
1304	2151	LOCALTRANSFORM ^= true;
1305	2152	}
1306	2153
1307		- void ToggleFast()
	2154	+ public void ToggleTexture()
	2155	+ {
	2156	+ textureon ^= true;
	2157	+ }
	2158	+
	2159	+ public void ToggleLive()
	2160	+ {
	2161	+ Globals.setLIVE(Globals.isLIVE() ^ true);
	2162	+
	2163	+ System.err.println("LIVE = " + Globals.isLIVE());
	2164	+
	2165	+ if (!Globals.isLIVE()) // save sound
	2166	+ Grafreed.savesound = true; // wav.save();
	2167	+ // else
	2168	+ repaint(); // start loop // may 2013
	2169	+ }
	2170	+
	2171	+ public void ToggleSupport()
	2172	+ {
	2173	+ SUPPORT ^= true;
	2174	+ }
	2175	+
	2176	+ public void ToggleAbort()
	2177	+ {
	2178	+ ABORTMODE ^= true;
	2179	+ }
	2180	+
	2181	+ public void ToggleInertia()
	2182	+ {
	2183	+ INERTIA ^= true;
	2184	+ }
	2185	+
	2186	+ public void ToggleFast()
1308	2187	{
1309	2188	FAST ^= true;
1310	2189	}
1311	2190
1312		- void ToggleSlowPose()
	2191	+ public void ToggleSlowPose()
1313	2192	{
1314	2193	SLOWPOSE ^= true;
1315	2194	}
1316	2195
1317		- void ToggleFootContact()
1318		- {
1319		- FOOTCONTACT ^= true;
1320		- }
1321		-
1322		- void ToggleBoxMode()
	2196	+ public void ToggleBoxMode()
1323	2197	{
1324	2198	BOXMODE ^= true;
1325	2199	}
1326	2200
1327		- void ToggleSmoothFocus()
	2201	+ public void ToggleZoomBoxMode()
	2202	+ {
	2203	+ ZOOMBOXMODE ^= true;
	2204	+ }
	2205	+
	2206	+ public void ToggleSmoothFocus()
1328	2207	{
1329	2208	SMOOTHFOCUS ^= true;
1330	2209	}
1331	2210
1332		- void ToggleImageFlip()
	2211	+ public void ToggleImageFlip()
1333	2212	{
1334	2213	IMAGEFLIP ^= true;
1335	2214	}
1336	2215
1337		- void ToggleSpeakerMocap()
	2216	+ public void ToggleSpeakerMocap()
1338	2217	{
1339	2218	SPEAKERMOCAP ^= true;
1340	2219	}
1341	2220
1342		- void ToggleSpeakerCamera()
	2221	+ public void ToggleSpeakerCamera()
1343	2222	{
1344	2223	SPEAKERCAMERA ^= true;
1345	2224	}
1346	2225
1347		- void ToggleSpeakerFocus()
	2226	+ public void ToggleSpeakerFocus()
1348	2227	{
1349	2228	SPEAKERFOCUS ^= true;
1350	2229	}
1351	2230
1352		- void ToggleDebug()
1353		- {
1354		- DEBUG ^= true;
1355		- }
1356		-
1357		- void ToggleFrustum()
	2231	+ public void ToggleFrustum()
1358	2232	{
1359	2233	FRUSTUM ^= true;
1360	2234	}
1361	2235
1362		- void ToggleTrack()
	2236	+ public void ToggleTrack()
1363	2237	{
1364	2238	TRACK ^= true;
1365	2239	if (TRACK)
..	..	@@ -1378,25 +2252,35 @@
1378	2252	repaint();
1379	2253	}
1380	2254
1381		- void ToggleTrackOnce()
	2255	+ public void ToggleTrackOnce()
1382	2256	{
1383	2257	TRACKONCE ^= true;
1384	2258	}
1385	2259
1386		- void ToggleShadowTrack()
	2260	+ public void ToggleShadowTrack()
1387	2261	{
1388	2262	SHADOWTRACK ^= true;
1389	2263	repaint();
1390	2264	}
1391	2265
1392		- void ToggleOeil()
	2266	+ public void ToggleOeil()
1393	2267	{
1394	2268	OEIL ^= true;
1395	2269	}
1396	2270
1397		- void ToggleOeilOnce()
	2271	+ public void ToggleOeilOnce()
1398	2272	{
1399	2273	OEILONCE ^= true;
	2274	+ }
	2275	+
	2276	+ void ToggleFootContact()
	2277	+ {
	2278	+ FOOTCONTACT ^= true;
	2279	+ }
	2280	+
	2281	+ void ToggleDebug()
	2282	+ {
	2283	+ Globals.DEBUG ^= true;
1400	2284	}
1401	2285
1402	2286	void ToggleLookAt()
..	..	@@ -1404,9 +2288,9 @@
1404	2288	LOOKAT ^= true;
1405	2289	}
1406	2290
1407		- void ToggleRandom()
	2291	+ void ToggleSwitch()
1408	2292	{
1409		- RANDOM ^= true;
	2293	+ SWITCH ^= true;
1410	2294	}
1411	2295
1412	2296	void ToggleHandles()
..	..	@@ -1414,10 +2298,17 @@
1414	2298	HANDLES ^= true;
1415	2299	}
1416	2300
	2301	+ Object3D paintFolder;
	2302	+
1417	2303	void TogglePaint()
1418	2304	{
1419	2305	PAINTMODE ^= true;
1420	2306	paintcount = 0;
	2307	+
	2308	+ if (PAINTMODE)
	2309	+ {
	2310	+ paintFolder = GetFolder();
	2311	+ }
1421	2312	}
1422	2313
1423	2314	void SwapCamera(int a, int b)
..	..	@@ -1513,7 +2404,7 @@
1513	2404	{
1514	2405	return currentGL;
1515	2406	}
1516		-
	2407	+
1517	2408	/**/
1518	2409	class CacheTexture
1519	2410	{
..	..	@@ -1531,9 +2422,10 @@
1531	2422	/**/
1532	2423
1533	2424	// TEXTURE static Texture texture;
1534		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
1535		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
1536		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2425	+ static public java.util.Hashtable<String, CacheTexture> textures = new java.util.Hashtable<String, CacheTexture>();
	2426	+ static public java.util.Hashtable<BufferedImage, CacheTexture> bimtextures = new java.util.Hashtable<BufferedImage, CacheTexture>();
	2427	+ static public java.util.HashSet<String> usedtextures = new java.util.HashSet<String>();
	2428	+
1537	2429	int pigmentdepth = 0;
1538	2430	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
1539	2431	int bumpdepth = 0;
..	..	@@ -1555,6 +2447,33 @@
1555	2447	true,
1556	2448	com.sun.opengl.util.texture.TextureIO.PNG);
1557	2449	} catch (java.io.IOException e)
	2450	+ {
	2451	+ throw new javax.media.opengl.GLException(e);
	2452	+ }
	2453	+
	2454	+ if (bump)
	2455	+ texturedata = ConvertBump(texturedata, false);
	2456	+
	2457	+ com.sun.opengl.util.texture.Texture texture =
	2458	+ com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2459	+
	2460	+ texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2461	+ texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2462	+
	2463	+ return texture;
	2464	+ }
	2465	+
	2466	+ com.sun.opengl.util.texture.Texture GetBimTexture(BufferedImage name, boolean bump)
	2467	+ {
	2468	+ TextureData texturedata = null;
	2469	+
	2470	+ try
	2471	+ {
	2472	+ texturedata =
	2473	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2474	+ name,
	2475	+ true);
	2476	+ } catch (Exception e)
1558	2477	{
1559	2478	throw new javax.media.opengl.GLException(e);
1560	2479	}
..	..	@@ -2641,6 +3560,8 @@
2641	3560
2642	3561	System.out.println("LOADING TEXTURE : " + name);
2643	3562
	3563	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3564	+
2644	3565	//
2645	3566	if (false) // compressbit > 0)
2646	3567	{
..	..	@@ -3345,6 +4266,7 @@
3345	4266
3346	4267	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
3347	4268	{
	4269	+ new Exception().printStackTrace();
3348	4270	System.exit(0);
3349	4271	com.sun.opengl.util.texture.Texture texture = null;
3350	4272
..	..	@@ -7038,7 +7960,7 @@
7038	7960	String pigment = Object3D.GetPigment(tex);
7039	7961	String bump = Object3D.GetBump(tex);
7040	7962
7041		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7963	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7042	7964	{
7043	7965	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7044	7966	// System.out.println("; bump = " + bump);
..	..	@@ -7055,6 +7977,64 @@
7055	7977
7056	7978	ReleaseTexture(bump, true);
7057	7979	ReleaseTexture(pigment, false);
	7980	+ }
	7981	+
	7982	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	7983	+ {
	7984	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7985	+ {
	7986	+ return;
	7987	+ }
	7988	+
	7989	+ if (tex == null)
	7990	+ {
	7991	+ ReleaseTexture(null, false);
	7992	+ return;
	7993	+ }
	7994	+
	7995	+ String pigment = Object3D.GetPigment(tex);
	7996	+
	7997	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7998	+ {
	7999	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8000	+ // System.out.println("; bump = " + bump);
	8001	+ }
	8002	+
	8003	+ if (pigment.equals(""))
	8004	+ {
	8005	+ pigment = null;
	8006	+ }
	8007	+
	8008	+ ReleaseTexture(pigment, false);
	8009	+ }
	8010	+
	8011	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8012	+ {
	8013	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8014	+ {
	8015	+ return;
	8016	+ }
	8017	+
	8018	+ if (tex == null)
	8019	+ {
	8020	+ ReleaseTexture(null, true);
	8021	+ return;
	8022	+ }
	8023	+
	8024	+ String bump = Object3D.GetBump(tex);
	8025	+
	8026	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8027	+ {
	8028	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8029	+ // System.out.println("; bump = " + bump);
	8030	+ }
	8031	+
	8032	+ if (bump.equals(""))
	8033	+ {
	8034	+ bump = null;
	8035	+ }
	8036	+
	8037	+ ReleaseTexture(bump, true);
7058	8038	}
7059	8039
7060	8040	void ReleaseTexture(String tex, boolean bump)
..	..	@@ -7160,7 +8140,55 @@
7160	8140	}
7161	8141	}
7162	8142
7163		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8143	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
	8144	+ {
	8145	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8146	+// ambientOcclusion ) // \|\| !textureon)
	8147	+// {
	8148	+// return; // false;
	8149	+// }
	8150	+//
	8151	+// if (tex == null)
	8152	+// {
	8153	+// BindTexture(null,false,resolution);
	8154	+// BindTexture(null,true,resolution);
	8155	+// return;
	8156	+// }
	8157	+//
	8158	+// String pigment = Object3D.GetPigment(tex);
	8159	+// String bump = Object3D.GetBump(tex);
	8160	+//
	8161	+// usedtextures.add(pigment);
	8162	+// usedtextures.add(bump);
	8163	+//
	8164	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8165	+// {
	8166	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8167	+// // System.out.println("; bump = " + bump);
	8168	+// }
	8169	+//
	8170	+// if (bump.equals(""))
	8171	+// {
	8172	+// bump = null;
	8173	+// }
	8174	+// if (pigment.equals(""))
	8175	+// {
	8176	+// pigment = null;
	8177	+// }
	8178	+//
	8179	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8180	+// BindTexture(pigment, false, resolution);
	8181	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8182	+// BindTexture(bump, true, resolution);
	8183	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8184	+//
	8185	+// return; // true;
	8186	+
	8187	+ BindPigmentTexture(tex, resolution);
	8188	+ BindBumpTexture(tex, resolution);
	8189	+ }
	8190	+
	8191	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
7164	8192	{
7165	8193	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7166	8194	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7170,18 +8198,48 @@
7170	8198
7171	8199	if (tex == null)
7172	8200	{
7173		- BindTexture(null,false,resolution);
7174		- BindTexture(null,true,resolution);
	8201	+ BindTexture(null, null,false,resolution);
7175	8202	return;
7176	8203	}
7177	8204
7178	8205	String pigment = Object3D.GetPigment(tex);
	8206	+
	8207	+ usedtextures.add(pigment);
	8208	+
	8209	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8210	+ {
	8211	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8212	+ // System.out.println("; bump = " + bump);
	8213	+ }
	8214	+
	8215	+ if (pigment.equals(""))
	8216	+ {
	8217	+ pigment = null;
	8218	+ }
	8219	+
	8220	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8221	+ BindTexture(tex.pigmenttexture, pigment, false, resolution);
	8222	+ }
	8223	+
	8224	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8225	+ {
	8226	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8227	+ ambientOcclusion ) // \|\| !textureon)
	8228	+ {
	8229	+ return; // false;
	8230	+ }
	8231	+
	8232	+ if (tex == null)
	8233	+ {
	8234	+ BindTexture(null, null,true,resolution);
	8235	+ return;
	8236	+ }
	8237	+
7179	8238	String bump = Object3D.GetBump(tex);
7180	8239
7181		- usedtextures.put(pigment, pigment);
7182		- usedtextures.put(bump, bump);
	8240	+ usedtextures.add(bump);
7183	8241
7184		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8242	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7185	8243	{
7186	8244	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
7187	8245	// System.out.println("; bump = " + bump);
..	..	@@ -7191,42 +8249,70 @@
7191	8249	{
7192	8250	bump = null;
7193	8251	}
7194		- if (pigment.equals(""))
7195		- {
7196		- pigment = null;
7197		- }
7198	8252
7199		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
7200		- BindTexture(pigment, false, resolution);
7201	8253	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
7202		- BindTexture(bump, true, resolution);
	8254	+ BindTexture(tex.bumptexture, bump, true, resolution);
7203	8255	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
7204		-
7205		- return; // true;
7206	8256	}
7207	8257
7208		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8258	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8259	+
	8260	+ private boolean FileExists(String tex)
7209	8261	{
7210		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8262	+ if (missingTextures.contains(tex))
	8263	+ {
	8264	+ return false;
	8265	+ }
	8266	+
	8267	+ boolean fileExists = new File(tex).exists();
	8268	+
	8269	+ if (!fileExists)
	8270	+ {
	8271	+ // If file exists, the "new File()" is not executed sgain
	8272	+ missingTextures.add(tex);
	8273	+ }
	8274	+
	8275	+ return fileExists;
	8276	+ }
	8277	+
	8278	+ CacheTexture GetCacheTexture(java.awt.image.BufferedImage bim, String tex, boolean bump, int resolution) throws Exception
	8279	+ {
	8280	+ CacheTexture texturecache = null;
7211	8281
7212	8282	if (tex != null)
7213	8283	{
7214	8284	String texname = tex;
7215	8285
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;
	8286	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8287	+
	8288	+// String[] split = tex.split("Textures");
	8289	+// if (split.length > 1)
	8290	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8291	+// else
	8292	+// if (!texname.startsWith("/"))
	8293	+// texname = "/Users/nbriere/Textures/" + texname;
	8294	+ if (!FileExists(tex))
	8295	+ {
	8296	+ texname = fallbackTextureName;
	8297	+ }
7222	8298
7223	8299	if (CACHETEXTURE)
7224		- texture = textures.get(texname); // TEXTURE CACHE
7225		-
7226		- TextureData texturedata = null;
7227		-
7228		- if (texture == null \|\| texture.resolution < resolution)
7229	8300	{
	8301	+ if (bim == null)
	8302	+ texturecache = textures.get(texname); // TEXTURE CACHE
	8303	+ else
	8304	+ texturecache = bimtextures.get(bim); // TEXTURE CACHE
	8305	+ }
	8306	+
	8307	+ if (texturecache == null \|\| texturecache.resolution < resolution)
	8308	+ {
	8309	+ TextureData texturedata = null;
	8310	+
	8311	+ if (bim == null)
	8312	+ {
	8313	+
	8314	+ }
	8315	+ else
7230	8316	if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
7231	8317	{
7232	8318	assert(!bump);
..	..	@@ -7238,19 +8324,19 @@
7238	8324	// }
7239	8325	// else
7240	8326	// {
7241		- texture = textures.get(tex);
7242		- if (texture == null)
	8327	+ texturecache = textures.get(tex);
	8328	+ if (texturecache == null)
7243	8329	{
7244		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8330	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
7245	8331	}
7246	8332	// }
7247	8333	} else
7248	8334	if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
7249	8335	{
7250	8336	assert(bump);
7251		- texture = textures.get(tex);
7252		- if (texture == null)
7253		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8337	+ texturecache = textures.get(tex);
	8338	+ if (texturecache == null)
	8339	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
7254	8340	} else
7255	8341	{
7256	8342	//if (tex.equals("IMMORTAL"))
..	..	@@ -7260,9 +8346,9 @@
7260	8346	//{
7261	8347	if (tex.equals("WHITE_NOISE"))
7262	8348	{
7263		- texture = textures.get(tex);
7264		- if (texture == null)
7265		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8349	+ texturecache = textures.get(tex);
	8350	+ if (texturecache == null)
	8351	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
7266	8352	} else
7267	8353	{
7268	8354	if (textureon)
..	..	@@ -7287,7 +8373,7 @@
7287	8373	}
7288	8374
7289	8375	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
7290		- if (!new File(cachename).exists())
	8376	+ if (!FileExists(cachename))
7291	8377	cachename = texname;
7292	8378	else
7293	8379	processbump = false; // don't process bump map again
..	..	@@ -7309,7 +8395,7 @@
7309	8395	}
7310	8396
7311	8397	cachename = texname.substring(0, texname.length()-4)+ext+".png";
7312		- if (!new File(cachename).exists())
	8398	+ if (!FileExists(cachename))
7313	8399	cachename = texname;
7314	8400	else
7315	8401	processbump = false; // don't process bump map again
..	..	@@ -7318,20 +8404,22 @@
7318	8404	texturedata = GetFileTexture(cachename, processbump, resolution);
7319	8405
7320	8406
7321		- if (texturedata != null)
7322		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8407	+ if (texturedata == null)
	8408	+ throw new Exception();
	8409	+
	8410	+ texturecache = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
7323	8411	//texture = GetTexture(tex, bump);
7324	8412	}
7325	8413	}
7326	8414	//}
7327	8415	}
7328	8416
7329		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8417	+ if (/CACHETEXTURE &&/ texturecache != null && textureon)
7330	8418	{
7331	8419	//return false;
7332	8420
7333	8421	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
7334		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8422	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
7335	8423	{
7336	8424	// String ext = "_highres";
7337	8425	// if (REDUCETEXTURE)
..	..	@@ -7420,8 +8508,8 @@
7420	8508	textures.remove(texname);
7421	8509	}
7422	8510
7423		- texture.texturedata = texturedata;
7424		- textures.put(texname, texture);
	8511	+ //texture.texturedata = texturedata;
	8512	+ textures.put(texname, texturecache);
7425	8513
7426	8514	// newtex = true;
7427	8515	}
..	..	@@ -7437,12 +8525,12 @@
7437	8525	}
7438	8526	}
7439	8527
7440		- return texture;
	8528	+ return texturecache;
7441	8529	}
7442	8530
7443		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8531	+ com.sun.opengl.util.texture.Texture GetTexture(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
7444	8532	{
7445		- CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	8533	+ CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
7446	8534
7447	8535	if (bump)
7448	8536	{
..	..	@@ -7458,23 +8546,23 @@
7458	8546	return texture!=null?texture.texture:null;
7459	8547	}
7460	8548
7461		- com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8549	+ public com.sun.opengl.util.texture.TextureData GetTextureData(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
7462	8550	{
7463		- CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	8551	+ CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
7464	8552
7465	8553	return texture!=null?texture.texturedata:null;
7466	8554	}
7467	8555
7468		- boolean BindTexture(String tex, boolean bump, int resolution)
	8556	+ boolean BindTexture(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
7469	8557	{
7470	8558	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
7471	8559	{
7472	8560	return false;
7473	8561	}
7474	8562
7475		- boolean newtex = false;
	8563	+ //boolean newtex = false;
7476	8564
7477		- com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
	8565	+ com.sun.opengl.util.texture.Texture texture = GetTexture(stream, tex, bump, resolution);
7478	8566
7479	8567	if (texture == null)
7480	8568	return false;
..	..	@@ -7504,7 +8592,7 @@
7504	8592	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
7505	8593	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
7506	8594
7507		- return newtex;
	8595	+ return true; // Warning: not used.
7508	8596	}
7509	8597
7510	8598	ShadowBuffer shadowPBuf;
..	..	@@ -8342,11 +9430,35 @@
8342	9430	jy8[3] = 0.5f;
8343	9431	}
8344	9432
8345		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9433	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
8346	9434	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
8347	9435	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
8348	9436	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
8349	9437
	9438	+ void ResetOptions()
	9439	+ {
	9440	+ options1[0] = 100;
	9441	+ options1[1] = 0.025f;
	9442	+ options1[2] = 0.01f;
	9443	+ options1[3] = 0;
	9444	+ options1[4] = 0;
	9445	+
	9446	+ options2[0] = 0;
	9447	+ options2[1] = 0.75f;
	9448	+ options2[2] = 0;
	9449	+ options2[3] = 0;
	9450	+
	9451	+ options3[0] = 1;
	9452	+ options3[1] = 1;
	9453	+ options3[2] = 1;
	9454	+ options3[3] = 0;
	9455	+
	9456	+ options4[0] = 1;
	9457	+ options4[1] = 0;
	9458	+ options4[2] = 1;
	9459	+ options4[3] = 0;
	9460	+ }
	9461	+
8350	9462	static int imagecount = 0; // movie generation
8351	9463
8352	9464	static int jitter = 0;
..	..	@@ -8442,8 +9554,8 @@
8442	9554	assert (parentcam != renderCamera);
8443	9555
8444	9556	if (renderCamera != lightCamera)
8445		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8446		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9557	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9558	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
8447	9559
8448	9560	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
8449	9561
..	..	@@ -8458,8 +9570,8 @@
8458	9570	LA.matCopy(renderCamera.fromScreen, matrix);
8459	9571
8460	9572	if (renderCamera != lightCamera)
8461		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8462		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9573	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9574	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
8463	9575
8464	9576	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
8465	9577
..	..	@@ -8531,7 +9643,7 @@
8531	9643	//gl.glFlush();
8532	9644	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
8533	9645
8534		- if (ANIMATION && ABORTED)
	9646	+ if (Globals.ANIMATION && ABORTED)
8535	9647	{
8536	9648	System.err.println(" ABORTED FRAME");
8537	9649	break;
..	..	@@ -8561,7 +9673,7 @@
8561	9673	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
8562	9674
8563	9675	// save image
8564		- if (ANIMATION && !ABORTED)
	9676	+ if (Globals.ANIMATION && !ABORTED)
8565	9677	{
8566	9678	VPwidth = viewport[2];
8567	9679	VPheight = viewport[3];
..	..	@@ -8672,11 +9784,11 @@
8672	9784
8673	9785	// imagecount++;
8674	9786
8675		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9787	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
8676	9788
8677	9789	if (!BOXMODE)
8678	9790	{
8679		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9791	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
8680	9792	}
8681	9793
8682	9794	if (!BOXMODE)
..	..	@@ -8714,7 +9826,7 @@
8714	9826	ABORTED = false;
8715	9827	}
8716	9828	else
8717		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9829	+ Grafreed.wav.cursor += 735 * ACSIZE;
8718	9830
8719	9831	if (false)
8720	9832	{
..	..	@@ -9377,11 +10489,11 @@
9377	10489
9378	10490	public void display(GLAutoDrawable drawable)
9379	10491	{
9380		- if (GrafreeD.savesound && GrafreeD.hassound)
	10492	+ if (Grafreed.savesound && Grafreed.hassound)
9381	10493	{
9382		- GrafreeD.wav.save();
9383		- GrafreeD.savesound = false;
9384		- GrafreeD.hassound = false;
	10494	+ Grafreed.wav.save();
	10495	+ Grafreed.savesound = false;
	10496	+ Grafreed.hassound = false;
9385	10497	}
9386	10498	// if (DEBUG_SELECTION)
9387	10499	// {
..	..	@@ -9457,6 +10569,7 @@
9457	10569	ANTIALIAS = 0;
9458	10570	//System.out.println("RESTART");
9459	10571	AAtimer.restart();
	10572	+ Globals.TIMERRUNNING = true;
9460	10573	}
9461	10574	}
9462	10575	}
..	..	@@ -9511,7 +10624,7 @@
9511	10624	Object3D theobject = object;
9512	10625	Object3D theparent = object.parent;
9513	10626	object.parent = null;
9514		- object = (Object3D)GrafreeD.clone(object);
	10627	+ object = (Object3D)Grafreed.clone(object);
9515	10628	object.Stripify();
9516	10629	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
9517	10630	theobject.PreprocessOcclusion(this);
..	..	@@ -9524,13 +10637,14 @@
9524	10637	ambientOcclusion = false;
9525	10638	}
9526	10639
9527		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10640	+ if (//Globals.lighttouched &&
	10641	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
9528	10642	{
9529	10643	//if (RENDERSHADOW) // ?
9530	10644	if (!IsFrozen())
9531	10645	{
9532	10646	// dec 2012
9533		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10647	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
9534	10648	{
9535	10649	Globals.framecount++;
9536	10650	shadowbuffer.display();
..	..	@@ -9657,8 +10771,8 @@
9657	10771
9658	10772	// if (parentcam != renderCamera) // not a light
9659	10773	if (cam != lightCamera)
9660		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9661		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10774	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10775	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9662	10776
9663	10777	for (int j = 0; j < 4; j++)
9664	10778	{
..	..	@@ -9672,8 +10786,8 @@
9672	10786
9673	10787	// if (parentcam != renderCamera) // not a light
9674	10788	if (cam != lightCamera)
9675		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9676		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10789	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10790	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9677	10791
9678	10792	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
9679	10793
..	..	@@ -9932,7 +11046,16 @@
9932	11046	// Bump noise
9933	11047	gl.glActiveTexture(GL.GL_TEXTURE6);
9934	11048	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
9935		- BindTexture(NOISE_TEXTURE, false, 2);
	11049	+
	11050	+ try
	11051	+ {
	11052	+ BindTexture(null, NOISE_TEXTURE, false, 2);
	11053	+ }
	11054	+ catch (Exception e)
	11055	+ {
	11056	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11057	+ }
	11058	+
9936	11059
9937	11060	gl.glActiveTexture(GL.GL_TEXTURE0);
9938	11061	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -9955,9 +11078,9 @@
9955	11078
9956	11079	gl.glMatrixMode(GL.GL_MODELVIEW);
9957	11080
9958		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
9959		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
9960		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11081	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11082	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11083	+gl.glEnable(gl.GL_MULTISAMPLE);
9961	11084	} else
9962	11085	{
9963	11086	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -9968,7 +11091,7 @@
9968	11091	//System.out.println("BLENDING ON");
9969	11092	gl.glEnable(GL.GL_BLEND);
9970	11093	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
9971		-
	11094	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
9972	11095	gl.glMatrixMode(gl.GL_PROJECTION);
9973	11096	gl.glLoadIdentity();
9974	11097
..	..	@@ -10057,8 +11180,8 @@
10057	11180	System.err.println("parentcam != renderCamera");
10058	11181
10059	11182	// if (cam != lightCamera)
10060		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10061		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11183	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11184	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10062	11185	}
10063	11186
10064	11187	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10079,8 +11202,8 @@
10079	11202	if (true) // TODO
10080	11203	{
10081	11204	if (cam != lightCamera)
10082		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10083		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11205	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11206	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10084	11207	}
10085	11208
10086	11209	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -10146,7 +11269,7 @@
10146	11269	fragmentMode \|= (lightslot - 64) << 2; // 1; // first bit is available for aniso
10147	11270	//System.out.println("fragmentMode = " + fragmentMode);
10148	11271
10149		- if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| DEBUG_SELECTION)
	11272	+ if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| IsDebugSelection())
10150	11273	{
10151	11274	/*
10152	11275	if (CULLFACE \|\| (ambientOcclusion && OCCLUSION_CULLING))
..	..	@@ -10396,8 +11519,14 @@
10396	11519	{
10397	11520	renderpass++;
10398	11521	// System.out.println("Draw object... ");
	11522	+ STEP = 1;
10399	11523	if (FAST) // in case there is no script
10400		- STEP = 16;
	11524	+ STEP = 8;
	11525	+
	11526	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11527	+ {
	11528	+ STEP *= 4;
	11529	+ }
10401	11530
10402	11531	//object.FullInvariants();
10403	11532
..	..	@@ -10411,23 +11540,44 @@
10411	11540	e.printStackTrace();
10412	11541	}
10413	11542
10414		- if (GrafreeD.RENDERME > 0)
10415		- GrafreeD.RENDERME--; // mechante magouille
	11543	+ if (Grafreed.RENDERME > 0)
	11544	+ Grafreed.RENDERME--; // mechante magouille
10416	11545
10417	11546	Globals.ONESTEP = false;
10418	11547	}
10419	11548
10420	11549	static boolean zoomonce = false;
10421	11550
	11551	+ static void CreateSelectedPoint()
	11552	+ {
	11553	+ if (selectedpoint == null)
	11554	+ {
	11555	+ debugpointG = new Sphere();
	11556	+ debugpointP = new Sphere();
	11557	+ debugpointC = new Sphere();
	11558	+ debugpointR = new Sphere();
	11559	+
	11560	+ selectedpoint = new Superellipsoid();
	11561	+
	11562	+ for (int i=0; i<8; i++)
	11563	+ {
	11564	+ debugpoints[i] = new Sphere();
	11565	+ }
	11566	+ }
	11567	+ }
	11568	+
10422	11569	void DrawObject(GL gl, boolean draw)
10423	11570	{
	11571	+ // To clear camera values
	11572	+ ResetOptions();
	11573	+
10424	11574	//System.out.println("DRAW OBJECT " + mouseDown);
10425	11575	// DrawMode() = SELECTION;
10426	11576	//GL gl = getGL();
10427	11577	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
10428	11578	{
10429	11579	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
10430		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11580	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
10431	11581	pingthread.StepToTarget(true); // true);
10432	11582	// zoomonce = false;
10433	11583	}
..	..	@@ -10447,7 +11597,7 @@
10447	11597	callist = gl.glGenLists(1);
10448	11598	}
10449	11599
10450		- boolean selectmode = DrawMode() == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	11600	+ boolean selectmode = DrawMode() == SELECTION \|\| IsDebugSelection();
10451	11601
10452	11602	boolean active = !selectmode; // DrawMode() != SELECTION; // mouseDown;
10453	11603
..	..	@@ -10482,7 +11632,14 @@
10482	11632
10483	11633	usedtextures.clear();
10484	11634
10485		- BindTextures(DEFAULT_TEXTURES, 2);
	11635	+ try
	11636	+ {
	11637	+ BindTextures(DEFAULT_TEXTURES, 2);
	11638	+ }
	11639	+ catch (Exception e)
	11640	+ {
	11641	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11642	+ }
10486	11643	}
10487	11644	//System.out.println("--> " + stackdepth);
10488	11645	// GrafreeD.traceon();
..	..	@@ -10492,8 +11649,9 @@
10492	11649
10493	11650	if (DrawMode() == DEFAULT)
10494	11651	{
10495		- if (DEBUG)
	11652	+ if (Globals.DEBUG)
10496	11653	{
	11654	+ CreateSelectedPoint();
10497	11655	float radius = 0.05f;
10498	11656	if (selectedpoint.radius != radius)
10499	11657	{
..	..	@@ -10556,7 +11714,7 @@
10556	11714	if (tex.equals("WHITE_NOISE"))
10557	11715	continue;
10558	11716
10559		- if (!usedtextures.containsKey(tex))
	11717	+ if (!usedtextures.contains(tex))
10560	11718	{
10561	11719	// System.out.println("DISPOSE +++++++++++++++ " + tex);
10562	11720	textures.get(tex).texture.dispose();
..	..	@@ -10573,7 +11731,14 @@
10573	11731	if (checker != null && DrawMode() == DEFAULT)
10574	11732	{
10575	11733	//BindTexture(IMMORTAL_TEXTURE);
10576		- BindTextures(checker.GetTextures(), checker.texres);
	11734	+ try
	11735	+ {
	11736	+ BindTextures(checker.GetTextures(), checker.texres);
	11737	+ }
	11738	+ catch (Exception e)
	11739	+ {
	11740	+ System.err.println("FAILED: " + checker.GetTextures());
	11741	+ }
10577	11742	// NEAREST
10578	11743	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
10579	11744	DrawChecker(gl);
..	..	@@ -10655,7 +11820,7 @@
10655	11820	return;
10656	11821	}
10657	11822
10658		- String string = obj.GetToolTip();
	11823	+ String string = obj.toString(); //.GetToolTip();
10659	11824
10660	11825	GL gl = GetGL();
10661	11826
..	..	@@ -10972,8 +12137,8 @@
10972	12137	//obj.TransformToWorld(light, light);
10973	12138	for (int i = tp.size(); --i >= 0;)
10974	12139	{
10975		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
10976		- LA.xformPos(light, tp.get(i).toParent, light);
	12140	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12141	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
10977	12142	}
10978	12143
10979	12144
..	..	@@ -10990,8 +12155,8 @@
10990	12155	parentcam = cameras[0];
10991	12156	}
10992	12157
10993		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10994		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12158	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12159	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
10995	12160
10996	12161	LA.xformPos(light, renderCamera.toScreen, light);
10997	12162
..	..	@@ -11605,8 +12770,8 @@
11605	12770
11606	12771	// display shadow only (bump == 0)
11607	12772	"SUB temp.x, half.x, shadow.x;" +
11608		- "MOV temp.y, -params6.x;" +
11609		- "SLT temp.z, temp.y, zero.x;" +
	12773	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12774	+ "SLT temp.z, temp.y, -one2048th.x;" +
11610	12775	"SUB temp.y, one.x, temp.z;" +
11611	12776	"MUL temp.x, temp.x, temp.y;" +
11612	12777	"KIL temp.x;" +
..	..	@@ -11735,8 +12900,10 @@
11735	12900	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
11736	12901
11737	12902	"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
	12903	+ // Tuning for default skin
	12904	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12905	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12906	+ "ADD temp.y, one.y, options2.y;" + // subsurface
11740	12907	"MUL temp.x, temp.x, temp.y;" +
11741	12908
11742	12909	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -11935,7 +13102,7 @@
11935	13102	//once = true;
11936	13103	}
11937	13104
11938		- System.out.print("Program #" + mode + "; length = " + program.length());
	13105	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
11939	13106	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
11940	13107	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
11941	13108
..	..	@@ -12068,12 +13235,16 @@
12068	13235
12069	13236	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12070	13237	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13238	+
	13239	+ // Compare fragment depth in light space with shadowmap.
12071	13240	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12072	13241	"SGE temp.y, temp.x, zero.x;" +
12073		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13242	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13243	+
	13244	+ // Reverse comparison
12074	13245	"SUB temp.x, one.x, temp.x;" +
12075	13246	"MUL " + shadow + ".x, temp.x, temp.y;" +
12076		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13247	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12077	13248	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12078	13249
12079	13250	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12087,6 +13258,10 @@
12087	13258	// No shadow for backface
12088	13259	"DP3 temp.x, normal, lightd;" +
12089	13260	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13261	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13262	+
	13263	+ // No shadow when out of frustrum
	13264	+ "SGE temp.x, " + depth + ".z, one.z;" +
12090	13265	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12091	13266	"";
12092	13267	}
..	..	@@ -12233,7 +13408,8 @@
12233	13408	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
12234	13409	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
12235	13410	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
12236		- Object3D.cVector2[] vector2buffer;
	13411	+
	13412	+ //Object3D.cVector2[] vector2buffer;
12237	13413
12238	13414	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
12239	13415	// OUT : diff, spec
..	..	@@ -12249,9 +13425,10 @@
12249	13425	"DP3 " + dest + ".z," + "normals," + "eye;" +
12250	13426	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
12251	13427	//"MOV " + dest + ".w," + "normal.z;" +
12252		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
12253		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
12254		- //"MOV " + dest + ".z," + "params2.w;" +
	13428	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13429	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13430	+
	13431	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
12255	13432	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
12256	13433	"RCP " + dest + ".w," + dest + ".w;" +
12257	13434	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -12645,7 +13822,7 @@
12645	13822	public void mousePressed(MouseEvent e)
12646	13823	{
12647	13824	//System.out.println("mousePressed: " + e);
12648		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13825	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
12649	13826	}
12650	13827
12651	13828	static long prevtime = 0;
..	..	@@ -12672,6 +13849,7 @@
12672	13849
12673	13850	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
12674	13851
	13852	+ if (BUTTONLESSWHEEL)
12675	13853	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
12676	13854	{
12677	13855	return;
..	..	@@ -12680,7 +13858,7 @@
12680	13858	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
12681	13859
12682	13860	// TIMER
12683		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	13861	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
12684	13862	{
12685	13863	keepboxmode = BOXMODE;
12686	13864	keepsupport = SUPPORT;
..	..	@@ -12720,8 +13898,8 @@
12720	13898	// mode \|= META;
12721	13899	//}
12722	13900
12723		- SetMouseMode(WHEEL \| e.getModifiersEx());
12724		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13901	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13902	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
12725	13903	anchorX = ax;
12726	13904	anchorY = ay;
12727	13905	prevX = px;
..	..	@@ -12755,6 +13933,7 @@
12755	13933	else
12756	13934	if (evt.getSource() == AAtimer)
12757	13935	{
	13936	+ Globals.TIMERRUNNING = false;
12758	13937	if (mouseDown)
12759	13938	{
12760	13939	//new Exception().printStackTrace();
..	..	@@ -12780,6 +13959,10 @@
12780	13959	// LIVE = waslive;
12781	13960	// wasliveok = true;
12782	13961	// waslive = false;
	13962	+
	13963	+ // May 2019 Forget it:
	13964	+ if (true)
	13965	+ return;
12783	13966
12784	13967	// source == timer
12785	13968	if (mouseDown)
..	..	@@ -12810,7 +13993,7 @@
12810	13993
12811	13994	// fev 2014???
12812	13995	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
12813		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	13996	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
12814	13997	pingthread.StepToTarget(true); // true);
12815	13998	}
12816	13999	// if (!LIVE)
..	..	@@ -12819,12 +14002,13 @@
12819	14002
12820	14003	javax.swing.Timer timer = new javax.swing.Timer(350, this);
12821	14004
12822		- void clickStart(int x, int y, int modifiers)
	14005	+ void clickStart(int x, int y, int modifiers, int modifiersex)
12823	14006	{
12824	14007	if (!wasliveok)
12825	14008	return;
12826	14009
12827	14010	AAtimer.restart(); //
	14011	+ Globals.TIMERRUNNING = true;
12828	14012
12829	14013	// waslive = LIVE;
12830	14014	// LIVE = false;
..	..	@@ -12836,7 +14020,7 @@
12836	14020	// touched = true; // main DL
12837	14021	if (isRenderer)
12838	14022	{
12839		- SetMouseMode(modifiers);
	14023	+ SetMouseMode(modifiers, modifiersex);
12840	14024	}
12841	14025
12842	14026	selectX = anchorX = x;
..	..	@@ -12849,7 +14033,7 @@
12849	14033	clicked = true;
12850	14034	hold = false;
12851	14035
12852		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14036	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
12853	14037	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
12854	14038	{
12855	14039	// System.out.println("RESTART II " + modifiers);
..	..	@@ -12880,7 +14064,7 @@
12880	14064	info.camera = renderCamera;
12881	14065	info.x = x;
12882	14066	info.y = y;
12883		- info.modifiers = modifiers;
	14067	+ info.modifiers = modifiersex;
12884	14068	editObj = object.doEditClick(info, 0);
12885	14069	if (!editObj)
12886	14070	{
..	..	@@ -12897,11 +14081,14 @@
12897	14081
12898	14082	public void mouseDragged(MouseEvent e)
12899	14083	{
	14084	+ Globals.MOUSEDRAGGED = true;
	14085	+
	14086	+ //System.out.println("mouseDragged: " + e);
12900	14087	if (isRenderer)
12901	14088	movingcamera = true;
	14089	+
12902	14090	//if (drawing)
12903	14091	//return;
12904		- //System.out.println("mouseDragged: " + e);
12905	14092	if ((e.getModifiersEx() & CTRL) != 0
12906	14093	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
12907	14094	{
..	..	@@ -12909,7 +14096,7 @@
12909	14096	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12910	14097	}
12911	14098	else
12912		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14099	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
12913	14100
12914	14101	//try { Thread.sleep(1); } catch (Exception ex) {}
12915	14102	}
..	..	@@ -12921,6 +14108,11 @@
12921	14108	cVector tmp = new cVector();
12922	14109	cVector tmp2 = new cVector();
12923	14110	boolean isMoving;
	14111	+
	14112	+ public cVector TargetLookAt()
	14113	+ {
	14114	+ return targetLookAt;
	14115	+ }
12924	14116
12925	14117	class PingThread extends Thread
12926	14118	{
..	..	@@ -13077,6 +14269,7 @@
13077	14269
13078	14270	public void run()
13079	14271	{
	14272	+ new Exception().printStackTrace();
13080	14273	System.exit(0);
13081	14274	for (;;)
13082	14275	{
..	..	@@ -13140,7 +14333,7 @@
13140	14333	{
13141	14334	Globals.lighttouched = true;
13142	14335	}
13143		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14336	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
13144	14337	}
13145	14338	//else
13146	14339	}
..	..	@@ -13154,12 +14347,12 @@
13154	14347	void GoDown(int mod)
13155	14348	{
13156	14349	MODIFIERS \|= COMMAND;
13157		- /*
	14350	+ /**/
13158	14351	if((mod&SHIFT) == SHIFT)
13159	14352	manipCamera.RotatePosition(0, -speed);
13160	14353	else
13161		- manipCamera.BackForth(0, -speed*delta, getWidth());
13162		- */
	14354	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14355	+ /**/
13163	14356	if ((mod & SHIFT) == SHIFT)
13164	14357	{
13165	14358	mouseMode = mouseMode; // VR??
..	..	@@ -13175,12 +14368,12 @@
13175	14368	void GoUp(int mod)
13176	14369	{
13177	14370	MODIFIERS \|= COMMAND;
13178		- /*
	14371	+ /**/
13179	14372	if((mod&SHIFT) == SHIFT)
13180	14373	manipCamera.RotatePosition(0, speed);
13181	14374	else
13182		- manipCamera.BackForth(0, speed*delta, getWidth());
13183		- */
	14375	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14376	+ /**/
13184	14377	if ((mod & SHIFT) == SHIFT)
13185	14378	{
13186	14379	mouseMode = mouseMode;
..	..	@@ -13196,12 +14389,12 @@
13196	14389	void GoLeft(int mod)
13197	14390	{
13198	14391	MODIFIERS \|= COMMAND;
13199		- /*
	14392	+ /**/
13200	14393	if((mod&SHIFT) == SHIFT)
13201		- manipCamera.RotatePosition(speed, 0);
13202		- else
13203	14394	manipCamera.Translate(speed*delta, 0, getWidth());
13204		- */
	14395	+ else
	14396	+ manipCamera.RotatePosition(speed, 0);
	14397	+ /**/
13205	14398	if ((mod & SHIFT) == SHIFT)
13206	14399	{
13207	14400	mouseMode = mouseMode;
..	..	@@ -13217,12 +14410,12 @@
13217	14410	void GoRight(int mod)
13218	14411	{
13219	14412	MODIFIERS \|= COMMAND;
13220		- /*
	14413	+ /**/
13221	14414	if((mod&SHIFT) == SHIFT)
13222		- manipCamera.RotatePosition(-speed, 0);
13223		- else
13224	14415	manipCamera.Translate(-speed*delta, 0, getWidth());
13225		- */
	14416	+ else
	14417	+ manipCamera.RotatePosition(-speed, 0);
	14418	+ /**/
13226	14419	if ((mod & SHIFT) == SHIFT)
13227	14420	{
13228	14421	mouseMode = mouseMode;
..	..	@@ -13240,7 +14433,7 @@
13240	14433	int X, Y;
13241	14434	boolean SX, SY;
13242	14435
13243		- void drag(int x, int y, int modifiers)
	14436	+ void drag(int x, int y, int modifiers, int modifiersex)
13244	14437	{
13245	14438	if (IsFrozen())
13246	14439	{
..	..	@@ -13249,17 +14442,17 @@
13249	14442
13250	14443	drag = true; // NEW
13251	14444
13252		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14445	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
13253	14446
13254	14447	X = x;
13255	14448	Y = y;
13256	14449	// floating state for animation
13257		- MODIFIERS = modifiers;
13258		- modifiers &= ~1024;
	14450	+ MODIFIERS = modifiersex;
	14451	+ modifiersex &= ~1024;
13259	14452	if (false) // modifiers != 0)
13260	14453	{
13261	14454	//new Exception().printStackTrace();
13262		- System.out.println("mouseDragged: " + modifiers);
	14455	+ System.out.println("mouseDragged: " + modifiersex);
13263	14456	System.out.println("SHIFT = " + SHIFT);
13264	14457	System.out.println("CONTROL = " + COMMAND);
13265	14458	System.out.println("META = " + META);
..	..	@@ -13279,7 +14472,8 @@
13279	14472	info.camera = renderCamera;
13280	14473	info.x = x;
13281	14474	info.y = y;
13282		- object.editWindow.copy.doEditDrag(info);
	14475	+ object.GetWindow().copy
	14476	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
13283	14477	} else
13284	14478	{
13285	14479	if (x < startX)
..	..	@@ -13431,7 +14625,6 @@
13431	14625	public void mouseMoved(MouseEvent e)
13432	14626	{
13433	14627	//System.out.println("mouseMoved: " + e);
13434		-
13435	14628	if (isRenderer)
13436	14629	return;
13437	14630
..	..	@@ -13444,7 +14637,9 @@
13444	14637	ci.camera = renderCamera;
13445	14638	if (!isRenderer)
13446	14639	{
13447		- if (object.editWindow.copy.doEditClick(ci, 0))
	14640	+ //ObjEditor editWindow = object.editWindow;
	14641	+ //Object3D copy = editWindow.copy;
	14642	+ if (object.doEditClick(ci, 0))
13448	14643	{
13449	14644	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
13450	14645	} else
..	..	@@ -13456,7 +14651,11 @@
13456	14651
13457	14652	public void mouseReleased(MouseEvent e)
13458	14653	{
	14654	+ Globals.MOUSEDRAGGED = false;
	14655	+
13459	14656	movingcamera = false;
	14657	+ X = 0; // getBounds().width/2;
	14658	+ Y = 0; // getBounds().height/2;
13460	14659	//System.out.println("mouseReleased: " + e);
13461	14660	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13462	14661	}
..	..	@@ -13479,9 +14678,9 @@
13479	14678	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
13480	14679	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
13481	14680
13482		- if (control \|\| command \|\| IsFrozen())
	14681	+// No delay if (control \|\| command \|\| IsFrozen())
13483	14682	timeout = true;
13484		- else
	14683	+// ?? May 2019 else
13485	14684	// timer.setDelay((modifiers & 128) != 0?0:350);
13486	14685	mouseDown = false;
13487	14686	if (!control && !command) // june 2013
..	..	@@ -13591,7 +14790,7 @@
13591	14790	System.out.println("keyReleased: " + e);
13592	14791	}
13593	14792
13594		- void SetMouseMode(int modifiers)
	14793	+ void SetMouseMode(int modifiers, int modifiersex)
13595	14794	{
13596	14795	//System.out.println("SetMouseMode = " + modifiers);
13597	14796	//modifiers &= ~1024;
..	..	@@ -13603,25 +14802,25 @@
13603	14802	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
13604	14803	// return;
13605	14804	//System.out.println("SetMode = " + modifiers);
13606		- if ((modifiers & WHEEL) == WHEEL)
	14805	+ if ((modifiersex & WHEEL) == WHEEL)
13607	14806	{
13608	14807	mouseMode \|= ZOOM;
13609	14808	}
13610	14809
13611	14810	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13612		- if (capsLocked \|\| (modifiers & META) == META)
	14811	+ if (capsLocked) // \|\| (modifiers & META) == META)
13613	14812	{
13614	14813	mouseMode \|= VR; // BACKFORTH;
13615	14814	}
13616		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14815	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
13617	14816	{
13618	14817	mouseMode \|= SELECT;
13619	14818	}
13620		- if ((modifiers & COMMAND) == COMMAND)
	14819	+ if ((modifiersex & COMMAND) == COMMAND)
13621	14820	{
13622	14821	mouseMode \|= SELECT;
13623	14822	}
13624		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14823	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
13625	14824	{
13626	14825	mouseMode &= ~VR;
13627	14826	mouseMode \|= TRANSLATE;
..	..	@@ -13650,10 +14849,10 @@
13650	14849
13651	14850	if (isRenderer) //
13652	14851	{
13653		- SetMouseMode(modifiers);
	14852	+ SetMouseMode(0, modifiers);
13654	14853	}
13655	14854
13656		- theRenderer.keyPressed(key);
	14855	+ Globals.theRenderer.keyPressed(key);
13657	14856	}
13658	14857
13659	14858	int kompactbit = 4; // power bit
..	..	@@ -13665,7 +14864,7 @@
13665	14864	float SATPOW = 1; // 2; // 0.5f;
13666	14865	float BRIPOW = 1; // 0.5f; // 0.5f;
13667	14866
13668		- void keyPressed(int key)
	14867	+ public void keyPressed(int key)
13669	14868	{
13670	14869	if (key >= '0' && key <= '5')
13671	14870	clampbit = (key-'0');
..	..	@@ -13797,7 +14996,9 @@
13797	14996	case 'E' : COMPACT ^= true;
13798	14997	repaint();
13799	14998	break;
13800		- case 'W' : DEBUGHSB ^= true;
	14999	+ case 'W' : // Wide Window (fullscreen)
	15000	+ //DEBUGHSB ^= true;
	15001	+ ObjEditor.theFrame.ToggleFullScreen();
13801	15002	repaint();
13802	15003	break;
13803	15004	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -13822,8 +15023,8 @@
13822	15023	RevertCamera();
13823	15024	repaint();
13824	15025	break;
13825		- case 'L':
13826	15026	case 'l':
	15027	+ //case 'L':
13827	15028	if (lightMode)
13828	15029	{
13829	15030	lightMode = false;
..	..	@@ -13966,9 +15167,9 @@
13966	15167	case '_':
13967	15168	kompactbit = 5;
13968	15169	break;
13969		- case '+':
13970		- kompactbit = 6;
13971		- break;
	15170	+// case '+':
	15171	+// kompactbit = 6;
	15172	+// break;
13972	15173	case ' ':
13973	15174	lightMode ^= true;
13974	15175	Globals.lighttouched = true;
..	..	@@ -13980,13 +15181,14 @@
13980	15181	case ESC:
13981	15182	RENDERPROGRAM += 1;
13982	15183	RENDERPROGRAM %= 3;
	15184	+
13983	15185	repaint();
13984	15186	break;
13985	15187	case 'Z':
13986	15188	//RESIZETEXTURE ^= true;
13987	15189	//break;
13988	15190	case 'z':
13989		- RENDERSHADOW ^= true;
	15191	+ Globals.RENDERSHADOW ^= true;
13990	15192	Globals.lighttouched = true;
13991	15193	repaint();
13992	15194	break;
..	..	@@ -14019,8 +15221,9 @@
14019	15221	case DELETE:
14020	15222	ClearSelection();
14021	15223	break;
14022		- /*
14023	15224	case '+':
	15225	+
	15226	+ /*
14024	15227	//fontsize += 1;
14025	15228	bbzoom *= 2;
14026	15229	repaint();
..	..	@@ -14037,17 +15240,17 @@
14037	15240	case '=':
14038	15241	IncDepth();
14039	15242	//fontsize += 1;
14040		- object.editWindow.refreshContents(true);
	15243	+ object.GetWindow().refreshContents(true);
14041	15244	maskbit = 6;
14042	15245	break;
14043	15246	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14044	15247	DecDepth();
14045	15248	maskbit = 5;
14046	15249	//if(fontsize > 1) fontsize -= 1;
14047		- if (object.editWindow == null)
14048		- new Exception().printStackTrace();
14049		- else
14050		- object.editWindow.refreshContents(true);
	15250	+// if (object.editWindow == null)
	15251	+// new Exception().printStackTrace();
	15252	+// else
	15253	+ object.GetWindow().refreshContents(true);
14051	15254	break;
14052	15255	case '{':
14053	15256	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14102,6 +15305,7 @@
14102	15305	}
14103	15306	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
14104	15307	}
	15308	+
14105	15309	static double OCCLUSIONBOOST = 1; // 0.5;
14106	15310
14107	15311	void keyReleased(int key, int modifiers)
..	..	@@ -14109,11 +15313,11 @@
14109	15313	//mode = ROTATE;
14110	15314	if ((MODIFIERS & COMMAND) == 0) // VR??
14111	15315	{
14112		- SetMouseMode(modifiers);
	15316	+ SetMouseMode(0, modifiers);
14113	15317	}
14114	15318	}
14115	15319
14116		- protected void processKeyEvent(KeyEvent e)
	15320	+ public void processKeyEvent(KeyEvent e)
14117	15321	{
14118	15322	switch (e.getID())
14119	15323	{
..	..	@@ -14243,8 +15447,9 @@
14243	15447
14244	15448	protected void processMouseMotionEvent(MouseEvent e)
14245	15449	{
14246		- //System.out.println("processMouseMotionEvent: " + mouseMode);
14247		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15450	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15451	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15452	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
14248	15453	{
14249	15454	mouseMoved(e);
14250	15455	} else
..	..	@@ -14269,11 +15474,12 @@
14269	15474	}
14270	15475	*/
14271	15476
14272		- object.editWindow.EditSelection();
	15477	+ object.GetWindow().EditSelection(false);
14273	15478	}
14274	15479
14275	15480	void SelectParent()
14276	15481	{
	15482	+ new Exception().printStackTrace();
14277	15483	System.exit(0);
14278	15484	Composite group = (Composite) object;
14279	15485	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -14285,10 +15491,10 @@
14285	15491	{
14286	15492	//selectees.remove(i);
14287	15493	System.out.println("select parent of " + elem);
14288		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15494	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
14289	15495	} else
14290	15496	{
14291		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15497	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
14292	15498	}
14293	15499
14294	15500	first = false;
..	..	@@ -14297,6 +15503,7 @@
14297	15503
14298	15504	void SelectChildren()
14299	15505	{
	15506	+ new Exception().printStackTrace();
14300	15507	System.exit(0);
14301	15508	/*
14302	15509	Composite group = (Composite) object;
..	..	@@ -14329,12 +15536,12 @@
14329	15536	for (int j = 0; j < group.children.size(); j++)
14330	15537	{
14331	15538	elem = (Object3D) group.children.elementAt(j);
14332		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15539	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
14333	15540	first = false;
14334	15541	}
14335	15542	} else
14336	15543	{
14337		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15544	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
14338	15545	}
14339	15546
14340	15547	first = false;
..	..	@@ -14345,21 +15552,21 @@
14345	15552	{
14346	15553	//Composite group = (Composite) object;
14347	15554	Object3D group = object;
14348		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15555	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
14349	15556	}
14350	15557
14351	15558	void ResetTransform(int mask)
14352	15559	{
14353	15560	//Composite group = (Composite) object;
14354	15561	Object3D group = object;
14355		- group.editWindow.ResetTransform(mask);
	15562	+ group.GetWindow().ResetTransform(mask);
14356	15563	}
14357	15564
14358	15565	void FlipTransform()
14359	15566	{
14360	15567	//Composite group = (Composite) object;
14361	15568	Object3D group = object;
14362		- group.editWindow.FlipTransform();
	15569	+ group.GetWindow().FlipTransform();
14363	15570	// group.editWindow.ReduceMesh(true);
14364	15571	}
14365	15572
..	..	@@ -14367,7 +15574,7 @@
14367	15574	{
14368	15575	//Composite group = (Composite) object;
14369	15576	Object3D group = object;
14370		- group.editWindow.PrintMemory();
	15577	+ group.GetWindow().PrintMemory();
14371	15578	// group.editWindow.ReduceMesh(true);
14372	15579	}
14373	15580
..	..	@@ -14375,7 +15582,7 @@
14375	15582	{
14376	15583	//Composite group = (Composite) object;
14377	15584	Object3D group = object;
14378		- group.editWindow.ResetCentroid();
	15585	+ group.GetWindow().ResetCentroid();
14379	15586	}
14380	15587
14381	15588	void IncDepth()
..	..	@@ -14461,7 +15668,9 @@
14461	15668	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
14462	15669	//Image img = CreateImage(width, height);
14463	15670	//System.out.println("width = " + width + "; height = " + height + "\n");
	15671	+
14464	15672	Graphics gr = g; // img.getGraphics();
	15673	+
14465	15674	if (!hasMarquee)
14466	15675	{
14467	15676	if (Xmin < Xmax) // !locked)
..	..	@@ -14549,6 +15758,7 @@
14549	15758	info.bounds.y += (height - desired) / 2;
14550	15759	}
14551	15760	}
	15761	+
14552	15762	info.g = gr;
14553	15763	info.camera = renderCamera;
14554	15764	/*
..	..	@@ -14558,15 +15768,55 @@
14558	15768	*/
14559	15769	if (!isRenderer)
14560	15770	{
14561		- object.drawEditHandles(info, 0);
	15771	+ Grafreed.Assert(object != null);
	15772	+ Grafreed.Assert(object.selection != null);
	15773	+ if (object.selection.Size() > 0)
	15774	+ {
	15775	+ int hitSomething = object.selection.get(0).hitSomething;
	15776	+
	15777	+ info.DX = 0;
	15778	+ info.DY = 0;
	15779	+ info.W = 1;
	15780	+ if (hitSomething == Object3D.hitCenter)
	15781	+ {
	15782	+ info.DX = X;
	15783	+ if (X != 0)
	15784	+ info.DX -= info.bounds.width/2;
	15785	+
	15786	+ info.DY = Y;
	15787	+ if (Y != 0)
	15788	+ info.DY -= info.bounds.height/2;
	15789	+ }
	15790	+
	15791	+ object.drawEditHandles(info, 0);
	15792	+
	15793	+ if (drag && (X != 0 \|\| Y != 0))
	15794	+ {
	15795	+ switch (hitSomething)
	15796	+ {
	15797	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15798	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15799	+ break;
	15800	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15801	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15802	+ break;
	15803	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15804	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15805	+ break;
	15806	+ }
	15807	+
	15808	+ }
	15809	+ }
14562	15810	}
14563	15811	}
	15812	+
14564	15813	if (isRenderer)
14565	15814	{
14566	15815	//gr.setColor(Color.black);
14567	15816	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
14568	15817	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
14569	15818	}
	15819	+
14570	15820	if (hasMarquee)
14571	15821	{
14572	15822	gr.setXORMode(Color.white);
..	..	@@ -14679,6 +15929,7 @@
14679	15929	public boolean mouseDown(Event evt, int x, int y)
14680	15930	{
14681	15931	System.out.println("mouseDown: " + evt);
	15932	+ System.exit(0);
14682	15933	/*
14683	15934	locked = true;
14684	15935	drag = false;
..	..	@@ -14722,7 +15973,7 @@
14722	15973	{
14723	15974	keyPressed(0, modifiers);
14724	15975	}
14725		- clickStart(x, y, modifiers);
	15976	+ // clickStart(x, y, modifiers);
14726	15977	return true;
14727	15978	}
14728	15979
..	..	@@ -14840,7 +16091,7 @@
14840	16091	{
14841	16092	keyReleased(0, 0);
14842	16093	}
14843		- drag(x, y, modifiers);
	16094	+ drag(x, y, 0, modifiers);
14844	16095	return true;
14845	16096	}
14846	16097
..	..	@@ -14972,7 +16223,7 @@
14972	16223	Object3D object;
14973	16224	static Object3D trackedobject;
14974	16225	Camera renderCamera; // Light or Eye (or Occlusion)
14975		- /static/ Camera manipCamera; // Light or Eye
	16226	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
14976	16227	/static/ Camera eyeCamera;
14977	16228	/static/ Camera lightCamera;
14978	16229	int cameracount;
..	..	@@ -15257,16 +16508,16 @@
15257	16508	cStatic.objectstack[materialdepth++] = checker;
15258	16509	//System.out.println("material " + material);
15259	16510	//Applet3D.tracein(this, selected);
15260		- vector2buffer = checker.projectedVertices;
	16511	+ //vector2buffer = checker.projectedVertices;
15261	16512
15262	16513	//checker.GetMaterial().Draw(this, false); // true);
15263		- DrawMaterial(checker.GetMaterial(), false); // true);
	16514	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
15264	16515
15265	16516	materialdepth -= 1;
15266	16517	if (materialdepth > 0)
15267	16518	{
15268		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
15269		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16519	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16520	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
15270	16521	}
15271	16522	//checker.GetMaterial().opacity = 1f;
15272	16523	////checker.GetMaterial().ambient = 1f;
..	..	@@ -15352,6 +16603,14 @@
15352	16603	}
15353	16604	}
15354	16605
	16606	+ private Object3D GetFolder()
	16607	+ {
	16608	+ Object3D folder = object.GetWindow().copy;
	16609	+ if (object.GetWindow().copy.selection.Size() > 0)
	16610	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16611	+ return folder;
	16612	+ }
	16613	+
15355	16614	class SelectBuffer implements GLEventListener
15356	16615	{
15357	16616
..	..	@@ -15410,6 +16669,7 @@
15410	16669	{
15411	16670	if (!selection)
15412	16671	{
	16672	+ new Exception().printStackTrace();
15413	16673	System.exit(0);
15414	16674	return;
15415	16675	}
..	..	@@ -15430,6 +16690,17 @@
15430	16690
15431	16691	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
15432	16692
	16693	+ if (PAINTMODE)
	16694	+ {
	16695	+ if (object.GetWindow().copy.selection.Size() > 0)
	16696	+ {
	16697	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16698	+
	16699	+ // Make what you paint not selectable.
	16700	+ paintobj.ResetSelectable();
	16701	+ }
	16702	+ }
	16703	+
15433	16704	//int tmp = selection_view;
15434	16705	//selection_view = -1;
15435	16706	int temp = DrawMode();
..	..	@@ -15441,6 +16712,17 @@
15441	16712	// temp = DEFAULT; // patch for selection debug
15442	16713	Globals.drawMode = temp; // WARNING
15443	16714
	16715	+ if (PAINTMODE)
	16716	+ {
	16717	+ if (object.GetWindow().copy.selection.Size() > 0)
	16718	+ {
	16719	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16720	+
	16721	+ // Revert.
	16722	+ paintobj.RestoreSelectable();
	16723	+ }
	16724	+ }
	16725	+
15444	16726	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
15445	16727
15446	16728	// trying different ways of getting the depth info over
..	..	@@ -15488,6 +16770,8 @@
15488	16770	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
15489	16771	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
15490	16772	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	16773	+
	16774	+ CreateSelectedPoint();
15491	16775
15492	16776	// Will fit the mesh !!!
15493	16777	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -15537,34 +16821,36 @@
15537	16821	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	16822	}
15539	16823
15540		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16824	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
15541	16825	}
15542	16826	}
15543	16827
15544	16828	if (!movingcamera && !PAINTMODE)
15545		- object.editWindow.ScreenFitPoint(); // fev 2014
	16829	+ object.GetWindow().ScreenFitPoint(); // fev 2014
15546	16830
15547		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16831	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
15548	16832	{
15549		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16833	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
15550	16834
15551		- Object3D group = new Object3D("inst" + paintcount++);
	16835	+ if (object.GetWindow().copy.selection.Size() > 0)
	16836	+ {
	16837	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
15552	16838
15553		- group.CreateMaterial(); // use a void leaf to select instances
15554		-
15555		- group.add(paintobj); // link
15556		-
15557		- object.editWindow.SnapObject(group);
15558		-
15559		- Object3D folder = object.editWindow.copy;
15560		-
15561		- if (object.editWindow.copy.selection.Size() > 0)
15562		- folder = object.editWindow.copy.selection.elementAt(0);
15563		-
15564		- folder.add(group);
15565		-
15566		- object.editWindow.ResetModel();
15567		- object.editWindow.refreshContents();
	16839	+ Object3D inst = new Object3D("inst" + paintcount++);
	16840	+
	16841	+ inst.CreateMaterial(); // use a void leaf to select instances
	16842	+
	16843	+ inst.add(paintobj); // link
	16844	+
	16845	+ object.GetWindow().SnapObject(inst);
	16846	+
	16847	+ Object3D folder = paintFolder; // GetFolder();
	16848	+
	16849	+ folder.add(inst);
	16850	+
	16851	+ object.GetWindow().ResetModel();
	16852	+ object.GetWindow().refreshContents();
	16853	+ }
15568	16854	}
15569	16855	else
15570	16856	paintcount = 0;
..	..	@@ -15603,6 +16889,11 @@
15603	16889	//System.out.println("objects[color] = " + objects[color]);
15604	16890	//objects[color].Select();
15605	16891	indexcount = 0;
	16892	+ ObjEditor window = object.GetWindow();
	16893	+ if (window != null && deselect)
	16894	+ {
	16895	+ window.Select(null, deselect, true);
	16896	+ }
15606	16897	object.Select(color, deselect);
15607	16898	}
15608	16899
..	..	@@ -15702,7 +16993,7 @@
15702	16993	gl.glDisable(gl.GL_CULL_FACE);
15703	16994	}
15704	16995
15705		- if (!RENDERSHADOW)
	16996	+ if (!Globals.RENDERSHADOW)
15706	16997	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
15707	16998
15708	16999	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -15712,7 +17003,7 @@
15712	17003	//gl.glColorMask(false, false, false, false);
15713	17004
15714	17005	//render_scene_from_light_view(gl, drawable, 0, 0);
15715		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17006	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
15716	17007	{
15717	17008	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
15718	17009
..	..	@@ -15772,7 +17063,6 @@
15772	17063
15773	17064	class AntialiasBuffer implements GLEventListener
15774	17065	{
15775		-
15776	17066	CameraPane parent = null;
15777	17067
15778	17068	AntialiasBuffer(CameraPane p)
..	..	@@ -16129,23 +17419,15 @@
16129	17419	int AAbuffersize = 0;
16130	17420
16131	17421	//double[] selectedpoint = new double[3];
16132		- static Superellipsoid selectedpoint = new Superellipsoid();
	17422	+ static Superellipsoid selectedpoint;
16133	17423	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();
	17424	+ static Sphere debugpointG;
	17425	+ static Sphere debugpointP;
	17426	+ static Sphere debugpointC;
	17427	+ static Sphere debugpointR;
16138	17428
16139	17429	static Sphere debugpoints[] = new Sphere[8];
16140	17430
16141		- static
16142		- {
16143		- for (int i=0; i<8; i++)
16144		- {
16145		- debugpoints[i] = new Sphere();
16146		- }
16147		- }
16148		-
16149	17431	static void InitPoints(float radius)
16150	17432	{
16151	17433	for (int i=0; i<8; i++)
..	..	@@ -16165,7 +17447,7 @@
16165	17447	}
16166	17448	}
16167	17449
16168		- static void DrawPoints(CameraPane cpane)
	17450	+ static void DrawPoints(iCameraPane cpane)
16169	17451	{
16170	17452	for (int i=0; i<8; i++) // first and last are red
16171	17453	{
..	..	@@ -16197,10 +17479,11 @@
16197	17479	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
16198	17480	// Depth buffer format
16199	17481	//private int depth_format;
16200		- static public void NextIndex(Object3D o, GL gl)
	17482	+
	17483	+ public void NextIndex()
16201	17484	{
16202	17485	indexcount+=16;
16203		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17486	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
16204	17487	//objects[indexcount] = o;
16205	17488	//System.out.println("indexcount = " + indexcount);
16206	17489	}