~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
..	..	@@ -9316,10 +9349,9 @@
9316	9349	double[] light2camera = new double[16];
9317	9350
9318	9351	//int newenvy = -1;
9319		- boolean envyoff = true; // false;
9320		- String skyboxname = "";
9321		- String skyboxext;
9322		- String loadedskyboxname = "";
	9352	+ //boolean envyoff = false;
	9353	+
	9354	+ String loadedskyboxname;
9323	9355
9324	9356	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
9325	9357	//float[] light0 = { 0,0,0 };
..	..	@@ -9808,7 +9840,10 @@
9808	9840	DrawSkyBox(gl, (float)rati);
9809	9841	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9810	9842	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9811		- accPerspective(gl, renderCamera.shaper_fovy / ratio,
	9843	+
	9844	+ boolean vr = capsLocked && !lightMode;
	9845	+
	9846	+ accPerspective(gl, renderCamera.shaper_fovy / ratio * (vr ? 1.2 : 1),
9812	9847	ratio,
9813	9848	//near_plane, far_plane,
9814	9849	renderCamera.shaper_zNear * renderCamera.Distance(), renderCamera.shaper_zFar * renderCamera.Distance(),
..	..	@@ -10671,9 +10706,18 @@
10671	10706	static boolean init = false;
10672	10707
10673	10708	double[][] matrix = LA.newMatrix();
	10709	+
	10710	+ // This is to refresh the UI of the material panel.
	10711	+ ObjEditor patchMaterial;
10674	10712
10675	10713	public void display(GLAutoDrawable drawable)
10676	10714	{
	10715	+ if (patchMaterial.patchMaterial)
	10716	+ {
	10717	+ patchMaterial.patchMaterial = false;
	10718	+ patchMaterial.objectTabbedPane.setSelectedIndex(1);
	10719	+ }
	10720	+
10677	10721	if (Grafreed.savesound && Grafreed.hassound)
10678	10722	{
10679	10723	Grafreed.wav.save();
..	..	@@ -10769,6 +10813,112 @@
10769	10813
10770	10814	if (DrawMode() == DEFAULT)
10771	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	+
10772	10922	currentlydrawing = true;
10773	10923	}
10774	10924
..	..	@@ -10842,7 +10992,7 @@
10842	10992
10843	10993	if (wait)
10844	10994	{
10845		- Sleep(500);
	10995	+ Sleep(200); // blocks everything
10846	10996
10847	10997	wait = false;
10848	10998	}
..	..	@@ -11065,10 +11215,34 @@
11065	11215	//
11066	11216	// newenvy = -1;
11067	11217
11068		- if (!skyboxname.equals(this.loadedskyboxname))
	11218	+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
11069	11219	{
11070		- LoadSkybox(skyboxname + "/", skyboxext, false);
11071		- loadedskyboxname = skyboxname;
	11220	+ if (cubemaprgb == null)
	11221	+ {
	11222	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
	11223	+ }
	11224	+
	11225	+ cubemap = cubemaprgb;
	11226	+ }
	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;
11072	11246	}
11073	11247
11074	11248	ratio = ((double) getWidth()) / getHeight();
..	..	@@ -11269,9 +11443,9 @@
11269	11443
11270	11444	gl.glMatrixMode(GL.GL_MODELVIEW);
11271	11445
11272		-gl.glEnable(gl.GL_POLYGON_SMOOTH);
11273		-gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
11274		-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);
11275	11449	} else
11276	11450	{
11277	11451	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -11332,7 +11506,10 @@
11332	11506	//gl.glOrtho(-BOOST, BOOST, -BOOST, BOOST, 0.001, 1000);
11333	11507	} else
11334	11508	{
11335		- 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());
11336	11513	}
11337	11514	}
11338	11515
..	..	@@ -11372,7 +11549,7 @@
11372	11549
11373	11550	// if (cam != lightCamera)
11374	11551	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11375		- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
	11552	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
11376	11553	}
11377	11554
11378	11555	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -11688,8 +11865,11 @@
11688	11865	repaint();
11689	11866	}
11690	11867
11691		- if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
	11868	+ if (Globals.isLIVE() && DrawMode() == DEFAULT \|\| pingthread.live) // may 2013
	11869	+ {
	11870	+ renderCamera.computeTransform();
11692	11871	repaint();
	11872	+ }
11693	11873
11694	11874	displaydone = true;
11695	11875	}
..	..	@@ -11764,9 +11944,23 @@
11764	11944	//GL gl = getGL();
11765	11945	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11766	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	+ }
11767	11961	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11768	11962	object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11769		- pingthread.StepToTarget(true); // true);
	11963	+ pingthread.StepToTarget(); // true);
11770	11964	// zoomonce = false;
11771	11965	}
11772	11966
..	..	@@ -12446,11 +12640,12 @@
12446	12640
12447	12641	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12448	12642
12449		- String program0 =
	12643	+ String programmin =
12450	12644	// Min shader
12451	12645	"!!ARBfp1.0\n" +
12452		- "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
12453		- "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 };" +
12454	12649	"PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
12455	12650	"PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
12456	12651	"PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
..	..	@@ -12465,10 +12660,11 @@
12465	12660	"TEMP eye;" +
12466	12661	"TEMP pos;" +
12467	12662
12468		- "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12663	+ "MAD normal, fragment.color, zero12t.z, -zero12t.y;" +
12469	12664	Normalize("normal") +
12470	12665	"MOV light, state.light[0].position;" +
12471	12666	"DP3 ndotl.x, light, normal;" +
	12667	+ "MAX ndotl.x, ndotl.x, zero12t.x;" +
12472	12668
12473	12669	// shadow
12474	12670	"MOV pos, fragment.texcoord[1];" +
..	..	@@ -12484,7 +12680,7 @@
12484	12680	"MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
12485	12681
12486	12682	// Backlit
12487		- "MOV pos.w, zero123.y;" +
	12683	+ "MOV pos.w, zero12t.y;" + // one
12488	12684	"DP4 eye.x, pos, light2cam0;" +
12489	12685	"DP4 eye.y, pos, light2cam1;" +
12490	12686	"DP4 eye.z, pos, light2cam2;" +
..	..	@@ -12492,28 +12688,32 @@
12492	12688
12493	12689	"DP3 ndotl.y, -eye, normal;" +
12494	12690	//"MUL ndotl.y, ndotl.y, pow2.x;" +
12495		- "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
12496		- "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
12497	12694	//"SUB ndotl.y, zero123.y, ndotl.y;" +
12498	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;" +
12499	12698
12500	12699	//"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
12501	12700	//"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
12502	12701
12503	12702	// Pigment
12504	12703	"TEX temp, fragment.texcoord[0], texture[0], 2D;" +
12505		- "LRP temp, zero123.w, temp, one;" + // texture proportion
12506		- "MUL temp, temp, ndotl.x;" +
12507		-
12508		- "MUL temp, temp, zero123.z;" +
	12704	+ "LRP temp, zero12t.w, temp, one;" + // texture proportion
	12705	+ "MUL temp, temp, zero12t.w;" + // Times x
12509	12706
12510	12707	//"MUL temp, temp, ndotl.y;" +
	12708	+ "MAD ndotl.x, pow_2.xxxx, ndotl.yyyy, ndotl.x;" +
12511	12709
12512		- "MOV temp.w, zero123.y;" + // reset alpha
	12710	+ "MUL temp, temp, ndotl.x;" + // lambert
	12711	+
	12712	+ "MOV temp.w, zero12t.y;" + // reset alpha
12513	12713	"MOV result.color, temp;" +
12514	12714	"END";
12515	12715
12516		- String program =
	12716	+ String programmax =
12517	12717	"!!ARBfp1.0\n" +
12518	12718
12519	12719	//"OPTION ARB_fragment_program_shadow;" +
..	..	@@ -12541,7 +12741,7 @@
12541	12741	"PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
12542	12742	"PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
12543	12743	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12544		- "PARAM params7 = program.env[7];" + // noise power, opacity power
	12744	+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
12545	12745	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
12546	12746	"PARAM options1 = program.env[62];" + // fog rgb color
12547	12747	"PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
..	..	@@ -12786,7 +12986,7 @@
12786	12986	"POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
12787	12987	// mar 2013 ??? "KIL alpha.a;" +
12788	12988	"MOV alpha, texSamp.aaaa;" + // y;" +
12789		- "KIL alpha.a;" +
	12989	+ "KIL alpha.a;" + // not sure with parallax mapping
12790	12990	/*
12791	12991	"MUL temp.xy, temp, two;" +
12792	12992	"TXB bump, temp, texture[0], 2D;" +
..	..	@@ -12872,11 +13072,6 @@
12872	13072	"SUB bump0, bump0, half;" +
12873	13073	"ADD bump, bump, bump0;" +
12874	13074
12875		- "MOV temp.x, texSamp.a;" +
12876		- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12877		- //"LRP texSamp0, params5.x, texSamp0, one;" +
12878		- "MOV texSamp.a, temp.x;" +
12879		-
12880	13075	// double-sided
12881	13076	/**/
12882	13077	(doublesided?"DP3 temp.z, normal, eye;" +
..	..	@@ -12886,26 +13081,73 @@
12886	13081	"ADD temp.x, temp.x, one.x;" +
12887	13082	"MUL normal, normal, temp.xxxx;":""
12888	13083	) +
12889		- /**/
12890		-//// Normalize("normal") +
12891		-//// "MAX normal.z, eps.x, normal.z;" +
12892		-// Normalize("normal") +
12893		- "MOV normald, normal;" +
12894		- "MOV normals, normal;" +
	13084	+ /**/
	13085	+
	13086	+ "MOV temp, fragment.texcoord[4];" +
12895	13087
12896	13088	// UV base
12897	13089	//"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
12898	13090	//"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
12899	13091	//"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
12900		- "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
12901		- "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
12902		- "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	+
12903	13097	"XPD V, normal, UP;" +
12904	13098	Normalize("V") +
12905	13099	"XPD U, V, normal;" +
12906	13100	Normalize("U") +
12907	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	+
12908	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;" +
12909	13151
12910	13152	//"MOV temp, fragment.texcoord[0];" +
12911	13153	//
..	..	@@ -13369,8 +13611,19 @@
13369	13611	//once = true;
13370	13612	}
13371	13613
13372		- System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13373		- 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	+
13374	13627	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13375	13628
13376	13629	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13417,7 +13670,8 @@
13417	13670	"\n" +
13418	13671	"END\n";
13419	13672
13420		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13673	+ if (Globals.DEBUG)
	13674	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13421	13675	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13422	13676
13423	13677	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13675,7 +13929,7 @@
13675	13929	/static/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
13676	13930	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13677	13931	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13678		- /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
13679	13933
13680	13934	//Object3D.cVector2[] vector2buffer;
13681	13935
..	..	@@ -13842,7 +14096,7 @@
13842	14096	"PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
13843	14097	"PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
13844	14098	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
13845		- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
	14099	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
13846	14100	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
13847	14101	"PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
13848	14102	//"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
..	..	@@ -13903,7 +14157,7 @@
13903	14157	"DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
13904	14158	"DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
13905	14159	"DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
13906		- //"MOV result.texcoord, vertex.texcoord;" +
	14160	+ //"MOV result.texcoord, vertex.fogcoord;" +
13907	14161	"MOV result.texcoord, temp;" +
13908	14162	// border fade
13909	14163	"MOV result.texcoord[3], vertex.texcoord;" +
..	..	@@ -13950,7 +14204,9 @@
13950	14204
13951	14205	//"ADD temp.z, temp.z, one;" +
13952	14206
13953		- "MOV result.color, temp;"
	14207	+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
	14208	+
	14209	+ "MOV result.color, temp;" // Normal
13954	14210	: "MOV result.color, vertex.color;") +
13955	14211	((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
13956	14212	: "") +
..	..	@@ -14085,10 +14341,13 @@
14085	14341	public void mouseClicked(MouseEvent e)
14086	14342	{
14087	14343	System.out.println("mouseClicked: " + e);
	14344	+ System.exit(0);
14088	14345	}
14089	14346
14090	14347	public void mousePressed(MouseEvent e)
14091	14348	{
	14349	+ RigidBody.justclicked = true;
	14350	+ System.out.println("justclicked: " + e);
14092	14351	//System.out.println("mousePressed: " + e);
14093	14352	clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
14094	14353	}
..	..	@@ -14123,10 +14382,12 @@
14123	14382	return;
14124	14383	}
14125	14384
14126		- 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;
14127	14388
14128	14389	// TIMER
14129		- if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	14390	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !vr) // VR
14130	14391	{
14131	14392	keepboxmode = BOXMODE;
14132	14393	keepsupport = SUPPORT;
..	..	@@ -14167,7 +14428,7 @@
14167	14428	//}
14168	14429
14169	14430	SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
14170		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
	14431	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, e.getModifiers(), e.getModifiersEx());
14171	14432	anchorX = ax;
14172	14433	anchorY = ay;
14173	14434	prevX = px;
..	..	@@ -14262,8 +14523,9 @@
14262	14523	// fev 2014???
14263	14524	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
14264	14525	object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
14265		- pingthread.StepToTarget(true); // true);
	14526	+ pingthread.StepToTarget(); // true);
14266	14527	}
	14528	+
14267	14529	// if (!LIVE)
14268	14530	super.repaint();
14269	14531	}
..	..	@@ -14358,8 +14620,8 @@
14358	14620
14359	14621	//if (drawing)
14360	14622	//return;
14361		- if ((e.getModifiersEx() & CTRL) != 0
14362		- \|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
	14623	+ if ((e.getModifiersEx() & CTRL) != 0 \|\|
	14624	+ (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
14363	14625	{
14364	14626	//System.out.println("mouseDragged: " + e);
14365	14627	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
..	..	@@ -14383,9 +14645,17 @@
14383	14645	return targetLookAt;
14384	14646	}
14385	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	+
14386	14653	class PingThread extends Thread
14387	14654	{
14388	14655	boolean jump;
	14656	+ boolean live;
	14657	+
	14658	+ boolean mute;
14389	14659
14390	14660	// void JumpToTarget()
14391	14661	// {
..	..	@@ -14401,6 +14671,88 @@
14401	14671	// only one thread!? synchronized
14402	14672	void StepToTarget(boolean jump)
14403	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	+
14404	14756	tmp.set(targetLookAt);
14405	14757	tmp.sub(manipCamera.lookAt); // june 2014
14406	14758
..	..	@@ -14438,7 +14790,7 @@
14438	14790
14439	14791	if (tmp.dot(tmp) > 1) // may 2014. far away: jump to target
14440	14792	{
14441		- jump = true; // step = 1;
	14793	+ // sep 2019 jump = true; // step = 1;
14442	14794	}
14443	14795
14444	14796	if (OEILONCE && OEIL)
..	..	@@ -14473,7 +14825,10 @@
14473	14825	if (tmp.dot(tmp) < 0.00001)
14474	14826	{
14475	14827	zoomonce = false;
	14828	+ live = false;
14476	14829	}
	14830	+ else
	14831	+ live = true;
14477	14832
14478	14833	tmp.mul(step > step2 ? step : step2);
14479	14834	}
..	..	@@ -14500,7 +14855,7 @@
14500	14855	{
14501	14856	if (LOOKAT)
14502	14857	manipCamera.lookAt.add(tmp);
14503		- if (OEIL)
	14858	+ if (OEIL && !capsLocked)
14504	14859	manipCamera.location.add(tmp);
14505	14860
14506	14861	{
..	..	@@ -14515,7 +14870,10 @@
14515	14870	lightCamera.computeTransform();
14516	14871	}
14517	14872	}
14518		- manipCamera.computeTransform();
	14873	+ if (tmp.x != 0 \|\| tmp.y != 0 \|\| tmp.z != 0)
	14874	+ {
	14875	+ manipCamera.computeTransform();
	14876	+ }
14519	14877	}
14520	14878	// ?????? mouseDown = true;
14521	14879	//System.out.println("---------------- ---------- Paint " + tmp.length2());
..	..	@@ -14608,49 +14966,107 @@
14608	14966	}
14609	14967	}
14610	14968	}
	14969	+
14611	14970	PingThread pingthread = new PingThread();
14612		- int delta = 5;
14613		- int speed = 5;
	14971	+ int delta = 1;
	14972	+ int speed = 1;
	14973	+ int walk = 8;
14614	14974	boolean autorepeat = false;
14615	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	+
14616	14995	void GoDown(int mod)
14617	14996	{
14618	14997	MODIFIERS \|= COMMAND;
	14998	+ boolean isVR = (mouseMode&VR)!=0;
14619	14999	/**/
14620	15000	if((mod&SHIFT) == SHIFT)
14621		- manipCamera.RotatePosition(0, -speed);
14622		- else
14623		- manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14624		- /**/
14625		- if ((mod & SHIFT) == SHIFT)
14626	15001	{
14627		- mouseMode = mouseMode; // VR??
14628		- } else
14629		- {
14630		- 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());
14631	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	+// }
14632	15026
	15027	+ targetLookAt.set(manipCamera.lookAt);
	15028	+
14633	15029	//prevX = X = anchorX;
14634	15030	prevY = Y = anchorY - (int) (renderCamera.Distance());
14635	15031	}
14636	15032
14637	15033	void GoUp(int mod)
14638	15034	{
	15035	+ RigidBody.justclicked = true;
	15036	+
14639	15037	MODIFIERS \|= COMMAND;
14640	15038	/**/
	15039	+ boolean isVR = (mouseMode&VR)!=0;
	15040	+
14641	15041	if((mod&SHIFT) == SHIFT)
14642		- manipCamera.RotatePosition(0, speed);
14643		- else
14644		- manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14645		- /**/
14646		- if ((mod & SHIFT) == SHIFT)
14647	15042	{
14648		- mouseMode = mouseMode;
14649		- } else
14650		- {
14651		- 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());
14652	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	+// }
14653	15067
	15068	+ targetLookAt.set(manipCamera.lookAt);
	15069	+
14654	15070	//prevX = X = anchorX;
14655	15071	prevY = Y = anchorY + (int) (renderCamera.Distance());
14656	15072	}
..	..	@@ -14660,18 +15076,29 @@
14660	15076	MODIFIERS \|= COMMAND;
14661	15077	/**/
14662	15078	if((mod&SHIFT) == SHIFT)
14663		- manipCamera.Translate(speed*delta, 0, getWidth());
	15079	+ manipCamera.Translate(speed, 0, getWidth());
14664	15080	else
14665		- 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	+
14666	15088	/**/
14667		- if ((mod & SHIFT) == SHIFT)
14668		- {
14669		- mouseMode = mouseMode;
14670		- } else
14671		- {
14672		- mouseMode \|= ROTATE;
14673		- } // TRANSLATE;
	15089	+// if ((mod & SHIFT) == SHIFT)
	15090	+// {
	15091	+// mouseMode = mouseMode;
	15092	+// } else
	15093	+// {
	15094	+// mouseMode \|= ROTATE;
	15095	+// } // TRANSLATE;
14674	15096
	15097	+ //System.err.println("lookAt = " + manipCamera.lookAt);
	15098	+ //System.err.println("location = " + manipCamera.location);
	15099	+
	15100	+ targetLookAt.set(manipCamera.lookAt);
	15101	+
14675	15102	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
14676	15103	prevY = Y = anchorY;
14677	15104	}
..	..	@@ -14681,18 +15108,26 @@
14681	15108	MODIFIERS \|= COMMAND;
14682	15109	/**/
14683	15110	if((mod&SHIFT) == SHIFT)
14684		- manipCamera.Translate(-speed*delta, 0, getWidth());
	15111	+ manipCamera.Translate(-speed, 0, getWidth());
14685	15112	else
14686		- 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	+
14687	15120	/**/
14688		- if ((mod & SHIFT) == SHIFT)
14689		- {
14690		- mouseMode = mouseMode;
14691		- } else
14692		- {
14693		- mouseMode \|= ROTATE;
14694		- } // TRANSLATE;
	15121	+// if ((mod & SHIFT) == SHIFT)
	15122	+// {
	15123	+// mouseMode = mouseMode;
	15124	+// } else
	15125	+// {
	15126	+// mouseMode \|= ROTATE;
	15127	+// } // TRANSLATE;
14695	15128
	15129	+ targetLookAt.set(manipCamera.lookAt);
	15130	+
14696	15131	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
14697	15132	prevY = Y = anchorY;
14698	15133	}
..	..	@@ -14826,6 +15261,11 @@
14826	15261	if ((mouseMode & ZOOM) != 0)
14827	15262	{
14828	15263	//if ((mouseMode & BACKFORTH) != 0)
	15264	+ if ((modifiersex & SHIFT) == SHIFT)
	15265	+ {
	15266	+ ViewAngle(dy);
	15267	+ }
	15268	+ else
14829	15269	if ((mouseMode & VR) != 0)
14830	15270	manipCamera.BackForth(dx, dy, getWidth());
14831	15271	else
..	..	@@ -14896,6 +15336,9 @@
14896	15336
14897	15337	public void mouseMoved(MouseEvent e)
14898	15338	{
	15339	+//object.editWindow.frame.
	15340	+ setCursor(Cursor.getDefaultCursor());
	15341	+
14899	15342	//System.out.println("mouseMoved: " + e);
14900	15343	if (isRenderer)
14901	15344	return;
..	..	@@ -15080,8 +15523,10 @@
15080	15523	mouseMode \|= ZOOM;
15081	15524	}
15082	15525
15083		- boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
15084		- 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)
15085	15530	{
15086	15531	mouseMode \|= VR; // BACKFORTH;
15087	15532	}
..	..	@@ -15093,7 +15538,8 @@
15093	15538	{
15094	15539	mouseMode \|= SELECT;
15095	15540	}
15096		- if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
	15541	+ if (//(modifiersex & SHIFT) == SHIFT \|\|
	15542	+ forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
15097	15543	{
15098	15544	mouseMode &= ~VR;
15099	15545	mouseMode \|= TRANSLATE;
..	..	@@ -15137,8 +15583,18 @@
15137	15583	float SATPOW = 1; // 2; // 0.5f;
15138	15584	float BRIPOW = 1; // 0.5f; // 0.5f;
15139	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	+
15140	15592	public void keyPressed(int key)
15141	15593	{
	15594	+// Set the blank cursor to the JFrame.
	15595	+//object.editWindow.frame.
	15596	+ setCursor(blankCursor);
	15597	+
15142	15598	if (key >= '0' && key <= '5')
15143	15599	clampbit = (key-'0');
15144	15600
..	..	@@ -15195,8 +15651,8 @@
15195	15651	case 'K':
15196	15652	KOMPACTTEXTURE ^= true;
15197	15653	//textures.clear();
15198		- break;
15199		- case 'P': // Texture Projection macros
	15654	+ // break;
	15655	+ //case 'P': // Texture Projection macros
15200	15656	// SAVETEXTURE ^= true;
15201	15657	macromode = true;
15202	15658	Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
..	..	@@ -15297,8 +15753,8 @@
15297	15753	RevertCamera();
15298	15754	repaint();
15299	15755	break;
15300		- case 'l':
15301		- //case 'L':
	15756	+ //case 'l':
	15757	+ case 'L':
15302	15758	if (lightMode)
15303	15759	{
15304	15760	lightMode = false;
..	..	@@ -15317,7 +15773,7 @@
15317	15773	targetLookAt.set(manipCamera.lookAt);
15318	15774	repaint();
15319	15775	break;
15320		- case 'p':
	15776	+ case 'P': // p':
15321	15777	// c'est quoi ca au juste? spherical ^= true;
15322	15778	Skinshader ^= true; programInitialized = false;
15323	15779	repaint();
..	..	@@ -15328,7 +15784,8 @@
15328	15784	break;
15329	15785	case 'm':
15330	15786	{
15331		- PrintMemory();
	15787	+ //PrintMemory();
	15788	+ ToggleImageFlip();
15332	15789	break;
15333	15790	}
15334	15791	case 'M':
..	..	@@ -15355,14 +15812,14 @@
15355	15812	repaint();
15356	15813	break;
15357	15814	case 'O':
15358		- Globals.drawMode = OCCLUSION; // WARNING
15359		- repaint();
15360		- break;
	15815	+ // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
	15816	+ //repaint();
	15817	+ //break;
15361	15818	case 'o':
15362	15819	OCCLUSION_CULLING ^= true;
15363	15820	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
15364	15821	break;
15365		- case '0': envyoff ^= true; repaint(); break;
	15822	+ //case '0': envyoff ^= true; repaint(); break;
15366	15823	case '1':
15367	15824	case '2':
15368	15825	case '3':
..	..	@@ -15372,7 +15829,7 @@
15372	15829	case '7':
15373	15830	case '8':
15374	15831	case '9':
15375		- if (envyoff)
	15832	+ if (true) // envyoff)
15376	15833	{
15377	15834	BGcolor = (key - '1')/8.f;
15378	15835	}
..	..	@@ -15449,7 +15906,21 @@
15449	15906	// kompactbit = 6;
15450	15907	// break;
15451	15908	case ' ':
	15909	+ capsLocked ^= true;
	15910	+ repaint();
	15911	+ break;
	15912	+ case 'l':
15452	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	+
15453	15924	Globals.lighttouched = true;
15454	15925	manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
15455	15926	targetLookAt.set(manipCamera.lookAt);
..	..	@@ -15457,6 +15928,10 @@
15457	15928	break;
15458	15929	//case '`' :
15459	15930	case ESC:
	15931	+ if (FULLSCREEN)
	15932	+ object.editWindow.ToggleFullScreen();
	15933	+ break;
	15934	+ case 'p':
15460	15935	RENDERPROGRAM += 1;
15461	15936	RENDERPROGRAM %= 3;
15462	15937
..	..	@@ -15495,6 +15970,10 @@
15495	15970	case ENTER:
15496	15971	// object.editWindow.ScreenFit(); // Edit();
15497	15972	ToggleLive();
	15973	+ if (capsLocked)
	15974	+ {
	15975	+ Globals.WALK ^= true;
	15976	+ }
15498	15977	break;
15499	15978	case DELETE:
15500	15979	ClearSelection();
..	..	@@ -15531,17 +16010,23 @@
15531	16010	object.GetWindow().refreshContents(true);
15532	16011	break;
15533	16012	case '{':
15534		- manipCamera.shaper_fovy /= 1.1;
	16013	+ double factor = 1.1;
	16014	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16015	+ manipCamera.shaper_fovy /= factor;
15535	16016	System.out.println("FOV = " + manipCamera.shaper_fovy);
15536	16017	repaint();
15537	16018	break;
15538	16019	case '}':
15539		- manipCamera.shaper_fovy *= 1.1;
	16020	+ factor = 1.1;
	16021	+ if (manipCamera.shaper_fovy * factor < 150)
	16022	+ manipCamera.shaper_fovy *= factor;
15540	16023	System.out.println("FOV = " + manipCamera.shaper_fovy);
15541	16024	repaint();
15542	16025	break;
15543	16026	case '[':
15544		- manipCamera.shaper_fovy /= 1.01;
	16027	+ factor = 1.01;
	16028	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16029	+ manipCamera.shaper_fovy /= factor;
15545	16030	if (false) //manipCamera.hAspect == 0)
15546	16031	{
15547	16032	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -15557,7 +16042,9 @@
15557	16042	break;
15558	16043	case ']':
15559	16044	//manipCamera.shaper_fovy += (180 - manipCamera.shaper_fovy)*0.1;
15560		- manipCamera.shaper_fovy *= 1.01;
	16045	+ factor = 1.01;
	16046	+ if (manipCamera.shaper_fovy * factor < 150)
	16047	+ manipCamera.shaper_fovy *= factor;
15561	16048	if (false) //manipCamera.hAspect == 0)
15562	16049	{
15563	16050	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -15595,98 +16082,113 @@
15595	16082	}
15596	16083	}
15597	16084
	16085	+ boolean keys[] = new boolean[256];
	16086	+ int speedkey[] = new int[256];
	16087	+ int modifiers = 0;
	16088	+
15598	16089	public void processKeyEvent(KeyEvent e)
15599	16090	{
15600	16091	switch (e.getID())
15601	16092	{
15602	16093	case KeyEvent.KEY_PRESSED:
15603		- if (!autorepeat)
15604		- {
15605		- //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
15606		- keyPressed(e.getKeyChar(), e.getModifiersEx());
15607		- }
15608		- if (manipCamera == lightCamera)
15609		- {
15610		- switch (e.getKeyCode())
15611		- {
15612		- case DOWN_ARROW:
15613		- lightCamera.DECAL /= 2;
15614		- repaint();
15615		- break;
15616		- case UP_ARROW:
15617		- lightCamera.DECAL *= 2;
15618		- repaint();
15619		- break;
15620		- case LEFT_ARROW:
15621		- lightCamera.SCALE /= 2;
15622		- repaint();
15623		- break;
15624		- case RIGHT_ARROW:
15625		- lightCamera.SCALE *= 2;
15626		- repaint();
15627		- break;
15628		- default:
15629		- break;
15630		- }
15631		-
15632		- System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
15633		- } else
15634		- {
15635		- if (true) // !autorepeat)
15636		- {
15637		- boolean reset = true;
15638		-
15639		- switch (e.getKeyCode())
15640		- {
15641		- case DOWN_ARROW:
15642		- GoDown(e.getModifiersEx());
15643		- repaint();
15644		- break;
15645		- case UP_ARROW:
15646		- GoUp(e.getModifiersEx());
15647		- repaint();
15648		- break;
15649		- case LEFT_ARROW:
15650		- GoLeft(e.getModifiersEx());
15651		- repaint();
15652		- break;
15653		- case RIGHT_ARROW:
15654		- GoRight(e.getModifiersEx());
15655		- repaint();
15656		- break;
15657		- default:
15658		- reset = false;
15659		- break;
15660		- }
15661		-
15662		- if (reset)
15663		- {
15664		- autorepeat = true;
15665		-
15666		- targetLookAt.set(manipCamera.lookAt);
15667		- }
15668		- }
15669		- }
	16094	+ keys[e.getKeyCode()] = true;
	16095	+ modifiers = e.getModifiersEx();
	16096	+ keyPressed(e.getKeyChar(), modifiers);
	16097	+ //Globals.theRenderer.keyPressed(e.getKeyChar());
	16098	+ repaint();
15670	16099	break;
15671		- case KeyEvent.KEY_TYPED:
15672		- 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;
15673	16170	case KeyEvent.KEY_RELEASED:
15674		- {
15675		- switch (e.getKeyCode())
15676		- {
15677		- case DOWN_ARROW:
15678		- case UP_ARROW:
15679		- case LEFT_ARROW:
15680		- case RIGHT_ARROW:
15681		- MODIFIERS &= ~COMMAND;
15682		- autorepeat = false;
15683		- break;
15684		- default:
15685		- break;
15686		- }
	16171	+ keys[e.getKeyCode()] = false;
	16172	+ modifiers = e.getModifiersEx();
15687	16173	keyReleased(e.getKeyChar(), e.getModifiersEx());
	16174	+ repaint();
15688	16175	break;
15689		- }
	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	+// }
15690	16192	default:
15691	16193	break;
15692	16194	}
..	..	@@ -16077,14 +16579,14 @@
16077	16579	{
16078	16580	switch (hitSomething)
16079	16581	{
16080		- case Object3D.hitCenter: gr.setColor(Color.pink);
	16582	+ case Object3D.hitCenter: gr.setColor(Color.white);
16081	16583	gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
16082	16584	break;
16083	16585	case Object3D.hitRotate: gr.setColor(Color.yellow);
16084	16586	gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
16085	16587	break;
16086	16588	case Object3D.hitScale: gr.setColor(Color.cyan);
16087		- gr.drawLine(X, Y, 0, 0);
	16589	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
16088	16590	break;
16089	16591	}
16090	16592
..	..	@@ -16103,7 +16605,7 @@
16103	16605	if (hasMarquee)
16104	16606	{
16105	16607	gr.setXORMode(Color.white);
16106		- gr.setColor(Color.red);
	16608	+ gr.setColor(Color.white);
16107	16609	if (!firstime)
16108	16610	{
16109	16611	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -16262,7 +16764,8 @@
16262	16764
16263	16765	public boolean mouseDrag(Event evt, int x, int y)
16264	16766	{
16265		- //System.out.println("mouseDrag: " + evt);
	16767	+ System.out.println("mouseDrag: " + evt);
	16768	+ System.exit(0);
16266	16769	/*
16267	16770	drag = true;
16268	16771	//System.out.println("Mouse DRAG");
..	..	@@ -16381,6 +16884,7 @@
16381	16884	public boolean mouseUp(Event evt, int x, int y)
16382	16885	{
16383	16886	System.out.println("mouseUp: " + evt);
	16887	+ System.exit(0);
16384	16888	/*
16385	16889	locked = false;
16386	16890	if (isRenderer)
..	..	@@ -16570,6 +17074,8 @@
16570	17074	private /static/ boolean firstime;
16571	17075	private /static/ cVector newView = new cVector();
16572	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"};
16573	17079	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16574	17080	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16575	17081	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16582,22 +17088,56 @@
16582	17088	{
16583	17089	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16584	17090
	17091	+ int usedsuf = 0;
	17092	+
16585	17093	for (int i = 0; i < suffixes.length; i++)
16586	17094	{
16587		- String resourceName = basename + suffixes[i] + "." + suffix;
16588		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16589		- mipmapped,
16590		- FileUtil.getFileSuffix(resourceName));
16591		- if (data == null)
	17095	+ String[] suffixe = suffixes;
	17096	+ String[] fallback = suffixes2;
	17097	+ String[] fallfallback = suffixes3;
	17098	+
	17099	+ for (int c=usedsuf; --c>=0;)
16592	17100	{
16593		- throw new IOException("Unable to load texture " + resourceName);
	17101	+// String[] temp = suffixe;
	17102	+// suffixe = fallback;
	17103	+// fallback = fallfallback;
	17104	+// fallfallback = temp;
16594	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	+
16595	17134	//System.out.println("Target = " + targets[i]);
16596	17135	cubemap.updateImage(data, targets[i]);
16597	17136	}
16598	17137
16599	17138	return cubemap;
16600	17139	}
	17140	+
16601	17141	int bigsphere = -1;
16602	17142
16603	17143	float BGcolor = 0.5f;
..	..	@@ -16606,7 +17146,9 @@
16606	17146
16607	17147	private void DrawSkyBox(GL gl, float ratio)
16608	17148	{
16609		- if (envyoff \|\| cubemap == null)
	17149	+ if (//envyoff \|\|
	17150	+ WIREFRAME \|\|
	17151	+ cubemap == null)
16610	17152	{
16611	17153	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16612	17154	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -16623,14 +17165,14 @@
16623	17165	gl.glLoadIdentity();
16624	17166	gl.glScalef(1,ratio,1);
16625	17167
16626		- colorV[0] = 2;
16627		- colorV[1] = 2;
16628		- colorV[2] = 2;
16629		- colorV[3] = 1;
16630		- gl.glDisable(gl.GL_COLOR_MATERIAL);
16631		- gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
16632		-
16633		- 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);
16634	17176
16635	17177	//gl.glActiveTexture(GL.GL_TEXTURE1);
16636	17178	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
..	..	@@ -16644,7 +17186,7 @@
16644	17186	// GL_NORMAL_MAP texgen mode. Temporarily enabling lighting
16645	17187	// causes the normals to be sent down. Thanks to Ken Dyke.
16646	17188	//gl.glEnable(GL.GL_LIGHTING);
16647		- gl.glEnable(GL.GL_LIGHTING);
	17189	+ gl.glDisable(GL.GL_LIGHTING);
16648	17190
16649	17191	gl.glTexGeni(GL.GL_S, GL.GL_TEXTURE_GEN_MODE, GL.GL_NORMAL_MAP);
16650	17192	gl.glTexGeni(GL.GL_T, GL.GL_TEXTURE_GEN_MODE, GL.GL_NORMAL_MAP);
..	..	@@ -16663,6 +17205,7 @@
16663	17205	{
16664	17206	gl.glScalef(1.0f, -1.0f, 1.0f);
16665	17207	}
	17208	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16666	17209	gl.glMultMatrixd(viewrot_1, 0);
16667	17210	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16668	17211	//viewer.updateInverseRotation(gl);
..	..	@@ -16703,7 +17246,8 @@
16703	17246	gl.glDisable(GL.GL_TEXTURE_GEN_R);
16704	17247
16705	17248	cubemap.disable();
16706		- ////cubemap.unbind();
	17249	+ //cubemap.dispose();
	17250	+
16707	17251	if (CULLFACE)
16708	17252	{
16709	17253	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -16759,7 +17303,7 @@
16759	17303	gl.glScalef(1.0f, -1.0f, 1.0f);
16760	17304	}
16761	17305
16762		- gl.glNormal3f(0.0f, 0.0f, 1.0f);
	17306	+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
16763	17307
16764	17308	float step = 2; // 0.1666f; //0.25f;
16765	17309	float stepv = 2; // step * 1652 / 998;
..	..	@@ -17048,7 +17592,7 @@
17048	17592
17049	17593	float depth = depths[y * TEX_SIZE + x];
17050	17594
17051		- if (pointselection && mouseMode == SELECT && depth != 0 && depth != 1)
	17595	+ if (pointselection && (mouseMode & SELECT) == SELECT && depth != 0 && depth != 1)
17052	17596	{
17053	17597	pointselection = false;
17054	17598
..	..	@@ -17239,6 +17783,7 @@
17239	17783
17240	17784	public void init(GLAutoDrawable drawable)
17241	17785	{
	17786	+ if (Globals.DEBUG)
17242	17787	System.out.println("shadow buffer init");
17243	17788
17244	17789	GL gl = drawable.getGL();
..	..	@@ -17467,10 +18012,14 @@
17467	18012	gl.glFlush();
17468	18013
17469	18014	/**/
17470		- 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);
17471	18016
17472		- float[] pixels = occlusionsizebuffer.array();
	18017	+ float[] depths = occlusiondepthbuffer.array();
17473	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	+
17474	18023	double r = 0, g = 0, b = 0;
17475	18024
17476	18025	double count = 0;
..	..	@@ -17481,7 +18030,7 @@
17481	18030
17482	18031	double FACTOR = 1;
17483	18032
17484		- for (int i = 0; i < pixels.length; i++)
	18033	+ for (int i = 0; i < depths.length; i++)
17485	18034	{
17486	18035	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
17487	18036	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -17564,7 +18113,7 @@
17564	18113
17565	18114	double scale = ray.z; // 1; // cos
17566	18115
17567		- float depth = pixels[newindex];
	18116	+ float depth = depths[newindex];
17568	18117
17569	18118	/*
17570	18119	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -17707,6 +18256,11 @@
17707	18256	static boolean DEBUG_SELECTION = false;
17708	18257	boolean OCCLUSION_CULLING = false; //true;
17709	18258	public boolean lightMode = false;
	18259	+
	18260	+ private boolean keepshadow;
	18261	+
	18262	+ static public boolean capsLocked = false; // VR
	18263	+
17710	18264	static public int indexcount = 0;
17711	18265	/static/ cColor vertexOcclusion = new cColor();
17712	18266	//private int selection_view = -1;
..	..	@@ -17761,11 +18315,14 @@
17761	18315	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17762	18316	static IntBuffer bigAAbuffer;
17763	18317	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17764		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	18318	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17765	18319	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17766	18320	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17767	18321	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17768		- 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	+
17769	18326	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17770	18327	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17771	18328	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();