~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)
..	..	@@ -192,9 +192,43 @@
192	192
193	193	/// INTERFACE
194	194
	195	+ public javax.media.opengl.GL GetGL0()
	196	+ {
	197	+ return null;
	198	+ }
	199	+
	200	+ public int GenList()
	201	+ {
	202	+ javax.media.opengl.GL gl = GetGL();
	203	+ return gl.glGenLists(1);
	204	+ }
	205	+
	206	+ public void NewList(int id)
	207	+ {
	208	+ javax.media.opengl.GL gl = GetGL();
	209	+ gl.glNewList(id, gl.GL_COMPILE); //_AND_EXECUTE);
	210	+ }
	211	+
	212	+ public void CallList(int id)
	213	+ {
	214	+ javax.media.opengl.GL gl = GetGL();
	215	+ gl.glCallList(id);
	216	+ }
	217	+
	218	+ public void EndList()
	219	+ {
	220	+ javax.media.opengl.GL gl = GetGL();
	221	+ gl.glEndList();
	222	+ }
	223	+
195	224	public boolean IsBoxMode()
196	225	{
197	226	return BOXMODE;
	227	+ }
	228	+
	229	+ public boolean IsZoomBoxMode()
	230	+ {
	231	+ return ZOOMBOXMODE;
198	232	}
199	233
200	234	public void ClearDepth()
..	..	@@ -236,9 +270,14 @@
236	270	return this.ambientOcclusion;
237	271	}
238	272
	273	+ public boolean IsDebugSelection()
	274	+ {
	275	+ return DEBUG_SELECTION;
	276	+ }
	277	+
239	278	public boolean IsFrozen()
240	279	{
241		- boolean selectmode = this.DrawMode() == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	280	+ boolean selectmode = this.DrawMode() == SELECTION \|\| this.IsDebugSelection();
242	281
243	282	return !selectmode && cameracount == 0; // != 0;
244	283	}
..	..	@@ -259,9 +298,19 @@
259	298	return lightCamera;
260	299	}
261	300
	301	+ public Camera ManipCamera()
	302	+ {
	303	+ return manipCamera;
	304	+ }
	305	+
262	306	public Camera RenderCamera()
263	307	{
264	308	return renderCamera;
	309	+ }
	310	+
	311	+ public Camera[] Cameras()
	312	+ {
	313	+ return cameras;
265	314	}
266	315
267	316	public void PushMaterial(Object3D obj, boolean selected)
..	..	@@ -277,7 +326,7 @@
277	326	cStatic.objectstack[materialdepth++] = obj;
278	327	//System.out.println("material " + material);
279	328	//Applet3D.tracein(this, selected);
280		- display.vector2buffer = obj.projectedVertices;
	329	+ //display.vector2buffer = obj.projectedVertices;
281	330	if (obj instanceof Camera)
282	331	{
283	332	display.options1[0] = material.shift;
..	..	@@ -286,14 +335,28 @@
286	335	display.options1[2] = material.shadowbias;
287	336	display.options1[3] = material.aniso;
288	337	display.options1[4] = material.anisoV;
	338	+// System.out.println("display.options1[0] " + display.options1[0]);
	339	+// System.out.println("display.options1[1] " + display.options1[1]);
	340	+// System.out.println("display.options1[2] " + display.options1[2]);
	341	+// System.out.println("display.options1[3] " + display.options1[3]);
	342	+// System.out.println("display.options1[4] " + display.options1[4]);
289	343	display.options2[0] = material.opacity;
290	344	display.options2[1] = material.diffuse;
291	345	display.options2[2] = material.factor;
	346	+// System.out.println("display.options2[0] " + display.options2[0]);
	347	+// System.out.println("display.options2[1] " + display.options2[1]);
	348	+// System.out.println("display.options2[2] " + display.options2[2]);
292	349
293	350	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	351	+// System.out.println("display.options3[0] " + display.options3[0]);
	352	+// System.out.println("display.options3[1] " + display.options3[1]);
	353	+// System.out.println("display.options3[2] " + display.options3[2]);
294	354	display.options4[0] = material.cameralight/0.2f;
295	355	display.options4[1] = material.subsurface;
296	356	display.options4[2] = material.sheen;
	357	+// System.out.println("display.options4[0] " + display.options4[0]);
	358	+// System.out.println("display.options4[1] " + display.options4[1]);
	359	+// System.out.println("display.options4[2] " + display.options4[2]);
297	360
298	361	// if (display.CURRENTANTIALIAS > 0)
299	362	// display.options3[3] /= 4;
..	..	@@ -309,7 +372,7 @@
309	372	/**/
310	373	} else
311	374	{
312		- DrawMaterial(material, selected);
	375	+ DrawMaterial(material, selected, obj.projectedVertices);
313	376	}
314	377	} else
315	378	{
..	..	@@ -333,8 +396,8 @@
333	396	cStatic.objectstack[materialdepth++] = obj;
334	397	//System.out.println("material " + material);
335	398	//Applet3D.tracein("selected ", selected);
336		- display.vector2buffer = obj.projectedVertices;
337		- display.DrawMaterial(material, selected);
	399	+ //display.vector2buffer = obj.projectedVertices;
	400	+ display.DrawMaterial(material, selected, obj.projectedVertices);
338	401	}
339	402	}
340	403
..	..	@@ -351,8 +414,8 @@
351	414	materialdepth -= 1;
352	415	if (materialdepth > 0)
353	416	{
354		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
355		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	417	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	418	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
356	419	}
357	420	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
358	421	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -372,8 +435,8 @@
372	435	materialdepth -= 1;
373	436	if (materialdepth > 0)
374	437	{
375		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
376		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	438	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	439	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
377	440	}
378	441	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
379	442	//else
..	..	@@ -408,16 +471,18 @@
408	471
409	472	javax.media.opengl.GL gl = display.GetGL();
410	473
411		- boolean selectmode = display.DrawMode() == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	474	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
412	475
413	476	//System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
414	477	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
415	478	{
416	479	//gl.glBegin(gl.GL_TRIANGLES);
417		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	480	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	481	+ // TEST LIVE NORMALS && !obj.dontselect
	482	+ ;
418	483	if (!hasnorm)
419	484	{
420		- // System.out.println("FUCK!!");
	485	+ // System.out.println("Mesh normal");
421	486	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
422	487	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
423	488	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -760,7 +825,627 @@
760	825	//// tris.postdraw(this);
761	826	}
762	827
	828	+ static Camera localcamera = new Camera();
	829	+ static cVector from = new cVector();
	830	+ static cVector to = new cVector();
	831	+
	832	+ public void PrepOcclusion(BoundaryRep br, double[][] transform)
	833	+ {
	834	+ CameraPane cp = this;
	835	+
	836	+ Camera keep = cp.RenderCamera();
	837	+ cp.renderCamera = localcamera;
	838	+
	839	+ if (br.trimmed)
	840	+ {
	841	+ float[] colors = new float[br.positions.length / 3];
	842	+
	843	+ int i3 = 0;
	844	+ for (int i = 0; i < br.positions.length / 3; i++, i3 += 3)
	845	+ {
	846	+ if (br.normals[i3] == 0 && br.normals[i3+1] == 0 && br.normals[i3+2] == 0)
	847	+ continue;
	848	+
	849	+ from.set(br.positions[i3], br.positions[i3 + 1], br.positions[i3 + 2]);
	850	+ to.set(br.positions[i3] + br.normals[i3],
	851	+ br.positions[i3 + 1] + br.normals[i3 + 1],
	852	+ br.positions[i3 + 2] + br.normals[i3 + 2]);
	853	+ LA.xformPos(from, transform, from);
	854	+ LA.xformPos(to, transform, to); // RIGID ONLY
	855	+ localcamera.setAim(from, to);
	856	+
	857	+ CameraPane.occlusionbuffer.display();
	858	+
	859	+ if (CameraPane.DEBUG_OCCLUSION)
	860	+ cp.display(); // debug
	861	+
	862	+ colors[i] = cp.vertexOcclusion.r;
	863	+ //colors[i3 + 1] = cp.vertexOcclusion.g;
	864	+ //colors[i3 + 2] = cp.vertexOcclusion.b;
	865	+
	866	+ if ((i % 100) == 0 && i != 0)
	867	+ {
	868	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	869	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	870	+ System.out.println((int) (100.0 * i / (br.positions.length / 3)) + "% (" + i + " of " + (br.positions.length / 3) + ")");
	871	+ }
	872	+ }
	873	+
	874	+ br.colors = colors;
	875	+ }
	876	+ else
	877	+ {
	878	+ for (int i = 0; i < br.VertexCount(); i++)
	879	+ {
	880	+ Vertex v = br.GetVertex(i);
	881	+
	882	+ if (v.norm == null \|\| v.norm.x == 0 && v.norm.y == 0 && v.norm.z == 0)
	883	+ continue;
	884	+
	885	+ from.set(v.x, v.y, v.z);
	886	+ to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
	887	+ LA.xformPos(from, transform, from);
	888	+ LA.xformPos(to, transform, to); // RIGID ONLY
	889	+ localcamera.setAim(from, to);
	890	+
	891	+ CameraPane.occlusionbuffer.display();
	892	+
	893	+ if (CameraPane.DEBUG_OCCLUSION)
	894	+ cp.display(); // debug
	895	+
	896	+ v.AO = cp.vertexOcclusion.r;
	897	+
	898	+ if ((i % 100) == 0 && i != 0)
	899	+ {
	900	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	901	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	902	+ System.out.println((int) (100.0 * i / br.VertexCount()) + "% (" + i + " of " + br.VertexCount() + ")");
	903	+ }
	904	+ }
	905	+ }
	906	+
	907	+ //System.out.println("done.");
	908	+
	909	+ cp.renderCamera = keep;
	910	+ }
	911	+
	912	+ void DrawPointFLow(PointFlow pointFlow, Object3D /Composite/ root, boolean selected, boolean blocked)
	913	+ {
	914	+ CameraPane display = this;
	915	+ pointFlow.CreateHT();
	916	+
	917	+ float r = display.modelParams0[0];
	918	+ float g = display.modelParams0[1];
	919	+ float b = display.modelParams0[2];
	920	+ float opacity = display.modelParams5[1];
	921	+
	922	+ //final GL gl = GLU.getCurrentGL();
	923	+ GL gl = display.GetGL(); // getGL();
	924	+
	925	+ int s = pointFlow.points.size();
	926	+
	927	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	928	+ gl.glEnable(gl.GL_CULL_FACE);
	929	+
	930	+ for (int i=s; --i>=0;)
	931	+ //for (int i=0; i<s; i++)
	932	+ {
	933	+ cVector v = pointFlow.points.get(i);
	934	+
	935	+ double mindist = Double.MAX_VALUE;
	936	+
	937	+ double size = pointFlow.minimumSize;
	938	+
	939	+ double distancenext = 0;
	940	+
	941	+ if (i > 0)
	942	+ {
	943	+ cVector w = pointFlow.points.get(i-1);
	944	+
	945	+ double dist = w.distance(v);
	946	+
	947	+ distancenext = dist;
	948	+
	949	+ if (mindist > dist)
	950	+ {
	951	+ mindist = dist;
	952	+ size = mindist*pointFlow.resizefactor;
	953	+ }
	954	+ }
	955	+
	956	+ if (i < s-1)
	957	+ {
	958	+ cVector w = pointFlow.points.get(i+1);
	959	+
	960	+ double dist = w.distance(v);
	961	+
	962	+ if (mindist > dist)
	963	+ {
	964	+ mindist = dist;
	965	+ size = mindist*pointFlow.resizefactor;
	966	+ }
	967	+ }
	968	+
	969	+ if (size < pointFlow.minimumSize)
	970	+ size = pointFlow.minimumSize;
	971	+ if (size > pointFlow.maximumSize)
	972	+ size = pointFlow.maximumSize;
	973	+
	974	+ double tx = v.x;
	975	+ double ty = v.y;
	976	+ double tz = v.z;
	977	+
	978	+ // if (tx == 0 && ty == 0 && tz == 0)
	979	+ // continue;
	980	+
	981	+ gl.glMatrixMode(gl.GL_TEXTURE);
	982	+ gl.glPushMatrix();
	983	+ pointFlow.texmat[12] = pointFlow.texmat[13] = pointFlow.texmat[14] = i;
	984	+
	985	+ gl.glMultMatrixf(pointFlow.texmat, 0);
	986	+
	987	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	988	+ gl.glPushMatrix();
	989	+
	990	+ gl.glTranslated(tx,ty,tz);
	991	+
	992	+ gl.glScaled(size,size,size);
	993	+
	994	+// float cr = colorBuf.get(index4);
	995	+// float cg = colorBuf.get(index4+1);
	996	+// float cb = colorBuf.get(index4+2);
	997	+// float ca = colorBuf.get(index4+3);
	998	+//
	999	+// display.modelParams0[0] = r * cr;
	1000	+// display.modelParams0[1] = g * cg;
	1001	+// display.modelParams0[2] = b * cb;
	1002	+//
	1003	+// display.modelParams5[1] = opacity * ca;
	1004	+//
	1005	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1006	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1007	+//
	1008	+// RandomNode.globalseed = (int)sizeBuf.get(index3+2); // i;
	1009	+// RandomNode.globalseed2 = RandomNode.globalseed;
	1010	+//
	1011	+//// gl.glColor4f(cr,cg,cb,ca);
	1012	+// // gl.glScalef(1024/16,1024/16,1024/16);
	1013	+ pointFlow.geo.Draw/Node/(display,null,selected, blocked);
	1014	+
	1015	+ gl.glPopMatrix();
	1016	+
	1017	+ double step = size/4; //
	1018	+
	1019	+ if (i == 0 \|\| size == 0 \|\| distancenext > 8*size \|\| distancenext < step)
	1020	+ continue;
	1021	+
	1022	+ int nbsteps = (int)(distancenext/step);
	1023	+
	1024	+ step = distancenext/nbsteps;
	1025	+
	1026	+ cVector next = pointFlow.points.get(i-1);
	1027	+
	1028	+ tmp.set(next);
	1029	+ tmp.sub(v);
	1030	+ tmp.normalize();
	1031	+ tmp.mul(step);
	1032	+
	1033	+ // calculate next size
	1034	+ mindist = Double.MAX_VALUE;
	1035	+
	1036	+ double nextsize = pointFlow.minimumSize;
	1037	+
	1038	+ if (i > 1)
	1039	+ {
	1040	+ cVector w = pointFlow.points.get(i-2);
	1041	+
	1042	+ double dist = w.distance(next);
	1043	+
	1044	+ if (mindist > dist)
	1045	+ {
	1046	+ mindist = dist;
	1047	+ nextsize = mindist*pointFlow.resizefactor;
	1048	+ }
	1049	+ }
	1050	+
	1051	+ double dist = v.distance(next);
	1052	+
	1053	+ if (mindist > dist)
	1054	+ {
	1055	+ mindist = dist;
	1056	+ nextsize = mindist*pointFlow.resizefactor;
	1057	+ }
	1058	+
	1059	+ if (nextsize < pointFlow.minimumSize)
	1060	+ nextsize = pointFlow.minimumSize;
	1061	+ if (nextsize > pointFlow.maximumSize)
	1062	+ nextsize = pointFlow.maximumSize;
	1063	+ //
	1064	+
	1065	+ double count = 0;
	1066	+
	1067	+ while (distancenext > 0.000000001) // step
	1068	+ {
	1069	+ gl.glPushMatrix();
	1070	+
	1071	+ gl.glTranslated(tx + tmp.xcount, ty + tmp.ycount, tz + tmp.z*count);
	1072	+
	1073	+ double K = count/nbsteps;
	1074	+
	1075	+ double intersize = Knextsize + (1-K)size;
	1076	+
	1077	+ gl.glScaled(intersize,intersize,intersize);
	1078	+
	1079	+ pointFlow.geo.Draw/Node/(display,null,selected,blocked);
	1080	+
	1081	+ count++;
	1082	+
	1083	+ distancenext -= step;
	1084	+
	1085	+ gl.glPopMatrix();
	1086	+ }
	1087	+
	1088	+ if (count != nbsteps)
	1089	+ assert(count == nbsteps);
	1090	+
	1091	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	1092	+ //gl.glTranslatef(-tx,-ty,-tz);
	1093	+
	1094	+ gl.glMatrixMode(gl.GL_TEXTURE);
	1095	+ gl.glPopMatrix();
	1096	+ }
	1097	+
	1098	+ if (!cf)
	1099	+ gl.glDisable(gl.GL_CULL_FACE);
	1100	+
	1101	+// display.modelParams0[0] = r;
	1102	+// display.modelParams0[1] = g;
	1103	+// display.modelParams0[2] = b;
	1104	+//
	1105	+// display.modelParams5[1] = opacity;
	1106	+//
	1107	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1108	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1109	+
	1110	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	1111	+ }
	1112	+
	1113	+ public void DrawBox(cVector min, cVector max)
	1114	+ {
	1115	+ javax.media.opengl.GL gl = GetGL();
	1116	+ gl.glBegin(gl.GL_LINES);
	1117	+
	1118	+ gl.glVertex3d(min.x, min.y, min.z);
	1119	+ gl.glVertex3d(min.x, min.y, max.z);
	1120	+ gl.glVertex3d(min.x, min.y, min.z);
	1121	+ gl.glVertex3d(min.x, max.y, min.z);
	1122	+ gl.glVertex3d(min.x, min.y, min.z);
	1123	+ gl.glVertex3d(max.x, min.y, min.z);
	1124	+
	1125	+ gl.glVertex3d(max.x, max.y, max.z);
	1126	+ gl.glVertex3d(min.x, max.y, max.z);
	1127	+ gl.glVertex3d(max.x, max.y, max.z);
	1128	+ gl.glVertex3d(max.x, min.y, max.z);
	1129	+ gl.glVertex3d(max.x, max.y, max.z);
	1130	+ gl.glVertex3d(max.x, max.y, min.z);
	1131	+
	1132	+ gl.glEnd();
	1133	+ }
	1134	+
	1135	+ public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
	1136	+ {
	1137	+ int[] strips = bRep.getRawIndices();
	1138	+
	1139	+ javax.media.opengl.GL gl = GetGL();
	1140	+
	1141	+ // TRIANGLE STRIP ARRAY
	1142	+ if (bRep.trimmed)
	1143	+ {
	1144	+ float[] v = bRep.getRawVertices();
	1145	+ float[] n = bRep.getRawNormals();
	1146	+ float[] c = bRep.getRawColors();
	1147	+ float[] uv = bRep.getRawUVMap();
	1148	+
	1149	+ int count2 = 0;
	1150	+ int count3 = 0;
	1151	+
	1152	+ if (n.length > 0)
	1153	+ {
	1154	+ for (int i = 0; i < strips.length; i++)
	1155	+ {
	1156	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1157	+
	1158	+ /*
	1159	+ boolean locked = false;
	1160	+ float eps = 0.1f;
	1161	+ boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	1162	+
	1163	+ int dot = 0;
	1164	+
	1165	+ if ((dot&1) == 0)
	1166	+ dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	1167	+
	1168	+ if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	1169	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	1170	+ else
	1171	+ {
	1172	+ locked = true;
	1173	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1174	+ }
	1175	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	1176	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	1177	+ if (hasnorm)
	1178	+ {
	1179	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	1180	+ gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
	1181	+ }
	1182	+
	1183	+ if ((dot&4) == 0)
	1184	+ dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	1185	+
	1186	+ if (wrap \|\| !locked && (dot&8) != 0)
	1187	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	1188	+ else
	1189	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1190	+
	1191	+ f.dot = dot;
	1192	+ */
	1193	+
	1194	+ if (!selectmode)
	1195	+ {
	1196	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1197	+ {
	1198	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1199	+ } else
	1200	+ {
	1201	+ gl.glNormal3f(0, 0, 1);
	1202	+ }
	1203	+
	1204	+ if (c != null)
	1205	+ //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
	1206	+ {
	1207	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1208	+ }
	1209	+ }
	1210	+
	1211	+ if (flipV)
	1212	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1213	+ else
	1214	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1215	+
	1216	+ //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1217	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1218	+
	1219	+ count2 += 2;
	1220	+ count3 += 3;
	1221	+ if (!selectmode)
	1222	+ {
	1223	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1224	+ {
	1225	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1226	+ } else
	1227	+ {
	1228	+ gl.glNormal3f(0, 0, 1);
	1229	+ }
	1230	+ if (c != null)
	1231	+ {
	1232	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1233	+ }
	1234	+ }
	1235	+
	1236	+ if (flipV)
	1237	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1238	+ else
	1239	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1240	+
	1241	+ //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1242	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1243	+
	1244	+ count2 += 2;
	1245	+ count3 += 3;
	1246	+ for (int j = 0; j < strips[i] - 2; j++)
	1247	+ {
	1248	+ //gl.glTexCoord2d(...);
	1249	+ if (!selectmode)
	1250	+ {
	1251	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1252	+ {
	1253	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1254	+ } else
	1255	+ {
	1256	+ gl.glNormal3f(0, 0, 1);
	1257	+ }
	1258	+ if (c != null)
	1259	+ {
	1260	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1261	+ }
	1262	+ }
	1263	+
	1264	+ if (flipV)
	1265	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1266	+ else
	1267	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1268	+
	1269	+ //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
	1270	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1271	+
	1272	+ count2 += 2;
	1273	+ count3 += 3;
	1274	+ }
	1275	+
	1276	+ gl.glEnd();
	1277	+ }
	1278	+ }
	1279	+
	1280	+ assert count3 == v.length;
	1281	+ }
	1282	+ else // !trimmed
	1283	+ {
	1284	+ int count = 0;
	1285	+ for (int i = 0; i < strips.length; i++)
	1286	+ {
	1287	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1288	+
	1289	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	1290	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	1291	+
	1292	+ drawVertex(gl, p, flipV, selectmode);
	1293	+ drawVertex(gl, q, flipV, selectmode);
	1294	+
	1295	+ for (int j = 0; j < strips[i] - 2; j++)
	1296	+ {
	1297	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	1298	+
	1299	+ // if (j%2 == 0)
	1300	+ // drawFace(p, q, r, display, null);
	1301	+ // else
	1302	+ // drawFace(p, r, q, display, null);
	1303	+
	1304	+ // p = q;
	1305	+ // q = r;
	1306	+ drawVertex(gl, r, flipV, selectmode);
	1307	+ }
	1308	+
	1309	+ gl.glEnd();
	1310	+ }
	1311	+ }
	1312	+ }
	1313	+
	1314	+ static cSpring.Point3D temp = new cSpring.Point3D();
	1315	+ static cSpring.Point3D temp2 = new cSpring.Point3D();
	1316	+ static cSpring.Point3D temp3 = new cSpring.Point3D();
	1317	+
	1318	+ public void DrawDynamicMesh(cMesh mesh)
	1319	+ {
	1320	+ GL gl = GetGL(); // getGL();
	1321	+
	1322	+ cSpring.PhysicsController3D Phys = mesh.Phys;
	1323	+
	1324	+ gl.glDisable(gl.GL_LIGHTING);
	1325	+
	1326	+ gl.glLineWidth(1);
	1327	+ gl.glColor3f(1,1,1);
	1328	+ gl.glBegin(gl.GL_LINES);
	1329	+ double scale = 0;
	1330	+ int count = 0;
	1331	+ for (int s=0; s<Phys.allSprings.size(); s++)
	1332	+ {
	1333	+ cSpring.Spring spring = Phys.allSprings.get(s);
	1334	+ if(s == 0)
	1335	+ {
	1336	+ //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
	1337	+ }
	1338	+ if (mesh.showsprings)
	1339	+ {
	1340	+ temp.set(spring.a.position);
	1341	+ temp.add(spring.b.position);
	1342	+ temp.mul(0.5);
	1343	+ temp2.set(spring.a.position);
	1344	+ temp2.sub(spring.b.position);
	1345	+ temp2.mul(spring.restLength/2);
	1346	+ temp.sub(temp2);
	1347	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1348	+ temp.add(temp2);
	1349	+ temp.add(temp2);
	1350	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1351	+ }
	1352	+
	1353	+ if (spring.isHandle)
	1354	+ continue;
	1355	+
	1356	+ //if (scale < spring.restLength)
	1357	+ scale += spring.restLength;
	1358	+ count++;
	1359	+ }
	1360	+ gl.glEnd();
	1361	+
	1362	+ if (count == 0)
	1363	+ scale = 0.01;
	1364	+ else
	1365	+ scale /= count * 3;
	1366	+
	1367	+ //scale = 0.25;
	1368	+
	1369	+ if (mesh.ShowInfo())
	1370	+ {
	1371	+ gl.glLineWidth(4);
	1372	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1373	+ {
	1374	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1375	+ if (node.mass == 0)
	1376	+ continue;
	1377	+
	1378	+ int i = node.springs==null?-1:node.springs.size();
	1379	+ gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
	1380	+ //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
	1381	+ //temp.normalize();
	1382	+ //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
	1383	+ gl.glBegin(gl.GL_LINES);
	1384	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1385	+ //gl.glVertex3d(node.position.x + node.normal.xscale, node.position.y + node.normal.yscale, node.position.z + node.normal.z*scale);
	1386	+ gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
	1387	+ node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
	1388	+ node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
	1389	+ gl.glEnd();
	1390	+ }
	1391	+
	1392	+ gl.glLineWidth(8);
	1393	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1394	+ {
	1395	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1396	+
	1397	+ if (node.springs != null)
	1398	+ {
	1399	+ for (int i=0; i<node.springs.size(); i+=1)
	1400	+ {
	1401	+ cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
	1402	+
	1403	+ int c = i+1;
	1404	+ // c = node.springs.get(i).nbcopies;
	1405	+
	1406	+ gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
	1407	+ gl.glBegin(gl.GL_LINES);
	1408	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1409	+ gl.glVertex3d(f.position.x/3+node.position.x2/3, f.position.y/3+node.position.y2/3, f.position.z/3+node.position.z*2/3);
	1410	+ gl.glEnd();
	1411	+ }
	1412	+ }
	1413	+ }
	1414	+
	1415	+ gl.glLineWidth(1);
	1416	+ }
	1417	+
	1418	+ gl.glEnable(gl.GL_LIGHTING);
	1419	+ }
	1420	+
763	1421	/// INTERFACE
	1422	+
	1423	+ public void StartTriangles()
	1424	+ {
	1425	+ javax.media.opengl.GL gl = GetGL();
	1426	+ gl.glBegin(gl.GL_TRIANGLES);
	1427	+ }
	1428	+
	1429	+ public void EndTriangles()
	1430	+ {
	1431	+ GetGL().glEnd();
	1432	+ }
	1433	+
	1434	+ void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
	1435	+ {
	1436	+ if (!selectmode)
	1437	+ {
	1438	+ gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1439	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	1440	+
	1441	+ if (flipV)
	1442	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	1443	+ else
	1444	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1445	+ }
	1446	+
	1447	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	1448	+ }
764	1449
765	1450	void SetColor(Object3D obj, Vertex p0)
766	1451	{
..	..	@@ -939,7 +1624,7 @@
939	1624	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
940	1625	}
941	1626
942		- void DrawMaterial(cMaterial material, boolean selected)
	1627	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
943	1628	{
944	1629	CameraPane display = this;
945	1630	//new Exception().printStackTrace();
..	..	@@ -955,18 +1640,18 @@
955	1640	//col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
956	1641	if (!material.multiply)
957	1642	{
958		- display.color = color;
	1643	+ display.color = material.color;
959	1644	display.saturation = material.modulation;
960	1645	}
961	1646	else
962	1647	{
963		- display.color = color2;
	1648	+ display.color = material.color2;
964	1649	display.saturation = material.modulation2;
965	1650	}
966	1651
967	1652	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
968	1653
969		- float[] colorV = GrafreeD.colorV;
	1654	+ float[] colorV = Grafreed.colorV;
970	1655
971	1656	/**/
972	1657	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -974,7 +1659,7 @@
974	1659	colorV[0] = display.modelParams0[0] * material.diffuse;
975	1660	colorV[1] = display.modelParams0[1] * material.diffuse;
976	1661	colorV[2] = display.modelParams0[2] * material.diffuse;
977		- colorV[3] = material.opacity;
	1662	+ colorV[3] = 1; // material.opacity;
978	1663
979	1664	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
980	1665	//System.out.println("Opacity = " + opacity);
..	..	@@ -1082,9 +1767,9 @@
1082	1767	display.modelParams7[2] = 0;
1083	1768	display.modelParams7[3] = 0;
1084	1769
1085		- display.modelParams6[0] = 100; // criss de bug de bump
	1770	+ //display.modelParams6[0] = 100; // criss de bug de bump
1086	1771
1087		- Object3D.cVector2[] extparams = display.vector2buffer;
	1772	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1088	1773	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1089	1774	{
1090	1775	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1226,7 +1911,7 @@
1226	1911	void PushMatrix(double[][] matrix)
1227	1912	{
1228	1913	// GrafreeD.tracein(matrix);
1229		- PushMatrix(matrix,1);
	1914	+ PushMatrix(matrix, 1);
1230	1915	}
1231	1916
1232	1917	void PushMatrix()
..	..	@@ -1323,7 +2008,7 @@
1323	2008
1324	2009	static int camerachangeframe;
1325	2010
1326		- boolean SetCamera(Camera cam)
	2011	+ public boolean SetCamera(Camera cam)
1327	2012	{
1328	2013	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
1329	2014	// return false;
..	..	@@ -1380,7 +2065,7 @@
1380	2065	//System.err.println("Oeil on");
1381	2066	OEIL = true;
1382	2067	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
1383		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2068	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
1384	2069	//pingthread.StepToTarget(true);
1385	2070	}
1386	2071
..	..	@@ -1451,33 +2136,6 @@
1451	2136	mainDL ^= true;
1452	2137	}
1453	2138
1454		- void ToggleTexture()
1455		- {
1456		- textureon ^= true;
1457		- }
1458		-
1459		- void ToggleLive()
1460		- {
1461		- Globals.setLIVE(Globals.isLIVE() ^ true);
1462		-
1463		- System.err.println("LIVE = " + Globals.isLIVE());
1464		-
1465		- if (!Globals.isLIVE()) // save sound
1466		- GrafreeD.savesound = true; // wav.save();
1467		- // else
1468		- repaint(); // start loop // may 2013
1469		- }
1470		-
1471		- void ToggleSupport()
1472		- {
1473		- SUPPORT ^= true;
1474		- }
1475		-
1476		- void ToggleAbort()
1477		- {
1478		- ABORTMODE ^= true;
1479		- }
1480		-
1481	2139	void ToggleFullScreen()
1482	2140	{
1483	2141	FULLSCREEN ^= true;
..	..	@@ -1488,72 +2146,94 @@
1488	2146	Globals.CROWD ^= true;
1489	2147	}
1490	2148
1491		- void ToggleInertia()
1492		- {
1493		- INERTIA ^= true;
1494		- }
1495		-
1496	2149	void ToggleLocal()
1497	2150	{
1498	2151	LOCALTRANSFORM ^= true;
1499	2152	}
1500	2153
1501		- void ToggleFast()
	2154	+ public void ToggleTexture()
	2155	+ {
	2156	+ textureon ^= true;
	2157	+ }
	2158	+
	2159	+ public void ToggleLive()
	2160	+ {
	2161	+ Globals.setLIVE(Globals.isLIVE() ^ true);
	2162	+
	2163	+ System.err.println("LIVE = " + Globals.isLIVE());
	2164	+
	2165	+ if (!Globals.isLIVE()) // save sound
	2166	+ Grafreed.savesound = true; // wav.save();
	2167	+ // else
	2168	+ repaint(); // start loop // may 2013
	2169	+ }
	2170	+
	2171	+ public void ToggleSupport()
	2172	+ {
	2173	+ SUPPORT ^= true;
	2174	+ }
	2175	+
	2176	+ public void ToggleAbort()
	2177	+ {
	2178	+ ABORTMODE ^= true;
	2179	+ }
	2180	+
	2181	+ public void ToggleInertia()
	2182	+ {
	2183	+ INERTIA ^= true;
	2184	+ }
	2185	+
	2186	+ public void ToggleFast()
1502	2187	{
1503	2188	FAST ^= true;
1504	2189	}
1505	2190
1506		- void ToggleSlowPose()
	2191	+ public void ToggleSlowPose()
1507	2192	{
1508	2193	SLOWPOSE ^= true;
1509	2194	}
1510	2195
1511		- void ToggleFootContact()
1512		- {
1513		- FOOTCONTACT ^= true;
1514		- }
1515		-
1516		- void ToggleBoxMode()
	2196	+ public void ToggleBoxMode()
1517	2197	{
1518	2198	BOXMODE ^= true;
1519	2199	}
1520	2200
1521		- void ToggleSmoothFocus()
	2201	+ public void ToggleZoomBoxMode()
	2202	+ {
	2203	+ ZOOMBOXMODE ^= true;
	2204	+ }
	2205	+
	2206	+ public void ToggleSmoothFocus()
1522	2207	{
1523	2208	SMOOTHFOCUS ^= true;
1524	2209	}
1525	2210
1526		- void ToggleImageFlip()
	2211	+ public void ToggleImageFlip()
1527	2212	{
1528	2213	IMAGEFLIP ^= true;
1529	2214	}
1530	2215
1531		- void ToggleSpeakerMocap()
	2216	+ public void ToggleSpeakerMocap()
1532	2217	{
1533	2218	SPEAKERMOCAP ^= true;
1534	2219	}
1535	2220
1536		- void ToggleSpeakerCamera()
	2221	+ public void ToggleSpeakerCamera()
1537	2222	{
1538	2223	SPEAKERCAMERA ^= true;
1539	2224	}
1540	2225
1541		- void ToggleSpeakerFocus()
	2226	+ public void ToggleSpeakerFocus()
1542	2227	{
1543	2228	SPEAKERFOCUS ^= true;
1544	2229	}
1545	2230
1546		- void ToggleDebug()
1547		- {
1548		- DEBUG ^= true;
1549		- }
1550		-
1551		- void ToggleFrustum()
	2231	+ public void ToggleFrustum()
1552	2232	{
1553	2233	FRUSTUM ^= true;
1554	2234	}
1555	2235
1556		- void ToggleTrack()
	2236	+ public void ToggleTrack()
1557	2237	{
1558	2238	TRACK ^= true;
1559	2239	if (TRACK)
..	..	@@ -1572,25 +2252,35 @@
1572	2252	repaint();
1573	2253	}
1574	2254
1575		- void ToggleTrackOnce()
	2255	+ public void ToggleTrackOnce()
1576	2256	{
1577	2257	TRACKONCE ^= true;
1578	2258	}
1579	2259
1580		- void ToggleShadowTrack()
	2260	+ public void ToggleShadowTrack()
1581	2261	{
1582	2262	SHADOWTRACK ^= true;
1583	2263	repaint();
1584	2264	}
1585	2265
1586		- void ToggleOeil()
	2266	+ public void ToggleOeil()
1587	2267	{
1588	2268	OEIL ^= true;
1589	2269	}
1590	2270
1591		- void ToggleOeilOnce()
	2271	+ public void ToggleOeilOnce()
1592	2272	{
1593	2273	OEILONCE ^= true;
	2274	+ }
	2275	+
	2276	+ void ToggleFootContact()
	2277	+ {
	2278	+ FOOTCONTACT ^= true;
	2279	+ }
	2280	+
	2281	+ void ToggleDebug()
	2282	+ {
	2283	+ Globals.DEBUG ^= true;
1594	2284	}
1595	2285
1596	2286	void ToggleLookAt()
..	..	@@ -1598,9 +2288,9 @@
1598	2288	LOOKAT ^= true;
1599	2289	}
1600	2290
1601		- void ToggleRandom()
	2291	+ void ToggleSwitch()
1602	2292	{
1603		- RANDOM ^= true;
	2293	+ SWITCH ^= true;
1604	2294	}
1605	2295
1606	2296	void ToggleHandles()
..	..	@@ -1608,10 +2298,17 @@
1608	2298	HANDLES ^= true;
1609	2299	}
1610	2300
	2301	+ Object3D paintFolder;
	2302	+
1611	2303	void TogglePaint()
1612	2304	{
1613	2305	PAINTMODE ^= true;
1614	2306	paintcount = 0;
	2307	+
	2308	+ if (PAINTMODE)
	2309	+ {
	2310	+ paintFolder = GetFolder();
	2311	+ }
1615	2312	}
1616	2313
1617	2314	void SwapCamera(int a, int b)
..	..	@@ -1707,7 +2404,46 @@
1707	2404	{
1708	2405	return currentGL;
1709	2406	}
1710		-
	2407	+
	2408	+ private BufferedImage CreateBim(TextureData texturedata)
	2409	+ {
	2410	+ // cache to disk
	2411	+ Buffer buffer = texturedata.getBuffer(); // getMipmapData();
	2412	+ //buffers[0].
	2413	+ ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
	2414	+ int[] pixels = new int[bytebuf.capacity()/3];
	2415	+ int width = texturedata.getWidth(); //(int)Math.sqrt(pixels.length); // squared
	2416	+ int height = width;
	2417	+ for (int i=pixels.length; --i>=0;)
	2418	+ {
	2419	+ int i3 = i*3;
	2420	+ pixels[i] = 0xFF;
	2421	+ pixels[i] <<= 8;
	2422	+ pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
	2423	+ pixels[i] <<= 8;
	2424	+ pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
	2425	+ pixels[i] <<= 8;
	2426	+ pixels[i] \|= bytebuf.get(i3) & 0xFF;
	2427	+ }
	2428	+ /*
	2429	+ int r=0,g=0,b=0,a=0;
	2430	+ for (int i=0; i<width; i++)
	2431	+ for (int j=0; j<height; j++)
	2432	+ {
	2433	+ int index = j*width+i;
	2434	+ int p = pixels[index];
	2435	+ a = ((p>>24) & 0xFF);
	2436	+ r = ((p>>16) & 0xFF);
	2437	+ g = ((p>>8) & 0xFF);
	2438	+ b = (p & 0xFF);
	2439	+ pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
	2440	+ }
	2441	+ /**/
	2442	+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
	2443	+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	2444	+ return rendImage;
	2445	+ }
	2446	+
1711	2447	/**/
1712	2448	class CacheTexture
1713	2449	{
..	..	@@ -1725,9 +2461,10 @@
1725	2461	/**/
1726	2462
1727	2463	// TEXTURE static Texture texture;
1728		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
1729		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
1730		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2464	+ static public java.util.Hashtable<String, CacheTexture> textures = new java.util.Hashtable<String, CacheTexture>();
	2465	+ static public java.util.Hashtable<BufferedImage, CacheTexture> bimtextures = new java.util.Hashtable<BufferedImage, CacheTexture>();
	2466	+ static public java.util.HashSet<String> usedtextures = new java.util.HashSet<String>();
	2467	+
1731	2468	int pigmentdepth = 0;
1732	2469	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
1733	2470	int bumpdepth = 0;
..	..	@@ -1749,6 +2486,33 @@
1749	2486	true,
1750	2487	com.sun.opengl.util.texture.TextureIO.PNG);
1751	2488	} catch (java.io.IOException e)
	2489	+ {
	2490	+ throw new javax.media.opengl.GLException(e);
	2491	+ }
	2492	+
	2493	+ if (bump)
	2494	+ texturedata = ConvertBump(texturedata, false);
	2495	+
	2496	+ com.sun.opengl.util.texture.Texture texture =
	2497	+ com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2498	+
	2499	+ texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2500	+ texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2501	+
	2502	+ return texture;
	2503	+ }
	2504	+
	2505	+ com.sun.opengl.util.texture.Texture GetBimTexture(BufferedImage name, boolean bump)
	2506	+ {
	2507	+ TextureData texturedata = null;
	2508	+
	2509	+ try
	2510	+ {
	2511	+ texturedata =
	2512	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2513	+ name,
	2514	+ true);
	2515	+ } catch (Exception e)
1752	2516	{
1753	2517	throw new javax.media.opengl.GLException(e);
1754	2518	}
..	..	@@ -2835,6 +3599,8 @@
2835	3599
2836	3600	System.out.println("LOADING TEXTURE : " + name);
2837	3601
	3602	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3603	+
2838	3604	//
2839	3605	if (false) // compressbit > 0)
2840	3606	{
..	..	@@ -3539,6 +4305,7 @@
3539	4305
3540	4306	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
3541	4307	{
	4308	+ new Exception().printStackTrace();
3542	4309	System.exit(0);
3543	4310	com.sun.opengl.util.texture.Texture texture = null;
3544	4311
..	..	@@ -7232,7 +7999,7 @@
7232	7999	String pigment = Object3D.GetPigment(tex);
7233	8000	String bump = Object3D.GetBump(tex);
7234	8001
7235		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8002	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7236	8003	{
7237	8004	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7238	8005	// System.out.println("; bump = " + bump);
..	..	@@ -7249,6 +8016,64 @@
7249	8016
7250	8017	ReleaseTexture(bump, true);
7251	8018	ReleaseTexture(pigment, false);
	8019	+ }
	8020	+
	8021	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8022	+ {
	8023	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8024	+ {
	8025	+ return;
	8026	+ }
	8027	+
	8028	+ if (tex == null)
	8029	+ {
	8030	+ ReleaseTexture(null, false);
	8031	+ return;
	8032	+ }
	8033	+
	8034	+ String pigment = Object3D.GetPigment(tex);
	8035	+
	8036	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8037	+ {
	8038	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8039	+ // System.out.println("; bump = " + bump);
	8040	+ }
	8041	+
	8042	+ if (pigment.equals(""))
	8043	+ {
	8044	+ pigment = null;
	8045	+ }
	8046	+
	8047	+ ReleaseTexture(pigment, false);
	8048	+ }
	8049	+
	8050	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8051	+ {
	8052	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8053	+ {
	8054	+ return;
	8055	+ }
	8056	+
	8057	+ if (tex == null)
	8058	+ {
	8059	+ ReleaseTexture(null, true);
	8060	+ return;
	8061	+ }
	8062	+
	8063	+ String bump = Object3D.GetBump(tex);
	8064	+
	8065	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8066	+ {
	8067	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8068	+ // System.out.println("; bump = " + bump);
	8069	+ }
	8070	+
	8071	+ if (bump.equals(""))
	8072	+ {
	8073	+ bump = null;
	8074	+ }
	8075	+
	8076	+ ReleaseTexture(bump, true);
7252	8077	}
7253	8078
7254	8079	void ReleaseTexture(String tex, boolean bump)
..	..	@@ -7354,7 +8179,55 @@
7354	8179	}
7355	8180	}
7356	8181
7357		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8182	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
	8183	+ {
	8184	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8185	+// ambientOcclusion ) // \|\| !textureon)
	8186	+// {
	8187	+// return; // false;
	8188	+// }
	8189	+//
	8190	+// if (tex == null)
	8191	+// {
	8192	+// BindTexture(null,false,resolution);
	8193	+// BindTexture(null,true,resolution);
	8194	+// return;
	8195	+// }
	8196	+//
	8197	+// String pigment = Object3D.GetPigment(tex);
	8198	+// String bump = Object3D.GetBump(tex);
	8199	+//
	8200	+// usedtextures.add(pigment);
	8201	+// usedtextures.add(bump);
	8202	+//
	8203	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8204	+// {
	8205	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8206	+// // System.out.println("; bump = " + bump);
	8207	+// }
	8208	+//
	8209	+// if (bump.equals(""))
	8210	+// {
	8211	+// bump = null;
	8212	+// }
	8213	+// if (pigment.equals(""))
	8214	+// {
	8215	+// pigment = null;
	8216	+// }
	8217	+//
	8218	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8219	+// BindTexture(pigment, false, resolution);
	8220	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8221	+// BindTexture(bump, true, resolution);
	8222	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8223	+//
	8224	+// return; // true;
	8225	+
	8226	+ BindPigmentTexture(tex, resolution);
	8227	+ BindBumpTexture(tex, resolution);
	8228	+ }
	8229	+
	8230	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
7358	8231	{
7359	8232	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7360	8233	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7364,18 +8237,48 @@
7364	8237
7365	8238	if (tex == null)
7366	8239	{
7367		- BindTexture(null,false,resolution);
7368		- BindTexture(null,true,resolution);
	8240	+ BindTexture(null, null,false,resolution);
7369	8241	return;
7370	8242	}
7371	8243
7372	8244	String pigment = Object3D.GetPigment(tex);
	8245	+
	8246	+ usedtextures.add(pigment);
	8247	+
	8248	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8249	+ {
	8250	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8251	+ // System.out.println("; bump = " + bump);
	8252	+ }
	8253	+
	8254	+ if (pigment.equals(""))
	8255	+ {
	8256	+ pigment = null;
	8257	+ }
	8258	+
	8259	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8260	+ BindTexture(tex.pigmenttexture, pigment, false, resolution);
	8261	+ }
	8262	+
	8263	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8264	+ {
	8265	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8266	+ ambientOcclusion ) // \|\| !textureon)
	8267	+ {
	8268	+ return; // false;
	8269	+ }
	8270	+
	8271	+ if (tex == null)
	8272	+ {
	8273	+ BindTexture(null, null,true,resolution);
	8274	+ return;
	8275	+ }
	8276	+
7373	8277	String bump = Object3D.GetBump(tex);
7374	8278
7375		- usedtextures.put(pigment, pigment);
7376		- usedtextures.put(bump, bump);
	8279	+ usedtextures.add(bump);
7377	8280
7378		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8281	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7379	8282	{
7380	8283	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
7381	8284	// System.out.println("; bump = " + bump);
..	..	@@ -7385,42 +8288,70 @@
7385	8288	{
7386	8289	bump = null;
7387	8290	}
7388		- if (pigment.equals(""))
7389		- {
7390		- pigment = null;
7391		- }
7392	8291
7393		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
7394		- BindTexture(pigment, false, resolution);
7395	8292	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
7396		- BindTexture(bump, true, resolution);
	8293	+ BindTexture(tex.bumptexture, bump, true, resolution);
7397	8294	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
7398		-
7399		- return; // true;
7400	8295	}
7401	8296
7402		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8297	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8298	+
	8299	+ private boolean FileExists(String tex)
7403	8300	{
7404		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8301	+ if (missingTextures.contains(tex))
	8302	+ {
	8303	+ return false;
	8304	+ }
	8305	+
	8306	+ boolean fileExists = new File(tex).exists();
	8307	+
	8308	+ if (!fileExists)
	8309	+ {
	8310	+ // If file exists, the "new File()" is not executed sgain
	8311	+ missingTextures.add(tex);
	8312	+ }
	8313	+
	8314	+ return fileExists;
	8315	+ }
	8316	+
	8317	+ CacheTexture GetCacheTexture(java.awt.image.BufferedImage bim, String tex, boolean bump, int resolution) throws Exception
	8318	+ {
	8319	+ CacheTexture texturecache = null;
7405	8320
7406	8321	if (tex != null)
7407	8322	{
7408	8323	String texname = tex;
7409	8324
7410		- String[] split = tex.split("Textures");
7411		- if (split.length > 1)
7412		- texname = "/Users/nbriere/Textures" + split[split.length-1];
7413		- else
7414		- if (!texname.startsWith("/"))
7415		- texname = "/Users/nbriere/Textures/" + texname;
	8325	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8326	+
	8327	+// String[] split = tex.split("Textures");
	8328	+// if (split.length > 1)
	8329	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8330	+// else
	8331	+// if (!texname.startsWith("/"))
	8332	+// texname = "/Users/nbriere/Textures/" + texname;
	8333	+ if (!FileExists(tex))
	8334	+ {
	8335	+ texname = fallbackTextureName;
	8336	+ }
7416	8337
7417	8338	if (CACHETEXTURE)
7418		- texture = textures.get(texname); // TEXTURE CACHE
7419		-
7420		- TextureData texturedata = null;
7421		-
7422		- if (texture == null \|\| texture.resolution < resolution)
7423	8339	{
	8340	+ if (bim == null)
	8341	+ texturecache = textures.get(texname); // TEXTURE CACHE
	8342	+ else
	8343	+ texturecache = bimtextures.get(bim); // TEXTURE CACHE
	8344	+ }
	8345	+
	8346	+ if (texturecache == null \|\| texturecache.resolution < resolution)
	8347	+ {
	8348	+ TextureData texturedata = null;
	8349	+
	8350	+ if (bim != null)
	8351	+ {
	8352	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8353	+ }
	8354	+ else
7424	8355	if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
7425	8356	{
7426	8357	assert(!bump);
..	..	@@ -7432,19 +8363,23 @@
7432	8363	// }
7433	8364	// else
7434	8365	// {
7435		- texture = textures.get(tex);
7436		- if (texture == null)
	8366	+ texturecache = textures.get(tex);
	8367	+ if (texturecache == null)
7437	8368	{
7438		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8369	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
7439	8370	}
	8371	+ else
	8372	+ new Exception().printStackTrace();
7440	8373	// }
7441	8374	} else
7442	8375	if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
7443	8376	{
7444	8377	assert(bump);
7445		- texture = textures.get(tex);
7446		- if (texture == null)
7447		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8378	+ texturecache = textures.get(tex);
	8379	+ if (texturecache == null)
	8380	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8381	+ else
	8382	+ new Exception().printStackTrace();
7448	8383	} else
7449	8384	{
7450	8385	//if (tex.equals("IMMORTAL"))
..	..	@@ -7454,9 +8389,11 @@
7454	8389	//{
7455	8390	if (tex.equals("WHITE_NOISE"))
7456	8391	{
7457		- texture = textures.get(tex);
7458		- if (texture == null)
7459		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8392	+ texturecache = textures.get(tex);
	8393	+ if (texturecache == null)
	8394	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8395	+ else
	8396	+ new Exception().printStackTrace();
7460	8397	} else
7461	8398	{
7462	8399	if (textureon)
..	..	@@ -7481,7 +8418,7 @@
7481	8418	}
7482	8419
7483	8420	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
7484		- if (!new File(cachename).exists())
	8421	+ if (!FileExists(cachename))
7485	8422	cachename = texname;
7486	8423	else
7487	8424	processbump = false; // don't process bump map again
..	..	@@ -7503,7 +8440,7 @@
7503	8440	}
7504	8441
7505	8442	cachename = texname.substring(0, texname.length()-4)+ext+".png";
7506		- if (!new File(cachename).exists())
	8443	+ if (!FileExists(cachename))
7507	8444	cachename = texname;
7508	8445	else
7509	8446	processbump = false; // don't process bump map again
..	..	@@ -7512,20 +8449,23 @@
7512	8449	texturedata = GetFileTexture(cachename, processbump, resolution);
7513	8450
7514	8451
7515		- if (texturedata != null)
7516		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8452	+ if (texturedata == null)
	8453	+ throw new Exception();
	8454	+
	8455	+ texturecache = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
7517	8456	//texture = GetTexture(tex, bump);
7518	8457	}
7519	8458	}
7520	8459	//}
7521	8460	}
7522	8461
7523		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8462	+ if (/CACHETEXTURE &&/ texturecache != null && textureon)
7524	8463	{
7525	8464	//return false;
	8465	+ assert(bim == null);
7526	8466
7527	8467	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
7528		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8468	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
7529	8469	{
7530	8470	// String ext = "_highres";
7531	8471	// if (REDUCETEXTURE)
..	..	@@ -7542,52 +8482,17 @@
7542	8482	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
7543	8483	if (!cachefile.exists())
7544	8484	{
7545		- // cache to disk
7546		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
7547		- //buffers[0].
7548		-
7549		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
7550		- int[] pixels = new int[bytebuf.capacity()/3];
7551		-
7552		- // squared size heuristic...
7553		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8485	+ //if (texturedata.getWidth() == texturedata.getHeight())
7554	8486	{
7555		- for (int i=pixels.length; --i>=0;)
7556		- {
7557		- int i3 = i*3;
7558		- pixels[i] = 0xFF;
7559		- pixels[i] <<= 8;
7560		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
7561		- pixels[i] <<= 8;
7562		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
7563		- pixels[i] <<= 8;
7564		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
7565		- }
7566		-
7567		- /*
7568		- int r=0,g=0,b=0,a=0;
7569		- for (int i=0; i<width; i++)
7570		- for (int j=0; j<height; j++)
7571		- {
7572		- int index = j*width+i;
7573		- int p = pixels[index];
7574		- a = ((p>>24) & 0xFF);
7575		- r = ((p>>16) & 0xFF);
7576		- g = ((p>>8) & 0xFF);
7577		- b = (p & 0xFF);
7578		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
7579		- }
7580		- /**/
7581		- int width = (int)Math.sqrt(pixels.length); // squared
7582		- int height = width;
7583		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
7584		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8487	+ BufferedImage rendImage = CreateBim(texturedata);
	8488	+
7585	8489	ImageWriter writer = null;
7586	8490	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
7587	8491	if (iter.hasNext()) {
7588	8492	writer = (ImageWriter)iter.next();
7589	8493	}
7590		- float compressionQuality = 0.9f;
	8494	+
	8495	+ float compressionQuality = 0.85f;
7591	8496	try
7592	8497	{
7593	8498	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -7614,8 +8519,8 @@
7614	8519	textures.remove(texname);
7615	8520	}
7616	8521
7617		- texture.texturedata = texturedata;
7618		- textures.put(texname, texture);
	8522	+ //texture.texturedata = texturedata;
	8523	+ textures.put(texname, texturecache);
7619	8524
7620	8525	// newtex = true;
7621	8526	}
..	..	@@ -7631,12 +8536,17 @@
7631	8536	}
7632	8537	}
7633	8538
7634		- return texture;
	8539	+ return texturecache;
7635	8540	}
7636	8541
7637		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8542	+ static void EmbedTextures(cTexture tex)
7638	8543	{
7639		- CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	8544	+
	8545	+ }
	8546	+
	8547	+ com.sun.opengl.util.texture.Texture GetTexture(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
	8548	+ {
	8549	+ CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
7640	8550
7641	8551	if (bump)
7642	8552	{
..	..	@@ -7652,23 +8562,23 @@
7652	8562	return texture!=null?texture.texture:null;
7653	8563	}
7654	8564
7655		- com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8565	+ public com.sun.opengl.util.texture.TextureData GetTextureData(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
7656	8566	{
7657		- CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	8567	+ CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
7658	8568
7659	8569	return texture!=null?texture.texturedata:null;
7660	8570	}
7661	8571
7662		- boolean BindTexture(String tex, boolean bump, int resolution)
	8572	+ boolean BindTexture(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
7663	8573	{
7664	8574	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
7665	8575	{
7666	8576	return false;
7667	8577	}
7668	8578
7669		- boolean newtex = false;
	8579	+ //boolean newtex = false;
7670	8580
7671		- com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
	8581	+ com.sun.opengl.util.texture.Texture texture = GetTexture(stream, tex, bump, resolution);
7672	8582
7673	8583	if (texture == null)
7674	8584	return false;
..	..	@@ -7698,7 +8608,7 @@
7698	8608	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
7699	8609	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
7700	8610
7701		- return newtex;
	8611	+ return true; // Warning: not used.
7702	8612	}
7703	8613
7704	8614	ShadowBuffer shadowPBuf;
..	..	@@ -8536,11 +9446,35 @@
8536	9446	jy8[3] = 0.5f;
8537	9447	}
8538	9448
8539		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9449	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
8540	9450	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
8541	9451	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
8542	9452	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
8543	9453
	9454	+ void ResetOptions()
	9455	+ {
	9456	+ options1[0] = 100;
	9457	+ options1[1] = 0.025f;
	9458	+ options1[2] = 0.01f;
	9459	+ options1[3] = 0;
	9460	+ options1[4] = 0;
	9461	+
	9462	+ options2[0] = 0;
	9463	+ options2[1] = 0.75f;
	9464	+ options2[2] = 0;
	9465	+ options2[3] = 0;
	9466	+
	9467	+ options3[0] = 1;
	9468	+ options3[1] = 1;
	9469	+ options3[2] = 1;
	9470	+ options3[3] = 0;
	9471	+
	9472	+ options4[0] = 1;
	9473	+ options4[1] = 0;
	9474	+ options4[2] = 1;
	9475	+ options4[3] = 0;
	9476	+ }
	9477	+
8544	9478	static int imagecount = 0; // movie generation
8545	9479
8546	9480	static int jitter = 0;
..	..	@@ -8636,8 +9570,8 @@
8636	9570	assert (parentcam != renderCamera);
8637	9571
8638	9572	if (renderCamera != lightCamera)
8639		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8640		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9573	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9574	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
8641	9575
8642	9576	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
8643	9577
..	..	@@ -8652,8 +9586,8 @@
8652	9586	LA.matCopy(renderCamera.fromScreen, matrix);
8653	9587
8654	9588	if (renderCamera != lightCamera)
8655		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8656		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9589	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9590	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
8657	9591
8658	9592	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
8659	9593
..	..	@@ -8725,7 +9659,7 @@
8725	9659	//gl.glFlush();
8726	9660	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
8727	9661
8728		- if (ANIMATION && ABORTED)
	9662	+ if (Globals.ANIMATION && ABORTED)
8729	9663	{
8730	9664	System.err.println(" ABORTED FRAME");
8731	9665	break;
..	..	@@ -8755,7 +9689,7 @@
8755	9689	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
8756	9690
8757	9691	// save image
8758		- if (ANIMATION && !ABORTED)
	9692	+ if (Globals.ANIMATION && !ABORTED)
8759	9693	{
8760	9694	VPwidth = viewport[2];
8761	9695	VPheight = viewport[3];
..	..	@@ -8866,11 +9800,11 @@
8866	9800
8867	9801	// imagecount++;
8868	9802
8869		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9803	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
8870	9804
8871	9805	if (!BOXMODE)
8872	9806	{
8873		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9807	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
8874	9808	}
8875	9809
8876	9810	if (!BOXMODE)
..	..	@@ -8908,7 +9842,7 @@
8908	9842	ABORTED = false;
8909	9843	}
8910	9844	else
8911		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9845	+ Grafreed.wav.cursor += 735 * ACSIZE;
8912	9846
8913	9847	if (false)
8914	9848	{
..	..	@@ -9571,11 +10505,11 @@
9571	10505
9572	10506	public void display(GLAutoDrawable drawable)
9573	10507	{
9574		- if (GrafreeD.savesound && GrafreeD.hassound)
	10508	+ if (Grafreed.savesound && Grafreed.hassound)
9575	10509	{
9576		- GrafreeD.wav.save();
9577		- GrafreeD.savesound = false;
9578		- GrafreeD.hassound = false;
	10510	+ Grafreed.wav.save();
	10511	+ Grafreed.savesound = false;
	10512	+ Grafreed.hassound = false;
9579	10513	}
9580	10514	// if (DEBUG_SELECTION)
9581	10515	// {
..	..	@@ -9651,6 +10585,7 @@
9651	10585	ANTIALIAS = 0;
9652	10586	//System.out.println("RESTART");
9653	10587	AAtimer.restart();
	10588	+ Globals.TIMERRUNNING = true;
9654	10589	}
9655	10590	}
9656	10591	}
..	..	@@ -9705,7 +10640,7 @@
9705	10640	Object3D theobject = object;
9706	10641	Object3D theparent = object.parent;
9707	10642	object.parent = null;
9708		- object = (Object3D)GrafreeD.clone(object);
	10643	+ object = (Object3D)Grafreed.clone(object);
9709	10644	object.Stripify();
9710	10645	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
9711	10646	theobject.PreprocessOcclusion(this);
..	..	@@ -9718,13 +10653,14 @@
9718	10653	ambientOcclusion = false;
9719	10654	}
9720	10655
9721		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10656	+ if (//Globals.lighttouched &&
	10657	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
9722	10658	{
9723	10659	//if (RENDERSHADOW) // ?
9724	10660	if (!IsFrozen())
9725	10661	{
9726	10662	// dec 2012
9727		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10663	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
9728	10664	{
9729	10665	Globals.framecount++;
9730	10666	shadowbuffer.display();
..	..	@@ -9851,8 +10787,8 @@
9851	10787
9852	10788	// if (parentcam != renderCamera) // not a light
9853	10789	if (cam != lightCamera)
9854		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9855		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10790	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10791	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
9856	10792
9857	10793	for (int j = 0; j < 4; j++)
9858	10794	{
..	..	@@ -9866,8 +10802,8 @@
9866	10802
9867	10803	// if (parentcam != renderCamera) // not a light
9868	10804	if (cam != lightCamera)
9869		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9870		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10805	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10806	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
9871	10807
9872	10808	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
9873	10809
..	..	@@ -10126,7 +11062,16 @@
10126	11062	// Bump noise
10127	11063	gl.glActiveTexture(GL.GL_TEXTURE6);
10128	11064	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10129		- BindTexture(NOISE_TEXTURE, false, 2);
	11065	+
	11066	+ try
	11067	+ {
	11068	+ BindTexture(null, NOISE_TEXTURE, false, 2);
	11069	+ }
	11070	+ catch (Exception e)
	11071	+ {
	11072	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11073	+ }
	11074	+
10130	11075
10131	11076	gl.glActiveTexture(GL.GL_TEXTURE0);
10132	11077	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10149,9 +11094,9 @@
10149	11094
10150	11095	gl.glMatrixMode(GL.GL_MODELVIEW);
10151	11096
10152		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10153		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10154		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11097	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11098	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11099	+gl.glEnable(gl.GL_MULTISAMPLE);
10155	11100	} else
10156	11101	{
10157	11102	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10162,7 +11107,7 @@
10162	11107	//System.out.println("BLENDING ON");
10163	11108	gl.glEnable(GL.GL_BLEND);
10164	11109	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10165		-
	11110	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10166	11111	gl.glMatrixMode(gl.GL_PROJECTION);
10167	11112	gl.glLoadIdentity();
10168	11113
..	..	@@ -10251,8 +11196,8 @@
10251	11196	System.err.println("parentcam != renderCamera");
10252	11197
10253	11198	// if (cam != lightCamera)
10254		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10255		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11199	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11200	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10256	11201	}
10257	11202
10258	11203	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10273,8 +11218,8 @@
10273	11218	if (true) // TODO
10274	11219	{
10275	11220	if (cam != lightCamera)
10276		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10277		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11221	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11222	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10278	11223	}
10279	11224
10280	11225	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -10340,7 +11285,7 @@
10340	11285	fragmentMode \|= (lightslot - 64) << 2; // 1; // first bit is available for aniso
10341	11286	//System.out.println("fragmentMode = " + fragmentMode);
10342	11287
10343		- if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| DEBUG_SELECTION)
	11288	+ if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| IsDebugSelection())
10344	11289	{
10345	11290	/*
10346	11291	if (CULLFACE \|\| (ambientOcclusion && OCCLUSION_CULLING))
..	..	@@ -10590,8 +11535,14 @@
10590	11535	{
10591	11536	renderpass++;
10592	11537	// System.out.println("Draw object... ");
	11538	+ STEP = 1;
10593	11539	if (FAST) // in case there is no script
10594		- STEP = 16;
	11540	+ STEP = 8;
	11541	+
	11542	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11543	+ {
	11544	+ STEP *= 4;
	11545	+ }
10595	11546
10596	11547	//object.FullInvariants();
10597	11548
..	..	@@ -10605,23 +11556,44 @@
10605	11556	e.printStackTrace();
10606	11557	}
10607	11558
10608		- if (GrafreeD.RENDERME > 0)
10609		- GrafreeD.RENDERME--; // mechante magouille
	11559	+ if (Grafreed.RENDERME > 0)
	11560	+ Grafreed.RENDERME--; // mechante magouille
10610	11561
10611	11562	Globals.ONESTEP = false;
10612	11563	}
10613	11564
10614	11565	static boolean zoomonce = false;
10615	11566
	11567	+ static void CreateSelectedPoint()
	11568	+ {
	11569	+ if (selectedpoint == null)
	11570	+ {
	11571	+ debugpointG = new Sphere();
	11572	+ debugpointP = new Sphere();
	11573	+ debugpointC = new Sphere();
	11574	+ debugpointR = new Sphere();
	11575	+
	11576	+ selectedpoint = new Superellipsoid();
	11577	+
	11578	+ for (int i=0; i<8; i++)
	11579	+ {
	11580	+ debugpoints[i] = new Sphere();
	11581	+ }
	11582	+ }
	11583	+ }
	11584	+
10616	11585	void DrawObject(GL gl, boolean draw)
10617	11586	{
	11587	+ // To clear camera values
	11588	+ ResetOptions();
	11589	+
10618	11590	//System.out.println("DRAW OBJECT " + mouseDown);
10619	11591	// DrawMode() = SELECTION;
10620	11592	//GL gl = getGL();
10621	11593	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
10622	11594	{
10623	11595	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
10624		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11596	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
10625	11597	pingthread.StepToTarget(true); // true);
10626	11598	// zoomonce = false;
10627	11599	}
..	..	@@ -10641,7 +11613,7 @@
10641	11613	callist = gl.glGenLists(1);
10642	11614	}
10643	11615
10644		- boolean selectmode = DrawMode() == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	11616	+ boolean selectmode = DrawMode() == SELECTION \|\| IsDebugSelection();
10645	11617
10646	11618	boolean active = !selectmode; // DrawMode() != SELECTION; // mouseDown;
10647	11619
..	..	@@ -10676,7 +11648,14 @@
10676	11648
10677	11649	usedtextures.clear();
10678	11650
10679		- BindTextures(DEFAULT_TEXTURES, 2);
	11651	+ try
	11652	+ {
	11653	+ BindTextures(DEFAULT_TEXTURES, 2);
	11654	+ }
	11655	+ catch (Exception e)
	11656	+ {
	11657	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11658	+ }
10680	11659	}
10681	11660	//System.out.println("--> " + stackdepth);
10682	11661	// GrafreeD.traceon();
..	..	@@ -10686,8 +11665,9 @@
10686	11665
10687	11666	if (DrawMode() == DEFAULT)
10688	11667	{
10689		- if (DEBUG)
	11668	+ if (Globals.DEBUG)
10690	11669	{
	11670	+ CreateSelectedPoint();
10691	11671	float radius = 0.05f;
10692	11672	if (selectedpoint.radius != radius)
10693	11673	{
..	..	@@ -10750,7 +11730,7 @@
10750	11730	if (tex.equals("WHITE_NOISE"))
10751	11731	continue;
10752	11732
10753		- if (!usedtextures.containsKey(tex))
	11733	+ if (!usedtextures.contains(tex))
10754	11734	{
10755	11735	// System.out.println("DISPOSE +++++++++++++++ " + tex);
10756	11736	textures.get(tex).texture.dispose();
..	..	@@ -10767,7 +11747,14 @@
10767	11747	if (checker != null && DrawMode() == DEFAULT)
10768	11748	{
10769	11749	//BindTexture(IMMORTAL_TEXTURE);
10770		- BindTextures(checker.GetTextures(), checker.texres);
	11750	+ try
	11751	+ {
	11752	+ BindTextures(checker.GetTextures(), checker.texres);
	11753	+ }
	11754	+ catch (Exception e)
	11755	+ {
	11756	+ System.err.println("FAILED: " + checker.GetTextures());
	11757	+ }
10771	11758	// NEAREST
10772	11759	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
10773	11760	DrawChecker(gl);
..	..	@@ -10849,7 +11836,7 @@
10849	11836	return;
10850	11837	}
10851	11838
10852		- String string = obj.GetToolTip();
	11839	+ String string = obj.toString(); //.GetToolTip();
10853	11840
10854	11841	GL gl = GetGL();
10855	11842
..	..	@@ -11166,8 +12153,8 @@
11166	12153	//obj.TransformToWorld(light, light);
11167	12154	for (int i = tp.size(); --i >= 0;)
11168	12155	{
11169		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11170		- LA.xformPos(light, tp.get(i).toParent, light);
	12156	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12157	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11171	12158	}
11172	12159
11173	12160
..	..	@@ -11184,8 +12171,8 @@
11184	12171	parentcam = cameras[0];
11185	12172	}
11186	12173
11187		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11188		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12174	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12175	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11189	12176
11190	12177	LA.xformPos(light, renderCamera.toScreen, light);
11191	12178
..	..	@@ -11799,8 +12786,8 @@
11799	12786
11800	12787	// display shadow only (bump == 0)
11801	12788	"SUB temp.x, half.x, shadow.x;" +
11802		- "MOV temp.y, -params6.x;" +
11803		- "SLT temp.z, temp.y, zero.x;" +
	12789	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12790	+ "SLT temp.z, temp.y, -one2048th.x;" +
11804	12791	"SUB temp.y, one.x, temp.z;" +
11805	12792	"MUL temp.x, temp.x, temp.y;" +
11806	12793	"KIL temp.x;" +
..	..	@@ -11929,8 +12916,10 @@
11929	12916	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
11930	12917
11931	12918	"SUB temp.x, one.x, ndotl.x;" +
11932		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
11933		- "ADD temp.y, one.y, options2.y;" + // sursurface
	12919	+ // Tuning for default skin
	12920	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12921	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12922	+ "ADD temp.y, one.y, options2.y;" + // subsurface
11934	12923	"MUL temp.x, temp.x, temp.y;" +
11935	12924
11936	12925	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12129,7 +13118,7 @@
12129	13118	//once = true;
12130	13119	}
12131	13120
12132		- System.out.print("Program #" + mode + "; length = " + program.length());
	13121	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
12133	13122	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
12134	13123	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12135	13124
..	..	@@ -12262,12 +13251,16 @@
12262	13251
12263	13252	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12264	13253	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13254	+
	13255	+ // Compare fragment depth in light space with shadowmap.
12265	13256	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12266	13257	"SGE temp.y, temp.x, zero.x;" +
12267		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13258	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13259	+
	13260	+ // Reverse comparison
12268	13261	"SUB temp.x, one.x, temp.x;" +
12269	13262	"MUL " + shadow + ".x, temp.x, temp.y;" +
12270		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13263	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12271	13264	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12272	13265
12273	13266	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12281,6 +13274,10 @@
12281	13274	// No shadow for backface
12282	13275	"DP3 temp.x, normal, lightd;" +
12283	13276	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13277	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13278	+
	13279	+ // No shadow when out of frustrum
	13280	+ "SGE temp.x, " + depth + ".z, one.z;" +
12284	13281	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12285	13282	"";
12286	13283	}
..	..	@@ -12427,7 +13424,8 @@
12427	13424	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
12428	13425	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
12429	13426	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
12430		- Object3D.cVector2[] vector2buffer;
	13427	+
	13428	+ //Object3D.cVector2[] vector2buffer;
12431	13429
12432	13430	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
12433	13431	// OUT : diff, spec
..	..	@@ -12443,9 +13441,10 @@
12443	13441	"DP3 " + dest + ".z," + "normals," + "eye;" +
12444	13442	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
12445	13443	//"MOV " + dest + ".w," + "normal.z;" +
12446		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
12447		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
12448		- //"MOV " + dest + ".z," + "params2.w;" +
	13444	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13445	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13446	+
	13447	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
12449	13448	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
12450	13449	"RCP " + dest + ".w," + dest + ".w;" +
12451	13450	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -12839,7 +13838,7 @@
12839	13838	public void mousePressed(MouseEvent e)
12840	13839	{
12841	13840	//System.out.println("mousePressed: " + e);
12842		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13841	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
12843	13842	}
12844	13843
12845	13844	static long prevtime = 0;
..	..	@@ -12866,6 +13865,7 @@
12866	13865
12867	13866	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
12868	13867
	13868	+ if (BUTTONLESSWHEEL)
12869	13869	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
12870	13870	{
12871	13871	return;
..	..	@@ -12874,7 +13874,7 @@
12874	13874	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
12875	13875
12876	13876	// TIMER
12877		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	13877	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
12878	13878	{
12879	13879	keepboxmode = BOXMODE;
12880	13880	keepsupport = SUPPORT;
..	..	@@ -12914,8 +13914,8 @@
12914	13914	// mode \|= META;
12915	13915	//}
12916	13916
12917		- SetMouseMode(WHEEL \| e.getModifiersEx());
12918		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13917	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13918	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
12919	13919	anchorX = ax;
12920	13920	anchorY = ay;
12921	13921	prevX = px;
..	..	@@ -12949,6 +13949,7 @@
12949	13949	else
12950	13950	if (evt.getSource() == AAtimer)
12951	13951	{
	13952	+ Globals.TIMERRUNNING = false;
12952	13953	if (mouseDown)
12953	13954	{
12954	13955	//new Exception().printStackTrace();
..	..	@@ -12974,6 +13975,10 @@
12974	13975	// LIVE = waslive;
12975	13976	// wasliveok = true;
12976	13977	// waslive = false;
	13978	+
	13979	+ // May 2019 Forget it:
	13980	+ if (true)
	13981	+ return;
12977	13982
12978	13983	// source == timer
12979	13984	if (mouseDown)
..	..	@@ -13004,7 +14009,7 @@
13004	14009
13005	14010	// fev 2014???
13006	14011	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13007		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14012	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13008	14013	pingthread.StepToTarget(true); // true);
13009	14014	}
13010	14015	// if (!LIVE)
..	..	@@ -13013,12 +14018,13 @@
13013	14018
13014	14019	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13015	14020
13016		- void clickStart(int x, int y, int modifiers)
	14021	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13017	14022	{
13018	14023	if (!wasliveok)
13019	14024	return;
13020	14025
13021	14026	AAtimer.restart(); //
	14027	+ Globals.TIMERRUNNING = true;
13022	14028
13023	14029	// waslive = LIVE;
13024	14030	// LIVE = false;
..	..	@@ -13030,7 +14036,7 @@
13030	14036	// touched = true; // main DL
13031	14037	if (isRenderer)
13032	14038	{
13033		- SetMouseMode(modifiers);
	14039	+ SetMouseMode(modifiers, modifiersex);
13034	14040	}
13035	14041
13036	14042	selectX = anchorX = x;
..	..	@@ -13043,7 +14049,7 @@
13043	14049	clicked = true;
13044	14050	hold = false;
13045	14051
13046		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14052	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13047	14053	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13048	14054	{
13049	14055	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13074,7 +14080,7 @@
13074	14080	info.camera = renderCamera;
13075	14081	info.x = x;
13076	14082	info.y = y;
13077		- info.modifiers = modifiers;
	14083	+ info.modifiers = modifiersex;
13078	14084	editObj = object.doEditClick(info, 0);
13079	14085	if (!editObj)
13080	14086	{
..	..	@@ -13091,11 +14097,14 @@
13091	14097
13092	14098	public void mouseDragged(MouseEvent e)
13093	14099	{
	14100	+ Globals.MOUSEDRAGGED = true;
	14101	+
	14102	+ //System.out.println("mouseDragged: " + e);
13094	14103	if (isRenderer)
13095	14104	movingcamera = true;
	14105	+
13096	14106	//if (drawing)
13097	14107	//return;
13098		- //System.out.println("mouseDragged: " + e);
13099	14108	if ((e.getModifiersEx() & CTRL) != 0
13100	14109	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
13101	14110	{
..	..	@@ -13103,7 +14112,7 @@
13103	14112	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13104	14113	}
13105	14114	else
13106		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14115	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13107	14116
13108	14117	//try { Thread.sleep(1); } catch (Exception ex) {}
13109	14118	}
..	..	@@ -13115,6 +14124,11 @@
13115	14124	cVector tmp = new cVector();
13116	14125	cVector tmp2 = new cVector();
13117	14126	boolean isMoving;
	14127	+
	14128	+ public cVector TargetLookAt()
	14129	+ {
	14130	+ return targetLookAt;
	14131	+ }
13118	14132
13119	14133	class PingThread extends Thread
13120	14134	{
..	..	@@ -13271,6 +14285,7 @@
13271	14285
13272	14286	public void run()
13273	14287	{
	14288	+ new Exception().printStackTrace();
13274	14289	System.exit(0);
13275	14290	for (;;)
13276	14291	{
..	..	@@ -13334,7 +14349,7 @@
13334	14349	{
13335	14350	Globals.lighttouched = true;
13336	14351	}
13337		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14352	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
13338	14353	}
13339	14354	//else
13340	14355	}
..	..	@@ -13348,12 +14363,12 @@
13348	14363	void GoDown(int mod)
13349	14364	{
13350	14365	MODIFIERS \|= COMMAND;
13351		- /*
	14366	+ /**/
13352	14367	if((mod&SHIFT) == SHIFT)
13353	14368	manipCamera.RotatePosition(0, -speed);
13354	14369	else
13355		- manipCamera.BackForth(0, -speed*delta, getWidth());
13356		- */
	14370	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14371	+ /**/
13357	14372	if ((mod & SHIFT) == SHIFT)
13358	14373	{
13359	14374	mouseMode = mouseMode; // VR??
..	..	@@ -13369,12 +14384,12 @@
13369	14384	void GoUp(int mod)
13370	14385	{
13371	14386	MODIFIERS \|= COMMAND;
13372		- /*
	14387	+ /**/
13373	14388	if((mod&SHIFT) == SHIFT)
13374	14389	manipCamera.RotatePosition(0, speed);
13375	14390	else
13376		- manipCamera.BackForth(0, speed*delta, getWidth());
13377		- */
	14391	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14392	+ /**/
13378	14393	if ((mod & SHIFT) == SHIFT)
13379	14394	{
13380	14395	mouseMode = mouseMode;
..	..	@@ -13390,12 +14405,12 @@
13390	14405	void GoLeft(int mod)
13391	14406	{
13392	14407	MODIFIERS \|= COMMAND;
13393		- /*
	14408	+ /**/
13394	14409	if((mod&SHIFT) == SHIFT)
13395		- manipCamera.RotatePosition(speed, 0);
13396		- else
13397	14410	manipCamera.Translate(speed*delta, 0, getWidth());
13398		- */
	14411	+ else
	14412	+ manipCamera.RotatePosition(speed, 0);
	14413	+ /**/
13399	14414	if ((mod & SHIFT) == SHIFT)
13400	14415	{
13401	14416	mouseMode = mouseMode;
..	..	@@ -13411,12 +14426,12 @@
13411	14426	void GoRight(int mod)
13412	14427	{
13413	14428	MODIFIERS \|= COMMAND;
13414		- /*
	14429	+ /**/
13415	14430	if((mod&SHIFT) == SHIFT)
13416		- manipCamera.RotatePosition(-speed, 0);
13417		- else
13418	14431	manipCamera.Translate(-speed*delta, 0, getWidth());
13419		- */
	14432	+ else
	14433	+ manipCamera.RotatePosition(-speed, 0);
	14434	+ /**/
13420	14435	if ((mod & SHIFT) == SHIFT)
13421	14436	{
13422	14437	mouseMode = mouseMode;
..	..	@@ -13434,7 +14449,7 @@
13434	14449	int X, Y;
13435	14450	boolean SX, SY;
13436	14451
13437		- void drag(int x, int y, int modifiers)
	14452	+ void drag(int x, int y, int modifiers, int modifiersex)
13438	14453	{
13439	14454	if (IsFrozen())
13440	14455	{
..	..	@@ -13443,17 +14458,17 @@
13443	14458
13444	14459	drag = true; // NEW
13445	14460
13446		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14461	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
13447	14462
13448	14463	X = x;
13449	14464	Y = y;
13450	14465	// floating state for animation
13451		- MODIFIERS = modifiers;
13452		- modifiers &= ~1024;
	14466	+ MODIFIERS = modifiersex;
	14467	+ modifiersex &= ~1024;
13453	14468	if (false) // modifiers != 0)
13454	14469	{
13455	14470	//new Exception().printStackTrace();
13456		- System.out.println("mouseDragged: " + modifiers);
	14471	+ System.out.println("mouseDragged: " + modifiersex);
13457	14472	System.out.println("SHIFT = " + SHIFT);
13458	14473	System.out.println("CONTROL = " + COMMAND);
13459	14474	System.out.println("META = " + META);
..	..	@@ -13473,7 +14488,8 @@
13473	14488	info.camera = renderCamera;
13474	14489	info.x = x;
13475	14490	info.y = y;
13476		- object.editWindow.copy.doEditDrag(info);
	14491	+ object.GetWindow().copy
	14492	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
13477	14493	} else
13478	14494	{
13479	14495	if (x < startX)
..	..	@@ -13625,7 +14641,6 @@
13625	14641	public void mouseMoved(MouseEvent e)
13626	14642	{
13627	14643	//System.out.println("mouseMoved: " + e);
13628		-
13629	14644	if (isRenderer)
13630	14645	return;
13631	14646
..	..	@@ -13638,7 +14653,9 @@
13638	14653	ci.camera = renderCamera;
13639	14654	if (!isRenderer)
13640	14655	{
13641		- if (object.editWindow.copy.doEditClick(ci, 0))
	14656	+ //ObjEditor editWindow = object.editWindow;
	14657	+ //Object3D copy = editWindow.copy;
	14658	+ if (object.doEditClick(ci, 0))
13642	14659	{
13643	14660	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
13644	14661	} else
..	..	@@ -13650,7 +14667,11 @@
13650	14667
13651	14668	public void mouseReleased(MouseEvent e)
13652	14669	{
	14670	+ Globals.MOUSEDRAGGED = false;
	14671	+
13653	14672	movingcamera = false;
	14673	+ X = 0; // getBounds().width/2;
	14674	+ Y = 0; // getBounds().height/2;
13654	14675	//System.out.println("mouseReleased: " + e);
13655	14676	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13656	14677	}
..	..	@@ -13673,9 +14694,9 @@
13673	14694	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
13674	14695	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
13675	14696
13676		- if (control \|\| command \|\| IsFrozen())
	14697	+// No delay if (control \|\| command \|\| IsFrozen())
13677	14698	timeout = true;
13678		- else
	14699	+// ?? May 2019 else
13679	14700	// timer.setDelay((modifiers & 128) != 0?0:350);
13680	14701	mouseDown = false;
13681	14702	if (!control && !command) // june 2013
..	..	@@ -13785,7 +14806,7 @@
13785	14806	System.out.println("keyReleased: " + e);
13786	14807	}
13787	14808
13788		- void SetMouseMode(int modifiers)
	14809	+ void SetMouseMode(int modifiers, int modifiersex)
13789	14810	{
13790	14811	//System.out.println("SetMouseMode = " + modifiers);
13791	14812	//modifiers &= ~1024;
..	..	@@ -13797,25 +14818,25 @@
13797	14818	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
13798	14819	// return;
13799	14820	//System.out.println("SetMode = " + modifiers);
13800		- if ((modifiers & WHEEL) == WHEEL)
	14821	+ if ((modifiersex & WHEEL) == WHEEL)
13801	14822	{
13802	14823	mouseMode \|= ZOOM;
13803	14824	}
13804	14825
13805	14826	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13806		- if (capsLocked \|\| (modifiers & META) == META)
	14827	+ if (capsLocked) // \|\| (modifiers & META) == META)
13807	14828	{
13808	14829	mouseMode \|= VR; // BACKFORTH;
13809	14830	}
13810		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14831	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
13811	14832	{
13812	14833	mouseMode \|= SELECT;
13813	14834	}
13814		- if ((modifiers & COMMAND) == COMMAND)
	14835	+ if ((modifiersex & COMMAND) == COMMAND)
13815	14836	{
13816	14837	mouseMode \|= SELECT;
13817	14838	}
13818		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14839	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
13819	14840	{
13820	14841	mouseMode &= ~VR;
13821	14842	mouseMode \|= TRANSLATE;
..	..	@@ -13844,10 +14865,10 @@
13844	14865
13845	14866	if (isRenderer) //
13846	14867	{
13847		- SetMouseMode(modifiers);
	14868	+ SetMouseMode(0, modifiers);
13848	14869	}
13849	14870
13850		- theRenderer.keyPressed(key);
	14871	+ Globals.theRenderer.keyPressed(key);
13851	14872	}
13852	14873
13853	14874	int kompactbit = 4; // power bit
..	..	@@ -13859,7 +14880,7 @@
13859	14880	float SATPOW = 1; // 2; // 0.5f;
13860	14881	float BRIPOW = 1; // 0.5f; // 0.5f;
13861	14882
13862		- void keyPressed(int key)
	14883	+ public void keyPressed(int key)
13863	14884	{
13864	14885	if (key >= '0' && key <= '5')
13865	14886	clampbit = (key-'0');
..	..	@@ -13991,7 +15012,9 @@
13991	15012	case 'E' : COMPACT ^= true;
13992	15013	repaint();
13993	15014	break;
13994		- case 'W' : DEBUGHSB ^= true;
	15015	+ case 'W' : // Wide Window (fullscreen)
	15016	+ //DEBUGHSB ^= true;
	15017	+ ObjEditor.theFrame.ToggleFullScreen();
13995	15018	repaint();
13996	15019	break;
13997	15020	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14016,8 +15039,8 @@
14016	15039	RevertCamera();
14017	15040	repaint();
14018	15041	break;
14019		- case 'L':
14020	15042	case 'l':
	15043	+ //case 'L':
14021	15044	if (lightMode)
14022	15045	{
14023	15046	lightMode = false;
..	..	@@ -14160,9 +15183,9 @@
14160	15183	case '_':
14161	15184	kompactbit = 5;
14162	15185	break;
14163		- case '+':
14164		- kompactbit = 6;
14165		- break;
	15186	+// case '+':
	15187	+// kompactbit = 6;
	15188	+// break;
14166	15189	case ' ':
14167	15190	lightMode ^= true;
14168	15191	Globals.lighttouched = true;
..	..	@@ -14174,13 +15197,14 @@
14174	15197	case ESC:
14175	15198	RENDERPROGRAM += 1;
14176	15199	RENDERPROGRAM %= 3;
	15200	+
14177	15201	repaint();
14178	15202	break;
14179	15203	case 'Z':
14180	15204	//RESIZETEXTURE ^= true;
14181	15205	//break;
14182	15206	case 'z':
14183		- RENDERSHADOW ^= true;
	15207	+ Globals.RENDERSHADOW ^= true;
14184	15208	Globals.lighttouched = true;
14185	15209	repaint();
14186	15210	break;
..	..	@@ -14213,8 +15237,9 @@
14213	15237	case DELETE:
14214	15238	ClearSelection();
14215	15239	break;
14216		- /*
14217	15240	case '+':
	15241	+
	15242	+ /*
14218	15243	//fontsize += 1;
14219	15244	bbzoom *= 2;
14220	15245	repaint();
..	..	@@ -14231,17 +15256,17 @@
14231	15256	case '=':
14232	15257	IncDepth();
14233	15258	//fontsize += 1;
14234		- object.editWindow.refreshContents(true);
	15259	+ object.GetWindow().refreshContents(true);
14235	15260	maskbit = 6;
14236	15261	break;
14237	15262	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14238	15263	DecDepth();
14239	15264	maskbit = 5;
14240	15265	//if(fontsize > 1) fontsize -= 1;
14241		- if (object.editWindow == null)
14242		- new Exception().printStackTrace();
14243		- else
14244		- object.editWindow.refreshContents(true);
	15266	+// if (object.editWindow == null)
	15267	+// new Exception().printStackTrace();
	15268	+// else
	15269	+ object.GetWindow().refreshContents(true);
14245	15270	break;
14246	15271	case '{':
14247	15272	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14296,6 +15321,7 @@
14296	15321	}
14297	15322	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
14298	15323	}
	15324	+
14299	15325	static double OCCLUSIONBOOST = 1; // 0.5;
14300	15326
14301	15327	void keyReleased(int key, int modifiers)
..	..	@@ -14303,11 +15329,11 @@
14303	15329	//mode = ROTATE;
14304	15330	if ((MODIFIERS & COMMAND) == 0) // VR??
14305	15331	{
14306		- SetMouseMode(modifiers);
	15332	+ SetMouseMode(0, modifiers);
14307	15333	}
14308	15334	}
14309	15335
14310		- protected void processKeyEvent(KeyEvent e)
	15336	+ public void processKeyEvent(KeyEvent e)
14311	15337	{
14312	15338	switch (e.getID())
14313	15339	{
..	..	@@ -14437,8 +15463,9 @@
14437	15463
14438	15464	protected void processMouseMotionEvent(MouseEvent e)
14439	15465	{
14440		- //System.out.println("processMouseMotionEvent: " + mouseMode);
14441		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15466	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15467	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15468	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
14442	15469	{
14443	15470	mouseMoved(e);
14444	15471	} else
..	..	@@ -14463,11 +15490,12 @@
14463	15490	}
14464	15491	*/
14465	15492
14466		- object.editWindow.EditSelection();
	15493	+ object.GetWindow().EditSelection(false);
14467	15494	}
14468	15495
14469	15496	void SelectParent()
14470	15497	{
	15498	+ new Exception().printStackTrace();
14471	15499	System.exit(0);
14472	15500	Composite group = (Composite) object;
14473	15501	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -14479,10 +15507,10 @@
14479	15507	{
14480	15508	//selectees.remove(i);
14481	15509	System.out.println("select parent of " + elem);
14482		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15510	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
14483	15511	} else
14484	15512	{
14485		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15513	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
14486	15514	}
14487	15515
14488	15516	first = false;
..	..	@@ -14491,6 +15519,7 @@
14491	15519
14492	15520	void SelectChildren()
14493	15521	{
	15522	+ new Exception().printStackTrace();
14494	15523	System.exit(0);
14495	15524	/*
14496	15525	Composite group = (Composite) object;
..	..	@@ -14523,12 +15552,12 @@
14523	15552	for (int j = 0; j < group.children.size(); j++)
14524	15553	{
14525	15554	elem = (Object3D) group.children.elementAt(j);
14526		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15555	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
14527	15556	first = false;
14528	15557	}
14529	15558	} else
14530	15559	{
14531		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15560	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
14532	15561	}
14533	15562
14534	15563	first = false;
..	..	@@ -14539,21 +15568,21 @@
14539	15568	{
14540	15569	//Composite group = (Composite) object;
14541	15570	Object3D group = object;
14542		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15571	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
14543	15572	}
14544	15573
14545	15574	void ResetTransform(int mask)
14546	15575	{
14547	15576	//Composite group = (Composite) object;
14548	15577	Object3D group = object;
14549		- group.editWindow.ResetTransform(mask);
	15578	+ group.GetWindow().ResetTransform(mask);
14550	15579	}
14551	15580
14552	15581	void FlipTransform()
14553	15582	{
14554	15583	//Composite group = (Composite) object;
14555	15584	Object3D group = object;
14556		- group.editWindow.FlipTransform();
	15585	+ group.GetWindow().FlipTransform();
14557	15586	// group.editWindow.ReduceMesh(true);
14558	15587	}
14559	15588
..	..	@@ -14561,7 +15590,7 @@
14561	15590	{
14562	15591	//Composite group = (Composite) object;
14563	15592	Object3D group = object;
14564		- group.editWindow.PrintMemory();
	15593	+ group.GetWindow().PrintMemory();
14565	15594	// group.editWindow.ReduceMesh(true);
14566	15595	}
14567	15596
..	..	@@ -14569,7 +15598,7 @@
14569	15598	{
14570	15599	//Composite group = (Composite) object;
14571	15600	Object3D group = object;
14572		- group.editWindow.ResetCentroid();
	15601	+ group.GetWindow().ResetCentroid();
14573	15602	}
14574	15603
14575	15604	void IncDepth()
..	..	@@ -14655,7 +15684,9 @@
14655	15684	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
14656	15685	//Image img = CreateImage(width, height);
14657	15686	//System.out.println("width = " + width + "; height = " + height + "\n");
	15687	+
14658	15688	Graphics gr = g; // img.getGraphics();
	15689	+
14659	15690	if (!hasMarquee)
14660	15691	{
14661	15692	if (Xmin < Xmax) // !locked)
..	..	@@ -14743,6 +15774,7 @@
14743	15774	info.bounds.y += (height - desired) / 2;
14744	15775	}
14745	15776	}
	15777	+
14746	15778	info.g = gr;
14747	15779	info.camera = renderCamera;
14748	15780	/*
..	..	@@ -14752,15 +15784,55 @@
14752	15784	*/
14753	15785	if (!isRenderer)
14754	15786	{
14755		- object.drawEditHandles(info, 0);
	15787	+ Grafreed.Assert(object != null);
	15788	+ Grafreed.Assert(object.selection != null);
	15789	+ if (object.selection.Size() > 0)
	15790	+ {
	15791	+ int hitSomething = object.selection.get(0).hitSomething;
	15792	+
	15793	+ info.DX = 0;
	15794	+ info.DY = 0;
	15795	+ info.W = 1;
	15796	+ if (hitSomething == Object3D.hitCenter)
	15797	+ {
	15798	+ info.DX = X;
	15799	+ if (X != 0)
	15800	+ info.DX -= info.bounds.width/2;
	15801	+
	15802	+ info.DY = Y;
	15803	+ if (Y != 0)
	15804	+ info.DY -= info.bounds.height/2;
	15805	+ }
	15806	+
	15807	+ object.drawEditHandles(info, 0);
	15808	+
	15809	+ if (drag && (X != 0 \|\| Y != 0))
	15810	+ {
	15811	+ switch (hitSomething)
	15812	+ {
	15813	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15814	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15815	+ break;
	15816	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15817	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15818	+ break;
	15819	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15820	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15821	+ break;
	15822	+ }
	15823	+
	15824	+ }
	15825	+ }
14756	15826	}
14757	15827	}
	15828	+
14758	15829	if (isRenderer)
14759	15830	{
14760	15831	//gr.setColor(Color.black);
14761	15832	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
14762	15833	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
14763	15834	}
	15835	+
14764	15836	if (hasMarquee)
14765	15837	{
14766	15838	gr.setXORMode(Color.white);
..	..	@@ -14873,6 +15945,7 @@
14873	15945	public boolean mouseDown(Event evt, int x, int y)
14874	15946	{
14875	15947	System.out.println("mouseDown: " + evt);
	15948	+ System.exit(0);
14876	15949	/*
14877	15950	locked = true;
14878	15951	drag = false;
..	..	@@ -14916,7 +15989,7 @@
14916	15989	{
14917	15990	keyPressed(0, modifiers);
14918	15991	}
14919		- clickStart(x, y, modifiers);
	15992	+ // clickStart(x, y, modifiers);
14920	15993	return true;
14921	15994	}
14922	15995
..	..	@@ -15034,7 +16107,7 @@
15034	16107	{
15035	16108	keyReleased(0, 0);
15036	16109	}
15037		- drag(x, y, modifiers);
	16110	+ drag(x, y, 0, modifiers);
15038	16111	return true;
15039	16112	}
15040	16113
..	..	@@ -15166,7 +16239,7 @@
15166	16239	Object3D object;
15167	16240	static Object3D trackedobject;
15168	16241	Camera renderCamera; // Light or Eye (or Occlusion)
15169		- /static/ Camera manipCamera; // Light or Eye
	16242	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15170	16243	/static/ Camera eyeCamera;
15171	16244	/static/ Camera lightCamera;
15172	16245	int cameracount;
..	..	@@ -15451,16 +16524,16 @@
15451	16524	cStatic.objectstack[materialdepth++] = checker;
15452	16525	//System.out.println("material " + material);
15453	16526	//Applet3D.tracein(this, selected);
15454		- vector2buffer = checker.projectedVertices;
	16527	+ //vector2buffer = checker.projectedVertices;
15455	16528
15456	16529	//checker.GetMaterial().Draw(this, false); // true);
15457		- DrawMaterial(checker.GetMaterial(), false); // true);
	16530	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
15458	16531
15459	16532	materialdepth -= 1;
15460	16533	if (materialdepth > 0)
15461	16534	{
15462		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
15463		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16535	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16536	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
15464	16537	}
15465	16538	//checker.GetMaterial().opacity = 1f;
15466	16539	////checker.GetMaterial().ambient = 1f;
..	..	@@ -15546,6 +16619,14 @@
15546	16619	}
15547	16620	}
15548	16621
	16622	+ private Object3D GetFolder()
	16623	+ {
	16624	+ Object3D folder = object.GetWindow().copy;
	16625	+ if (object.GetWindow().copy.selection.Size() > 0)
	16626	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16627	+ return folder;
	16628	+ }
	16629	+
15549	16630	class SelectBuffer implements GLEventListener
15550	16631	{
15551	16632
..	..	@@ -15604,6 +16685,7 @@
15604	16685	{
15605	16686	if (!selection)
15606	16687	{
	16688	+ new Exception().printStackTrace();
15607	16689	System.exit(0);
15608	16690	return;
15609	16691	}
..	..	@@ -15624,6 +16706,17 @@
15624	16706
15625	16707	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
15626	16708
	16709	+ if (PAINTMODE)
	16710	+ {
	16711	+ if (object.GetWindow().copy.selection.Size() > 0)
	16712	+ {
	16713	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16714	+
	16715	+ // Make what you paint not selectable.
	16716	+ paintobj.ResetSelectable();
	16717	+ }
	16718	+ }
	16719	+
15627	16720	//int tmp = selection_view;
15628	16721	//selection_view = -1;
15629	16722	int temp = DrawMode();
..	..	@@ -15635,6 +16728,17 @@
15635	16728	// temp = DEFAULT; // patch for selection debug
15636	16729	Globals.drawMode = temp; // WARNING
15637	16730
	16731	+ if (PAINTMODE)
	16732	+ {
	16733	+ if (object.GetWindow().copy.selection.Size() > 0)
	16734	+ {
	16735	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16736	+
	16737	+ // Revert.
	16738	+ paintobj.RestoreSelectable();
	16739	+ }
	16740	+ }
	16741	+
15638	16742	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
15639	16743
15640	16744	// trying different ways of getting the depth info over
..	..	@@ -15682,6 +16786,8 @@
15682	16786	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
15683	16787	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
15684	16788	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	16789	+
	16790	+ CreateSelectedPoint();
15685	16791
15686	16792	// Will fit the mesh !!!
15687	16793	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -15731,34 +16837,36 @@
15731	16837	System.out.println("; fromto " + sel + " " + Trunk(previousselectedpoint.toParent[3][0]) + " " + Trunk(previousselectedpoint.toParent[3][2]) + " " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][2]));
15732	16838	}
15733	16839
15734		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16840	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
15735	16841	}
15736	16842	}
15737	16843
15738	16844	if (!movingcamera && !PAINTMODE)
15739		- object.editWindow.ScreenFitPoint(); // fev 2014
	16845	+ object.GetWindow().ScreenFitPoint(); // fev 2014
15740	16846
15741		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16847	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
15742	16848	{
15743		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16849	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
15744	16850
15745		- Object3D group = new Object3D("inst" + paintcount++);
	16851	+ if (object.GetWindow().copy.selection.Size() > 0)
	16852	+ {
	16853	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
15746	16854
15747		- group.CreateMaterial(); // use a void leaf to select instances
15748		-
15749		- group.add(paintobj); // link
15750		-
15751		- object.editWindow.SnapObject(group);
15752		-
15753		- Object3D folder = object.editWindow.copy;
15754		-
15755		- if (object.editWindow.copy.selection.Size() > 0)
15756		- folder = object.editWindow.copy.selection.elementAt(0);
15757		-
15758		- folder.add(group);
15759		-
15760		- object.editWindow.ResetModel();
15761		- object.editWindow.refreshContents();
	16855	+ Object3D inst = new Object3D("inst" + paintcount++);
	16856	+
	16857	+ inst.CreateMaterial(); // use a void leaf to select instances
	16858	+
	16859	+ inst.add(paintobj); // link
	16860	+
	16861	+ object.GetWindow().SnapObject(inst);
	16862	+
	16863	+ Object3D folder = paintFolder; // GetFolder();
	16864	+
	16865	+ folder.add(inst);
	16866	+
	16867	+ object.GetWindow().ResetModel();
	16868	+ object.GetWindow().refreshContents();
	16869	+ }
15762	16870	}
15763	16871	else
15764	16872	paintcount = 0;
..	..	@@ -15797,6 +16905,11 @@
15797	16905	//System.out.println("objects[color] = " + objects[color]);
15798	16906	//objects[color].Select();
15799	16907	indexcount = 0;
	16908	+ ObjEditor window = object.GetWindow();
	16909	+ if (window != null && deselect)
	16910	+ {
	16911	+ window.Select(null, deselect, true);
	16912	+ }
15800	16913	object.Select(color, deselect);
15801	16914	}
15802	16915
..	..	@@ -15896,7 +17009,7 @@
15896	17009	gl.glDisable(gl.GL_CULL_FACE);
15897	17010	}
15898	17011
15899		- if (!RENDERSHADOW)
	17012	+ if (!Globals.RENDERSHADOW)
15900	17013	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
15901	17014
15902	17015	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -15906,7 +17019,7 @@
15906	17019	//gl.glColorMask(false, false, false, false);
15907	17020
15908	17021	//render_scene_from_light_view(gl, drawable, 0, 0);
15909		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17022	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
15910	17023	{
15911	17024	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
15912	17025
..	..	@@ -15966,7 +17079,6 @@
15966	17079
15967	17080	class AntialiasBuffer implements GLEventListener
15968	17081	{
15969		-
15970	17082	CameraPane parent = null;
15971	17083
15972	17084	AntialiasBuffer(CameraPane p)
..	..	@@ -16323,23 +17435,15 @@
16323	17435	int AAbuffersize = 0;
16324	17436
16325	17437	//double[] selectedpoint = new double[3];
16326		- static Superellipsoid selectedpoint = new Superellipsoid();
	17438	+ static Superellipsoid selectedpoint;
16327	17439	static Sphere previousselectedpoint = null;
16328		- static Sphere debugpointG = new Sphere();
16329		- static Sphere debugpointP = new Sphere();
16330		- static Sphere debugpointC = new Sphere();
16331		- static Sphere debugpointR = new Sphere();
	17440	+ static Sphere debugpointG;
	17441	+ static Sphere debugpointP;
	17442	+ static Sphere debugpointC;
	17443	+ static Sphere debugpointR;
16332	17444
16333	17445	static Sphere debugpoints[] = new Sphere[8];
16334	17446
16335		- static
16336		- {
16337		- for (int i=0; i<8; i++)
16338		- {
16339		- debugpoints[i] = new Sphere();
16340		- }
16341		- }
16342		-
16343	17447	static void InitPoints(float radius)
16344	17448	{
16345	17449	for (int i=0; i<8; i++)
..	..	@@ -16359,7 +17463,7 @@
16359	17463	}
16360	17464	}
16361	17465
16362		- static void DrawPoints(CameraPane cpane)
	17466	+ static void DrawPoints(iCameraPane cpane)
16363	17467	{
16364	17468	for (int i=0; i<8; i++) // first and last are red
16365	17469	{
..	..	@@ -16391,10 +17495,11 @@
16391	17495	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
16392	17496	// Depth buffer format
16393	17497	//private int depth_format;
16394		- static public void NextIndex(Object3D o, GL gl)
	17498	+
	17499	+ public void NextIndex()
16395	17500	{
16396	17501	indexcount+=16;
16397		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17502	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
16398	17503	//objects[indexcount] = o;
16399	17504	//System.out.println("indexcount = " + indexcount);
16400	17505	}