~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -18,7 +18,10 @@
18	18	import javax.imageio.ImageIO;
19	19	import javax.imageio.ImageWriteParam;
20	20	import javax.imageio.ImageWriter;
	21	+import javax.imageio.ImageReadParam;
	22	+import javax.imageio.ImageReader;
21	23	import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
	24	+import javax.imageio.stream.ImageInputStream;
22	25	import javax.imageio.stream.ImageOutputStream;
23	26	import javax.imageio.ImageWriteParam;
24	27
..	..	@@ -30,6 +33,7 @@
30	33	import java.nio.*;
31	34
32	35	import gleem.linalg.Mat4f;
	36	+import javax.imageio.ImageTypeSpecifier;
33	37
34	38	class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
35	39	{
..	..	@@ -37,7 +41,6 @@
37	41	static boolean[] selectedstack = new boolean[65536];
38	42	static int materialdepth = 0;
39	43
40		- static boolean DEBUG = false;
41	44	static boolean FRUSTUM = false; // still bogus true; // frustum culling
42	45
43	46	// camera change fix
..	..	@@ -45,6 +48,39 @@
45	48	static boolean ABORTED = false;
46	49
47	50	static int STEP = 1;
	51	+
	52	+ private static BufferedImage CreateBim(byte[] bytes, int width, int height)
	53	+ {
	54	+ int[] pixels = new int[bytes.length/3];
	55	+ for (int i=pixels.length; --i>=0;)
	56	+ {
	57	+ int i3 = i*3;
	58	+ pixels[i] = 0xFF;
	59	+ pixels[i] <<= 8;
	60	+ pixels[i] \|= bytes[i3+2] & 0xFF;
	61	+ pixels[i] <<= 8;
	62	+ pixels[i] \|= bytes[i3+1] & 0xFF;
	63	+ pixels[i] <<= 8;
	64	+ pixels[i] \|= bytes[i3] & 0xFF;
	65	+ }
	66	+ /*
	67	+ int r=0,g=0,b=0,a=0;
	68	+ for (int i=0; i<width; i++)
	69	+ for (int j=0; j<height; j++)
	70	+ {
	71	+ int index = j*width+i;
	72	+ int p = pixels[index];
	73	+ a = ((p>>24) & 0xFF);
	74	+ r = ((p>>16) & 0xFF);
	75	+ g = ((p>>8) & 0xFF);
	76	+ b = (p & 0xFF);
	77	+ pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
	78	+ }
	79	+ /**/
	80	+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
	81	+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	82	+ return rendImage;
	83	+ }
48	84
49	85	/static/ private boolean CULLFACE = false; // true;
50	86	/static/ boolean NEAREST = false; // true;
..	..	@@ -56,14 +92,12 @@
56	92	static int CURRENTANTIALIAS = 0; // 1;
57	93	/static/ boolean RENDERSHADOW = true;
58	94	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
59		- static boolean ANIMATION = false;
60		- static String filename;
61	95
62	96	boolean DISPLAYTEXT = false;
63	97	//boolean REDUCETEXTURE = true;
64	98	boolean CACHETEXTURE = true;
65	99	boolean CLEANCACHE = false; // true;
66		- boolean MIPMAP = false; // true;
	100	+ boolean MIPMAP = false; // true; // never works...
67	101	boolean COMPRESSTEXTURE = false;
68	102	boolean KOMPACTTEXTURE = false; // true;
69	103	boolean RESIZETEXTURE = false;
..	..	@@ -76,7 +110,11 @@
76	110	//private Mat4f spotlightTransform = new Mat4f();
77	111	//private Mat4f spotlightInverseTransform = new Mat4f();
78	112	static GLContext glcontext = null;
79		- /static/ com.sun.opengl.util.texture.Texture cubemap;
	113	+ /static/ com.sun.opengl.util.texture.Texture cubemap; // Either custom or rgb
	114	+ /static/ com.sun.opengl.util.texture.Texture cubemapcustom;
	115	+ /static/ com.sun.opengl.util.texture.Texture cubemaprgb;
	116	+ boolean transformMode;
	117	+
80	118	boolean reverseUP = false;
81	119	static boolean frozen = false;
82	120	boolean enablebackspace = false; // patch for back buffer refresh
..	..	@@ -92,6 +130,8 @@
92	130
93	131	static int tickcount = 0; // slow pose issue
94	132
	133	+static boolean BUTTONLESSWHEEL = false;
	134	+static boolean ZOOMBOXMODE = false;
95	135	static boolean BOXMODE = false;
96	136	static boolean IMAGEFLIP = false;
97	137	static boolean SMOOTHFOCUS = false;
..	..	@@ -106,7 +146,7 @@
106	146	static boolean OEIL = true;
107	147	static boolean OEILONCE = false; // do oeilon then oeiloff
108	148	static boolean LOOKAT = true;
109		-static boolean RANDOM = true; // false;
	149	+static boolean SWITCH = true; // false;
110	150	static boolean HANDLES = false; // selection doesn't work!!
111	151	static boolean PAINTMODE = false;
112	152
..	..	@@ -128,7 +168,7 @@
128	168
129	169
130	170	// OPTIONS
131		- boolean Skinshader = true;
	171	+ boolean Skinshader = false; // true;
132	172	boolean cameraLight = false;
133	173	boolean UVdebug = false;
134	174	boolean Udebug = false;
..	..	@@ -137,7 +177,7 @@
137	177	static boolean doublesided = false; // true; // reversed normals are awful for conformance
138	178	boolean anisotropy = true;
139	179	boolean softshadow = true; // slower but better false;
140		- boolean opacityhalo = false;
	180	+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
141	181
142	182	boolean macromode = false;
143	183
..	..	@@ -150,12 +190,25 @@
150	190	defaultcaps.setAccumAlphaBits(16);
151	191	}
152	192
153		- static CameraPane theRenderer;
	193	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	194	+
	195	+ public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	196	+ {
	197	+ try
	198	+ {
	199	+ return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	200	+ } catch (IOException e)
	201	+ {
	202	+ System.out.println("NAME = " + name);
	203	+ e.printStackTrace(); // throw new RuntimeException(e);
	204	+ return null;
	205	+ }
	206	+ }
154	207
155	208	void SetAsGLRenderer(boolean b)
156	209	{
157	210	isRenderer = b;
158		- theRenderer = this;
	211	+ Globals.theRenderer = this;
159	212	}
160	213
161	214	CameraPane(Object3D o, Camera cam, boolean withcontext)
..	..	@@ -170,7 +223,8 @@
170	223
171	224	SetCamera(cam);
172	225
173		- SetLight(new Camera(new cVector(10, 10, -20)));
	226	+ // Warning: not used.
	227	+ SetLight(new Camera(new cVector(15, 10, -20)));
174	228
175	229	object = o;
176	230
..	..	@@ -193,9 +247,43 @@
193	247
194	248	/// INTERFACE
195	249
	250	+ public javax.media.opengl.GL GetGL0()
	251	+ {
	252	+ return null;
	253	+ }
	254	+
	255	+ public int GenList()
	256	+ {
	257	+ javax.media.opengl.GL gl = GetGL();
	258	+ return gl.glGenLists(1);
	259	+ }
	260	+
	261	+ public void NewList(int id)
	262	+ {
	263	+ javax.media.opengl.GL gl = GetGL();
	264	+ gl.glNewList(id, gl.GL_COMPILE); //_AND_EXECUTE);
	265	+ }
	266	+
	267	+ public void CallList(int id)
	268	+ {
	269	+ javax.media.opengl.GL gl = GetGL();
	270	+ gl.glCallList(id);
	271	+ }
	272	+
	273	+ public void EndList()
	274	+ {
	275	+ javax.media.opengl.GL gl = GetGL();
	276	+ gl.glEndList();
	277	+ }
	278	+
196	279	public boolean IsBoxMode()
197	280	{
198	281	return BOXMODE;
	282	+ }
	283	+
	284	+ public boolean IsZoomBoxMode()
	285	+ {
	286	+ return ZOOMBOXMODE;
199	287	}
200	288
201	289	public void ClearDepth()
..	..	@@ -293,7 +381,7 @@
293	381	cStatic.objectstack[materialdepth++] = obj;
294	382	//System.out.println("material " + material);
295	383	//Applet3D.tracein(this, selected);
296		- display.vector2buffer = obj.projectedVertices;
	384	+ //display.vector2buffer = obj.projectedVertices;
297	385	if (obj instanceof Camera)
298	386	{
299	387	display.options1[0] = material.shift;
..	..	@@ -302,14 +390,28 @@
302	390	display.options1[2] = material.shadowbias;
303	391	display.options1[3] = material.aniso;
304	392	display.options1[4] = material.anisoV;
	393	+// System.out.println("display.options1[0] " + display.options1[0]);
	394	+// System.out.println("display.options1[1] " + display.options1[1]);
	395	+// System.out.println("display.options1[2] " + display.options1[2]);
	396	+// System.out.println("display.options1[3] " + display.options1[3]);
	397	+// System.out.println("display.options1[4] " + display.options1[4]);
305	398	display.options2[0] = material.opacity;
306	399	display.options2[1] = material.diffuse;
307	400	display.options2[2] = material.factor;
	401	+// System.out.println("display.options2[0] " + display.options2[0]);
	402	+// System.out.println("display.options2[1] " + display.options2[1]);
	403	+// System.out.println("display.options2[2] " + display.options2[2]);
308	404
309	405	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	406	+// System.out.println("display.options3[0] " + display.options3[0]);
	407	+// System.out.println("display.options3[1] " + display.options3[1]);
	408	+// System.out.println("display.options3[2] " + display.options3[2]);
310	409	display.options4[0] = material.cameralight/0.2f;
311	410	display.options4[1] = material.subsurface;
312	411	display.options4[2] = material.sheen;
	412	+// System.out.println("display.options4[0] " + display.options4[0]);
	413	+// System.out.println("display.options4[1] " + display.options4[1]);
	414	+// System.out.println("display.options4[2] " + display.options4[2]);
313	415
314	416	// if (display.CURRENTANTIALIAS > 0)
315	417	// display.options3[3] /= 4;
..	..	@@ -325,7 +427,7 @@
325	427	/**/
326	428	} else
327	429	{
328		- DrawMaterial(material, selected);
	430	+ DrawMaterial(material, selected, obj.projectedVertices);
329	431	}
330	432	} else
331	433	{
..	..	@@ -349,8 +451,8 @@
349	451	cStatic.objectstack[materialdepth++] = obj;
350	452	//System.out.println("material " + material);
351	453	//Applet3D.tracein("selected ", selected);
352		- display.vector2buffer = obj.projectedVertices;
353		- display.DrawMaterial(material, selected);
	454	+ //display.vector2buffer = obj.projectedVertices;
	455	+ display.DrawMaterial(material, selected, obj.projectedVertices);
354	456	}
355	457	}
356	458
..	..	@@ -367,8 +469,8 @@
367	469	materialdepth -= 1;
368	470	if (materialdepth > 0)
369	471	{
370		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
371		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	472	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	473	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
372	474	}
373	475	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
374	476	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -388,8 +490,8 @@
388	490	materialdepth -= 1;
389	491	if (materialdepth > 0)
390	492	{
391		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
392		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	493	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	494	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
393	495	}
394	496	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
395	497	//else
..	..	@@ -430,15 +532,18 @@
430	532	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
431	533	{
432	534	//gl.glBegin(gl.GL_TRIANGLES);
433		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	535	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	536	+ // TEST LIVE NORMALS && !obj.dontselect
	537	+ ;
434	538	if (!hasnorm)
435	539	{
436		- // System.out.println("FUCK!!");
	540	+ // System.out.println("Mesh normal");
437	541	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
438	542	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
439	543	LA.vecCross(obj.v0, obj.v1, obj.v2);
440	544	LA.vecNormalize(obj.v2);
441		- gl.glNormal3f((float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
	545	+
	546	+ SetGLNormal(gl, (float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
442	547	}
443	548
444	549	// P
..	..	@@ -460,7 +565,7 @@
460	565	y += ny * obj.NORMALPUSH;
461	566	z += nz * obj.NORMALPUSH;
462	567
463		- gl.glNormal3f(nx, ny, nz);
	568	+ SetGLNormal(gl, nx, ny, nz);
464	569	}
465	570	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
466	571	SetColor(obj, pv);
..	..	@@ -492,7 +597,7 @@
492	597	y += ny * obj.NORMALPUSH;
493	598	z += nz * obj.NORMALPUSH;
494	599
495		- gl.glNormal3f(nx, ny, nz);
	600	+ SetGLNormal(gl, nx, ny, nz);
496	601	}
497	602	//System.out.println("vertexq = " + qv.s + ", " + qv.t);
498	603	// boolean locked = false;
..	..	@@ -540,7 +645,7 @@
540	645	y += ny * obj.NORMALPUSH;
541	646	z += nz * obj.NORMALPUSH;
542	647
543		- gl.glNormal3f(nx, ny, nz);
	648	+ SetGLNormal(gl, nx, ny, nz);
544	649	}
545	650
546	651	// if ((dot&4) == 0)
..	..	@@ -816,7 +921,7 @@
816	921
817	922	if ((i % 100) == 0 && i != 0)
818	923	{
819		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	924	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
820	925	//System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
821	926	System.out.println((int) (100.0 * i / (br.positions.length / 3)) + "% (" + i + " of " + (br.positions.length / 3) + ")");
822	927	}
..	..	@@ -848,7 +953,7 @@
848	953
849	954	if ((i % 100) == 0 && i != 0)
850	955	{
851		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	956	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
852	957	//System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
853	958	System.out.println((int) (100.0 * i / br.VertexCount()) + "% (" + i + " of " + br.VertexCount() + ")");
854	959	}
..	..	@@ -1061,8 +1166,345 @@
1061	1166	gl.glMatrixMode(gl.GL_MODELVIEW);
1062	1167	}
1063	1168
	1169	+ public void DrawBox(cVector min, cVector max)
	1170	+ {
	1171	+ javax.media.opengl.GL gl = GetGL();
	1172	+ gl.glBegin(gl.GL_LINES);
	1173	+
	1174	+ gl.glVertex3d(min.x, min.y, min.z);
	1175	+ gl.glVertex3d(min.x, min.y, max.z);
	1176	+ gl.glVertex3d(min.x, min.y, min.z);
	1177	+ gl.glVertex3d(min.x, max.y, min.z);
	1178	+ gl.glVertex3d(min.x, min.y, min.z);
	1179	+ gl.glVertex3d(max.x, min.y, min.z);
	1180	+
	1181	+ gl.glVertex3d(max.x, max.y, max.z);
	1182	+ gl.glVertex3d(min.x, max.y, max.z);
	1183	+ gl.glVertex3d(max.x, max.y, max.z);
	1184	+ gl.glVertex3d(max.x, min.y, max.z);
	1185	+ gl.glVertex3d(max.x, max.y, max.z);
	1186	+ gl.glVertex3d(max.x, max.y, min.z);
	1187	+
	1188	+ gl.glEnd();
	1189	+ }
	1190	+
	1191	+ public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
	1192	+ {
	1193	+ int[] strips = bRep.getRawIndices();
	1194	+
	1195	+ javax.media.opengl.GL gl = GetGL();
	1196	+
	1197	+ // TRIANGLE STRIP ARRAY
	1198	+ if (bRep.trimmed)
	1199	+ {
	1200	+ float[] v = bRep.getRawVertices();
	1201	+ float[] n = bRep.getRawNormals();
	1202	+ float[] c = bRep.getRawColors();
	1203	+ float[] uv = bRep.getRawUVMap();
	1204	+
	1205	+ int count2 = 0;
	1206	+ int count3 = 0;
	1207	+
	1208	+ if (n.length > 0)
	1209	+ {
	1210	+ for (int i = 0; i < strips.length; i++)
	1211	+ {
	1212	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1213	+
	1214	+ /*
	1215	+ boolean locked = false;
	1216	+ float eps = 0.1f;
	1217	+ boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	1218	+
	1219	+ int dot = 0;
	1220	+
	1221	+ if ((dot&1) == 0)
	1222	+ dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	1223	+
	1224	+ if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	1225	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	1226	+ else
	1227	+ {
	1228	+ locked = true;
	1229	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1230	+ }
	1231	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	1232	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	1233	+ if (hasnorm)
	1234	+ {
	1235	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	1236	+ gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
	1237	+ }
	1238	+
	1239	+ if ((dot&4) == 0)
	1240	+ dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	1241	+
	1242	+ if (wrap \|\| !locked && (dot&8) != 0)
	1243	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	1244	+ else
	1245	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1246	+
	1247	+ f.dot = dot;
	1248	+ */
	1249	+
	1250	+ if (!selectmode)
	1251	+ {
	1252	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1253	+ {
	1254	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
	1255	+ } else
	1256	+ {
	1257	+ SetGLNormal(gl, 0, 0, 1);
	1258	+ }
	1259	+
	1260	+ if (c != null)
	1261	+ //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
	1262	+ {
	1263	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1264	+ }
	1265	+ }
	1266	+
	1267	+ if (flipV)
	1268	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1269	+ else
	1270	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1271	+
	1272	+ //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1273	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1274	+
	1275	+ count2 += 2;
	1276	+ count3 += 3;
	1277	+ if (!selectmode)
	1278	+ {
	1279	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1280	+ {
	1281	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
	1282	+ } else
	1283	+ {
	1284	+ SetGLNormal(gl, 0, 0, 1);
	1285	+ }
	1286	+ if (c != null)
	1287	+ {
	1288	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1289	+ }
	1290	+ }
	1291	+
	1292	+ if (flipV)
	1293	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1294	+ else
	1295	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1296	+
	1297	+ //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1298	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1299	+
	1300	+ count2 += 2;
	1301	+ count3 += 3;
	1302	+ for (int j = 0; j < strips[i] - 2; j++)
	1303	+ {
	1304	+ //gl.glTexCoord2d(...);
	1305	+ if (!selectmode)
	1306	+ {
	1307	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1308	+ {
	1309	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
	1310	+ } else
	1311	+ {
	1312	+ SetGLNormal(gl, 0, 0, 1);
	1313	+ }
	1314	+ if (c != null)
	1315	+ {
	1316	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1317	+ }
	1318	+ }
	1319	+
	1320	+ if (flipV)
	1321	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1322	+ else
	1323	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1324	+
	1325	+ //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
	1326	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1327	+
	1328	+ count2 += 2;
	1329	+ count3 += 3;
	1330	+ }
	1331	+
	1332	+ gl.glEnd();
	1333	+ }
	1334	+ }
	1335	+
	1336	+ assert count3 == v.length;
	1337	+ }
	1338	+ else // !trimmed
	1339	+ {
	1340	+ int count = 0;
	1341	+ for (int i = 0; i < strips.length; i++)
	1342	+ {
	1343	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1344	+
	1345	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	1346	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	1347	+
	1348	+ drawVertex(gl, p, flipV, selectmode);
	1349	+ drawVertex(gl, q, flipV, selectmode);
	1350	+
	1351	+ for (int j = 0; j < strips[i] - 2; j++)
	1352	+ {
	1353	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	1354	+
	1355	+ // if (j%2 == 0)
	1356	+ // drawFace(p, q, r, display, null);
	1357	+ // else
	1358	+ // drawFace(p, r, q, display, null);
	1359	+
	1360	+ // p = q;
	1361	+ // q = r;
	1362	+ drawVertex(gl, r, flipV, selectmode);
	1363	+ }
	1364	+
	1365	+ gl.glEnd();
	1366	+ }
	1367	+ }
	1368	+ }
	1369	+
	1370	+ static cSpring.Point3D temp = new cSpring.Point3D();
	1371	+ static cSpring.Point3D temp2 = new cSpring.Point3D();
	1372	+ static cSpring.Point3D temp3 = new cSpring.Point3D();
	1373	+
	1374	+ public void DrawDynamicMesh(cMesh mesh)
	1375	+ {
	1376	+ GL gl = GetGL(); // getGL();
	1377	+
	1378	+ cSpring.PhysicsController3D Phys = mesh.Phys;
	1379	+
	1380	+ gl.glDisable(gl.GL_LIGHTING);
	1381	+
	1382	+ gl.glLineWidth(1);
	1383	+ gl.glColor3f(1,1,1);
	1384	+ gl.glBegin(gl.GL_LINES);
	1385	+ double scale = 0;
	1386	+ int count = 0;
	1387	+ for (int s=0; s<Phys.allSprings.size(); s++)
	1388	+ {
	1389	+ cSpring.Spring spring = Phys.allSprings.get(s);
	1390	+ if(s == 0)
	1391	+ {
	1392	+ //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
	1393	+ }
	1394	+ if (mesh.showsprings)
	1395	+ {
	1396	+ temp.set(spring.a.position);
	1397	+ temp.add(spring.b.position);
	1398	+ temp.mul(0.5);
	1399	+ temp2.set(spring.a.position);
	1400	+ temp2.sub(spring.b.position);
	1401	+ temp2.mul(spring.restLength/2);
	1402	+ temp.sub(temp2);
	1403	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1404	+ temp.add(temp2);
	1405	+ temp.add(temp2);
	1406	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1407	+ }
	1408	+
	1409	+ if (spring.isHandle)
	1410	+ continue;
	1411	+
	1412	+ //if (scale < spring.restLength)
	1413	+ scale += spring.restLength;
	1414	+ count++;
	1415	+ }
	1416	+ gl.glEnd();
	1417	+
	1418	+ if (count == 0)
	1419	+ scale = 0.01;
	1420	+ else
	1421	+ scale /= count * 3;
	1422	+
	1423	+ //scale = 0.25;
	1424	+
	1425	+ if (mesh.ShowInfo())
	1426	+ {
	1427	+ gl.glLineWidth(4);
	1428	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1429	+ {
	1430	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1431	+ if (node.mass == 0)
	1432	+ continue;
	1433	+
	1434	+ int i = node.springs==null?-1:node.springs.size();
	1435	+ gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
	1436	+ //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
	1437	+ //temp.normalize();
	1438	+ //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
	1439	+ gl.glBegin(gl.GL_LINES);
	1440	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1441	+ //gl.glVertex3d(node.position.x + node.normal.xscale, node.position.y + node.normal.yscale, node.position.z + node.normal.z*scale);
	1442	+ gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
	1443	+ node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
	1444	+ node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
	1445	+ gl.glEnd();
	1446	+ }
	1447	+
	1448	+ gl.glLineWidth(8);
	1449	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1450	+ {
	1451	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1452	+
	1453	+ if (node.springs != null)
	1454	+ {
	1455	+ for (int i=0; i<node.springs.size(); i+=1)
	1456	+ {
	1457	+ cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
	1458	+
	1459	+ int c = i+1;
	1460	+ // c = node.springs.get(i).nbcopies;
	1461	+
	1462	+ gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
	1463	+ gl.glBegin(gl.GL_LINES);
	1464	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1465	+ 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);
	1466	+ gl.glEnd();
	1467	+ }
	1468	+ }
	1469	+ }
	1470	+
	1471	+ gl.glLineWidth(1);
	1472	+ }
	1473	+
	1474	+ gl.glEnable(gl.GL_LIGHTING);
	1475	+ }
	1476	+
1064	1477	/// INTERFACE
1065	1478
	1479	+ public void StartTriangles()
	1480	+ {
	1481	+ javax.media.opengl.GL gl = GetGL();
	1482	+ gl.glBegin(gl.GL_TRIANGLES);
	1483	+ }
	1484	+
	1485	+ public void EndTriangles()
	1486	+ {
	1487	+ GetGL().glEnd();
	1488	+ }
	1489	+
	1490	+ void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
	1491	+ {
	1492	+ if (!selectmode)
	1493	+ {
	1494	+ SetGLNormal(gl, (float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1495	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	1496	+
	1497	+ if (flipV)
	1498	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	1499	+ else
	1500	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1501	+ }
	1502	+
	1503	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	1504	+ }
	1505	+
	1506	+ float[] colorV = new float[4];
	1507	+
1066	1508	void SetColor(Object3D obj, Vertex p0)
1067	1509	{
1068	1510	CameraPane display = this;
..	..	@@ -1130,8 +1572,6 @@
1130	1572	{
1131	1573	return;
1132	1574	}
1133		-
1134		- float[] colorV = new float[3];
1135	1575
1136	1576	if (false) // marked)
1137	1577	{
..	..	@@ -1240,7 +1680,7 @@
1240	1680	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1241	1681	}
1242	1682
1243		- void DrawMaterial(cMaterial material, boolean selected)
	1683	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1244	1684	{
1245	1685	CameraPane display = this;
1246	1686	//new Exception().printStackTrace();
..	..	@@ -1256,18 +1696,18 @@
1256	1696	//col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
1257	1697	if (!material.multiply)
1258	1698	{
1259		- display.color = color;
	1699	+ display.color = material.color;
1260	1700	display.saturation = material.modulation;
1261	1701	}
1262	1702	else
1263	1703	{
1264		- display.color = color2;
	1704	+ display.color = material.color2;
1265	1705	display.saturation = material.modulation2;
1266	1706	}
1267	1707
1268	1708	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1269	1709
1270		- float[] colorV = GrafreeD.colorV;
	1710	+ float[] colorV = Grafreed.colorV;
1271	1711
1272	1712	/**/
1273	1713	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1275,7 +1715,7 @@
1275	1715	colorV[0] = display.modelParams0[0] * material.diffuse;
1276	1716	colorV[1] = display.modelParams0[1] * material.diffuse;
1277	1717	colorV[2] = display.modelParams0[2] * material.diffuse;
1278		- colorV[3] = material.opacity;
	1718	+ colorV[3] = 1; // material.opacity;
1279	1719
1280	1720	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1281	1721	//System.out.println("Opacity = " + opacity);
..	..	@@ -1380,12 +1820,12 @@
1380	1820
1381	1821	display.modelParams7[0] = 0;
1382	1822	display.modelParams7[1] = 1000;
1383		- display.modelParams7[2] = 0;
	1823	+ display.modelParams7[2] = material.parallax;
1384	1824	display.modelParams7[3] = 0;
1385	1825
1386		- display.modelParams6[0] = 100; // criss de bug de bump
	1826	+ //display.modelParams6[0] = 100; // criss de bug de bump
1387	1827
1388		- Object3D.cVector2[] extparams = display.vector2buffer;
	1828	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1389	1829	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1390	1830	{
1391	1831	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1527,7 +1967,7 @@
1527	1967	void PushMatrix(double[][] matrix)
1528	1968	{
1529	1969	// GrafreeD.tracein(matrix);
1530		- PushMatrix(matrix,1);
	1970	+ PushMatrix(matrix, 1);
1531	1971	}
1532	1972
1533	1973	void PushMatrix()
..	..	@@ -1613,9 +2053,9 @@
1613	2053	switch(viewcode)
1614	2054	{
1615	2055	case 0: return "main";
1616		- case 1: return "one";
1617		- case 2: return "two";
1618		- case 3: return "three";
	2056	+ case 1: return "Red";
	2057	+ case 2: return "Green";
	2058	+ case 3: return "Blue";
1619	2059	case 4: return "light";
1620	2060	}
1621	2061
..	..	@@ -1624,7 +2064,7 @@
1624	2064
1625	2065	static int camerachangeframe;
1626	2066
1627		- boolean SetCamera(Camera cam)
	2067	+ public boolean SetCamera(Camera cam)
1628	2068	{
1629	2069	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
1630	2070	// return false;
..	..	@@ -1681,7 +2121,7 @@
1681	2121	//System.err.println("Oeil on");
1682	2122	OEIL = true;
1683	2123	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
1684		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2124	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
1685	2125	//pingthread.StepToTarget(true);
1686	2126	}
1687	2127
..	..	@@ -1752,33 +2192,6 @@
1752	2192	mainDL ^= true;
1753	2193	}
1754	2194
1755		- void ToggleTexture()
1756		- {
1757		- textureon ^= true;
1758		- }
1759		-
1760		- void ToggleLive()
1761		- {
1762		- Globals.setLIVE(Globals.isLIVE() ^ true);
1763		-
1764		- System.err.println("LIVE = " + Globals.isLIVE());
1765		-
1766		- if (!Globals.isLIVE()) // save sound
1767		- GrafreeD.savesound = true; // wav.save();
1768		- // else
1769		- repaint(); // start loop // may 2013
1770		- }
1771		-
1772		- void ToggleSupport()
1773		- {
1774		- SUPPORT ^= true;
1775		- }
1776		-
1777		- void ToggleAbort()
1778		- {
1779		- ABORTMODE ^= true;
1780		- }
1781		-
1782	2195	void ToggleFullScreen()
1783	2196	{
1784	2197	FULLSCREEN ^= true;
..	..	@@ -1789,72 +2202,94 @@
1789	2202	Globals.CROWD ^= true;
1790	2203	}
1791	2204
1792		- void ToggleInertia()
1793		- {
1794		- INERTIA ^= true;
1795		- }
1796		-
1797	2205	void ToggleLocal()
1798	2206	{
1799	2207	LOCALTRANSFORM ^= true;
1800	2208	}
1801	2209
1802		- void ToggleFast()
	2210	+ public void ToggleTexture()
	2211	+ {
	2212	+ textureon ^= true;
	2213	+ }
	2214	+
	2215	+ public void ToggleLive()
	2216	+ {
	2217	+ Globals.setLIVE(Globals.isLIVE() ^ true);
	2218	+
	2219	+ System.err.println("LIVE = " + Globals.isLIVE());
	2220	+
	2221	+ if (!Globals.isLIVE()) // save sound
	2222	+ Grafreed.savesound = true; // wav.save();
	2223	+ // else
	2224	+ repaint(); // start loop // may 2013
	2225	+ }
	2226	+
	2227	+ public void ToggleSupport()
	2228	+ {
	2229	+ SUPPORT ^= true;
	2230	+ }
	2231	+
	2232	+ public void ToggleAbort()
	2233	+ {
	2234	+ ABORTMODE ^= true;
	2235	+ }
	2236	+
	2237	+ public void ToggleInertia()
	2238	+ {
	2239	+ INERTIA ^= true;
	2240	+ }
	2241	+
	2242	+ public void ToggleFast()
1803	2243	{
1804	2244	FAST ^= true;
1805	2245	}
1806	2246
1807		- void ToggleSlowPose()
	2247	+ public void ToggleSlowPose()
1808	2248	{
1809	2249	SLOWPOSE ^= true;
1810	2250	}
1811	2251
1812		- void ToggleFootContact()
1813		- {
1814		- FOOTCONTACT ^= true;
1815		- }
1816		-
1817		- void ToggleBoxMode()
	2252	+ public void ToggleBoxMode()
1818	2253	{
1819	2254	BOXMODE ^= true;
1820	2255	}
1821	2256
1822		- void ToggleSmoothFocus()
	2257	+ public void ToggleZoomBoxMode()
	2258	+ {
	2259	+ ZOOMBOXMODE ^= true;
	2260	+ }
	2261	+
	2262	+ public void ToggleSmoothFocus()
1823	2263	{
1824	2264	SMOOTHFOCUS ^= true;
1825	2265	}
1826	2266
1827		- void ToggleImageFlip()
	2267	+ public void ToggleImageFlip()
1828	2268	{
1829	2269	IMAGEFLIP ^= true;
1830	2270	}
1831	2271
1832		- void ToggleSpeakerMocap()
	2272	+ public void ToggleSpeakerMocap()
1833	2273	{
1834	2274	SPEAKERMOCAP ^= true;
1835	2275	}
1836	2276
1837		- void ToggleSpeakerCamera()
	2277	+ public void ToggleSpeakerCamera()
1838	2278	{
1839	2279	SPEAKERCAMERA ^= true;
1840	2280	}
1841	2281
1842		- void ToggleSpeakerFocus()
	2282	+ public void ToggleSpeakerFocus()
1843	2283	{
1844	2284	SPEAKERFOCUS ^= true;
1845	2285	}
1846	2286
1847		- void ToggleDebug()
1848		- {
1849		- DEBUG ^= true;
1850		- }
1851		-
1852		- void ToggleFrustum()
	2287	+ public void ToggleFrustum()
1853	2288	{
1854	2289	FRUSTUM ^= true;
1855	2290	}
1856	2291
1857		- void ToggleTrack()
	2292	+ public void ToggleTrack()
1858	2293	{
1859	2294	TRACK ^= true;
1860	2295	if (TRACK)
..	..	@@ -1873,25 +2308,35 @@
1873	2308	repaint();
1874	2309	}
1875	2310
1876		- void ToggleTrackOnce()
	2311	+ public void ToggleTrackOnce()
1877	2312	{
1878	2313	TRACKONCE ^= true;
1879	2314	}
1880	2315
1881		- void ToggleShadowTrack()
	2316	+ public void ToggleShadowTrack()
1882	2317	{
1883	2318	SHADOWTRACK ^= true;
1884	2319	repaint();
1885	2320	}
1886	2321
1887		- void ToggleOeil()
	2322	+ public void ToggleOeil()
1888	2323	{
1889	2324	OEIL ^= true;
1890	2325	}
1891	2326
1892		- void ToggleOeilOnce()
	2327	+ public void ToggleOeilOnce()
1893	2328	{
1894	2329	OEILONCE ^= true;
	2330	+ }
	2331	+
	2332	+ void ToggleFootContact()
	2333	+ {
	2334	+ FOOTCONTACT ^= true;
	2335	+ }
	2336	+
	2337	+ void ToggleDebug()
	2338	+ {
	2339	+ Globals.DEBUG ^= true;
1895	2340	}
1896	2341
1897	2342	void ToggleLookAt()
..	..	@@ -1899,9 +2344,9 @@
1899	2344	LOOKAT ^= true;
1900	2345	}
1901	2346
1902		- void ToggleRandom()
	2347	+ void ToggleSwitch()
1903	2348	{
1904		- RANDOM ^= true;
	2349	+ SWITCH ^= true;
1905	2350	}
1906	2351
1907	2352	void ToggleHandles()
..	..	@@ -1909,10 +2354,17 @@
1909	2354	HANDLES ^= true;
1910	2355	}
1911	2356
	2357	+ Object3D paintFolder;
	2358	+
1912	2359	void TogglePaint()
1913	2360	{
1914	2361	PAINTMODE ^= true;
1915	2362	paintcount = 0;
	2363	+
	2364	+ if (PAINTMODE)
	2365	+ {
	2366	+ paintFolder = GetFolder();
	2367	+ }
1916	2368	}
1917	2369
1918	2370	void SwapCamera(int a, int b)
..	..	@@ -2008,7 +2460,34 @@
2008	2460	{
2009	2461	return currentGL;
2010	2462	}
2011		-
	2463	+
	2464	+ static private BufferedImage CreateBim(TextureData texturedata)
	2465	+ {
	2466	+ Grafreed.Assert(texturedata != null);
	2467	+
	2468	+ int width = texturedata.getWidth();
	2469	+ int height = texturedata.getHeight();
	2470	+
	2471	+ Buffer buffer = texturedata.getBuffer();
	2472	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2473	+
	2474	+ byte[] bytes = bytebuf.array();
	2475	+
	2476	+ return CreateBim(bytes, width, height);
	2477	+ }
	2478	+
	2479	+ private void SetGLNormal(javax.media.opengl.GL gl, float nx, float ny, float nz)
	2480	+ {
	2481	+ gl.glNormal3f(nx, ny, nz);
	2482	+
	2483	+ if (ny > 0.9 \|\| ny < -0.9)
	2484	+ // Ground or ceiling
	2485	+ gl.glVertexAttrib3f(4, 1, 0, 0);
	2486	+ else
	2487	+ // Walls
	2488	+ gl.glVertexAttrib3f(4, 0, 1, 0);
	2489	+ }
	2490	+
2012	2491	/**/
2013	2492	class CacheTexture
2014	2493	{
..	..	@@ -2017,28 +2496,31 @@
2017	2496
2018	2497	int resolution;
2019	2498
2020		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2499	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2021	2500	{
2022		- texture = tex;
	2501	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2502	+ texturedata = texdata;
2023	2503	resolution = res;
2024	2504	}
2025	2505	}
2026	2506	/**/
2027	2507
2028	2508	// TEXTURE static Texture texture;
2029		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2030		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2031		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2509	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2510	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2511	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2512	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2513	+
2032	2514	int pigmentdepth = 0;
2033	2515	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2034	2516	int bumpdepth = 0;
2035	2517	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2036	2518	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2037	2519	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2038		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2520	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2039	2521	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2040	2522
2041		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2523	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2042	2524	{
2043	2525	TextureData texturedata = null;
2044	2526
..	..	@@ -2048,7 +2530,7 @@
2048	2530	com.sun.opengl.util.texture.TextureIO.newTextureData(
2049	2531	getClass().getClassLoader().getResourceAsStream(name),
2050	2532	true,
2051		- com.sun.opengl.util.texture.TextureIO.PNG);
	2533	+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
2052	2534	} catch (java.io.IOException e)
2053	2535	{
2054	2536	throw new javax.media.opengl.GLException(e);
..	..	@@ -2057,13 +2539,34 @@
2057	2539	if (bump)
2058	2540	texturedata = ConvertBump(texturedata, false);
2059	2541
2060		- com.sun.opengl.util.texture.Texture texture =
2061		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2542	+// com.sun.opengl.util.texture.Texture texture =
	2543	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2062	2544
2063		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2064		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2545	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2546	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2065	2547
2066		- return texture;
	2548	+ return texturedata;
	2549	+ }
	2550	+
	2551	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2552	+ {
	2553	+ TextureData texturedata = null;
	2554	+
	2555	+ try
	2556	+ {
	2557	+ texturedata =
	2558	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2559	+ bim,
	2560	+ true);
	2561	+ } catch (Exception e)
	2562	+ {
	2563	+ throw new javax.media.opengl.GLException(e);
	2564	+ }
	2565	+
	2566	+ if (bump)
	2567	+ texturedata = ConvertBump(texturedata, false);
	2568	+
	2569	+ return texturedata;
2067	2570	}
2068	2571
2069	2572	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3136,6 +3639,8 @@
3136	3639
3137	3640	System.out.println("LOADING TEXTURE : " + name);
3138	3641
	3642	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3643	+
3139	3644	//
3140	3645	if (false) // compressbit > 0)
3141	3646	{
..	..	@@ -3840,6 +4345,7 @@
3840	4345
3841	4346	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
3842	4347	{
	4348	+ new Exception().printStackTrace();
3843	4349	System.exit(0);
3844	4350	com.sun.opengl.util.texture.Texture texture = null;
3845	4351
..	..	@@ -7533,7 +8039,7 @@
7533	8039	String pigment = Object3D.GetPigment(tex);
7534	8040	String bump = Object3D.GetBump(tex);
7535	8041
7536		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8042	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7537	8043	{
7538	8044	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7539	8045	// System.out.println("; bump = " + bump);
..	..	@@ -7548,11 +8054,69 @@
7548	8054	pigment = null;
7549	8055	}
7550	8056
7551		- ReleaseTexture(bump, true);
7552		- ReleaseTexture(pigment, false);
	8057	+ ReleaseTexture(tex, true);
	8058	+ ReleaseTexture(tex, false);
7553	8059	}
7554	8060
7555		- void ReleaseTexture(String tex, boolean bump)
	8061	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8062	+ {
	8063	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8064	+ {
	8065	+ return;
	8066	+ }
	8067	+
	8068	+ if (tex == null)
	8069	+ {
	8070	+ ReleaseTexture(null, false);
	8071	+ return;
	8072	+ }
	8073	+
	8074	+ String pigment = Object3D.GetPigment(tex);
	8075	+
	8076	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8077	+ {
	8078	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8079	+ // System.out.println("; bump = " + bump);
	8080	+ }
	8081	+
	8082	+ if (pigment.equals(""))
	8083	+ {
	8084	+ pigment = null;
	8085	+ }
	8086	+
	8087	+ ReleaseTexture(tex, false);
	8088	+ }
	8089	+
	8090	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8091	+ {
	8092	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8093	+ {
	8094	+ return;
	8095	+ }
	8096	+
	8097	+ if (tex == null)
	8098	+ {
	8099	+ ReleaseTexture(null, true);
	8100	+ return;
	8101	+ }
	8102	+
	8103	+ String bump = Object3D.GetBump(tex);
	8104	+
	8105	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8106	+ {
	8107	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8108	+ // System.out.println("; bump = " + bump);
	8109	+ }
	8110	+
	8111	+ if (bump.equals(""))
	8112	+ {
	8113	+ bump = null;
	8114	+ }
	8115	+
	8116	+ ReleaseTexture(tex, true);
	8117	+ }
	8118	+
	8119	+ void ReleaseTexture(cTexture tex, boolean bump)
7556	8120	{
7557	8121	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7558	8122	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7563,7 +8127,7 @@
7563	8127	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7564	8128
7565	8129	if (tex != null)
7566		- texture = textures.get(tex);
	8130	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7567	8131
7568	8132	// //assert( texture != null );
7569	8133	// if (texture == null)
..	..	@@ -7655,7 +8219,55 @@
7655	8219	}
7656	8220	}
7657	8221
7658		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8222	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
	8223	+ {
	8224	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8225	+// ambientOcclusion ) // \|\| !textureon)
	8226	+// {
	8227	+// return; // false;
	8228	+// }
	8229	+//
	8230	+// if (tex == null)
	8231	+// {
	8232	+// BindTexture(null,false,resolution);
	8233	+// BindTexture(null,true,resolution);
	8234	+// return;
	8235	+// }
	8236	+//
	8237	+// String pigment = Object3D.GetPigment(tex);
	8238	+// String bump = Object3D.GetBump(tex);
	8239	+//
	8240	+// usedtextures.add(pigment);
	8241	+// usedtextures.add(bump);
	8242	+//
	8243	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8244	+// {
	8245	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8246	+// // System.out.println("; bump = " + bump);
	8247	+// }
	8248	+//
	8249	+// if (bump.equals(""))
	8250	+// {
	8251	+// bump = null;
	8252	+// }
	8253	+// if (pigment.equals(""))
	8254	+// {
	8255	+// pigment = null;
	8256	+// }
	8257	+//
	8258	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8259	+// BindTexture(pigment, false, resolution);
	8260	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8261	+// BindTexture(bump, true, resolution);
	8262	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8263	+//
	8264	+// return; // true;
	8265	+
	8266	+ BindPigmentTexture(tex, resolution);
	8267	+ BindBumpTexture(tex, resolution);
	8268	+ }
	8269	+
	8270	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
7659	8271	{
7660	8272	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7661	8273	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7666,17 +8278,47 @@
7666	8278	if (tex == null)
7667	8279	{
7668	8280	BindTexture(null,false,resolution);
7669		- BindTexture(null,true,resolution);
7670	8281	return;
7671	8282	}
7672	8283
7673	8284	String pigment = Object3D.GetPigment(tex);
	8285	+
	8286	+ usedtextures.add(tex);
	8287	+
	8288	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8289	+ {
	8290	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8291	+ // System.out.println("; bump = " + bump);
	8292	+ }
	8293	+
	8294	+ if (pigment.equals(""))
	8295	+ {
	8296	+ pigment = null;
	8297	+ }
	8298	+
	8299	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8300	+ BindTexture(tex, false, resolution);
	8301	+ }
	8302	+
	8303	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8304	+ {
	8305	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8306	+ ambientOcclusion ) // \|\| !textureon)
	8307	+ {
	8308	+ return; // false;
	8309	+ }
	8310	+
	8311	+ if (tex == null)
	8312	+ {
	8313	+ BindTexture(null,true,resolution);
	8314	+ return;
	8315	+ }
	8316	+
7674	8317	String bump = Object3D.GetBump(tex);
7675	8318
7676		- usedtextures.put(pigment, pigment);
7677		- usedtextures.put(bump, bump);
	8319	+ usedtextures.add(tex);
7678	8320
7679		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8321	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7680	8322	{
7681	8323	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
7682	8324	// System.out.println("; bump = " + bump);
..	..	@@ -7686,43 +8328,94 @@
7686	8328	{
7687	8329	bump = null;
7688	8330	}
7689		- if (pigment.equals(""))
7690		- {
7691		- pigment = null;
7692		- }
7693	8331
7694		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
7695		- BindTexture(pigment, false, resolution);
7696	8332	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
7697		- BindTexture(bump, true, resolution);
	8333	+ BindTexture(tex, true, resolution);
7698	8334	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
7699		-
7700		- return; // true;
7701	8335	}
7702	8336
7703		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8337	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8338	+
	8339	+ private boolean FileExists(String tex)
7704	8340	{
7705		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8341	+ if (missingTextures.contains(tex))
	8342	+ {
	8343	+ return false;
	8344	+ }
	8345	+
	8346	+ boolean fileExists = new File(tex).exists();
	8347	+
	8348	+ if (!fileExists)
	8349	+ {
	8350	+ // If file exists, the "new File()" is not executed sgain
	8351	+ missingTextures.add(tex);
	8352	+ }
	8353	+
	8354	+ return fileExists;
	8355	+ }
	8356	+
	8357	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
	8358	+ {
	8359	+ CacheTexture texturecache = null;
7706	8360
7707	8361	if (tex != null)
7708	8362	{
7709		- String texname = tex;
	8363	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8364	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
7710	8365
7711		- String[] split = tex.split("Textures");
7712		- if (split.length > 1)
7713		- texname = "/Users/nbriere/Textures" + split[split.length-1];
7714		- else
7715		- if (!texname.startsWith("/"))
7716		- texname = "/Users/nbriere/Textures/" + texname;
	8366	+ if (texname.equals("") && texdata == null)
	8367	+ {
	8368	+ return null;
	8369	+ }
	8370	+
	8371	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8372	+
	8373	+// String[] split = tex.split("Textures");
	8374	+// if (split.length > 1)
	8375	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8376	+// else
	8377	+// if (!texname.startsWith("/"))
	8378	+// texname = "/Users/nbriere/Textures/" + texname;
	8379	+ if (!FileExists(texname) && !texname.startsWith("@"))
	8380	+ {
	8381	+ texname = fallbackTextureName;
	8382	+ }
7717	8383
7718	8384	if (CACHETEXTURE)
7719		- texture = textures.get(texname); // TEXTURE CACHE
7720		-
7721		- TextureData texturedata = null;
7722		-
7723		- if (texture == null \|\| texture.resolution < resolution)
7724	8385	{
7725		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8386	+ if (texdata == null)
	8387	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8388	+ else
	8389	+ texturecache = bimtextures.get(texdata);
	8390	+ }
	8391	+
	8392	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8393	+ {
	8394	+ TextureData texturedata = null;
	8395	+
	8396	+ if (texdata != null && textureon)
	8397	+ {
	8398	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8399	+
	8400	+ try
	8401	+ {
	8402	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8403	+ }
	8404	+ catch (Exception e)
	8405	+ {
	8406	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8407	+ }
	8408	+
	8409	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8410	+ bimtextures.put(texdata, texturecache);
	8411	+
	8412	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8413	+
	8414	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8415	+ //bim2 = bim;
	8416	+ }
	8417	+ else
	8418	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
7726	8419	{
7727	8420	assert(!bump);
7728	8421	// if (bump)
..	..	@@ -7733,19 +8426,23 @@
7733	8426	// }
7734	8427	// else
7735	8428	// {
7736		- texture = textures.get(tex);
7737		- if (texture == null)
	8429	+ // texturecache = textures.get(texname); // suspicious
	8430	+ if (texturecache == null)
7738	8431	{
7739		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8432	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
7740	8433	}
	8434	+ else
	8435	+ new Exception().printStackTrace();
7741	8436	// }
7742	8437	} else
7743		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8438	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
7744	8439	{
7745	8440	assert(bump);
7746		- texture = textures.get(tex);
7747		- if (texture == null)
7748		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8441	+ // texturecache = textures.get(texname); // suspicious
	8442	+ if (texturecache == null)
	8443	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8444	+ else
	8445	+ new Exception().printStackTrace();
7749	8446	} else
7750	8447	{
7751	8448	//if (tex.equals("IMMORTAL"))
..	..	@@ -7753,11 +8450,22 @@
7753	8450	// texture = GetResourceTexture("default.png");
7754	8451	//} else
7755	8452	//{
7756		- if (tex.equals("WHITE_NOISE"))
	8453	+ if (texname.endsWith("WHITE_NOISE"))
7757	8454	{
7758		- texture = textures.get(tex);
7759		- if (texture == null)
7760		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8455	+ // texturecache = textures.get(texname); // suspicious
	8456	+ if (texturecache == null)
	8457	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8458	+ else
	8459	+ new Exception().printStackTrace();
	8460	+ } else
	8461	+ {
	8462	+ if (texname.startsWith("@"))
	8463	+ {
	8464	+ // texturecache = textures.get(texname); // suspicious
	8465	+ if (texturecache == null)
	8466	+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
	8467	+ else
	8468	+ new Exception().printStackTrace();
7761	8469	} else
7762	8470	{
7763	8471	if (textureon)
..	..	@@ -7782,7 +8490,7 @@
7782	8490	}
7783	8491
7784	8492	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
7785		- if (!new File(cachename).exists())
	8493	+ if (!FileExists(cachename))
7786	8494	cachename = texname;
7787	8495	else
7788	8496	processbump = false; // don't process bump map again
..	..	@@ -7804,7 +8512,7 @@
7804	8512	}
7805	8513
7806	8514	cachename = texname.substring(0, texname.length()-4)+ext+".png";
7807		- if (!new File(cachename).exists())
	8515	+ if (!FileExists(cachename))
7808	8516	cachename = texname;
7809	8517	else
7810	8518	processbump = false; // don't process bump map again
..	..	@@ -7813,20 +8521,23 @@
7813	8521	texturedata = GetFileTexture(cachename, processbump, resolution);
7814	8522
7815	8523
7816		- if (texturedata != null)
7817		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8524	+ if (texturedata == null)
	8525	+ throw new Exception();
	8526	+
	8527	+ texturecache = new CacheTexture(texturedata,resolution);
7818	8528	//texture = GetTexture(tex, bump);
7819	8529	}
	8530	+ }
7820	8531	}
7821	8532	//}
7822	8533	}
7823	8534
7824		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8535	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
7825	8536	{
7826	8537	//return false;
7827	8538
7828	8539	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
7829		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8540	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
7830	8541	{
7831	8542	// String ext = "_highres";
7832	8543	// if (REDUCETEXTURE)
..	..	@@ -7843,52 +8554,17 @@
7843	8554	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
7844	8555	if (!cachefile.exists())
7845	8556	{
7846		- // cache to disk
7847		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
7848		- //buffers[0].
7849		-
7850		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
7851		- int[] pixels = new int[bytebuf.capacity()/3];
7852		-
7853		- // squared size heuristic...
7854		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8557	+ //if (texturedata.getWidth() == texturedata.getHeight())
7855	8558	{
7856		- for (int i=pixels.length; --i>=0;)
7857		- {
7858		- int i3 = i*3;
7859		- pixels[i] = 0xFF;
7860		- pixels[i] <<= 8;
7861		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
7862		- pixels[i] <<= 8;
7863		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
7864		- pixels[i] <<= 8;
7865		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
7866		- }
7867		-
7868		- /*
7869		- int r=0,g=0,b=0,a=0;
7870		- for (int i=0; i<width; i++)
7871		- for (int j=0; j<height; j++)
7872		- {
7873		- int index = j*width+i;
7874		- int p = pixels[index];
7875		- a = ((p>>24) & 0xFF);
7876		- r = ((p>>16) & 0xFF);
7877		- g = ((p>>8) & 0xFF);
7878		- b = (p & 0xFF);
7879		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
7880		- }
7881		- /**/
7882		- int width = (int)Math.sqrt(pixels.length); // squared
7883		- int height = width;
7884		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
7885		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8559	+ BufferedImage rendImage = CreateBim(texturedata);
	8560	+
7886	8561	ImageWriter writer = null;
7887	8562	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
7888	8563	if (iter.hasNext()) {
7889	8564	writer = (ImageWriter)iter.next();
7890	8565	}
7891		- float compressionQuality = 0.9f;
	8566	+
	8567	+ float compressionQuality = 0.85f;
7892	8568	try
7893	8569	{
7894	8570	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -7905,18 +8581,20 @@
7905	8581	}
7906	8582	}
7907	8583	}
7908		-
	8584	+
	8585	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8586	+
7909	8587	//System.out.println("Texture = " + tex);
7910		- if (textures.containsKey(texname))
	8588	+ if (textures.containsKey(tex))
7911	8589	{
7912		- CacheTexture thetex = textures.get(texname);
	8590	+ CacheTexture thetex = textures.get(tex);
7913	8591	thetex.texture.disable();
7914	8592	thetex.texture.dispose();
7915		- textures.remove(texname);
	8593	+ textures.remove(tex);
7916	8594	}
7917	8595
7918		- texture.texturedata = texturedata;
7919		- textures.put(texname, texture);
	8596	+ //texture.texturedata = texturedata;
	8597	+ textures.put(tex, texturecache);
7920	8598
7921	8599	// newtex = true;
7922	8600	}
..	..	@@ -7932,10 +8610,44 @@
7932	8610	}
7933	8611	}
7934	8612
7935		- return texture;
	8613	+ return texturecache;
7936	8614	}
7937	8615
7938		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8616	+ static void EmbedTextures(cTexture tex)
	8617	+ {
	8618	+ if (tex.pigmentdata == null)
	8619	+ {
	8620	+ //String texname = Object3D.GetPigment(tex);
	8621	+
	8622	+ CacheTexture texturecache = texturepigment.get(tex);
	8623	+
	8624	+ if (texturecache != null)
	8625	+ {
	8626	+ tex.pw = texturecache.texturedata.getWidth();
	8627	+ tex.ph = texturecache.texturedata.getHeight();
	8628	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8629	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8630	+ ;
	8631	+ //, tex.pw, tex.ph), 0.5f);
	8632	+ }
	8633	+ }
	8634	+
	8635	+ if (tex.bumpdata == null)
	8636	+ {
	8637	+ //String texname = Object3D.GetBump(tex);
	8638	+
	8639	+ CacheTexture texturecache = texturebump.get(tex);
	8640	+
	8641	+ if (texturecache != null)
	8642	+ {
	8643	+ tex.bw = texturecache.texturedata.getWidth();
	8644	+ tex.bh = texturecache.texturedata.getHeight();
	8645	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8646	+ }
	8647	+ }
	8648	+ }
	8649	+
	8650	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
7939	8651	{
7940	8652	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7941	8653
..	..	@@ -7953,21 +8665,21 @@
7953	8665	return texture!=null?texture.texture:null;
7954	8666	}
7955	8667
7956		- com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8668	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
7957	8669	{
7958	8670	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7959	8671
7960	8672	return texture!=null?texture.texturedata:null;
7961	8673	}
7962	8674
7963		- boolean BindTexture(String tex, boolean bump, int resolution)
	8675	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
7964	8676	{
7965	8677	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
7966	8678	{
7967	8679	return false;
7968	8680	}
7969	8681
7970		- boolean newtex = false;
	8682	+ //boolean newtex = false;
7971	8683
7972	8684	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
7973	8685
..	..	@@ -7999,9 +8711,75 @@
7999	8711	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8000	8712	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8001	8713
8002		- return newtex;
	8714	+ return true; // Warning: not used.
8003	8715	}
8004	8716
	8717	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8718	+ {
	8719	+ try
	8720	+ {
	8721	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8722	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8723	+ ImageWriter writer = writers.next();
	8724	+
	8725	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8726	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8727	+ param.setCompressionQuality(quality);
	8728	+
	8729	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8730	+ writer.setOutput(ios);
	8731	+ writer.write(null, new IIOImage(image, null, null), param);
	8732	+
	8733	+ byte[] data = baos.toByteArray();
	8734	+ writer.dispose();
	8735	+ return data;
	8736	+ }
	8737	+ catch (Exception e)
	8738	+ {
	8739	+ e.printStackTrace();
	8740	+ return null;
	8741	+ }
	8742	+ }
	8743	+
	8744	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8745	+ {
	8746	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8747	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8748	+ ImageReader reader = writers.next();
	8749	+
	8750	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8751	+
	8752	+ ImageReadParam param = reader.getDefaultReadParam();
	8753	+ param.setDestination(bim);
	8754	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8755	+
	8756	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8757	+ reader.setInput(ios);
	8758	+ BufferedImage bim2 = reader.read(0, param);
	8759	+ reader.dispose();
	8760	+
	8761	+// WritableRaster raster = bim2.getRaster();
	8762	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8763	+// byte[] bytes = data.getData();
	8764	+//
	8765	+// int[] pixels = new int[bytes.length/3];
	8766	+// for (int i=pixels.length; --i>=0;)
	8767	+// {
	8768	+// int i3 = i*3;
	8769	+// pixels[i] = 0xFF;
	8770	+// pixels[i] <<= 8;
	8771	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8772	+// pixels[i] <<= 8;
	8773	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8774	+// pixels[i] <<= 8;
	8775	+// pixels[i] \|= bytes[i3] & 0xFF;
	8776	+// }
	8777	+//
	8778	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8779	+
	8780	+ return bim;
	8781	+ }
	8782	+
8005	8783	ShadowBuffer shadowPBuf;
8006	8784	AntialiasBuffer antialiasPBuf;
8007	8785	int MAXSTACK;
..	..	@@ -8018,10 +8796,12 @@
8018	8796
8019	8797	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8020	8798	MAXSTACK = temp[0];
8021		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8799	+ if (Globals.DEBUG)
	8800	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8022	8801	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8023	8802	MAXSTACK = temp[0];
8024		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8803	+ if (Globals.DEBUG)
	8804	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8025	8805
8026	8806	// Use debug pipeline
8027	8807	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8029,7 +8809,8 @@
8029	8809	gl = drawable.getGL(); //
8030	8810
8031	8811	GL gl3 = getGL();
8032		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8812	+ if (Globals.DEBUG)
	8813	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8033	8814
8034	8815
8035	8816	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8194,7 +8975,7 @@
8194	8975
8195	8976	if (cubemap == null)
8196	8977	{
8197		- LoadEnvy(5);
	8978	+ //LoadEnvy(1);
8198	8979	}
8199	8980
8200	8981	//cubemap.enable();
..	..	@@ -8470,6 +9251,8 @@
8470	9251
8471	9252	void LoadEnvy(int which)
8472	9253	{
	9254	+ assert(false);
	9255	+
8473	9256	String name;
8474	9257	String ext;
8475	9258
..	..	@@ -8481,37 +9264,58 @@
8481	9264	cubemap = null;
8482	9265	return;
8483	9266	case 1:
8484		- name = "cubemaps/box_";
8485		- ext = "png";
	9267	+ name = "cubemaps/rgb/";
	9268	+ ext = "jpg";
8486	9269	reverseUP = false;
8487	9270	break;
8488	9271	case 2:
8489		- name = "cubemaps/uffizi_";
8490		- ext = "png";
8491		- break; // reverseUP = true; break;
	9272	+ name = "cubemaps/uffizi/";
	9273	+ ext = "jpg";
	9274	+ reverseUP = false;
	9275	+ break;
8492	9276	case 3:
8493		- name = "cubemaps/CloudyHills_";
8494		- ext = "tga";
	9277	+ name = "cubemaps/CloudyHills/";
	9278	+ ext = "jpg";
8495	9279	reverseUP = false;
8496	9280	break;
8497	9281	case 4:
8498		- name = "cubemaps/cornell_";
	9282	+ name = "cubemaps/cornell/";
8499	9283	ext = "png";
8500	9284	reverseUP = false;
8501	9285	break;
	9286	+ case 5:
	9287	+ name = "cubemaps/skycube/";
	9288	+ ext = "jpg";
	9289	+ reverseUP = false;
	9290	+ break;
	9291	+ case 6:
	9292	+ name = "cubemaps/SaintLazarusChurch3/";
	9293	+ ext = "jpg";
	9294	+ reverseUP = false;
	9295	+ break;
	9296	+ case 7:
	9297	+ name = "cubemaps/Sodermalmsallen/";
	9298	+ ext = "jpg";
	9299	+ reverseUP = false;
	9300	+ break;
	9301	+ case 8:
	9302	+ name = "cubemaps/Sodermalmsallen2/";
	9303	+ ext = "jpg";
	9304	+ reverseUP = false;
	9305	+ break;
	9306	+ case 9:
	9307	+ name = "cubemaps/UnionSquare/";
	9308	+ ext = "jpg";
	9309	+ reverseUP = false;
	9310	+ break;
8502	9311	default:
8503		- name = "cubemaps/rgb_";
8504		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9312	+ name = "cubemaps/box/";
	9313	+ ext = "png"; /mipmap = true;/
	9314	+ reverseUP = false;
8505	9315	break;
8506	9316	}
8507		-
8508		- try
8509		- {
8510		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
8511		- } catch (IOException e)
8512		- {
8513		- throw new RuntimeException(e);
8514		- }
	9317	+
	9318	+ LoadSkybox(name, ext, mipmap);
8515	9319	}
8516	9320
8517	9321	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -8543,8 +9347,12 @@
8543	9347	static double[] model = new double[16];
8544	9348	double[] camera2light = new double[16];
8545	9349	double[] light2camera = new double[16];
8546		- int newenvy = -1;
8547		- boolean envyoff = true; // false;
	9350	+
	9351	+ //int newenvy = -1;
	9352	+ //boolean envyoff = false;
	9353	+
	9354	+ String loadedskyboxname;
	9355	+
8548	9356	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
8549	9357	//float[] light0 = { 0,0,0 };
8550	9358	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -8837,11 +9645,35 @@
8837	9645	jy8[3] = 0.5f;
8838	9646	}
8839	9647
8840		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9648	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
8841	9649	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
8842	9650	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
8843	9651	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
8844	9652
	9653	+ void ResetOptions()
	9654	+ {
	9655	+ options1[0] = 100;
	9656	+ options1[1] = 0.025f;
	9657	+ options1[2] = 0.01f;
	9658	+ options1[3] = 0;
	9659	+ options1[4] = 0;
	9660	+
	9661	+ options2[0] = 0;
	9662	+ options2[1] = 0.75f;
	9663	+ options2[2] = 0;
	9664	+ options2[3] = 0;
	9665	+
	9666	+ options3[0] = 1;
	9667	+ options3[1] = 1;
	9668	+ options3[2] = 1;
	9669	+ options3[3] = 0;
	9670	+
	9671	+ options4[0] = 1;
	9672	+ options4[1] = 0;
	9673	+ options4[2] = 1;
	9674	+ options4[3] = 0;
	9675	+ }
	9676	+
8845	9677	static int imagecount = 0; // movie generation
8846	9678
8847	9679	static int jitter = 0;
..	..	@@ -8937,8 +9769,8 @@
8937	9769	assert (parentcam != renderCamera);
8938	9770
8939	9771	if (renderCamera != lightCamera)
8940		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8941		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9772	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9773	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
8942	9774
8943	9775	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
8944	9776
..	..	@@ -8953,8 +9785,8 @@
8953	9785	LA.matCopy(renderCamera.fromScreen, matrix);
8954	9786
8955	9787	if (renderCamera != lightCamera)
8956		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8957		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9788	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9789	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
8958	9790
8959	9791	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
8960	9792
..	..	@@ -9000,10 +9832,12 @@
9000	9832	rati = 1 / rati;
9001	9833	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9002	9834	}
9003		- assert (newenvy == -1);
	9835	+
	9836	+ //assert (newenvy == -1);
	9837	+
9004	9838	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9005	9839	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9006		- DrawSkyBox(gl);
	9840	+ DrawSkyBox(gl, (float)rati);
9007	9841	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9008	9842	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9009	9843	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -9026,7 +9860,7 @@
9026	9860	//gl.glFlush();
9027	9861	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9028	9862
9029		- if (ANIMATION && ABORTED)
	9863	+ if (Globals.ANIMATION && ABORTED)
9030	9864	{
9031	9865	System.err.println(" ABORTED FRAME");
9032	9866	break;
..	..	@@ -9056,7 +9890,7 @@
9056	9890	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9057	9891
9058	9892	// save image
9059		- if (ANIMATION && !ABORTED)
	9893	+ if (Globals.ANIMATION && !ABORTED)
9060	9894	{
9061	9895	VPwidth = viewport[2];
9062	9896	VPheight = viewport[3];
..	..	@@ -9167,11 +10001,11 @@
9167	10001
9168	10002	// imagecount++;
9169	10003
9170		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	10004	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9171	10005
9172	10006	if (!BOXMODE)
9173	10007	{
9174		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	10008	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9175	10009	}
9176	10010
9177	10011	if (!BOXMODE)
..	..	@@ -9209,7 +10043,7 @@
9209	10043	ABORTED = false;
9210	10044	}
9211	10045	else
9212		- GrafreeD.wav.cursor += 735 * ACSIZE;
	10046	+ Grafreed.wav.cursor += 735 * ACSIZE;
9213	10047
9214	10048	if (false)
9215	10049	{
..	..	@@ -9869,14 +10703,23 @@
9869	10703	static boolean init = false;
9870	10704
9871	10705	double[][] matrix = LA.newMatrix();
	10706	+
	10707	+ // This is to refresh the UI of the material panel.
	10708	+ ObjEditor patchMaterial;
9872	10709
9873	10710	public void display(GLAutoDrawable drawable)
9874	10711	{
9875		- if (GrafreeD.savesound && GrafreeD.hassound)
	10712	+ if (patchMaterial.patchMaterial)
9876	10713	{
9877		- GrafreeD.wav.save();
9878		- GrafreeD.savesound = false;
9879		- GrafreeD.hassound = false;
	10714	+ patchMaterial.patchMaterial = false;
	10715	+ patchMaterial.objectPanel.setSelectedIndex(1);
	10716	+ }
	10717	+
	10718	+ if (Grafreed.savesound && Grafreed.hassound)
	10719	+ {
	10720	+ Grafreed.wav.save();
	10721	+ Grafreed.savesound = false;
	10722	+ Grafreed.hassound = false;
9880	10723	}
9881	10724	// if (DEBUG_SELECTION)
9882	10725	// {
..	..	@@ -9952,6 +10795,7 @@
9952	10795	ANTIALIAS = 0;
9953	10796	//System.out.println("RESTART");
9954	10797	AAtimer.restart();
	10798	+ Globals.TIMERRUNNING = true;
9955	10799	}
9956	10800	}
9957	10801	}
..	..	@@ -10006,7 +10850,7 @@
10006	10850	Object3D theobject = object;
10007	10851	Object3D theparent = object.parent;
10008	10852	object.parent = null;
10009		- object = (Object3D)GrafreeD.clone(object);
	10853	+ object = (Object3D)Grafreed.clone(object);
10010	10854	object.Stripify();
10011	10855	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10012	10856	theobject.PreprocessOcclusion(this);
..	..	@@ -10019,13 +10863,14 @@
10019	10863	ambientOcclusion = false;
10020	10864	}
10021	10865
10022		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10866	+ if (//Globals.lighttouched &&
	10867	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10023	10868	{
10024	10869	//if (RENDERSHADOW) // ?
10025	10870	if (!IsFrozen())
10026	10871	{
10027	10872	// dec 2012
10028		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10873	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10029	10874	{
10030	10875	Globals.framecount++;
10031	10876	shadowbuffer.display();
..	..	@@ -10038,7 +10883,7 @@
10038	10883
10039	10884	if (wait)
10040	10885	{
10041		- Sleep(500);
	10886	+ Sleep(200); // blocks everything
10042	10887
10043	10888	wait = false;
10044	10889	}
..	..	@@ -10152,8 +10997,8 @@
10152	10997
10153	10998	// if (parentcam != renderCamera) // not a light
10154	10999	if (cam != lightCamera)
10155		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10156		- LA.matConcat(matrix, parentcam.toParent, matrix);
	11000	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11001	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10157	11002
10158	11003	for (int j = 0; j < 4; j++)
10159	11004	{
..	..	@@ -10167,8 +11012,8 @@
10167	11012
10168	11013	// if (parentcam != renderCamera) // not a light
10169	11014	if (cam != lightCamera)
10170		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10171		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	11015	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11016	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10172	11017
10173	11018	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10174	11019
..	..	@@ -10254,13 +11099,43 @@
10254	11099	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10255	11100	}
10256	11101
10257		- if (newenvy > -1)
	11102	+// if (newenvy > -1)
	11103	+// {
	11104	+// LoadEnvy(newenvy);
	11105	+// }
	11106	+//
	11107	+// newenvy = -1;
	11108	+
	11109	+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
10258	11110	{
10259		- LoadEnvy(newenvy);
	11111	+ if (cubemaprgb == null)
	11112	+ {
	11113	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
	11114	+ }
	11115	+
	11116	+ cubemap = cubemaprgb;
10260	11117	}
10261		-
10262		- newenvy = -1;
10263		-
	11118	+ else
	11119	+ {
	11120	+ if (object.skyboxname != null)
	11121	+ {
	11122	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11123	+ {
	11124	+ if (cubemap != null && cubemap != cubemaprgb)
	11125	+ cubemap.dispose();
	11126	+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11127	+ loadedskyboxname = object.skyboxname;
	11128	+ }
	11129	+ }
	11130	+ else
	11131	+ {
	11132	+ cubemapcustom = null;
	11133	+ loadedskyboxname = null;
	11134	+ }
	11135	+
	11136	+ cubemap = cubemapcustom;
	11137	+ }
	11138	+
10264	11139	ratio = ((double) getWidth()) / getHeight();
10265	11140	//System.out.println("ratio = " + ratio);
10266	11141
..	..	@@ -10276,7 +11151,7 @@
10276	11151
10277	11152	if (!IsFrozen() && !ambientOcclusion)
10278	11153	{
10279		- DrawSkyBox(gl);
	11154	+ DrawSkyBox(gl, (float)ratio);
10280	11155	}
10281	11156
10282	11157	//if (selection_view == -1)
..	..	@@ -10427,7 +11302,16 @@
10427	11302	// Bump noise
10428	11303	gl.glActiveTexture(GL.GL_TEXTURE6);
10429	11304	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10430		- BindTexture(NOISE_TEXTURE, false, 2);
	11305	+
	11306	+ try
	11307	+ {
	11308	+ BindTexture(NOISE_TEXTURE, false, 2);
	11309	+ }
	11310	+ catch (Exception e)
	11311	+ {
	11312	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11313	+ }
	11314	+
10431	11315
10432	11316	gl.glActiveTexture(GL.GL_TEXTURE0);
10433	11317	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10450,9 +11334,9 @@
10450	11334
10451	11335	gl.glMatrixMode(GL.GL_MODELVIEW);
10452	11336
10453		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10454		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10455		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11337	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11338	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11339	+gl.glEnable(gl.GL_MULTISAMPLE);
10456	11340	} else
10457	11341	{
10458	11342	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10463,7 +11347,7 @@
10463	11347	//System.out.println("BLENDING ON");
10464	11348	gl.glEnable(GL.GL_BLEND);
10465	11349	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10466		-
	11350	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10467	11351	gl.glMatrixMode(gl.GL_PROJECTION);
10468	11352	gl.glLoadIdentity();
10469	11353
..	..	@@ -10552,8 +11436,8 @@
10552	11436	System.err.println("parentcam != renderCamera");
10553	11437
10554	11438	// if (cam != lightCamera)
10555		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10556		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11439	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11440	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
10557	11441	}
10558	11442
10559	11443	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10574,8 +11458,8 @@
10574	11458	if (true) // TODO
10575	11459	{
10576	11460	if (cam != lightCamera)
10577		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10578		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11461	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11462	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10579	11463	}
10580	11464
10581	11465	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -10712,7 +11596,7 @@
10712	11596	}
10713	11597	}
10714	11598
10715		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11599	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
10716	11600	{
10717	11601	//gl.glDepthFunc(GL.GL_LEQUAL);
10718	11602	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -10720,24 +11604,21 @@
10720	11604
10721	11605	boolean texon = textureon;
10722	11606
10723		- if (RENDERPROGRAM > 0)
10724		- {
10725		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
10726		- textureon = false;
10727		- }
	11607	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11608	+ textureon = false;
	11609	+
10728	11610	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
10729	11611	//System.out.println("ALLO");
10730	11612	gl.glColorMask(false, false, false, false);
10731	11613	DrawObject(gl);
10732		- if (RENDERPROGRAM > 0)
10733		- {
10734		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
10735		- textureon = texon;
10736		- }
	11614	+
	11615	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11616	+ textureon = texon;
	11617	+
10737	11618	gl.glColorMask(true, true, true, true);
10738	11619
10739	11620	gl.glDepthFunc(GL.GL_EQUAL);
10740		- //gl.glDepthMask(false);
	11621	+ gl.glDepthMask(false);
10741	11622	}
10742	11623
10743	11624	if (false) // DrawMode() == SHADOW)
..	..	@@ -10891,8 +11772,14 @@
10891	11772	{
10892	11773	renderpass++;
10893	11774	// System.out.println("Draw object... ");
	11775	+ STEP = 1;
10894	11776	if (FAST) // in case there is no script
10895		- STEP = 16;
	11777	+ STEP = 8;
	11778	+
	11779	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11780	+ {
	11781	+ STEP *= 4;
	11782	+ }
10896	11783
10897	11784	//object.FullInvariants();
10898	11785
..	..	@@ -10906,23 +11793,44 @@
10906	11793	e.printStackTrace();
10907	11794	}
10908	11795
10909		- if (GrafreeD.RENDERME > 0)
10910		- GrafreeD.RENDERME--; // mechante magouille
	11796	+ if (Grafreed.RENDERME > 0)
	11797	+ Grafreed.RENDERME--; // mechante magouille
10911	11798
10912	11799	Globals.ONESTEP = false;
10913	11800	}
10914	11801
10915	11802	static boolean zoomonce = false;
10916	11803
	11804	+ static void CreateSelectedPoint()
	11805	+ {
	11806	+ if (selectedpoint == null)
	11807	+ {
	11808	+ debugpointG = new Sphere();
	11809	+ debugpointP = new Sphere();
	11810	+ debugpointC = new Sphere();
	11811	+ debugpointR = new Sphere();
	11812	+
	11813	+ selectedpoint = new Superellipsoid();
	11814	+
	11815	+ for (int i=0; i<8; i++)
	11816	+ {
	11817	+ debugpoints[i] = new Sphere();
	11818	+ }
	11819	+ }
	11820	+ }
	11821	+
10917	11822	void DrawObject(GL gl, boolean draw)
10918	11823	{
	11824	+ // To clear camera values
	11825	+ ResetOptions();
	11826	+
10919	11827	//System.out.println("DRAW OBJECT " + mouseDown);
10920	11828	// DrawMode() = SELECTION;
10921	11829	//GL gl = getGL();
10922	11830	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
10923	11831	{
10924	11832	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
10925		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11833	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
10926	11834	pingthread.StepToTarget(true); // true);
10927	11835	// zoomonce = false;
10928	11836	}
..	..	@@ -10977,7 +11885,14 @@
10977	11885
10978	11886	usedtextures.clear();
10979	11887
10980		- BindTextures(DEFAULT_TEXTURES, 2);
	11888	+ try
	11889	+ {
	11890	+ BindTextures(DEFAULT_TEXTURES, 2);
	11891	+ }
	11892	+ catch (Exception e)
	11893	+ {
	11894	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11895	+ }
10981	11896	}
10982	11897	//System.out.println("--> " + stackdepth);
10983	11898	// GrafreeD.traceon();
..	..	@@ -10987,8 +11902,9 @@
10987	11902
10988	11903	if (DrawMode() == DEFAULT)
10989	11904	{
10990		- if (DEBUG)
	11905	+ if (Globals.DEBUG)
10991	11906	{
	11907	+ CreateSelectedPoint();
10992	11908	float radius = 0.05f;
10993	11909	if (selectedpoint.radius != radius)
10994	11910	{
..	..	@@ -11042,20 +11958,32 @@
11042	11958	ReleaseTextures(DEFAULT_TEXTURES);
11043	11959
11044	11960	if (CLEANCACHE)
11045		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11961	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11046	11962	{
11047		- String tex = e.nextElement();
	11963	+ cTexture tex = e.nextElement();
11048	11964
11049	11965	// System.out.println("Texture --------- " + tex);
11050	11966
11051		- if (tex.equals("WHITE_NOISE"))
	11967	+ if (tex.equals("WHITE_NOISE:"))
11052	11968	continue;
11053	11969
11054		- if (!usedtextures.containsKey(tex))
	11970	+ if (!usedtextures.contains(tex))
11055	11971	{
	11972	+ CacheTexture gettex = texturepigment.get(tex);
11056	11973	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11057		- textures.get(tex).texture.dispose();
11058		- textures.remove(tex);
	11974	+ if (gettex != null)
	11975	+ {
	11976	+ gettex.texture.dispose();
	11977	+ texturepigment.remove(tex);
	11978	+ }
	11979	+
	11980	+ gettex = texturebump.get(tex);
	11981	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11982	+ if (gettex != null)
	11983	+ {
	11984	+ gettex.texture.dispose();
	11985	+ texturebump.remove(tex);
	11986	+ }
11059	11987	}
11060	11988	}
11061	11989	}
..	..	@@ -11068,7 +11996,14 @@
11068	11996	if (checker != null && DrawMode() == DEFAULT)
11069	11997	{
11070	11998	//BindTexture(IMMORTAL_TEXTURE);
11071		- BindTextures(checker.GetTextures(), checker.texres);
	11999	+ try
	12000	+ {
	12001	+ BindTextures(checker.GetTextures(), checker.texres);
	12002	+ }
	12003	+ catch (Exception e)
	12004	+ {
	12005	+ System.err.println("FAILED: " + checker.GetTextures());
	12006	+ }
11072	12007	// NEAREST
11073	12008	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11074	12009	DrawChecker(gl);
..	..	@@ -11150,7 +12085,7 @@
11150	12085	return;
11151	12086	}
11152	12087
11153		- String string = obj.GetToolTip();
	12088	+ String string = obj.toString(); //.GetToolTip();
11154	12089
11155	12090	GL gl = GetGL();
11156	12091
..	..	@@ -11467,8 +12402,8 @@
11467	12402	//obj.TransformToWorld(light, light);
11468	12403	for (int i = tp.size(); --i >= 0;)
11469	12404	{
11470		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11471		- LA.xformPos(light, tp.get(i).toParent, light);
	12405	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12406	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11472	12407	}
11473	12408
11474	12409
..	..	@@ -11485,8 +12420,8 @@
11485	12420	parentcam = cameras[0];
11486	12421	}
11487	12422
11488		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11489		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12423	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12424	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11490	12425
11491	12426	LA.xformPos(light, renderCamera.toScreen, light);
11492	12427
..	..	@@ -11576,8 +12511,76 @@
11576	12511
11577	12512	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
11578	12513
11579		- String program =
	12514	+ String programmin =
	12515	+ // Min shader
11580	12516	"!!ARBfp1.0\n" +
	12517	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12518	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12519	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12520	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12521	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12522	+ "PARAM light2cam0 = program.env[10];" +
	12523	+ "PARAM light2cam1 = program.env[11];" +
	12524	+ "PARAM light2cam2 = program.env[12];" +
	12525	+ "TEMP temp;" +
	12526	+ "TEMP light;" +
	12527	+ "TEMP ndotl;" +
	12528	+ "TEMP normal;" +
	12529	+ "TEMP depth;" +
	12530	+ "TEMP eye;" +
	12531	+ "TEMP pos;" +
	12532	+
	12533	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12534	+ Normalize("normal") +
	12535	+ "MOV light, state.light[0].position;" +
	12536	+ "DP3 ndotl.x, light, normal;" +
	12537	+
	12538	+ // shadow
	12539	+ "MOV pos, fragment.texcoord[1];" +
	12540	+ "MOV temp, pos;" +
	12541	+ ShadowTextureFetch("depth", "temp", "1") +
	12542	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12543	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12544	+
	12545	+ // No shadow when out of frustum
	12546	+ //"SGE temp.y, depth.z, zero123.y;" +
	12547	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12548	+
	12549	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12550	+
	12551	+ // Backlit
	12552	+ "MOV pos.w, zero123.y;" +
	12553	+ "DP4 eye.x, pos, light2cam0;" +
	12554	+ "DP4 eye.y, pos, light2cam1;" +
	12555	+ "DP4 eye.z, pos, light2cam2;" +
	12556	+ Normalize("eye") +
	12557	+
	12558	+ "DP3 ndotl.y, -eye, normal;" +
	12559	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12560	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12561	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12562	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12563	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12564	+
	12565	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12566	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12567	+
	12568	+ // Pigment
	12569	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12570	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12571	+ "MUL temp, temp, ndotl.x;" +
	12572	+
	12573	+ "MUL temp, temp, zero123.z;" +
	12574	+
	12575	+ //"MUL temp, temp, ndotl.y;" +
	12576	+
	12577	+ "MOV temp.w, zero123.y;" + // reset alpha
	12578	+ "MOV result.color, temp;" +
	12579	+ "END";
	12580	+
	12581	+ String programmax =
	12582	+ "!!ARBfp1.0\n" +
	12583	+
11581	12584	//"OPTION ARB_fragment_program_shadow;" +
11582	12585	"PARAM light2cam0 = program.env[10];" +
11583	12586	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -11603,7 +12606,7 @@
11603	12606	"PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
11604	12607	"PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
11605	12608	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
11606		- "PARAM params7 = program.env[7];" + // noise power, opacity power
	12609	+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
11607	12610	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
11608	12611	"PARAM options1 = program.env[62];" + // fog rgb color
11609	12612	"PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
..	..	@@ -11692,8 +12695,7 @@
11692	12695	"TEMP shininess;" +
11693	12696	"\n" +
11694	12697	"MOV texSamp, one;" +
11695		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
11696		-
	12698	+
11697	12699	"MOV mapgrid.x, one2048th.x;" +
11698	12700	"MOV temp, fragment.texcoord[1];" +
11699	12701	/*
..	..	@@ -11714,20 +12716,20 @@
11714	12716	"MUL temp, floor, mapgrid.x;" +
11715	12717	//"TEX depth0, temp, texture[1], 2D;" +
11716	12718	(((mode & FP_SOFTSHADOW) == 0) ? "" :
11717		- TextureFetch("depth0", "temp", "1") +
	12719	+ ShadowTextureFetch("depth0", "temp", "1") +
11718	12720	"") +
11719	12721	"ADD temp.x, temp.x, mapgrid.x;" +
11720	12722	//"TEX depth1, temp, texture[1], 2D;" +
11721	12723	(((mode & FP_SOFTSHADOW) == 0) ? "" :
11722		- TextureFetch("depth1", "temp", "1") +
	12724	+ ShadowTextureFetch("depth1", "temp", "1") +
11723	12725	"") +
11724	12726	"ADD temp.y, temp.y, mapgrid.x;" +
11725	12727	//"TEX depth2, temp, texture[1], 2D;" +
11726		- TextureFetch("depth2", "temp", "1") +
	12728	+ ShadowTextureFetch("depth2", "temp", "1") +
11727	12729	"SUB temp.x, temp.x, mapgrid.x;" +
11728	12730	//"TEX depth3, temp, texture[1], 2D;" +
11729	12731	(((mode & FP_SOFTSHADOW) == 0) ? "" :
11730		- TextureFetch("depth3", "temp", "1") +
	12732	+ ShadowTextureFetch("depth3", "temp", "1") +
11731	12733	"") +
11732	12734	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
11733	12735	//"MOV params, material;" +
..	..	@@ -11849,7 +12851,7 @@
11849	12851	"POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
11850	12852	// mar 2013 ??? "KIL alpha.a;" +
11851	12853	"MOV alpha, texSamp.aaaa;" + // y;" +
11852		- "KIL alpha.a;" +
	12854	+ "KIL alpha.a;" + // not sure with parallax mapping
11853	12855	/*
11854	12856	"MUL temp.xy, temp, two;" +
11855	12857	"TXB bump, temp, texture[0], 2D;" +
..	..	@@ -11935,11 +12937,6 @@
11935	12937	"SUB bump0, bump0, half;" +
11936	12938	"ADD bump, bump, bump0;" +
11937	12939
11938		- "MOV temp.x, texSamp.a;" +
11939		- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
11940		- //"LRP texSamp0, params5.x, texSamp0, one;" +
11941		- "MOV texSamp.a, temp.x;" +
11942		-
11943	12940	// double-sided
11944	12941	/**/
11945	12942	(doublesided?"DP3 temp.z, normal, eye;" +
..	..	@@ -11956,19 +12953,62 @@
11956	12953	"MOV normald, normal;" +
11957	12954	"MOV normals, normal;" +
11958	12955
	12956	+ "MOV temp, fragment.texcoord[4];" +
	12957	+
11959	12958	// UV base
11960	12959	//"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
11961	12960	//"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
11962	12961	//"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
11963		- "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
11964		- "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
11965		- "DP3 UP.z,state.matrix.texture[7].row[2],Y;" +
	12962	+ "DP3 UP.x,state.matrix.texture[7].row[0],temp;" +
	12963	+ "DP3 UP.y,state.matrix.texture[7].row[1],temp;" +
	12964	+ "DP3 UP.z,state.matrix.texture[7].row[2],temp;" +
	12965	+ Normalize("UP") +
	12966	+
11966	12967	"XPD V, normal, UP;" +
11967	12968	Normalize("V") +
11968	12969	"XPD U, V, normal;" +
11969	12970	Normalize("U") +
11970	12971
11971	12972	// parallax mapping
	12973	+
	12974	+ "DP3 temp2.x, V, eye;" +
	12975	+ "DP3 temp2.y, U, eye;" +
	12976	+ "DP3 temp2.z, normal, eye;" +
	12977	+ "RCP temp2.z, temp2.z;" +
	12978	+
	12979	+ "DP3 temp2.w, texSamp, texSamp;" + // Height
	12980	+ "RSQ temp2.w, temp2.w;" +
	12981	+ "RCP temp2.w, temp2.w;" +
	12982	+
	12983	+ "SUB temp2.w, temp2.w, half;" +
	12984	+// "SGE temp.x, temp2.w, eps.x;" +
	12985	+// "MUL temp2.w, temp2.w, temp.x;" +
	12986	+
	12987	+ //"MOV texSamp, U;" +
	12988	+
	12989	+ "MUL temp2.z, temp2.z, temp2.w;" +
	12990	+ "MUL temp2.z, temp2.z, params7.z;" + // parallax
	12991	+
	12992	+ "MUL temp2, temp2, temp2.z;" +
	12993	+
	12994	+ "MOV temp, fragment.texcoord[0];" +
	12995	+
	12996	+ "SUB temp, temp, temp2;" +
	12997	+
	12998	+ "TEX temp, temp, texture[0], 2D;" +
	12999	+ "POW temp.a, temp.a, params6.w;" + // punch through
	13000	+
	13001	+ "ADD texSamp, temp, texSamp;" +
	13002	+ "MUL texSamp.xyz, half, texSamp;" +
	13003	+
	13004	+ "MOV alpha, texSamp.aaaa;" +
	13005	+
	13006	+// parallax mapping
	13007	+
	13008	+ "MOV temp.x, texSamp.a;" +
	13009	+ "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
	13010	+ //"LRP texSamp0, params5.x, texSamp0, one;" +
	13011	+ "MOV texSamp.a, temp.x;" +
11972	13012
11973	13013	//"MOV temp, fragment.texcoord[0];" +
11974	13014	//
..	..	@@ -12098,10 +13138,10 @@
12098	13138	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12099	13139	"") +
12100	13140
12101		- // display shadow only (bump == 0)
	13141	+ // display shadow only (fakedepth == 0)
12102	13142	"SUB temp.x, half.x, shadow.x;" +
12103		- "MOV temp.y, -params6.x;" +
12104		- "SLT temp.z, temp.y, zero.x;" +
	13143	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	13144	+ "SLT temp.z, temp.y, -c256i.x;" +
12105	13145	"SUB temp.y, one.x, temp.z;" +
12106	13146	"MUL temp.x, temp.x, temp.y;" +
12107	13147	"KIL temp.x;" +
..	..	@@ -12230,8 +13270,10 @@
12230	13270	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12231	13271
12232	13272	"SUB temp.x, one.x, ndotl.x;" +
12233		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
12234		- "ADD temp.y, one.y, options2.y;" + // sursurface
	13273	+ // Tuning for default skin
	13274	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	13275	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	13276	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12235	13277	"MUL temp.x, temp.x, temp.y;" +
12236	13278
12237	13279	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12430,8 +13472,19 @@
12430	13472	//once = true;
12431	13473	}
12432	13474
12433		- System.out.print("Program #" + mode + "; length = " + program.length());
12434		- System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13475	+ String program = programmax;
	13476	+
	13477	+ if (Globals.MINSHADER)
	13478	+ {
	13479	+ program = programmin;
	13480	+ }
	13481	+
	13482	+ if (Globals.DEBUG)
	13483	+ {
	13484	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
	13485	+ System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13486	+ }
	13487	+
12435	13488	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12436	13489
12437	13490	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -12478,7 +13531,8 @@
12478	13531	"\n" +
12479	13532	"END\n";
12480	13533
12481		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13534	+ if (Globals.DEBUG)
	13535	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
12482	13536	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12483	13537
12484	13538	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -12523,25 +13577,26 @@
12523	13577	return out;
12524	13578	}
12525	13579
12526		- String TextureFetch(String dest, String src, String unit)
	13580	+ // Also does frustum culling
	13581	+ String ShadowTextureFetch(String dest, String src, String unit)
12527	13582	{
12528	13583	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12529	13584	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12530	13585	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13586	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13587	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12531	13588	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12532		- "SLT " + src + ".z, " + src + ".x, one.x;" +
12533		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12534		- "SLT " + src + ".z, " + src + ".y, one.x;" +
12535		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13589	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13590	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12536	13591	//"SWZ buffer, temp, w,w,w,w;";
12537		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13592	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12538	13593	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12539	13594	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12540	13595	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12541		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13596	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12542	13597
12543		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12544		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13598	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13599	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12545	13600	}
12546	13601
12547	13602	String Shadow(String depth, String shadow)
..	..	@@ -12563,12 +13618,16 @@
12563	13618
12564	13619	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12565	13620	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13621	+
	13622	+ // Compare fragment depth in light space with shadowmap.
12566	13623	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12567	13624	"SGE temp.y, temp.x, zero.x;" +
12568		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13625	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13626	+
	13627	+ // Reverse comparison
12569	13628	"SUB temp.x, one.x, temp.x;" +
12570	13629	"MUL " + shadow + ".x, temp.x, temp.y;" +
12571		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13630	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12572	13631	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12573	13632
12574	13633	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12582,6 +13641,10 @@
12582	13641	// No shadow for backface
12583	13642	"DP3 temp.x, normal, lightd;" +
12584	13643	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13644	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13645	+
	13646	+ // No shadow when out of frustum
	13647	+ "SGE temp.x, " + depth + ".z, one.z;" +
12585	13648	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12586	13649	"";
12587	13650	}
..	..	@@ -12727,8 +13790,9 @@
12727	13790	/static/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
12728	13791	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
12729	13792	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
12730		- /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
12731		- Object3D.cVector2[] vector2buffer;
	13793	+ /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
	13794	+
	13795	+ //Object3D.cVector2[] vector2buffer;
12732	13796
12733	13797	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
12734	13798	// OUT : diff, spec
..	..	@@ -12744,9 +13808,10 @@
12744	13808	"DP3 " + dest + ".z," + "normals," + "eye;" +
12745	13809	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
12746	13810	//"MOV " + dest + ".w," + "normal.z;" +
12747		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
12748		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
12749		- //"MOV " + dest + ".z," + "params2.w;" +
	13811	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13812	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13813	+
	13814	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
12750	13815	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
12751	13816	"RCP " + dest + ".w," + dest + ".w;" +
12752	13817	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -12892,7 +13957,7 @@
12892	13957	"PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
12893	13958	"PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
12894	13959	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
12895		- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
	13960	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
12896	13961	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
12897	13962	"PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
12898	13963	//"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
..	..	@@ -12953,7 +14018,7 @@
12953	14018	"DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
12954	14019	"DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
12955	14020	"DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
12956		- //"MOV result.texcoord, vertex.texcoord;" +
	14021	+ //"MOV result.texcoord, vertex.fogcoord;" +
12957	14022	"MOV result.texcoord, temp;" +
12958	14023	// border fade
12959	14024	"MOV result.texcoord[3], vertex.texcoord;" +
..	..	@@ -13000,7 +14065,9 @@
13000	14065
13001	14066	//"ADD temp.z, temp.z, one;" +
13002	14067
13003		- "MOV result.color, temp;"
	14068	+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
	14069	+
	14070	+ "MOV result.color, temp;" // Normal
13004	14071	: "MOV result.color, vertex.color;") +
13005	14072	((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
13006	14073	: "") +
..	..	@@ -13140,7 +14207,7 @@
13140	14207	public void mousePressed(MouseEvent e)
13141	14208	{
13142	14209	//System.out.println("mousePressed: " + e);
13143		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	14210	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13144	14211	}
13145	14212
13146	14213	static long prevtime = 0;
..	..	@@ -13167,6 +14234,7 @@
13167	14234
13168	14235	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
13169	14236
	14237	+ if (BUTTONLESSWHEEL)
13170	14238	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
13171	14239	{
13172	14240	return;
..	..	@@ -13175,7 +14243,7 @@
13175	14243	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13176	14244
13177	14245	// TIMER
13178		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	14246	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13179	14247	{
13180	14248	keepboxmode = BOXMODE;
13181	14249	keepsupport = SUPPORT;
..	..	@@ -13215,8 +14283,8 @@
13215	14283	// mode \|= META;
13216	14284	//}
13217	14285
13218		- SetMouseMode(WHEEL \| e.getModifiersEx());
13219		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	14286	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	14287	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13220	14288	anchorX = ax;
13221	14289	anchorY = ay;
13222	14290	prevX = px;
..	..	@@ -13250,6 +14318,7 @@
13250	14318	else
13251	14319	if (evt.getSource() == AAtimer)
13252	14320	{
	14321	+ Globals.TIMERRUNNING = false;
13253	14322	if (mouseDown)
13254	14323	{
13255	14324	//new Exception().printStackTrace();
..	..	@@ -13275,6 +14344,10 @@
13275	14344	// LIVE = waslive;
13276	14345	// wasliveok = true;
13277	14346	// waslive = false;
	14347	+
	14348	+ // May 2019 Forget it:
	14349	+ if (true)
	14350	+ return;
13278	14351
13279	14352	// source == timer
13280	14353	if (mouseDown)
..	..	@@ -13305,7 +14378,7 @@
13305	14378
13306	14379	// fev 2014???
13307	14380	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13308		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14381	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13309	14382	pingthread.StepToTarget(true); // true);
13310	14383	}
13311	14384	// if (!LIVE)
..	..	@@ -13314,12 +14387,13 @@
13314	14387
13315	14388	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13316	14389
13317		- void clickStart(int x, int y, int modifiers)
	14390	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13318	14391	{
13319	14392	if (!wasliveok)
13320	14393	return;
13321	14394
13322	14395	AAtimer.restart(); //
	14396	+ Globals.TIMERRUNNING = true;
13323	14397
13324	14398	// waslive = LIVE;
13325	14399	// LIVE = false;
..	..	@@ -13331,7 +14405,7 @@
13331	14405	// touched = true; // main DL
13332	14406	if (isRenderer)
13333	14407	{
13334		- SetMouseMode(modifiers);
	14408	+ SetMouseMode(modifiers, modifiersex);
13335	14409	}
13336	14410
13337	14411	selectX = anchorX = x;
..	..	@@ -13344,7 +14418,7 @@
13344	14418	clicked = true;
13345	14419	hold = false;
13346	14420
13347		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14421	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13348	14422	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13349	14423	{
13350	14424	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13369,14 +14443,15 @@
13369	14443	drag = false;
13370	14444	//System.out.println("Mouse DOWN");
13371	14445	editObj = false;
13372		- ClickInfo info = new ClickInfo();
13373		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13374		- info.pane = this;
13375		- info.camera = renderCamera;
13376		- info.x = x;
13377		- info.y = y;
13378		- info.modifiers = modifiers;
13379		- editObj = object.doEditClick(info, 0);
	14446	+ //ClickInfo info = new ClickInfo();
	14447	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14448	+ object.clickInfo.pane = this;
	14449	+ object.clickInfo.camera = renderCamera;
	14450	+ object.clickInfo.x = x;
	14451	+ object.clickInfo.y = y;
	14452	+ object.clickInfo.modifiers = modifiersex;
	14453	+ editObj = object.doEditClick(//info,
	14454	+ 0);
13380	14455	if (!editObj)
13381	14456	{
13382	14457	hasMarquee = true;
..	..	@@ -13392,11 +14467,14 @@
13392	14467
13393	14468	public void mouseDragged(MouseEvent e)
13394	14469	{
	14470	+ Globals.MOUSEDRAGGED = true;
	14471	+
	14472	+ //System.out.println("mouseDragged: " + e);
13395	14473	if (isRenderer)
13396	14474	movingcamera = true;
	14475	+
13397	14476	//if (drawing)
13398	14477	//return;
13399		- //System.out.println("mouseDragged: " + e);
13400	14478	if ((e.getModifiersEx() & CTRL) != 0
13401	14479	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
13402	14480	{
..	..	@@ -13404,7 +14482,7 @@
13404	14482	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13405	14483	}
13406	14484	else
13407		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14485	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13408	14486
13409	14487	//try { Thread.sleep(1); } catch (Exception ex) {}
13410	14488	}
..	..	@@ -13577,6 +14655,7 @@
13577	14655
13578	14656	public void run()
13579	14657	{
	14658	+ new Exception().printStackTrace();
13580	14659	System.exit(0);
13581	14660	for (;;)
13582	14661	{
..	..	@@ -13640,7 +14719,7 @@
13640	14719	{
13641	14720	Globals.lighttouched = true;
13642	14721	}
13643		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14722	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
13644	14723	}
13645	14724	//else
13646	14725	}
..	..	@@ -13654,12 +14733,18 @@
13654	14733	void GoDown(int mod)
13655	14734	{
13656	14735	MODIFIERS \|= COMMAND;
13657		- /*
	14736	+ boolean isVR = (mouseMode&VR)!=0;
	14737	+ /**/
13658	14738	if((mod&SHIFT) == SHIFT)
13659		- manipCamera.RotatePosition(0, -speed);
	14739	+ {
	14740	+ if (isVR)
	14741	+ manipCamera.RotateInterest(0, -speed);
	14742	+ else
	14743	+ manipCamera.RotatePosition(0, -speed);
	14744	+ }
13660	14745	else
13661		- manipCamera.BackForth(0, -speed*delta, getWidth());
13662		- */
	14746	+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
	14747	+ /**/
13663	14748	if ((mod & SHIFT) == SHIFT)
13664	14749	{
13665	14750	mouseMode = mouseMode; // VR??
..	..	@@ -13668,6 +14753,8 @@
13668	14753	mouseMode \|= BACKFORTH;
13669	14754	}
13670	14755
	14756	+ targetLookAt.set(manipCamera.lookAt);
	14757	+
13671	14758	//prevX = X = anchorX;
13672	14759	prevY = Y = anchorY - (int) (renderCamera.Distance());
13673	14760	}
..	..	@@ -13675,12 +14762,19 @@
13675	14762	void GoUp(int mod)
13676	14763	{
13677	14764	MODIFIERS \|= COMMAND;
13678		- /*
	14765	+ /**/
	14766	+ boolean isVR = (mouseMode&VR)!=0;
	14767	+
13679	14768	if((mod&SHIFT) == SHIFT)
13680		- manipCamera.RotatePosition(0, speed);
	14769	+ {
	14770	+ if (isVR)
	14771	+ manipCamera.RotateInterest(0, speed);
	14772	+ else
	14773	+ manipCamera.RotatePosition(0, speed);
	14774	+ }
13681	14775	else
13682		- manipCamera.BackForth(0, speed*delta, getWidth());
13683		- */
	14776	+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
	14777	+ /**/
13684	14778	if ((mod & SHIFT) == SHIFT)
13685	14779	{
13686	14780	mouseMode = mouseMode;
..	..	@@ -13689,6 +14783,8 @@
13689	14783	mouseMode \|= BACKFORTH;
13690	14784	}
13691	14785
	14786	+ targetLookAt.set(manipCamera.lookAt);
	14787	+
13692	14788	//prevX = X = anchorX;
13693	14789	prevY = Y = anchorY + (int) (renderCamera.Distance());
13694	14790	}
..	..	@@ -13696,12 +14792,17 @@
13696	14792	void GoLeft(int mod)
13697	14793	{
13698	14794	MODIFIERS \|= COMMAND;
13699		- /*
	14795	+ /**/
13700	14796	if((mod&SHIFT) == SHIFT)
13701		- manipCamera.RotatePosition(speed, 0);
	14797	+ manipCamera.Translate(speed*delta, 0, getWidth());
13702	14798	else
13703		- manipCamera.Translate(speed*delta, 0, getWidth());
13704		- */
	14799	+ {
	14800	+ if ((mouseMode&VR)!=0)
	14801	+ manipCamera.RotateInterest(-speed, 0);
	14802	+ else
	14803	+ manipCamera.RotatePosition(speed, 0);
	14804	+ }
	14805	+ /**/
13705	14806	if ((mod & SHIFT) == SHIFT)
13706	14807	{
13707	14808	mouseMode = mouseMode;
..	..	@@ -13710,6 +14811,8 @@
13710	14811	mouseMode \|= ROTATE;
13711	14812	} // TRANSLATE;
13712	14813
	14814	+ targetLookAt.set(manipCamera.lookAt);
	14815	+
13713	14816	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
13714	14817	prevY = Y = anchorY;
13715	14818	}
..	..	@@ -13717,12 +14820,18 @@
13717	14820	void GoRight(int mod)
13718	14821	{
13719	14822	MODIFIERS \|= COMMAND;
13720		- /*
	14823	+ /**/
13721	14824	if((mod&SHIFT) == SHIFT)
13722		- manipCamera.RotatePosition(-speed, 0);
	14825	+ manipCamera.Translate(-speed*delta, 0, getWidth());
13723	14826	else
13724		- manipCamera.Translate(-speed*delta, 0, getWidth());
13725		- */
	14827	+ {
	14828	+ if ((mouseMode&VR)!=0)
	14829	+ manipCamera.RotateInterest(speed, 0);
	14830	+ else
	14831	+ manipCamera.RotatePosition(-speed, 0);
	14832	+ }
	14833	+
	14834	+ /**/
13726	14835	if ((mod & SHIFT) == SHIFT)
13727	14836	{
13728	14837	mouseMode = mouseMode;
..	..	@@ -13731,6 +14840,8 @@
13731	14840	mouseMode \|= ROTATE;
13732	14841	} // TRANSLATE;
13733	14842
	14843	+ targetLookAt.set(manipCamera.lookAt);
	14844	+
13734	14845	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
13735	14846	prevY = Y = anchorY;
13736	14847	}
..	..	@@ -13740,7 +14851,7 @@
13740	14851	int X, Y;
13741	14852	boolean SX, SY;
13742	14853
13743		- void drag(int x, int y, int modifiers)
	14854	+ void drag(int x, int y, int modifiers, int modifiersex)
13744	14855	{
13745	14856	if (IsFrozen())
13746	14857	{
..	..	@@ -13749,17 +14860,17 @@
13749	14860
13750	14861	drag = true; // NEW
13751	14862
13752		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14863	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
13753	14864
13754	14865	X = x;
13755	14866	Y = y;
13756	14867	// floating state for animation
13757		- MODIFIERS = modifiers;
13758		- modifiers &= ~1024;
	14868	+ MODIFIERS = modifiersex;
	14869	+ modifiersex &= ~1024;
13759	14870	if (false) // modifiers != 0)
13760	14871	{
13761	14872	//new Exception().printStackTrace();
13762		- System.out.println("mouseDragged: " + modifiers);
	14873	+ System.out.println("mouseDragged: " + modifiersex);
13763	14874	System.out.println("SHIFT = " + SHIFT);
13764	14875	System.out.println("CONTROL = " + COMMAND);
13765	14876	System.out.println("META = " + META);
..	..	@@ -13772,14 +14883,16 @@
13772	14883	if (editObj)
13773	14884	{
13774	14885	drag = true;
13775		- ClickInfo info = new ClickInfo();
13776		- info.bounds.setBounds(0, 0,
	14886	+ //ClickInfo info = new ClickInfo();
	14887	+ object.clickInfo.bounds.setBounds(0, 0,
13777	14888	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13778		- info.pane = this;
13779		- info.camera = renderCamera;
13780		- info.x = x;
13781		- info.y = y;
13782		- object.editWindow.copy.doEditDrag(info);
	14889	+ object.clickInfo.pane = this;
	14890	+ object.clickInfo.camera = renderCamera;
	14891	+ object.clickInfo.x = x;
	14892	+ object.clickInfo.y = y;
	14893	+ object //.GetWindow().copy
	14894	+ .doEditDrag(//info,
	14895	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
13783	14896	} else
13784	14897	{
13785	14898	if (x < startX)
..	..	@@ -13928,23 +15041,27 @@
13928	15041	}
13929	15042	}
13930	15043
	15044	+// ClickInfo clickInfo = new ClickInfo();
	15045	+
13931	15046	public void mouseMoved(MouseEvent e)
13932	15047	{
13933	15048	//System.out.println("mouseMoved: " + e);
13934		-
13935	15049	if (isRenderer)
13936	15050	return;
13937	15051
13938		- ClickInfo ci = new ClickInfo();
13939		- ci.x = e.getX();
13940		- ci.y = e.getY();
13941		- ci.modifiers = e.getModifiersEx();
13942		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13943		- ci.pane = this;
13944		- ci.camera = renderCamera;
	15052	+ // Mouse cursor feedback
	15053	+ object.clickInfo.x = e.getX();
	15054	+ object.clickInfo.y = e.getY();
	15055	+ object.clickInfo.modifiers = e.getModifiersEx();
	15056	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	15057	+ object.clickInfo.pane = this;
	15058	+ object.clickInfo.camera = renderCamera;
13945	15059	if (!isRenderer)
13946	15060	{
13947		- if (object.editWindow.copy.doEditClick(ci, 0))
	15061	+ //ObjEditor editWindow = object.editWindow;
	15062	+ //Object3D copy = editWindow.copy;
	15063	+ if (object.doEditClick(//clickInfo,
	15064	+ 0))
13948	15065	{
13949	15066	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
13950	15067	} else
..	..	@@ -13956,7 +15073,11 @@
13956	15073
13957	15074	public void mouseReleased(MouseEvent e)
13958	15075	{
	15076	+ Globals.MOUSEDRAGGED = false;
	15077	+
13959	15078	movingcamera = false;
	15079	+ X = 0; // getBounds().width/2;
	15080	+ Y = 0; // getBounds().height/2;
13960	15081	//System.out.println("mouseReleased: " + e);
13961	15082	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13962	15083	}
..	..	@@ -13979,9 +15100,9 @@
13979	15100	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
13980	15101	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
13981	15102
13982		- if (control \|\| command \|\| IsFrozen())
	15103	+// No delay if (control \|\| command \|\| IsFrozen())
13983	15104	timeout = true;
13984		- else
	15105	+// ?? May 2019 else
13985	15106	// timer.setDelay((modifiers & 128) != 0?0:350);
13986	15107	mouseDown = false;
13987	15108	if (!control && !command) // june 2013
..	..	@@ -14091,7 +15212,7 @@
14091	15212	System.out.println("keyReleased: " + e);
14092	15213	}
14093	15214
14094		- void SetMouseMode(int modifiers)
	15215	+ void SetMouseMode(int modifiers, int modifiersex)
14095	15216	{
14096	15217	//System.out.println("SetMouseMode = " + modifiers);
14097	15218	//modifiers &= ~1024;
..	..	@@ -14103,25 +15224,25 @@
14103	15224	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14104	15225	// return;
14105	15226	//System.out.println("SetMode = " + modifiers);
14106		- if ((modifiers & WHEEL) == WHEEL)
	15227	+ if ((modifiersex & WHEEL) == WHEEL)
14107	15228	{
14108	15229	mouseMode \|= ZOOM;
14109	15230	}
14110	15231
14111	15232	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14112		- if (capsLocked \|\| (modifiers & META) == META)
	15233	+ if (capsLocked) // \|\| (modifiers & META) == META)
14113	15234	{
14114	15235	mouseMode \|= VR; // BACKFORTH;
14115	15236	}
14116		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	15237	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14117	15238	{
14118	15239	mouseMode \|= SELECT;
14119	15240	}
14120		- if ((modifiers & COMMAND) == COMMAND)
	15241	+ if ((modifiersex & COMMAND) == COMMAND)
14121	15242	{
14122	15243	mouseMode \|= SELECT;
14123	15244	}
14124		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	15245	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14125	15246	{
14126	15247	mouseMode &= ~VR;
14127	15248	mouseMode \|= TRANSLATE;
..	..	@@ -14150,10 +15271,10 @@
14150	15271
14151	15272	if (isRenderer) //
14152	15273	{
14153		- SetMouseMode(modifiers);
	15274	+ SetMouseMode(0, modifiers);
14154	15275	}
14155	15276
14156		- theRenderer.keyPressed(key);
	15277	+ Globals.theRenderer.keyPressed(key);
14157	15278	}
14158	15279
14159	15280	int kompactbit = 4; // power bit
..	..	@@ -14165,7 +15286,7 @@
14165	15286	float SATPOW = 1; // 2; // 0.5f;
14166	15287	float BRIPOW = 1; // 0.5f; // 0.5f;
14167	15288
14168		- void keyPressed(int key)
	15289	+ public void keyPressed(int key)
14169	15290	{
14170	15291	if (key >= '0' && key <= '5')
14171	15292	clampbit = (key-'0');
..	..	@@ -14212,7 +15333,8 @@
14212	15333	// break;
14213	15334	case 'T':
14214	15335	CACHETEXTURE ^= true;
14215		- textures.clear();
	15336	+ texturepigment.clear();
	15337	+ texturebump.clear();
14216	15338	// repaint();
14217	15339	break;
14218	15340	case 'Y':
..	..	@@ -14222,8 +15344,8 @@
14222	15344	case 'K':
14223	15345	KOMPACTTEXTURE ^= true;
14224	15346	//textures.clear();
14225		- break;
14226		- case 'P': // Texture Projection macros
	15347	+ // break;
	15348	+ //case 'P': // Texture Projection macros
14227	15349	// SAVETEXTURE ^= true;
14228	15350	macromode = true;
14229	15351	Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
..	..	@@ -14297,7 +15419,9 @@
14297	15419	case 'E' : COMPACT ^= true;
14298	15420	repaint();
14299	15421	break;
14300		- case 'W' : DEBUGHSB ^= true;
	15422	+ case 'W' : // Wide Window (fullscreen)
	15423	+ //DEBUGHSB ^= true;
	15424	+ ObjEditor.theFrame.ToggleFullScreen();
14301	15425	repaint();
14302	15426	break;
14303	15427	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14322,8 +15446,8 @@
14322	15446	RevertCamera();
14323	15447	repaint();
14324	15448	break;
14325		- case 'L':
14326	15449	case 'l':
	15450	+ //case 'L':
14327	15451	if (lightMode)
14328	15452	{
14329	15453	lightMode = false;
..	..	@@ -14342,7 +15466,7 @@
14342	15466	targetLookAt.set(manipCamera.lookAt);
14343	15467	repaint();
14344	15468	break;
14345		- case 'p':
	15469	+ case 'P': // p':
14346	15470	// c'est quoi ca au juste? spherical ^= true;
14347	15471	Skinshader ^= true; programInitialized = false;
14348	15472	repaint();
..	..	@@ -14387,20 +15511,24 @@
14387	15511	OCCLUSION_CULLING ^= true;
14388	15512	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14389	15513	break;
14390		- case '0': envyoff ^= true; repaint(); break;
	15514	+ //case '0': envyoff ^= true; repaint(); break;
14391	15515	case '1':
14392	15516	case '2':
14393	15517	case '3':
14394	15518	case '4':
14395	15519	case '5':
14396		- newenvy = Character.getNumericValue(key);
14397		- repaint();
14398		- break;
14399	15520	case '6':
14400	15521	case '7':
14401	15522	case '8':
14402	15523	case '9':
14403		- BGcolor = (key - '6')/3.f;
	15524	+ if (true) // envyoff)
	15525	+ {
	15526	+ BGcolor = (key - '1')/8.f;
	15527	+ }
	15528	+ else
	15529	+ {
	15530	+ //newenvy = Character.getNumericValue(key);
	15531	+ }
14404	15532	repaint();
14405	15533	break;
14406	15534	case '!':
..	..	@@ -14466,9 +15594,9 @@
14466	15594	case '_':
14467	15595	kompactbit = 5;
14468	15596	break;
14469		- case '+':
14470		- kompactbit = 6;
14471		- break;
	15597	+// case '+':
	15598	+// kompactbit = 6;
	15599	+// break;
14472	15600	case ' ':
14473	15601	lightMode ^= true;
14474	15602	Globals.lighttouched = true;
..	..	@@ -14480,13 +15608,14 @@
14480	15608	case ESC:
14481	15609	RENDERPROGRAM += 1;
14482	15610	RENDERPROGRAM %= 3;
	15611	+
14483	15612	repaint();
14484	15613	break;
14485	15614	case 'Z':
14486	15615	//RESIZETEXTURE ^= true;
14487	15616	//break;
14488	15617	case 'z':
14489		- RENDERSHADOW ^= true;
	15618	+ Globals.RENDERSHADOW ^= true;
14490	15619	Globals.lighttouched = true;
14491	15620	repaint();
14492	15621	break;
..	..	@@ -14519,8 +15648,9 @@
14519	15648	case DELETE:
14520	15649	ClearSelection();
14521	15650	break;
14522		- /*
14523	15651	case '+':
	15652	+
	15653	+ /*
14524	15654	//fontsize += 1;
14525	15655	bbzoom *= 2;
14526	15656	repaint();
..	..	@@ -14537,17 +15667,17 @@
14537	15667	case '=':
14538	15668	IncDepth();
14539	15669	//fontsize += 1;
14540		- object.editWindow.refreshContents(true);
	15670	+ object.GetWindow().refreshContents(true);
14541	15671	maskbit = 6;
14542	15672	break;
14543	15673	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14544	15674	DecDepth();
14545	15675	maskbit = 5;
14546	15676	//if(fontsize > 1) fontsize -= 1;
14547		- if (object.editWindow == null)
14548		- new Exception().printStackTrace();
14549		- else
14550		- object.editWindow.refreshContents(true);
	15677	+// if (object.editWindow == null)
	15678	+// new Exception().printStackTrace();
	15679	+// else
	15680	+ object.GetWindow().refreshContents(true);
14551	15681	break;
14552	15682	case '{':
14553	15683	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14602,6 +15732,7 @@
14602	15732	}
14603	15733	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
14604	15734	}
	15735	+
14605	15736	static double OCCLUSIONBOOST = 1; // 0.5;
14606	15737
14607	15738	void keyReleased(int key, int modifiers)
..	..	@@ -14609,11 +15740,11 @@
14609	15740	//mode = ROTATE;
14610	15741	if ((MODIFIERS & COMMAND) == 0) // VR??
14611	15742	{
14612		- SetMouseMode(modifiers);
	15743	+ SetMouseMode(0, modifiers);
14613	15744	}
14614	15745	}
14615	15746
14616		- protected void processKeyEvent(KeyEvent e)
	15747	+ public void processKeyEvent(KeyEvent e)
14617	15748	{
14618	15749	switch (e.getID())
14619	15750	{
..	..	@@ -14743,8 +15874,9 @@
14743	15874
14744	15875	protected void processMouseMotionEvent(MouseEvent e)
14745	15876	{
14746		- //System.out.println("processMouseMotionEvent: " + mouseMode);
14747		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15877	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15878	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15879	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
14748	15880	{
14749	15881	mouseMoved(e);
14750	15882	} else
..	..	@@ -14769,11 +15901,12 @@
14769	15901	}
14770	15902	*/
14771	15903
14772		- object.editWindow.EditSelection();
	15904	+ object.GetWindow().EditSelection(false);
14773	15905	}
14774	15906
14775	15907	void SelectParent()
14776	15908	{
	15909	+ new Exception().printStackTrace();
14777	15910	System.exit(0);
14778	15911	Composite group = (Composite) object;
14779	15912	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -14785,10 +15918,10 @@
14785	15918	{
14786	15919	//selectees.remove(i);
14787	15920	System.out.println("select parent of " + elem);
14788		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15921	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
14789	15922	} else
14790	15923	{
14791		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15924	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
14792	15925	}
14793	15926
14794	15927	first = false;
..	..	@@ -14797,6 +15930,7 @@
14797	15930
14798	15931	void SelectChildren()
14799	15932	{
	15933	+ new Exception().printStackTrace();
14800	15934	System.exit(0);
14801	15935	/*
14802	15936	Composite group = (Composite) object;
..	..	@@ -14829,12 +15963,12 @@
14829	15963	for (int j = 0; j < group.children.size(); j++)
14830	15964	{
14831	15965	elem = (Object3D) group.children.elementAt(j);
14832		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15966	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
14833	15967	first = false;
14834	15968	}
14835	15969	} else
14836	15970	{
14837		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15971	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
14838	15972	}
14839	15973
14840	15974	first = false;
..	..	@@ -14845,21 +15979,21 @@
14845	15979	{
14846	15980	//Composite group = (Composite) object;
14847	15981	Object3D group = object;
14848		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15982	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
14849	15983	}
14850	15984
14851	15985	void ResetTransform(int mask)
14852	15986	{
14853	15987	//Composite group = (Composite) object;
14854	15988	Object3D group = object;
14855		- group.editWindow.ResetTransform(mask);
	15989	+ group.GetWindow().ResetTransform(mask);
14856	15990	}
14857	15991
14858	15992	void FlipTransform()
14859	15993	{
14860	15994	//Composite group = (Composite) object;
14861	15995	Object3D group = object;
14862		- group.editWindow.FlipTransform();
	15996	+ group.GetWindow().FlipTransform();
14863	15997	// group.editWindow.ReduceMesh(true);
14864	15998	}
14865	15999
..	..	@@ -14867,7 +16001,7 @@
14867	16001	{
14868	16002	//Composite group = (Composite) object;
14869	16003	Object3D group = object;
14870		- group.editWindow.PrintMemory();
	16004	+ group.GetWindow().PrintMemory();
14871	16005	// group.editWindow.ReduceMesh(true);
14872	16006	}
14873	16007
..	..	@@ -14875,7 +16009,7 @@
14875	16009	{
14876	16010	//Composite group = (Composite) object;
14877	16011	Object3D group = object;
14878		- group.editWindow.ResetCentroid();
	16012	+ group.GetWindow().ResetCentroid();
14879	16013	}
14880	16014
14881	16015	void IncDepth()
..	..	@@ -14957,11 +16091,11 @@
14957	16091
14958	16092	int width = getBounds().width;
14959	16093	int height = getBounds().height;
14960		- ClickInfo info = new ClickInfo();
14961		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
14962	16094	//Image img = CreateImage(width, height);
14963	16095	//System.out.println("width = " + width + "; height = " + height + "\n");
	16096	+
14964	16097	Graphics gr = g; // img.getGraphics();
	16098	+
14965	16099	if (!hasMarquee)
14966	16100	{
14967	16101	if (Xmin < Xmax) // !locked)
..	..	@@ -15033,44 +16167,92 @@
15033	16167	}
15034	16168	if (object != null && !hasMarquee)
15035	16169	{
	16170	+ if (object.clickInfo == null)
	16171	+ object.clickInfo = new ClickInfo();
	16172	+ ClickInfo info = object.clickInfo;
	16173	+ //ClickInfo info = new ClickInfo();
	16174	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16175	+
15036	16176	if (isRenderer)
15037	16177	{
15038		- info.flags++;
	16178	+ object.clickInfo.flags++;
15039	16179	double frameAspect = (double) width / (double) height;
15040	16180	if (frameAspect > renderCamera.aspect)
15041	16181	{
15042	16182	int desired = (int) ((double) height * renderCamera.aspect);
15043		- info.bounds.width -= width - desired;
15044		- info.bounds.x += (width - desired) / 2;
	16183	+ object.clickInfo.bounds.width -= width - desired;
	16184	+ object.clickInfo.bounds.x += (width - desired) / 2;
15045	16185	} else
15046	16186	{
15047	16187	int desired = (int) ((double) width / renderCamera.aspect);
15048		- info.bounds.height -= height - desired;
15049		- info.bounds.y += (height - desired) / 2;
	16188	+ object.clickInfo.bounds.height -= height - desired;
	16189	+ object.clickInfo.bounds.y += (height - desired) / 2;
15050	16190	}
15051	16191	}
15052		- info.g = gr;
15053		- info.camera = renderCamera;
	16192	+
	16193	+ object.clickInfo.g = gr;
	16194	+ object.clickInfo.camera = renderCamera;
15054	16195	/*
15055	16196	// Memory intensive (brep.verticescopy)
15056	16197	if (!(object instanceof Composite))
15057	16198	object.draw(info, 0, false); // SLOW :
15058	16199	*/
15059		- if (!isRenderer)
	16200	+ if (!isRenderer) // && drag)
15060	16201	{
15061		- object.drawEditHandles(info, 0);
	16202	+ Grafreed.Assert(object != null);
	16203	+ Grafreed.Assert(object.selection != null);
	16204	+ if (object.selection.Size() > 0)
	16205	+ {
	16206	+ int hitSomething = object.selection.get(0).hitSomething;
	16207	+
	16208	+ object.clickInfo.DX = 0;
	16209	+ object.clickInfo.DY = 0;
	16210	+ object.clickInfo.W = 1;
	16211	+ if (hitSomething == Object3D.hitCenter)
	16212	+ {
	16213	+ info.DX = X;
	16214	+ if (X != 0)
	16215	+ info.DX -= info.bounds.width/2;
	16216	+
	16217	+ info.DY = Y;
	16218	+ if (Y != 0)
	16219	+ info.DY -= info.bounds.height/2;
	16220	+ }
	16221	+
	16222	+ object.drawEditHandles(//info,
	16223	+ 0);
	16224	+
	16225	+ if (drag && (X != 0 \|\| Y != 0))
	16226	+ {
	16227	+ switch (hitSomething)
	16228	+ {
	16229	+ case Object3D.hitCenter: gr.setColor(Color.white);
	16230	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16231	+ break;
	16232	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16233	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16234	+ break;
	16235	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16236	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16237	+ break;
	16238	+ }
	16239	+
	16240	+ }
	16241	+ }
15062	16242	}
15063	16243	}
	16244	+
15064	16245	if (isRenderer)
15065	16246	{
15066	16247	//gr.setColor(Color.black);
15067	16248	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15068	16249	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15069	16250	}
	16251	+
15070	16252	if (hasMarquee)
15071	16253	{
15072	16254	gr.setXORMode(Color.white);
15073		- gr.setColor(Color.red);
	16255	+ gr.setColor(Color.white);
15074	16256	if (!firstime)
15075	16257	{
15076	16258	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -15179,6 +16361,7 @@
15179	16361	public boolean mouseDown(Event evt, int x, int y)
15180	16362	{
15181	16363	System.out.println("mouseDown: " + evt);
	16364	+ System.exit(0);
15182	16365	/*
15183	16366	locked = true;
15184	16367	drag = false;
..	..	@@ -15222,7 +16405,7 @@
15222	16405	{
15223	16406	keyPressed(0, modifiers);
15224	16407	}
15225		- clickStart(x, y, modifiers);
	16408	+ // clickStart(x, y, modifiers);
15226	16409	return true;
15227	16410	}
15228	16411
..	..	@@ -15340,7 +16523,7 @@
15340	16523	{
15341	16524	keyReleased(0, 0);
15342	16525	}
15343		- drag(x, y, modifiers);
	16526	+ drag(x, y, 0, modifiers);
15344	16527	return true;
15345	16528	}
15346	16529
..	..	@@ -15472,7 +16655,7 @@
15472	16655	Object3D object;
15473	16656	static Object3D trackedobject;
15474	16657	Camera renderCamera; // Light or Eye (or Occlusion)
15475		- /static/ Camera manipCamera; // Light or Eye
	16658	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15476	16659	/static/ Camera eyeCamera;
15477	16660	/static/ Camera lightCamera;
15478	16661	int cameracount;
..	..	@@ -15536,6 +16719,8 @@
15536	16719	private /static/ boolean firstime;
15537	16720	private /static/ cVector newView = new cVector();
15538	16721	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16722	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16723	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
15539	16724	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
15540	16725	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
15541	16726	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -15548,29 +16733,67 @@
15548	16733	{
15549	16734	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
15550	16735
	16736	+ int usedsuf = 0;
	16737	+
15551	16738	for (int i = 0; i < suffixes.length; i++)
15552	16739	{
15553		- String resourceName = basename + suffixes[i] + "." + suffix;
15554		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
15555		- mipmapped,
15556		- FileUtil.getFileSuffix(resourceName));
15557		- if (data == null)
	16740	+ String[] suffixe = suffixes;
	16741	+ String[] fallback = suffixes2;
	16742	+ String[] fallfallback = suffixes3;
	16743	+
	16744	+ for (int c=usedsuf; --c>=0;)
15558	16745	{
15559		- throw new IOException("Unable to load texture " + resourceName);
	16746	+// String[] temp = suffixe;
	16747	+// suffixe = fallback;
	16748	+// fallback = fallfallback;
	16749	+// fallfallback = temp;
15560	16750	}
	16751	+
	16752	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16753	+ TextureData data;
	16754	+
	16755	+ try
	16756	+ {
	16757	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16758	+ mipmapped,
	16759	+ FileUtil.getFileSuffix(resourceName));
	16760	+ }
	16761	+ catch (Exception e)
	16762	+ {
	16763	+ try
	16764	+ {
	16765	+ resourceName = basename + fallback[i] + "." + suffix;
	16766	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16767	+ mipmapped,
	16768	+ FileUtil.getFileSuffix(resourceName));
	16769	+ }
	16770	+ catch (Exception e2)
	16771	+ {
	16772	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16773	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16774	+ mipmapped,
	16775	+ FileUtil.getFileSuffix(resourceName));
	16776	+ }
	16777	+ }
	16778	+
15561	16779	//System.out.println("Target = " + targets[i]);
15562	16780	cubemap.updateImage(data, targets[i]);
15563	16781	}
15564	16782
15565	16783	return cubemap;
15566	16784	}
	16785	+
15567	16786	int bigsphere = -1;
15568	16787
15569	16788	float BGcolor = 0.5f;
15570	16789
15571		- private void DrawSkyBox(GL gl)
	16790	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16791	+
	16792	+ private void DrawSkyBox(GL gl, float ratio)
15572	16793	{
15573		- if (envyoff \|\| cubemap == null)
	16794	+ if (//envyoff \|\|
	16795	+ WIREFRAME \|\|
	16796	+ cubemap == null)
15574	16797	{
15575	16798	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
15576	16799	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -15585,7 +16808,17 @@
15585	16808	// Compensates for ExaminerViewer's modification of modelview matrix
15586	16809	gl.glMatrixMode(GL.GL_MODELVIEW);
15587	16810	gl.glLoadIdentity();
	16811	+ gl.glScalef(1,ratio,1);
15588	16812
	16813	+// colorV[0] = 2;
	16814	+// colorV[1] = 2;
	16815	+// colorV[2] = 2;
	16816	+// colorV[3] = 1;
	16817	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16818	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16819	+//
	16820	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16821	+
15589	16822	//gl.glActiveTexture(GL.GL_TEXTURE1);
15590	16823	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
15591	16824
..	..	@@ -15617,6 +16850,7 @@
15617	16850	{
15618	16851	gl.glScalef(1.0f, -1.0f, 1.0f);
15619	16852	}
	16853	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
15620	16854	gl.glMultMatrixd(viewrot_1, 0);
15621	16855	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
15622	16856	//viewer.updateInverseRotation(gl);
..	..	@@ -15657,7 +16891,8 @@
15657	16891	gl.glDisable(GL.GL_TEXTURE_GEN_R);
15658	16892
15659	16893	cubemap.disable();
15660		- ////cubemap.unbind();
	16894	+ //cubemap.dispose();
	16895	+
15661	16896	if (CULLFACE)
15662	16897	{
15663	16898	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -15713,7 +16948,7 @@
15713	16948	gl.glScalef(1.0f, -1.0f, 1.0f);
15714	16949	}
15715	16950
15716		- gl.glNormal3f(0.0f, 0.0f, 1.0f);
	16951	+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
15717	16952
15718	16953	float step = 2; // 0.1666f; //0.25f;
15719	16954	float stepv = 2; // step * 1652 / 998;
..	..	@@ -15757,16 +16992,16 @@
15757	16992	cStatic.objectstack[materialdepth++] = checker;
15758	16993	//System.out.println("material " + material);
15759	16994	//Applet3D.tracein(this, selected);
15760		- vector2buffer = checker.projectedVertices;
	16995	+ //vector2buffer = checker.projectedVertices;
15761	16996
15762	16997	//checker.GetMaterial().Draw(this, false); // true);
15763		- DrawMaterial(checker.GetMaterial(), false); // true);
	16998	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
15764	16999
15765	17000	materialdepth -= 1;
15766	17001	if (materialdepth > 0)
15767	17002	{
15768		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
15769		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	17003	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	17004	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
15770	17005	}
15771	17006	//checker.GetMaterial().opacity = 1f;
15772	17007	////checker.GetMaterial().ambient = 1f;
..	..	@@ -15852,6 +17087,14 @@
15852	17087	}
15853	17088	}
15854	17089
	17090	+ private Object3D GetFolder()
	17091	+ {
	17092	+ Object3D folder = object.GetWindow().copy;
	17093	+ if (object.GetWindow().copy.selection.Size() > 0)
	17094	+ folder = object.GetWindow().copy.selection.elementAt(0);
	17095	+ return folder;
	17096	+ }
	17097	+
15855	17098	class SelectBuffer implements GLEventListener
15856	17099	{
15857	17100
..	..	@@ -15867,7 +17110,7 @@
15867	17110	//new Exception().printStackTrace();
15868	17111	System.out.println("select buffer init");
15869	17112	// Use debug pipeline
15870		- drawable.setGL(new DebugGL(drawable.getGL()));
	17113	+ //drawable.setGL(new DebugGL(drawable.getGL()));
15871	17114
15872	17115	GL gl = drawable.getGL();
15873	17116
..	..	@@ -15910,6 +17153,7 @@
15910	17153	{
15911	17154	if (!selection)
15912	17155	{
	17156	+ new Exception().printStackTrace();
15913	17157	System.exit(0);
15914	17158	return;
15915	17159	}
..	..	@@ -15930,6 +17174,17 @@
15930	17174
15931	17175	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
15932	17176
	17177	+ if (PAINTMODE)
	17178	+ {
	17179	+ if (object.GetWindow().copy.selection.Size() > 0)
	17180	+ {
	17181	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17182	+
	17183	+ // Make what you paint not selectable.
	17184	+ paintobj.ResetSelectable();
	17185	+ }
	17186	+ }
	17187	+
15933	17188	//int tmp = selection_view;
15934	17189	//selection_view = -1;
15935	17190	int temp = DrawMode();
..	..	@@ -15941,6 +17196,17 @@
15941	17196	// temp = DEFAULT; // patch for selection debug
15942	17197	Globals.drawMode = temp; // WARNING
15943	17198
	17199	+ if (PAINTMODE)
	17200	+ {
	17201	+ if (object.GetWindow().copy.selection.Size() > 0)
	17202	+ {
	17203	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17204	+
	17205	+ // Revert.
	17206	+ paintobj.RestoreSelectable();
	17207	+ }
	17208	+ }
	17209	+
15944	17210	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
15945	17211
15946	17212	// trying different ways of getting the depth info over
..	..	@@ -15988,6 +17254,8 @@
15988	17254	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
15989	17255	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
15990	17256	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17257	+
	17258	+ CreateSelectedPoint();
15991	17259
15992	17260	// Will fit the mesh !!!
15993	17261	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16037,34 +17305,36 @@
16037	17305	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]));
16038	17306	}
16039	17307
16040		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	17308	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16041	17309	}
16042	17310	}
16043	17311
16044	17312	if (!movingcamera && !PAINTMODE)
16045		- object.editWindow.ScreenFitPoint(); // fev 2014
	17313	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16046	17314
16047		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17315	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16048	17316	{
16049		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17317	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16050	17318
16051		- Object3D group = new Object3D("inst" + paintcount++);
	17319	+ if (object.GetWindow().copy.selection.Size() > 0)
	17320	+ {
	17321	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16052	17322
16053		- group.CreateMaterial(); // use a void leaf to select instances
16054		-
16055		- group.add(paintobj); // link
16056		-
16057		- object.editWindow.SnapObject(group);
16058		-
16059		- Object3D folder = object.editWindow.copy;
16060		-
16061		- if (object.editWindow.copy.selection.Size() > 0)
16062		- folder = object.editWindow.copy.selection.elementAt(0);
16063		-
16064		- folder.add(group);
16065		-
16066		- object.editWindow.ResetModel();
16067		- object.editWindow.refreshContents();
	17323	+ Object3D inst = new Object3D("inst" + paintcount++);
	17324	+
	17325	+ inst.CreateMaterial(); // use a void leaf to select instances
	17326	+
	17327	+ inst.add(paintobj); // link
	17328	+
	17329	+ object.GetWindow().SnapObject(inst);
	17330	+
	17331	+ Object3D folder = paintFolder; // GetFolder();
	17332	+
	17333	+ folder.add(inst);
	17334	+
	17335	+ object.GetWindow().ResetModel();
	17336	+ object.GetWindow().refreshContents();
	17337	+ }
16068	17338	}
16069	17339	else
16070	17340	paintcount = 0;
..	..	@@ -16103,6 +17373,11 @@
16103	17373	//System.out.println("objects[color] = " + objects[color]);
16104	17374	//objects[color].Select();
16105	17375	indexcount = 0;
	17376	+ ObjEditor window = object.GetWindow();
	17377	+ if (window != null && deselect)
	17378	+ {
	17379	+ window.Select(null, deselect, true);
	17380	+ }
16106	17381	object.Select(color, deselect);
16107	17382	}
16108	17383
..	..	@@ -16153,6 +17428,7 @@
16153	17428
16154	17429	public void init(GLAutoDrawable drawable)
16155	17430	{
	17431	+ if (Globals.DEBUG)
16156	17432	System.out.println("shadow buffer init");
16157	17433
16158	17434	GL gl = drawable.getGL();
..	..	@@ -16202,7 +17478,7 @@
16202	17478	gl.glDisable(gl.GL_CULL_FACE);
16203	17479	}
16204	17480
16205		- if (!RENDERSHADOW)
	17481	+ if (!Globals.RENDERSHADOW)
16206	17482	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16207	17483
16208	17484	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16212,7 +17488,7 @@
16212	17488	//gl.glColorMask(false, false, false, false);
16213	17489
16214	17490	//render_scene_from_light_view(gl, drawable, 0, 0);
16215		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17491	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16216	17492	{
16217	17493	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16218	17494
..	..	@@ -16381,10 +17657,14 @@
16381	17657	gl.glFlush();
16382	17658
16383	17659	/**/
16384		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
	17660	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
16385	17661
16386		- float[] pixels = occlusionsizebuffer.array();
	17662	+ float[] depths = occlusiondepthbuffer.array();
16387	17663
	17664	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
	17665	+
	17666	+ int[] pixels = selectsizebuffer.array();
	17667	+
16388	17668	double r = 0, g = 0, b = 0;
16389	17669
16390	17670	double count = 0;
..	..	@@ -16395,7 +17675,7 @@
16395	17675
16396	17676	double FACTOR = 1;
16397	17677
16398		- for (int i = 0; i < pixels.length; i++)
	17678	+ for (int i = 0; i < depths.length; i++)
16399	17679	{
16400	17680	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
16401	17681	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -16478,7 +17758,7 @@
16478	17758
16479	17759	double scale = ray.z; // 1; // cos
16480	17760
16481		- float depth = pixels[newindex];
	17761	+ float depth = depths[newindex];
16482	17762
16483	17763	/*
16484	17764	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -16628,23 +17908,15 @@
16628	17908	int AAbuffersize = 0;
16629	17909
16630	17910	//double[] selectedpoint = new double[3];
16631		- static Superellipsoid selectedpoint = new Superellipsoid();
	17911	+ static Superellipsoid selectedpoint;
16632	17912	static Sphere previousselectedpoint = null;
16633		- static Sphere debugpointG = new Sphere();
16634		- static Sphere debugpointP = new Sphere();
16635		- static Sphere debugpointC = new Sphere();
16636		- static Sphere debugpointR = new Sphere();
	17913	+ static Sphere debugpointG;
	17914	+ static Sphere debugpointP;
	17915	+ static Sphere debugpointC;
	17916	+ static Sphere debugpointR;
16637	17917
16638	17918	static Sphere debugpoints[] = new Sphere[8];
16639	17919
16640		- static
16641		- {
16642		- for (int i=0; i<8; i++)
16643		- {
16644		- debugpoints[i] = new Sphere();
16645		- }
16646		- }
16647		-
16648	17920	static void InitPoints(float radius)
16649	17921	{
16650	17922	for (int i=0; i<8; i++)
..	..	@@ -16683,11 +17955,14 @@
16683	17955	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
16684	17956	static IntBuffer bigAAbuffer;
16685	17957	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
16686		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	17958	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
16687	17959	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
16688	17960	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
16689	17961	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
16690		- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17962	+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17963	+
	17964	+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17965	+
16691	17966	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
16692	17967	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
16693	17968	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();
..	..	@@ -16696,10 +17971,11 @@
16696	17971	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
16697	17972	// Depth buffer format
16698	17973	//private int depth_format;
16699		- static public void NextIndex(Object3D o, GL gl)
	17974	+
	17975	+ public void NextIndex()
16700	17976	{
16701	17977	indexcount+=16;
16702		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17978	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
16703	17979	//objects[indexcount] = o;
16704	17980	//System.out.println("indexcount = " + indexcount);
16705	17981	}