~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
..	..	@@ -148,6 +188,21 @@
148	188	defaultcaps.setAccumGreenBits(16);
149	189	defaultcaps.setAccumBlueBits(16);
150	190	defaultcaps.setAccumAlphaBits(16);
	191	+ }
	192	+
	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	+ }
151	206	}
152	207
153	208	void SetAsGLRenderer(boolean b)
..	..	@@ -168,7 +223,8 @@
168	223
169	224	SetCamera(cam);
170	225
171		- SetLight(new Camera(new cVector(10, 10, -20)));
	226	+ // Warning: not used.
	227	+ SetLight(new Camera(new cVector(15, 10, -20)));
172	228
173	229	object = o;
174	230
..	..	@@ -223,6 +279,11 @@
223	279	public boolean IsBoxMode()
224	280	{
225	281	return BOXMODE;
	282	+ }
	283	+
	284	+ public boolean IsZoomBoxMode()
	285	+ {
	286	+ return ZOOMBOXMODE;
226	287	}
227	288
228	289	public void ClearDepth()
..	..	@@ -320,7 +381,7 @@
320	381	cStatic.objectstack[materialdepth++] = obj;
321	382	//System.out.println("material " + material);
322	383	//Applet3D.tracein(this, selected);
323		- display.vector2buffer = obj.projectedVertices;
	384	+ //display.vector2buffer = obj.projectedVertices;
324	385	if (obj instanceof Camera)
325	386	{
326	387	display.options1[0] = material.shift;
..	..	@@ -329,14 +390,28 @@
329	390	display.options1[2] = material.shadowbias;
330	391	display.options1[3] = material.aniso;
331	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]);
332	398	display.options2[0] = material.opacity;
333	399	display.options2[1] = material.diffuse;
334	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]);
335	404
336	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]);
337	409	display.options4[0] = material.cameralight/0.2f;
338	410	display.options4[1] = material.subsurface;
339	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]);
340	415
341	416	// if (display.CURRENTANTIALIAS > 0)
342	417	// display.options3[3] /= 4;
..	..	@@ -352,7 +427,7 @@
352	427	/**/
353	428	} else
354	429	{
355		- DrawMaterial(material, selected);
	430	+ DrawMaterial(material, selected, obj.projectedVertices);
356	431	}
357	432	} else
358	433	{
..	..	@@ -376,8 +451,8 @@
376	451	cStatic.objectstack[materialdepth++] = obj;
377	452	//System.out.println("material " + material);
378	453	//Applet3D.tracein("selected ", selected);
379		- display.vector2buffer = obj.projectedVertices;
380		- display.DrawMaterial(material, selected);
	454	+ //display.vector2buffer = obj.projectedVertices;
	455	+ display.DrawMaterial(material, selected, obj.projectedVertices);
381	456	}
382	457	}
383	458
..	..	@@ -394,8 +469,8 @@
394	469	materialdepth -= 1;
395	470	if (materialdepth > 0)
396	471	{
397		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
398		- 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);
399	474	}
400	475	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
401	476	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -415,8 +490,8 @@
415	490	materialdepth -= 1;
416	491	if (materialdepth > 0)
417	492	{
418		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
419		- 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);
420	495	}
421	496	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
422	497	//else
..	..	@@ -457,15 +532,18 @@
457	532	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
458	533	{
459	534	//gl.glBegin(gl.GL_TRIANGLES);
460		- 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	+ ;
461	538	if (!hasnorm)
462	539	{
463		- // System.out.println("FUCK!!");
	540	+ // System.out.println("Mesh normal");
464	541	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
465	542	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
466	543	LA.vecCross(obj.v0, obj.v1, obj.v2);
467	544	LA.vecNormalize(obj.v2);
468		- 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);
469	547	}
470	548
471	549	// P
..	..	@@ -487,7 +565,7 @@
487	565	y += ny * obj.NORMALPUSH;
488	566	z += nz * obj.NORMALPUSH;
489	567
490		- gl.glNormal3f(nx, ny, nz);
	568	+ SetGLNormal(gl, nx, ny, nz);
491	569	}
492	570	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
493	571	SetColor(obj, pv);
..	..	@@ -519,7 +597,7 @@
519	597	y += ny * obj.NORMALPUSH;
520	598	z += nz * obj.NORMALPUSH;
521	599
522		- gl.glNormal3f(nx, ny, nz);
	600	+ SetGLNormal(gl, nx, ny, nz);
523	601	}
524	602	//System.out.println("vertexq = " + qv.s + ", " + qv.t);
525	603	// boolean locked = false;
..	..	@@ -567,7 +645,7 @@
567	645	y += ny * obj.NORMALPUSH;
568	646	z += nz * obj.NORMALPUSH;
569	647
570		- gl.glNormal3f(nx, ny, nz);
	648	+ SetGLNormal(gl, nx, ny, nz);
571	649	}
572	650
573	651	// if ((dot&4) == 0)
..	..	@@ -803,7 +881,7 @@
803	881	//// tris.postdraw(this);
804	882	}
805	883
806		- static Camera localcamera = new Camera();
	884	+ static Camera localAOcamera = new Camera();
807	885	static cVector from = new cVector();
808	886	static cVector to = new cVector();
809	887
..	..	@@ -812,7 +890,7 @@
812	890	CameraPane cp = this;
813	891
814	892	Camera keep = cp.RenderCamera();
815		- cp.renderCamera = localcamera;
	893	+ cp.renderCamera = localAOcamera;
816	894
817	895	if (br.trimmed)
818	896	{
..	..	@@ -830,7 +908,7 @@
830	908	br.positions[i3 + 2] + br.normals[i3 + 2]);
831	909	LA.xformPos(from, transform, from);
832	910	LA.xformPos(to, transform, to); // RIGID ONLY
833		- localcamera.setAim(from, to);
	911	+ localAOcamera.setAim(from, to);
834	912
835	913	CameraPane.occlusionbuffer.display();
836	914
..	..	@@ -864,7 +942,7 @@
864	942	to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
865	943	LA.xformPos(from, transform, from);
866	944	LA.xformPos(to, transform, to); // RIGID ONLY
867		- localcamera.setAim(from, to);
	945	+ localAOcamera.setAim(from, to);
868	946
869	947	CameraPane.occlusionbuffer.display();
870	948
..	..	@@ -1173,10 +1251,10 @@
1173	1251	{
1174	1252	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1175	1253	{
1176		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1254	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1177	1255	} else
1178	1256	{
1179		- gl.glNormal3f(0, 0, 1);
	1257	+ SetGLNormal(gl, 0, 0, 1);
1180	1258	}
1181	1259
1182	1260	if (c != null)
..	..	@@ -1185,10 +1263,12 @@
1185	1263	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1186	1264	}
1187	1265	}
	1266	+
1188	1267	if (flipV)
1189	1268	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1190	1269	else
1191	1270	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1271	+
1192	1272	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1193	1273	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1194	1274
..	..	@@ -1198,20 +1278,22 @@
1198	1278	{
1199	1279	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1200	1280	{
1201		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1281	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1202	1282	} else
1203	1283	{
1204		- gl.glNormal3f(0, 0, 1);
	1284	+ SetGLNormal(gl, 0, 0, 1);
1205	1285	}
1206	1286	if (c != null)
1207	1287	{
1208	1288	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1209	1289	}
1210	1290	}
	1291	+
1211	1292	if (flipV)
1212	1293	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1213	1294	else
1214	1295	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1296	+
1215	1297	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1216	1298	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1217	1299
..	..	@@ -1224,10 +1306,10 @@
1224	1306	{
1225	1307	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1226	1308	{
1227		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1309	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1228	1310	} else
1229	1311	{
1230		- gl.glNormal3f(0, 0, 1);
	1312	+ SetGLNormal(gl, 0, 0, 1);
1231	1313	}
1232	1314	if (c != null)
1233	1315	{
..	..	@@ -1239,8 +1321,10 @@
1239	1321	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1240	1322	else
1241	1323	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1324	+
1242	1325	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1243	1326	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1327	+
1244	1328	count2 += 2;
1245	1329	count3 += 3;
1246	1330	}
..	..	@@ -1407,7 +1491,7 @@
1407	1491	{
1408	1492	if (!selectmode)
1409	1493	{
1410		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1494	+ SetGLNormal(gl, (float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
1411	1495	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
1412	1496
1413	1497	if (flipV)
..	..	@@ -1419,6 +1503,8 @@
1419	1503	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1420	1504	}
1421	1505
	1506	+ float[] colorV = new float[4];
	1507	+
1422	1508	void SetColor(Object3D obj, Vertex p0)
1423	1509	{
1424	1510	CameraPane display = this;
..	..	@@ -1486,8 +1572,6 @@
1486	1572	{
1487	1573	return;
1488	1574	}
1489		-
1490		- float[] colorV = new float[3];
1491	1575
1492	1576	if (false) // marked)
1493	1577	{
..	..	@@ -1596,7 +1680,7 @@
1596	1680	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1597	1681	}
1598	1682
1599		- void DrawMaterial(cMaterial material, boolean selected)
	1683	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1600	1684	{
1601	1685	CameraPane display = this;
1602	1686	//new Exception().printStackTrace();
..	..	@@ -1612,18 +1696,18 @@
1612	1696	//col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
1613	1697	if (!material.multiply)
1614	1698	{
1615		- display.color = color;
	1699	+ display.color = material.color;
1616	1700	display.saturation = material.modulation;
1617	1701	}
1618	1702	else
1619	1703	{
1620		- display.color = color2;
	1704	+ display.color = material.color2;
1621	1705	display.saturation = material.modulation2;
1622	1706	}
1623	1707
1624	1708	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1625	1709
1626		- float[] colorV = GrafreeD.colorV;
	1710	+ float[] colorV = Grafreed.colorV;
1627	1711
1628	1712	/**/
1629	1713	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1631,7 +1715,7 @@
1631	1715	colorV[0] = display.modelParams0[0] * material.diffuse;
1632	1716	colorV[1] = display.modelParams0[1] * material.diffuse;
1633	1717	colorV[2] = display.modelParams0[2] * material.diffuse;
1634		- colorV[3] = material.opacity;
	1718	+ colorV[3] = 1; // material.opacity;
1635	1719
1636	1720	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1637	1721	//System.out.println("Opacity = " + opacity);
..	..	@@ -1736,12 +1820,12 @@
1736	1820
1737	1821	display.modelParams7[0] = 0;
1738	1822	display.modelParams7[1] = 1000;
1739		- display.modelParams7[2] = 0;
	1823	+ display.modelParams7[2] = material.parallax;
1740	1824	display.modelParams7[3] = 0;
1741	1825
1742		- display.modelParams6[0] = 100; // criss de bug de bump
	1826	+ //display.modelParams6[0] = 100; // criss de bug de bump
1743	1827
1744		- Object3D.cVector2[] extparams = display.vector2buffer;
	1828	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1745	1829	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1746	1830	{
1747	1831	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1883,7 +1967,7 @@
1883	1967	void PushMatrix(double[][] matrix)
1884	1968	{
1885	1969	// GrafreeD.tracein(matrix);
1886		- PushMatrix(matrix,1);
	1970	+ PushMatrix(matrix, 1);
1887	1971	}
1888	1972
1889	1973	void PushMatrix()
..	..	@@ -1969,9 +2053,9 @@
1969	2053	switch(viewcode)
1970	2054	{
1971	2055	case 0: return "main";
1972		- case 1: return "one";
1973		- case 2: return "two";
1974		- case 3: return "three";
	2056	+ case 1: return "Red";
	2057	+ case 2: return "Green";
	2058	+ case 3: return "Blue";
1975	2059	case 4: return "light";
1976	2060	}
1977	2061
..	..	@@ -2037,7 +2121,7 @@
2037	2121	//System.err.println("Oeil on");
2038	2122	OEIL = true;
2039	2123	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2040		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2124	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2041	2125	//pingthread.StepToTarget(true);
2042	2126	}
2043	2127
..	..	@@ -2135,7 +2219,7 @@
2135	2219	System.err.println("LIVE = " + Globals.isLIVE());
2136	2220
2137	2221	if (!Globals.isLIVE()) // save sound
2138		- GrafreeD.savesound = true; // wav.save();
	2222	+ Grafreed.savesound = true; // wav.save();
2139	2223	// else
2140	2224	repaint(); // start loop // may 2013
2141	2225	}
..	..	@@ -2168,6 +2252,11 @@
2168	2252	public void ToggleBoxMode()
2169	2253	{
2170	2254	BOXMODE ^= true;
	2255	+ }
	2256	+
	2257	+ public void ToggleZoomBoxMode()
	2258	+ {
	2259	+ ZOOMBOXMODE ^= true;
2171	2260	}
2172	2261
2173	2262	public void ToggleSmoothFocus()
..	..	@@ -2247,7 +2336,7 @@
2247	2336
2248	2337	void ToggleDebug()
2249	2338	{
2250		- DEBUG ^= true;
	2339	+ Globals.DEBUG ^= true;
2251	2340	}
2252	2341
2253	2342	void ToggleLookAt()
..	..	@@ -2255,9 +2344,9 @@
2255	2344	LOOKAT ^= true;
2256	2345	}
2257	2346
2258		- void ToggleRandom()
	2347	+ void ToggleSwitch()
2259	2348	{
2260		- RANDOM ^= true;
	2349	+ SWITCH ^= true;
2261	2350	}
2262	2351
2263	2352	void ToggleHandles()
..	..	@@ -2265,10 +2354,17 @@
2265	2354	HANDLES ^= true;
2266	2355	}
2267	2356
	2357	+ Object3D paintFolder;
	2358	+
2268	2359	void TogglePaint()
2269	2360	{
2270	2361	PAINTMODE ^= true;
2271	2362	paintcount = 0;
	2363	+
	2364	+ if (PAINTMODE)
	2365	+ {
	2366	+ paintFolder = GetFolder();
	2367	+ }
2272	2368	}
2273	2369
2274	2370	void SwapCamera(int a, int b)
..	..	@@ -2364,7 +2460,34 @@
2364	2460	{
2365	2461	return currentGL;
2366	2462	}
2367		-
	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	+
2368	2491	/**/
2369	2492	class CacheTexture
2370	2493	{
..	..	@@ -2373,28 +2496,31 @@
2373	2496
2374	2497	int resolution;
2375	2498
2376		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2499	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2377	2500	{
2378		- texture = tex;
	2501	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2502	+ texturedata = texdata;
2379	2503	resolution = res;
2380	2504	}
2381	2505	}
2382	2506	/**/
2383	2507
2384	2508	// TEXTURE static Texture texture;
2385		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2386		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2387		- 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	+
2388	2514	int pigmentdepth = 0;
2389	2515	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2390	2516	int bumpdepth = 0;
2391	2517	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2392	2518	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2393	2519	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2394		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2520	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2395	2521	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2396	2522
2397		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2523	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2398	2524	{
2399	2525	TextureData texturedata = null;
2400	2526
..	..	@@ -2404,7 +2530,7 @@
2404	2530	com.sun.opengl.util.texture.TextureIO.newTextureData(
2405	2531	getClass().getClassLoader().getResourceAsStream(name),
2406	2532	true,
2407		- com.sun.opengl.util.texture.TextureIO.PNG);
	2533	+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
2408	2534	} catch (java.io.IOException e)
2409	2535	{
2410	2536	throw new javax.media.opengl.GLException(e);
..	..	@@ -2413,13 +2539,34 @@
2413	2539	if (bump)
2414	2540	texturedata = ConvertBump(texturedata, false);
2415	2541
2416		- com.sun.opengl.util.texture.Texture texture =
2417		- 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);
2418	2544
2419		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2420		- 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);
2421	2547
2422		- 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;
2423	2570	}
2424	2571
2425	2572	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3492,6 +3639,8 @@
3492	3639
3493	3640	System.out.println("LOADING TEXTURE : " + name);
3494	3641
	3642	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3643	+
3495	3644	//
3496	3645	if (false) // compressbit > 0)
3497	3646	{
..	..	@@ -4196,6 +4345,7 @@
4196	4345
4197	4346	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
4198	4347	{
	4348	+ new Exception().printStackTrace();
4199	4349	System.exit(0);
4200	4350	com.sun.opengl.util.texture.Texture texture = null;
4201	4351
..	..	@@ -7889,7 +8039,7 @@
7889	8039	String pigment = Object3D.GetPigment(tex);
7890	8040	String bump = Object3D.GetBump(tex);
7891	8041
7892		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8042	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7893	8043	{
7894	8044	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7895	8045	// System.out.println("; bump = " + bump);
..	..	@@ -7904,11 +8054,69 @@
7904	8054	pigment = null;
7905	8055	}
7906	8056
7907		- ReleaseTexture(bump, true);
7908		- ReleaseTexture(pigment, false);
	8057	+ ReleaseTexture(tex, true);
	8058	+ ReleaseTexture(tex, false);
7909	8059	}
7910	8060
7911		- 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)
7912	8120	{
7913	8121	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7914	8122	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7919,7 +8127,7 @@
7919	8127	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7920	8128
7921	8129	if (tex != null)
7922		- texture = textures.get(tex);
	8130	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7923	8131
7924	8132	// //assert( texture != null );
7925	8133	// if (texture == null)
..	..	@@ -8011,7 +8219,55 @@
8011	8219	}
8012	8220	}
8013	8221
8014		- /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
8015	8271	{
8016	8272	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8017	8273	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8022,17 +8278,47 @@
8022	8278	if (tex == null)
8023	8279	{
8024	8280	BindTexture(null,false,resolution);
8025		- BindTexture(null,true,resolution);
8026	8281	return;
8027	8282	}
8028	8283
8029	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	+
8030	8317	String bump = Object3D.GetBump(tex);
8031	8318
8032		- usedtextures.put(pigment, pigment);
8033		- usedtextures.put(bump, bump);
	8319	+ usedtextures.add(tex);
8034	8320
8035		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8321	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8036	8322	{
8037	8323	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8038	8324	// System.out.println("; bump = " + bump);
..	..	@@ -8042,43 +8328,94 @@
8042	8328	{
8043	8329	bump = null;
8044	8330	}
8045		- if (pigment.equals(""))
8046		- {
8047		- pigment = null;
8048		- }
8049	8331
8050		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8051		- BindTexture(pigment, false, resolution);
8052	8332	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8053		- BindTexture(bump, true, resolution);
	8333	+ BindTexture(tex, true, resolution);
8054	8334	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8055		-
8056		- return; // true;
8057	8335	}
8058	8336
8059		- 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)
8060	8340	{
8061		- 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;
8062	8360
8063	8361	if (tex != null)
8064	8362	{
8065		- String texname = tex;
	8363	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8364	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
8066	8365
8067		- String[] split = tex.split("Textures");
8068		- if (split.length > 1)
8069		- texname = "/Users/nbriere/Textures" + split[split.length-1];
8070		- else
8071		- if (!texname.startsWith("/"))
8072		- 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	+ }
8073	8383
8074	8384	if (CACHETEXTURE)
8075		- texture = textures.get(texname); // TEXTURE CACHE
8076		-
8077		- TextureData texturedata = null;
8078		-
8079		- if (texture == null \|\| texture.resolution < resolution)
8080	8385	{
8081		- 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(""))
8082	8419	{
8083	8420	assert(!bump);
8084	8421	// if (bump)
..	..	@@ -8089,19 +8426,23 @@
8089	8426	// }
8090	8427	// else
8091	8428	// {
8092		- texture = textures.get(tex);
8093		- if (texture == null)
	8429	+ // texturecache = textures.get(texname); // suspicious
	8430	+ if (texturecache == null)
8094	8431	{
8095		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8432	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8096	8433	}
	8434	+ else
	8435	+ new Exception().printStackTrace();
8097	8436	// }
8098	8437	} else
8099		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8438	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8100	8439	{
8101	8440	assert(bump);
8102		- texture = textures.get(tex);
8103		- if (texture == null)
8104		- 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();
8105	8446	} else
8106	8447	{
8107	8448	//if (tex.equals("IMMORTAL"))
..	..	@@ -8109,11 +8450,22 @@
8109	8450	// texture = GetResourceTexture("default.png");
8110	8451	//} else
8111	8452	//{
8112		- if (tex.equals("WHITE_NOISE"))
	8453	+ if (texname.endsWith("WHITE_NOISE"))
8113	8454	{
8114		- texture = textures.get(tex);
8115		- if (texture == null)
8116		- 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();
8117	8469	} else
8118	8470	{
8119	8471	if (textureon)
..	..	@@ -8138,7 +8490,7 @@
8138	8490	}
8139	8491
8140	8492	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8141		- if (!new File(cachename).exists())
	8493	+ if (!FileExists(cachename))
8142	8494	cachename = texname;
8143	8495	else
8144	8496	processbump = false; // don't process bump map again
..	..	@@ -8160,7 +8512,7 @@
8160	8512	}
8161	8513
8162	8514	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8163		- if (!new File(cachename).exists())
	8515	+ if (!FileExists(cachename))
8164	8516	cachename = texname;
8165	8517	else
8166	8518	processbump = false; // don't process bump map again
..	..	@@ -8169,20 +8521,23 @@
8169	8521	texturedata = GetFileTexture(cachename, processbump, resolution);
8170	8522
8171	8523
8172		- if (texturedata != null)
8173		- 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);
8174	8528	//texture = GetTexture(tex, bump);
8175	8529	}
	8530	+ }
8176	8531	}
8177	8532	//}
8178	8533	}
8179	8534
8180		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8535	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8181	8536	{
8182	8537	//return false;
8183	8538
8184	8539	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8185		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8540	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8186	8541	{
8187	8542	// String ext = "_highres";
8188	8543	// if (REDUCETEXTURE)
..	..	@@ -8199,52 +8554,17 @@
8199	8554	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8200	8555	if (!cachefile.exists())
8201	8556	{
8202		- // cache to disk
8203		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8204		- //buffers[0].
8205		-
8206		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8207		- int[] pixels = new int[bytebuf.capacity()/3];
8208		-
8209		- // squared size heuristic...
8210		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8557	+ //if (texturedata.getWidth() == texturedata.getHeight())
8211	8558	{
8212		- for (int i=pixels.length; --i>=0;)
8213		- {
8214		- int i3 = i*3;
8215		- pixels[i] = 0xFF;
8216		- pixels[i] <<= 8;
8217		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8218		- pixels[i] <<= 8;
8219		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8220		- pixels[i] <<= 8;
8221		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8222		- }
8223		-
8224		- /*
8225		- int r=0,g=0,b=0,a=0;
8226		- for (int i=0; i<width; i++)
8227		- for (int j=0; j<height; j++)
8228		- {
8229		- int index = j*width+i;
8230		- int p = pixels[index];
8231		- a = ((p>>24) & 0xFF);
8232		- r = ((p>>16) & 0xFF);
8233		- g = ((p>>8) & 0xFF);
8234		- b = (p & 0xFF);
8235		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8236		- }
8237		- /**/
8238		- int width = (int)Math.sqrt(pixels.length); // squared
8239		- int height = width;
8240		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8241		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8559	+ BufferedImage rendImage = CreateBim(texturedata);
	8560	+
8242	8561	ImageWriter writer = null;
8243	8562	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8244	8563	if (iter.hasNext()) {
8245	8564	writer = (ImageWriter)iter.next();
8246	8565	}
8247		- float compressionQuality = 0.9f;
	8566	+
	8567	+ float compressionQuality = 0.85f;
8248	8568	try
8249	8569	{
8250	8570	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8261,18 +8581,20 @@
8261	8581	}
8262	8582	}
8263	8583	}
8264		-
	8584	+
	8585	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8586	+
8265	8587	//System.out.println("Texture = " + tex);
8266		- if (textures.containsKey(texname))
	8588	+ if (textures.containsKey(tex))
8267	8589	{
8268		- CacheTexture thetex = textures.get(texname);
	8590	+ CacheTexture thetex = textures.get(tex);
8269	8591	thetex.texture.disable();
8270	8592	thetex.texture.dispose();
8271		- textures.remove(texname);
	8593	+ textures.remove(tex);
8272	8594	}
8273	8595
8274		- texture.texturedata = texturedata;
8275		- textures.put(texname, texture);
	8596	+ //texture.texturedata = texturedata;
	8597	+ textures.put(tex, texturecache);
8276	8598
8277	8599	// newtex = true;
8278	8600	}
..	..	@@ -8288,10 +8610,44 @@
8288	8610	}
8289	8611	}
8290	8612
8291		- return texture;
	8613	+ return texturecache;
8292	8614	}
8293	8615
8294		- 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
8295	8651	{
8296	8652	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8297	8653
..	..	@@ -8309,21 +8665,21 @@
8309	8665	return texture!=null?texture.texture:null;
8310	8666	}
8311	8667
8312		- public 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
8313	8669	{
8314	8670	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8315	8671
8316	8672	return texture!=null?texture.texturedata:null;
8317	8673	}
8318	8674
8319		- boolean BindTexture(String tex, boolean bump, int resolution)
	8675	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8320	8676	{
8321	8677	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8322	8678	{
8323	8679	return false;
8324	8680	}
8325	8681
8326		- boolean newtex = false;
	8682	+ //boolean newtex = false;
8327	8683
8328	8684	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8329	8685
..	..	@@ -8355,9 +8711,75 @@
8355	8711	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8356	8712	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8357	8713
8358		- return newtex;
	8714	+ return true; // Warning: not used.
8359	8715	}
8360	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	+
8361	8783	ShadowBuffer shadowPBuf;
8362	8784	AntialiasBuffer antialiasPBuf;
8363	8785	int MAXSTACK;
..	..	@@ -8374,10 +8796,12 @@
8374	8796
8375	8797	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8376	8798	MAXSTACK = temp[0];
8377		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8799	+ if (Globals.DEBUG)
	8800	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8378	8801	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8379	8802	MAXSTACK = temp[0];
8380		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8803	+ if (Globals.DEBUG)
	8804	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8381	8805
8382	8806	// Use debug pipeline
8383	8807	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8385,7 +8809,8 @@
8385	8809	gl = drawable.getGL(); //
8386	8810
8387	8811	GL gl3 = getGL();
8388		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8812	+ if (Globals.DEBUG)
	8813	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8389	8814
8390	8815
8391	8816	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8550,7 +8975,7 @@
8550	8975
8551	8976	if (cubemap == null)
8552	8977	{
8553		- LoadEnvy(5);
	8978	+ //LoadEnvy(1);
8554	8979	}
8555	8980
8556	8981	//cubemap.enable();
..	..	@@ -8826,6 +9251,8 @@
8826	9251
8827	9252	void LoadEnvy(int which)
8828	9253	{
	9254	+ assert(false);
	9255	+
8829	9256	String name;
8830	9257	String ext;
8831	9258
..	..	@@ -8837,37 +9264,58 @@
8837	9264	cubemap = null;
8838	9265	return;
8839	9266	case 1:
8840		- name = "cubemaps/box_";
8841		- ext = "png";
	9267	+ name = "cubemaps/rgb/";
	9268	+ ext = "jpg";
8842	9269	reverseUP = false;
8843	9270	break;
8844	9271	case 2:
8845		- name = "cubemaps/uffizi_";
8846		- ext = "png";
8847		- break; // reverseUP = true; break;
	9272	+ name = "cubemaps/uffizi/";
	9273	+ ext = "jpg";
	9274	+ reverseUP = false;
	9275	+ break;
8848	9276	case 3:
8849		- name = "cubemaps/CloudyHills_";
8850		- ext = "tga";
	9277	+ name = "cubemaps/CloudyHills/";
	9278	+ ext = "jpg";
8851	9279	reverseUP = false;
8852	9280	break;
8853	9281	case 4:
8854		- name = "cubemaps/cornell_";
	9282	+ name = "cubemaps/cornell/";
8855	9283	ext = "png";
8856	9284	reverseUP = false;
8857	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;
8858	9311	default:
8859		- name = "cubemaps/rgb_";
8860		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9312	+ name = "cubemaps/box/";
	9313	+ ext = "png"; /mipmap = true;/
	9314	+ reverseUP = false;
8861	9315	break;
8862	9316	}
8863		-
8864		- try
8865		- {
8866		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
8867		- } catch (IOException e)
8868		- {
8869		- throw new RuntimeException(e);
8870		- }
	9317	+
	9318	+ LoadSkybox(name, ext, mipmap);
8871	9319	}
8872	9320
8873	9321	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -8899,8 +9347,12 @@
8899	9347	static double[] model = new double[16];
8900	9348	double[] camera2light = new double[16];
8901	9349	double[] light2camera = new double[16];
8902		- int newenvy = -1;
8903		- boolean envyoff = true; // false;
	9350	+
	9351	+ //int newenvy = -1;
	9352	+ //boolean envyoff = false;
	9353	+
	9354	+ String loadedskyboxname;
	9355	+
8904	9356	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
8905	9357	//float[] light0 = { 0,0,0 };
8906	9358	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9193,11 +9645,35 @@
9193	9645	jy8[3] = 0.5f;
9194	9646	}
9195	9647
9196		- 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
9197	9649	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9198	9650	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9199	9651	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9200	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	+
9201	9677	static int imagecount = 0; // movie generation
9202	9678
9203	9679	static int jitter = 0;
..	..	@@ -9293,8 +9769,8 @@
9293	9769	assert (parentcam != renderCamera);
9294	9770
9295	9771	if (renderCamera != lightCamera)
9296		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9297		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9772	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9773	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9298	9774
9299	9775	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9300	9776
..	..	@@ -9309,8 +9785,8 @@
9309	9785	LA.matCopy(renderCamera.fromScreen, matrix);
9310	9786
9311	9787	if (renderCamera != lightCamera)
9312		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9313		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9788	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9789	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9314	9790
9315	9791	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9316	9792
..	..	@@ -9356,10 +9832,12 @@
9356	9832	rati = 1 / rati;
9357	9833	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9358	9834	}
9359		- assert (newenvy == -1);
	9835	+
	9836	+ //assert (newenvy == -1);
	9837	+
9360	9838	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9361	9839	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9362		- DrawSkyBox(gl);
	9840	+ DrawSkyBox(gl, (float)rati);
9363	9841	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9364	9842	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9365	9843	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -9382,7 +9860,7 @@
9382	9860	//gl.glFlush();
9383	9861	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9384	9862
9385		- if (ANIMATION && ABORTED)
	9863	+ if (Globals.ANIMATION && ABORTED)
9386	9864	{
9387	9865	System.err.println(" ABORTED FRAME");
9388	9866	break;
..	..	@@ -9412,7 +9890,7 @@
9412	9890	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9413	9891
9414	9892	// save image
9415		- if (ANIMATION && !ABORTED)
	9893	+ if (Globals.ANIMATION && !ABORTED)
9416	9894	{
9417	9895	VPwidth = viewport[2];
9418	9896	VPheight = viewport[3];
..	..	@@ -9523,11 +10001,11 @@
9523	10001
9524	10002	// imagecount++;
9525	10003
9526		- 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;
9527	10005
9528	10006	if (!BOXMODE)
9529	10007	{
9530		- 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) + ")");
9531	10009	}
9532	10010
9533	10011	if (!BOXMODE)
..	..	@@ -9565,7 +10043,7 @@
9565	10043	ABORTED = false;
9566	10044	}
9567	10045	else
9568		- GrafreeD.wav.cursor += 735 * ACSIZE;
	10046	+ Grafreed.wav.cursor += 735 * ACSIZE;
9569	10047
9570	10048	if (false)
9571	10049	{
..	..	@@ -10225,14 +10703,23 @@
10225	10703	static boolean init = false;
10226	10704
10227	10705	double[][] matrix = LA.newMatrix();
	10706	+
	10707	+ // This is to refresh the UI of the material panel.
	10708	+ ObjEditor patchMaterial;
10228	10709
10229	10710	public void display(GLAutoDrawable drawable)
10230	10711	{
10231		- if (GrafreeD.savesound && GrafreeD.hassound)
	10712	+ if (patchMaterial.patchMaterial)
10232	10713	{
10233		- GrafreeD.wav.save();
10234		- GrafreeD.savesound = false;
10235		- 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;
10236	10723	}
10237	10724	// if (DEBUG_SELECTION)
10238	10725	// {
..	..	@@ -10308,6 +10795,7 @@
10308	10795	ANTIALIAS = 0;
10309	10796	//System.out.println("RESTART");
10310	10797	AAtimer.restart();
	10798	+ Globals.TIMERRUNNING = true;
10311	10799	}
10312	10800	}
10313	10801	}
..	..	@@ -10362,7 +10850,7 @@
10362	10850	Object3D theobject = object;
10363	10851	Object3D theparent = object.parent;
10364	10852	object.parent = null;
10365		- object = (Object3D)GrafreeD.clone(object);
	10853	+ object = (Object3D)Grafreed.clone(object);
10366	10854	object.Stripify();
10367	10855	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10368	10856	theobject.PreprocessOcclusion(this);
..	..	@@ -10375,13 +10863,14 @@
10375	10863	ambientOcclusion = false;
10376	10864	}
10377	10865
10378		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10866	+ if (//Globals.lighttouched &&
	10867	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10379	10868	{
10380	10869	//if (RENDERSHADOW) // ?
10381	10870	if (!IsFrozen())
10382	10871	{
10383	10872	// dec 2012
10384		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10873	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10385	10874	{
10386	10875	Globals.framecount++;
10387	10876	shadowbuffer.display();
..	..	@@ -10394,7 +10883,7 @@
10394	10883
10395	10884	if (wait)
10396	10885	{
10397		- Sleep(500);
	10886	+ Sleep(200); // blocks everything
10398	10887
10399	10888	wait = false;
10400	10889	}
..	..	@@ -10508,8 +10997,8 @@
10508	10997
10509	10998	// if (parentcam != renderCamera) // not a light
10510	10999	if (cam != lightCamera)
10511		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10512		- LA.matConcat(matrix, parentcam.toParent, matrix);
	11000	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11001	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10513	11002
10514	11003	for (int j = 0; j < 4; j++)
10515	11004	{
..	..	@@ -10523,8 +11012,8 @@
10523	11012
10524	11013	// if (parentcam != renderCamera) // not a light
10525	11014	if (cam != lightCamera)
10526		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10527		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	11015	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11016	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10528	11017
10529	11018	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10530	11019
..	..	@@ -10610,13 +11099,43 @@
10610	11099	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10611	11100	}
10612	11101
10613		- 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"))
10614	11110	{
10615		- LoadEnvy(newenvy);
	11111	+ if (cubemaprgb == null)
	11112	+ {
	11113	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
	11114	+ }
	11115	+
	11116	+ cubemap = cubemaprgb;
10616	11117	}
10617		-
10618		- newenvy = -1;
10619		-
	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	+
10620	11139	ratio = ((double) getWidth()) / getHeight();
10621	11140	//System.out.println("ratio = " + ratio);
10622	11141
..	..	@@ -10632,7 +11151,7 @@
10632	11151
10633	11152	if (!IsFrozen() && !ambientOcclusion)
10634	11153	{
10635		- DrawSkyBox(gl);
	11154	+ DrawSkyBox(gl, (float)ratio);
10636	11155	}
10637	11156
10638	11157	//if (selection_view == -1)
..	..	@@ -10783,7 +11302,16 @@
10783	11302	// Bump noise
10784	11303	gl.glActiveTexture(GL.GL_TEXTURE6);
10785	11304	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10786		- 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	+
10787	11315
10788	11316	gl.glActiveTexture(GL.GL_TEXTURE0);
10789	11317	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10806,9 +11334,9 @@
10806	11334
10807	11335	gl.glMatrixMode(GL.GL_MODELVIEW);
10808	11336
10809		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10810		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10811		-//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);
10812	11340	} else
10813	11341	{
10814	11342	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10819,7 +11347,7 @@
10819	11347	//System.out.println("BLENDING ON");
10820	11348	gl.glEnable(GL.GL_BLEND);
10821	11349	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10822		-
	11350	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10823	11351	gl.glMatrixMode(gl.GL_PROJECTION);
10824	11352	gl.glLoadIdentity();
10825	11353
..	..	@@ -10908,8 +11436,8 @@
10908	11436	System.err.println("parentcam != renderCamera");
10909	11437
10910	11438	// if (cam != lightCamera)
10911		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10912		- 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
10913	11441	}
10914	11442
10915	11443	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10930,8 +11458,8 @@
10930	11458	if (true) // TODO
10931	11459	{
10932	11460	if (cam != lightCamera)
10933		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10934		- 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
10935	11463	}
10936	11464
10937	11465	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11068,7 +11596,7 @@
11068	11596	}
11069	11597	}
11070	11598
11071		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11599	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11072	11600	{
11073	11601	//gl.glDepthFunc(GL.GL_LEQUAL);
11074	11602	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11076,24 +11604,21 @@
11076	11604
11077	11605	boolean texon = textureon;
11078	11606
11079		- if (RENDERPROGRAM > 0)
11080		- {
11081		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11082		- textureon = false;
11083		- }
	11607	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11608	+ textureon = false;
	11609	+
11084	11610	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11085	11611	//System.out.println("ALLO");
11086	11612	gl.glColorMask(false, false, false, false);
11087	11613	DrawObject(gl);
11088		- if (RENDERPROGRAM > 0)
11089		- {
11090		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11091		- textureon = texon;
11092		- }
	11614	+
	11615	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11616	+ textureon = texon;
	11617	+
11093	11618	gl.glColorMask(true, true, true, true);
11094	11619
11095	11620	gl.glDepthFunc(GL.GL_EQUAL);
11096		- //gl.glDepthMask(false);
	11621	+ gl.glDepthMask(false);
11097	11622	}
11098	11623
11099	11624	if (false) // DrawMode() == SHADOW)
..	..	@@ -11247,8 +11772,14 @@
11247	11772	{
11248	11773	renderpass++;
11249	11774	// System.out.println("Draw object... ");
	11775	+ STEP = 1;
11250	11776	if (FAST) // in case there is no script
11251		- STEP = 16;
	11777	+ STEP = 8;
	11778	+
	11779	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11780	+ {
	11781	+ STEP *= 4;
	11782	+ }
11252	11783
11253	11784	//object.FullInvariants();
11254	11785
..	..	@@ -11262,23 +11793,44 @@
11262	11793	e.printStackTrace();
11263	11794	}
11264	11795
11265		- if (GrafreeD.RENDERME > 0)
11266		- GrafreeD.RENDERME--; // mechante magouille
	11796	+ if (Grafreed.RENDERME > 0)
	11797	+ Grafreed.RENDERME--; // mechante magouille
11267	11798
11268	11799	Globals.ONESTEP = false;
11269	11800	}
11270	11801
11271	11802	static boolean zoomonce = false;
11272	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	+
11273	11822	void DrawObject(GL gl, boolean draw)
11274	11823	{
	11824	+ // To clear camera values
	11825	+ ResetOptions();
	11826	+
11275	11827	//System.out.println("DRAW OBJECT " + mouseDown);
11276	11828	// DrawMode() = SELECTION;
11277	11829	//GL gl = getGL();
11278	11830	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11279	11831	{
11280	11832	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11281		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11833	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11282	11834	pingthread.StepToTarget(true); // true);
11283	11835	// zoomonce = false;
11284	11836	}
..	..	@@ -11333,7 +11885,14 @@
11333	11885
11334	11886	usedtextures.clear();
11335	11887
11336		- 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	+ }
11337	11896	}
11338	11897	//System.out.println("--> " + stackdepth);
11339	11898	// GrafreeD.traceon();
..	..	@@ -11343,8 +11902,9 @@
11343	11902
11344	11903	if (DrawMode() == DEFAULT)
11345	11904	{
11346		- if (DEBUG)
	11905	+ if (Globals.DEBUG)
11347	11906	{
	11907	+ CreateSelectedPoint();
11348	11908	float radius = 0.05f;
11349	11909	if (selectedpoint.radius != radius)
11350	11910	{
..	..	@@ -11398,20 +11958,32 @@
11398	11958	ReleaseTextures(DEFAULT_TEXTURES);
11399	11959
11400	11960	if (CLEANCACHE)
11401		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11961	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11402	11962	{
11403		- String tex = e.nextElement();
	11963	+ cTexture tex = e.nextElement();
11404	11964
11405	11965	// System.out.println("Texture --------- " + tex);
11406	11966
11407		- if (tex.equals("WHITE_NOISE"))
	11967	+ if (tex.equals("WHITE_NOISE:"))
11408	11968	continue;
11409	11969
11410		- if (!usedtextures.containsKey(tex))
	11970	+ if (!usedtextures.contains(tex))
11411	11971	{
	11972	+ CacheTexture gettex = texturepigment.get(tex);
11412	11973	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11413		- textures.get(tex).texture.dispose();
11414		- 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	+ }
11415	11987	}
11416	11988	}
11417	11989	}
..	..	@@ -11424,7 +11996,14 @@
11424	11996	if (checker != null && DrawMode() == DEFAULT)
11425	11997	{
11426	11998	//BindTexture(IMMORTAL_TEXTURE);
11427		- 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	+ }
11428	12007	// NEAREST
11429	12008	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11430	12009	DrawChecker(gl);
..	..	@@ -11506,7 +12085,7 @@
11506	12085	return;
11507	12086	}
11508	12087
11509		- String string = obj.GetToolTip();
	12088	+ String string = obj.toString(); //.GetToolTip();
11510	12089
11511	12090	GL gl = GetGL();
11512	12091
..	..	@@ -11823,8 +12402,8 @@
11823	12402	//obj.TransformToWorld(light, light);
11824	12403	for (int i = tp.size(); --i >= 0;)
11825	12404	{
11826		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11827		- 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);
11828	12407	}
11829	12408
11830	12409
..	..	@@ -11841,8 +12420,8 @@
11841	12420	parentcam = cameras[0];
11842	12421	}
11843	12422
11844		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11845		- 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
11846	12425
11847	12426	LA.xformPos(light, renderCamera.toScreen, light);
11848	12427
..	..	@@ -11932,8 +12511,82 @@
11932	12511
11933	12512	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
11934	12513
11935		- String program =
	12514	+ String programmin =
	12515	+ // Min shader
11936	12516	"!!ARBfp1.0\n" +
	12517	+ "PARAM zero12t = { 0.0, 1.0, 2, 1.25 };" +
	12518	+ "PARAM pow_2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12519	+ "PARAM pow2 = { 2, 4, 8, 0.0 };" +
	12520	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12521	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12522	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12523	+ "PARAM light2cam0 = program.env[10];" +
	12524	+ "PARAM light2cam1 = program.env[11];" +
	12525	+ "PARAM light2cam2 = program.env[12];" +
	12526	+ "TEMP temp;" +
	12527	+ "TEMP light;" +
	12528	+ "TEMP ndotl;" +
	12529	+ "TEMP normal;" +
	12530	+ "TEMP depth;" +
	12531	+ "TEMP eye;" +
	12532	+ "TEMP pos;" +
	12533	+
	12534	+ "MAD normal, fragment.color, zero12t.z, -zero12t.y;" +
	12535	+ Normalize("normal") +
	12536	+ "MOV light, state.light[0].position;" +
	12537	+ "DP3 ndotl.x, light, normal;" +
	12538	+ "MAX ndotl.x, ndotl.x, zero12t.x;" +
	12539	+
	12540	+ // shadow
	12541	+ "MOV pos, fragment.texcoord[1];" +
	12542	+ "MOV temp, pos;" +
	12543	+ ShadowTextureFetch("depth", "temp", "1") +
	12544	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12545	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12546	+
	12547	+ // No shadow when out of frustum
	12548	+ //"SGE temp.y, depth.z, zero123.y;" +
	12549	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12550	+
	12551	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12552	+
	12553	+ // Backlit
	12554	+ "MOV pos.w, zero12t.y;" + // one
	12555	+ "DP4 eye.x, pos, light2cam0;" +
	12556	+ "DP4 eye.y, pos, light2cam1;" +
	12557	+ "DP4 eye.z, pos, light2cam2;" +
	12558	+ Normalize("eye") +
	12559	+
	12560	+ "DP3 ndotl.y, -eye, normal;" +
	12561	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12562	+ "POW ndotl.y, ndotl.y, pow2.x;" + // backlit
	12563	+ "SUB ndotl.y, zero12t.y, ndotl.y;" + // 1 - y
	12564	+ //"POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12565	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12566	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12567	+ "ADD ndotl.y, ndotl.y, one.x;" +
	12568	+ "MUL ndotl.y, ndotl.y, pow_2.x;" +
	12569	+
	12570	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12571	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12572	+
	12573	+ // Pigment
	12574	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12575	+ "LRP temp, zero12t.w, temp, one;" + // texture proportion
	12576	+ "MUL temp, temp, zero12t.w;" + // Times x
	12577	+
	12578	+ //"MUL temp, temp, ndotl.y;" +
	12579	+ "MAD ndotl.x, pow_2.xxxx, ndotl.yyyy, ndotl.x;" +
	12580	+
	12581	+ "MUL temp, temp, ndotl.x;" + // lambert
	12582	+
	12583	+ "MOV temp.w, zero12t.y;" + // reset alpha
	12584	+ "MOV result.color, temp;" +
	12585	+ "END";
	12586	+
	12587	+ String programmax =
	12588	+ "!!ARBfp1.0\n" +
	12589	+
11937	12590	//"OPTION ARB_fragment_program_shadow;" +
11938	12591	"PARAM light2cam0 = program.env[10];" +
11939	12592	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -11959,7 +12612,7 @@
11959	12612	"PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
11960	12613	"PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
11961	12614	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
11962		- "PARAM params7 = program.env[7];" + // noise power, opacity power
	12615	+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
11963	12616	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
11964	12617	"PARAM options1 = program.env[62];" + // fog rgb color
11965	12618	"PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
..	..	@@ -12048,8 +12701,7 @@
12048	12701	"TEMP shininess;" +
12049	12702	"\n" +
12050	12703	"MOV texSamp, one;" +
12051		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12052		-
	12704	+
12053	12705	"MOV mapgrid.x, one2048th.x;" +
12054	12706	"MOV temp, fragment.texcoord[1];" +
12055	12707	/*
..	..	@@ -12070,20 +12722,20 @@
12070	12722	"MUL temp, floor, mapgrid.x;" +
12071	12723	//"TEX depth0, temp, texture[1], 2D;" +
12072	12724	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12073		- TextureFetch("depth0", "temp", "1") +
	12725	+ ShadowTextureFetch("depth0", "temp", "1") +
12074	12726	"") +
12075	12727	"ADD temp.x, temp.x, mapgrid.x;" +
12076	12728	//"TEX depth1, temp, texture[1], 2D;" +
12077	12729	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12078		- TextureFetch("depth1", "temp", "1") +
	12730	+ ShadowTextureFetch("depth1", "temp", "1") +
12079	12731	"") +
12080	12732	"ADD temp.y, temp.y, mapgrid.x;" +
12081	12733	//"TEX depth2, temp, texture[1], 2D;" +
12082		- TextureFetch("depth2", "temp", "1") +
	12734	+ ShadowTextureFetch("depth2", "temp", "1") +
12083	12735	"SUB temp.x, temp.x, mapgrid.x;" +
12084	12736	//"TEX depth3, temp, texture[1], 2D;" +
12085	12737	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12086		- TextureFetch("depth3", "temp", "1") +
	12738	+ ShadowTextureFetch("depth3", "temp", "1") +
12087	12739	"") +
12088	12740	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12089	12741	//"MOV params, material;" +
..	..	@@ -12205,7 +12857,7 @@
12205	12857	"POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
12206	12858	// mar 2013 ??? "KIL alpha.a;" +
12207	12859	"MOV alpha, texSamp.aaaa;" + // y;" +
12208		- "KIL alpha.a;" +
	12860	+ "KIL alpha.a;" + // not sure with parallax mapping
12209	12861	/*
12210	12862	"MUL temp.xy, temp, two;" +
12211	12863	"TXB bump, temp, texture[0], 2D;" +
..	..	@@ -12291,11 +12943,6 @@
12291	12943	"SUB bump0, bump0, half;" +
12292	12944	"ADD bump, bump, bump0;" +
12293	12945
12294		- "MOV temp.x, texSamp.a;" +
12295		- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12296		- //"LRP texSamp0, params5.x, texSamp0, one;" +
12297		- "MOV texSamp.a, temp.x;" +
12298		-
12299	12946	// double-sided
12300	12947	/**/
12301	12948	(doublesided?"DP3 temp.z, normal, eye;" +
..	..	@@ -12312,19 +12959,62 @@
12312	12959	"MOV normald, normal;" +
12313	12960	"MOV normals, normal;" +
12314	12961
	12962	+ "MOV temp, fragment.texcoord[4];" +
	12963	+
12315	12964	// UV base
12316	12965	//"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
12317	12966	//"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
12318	12967	//"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
12319		- "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
12320		- "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
12321		- "DP3 UP.z,state.matrix.texture[7].row[2],Y;" +
	12968	+ "DP3 UP.x,state.matrix.texture[7].row[0],temp;" +
	12969	+ "DP3 UP.y,state.matrix.texture[7].row[1],temp;" +
	12970	+ "DP3 UP.z,state.matrix.texture[7].row[2],temp;" +
	12971	+ Normalize("UP") +
	12972	+
12322	12973	"XPD V, normal, UP;" +
12323	12974	Normalize("V") +
12324	12975	"XPD U, V, normal;" +
12325	12976	Normalize("U") +
12326	12977
12327	12978	// parallax mapping
	12979	+
	12980	+ "DP3 temp2.x, V, eye;" +
	12981	+ "DP3 temp2.y, U, eye;" +
	12982	+ "DP3 temp2.z, normal, eye;" +
	12983	+ "RCP temp2.z, temp2.z;" +
	12984	+
	12985	+ "DP3 temp2.w, texSamp, texSamp;" + // Height
	12986	+ "RSQ temp2.w, temp2.w;" +
	12987	+ "RCP temp2.w, temp2.w;" +
	12988	+
	12989	+ "SUB temp2.w, temp2.w, half;" +
	12990	+// "SGE temp.x, temp2.w, eps.x;" +
	12991	+// "MUL temp2.w, temp2.w, temp.x;" +
	12992	+
	12993	+ //"MOV texSamp, U;" +
	12994	+
	12995	+ "MUL temp2.z, temp2.z, temp2.w;" +
	12996	+ "MUL temp2.z, temp2.z, params7.z;" + // parallax
	12997	+
	12998	+ "MUL temp2, temp2, temp2.z;" +
	12999	+
	13000	+ "MOV temp, fragment.texcoord[0];" +
	13001	+
	13002	+ "SUB temp, temp, temp2;" +
	13003	+
	13004	+ "TEX temp, temp, texture[0], 2D;" +
	13005	+ "POW temp.a, temp.a, params6.w;" + // punch through
	13006	+
	13007	+ "ADD texSamp, temp, texSamp;" +
	13008	+ "MUL texSamp.xyz, half, texSamp;" +
	13009	+
	13010	+ "MOV alpha, texSamp.aaaa;" +
	13011	+
	13012	+// parallax mapping
	13013	+
	13014	+ "MOV temp.x, texSamp.a;" +
	13015	+ "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
	13016	+ //"LRP texSamp0, params5.x, texSamp0, one;" +
	13017	+ "MOV texSamp.a, temp.x;" +
12328	13018
12329	13019	//"MOV temp, fragment.texcoord[0];" +
12330	13020	//
..	..	@@ -12454,10 +13144,10 @@
12454	13144	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12455	13145	"") +
12456	13146
12457		- // display shadow only (bump == 0)
	13147	+ // display shadow only (fakedepth == 0)
12458	13148	"SUB temp.x, half.x, shadow.x;" +
12459		- "MOV temp.y, -params6.x;" +
12460		- "SLT temp.z, temp.y, zero.x;" +
	13149	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	13150	+ "SLT temp.z, temp.y, -c256i.x;" +
12461	13151	"SUB temp.y, one.x, temp.z;" +
12462	13152	"MUL temp.x, temp.x, temp.y;" +
12463	13153	"KIL temp.x;" +
..	..	@@ -12586,8 +13276,10 @@
12586	13276	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12587	13277
12588	13278	"SUB temp.x, one.x, ndotl.x;" +
12589		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
12590		- "ADD temp.y, one.y, options2.y;" + // sursurface
	13279	+ // Tuning for default skin
	13280	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	13281	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	13282	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12591	13283	"MUL temp.x, temp.x, temp.y;" +
12592	13284
12593	13285	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12786,8 +13478,19 @@
12786	13478	//once = true;
12787	13479	}
12788	13480
12789		- System.out.print("Program #" + mode + "; length = " + program.length());
12790		- System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13481	+ String program = programmax;
	13482	+
	13483	+ if (Globals.MINSHADER)
	13484	+ {
	13485	+ program = programmin;
	13486	+ }
	13487	+
	13488	+ if (Globals.DEBUG)
	13489	+ {
	13490	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
	13491	+ System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13492	+ }
	13493	+
12791	13494	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12792	13495
12793	13496	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -12834,7 +13537,8 @@
12834	13537	"\n" +
12835	13538	"END\n";
12836	13539
12837		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13540	+ if (Globals.DEBUG)
	13541	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
12838	13542	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12839	13543
12840	13544	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -12879,25 +13583,26 @@
12879	13583	return out;
12880	13584	}
12881	13585
12882		- String TextureFetch(String dest, String src, String unit)
	13586	+ // Also does frustum culling
	13587	+ String ShadowTextureFetch(String dest, String src, String unit)
12883	13588	{
12884	13589	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12885	13590	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12886	13591	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13592	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13593	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12887	13594	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12888		- "SLT " + src + ".z, " + src + ".x, one.x;" +
12889		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12890		- "SLT " + src + ".z, " + src + ".y, one.x;" +
12891		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13595	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13596	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12892	13597	//"SWZ buffer, temp, w,w,w,w;";
12893		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13598	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12894	13599	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12895	13600	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12896	13601	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12897		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13602	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12898	13603
12899		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12900		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13604	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13605	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12901	13606	}
12902	13607
12903	13608	String Shadow(String depth, String shadow)
..	..	@@ -12919,12 +13624,16 @@
12919	13624
12920	13625	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12921	13626	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13627	+
	13628	+ // Compare fragment depth in light space with shadowmap.
12922	13629	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12923	13630	"SGE temp.y, temp.x, zero.x;" +
12924		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13631	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13632	+
	13633	+ // Reverse comparison
12925	13634	"SUB temp.x, one.x, temp.x;" +
12926	13635	"MUL " + shadow + ".x, temp.x, temp.y;" +
12927		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13636	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12928	13637	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12929	13638
12930	13639	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12938,6 +13647,10 @@
12938	13647	// No shadow for backface
12939	13648	"DP3 temp.x, normal, lightd;" +
12940	13649	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13650	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13651	+
	13652	+ // No shadow when out of frustum
	13653	+ "SGE temp.x, " + depth + ".z, one.z;" +
12941	13654	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12942	13655	"";
12943	13656	}
..	..	@@ -13083,8 +13796,9 @@
13083	13796	/static/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
13084	13797	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13085	13798	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13086		- /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13087		- Object3D.cVector2[] vector2buffer;
	13799	+ /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
	13800	+
	13801	+ //Object3D.cVector2[] vector2buffer;
13088	13802
13089	13803	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13090	13804	// OUT : diff, spec
..	..	@@ -13100,9 +13814,10 @@
13100	13814	"DP3 " + dest + ".z," + "normals," + "eye;" +
13101	13815	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13102	13816	//"MOV " + dest + ".w," + "normal.z;" +
13103		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13104		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13105		- //"MOV " + dest + ".z," + "params2.w;" +
	13817	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13818	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13819	+
	13820	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13106	13821	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13107	13822	"RCP " + dest + ".w," + dest + ".w;" +
13108	13823	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13248,7 +13963,7 @@
13248	13963	"PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
13249	13964	"PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
13250	13965	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
13251		- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
	13966	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
13252	13967	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
13253	13968	"PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
13254	13969	//"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
..	..	@@ -13309,7 +14024,7 @@
13309	14024	"DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
13310	14025	"DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
13311	14026	"DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
13312		- //"MOV result.texcoord, vertex.texcoord;" +
	14027	+ //"MOV result.texcoord, vertex.fogcoord;" +
13313	14028	"MOV result.texcoord, temp;" +
13314	14029	// border fade
13315	14030	"MOV result.texcoord[3], vertex.texcoord;" +
..	..	@@ -13356,7 +14071,9 @@
13356	14071
13357	14072	//"ADD temp.z, temp.z, one;" +
13358	14073
13359		- "MOV result.color, temp;"
	14074	+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
	14075	+
	14076	+ "MOV result.color, temp;" // Normal
13360	14077	: "MOV result.color, vertex.color;") +
13361	14078	((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
13362	14079	: "") +
..	..	@@ -13496,7 +14213,7 @@
13496	14213	public void mousePressed(MouseEvent e)
13497	14214	{
13498	14215	//System.out.println("mousePressed: " + e);
13499		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	14216	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13500	14217	}
13501	14218
13502	14219	static long prevtime = 0;
..	..	@@ -13523,6 +14240,7 @@
13523	14240
13524	14241	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
13525	14242
	14243	+ if (BUTTONLESSWHEEL)
13526	14244	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
13527	14245	{
13528	14246	return;
..	..	@@ -13531,7 +14249,7 @@
13531	14249	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13532	14250
13533	14251	// TIMER
13534		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	14252	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13535	14253	{
13536	14254	keepboxmode = BOXMODE;
13537	14255	keepsupport = SUPPORT;
..	..	@@ -13571,8 +14289,8 @@
13571	14289	// mode \|= META;
13572	14290	//}
13573	14291
13574		- SetMouseMode(WHEEL \| e.getModifiersEx());
13575		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	14292	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	14293	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13576	14294	anchorX = ax;
13577	14295	anchorY = ay;
13578	14296	prevX = px;
..	..	@@ -13606,6 +14324,7 @@
13606	14324	else
13607	14325	if (evt.getSource() == AAtimer)
13608	14326	{
	14327	+ Globals.TIMERRUNNING = false;
13609	14328	if (mouseDown)
13610	14329	{
13611	14330	//new Exception().printStackTrace();
..	..	@@ -13631,6 +14350,10 @@
13631	14350	// LIVE = waslive;
13632	14351	// wasliveok = true;
13633	14352	// waslive = false;
	14353	+
	14354	+ // May 2019 Forget it:
	14355	+ if (true)
	14356	+ return;
13634	14357
13635	14358	// source == timer
13636	14359	if (mouseDown)
..	..	@@ -13661,7 +14384,7 @@
13661	14384
13662	14385	// fev 2014???
13663	14386	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13664		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14387	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13665	14388	pingthread.StepToTarget(true); // true);
13666	14389	}
13667	14390	// if (!LIVE)
..	..	@@ -13670,12 +14393,13 @@
13670	14393
13671	14394	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13672	14395
13673		- void clickStart(int x, int y, int modifiers)
	14396	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13674	14397	{
13675	14398	if (!wasliveok)
13676	14399	return;
13677	14400
13678	14401	AAtimer.restart(); //
	14402	+ Globals.TIMERRUNNING = true;
13679	14403
13680	14404	// waslive = LIVE;
13681	14405	// LIVE = false;
..	..	@@ -13687,7 +14411,7 @@
13687	14411	// touched = true; // main DL
13688	14412	if (isRenderer)
13689	14413	{
13690		- SetMouseMode(modifiers);
	14414	+ SetMouseMode(modifiers, modifiersex);
13691	14415	}
13692	14416
13693	14417	selectX = anchorX = x;
..	..	@@ -13700,7 +14424,7 @@
13700	14424	clicked = true;
13701	14425	hold = false;
13702	14426
13703		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14427	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13704	14428	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13705	14429	{
13706	14430	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13725,14 +14449,15 @@
13725	14449	drag = false;
13726	14450	//System.out.println("Mouse DOWN");
13727	14451	editObj = false;
13728		- ClickInfo info = new ClickInfo();
13729		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13730		- info.pane = this;
13731		- info.camera = renderCamera;
13732		- info.x = x;
13733		- info.y = y;
13734		- info.modifiers = modifiers;
13735		- editObj = object.doEditClick(info, 0);
	14452	+ //ClickInfo info = new ClickInfo();
	14453	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14454	+ object.clickInfo.pane = this;
	14455	+ object.clickInfo.camera = renderCamera;
	14456	+ object.clickInfo.x = x;
	14457	+ object.clickInfo.y = y;
	14458	+ object.clickInfo.modifiers = modifiersex;
	14459	+ editObj = object.doEditClick(//info,
	14460	+ 0);
13736	14461	if (!editObj)
13737	14462	{
13738	14463	hasMarquee = true;
..	..	@@ -13748,11 +14473,14 @@
13748	14473
13749	14474	public void mouseDragged(MouseEvent e)
13750	14475	{
	14476	+ Globals.MOUSEDRAGGED = true;
	14477	+
	14478	+ //System.out.println("mouseDragged: " + e);
13751	14479	if (isRenderer)
13752	14480	movingcamera = true;
	14481	+
13753	14482	//if (drawing)
13754	14483	//return;
13755		- //System.out.println("mouseDragged: " + e);
13756	14484	if ((e.getModifiersEx() & CTRL) != 0
13757	14485	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
13758	14486	{
..	..	@@ -13760,7 +14488,7 @@
13760	14488	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13761	14489	}
13762	14490	else
13763		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14491	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13764	14492
13765	14493	//try { Thread.sleep(1); } catch (Exception ex) {}
13766	14494	}
..	..	@@ -13933,6 +14661,7 @@
13933	14661
13934	14662	public void run()
13935	14663	{
	14664	+ new Exception().printStackTrace();
13936	14665	System.exit(0);
13937	14666	for (;;)
13938	14667	{
..	..	@@ -13996,7 +14725,7 @@
13996	14725	{
13997	14726	Globals.lighttouched = true;
13998	14727	}
13999		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14728	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
14000	14729	}
14001	14730	//else
14002	14731	}
..	..	@@ -14010,12 +14739,18 @@
14010	14739	void GoDown(int mod)
14011	14740	{
14012	14741	MODIFIERS \|= COMMAND;
14013		- /*
	14742	+ boolean isVR = (mouseMode&VR)!=0;
	14743	+ /**/
14014	14744	if((mod&SHIFT) == SHIFT)
14015		- manipCamera.RotatePosition(0, -speed);
	14745	+ {
	14746	+ if (isVR)
	14747	+ manipCamera.RotateInterest(0, -speed);
	14748	+ else
	14749	+ manipCamera.RotatePosition(0, -speed);
	14750	+ }
14016	14751	else
14017		- manipCamera.BackForth(0, -speed*delta, getWidth());
14018		- */
	14752	+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
	14753	+ /**/
14019	14754	if ((mod & SHIFT) == SHIFT)
14020	14755	{
14021	14756	mouseMode = mouseMode; // VR??
..	..	@@ -14024,6 +14759,8 @@
14024	14759	mouseMode \|= BACKFORTH;
14025	14760	}
14026	14761
	14762	+ targetLookAt.set(manipCamera.lookAt);
	14763	+
14027	14764	//prevX = X = anchorX;
14028	14765	prevY = Y = anchorY - (int) (renderCamera.Distance());
14029	14766	}
..	..	@@ -14031,12 +14768,19 @@
14031	14768	void GoUp(int mod)
14032	14769	{
14033	14770	MODIFIERS \|= COMMAND;
14034		- /*
	14771	+ /**/
	14772	+ boolean isVR = (mouseMode&VR)!=0;
	14773	+
14035	14774	if((mod&SHIFT) == SHIFT)
14036		- manipCamera.RotatePosition(0, speed);
	14775	+ {
	14776	+ if (isVR)
	14777	+ manipCamera.RotateInterest(0, speed);
	14778	+ else
	14779	+ manipCamera.RotatePosition(0, speed);
	14780	+ }
14037	14781	else
14038		- manipCamera.BackForth(0, speed*delta, getWidth());
14039		- */
	14782	+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
	14783	+ /**/
14040	14784	if ((mod & SHIFT) == SHIFT)
14041	14785	{
14042	14786	mouseMode = mouseMode;
..	..	@@ -14045,6 +14789,8 @@
14045	14789	mouseMode \|= BACKFORTH;
14046	14790	}
14047	14791
	14792	+ targetLookAt.set(manipCamera.lookAt);
	14793	+
14048	14794	//prevX = X = anchorX;
14049	14795	prevY = Y = anchorY + (int) (renderCamera.Distance());
14050	14796	}
..	..	@@ -14052,12 +14798,17 @@
14052	14798	void GoLeft(int mod)
14053	14799	{
14054	14800	MODIFIERS \|= COMMAND;
14055		- /*
	14801	+ /**/
14056	14802	if((mod&SHIFT) == SHIFT)
14057		- manipCamera.RotatePosition(speed, 0);
	14803	+ manipCamera.Translate(speed*delta, 0, getWidth());
14058	14804	else
14059		- manipCamera.Translate(speed*delta, 0, getWidth());
14060		- */
	14805	+ {
	14806	+ if ((mouseMode&VR)!=0)
	14807	+ manipCamera.RotateInterest(-speed, 0);
	14808	+ else
	14809	+ manipCamera.RotatePosition(speed, 0);
	14810	+ }
	14811	+ /**/
14061	14812	if ((mod & SHIFT) == SHIFT)
14062	14813	{
14063	14814	mouseMode = mouseMode;
..	..	@@ -14066,6 +14817,8 @@
14066	14817	mouseMode \|= ROTATE;
14067	14818	} // TRANSLATE;
14068	14819
	14820	+ targetLookAt.set(manipCamera.lookAt);
	14821	+
14069	14822	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
14070	14823	prevY = Y = anchorY;
14071	14824	}
..	..	@@ -14073,12 +14826,18 @@
14073	14826	void GoRight(int mod)
14074	14827	{
14075	14828	MODIFIERS \|= COMMAND;
14076		- /*
	14829	+ /**/
14077	14830	if((mod&SHIFT) == SHIFT)
14078		- manipCamera.RotatePosition(-speed, 0);
	14831	+ manipCamera.Translate(-speed*delta, 0, getWidth());
14079	14832	else
14080		- manipCamera.Translate(-speed*delta, 0, getWidth());
14081		- */
	14833	+ {
	14834	+ if ((mouseMode&VR)!=0)
	14835	+ manipCamera.RotateInterest(speed, 0);
	14836	+ else
	14837	+ manipCamera.RotatePosition(-speed, 0);
	14838	+ }
	14839	+
	14840	+ /**/
14082	14841	if ((mod & SHIFT) == SHIFT)
14083	14842	{
14084	14843	mouseMode = mouseMode;
..	..	@@ -14087,6 +14846,8 @@
14087	14846	mouseMode \|= ROTATE;
14088	14847	} // TRANSLATE;
14089	14848
	14849	+ targetLookAt.set(manipCamera.lookAt);
	14850	+
14090	14851	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
14091	14852	prevY = Y = anchorY;
14092	14853	}
..	..	@@ -14096,7 +14857,7 @@
14096	14857	int X, Y;
14097	14858	boolean SX, SY;
14098	14859
14099		- void drag(int x, int y, int modifiers)
	14860	+ void drag(int x, int y, int modifiers, int modifiersex)
14100	14861	{
14101	14862	if (IsFrozen())
14102	14863	{
..	..	@@ -14105,17 +14866,17 @@
14105	14866
14106	14867	drag = true; // NEW
14107	14868
14108		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14869	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
14109	14870
14110	14871	X = x;
14111	14872	Y = y;
14112	14873	// floating state for animation
14113		- MODIFIERS = modifiers;
14114		- modifiers &= ~1024;
	14874	+ MODIFIERS = modifiersex;
	14875	+ modifiersex &= ~1024;
14115	14876	if (false) // modifiers != 0)
14116	14877	{
14117	14878	//new Exception().printStackTrace();
14118		- System.out.println("mouseDragged: " + modifiers);
	14879	+ System.out.println("mouseDragged: " + modifiersex);
14119	14880	System.out.println("SHIFT = " + SHIFT);
14120	14881	System.out.println("CONTROL = " + COMMAND);
14121	14882	System.out.println("META = " + META);
..	..	@@ -14128,14 +14889,16 @@
14128	14889	if (editObj)
14129	14890	{
14130	14891	drag = true;
14131		- ClickInfo info = new ClickInfo();
14132		- info.bounds.setBounds(0, 0,
	14892	+ //ClickInfo info = new ClickInfo();
	14893	+ object.clickInfo.bounds.setBounds(0, 0,
14133	14894	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14134		- info.pane = this;
14135		- info.camera = renderCamera;
14136		- info.x = x;
14137		- info.y = y;
14138		- object.editWindow.copy.doEditDrag(info);
	14895	+ object.clickInfo.pane = this;
	14896	+ object.clickInfo.camera = renderCamera;
	14897	+ object.clickInfo.x = x;
	14898	+ object.clickInfo.y = y;
	14899	+ object //.GetWindow().copy
	14900	+ .doEditDrag(//info,
	14901	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14139	14902	} else
14140	14903	{
14141	14904	if (x < startX)
..	..	@@ -14284,23 +15047,27 @@
14284	15047	}
14285	15048	}
14286	15049
	15050	+// ClickInfo clickInfo = new ClickInfo();
	15051	+
14287	15052	public void mouseMoved(MouseEvent e)
14288	15053	{
14289	15054	//System.out.println("mouseMoved: " + e);
14290		-
14291	15055	if (isRenderer)
14292	15056	return;
14293	15057
14294		- ClickInfo ci = new ClickInfo();
14295		- ci.x = e.getX();
14296		- ci.y = e.getY();
14297		- ci.modifiers = e.getModifiersEx();
14298		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14299		- ci.pane = this;
14300		- ci.camera = renderCamera;
	15058	+ // Mouse cursor feedback
	15059	+ object.clickInfo.x = e.getX();
	15060	+ object.clickInfo.y = e.getY();
	15061	+ object.clickInfo.modifiers = e.getModifiersEx();
	15062	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	15063	+ object.clickInfo.pane = this;
	15064	+ object.clickInfo.camera = renderCamera;
14301	15065	if (!isRenderer)
14302	15066	{
14303		- if (object.editWindow.copy.doEditClick(ci, 0))
	15067	+ //ObjEditor editWindow = object.editWindow;
	15068	+ //Object3D copy = editWindow.copy;
	15069	+ if (object.doEditClick(//clickInfo,
	15070	+ 0))
14304	15071	{
14305	15072	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14306	15073	} else
..	..	@@ -14312,7 +15079,11 @@
14312	15079
14313	15080	public void mouseReleased(MouseEvent e)
14314	15081	{
	15082	+ Globals.MOUSEDRAGGED = false;
	15083	+
14315	15084	movingcamera = false;
	15085	+ X = 0; // getBounds().width/2;
	15086	+ Y = 0; // getBounds().height/2;
14316	15087	//System.out.println("mouseReleased: " + e);
14317	15088	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14318	15089	}
..	..	@@ -14335,9 +15106,9 @@
14335	15106	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14336	15107	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14337	15108
14338		- if (control \|\| command \|\| IsFrozen())
	15109	+// No delay if (control \|\| command \|\| IsFrozen())
14339	15110	timeout = true;
14340		- else
	15111	+// ?? May 2019 else
14341	15112	// timer.setDelay((modifiers & 128) != 0?0:350);
14342	15113	mouseDown = false;
14343	15114	if (!control && !command) // june 2013
..	..	@@ -14447,7 +15218,7 @@
14447	15218	System.out.println("keyReleased: " + e);
14448	15219	}
14449	15220
14450		- void SetMouseMode(int modifiers)
	15221	+ void SetMouseMode(int modifiers, int modifiersex)
14451	15222	{
14452	15223	//System.out.println("SetMouseMode = " + modifiers);
14453	15224	//modifiers &= ~1024;
..	..	@@ -14459,25 +15230,25 @@
14459	15230	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14460	15231	// return;
14461	15232	//System.out.println("SetMode = " + modifiers);
14462		- if ((modifiers & WHEEL) == WHEEL)
	15233	+ if ((modifiersex & WHEEL) == WHEEL)
14463	15234	{
14464	15235	mouseMode \|= ZOOM;
14465	15236	}
14466	15237
14467	15238	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14468		- if (capsLocked \|\| (modifiers & META) == META)
	15239	+ if (capsLocked) // \|\| (modifiers & META) == META)
14469	15240	{
14470	15241	mouseMode \|= VR; // BACKFORTH;
14471	15242	}
14472		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	15243	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14473	15244	{
14474	15245	mouseMode \|= SELECT;
14475	15246	}
14476		- if ((modifiers & COMMAND) == COMMAND)
	15247	+ if ((modifiersex & COMMAND) == COMMAND)
14477	15248	{
14478	15249	mouseMode \|= SELECT;
14479	15250	}
14480		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	15251	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14481	15252	{
14482	15253	mouseMode &= ~VR;
14483	15254	mouseMode \|= TRANSLATE;
..	..	@@ -14506,7 +15277,7 @@
14506	15277
14507	15278	if (isRenderer) //
14508	15279	{
14509		- SetMouseMode(modifiers);
	15280	+ SetMouseMode(0, modifiers);
14510	15281	}
14511	15282
14512	15283	Globals.theRenderer.keyPressed(key);
..	..	@@ -14568,7 +15339,8 @@
14568	15339	// break;
14569	15340	case 'T':
14570	15341	CACHETEXTURE ^= true;
14571		- textures.clear();
	15342	+ texturepigment.clear();
	15343	+ texturebump.clear();
14572	15344	// repaint();
14573	15345	break;
14574	15346	case 'Y':
..	..	@@ -14578,8 +15350,8 @@
14578	15350	case 'K':
14579	15351	KOMPACTTEXTURE ^= true;
14580	15352	//textures.clear();
14581		- break;
14582		- case 'P': // Texture Projection macros
	15353	+ // break;
	15354	+ //case 'P': // Texture Projection macros
14583	15355	// SAVETEXTURE ^= true;
14584	15356	macromode = true;
14585	15357	Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
..	..	@@ -14653,7 +15425,9 @@
14653	15425	case 'E' : COMPACT ^= true;
14654	15426	repaint();
14655	15427	break;
14656		- case 'W' : DEBUGHSB ^= true;
	15428	+ case 'W' : // Wide Window (fullscreen)
	15429	+ //DEBUGHSB ^= true;
	15430	+ ObjEditor.theFrame.ToggleFullScreen();
14657	15431	repaint();
14658	15432	break;
14659	15433	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14678,8 +15452,8 @@
14678	15452	RevertCamera();
14679	15453	repaint();
14680	15454	break;
14681		- case 'L':
14682	15455	case 'l':
	15456	+ //case 'L':
14683	15457	if (lightMode)
14684	15458	{
14685	15459	lightMode = false;
..	..	@@ -14698,7 +15472,7 @@
14698	15472	targetLookAt.set(manipCamera.lookAt);
14699	15473	repaint();
14700	15474	break;
14701		- case 'p':
	15475	+ case 'P': // p':
14702	15476	// c'est quoi ca au juste? spherical ^= true;
14703	15477	Skinshader ^= true; programInitialized = false;
14704	15478	repaint();
..	..	@@ -14736,27 +15510,31 @@
14736	15510	repaint();
14737	15511	break;
14738	15512	case 'O':
14739		- Globals.drawMode = OCCLUSION; // WARNING
	15513	+ // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
14740	15514	repaint();
14741	15515	break;
14742	15516	case 'o':
14743	15517	OCCLUSION_CULLING ^= true;
14744	15518	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14745	15519	break;
14746		- case '0': envyoff ^= true; repaint(); break;
	15520	+ //case '0': envyoff ^= true; repaint(); break;
14747	15521	case '1':
14748	15522	case '2':
14749	15523	case '3':
14750	15524	case '4':
14751	15525	case '5':
14752		- newenvy = Character.getNumericValue(key);
14753		- repaint();
14754		- break;
14755	15526	case '6':
14756	15527	case '7':
14757	15528	case '8':
14758	15529	case '9':
14759		- BGcolor = (key - '6')/3.f;
	15530	+ if (true) // envyoff)
	15531	+ {
	15532	+ BGcolor = (key - '1')/8.f;
	15533	+ }
	15534	+ else
	15535	+ {
	15536	+ //newenvy = Character.getNumericValue(key);
	15537	+ }
14760	15538	repaint();
14761	15539	break;
14762	15540	case '!':
..	..	@@ -14822,9 +15600,9 @@
14822	15600	case '_':
14823	15601	kompactbit = 5;
14824	15602	break;
14825		- case '+':
14826		- kompactbit = 6;
14827		- break;
	15603	+// case '+':
	15604	+// kompactbit = 6;
	15605	+// break;
14828	15606	case ' ':
14829	15607	lightMode ^= true;
14830	15608	Globals.lighttouched = true;
..	..	@@ -14836,13 +15614,14 @@
14836	15614	case ESC:
14837	15615	RENDERPROGRAM += 1;
14838	15616	RENDERPROGRAM %= 3;
	15617	+
14839	15618	repaint();
14840	15619	break;
14841	15620	case 'Z':
14842	15621	//RESIZETEXTURE ^= true;
14843	15622	//break;
14844	15623	case 'z':
14845		- RENDERSHADOW ^= true;
	15624	+ Globals.RENDERSHADOW ^= true;
14846	15625	Globals.lighttouched = true;
14847	15626	repaint();
14848	15627	break;
..	..	@@ -14875,8 +15654,9 @@
14875	15654	case DELETE:
14876	15655	ClearSelection();
14877	15656	break;
14878		- /*
14879	15657	case '+':
	15658	+
	15659	+ /*
14880	15660	//fontsize += 1;
14881	15661	bbzoom *= 2;
14882	15662	repaint();
..	..	@@ -14893,17 +15673,17 @@
14893	15673	case '=':
14894	15674	IncDepth();
14895	15675	//fontsize += 1;
14896		- object.editWindow.refreshContents(true);
	15676	+ object.GetWindow().refreshContents(true);
14897	15677	maskbit = 6;
14898	15678	break;
14899	15679	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14900	15680	DecDepth();
14901	15681	maskbit = 5;
14902	15682	//if(fontsize > 1) fontsize -= 1;
14903		- if (object.editWindow == null)
14904		- new Exception().printStackTrace();
14905		- else
14906		- object.editWindow.refreshContents(true);
	15683	+// if (object.editWindow == null)
	15684	+// new Exception().printStackTrace();
	15685	+// else
	15686	+ object.GetWindow().refreshContents(true);
14907	15687	break;
14908	15688	case '{':
14909	15689	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14966,7 +15746,7 @@
14966	15746	//mode = ROTATE;
14967	15747	if ((MODIFIERS & COMMAND) == 0) // VR??
14968	15748	{
14969		- SetMouseMode(modifiers);
	15749	+ SetMouseMode(0, modifiers);
14970	15750	}
14971	15751	}
14972	15752
..	..	@@ -15100,8 +15880,9 @@
15100	15880
15101	15881	protected void processMouseMotionEvent(MouseEvent e)
15102	15882	{
15103		- //System.out.println("processMouseMotionEvent: " + mouseMode);
15104		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15883	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15884	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15885	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
15105	15886	{
15106	15887	mouseMoved(e);
15107	15888	} else
..	..	@@ -15126,11 +15907,12 @@
15126	15907	}
15127	15908	*/
15128	15909
15129		- object.editWindow.EditSelection();
	15910	+ object.GetWindow().EditSelection(false);
15130	15911	}
15131	15912
15132	15913	void SelectParent()
15133	15914	{
	15915	+ new Exception().printStackTrace();
15134	15916	System.exit(0);
15135	15917	Composite group = (Composite) object;
15136	15918	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -15142,10 +15924,10 @@
15142	15924	{
15143	15925	//selectees.remove(i);
15144	15926	System.out.println("select parent of " + elem);
15145		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15927	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15146	15928	} else
15147	15929	{
15148		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15930	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15149	15931	}
15150	15932
15151	15933	first = false;
..	..	@@ -15154,6 +15936,7 @@
15154	15936
15155	15937	void SelectChildren()
15156	15938	{
	15939	+ new Exception().printStackTrace();
15157	15940	System.exit(0);
15158	15941	/*
15159	15942	Composite group = (Composite) object;
..	..	@@ -15186,12 +15969,12 @@
15186	15969	for (int j = 0; j < group.children.size(); j++)
15187	15970	{
15188	15971	elem = (Object3D) group.children.elementAt(j);
15189		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15972	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15190	15973	first = false;
15191	15974	}
15192	15975	} else
15193	15976	{
15194		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15977	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15195	15978	}
15196	15979
15197	15980	first = false;
..	..	@@ -15202,21 +15985,21 @@
15202	15985	{
15203	15986	//Composite group = (Composite) object;
15204	15987	Object3D group = object;
15205		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15988	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15206	15989	}
15207	15990
15208	15991	void ResetTransform(int mask)
15209	15992	{
15210	15993	//Composite group = (Composite) object;
15211	15994	Object3D group = object;
15212		- group.editWindow.ResetTransform(mask);
	15995	+ group.GetWindow().ResetTransform(mask);
15213	15996	}
15214	15997
15215	15998	void FlipTransform()
15216	15999	{
15217	16000	//Composite group = (Composite) object;
15218	16001	Object3D group = object;
15219		- group.editWindow.FlipTransform();
	16002	+ group.GetWindow().FlipTransform();
15220	16003	// group.editWindow.ReduceMesh(true);
15221	16004	}
15222	16005
..	..	@@ -15224,7 +16007,7 @@
15224	16007	{
15225	16008	//Composite group = (Composite) object;
15226	16009	Object3D group = object;
15227		- group.editWindow.PrintMemory();
	16010	+ group.GetWindow().PrintMemory();
15228	16011	// group.editWindow.ReduceMesh(true);
15229	16012	}
15230	16013
..	..	@@ -15232,7 +16015,7 @@
15232	16015	{
15233	16016	//Composite group = (Composite) object;
15234	16017	Object3D group = object;
15235		- group.editWindow.ResetCentroid();
	16018	+ group.GetWindow().ResetCentroid();
15236	16019	}
15237	16020
15238	16021	void IncDepth()
..	..	@@ -15314,11 +16097,11 @@
15314	16097
15315	16098	int width = getBounds().width;
15316	16099	int height = getBounds().height;
15317		- ClickInfo info = new ClickInfo();
15318		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15319	16100	//Image img = CreateImage(width, height);
15320	16101	//System.out.println("width = " + width + "; height = " + height + "\n");
	16102	+
15321	16103	Graphics gr = g; // img.getGraphics();
	16104	+
15322	16105	if (!hasMarquee)
15323	16106	{
15324	16107	if (Xmin < Xmax) // !locked)
..	..	@@ -15390,44 +16173,92 @@
15390	16173	}
15391	16174	if (object != null && !hasMarquee)
15392	16175	{
	16176	+ if (object.clickInfo == null)
	16177	+ object.clickInfo = new ClickInfo();
	16178	+ ClickInfo info = object.clickInfo;
	16179	+ //ClickInfo info = new ClickInfo();
	16180	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16181	+
15393	16182	if (isRenderer)
15394	16183	{
15395		- info.flags++;
	16184	+ object.clickInfo.flags++;
15396	16185	double frameAspect = (double) width / (double) height;
15397	16186	if (frameAspect > renderCamera.aspect)
15398	16187	{
15399	16188	int desired = (int) ((double) height * renderCamera.aspect);
15400		- info.bounds.width -= width - desired;
15401		- info.bounds.x += (width - desired) / 2;
	16189	+ object.clickInfo.bounds.width -= width - desired;
	16190	+ object.clickInfo.bounds.x += (width - desired) / 2;
15402	16191	} else
15403	16192	{
15404	16193	int desired = (int) ((double) width / renderCamera.aspect);
15405		- info.bounds.height -= height - desired;
15406		- info.bounds.y += (height - desired) / 2;
	16194	+ object.clickInfo.bounds.height -= height - desired;
	16195	+ object.clickInfo.bounds.y += (height - desired) / 2;
15407	16196	}
15408	16197	}
15409		- info.g = gr;
15410		- info.camera = renderCamera;
	16198	+
	16199	+ object.clickInfo.g = gr;
	16200	+ object.clickInfo.camera = renderCamera;
15411	16201	/*
15412	16202	// Memory intensive (brep.verticescopy)
15413	16203	if (!(object instanceof Composite))
15414	16204	object.draw(info, 0, false); // SLOW :
15415	16205	*/
15416		- if (!isRenderer)
	16206	+ if (!isRenderer) // && drag)
15417	16207	{
15418		- object.drawEditHandles(info, 0);
	16208	+ Grafreed.Assert(object != null);
	16209	+ Grafreed.Assert(object.selection != null);
	16210	+ if (object.selection.Size() > 0)
	16211	+ {
	16212	+ int hitSomething = object.selection.get(0).hitSomething;
	16213	+
	16214	+ object.clickInfo.DX = 0;
	16215	+ object.clickInfo.DY = 0;
	16216	+ object.clickInfo.W = 1;
	16217	+ if (hitSomething == Object3D.hitCenter)
	16218	+ {
	16219	+ info.DX = X;
	16220	+ if (X != 0)
	16221	+ info.DX -= info.bounds.width/2;
	16222	+
	16223	+ info.DY = Y;
	16224	+ if (Y != 0)
	16225	+ info.DY -= info.bounds.height/2;
	16226	+ }
	16227	+
	16228	+ object.drawEditHandles(//info,
	16229	+ 0);
	16230	+
	16231	+ if (drag && (X != 0 \|\| Y != 0))
	16232	+ {
	16233	+ switch (hitSomething)
	16234	+ {
	16235	+ case Object3D.hitCenter: gr.setColor(Color.white);
	16236	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16237	+ break;
	16238	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16239	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16240	+ break;
	16241	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16242	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16243	+ break;
	16244	+ }
	16245	+
	16246	+ }
	16247	+ }
15419	16248	}
15420	16249	}
	16250	+
15421	16251	if (isRenderer)
15422	16252	{
15423	16253	//gr.setColor(Color.black);
15424	16254	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15425	16255	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15426	16256	}
	16257	+
15427	16258	if (hasMarquee)
15428	16259	{
15429	16260	gr.setXORMode(Color.white);
15430		- gr.setColor(Color.red);
	16261	+ gr.setColor(Color.white);
15431	16262	if (!firstime)
15432	16263	{
15433	16264	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -15536,6 +16367,7 @@
15536	16367	public boolean mouseDown(Event evt, int x, int y)
15537	16368	{
15538	16369	System.out.println("mouseDown: " + evt);
	16370	+ System.exit(0);
15539	16371	/*
15540	16372	locked = true;
15541	16373	drag = false;
..	..	@@ -15579,7 +16411,7 @@
15579	16411	{
15580	16412	keyPressed(0, modifiers);
15581	16413	}
15582		- clickStart(x, y, modifiers);
	16414	+ // clickStart(x, y, modifiers);
15583	16415	return true;
15584	16416	}
15585	16417
..	..	@@ -15697,7 +16529,7 @@
15697	16529	{
15698	16530	keyReleased(0, 0);
15699	16531	}
15700		- drag(x, y, modifiers);
	16532	+ drag(x, y, 0, modifiers);
15701	16533	return true;
15702	16534	}
15703	16535
..	..	@@ -15829,7 +16661,7 @@
15829	16661	Object3D object;
15830	16662	static Object3D trackedobject;
15831	16663	Camera renderCamera; // Light or Eye (or Occlusion)
15832		- /static/ Camera manipCamera; // Light or Eye
	16664	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15833	16665	/static/ Camera eyeCamera;
15834	16666	/static/ Camera lightCamera;
15835	16667	int cameracount;
..	..	@@ -15893,6 +16725,8 @@
15893	16725	private /static/ boolean firstime;
15894	16726	private /static/ cVector newView = new cVector();
15895	16727	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16728	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16729	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
15896	16730	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
15897	16731	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
15898	16732	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -15905,29 +16739,67 @@
15905	16739	{
15906	16740	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
15907	16741
	16742	+ int usedsuf = 0;
	16743	+
15908	16744	for (int i = 0; i < suffixes.length; i++)
15909	16745	{
15910		- String resourceName = basename + suffixes[i] + "." + suffix;
15911		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
15912		- mipmapped,
15913		- FileUtil.getFileSuffix(resourceName));
15914		- if (data == null)
	16746	+ String[] suffixe = suffixes;
	16747	+ String[] fallback = suffixes2;
	16748	+ String[] fallfallback = suffixes3;
	16749	+
	16750	+ for (int c=usedsuf; --c>=0;)
15915	16751	{
15916		- throw new IOException("Unable to load texture " + resourceName);
	16752	+// String[] temp = suffixe;
	16753	+// suffixe = fallback;
	16754	+// fallback = fallfallback;
	16755	+// fallfallback = temp;
15917	16756	}
	16757	+
	16758	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16759	+ TextureData data;
	16760	+
	16761	+ try
	16762	+ {
	16763	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16764	+ mipmapped,
	16765	+ FileUtil.getFileSuffix(resourceName));
	16766	+ }
	16767	+ catch (Exception e)
	16768	+ {
	16769	+ try
	16770	+ {
	16771	+ resourceName = basename + fallback[i] + "." + suffix;
	16772	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16773	+ mipmapped,
	16774	+ FileUtil.getFileSuffix(resourceName));
	16775	+ }
	16776	+ catch (Exception e2)
	16777	+ {
	16778	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16779	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16780	+ mipmapped,
	16781	+ FileUtil.getFileSuffix(resourceName));
	16782	+ }
	16783	+ }
	16784	+
15918	16785	//System.out.println("Target = " + targets[i]);
15919	16786	cubemap.updateImage(data, targets[i]);
15920	16787	}
15921	16788
15922	16789	return cubemap;
15923	16790	}
	16791	+
15924	16792	int bigsphere = -1;
15925	16793
15926	16794	float BGcolor = 0.5f;
15927	16795
15928		- private void DrawSkyBox(GL gl)
	16796	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16797	+
	16798	+ private void DrawSkyBox(GL gl, float ratio)
15929	16799	{
15930		- if (envyoff \|\| cubemap == null)
	16800	+ if (//envyoff \|\|
	16801	+ WIREFRAME \|\|
	16802	+ cubemap == null)
15931	16803	{
15932	16804	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
15933	16805	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -15942,7 +16814,17 @@
15942	16814	// Compensates for ExaminerViewer's modification of modelview matrix
15943	16815	gl.glMatrixMode(GL.GL_MODELVIEW);
15944	16816	gl.glLoadIdentity();
	16817	+ gl.glScalef(1,ratio,1);
15945	16818
	16819	+// colorV[0] = 2;
	16820	+// colorV[1] = 2;
	16821	+// colorV[2] = 2;
	16822	+// colorV[3] = 1;
	16823	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16824	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16825	+//
	16826	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16827	+
15946	16828	//gl.glActiveTexture(GL.GL_TEXTURE1);
15947	16829	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
15948	16830
..	..	@@ -15974,6 +16856,7 @@
15974	16856	{
15975	16857	gl.glScalef(1.0f, -1.0f, 1.0f);
15976	16858	}
	16859	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
15977	16860	gl.glMultMatrixd(viewrot_1, 0);
15978	16861	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
15979	16862	//viewer.updateInverseRotation(gl);
..	..	@@ -16014,7 +16897,8 @@
16014	16897	gl.glDisable(GL.GL_TEXTURE_GEN_R);
16015	16898
16016	16899	cubemap.disable();
16017		- ////cubemap.unbind();
	16900	+ //cubemap.dispose();
	16901	+
16018	16902	if (CULLFACE)
16019	16903	{
16020	16904	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -16070,7 +16954,7 @@
16070	16954	gl.glScalef(1.0f, -1.0f, 1.0f);
16071	16955	}
16072	16956
16073		- gl.glNormal3f(0.0f, 0.0f, 1.0f);
	16957	+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
16074	16958
16075	16959	float step = 2; // 0.1666f; //0.25f;
16076	16960	float stepv = 2; // step * 1652 / 998;
..	..	@@ -16114,16 +16998,16 @@
16114	16998	cStatic.objectstack[materialdepth++] = checker;
16115	16999	//System.out.println("material " + material);
16116	17000	//Applet3D.tracein(this, selected);
16117		- vector2buffer = checker.projectedVertices;
	17001	+ //vector2buffer = checker.projectedVertices;
16118	17002
16119	17003	//checker.GetMaterial().Draw(this, false); // true);
16120		- DrawMaterial(checker.GetMaterial(), false); // true);
	17004	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16121	17005
16122	17006	materialdepth -= 1;
16123	17007	if (materialdepth > 0)
16124	17008	{
16125		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16126		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	17009	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	17010	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16127	17011	}
16128	17012	//checker.GetMaterial().opacity = 1f;
16129	17013	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16209,6 +17093,14 @@
16209	17093	}
16210	17094	}
16211	17095
	17096	+ private Object3D GetFolder()
	17097	+ {
	17098	+ Object3D folder = object.GetWindow().copy;
	17099	+ if (object.GetWindow().copy.selection.Size() > 0)
	17100	+ folder = object.GetWindow().copy.selection.elementAt(0);
	17101	+ return folder;
	17102	+ }
	17103	+
16212	17104	class SelectBuffer implements GLEventListener
16213	17105	{
16214	17106
..	..	@@ -16224,7 +17116,7 @@
16224	17116	//new Exception().printStackTrace();
16225	17117	System.out.println("select buffer init");
16226	17118	// Use debug pipeline
16227		- drawable.setGL(new DebugGL(drawable.getGL()));
	17119	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16228	17120
16229	17121	GL gl = drawable.getGL();
16230	17122
..	..	@@ -16267,6 +17159,7 @@
16267	17159	{
16268	17160	if (!selection)
16269	17161	{
	17162	+ new Exception().printStackTrace();
16270	17163	System.exit(0);
16271	17164	return;
16272	17165	}
..	..	@@ -16287,6 +17180,17 @@
16287	17180
16288	17181	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16289	17182
	17183	+ if (PAINTMODE)
	17184	+ {
	17185	+ if (object.GetWindow().copy.selection.Size() > 0)
	17186	+ {
	17187	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17188	+
	17189	+ // Make what you paint not selectable.
	17190	+ paintobj.ResetSelectable();
	17191	+ }
	17192	+ }
	17193	+
16290	17194	//int tmp = selection_view;
16291	17195	//selection_view = -1;
16292	17196	int temp = DrawMode();
..	..	@@ -16298,6 +17202,17 @@
16298	17202	// temp = DEFAULT; // patch for selection debug
16299	17203	Globals.drawMode = temp; // WARNING
16300	17204
	17205	+ if (PAINTMODE)
	17206	+ {
	17207	+ if (object.GetWindow().copy.selection.Size() > 0)
	17208	+ {
	17209	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17210	+
	17211	+ // Revert.
	17212	+ paintobj.RestoreSelectable();
	17213	+ }
	17214	+ }
	17215	+
16301	17216	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16302	17217
16303	17218	// trying different ways of getting the depth info over
..	..	@@ -16345,6 +17260,8 @@
16345	17260	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16346	17261	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16347	17262	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17263	+
	17264	+ CreateSelectedPoint();
16348	17265
16349	17266	// Will fit the mesh !!!
16350	17267	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16394,34 +17311,36 @@
16394	17311	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]));
16395	17312	}
16396	17313
16397		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	17314	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16398	17315	}
16399	17316	}
16400	17317
16401	17318	if (!movingcamera && !PAINTMODE)
16402		- object.editWindow.ScreenFitPoint(); // fev 2014
	17319	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16403	17320
16404		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17321	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16405	17322	{
16406		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17323	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16407	17324
16408		- Object3D group = new Object3D("inst" + paintcount++);
	17325	+ if (object.GetWindow().copy.selection.Size() > 0)
	17326	+ {
	17327	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16409	17328
16410		- group.CreateMaterial(); // use a void leaf to select instances
16411		-
16412		- group.add(paintobj); // link
16413		-
16414		- object.editWindow.SnapObject(group);
16415		-
16416		- Object3D folder = object.editWindow.copy;
16417		-
16418		- if (object.editWindow.copy.selection.Size() > 0)
16419		- folder = object.editWindow.copy.selection.elementAt(0);
16420		-
16421		- folder.add(group);
16422		-
16423		- object.editWindow.ResetModel();
16424		- object.editWindow.refreshContents();
	17329	+ Object3D inst = new Object3D("inst" + paintcount++);
	17330	+
	17331	+ inst.CreateMaterial(); // use a void leaf to select instances
	17332	+
	17333	+ inst.add(paintobj); // link
	17334	+
	17335	+ object.GetWindow().SnapObject(inst);
	17336	+
	17337	+ Object3D folder = paintFolder; // GetFolder();
	17338	+
	17339	+ folder.add(inst);
	17340	+
	17341	+ object.GetWindow().ResetModel();
	17342	+ object.GetWindow().refreshContents();
	17343	+ }
16425	17344	}
16426	17345	else
16427	17346	paintcount = 0;
..	..	@@ -16460,6 +17379,11 @@
16460	17379	//System.out.println("objects[color] = " + objects[color]);
16461	17380	//objects[color].Select();
16462	17381	indexcount = 0;
	17382	+ ObjEditor window = object.GetWindow();
	17383	+ if (window != null && deselect)
	17384	+ {
	17385	+ window.Select(null, deselect, true);
	17386	+ }
16463	17387	object.Select(color, deselect);
16464	17388	}
16465	17389
..	..	@@ -16510,6 +17434,7 @@
16510	17434
16511	17435	public void init(GLAutoDrawable drawable)
16512	17436	{
	17437	+ if (Globals.DEBUG)
16513	17438	System.out.println("shadow buffer init");
16514	17439
16515	17440	GL gl = drawable.getGL();
..	..	@@ -16559,7 +17484,7 @@
16559	17484	gl.glDisable(gl.GL_CULL_FACE);
16560	17485	}
16561	17486
16562		- if (!RENDERSHADOW)
	17487	+ if (!Globals.RENDERSHADOW)
16563	17488	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16564	17489
16565	17490	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16569,7 +17494,7 @@
16569	17494	//gl.glColorMask(false, false, false, false);
16570	17495
16571	17496	//render_scene_from_light_view(gl, drawable, 0, 0);
16572		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17497	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16573	17498	{
16574	17499	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16575	17500
..	..	@@ -16738,10 +17663,14 @@
16738	17663	gl.glFlush();
16739	17664
16740	17665	/**/
16741		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
	17666	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
16742	17667
16743		- float[] pixels = occlusionsizebuffer.array();
	17668	+ float[] depths = occlusiondepthbuffer.array();
16744	17669
	17670	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
	17671	+
	17672	+ int[] pixels = selectsizebuffer.array();
	17673	+
16745	17674	double r = 0, g = 0, b = 0;
16746	17675
16747	17676	double count = 0;
..	..	@@ -16752,7 +17681,7 @@
16752	17681
16753	17682	double FACTOR = 1;
16754	17683
16755		- for (int i = 0; i < pixels.length; i++)
	17684	+ for (int i = 0; i < depths.length; i++)
16756	17685	{
16757	17686	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
16758	17687	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -16835,7 +17764,7 @@
16835	17764
16836	17765	double scale = ray.z; // 1; // cos
16837	17766
16838		- float depth = pixels[newindex];
	17767	+ float depth = depths[newindex];
16839	17768
16840	17769	/*
16841	17770	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -16985,23 +17914,15 @@
16985	17914	int AAbuffersize = 0;
16986	17915
16987	17916	//double[] selectedpoint = new double[3];
16988		- static Superellipsoid selectedpoint = new Superellipsoid();
	17917	+ static Superellipsoid selectedpoint;
16989	17918	static Sphere previousselectedpoint = null;
16990		- static Sphere debugpointG = new Sphere();
16991		- static Sphere debugpointP = new Sphere();
16992		- static Sphere debugpointC = new Sphere();
16993		- static Sphere debugpointR = new Sphere();
	17919	+ static Sphere debugpointG;
	17920	+ static Sphere debugpointP;
	17921	+ static Sphere debugpointC;
	17922	+ static Sphere debugpointR;
16994	17923
16995	17924	static Sphere debugpoints[] = new Sphere[8];
16996	17925
16997		- static
16998		- {
16999		- for (int i=0; i<8; i++)
17000		- {
17001		- debugpoints[i] = new Sphere();
17002		- }
17003		- }
17004		-
17005	17926	static void InitPoints(float radius)
17006	17927	{
17007	17928	for (int i=0; i<8; i++)
..	..	@@ -17040,11 +17961,14 @@
17040	17961	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17041	17962	static IntBuffer bigAAbuffer;
17042	17963	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17043		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	17964	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17044	17965	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17045	17966	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17046	17967	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17047		- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17968	+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17969	+
	17970	+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17971	+
17048	17972	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17049	17973	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17050	17974	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();