~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.*;
..	..	@@ -110,7 +111,11 @@
110	111	//private Mat4f spotlightTransform = new Mat4f();
111	112	//private Mat4f spotlightInverseTransform = new Mat4f();
112	113	static GLContext glcontext = null;
113		- /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	+
114	119	boolean reverseUP = false;
115	120	static boolean frozen = false;
116	121	boolean enablebackspace = false; // patch for back buffer refresh
..	..	@@ -130,7 +135,7 @@
130	135	static boolean ZOOMBOXMODE = false;
131	136	static boolean BOXMODE = false;
132	137	static boolean IMAGEFLIP = false;
133		-static boolean SMOOTHFOCUS = false;
	138	+static boolean SMOOTHFOCUS = true; // false;
134	139	static boolean SPEAKERMOCAP = true; // jan 2014 false;
135	140	static boolean SPEAKERCAMERA = false;
136	141	static boolean SPEAKERFOCUS = false;
..	..	@@ -164,16 +169,16 @@
164	169
165	170
166	171	// OPTIONS
167		- boolean Skinshader = true;
	172	+ boolean Skinshader = false; // true;
168	173	boolean cameraLight = false;
169	174	boolean UVdebug = false;
170	175	boolean Udebug = false;
171	176	boolean Vdebug = false;
172	177	boolean NORMALdebug = false;
173		- static boolean doublesided = false; // true; // reversed normals are awful for conformance
	178	+ static boolean doublesided = true; // false; // reversed normals are awful for conformance
174	179	boolean anisotropy = true;
175	180	boolean softshadow = true; // slower but better false;
176		- boolean opacityhalo = false;
	181	+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
177	182
178	183	boolean macromode = false;
179	184
..	..	@@ -188,15 +193,16 @@
188	193
189	194	private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
190	195
191		- public void LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	196	+ public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
192	197	{
193	198	try
194	199	{
195		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	200	+ return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
196	201	} catch (IOException e)
197	202	{
198	203	System.out.println("NAME = " + name);
199	204	e.printStackTrace(); // throw new RuntimeException(e);
	205	+ return null;
200	206	}
201	207	}
202	208
..	..	@@ -216,10 +222,10 @@
216	222	cameras = new Camera[2];
217	223	targetLookAts = new cVector[2];
218	224
219		- SetCamera(cam);
	225	+ SetCamera(cam, true);
220	226
221	227	// Warning: not used.
222		- SetLight(new Camera(new cVector(15, 10, -20)));
	228	+ //SetLight(new Camera(new cVector(15, 10, -20)));
223	229
224	230	object = o;
225	231
..	..	@@ -537,7 +543,8 @@
537	543	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
538	544	LA.vecCross(obj.v0, obj.v1, obj.v2);
539	545	LA.vecNormalize(obj.v2);
540		- 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);
541	548	}
542	549
543	550	// P
..	..	@@ -559,7 +566,7 @@
559	566	y += ny * obj.NORMALPUSH;
560	567	z += nz * obj.NORMALPUSH;
561	568
562		- gl.glNormal3f(nx, ny, nz);
	569	+ SetGLNormal(gl, nx, ny, nz);
563	570	}
564	571	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
565	572	SetColor(obj, pv);
..	..	@@ -591,7 +598,7 @@
591	598	y += ny * obj.NORMALPUSH;
592	599	z += nz * obj.NORMALPUSH;
593	600
594		- gl.glNormal3f(nx, ny, nz);
	601	+ SetGLNormal(gl, nx, ny, nz);
595	602	}
596	603	//System.out.println("vertexq = " + qv.s + ", " + qv.t);
597	604	// boolean locked = false;
..	..	@@ -639,7 +646,7 @@
639	646	y += ny * obj.NORMALPUSH;
640	647	z += nz * obj.NORMALPUSH;
641	648
642		- gl.glNormal3f(nx, ny, nz);
	649	+ SetGLNormal(gl, nx, ny, nz);
643	650	}
644	651
645	652	// if ((dot&4) == 0)
..	..	@@ -875,7 +882,7 @@
875	882	//// tris.postdraw(this);
876	883	}
877	884
878		- static Camera localcamera = new Camera();
	885	+ static Camera localAOcamera = new Camera();
879	886	static cVector from = new cVector();
880	887	static cVector to = new cVector();
881	888
..	..	@@ -884,7 +891,7 @@
884	891	CameraPane cp = this;
885	892
886	893	Camera keep = cp.RenderCamera();
887		- cp.renderCamera = localcamera;
	894	+ cp.renderCamera = localAOcamera;
888	895
889	896	if (br.trimmed)
890	897	{
..	..	@@ -902,7 +909,7 @@
902	909	br.positions[i3 + 2] + br.normals[i3 + 2]);
903	910	LA.xformPos(from, transform, from);
904	911	LA.xformPos(to, transform, to); // RIGID ONLY
905		- localcamera.setAim(from, to);
	912	+ localAOcamera.setAim(from, to);
906	913
907	914	CameraPane.occlusionbuffer.display();
908	915
..	..	@@ -936,7 +943,7 @@
936	943	to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
937	944	LA.xformPos(from, transform, from);
938	945	LA.xformPos(to, transform, to); // RIGID ONLY
939		- localcamera.setAim(from, to);
	946	+ localAOcamera.setAim(from, to);
940	947
941	948	CameraPane.occlusionbuffer.display();
942	949
..	..	@@ -1245,10 +1252,10 @@
1245	1252	{
1246	1253	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1247	1254	{
1248		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1255	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1249	1256	} else
1250	1257	{
1251		- gl.glNormal3f(0, 0, 1);
	1258	+ SetGLNormal(gl, 0, 0, 1);
1252	1259	}
1253	1260
1254	1261	if (c != null)
..	..	@@ -1272,10 +1279,10 @@
1272	1279	{
1273	1280	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1274	1281	{
1275		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1282	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1276	1283	} else
1277	1284	{
1278		- gl.glNormal3f(0, 0, 1);
	1285	+ SetGLNormal(gl, 0, 0, 1);
1279	1286	}
1280	1287	if (c != null)
1281	1288	{
..	..	@@ -1300,10 +1307,10 @@
1300	1307	{
1301	1308	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1302	1309	{
1303		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1310	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1304	1311	} else
1305	1312	{
1306		- gl.glNormal3f(0, 0, 1);
	1313	+ SetGLNormal(gl, 0, 0, 1);
1307	1314	}
1308	1315	if (c != null)
1309	1316	{
..	..	@@ -1485,7 +1492,7 @@
1485	1492	{
1486	1493	if (!selectmode)
1487	1494	{
1488		- 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);
1489	1496	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
1490	1497
1491	1498	if (flipV)
..	..	@@ -1814,7 +1821,7 @@
1814	1821
1815	1822	display.modelParams7[0] = 0;
1816	1823	display.modelParams7[1] = 1000;
1817		- display.modelParams7[2] = 0;
	1824	+ display.modelParams7[2] = material.parallax;
1818	1825	display.modelParams7[3] = 0;
1819	1826
1820	1827	//display.modelParams6[0] = 100; // criss de bug de bump
..	..	@@ -2047,9 +2054,9 @@
2047	2054	switch(viewcode)
2048	2055	{
2049	2056	case 0: return "main";
2050		- case 1: return "one";
2051		- case 2: return "two";
2052		- case 3: return "three";
	2057	+ case 1: return "Red";
	2058	+ case 2: return "Green";
	2059	+ case 3: return "Blue";
2053	2060	case 4: return "light";
2054	2061	}
2055	2062
..	..	@@ -2058,7 +2065,7 @@
2058	2065
2059	2066	static int camerachangeframe;
2060	2067
2061		- public boolean SetCamera(Camera cam)
	2068	+ public boolean SetCamera(Camera cam, boolean set)
2062	2069	{
2063	2070	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
2064	2071	// return false;
..	..	@@ -2076,7 +2083,8 @@
2076	2083
2077	2084	camerachangeframe = Globals.framecount;
2078	2085
2079		- cam.hAspect = -1; // Read only
	2086	+ if (cam != null)
	2087	+ cam.hAspect = -1; // Read only
2080	2088
2081	2089	cameras[0] = cam;
2082	2090	targetLookAts[0] = new cVector(cam.lookAt);
..	..	@@ -2086,11 +2094,14 @@
2086	2094	{
2087	2095	cameras[i] = new Camera(cam.viewCode);
2088	2096	}
2089		-
2090		- cameras[i].setAim(cam.location, cam.lookAt);
2091		- cameras[i].shaper_fovy = cam.shaper_fovy;
2092		- cameras[i].UP.set(cam.UP);
2093		- 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	+ }
2094	2105	}
2095	2106	cameracount = 0;
2096	2107	targetLookAt = targetLookAts[cameracount];
..	..	@@ -2099,7 +2110,7 @@
2099	2110	// Start with free camera
2100	2111	SwitchCameras(true);
2101	2112
2102		- pingthread.jump = true; // optional?
	2113	+// pingthread.jump = true; // optional?
2103	2114
2104	2115	if (TRACKONCE)
2105	2116	{
..	..	@@ -2286,18 +2297,6 @@
2286	2297	public void ToggleTrack()
2287	2298	{
2288	2299	TRACK ^= true;
2289		- if (TRACK)
2290		- {
2291		- if (object.selection != null &&
2292		- object.selection.size() > 0 &&
2293		- object.selection.elementAt(0) != null &&
2294		- !(object.selection.elementAt(0) instanceof Camera) &&
2295		- !(object.selection.elementAt(0) instanceof ScriptNode))
2296		- {
2297		- trackedobject = object.selection.elementAt(0);
2298		- repaint();
2299		- }
2300		- }
2301	2300
2302	2301	repaint();
2303	2302	}
..	..	@@ -2389,7 +2388,8 @@
2389	2388	{
2390	2389	//System.out.println("PROTECTION = " + cam.hAspect);
2391	2390	//assert (cam.hAspect == 0);
2392		- cam.hAspect = 0;
	2391	+ if (cam != null)
	2392	+ cam.hAspect = 0;
2393	2393	lightCamera = cam;
2394	2394	}
2395	2395
..	..	@@ -2470,6 +2470,18 @@
2470	2470	return CreateBim(bytes, width, height);
2471	2471	}
2472	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	+
2473	2485	/**/
2474	2486	class CacheTexture
2475	2487	{
..	..	@@ -2512,7 +2524,7 @@
2512	2524	com.sun.opengl.util.texture.TextureIO.newTextureData(
2513	2525	getClass().getClassLoader().getResourceAsStream(name),
2514	2526	true,
2515		- com.sun.opengl.util.texture.TextureIO.PNG);
	2527	+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
2516	2528	} catch (java.io.IOException e)
2517	2529	{
2518	2530	throw new javax.media.opengl.GLException(e);
..	..	@@ -3578,6 +3590,8 @@
3578	3590	};
3579	3591	/**/
3580	3592
	3593	+ static Object3D lastObject;
	3594	+
3581	3595	//com.sun.opengl.util.texture.Texture
3582	3596	TextureData
3583	3597	GetFileTexture(String name, boolean bump, int resolution)
..	..	@@ -3614,6 +3628,8 @@
3614	3628	// return null;
3615	3629	//if (i == 2)
3616	3630	// return null;
	3631	+ // TIFF issue sept 2019
	3632	+ System.err.println("lastObject = " + lastObject);
3617	3633	e.printStackTrace();
3618	3634	name = name.split("\\.tif")[0] + ".jpg";
3619	3635	}
..	..	@@ -6946,30 +6962,30 @@
6946	6962	short residu = 0;
6947	6963
6948	6964	// wraparound workarounds
6949		- short fuck = (short) (buffer[i] & 0xFF);
	6965	+ short ww = (short) (buffer[i] & 0xFF);
6950	6966	/*
6951		- residu += (fuck%2);
6952		- if(fuck/2 < 256-residu/2)
	6967	+ residu += (ww%2);
	6968	+ if(ww/2 < 256-residu/2)
6953	6969	{
6954		- fuck = (short)((fuck/2) + residu/2);
	6970	+ ww = (short)((ww/2) + residu/2);
6955	6971	if(residu == 2)
6956	6972	residu = 0;
6957	6973	}
6958	6974	else
6959	6975	{
6960	6976	residu = 0;
6961		- fuck /= 2;
	6977	+ ww /= 2;
6962	6978	}
6963	6979	*/
6964		- if (i < imglength / 3 \|\| rnd.nextFloat() < 0.5 \|\| fuck >= 254)
	6980	+ if (i < imglength / 3 \|\| rnd.nextFloat() < 0.5 \|\| ww >= 254)
6965	6981	{
6966		- fuck /= 2;
	6982	+ ww /= 2;
6967	6983	} else
6968	6984	{
6969		- fuck = (short) ((fuck / 2) + fuck % 2);
	6985	+ ww = (short) ((ww / 2) + ww % 2);
6970	6986	}
6971	6987
6972		- buffer[i] = (byte) fuck;
	6988	+ buffer[i] = (byte) ww;
6973	6989	}
6974	6990	//System.out.print(bytes[i] + " ");
6975	6991	//if(buffer[i] >= 0 && buffer[i]<=eps-1) buffer[i] = eps;
..	..	@@ -8358,7 +8374,7 @@
8358	8374	// else
8359	8375	// if (!texname.startsWith("/"))
8360	8376	// texname = "/Users/nbriere/Textures/" + texname;
8361		- if (!FileExists(texname))
	8377	+ if (!FileExists(texname) && !texname.startsWith("@"))
8362	8378	{
8363	8379	texname = fallbackTextureName;
8364	8380	}
..	..	@@ -8436,7 +8452,16 @@
8436	8452	{
8437	8453	// texturecache = textures.get(texname); // suspicious
8438	8454	if (texturecache == null)
8439		- 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);
8440	8465	else
8441	8466	new Exception().printStackTrace();
8442	8467	} else
..	..	@@ -8500,6 +8525,7 @@
8500	8525	texturecache = new CacheTexture(texturedata,resolution);
8501	8526	//texture = GetTexture(tex, bump);
8502	8527	}
	8528	+ }
8503	8529	}
8504	8530	//}
8505	8531	}
..	..	@@ -8614,7 +8640,9 @@
8614	8640	{
8615	8641	tex.bw = texturecache.texturedata.getWidth();
8616	8642	tex.bh = texturecache.texturedata.getHeight();
8617		- tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8643	+ tex.bumpdata = //CompressJPEG(CreateBim(
	8644	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array();
	8645	+ //, tex.bw, tex.bh), 0.5f);
8618	8646	}
8619	8647	}
8620	8648	}
..	..	@@ -8768,10 +8796,12 @@
8768	8796
8769	8797	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8770	8798	MAXSTACK = temp[0];
8771		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8799	+ if (Globals.DEBUG)
	8800	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8772	8801	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8773	8802	MAXSTACK = temp[0];
8774		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8803	+ if (Globals.DEBUG)
	8804	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8775	8805
8776	8806	// Use debug pipeline
8777	8807	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8779,7 +8809,8 @@
8779	8809	gl = drawable.getGL(); //
8780	8810
8781	8811	GL gl3 = getGL();
8782		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8812	+ if (Globals.DEBUG)
	8813	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8783	8814
8784	8815
8785	8816	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -9220,6 +9251,8 @@
9220	9251
9221	9252	void LoadEnvy(int which)
9222	9253	{
	9254	+ assert(false);
	9255	+
9223	9256	String name;
9224	9257	String ext;
9225	9258
..	..	@@ -9807,7 +9840,10 @@
9807	9840	DrawSkyBox(gl, (float)rati);
9808	9841	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9809	9842	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9810		- accPerspective(gl, renderCamera.shaper_fovy / ratio,
	9843	+
	9844	+ boolean vr = capsLocked && !lightMode;
	9845	+
	9846	+ accPerspective(gl, renderCamera.shaper_fovy / ratio * (vr ? 1.2 : 1),
9811	9847	ratio,
9812	9848	//near_plane, far_plane,
9813	9849	renderCamera.shaper_zNear * renderCamera.Distance(), renderCamera.shaper_zFar * renderCamera.Distance(),
..	..	@@ -10670,9 +10706,18 @@
10670	10706	static boolean init = false;
10671	10707
10672	10708	double[][] matrix = LA.newMatrix();
	10709	+
	10710	+ // This is to refresh the UI of the material panel.
	10711	+ ObjEditor patchMaterial;
10673	10712
10674	10713	public void display(GLAutoDrawable drawable)
10675	10714	{
	10715	+ if (patchMaterial.patchMaterial)
	10716	+ {
	10717	+ patchMaterial.patchMaterial = false;
	10718	+ patchMaterial.objectTabbedPane.setSelectedIndex(1);
	10719	+ }
	10720	+
10676	10721	if (Grafreed.savesound && Grafreed.hassound)
10677	10722	{
10678	10723	Grafreed.wav.save();
..	..	@@ -10768,6 +10813,112 @@
10768	10813
10769	10814	if (DrawMode() == DEFAULT)
10770	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	+
10771	10922	currentlydrawing = true;
10772	10923	}
10773	10924
..	..	@@ -10841,7 +10992,7 @@
10841	10992
10842	10993	if (wait)
10843	10994	{
10844		- Sleep(500);
	10995	+ Sleep(200); // blocks everything
10845	10996
10846	10997	wait = false;
10847	10998	}
..	..	@@ -11064,18 +11215,34 @@
11064	11215	//
11065	11216	// newenvy = -1;
11066	11217
11067		- if (object.skyboxname != null)
	11218	+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
11068	11219	{
11069		- if (!object.skyboxname.equals(this.loadedskyboxname))
	11220	+ if (cubemaprgb == null)
11070	11221	{
11071		- LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
11072		- loadedskyboxname = object.skyboxname;
	11222	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
11073	11223	}
	11224	+
	11225	+ cubemap = cubemaprgb;
11074	11226	}
11075	11227	else
11076	11228	{
11077		- cubemap = null;
11078		- loadedskyboxname = null;
	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;
11079	11246	}
11080	11247
11081	11248	ratio = ((double) getWidth()) / getHeight();
..	..	@@ -11276,9 +11443,9 @@
11276	11443
11277	11444	gl.glMatrixMode(GL.GL_MODELVIEW);
11278	11445
11279		-gl.glEnable(gl.GL_POLYGON_SMOOTH);
11280		-gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
11281		-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);
11282	11449	} else
11283	11450	{
11284	11451	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -11339,7 +11506,10 @@
11339	11506	//gl.glOrtho(-BOOST, BOOST, -BOOST, BOOST, 0.001, 1000);
11340	11507	} else
11341	11508	{
11342		- 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());
11343	11513	}
11344	11514	}
11345	11515
..	..	@@ -11379,7 +11549,7 @@
11379	11549
11380	11550	// if (cam != lightCamera)
11381	11551	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11382		- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
	11552	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
11383	11553	}
11384	11554
11385	11555	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -11695,8 +11865,11 @@
11695	11865	repaint();
11696	11866	}
11697	11867
11698		- if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
	11868	+ if (Globals.isLIVE() && DrawMode() == DEFAULT \|\| pingthread.live) // may 2013
	11869	+ {
	11870	+ renderCamera.computeTransform();
11699	11871	repaint();
	11872	+ }
11700	11873
11701	11874	displaydone = true;
11702	11875	}
..	..	@@ -11771,9 +11944,23 @@
11771	11944	//GL gl = getGL();
11772	11945	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11773	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	+ }
11774	11961	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11775	11962	object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11776		- pingthread.StepToTarget(true); // true);
	11963	+ pingthread.StepToTarget(); // true);
11777	11964	// zoomonce = false;
11778	11965	}
11779	11966
..	..	@@ -12453,11 +12640,12 @@
12453	12640
12454	12641	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12455	12642
12456		- String program0 =
	12643	+ String programmin =
12457	12644	// Min shader
12458	12645	"!!ARBfp1.0\n" +
12459		- "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
12460		- "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	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 };" +
12461	12649	"PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
12462	12650	"PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
12463	12651	"PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
..	..	@@ -12472,10 +12660,11 @@
12472	12660	"TEMP eye;" +
12473	12661	"TEMP pos;" +
12474	12662
12475		- "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12663	+ "MAD normal, fragment.color, zero12t.z, -zero12t.y;" +
12476	12664	Normalize("normal") +
12477	12665	"MOV light, state.light[0].position;" +
12478	12666	"DP3 ndotl.x, light, normal;" +
	12667	+ "MAX ndotl.x, ndotl.x, zero12t.x;" +
12479	12668
12480	12669	// shadow
12481	12670	"MOV pos, fragment.texcoord[1];" +
..	..	@@ -12491,7 +12680,7 @@
12491	12680	"MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
12492	12681
12493	12682	// Backlit
12494		- "MOV pos.w, zero123.y;" +
	12683	+ "MOV pos.w, zero12t.y;" + // one
12495	12684	"DP4 eye.x, pos, light2cam0;" +
12496	12685	"DP4 eye.y, pos, light2cam1;" +
12497	12686	"DP4 eye.z, pos, light2cam2;" +
..	..	@@ -12499,28 +12688,32 @@
12499	12688
12500	12689	"DP3 ndotl.y, -eye, normal;" +
12501	12690	//"MUL ndotl.y, ndotl.y, pow2.x;" +
12502		- "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
12503		- "SUB ndotl.y, zero123.y, ndotl.y;" +
	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
12504	12694	//"SUB ndotl.y, zero123.y, ndotl.y;" +
12505	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;" +
12506	12698
12507	12699	//"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
12508	12700	//"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
12509	12701
12510	12702	// Pigment
12511	12703	"TEX temp, fragment.texcoord[0], texture[0], 2D;" +
12512		- "LRP temp, zero123.w, temp, one;" + // texture proportion
12513		- "MUL temp, temp, ndotl.x;" +
12514		-
12515		- "MUL temp, temp, zero123.z;" +
	12704	+ "LRP temp, zero12t.w, temp, one;" + // texture proportion
	12705	+ "MUL temp, temp, zero12t.w;" + // Times x
12516	12706
12517	12707	//"MUL temp, temp, ndotl.y;" +
	12708	+ "MAD ndotl.x, pow_2.xxxx, ndotl.yyyy, ndotl.x;" +
12518	12709
12519		- "MOV temp.w, zero123.y;" + // reset alpha
	12710	+ "MUL temp, temp, ndotl.x;" + // lambert
	12711	+
	12712	+ "MOV temp.w, zero12t.y;" + // reset alpha
12520	12713	"MOV result.color, temp;" +
12521	12714	"END";
12522	12715
12523		- String program =
	12716	+ String programmax =
12524	12717	"!!ARBfp1.0\n" +
12525	12718
12526	12719	//"OPTION ARB_fragment_program_shadow;" +
..	..	@@ -12548,7 +12741,7 @@
12548	12741	"PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
12549	12742	"PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
12550	12743	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12551		- "PARAM params7 = program.env[7];" + // noise power, opacity power
	12744	+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
12552	12745	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
12553	12746	"PARAM options1 = program.env[62];" + // fog rgb color
12554	12747	"PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
..	..	@@ -12793,7 +12986,7 @@
12793	12986	"POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
12794	12987	// mar 2013 ??? "KIL alpha.a;" +
12795	12988	"MOV alpha, texSamp.aaaa;" + // y;" +
12796		- "KIL alpha.a;" +
	12989	+ "KIL alpha.a;" + // not sure with parallax mapping
12797	12990	/*
12798	12991	"MUL temp.xy, temp, two;" +
12799	12992	"TXB bump, temp, texture[0], 2D;" +
..	..	@@ -12879,11 +13072,6 @@
12879	13072	"SUB bump0, bump0, half;" +
12880	13073	"ADD bump, bump, bump0;" +
12881	13074
12882		- "MOV temp.x, texSamp.a;" +
12883		- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12884		- //"LRP texSamp0, params5.x, texSamp0, one;" +
12885		- "MOV texSamp.a, temp.x;" +
12886		-
12887	13075	// double-sided
12888	13076	/**/
12889	13077	(doublesided?"DP3 temp.z, normal, eye;" +
..	..	@@ -12893,26 +13081,73 @@
12893	13081	"ADD temp.x, temp.x, one.x;" +
12894	13082	"MUL normal, normal, temp.xxxx;":""
12895	13083	) +
12896		- /**/
12897		-//// Normalize("normal") +
12898		-//// "MAX normal.z, eps.x, normal.z;" +
12899		-// Normalize("normal") +
12900		- "MOV normald, normal;" +
12901		- "MOV normals, normal;" +
	13084	+ /**/
	13085	+
	13086	+ "MOV temp, fragment.texcoord[4];" +
12902	13087
12903	13088	// UV base
12904	13089	//"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
12905	13090	//"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
12906	13091	//"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
12907		- "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
12908		- "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
12909		- "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	+
12910	13097	"XPD V, normal, UP;" +
12911	13098	Normalize("V") +
12912	13099	"XPD U, V, normal;" +
12913	13100	Normalize("U") +
12914	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	+
12915	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;" +
12916	13151
12917	13152	//"MOV temp, fragment.texcoord[0];" +
12918	13153	//
..	..	@@ -13376,8 +13611,19 @@
13376	13611	//once = true;
13377	13612	}
13378	13613
13379		- System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13380		- 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	+
13381	13627	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13382	13628
13383	13629	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13424,7 +13670,8 @@
13424	13670	"\n" +
13425	13671	"END\n";
13426	13672
13427		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13673	+ if (Globals.DEBUG)
	13674	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13428	13675	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13429	13676
13430	13677	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13682,7 +13929,7 @@
13682	13929	/static/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
13683	13930	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13684	13931	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13685		- /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
13686	13933
13687	13934	//Object3D.cVector2[] vector2buffer;
13688	13935
..	..	@@ -13849,7 +14096,7 @@
13849	14096	"PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
13850	14097	"PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
13851	14098	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
13852		- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
	14099	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
13853	14100	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
13854	14101	"PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
13855	14102	//"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
..	..	@@ -13910,7 +14157,7 @@
13910	14157	"DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
13911	14158	"DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
13912	14159	"DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
13913		- //"MOV result.texcoord, vertex.texcoord;" +
	14160	+ //"MOV result.texcoord, vertex.fogcoord;" +
13914	14161	"MOV result.texcoord, temp;" +
13915	14162	// border fade
13916	14163	"MOV result.texcoord[3], vertex.texcoord;" +
..	..	@@ -13957,7 +14204,9 @@
13957	14204
13958	14205	//"ADD temp.z, temp.z, one;" +
13959	14206
13960		- "MOV result.color, temp;"
	14207	+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
	14208	+
	14209	+ "MOV result.color, temp;" // Normal
13961	14210	: "MOV result.color, vertex.color;") +
13962	14211	((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
13963	14212	: "") +
..	..	@@ -14092,10 +14341,13 @@
14092	14341	public void mouseClicked(MouseEvent e)
14093	14342	{
14094	14343	System.out.println("mouseClicked: " + e);
	14344	+ System.exit(0);
14095	14345	}
14096	14346
14097	14347	public void mousePressed(MouseEvent e)
14098	14348	{
	14349	+ RigidBody.justclicked = true;
	14350	+ System.out.println("justclicked: " + e);
14099	14351	//System.out.println("mousePressed: " + e);
14100	14352	clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
14101	14353	}
..	..	@@ -14130,10 +14382,12 @@
14130	14382	return;
14131	14383	}
14132	14384
14133		- 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;
14134	14388
14135	14389	// TIMER
14136		- if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	14390	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !vr) // VR
14137	14391	{
14138	14392	keepboxmode = BOXMODE;
14139	14393	keepsupport = SUPPORT;
..	..	@@ -14174,7 +14428,7 @@
14174	14428	//}
14175	14429
14176	14430	SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
14177		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
	14431	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, e.getModifiers(), e.getModifiersEx());
14178	14432	anchorX = ax;
14179	14433	anchorY = ay;
14180	14434	prevX = px;
..	..	@@ -14269,8 +14523,9 @@
14269	14523	// fev 2014???
14270	14524	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
14271	14525	object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
14272		- pingthread.StepToTarget(true); // true);
	14526	+ pingthread.StepToTarget(); // true);
14273	14527	}
	14528	+
14274	14529	// if (!LIVE)
14275	14530	super.repaint();
14276	14531	}
..	..	@@ -14365,8 +14620,8 @@
14365	14620
14366	14621	//if (drawing)
14367	14622	//return;
14368		- if ((e.getModifiersEx() & CTRL) != 0
14369		- \|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
	14623	+ if ((e.getModifiersEx() & CTRL) != 0 \|\|
	14624	+ (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
14370	14625	{
14371	14626	//System.out.println("mouseDragged: " + e);
14372	14627	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
..	..	@@ -14390,9 +14645,17 @@
14390	14645	return targetLookAt;
14391	14646	}
14392	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	+
14393	14653	class PingThread extends Thread
14394	14654	{
14395	14655	boolean jump;
	14656	+ boolean live;
	14657	+
	14658	+ boolean mute;
14396	14659
14397	14660	// void JumpToTarget()
14398	14661	// {
..	..	@@ -14408,6 +14671,88 @@
14408	14671	// only one thread!? synchronized
14409	14672	void StepToTarget(boolean jump)
14410	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	+
14411	14756	tmp.set(targetLookAt);
14412	14757	tmp.sub(manipCamera.lookAt); // june 2014
14413	14758
..	..	@@ -14445,7 +14790,7 @@
14445	14790
14446	14791	if (tmp.dot(tmp) > 1) // may 2014. far away: jump to target
14447	14792	{
14448		- jump = true; // step = 1;
	14793	+ // sep 2019 jump = true; // step = 1;
14449	14794	}
14450	14795
14451	14796	if (OEILONCE && OEIL)
..	..	@@ -14480,7 +14825,10 @@
14480	14825	if (tmp.dot(tmp) < 0.00001)
14481	14826	{
14482	14827	zoomonce = false;
	14828	+ live = false;
14483	14829	}
	14830	+ else
	14831	+ live = true;
14484	14832
14485	14833	tmp.mul(step > step2 ? step : step2);
14486	14834	}
..	..	@@ -14507,7 +14855,7 @@
14507	14855	{
14508	14856	if (LOOKAT)
14509	14857	manipCamera.lookAt.add(tmp);
14510		- if (OEIL)
	14858	+ if (OEIL && !capsLocked)
14511	14859	manipCamera.location.add(tmp);
14512	14860
14513	14861	{
..	..	@@ -14522,7 +14870,10 @@
14522	14870	lightCamera.computeTransform();
14523	14871	}
14524	14872	}
14525		- manipCamera.computeTransform();
	14873	+ if (tmp.x != 0 \|\| tmp.y != 0 \|\| tmp.z != 0)
	14874	+ {
	14875	+ manipCamera.computeTransform();
	14876	+ }
14526	14877	}
14527	14878	// ?????? mouseDown = true;
14528	14879	//System.out.println("---------------- ---------- Paint " + tmp.length2());
..	..	@@ -14615,49 +14966,107 @@
14615	14966	}
14616	14967	}
14617	14968	}
	14969	+
14618	14970	PingThread pingthread = new PingThread();
14619		- int delta = 5;
14620		- int speed = 5;
	14971	+ int delta = 1;
	14972	+ int speed = 1;
	14973	+ int walk = 8;
14621	14974	boolean autorepeat = false;
14622	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	+
14623	14995	void GoDown(int mod)
14624	14996	{
14625	14997	MODIFIERS \|= COMMAND;
	14998	+ boolean isVR = (mouseMode&VR)!=0;
14626	14999	/**/
14627	15000	if((mod&SHIFT) == SHIFT)
14628		- manipCamera.RotatePosition(0, -speed);
14629		- else
14630		- manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14631		- /**/
14632		- if ((mod & SHIFT) == SHIFT)
14633	15001	{
14634		- mouseMode = mouseMode; // VR??
14635		- } else
14636		- {
14637		- 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());
14638	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	+// }
14639	15026
	15027	+ targetLookAt.set(manipCamera.lookAt);
	15028	+
14640	15029	//prevX = X = anchorX;
14641	15030	prevY = Y = anchorY - (int) (renderCamera.Distance());
14642	15031	}
14643	15032
14644	15033	void GoUp(int mod)
14645	15034	{
	15035	+ RigidBody.justclicked = true;
	15036	+
14646	15037	MODIFIERS \|= COMMAND;
14647	15038	/**/
	15039	+ boolean isVR = (mouseMode&VR)!=0;
	15040	+
14648	15041	if((mod&SHIFT) == SHIFT)
14649		- manipCamera.RotatePosition(0, speed);
14650		- else
14651		- manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14652		- /**/
14653		- if ((mod & SHIFT) == SHIFT)
14654	15042	{
14655		- mouseMode = mouseMode;
14656		- } else
14657		- {
14658		- 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());
14659	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	+// }
14660	15067
	15068	+ targetLookAt.set(manipCamera.lookAt);
	15069	+
14661	15070	//prevX = X = anchorX;
14662	15071	prevY = Y = anchorY + (int) (renderCamera.Distance());
14663	15072	}
..	..	@@ -14667,18 +15076,29 @@
14667	15076	MODIFIERS \|= COMMAND;
14668	15077	/**/
14669	15078	if((mod&SHIFT) == SHIFT)
14670		- manipCamera.Translate(speed*delta, 0, getWidth());
	15079	+ manipCamera.Translate(speed, 0, getWidth());
14671	15080	else
14672		- 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	+
14673	15088	/**/
14674		- if ((mod & SHIFT) == SHIFT)
14675		- {
14676		- mouseMode = mouseMode;
14677		- } else
14678		- {
14679		- mouseMode \|= ROTATE;
14680		- } // TRANSLATE;
	15089	+// if ((mod & SHIFT) == SHIFT)
	15090	+// {
	15091	+// mouseMode = mouseMode;
	15092	+// } else
	15093	+// {
	15094	+// mouseMode \|= ROTATE;
	15095	+// } // TRANSLATE;
14681	15096
	15097	+ //System.err.println("lookAt = " + manipCamera.lookAt);
	15098	+ //System.err.println("location = " + manipCamera.location);
	15099	+
	15100	+ targetLookAt.set(manipCamera.lookAt);
	15101	+
14682	15102	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
14683	15103	prevY = Y = anchorY;
14684	15104	}
..	..	@@ -14688,18 +15108,26 @@
14688	15108	MODIFIERS \|= COMMAND;
14689	15109	/**/
14690	15110	if((mod&SHIFT) == SHIFT)
14691		- manipCamera.Translate(-speed*delta, 0, getWidth());
	15111	+ manipCamera.Translate(-speed, 0, getWidth());
14692	15112	else
14693		- 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	+
14694	15120	/**/
14695		- if ((mod & SHIFT) == SHIFT)
14696		- {
14697		- mouseMode = mouseMode;
14698		- } else
14699		- {
14700		- mouseMode \|= ROTATE;
14701		- } // TRANSLATE;
	15121	+// if ((mod & SHIFT) == SHIFT)
	15122	+// {
	15123	+// mouseMode = mouseMode;
	15124	+// } else
	15125	+// {
	15126	+// mouseMode \|= ROTATE;
	15127	+// } // TRANSLATE;
14702	15128
	15129	+ targetLookAt.set(manipCamera.lookAt);
	15130	+
14703	15131	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
14704	15132	prevY = Y = anchorY;
14705	15133	}
..	..	@@ -14833,6 +15261,11 @@
14833	15261	if ((mouseMode & ZOOM) != 0)
14834	15262	{
14835	15263	//if ((mouseMode & BACKFORTH) != 0)
	15264	+ if ((modifiersex & SHIFT) == SHIFT)
	15265	+ {
	15266	+ ViewAngle(dy);
	15267	+ }
	15268	+ else
14836	15269	if ((mouseMode & VR) != 0)
14837	15270	manipCamera.BackForth(dx, dy, getWidth());
14838	15271	else
..	..	@@ -14903,6 +15336,9 @@
14903	15336
14904	15337	public void mouseMoved(MouseEvent e)
14905	15338	{
	15339	+//object.editWindow.frame.
	15340	+ setCursor(Cursor.getDefaultCursor());
	15341	+
14906	15342	//System.out.println("mouseMoved: " + e);
14907	15343	if (isRenderer)
14908	15344	return;
..	..	@@ -15087,8 +15523,10 @@
15087	15523	mouseMode \|= ZOOM;
15088	15524	}
15089	15525
15090		- boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
15091		- 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)
15092	15530	{
15093	15531	mouseMode \|= VR; // BACKFORTH;
15094	15532	}
..	..	@@ -15100,7 +15538,8 @@
15100	15538	{
15101	15539	mouseMode \|= SELECT;
15102	15540	}
15103		- if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
	15541	+ if (//(modifiersex & SHIFT) == SHIFT \|\|
	15542	+ forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
15104	15543	{
15105	15544	mouseMode &= ~VR;
15106	15545	mouseMode \|= TRANSLATE;
..	..	@@ -15144,8 +15583,18 @@
15144	15583	float SATPOW = 1; // 2; // 0.5f;
15145	15584	float BRIPOW = 1; // 0.5f; // 0.5f;
15146	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	+
15147	15592	public void keyPressed(int key)
15148	15593	{
	15594	+// Set the blank cursor to the JFrame.
	15595	+//object.editWindow.frame.
	15596	+ setCursor(blankCursor);
	15597	+
15149	15598	if (key >= '0' && key <= '5')
15150	15599	clampbit = (key-'0');
15151	15600
..	..	@@ -15202,8 +15651,8 @@
15202	15651	case 'K':
15203	15652	KOMPACTTEXTURE ^= true;
15204	15653	//textures.clear();
15205		- break;
15206		- case 'P': // Texture Projection macros
	15654	+ // break;
	15655	+ //case 'P': // Texture Projection macros
15207	15656	// SAVETEXTURE ^= true;
15208	15657	macromode = true;
15209	15658	Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
..	..	@@ -15304,8 +15753,8 @@
15304	15753	RevertCamera();
15305	15754	repaint();
15306	15755	break;
15307		- case 'l':
15308		- //case 'L':
	15756	+ //case 'l':
	15757	+ case 'L':
15309	15758	if (lightMode)
15310	15759	{
15311	15760	lightMode = false;
..	..	@@ -15324,7 +15773,7 @@
15324	15773	targetLookAt.set(manipCamera.lookAt);
15325	15774	repaint();
15326	15775	break;
15327		- case 'p':
	15776	+ case 'P': // p':
15328	15777	// c'est quoi ca au juste? spherical ^= true;
15329	15778	Skinshader ^= true; programInitialized = false;
15330	15779	repaint();
..	..	@@ -15335,7 +15784,8 @@
15335	15784	break;
15336	15785	case 'm':
15337	15786	{
15338		- PrintMemory();
	15787	+ //PrintMemory();
	15788	+ ToggleImageFlip();
15339	15789	break;
15340	15790	}
15341	15791	case 'M':
..	..	@@ -15362,9 +15812,9 @@
15362	15812	repaint();
15363	15813	break;
15364	15814	case 'O':
15365		- Globals.drawMode = OCCLUSION; // WARNING
15366		- repaint();
15367		- break;
	15815	+ // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
	15816	+ //repaint();
	15817	+ //break;
15368	15818	case 'o':
15369	15819	OCCLUSION_CULLING ^= true;
15370	15820	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
..	..	@@ -15456,7 +15906,21 @@
15456	15906	// kompactbit = 6;
15457	15907	// break;
15458	15908	case ' ':
	15909	+ capsLocked ^= true;
	15910	+ repaint();
	15911	+ break;
	15912	+ case 'l':
15459	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	+
15460	15924	Globals.lighttouched = true;
15461	15925	manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
15462	15926	targetLookAt.set(manipCamera.lookAt);
..	..	@@ -15464,6 +15928,10 @@
15464	15928	break;
15465	15929	//case '`' :
15466	15930	case ESC:
	15931	+ if (FULLSCREEN)
	15932	+ object.editWindow.ToggleFullScreen();
	15933	+ break;
	15934	+ case 'p':
15467	15935	RENDERPROGRAM += 1;
15468	15936	RENDERPROGRAM %= 3;
15469	15937
..	..	@@ -15502,6 +15970,10 @@
15502	15970	case ENTER:
15503	15971	// object.editWindow.ScreenFit(); // Edit();
15504	15972	ToggleLive();
	15973	+ if (capsLocked)
	15974	+ {
	15975	+ Globals.WALK ^= true;
	15976	+ }
15505	15977	break;
15506	15978	case DELETE:
15507	15979	ClearSelection();
..	..	@@ -15538,17 +16010,23 @@
15538	16010	object.GetWindow().refreshContents(true);
15539	16011	break;
15540	16012	case '{':
15541		- manipCamera.shaper_fovy /= 1.1;
	16013	+ double factor = 1.1;
	16014	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16015	+ manipCamera.shaper_fovy /= factor;
15542	16016	System.out.println("FOV = " + manipCamera.shaper_fovy);
15543	16017	repaint();
15544	16018	break;
15545	16019	case '}':
15546		- manipCamera.shaper_fovy *= 1.1;
	16020	+ factor = 1.1;
	16021	+ if (manipCamera.shaper_fovy * factor < 150)
	16022	+ manipCamera.shaper_fovy *= factor;
15547	16023	System.out.println("FOV = " + manipCamera.shaper_fovy);
15548	16024	repaint();
15549	16025	break;
15550	16026	case '[':
15551		- manipCamera.shaper_fovy /= 1.01;
	16027	+ factor = 1.01;
	16028	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16029	+ manipCamera.shaper_fovy /= factor;
15552	16030	if (false) //manipCamera.hAspect == 0)
15553	16031	{
15554	16032	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -15564,7 +16042,9 @@
15564	16042	break;
15565	16043	case ']':
15566	16044	//manipCamera.shaper_fovy += (180 - manipCamera.shaper_fovy)*0.1;
15567		- manipCamera.shaper_fovy *= 1.01;
	16045	+ factor = 1.01;
	16046	+ if (manipCamera.shaper_fovy * factor < 150)
	16047	+ manipCamera.shaper_fovy *= factor;
15568	16048	if (false) //manipCamera.hAspect == 0)
15569	16049	{
15570	16050	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -15602,98 +16082,113 @@
15602	16082	}
15603	16083	}
15604	16084
	16085	+ boolean keys[] = new boolean[256];
	16086	+ int speedkey[] = new int[256];
	16087	+ int modifiers = 0;
	16088	+
15605	16089	public void processKeyEvent(KeyEvent e)
15606	16090	{
15607	16091	switch (e.getID())
15608	16092	{
15609	16093	case KeyEvent.KEY_PRESSED:
15610		- if (!autorepeat)
15611		- {
15612		- //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
15613		- keyPressed(e.getKeyChar(), e.getModifiersEx());
15614		- }
15615		- if (manipCamera == lightCamera)
15616		- {
15617		- switch (e.getKeyCode())
15618		- {
15619		- case DOWN_ARROW:
15620		- lightCamera.DECAL /= 2;
15621		- repaint();
15622		- break;
15623		- case UP_ARROW:
15624		- lightCamera.DECAL *= 2;
15625		- repaint();
15626		- break;
15627		- case LEFT_ARROW:
15628		- lightCamera.SCALE /= 2;
15629		- repaint();
15630		- break;
15631		- case RIGHT_ARROW:
15632		- lightCamera.SCALE *= 2;
15633		- repaint();
15634		- break;
15635		- default:
15636		- break;
15637		- }
15638		-
15639		- System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
15640		- } else
15641		- {
15642		- if (true) // !autorepeat)
15643		- {
15644		- boolean reset = true;
15645		-
15646		- switch (e.getKeyCode())
15647		- {
15648		- case DOWN_ARROW:
15649		- GoDown(e.getModifiersEx());
15650		- repaint();
15651		- break;
15652		- case UP_ARROW:
15653		- GoUp(e.getModifiersEx());
15654		- repaint();
15655		- break;
15656		- case LEFT_ARROW:
15657		- GoLeft(e.getModifiersEx());
15658		- repaint();
15659		- break;
15660		- case RIGHT_ARROW:
15661		- GoRight(e.getModifiersEx());
15662		- repaint();
15663		- break;
15664		- default:
15665		- reset = false;
15666		- break;
15667		- }
15668		-
15669		- if (reset)
15670		- {
15671		- autorepeat = true;
15672		-
15673		- targetLookAt.set(manipCamera.lookAt);
15674		- }
15675		- }
15676		- }
	16094	+ keys[e.getKeyCode()] = true;
	16095	+ modifiers = e.getModifiersEx();
	16096	+ keyPressed(e.getKeyChar(), modifiers);
	16097	+ //Globals.theRenderer.keyPressed(e.getKeyChar());
	16098	+ repaint();
15677	16099	break;
15678		- case KeyEvent.KEY_TYPED:
15679		- 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;
15680	16170	case KeyEvent.KEY_RELEASED:
15681		- {
15682		- switch (e.getKeyCode())
15683		- {
15684		- case DOWN_ARROW:
15685		- case UP_ARROW:
15686		- case LEFT_ARROW:
15687		- case RIGHT_ARROW:
15688		- MODIFIERS &= ~COMMAND;
15689		- autorepeat = false;
15690		- break;
15691		- default:
15692		- break;
15693		- }
	16171	+ keys[e.getKeyCode()] = false;
	16172	+ modifiers = e.getModifiersEx();
15694	16173	keyReleased(e.getKeyChar(), e.getModifiersEx());
	16174	+ repaint();
15695	16175	break;
15696		- }
	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	+// }
15697	16192	default:
15698	16193	break;
15699	16194	}
..	..	@@ -16084,7 +16579,7 @@
16084	16579	{
16085	16580	switch (hitSomething)
16086	16581	{
16087		- case Object3D.hitCenter: gr.setColor(Color.pink);
	16582	+ case Object3D.hitCenter: gr.setColor(Color.white);
16088	16583	gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
16089	16584	break;
16090	16585	case Object3D.hitRotate: gr.setColor(Color.yellow);
..	..	@@ -16110,7 +16605,7 @@
16110	16605	if (hasMarquee)
16111	16606	{
16112	16607	gr.setXORMode(Color.white);
16113		- gr.setColor(Color.red);
	16608	+ gr.setColor(Color.white);
16114	16609	if (!firstime)
16115	16610	{
16116	16611	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -16269,7 +16764,8 @@
16269	16764
16270	16765	public boolean mouseDrag(Event evt, int x, int y)
16271	16766	{
16272		- //System.out.println("mouseDrag: " + evt);
	16767	+ System.out.println("mouseDrag: " + evt);
	16768	+ System.exit(0);
16273	16769	/*
16274	16770	drag = true;
16275	16771	//System.out.println("Mouse DRAG");
..	..	@@ -16388,6 +16884,7 @@
16388	16884	public boolean mouseUp(Event evt, int x, int y)
16389	16885	{
16390	16886	System.out.println("mouseUp: " + evt);
	16887	+ System.exit(0);
16391	16888	/*
16392	16889	locked = false;
16393	16890	if (isRenderer)
..	..	@@ -16650,6 +17147,7 @@
16650	17147	private void DrawSkyBox(GL gl, float ratio)
16651	17148	{
16652	17149	if (//envyoff \|\|
	17150	+ WIREFRAME \|\|
16653	17151	cubemap == null)
16654	17152	{
16655	17153	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
..	..	@@ -16667,14 +17165,14 @@
16667	17165	gl.glLoadIdentity();
16668	17166	gl.glScalef(1,ratio,1);
16669	17167
16670		- colorV[0] = 2;
16671		- colorV[1] = 2;
16672		- colorV[2] = 2;
16673		- colorV[3] = 1;
16674		- gl.glDisable(gl.GL_COLOR_MATERIAL);
16675		- gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
16676		-
16677		- gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	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);
16678	17176
16679	17177	//gl.glActiveTexture(GL.GL_TEXTURE1);
16680	17178	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
..	..	@@ -16688,7 +17186,7 @@
16688	17186	// GL_NORMAL_MAP texgen mode. Temporarily enabling lighting
16689	17187	// causes the normals to be sent down. Thanks to Ken Dyke.
16690	17188	//gl.glEnable(GL.GL_LIGHTING);
16691		- gl.glEnable(GL.GL_LIGHTING);
	17189	+ gl.glDisable(GL.GL_LIGHTING);
16692	17190
16693	17191	gl.glTexGeni(GL.GL_S, GL.GL_TEXTURE_GEN_MODE, GL.GL_NORMAL_MAP);
16694	17192	gl.glTexGeni(GL.GL_T, GL.GL_TEXTURE_GEN_MODE, GL.GL_NORMAL_MAP);
..	..	@@ -16748,7 +17246,8 @@
16748	17246	gl.glDisable(GL.GL_TEXTURE_GEN_R);
16749	17247
16750	17248	cubemap.disable();
16751		- ////cubemap.unbind();
	17249	+ //cubemap.dispose();
	17250	+
16752	17251	if (CULLFACE)
16753	17252	{
16754	17253	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -16804,7 +17303,7 @@
16804	17303	gl.glScalef(1.0f, -1.0f, 1.0f);
16805	17304	}
16806	17305
16807		- gl.glNormal3f(0.0f, 0.0f, 1.0f);
	17306	+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
16808	17307
16809	17308	float step = 2; // 0.1666f; //0.25f;
16810	17309	float stepv = 2; // step * 1652 / 998;
..	..	@@ -17093,7 +17592,7 @@
17093	17592
17094	17593	float depth = depths[y * TEX_SIZE + x];
17095	17594
17096		- if (pointselection && mouseMode == SELECT && depth != 0 && depth != 1)
	17595	+ if (pointselection && (mouseMode & SELECT) == SELECT && depth != 0 && depth != 1)
17097	17596	{
17098	17597	pointselection = false;
17099	17598
..	..	@@ -17284,6 +17783,7 @@
17284	17783
17285	17784	public void init(GLAutoDrawable drawable)
17286	17785	{
	17786	+ if (Globals.DEBUG)
17287	17787	System.out.println("shadow buffer init");
17288	17788
17289	17789	GL gl = drawable.getGL();
..	..	@@ -17512,10 +18012,14 @@
17512	18012	gl.glFlush();
17513	18013
17514	18014	/**/
17515		- 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);
17516	18016
17517		- float[] pixels = occlusionsizebuffer.array();
	18017	+ float[] depths = occlusiondepthbuffer.array();
17518	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	+
17519	18023	double r = 0, g = 0, b = 0;
17520	18024
17521	18025	double count = 0;
..	..	@@ -17526,7 +18030,7 @@
17526	18030
17527	18031	double FACTOR = 1;
17528	18032
17529		- for (int i = 0; i < pixels.length; i++)
	18033	+ for (int i = 0; i < depths.length; i++)
17530	18034	{
17531	18035	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
17532	18036	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -17609,7 +18113,7 @@
17609	18113
17610	18114	double scale = ray.z; // 1; // cos
17611	18115
17612		- float depth = pixels[newindex];
	18116	+ float depth = depths[newindex];
17613	18117
17614	18118	/*
17615	18119	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -17752,6 +18256,11 @@
17752	18256	static boolean DEBUG_SELECTION = false;
17753	18257	boolean OCCLUSION_CULLING = false; //true;
17754	18258	public boolean lightMode = false;
	18259	+
	18260	+ private boolean keepshadow;
	18261	+
	18262	+ static public boolean capsLocked = false; // VR
	18263	+
17755	18264	static public int indexcount = 0;
17756	18265	/static/ cColor vertexOcclusion = new cColor();
17757	18266	//private int selection_view = -1;
..	..	@@ -17806,11 +18315,14 @@
17806	18315	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17807	18316	static IntBuffer bigAAbuffer;
17808	18317	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17809		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	18318	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17810	18319	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17811	18320	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17812	18321	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17813		- 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	+
17814	18326	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17815	18327	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17816	18328	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();