~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -1,4 +1,5 @@
1	1
	2	+import com.bulletphysics.dynamics.RigidBody;
2	3	import java.awt.*;
3	4	import java.awt.event.*;
4	5	import java.awt.image.*;
..	..	@@ -18,7 +19,10 @@
18	19	import javax.imageio.ImageIO;
19	20	import javax.imageio.ImageWriteParam;
20	21	import javax.imageio.ImageWriter;
	22	+import javax.imageio.ImageReadParam;
	23	+import javax.imageio.ImageReader;
21	24	import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
	25	+import javax.imageio.stream.ImageInputStream;
22	26	import javax.imageio.stream.ImageOutputStream;
23	27	import javax.imageio.ImageWriteParam;
24	28
..	..	@@ -30,6 +34,7 @@
30	34	import java.nio.*;
31	35
32	36	import gleem.linalg.Mat4f;
	37	+import javax.imageio.ImageTypeSpecifier;
33	38
34	39	class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
35	40	{
..	..	@@ -37,7 +42,6 @@
37	42	static boolean[] selectedstack = new boolean[65536];
38	43	static int materialdepth = 0;
39	44
40		- static boolean DEBUG = false;
41	45	static boolean FRUSTUM = false; // still bogus true; // frustum culling
42	46
43	47	// camera change fix
..	..	@@ -45,6 +49,39 @@
45	49	static boolean ABORTED = false;
46	50
47	51	static int STEP = 1;
	52	+
	53	+ private static BufferedImage CreateBim(byte[] bytes, int width, int height)
	54	+ {
	55	+ int[] pixels = new int[bytes.length/3];
	56	+ for (int i=pixels.length; --i>=0;)
	57	+ {
	58	+ int i3 = i*3;
	59	+ pixels[i] = 0xFF;
	60	+ pixels[i] <<= 8;
	61	+ pixels[i] \|= bytes[i3+2] & 0xFF;
	62	+ pixels[i] <<= 8;
	63	+ pixels[i] \|= bytes[i3+1] & 0xFF;
	64	+ pixels[i] <<= 8;
	65	+ pixels[i] \|= bytes[i3] & 0xFF;
	66	+ }
	67	+ /*
	68	+ int r=0,g=0,b=0,a=0;
	69	+ for (int i=0; i<width; i++)
	70	+ for (int j=0; j<height; j++)
	71	+ {
	72	+ int index = j*width+i;
	73	+ int p = pixels[index];
	74	+ a = ((p>>24) & 0xFF);
	75	+ r = ((p>>16) & 0xFF);
	76	+ g = ((p>>8) & 0xFF);
	77	+ b = (p & 0xFF);
	78	+ pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
	79	+ }
	80	+ /**/
	81	+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
	82	+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	83	+ return rendImage;
	84	+ }
48	85
49	86	/static/ private boolean CULLFACE = false; // true;
50	87	/static/ boolean NEAREST = false; // true;
..	..	@@ -56,14 +93,12 @@
56	93	static int CURRENTANTIALIAS = 0; // 1;
57	94	/static/ boolean RENDERSHADOW = true;
58	95	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
59		- static boolean ANIMATION = false;
60		- static String filename;
61	96
62	97	boolean DISPLAYTEXT = false;
63	98	//boolean REDUCETEXTURE = true;
64	99	boolean CACHETEXTURE = true;
65	100	boolean CLEANCACHE = false; // true;
66		- boolean MIPMAP = false; // true;
	101	+ boolean MIPMAP = false; // true; // never works...
67	102	boolean COMPRESSTEXTURE = false;
68	103	boolean KOMPACTTEXTURE = false; // true;
69	104	boolean RESIZETEXTURE = false;
..	..	@@ -76,7 +111,11 @@
76	111	//private Mat4f spotlightTransform = new Mat4f();
77	112	//private Mat4f spotlightInverseTransform = new Mat4f();
78	113	static GLContext glcontext = null;
79		- /static/ com.sun.opengl.util.texture.Texture cubemap;
	114	+ /static/ com.sun.opengl.util.texture.Texture cubemap; // Either custom or rgb
	115	+ /static/ com.sun.opengl.util.texture.Texture cubemapcustom;
	116	+ /static/ com.sun.opengl.util.texture.Texture cubemaprgb;
	117	+ boolean transformMode;
	118	+
80	119	boolean reverseUP = false;
81	120	static boolean frozen = false;
82	121	boolean enablebackspace = false; // patch for back buffer refresh
..	..	@@ -85,8 +124,8 @@
85	124	static boolean LOCALTRANSFORM = false;
86	125	static boolean FULLSCREEN = false;
87	126	static boolean SUPPORT = true;
88		-static boolean INERTIA = true;
89		-static boolean FAST = true; // false;
	127	+static boolean INERTIA = false; // true;
	128	+static boolean FAST = false;
90	129	static boolean SLOWPOSE = false;
91	130	static boolean FOOTCONTACT = true;
92	131
..	..	@@ -96,7 +135,7 @@
96	135	static boolean ZOOMBOXMODE = false;
97	136	static boolean BOXMODE = false;
98	137	static boolean IMAGEFLIP = false;
99		-static boolean SMOOTHFOCUS = false;
	138	+static boolean SMOOTHFOCUS = true; // false;
100	139	static boolean SPEAKERMOCAP = true; // jan 2014 false;
101	140	static boolean SPEAKERCAMERA = false;
102	141	static boolean SPEAKERFOCUS = false;
..	..	@@ -108,7 +147,7 @@
108	147	static boolean OEIL = true;
109	148	static boolean OEILONCE = false; // do oeilon then oeiloff
110	149	static boolean LOOKAT = true;
111		-static boolean RANDOM = true; // false;
	150	+static boolean SWITCH = true; // false;
112	151	static boolean HANDLES = false; // selection doesn't work!!
113	152	static boolean PAINTMODE = false;
114	153
..	..	@@ -130,16 +169,16 @@
130	169
131	170
132	171	// OPTIONS
133		- boolean Skinshader = true;
	172	+ boolean Skinshader = false; // true;
134	173	boolean cameraLight = false;
135	174	boolean UVdebug = false;
136	175	boolean Udebug = false;
137	176	boolean Vdebug = false;
138	177	boolean NORMALdebug = false;
139		- static boolean doublesided = false; // true; // reversed normals are awful for conformance
	178	+ static boolean doublesided = true; // false; // reversed normals are awful for conformance
140	179	boolean anisotropy = true;
141	180	boolean softshadow = true; // slower but better false;
142		- boolean opacityhalo = false;
	181	+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
143	182
144	183	boolean macromode = false;
145	184
..	..	@@ -150,6 +189,21 @@
150	189	defaultcaps.setAccumGreenBits(16);
151	190	defaultcaps.setAccumBlueBits(16);
152	191	defaultcaps.setAccumAlphaBits(16);
	192	+ }
	193	+
	194	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	195	+
	196	+ public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	197	+ {
	198	+ try
	199	+ {
	200	+ return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	201	+ } catch (IOException e)
	202	+ {
	203	+ System.out.println("NAME = " + name);
	204	+ e.printStackTrace(); // throw new RuntimeException(e);
	205	+ return null;
	206	+ }
153	207	}
154	208
155	209	void SetAsGLRenderer(boolean b)
..	..	@@ -168,9 +222,10 @@
168	222	cameras = new Camera[2];
169	223	targetLookAts = new cVector[2];
170	224
171		- SetCamera(cam);
	225	+ SetCamera(cam, true);
172	226
173		- SetLight(new Camera(new cVector(10, 10, -20)));
	227	+ // Warning: not used.
	228	+ //SetLight(new Camera(new cVector(15, 10, -20)));
174	229
175	230	object = o;
176	231
..	..	@@ -195,7 +250,7 @@
195	250
196	251	public javax.media.opengl.GL GetGL0()
197	252	{
198		- return null;
	253	+ return currentGL;
199	254	}
200	255
201	256	public int GenList()
..	..	@@ -327,7 +382,7 @@
327	382	cStatic.objectstack[materialdepth++] = obj;
328	383	//System.out.println("material " + material);
329	384	//Applet3D.tracein(this, selected);
330		- display.vector2buffer = obj.projectedVertices;
	385	+ //display.vector2buffer = obj.projectedVertices;
331	386	if (obj instanceof Camera)
332	387	{
333	388	display.options1[0] = material.shift;
..	..	@@ -336,14 +391,28 @@
336	391	display.options1[2] = material.shadowbias;
337	392	display.options1[3] = material.aniso;
338	393	display.options1[4] = material.anisoV;
	394	+// System.out.println("display.options1[0] " + display.options1[0]);
	395	+// System.out.println("display.options1[1] " + display.options1[1]);
	396	+// System.out.println("display.options1[2] " + display.options1[2]);
	397	+// System.out.println("display.options1[3] " + display.options1[3]);
	398	+// System.out.println("display.options1[4] " + display.options1[4]);
339	399	display.options2[0] = material.opacity;
340	400	display.options2[1] = material.diffuse;
341	401	display.options2[2] = material.factor;
	402	+// System.out.println("display.options2[0] " + display.options2[0]);
	403	+// System.out.println("display.options2[1] " + display.options2[1]);
	404	+// System.out.println("display.options2[2] " + display.options2[2]);
342	405
343	406	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	407	+// System.out.println("display.options3[0] " + display.options3[0]);
	408	+// System.out.println("display.options3[1] " + display.options3[1]);
	409	+// System.out.println("display.options3[2] " + display.options3[2]);
344	410	display.options4[0] = material.cameralight/0.2f;
345	411	display.options4[1] = material.subsurface;
346	412	display.options4[2] = material.sheen;
	413	+// System.out.println("display.options4[0] " + display.options4[0]);
	414	+// System.out.println("display.options4[1] " + display.options4[1]);
	415	+// System.out.println("display.options4[2] " + display.options4[2]);
347	416
348	417	// if (display.CURRENTANTIALIAS > 0)
349	418	// display.options3[3] /= 4;
..	..	@@ -359,7 +428,7 @@
359	428	/**/
360	429	} else
361	430	{
362		- DrawMaterial(material, selected);
	431	+ DrawMaterial(material, selected, obj.projectedVertices);
363	432	}
364	433	} else
365	434	{
..	..	@@ -383,8 +452,8 @@
383	452	cStatic.objectstack[materialdepth++] = obj;
384	453	//System.out.println("material " + material);
385	454	//Applet3D.tracein("selected ", selected);
386		- display.vector2buffer = obj.projectedVertices;
387		- display.DrawMaterial(material, selected);
	455	+ //display.vector2buffer = obj.projectedVertices;
	456	+ display.DrawMaterial(material, selected, obj.projectedVertices);
388	457	}
389	458	}
390	459
..	..	@@ -401,8 +470,8 @@
401	470	materialdepth -= 1;
402	471	if (materialdepth > 0)
403	472	{
404		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
405		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	473	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	474	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
406	475	}
407	476	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
408	477	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -422,8 +491,8 @@
422	491	materialdepth -= 1;
423	492	if (materialdepth > 0)
424	493	{
425		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
426		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	494	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	495	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
427	496	}
428	497	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
429	498	//else
..	..	@@ -464,15 +533,18 @@
464	533	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
465	534	{
466	535	//gl.glBegin(gl.GL_TRIANGLES);
467		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	536	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	537	+ // TEST LIVE NORMALS && !obj.dontselect
	538	+ ;
468	539	if (!hasnorm)
469	540	{
470		- // System.out.println("FUCK!!");
	541	+ // System.out.println("Mesh normal");
471	542	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
472	543	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
473	544	LA.vecCross(obj.v0, obj.v1, obj.v2);
474	545	LA.vecNormalize(obj.v2);
475		- gl.glNormal3f((float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
	546	+
	547	+ SetGLNormal(gl, (float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
476	548	}
477	549
478	550	// P
..	..	@@ -494,7 +566,7 @@
494	566	y += ny * obj.NORMALPUSH;
495	567	z += nz * obj.NORMALPUSH;
496	568
497		- gl.glNormal3f(nx, ny, nz);
	569	+ SetGLNormal(gl, nx, ny, nz);
498	570	}
499	571	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
500	572	SetColor(obj, pv);
..	..	@@ -526,7 +598,7 @@
526	598	y += ny * obj.NORMALPUSH;
527	599	z += nz * obj.NORMALPUSH;
528	600
529		- gl.glNormal3f(nx, ny, nz);
	601	+ SetGLNormal(gl, nx, ny, nz);
530	602	}
531	603	//System.out.println("vertexq = " + qv.s + ", " + qv.t);
532	604	// boolean locked = false;
..	..	@@ -574,7 +646,7 @@
574	646	y += ny * obj.NORMALPUSH;
575	647	z += nz * obj.NORMALPUSH;
576	648
577		- gl.glNormal3f(nx, ny, nz);
	649	+ SetGLNormal(gl, nx, ny, nz);
578	650	}
579	651
580	652	// if ((dot&4) == 0)
..	..	@@ -810,7 +882,7 @@
810	882	//// tris.postdraw(this);
811	883	}
812	884
813		- static Camera localcamera = new Camera();
	885	+ static Camera localAOcamera = new Camera();
814	886	static cVector from = new cVector();
815	887	static cVector to = new cVector();
816	888
..	..	@@ -819,7 +891,7 @@
819	891	CameraPane cp = this;
820	892
821	893	Camera keep = cp.RenderCamera();
822		- cp.renderCamera = localcamera;
	894	+ cp.renderCamera = localAOcamera;
823	895
824	896	if (br.trimmed)
825	897	{
..	..	@@ -837,7 +909,7 @@
837	909	br.positions[i3 + 2] + br.normals[i3 + 2]);
838	910	LA.xformPos(from, transform, from);
839	911	LA.xformPos(to, transform, to); // RIGID ONLY
840		- localcamera.setAim(from, to);
	912	+ localAOcamera.setAim(from, to);
841	913
842	914	CameraPane.occlusionbuffer.display();
843	915
..	..	@@ -871,7 +943,7 @@
871	943	to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
872	944	LA.xformPos(from, transform, from);
873	945	LA.xformPos(to, transform, to); // RIGID ONLY
874		- localcamera.setAim(from, to);
	946	+ localAOcamera.setAim(from, to);
875	947
876	948	CameraPane.occlusionbuffer.display();
877	949
..	..	@@ -1180,10 +1252,10 @@
1180	1252	{
1181	1253	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1182	1254	{
1183		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1255	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1184	1256	} else
1185	1257	{
1186		- gl.glNormal3f(0, 0, 1);
	1258	+ SetGLNormal(gl, 0, 0, 1);
1187	1259	}
1188	1260
1189	1261	if (c != null)
..	..	@@ -1192,10 +1264,12 @@
1192	1264	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1193	1265	}
1194	1266	}
	1267	+
1195	1268	if (flipV)
1196	1269	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1197	1270	else
1198	1271	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1272	+
1199	1273	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1200	1274	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1201	1275
..	..	@@ -1205,20 +1279,22 @@
1205	1279	{
1206	1280	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1207	1281	{
1208		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1282	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1209	1283	} else
1210	1284	{
1211		- gl.glNormal3f(0, 0, 1);
	1285	+ SetGLNormal(gl, 0, 0, 1);
1212	1286	}
1213	1287	if (c != null)
1214	1288	{
1215	1289	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1216	1290	}
1217	1291	}
	1292	+
1218	1293	if (flipV)
1219	1294	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1220	1295	else
1221	1296	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1297	+
1222	1298	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1223	1299	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1224	1300
..	..	@@ -1231,10 +1307,10 @@
1231	1307	{
1232	1308	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1233	1309	{
1234		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1310	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1235	1311	} else
1236	1312	{
1237		- gl.glNormal3f(0, 0, 1);
	1313	+ SetGLNormal(gl, 0, 0, 1);
1238	1314	}
1239	1315	if (c != null)
1240	1316	{
..	..	@@ -1246,8 +1322,10 @@
1246	1322	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1247	1323	else
1248	1324	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1325	+
1249	1326	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1250	1327	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1328	+
1251	1329	count2 += 2;
1252	1330	count3 += 3;
1253	1331	}
..	..	@@ -1414,7 +1492,7 @@
1414	1492	{
1415	1493	if (!selectmode)
1416	1494	{
1417		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1495	+ SetGLNormal(gl, (float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
1418	1496	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
1419	1497
1420	1498	if (flipV)
..	..	@@ -1426,6 +1504,8 @@
1426	1504	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1427	1505	}
1428	1506
	1507	+ float[] colorV = new float[4];
	1508	+
1429	1509	void SetColor(Object3D obj, Vertex p0)
1430	1510	{
1431	1511	CameraPane display = this;
..	..	@@ -1450,7 +1530,7 @@
1450	1530	}
1451	1531	}
1452	1532	float b = 0;
1453		- if (obj.support != null && obj.link2master)
	1533	+ if (obj.support != null && obj.Link2Support())
1454	1534	{
1455	1535	b = 1;
1456	1536	}
..	..	@@ -1493,8 +1573,6 @@
1493	1573	{
1494	1574	return;
1495	1575	}
1496		-
1497		- float[] colorV = new float[3];
1498	1576
1499	1577	if (false) // marked)
1500	1578	{
..	..	@@ -1603,7 +1681,7 @@
1603	1681	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1604	1682	}
1605	1683
1606		- void DrawMaterial(cMaterial material, boolean selected)
	1684	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1607	1685	{
1608	1686	CameraPane display = this;
1609	1687	//new Exception().printStackTrace();
..	..	@@ -1630,7 +1708,7 @@
1630	1708
1631	1709	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1632	1710
1633		- float[] colorV = GrafreeD.colorV;
	1711	+ float[] colorV = Grafreed.colorV;
1634	1712
1635	1713	/**/
1636	1714	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1638,7 +1716,7 @@
1638	1716	colorV[0] = display.modelParams0[0] * material.diffuse;
1639	1717	colorV[1] = display.modelParams0[1] * material.diffuse;
1640	1718	colorV[2] = display.modelParams0[2] * material.diffuse;
1641		- colorV[3] = material.opacity;
	1719	+ colorV[3] = 1; // material.opacity;
1642	1720
1643	1721	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1644	1722	//System.out.println("Opacity = " + opacity);
..	..	@@ -1743,12 +1821,12 @@
1743	1821
1744	1822	display.modelParams7[0] = 0;
1745	1823	display.modelParams7[1] = 1000;
1746		- display.modelParams7[2] = 0;
	1824	+ display.modelParams7[2] = material.parallax;
1747	1825	display.modelParams7[3] = 0;
1748	1826
1749		- display.modelParams6[0] = 100; // criss de bug de bump
	1827	+ //display.modelParams6[0] = 100; // criss de bug de bump
1750	1828
1751		- Object3D.cVector2[] extparams = display.vector2buffer;
	1829	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1752	1830	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1753	1831	{
1754	1832	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1890,7 +1968,7 @@
1890	1968	void PushMatrix(double[][] matrix)
1891	1969	{
1892	1970	// GrafreeD.tracein(matrix);
1893		- PushMatrix(matrix,1);
	1971	+ PushMatrix(matrix, 1);
1894	1972	}
1895	1973
1896	1974	void PushMatrix()
..	..	@@ -1976,9 +2054,9 @@
1976	2054	switch(viewcode)
1977	2055	{
1978	2056	case 0: return "main";
1979		- case 1: return "one";
1980		- case 2: return "two";
1981		- case 3: return "three";
	2057	+ case 1: return "Red";
	2058	+ case 2: return "Green";
	2059	+ case 3: return "Blue";
1982	2060	case 4: return "light";
1983	2061	}
1984	2062
..	..	@@ -1987,7 +2065,7 @@
1987	2065
1988	2066	static int camerachangeframe;
1989	2067
1990		- public boolean SetCamera(Camera cam)
	2068	+ public boolean SetCamera(Camera cam, boolean set)
1991	2069	{
1992	2070	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
1993	2071	// return false;
..	..	@@ -2005,7 +2083,8 @@
2005	2083
2006	2084	camerachangeframe = Globals.framecount;
2007	2085
2008		- cam.hAspect = -1; // Read only
	2086	+ if (cam != null)
	2087	+ cam.hAspect = -1; // Read only
2009	2088
2010	2089	cameras[0] = cam;
2011	2090	targetLookAts[0] = new cVector(cam.lookAt);
..	..	@@ -2015,11 +2094,14 @@
2015	2094	{
2016	2095	cameras[i] = new Camera(cam.viewCode);
2017	2096	}
2018		-
2019		- cameras[i].setAim(cam.location, cam.lookAt);
2020		- cameras[i].shaper_fovy = cam.shaper_fovy;
2021		- cameras[i].UP.set(cam.UP);
2022		- targetLookAts[i] = new cVector(cameras[i].lookAt);
	2097	+
	2098	+ if (set)
	2099	+ {
	2100	+ cameras[i].setAim(cam.location, cam.lookAt);
	2101	+ cameras[i].shaper_fovy = cam.shaper_fovy;
	2102	+ cameras[i].UP.set(cam.UP);
	2103	+ targetLookAts[i] = new cVector(cameras[i].lookAt);
	2104	+ }
2023	2105	}
2024	2106	cameracount = 0;
2025	2107	targetLookAt = targetLookAts[cameracount];
..	..	@@ -2028,7 +2110,7 @@
2028	2110	// Start with free camera
2029	2111	SwitchCameras(true);
2030	2112
2031		- pingthread.jump = true; // optional?
	2113	+// pingthread.jump = true; // optional?
2032	2114
2033	2115	if (TRACKONCE)
2034	2116	{
..	..	@@ -2044,7 +2126,7 @@
2044	2126	//System.err.println("Oeil on");
2045	2127	OEIL = true;
2046	2128	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2047		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2129	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2048	2130	//pingthread.StepToTarget(true);
2049	2131	}
2050	2132
..	..	@@ -2142,7 +2224,7 @@
2142	2224	System.err.println("LIVE = " + Globals.isLIVE());
2143	2225
2144	2226	if (!Globals.isLIVE()) // save sound
2145		- GrafreeD.savesound = true; // wav.save();
	2227	+ Grafreed.savesound = true; // wav.save();
2146	2228	// else
2147	2229	repaint(); // start loop // may 2013
2148	2230	}
..	..	@@ -2215,18 +2297,6 @@
2215	2297	public void ToggleTrack()
2216	2298	{
2217	2299	TRACK ^= true;
2218		- if (TRACK)
2219		- {
2220		- if (object.selection != null &&
2221		- object.selection.size() > 0 &&
2222		- object.selection.elementAt(0) != null &&
2223		- !(object.selection.elementAt(0) instanceof Camera) &&
2224		- !(object.selection.elementAt(0) instanceof ScriptNode))
2225		- {
2226		- trackedobject = object.selection.elementAt(0);
2227		- repaint();
2228		- }
2229		- }
2230	2300
2231	2301	repaint();
2232	2302	}
..	..	@@ -2259,7 +2329,7 @@
2259	2329
2260	2330	void ToggleDebug()
2261	2331	{
2262		- DEBUG ^= true;
	2332	+ Globals.DEBUG ^= true;
2263	2333	}
2264	2334
2265	2335	void ToggleLookAt()
..	..	@@ -2267,9 +2337,9 @@
2267	2337	LOOKAT ^= true;
2268	2338	}
2269	2339
2270		- void ToggleRandom()
	2340	+ void ToggleSwitch()
2271	2341	{
2272		- RANDOM ^= true;
	2342	+ SWITCH ^= true;
2273	2343	}
2274	2344
2275	2345	void ToggleHandles()
..	..	@@ -2277,10 +2347,17 @@
2277	2347	HANDLES ^= true;
2278	2348	}
2279	2349
	2350	+ Object3D paintFolder;
	2351	+
2280	2352	void TogglePaint()
2281	2353	{
2282	2354	PAINTMODE ^= true;
2283	2355	paintcount = 0;
	2356	+
	2357	+ if (PAINTMODE)
	2358	+ {
	2359	+ paintFolder = GetFolder();
	2360	+ }
2284	2361	}
2285	2362
2286	2363	void SwapCamera(int a, int b)
..	..	@@ -2311,7 +2388,8 @@
2311	2388	{
2312	2389	//System.out.println("PROTECTION = " + cam.hAspect);
2313	2390	//assert (cam.hAspect == 0);
2314		- cam.hAspect = 0;
	2391	+ if (cam != null)
	2392	+ cam.hAspect = 0;
2315	2393	lightCamera = cam;
2316	2394	}
2317	2395
..	..	@@ -2376,7 +2454,34 @@
2376	2454	{
2377	2455	return currentGL;
2378	2456	}
2379		-
	2457	+
	2458	+ static private BufferedImage CreateBim(TextureData texturedata)
	2459	+ {
	2460	+ Grafreed.Assert(texturedata != null);
	2461	+
	2462	+ int width = texturedata.getWidth();
	2463	+ int height = texturedata.getHeight();
	2464	+
	2465	+ Buffer buffer = texturedata.getBuffer();
	2466	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2467	+
	2468	+ byte[] bytes = bytebuf.array();
	2469	+
	2470	+ return CreateBim(bytes, width, height);
	2471	+ }
	2472	+
	2473	+ private void SetGLNormal(javax.media.opengl.GL gl, float nx, float ny, float nz)
	2474	+ {
	2475	+ gl.glNormal3f(nx, ny, nz);
	2476	+
	2477	+ if (ny > 0.9 \|\| ny < -0.9)
	2478	+ // Ground or ceiling
	2479	+ gl.glVertexAttrib3f(4, 1, 0, 0);
	2480	+ else
	2481	+ // Walls
	2482	+ gl.glVertexAttrib3f(4, 0, 1, 0);
	2483	+ }
	2484	+
2380	2485	/**/
2381	2486	class CacheTexture
2382	2487	{
..	..	@@ -2385,28 +2490,31 @@
2385	2490
2386	2491	int resolution;
2387	2492
2388		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2493	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2389	2494	{
2390		- texture = tex;
	2495	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2496	+ texturedata = texdata;
2391	2497	resolution = res;
2392	2498	}
2393	2499	}
2394	2500	/**/
2395	2501
2396	2502	// TEXTURE static Texture texture;
2397		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2398		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2399		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2503	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2504	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2505	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2506	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2507	+
2400	2508	int pigmentdepth = 0;
2401	2509	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2402	2510	int bumpdepth = 0;
2403	2511	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2404	2512	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2405	2513	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2406		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2514	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2407	2515	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2408	2516
2409		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2517	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2410	2518	{
2411	2519	TextureData texturedata = null;
2412	2520
..	..	@@ -2416,7 +2524,7 @@
2416	2524	com.sun.opengl.util.texture.TextureIO.newTextureData(
2417	2525	getClass().getClassLoader().getResourceAsStream(name),
2418	2526	true,
2419		- com.sun.opengl.util.texture.TextureIO.PNG);
	2527	+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
2420	2528	} catch (java.io.IOException e)
2421	2529	{
2422	2530	throw new javax.media.opengl.GLException(e);
..	..	@@ -2425,13 +2533,34 @@
2425	2533	if (bump)
2426	2534	texturedata = ConvertBump(texturedata, false);
2427	2535
2428		- com.sun.opengl.util.texture.Texture texture =
2429		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2536	+// com.sun.opengl.util.texture.Texture texture =
	2537	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2430	2538
2431		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2432		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2539	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2540	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2433	2541
2434		- return texture;
	2542	+ return texturedata;
	2543	+ }
	2544	+
	2545	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2546	+ {
	2547	+ TextureData texturedata = null;
	2548	+
	2549	+ try
	2550	+ {
	2551	+ texturedata =
	2552	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2553	+ bim,
	2554	+ true);
	2555	+ } catch (Exception e)
	2556	+ {
	2557	+ throw new javax.media.opengl.GLException(e);
	2558	+ }
	2559	+
	2560	+ if (bump)
	2561	+ texturedata = ConvertBump(texturedata, false);
	2562	+
	2563	+ return texturedata;
2435	2564	}
2436	2565
2437	2566	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3461,6 +3590,8 @@
3461	3590	};
3462	3591	/**/
3463	3592
	3593	+ static Object3D lastObject;
	3594	+
3464	3595	//com.sun.opengl.util.texture.Texture
3465	3596	TextureData
3466	3597	GetFileTexture(String name, boolean bump, int resolution)
..	..	@@ -3497,6 +3628,8 @@
3497	3628	// return null;
3498	3629	//if (i == 2)
3499	3630	// return null;
	3631	+ // TIFF issue sept 2019
	3632	+ System.err.println("lastObject = " + lastObject);
3500	3633	e.printStackTrace();
3501	3634	name = name.split("\\.tif")[0] + ".jpg";
3502	3635	}
..	..	@@ -3504,6 +3637,8 @@
3504	3637
3505	3638	System.out.println("LOADING TEXTURE : " + name);
3506	3639
	3640	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3641	+
3507	3642	//
3508	3643	if (false) // compressbit > 0)
3509	3644	{
..	..	@@ -4208,6 +4343,7 @@
4208	4343
4209	4344	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
4210	4345	{
	4346	+ new Exception().printStackTrace();
4211	4347	System.exit(0);
4212	4348	com.sun.opengl.util.texture.Texture texture = null;
4213	4349
..	..	@@ -6826,30 +6962,30 @@
6826	6962	short residu = 0;
6827	6963
6828	6964	// wraparound workarounds
6829		- short fuck = (short) (buffer[i] & 0xFF);
	6965	+ short ww = (short) (buffer[i] & 0xFF);
6830	6966	/*
6831		- residu += (fuck%2);
6832		- if(fuck/2 < 256-residu/2)
	6967	+ residu += (ww%2);
	6968	+ if(ww/2 < 256-residu/2)
6833	6969	{
6834		- fuck = (short)((fuck/2) + residu/2);
	6970	+ ww = (short)((ww/2) + residu/2);
6835	6971	if(residu == 2)
6836	6972	residu = 0;
6837	6973	}
6838	6974	else
6839	6975	{
6840	6976	residu = 0;
6841		- fuck /= 2;
	6977	+ ww /= 2;
6842	6978	}
6843	6979	*/
6844		- if (i < imglength / 3 \|\| rnd.nextFloat() < 0.5 \|\| fuck >= 254)
	6980	+ if (i < imglength / 3 \|\| rnd.nextFloat() < 0.5 \|\| ww >= 254)
6845	6981	{
6846		- fuck /= 2;
	6982	+ ww /= 2;
6847	6983	} else
6848	6984	{
6849		- fuck = (short) ((fuck / 2) + fuck % 2);
	6985	+ ww = (short) ((ww / 2) + ww % 2);
6850	6986	}
6851	6987
6852		- buffer[i] = (byte) fuck;
	6988	+ buffer[i] = (byte) ww;
6853	6989	}
6854	6990	//System.out.print(bytes[i] + " ");
6855	6991	//if(buffer[i] >= 0 && buffer[i]<=eps-1) buffer[i] = eps;
..	..	@@ -7901,7 +8037,7 @@
7901	8037	String pigment = Object3D.GetPigment(tex);
7902	8038	String bump = Object3D.GetBump(tex);
7903	8039
7904		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8040	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7905	8041	{
7906	8042	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7907	8043	// System.out.println("; bump = " + bump);
..	..	@@ -7916,11 +8052,69 @@
7916	8052	pigment = null;
7917	8053	}
7918	8054
7919		- ReleaseTexture(bump, true);
7920		- ReleaseTexture(pigment, false);
	8055	+ ReleaseTexture(tex, true);
	8056	+ ReleaseTexture(tex, false);
7921	8057	}
7922	8058
7923		- void ReleaseTexture(String tex, boolean bump)
	8059	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8060	+ {
	8061	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8062	+ {
	8063	+ return;
	8064	+ }
	8065	+
	8066	+ if (tex == null)
	8067	+ {
	8068	+ ReleaseTexture(null, false);
	8069	+ return;
	8070	+ }
	8071	+
	8072	+ String pigment = Object3D.GetPigment(tex);
	8073	+
	8074	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8075	+ {
	8076	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8077	+ // System.out.println("; bump = " + bump);
	8078	+ }
	8079	+
	8080	+ if (pigment.equals(""))
	8081	+ {
	8082	+ pigment = null;
	8083	+ }
	8084	+
	8085	+ ReleaseTexture(tex, false);
	8086	+ }
	8087	+
	8088	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8089	+ {
	8090	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8091	+ {
	8092	+ return;
	8093	+ }
	8094	+
	8095	+ if (tex == null)
	8096	+ {
	8097	+ ReleaseTexture(null, true);
	8098	+ return;
	8099	+ }
	8100	+
	8101	+ String bump = Object3D.GetBump(tex);
	8102	+
	8103	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8104	+ {
	8105	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8106	+ // System.out.println("; bump = " + bump);
	8107	+ }
	8108	+
	8109	+ if (bump.equals(""))
	8110	+ {
	8111	+ bump = null;
	8112	+ }
	8113	+
	8114	+ ReleaseTexture(tex, true);
	8115	+ }
	8116	+
	8117	+ void ReleaseTexture(cTexture tex, boolean bump)
7924	8118	{
7925	8119	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7926	8120	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7931,7 +8125,7 @@
7931	8125	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7932	8126
7933	8127	if (tex != null)
7934		- texture = textures.get(tex);
	8128	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7935	8129
7936	8130	// //assert( texture != null );
7937	8131	// if (texture == null)
..	..	@@ -8023,7 +8217,55 @@
8023	8217	}
8024	8218	}
8025	8219
8026		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8220	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
	8221	+ {
	8222	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8223	+// ambientOcclusion ) // \|\| !textureon)
	8224	+// {
	8225	+// return; // false;
	8226	+// }
	8227	+//
	8228	+// if (tex == null)
	8229	+// {
	8230	+// BindTexture(null,false,resolution);
	8231	+// BindTexture(null,true,resolution);
	8232	+// return;
	8233	+// }
	8234	+//
	8235	+// String pigment = Object3D.GetPigment(tex);
	8236	+// String bump = Object3D.GetBump(tex);
	8237	+//
	8238	+// usedtextures.add(pigment);
	8239	+// usedtextures.add(bump);
	8240	+//
	8241	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8242	+// {
	8243	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8244	+// // System.out.println("; bump = " + bump);
	8245	+// }
	8246	+//
	8247	+// if (bump.equals(""))
	8248	+// {
	8249	+// bump = null;
	8250	+// }
	8251	+// if (pigment.equals(""))
	8252	+// {
	8253	+// pigment = null;
	8254	+// }
	8255	+//
	8256	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8257	+// BindTexture(pigment, false, resolution);
	8258	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8259	+// BindTexture(bump, true, resolution);
	8260	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8261	+//
	8262	+// return; // true;
	8263	+
	8264	+ BindPigmentTexture(tex, resolution);
	8265	+ BindBumpTexture(tex, resolution);
	8266	+ }
	8267	+
	8268	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8027	8269	{
8028	8270	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8029	8271	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8034,17 +8276,47 @@
8034	8276	if (tex == null)
8035	8277	{
8036	8278	BindTexture(null,false,resolution);
8037		- BindTexture(null,true,resolution);
8038	8279	return;
8039	8280	}
8040	8281
8041	8282	String pigment = Object3D.GetPigment(tex);
	8283	+
	8284	+ usedtextures.add(tex);
	8285	+
	8286	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8287	+ {
	8288	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8289	+ // System.out.println("; bump = " + bump);
	8290	+ }
	8291	+
	8292	+ if (pigment.equals(""))
	8293	+ {
	8294	+ pigment = null;
	8295	+ }
	8296	+
	8297	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8298	+ BindTexture(tex, false, resolution);
	8299	+ }
	8300	+
	8301	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8302	+ {
	8303	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8304	+ ambientOcclusion ) // \|\| !textureon)
	8305	+ {
	8306	+ return; // false;
	8307	+ }
	8308	+
	8309	+ if (tex == null)
	8310	+ {
	8311	+ BindTexture(null,true,resolution);
	8312	+ return;
	8313	+ }
	8314	+
8042	8315	String bump = Object3D.GetBump(tex);
8043	8316
8044		- usedtextures.put(pigment, pigment);
8045		- usedtextures.put(bump, bump);
	8317	+ usedtextures.add(tex);
8046	8318
8047		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8319	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8048	8320	{
8049	8321	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8050	8322	// System.out.println("; bump = " + bump);
..	..	@@ -8054,43 +8326,94 @@
8054	8326	{
8055	8327	bump = null;
8056	8328	}
8057		- if (pigment.equals(""))
8058		- {
8059		- pigment = null;
8060		- }
8061	8329
8062		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8063		- BindTexture(pigment, false, resolution);
8064	8330	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8065		- BindTexture(bump, true, resolution);
	8331	+ BindTexture(tex, true, resolution);
8066	8332	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8067		-
8068		- return; // true;
8069	8333	}
8070	8334
8071		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8335	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8336	+
	8337	+ private boolean FileExists(String tex)
8072	8338	{
8073		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8339	+ if (missingTextures.contains(tex))
	8340	+ {
	8341	+ return false;
	8342	+ }
	8343	+
	8344	+ boolean fileExists = new File(tex).exists();
	8345	+
	8346	+ if (!fileExists)
	8347	+ {
	8348	+ // If file exists, the "new File()" is not executed sgain
	8349	+ missingTextures.add(tex);
	8350	+ }
	8351	+
	8352	+ return fileExists;
	8353	+ }
	8354	+
	8355	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
	8356	+ {
	8357	+ CacheTexture texturecache = null;
8074	8358
8075	8359	if (tex != null)
8076	8360	{
8077		- String texname = tex;
	8361	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8362	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
8078	8363
8079		- String[] split = tex.split("Textures");
8080		- if (split.length > 1)
8081		- texname = "/Users/nbriere/Textures" + split[split.length-1];
8082		- else
8083		- if (!texname.startsWith("/"))
8084		- texname = "/Users/nbriere/Textures/" + texname;
	8364	+ if (texname.equals("") && texdata == null)
	8365	+ {
	8366	+ return null;
	8367	+ }
	8368	+
	8369	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8370	+
	8371	+// String[] split = tex.split("Textures");
	8372	+// if (split.length > 1)
	8373	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8374	+// else
	8375	+// if (!texname.startsWith("/"))
	8376	+// texname = "/Users/nbriere/Textures/" + texname;
	8377	+ if (!FileExists(texname) && !texname.startsWith("@"))
	8378	+ {
	8379	+ texname = fallbackTextureName;
	8380	+ }
8085	8381
8086	8382	if (CACHETEXTURE)
8087		- texture = textures.get(texname); // TEXTURE CACHE
8088		-
8089		- TextureData texturedata = null;
8090		-
8091		- if (texture == null \|\| texture.resolution < resolution)
8092	8383	{
8093		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8384	+ if (texdata == null)
	8385	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8386	+ else
	8387	+ texturecache = bimtextures.get(texdata);
	8388	+ }
	8389	+
	8390	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8391	+ {
	8392	+ TextureData texturedata = null;
	8393	+
	8394	+ if (texdata != null && textureon)
	8395	+ {
	8396	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8397	+
	8398	+ try
	8399	+ {
	8400	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8401	+ }
	8402	+ catch (Exception e)
	8403	+ {
	8404	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8405	+ }
	8406	+
	8407	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8408	+ bimtextures.put(texdata, texturecache);
	8409	+
	8410	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8411	+
	8412	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8413	+ //bim2 = bim;
	8414	+ }
	8415	+ else
	8416	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8094	8417	{
8095	8418	assert(!bump);
8096	8419	// if (bump)
..	..	@@ -8101,19 +8424,23 @@
8101	8424	// }
8102	8425	// else
8103	8426	// {
8104		- texture = textures.get(tex);
8105		- if (texture == null)
	8427	+ // texturecache = textures.get(texname); // suspicious
	8428	+ if (texturecache == null)
8106	8429	{
8107		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8430	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8108	8431	}
	8432	+ else
	8433	+ new Exception().printStackTrace();
8109	8434	// }
8110	8435	} else
8111		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8436	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8112	8437	{
8113	8438	assert(bump);
8114		- texture = textures.get(tex);
8115		- if (texture == null)
8116		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8439	+ // texturecache = textures.get(texname); // suspicious
	8440	+ if (texturecache == null)
	8441	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8442	+ else
	8443	+ new Exception().printStackTrace();
8117	8444	} else
8118	8445	{
8119	8446	//if (tex.equals("IMMORTAL"))
..	..	@@ -8121,11 +8448,22 @@
8121	8448	// texture = GetResourceTexture("default.png");
8122	8449	//} else
8123	8450	//{
8124		- if (tex.equals("WHITE_NOISE"))
	8451	+ if (texname.endsWith("WHITE_NOISE"))
8125	8452	{
8126		- texture = textures.get(tex);
8127		- if (texture == null)
8128		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8453	+ // texturecache = textures.get(texname); // suspicious
	8454	+ if (texturecache == null)
	8455	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.jpg", bump),resolution);
	8456	+ else
	8457	+ new Exception().printStackTrace();
	8458	+ } else
	8459	+ {
	8460	+ if (texname.startsWith("@") && textureon)
	8461	+ {
	8462	+ // texturecache = textures.get(texname); // suspicious
	8463	+ if (texturecache == null)
	8464	+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
	8465	+ else
	8466	+ new Exception().printStackTrace();
8129	8467	} else
8130	8468	{
8131	8469	if (textureon)
..	..	@@ -8150,7 +8488,7 @@
8150	8488	}
8151	8489
8152	8490	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8153		- if (!new File(cachename).exists())
	8491	+ if (!FileExists(cachename))
8154	8492	cachename = texname;
8155	8493	else
8156	8494	processbump = false; // don't process bump map again
..	..	@@ -8172,7 +8510,7 @@
8172	8510	}
8173	8511
8174	8512	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8175		- if (!new File(cachename).exists())
	8513	+ if (!FileExists(cachename))
8176	8514	cachename = texname;
8177	8515	else
8178	8516	processbump = false; // don't process bump map again
..	..	@@ -8181,20 +8519,23 @@
8181	8519	texturedata = GetFileTexture(cachename, processbump, resolution);
8182	8520
8183	8521
8184		- if (texturedata != null)
8185		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8522	+ if (texturedata == null)
	8523	+ throw new Exception();
	8524	+
	8525	+ texturecache = new CacheTexture(texturedata,resolution);
8186	8526	//texture = GetTexture(tex, bump);
8187	8527	}
	8528	+ }
8188	8529	}
8189	8530	//}
8190	8531	}
8191	8532
8192		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8533	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8193	8534	{
8194	8535	//return false;
8195	8536
8196	8537	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8197		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8538	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8198	8539	{
8199	8540	// String ext = "_highres";
8200	8541	// if (REDUCETEXTURE)
..	..	@@ -8211,52 +8552,17 @@
8211	8552	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8212	8553	if (!cachefile.exists())
8213	8554	{
8214		- // cache to disk
8215		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8216		- //buffers[0].
8217		-
8218		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8219		- int[] pixels = new int[bytebuf.capacity()/3];
8220		-
8221		- // squared size heuristic...
8222		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8555	+ //if (texturedata.getWidth() == texturedata.getHeight())
8223	8556	{
8224		- for (int i=pixels.length; --i>=0;)
8225		- {
8226		- int i3 = i*3;
8227		- pixels[i] = 0xFF;
8228		- pixels[i] <<= 8;
8229		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8230		- pixels[i] <<= 8;
8231		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8232		- pixels[i] <<= 8;
8233		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8234		- }
8235		-
8236		- /*
8237		- int r=0,g=0,b=0,a=0;
8238		- for (int i=0; i<width; i++)
8239		- for (int j=0; j<height; j++)
8240		- {
8241		- int index = j*width+i;
8242		- int p = pixels[index];
8243		- a = ((p>>24) & 0xFF);
8244		- r = ((p>>16) & 0xFF);
8245		- g = ((p>>8) & 0xFF);
8246		- b = (p & 0xFF);
8247		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8248		- }
8249		- /**/
8250		- int width = (int)Math.sqrt(pixels.length); // squared
8251		- int height = width;
8252		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8253		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8557	+ BufferedImage rendImage = CreateBim(texturedata);
	8558	+
8254	8559	ImageWriter writer = null;
8255	8560	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8256	8561	if (iter.hasNext()) {
8257	8562	writer = (ImageWriter)iter.next();
8258	8563	}
8259		- float compressionQuality = 0.9f;
	8564	+
	8565	+ float compressionQuality = 0.85f;
8260	8566	try
8261	8567	{
8262	8568	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8273,18 +8579,20 @@
8273	8579	}
8274	8580	}
8275	8581	}
8276		-
	8582	+
	8583	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8584	+
8277	8585	//System.out.println("Texture = " + tex);
8278		- if (textures.containsKey(texname))
	8586	+ if (textures.containsKey(tex))
8279	8587	{
8280		- CacheTexture thetex = textures.get(texname);
	8588	+ CacheTexture thetex = textures.get(tex);
8281	8589	thetex.texture.disable();
8282	8590	thetex.texture.dispose();
8283		- textures.remove(texname);
	8591	+ textures.remove(tex);
8284	8592	}
8285	8593
8286		- texture.texturedata = texturedata;
8287		- textures.put(texname, texture);
	8594	+ //texture.texturedata = texturedata;
	8595	+ textures.put(tex, texturecache);
8288	8596
8289	8597	// newtex = true;
8290	8598	}
..	..	@@ -8300,10 +8608,46 @@
8300	8608	}
8301	8609	}
8302	8610
8303		- return texture;
	8611	+ return texturecache;
8304	8612	}
8305	8613
8306		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8614	+ static void EmbedTextures(cTexture tex)
	8615	+ {
	8616	+ if (tex.pigmentdata == null)
	8617	+ {
	8618	+ //String texname = Object3D.GetPigment(tex);
	8619	+
	8620	+ CacheTexture texturecache = texturepigment.get(tex);
	8621	+
	8622	+ if (texturecache != null)
	8623	+ {
	8624	+ tex.pw = texturecache.texturedata.getWidth();
	8625	+ tex.ph = texturecache.texturedata.getHeight();
	8626	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8627	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8628	+ ;
	8629	+ //, tex.pw, tex.ph), 0.5f);
	8630	+ }
	8631	+ }
	8632	+
	8633	+ if (tex.bumpdata == null)
	8634	+ {
	8635	+ //String texname = Object3D.GetBump(tex);
	8636	+
	8637	+ CacheTexture texturecache = texturebump.get(tex);
	8638	+
	8639	+ if (texturecache != null)
	8640	+ {
	8641	+ tex.bw = texturecache.texturedata.getWidth();
	8642	+ tex.bh = texturecache.texturedata.getHeight();
	8643	+ tex.bumpdata = //CompressJPEG(CreateBim(
	8644	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array();
	8645	+ //, 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
8307	8651	{
8308	8652	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8309	8653
..	..	@@ -8321,21 +8665,21 @@
8321	8665	return texture!=null?texture.texture:null;
8322	8666	}
8323	8667
8324		- 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
8325	8669	{
8326	8670	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8327	8671
8328	8672	return texture!=null?texture.texturedata:null;
8329	8673	}
8330	8674
8331		- boolean BindTexture(String tex, boolean bump, int resolution)
	8675	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8332	8676	{
8333	8677	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8334	8678	{
8335	8679	return false;
8336	8680	}
8337	8681
8338		- boolean newtex = false;
	8682	+ //boolean newtex = false;
8339	8683
8340	8684	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8341	8685
..	..	@@ -8367,9 +8711,75 @@
8367	8711	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8368	8712	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8369	8713
8370		- return newtex;
	8714	+ return true; // Warning: not used.
8371	8715	}
8372	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	+
8373	8783	ShadowBuffer shadowPBuf;
8374	8784	AntialiasBuffer antialiasPBuf;
8375	8785	int MAXSTACK;
..	..	@@ -8386,10 +8796,12 @@
8386	8796
8387	8797	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8388	8798	MAXSTACK = temp[0];
8389		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8799	+ if (Globals.DEBUG)
	8800	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8390	8801	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8391	8802	MAXSTACK = temp[0];
8392		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8803	+ if (Globals.DEBUG)
	8804	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8393	8805
8394	8806	// Use debug pipeline
8395	8807	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8397,7 +8809,8 @@
8397	8809	gl = drawable.getGL(); //
8398	8810
8399	8811	GL gl3 = getGL();
8400		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8812	+ if (Globals.DEBUG)
	8813	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8401	8814
8402	8815
8403	8816	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8562,7 +8975,7 @@
8562	8975
8563	8976	if (cubemap == null)
8564	8977	{
8565		- LoadEnvy(5);
	8978	+ //LoadEnvy(1);
8566	8979	}
8567	8980
8568	8981	//cubemap.enable();
..	..	@@ -8838,6 +9251,8 @@
8838	9251
8839	9252	void LoadEnvy(int which)
8840	9253	{
	9254	+ assert(false);
	9255	+
8841	9256	String name;
8842	9257	String ext;
8843	9258
..	..	@@ -8849,37 +9264,58 @@
8849	9264	cubemap = null;
8850	9265	return;
8851	9266	case 1:
8852		- name = "cubemaps/box_";
8853		- ext = "png";
	9267	+ name = "cubemaps/rgb/";
	9268	+ ext = "jpg";
8854	9269	reverseUP = false;
8855	9270	break;
8856	9271	case 2:
8857		- name = "cubemaps/uffizi_";
8858		- ext = "png";
8859		- break; // reverseUP = true; break;
	9272	+ name = "cubemaps/uffizi/";
	9273	+ ext = "jpg";
	9274	+ reverseUP = false;
	9275	+ break;
8860	9276	case 3:
8861		- name = "cubemaps/CloudyHills_";
8862		- ext = "tga";
	9277	+ name = "cubemaps/CloudyHills/";
	9278	+ ext = "jpg";
8863	9279	reverseUP = false;
8864	9280	break;
8865	9281	case 4:
8866		- name = "cubemaps/cornell_";
	9282	+ name = "cubemaps/cornell/";
8867	9283	ext = "png";
8868	9284	reverseUP = false;
8869	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;
8870	9311	default:
8871		- name = "cubemaps/rgb_";
8872		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9312	+ name = "cubemaps/box/";
	9313	+ ext = "png"; /mipmap = true;/
	9314	+ reverseUP = false;
8873	9315	break;
8874	9316	}
8875		-
8876		- try
8877		- {
8878		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
8879		- } catch (IOException e)
8880		- {
8881		- throw new RuntimeException(e);
8882		- }
	9317	+
	9318	+ LoadSkybox(name, ext, mipmap);
8883	9319	}
8884	9320
8885	9321	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -8911,8 +9347,12 @@
8911	9347	static double[] model = new double[16];
8912	9348	double[] camera2light = new double[16];
8913	9349	double[] light2camera = new double[16];
8914		- int newenvy = -1;
8915		- boolean envyoff = true; // false;
	9350	+
	9351	+ //int newenvy = -1;
	9352	+ //boolean envyoff = false;
	9353	+
	9354	+ String loadedskyboxname;
	9355	+
8916	9356	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
8917	9357	//float[] light0 = { 0,0,0 };
8918	9358	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9205,11 +9645,35 @@
9205	9645	jy8[3] = 0.5f;
9206	9646	}
9207	9647
9208		- 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
9209	9649	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9210	9650	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9211	9651	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9212	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	+
9213	9677	static int imagecount = 0; // movie generation
9214	9678
9215	9679	static int jitter = 0;
..	..	@@ -9305,8 +9769,8 @@
9305	9769	assert (parentcam != renderCamera);
9306	9770
9307	9771	if (renderCamera != lightCamera)
9308		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9309		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9772	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9773	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9310	9774
9311	9775	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9312	9776
..	..	@@ -9321,8 +9785,8 @@
9321	9785	LA.matCopy(renderCamera.fromScreen, matrix);
9322	9786
9323	9787	if (renderCamera != lightCamera)
9324		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9325		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9788	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9789	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9326	9790
9327	9791	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9328	9792
..	..	@@ -9368,13 +9832,18 @@
9368	9832	rati = 1 / rati;
9369	9833	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9370	9834	}
9371		- assert (newenvy == -1);
	9835	+
	9836	+ //assert (newenvy == -1);
	9837	+
9372	9838	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9373	9839	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9374		- DrawSkyBox(gl);
	9840	+ DrawSkyBox(gl, (float)rati);
9375	9841	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9376	9842	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9377		- accPerspective(gl, renderCamera.shaper_fovy / ratio,
	9843	+
	9844	+ boolean vr = capsLocked && !lightMode;
	9845	+
	9846	+ accPerspective(gl, renderCamera.shaper_fovy / ratio * (vr ? 1.2 : 1),
9378	9847	ratio,
9379	9848	//near_plane, far_plane,
9380	9849	renderCamera.shaper_zNear * renderCamera.Distance(), renderCamera.shaper_zFar * renderCamera.Distance(),
..	..	@@ -9394,7 +9863,7 @@
9394	9863	//gl.glFlush();
9395	9864	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9396	9865
9397		- if (ANIMATION && ABORTED)
	9866	+ if (Globals.ANIMATION && ABORTED)
9398	9867	{
9399	9868	System.err.println(" ABORTED FRAME");
9400	9869	break;
..	..	@@ -9424,7 +9893,7 @@
9424	9893	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9425	9894
9426	9895	// save image
9427		- if (ANIMATION && !ABORTED)
	9896	+ if (Globals.ANIMATION && !ABORTED)
9428	9897	{
9429	9898	VPwidth = viewport[2];
9430	9899	VPheight = viewport[3];
..	..	@@ -9535,11 +10004,11 @@
9535	10004
9536	10005	// imagecount++;
9537	10006
9538		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	10007	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9539	10008
9540	10009	if (!BOXMODE)
9541	10010	{
9542		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	10011	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9543	10012	}
9544	10013
9545	10014	if (!BOXMODE)
..	..	@@ -9577,7 +10046,7 @@
9577	10046	ABORTED = false;
9578	10047	}
9579	10048	else
9580		- GrafreeD.wav.cursor += 735 * ACSIZE;
	10049	+ Grafreed.wav.cursor += 735 * ACSIZE;
9581	10050
9582	10051	if (false)
9583	10052	{
..	..	@@ -10237,14 +10706,23 @@
10237	10706	static boolean init = false;
10238	10707
10239	10708	double[][] matrix = LA.newMatrix();
	10709	+
	10710	+ // This is to refresh the UI of the material panel.
	10711	+ ObjEditor patchMaterial;
10240	10712
10241	10713	public void display(GLAutoDrawable drawable)
10242	10714	{
10243		- if (GrafreeD.savesound && GrafreeD.hassound)
	10715	+ if (patchMaterial.patchMaterial)
10244	10716	{
10245		- GrafreeD.wav.save();
10246		- GrafreeD.savesound = false;
10247		- GrafreeD.hassound = false;
	10717	+ patchMaterial.patchMaterial = false;
	10718	+ patchMaterial.objectTabbedPane.setSelectedIndex(1);
	10719	+ }
	10720	+
	10721	+ if (Grafreed.savesound && Grafreed.hassound)
	10722	+ {
	10723	+ Grafreed.wav.save();
	10724	+ Grafreed.savesound = false;
	10725	+ Grafreed.hassound = false;
10248	10726	}
10249	10727	// if (DEBUG_SELECTION)
10250	10728	// {
..	..	@@ -10283,7 +10761,9 @@
10283	10761	}
10284	10762	/**/
10285	10763
10286		- if (selection)
	10764	+ boolean control = ((modifiers & CTRL) != 0);
	10765	+
	10766	+ if (selection && (!Globals.isLIVE() \|\| control))
10287	10767	{
10288	10768	selectbuffer.display();
10289	10769	return;
..	..	@@ -10320,6 +10800,7 @@
10320	10800	ANTIALIAS = 0;
10321	10801	//System.out.println("RESTART");
10322	10802	AAtimer.restart();
	10803	+ Globals.TIMERRUNNING = true;
10323	10804	}
10324	10805	}
10325	10806	}
..	..	@@ -10334,6 +10815,112 @@
10334	10815
10335	10816	if (DrawMode() == DEFAULT)
10336	10817	{
	10818	+ if (manipCamera == lightCamera)
	10819	+ {
	10820	+// switch (e.getKeyCode())
	10821	+// {
	10822	+// case DOWN_ARROW:
	10823	+// lightCamera.DECAL /= 2;
	10824	+// repaint();
	10825	+// break;
	10826	+// case UP_ARROW:
	10827	+// lightCamera.DECAL *= 2;
	10828	+// repaint();
	10829	+// break;
	10830	+// case LEFT_ARROW:
	10831	+// lightCamera.SCALE /= 2;
	10832	+// repaint();
	10833	+// break;
	10834	+// case RIGHT_ARROW:
	10835	+// lightCamera.SCALE *= 2;
	10836	+// repaint();
	10837	+// break;
	10838	+// default:
	10839	+// break;
	10840	+ if (keys[DOWN_ARROW])
	10841	+ {
	10842	+ lightCamera.DECAL /= 2;
	10843	+ }
	10844	+
	10845	+ if (keys[UP_ARROW])
	10846	+ {
	10847	+ lightCamera.DECAL *= 2;
	10848	+ }
	10849	+
	10850	+ if (keys[LEFT_ARROW])
	10851	+ {
	10852	+ lightCamera.SCALE /= 2;
	10853	+ }
	10854	+
	10855	+ if (keys[RIGHT_ARROW])
	10856	+ {
	10857	+ lightCamera.SCALE *= 2;
	10858	+ }
	10859	+ }
	10860	+ else
	10861	+ {
	10862	+ //pingthread.mute = true;
	10863	+
	10864	+ boolean keyon = false;
	10865	+
	10866	+ if (keys[DOWN_ARROW])
	10867	+ {
	10868	+ speed = ++speedkey[DOWN_ARROW];
	10869	+ if (speed > 20)
	10870	+ speed = 20;
	10871	+ GoDown(modifiers);
	10872	+ keyon = true;
	10873	+ }
	10874	+ else
	10875	+ speedkey[DOWN_ARROW] = 0;
	10876	+
	10877	+ if (keys[UP_ARROW])
	10878	+ {
	10879	+ speed = ++speedkey[UP_ARROW];
	10880	+ if (speed > 20)
	10881	+ speed = 20;
	10882	+ GoUp(modifiers);
	10883	+ keyon = true;
	10884	+ }
	10885	+ else
	10886	+ speedkey[UP_ARROW] = 0;
	10887	+
	10888	+ if (keys[LEFT_ARROW])
	10889	+ {
	10890	+ speed = ++speedkey[LEFT_ARROW];
	10891	+ if (speed > 20)
	10892	+ speed = 20;
	10893	+ GoLeft(modifiers);
	10894	+ keyon = true;
	10895	+ }
	10896	+ else
	10897	+ speedkey[LEFT_ARROW] = 0;
	10898	+
	10899	+ if (keys[RIGHT_ARROW])
	10900	+ {
	10901	+ speed = ++speedkey[RIGHT_ARROW];
	10902	+ if (speed > 20)
	10903	+ speed = 20;
	10904	+ GoRight(modifiers);
	10905	+ keyon = true;
	10906	+ }
	10907	+ else
	10908	+ speedkey[RIGHT_ARROW] = 0;
	10909	+
	10910	+ if (Globals.WALK && capsLocked)
	10911	+ {
	10912	+ Walk();
	10913	+ keyon = true;
	10914	+ }
	10915	+
	10916	+ if (keyon)
	10917	+ {
	10918	+ repaint();
	10919	+ }
	10920	+
	10921	+ //pingthread.mute = false;
	10922	+ }
	10923	+
10337	10924	currentlydrawing = true;
10338	10925	}
10339	10926
..	..	@@ -10374,7 +10961,7 @@
10374	10961	Object3D theobject = object;
10375	10962	Object3D theparent = object.parent;
10376	10963	object.parent = null;
10377		- object = (Object3D)GrafreeD.clone(object);
	10964	+ object = (Object3D)Grafreed.clone(object);
10378	10965	object.Stripify();
10379	10966	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10380	10967	theobject.PreprocessOcclusion(this);
..	..	@@ -10387,13 +10974,14 @@
10387	10974	ambientOcclusion = false;
10388	10975	}
10389	10976
10390		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10977	+ if (//Globals.lighttouched &&
	10978	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10391	10979	{
10392	10980	//if (RENDERSHADOW) // ?
10393	10981	if (!IsFrozen())
10394	10982	{
10395	10983	// dec 2012
10396		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10984	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10397	10985	{
10398	10986	Globals.framecount++;
10399	10987	shadowbuffer.display();
..	..	@@ -10406,7 +10994,7 @@
10406	10994
10407	10995	if (wait)
10408	10996	{
10409		- Sleep(500);
	10997	+ Sleep(200); // blocks everything
10410	10998
10411	10999	wait = false;
10412	11000	}
..	..	@@ -10520,8 +11108,8 @@
10520	11108
10521	11109	// if (parentcam != renderCamera) // not a light
10522	11110	if (cam != lightCamera)
10523		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10524		- LA.matConcat(matrix, parentcam.toParent, matrix);
	11111	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11112	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10525	11113
10526	11114	for (int j = 0; j < 4; j++)
10527	11115	{
..	..	@@ -10535,8 +11123,8 @@
10535	11123
10536	11124	// if (parentcam != renderCamera) // not a light
10537	11125	if (cam != lightCamera)
10538		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10539		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	11126	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11127	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10540	11128
10541	11129	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10542	11130
..	..	@@ -10622,13 +11210,43 @@
10622	11210	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10623	11211	}
10624	11212
10625		- if (newenvy > -1)
	11213	+// if (newenvy > -1)
	11214	+// {
	11215	+// LoadEnvy(newenvy);
	11216	+// }
	11217	+//
	11218	+// newenvy = -1;
	11219	+
	11220	+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
10626	11221	{
10627		- LoadEnvy(newenvy);
	11222	+ if (cubemaprgb == null)
	11223	+ {
	11224	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
	11225	+ }
	11226	+
	11227	+ cubemap = cubemaprgb;
10628	11228	}
10629		-
10630		- newenvy = -1;
10631		-
	11229	+ else
	11230	+ {
	11231	+ if (object.skyboxname != null)
	11232	+ {
	11233	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11234	+ {
	11235	+ if (cubemap != null && cubemap != cubemaprgb)
	11236	+ cubemap.dispose();
	11237	+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11238	+ loadedskyboxname = object.skyboxname;
	11239	+ }
	11240	+ }
	11241	+ else
	11242	+ {
	11243	+ cubemapcustom = null;
	11244	+ loadedskyboxname = null;
	11245	+ }
	11246	+
	11247	+ cubemap = cubemapcustom;
	11248	+ }
	11249	+
10632	11250	ratio = ((double) getWidth()) / getHeight();
10633	11251	//System.out.println("ratio = " + ratio);
10634	11252
..	..	@@ -10644,7 +11262,7 @@
10644	11262
10645	11263	if (!IsFrozen() && !ambientOcclusion)
10646	11264	{
10647		- DrawSkyBox(gl);
	11265	+ DrawSkyBox(gl, (float)ratio);
10648	11266	}
10649	11267
10650	11268	//if (selection_view == -1)
..	..	@@ -10795,7 +11413,16 @@
10795	11413	// Bump noise
10796	11414	gl.glActiveTexture(GL.GL_TEXTURE6);
10797	11415	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10798		- BindTexture(NOISE_TEXTURE, false, 2);
	11416	+
	11417	+ try
	11418	+ {
	11419	+ BindTexture(NOISE_TEXTURE, false, 2);
	11420	+ }
	11421	+ catch (Exception e)
	11422	+ {
	11423	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11424	+ }
	11425	+
10799	11426
10800	11427	gl.glActiveTexture(GL.GL_TEXTURE0);
10801	11428	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10818,8 +11445,8 @@
10818	11445
10819	11446	gl.glMatrixMode(GL.GL_MODELVIEW);
10820	11447
10821		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10822	11448	//gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11449	+//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10823	11450	//gl.glEnable(gl.GL_MULTISAMPLE);
10824	11451	} else
10825	11452	{
..	..	@@ -10831,7 +11458,7 @@
10831	11458	//System.out.println("BLENDING ON");
10832	11459	gl.glEnable(GL.GL_BLEND);
10833	11460	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10834		-
	11461	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10835	11462	gl.glMatrixMode(gl.GL_PROJECTION);
10836	11463	gl.glLoadIdentity();
10837	11464
..	..	@@ -10881,7 +11508,10 @@
10881	11508	//gl.glOrtho(-BOOST, BOOST, -BOOST, BOOST, 0.001, 1000);
10882	11509	} else
10883	11510	{
10884		- glu.gluPerspective(cam.shaper_fovy / ratio, ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
	11511	+ boolean vr = capsLocked && !lightMode;
	11512	+
	11513	+ glu.gluPerspective(cam.shaper_fovy / ratio * (vr ? 1.2 : 1),
	11514	+ ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
10885	11515	}
10886	11516	}
10887	11517
..	..	@@ -10920,8 +11550,8 @@
10920	11550	System.err.println("parentcam != renderCamera");
10921	11551
10922	11552	// if (cam != lightCamera)
10923		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10924		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11553	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11554	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
10925	11555	}
10926	11556
10927	11557	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10942,8 +11572,8 @@
10942	11572	if (true) // TODO
10943	11573	{
10944	11574	if (cam != lightCamera)
10945		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10946		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11575	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11576	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10947	11577	}
10948	11578
10949	11579	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11080,7 +11710,7 @@
11080	11710	}
11081	11711	}
11082	11712
11083		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11713	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11084	11714	{
11085	11715	//gl.glDepthFunc(GL.GL_LEQUAL);
11086	11716	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11088,24 +11718,21 @@
11088	11718
11089	11719	boolean texon = textureon;
11090	11720
11091		- if (RENDERPROGRAM > 0)
11092		- {
11093		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11094		- textureon = false;
11095		- }
	11721	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11722	+ textureon = false;
	11723	+
11096	11724	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11097	11725	//System.out.println("ALLO");
11098	11726	gl.glColorMask(false, false, false, false);
11099	11727	DrawObject(gl);
11100		- if (RENDERPROGRAM > 0)
11101		- {
11102		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11103		- textureon = texon;
11104		- }
	11728	+
	11729	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11730	+ textureon = texon;
	11731	+
11105	11732	gl.glColorMask(true, true, true, true);
11106	11733
11107	11734	gl.glDepthFunc(GL.GL_EQUAL);
11108		- //gl.glDepthMask(false);
	11735	+ gl.glDepthMask(false);
11109	11736	}
11110	11737
11111	11738	if (false) // DrawMode() == SHADOW)
..	..	@@ -11240,8 +11867,11 @@
11240	11867	repaint();
11241	11868	}
11242	11869
11243		- if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
	11870	+ if (Globals.isLIVE() && DrawMode() == DEFAULT \|\| pingthread.live) // may 2013
	11871	+ {
	11872	+ renderCamera.computeTransform();
11244	11873	repaint();
	11874	+ }
11245	11875
11246	11876	displaydone = true;
11247	11877	}
..	..	@@ -11259,8 +11889,14 @@
11259	11889	{
11260	11890	renderpass++;
11261	11891	// System.out.println("Draw object... ");
	11892	+ STEP = 1;
11262	11893	if (FAST) // in case there is no script
11263		- STEP = 16;
	11894	+ STEP = 8;
	11895	+
	11896	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11897	+ {
	11898	+ STEP *= 4;
	11899	+ }
11264	11900
11265	11901	//object.FullInvariants();
11266	11902
..	..	@@ -11274,24 +11910,59 @@
11274	11910	e.printStackTrace();
11275	11911	}
11276	11912
11277		- if (GrafreeD.RENDERME > 0)
11278		- GrafreeD.RENDERME--; // mechante magouille
	11913	+ if (Grafreed.RENDERME > 0)
	11914	+ Grafreed.RENDERME--; // mechante magouille
11279	11915
11280	11916	Globals.ONESTEP = false;
11281	11917	}
11282	11918
11283	11919	static boolean zoomonce = false;
11284	11920
	11921	+ static void CreateSelectedPoint()
	11922	+ {
	11923	+ if (selectedpoint == null)
	11924	+ {
	11925	+ debugpointG = new Sphere();
	11926	+ debugpointP = new Sphere();
	11927	+ debugpointC = new Sphere();
	11928	+ debugpointR = new Sphere();
	11929	+
	11930	+ selectedpoint = new Superellipsoid();
	11931	+
	11932	+ for (int i=0; i<8; i++)
	11933	+ {
	11934	+ debugpoints[i] = new Sphere();
	11935	+ }
	11936	+ }
	11937	+ }
	11938	+
11285	11939	void DrawObject(GL gl, boolean draw)
11286	11940	{
	11941	+ // To clear camera values
	11942	+ ResetOptions();
	11943	+
11287	11944	//System.out.println("DRAW OBJECT " + mouseDown);
11288	11945	// DrawMode() = SELECTION;
11289	11946	//GL gl = getGL();
11290	11947	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11291	11948	{
	11949	+ if (TRACK)
	11950	+ {
	11951	+ if (object.selection != null &&
	11952	+ object.selection.size() > 0 &&
	11953	+ object.selection.elementAt(0) != null &&
	11954	+ !(object.selection.elementAt(0) instanceof Camera) &&
	11955	+ !(object.selection.elementAt(0) instanceof ScriptNode))
	11956	+ {
	11957	+ trackedobject = object.selection.elementAt(0);
	11958	+ //repaint();
	11959	+ }
	11960	+ else
	11961	+ trackedobject = null;
	11962	+ }
11292	11963	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11293		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11294		- pingthread.StepToTarget(true); // true);
	11964	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11965	+ pingthread.StepToTarget(); // true);
11295	11966	// zoomonce = false;
11296	11967	}
11297	11968
..	..	@@ -11345,7 +12016,14 @@
11345	12016
11346	12017	usedtextures.clear();
11347	12018
11348		- BindTextures(DEFAULT_TEXTURES, 2);
	12019	+ try
	12020	+ {
	12021	+ BindTextures(DEFAULT_TEXTURES, 2);
	12022	+ }
	12023	+ catch (Exception e)
	12024	+ {
	12025	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	12026	+ }
11349	12027	}
11350	12028	//System.out.println("--> " + stackdepth);
11351	12029	// GrafreeD.traceon();
..	..	@@ -11355,8 +12033,9 @@
11355	12033
11356	12034	if (DrawMode() == DEFAULT)
11357	12035	{
11358		- if (DEBUG)
	12036	+ if (Globals.DEBUG)
11359	12037	{
	12038	+ CreateSelectedPoint();
11360	12039	float radius = 0.05f;
11361	12040	if (selectedpoint.radius != radius)
11362	12041	{
..	..	@@ -11410,20 +12089,32 @@
11410	12089	ReleaseTextures(DEFAULT_TEXTURES);
11411	12090
11412	12091	if (CLEANCACHE)
11413		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	12092	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11414	12093	{
11415		- String tex = e.nextElement();
	12094	+ cTexture tex = e.nextElement();
11416	12095
11417	12096	// System.out.println("Texture --------- " + tex);
11418	12097
11419		- if (tex.equals("WHITE_NOISE"))
	12098	+ if (tex.equals("WHITE_NOISE:"))
11420	12099	continue;
11421	12100
11422		- if (!usedtextures.containsKey(tex))
	12101	+ if (!usedtextures.contains(tex))
11423	12102	{
	12103	+ CacheTexture gettex = texturepigment.get(tex);
11424	12104	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11425		- textures.get(tex).texture.dispose();
11426		- textures.remove(tex);
	12105	+ if (gettex != null)
	12106	+ {
	12107	+ gettex.texture.dispose();
	12108	+ texturepigment.remove(tex);
	12109	+ }
	12110	+
	12111	+ gettex = texturebump.get(tex);
	12112	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	12113	+ if (gettex != null)
	12114	+ {
	12115	+ gettex.texture.dispose();
	12116	+ texturebump.remove(tex);
	12117	+ }
11427	12118	}
11428	12119	}
11429	12120	}
..	..	@@ -11436,7 +12127,14 @@
11436	12127	if (checker != null && DrawMode() == DEFAULT)
11437	12128	{
11438	12129	//BindTexture(IMMORTAL_TEXTURE);
11439		- BindTextures(checker.GetTextures(), checker.texres);
	12130	+ try
	12131	+ {
	12132	+ BindTextures(checker.GetTextures(), checker.texres);
	12133	+ }
	12134	+ catch (Exception e)
	12135	+ {
	12136	+ System.err.println("FAILED: " + checker.GetTextures());
	12137	+ }
11440	12138	// NEAREST
11441	12139	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11442	12140	DrawChecker(gl);
..	..	@@ -11518,7 +12216,7 @@
11518	12216	return;
11519	12217	}
11520	12218
11521		- String string = obj.GetToolTip();
	12219	+ String string = obj.toString(); //.GetToolTip();
11522	12220
11523	12221	GL gl = GetGL();
11524	12222
..	..	@@ -11835,8 +12533,8 @@
11835	12533	//obj.TransformToWorld(light, light);
11836	12534	for (int i = tp.size(); --i >= 0;)
11837	12535	{
11838		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11839		- LA.xformPos(light, tp.get(i).toParent, light);
	12536	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12537	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11840	12538	}
11841	12539
11842	12540
..	..	@@ -11853,8 +12551,8 @@
11853	12551	parentcam = cameras[0];
11854	12552	}
11855	12553
11856		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11857		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12554	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12555	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11858	12556
11859	12557	LA.xformPos(light, renderCamera.toScreen, light);
11860	12558
..	..	@@ -11944,8 +12642,82 @@
11944	12642
11945	12643	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
11946	12644
11947		- String program =
	12645	+ String programmin =
	12646	+ // Min shader
11948	12647	"!!ARBfp1.0\n" +
	12648	+ "PARAM zero12t = { 0.0, 1.0, 2, 1.25 };" +
	12649	+ "PARAM pow_2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12650	+ "PARAM pow2 = { 2, 4, 8, 0.0 };" +
	12651	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12652	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12653	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12654	+ "PARAM light2cam0 = program.env[10];" +
	12655	+ "PARAM light2cam1 = program.env[11];" +
	12656	+ "PARAM light2cam2 = program.env[12];" +
	12657	+ "TEMP temp;" +
	12658	+ "TEMP light;" +
	12659	+ "TEMP ndotl;" +
	12660	+ "TEMP normal;" +
	12661	+ "TEMP depth;" +
	12662	+ "TEMP eye;" +
	12663	+ "TEMP pos;" +
	12664	+
	12665	+ "MAD normal, fragment.color, zero12t.z, -zero12t.y;" +
	12666	+ Normalize("normal") +
	12667	+ "MOV light, state.light[0].position;" +
	12668	+ "DP3 ndotl.x, light, normal;" +
	12669	+ "MAX ndotl.x, ndotl.x, zero12t.x;" +
	12670	+
	12671	+ // shadow
	12672	+ "MOV pos, fragment.texcoord[1];" +
	12673	+ "MOV temp, pos;" +
	12674	+ ShadowTextureFetch("depth", "temp", "1") +
	12675	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12676	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12677	+
	12678	+ // No shadow when out of frustum
	12679	+ //"SGE temp.y, depth.z, zero123.y;" +
	12680	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12681	+
	12682	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12683	+
	12684	+ // Backlit
	12685	+ "MOV pos.w, zero12t.y;" + // one
	12686	+ "DP4 eye.x, pos, light2cam0;" +
	12687	+ "DP4 eye.y, pos, light2cam1;" +
	12688	+ "DP4 eye.z, pos, light2cam2;" +
	12689	+ Normalize("eye") +
	12690	+
	12691	+ "DP3 ndotl.y, -eye, normal;" +
	12692	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12693	+ "POW ndotl.y, ndotl.y, pow2.x;" + // backlit
	12694	+ "SUB ndotl.y, zero12t.y, ndotl.y;" + // 1 - y
	12695	+ //"POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12696	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12697	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12698	+ "ADD ndotl.y, ndotl.y, one.x;" +
	12699	+ "MUL ndotl.y, ndotl.y, pow_2.x;" +
	12700	+
	12701	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12702	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12703	+
	12704	+ // Pigment
	12705	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12706	+ "LRP temp, zero12t.w, temp, one;" + // texture proportion
	12707	+ "MUL temp, temp, zero12t.w;" + // Times x
	12708	+
	12709	+ //"MUL temp, temp, ndotl.y;" +
	12710	+ "MAD ndotl.x, pow_2.xxxx, ndotl.yyyy, ndotl.x;" +
	12711	+
	12712	+ "MUL temp, temp, ndotl.x;" + // lambert
	12713	+
	12714	+ "MOV temp.w, zero12t.y;" + // reset alpha
	12715	+ "MOV result.color, temp;" +
	12716	+ "END";
	12717	+
	12718	+ String programmax =
	12719	+ "!!ARBfp1.0\n" +
	12720	+
11949	12721	//"OPTION ARB_fragment_program_shadow;" +
11950	12722	"PARAM light2cam0 = program.env[10];" +
11951	12723	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -11971,7 +12743,7 @@
11971	12743	"PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
11972	12744	"PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
11973	12745	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
11974		- "PARAM params7 = program.env[7];" + // noise power, opacity power
	12746	+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
11975	12747	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
11976	12748	"PARAM options1 = program.env[62];" + // fog rgb color
11977	12749	"PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
..	..	@@ -12060,8 +12832,7 @@
12060	12832	"TEMP shininess;" +
12061	12833	"\n" +
12062	12834	"MOV texSamp, one;" +
12063		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12064		-
	12835	+
12065	12836	"MOV mapgrid.x, one2048th.x;" +
12066	12837	"MOV temp, fragment.texcoord[1];" +
12067	12838	/*
..	..	@@ -12082,20 +12853,20 @@
12082	12853	"MUL temp, floor, mapgrid.x;" +
12083	12854	//"TEX depth0, temp, texture[1], 2D;" +
12084	12855	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12085		- TextureFetch("depth0", "temp", "1") +
	12856	+ ShadowTextureFetch("depth0", "temp", "1") +
12086	12857	"") +
12087	12858	"ADD temp.x, temp.x, mapgrid.x;" +
12088	12859	//"TEX depth1, temp, texture[1], 2D;" +
12089	12860	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12090		- TextureFetch("depth1", "temp", "1") +
	12861	+ ShadowTextureFetch("depth1", "temp", "1") +
12091	12862	"") +
12092	12863	"ADD temp.y, temp.y, mapgrid.x;" +
12093	12864	//"TEX depth2, temp, texture[1], 2D;" +
12094		- TextureFetch("depth2", "temp", "1") +
	12865	+ ShadowTextureFetch("depth2", "temp", "1") +
12095	12866	"SUB temp.x, temp.x, mapgrid.x;" +
12096	12867	//"TEX depth3, temp, texture[1], 2D;" +
12097	12868	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12098		- TextureFetch("depth3", "temp", "1") +
	12869	+ ShadowTextureFetch("depth3", "temp", "1") +
12099	12870	"") +
12100	12871	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12101	12872	//"MOV params, material;" +
..	..	@@ -12217,7 +12988,7 @@
12217	12988	"POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
12218	12989	// mar 2013 ??? "KIL alpha.a;" +
12219	12990	"MOV alpha, texSamp.aaaa;" + // y;" +
12220		- "KIL alpha.a;" +
	12991	+ "KIL alpha.a;" + // not sure with parallax mapping
12221	12992	/*
12222	12993	"MUL temp.xy, temp, two;" +
12223	12994	"TXB bump, temp, texture[0], 2D;" +
..	..	@@ -12303,11 +13074,6 @@
12303	13074	"SUB bump0, bump0, half;" +
12304	13075	"ADD bump, bump, bump0;" +
12305	13076
12306		- "MOV temp.x, texSamp.a;" +
12307		- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12308		- //"LRP texSamp0, params5.x, texSamp0, one;" +
12309		- "MOV texSamp.a, temp.x;" +
12310		-
12311	13077	// double-sided
12312	13078	/**/
12313	13079	(doublesided?"DP3 temp.z, normal, eye;" +
..	..	@@ -12317,26 +13083,73 @@
12317	13083	"ADD temp.x, temp.x, one.x;" +
12318	13084	"MUL normal, normal, temp.xxxx;":""
12319	13085	) +
12320		- /**/
12321		-//// Normalize("normal") +
12322		-//// "MAX normal.z, eps.x, normal.z;" +
12323		-// Normalize("normal") +
12324		- "MOV normald, normal;" +
12325		- "MOV normals, normal;" +
	13086	+ /**/
	13087	+
	13088	+ "MOV temp, fragment.texcoord[4];" +
12326	13089
12327	13090	// UV base
12328	13091	//"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
12329	13092	//"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
12330	13093	//"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
12331		- "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
12332		- "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
12333		- "DP3 UP.z,state.matrix.texture[7].row[2],Y;" +
	13094	+ "DP3 UP.x,state.matrix.texture[7].row[0],temp;" +
	13095	+ "DP3 UP.y,state.matrix.texture[7].row[1],temp;" +
	13096	+ "DP3 UP.z,state.matrix.texture[7].row[2],temp;" +
	13097	+ Normalize("UP") +
	13098	+
12334	13099	"XPD V, normal, UP;" +
12335	13100	Normalize("V") +
12336	13101	"XPD U, V, normal;" +
12337	13102	Normalize("U") +
12338	13103
	13104	+ "MOV temp, fragment.texcoord[0];" +
	13105	+
	13106	+// "MAD normal, -temp.x, U, normal;" +
	13107	+// "MAD normal, -temp.y, V, normal;" +
	13108	+// Normalize("normal") +
	13109	+
	13110	+//// "MAX normal.z, eps.x, normal.z;" +
	13111	+// Normalize("normal") +
	13112	+ "MOV normald, normal;" +
	13113	+ "MOV normals, normal;" +
	13114	+
12339	13115	// parallax mapping
	13116	+
	13117	+ "DP3 temp2.x, V, eye;" +
	13118	+ "DP3 temp2.y, U, eye;" +
	13119	+ "DP3 temp2.z, normal, eye;" +
	13120	+ "RCP temp2.z, temp2.z;" +
	13121	+
	13122	+ "DP3 temp2.w, texSamp, texSamp;" + // Height
	13123	+ "RSQ temp2.w, temp2.w;" +
	13124	+ "RCP temp2.w, temp2.w;" +
	13125	+
	13126	+ "SUB temp2.w, temp2.w, half;" +
	13127	+ // "SGE temp.x, temp2.w, eps.x;" +
	13128	+ // "MUL temp2.w, temp2.w, temp.x;" +
	13129	+
	13130	+ // "MOV texSamp, U;" +
	13131	+
	13132	+ "MUL temp2.z, temp2.z, temp2.w;" +
	13133	+ "MUL temp2.z, temp2.z, params7.z;" + // parallax
	13134	+
	13135	+ "MUL temp2, temp2, temp2.z;" +
	13136	+
	13137	+ "SUB temp, temp, temp2;" +
	13138	+
	13139	+ "TEX temp, temp, texture[0], 2D;" +
	13140	+ "POW temp.a, temp.a, params6.w;" + // punch through
	13141	+
	13142	+ "ADD texSamp, temp, texSamp;" +
	13143	+ "MUL texSamp.xyz, half, texSamp;" +
	13144	+
	13145	+ "MOV alpha, texSamp.aaaa;" +
	13146	+
	13147	+// parallax mapping
	13148	+
	13149	+ "MOV temp.x, texSamp.a;" +
	13150	+ "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
	13151	+ //"LRP texSamp0, params5.x, texSamp0, one;" +
	13152	+ "MOV texSamp.a, temp.x;" +
12340	13153
12341	13154	//"MOV temp, fragment.texcoord[0];" +
12342	13155	//
..	..	@@ -12466,10 +13279,10 @@
12466	13279	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12467	13280	"") +
12468	13281
12469		- // display shadow only (bump == 0)
	13282	+ // display shadow only (fakedepth == 0)
12470	13283	"SUB temp.x, half.x, shadow.x;" +
12471		- "MOV temp.y, -params6.x;" +
12472		- "SLT temp.z, temp.y, zero.x;" +
	13284	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	13285	+ "SLT temp.z, temp.y, -c256i.x;" +
12473	13286	"SUB temp.y, one.x, temp.z;" +
12474	13287	"MUL temp.x, temp.x, temp.y;" +
12475	13288	"KIL temp.x;" +
..	..	@@ -12598,8 +13411,10 @@
12598	13411	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12599	13412
12600	13413	"SUB temp.x, one.x, ndotl.x;" +
12601		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
12602		- "ADD temp.y, one.y, options2.y;" + // sursurface
	13414	+ // Tuning for default skin
	13415	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	13416	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	13417	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12603	13418	"MUL temp.x, temp.x, temp.y;" +
12604	13419
12605	13420	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12798,8 +13613,19 @@
12798	13613	//once = true;
12799	13614	}
12800	13615
12801		- System.out.print("Program #" + mode + "; length = " + program.length());
12802		- System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13616	+ String program = programmax;
	13617	+
	13618	+ if (Globals.MINSHADER)
	13619	+ {
	13620	+ program = programmin;
	13621	+ }
	13622	+
	13623	+ if (Globals.DEBUG)
	13624	+ {
	13625	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
	13626	+ System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13627	+ }
	13628	+
12803	13629	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12804	13630
12805	13631	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -12846,7 +13672,8 @@
12846	13672	"\n" +
12847	13673	"END\n";
12848	13674
12849		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13675	+ if (Globals.DEBUG)
	13676	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
12850	13677	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12851	13678
12852	13679	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -12891,25 +13718,26 @@
12891	13718	return out;
12892	13719	}
12893	13720
12894		- String TextureFetch(String dest, String src, String unit)
	13721	+ // Also does frustum culling
	13722	+ String ShadowTextureFetch(String dest, String src, String unit)
12895	13723	{
12896	13724	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12897	13725	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12898	13726	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13727	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13728	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12899	13729	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12900		- "SLT " + src + ".z, " + src + ".x, one.x;" +
12901		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12902		- "SLT " + src + ".z, " + src + ".y, one.x;" +
12903		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13730	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13731	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12904	13732	//"SWZ buffer, temp, w,w,w,w;";
12905		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13733	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12906	13734	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12907	13735	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12908	13736	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12909		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13737	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12910	13738
12911		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12912		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13739	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13740	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12913	13741	}
12914	13742
12915	13743	String Shadow(String depth, String shadow)
..	..	@@ -12931,12 +13759,16 @@
12931	13759
12932	13760	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12933	13761	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13762	+
	13763	+ // Compare fragment depth in light space with shadowmap.
12934	13764	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12935	13765	"SGE temp.y, temp.x, zero.x;" +
12936		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13766	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13767	+
	13768	+ // Reverse comparison
12937	13769	"SUB temp.x, one.x, temp.x;" +
12938	13770	"MUL " + shadow + ".x, temp.x, temp.y;" +
12939		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13771	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12940	13772	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12941	13773
12942	13774	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12950,6 +13782,10 @@
12950	13782	// No shadow for backface
12951	13783	"DP3 temp.x, normal, lightd;" +
12952	13784	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13785	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13786	+
	13787	+ // No shadow when out of frustum
	13788	+ "SGE temp.x, " + depth + ".z, one.z;" +
12953	13789	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12954	13790	"";
12955	13791	}
..	..	@@ -13095,8 +13931,9 @@
13095	13931	/static/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
13096	13932	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13097	13933	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13098		- /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13099		- Object3D.cVector2[] vector2buffer;
	13934	+ /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
	13935	+
	13936	+ //Object3D.cVector2[] vector2buffer;
13100	13937
13101	13938	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13102	13939	// OUT : diff, spec
..	..	@@ -13112,9 +13949,10 @@
13112	13949	"DP3 " + dest + ".z," + "normals," + "eye;" +
13113	13950	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13114	13951	//"MOV " + dest + ".w," + "normal.z;" +
13115		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13116		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13117		- //"MOV " + dest + ".z," + "params2.w;" +
	13952	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13953	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13954	+
	13955	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13118	13956	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13119	13957	"RCP " + dest + ".w," + dest + ".w;" +
13120	13958	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13260,7 +14098,7 @@
13260	14098	"PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
13261	14099	"PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
13262	14100	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
13263		- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
	14101	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
13264	14102	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
13265	14103	"PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
13266	14104	//"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
..	..	@@ -13321,7 +14159,7 @@
13321	14159	"DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
13322	14160	"DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
13323	14161	"DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
13324		- //"MOV result.texcoord, vertex.texcoord;" +
	14162	+ //"MOV result.texcoord, vertex.fogcoord;" +
13325	14163	"MOV result.texcoord, temp;" +
13326	14164	// border fade
13327	14165	"MOV result.texcoord[3], vertex.texcoord;" +
..	..	@@ -13368,7 +14206,9 @@
13368	14206
13369	14207	//"ADD temp.z, temp.z, one;" +
13370	14208
13371		- "MOV result.color, temp;"
	14209	+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
	14210	+
	14211	+ "MOV result.color, temp;" // Normal
13372	14212	: "MOV result.color, vertex.color;") +
13373	14213	((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
13374	14214	: "") +
..	..	@@ -13503,12 +14343,13 @@
13503	14343	public void mouseClicked(MouseEvent e)
13504	14344	{
13505	14345	System.out.println("mouseClicked: " + e);
	14346	+ System.exit(0);
13506	14347	}
13507	14348
13508	14349	public void mousePressed(MouseEvent e)
13509	14350	{
13510	14351	//System.out.println("mousePressed: " + e);
13511		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	14352	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13512	14353	}
13513	14354
13514	14355	static long prevtime = 0;
..	..	@@ -13541,10 +14382,12 @@
13541	14382	return;
13542	14383	}
13543	14384
13544		- boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
	14385	+ //boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
	14386	+
	14387	+ boolean vr = capsLocked && !lightMode;
13545	14388
13546	14389	// TIMER
13547		- if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	14390	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !vr) // VR
13548	14391	{
13549	14392	keepboxmode = BOXMODE;
13550	14393	keepsupport = SUPPORT;
..	..	@@ -13584,8 +14427,8 @@
13584	14427	// mode \|= META;
13585	14428	//}
13586	14429
13587		- SetMouseMode(WHEEL \| e.getModifiersEx());
13588		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	14430	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	14431	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, e.getModifiers(), e.getModifiersEx());
13589	14432	anchorX = ax;
13590	14433	anchorY = ay;
13591	14434	prevX = px;
..	..	@@ -13619,6 +14462,7 @@
13619	14462	else
13620	14463	if (evt.getSource() == AAtimer)
13621	14464	{
	14465	+ Globals.TIMERRUNNING = false;
13622	14466	if (mouseDown)
13623	14467	{
13624	14468	//new Exception().printStackTrace();
..	..	@@ -13644,6 +14488,10 @@
13644	14488	// LIVE = waslive;
13645	14489	// wasliveok = true;
13646	14490	// waslive = false;
	14491	+
	14492	+ // May 2019 Forget it:
	14493	+ if (true)
	14494	+ return;
13647	14495
13648	14496	// source == timer
13649	14497	if (mouseDown)
..	..	@@ -13674,21 +14522,23 @@
13674	14522
13675	14523	// fev 2014???
13676	14524	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13677		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13678		- pingthread.StepToTarget(true); // true);
	14525	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14526	+ pingthread.StepToTarget(); // true);
13679	14527	}
	14528	+
13680	14529	// if (!LIVE)
13681	14530	super.repaint();
13682	14531	}
13683	14532
13684	14533	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13685	14534
13686		- void clickStart(int x, int y, int modifiers)
	14535	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13687	14536	{
13688	14537	if (!wasliveok)
13689	14538	return;
13690	14539
13691	14540	AAtimer.restart(); //
	14541	+ Globals.TIMERRUNNING = true;
13692	14542
13693	14543	// waslive = LIVE;
13694	14544	// LIVE = false;
..	..	@@ -13700,7 +14550,7 @@
13700	14550	// touched = true; // main DL
13701	14551	if (isRenderer)
13702	14552	{
13703		- SetMouseMode(modifiers);
	14553	+ SetMouseMode(modifiers, modifiersex);
13704	14554	}
13705	14555
13706	14556	selectX = anchorX = x;
..	..	@@ -13713,7 +14563,7 @@
13713	14563	clicked = true;
13714	14564	hold = false;
13715	14565
13716		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14566	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13717	14567	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13718	14568	{
13719	14569	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13738,14 +14588,15 @@
13738	14588	drag = false;
13739	14589	//System.out.println("Mouse DOWN");
13740	14590	editObj = false;
13741		- ClickInfo info = new ClickInfo();
13742		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13743		- info.pane = this;
13744		- info.camera = renderCamera;
13745		- info.x = x;
13746		- info.y = y;
13747		- info.modifiers = modifiers;
13748		- editObj = object.doEditClick(info, 0);
	14591	+ //ClickInfo info = new ClickInfo();
	14592	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14593	+ object.clickInfo.pane = this;
	14594	+ object.clickInfo.camera = renderCamera;
	14595	+ object.clickInfo.x = x;
	14596	+ object.clickInfo.y = y;
	14597	+ object.clickInfo.modifiers = modifiersex;
	14598	+ editObj = object.doEditClick(//info,
	14599	+ 0);
13749	14600	if (!editObj)
13750	14601	{
13751	14602	hasMarquee = true;
..	..	@@ -13761,19 +14612,22 @@
13761	14612
13762	14613	public void mouseDragged(MouseEvent e)
13763	14614	{
	14615	+ Globals.MOUSEDRAGGED = true;
	14616	+
13764	14617	//System.out.println("mouseDragged: " + e);
13765	14618	if (isRenderer)
13766	14619	movingcamera = true;
	14620	+
13767	14621	//if (drawing)
13768	14622	//return;
13769		- if ((e.getModifiersEx() & CTRL) != 0
13770		- \|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
	14623	+ if ((e.getModifiersEx() & CTRL) != 0 \|\|
	14624	+ (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
13771	14625	{
13772	14626	//System.out.println("mouseDragged: " + e);
13773	14627	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13774	14628	}
13775	14629	else
13776		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14630	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13777	14631
13778	14632	//try { Thread.sleep(1); } catch (Exception ex) {}
13779	14633	}
..	..	@@ -13791,9 +14645,17 @@
13791	14645	return targetLookAt;
13792	14646	}
13793	14647
	14648	+ javax.vecmath.Point3d eye = new javax.vecmath.Point3d();
	14649	+ javax.vecmath.Point3d eye2 = new javax.vecmath.Point3d();
	14650	+ javax.vecmath.Vector3d dir = new javax.vecmath.Vector3d();
	14651	+
	14652	+
13794	14653	class PingThread extends Thread
13795	14654	{
13796	14655	boolean jump;
	14656	+ boolean live;
	14657	+
	14658	+ boolean mute = false;
13797	14659
13798	14660	// void JumpToTarget()
13799	14661	// {
..	..	@@ -13809,6 +14671,95 @@
13809	14671	// only one thread!? synchronized
13810	14672	void StepToTarget(boolean jump)
13811	14673	{
	14674	+ RigidBody.pos.x = 0;
	14675	+ RigidBody.pos.y = 0;
	14676	+ RigidBody.pos.z = 0;
	14677	+ if (RigidBody.justclicked)
	14678	+ {
	14679	+// RigidBody.pos.x = (float)manipCamera.lookAt.x;
	14680	+// RigidBody.pos.y = (float)manipCamera.lookAt.y;
	14681	+// RigidBody.pos.z = (float)manipCamera.lookAt.z;
	14682	+ // System.err.println("selected point = " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][1]) + " " + Trunk(selectedpoint.toParent[3][2]));
	14683	+ CreateSelectedPoint();
	14684	+
	14685	+ RigidBody.pos.x = (float)selectedpoint.toParent[3][0];
	14686	+ RigidBody.pos.y = (float)selectedpoint.toParent[3][1];
	14687	+ RigidBody.pos.z = (float)selectedpoint.toParent[3][2];
	14688	+
	14689	+ RigidBody.wind.set(RigidBody.pos);
	14690	+ RigidBody.wind.x -= (float)manipCamera.location.x;
	14691	+ RigidBody.wind.y -= (float)manipCamera.location.y;
	14692	+ RigidBody.wind.z -= (float)manipCamera.location.z;
	14693	+ RigidBody.wind.normalize();
	14694	+ }
	14695	+
	14696	+ if (mute)
	14697	+ return;
	14698	+
	14699	+ if (capsLocked && manipCamera.viewCode == 0)
	14700	+ {
	14701	+ eye.x = manipCamera.location.x;
	14702	+ eye.y = manipCamera.location.y + 0.25;
	14703	+ eye.z = manipCamera.location.z;
	14704	+
	14705	+ dir.y = -1;
	14706	+
	14707	+ Ray ray = new Ray(eye, dir);
	14708	+
	14709	+ IntersectResult res = new IntersectResult();
	14710	+ res.t = Double.POSITIVE_INFINITY;
	14711	+
	14712	+ tmp.set(targetLookAt);
	14713	+ tmp.sub(manipCamera.location);
	14714	+
	14715	+ double dist = tmp.length();
	14716	+
	14717	+ tmp.normalize();
	14718	+
	14719	+ eye2.x = manipCamera.location.x + tmp.x * 0.25;
	14720	+ eye2.y = manipCamera.location.y + 0.25;
	14721	+ eye2.z = manipCamera.location.z + tmp.z * 0.25;
	14722	+
	14723	+ Ray ray2 = new Ray(eye2, dir);
	14724	+
	14725	+ IntersectResult res2 = new IntersectResult();
	14726	+ res2.t = Double.POSITIVE_INFINITY;
	14727	+
	14728	+ if (object.intersect(ray, res) && object.intersect(ray2, res2) && Math.abs(res.t - res2.t) < 0.25)
	14729	+ {
	14730	+ //tmp.set(manipCamera.location);
	14731	+
	14732	+ manipCamera.location.x = ray.eyePoint.x + ray.viewDirection.x * res.t;
	14733	+ manipCamera.location.y = ray.eyePoint.y + ray.viewDirection.y * res.t + 0.5;
	14734	+ manipCamera.location.z = ray.eyePoint.z + ray.viewDirection.z * res.t;
	14735	+
	14736	+ //tmp.sub(manipCamera.location);
	14737	+
	14738	+ targetLookAt.x = ray2.eyePoint.x + ray2.viewDirection.x * res2.t;
	14739	+ targetLookAt.y = ray2.eyePoint.y + ray2.viewDirection.y * res2.t + 0.5;
	14740	+ targetLookAt.z = ray2.eyePoint.z + ray2.viewDirection.z * res2.t;
	14741	+
	14742	+ targetLookAt.sub(manipCamera.location);
	14743	+ targetLookAt.normalize();
	14744	+ targetLookAt.mul(dist);
	14745	+ targetLookAt.add(manipCamera.location);
	14746	+
	14747	+ //if (tmp.dot(tmp) > 0.000001)
	14748	+ // System.out.println("INTERSECTION " + manipCamera.location);
	14749	+
	14750	+ manipCamera.lookAt.set(targetLookAt);
	14751	+
	14752	+ tmp.x = res.n.x;
	14753	+ tmp.y = res.n.y;
	14754	+ tmp.z = res.n.z;
	14755	+ tmp.x += res2.n.x;
	14756	+ tmp.y += res2.n.y;
	14757	+ tmp.z += res2.n.z;
	14758	+ tmp.normalize();
	14759	+ manipCamera.UP.set(tmp);
	14760	+ }
	14761	+ }
	14762	+
13812	14763	tmp.set(targetLookAt);
13813	14764	tmp.sub(manipCamera.lookAt); // june 2014
13814	14765
..	..	@@ -13846,7 +14797,7 @@
13846	14797
13847	14798	if (tmp.dot(tmp) > 1) // may 2014. far away: jump to target
13848	14799	{
13849		- jump = true; // step = 1;
	14800	+ // sep 2019 jump = true; // step = 1;
13850	14801	}
13851	14802
13852	14803	if (OEILONCE && OEIL)
..	..	@@ -13881,7 +14832,10 @@
13881	14832	if (tmp.dot(tmp) < 0.00001)
13882	14833	{
13883	14834	zoomonce = false;
	14835	+ live = false;
13884	14836	}
	14837	+ else
	14838	+ live = true;
13885	14839
13886	14840	tmp.mul(step > step2 ? step : step2);
13887	14841	}
..	..	@@ -13908,7 +14862,7 @@
13908	14862	{
13909	14863	if (LOOKAT)
13910	14864	manipCamera.lookAt.add(tmp);
13911		- if (OEIL)
	14865	+ if (OEIL && !capsLocked)
13912	14866	manipCamera.location.add(tmp);
13913	14867
13914	14868	{
..	..	@@ -13923,7 +14877,10 @@
13923	14877	lightCamera.computeTransform();
13924	14878	}
13925	14879	}
13926		- manipCamera.computeTransform();
	14880	+ if (tmp.x != 0 \|\| tmp.y != 0 \|\| tmp.z != 0)
	14881	+ {
	14882	+ manipCamera.computeTransform();
	14883	+ }
13927	14884	}
13928	14885	// ?????? mouseDown = true;
13929	14886	//System.out.println("---------------- ---------- Paint " + tmp.length2());
..	..	@@ -13946,6 +14903,7 @@
13946	14903
13947	14904	public void run()
13948	14905	{
	14906	+ new Exception().printStackTrace();
13949	14907	System.exit(0);
13950	14908	for (;;)
13951	14909	{
..	..	@@ -14009,55 +14967,113 @@
14009	14967	{
14010	14968	Globals.lighttouched = true;
14011	14969	}
14012		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14970	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
14013	14971	}
14014	14972	//else
14015	14973	}
14016	14974	}
14017	14975	}
	14976	+
14018	14977	PingThread pingthread = new PingThread();
14019		- int delta = 5;
14020		- int speed = 5;
	14978	+ int delta = 1;
	14979	+ int speed = 1;
	14980	+ int walk = 8;
14021	14981	boolean autorepeat = false;
14022	14982
	14983	+ void Walk()
	14984	+ {
	14985	+ manipCamera.BackForth(0, walk, 1000);
	14986	+
	14987	+ targetLookAt.set(manipCamera.lookAt);
	14988	+ }
	14989	+
	14990	+ void ViewAngle(float dy)
	14991	+ {
	14992	+ double factor = Math.exp(-dy/300.0); // (1 + dy/100);
	14993	+
	14994	+ if (manipCamera.shaper_fovy * factor > 1 &&
	14995	+ manipCamera.shaper_fovy * factor < 150)
	14996	+ {
	14997	+ manipCamera.shaper_fovy *= factor;
	14998	+ //System.out.println("fovy = " + shaper_fovy);
	14999	+ }
	15000	+ }
	15001	+
14023	15002	void GoDown(int mod)
14024	15003	{
14025	15004	MODIFIERS \|= COMMAND;
14026		- /*
	15005	+ boolean isVR = (mouseMode&VR)!=0;
	15006	+ /**/
14027	15007	if((mod&SHIFT) == SHIFT)
14028		- manipCamera.RotatePosition(0, -speed);
14029		- else
14030		- manipCamera.BackForth(0, -speed*delta, getWidth());
14031		- */
14032		- if ((mod & SHIFT) == SHIFT)
14033	15008	{
14034		- mouseMode = mouseMode; // VR??
14035		- } else
14036		- {
14037		- mouseMode \|= BACKFORTH;
	15009	+// if (isVR)
	15010	+// manipCamera.RotateInterest(0, speed);
	15011	+// else
	15012	+ if (isVR)
	15013	+ ViewAngle(-speed*delta);
	15014	+ else
	15015	+ manipCamera.Translate(0, -speed*delta, getWidth());
14038	15016	}
	15017	+ else
	15018	+ {
	15019	+ if (isVR)
	15020	+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
	15021	+ else
	15022	+ manipCamera.RotatePosition(0, -speed);
	15023	+ }
	15024	+
	15025	+ /**/
	15026	+// if ((mod & SHIFT) == SHIFT)
	15027	+// {
	15028	+// mouseMode = mouseMode; // VR??
	15029	+// } else
	15030	+// {
	15031	+// mouseMode \|= BACKFORTH;
	15032	+// }
14039	15033
	15034	+ targetLookAt.set(manipCamera.lookAt);
	15035	+
14040	15036	//prevX = X = anchorX;
14041	15037	prevY = Y = anchorY - (int) (renderCamera.Distance());
14042	15038	}
14043	15039
14044	15040	void GoUp(int mod)
14045	15041	{
	15042	+ RigidBody.justclicked = true;
	15043	+
14046	15044	MODIFIERS \|= COMMAND;
14047		- /*
	15045	+ /**/
	15046	+ boolean isVR = (mouseMode&VR)!=0;
	15047	+
14048	15048	if((mod&SHIFT) == SHIFT)
14049		- manipCamera.RotatePosition(0, speed);
14050		- else
14051		- manipCamera.BackForth(0, speed*delta, getWidth());
14052		- */
14053		- if ((mod & SHIFT) == SHIFT)
14054	15049	{
14055		- mouseMode = mouseMode;
14056		- } else
14057		- {
14058		- mouseMode \|= BACKFORTH;
	15050	+// if (isVR)
	15051	+// manipCamera.RotateInterest(0, -speed);
	15052	+// else
	15053	+ if (isVR)
	15054	+ ViewAngle(speed*delta);
	15055	+ else
	15056	+ manipCamera.Translate(0, speed*delta, getWidth());
14059	15057	}
	15058	+ else
	15059	+ {
	15060	+ if (isVR)
	15061	+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
	15062	+ else
	15063	+ manipCamera.RotatePosition(0, speed);
	15064	+ }
	15065	+
	15066	+ /**/
	15067	+// if ((mod & SHIFT) == SHIFT)
	15068	+// {
	15069	+// mouseMode = mouseMode;
	15070	+// } else
	15071	+// {
	15072	+// mouseMode \|= BACKFORTH;
	15073	+// }
14060	15074
	15075	+ targetLookAt.set(manipCamera.lookAt);
	15076	+
14061	15077	//prevX = X = anchorX;
14062	15078	prevY = Y = anchorY + (int) (renderCamera.Distance());
14063	15079	}
..	..	@@ -14065,20 +15081,31 @@
14065	15081	void GoLeft(int mod)
14066	15082	{
14067	15083	MODIFIERS \|= COMMAND;
14068		- /*
	15084	+ /**/
14069	15085	if((mod&SHIFT) == SHIFT)
14070		- manipCamera.RotatePosition(speed, 0);
	15086	+ manipCamera.Translate(speed, 0, getWidth());
14071	15087	else
14072		- manipCamera.Translate(speed*delta, 0, getWidth());
14073		- */
14074		- if ((mod & SHIFT) == SHIFT)
14075	15088	{
14076		- mouseMode = mouseMode;
14077		- } else
14078		- {
14079		- mouseMode \|= ROTATE;
14080		- } // TRANSLATE;
	15089	+ if ((mouseMode&VR)!=0)
	15090	+ manipCamera.RotateInterest(-speed*manipCamera.shaper_fovy/90, 0);
	15091	+ else
	15092	+ manipCamera.RotatePosition(speed*manipCamera.shaper_fovy/90, 0);
	15093	+ }
	15094	+
	15095	+ /**/
	15096	+// if ((mod & SHIFT) == SHIFT)
	15097	+// {
	15098	+// mouseMode = mouseMode;
	15099	+// } else
	15100	+// {
	15101	+// mouseMode \|= ROTATE;
	15102	+// } // TRANSLATE;
14081	15103
	15104	+ //System.err.println("lookAt = " + manipCamera.lookAt);
	15105	+ //System.err.println("location = " + manipCamera.location);
	15106	+
	15107	+ targetLookAt.set(manipCamera.lookAt);
	15108	+
14082	15109	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
14083	15110	prevY = Y = anchorY;
14084	15111	}
..	..	@@ -14086,20 +15113,28 @@
14086	15113	void GoRight(int mod)
14087	15114	{
14088	15115	MODIFIERS \|= COMMAND;
14089		- /*
	15116	+ /**/
14090	15117	if((mod&SHIFT) == SHIFT)
14091		- manipCamera.RotatePosition(-speed, 0);
	15118	+ manipCamera.Translate(-speed, 0, getWidth());
14092	15119	else
14093		- manipCamera.Translate(-speed*delta, 0, getWidth());
14094		- */
14095		- if ((mod & SHIFT) == SHIFT)
14096	15120	{
14097		- mouseMode = mouseMode;
14098		- } else
14099		- {
14100		- mouseMode \|= ROTATE;
14101		- } // TRANSLATE;
	15121	+ if ((mouseMode&VR)!=0)
	15122	+ manipCamera.RotateInterest(speed*manipCamera.shaper_fovy/90, 0);
	15123	+ else
	15124	+ manipCamera.RotatePosition(-speed*manipCamera.shaper_fovy/90, 0);
	15125	+ }
	15126	+
	15127	+ /**/
	15128	+// if ((mod & SHIFT) == SHIFT)
	15129	+// {
	15130	+// mouseMode = mouseMode;
	15131	+// } else
	15132	+// {
	15133	+// mouseMode \|= ROTATE;
	15134	+// } // TRANSLATE;
14102	15135
	15136	+ targetLookAt.set(manipCamera.lookAt);
	15137	+
14103	15138	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
14104	15139	prevY = Y = anchorY;
14105	15140	}
..	..	@@ -14109,7 +15144,7 @@
14109	15144	int X, Y;
14110	15145	boolean SX, SY;
14111	15146
14112		- void drag(int x, int y, int modifiers)
	15147	+ void drag(int x, int y, int modifiers, int modifiersex)
14113	15148	{
14114	15149	if (IsFrozen())
14115	15150	{
..	..	@@ -14118,17 +15153,17 @@
14118	15153
14119	15154	drag = true; // NEW
14120	15155
14121		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	15156	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
14122	15157
14123	15158	X = x;
14124	15159	Y = y;
14125	15160	// floating state for animation
14126		- MODIFIERS = modifiers;
14127		- modifiers &= ~1024;
	15161	+ MODIFIERS = modifiersex;
	15162	+ modifiersex &= ~1024;
14128	15163	if (false) // modifiers != 0)
14129	15164	{
14130	15165	//new Exception().printStackTrace();
14131		- System.out.println("mouseDragged: " + modifiers);
	15166	+ System.out.println("mouseDragged: " + modifiersex);
14132	15167	System.out.println("SHIFT = " + SHIFT);
14133	15168	System.out.println("CONTROL = " + COMMAND);
14134	15169	System.out.println("META = " + META);
..	..	@@ -14141,14 +15176,16 @@
14141	15176	if (editObj)
14142	15177	{
14143	15178	drag = true;
14144		- ClickInfo info = new ClickInfo();
14145		- info.bounds.setBounds(0, 0,
	15179	+ //ClickInfo info = new ClickInfo();
	15180	+ object.clickInfo.bounds.setBounds(0, 0,
14146	15181	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14147		- info.pane = this;
14148		- info.camera = renderCamera;
14149		- info.x = x;
14150		- info.y = y;
14151		- object.editWindow.copy.doEditDrag(info);
	15182	+ object.clickInfo.pane = this;
	15183	+ object.clickInfo.camera = renderCamera;
	15184	+ object.clickInfo.x = x;
	15185	+ object.clickInfo.y = y;
	15186	+ object //.GetWindow().copy
	15187	+ .doEditDrag(//info,
	15188	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14152	15189	} else
14153	15190	{
14154	15191	if (x < startX)
..	..	@@ -14231,6 +15268,11 @@
14231	15268	if ((mouseMode & ZOOM) != 0)
14232	15269	{
14233	15270	//if ((mouseMode & BACKFORTH) != 0)
	15271	+ if ((modifiersex & SHIFT) == SHIFT)
	15272	+ {
	15273	+ ViewAngle(dy);
	15274	+ }
	15275	+ else
14234	15276	if ((mouseMode & VR) != 0)
14235	15277	manipCamera.BackForth(dx, dy, getWidth());
14236	15278	else
..	..	@@ -14297,22 +15339,30 @@
14297	15339	}
14298	15340	}
14299	15341
	15342	+// ClickInfo clickInfo = new ClickInfo();
	15343	+
14300	15344	public void mouseMoved(MouseEvent e)
14301	15345	{
	15346	+//object.editWindow.frame.
	15347	+ setCursor(Cursor.getDefaultCursor());
	15348	+
14302	15349	//System.out.println("mouseMoved: " + e);
14303	15350	if (isRenderer)
14304	15351	return;
14305	15352
14306		- ClickInfo ci = new ClickInfo();
14307		- ci.x = e.getX();
14308		- ci.y = e.getY();
14309		- ci.modifiers = e.getModifiersEx();
14310		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14311		- ci.pane = this;
14312		- ci.camera = renderCamera;
	15353	+ // Mouse cursor feedback
	15354	+ object.clickInfo.x = e.getX();
	15355	+ object.clickInfo.y = e.getY();
	15356	+ object.clickInfo.modifiers = e.getModifiersEx();
	15357	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	15358	+ object.clickInfo.pane = this;
	15359	+ object.clickInfo.camera = renderCamera;
14313	15360	if (!isRenderer)
14314	15361	{
14315		- if (object.editWindow.copy.doEditClick(ci, 0))
	15362	+ //ObjEditor editWindow = object.editWindow;
	15363	+ //Object3D copy = editWindow.copy;
	15364	+ if (object.doEditClick(//clickInfo,
	15365	+ 0))
14316	15366	{
14317	15367	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14318	15368	} else
..	..	@@ -14324,7 +15374,17 @@
14324	15374
14325	15375	public void mouseReleased(MouseEvent e)
14326	15376	{
	15377	+ if (isRenderer && !movingcamera)
	15378	+ {
	15379	+ RigidBody.justclicked = true;
	15380	+ System.out.println("justclicked: " + e);
	15381	+ }
	15382	+
	15383	+ Globals.MOUSEDRAGGED = false;
	15384	+
14327	15385	movingcamera = false;
	15386	+ X = 0; // getBounds().width/2;
	15387	+ Y = 0; // getBounds().height/2;
14328	15388	//System.out.println("mouseReleased: " + e);
14329	15389	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14330	15390	}
..	..	@@ -14347,9 +15407,9 @@
14347	15407	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14348	15408	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14349	15409
14350		- if (control \|\| command \|\| IsFrozen())
	15410	+// No delay if (control \|\| command \|\| IsFrozen())
14351	15411	timeout = true;
14352		- else
	15412	+// ?? May 2019 else
14353	15413	// timer.setDelay((modifiers & 128) != 0?0:350);
14354	15414	mouseDown = false;
14355	15415	if (!control && !command) // june 2013
..	..	@@ -14459,7 +15519,7 @@
14459	15519	System.out.println("keyReleased: " + e);
14460	15520	}
14461	15521
14462		- void SetMouseMode(int modifiers)
	15522	+ void SetMouseMode(int modifiers, int modifiersex)
14463	15523	{
14464	15524	//System.out.println("SetMouseMode = " + modifiers);
14465	15525	//modifiers &= ~1024;
..	..	@@ -14471,25 +15531,28 @@
14471	15531	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14472	15532	// return;
14473	15533	//System.out.println("SetMode = " + modifiers);
14474		- if ((modifiers & WHEEL) == WHEEL)
	15534	+ if ((modifiersex & WHEEL) == WHEEL)
14475	15535	{
14476	15536	mouseMode \|= ZOOM;
14477	15537	}
14478	15538
14479		- boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14480		- if (capsLocked \|\| (modifiers & META) == META)
	15539	+ //boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
	15540	+ boolean vr = capsLocked && !lightMode;
	15541	+
	15542	+ if (vr) // \|\| (modifiers & META) == META)
14481	15543	{
14482	15544	mouseMode \|= VR; // BACKFORTH;
14483	15545	}
14484		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	15546	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14485	15547	{
14486	15548	mouseMode \|= SELECT;
14487	15549	}
14488		- if ((modifiers & COMMAND) == COMMAND)
	15550	+ if ((modifiersex & COMMAND) == COMMAND)
14489	15551	{
14490	15552	mouseMode \|= SELECT;
14491	15553	}
14492		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	15554	+ if (//(modifiersex & SHIFT) == SHIFT \|\|
	15555	+ forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14493	15556	{
14494	15557	mouseMode &= ~VR;
14495	15558	mouseMode \|= TRANSLATE;
..	..	@@ -14518,7 +15581,7 @@
14518	15581
14519	15582	if (isRenderer) //
14520	15583	{
14521		- SetMouseMode(modifiers);
	15584	+ SetMouseMode(0, modifiers);
14522	15585	}
14523	15586
14524	15587	Globals.theRenderer.keyPressed(key);
..	..	@@ -14533,8 +15596,18 @@
14533	15596	float SATPOW = 1; // 2; // 0.5f;
14534	15597	float BRIPOW = 1; // 0.5f; // 0.5f;
14535	15598
	15599	+static BufferedImage cursorImg = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB);
	15600	+
	15601	+// Create a new blank cursor.
	15602	+static Cursor blankCursor = Toolkit.getDefaultToolkit().createCustomCursor(
	15603	+ cursorImg, new Point(0, 0), "blank cursor");
	15604	+
14536	15605	public void keyPressed(int key)
14537	15606	{
	15607	+// Set the blank cursor to the JFrame.
	15608	+//object.editWindow.frame.
	15609	+ setCursor(blankCursor);
	15610	+
14538	15611	if (key >= '0' && key <= '5')
14539	15612	clampbit = (key-'0');
14540	15613
..	..	@@ -14580,7 +15653,8 @@
14580	15653	// break;
14581	15654	case 'T':
14582	15655	CACHETEXTURE ^= true;
14583		- textures.clear();
	15656	+ texturepigment.clear();
	15657	+ texturebump.clear();
14584	15658	// repaint();
14585	15659	break;
14586	15660	case 'Y':
..	..	@@ -14590,8 +15664,8 @@
14590	15664	case 'K':
14591	15665	KOMPACTTEXTURE ^= true;
14592	15666	//textures.clear();
14593		- break;
14594		- case 'P': // Texture Projection macros
	15667	+ // break;
	15668	+ //case 'P': // Texture Projection macros
14595	15669	// SAVETEXTURE ^= true;
14596	15670	macromode = true;
14597	15671	Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
..	..	@@ -14665,7 +15739,9 @@
14665	15739	case 'E' : COMPACT ^= true;
14666	15740	repaint();
14667	15741	break;
14668		- case 'W' : DEBUGHSB ^= true;
	15742	+ case 'W' : // Wide Window (fullscreen)
	15743	+ //DEBUGHSB ^= true;
	15744	+ ObjEditor.theFrame.ToggleFullScreen();
14669	15745	repaint();
14670	15746	break;
14671	15747	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14690,8 +15766,8 @@
14690	15766	RevertCamera();
14691	15767	repaint();
14692	15768	break;
	15769	+ //case 'l':
14693	15770	case 'L':
14694		- case 'l':
14695	15771	if (lightMode)
14696	15772	{
14697	15773	lightMode = false;
..	..	@@ -14710,7 +15786,7 @@
14710	15786	targetLookAt.set(manipCamera.lookAt);
14711	15787	repaint();
14712	15788	break;
14713		- case 'p':
	15789	+ case 'P': // p':
14714	15790	// c'est quoi ca au juste? spherical ^= true;
14715	15791	Skinshader ^= true; programInitialized = false;
14716	15792	repaint();
..	..	@@ -14721,7 +15797,8 @@
14721	15797	break;
14722	15798	case 'm':
14723	15799	{
14724		- PrintMemory();
	15800	+ //PrintMemory();
	15801	+ ToggleImageFlip();
14725	15802	break;
14726	15803	}
14727	15804	case 'M':
..	..	@@ -14748,27 +15825,31 @@
14748	15825	repaint();
14749	15826	break;
14750	15827	case 'O':
14751		- Globals.drawMode = OCCLUSION; // WARNING
14752		- repaint();
14753		- break;
	15828	+ // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
	15829	+ //repaint();
	15830	+ //break;
14754	15831	case 'o':
14755	15832	OCCLUSION_CULLING ^= true;
14756	15833	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14757	15834	break;
14758		- case '0': envyoff ^= true; repaint(); break;
	15835	+ //case '0': envyoff ^= true; repaint(); break;
14759	15836	case '1':
14760	15837	case '2':
14761	15838	case '3':
14762	15839	case '4':
14763	15840	case '5':
14764		- newenvy = Character.getNumericValue(key);
14765		- repaint();
14766		- break;
14767	15841	case '6':
14768	15842	case '7':
14769	15843	case '8':
14770	15844	case '9':
14771		- BGcolor = (key - '6')/3.f;
	15845	+ if (true) // envyoff)
	15846	+ {
	15847	+ BGcolor = (key - '1')/8.f;
	15848	+ }
	15849	+ else
	15850	+ {
	15851	+ //newenvy = Character.getNumericValue(key);
	15852	+ }
14772	15853	repaint();
14773	15854	break;
14774	15855	case '!':
..	..	@@ -14834,11 +15915,25 @@
14834	15915	case '_':
14835	15916	kompactbit = 5;
14836	15917	break;
14837		- case '+':
14838		- kompactbit = 6;
14839		- break;
	15918	+// case '+':
	15919	+// kompactbit = 6;
	15920	+// break;
14840	15921	case ' ':
	15922	+ capsLocked ^= true;
	15923	+ repaint();
	15924	+ break;
	15925	+ case 'l':
14841	15926	lightMode ^= true;
	15927	+ if (lightMode)
	15928	+ {
	15929	+ keepshadow = Globals.RENDERSHADOW;
	15930	+ Globals.RENDERSHADOW = false;
	15931	+ }
	15932	+ else
	15933	+ {
	15934	+ Globals.RENDERSHADOW = keepshadow;
	15935	+ }
	15936	+
14842	15937	Globals.lighttouched = true;
14843	15938	manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14844	15939	targetLookAt.set(manipCamera.lookAt);
..	..	@@ -14846,15 +15941,20 @@
14846	15941	break;
14847	15942	//case '`' :
14848	15943	case ESC:
	15944	+ if (FULLSCREEN)
	15945	+ object.editWindow.ToggleFullScreen();
	15946	+ break;
	15947	+ case 'p':
14849	15948	RENDERPROGRAM += 1;
14850	15949	RENDERPROGRAM %= 3;
	15950	+
14851	15951	repaint();
14852	15952	break;
14853	15953	case 'Z':
14854	15954	//RESIZETEXTURE ^= true;
14855	15955	//break;
14856	15956	case 'z':
14857		- RENDERSHADOW ^= true;
	15957	+ Globals.RENDERSHADOW ^= true;
14858	15958	Globals.lighttouched = true;
14859	15959	repaint();
14860	15960	break;
..	..	@@ -14883,12 +15983,17 @@
14883	15983	case ENTER:
14884	15984	// object.editWindow.ScreenFit(); // Edit();
14885	15985	ToggleLive();
	15986	+ if (capsLocked)
	15987	+ {
	15988	+ Globals.WALK ^= true;
	15989	+ }
14886	15990	break;
14887	15991	case DELETE:
14888	15992	ClearSelection();
14889	15993	break;
14890		- /*
14891	15994	case '+':
	15995	+
	15996	+ /*
14892	15997	//fontsize += 1;
14893	15998	bbzoom *= 2;
14894	15999	repaint();
..	..	@@ -14905,30 +16010,36 @@
14905	16010	case '=':
14906	16011	IncDepth();
14907	16012	//fontsize += 1;
14908		- object.editWindow.refreshContents(true);
	16013	+ object.GetWindow().refreshContents(true);
14909	16014	maskbit = 6;
14910	16015	break;
14911	16016	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14912	16017	DecDepth();
14913	16018	maskbit = 5;
14914	16019	//if(fontsize > 1) fontsize -= 1;
14915		- if (object.editWindow == null)
14916		- new Exception().printStackTrace();
14917		- else
14918		- object.editWindow.refreshContents(true);
	16020	+// if (object.editWindow == null)
	16021	+// new Exception().printStackTrace();
	16022	+// else
	16023	+ object.GetWindow().refreshContents(true);
14919	16024	break;
14920	16025	case '{':
14921		- manipCamera.shaper_fovy /= 1.1;
	16026	+ double factor = 1.1;
	16027	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16028	+ manipCamera.shaper_fovy /= factor;
14922	16029	System.out.println("FOV = " + manipCamera.shaper_fovy);
14923	16030	repaint();
14924	16031	break;
14925	16032	case '}':
14926		- manipCamera.shaper_fovy *= 1.1;
	16033	+ factor = 1.1;
	16034	+ if (manipCamera.shaper_fovy * factor < 150)
	16035	+ manipCamera.shaper_fovy *= factor;
14927	16036	System.out.println("FOV = " + manipCamera.shaper_fovy);
14928	16037	repaint();
14929	16038	break;
14930	16039	case '[':
14931		- manipCamera.shaper_fovy /= 1.01;
	16040	+ factor = 1.01;
	16041	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16042	+ manipCamera.shaper_fovy /= factor;
14932	16043	if (false) //manipCamera.hAspect == 0)
14933	16044	{
14934	16045	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -14944,7 +16055,9 @@
14944	16055	break;
14945	16056	case ']':
14946	16057	//manipCamera.shaper_fovy += (180 - manipCamera.shaper_fovy)*0.1;
14947		- manipCamera.shaper_fovy *= 1.01;
	16058	+ factor = 1.01;
	16059	+ if (manipCamera.shaper_fovy * factor < 150)
	16060	+ manipCamera.shaper_fovy *= factor;
14948	16061	if (false) //manipCamera.hAspect == 0)
14949	16062	{
14950	16063	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -14978,102 +16091,117 @@
14978	16091	//mode = ROTATE;
14979	16092	if ((MODIFIERS & COMMAND) == 0) // VR??
14980	16093	{
14981		- SetMouseMode(modifiers);
	16094	+ SetMouseMode(0, modifiers);
14982	16095	}
14983	16096	}
14984	16097
	16098	+ boolean keys[] = new boolean[256];
	16099	+ int speedkey[] = new int[256];
	16100	+ int modifiers = 0;
	16101	+
14985	16102	public void processKeyEvent(KeyEvent e)
14986	16103	{
14987	16104	switch (e.getID())
14988	16105	{
14989	16106	case KeyEvent.KEY_PRESSED:
14990		- if (!autorepeat)
14991		- {
14992		- //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
14993		- keyPressed(e.getKeyChar(), e.getModifiersEx());
14994		- }
14995		- if (manipCamera == lightCamera)
14996		- {
14997		- switch (e.getKeyCode())
14998		- {
14999		- case DOWN_ARROW:
15000		- lightCamera.DECAL /= 2;
15001		- repaint();
15002		- break;
15003		- case UP_ARROW:
15004		- lightCamera.DECAL *= 2;
15005		- repaint();
15006		- break;
15007		- case LEFT_ARROW:
15008		- lightCamera.SCALE /= 2;
15009		- repaint();
15010		- break;
15011		- case RIGHT_ARROW:
15012		- lightCamera.SCALE *= 2;
15013		- repaint();
15014		- break;
15015		- default:
15016		- break;
15017		- }
15018		-
15019		- System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
15020		- } else
15021		- {
15022		- if (true) // !autorepeat)
15023		- {
15024		- boolean reset = true;
15025		-
15026		- switch (e.getKeyCode())
15027		- {
15028		- case DOWN_ARROW:
15029		- GoDown(e.getModifiersEx());
15030		- repaint();
15031		- break;
15032		- case UP_ARROW:
15033		- GoUp(e.getModifiersEx());
15034		- repaint();
15035		- break;
15036		- case LEFT_ARROW:
15037		- GoLeft(e.getModifiersEx());
15038		- repaint();
15039		- break;
15040		- case RIGHT_ARROW:
15041		- GoRight(e.getModifiersEx());
15042		- repaint();
15043		- break;
15044		- default:
15045		- reset = false;
15046		- break;
15047		- }
15048		-
15049		- if (reset)
15050		- {
15051		- autorepeat = true;
15052		-
15053		- targetLookAt.set(manipCamera.lookAt);
15054		- }
15055		- }
15056		- }
	16107	+ keys[e.getKeyCode()] = true;
	16108	+ modifiers = e.getModifiersEx();
	16109	+ keyPressed(e.getKeyChar(), modifiers);
	16110	+ //Globals.theRenderer.keyPressed(e.getKeyChar());
	16111	+ repaint();
15057	16112	break;
15058		- case KeyEvent.KEY_TYPED:
15059		- break;
	16113	+// if (!autorepeat)
	16114	+// {
	16115	+// //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
	16116	+// keyPressed(e.getKeyChar(), e.getModifiersEx());
	16117	+// }
	16118	+// if (manipCamera == lightCamera)
	16119	+// {
	16120	+// switch (e.getKeyCode())
	16121	+// {
	16122	+// case DOWN_ARROW:
	16123	+// lightCamera.DECAL /= 2;
	16124	+// repaint();
	16125	+// break;
	16126	+// case UP_ARROW:
	16127	+// lightCamera.DECAL *= 2;
	16128	+// repaint();
	16129	+// break;
	16130	+// case LEFT_ARROW:
	16131	+// lightCamera.SCALE /= 2;
	16132	+// repaint();
	16133	+// break;
	16134	+// case RIGHT_ARROW:
	16135	+// lightCamera.SCALE *= 2;
	16136	+// repaint();
	16137	+// break;
	16138	+// default:
	16139	+// break;
	16140	+// }
	16141	+//
	16142	+// System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
	16143	+// } else
	16144	+// {
	16145	+// if (true) // !autorepeat)
	16146	+// {
	16147	+// boolean reset = true;
	16148	+//
	16149	+// switch (e.getKeyCode())
	16150	+// {
	16151	+// case DOWN_ARROW:
	16152	+// GoDown(e.getModifiersEx());
	16153	+// repaint();
	16154	+// break;
	16155	+// case UP_ARROW:
	16156	+// GoUp(e.getModifiersEx());
	16157	+// repaint();
	16158	+// break;
	16159	+// case LEFT_ARROW:
	16160	+// GoLeft(e.getModifiersEx());
	16161	+// repaint();
	16162	+// break;
	16163	+// case RIGHT_ARROW:
	16164	+// GoRight(e.getModifiersEx());
	16165	+// repaint();
	16166	+// break;
	16167	+// default:
	16168	+// reset = false;
	16169	+// break;
	16170	+// }
	16171	+//
	16172	+// if (reset)
	16173	+// {
	16174	+// autorepeat = true;
	16175	+//
	16176	+// targetLookAt.set(manipCamera.lookAt);
	16177	+// }
	16178	+// }
	16179	+// }
	16180	+// break;
	16181	+// case KeyEvent.KEY_TYPED:
	16182	+// break;
15060	16183	case KeyEvent.KEY_RELEASED:
15061		- {
15062		- switch (e.getKeyCode())
15063		- {
15064		- case DOWN_ARROW:
15065		- case UP_ARROW:
15066		- case LEFT_ARROW:
15067		- case RIGHT_ARROW:
15068		- MODIFIERS &= ~COMMAND;
15069		- autorepeat = false;
15070		- break;
15071		- default:
15072		- break;
15073		- }
	16184	+ keys[e.getKeyCode()] = false;
	16185	+ modifiers = e.getModifiersEx();
15074	16186	keyReleased(e.getKeyChar(), e.getModifiersEx());
	16187	+ repaint();
15075	16188	break;
15076		- }
	16189	+// {
	16190	+// switch (e.getKeyCode())
	16191	+// {
	16192	+// case DOWN_ARROW:
	16193	+// case UP_ARROW:
	16194	+// case LEFT_ARROW:
	16195	+// case RIGHT_ARROW:
	16196	+// MODIFIERS &= ~COMMAND;
	16197	+// autorepeat = false;
	16198	+// break;
	16199	+// default:
	16200	+// break;
	16201	+// }
	16202	+// keyReleased(e.getKeyChar(), e.getModifiersEx());
	16203	+// break;
	16204	+// }
15077	16205	default:
15078	16206	break;
15079	16207	}
..	..	@@ -15114,7 +16242,7 @@
15114	16242	{
15115	16243	//System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
15116	16244	//if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
15117		- if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (mouseMode & SELECT) == 0)
	16245	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
15118	16246	{
15119	16247	mouseMoved(e);
15120	16248	} else
..	..	@@ -15139,11 +16267,12 @@
15139	16267	}
15140	16268	*/
15141	16269
15142		- object.editWindow.EditSelection();
	16270	+ object.GetWindow().EditSelection(false);
15143	16271	}
15144	16272
15145	16273	void SelectParent()
15146	16274	{
	16275	+ new Exception().printStackTrace();
15147	16276	System.exit(0);
15148	16277	Composite group = (Composite) object;
15149	16278	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -15155,10 +16284,10 @@
15155	16284	{
15156	16285	//selectees.remove(i);
15157	16286	System.out.println("select parent of " + elem);
15158		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	16287	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15159	16288	} else
15160	16289	{
15161		- group.editWindow.Select(elem.GetTreePath(), first, true);
	16290	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15162	16291	}
15163	16292
15164	16293	first = false;
..	..	@@ -15167,6 +16296,7 @@
15167	16296
15168	16297	void SelectChildren()
15169	16298	{
	16299	+ new Exception().printStackTrace();
15170	16300	System.exit(0);
15171	16301	/*
15172	16302	Composite group = (Composite) object;
..	..	@@ -15199,12 +16329,12 @@
15199	16329	for (int j = 0; j < group.children.size(); j++)
15200	16330	{
15201	16331	elem = (Object3D) group.children.elementAt(j);
15202		- object.editWindow.Select(elem.GetTreePath(), first, true);
	16332	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15203	16333	first = false;
15204	16334	}
15205	16335	} else
15206	16336	{
15207		- object.editWindow.Select(elem.GetTreePath(), first, true);
	16337	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15208	16338	}
15209	16339
15210	16340	first = false;
..	..	@@ -15215,21 +16345,21 @@
15215	16345	{
15216	16346	//Composite group = (Composite) object;
15217	16347	Object3D group = object;
15218		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	16348	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15219	16349	}
15220	16350
15221	16351	void ResetTransform(int mask)
15222	16352	{
15223	16353	//Composite group = (Composite) object;
15224	16354	Object3D group = object;
15225		- group.editWindow.ResetTransform(mask);
	16355	+ group.GetWindow().ResetTransform(mask);
15226	16356	}
15227	16357
15228	16358	void FlipTransform()
15229	16359	{
15230	16360	//Composite group = (Composite) object;
15231	16361	Object3D group = object;
15232		- group.editWindow.FlipTransform();
	16362	+ group.GetWindow().FlipTransform();
15233	16363	// group.editWindow.ReduceMesh(true);
15234	16364	}
15235	16365
..	..	@@ -15237,7 +16367,7 @@
15237	16367	{
15238	16368	//Composite group = (Composite) object;
15239	16369	Object3D group = object;
15240		- group.editWindow.PrintMemory();
	16370	+ group.GetWindow().PrintMemory();
15241	16371	// group.editWindow.ReduceMesh(true);
15242	16372	}
15243	16373
..	..	@@ -15245,7 +16375,7 @@
15245	16375	{
15246	16376	//Composite group = (Composite) object;
15247	16377	Object3D group = object;
15248		- group.editWindow.ResetCentroid();
	16378	+ group.GetWindow().ResetCentroid();
15249	16379	}
15250	16380
15251	16381	void IncDepth()
..	..	@@ -15327,11 +16457,11 @@
15327	16457
15328	16458	int width = getBounds().width;
15329	16459	int height = getBounds().height;
15330		- ClickInfo info = new ClickInfo();
15331		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15332	16460	//Image img = CreateImage(width, height);
15333	16461	//System.out.println("width = " + width + "; height = " + height + "\n");
	16462	+
15334	16463	Graphics gr = g; // img.getGraphics();
	16464	+
15335	16465	if (!hasMarquee)
15336	16466	{
15337	16467	if (Xmin < Xmax) // !locked)
..	..	@@ -15403,44 +16533,92 @@
15403	16533	}
15404	16534	if (object != null && !hasMarquee)
15405	16535	{
	16536	+ if (object.clickInfo == null)
	16537	+ object.clickInfo = new ClickInfo();
	16538	+ ClickInfo info = object.clickInfo;
	16539	+ //ClickInfo info = new ClickInfo();
	16540	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16541	+
15406	16542	if (isRenderer)
15407	16543	{
15408		- info.flags++;
	16544	+ object.clickInfo.flags++;
15409	16545	double frameAspect = (double) width / (double) height;
15410	16546	if (frameAspect > renderCamera.aspect)
15411	16547	{
15412	16548	int desired = (int) ((double) height * renderCamera.aspect);
15413		- info.bounds.width -= width - desired;
15414		- info.bounds.x += (width - desired) / 2;
	16549	+ object.clickInfo.bounds.width -= width - desired;
	16550	+ object.clickInfo.bounds.x += (width - desired) / 2;
15415	16551	} else
15416	16552	{
15417	16553	int desired = (int) ((double) width / renderCamera.aspect);
15418		- info.bounds.height -= height - desired;
15419		- info.bounds.y += (height - desired) / 2;
	16554	+ object.clickInfo.bounds.height -= height - desired;
	16555	+ object.clickInfo.bounds.y += (height - desired) / 2;
15420	16556	}
15421	16557	}
15422		- info.g = gr;
15423		- info.camera = renderCamera;
	16558	+
	16559	+ object.clickInfo.g = gr;
	16560	+ object.clickInfo.camera = renderCamera;
15424	16561	/*
15425	16562	// Memory intensive (brep.verticescopy)
15426	16563	if (!(object instanceof Composite))
15427	16564	object.draw(info, 0, false); // SLOW :
15428	16565	*/
15429		- if (!isRenderer)
	16566	+ if (!isRenderer) // && drag)
15430	16567	{
15431		- object.drawEditHandles(info, 0);
	16568	+ Grafreed.Assert(object != null);
	16569	+ Grafreed.Assert(object.selection != null);
	16570	+ if (object.selection.Size() > 0)
	16571	+ {
	16572	+ int hitSomething = object.selection.get(0).hitSomething;
	16573	+
	16574	+ object.clickInfo.DX = 0;
	16575	+ object.clickInfo.DY = 0;
	16576	+ object.clickInfo.W = 1;
	16577	+ if (hitSomething == Object3D.hitCenter)
	16578	+ {
	16579	+ info.DX = X;
	16580	+ if (X != 0)
	16581	+ info.DX -= info.bounds.width/2;
	16582	+
	16583	+ info.DY = Y;
	16584	+ if (Y != 0)
	16585	+ info.DY -= info.bounds.height/2;
	16586	+ }
	16587	+
	16588	+ object.drawEditHandles(//info,
	16589	+ 0);
	16590	+
	16591	+ if (drag && (X != 0 \|\| Y != 0))
	16592	+ {
	16593	+ switch (hitSomething)
	16594	+ {
	16595	+ case Object3D.hitCenter: gr.setColor(Color.white);
	16596	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16597	+ break;
	16598	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16599	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16600	+ break;
	16601	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16602	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16603	+ break;
	16604	+ }
	16605	+
	16606	+ }
	16607	+ }
15432	16608	}
15433	16609	}
	16610	+
15434	16611	if (isRenderer)
15435	16612	{
15436	16613	//gr.setColor(Color.black);
15437	16614	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15438	16615	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15439	16616	}
	16617	+
15440	16618	if (hasMarquee)
15441	16619	{
15442	16620	gr.setXORMode(Color.white);
15443		- gr.setColor(Color.red);
	16621	+ gr.setColor(Color.white);
15444	16622	if (!firstime)
15445	16623	{
15446	16624	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -15549,6 +16727,7 @@
15549	16727	public boolean mouseDown(Event evt, int x, int y)
15550	16728	{
15551	16729	System.out.println("mouseDown: " + evt);
	16730	+ System.exit(0);
15552	16731	/*
15553	16732	locked = true;
15554	16733	drag = false;
..	..	@@ -15592,13 +16771,14 @@
15592	16771	{
15593	16772	keyPressed(0, modifiers);
15594	16773	}
15595		- clickStart(x, y, modifiers);
	16774	+ // clickStart(x, y, modifiers);
15596	16775	return true;
15597	16776	}
15598	16777
15599	16778	public boolean mouseDrag(Event evt, int x, int y)
15600	16779	{
15601		- //System.out.println("mouseDrag: " + evt);
	16780	+ System.out.println("mouseDrag: " + evt);
	16781	+ System.exit(0);
15602	16782	/*
15603	16783	drag = true;
15604	16784	//System.out.println("Mouse DRAG");
..	..	@@ -15710,13 +16890,14 @@
15710	16890	{
15711	16891	keyReleased(0, 0);
15712	16892	}
15713		- drag(x, y, modifiers);
	16893	+ drag(x, y, 0, modifiers);
15714	16894	return true;
15715	16895	}
15716	16896
15717	16897	public boolean mouseUp(Event evt, int x, int y)
15718	16898	{
15719	16899	System.out.println("mouseUp: " + evt);
	16900	+ System.exit(0);
15720	16901	/*
15721	16902	locked = false;
15722	16903	if (isRenderer)
..	..	@@ -15842,7 +17023,7 @@
15842	17023	Object3D object;
15843	17024	static Object3D trackedobject;
15844	17025	Camera renderCamera; // Light or Eye (or Occlusion)
15845		- /static/ Camera manipCamera; // Light or Eye
	17026	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15846	17027	/static/ Camera eyeCamera;
15847	17028	/static/ Camera lightCamera;
15848	17029	int cameracount;
..	..	@@ -15906,6 +17087,8 @@
15906	17087	private /static/ boolean firstime;
15907	17088	private /static/ cVector newView = new cVector();
15908	17089	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	17090	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	17091	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
15909	17092	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
15910	17093	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
15911	17094	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -15918,36 +17101,74 @@
15918	17101	{
15919	17102	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
15920	17103
	17104	+ int usedsuf = 0;
	17105	+
15921	17106	for (int i = 0; i < suffixes.length; i++)
15922	17107	{
15923		- String resourceName = basename + suffixes[i] + "." + suffix;
15924		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
15925		- mipmapped,
15926		- FileUtil.getFileSuffix(resourceName));
15927		- if (data == null)
	17108	+ String[] suffixe = suffixes;
	17109	+ String[] fallback = suffixes2;
	17110	+ String[] fallfallback = suffixes3;
	17111	+
	17112	+ for (int c=usedsuf; --c>=0;)
15928	17113	{
15929		- throw new IOException("Unable to load texture " + resourceName);
	17114	+// String[] temp = suffixe;
	17115	+// suffixe = fallback;
	17116	+// fallback = fallfallback;
	17117	+// fallfallback = temp;
15930	17118	}
	17119	+
	17120	+ String resourceName = basename + suffixe[i] + "." + suffix;
	17121	+ TextureData data;
	17122	+
	17123	+ try
	17124	+ {
	17125	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	17126	+ mipmapped,
	17127	+ FileUtil.getFileSuffix(resourceName));
	17128	+ }
	17129	+ catch (Exception e)
	17130	+ {
	17131	+ try
	17132	+ {
	17133	+ resourceName = basename + fallback[i] + "." + suffix;
	17134	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	17135	+ mipmapped,
	17136	+ FileUtil.getFileSuffix(resourceName));
	17137	+ }
	17138	+ catch (Exception e2)
	17139	+ {
	17140	+ resourceName = basename + fallfallback[i] + "." + suffix;
	17141	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	17142	+ mipmapped,
	17143	+ FileUtil.getFileSuffix(resourceName));
	17144	+ }
	17145	+ }
	17146	+
15931	17147	//System.out.println("Target = " + targets[i]);
15932	17148	cubemap.updateImage(data, targets[i]);
15933	17149	}
15934	17150
15935	17151	return cubemap;
15936	17152	}
	17153	+
15937	17154	int bigsphere = -1;
15938	17155
15939	17156	float BGcolor = 0.5f;
15940	17157
15941		- private void DrawSkyBox(GL gl)
	17158	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	17159	+
	17160	+ private void DrawSkyBox(GL gl, float ratio)
15942	17161	{
15943		- if (envyoff \|\| cubemap == null)
	17162	+ if (//envyoff \|\|
	17163	+ WIREFRAME \|\|
	17164	+ cubemap == null)
15944	17165	{
15945	17166	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
15946	17167	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
15947	17168	return;
15948	17169	}
15949	17170
15950		- if (WIREFRAME)
	17171	+ //if (WIREFRAME)
15951	17172	gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL);
15952	17173
15953	17174	gl.glDisable(gl.GL_CULL_FACE);
..	..	@@ -15955,7 +17176,17 @@
15955	17176	// Compensates for ExaminerViewer's modification of modelview matrix
15956	17177	gl.glMatrixMode(GL.GL_MODELVIEW);
15957	17178	gl.glLoadIdentity();
	17179	+ gl.glScalef(1,ratio,1);
15958	17180
	17181	+// colorV[0] = 2;
	17182	+// colorV[1] = 2;
	17183	+// colorV[2] = 2;
	17184	+// colorV[3] = 1;
	17185	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	17186	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	17187	+//
	17188	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	17189	+
15959	17190	//gl.glActiveTexture(GL.GL_TEXTURE1);
15960	17191	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
15961	17192
..	..	@@ -15987,6 +17218,7 @@
15987	17218	{
15988	17219	gl.glScalef(1.0f, -1.0f, 1.0f);
15989	17220	}
	17221	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
15990	17222	gl.glMultMatrixd(viewrot_1, 0);
15991	17223	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
15992	17224	//viewer.updateInverseRotation(gl);
..	..	@@ -16027,7 +17259,8 @@
16027	17259	gl.glDisable(GL.GL_TEXTURE_GEN_R);
16028	17260
16029	17261	cubemap.disable();
16030		- ////cubemap.unbind();
	17262	+ //cubemap.dispose();
	17263	+
16031	17264	if (CULLFACE)
16032	17265	{
16033	17266	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -16035,6 +17268,8 @@
16035	17268
16036	17269	if (WIREFRAME)
16037	17270	gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_LINE);
	17271	+ else
	17272	+ gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL);
16038	17273	}
16039	17274
16040	17275	private void DrawChecker(GL gl)
..	..	@@ -16083,7 +17318,7 @@
16083	17318	gl.glScalef(1.0f, -1.0f, 1.0f);
16084	17319	}
16085	17320
16086		- gl.glNormal3f(0.0f, 0.0f, 1.0f);
	17321	+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
16087	17322
16088	17323	float step = 2; // 0.1666f; //0.25f;
16089	17324	float stepv = 2; // step * 1652 / 998;
..	..	@@ -16127,16 +17362,16 @@
16127	17362	cStatic.objectstack[materialdepth++] = checker;
16128	17363	//System.out.println("material " + material);
16129	17364	//Applet3D.tracein(this, selected);
16130		- vector2buffer = checker.projectedVertices;
	17365	+ //vector2buffer = checker.projectedVertices;
16131	17366
16132	17367	//checker.GetMaterial().Draw(this, false); // true);
16133		- DrawMaterial(checker.GetMaterial(), false); // true);
	17368	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16134	17369
16135	17370	materialdepth -= 1;
16136	17371	if (materialdepth > 0)
16137	17372	{
16138		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16139		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	17373	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	17374	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16140	17375	}
16141	17376	//checker.GetMaterial().opacity = 1f;
16142	17377	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16222,6 +17457,14 @@
16222	17457	}
16223	17458	}
16224	17459
	17460	+ private Object3D GetFolder()
	17461	+ {
	17462	+ Object3D folder = object.GetWindow().copy;
	17463	+ if (object.GetWindow().copy.selection.Size() > 0)
	17464	+ folder = object.GetWindow().copy.selection.elementAt(0);
	17465	+ return folder;
	17466	+ }
	17467	+
16225	17468	class SelectBuffer implements GLEventListener
16226	17469	{
16227	17470
..	..	@@ -16237,7 +17480,7 @@
16237	17480	//new Exception().printStackTrace();
16238	17481	System.out.println("select buffer init");
16239	17482	// Use debug pipeline
16240		- drawable.setGL(new DebugGL(drawable.getGL()));
	17483	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16241	17484
16242	17485	GL gl = drawable.getGL();
16243	17486
..	..	@@ -16280,6 +17523,7 @@
16280	17523	{
16281	17524	if (!selection)
16282	17525	{
	17526	+ new Exception().printStackTrace();
16283	17527	System.exit(0);
16284	17528	return;
16285	17529	}
..	..	@@ -16300,6 +17544,17 @@
16300	17544
16301	17545	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16302	17546
	17547	+ if (PAINTMODE)
	17548	+ {
	17549	+ if (object.GetWindow().copy.selection.Size() > 0)
	17550	+ {
	17551	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17552	+
	17553	+ // Make what you paint not selectable.
	17554	+ paintobj.ResetSelectable();
	17555	+ }
	17556	+ }
	17557	+
16303	17558	//int tmp = selection_view;
16304	17559	//selection_view = -1;
16305	17560	int temp = DrawMode();
..	..	@@ -16311,6 +17566,17 @@
16311	17566	// temp = DEFAULT; // patch for selection debug
16312	17567	Globals.drawMode = temp; // WARNING
16313	17568
	17569	+ if (PAINTMODE)
	17570	+ {
	17571	+ if (object.GetWindow().copy.selection.Size() > 0)
	17572	+ {
	17573	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17574	+
	17575	+ // Revert.
	17576	+ paintobj.RestoreSelectable();
	17577	+ }
	17578	+ }
	17579	+
16314	17580	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16315	17581
16316	17582	// trying different ways of getting the depth info over
..	..	@@ -16341,7 +17607,7 @@
16341	17607
16342	17608	float depth = depths[y * TEX_SIZE + x];
16343	17609
16344		- if (pointselection && mouseMode == SELECT && depth != 0 && depth != 1)
	17610	+ if (pointselection && (mouseMode & SELECT) == SELECT && depth != 0 && depth != 1)
16345	17611	{
16346	17612	pointselection = false;
16347	17613
..	..	@@ -16358,6 +17624,8 @@
16358	17624	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16359	17625	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16360	17626	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17627	+
	17628	+ CreateSelectedPoint();
16361	17629
16362	17630	// Will fit the mesh !!!
16363	17631	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16407,34 +17675,36 @@
16407	17675	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]));
16408	17676	}
16409	17677
16410		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	17678	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16411	17679	}
16412	17680	}
16413	17681
16414	17682	if (!movingcamera && !PAINTMODE)
16415		- object.editWindow.ScreenFitPoint(); // fev 2014
	17683	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16416	17684
16417		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17685	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16418	17686	{
16419		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17687	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16420	17688
16421		- Object3D group = new Object3D("inst" + paintcount++);
	17689	+ if (object.GetWindow().copy.selection.Size() > 0)
	17690	+ {
	17691	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16422	17692
16423		- group.CreateMaterial(); // use a void leaf to select instances
16424		-
16425		- group.add(paintobj); // link
16426		-
16427		- object.editWindow.SnapObject(group);
16428		-
16429		- Object3D folder = object.editWindow.copy;
16430		-
16431		- if (object.editWindow.copy.selection.Size() > 0)
16432		- folder = object.editWindow.copy.selection.elementAt(0);
16433		-
16434		- folder.add(group);
16435		-
16436		- object.editWindow.ResetModel();
16437		- object.editWindow.refreshContents();
	17693	+ Object3D inst = new Object3D("inst" + paintcount++);
	17694	+
	17695	+ inst.CreateMaterial(); // use a void leaf to select instances
	17696	+
	17697	+ inst.add(paintobj); // link
	17698	+
	17699	+ object.GetWindow().SnapObject(inst);
	17700	+
	17701	+ Object3D folder = paintFolder; // GetFolder();
	17702	+
	17703	+ folder.add(inst);
	17704	+
	17705	+ object.GetWindow().ResetModel();
	17706	+ object.GetWindow().refreshContents();
	17707	+ }
16438	17708	}
16439	17709	else
16440	17710	paintcount = 0;
..	..	@@ -16473,6 +17743,11 @@
16473	17743	//System.out.println("objects[color] = " + objects[color]);
16474	17744	//objects[color].Select();
16475	17745	indexcount = 0;
	17746	+ ObjEditor window = object.GetWindow();
	17747	+ if (window != null && deselect)
	17748	+ {
	17749	+ window.Select(null, deselect, true);
	17750	+ }
16476	17751	object.Select(color, deselect);
16477	17752	}
16478	17753
..	..	@@ -16523,6 +17798,7 @@
16523	17798
16524	17799	public void init(GLAutoDrawable drawable)
16525	17800	{
	17801	+ if (Globals.DEBUG)
16526	17802	System.out.println("shadow buffer init");
16527	17803
16528	17804	GL gl = drawable.getGL();
..	..	@@ -16572,7 +17848,7 @@
16572	17848	gl.glDisable(gl.GL_CULL_FACE);
16573	17849	}
16574	17850
16575		- if (!RENDERSHADOW)
	17851	+ if (!Globals.RENDERSHADOW)
16576	17852	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16577	17853
16578	17854	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16582,7 +17858,7 @@
16582	17858	//gl.glColorMask(false, false, false, false);
16583	17859
16584	17860	//render_scene_from_light_view(gl, drawable, 0, 0);
16585		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17861	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16586	17862	{
16587	17863	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16588	17864
..	..	@@ -16751,10 +18027,14 @@
16751	18027	gl.glFlush();
16752	18028
16753	18029	/**/
16754		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
	18030	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
16755	18031
16756		- float[] pixels = occlusionsizebuffer.array();
	18032	+ float[] depths = occlusiondepthbuffer.array();
16757	18033
	18034	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
	18035	+
	18036	+ int[] pixels = selectsizebuffer.array();
	18037	+
16758	18038	double r = 0, g = 0, b = 0;
16759	18039
16760	18040	double count = 0;
..	..	@@ -16765,7 +18045,7 @@
16765	18045
16766	18046	double FACTOR = 1;
16767	18047
16768		- for (int i = 0; i < pixels.length; i++)
	18048	+ for (int i = 0; i < depths.length; i++)
16769	18049	{
16770	18050	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
16771	18051	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -16848,7 +18128,7 @@
16848	18128
16849	18129	double scale = ray.z; // 1; // cos
16850	18130
16851		- float depth = pixels[newindex];
	18131	+ float depth = depths[newindex];
16852	18132
16853	18133	/*
16854	18134	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -16991,6 +18271,11 @@
16991	18271	static boolean DEBUG_SELECTION = false;
16992	18272	boolean OCCLUSION_CULLING = false; //true;
16993	18273	public boolean lightMode = false;
	18274	+
	18275	+ private boolean keepshadow;
	18276	+
	18277	+ static public boolean capsLocked = false; // VR
	18278	+
16994	18279	static public int indexcount = 0;
16995	18280	/static/ cColor vertexOcclusion = new cColor();
16996	18281	//private int selection_view = -1;
..	..	@@ -16998,23 +18283,15 @@
16998	18283	int AAbuffersize = 0;
16999	18284
17000	18285	//double[] selectedpoint = new double[3];
17001		- static Superellipsoid selectedpoint = new Superellipsoid();
	18286	+ static Superellipsoid selectedpoint;
17002	18287	static Sphere previousselectedpoint = null;
17003		- static Sphere debugpointG = new Sphere();
17004		- static Sphere debugpointP = new Sphere();
17005		- static Sphere debugpointC = new Sphere();
17006		- static Sphere debugpointR = new Sphere();
	18288	+ static Sphere debugpointG;
	18289	+ static Sphere debugpointP;
	18290	+ static Sphere debugpointC;
	18291	+ static Sphere debugpointR;
17007	18292
17008	18293	static Sphere debugpoints[] = new Sphere[8];
17009	18294
17010		- static
17011		- {
17012		- for (int i=0; i<8; i++)
17013		- {
17014		- debugpoints[i] = new Sphere();
17015		- }
17016		- }
17017		-
17018	18295	static void InitPoints(float radius)
17019	18296	{
17020	18297	for (int i=0; i<8; i++)
..	..	@@ -17053,11 +18330,14 @@
17053	18330	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17054	18331	static IntBuffer bigAAbuffer;
17055	18332	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17056		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	18333	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17057	18334	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17058	18335	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17059	18336	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17060		- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	18337	+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	18338	+
	18339	+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	18340	+
17061	18341	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17062	18342	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17063	18343	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();