~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	{
..	..	@@ -44,6 +49,39 @@
44	49	static boolean ABORTED = false;
45	50
46	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	+ }
47	85
48	86	/static/ private boolean CULLFACE = false; // true;
49	87	/static/ boolean NEAREST = false; // true;
..	..	@@ -60,7 +98,7 @@
60	98	//boolean REDUCETEXTURE = true;
61	99	boolean CACHETEXTURE = true;
62	100	boolean CLEANCACHE = false; // true;
63		- boolean MIPMAP = true; // false; // true;
	101	+ boolean MIPMAP = false; // true; // never works...
64	102	boolean COMPRESSTEXTURE = false;
65	103	boolean KOMPACTTEXTURE = false; // true;
66	104	boolean RESIZETEXTURE = false;
..	..	@@ -73,7 +111,11 @@
73	111	//private Mat4f spotlightTransform = new Mat4f();
74	112	//private Mat4f spotlightInverseTransform = new Mat4f();
75	113	static GLContext glcontext = null;
76		- /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	+
77	119	boolean reverseUP = false;
78	120	static boolean frozen = false;
79	121	boolean enablebackspace = false; // patch for back buffer refresh
..	..	@@ -93,7 +135,7 @@
93	135	static boolean ZOOMBOXMODE = false;
94	136	static boolean BOXMODE = false;
95	137	static boolean IMAGEFLIP = false;
96		-static boolean SMOOTHFOCUS = false;
	138	+static boolean SMOOTHFOCUS = true; // false;
97	139	static boolean SPEAKERMOCAP = true; // jan 2014 false;
98	140	static boolean SPEAKERCAMERA = false;
99	141	static boolean SPEAKERFOCUS = false;
..	..	@@ -127,16 +169,16 @@
127	169
128	170
129	171	// OPTIONS
130		- boolean Skinshader = true;
	172	+ boolean Skinshader = false; // true;
131	173	boolean cameraLight = false;
132	174	boolean UVdebug = false;
133	175	boolean Udebug = false;
134	176	boolean Vdebug = false;
135	177	boolean NORMALdebug = false;
136		- static boolean doublesided = false; // true; // reversed normals are awful for conformance
	178	+ static boolean doublesided = true; // false; // reversed normals are awful for conformance
137	179	boolean anisotropy = true;
138	180	boolean softshadow = true; // slower but better false;
139		- boolean opacityhalo = false;
	181	+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
140	182
141	183	boolean macromode = false;
142	184
..	..	@@ -150,6 +192,19 @@
150	192	}
151	193
152	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	+ }
	207	+ }
153	208
154	209	void SetAsGLRenderer(boolean b)
155	210	{
..	..	@@ -167,9 +222,10 @@
167	222	cameras = new Camera[2];
168	223	targetLookAts = new cVector[2];
169	224
170		- SetCamera(cam);
	225	+ SetCamera(cam, true);
171	226
172		- SetLight(new Camera(new cVector(10, 10, -20)));
	227	+ // Warning: not used.
	228	+ //SetLight(new Camera(new cVector(15, 10, -20)));
173	229
174	230	object = o;
175	231
..	..	@@ -487,7 +543,8 @@
487	543	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
488	544	LA.vecCross(obj.v0, obj.v1, obj.v2);
489	545	LA.vecNormalize(obj.v2);
490		- 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);
491	548	}
492	549
493	550	// P
..	..	@@ -509,7 +566,7 @@
509	566	y += ny * obj.NORMALPUSH;
510	567	z += nz * obj.NORMALPUSH;
511	568
512		- gl.glNormal3f(nx, ny, nz);
	569	+ SetGLNormal(gl, nx, ny, nz);
513	570	}
514	571	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
515	572	SetColor(obj, pv);
..	..	@@ -541,7 +598,7 @@
541	598	y += ny * obj.NORMALPUSH;
542	599	z += nz * obj.NORMALPUSH;
543	600
544		- gl.glNormal3f(nx, ny, nz);
	601	+ SetGLNormal(gl, nx, ny, nz);
545	602	}
546	603	//System.out.println("vertexq = " + qv.s + ", " + qv.t);
547	604	// boolean locked = false;
..	..	@@ -589,7 +646,7 @@
589	646	y += ny * obj.NORMALPUSH;
590	647	z += nz * obj.NORMALPUSH;
591	648
592		- gl.glNormal3f(nx, ny, nz);
	649	+ SetGLNormal(gl, nx, ny, nz);
593	650	}
594	651
595	652	// if ((dot&4) == 0)
..	..	@@ -825,7 +882,7 @@
825	882	//// tris.postdraw(this);
826	883	}
827	884
828		- static Camera localcamera = new Camera();
	885	+ static Camera localAOcamera = new Camera();
829	886	static cVector from = new cVector();
830	887	static cVector to = new cVector();
831	888
..	..	@@ -834,7 +891,7 @@
834	891	CameraPane cp = this;
835	892
836	893	Camera keep = cp.RenderCamera();
837		- cp.renderCamera = localcamera;
	894	+ cp.renderCamera = localAOcamera;
838	895
839	896	if (br.trimmed)
840	897	{
..	..	@@ -852,7 +909,7 @@
852	909	br.positions[i3 + 2] + br.normals[i3 + 2]);
853	910	LA.xformPos(from, transform, from);
854	911	LA.xformPos(to, transform, to); // RIGID ONLY
855		- localcamera.setAim(from, to);
	912	+ localAOcamera.setAim(from, to);
856	913
857	914	CameraPane.occlusionbuffer.display();
858	915
..	..	@@ -886,7 +943,7 @@
886	943	to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
887	944	LA.xformPos(from, transform, from);
888	945	LA.xformPos(to, transform, to); // RIGID ONLY
889		- localcamera.setAim(from, to);
	946	+ localAOcamera.setAim(from, to);
890	947
891	948	CameraPane.occlusionbuffer.display();
892	949
..	..	@@ -1195,10 +1252,10 @@
1195	1252	{
1196	1253	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1197	1254	{
1198		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1255	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1199	1256	} else
1200	1257	{
1201		- gl.glNormal3f(0, 0, 1);
	1258	+ SetGLNormal(gl, 0, 0, 1);
1202	1259	}
1203	1260
1204	1261	if (c != null)
..	..	@@ -1222,10 +1279,10 @@
1222	1279	{
1223	1280	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1224	1281	{
1225		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1282	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1226	1283	} else
1227	1284	{
1228		- gl.glNormal3f(0, 0, 1);
	1285	+ SetGLNormal(gl, 0, 0, 1);
1229	1286	}
1230	1287	if (c != null)
1231	1288	{
..	..	@@ -1250,10 +1307,10 @@
1250	1307	{
1251	1308	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1252	1309	{
1253		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1310	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1254	1311	} else
1255	1312	{
1256		- gl.glNormal3f(0, 0, 1);
	1313	+ SetGLNormal(gl, 0, 0, 1);
1257	1314	}
1258	1315	if (c != null)
1259	1316	{
..	..	@@ -1435,7 +1492,7 @@
1435	1492	{
1436	1493	if (!selectmode)
1437	1494	{
1438		- 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);
1439	1496	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
1440	1497
1441	1498	if (flipV)
..	..	@@ -1447,6 +1504,8 @@
1447	1504	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1448	1505	}
1449	1506
	1507	+ float[] colorV = new float[4];
	1508	+
1450	1509	void SetColor(Object3D obj, Vertex p0)
1451	1510	{
1452	1511	CameraPane display = this;
..	..	@@ -1514,8 +1573,6 @@
1514	1573	{
1515	1574	return;
1516	1575	}
1517		-
1518		- float[] colorV = new float[3];
1519	1576
1520	1577	if (false) // marked)
1521	1578	{
..	..	@@ -1764,7 +1821,7 @@
1764	1821
1765	1822	display.modelParams7[0] = 0;
1766	1823	display.modelParams7[1] = 1000;
1767		- display.modelParams7[2] = 0;
	1824	+ display.modelParams7[2] = material.parallax;
1768	1825	display.modelParams7[3] = 0;
1769	1826
1770	1827	//display.modelParams6[0] = 100; // criss de bug de bump
..	..	@@ -1997,9 +2054,9 @@
1997	2054	switch(viewcode)
1998	2055	{
1999	2056	case 0: return "main";
2000		- case 1: return "one";
2001		- case 2: return "two";
2002		- case 3: return "three";
	2057	+ case 1: return "Red";
	2058	+ case 2: return "Green";
	2059	+ case 3: return "Blue";
2003	2060	case 4: return "light";
2004	2061	}
2005	2062
..	..	@@ -2008,7 +2065,7 @@
2008	2065
2009	2066	static int camerachangeframe;
2010	2067
2011		- public boolean SetCamera(Camera cam)
	2068	+ public boolean SetCamera(Camera cam, boolean set)
2012	2069	{
2013	2070	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
2014	2071	// return false;
..	..	@@ -2026,7 +2083,8 @@
2026	2083
2027	2084	camerachangeframe = Globals.framecount;
2028	2085
2029		- cam.hAspect = -1; // Read only
	2086	+ if (cam != null)
	2087	+ cam.hAspect = -1; // Read only
2030	2088
2031	2089	cameras[0] = cam;
2032	2090	targetLookAts[0] = new cVector(cam.lookAt);
..	..	@@ -2036,11 +2094,14 @@
2036	2094	{
2037	2095	cameras[i] = new Camera(cam.viewCode);
2038	2096	}
2039		-
2040		- cameras[i].setAim(cam.location, cam.lookAt);
2041		- cameras[i].shaper_fovy = cam.shaper_fovy;
2042		- cameras[i].UP.set(cam.UP);
2043		- 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	+ }
2044	2105	}
2045	2106	cameracount = 0;
2046	2107	targetLookAt = targetLookAts[cameracount];
..	..	@@ -2049,7 +2110,7 @@
2049	2110	// Start with free camera
2050	2111	SwitchCameras(true);
2051	2112
2052		- pingthread.jump = true; // optional?
	2113	+// pingthread.jump = true; // optional?
2053	2114
2054	2115	if (TRACKONCE)
2055	2116	{
..	..	@@ -2236,18 +2297,6 @@
2236	2297	public void ToggleTrack()
2237	2298	{
2238	2299	TRACK ^= true;
2239		- if (TRACK)
2240		- {
2241		- if (object.selection != null &&
2242		- object.selection.size() > 0 &&
2243		- object.selection.elementAt(0) != null &&
2244		- !(object.selection.elementAt(0) instanceof Camera) &&
2245		- !(object.selection.elementAt(0) instanceof ScriptNode))
2246		- {
2247		- trackedobject = object.selection.elementAt(0);
2248		- repaint();
2249		- }
2250		- }
2251	2300
2252	2301	repaint();
2253	2302	}
..	..	@@ -2339,7 +2388,8 @@
2339	2388	{
2340	2389	//System.out.println("PROTECTION = " + cam.hAspect);
2341	2390	//assert (cam.hAspect == 0);
2342		- cam.hAspect = 0;
	2391	+ if (cam != null)
	2392	+ cam.hAspect = 0;
2343	2393	lightCamera = cam;
2344	2394	}
2345	2395
..	..	@@ -2405,6 +2455,33 @@
2405	2455	return currentGL;
2406	2456	}
2407	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	+
2408	2485	/**/
2409	2486	class CacheTexture
2410	2487	{
..	..	@@ -2413,18 +2490,20 @@
2413	2490
2414	2491	int resolution;
2415	2492
2416		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2493	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2417	2494	{
2418		- texture = tex;
	2495	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2496	+ texturedata = texdata;
2419	2497	resolution = res;
2420	2498	}
2421	2499	}
2422	2500	/**/
2423	2501
2424	2502	// TEXTURE static Texture texture;
2425		- static public java.util.Hashtable<String, CacheTexture> textures = new java.util.Hashtable<String, CacheTexture>();
2426		- static public java.util.Hashtable<BufferedImage, CacheTexture> bimtextures = new java.util.Hashtable<BufferedImage, CacheTexture>();
2427		- static public java.util.HashSet<String> usedtextures = new java.util.HashSet<String>();
	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>();
2428	2507
2429	2508	int pigmentdepth = 0;
2430	2509	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
..	..	@@ -2432,10 +2511,10 @@
2432	2511	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2433	2512	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2434	2513	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2435		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2514	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2436	2515	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2437	2516
2438		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2517	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2439	2518	{
2440	2519	TextureData texturedata = null;
2441	2520
..	..	@@ -2445,7 +2524,7 @@
2445	2524	com.sun.opengl.util.texture.TextureIO.newTextureData(
2446	2525	getClass().getClassLoader().getResourceAsStream(name),
2447	2526	true,
2448		- com.sun.opengl.util.texture.TextureIO.PNG);
	2527	+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
2449	2528	} catch (java.io.IOException e)
2450	2529	{
2451	2530	throw new javax.media.opengl.GLException(e);
..	..	@@ -2454,16 +2533,16 @@
2454	2533	if (bump)
2455	2534	texturedata = ConvertBump(texturedata, false);
2456	2535
2457		- com.sun.opengl.util.texture.Texture texture =
2458		- 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);
2459	2538
2460		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2461		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	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);
2462	2541
2463		- return texture;
	2542	+ return texturedata;
2464	2543	}
2465	2544
2466		- com.sun.opengl.util.texture.Texture GetBimTexture(BufferedImage name, boolean bump)
	2545	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
2467	2546	{
2468	2547	TextureData texturedata = null;
2469	2548
..	..	@@ -2471,7 +2550,7 @@
2471	2550	{
2472	2551	texturedata =
2473	2552	com.sun.opengl.util.texture.TextureIO.newTextureData(
2474		- name,
	2553	+ bim,
2475	2554	true);
2476	2555	} catch (Exception e)
2477	2556	{
..	..	@@ -2480,14 +2559,8 @@
2480	2559
2481	2560	if (bump)
2482	2561	texturedata = ConvertBump(texturedata, false);
2483		-
2484		- com.sun.opengl.util.texture.Texture texture =
2485		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2486		-
2487		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2488		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2489		-
2490		- return texture;
	2562	+
	2563	+ return texturedata;
2491	2564	}
2492	2565
2493	2566	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3517,6 +3590,8 @@
3517	3590	};
3518	3591	/**/
3519	3592
	3593	+ static Object3D lastObject;
	3594	+
3520	3595	//com.sun.opengl.util.texture.Texture
3521	3596	TextureData
3522	3597	GetFileTexture(String name, boolean bump, int resolution)
..	..	@@ -3553,6 +3628,8 @@
3553	3628	// return null;
3554	3629	//if (i == 2)
3555	3630	// return null;
	3631	+ // TIFF issue sept 2019
	3632	+ System.err.println("lastObject = " + lastObject);
3556	3633	e.printStackTrace();
3557	3634	name = name.split("\\.tif")[0] + ".jpg";
3558	3635	}
..	..	@@ -6885,30 +6962,30 @@
6885	6962	short residu = 0;
6886	6963
6887	6964	// wraparound workarounds
6888		- short fuck = (short) (buffer[i] & 0xFF);
	6965	+ short ww = (short) (buffer[i] & 0xFF);
6889	6966	/*
6890		- residu += (fuck%2);
6891		- if(fuck/2 < 256-residu/2)
	6967	+ residu += (ww%2);
	6968	+ if(ww/2 < 256-residu/2)
6892	6969	{
6893		- fuck = (short)((fuck/2) + residu/2);
	6970	+ ww = (short)((ww/2) + residu/2);
6894	6971	if(residu == 2)
6895	6972	residu = 0;
6896	6973	}
6897	6974	else
6898	6975	{
6899	6976	residu = 0;
6900		- fuck /= 2;
	6977	+ ww /= 2;
6901	6978	}
6902	6979	*/
6903		- if (i < imglength / 3 \|\| rnd.nextFloat() < 0.5 \|\| fuck >= 254)
	6980	+ if (i < imglength / 3 \|\| rnd.nextFloat() < 0.5 \|\| ww >= 254)
6904	6981	{
6905		- fuck /= 2;
	6982	+ ww /= 2;
6906	6983	} else
6907	6984	{
6908		- fuck = (short) ((fuck / 2) + fuck % 2);
	6985	+ ww = (short) ((ww / 2) + ww % 2);
6909	6986	}
6910	6987
6911		- buffer[i] = (byte) fuck;
	6988	+ buffer[i] = (byte) ww;
6912	6989	}
6913	6990	//System.out.print(bytes[i] + " ");
6914	6991	//if(buffer[i] >= 0 && buffer[i]<=eps-1) buffer[i] = eps;
..	..	@@ -7975,8 +8052,8 @@
7975	8052	pigment = null;
7976	8053	}
7977	8054
7978		- ReleaseTexture(bump, true);
7979		- ReleaseTexture(pigment, false);
	8055	+ ReleaseTexture(tex, true);
	8056	+ ReleaseTexture(tex, false);
7980	8057	}
7981	8058
7982	8059	public void ReleasePigmentTexture(cTexture tex) // INTERFACE
..	..	@@ -8005,7 +8082,7 @@
8005	8082	pigment = null;
8006	8083	}
8007	8084
8008		- ReleaseTexture(pigment, false);
	8085	+ ReleaseTexture(tex, false);
8009	8086	}
8010	8087
8011	8088	public void ReleaseBumpTexture(cTexture tex) // INTERFACE
..	..	@@ -8034,10 +8111,10 @@
8034	8111	bump = null;
8035	8112	}
8036	8113
8037		- ReleaseTexture(bump, true);
	8114	+ ReleaseTexture(tex, true);
8038	8115	}
8039	8116
8040		- void ReleaseTexture(String tex, boolean bump)
	8117	+ void ReleaseTexture(cTexture tex, boolean bump)
8041	8118	{
8042	8119	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8043	8120	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8048,7 +8125,7 @@
8048	8125	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
8049	8126
8050	8127	if (tex != null)
8051		- texture = textures.get(tex);
	8128	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
8052	8129
8053	8130	// //assert( texture != null );
8054	8131	// if (texture == null)
..	..	@@ -8198,13 +8275,13 @@
8198	8275
8199	8276	if (tex == null)
8200	8277	{
8201		- BindTexture(null, null,false,resolution);
	8278	+ BindTexture(null,false,resolution);
8202	8279	return;
8203	8280	}
8204	8281
8205	8282	String pigment = Object3D.GetPigment(tex);
8206	8283
8207		- usedtextures.add(pigment);
	8284	+ usedtextures.add(tex);
8208	8285
8209	8286	//if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8210	8287	{
..	..	@@ -8218,7 +8295,7 @@
8218	8295	}
8219	8296
8220	8297	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8221		- BindTexture(tex.pigmenttexture, pigment, false, resolution);
	8298	+ BindTexture(tex, false, resolution);
8222	8299	}
8223	8300
8224	8301	/boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8231,13 +8308,13 @@
8231	8308
8232	8309	if (tex == null)
8233	8310	{
8234		- BindTexture(null, null,true,resolution);
	8311	+ BindTexture(null,true,resolution);
8235	8312	return;
8236	8313	}
8237	8314
8238	8315	String bump = Object3D.GetBump(tex);
8239	8316
8240		- usedtextures.add(bump);
	8317	+ usedtextures.add(tex);
8241	8318
8242	8319	//if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8243	8320	{
..	..	@@ -8251,7 +8328,7 @@
8251	8328	}
8252	8329
8253	8330	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8254		- BindTexture(tex.bumptexture, bump, true, resolution);
	8331	+ BindTexture(tex, true, resolution);
8255	8332	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8256	8333	}
8257	8334
..	..	@@ -8275,13 +8352,19 @@
8275	8352	return fileExists;
8276	8353	}
8277	8354
8278		- CacheTexture GetCacheTexture(java.awt.image.BufferedImage bim, String tex, boolean bump, int resolution) throws Exception
	8355	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8279	8356	{
8280	8357	CacheTexture texturecache = null;
8281	8358
8282	8359	if (tex != null)
8283	8360	{
8284		- String texname = tex;
	8361	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8362	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
	8363	+
	8364	+ if (texname.equals("") && texdata == null)
	8365	+ {
	8366	+ return null;
	8367	+ }
8285	8368
8286	8369	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8287	8370
..	..	@@ -8291,29 +8374,46 @@
8291	8374	// else
8292	8375	// if (!texname.startsWith("/"))
8293	8376	// texname = "/Users/nbriere/Textures/" + texname;
8294		- if (!FileExists(tex))
	8377	+ if (!FileExists(texname) && !texname.startsWith("@"))
8295	8378	{
8296	8379	texname = fallbackTextureName;
8297	8380	}
8298	8381
8299	8382	if (CACHETEXTURE)
8300	8383	{
8301		- if (bim == null)
8302		- texturecache = textures.get(texname); // TEXTURE CACHE
	8384	+ if (texdata == null)
	8385	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
8303	8386	else
8304		- texturecache = bimtextures.get(bim); // TEXTURE CACHE
	8387	+ texturecache = bimtextures.get(texdata);
8305	8388	}
8306	8389
8307		- if (texturecache == null \|\| texturecache.resolution < resolution)
	8390	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
8308	8391	{
8309	8392	TextureData texturedata = null;
8310	8393
8311		- if (bim == null)
	8394	+ if (texdata != null && textureon)
8312	8395	{
	8396	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
8313	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;
8314	8414	}
8315	8415	else
8316		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8416	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8317	8417	{
8318	8418	assert(!bump);
8319	8419	// if (bump)
..	..	@@ -8324,19 +8424,23 @@
8324	8424	// }
8325	8425	// else
8326	8426	// {
8327		- texturecache = textures.get(tex);
	8427	+ // texturecache = textures.get(texname); // suspicious
8328	8428	if (texturecache == null)
8329	8429	{
8330	8430	texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8331	8431	}
	8432	+ else
	8433	+ new Exception().printStackTrace();
8332	8434	// }
8333	8435	} else
8334		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8436	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8335	8437	{
8336	8438	assert(bump);
8337		- texturecache = textures.get(tex);
	8439	+ // texturecache = textures.get(texname); // suspicious
8338	8440	if (texturecache == null)
8339	8441	texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8442	+ else
	8443	+ new Exception().printStackTrace();
8340	8444	} else
8341	8445	{
8342	8446	//if (tex.equals("IMMORTAL"))
..	..	@@ -8344,11 +8448,22 @@
8344	8448	// texture = GetResourceTexture("default.png");
8345	8449	//} else
8346	8450	//{
8347		- if (tex.equals("WHITE_NOISE"))
	8451	+ if (texname.endsWith("WHITE_NOISE"))
8348	8452	{
8349		- texturecache = textures.get(tex);
	8453	+ // texturecache = textures.get(texname); // suspicious
8350	8454	if (texturecache == null)
8351		- texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	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();
8352	8467	} else
8353	8468	{
8354	8469	if (textureon)
..	..	@@ -8407,14 +8522,15 @@
8407	8522	if (texturedata == null)
8408	8523	throw new Exception();
8409	8524
8410		- texturecache = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8525	+ texturecache = new CacheTexture(texturedata,resolution);
8411	8526	//texture = GetTexture(tex, bump);
8412	8527	}
	8528	+ }
8413	8529	}
8414	8530	//}
8415	8531	}
8416	8532
8417		- if (/CACHETEXTURE &&/ texturecache != null && textureon)
	8533	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8418	8534	{
8419	8535	//return false;
8420	8536
..	..	@@ -8436,52 +8552,17 @@
8436	8552	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8437	8553	if (!cachefile.exists())
8438	8554	{
8439		- // cache to disk
8440		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8441		- //buffers[0].
8442		-
8443		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8444		- int[] pixels = new int[bytebuf.capacity()/3];
8445		-
8446		- // squared size heuristic...
8447		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8555	+ //if (texturedata.getWidth() == texturedata.getHeight())
8448	8556	{
8449		- for (int i=pixels.length; --i>=0;)
8450		- {
8451		- int i3 = i*3;
8452		- pixels[i] = 0xFF;
8453		- pixels[i] <<= 8;
8454		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8455		- pixels[i] <<= 8;
8456		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8457		- pixels[i] <<= 8;
8458		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8459		- }
8460		-
8461		- /*
8462		- int r=0,g=0,b=0,a=0;
8463		- for (int i=0; i<width; i++)
8464		- for (int j=0; j<height; j++)
8465		- {
8466		- int index = j*width+i;
8467		- int p = pixels[index];
8468		- a = ((p>>24) & 0xFF);
8469		- r = ((p>>16) & 0xFF);
8470		- g = ((p>>8) & 0xFF);
8471		- b = (p & 0xFF);
8472		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8473		- }
8474		- /**/
8475		- int width = (int)Math.sqrt(pixels.length); // squared
8476		- int height = width;
8477		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8478		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8557	+ BufferedImage rendImage = CreateBim(texturedata);
	8558	+
8479	8559	ImageWriter writer = null;
8480	8560	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8481	8561	if (iter.hasNext()) {
8482	8562	writer = (ImageWriter)iter.next();
8483	8563	}
8484		- float compressionQuality = 0.9f;
	8564	+
	8565	+ float compressionQuality = 0.85f;
8485	8566	try
8486	8567	{
8487	8568	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8498,18 +8579,20 @@
8498	8579	}
8499	8580	}
8500	8581	}
8501		-
	8582	+
	8583	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8584	+
8502	8585	//System.out.println("Texture = " + tex);
8503		- if (textures.containsKey(texname))
	8586	+ if (textures.containsKey(tex))
8504	8587	{
8505		- CacheTexture thetex = textures.get(texname);
	8588	+ CacheTexture thetex = textures.get(tex);
8506	8589	thetex.texture.disable();
8507	8590	thetex.texture.dispose();
8508		- textures.remove(texname);
	8591	+ textures.remove(tex);
8509	8592	}
8510	8593
8511	8594	//texture.texturedata = texturedata;
8512		- textures.put(texname, texturecache);
	8595	+ textures.put(tex, texturecache);
8513	8596
8514	8597	// newtex = true;
8515	8598	}
..	..	@@ -8528,9 +8611,45 @@
8528	8611	return texturecache;
8529	8612	}
8530	8613
8531		- com.sun.opengl.util.texture.Texture GetTexture(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
	8614	+ static void EmbedTextures(cTexture tex)
8532	8615	{
8533		- CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
	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
	8651	+ {
	8652	+ CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8534	8653
8535	8654	if (bump)
8536	8655	{
..	..	@@ -8546,14 +8665,14 @@
8546	8665	return texture!=null?texture.texture:null;
8547	8666	}
8548	8667
8549		- public com.sun.opengl.util.texture.TextureData GetTextureData(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
	8668	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8550	8669	{
8551		- CacheTexture texture = GetCacheTexture(stream, tex, bump, resolution);
	8670	+ CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8552	8671
8553	8672	return texture!=null?texture.texturedata:null;
8554	8673	}
8555	8674
8556		- boolean BindTexture(java.awt.image.BufferedImage stream, String tex, boolean bump, int resolution) throws Exception
	8675	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8557	8676	{
8558	8677	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8559	8678	{
..	..	@@ -8562,7 +8681,7 @@
8562	8681
8563	8682	//boolean newtex = false;
8564	8683
8565		- com.sun.opengl.util.texture.Texture texture = GetTexture(stream, tex, bump, resolution);
	8684	+ com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8566	8685
8567	8686	if (texture == null)
8568	8687	return false;
..	..	@@ -8595,6 +8714,72 @@
8595	8714	return true; // Warning: not used.
8596	8715	}
8597	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	+
8598	8783	ShadowBuffer shadowPBuf;
8599	8784	AntialiasBuffer antialiasPBuf;
8600	8785	int MAXSTACK;
..	..	@@ -8611,10 +8796,12 @@
8611	8796
8612	8797	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8613	8798	MAXSTACK = temp[0];
8614		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8799	+ if (Globals.DEBUG)
	8800	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8615	8801	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8616	8802	MAXSTACK = temp[0];
8617		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8803	+ if (Globals.DEBUG)
	8804	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8618	8805
8619	8806	// Use debug pipeline
8620	8807	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8622,7 +8809,8 @@
8622	8809	gl = drawable.getGL(); //
8623	8810
8624	8811	GL gl3 = getGL();
8625		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8812	+ if (Globals.DEBUG)
	8813	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8626	8814
8627	8815
8628	8816	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8787,7 +8975,7 @@
8787	8975
8788	8976	if (cubemap == null)
8789	8977	{
8790		- LoadEnvy(5);
	8978	+ //LoadEnvy(1);
8791	8979	}
8792	8980
8793	8981	//cubemap.enable();
..	..	@@ -9063,6 +9251,8 @@
9063	9251
9064	9252	void LoadEnvy(int which)
9065	9253	{
	9254	+ assert(false);
	9255	+
9066	9256	String name;
9067	9257	String ext;
9068	9258
..	..	@@ -9074,37 +9264,58 @@
9074	9264	cubemap = null;
9075	9265	return;
9076	9266	case 1:
9077		- name = "cubemaps/box_";
9078		- ext = "png";
	9267	+ name = "cubemaps/rgb/";
	9268	+ ext = "jpg";
9079	9269	reverseUP = false;
9080	9270	break;
9081	9271	case 2:
9082		- name = "cubemaps/uffizi_";
9083		- ext = "png";
9084		- break; // reverseUP = true; break;
	9272	+ name = "cubemaps/uffizi/";
	9273	+ ext = "jpg";
	9274	+ reverseUP = false;
	9275	+ break;
9085	9276	case 3:
9086		- name = "cubemaps/CloudyHills_";
9087		- ext = "tga";
	9277	+ name = "cubemaps/CloudyHills/";
	9278	+ ext = "jpg";
9088	9279	reverseUP = false;
9089	9280	break;
9090	9281	case 4:
9091		- name = "cubemaps/cornell_";
	9282	+ name = "cubemaps/cornell/";
9092	9283	ext = "png";
9093	9284	reverseUP = false;
9094	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;
9095	9311	default:
9096		- name = "cubemaps/rgb_";
9097		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9312	+ name = "cubemaps/box/";
	9313	+ ext = "png"; /mipmap = true;/
	9314	+ reverseUP = false;
9098	9315	break;
9099	9316	}
9100		-
9101		- try
9102		- {
9103		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9104		- } catch (IOException e)
9105		- {
9106		- throw new RuntimeException(e);
9107		- }
	9317	+
	9318	+ LoadSkybox(name, ext, mipmap);
9108	9319	}
9109	9320
9110	9321	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -9136,8 +9347,12 @@
9136	9347	static double[] model = new double[16];
9137	9348	double[] camera2light = new double[16];
9138	9349	double[] light2camera = new double[16];
9139		- int newenvy = -1;
9140		- boolean envyoff = true; // false;
	9350	+
	9351	+ //int newenvy = -1;
	9352	+ //boolean envyoff = false;
	9353	+
	9354	+ String loadedskyboxname;
	9355	+
9141	9356	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
9142	9357	//float[] light0 = { 0,0,0 };
9143	9358	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9555,7 +9770,7 @@
9555	9770
9556	9771	if (renderCamera != lightCamera)
9557	9772	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9558		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9773	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9559	9774
9560	9775	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9561	9776
..	..	@@ -9571,7 +9786,7 @@
9571	9786
9572	9787	if (renderCamera != lightCamera)
9573	9788	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9574		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9789	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9575	9790
9576	9791	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9577	9792
..	..	@@ -9617,13 +9832,18 @@
9617	9832	rati = 1 / rati;
9618	9833	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9619	9834	}
9620		- assert (newenvy == -1);
	9835	+
	9836	+ //assert (newenvy == -1);
	9837	+
9621	9838	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9622	9839	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9623		- DrawSkyBox(gl);
	9840	+ DrawSkyBox(gl, (float)rati);
9624	9841	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9625	9842	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9626		- accPerspective(gl, renderCamera.shaper_fovy / ratio,
	9843	+
	9844	+ boolean vr = capsLocked && !lightMode;
	9845	+
	9846	+ accPerspective(gl, renderCamera.shaper_fovy / ratio * (vr ? 1.2 : 1),
9627	9847	ratio,
9628	9848	//near_plane, far_plane,
9629	9849	renderCamera.shaper_zNear * renderCamera.Distance(), renderCamera.shaper_zFar * renderCamera.Distance(),
..	..	@@ -10486,9 +10706,18 @@
10486	10706	static boolean init = false;
10487	10707
10488	10708	double[][] matrix = LA.newMatrix();
	10709	+
	10710	+ // This is to refresh the UI of the material panel.
	10711	+ ObjEditor patchMaterial;
10489	10712
10490	10713	public void display(GLAutoDrawable drawable)
10491	10714	{
	10715	+ if (patchMaterial.patchMaterial)
	10716	+ {
	10717	+ patchMaterial.patchMaterial = false;
	10718	+ patchMaterial.objectTabbedPane.setSelectedIndex(1);
	10719	+ }
	10720	+
10492	10721	if (Grafreed.savesound && Grafreed.hassound)
10493	10722	{
10494	10723	Grafreed.wav.save();
..	..	@@ -10584,6 +10813,112 @@
10584	10813
10585	10814	if (DrawMode() == DEFAULT)
10586	10815	{
	10816	+ if (manipCamera == lightCamera)
	10817	+ {
	10818	+// switch (e.getKeyCode())
	10819	+// {
	10820	+// case DOWN_ARROW:
	10821	+// lightCamera.DECAL /= 2;
	10822	+// repaint();
	10823	+// break;
	10824	+// case UP_ARROW:
	10825	+// lightCamera.DECAL *= 2;
	10826	+// repaint();
	10827	+// break;
	10828	+// case LEFT_ARROW:
	10829	+// lightCamera.SCALE /= 2;
	10830	+// repaint();
	10831	+// break;
	10832	+// case RIGHT_ARROW:
	10833	+// lightCamera.SCALE *= 2;
	10834	+// repaint();
	10835	+// break;
	10836	+// default:
	10837	+// break;
	10838	+ if (keys[DOWN_ARROW])
	10839	+ {
	10840	+ lightCamera.DECAL /= 2;
	10841	+ }
	10842	+
	10843	+ if (keys[UP_ARROW])
	10844	+ {
	10845	+ lightCamera.DECAL *= 2;
	10846	+ }
	10847	+
	10848	+ if (keys[LEFT_ARROW])
	10849	+ {
	10850	+ lightCamera.SCALE /= 2;
	10851	+ }
	10852	+
	10853	+ if (keys[RIGHT_ARROW])
	10854	+ {
	10855	+ lightCamera.SCALE *= 2;
	10856	+ }
	10857	+ }
	10858	+ else
	10859	+ {
	10860	+ //pingthread.mute = true;
	10861	+
	10862	+ boolean keyon = false;
	10863	+
	10864	+ if (keys[DOWN_ARROW])
	10865	+ {
	10866	+ speed = ++speedkey[DOWN_ARROW];
	10867	+ if (speed > 20)
	10868	+ speed = 20;
	10869	+ GoDown(modifiers);
	10870	+ keyon = true;
	10871	+ }
	10872	+ else
	10873	+ speedkey[DOWN_ARROW] = 0;
	10874	+
	10875	+ if (keys[UP_ARROW])
	10876	+ {
	10877	+ speed = ++speedkey[UP_ARROW];
	10878	+ if (speed > 20)
	10879	+ speed = 20;
	10880	+ GoUp(modifiers);
	10881	+ keyon = true;
	10882	+ }
	10883	+ else
	10884	+ speedkey[UP_ARROW] = 0;
	10885	+
	10886	+ if (keys[LEFT_ARROW])
	10887	+ {
	10888	+ speed = ++speedkey[LEFT_ARROW];
	10889	+ if (speed > 20)
	10890	+ speed = 20;
	10891	+ GoLeft(modifiers);
	10892	+ keyon = true;
	10893	+ }
	10894	+ else
	10895	+ speedkey[LEFT_ARROW] = 0;
	10896	+
	10897	+ if (keys[RIGHT_ARROW])
	10898	+ {
	10899	+ speed = ++speedkey[RIGHT_ARROW];
	10900	+ if (speed > 20)
	10901	+ speed = 20;
	10902	+ GoRight(modifiers);
	10903	+ keyon = true;
	10904	+ }
	10905	+ else
	10906	+ speedkey[RIGHT_ARROW] = 0;
	10907	+
	10908	+ if (Globals.WALK && capsLocked)
	10909	+ {
	10910	+ Walk();
	10911	+ keyon = true;
	10912	+ }
	10913	+
	10914	+ if (keyon)
	10915	+ {
	10916	+ repaint();
	10917	+ }
	10918	+
	10919	+ //pingthread.mute = false;
	10920	+ }
	10921	+
10587	10922	currentlydrawing = true;
10588	10923	}
10589	10924
..	..	@@ -10657,7 +10992,7 @@
10657	10992
10658	10993	if (wait)
10659	10994	{
10660		- Sleep(500);
	10995	+ Sleep(200); // blocks everything
10661	10996
10662	10997	wait = false;
10663	10998	}
..	..	@@ -10772,7 +11107,7 @@
10772	11107	// if (parentcam != renderCamera) // not a light
10773	11108	if (cam != lightCamera)
10774	11109	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10775		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	11110	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10776	11111
10777	11112	for (int j = 0; j < 4; j++)
10778	11113	{
..	..	@@ -10787,7 +11122,7 @@
10787	11122	// if (parentcam != renderCamera) // not a light
10788	11123	if (cam != lightCamera)
10789	11124	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10790		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	11125	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10791	11126
10792	11127	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10793	11128
..	..	@@ -10873,13 +11208,43 @@
10873	11208	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10874	11209	}
10875	11210
10876		- if (newenvy > -1)
	11211	+// if (newenvy > -1)
	11212	+// {
	11213	+// LoadEnvy(newenvy);
	11214	+// }
	11215	+//
	11216	+// newenvy = -1;
	11217	+
	11218	+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
10877	11219	{
10878		- LoadEnvy(newenvy);
	11220	+ if (cubemaprgb == null)
	11221	+ {
	11222	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
	11223	+ }
	11224	+
	11225	+ cubemap = cubemaprgb;
10879	11226	}
10880		-
10881		- newenvy = -1;
10882		-
	11227	+ else
	11228	+ {
	11229	+ if (object.skyboxname != null)
	11230	+ {
	11231	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11232	+ {
	11233	+ if (cubemap != null && cubemap != cubemaprgb)
	11234	+ cubemap.dispose();
	11235	+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11236	+ loadedskyboxname = object.skyboxname;
	11237	+ }
	11238	+ }
	11239	+ else
	11240	+ {
	11241	+ cubemapcustom = null;
	11242	+ loadedskyboxname = null;
	11243	+ }
	11244	+
	11245	+ cubemap = cubemapcustom;
	11246	+ }
	11247	+
10883	11248	ratio = ((double) getWidth()) / getHeight();
10884	11249	//System.out.println("ratio = " + ratio);
10885	11250
..	..	@@ -10895,7 +11260,7 @@
10895	11260
10896	11261	if (!IsFrozen() && !ambientOcclusion)
10897	11262	{
10898		- DrawSkyBox(gl);
	11263	+ DrawSkyBox(gl, (float)ratio);
10899	11264	}
10900	11265
10901	11266	//if (selection_view == -1)
..	..	@@ -11049,7 +11414,7 @@
11049	11414
11050	11415	try
11051	11416	{
11052		- BindTexture(null, NOISE_TEXTURE, false, 2);
	11417	+ BindTexture(NOISE_TEXTURE, false, 2);
11053	11418	}
11054	11419	catch (Exception e)
11055	11420	{
..	..	@@ -11078,9 +11443,9 @@
11078	11443
11079	11444	gl.glMatrixMode(GL.GL_MODELVIEW);
11080	11445
11081		-gl.glEnable(gl.GL_POLYGON_SMOOTH);
11082		-gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
11083		-gl.glEnable(gl.GL_MULTISAMPLE);
	11446	+//gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11447	+//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11448	+//gl.glEnable(gl.GL_MULTISAMPLE);
11084	11449	} else
11085	11450	{
11086	11451	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -11141,7 +11506,10 @@
11141	11506	//gl.glOrtho(-BOOST, BOOST, -BOOST, BOOST, 0.001, 1000);
11142	11507	} else
11143	11508	{
11144		- glu.gluPerspective(cam.shaper_fovy / ratio, ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
	11509	+ boolean vr = capsLocked && !lightMode;
	11510	+
	11511	+ glu.gluPerspective(cam.shaper_fovy / ratio * (vr ? 1.2 : 1),
	11512	+ ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
11145	11513	}
11146	11514	}
11147	11515
..	..	@@ -11181,7 +11549,7 @@
11181	11549
11182	11550	// if (cam != lightCamera)
11183	11551	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11184		- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
	11552	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
11185	11553	}
11186	11554
11187	11555	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -11340,7 +11708,7 @@
11340	11708	}
11341	11709	}
11342	11710
11343		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11711	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11344	11712	{
11345	11713	//gl.glDepthFunc(GL.GL_LEQUAL);
11346	11714	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11348,24 +11716,21 @@
11348	11716
11349	11717	boolean texon = textureon;
11350	11718
11351		- if (RENDERPROGRAM > 0)
11352		- {
11353		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11354		- textureon = false;
11355		- }
	11719	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11720	+ textureon = false;
	11721	+
11356	11722	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11357	11723	//System.out.println("ALLO");
11358	11724	gl.glColorMask(false, false, false, false);
11359	11725	DrawObject(gl);
11360		- if (RENDERPROGRAM > 0)
11361		- {
11362		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11363		- textureon = texon;
11364		- }
	11726	+
	11727	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11728	+ textureon = texon;
	11729	+
11365	11730	gl.glColorMask(true, true, true, true);
11366	11731
11367	11732	gl.glDepthFunc(GL.GL_EQUAL);
11368		- //gl.glDepthMask(false);
	11733	+ gl.glDepthMask(false);
11369	11734	}
11370	11735
11371	11736	if (false) // DrawMode() == SHADOW)
..	..	@@ -11500,8 +11865,11 @@
11500	11865	repaint();
11501	11866	}
11502	11867
11503		- if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
	11868	+ if (Globals.isLIVE() && DrawMode() == DEFAULT \|\| pingthread.live) // may 2013
	11869	+ {
	11870	+ renderCamera.computeTransform();
11504	11871	repaint();
	11872	+ }
11505	11873
11506	11874	displaydone = true;
11507	11875	}
..	..	@@ -11576,9 +11944,23 @@
11576	11944	//GL gl = getGL();
11577	11945	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11578	11946	{
	11947	+ if (TRACK)
	11948	+ {
	11949	+ if (object.selection != null &&
	11950	+ object.selection.size() > 0 &&
	11951	+ object.selection.elementAt(0) != null &&
	11952	+ !(object.selection.elementAt(0) instanceof Camera) &&
	11953	+ !(object.selection.elementAt(0) instanceof ScriptNode))
	11954	+ {
	11955	+ trackedobject = object.selection.elementAt(0);
	11956	+ //repaint();
	11957	+ }
	11958	+ else
	11959	+ trackedobject = null;
	11960	+ }
11579	11961	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11580	11962	object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11581		- pingthread.StepToTarget(true); // true);
	11963	+ pingthread.StepToTarget(); // true);
11582	11964	// zoomonce = false;
11583	11965	}
11584	11966
..	..	@@ -11705,20 +12087,32 @@
11705	12087	ReleaseTextures(DEFAULT_TEXTURES);
11706	12088
11707	12089	if (CLEANCACHE)
11708		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	12090	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11709	12091	{
11710		- String tex = e.nextElement();
	12092	+ cTexture tex = e.nextElement();
11711	12093
11712	12094	// System.out.println("Texture --------- " + tex);
11713	12095
11714		- if (tex.equals("WHITE_NOISE"))
	12096	+ if (tex.equals("WHITE_NOISE:"))
11715	12097	continue;
11716	12098
11717	12099	if (!usedtextures.contains(tex))
11718	12100	{
	12101	+ CacheTexture gettex = texturepigment.get(tex);
11719	12102	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11720		- textures.get(tex).texture.dispose();
11721		- textures.remove(tex);
	12103	+ if (gettex != null)
	12104	+ {
	12105	+ gettex.texture.dispose();
	12106	+ texturepigment.remove(tex);
	12107	+ }
	12108	+
	12109	+ gettex = texturebump.get(tex);
	12110	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	12111	+ if (gettex != null)
	12112	+ {
	12113	+ gettex.texture.dispose();
	12114	+ texturebump.remove(tex);
	12115	+ }
11722	12116	}
11723	12117	}
11724	12118	}
..	..	@@ -12246,8 +12640,82 @@
12246	12640
12247	12641	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12248	12642
12249		- String program =
	12643	+ String programmin =
	12644	+ // Min shader
12250	12645	"!!ARBfp1.0\n" +
	12646	+ "PARAM zero12t = { 0.0, 1.0, 2, 1.25 };" +
	12647	+ "PARAM pow_2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12648	+ "PARAM pow2 = { 2, 4, 8, 0.0 };" +
	12649	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12650	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12651	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12652	+ "PARAM light2cam0 = program.env[10];" +
	12653	+ "PARAM light2cam1 = program.env[11];" +
	12654	+ "PARAM light2cam2 = program.env[12];" +
	12655	+ "TEMP temp;" +
	12656	+ "TEMP light;" +
	12657	+ "TEMP ndotl;" +
	12658	+ "TEMP normal;" +
	12659	+ "TEMP depth;" +
	12660	+ "TEMP eye;" +
	12661	+ "TEMP pos;" +
	12662	+
	12663	+ "MAD normal, fragment.color, zero12t.z, -zero12t.y;" +
	12664	+ Normalize("normal") +
	12665	+ "MOV light, state.light[0].position;" +
	12666	+ "DP3 ndotl.x, light, normal;" +
	12667	+ "MAX ndotl.x, ndotl.x, zero12t.x;" +
	12668	+
	12669	+ // shadow
	12670	+ "MOV pos, fragment.texcoord[1];" +
	12671	+ "MOV temp, pos;" +
	12672	+ ShadowTextureFetch("depth", "temp", "1") +
	12673	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12674	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12675	+
	12676	+ // No shadow when out of frustum
	12677	+ //"SGE temp.y, depth.z, zero123.y;" +
	12678	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12679	+
	12680	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12681	+
	12682	+ // Backlit
	12683	+ "MOV pos.w, zero12t.y;" + // one
	12684	+ "DP4 eye.x, pos, light2cam0;" +
	12685	+ "DP4 eye.y, pos, light2cam1;" +
	12686	+ "DP4 eye.z, pos, light2cam2;" +
	12687	+ Normalize("eye") +
	12688	+
	12689	+ "DP3 ndotl.y, -eye, normal;" +
	12690	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12691	+ "POW ndotl.y, ndotl.y, pow2.x;" + // backlit
	12692	+ "SUB ndotl.y, zero12t.y, ndotl.y;" + // 1 - y
	12693	+ //"POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12694	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12695	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12696	+ "ADD ndotl.y, ndotl.y, one.x;" +
	12697	+ "MUL ndotl.y, ndotl.y, pow_2.x;" +
	12698	+
	12699	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12700	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12701	+
	12702	+ // Pigment
	12703	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12704	+ "LRP temp, zero12t.w, temp, one;" + // texture proportion
	12705	+ "MUL temp, temp, zero12t.w;" + // Times x
	12706	+
	12707	+ //"MUL temp, temp, ndotl.y;" +
	12708	+ "MAD ndotl.x, pow_2.xxxx, ndotl.yyyy, ndotl.x;" +
	12709	+
	12710	+ "MUL temp, temp, ndotl.x;" + // lambert
	12711	+
	12712	+ "MOV temp.w, zero12t.y;" + // reset alpha
	12713	+ "MOV result.color, temp;" +
	12714	+ "END";
	12715	+
	12716	+ String programmax =
	12717	+ "!!ARBfp1.0\n" +
	12718	+
12251	12719	//"OPTION ARB_fragment_program_shadow;" +
12252	12720	"PARAM light2cam0 = program.env[10];" +
12253	12721	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12273,7 +12741,7 @@
12273	12741	"PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
12274	12742	"PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
12275	12743	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12276		- "PARAM params7 = program.env[7];" + // noise power, opacity power
	12744	+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
12277	12745	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
12278	12746	"PARAM options1 = program.env[62];" + // fog rgb color
12279	12747	"PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
..	..	@@ -12362,8 +12830,7 @@
12362	12830	"TEMP shininess;" +
12363	12831	"\n" +
12364	12832	"MOV texSamp, one;" +
12365		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12366		-
	12833	+
12367	12834	"MOV mapgrid.x, one2048th.x;" +
12368	12835	"MOV temp, fragment.texcoord[1];" +
12369	12836	/*
..	..	@@ -12384,20 +12851,20 @@
12384	12851	"MUL temp, floor, mapgrid.x;" +
12385	12852	//"TEX depth0, temp, texture[1], 2D;" +
12386	12853	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12387		- TextureFetch("depth0", "temp", "1") +
	12854	+ ShadowTextureFetch("depth0", "temp", "1") +
12388	12855	"") +
12389	12856	"ADD temp.x, temp.x, mapgrid.x;" +
12390	12857	//"TEX depth1, temp, texture[1], 2D;" +
12391	12858	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12392		- TextureFetch("depth1", "temp", "1") +
	12859	+ ShadowTextureFetch("depth1", "temp", "1") +
12393	12860	"") +
12394	12861	"ADD temp.y, temp.y, mapgrid.x;" +
12395	12862	//"TEX depth2, temp, texture[1], 2D;" +
12396		- TextureFetch("depth2", "temp", "1") +
	12863	+ ShadowTextureFetch("depth2", "temp", "1") +
12397	12864	"SUB temp.x, temp.x, mapgrid.x;" +
12398	12865	//"TEX depth3, temp, texture[1], 2D;" +
12399	12866	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12400		- TextureFetch("depth3", "temp", "1") +
	12867	+ ShadowTextureFetch("depth3", "temp", "1") +
12401	12868	"") +
12402	12869	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12403	12870	//"MOV params, material;" +
..	..	@@ -12519,7 +12986,7 @@
12519	12986	"POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
12520	12987	// mar 2013 ??? "KIL alpha.a;" +
12521	12988	"MOV alpha, texSamp.aaaa;" + // y;" +
12522		- "KIL alpha.a;" +
	12989	+ "KIL alpha.a;" + // not sure with parallax mapping
12523	12990	/*
12524	12991	"MUL temp.xy, temp, two;" +
12525	12992	"TXB bump, temp, texture[0], 2D;" +
..	..	@@ -12605,11 +13072,6 @@
12605	13072	"SUB bump0, bump0, half;" +
12606	13073	"ADD bump, bump, bump0;" +
12607	13074
12608		- "MOV temp.x, texSamp.a;" +
12609		- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12610		- //"LRP texSamp0, params5.x, texSamp0, one;" +
12611		- "MOV texSamp.a, temp.x;" +
12612		-
12613	13075	// double-sided
12614	13076	/**/
12615	13077	(doublesided?"DP3 temp.z, normal, eye;" +
..	..	@@ -12619,26 +13081,73 @@
12619	13081	"ADD temp.x, temp.x, one.x;" +
12620	13082	"MUL normal, normal, temp.xxxx;":""
12621	13083	) +
12622		- /**/
12623		-//// Normalize("normal") +
12624		-//// "MAX normal.z, eps.x, normal.z;" +
12625		-// Normalize("normal") +
12626		- "MOV normald, normal;" +
12627		- "MOV normals, normal;" +
	13084	+ /**/
	13085	+
	13086	+ "MOV temp, fragment.texcoord[4];" +
12628	13087
12629	13088	// UV base
12630	13089	//"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
12631	13090	//"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
12632	13091	//"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
12633		- "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
12634		- "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
12635		- "DP3 UP.z,state.matrix.texture[7].row[2],Y;" +
	13092	+ "DP3 UP.x,state.matrix.texture[7].row[0],temp;" +
	13093	+ "DP3 UP.y,state.matrix.texture[7].row[1],temp;" +
	13094	+ "DP3 UP.z,state.matrix.texture[7].row[2],temp;" +
	13095	+ Normalize("UP") +
	13096	+
12636	13097	"XPD V, normal, UP;" +
12637	13098	Normalize("V") +
12638	13099	"XPD U, V, normal;" +
12639	13100	Normalize("U") +
12640	13101
	13102	+ "MOV temp, fragment.texcoord[0];" +
	13103	+
	13104	+// "MAD normal, -temp.x, U, normal;" +
	13105	+// "MAD normal, -temp.y, V, normal;" +
	13106	+// Normalize("normal") +
	13107	+
	13108	+//// "MAX normal.z, eps.x, normal.z;" +
	13109	+// Normalize("normal") +
	13110	+ "MOV normald, normal;" +
	13111	+ "MOV normals, normal;" +
	13112	+
12641	13113	// parallax mapping
	13114	+
	13115	+ "DP3 temp2.x, V, eye;" +
	13116	+ "DP3 temp2.y, U, eye;" +
	13117	+ "DP3 temp2.z, normal, eye;" +
	13118	+ "RCP temp2.z, temp2.z;" +
	13119	+
	13120	+ "DP3 temp2.w, texSamp, texSamp;" + // Height
	13121	+ "RSQ temp2.w, temp2.w;" +
	13122	+ "RCP temp2.w, temp2.w;" +
	13123	+
	13124	+ "SUB temp2.w, temp2.w, half;" +
	13125	+ // "SGE temp.x, temp2.w, eps.x;" +
	13126	+ // "MUL temp2.w, temp2.w, temp.x;" +
	13127	+
	13128	+ // "MOV texSamp, U;" +
	13129	+
	13130	+ "MUL temp2.z, temp2.z, temp2.w;" +
	13131	+ "MUL temp2.z, temp2.z, params7.z;" + // parallax
	13132	+
	13133	+ "MUL temp2, temp2, temp2.z;" +
	13134	+
	13135	+ "SUB temp, temp, temp2;" +
	13136	+
	13137	+ "TEX temp, temp, texture[0], 2D;" +
	13138	+ "POW temp.a, temp.a, params6.w;" + // punch through
	13139	+
	13140	+ "ADD texSamp, temp, texSamp;" +
	13141	+ "MUL texSamp.xyz, half, texSamp;" +
	13142	+
	13143	+ "MOV alpha, texSamp.aaaa;" +
	13144	+
	13145	+// parallax mapping
	13146	+
	13147	+ "MOV temp.x, texSamp.a;" +
	13148	+ "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
	13149	+ //"LRP texSamp0, params5.x, texSamp0, one;" +
	13150	+ "MOV texSamp.a, temp.x;" +
12642	13151
12643	13152	//"MOV temp, fragment.texcoord[0];" +
12644	13153	//
..	..	@@ -12768,10 +13277,10 @@
12768	13277	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12769	13278	"") +
12770	13279
12771		- // display shadow only (bump == 0)
	13280	+ // display shadow only (fakedepth == 0)
12772	13281	"SUB temp.x, half.x, shadow.x;" +
12773	13282	"MOV temp.y, -params5.z;" + // params6.x;" +
12774		- "SLT temp.z, temp.y, -one2048th.x;" +
	13283	+ "SLT temp.z, temp.y, -c256i.x;" +
12775	13284	"SUB temp.y, one.x, temp.z;" +
12776	13285	"MUL temp.x, temp.x, temp.y;" +
12777	13286	"KIL temp.x;" +
..	..	@@ -13102,8 +13611,19 @@
13102	13611	//once = true;
13103	13612	}
13104	13613
13105		- System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13106		- System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13614	+ String program = programmax;
	13615	+
	13616	+ if (Globals.MINSHADER)
	13617	+ {
	13618	+ program = programmin;
	13619	+ }
	13620	+
	13621	+ if (Globals.DEBUG)
	13622	+ {
	13623	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
	13624	+ System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13625	+ }
	13626	+
13107	13627	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13108	13628
13109	13629	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13150,7 +13670,8 @@
13150	13670	"\n" +
13151	13671	"END\n";
13152	13672
13153		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13673	+ if (Globals.DEBUG)
	13674	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13154	13675	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13155	13676
13156	13677	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13195,25 +13716,26 @@
13195	13716	return out;
13196	13717	}
13197	13718
13198		- String TextureFetch(String dest, String src, String unit)
	13719	+ // Also does frustum culling
	13720	+ String ShadowTextureFetch(String dest, String src, String unit)
13199	13721	{
13200	13722	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13201	13723	"SGE " + src + ".w, " + src + ".x, eps.x;" +
13202	13724	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13725	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13726	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
13203	13727	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13204		- "SLT " + src + ".z, " + src + ".x, one.x;" +
13205		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13206		- "SLT " + src + ".z, " + src + ".y, one.x;" +
13207		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13728	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13729	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
13208	13730	//"SWZ buffer, temp, w,w,w,w;";
13209		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13731	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13210	13732	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
13211	13733	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
13212	13734	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13213		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13735	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13214	13736
13215		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13216		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13737	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13738	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13217	13739	}
13218	13740
13219	13741	String Shadow(String depth, String shadow)
..	..	@@ -13260,7 +13782,7 @@
13260	13782	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13261	13783	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13262	13784
13263		- // No shadow when out of frustrum
	13785	+ // No shadow when out of frustum
13264	13786	"SGE temp.x, " + depth + ".z, one.z;" +
13265	13787	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13266	13788	"";
..	..	@@ -13407,7 +13929,7 @@
13407	13929	/static/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
13408	13930	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13409	13931	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13410		- /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
	13932	+ /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
13411	13933
13412	13934	//Object3D.cVector2[] vector2buffer;
13413	13935
..	..	@@ -13574,7 +14096,7 @@
13574	14096	"PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
13575	14097	"PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
13576	14098	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
13577		- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
	14099	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
13578	14100	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
13579	14101	"PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
13580	14102	//"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
..	..	@@ -13635,7 +14157,7 @@
13635	14157	"DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
13636	14158	"DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
13637	14159	"DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
13638		- //"MOV result.texcoord, vertex.texcoord;" +
	14160	+ //"MOV result.texcoord, vertex.fogcoord;" +
13639	14161	"MOV result.texcoord, temp;" +
13640	14162	// border fade
13641	14163	"MOV result.texcoord[3], vertex.texcoord;" +
..	..	@@ -13682,7 +14204,9 @@
13682	14204
13683	14205	//"ADD temp.z, temp.z, one;" +
13684	14206
13685		- "MOV result.color, temp;"
	14207	+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
	14208	+
	14209	+ "MOV result.color, temp;" // Normal
13686	14210	: "MOV result.color, vertex.color;") +
13687	14211	((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
13688	14212	: "") +
..	..	@@ -13817,10 +14341,13 @@
13817	14341	public void mouseClicked(MouseEvent e)
13818	14342	{
13819	14343	System.out.println("mouseClicked: " + e);
	14344	+ System.exit(0);
13820	14345	}
13821	14346
13822	14347	public void mousePressed(MouseEvent e)
13823	14348	{
	14349	+ RigidBody.justclicked = true;
	14350	+ System.out.println("justclicked: " + e);
13824	14351	//System.out.println("mousePressed: " + e);
13825	14352	clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13826	14353	}
..	..	@@ -13855,10 +14382,12 @@
13855	14382	return;
13856	14383	}
13857	14384
13858		- 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;
13859	14388
13860	14389	// TIMER
13861		- if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	14390	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !vr) // VR
13862	14391	{
13863	14392	keepboxmode = BOXMODE;
13864	14393	keepsupport = SUPPORT;
..	..	@@ -13899,7 +14428,7 @@
13899	14428	//}
13900	14429
13901	14430	SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
13902		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
	14431	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, e.getModifiers(), e.getModifiersEx());
13903	14432	anchorX = ax;
13904	14433	anchorY = ay;
13905	14434	prevX = px;
..	..	@@ -13994,8 +14523,9 @@
13994	14523	// fev 2014???
13995	14524	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13996	14525	object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13997		- pingthread.StepToTarget(true); // true);
	14526	+ pingthread.StepToTarget(); // true);
13998	14527	}
	14528	+
13999	14529	// if (!LIVE)
14000	14530	super.repaint();
14001	14531	}
..	..	@@ -14058,14 +14588,15 @@
14058	14588	drag = false;
14059	14589	//System.out.println("Mouse DOWN");
14060	14590	editObj = false;
14061		- ClickInfo info = new ClickInfo();
14062		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14063		- info.pane = this;
14064		- info.camera = renderCamera;
14065		- info.x = x;
14066		- info.y = y;
14067		- info.modifiers = modifiersex;
14068		- 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);
14069	14600	if (!editObj)
14070	14601	{
14071	14602	hasMarquee = true;
..	..	@@ -14089,8 +14620,8 @@
14089	14620
14090	14621	//if (drawing)
14091	14622	//return;
14092		- if ((e.getModifiersEx() & CTRL) != 0
14093		- \|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
	14623	+ if ((e.getModifiersEx() & CTRL) != 0 \|\|
	14624	+ (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
14094	14625	{
14095	14626	//System.out.println("mouseDragged: " + e);
14096	14627	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
..	..	@@ -14114,9 +14645,17 @@
14114	14645	return targetLookAt;
14115	14646	}
14116	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	+
14117	14653	class PingThread extends Thread
14118	14654	{
14119	14655	boolean jump;
	14656	+ boolean live;
	14657	+
	14658	+ boolean mute;
14120	14659
14121	14660	// void JumpToTarget()
14122	14661	// {
..	..	@@ -14132,6 +14671,88 @@
14132	14671	// only one thread!? synchronized
14133	14672	void StepToTarget(boolean jump)
14134	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	+ RigidBody.wind.set(RigidBody.pos);
	14683	+ RigidBody.wind.x -= (float)manipCamera.location.x;
	14684	+ RigidBody.wind.y -= (float)manipCamera.location.y;
	14685	+ RigidBody.wind.z -= (float)manipCamera.location.z;
	14686	+ RigidBody.wind.normalize();
	14687	+ }
	14688	+
	14689	+ if (mute)
	14690	+ return;
	14691	+
	14692	+ if (capsLocked && manipCamera.viewCode == 0)
	14693	+ {
	14694	+ eye.x = manipCamera.location.x;
	14695	+ eye.y = manipCamera.location.y + 0.25;
	14696	+ eye.z = manipCamera.location.z;
	14697	+
	14698	+ dir.y = -1;
	14699	+
	14700	+ Ray ray = new Ray(eye, dir);
	14701	+
	14702	+ IntersectResult res = new IntersectResult();
	14703	+ res.t = Double.POSITIVE_INFINITY;
	14704	+
	14705	+ tmp.set(targetLookAt);
	14706	+ tmp.sub(manipCamera.location);
	14707	+
	14708	+ double dist = tmp.length();
	14709	+
	14710	+ tmp.normalize();
	14711	+
	14712	+ eye2.x = manipCamera.location.x + tmp.x * 0.25;
	14713	+ eye2.y = manipCamera.location.y + 0.25;
	14714	+ eye2.z = manipCamera.location.z + tmp.z * 0.25;
	14715	+
	14716	+ Ray ray2 = new Ray(eye2, dir);
	14717	+
	14718	+ IntersectResult res2 = new IntersectResult();
	14719	+ res2.t = Double.POSITIVE_INFINITY;
	14720	+
	14721	+ if (object.intersect(ray, res) && object.intersect(ray2, res2) && Math.abs(res.t - res2.t) < 0.25)
	14722	+ {
	14723	+ //tmp.set(manipCamera.location);
	14724	+
	14725	+ manipCamera.location.x = ray.eyePoint.x + ray.viewDirection.x * res.t;
	14726	+ manipCamera.location.y = ray.eyePoint.y + ray.viewDirection.y * res.t + 0.5;
	14727	+ manipCamera.location.z = ray.eyePoint.z + ray.viewDirection.z * res.t;
	14728	+
	14729	+ //tmp.sub(manipCamera.location);
	14730	+
	14731	+ targetLookAt.x = ray2.eyePoint.x + ray2.viewDirection.x * res2.t;
	14732	+ targetLookAt.y = ray2.eyePoint.y + ray2.viewDirection.y * res2.t + 0.5;
	14733	+ targetLookAt.z = ray2.eyePoint.z + ray2.viewDirection.z * res2.t;
	14734	+
	14735	+ targetLookAt.sub(manipCamera.location);
	14736	+ targetLookAt.normalize();
	14737	+ targetLookAt.mul(dist);
	14738	+ targetLookAt.add(manipCamera.location);
	14739	+
	14740	+ //if (tmp.dot(tmp) > 0.000001)
	14741	+ // System.out.println("INTERSECTION " + manipCamera.location);
	14742	+
	14743	+ manipCamera.lookAt.set(targetLookAt);
	14744	+
	14745	+ tmp.x = res.n.x;
	14746	+ tmp.y = res.n.y;
	14747	+ tmp.z = res.n.z;
	14748	+ tmp.x += res2.n.x;
	14749	+ tmp.y += res2.n.y;
	14750	+ tmp.z += res2.n.z;
	14751	+ tmp.normalize();
	14752	+ manipCamera.UP.set(tmp);
	14753	+ }
	14754	+ }
	14755	+
14135	14756	tmp.set(targetLookAt);
14136	14757	tmp.sub(manipCamera.lookAt); // june 2014
14137	14758
..	..	@@ -14169,7 +14790,7 @@
14169	14790
14170	14791	if (tmp.dot(tmp) > 1) // may 2014. far away: jump to target
14171	14792	{
14172		- jump = true; // step = 1;
	14793	+ // sep 2019 jump = true; // step = 1;
14173	14794	}
14174	14795
14175	14796	if (OEILONCE && OEIL)
..	..	@@ -14204,7 +14825,10 @@
14204	14825	if (tmp.dot(tmp) < 0.00001)
14205	14826	{
14206	14827	zoomonce = false;
	14828	+ live = false;
14207	14829	}
	14830	+ else
	14831	+ live = true;
14208	14832
14209	14833	tmp.mul(step > step2 ? step : step2);
14210	14834	}
..	..	@@ -14231,7 +14855,7 @@
14231	14855	{
14232	14856	if (LOOKAT)
14233	14857	manipCamera.lookAt.add(tmp);
14234		- if (OEIL)
	14858	+ if (OEIL && !capsLocked)
14235	14859	manipCamera.location.add(tmp);
14236	14860
14237	14861	{
..	..	@@ -14246,7 +14870,10 @@
14246	14870	lightCamera.computeTransform();
14247	14871	}
14248	14872	}
14249		- manipCamera.computeTransform();
	14873	+ if (tmp.x != 0 \|\| tmp.y != 0 \|\| tmp.z != 0)
	14874	+ {
	14875	+ manipCamera.computeTransform();
	14876	+ }
14250	14877	}
14251	14878	// ?????? mouseDown = true;
14252	14879	//System.out.println("---------------- ---------- Paint " + tmp.length2());
..	..	@@ -14339,49 +14966,107 @@
14339	14966	}
14340	14967	}
14341	14968	}
	14969	+
14342	14970	PingThread pingthread = new PingThread();
14343		- int delta = 5;
14344		- int speed = 5;
	14971	+ int delta = 1;
	14972	+ int speed = 1;
	14973	+ int walk = 8;
14345	14974	boolean autorepeat = false;
14346	14975
	14976	+ void Walk()
	14977	+ {
	14978	+ manipCamera.BackForth(0, walk, 1000);
	14979	+
	14980	+ targetLookAt.set(manipCamera.lookAt);
	14981	+ }
	14982	+
	14983	+ void ViewAngle(float dy)
	14984	+ {
	14985	+ double factor = Math.exp(-dy/300.0); // (1 + dy/100);
	14986	+
	14987	+ if (manipCamera.shaper_fovy * factor > 1 &&
	14988	+ manipCamera.shaper_fovy * factor < 150)
	14989	+ {
	14990	+ manipCamera.shaper_fovy *= factor;
	14991	+ //System.out.println("fovy = " + shaper_fovy);
	14992	+ }
	14993	+ }
	14994	+
14347	14995	void GoDown(int mod)
14348	14996	{
14349	14997	MODIFIERS \|= COMMAND;
	14998	+ boolean isVR = (mouseMode&VR)!=0;
14350	14999	/**/
14351	15000	if((mod&SHIFT) == SHIFT)
14352		- manipCamera.RotatePosition(0, -speed);
14353		- else
14354		- manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14355		- /**/
14356		- if ((mod & SHIFT) == SHIFT)
14357	15001	{
14358		- mouseMode = mouseMode; // VR??
14359		- } else
14360		- {
14361		- mouseMode \|= BACKFORTH;
	15002	+// if (isVR)
	15003	+// manipCamera.RotateInterest(0, speed);
	15004	+// else
	15005	+ if (isVR)
	15006	+ ViewAngle(-speed*delta);
	15007	+ else
	15008	+ manipCamera.Translate(0, -speed*delta, getWidth());
14362	15009	}
	15010	+ else
	15011	+ {
	15012	+ if (isVR)
	15013	+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
	15014	+ else
	15015	+ manipCamera.RotatePosition(0, -speed);
	15016	+ }
	15017	+
	15018	+ /**/
	15019	+// if ((mod & SHIFT) == SHIFT)
	15020	+// {
	15021	+// mouseMode = mouseMode; // VR??
	15022	+// } else
	15023	+// {
	15024	+// mouseMode \|= BACKFORTH;
	15025	+// }
14363	15026
	15027	+ targetLookAt.set(manipCamera.lookAt);
	15028	+
14364	15029	//prevX = X = anchorX;
14365	15030	prevY = Y = anchorY - (int) (renderCamera.Distance());
14366	15031	}
14367	15032
14368	15033	void GoUp(int mod)
14369	15034	{
	15035	+ RigidBody.justclicked = true;
	15036	+
14370	15037	MODIFIERS \|= COMMAND;
14371	15038	/**/
	15039	+ boolean isVR = (mouseMode&VR)!=0;
	15040	+
14372	15041	if((mod&SHIFT) == SHIFT)
14373		- manipCamera.RotatePosition(0, speed);
14374		- else
14375		- manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14376		- /**/
14377		- if ((mod & SHIFT) == SHIFT)
14378	15042	{
14379		- mouseMode = mouseMode;
14380		- } else
14381		- {
14382		- mouseMode \|= BACKFORTH;
	15043	+// if (isVR)
	15044	+// manipCamera.RotateInterest(0, -speed);
	15045	+// else
	15046	+ if (isVR)
	15047	+ ViewAngle(speed*delta);
	15048	+ else
	15049	+ manipCamera.Translate(0, speed*delta, getWidth());
14383	15050	}
	15051	+ else
	15052	+ {
	15053	+ if (isVR)
	15054	+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
	15055	+ else
	15056	+ manipCamera.RotatePosition(0, speed);
	15057	+ }
	15058	+
	15059	+ /**/
	15060	+// if ((mod & SHIFT) == SHIFT)
	15061	+// {
	15062	+// mouseMode = mouseMode;
	15063	+// } else
	15064	+// {
	15065	+// mouseMode \|= BACKFORTH;
	15066	+// }
14384	15067
	15068	+ targetLookAt.set(manipCamera.lookAt);
	15069	+
14385	15070	//prevX = X = anchorX;
14386	15071	prevY = Y = anchorY + (int) (renderCamera.Distance());
14387	15072	}
..	..	@@ -14391,18 +15076,29 @@
14391	15076	MODIFIERS \|= COMMAND;
14392	15077	/**/
14393	15078	if((mod&SHIFT) == SHIFT)
14394		- manipCamera.Translate(speed*delta, 0, getWidth());
	15079	+ manipCamera.Translate(speed, 0, getWidth());
14395	15080	else
14396		- manipCamera.RotatePosition(speed, 0);
	15081	+ {
	15082	+ if ((mouseMode&VR)!=0)
	15083	+ manipCamera.RotateInterest(-speed*manipCamera.shaper_fovy/90, 0);
	15084	+ else
	15085	+ manipCamera.RotatePosition(speed*manipCamera.shaper_fovy/90, 0);
	15086	+ }
	15087	+
14397	15088	/**/
14398		- if ((mod & SHIFT) == SHIFT)
14399		- {
14400		- mouseMode = mouseMode;
14401		- } else
14402		- {
14403		- mouseMode \|= ROTATE;
14404		- } // TRANSLATE;
	15089	+// if ((mod & SHIFT) == SHIFT)
	15090	+// {
	15091	+// mouseMode = mouseMode;
	15092	+// } else
	15093	+// {
	15094	+// mouseMode \|= ROTATE;
	15095	+// } // TRANSLATE;
14405	15096
	15097	+ //System.err.println("lookAt = " + manipCamera.lookAt);
	15098	+ //System.err.println("location = " + manipCamera.location);
	15099	+
	15100	+ targetLookAt.set(manipCamera.lookAt);
	15101	+
14406	15102	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
14407	15103	prevY = Y = anchorY;
14408	15104	}
..	..	@@ -14412,18 +15108,26 @@
14412	15108	MODIFIERS \|= COMMAND;
14413	15109	/**/
14414	15110	if((mod&SHIFT) == SHIFT)
14415		- manipCamera.Translate(-speed*delta, 0, getWidth());
	15111	+ manipCamera.Translate(-speed, 0, getWidth());
14416	15112	else
14417		- manipCamera.RotatePosition(-speed, 0);
	15113	+ {
	15114	+ if ((mouseMode&VR)!=0)
	15115	+ manipCamera.RotateInterest(speed*manipCamera.shaper_fovy/90, 0);
	15116	+ else
	15117	+ manipCamera.RotatePosition(-speed*manipCamera.shaper_fovy/90, 0);
	15118	+ }
	15119	+
14418	15120	/**/
14419		- if ((mod & SHIFT) == SHIFT)
14420		- {
14421		- mouseMode = mouseMode;
14422		- } else
14423		- {
14424		- mouseMode \|= ROTATE;
14425		- } // TRANSLATE;
	15121	+// if ((mod & SHIFT) == SHIFT)
	15122	+// {
	15123	+// mouseMode = mouseMode;
	15124	+// } else
	15125	+// {
	15126	+// mouseMode \|= ROTATE;
	15127	+// } // TRANSLATE;
14426	15128
	15129	+ targetLookAt.set(manipCamera.lookAt);
	15130	+
14427	15131	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
14428	15132	prevY = Y = anchorY;
14429	15133	}
..	..	@@ -14465,15 +15169,16 @@
14465	15169	if (editObj)
14466	15170	{
14467	15171	drag = true;
14468		- ClickInfo info = new ClickInfo();
14469		- info.bounds.setBounds(0, 0,
	15172	+ //ClickInfo info = new ClickInfo();
	15173	+ object.clickInfo.bounds.setBounds(0, 0,
14470	15174	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14471		- info.pane = this;
14472		- info.camera = renderCamera;
14473		- info.x = x;
14474		- info.y = y;
14475		- object.GetWindow().copy
14476		- .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
	15175	+ object.clickInfo.pane = this;
	15176	+ object.clickInfo.camera = renderCamera;
	15177	+ object.clickInfo.x = x;
	15178	+ object.clickInfo.y = y;
	15179	+ object //.GetWindow().copy
	15180	+ .doEditDrag(//info,
	15181	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14477	15182	} else
14478	15183	{
14479	15184	if (x < startX)
..	..	@@ -14556,6 +15261,11 @@
14556	15261	if ((mouseMode & ZOOM) != 0)
14557	15262	{
14558	15263	//if ((mouseMode & BACKFORTH) != 0)
	15264	+ if ((modifiersex & SHIFT) == SHIFT)
	15265	+ {
	15266	+ ViewAngle(dy);
	15267	+ }
	15268	+ else
14559	15269	if ((mouseMode & VR) != 0)
14560	15270	manipCamera.BackForth(dx, dy, getWidth());
14561	15271	else
..	..	@@ -14622,24 +15332,30 @@
14622	15332	}
14623	15333	}
14624	15334
	15335	+// ClickInfo clickInfo = new ClickInfo();
	15336	+
14625	15337	public void mouseMoved(MouseEvent e)
14626	15338	{
	15339	+//object.editWindow.frame.
	15340	+ setCursor(Cursor.getDefaultCursor());
	15341	+
14627	15342	//System.out.println("mouseMoved: " + e);
14628	15343	if (isRenderer)
14629	15344	return;
14630	15345
14631		- ClickInfo ci = new ClickInfo();
14632		- ci.x = e.getX();
14633		- ci.y = e.getY();
14634		- ci.modifiers = e.getModifiersEx();
14635		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14636		- ci.pane = this;
14637		- ci.camera = renderCamera;
	15346	+ // Mouse cursor feedback
	15347	+ object.clickInfo.x = e.getX();
	15348	+ object.clickInfo.y = e.getY();
	15349	+ object.clickInfo.modifiers = e.getModifiersEx();
	15350	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	15351	+ object.clickInfo.pane = this;
	15352	+ object.clickInfo.camera = renderCamera;
14638	15353	if (!isRenderer)
14639	15354	{
14640	15355	//ObjEditor editWindow = object.editWindow;
14641	15356	//Object3D copy = editWindow.copy;
14642		- if (object.doEditClick(ci, 0))
	15357	+ if (object.doEditClick(//clickInfo,
	15358	+ 0))
14643	15359	{
14644	15360	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14645	15361	} else
..	..	@@ -14807,8 +15523,10 @@
14807	15523	mouseMode \|= ZOOM;
14808	15524	}
14809	15525
14810		- boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14811		- if (capsLocked) // \|\| (modifiers & META) == META)
	15526	+ //boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
	15527	+ boolean vr = capsLocked && !lightMode;
	15528	+
	15529	+ if (vr) // \|\| (modifiers & META) == META)
14812	15530	{
14813	15531	mouseMode \|= VR; // BACKFORTH;
14814	15532	}
..	..	@@ -14820,7 +15538,8 @@
14820	15538	{
14821	15539	mouseMode \|= SELECT;
14822	15540	}
14823		- if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
	15541	+ if (//(modifiersex & SHIFT) == SHIFT \|\|
	15542	+ forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14824	15543	{
14825	15544	mouseMode &= ~VR;
14826	15545	mouseMode \|= TRANSLATE;
..	..	@@ -14864,8 +15583,18 @@
14864	15583	float SATPOW = 1; // 2; // 0.5f;
14865	15584	float BRIPOW = 1; // 0.5f; // 0.5f;
14866	15585
	15586	+static BufferedImage cursorImg = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB);
	15587	+
	15588	+// Create a new blank cursor.
	15589	+static Cursor blankCursor = Toolkit.getDefaultToolkit().createCustomCursor(
	15590	+ cursorImg, new Point(0, 0), "blank cursor");
	15591	+
14867	15592	public void keyPressed(int key)
14868	15593	{
	15594	+// Set the blank cursor to the JFrame.
	15595	+//object.editWindow.frame.
	15596	+ setCursor(blankCursor);
	15597	+
14869	15598	if (key >= '0' && key <= '5')
14870	15599	clampbit = (key-'0');
14871	15600
..	..	@@ -14911,7 +15640,8 @@
14911	15640	// break;
14912	15641	case 'T':
14913	15642	CACHETEXTURE ^= true;
14914		- textures.clear();
	15643	+ texturepigment.clear();
	15644	+ texturebump.clear();
14915	15645	// repaint();
14916	15646	break;
14917	15647	case 'Y':
..	..	@@ -14921,8 +15651,8 @@
14921	15651	case 'K':
14922	15652	KOMPACTTEXTURE ^= true;
14923	15653	//textures.clear();
14924		- break;
14925		- case 'P': // Texture Projection macros
	15654	+ // break;
	15655	+ //case 'P': // Texture Projection macros
14926	15656	// SAVETEXTURE ^= true;
14927	15657	macromode = true;
14928	15658	Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
..	..	@@ -15023,8 +15753,8 @@
15023	15753	RevertCamera();
15024	15754	repaint();
15025	15755	break;
15026		- case 'l':
15027		- //case 'L':
	15756	+ //case 'l':
	15757	+ case 'L':
15028	15758	if (lightMode)
15029	15759	{
15030	15760	lightMode = false;
..	..	@@ -15043,7 +15773,7 @@
15043	15773	targetLookAt.set(manipCamera.lookAt);
15044	15774	repaint();
15045	15775	break;
15046		- case 'p':
	15776	+ case 'P': // p':
15047	15777	// c'est quoi ca au juste? spherical ^= true;
15048	15778	Skinshader ^= true; programInitialized = false;
15049	15779	repaint();
..	..	@@ -15054,7 +15784,8 @@
15054	15784	break;
15055	15785	case 'm':
15056	15786	{
15057		- PrintMemory();
	15787	+ //PrintMemory();
	15788	+ ToggleImageFlip();
15058	15789	break;
15059	15790	}
15060	15791	case 'M':
..	..	@@ -15081,27 +15812,31 @@
15081	15812	repaint();
15082	15813	break;
15083	15814	case 'O':
15084		- Globals.drawMode = OCCLUSION; // WARNING
15085		- repaint();
15086		- break;
	15815	+ // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
	15816	+ //repaint();
	15817	+ //break;
15087	15818	case 'o':
15088	15819	OCCLUSION_CULLING ^= true;
15089	15820	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
15090	15821	break;
15091		- case '0': envyoff ^= true; repaint(); break;
	15822	+ //case '0': envyoff ^= true; repaint(); break;
15092	15823	case '1':
15093	15824	case '2':
15094	15825	case '3':
15095	15826	case '4':
15096	15827	case '5':
15097		- newenvy = Character.getNumericValue(key);
15098		- repaint();
15099		- break;
15100	15828	case '6':
15101	15829	case '7':
15102	15830	case '8':
15103	15831	case '9':
15104		- BGcolor = (key - '6')/3.f;
	15832	+ if (true) // envyoff)
	15833	+ {
	15834	+ BGcolor = (key - '1')/8.f;
	15835	+ }
	15836	+ else
	15837	+ {
	15838	+ //newenvy = Character.getNumericValue(key);
	15839	+ }
15105	15840	repaint();
15106	15841	break;
15107	15842	case '!':
..	..	@@ -15171,7 +15906,21 @@
15171	15906	// kompactbit = 6;
15172	15907	// break;
15173	15908	case ' ':
	15909	+ capsLocked ^= true;
	15910	+ repaint();
	15911	+ break;
	15912	+ case 'l':
15174	15913	lightMode ^= true;
	15914	+ if (lightMode)
	15915	+ {
	15916	+ keepshadow = Globals.RENDERSHADOW;
	15917	+ Globals.RENDERSHADOW = false;
	15918	+ }
	15919	+ else
	15920	+ {
	15921	+ Globals.RENDERSHADOW = keepshadow;
	15922	+ }
	15923	+
15175	15924	Globals.lighttouched = true;
15176	15925	manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
15177	15926	targetLookAt.set(manipCamera.lookAt);
..	..	@@ -15179,6 +15928,10 @@
15179	15928	break;
15180	15929	//case '`' :
15181	15930	case ESC:
	15931	+ if (FULLSCREEN)
	15932	+ object.editWindow.ToggleFullScreen();
	15933	+ break;
	15934	+ case 'p':
15182	15935	RENDERPROGRAM += 1;
15183	15936	RENDERPROGRAM %= 3;
15184	15937
..	..	@@ -15217,6 +15970,10 @@
15217	15970	case ENTER:
15218	15971	// object.editWindow.ScreenFit(); // Edit();
15219	15972	ToggleLive();
	15973	+ if (capsLocked)
	15974	+ {
	15975	+ Globals.WALK ^= true;
	15976	+ }
15220	15977	break;
15221	15978	case DELETE:
15222	15979	ClearSelection();
..	..	@@ -15253,17 +16010,23 @@
15253	16010	object.GetWindow().refreshContents(true);
15254	16011	break;
15255	16012	case '{':
15256		- manipCamera.shaper_fovy /= 1.1;
	16013	+ double factor = 1.1;
	16014	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16015	+ manipCamera.shaper_fovy /= factor;
15257	16016	System.out.println("FOV = " + manipCamera.shaper_fovy);
15258	16017	repaint();
15259	16018	break;
15260	16019	case '}':
15261		- manipCamera.shaper_fovy *= 1.1;
	16020	+ factor = 1.1;
	16021	+ if (manipCamera.shaper_fovy * factor < 150)
	16022	+ manipCamera.shaper_fovy *= factor;
15262	16023	System.out.println("FOV = " + manipCamera.shaper_fovy);
15263	16024	repaint();
15264	16025	break;
15265	16026	case '[':
15266		- manipCamera.shaper_fovy /= 1.01;
	16027	+ factor = 1.01;
	16028	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16029	+ manipCamera.shaper_fovy /= factor;
15267	16030	if (false) //manipCamera.hAspect == 0)
15268	16031	{
15269	16032	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -15279,7 +16042,9 @@
15279	16042	break;
15280	16043	case ']':
15281	16044	//manipCamera.shaper_fovy += (180 - manipCamera.shaper_fovy)*0.1;
15282		- manipCamera.shaper_fovy *= 1.01;
	16045	+ factor = 1.01;
	16046	+ if (manipCamera.shaper_fovy * factor < 150)
	16047	+ manipCamera.shaper_fovy *= factor;
15283	16048	if (false) //manipCamera.hAspect == 0)
15284	16049	{
15285	16050	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -15317,98 +16082,113 @@
15317	16082	}
15318	16083	}
15319	16084
	16085	+ boolean keys[] = new boolean[256];
	16086	+ int speedkey[] = new int[256];
	16087	+ int modifiers = 0;
	16088	+
15320	16089	public void processKeyEvent(KeyEvent e)
15321	16090	{
15322	16091	switch (e.getID())
15323	16092	{
15324	16093	case KeyEvent.KEY_PRESSED:
15325		- if (!autorepeat)
15326		- {
15327		- //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
15328		- keyPressed(e.getKeyChar(), e.getModifiersEx());
15329		- }
15330		- if (manipCamera == lightCamera)
15331		- {
15332		- switch (e.getKeyCode())
15333		- {
15334		- case DOWN_ARROW:
15335		- lightCamera.DECAL /= 2;
15336		- repaint();
15337		- break;
15338		- case UP_ARROW:
15339		- lightCamera.DECAL *= 2;
15340		- repaint();
15341		- break;
15342		- case LEFT_ARROW:
15343		- lightCamera.SCALE /= 2;
15344		- repaint();
15345		- break;
15346		- case RIGHT_ARROW:
15347		- lightCamera.SCALE *= 2;
15348		- repaint();
15349		- break;
15350		- default:
15351		- break;
15352		- }
15353		-
15354		- System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
15355		- } else
15356		- {
15357		- if (true) // !autorepeat)
15358		- {
15359		- boolean reset = true;
15360		-
15361		- switch (e.getKeyCode())
15362		- {
15363		- case DOWN_ARROW:
15364		- GoDown(e.getModifiersEx());
15365		- repaint();
15366		- break;
15367		- case UP_ARROW:
15368		- GoUp(e.getModifiersEx());
15369		- repaint();
15370		- break;
15371		- case LEFT_ARROW:
15372		- GoLeft(e.getModifiersEx());
15373		- repaint();
15374		- break;
15375		- case RIGHT_ARROW:
15376		- GoRight(e.getModifiersEx());
15377		- repaint();
15378		- break;
15379		- default:
15380		- reset = false;
15381		- break;
15382		- }
15383		-
15384		- if (reset)
15385		- {
15386		- autorepeat = true;
15387		-
15388		- targetLookAt.set(manipCamera.lookAt);
15389		- }
15390		- }
15391		- }
	16094	+ keys[e.getKeyCode()] = true;
	16095	+ modifiers = e.getModifiersEx();
	16096	+ keyPressed(e.getKeyChar(), modifiers);
	16097	+ //Globals.theRenderer.keyPressed(e.getKeyChar());
	16098	+ repaint();
15392	16099	break;
15393		- case KeyEvent.KEY_TYPED:
15394		- break;
	16100	+// if (!autorepeat)
	16101	+// {
	16102	+// //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
	16103	+// keyPressed(e.getKeyChar(), e.getModifiersEx());
	16104	+// }
	16105	+// if (manipCamera == lightCamera)
	16106	+// {
	16107	+// switch (e.getKeyCode())
	16108	+// {
	16109	+// case DOWN_ARROW:
	16110	+// lightCamera.DECAL /= 2;
	16111	+// repaint();
	16112	+// break;
	16113	+// case UP_ARROW:
	16114	+// lightCamera.DECAL *= 2;
	16115	+// repaint();
	16116	+// break;
	16117	+// case LEFT_ARROW:
	16118	+// lightCamera.SCALE /= 2;
	16119	+// repaint();
	16120	+// break;
	16121	+// case RIGHT_ARROW:
	16122	+// lightCamera.SCALE *= 2;
	16123	+// repaint();
	16124	+// break;
	16125	+// default:
	16126	+// break;
	16127	+// }
	16128	+//
	16129	+// System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
	16130	+// } else
	16131	+// {
	16132	+// if (true) // !autorepeat)
	16133	+// {
	16134	+// boolean reset = true;
	16135	+//
	16136	+// switch (e.getKeyCode())
	16137	+// {
	16138	+// case DOWN_ARROW:
	16139	+// GoDown(e.getModifiersEx());
	16140	+// repaint();
	16141	+// break;
	16142	+// case UP_ARROW:
	16143	+// GoUp(e.getModifiersEx());
	16144	+// repaint();
	16145	+// break;
	16146	+// case LEFT_ARROW:
	16147	+// GoLeft(e.getModifiersEx());
	16148	+// repaint();
	16149	+// break;
	16150	+// case RIGHT_ARROW:
	16151	+// GoRight(e.getModifiersEx());
	16152	+// repaint();
	16153	+// break;
	16154	+// default:
	16155	+// reset = false;
	16156	+// break;
	16157	+// }
	16158	+//
	16159	+// if (reset)
	16160	+// {
	16161	+// autorepeat = true;
	16162	+//
	16163	+// targetLookAt.set(manipCamera.lookAt);
	16164	+// }
	16165	+// }
	16166	+// }
	16167	+// break;
	16168	+// case KeyEvent.KEY_TYPED:
	16169	+// break;
15395	16170	case KeyEvent.KEY_RELEASED:
15396		- {
15397		- switch (e.getKeyCode())
15398		- {
15399		- case DOWN_ARROW:
15400		- case UP_ARROW:
15401		- case LEFT_ARROW:
15402		- case RIGHT_ARROW:
15403		- MODIFIERS &= ~COMMAND;
15404		- autorepeat = false;
15405		- break;
15406		- default:
15407		- break;
15408		- }
	16171	+ keys[e.getKeyCode()] = false;
	16172	+ modifiers = e.getModifiersEx();
15409	16173	keyReleased(e.getKeyChar(), e.getModifiersEx());
	16174	+ repaint();
15410	16175	break;
15411		- }
	16176	+// {
	16177	+// switch (e.getKeyCode())
	16178	+// {
	16179	+// case DOWN_ARROW:
	16180	+// case UP_ARROW:
	16181	+// case LEFT_ARROW:
	16182	+// case RIGHT_ARROW:
	16183	+// MODIFIERS &= ~COMMAND;
	16184	+// autorepeat = false;
	16185	+// break;
	16186	+// default:
	16187	+// break;
	16188	+// }
	16189	+// keyReleased(e.getKeyChar(), e.getModifiersEx());
	16190	+// break;
	16191	+// }
15412	16192	default:
15413	16193	break;
15414	16194	}
..	..	@@ -15664,8 +16444,6 @@
15664	16444
15665	16445	int width = getBounds().width;
15666	16446	int height = getBounds().height;
15667		- ClickInfo info = new ClickInfo();
15668		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15669	16447	//Image img = CreateImage(width, height);
15670	16448	//System.out.println("width = " + width + "; height = " + height + "\n");
15671	16449
..	..	@@ -15742,31 +16520,37 @@
15742	16520	}
15743	16521	if (object != null && !hasMarquee)
15744	16522	{
	16523	+ if (object.clickInfo == null)
	16524	+ object.clickInfo = new ClickInfo();
	16525	+ ClickInfo info = object.clickInfo;
	16526	+ //ClickInfo info = new ClickInfo();
	16527	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16528	+
15745	16529	if (isRenderer)
15746	16530	{
15747		- info.flags++;
	16531	+ object.clickInfo.flags++;
15748	16532	double frameAspect = (double) width / (double) height;
15749	16533	if (frameAspect > renderCamera.aspect)
15750	16534	{
15751	16535	int desired = (int) ((double) height * renderCamera.aspect);
15752		- info.bounds.width -= width - desired;
15753		- info.bounds.x += (width - desired) / 2;
	16536	+ object.clickInfo.bounds.width -= width - desired;
	16537	+ object.clickInfo.bounds.x += (width - desired) / 2;
15754	16538	} else
15755	16539	{
15756	16540	int desired = (int) ((double) width / renderCamera.aspect);
15757		- info.bounds.height -= height - desired;
15758		- info.bounds.y += (height - desired) / 2;
	16541	+ object.clickInfo.bounds.height -= height - desired;
	16542	+ object.clickInfo.bounds.y += (height - desired) / 2;
15759	16543	}
15760	16544	}
15761	16545
15762		- info.g = gr;
15763		- info.camera = renderCamera;
	16546	+ object.clickInfo.g = gr;
	16547	+ object.clickInfo.camera = renderCamera;
15764	16548	/*
15765	16549	// Memory intensive (brep.verticescopy)
15766	16550	if (!(object instanceof Composite))
15767	16551	object.draw(info, 0, false); // SLOW :
15768	16552	*/
15769		- if (!isRenderer)
	16553	+ if (!isRenderer) // && drag)
15770	16554	{
15771	16555	Grafreed.Assert(object != null);
15772	16556	Grafreed.Assert(object.selection != null);
..	..	@@ -15774,9 +16558,9 @@
15774	16558	{
15775	16559	int hitSomething = object.selection.get(0).hitSomething;
15776	16560
15777		- info.DX = 0;
15778		- info.DY = 0;
15779		- info.W = 1;
	16561	+ object.clickInfo.DX = 0;
	16562	+ object.clickInfo.DY = 0;
	16563	+ object.clickInfo.W = 1;
15780	16564	if (hitSomething == Object3D.hitCenter)
15781	16565	{
15782	16566	info.DX = X;
..	..	@@ -15788,13 +16572,14 @@
15788	16572	info.DY -= info.bounds.height/2;
15789	16573	}
15790	16574
15791		- object.drawEditHandles(info, 0);
	16575	+ object.drawEditHandles(//info,
	16576	+ 0);
15792	16577
15793	16578	if (drag && (X != 0 \|\| Y != 0))
15794	16579	{
15795	16580	switch (hitSomething)
15796	16581	{
15797		- case Object3D.hitCenter: gr.setColor(Color.pink);
	16582	+ case Object3D.hitCenter: gr.setColor(Color.white);
15798	16583	gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15799	16584	break;
15800	16585	case Object3D.hitRotate: gr.setColor(Color.yellow);
..	..	@@ -15820,7 +16605,7 @@
15820	16605	if (hasMarquee)
15821	16606	{
15822	16607	gr.setXORMode(Color.white);
15823		- gr.setColor(Color.red);
	16608	+ gr.setColor(Color.white);
15824	16609	if (!firstime)
15825	16610	{
15826	16611	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -15979,7 +16764,8 @@
15979	16764
15980	16765	public boolean mouseDrag(Event evt, int x, int y)
15981	16766	{
15982		- //System.out.println("mouseDrag: " + evt);
	16767	+ System.out.println("mouseDrag: " + evt);
	16768	+ System.exit(0);
15983	16769	/*
15984	16770	drag = true;
15985	16771	//System.out.println("Mouse DRAG");
..	..	@@ -16098,6 +16884,7 @@
16098	16884	public boolean mouseUp(Event evt, int x, int y)
16099	16885	{
16100	16886	System.out.println("mouseUp: " + evt);
	16887	+ System.exit(0);
16101	16888	/*
16102	16889	locked = false;
16103	16890	if (isRenderer)
..	..	@@ -16287,6 +17074,8 @@
16287	17074	private /static/ boolean firstime;
16288	17075	private /static/ cVector newView = new cVector();
16289	17076	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	17077	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	17078	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
16290	17079	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16291	17080	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16292	17081	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16299,29 +17088,67 @@
16299	17088	{
16300	17089	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16301	17090
	17091	+ int usedsuf = 0;
	17092	+
16302	17093	for (int i = 0; i < suffixes.length; i++)
16303	17094	{
16304		- String resourceName = basename + suffixes[i] + "." + suffix;
16305		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16306		- mipmapped,
16307		- FileUtil.getFileSuffix(resourceName));
16308		- if (data == null)
	17095	+ String[] suffixe = suffixes;
	17096	+ String[] fallback = suffixes2;
	17097	+ String[] fallfallback = suffixes3;
	17098	+
	17099	+ for (int c=usedsuf; --c>=0;)
16309	17100	{
16310		- throw new IOException("Unable to load texture " + resourceName);
	17101	+// String[] temp = suffixe;
	17102	+// suffixe = fallback;
	17103	+// fallback = fallfallback;
	17104	+// fallfallback = temp;
16311	17105	}
	17106	+
	17107	+ String resourceName = basename + suffixe[i] + "." + suffix;
	17108	+ TextureData data;
	17109	+
	17110	+ try
	17111	+ {
	17112	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	17113	+ mipmapped,
	17114	+ FileUtil.getFileSuffix(resourceName));
	17115	+ }
	17116	+ catch (Exception e)
	17117	+ {
	17118	+ try
	17119	+ {
	17120	+ resourceName = basename + fallback[i] + "." + suffix;
	17121	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	17122	+ mipmapped,
	17123	+ FileUtil.getFileSuffix(resourceName));
	17124	+ }
	17125	+ catch (Exception e2)
	17126	+ {
	17127	+ resourceName = basename + fallfallback[i] + "." + suffix;
	17128	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	17129	+ mipmapped,
	17130	+ FileUtil.getFileSuffix(resourceName));
	17131	+ }
	17132	+ }
	17133	+
16312	17134	//System.out.println("Target = " + targets[i]);
16313	17135	cubemap.updateImage(data, targets[i]);
16314	17136	}
16315	17137
16316	17138	return cubemap;
16317	17139	}
	17140	+
16318	17141	int bigsphere = -1;
16319	17142
16320	17143	float BGcolor = 0.5f;
16321	17144
16322		- private void DrawSkyBox(GL gl)
	17145	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	17146	+
	17147	+ private void DrawSkyBox(GL gl, float ratio)
16323	17148	{
16324		- if (envyoff \|\| cubemap == null)
	17149	+ if (//envyoff \|\|
	17150	+ WIREFRAME \|\|
	17151	+ cubemap == null)
16325	17152	{
16326	17153	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16327	17154	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -16336,7 +17163,17 @@
16336	17163	// Compensates for ExaminerViewer's modification of modelview matrix
16337	17164	gl.glMatrixMode(GL.GL_MODELVIEW);
16338	17165	gl.glLoadIdentity();
	17166	+ gl.glScalef(1,ratio,1);
16339	17167
	17168	+// colorV[0] = 2;
	17169	+// colorV[1] = 2;
	17170	+// colorV[2] = 2;
	17171	+// colorV[3] = 1;
	17172	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	17173	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	17174	+//
	17175	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	17176	+
16340	17177	//gl.glActiveTexture(GL.GL_TEXTURE1);
16341	17178	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16342	17179
..	..	@@ -16368,6 +17205,7 @@
16368	17205	{
16369	17206	gl.glScalef(1.0f, -1.0f, 1.0f);
16370	17207	}
	17208	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16371	17209	gl.glMultMatrixd(viewrot_1, 0);
16372	17210	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16373	17211	//viewer.updateInverseRotation(gl);
..	..	@@ -16408,7 +17246,8 @@
16408	17246	gl.glDisable(GL.GL_TEXTURE_GEN_R);
16409	17247
16410	17248	cubemap.disable();
16411		- ////cubemap.unbind();
	17249	+ //cubemap.dispose();
	17250	+
16412	17251	if (CULLFACE)
16413	17252	{
16414	17253	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -16464,7 +17303,7 @@
16464	17303	gl.glScalef(1.0f, -1.0f, 1.0f);
16465	17304	}
16466	17305
16467		- gl.glNormal3f(0.0f, 0.0f, 1.0f);
	17306	+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
16468	17307
16469	17308	float step = 2; // 0.1666f; //0.25f;
16470	17309	float stepv = 2; // step * 1652 / 998;
..	..	@@ -16626,7 +17465,7 @@
16626	17465	//new Exception().printStackTrace();
16627	17466	System.out.println("select buffer init");
16628	17467	// Use debug pipeline
16629		- drawable.setGL(new DebugGL(drawable.getGL()));
	17468	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16630	17469
16631	17470	GL gl = drawable.getGL();
16632	17471
..	..	@@ -16753,7 +17592,7 @@
16753	17592
16754	17593	float depth = depths[y * TEX_SIZE + x];
16755	17594
16756		- if (pointselection && mouseMode == SELECT && depth != 0 && depth != 1)
	17595	+ if (pointselection && (mouseMode & SELECT) == SELECT && depth != 0 && depth != 1)
16757	17596	{
16758	17597	pointselection = false;
16759	17598
..	..	@@ -16944,6 +17783,7 @@
16944	17783
16945	17784	public void init(GLAutoDrawable drawable)
16946	17785	{
	17786	+ if (Globals.DEBUG)
16947	17787	System.out.println("shadow buffer init");
16948	17788
16949	17789	GL gl = drawable.getGL();
..	..	@@ -17172,10 +18012,14 @@
17172	18012	gl.glFlush();
17173	18013
17174	18014	/**/
17175		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
	18015	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
17176	18016
17177		- float[] pixels = occlusionsizebuffer.array();
	18017	+ float[] depths = occlusiondepthbuffer.array();
17178	18018
	18019	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
	18020	+
	18021	+ int[] pixels = selectsizebuffer.array();
	18022	+
17179	18023	double r = 0, g = 0, b = 0;
17180	18024
17181	18025	double count = 0;
..	..	@@ -17186,7 +18030,7 @@
17186	18030
17187	18031	double FACTOR = 1;
17188	18032
17189		- for (int i = 0; i < pixels.length; i++)
	18033	+ for (int i = 0; i < depths.length; i++)
17190	18034	{
17191	18035	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
17192	18036	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -17269,7 +18113,7 @@
17269	18113
17270	18114	double scale = ray.z; // 1; // cos
17271	18115
17272		- float depth = pixels[newindex];
	18116	+ float depth = depths[newindex];
17273	18117
17274	18118	/*
17275	18119	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -17412,6 +18256,11 @@
17412	18256	static boolean DEBUG_SELECTION = false;
17413	18257	boolean OCCLUSION_CULLING = false; //true;
17414	18258	public boolean lightMode = false;
	18259	+
	18260	+ private boolean keepshadow;
	18261	+
	18262	+ static public boolean capsLocked = false; // VR
	18263	+
17415	18264	static public int indexcount = 0;
17416	18265	/static/ cColor vertexOcclusion = new cColor();
17417	18266	//private int selection_view = -1;
..	..	@@ -17466,11 +18315,14 @@
17466	18315	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17467	18316	static IntBuffer bigAAbuffer;
17468	18317	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17469		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	18318	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17470	18319	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17471	18320	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17472	18321	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17473		- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	18322	+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	18323	+
	18324	+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	18325	+
17474	18326	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17475	18327	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17476	18328	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();