~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
..	..	@@ -119,7 +124,7 @@
119	124	static boolean LOCALTRANSFORM = false;
120	125	static boolean FULLSCREEN = false;
121	126	static boolean SUPPORT = true;
122		-static boolean INERTIA = true;
	127	+static boolean INERTIA = false; // true;
123	128	static boolean FAST = false;
124	129	static boolean SLOWPOSE = false;
125	130	static boolean FOOTCONTACT = true;
..	..	@@ -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
..	..	@@ -244,7 +250,7 @@
244	250
245	251	public javax.media.opengl.GL GetGL0()
246	252	{
247		- return null;
	253	+ return currentGL;
248	254	}
249	255
250	256	public int GenList()
..	..	@@ -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)
..	..	@@ -1523,7 +1530,7 @@
1523	1530	}
1524	1531	}
1525	1532	float b = 0;
1526		- if (obj.support != null && obj.link2master)
	1533	+ if (obj.support != null && obj.Link2Support())
1527	1534	{
1528	1535	b = 1;
1529	1536	}
..	..	@@ -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();
..	..	@@ -10717,7 +10761,9 @@
10717	10761	}
10718	10762	/**/
10719	10763
10720		- if (selection)
	10764	+ boolean control = ((modifiers & CTRL) != 0);
	10765	+
	10766	+ if (selection && (!Globals.isLIVE() \|\| control))
10721	10767	{
10722	10768	selectbuffer.display();
10723	10769	return;
..	..	@@ -10769,6 +10815,112 @@
10769	10815
10770	10816	if (DrawMode() == DEFAULT)
10771	10817	{
	10818	+ if (manipCamera == lightCamera)
	10819	+ {
	10820	+// switch (e.getKeyCode())
	10821	+// {
	10822	+// case DOWN_ARROW:
	10823	+// lightCamera.DECAL /= 2;
	10824	+// repaint();
	10825	+// break;
	10826	+// case UP_ARROW:
	10827	+// lightCamera.DECAL *= 2;
	10828	+// repaint();
	10829	+// break;
	10830	+// case LEFT_ARROW:
	10831	+// lightCamera.SCALE /= 2;
	10832	+// repaint();
	10833	+// break;
	10834	+// case RIGHT_ARROW:
	10835	+// lightCamera.SCALE *= 2;
	10836	+// repaint();
	10837	+// break;
	10838	+// default:
	10839	+// break;
	10840	+ if (keys[DOWN_ARROW])
	10841	+ {
	10842	+ lightCamera.DECAL /= 2;
	10843	+ }
	10844	+
	10845	+ if (keys[UP_ARROW])
	10846	+ {
	10847	+ lightCamera.DECAL *= 2;
	10848	+ }
	10849	+
	10850	+ if (keys[LEFT_ARROW])
	10851	+ {
	10852	+ lightCamera.SCALE /= 2;
	10853	+ }
	10854	+
	10855	+ if (keys[RIGHT_ARROW])
	10856	+ {
	10857	+ lightCamera.SCALE *= 2;
	10858	+ }
	10859	+ }
	10860	+ else
	10861	+ {
	10862	+ //pingthread.mute = true;
	10863	+
	10864	+ boolean keyon = false;
	10865	+
	10866	+ if (keys[DOWN_ARROW])
	10867	+ {
	10868	+ speed = ++speedkey[DOWN_ARROW];
	10869	+ if (speed > 20)
	10870	+ speed = 20;
	10871	+ GoDown(modifiers);
	10872	+ keyon = true;
	10873	+ }
	10874	+ else
	10875	+ speedkey[DOWN_ARROW] = 0;
	10876	+
	10877	+ if (keys[UP_ARROW])
	10878	+ {
	10879	+ speed = ++speedkey[UP_ARROW];
	10880	+ if (speed > 20)
	10881	+ speed = 20;
	10882	+ GoUp(modifiers);
	10883	+ keyon = true;
	10884	+ }
	10885	+ else
	10886	+ speedkey[UP_ARROW] = 0;
	10887	+
	10888	+ if (keys[LEFT_ARROW])
	10889	+ {
	10890	+ speed = ++speedkey[LEFT_ARROW];
	10891	+ if (speed > 20)
	10892	+ speed = 20;
	10893	+ GoLeft(modifiers);
	10894	+ keyon = true;
	10895	+ }
	10896	+ else
	10897	+ speedkey[LEFT_ARROW] = 0;
	10898	+
	10899	+ if (keys[RIGHT_ARROW])
	10900	+ {
	10901	+ speed = ++speedkey[RIGHT_ARROW];
	10902	+ if (speed > 20)
	10903	+ speed = 20;
	10904	+ GoRight(modifiers);
	10905	+ keyon = true;
	10906	+ }
	10907	+ else
	10908	+ speedkey[RIGHT_ARROW] = 0;
	10909	+
	10910	+ if (Globals.WALK && capsLocked)
	10911	+ {
	10912	+ Walk();
	10913	+ keyon = true;
	10914	+ }
	10915	+
	10916	+ if (keyon)
	10917	+ {
	10918	+ repaint();
	10919	+ }
	10920	+
	10921	+ //pingthread.mute = false;
	10922	+ }
	10923	+
10772	10924	currentlydrawing = true;
10773	10925	}
10774	10926
..	..	@@ -10842,7 +10994,7 @@
10842	10994
10843	10995	if (wait)
10844	10996	{
10845		- Sleep(500);
	10997	+ Sleep(200); // blocks everything
10846	10998
10847	10999	wait = false;
10848	11000	}
..	..	@@ -11065,10 +11217,34 @@
11065	11217	//
11066	11218	// newenvy = -1;
11067	11219
11068		- if (!skyboxname.equals(this.loadedskyboxname))
	11220	+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
11069	11221	{
11070		- LoadSkybox(skyboxname + "/", skyboxext, false);
11071		- loadedskyboxname = skyboxname;
	11222	+ if (cubemaprgb == null)
	11223	+ {
	11224	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
	11225	+ }
	11226	+
	11227	+ cubemap = cubemaprgb;
	11228	+ }
	11229	+ else
	11230	+ {
	11231	+ if (object.skyboxname != null)
	11232	+ {
	11233	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11234	+ {
	11235	+ if (cubemap != null && cubemap != cubemaprgb)
	11236	+ cubemap.dispose();
	11237	+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11238	+ loadedskyboxname = object.skyboxname;
	11239	+ }
	11240	+ }
	11241	+ else
	11242	+ {
	11243	+ cubemapcustom = null;
	11244	+ loadedskyboxname = null;
	11245	+ }
	11246	+
	11247	+ cubemap = cubemapcustom;
11072	11248	}
11073	11249
11074	11250	ratio = ((double) getWidth()) / getHeight();
..	..	@@ -11269,9 +11445,9 @@
11269	11445
11270	11446	gl.glMatrixMode(GL.GL_MODELVIEW);
11271	11447
11272		-gl.glEnable(gl.GL_POLYGON_SMOOTH);
11273		-gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
11274		-gl.glEnable(gl.GL_MULTISAMPLE);
	11448	+//gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11449	+//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11450	+//gl.glEnable(gl.GL_MULTISAMPLE);
11275	11451	} else
11276	11452	{
11277	11453	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -11332,7 +11508,10 @@
11332	11508	//gl.glOrtho(-BOOST, BOOST, -BOOST, BOOST, 0.001, 1000);
11333	11509	} else
11334	11510	{
11335		- glu.gluPerspective(cam.shaper_fovy / ratio, ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
	11511	+ boolean vr = capsLocked && !lightMode;
	11512	+
	11513	+ glu.gluPerspective(cam.shaper_fovy / ratio * (vr ? 1.2 : 1),
	11514	+ ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
11336	11515	}
11337	11516	}
11338	11517
..	..	@@ -11372,7 +11551,7 @@
11372	11551
11373	11552	// if (cam != lightCamera)
11374	11553	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11375		- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
	11554	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
11376	11555	}
11377	11556
11378	11557	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -11688,8 +11867,11 @@
11688	11867	repaint();
11689	11868	}
11690	11869
11691		- if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
	11870	+ if (Globals.isLIVE() && DrawMode() == DEFAULT \|\| pingthread.live) // may 2013
	11871	+ {
	11872	+ renderCamera.computeTransform();
11692	11873	repaint();
	11874	+ }
11693	11875
11694	11876	displaydone = true;
11695	11877	}
..	..	@@ -11764,9 +11946,23 @@
11764	11946	//GL gl = getGL();
11765	11947	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11766	11948	{
	11949	+ if (TRACK)
	11950	+ {
	11951	+ if (object.selection != null &&
	11952	+ object.selection.size() > 0 &&
	11953	+ object.selection.elementAt(0) != null &&
	11954	+ !(object.selection.elementAt(0) instanceof Camera) &&
	11955	+ !(object.selection.elementAt(0) instanceof ScriptNode))
	11956	+ {
	11957	+ trackedobject = object.selection.elementAt(0);
	11958	+ //repaint();
	11959	+ }
	11960	+ else
	11961	+ trackedobject = null;
	11962	+ }
11767	11963	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11768	11964	object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11769		- pingthread.StepToTarget(true); // true);
	11965	+ pingthread.StepToTarget(); // true);
11770	11966	// zoomonce = false;
11771	11967	}
11772	11968
..	..	@@ -12446,11 +12642,12 @@
12446	12642
12447	12643	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12448	12644
12449		- String program0 =
	12645	+ String programmin =
12450	12646	// Min shader
12451	12647	"!!ARBfp1.0\n" +
12452		- "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
12453		- "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12648	+ "PARAM zero12t = { 0.0, 1.0, 2, 1.25 };" +
	12649	+ "PARAM pow_2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12650	+ "PARAM pow2 = { 2, 4, 8, 0.0 };" +
12454	12651	"PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
12455	12652	"PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
12456	12653	"PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
..	..	@@ -12465,10 +12662,11 @@
12465	12662	"TEMP eye;" +
12466	12663	"TEMP pos;" +
12467	12664
12468		- "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12665	+ "MAD normal, fragment.color, zero12t.z, -zero12t.y;" +
12469	12666	Normalize("normal") +
12470	12667	"MOV light, state.light[0].position;" +
12471	12668	"DP3 ndotl.x, light, normal;" +
	12669	+ "MAX ndotl.x, ndotl.x, zero12t.x;" +
12472	12670
12473	12671	// shadow
12474	12672	"MOV pos, fragment.texcoord[1];" +
..	..	@@ -12484,7 +12682,7 @@
12484	12682	"MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
12485	12683
12486	12684	// Backlit
12487		- "MOV pos.w, zero123.y;" +
	12685	+ "MOV pos.w, zero12t.y;" + // one
12488	12686	"DP4 eye.x, pos, light2cam0;" +
12489	12687	"DP4 eye.y, pos, light2cam1;" +
12490	12688	"DP4 eye.z, pos, light2cam2;" +
..	..	@@ -12492,28 +12690,32 @@
12492	12690
12493	12691	"DP3 ndotl.y, -eye, normal;" +
12494	12692	//"MUL ndotl.y, ndotl.y, pow2.x;" +
12495		- "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
12496		- "SUB ndotl.y, zero123.y, ndotl.y;" +
	12693	+ "POW ndotl.y, ndotl.y, pow2.x;" + // backlit
	12694	+ "SUB ndotl.y, zero12t.y, ndotl.y;" + // 1 - y
	12695	+ //"POW ndotl.y, ndotl.y, pow2.z;" + // backlit
12497	12696	//"SUB ndotl.y, zero123.y, ndotl.y;" +
12498	12697	//"MUL ndotl.y, ndotl.y, pow2.z;" +
	12698	+ "ADD ndotl.y, ndotl.y, one.x;" +
	12699	+ "MUL ndotl.y, ndotl.y, pow_2.x;" +
12499	12700
12500	12701	//"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
12501	12702	//"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
12502	12703
12503	12704	// Pigment
12504	12705	"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;" +
	12706	+ "LRP temp, zero12t.w, temp, one;" + // texture proportion
	12707	+ "MUL temp, temp, zero12t.w;" + // Times x
12509	12708
12510	12709	//"MUL temp, temp, ndotl.y;" +
	12710	+ "MAD ndotl.x, pow_2.xxxx, ndotl.yyyy, ndotl.x;" +
12511	12711
12512		- "MOV temp.w, zero123.y;" + // reset alpha
	12712	+ "MUL temp, temp, ndotl.x;" + // lambert
	12713	+
	12714	+ "MOV temp.w, zero12t.y;" + // reset alpha
12513	12715	"MOV result.color, temp;" +
12514	12716	"END";
12515	12717
12516		- String program =
	12718	+ String programmax =
12517	12719	"!!ARBfp1.0\n" +
12518	12720
12519	12721	//"OPTION ARB_fragment_program_shadow;" +
..	..	@@ -12541,7 +12743,7 @@
12541	12743	"PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
12542	12744	"PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
12543	12745	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12544		- "PARAM params7 = program.env[7];" + // noise power, opacity power
	12746	+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
12545	12747	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
12546	12748	"PARAM options1 = program.env[62];" + // fog rgb color
12547	12749	"PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
..	..	@@ -12786,7 +12988,7 @@
12786	12988	"POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
12787	12989	// mar 2013 ??? "KIL alpha.a;" +
12788	12990	"MOV alpha, texSamp.aaaa;" + // y;" +
12789		- "KIL alpha.a;" +
	12991	+ "KIL alpha.a;" + // not sure with parallax mapping
12790	12992	/*
12791	12993	"MUL temp.xy, temp, two;" +
12792	12994	"TXB bump, temp, texture[0], 2D;" +
..	..	@@ -12872,11 +13074,6 @@
12872	13074	"SUB bump0, bump0, half;" +
12873	13075	"ADD bump, bump, bump0;" +
12874	13076
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	13077	// double-sided
12881	13078	/**/
12882	13079	(doublesided?"DP3 temp.z, normal, eye;" +
..	..	@@ -12886,26 +13083,73 @@
12886	13083	"ADD temp.x, temp.x, one.x;" +
12887	13084	"MUL normal, normal, temp.xxxx;":""
12888	13085	) +
12889		- /**/
12890		-//// Normalize("normal") +
12891		-//// "MAX normal.z, eps.x, normal.z;" +
12892		-// Normalize("normal") +
12893		- "MOV normald, normal;" +
12894		- "MOV normals, normal;" +
	13086	+ /**/
	13087	+
	13088	+ "MOV temp, fragment.texcoord[4];" +
12895	13089
12896	13090	// UV base
12897	13091	//"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
12898	13092	//"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
12899	13093	//"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;" +
	13094	+ "DP3 UP.x,state.matrix.texture[7].row[0],temp;" +
	13095	+ "DP3 UP.y,state.matrix.texture[7].row[1],temp;" +
	13096	+ "DP3 UP.z,state.matrix.texture[7].row[2],temp;" +
	13097	+ Normalize("UP") +
	13098	+
12903	13099	"XPD V, normal, UP;" +
12904	13100	Normalize("V") +
12905	13101	"XPD U, V, normal;" +
12906	13102	Normalize("U") +
12907	13103
	13104	+ "MOV temp, fragment.texcoord[0];" +
	13105	+
	13106	+// "MAD normal, -temp.x, U, normal;" +
	13107	+// "MAD normal, -temp.y, V, normal;" +
	13108	+// Normalize("normal") +
	13109	+
	13110	+//// "MAX normal.z, eps.x, normal.z;" +
	13111	+// Normalize("normal") +
	13112	+ "MOV normald, normal;" +
	13113	+ "MOV normals, normal;" +
	13114	+
12908	13115	// parallax mapping
	13116	+
	13117	+ "DP3 temp2.x, V, eye;" +
	13118	+ "DP3 temp2.y, U, eye;" +
	13119	+ "DP3 temp2.z, normal, eye;" +
	13120	+ "RCP temp2.z, temp2.z;" +
	13121	+
	13122	+ "DP3 temp2.w, texSamp, texSamp;" + // Height
	13123	+ "RSQ temp2.w, temp2.w;" +
	13124	+ "RCP temp2.w, temp2.w;" +
	13125	+
	13126	+ "SUB temp2.w, temp2.w, half;" +
	13127	+ // "SGE temp.x, temp2.w, eps.x;" +
	13128	+ // "MUL temp2.w, temp2.w, temp.x;" +
	13129	+
	13130	+ // "MOV texSamp, U;" +
	13131	+
	13132	+ "MUL temp2.z, temp2.z, temp2.w;" +
	13133	+ "MUL temp2.z, temp2.z, params7.z;" + // parallax
	13134	+
	13135	+ "MUL temp2, temp2, temp2.z;" +
	13136	+
	13137	+ "SUB temp, temp, temp2;" +
	13138	+
	13139	+ "TEX temp, temp, texture[0], 2D;" +
	13140	+ "POW temp.a, temp.a, params6.w;" + // punch through
	13141	+
	13142	+ "ADD texSamp, temp, texSamp;" +
	13143	+ "MUL texSamp.xyz, half, texSamp;" +
	13144	+
	13145	+ "MOV alpha, texSamp.aaaa;" +
	13146	+
	13147	+// parallax mapping
	13148	+
	13149	+ "MOV temp.x, texSamp.a;" +
	13150	+ "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
	13151	+ //"LRP texSamp0, params5.x, texSamp0, one;" +
	13152	+ "MOV texSamp.a, temp.x;" +
12909	13153
12910	13154	//"MOV temp, fragment.texcoord[0];" +
12911	13155	//
..	..	@@ -13038,7 +13282,7 @@
13038	13282	// display shadow only (fakedepth == 0)
13039	13283	"SUB temp.x, half.x, shadow.x;" +
13040	13284	"MOV temp.y, -params5.z;" + // params6.x;" +
13041		- "SLT temp.z, temp.y, -one2048th.x;" +
	13285	+ "SLT temp.z, temp.y, -c256i.x;" +
13042	13286	"SUB temp.y, one.x, temp.z;" +
13043	13287	"MUL temp.x, temp.x, temp.y;" +
13044	13288	"KIL temp.x;" +
..	..	@@ -13369,8 +13613,19 @@
13369	13613	//once = true;
13370	13614	}
13371	13615
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 " : ""));
	13616	+ String program = programmax;
	13617	+
	13618	+ if (Globals.MINSHADER)
	13619	+ {
	13620	+ program = programmin;
	13621	+ }
	13622	+
	13623	+ if (Globals.DEBUG)
	13624	+ {
	13625	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
	13626	+ System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13627	+ }
	13628	+
13374	13629	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13375	13630
13376	13631	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13417,7 +13672,8 @@
13417	13672	"\n" +
13418	13673	"END\n";
13419	13674
13420		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13675	+ if (Globals.DEBUG)
	13676	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13421	13677	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13422	13678
13423	13679	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13675,7 +13931,7 @@
13675	13931	/static/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
13676	13932	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13677	13933	/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
	13934	+ /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
13679	13935
13680	13936	//Object3D.cVector2[] vector2buffer;
13681	13937
..	..	@@ -13842,7 +14098,7 @@
13842	14098	"PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
13843	14099	"PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
13844	14100	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
13845		- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
	14101	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
13846	14102	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
13847	14103	"PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
13848	14104	//"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
..	..	@@ -13903,7 +14159,7 @@
13903	14159	"DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
13904	14160	"DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
13905	14161	"DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
13906		- //"MOV result.texcoord, vertex.texcoord;" +
	14162	+ //"MOV result.texcoord, vertex.fogcoord;" +
13907	14163	"MOV result.texcoord, temp;" +
13908	14164	// border fade
13909	14165	"MOV result.texcoord[3], vertex.texcoord;" +
..	..	@@ -13950,7 +14206,9 @@
13950	14206
13951	14207	//"ADD temp.z, temp.z, one;" +
13952	14208
13953		- "MOV result.color, temp;"
	14209	+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
	14210	+
	14211	+ "MOV result.color, temp;" // Normal
13954	14212	: "MOV result.color, vertex.color;") +
13955	14213	((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
13956	14214	: "") +
..	..	@@ -14085,6 +14343,7 @@
14085	14343	public void mouseClicked(MouseEvent e)
14086	14344	{
14087	14345	System.out.println("mouseClicked: " + e);
	14346	+ System.exit(0);
14088	14347	}
14089	14348
14090	14349	public void mousePressed(MouseEvent e)
..	..	@@ -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 = false;
14389	14659
14390	14660	// void JumpToTarget()
14391	14661	// {
..	..	@@ -14401,6 +14671,95 @@
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	+ // System.err.println("selected point = " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][1]) + " " + Trunk(selectedpoint.toParent[3][2]));
	14683	+ CreateSelectedPoint();
	14684	+
	14685	+ RigidBody.pos.x = (float)selectedpoint.toParent[3][0];
	14686	+ RigidBody.pos.y = (float)selectedpoint.toParent[3][1];
	14687	+ RigidBody.pos.z = (float)selectedpoint.toParent[3][2];
	14688	+
	14689	+ RigidBody.wind.set(RigidBody.pos);
	14690	+ RigidBody.wind.x -= (float)manipCamera.location.x;
	14691	+ RigidBody.wind.y -= (float)manipCamera.location.y;
	14692	+ RigidBody.wind.z -= (float)manipCamera.location.z;
	14693	+ RigidBody.wind.normalize();
	14694	+ }
	14695	+
	14696	+ if (mute)
	14697	+ return;
	14698	+
	14699	+ if (capsLocked && manipCamera.viewCode == 0)
	14700	+ {
	14701	+ eye.x = manipCamera.location.x;
	14702	+ eye.y = manipCamera.location.y + 0.25;
	14703	+ eye.z = manipCamera.location.z;
	14704	+
	14705	+ dir.y = -1;
	14706	+
	14707	+ Ray ray = new Ray(eye, dir);
	14708	+
	14709	+ IntersectResult res = new IntersectResult();
	14710	+ res.t = Double.POSITIVE_INFINITY;
	14711	+
	14712	+ tmp.set(targetLookAt);
	14713	+ tmp.sub(manipCamera.location);
	14714	+
	14715	+ double dist = tmp.length();
	14716	+
	14717	+ tmp.normalize();
	14718	+
	14719	+ eye2.x = manipCamera.location.x + tmp.x * 0.25;
	14720	+ eye2.y = manipCamera.location.y + 0.25;
	14721	+ eye2.z = manipCamera.location.z + tmp.z * 0.25;
	14722	+
	14723	+ Ray ray2 = new Ray(eye2, dir);
	14724	+
	14725	+ IntersectResult res2 = new IntersectResult();
	14726	+ res2.t = Double.POSITIVE_INFINITY;
	14727	+
	14728	+ if (object.intersect(ray, res) && object.intersect(ray2, res2) && Math.abs(res.t - res2.t) < 0.25)
	14729	+ {
	14730	+ //tmp.set(manipCamera.location);
	14731	+
	14732	+ manipCamera.location.x = ray.eyePoint.x + ray.viewDirection.x * res.t;
	14733	+ manipCamera.location.y = ray.eyePoint.y + ray.viewDirection.y * res.t + 0.5;
	14734	+ manipCamera.location.z = ray.eyePoint.z + ray.viewDirection.z * res.t;
	14735	+
	14736	+ //tmp.sub(manipCamera.location);
	14737	+
	14738	+ targetLookAt.x = ray2.eyePoint.x + ray2.viewDirection.x * res2.t;
	14739	+ targetLookAt.y = ray2.eyePoint.y + ray2.viewDirection.y * res2.t + 0.5;
	14740	+ targetLookAt.z = ray2.eyePoint.z + ray2.viewDirection.z * res2.t;
	14741	+
	14742	+ targetLookAt.sub(manipCamera.location);
	14743	+ targetLookAt.normalize();
	14744	+ targetLookAt.mul(dist);
	14745	+ targetLookAt.add(manipCamera.location);
	14746	+
	14747	+ //if (tmp.dot(tmp) > 0.000001)
	14748	+ // System.out.println("INTERSECTION " + manipCamera.location);
	14749	+
	14750	+ manipCamera.lookAt.set(targetLookAt);
	14751	+
	14752	+ tmp.x = res.n.x;
	14753	+ tmp.y = res.n.y;
	14754	+ tmp.z = res.n.z;
	14755	+ tmp.x += res2.n.x;
	14756	+ tmp.y += res2.n.y;
	14757	+ tmp.z += res2.n.z;
	14758	+ tmp.normalize();
	14759	+ manipCamera.UP.set(tmp);
	14760	+ }
	14761	+ }
	14762	+
14404	14763	tmp.set(targetLookAt);
14405	14764	tmp.sub(manipCamera.lookAt); // june 2014
14406	14765
..	..	@@ -14438,7 +14797,7 @@
14438	14797
14439	14798	if (tmp.dot(tmp) > 1) // may 2014. far away: jump to target
14440	14799	{
14441		- jump = true; // step = 1;
	14800	+ // sep 2019 jump = true; // step = 1;
14442	14801	}
14443	14802
14444	14803	if (OEILONCE && OEIL)
..	..	@@ -14473,7 +14832,10 @@
14473	14832	if (tmp.dot(tmp) < 0.00001)
14474	14833	{
14475	14834	zoomonce = false;
	14835	+ live = false;
14476	14836	}
	14837	+ else
	14838	+ live = true;
14477	14839
14478	14840	tmp.mul(step > step2 ? step : step2);
14479	14841	}
..	..	@@ -14500,7 +14862,7 @@
14500	14862	{
14501	14863	if (LOOKAT)
14502	14864	manipCamera.lookAt.add(tmp);
14503		- if (OEIL)
	14865	+ if (OEIL && !capsLocked)
14504	14866	manipCamera.location.add(tmp);
14505	14867
14506	14868	{
..	..	@@ -14515,7 +14877,10 @@
14515	14877	lightCamera.computeTransform();
14516	14878	}
14517	14879	}
14518		- manipCamera.computeTransform();
	14880	+ if (tmp.x != 0 \|\| tmp.y != 0 \|\| tmp.z != 0)
	14881	+ {
	14882	+ manipCamera.computeTransform();
	14883	+ }
14519	14884	}
14520	14885	// ?????? mouseDown = true;
14521	14886	//System.out.println("---------------- ---------- Paint " + tmp.length2());
..	..	@@ -14608,49 +14973,107 @@
14608	14973	}
14609	14974	}
14610	14975	}
	14976	+
14611	14977	PingThread pingthread = new PingThread();
14612		- int delta = 5;
14613		- int speed = 5;
	14978	+ int delta = 1;
	14979	+ int speed = 1;
	14980	+ int walk = 8;
14614	14981	boolean autorepeat = false;
14615	14982
	14983	+ void Walk()
	14984	+ {
	14985	+ manipCamera.BackForth(0, walk, 1000);
	14986	+
	14987	+ targetLookAt.set(manipCamera.lookAt);
	14988	+ }
	14989	+
	14990	+ void ViewAngle(float dy)
	14991	+ {
	14992	+ double factor = Math.exp(-dy/300.0); // (1 + dy/100);
	14993	+
	14994	+ if (manipCamera.shaper_fovy * factor > 1 &&
	14995	+ manipCamera.shaper_fovy * factor < 150)
	14996	+ {
	14997	+ manipCamera.shaper_fovy *= factor;
	14998	+ //System.out.println("fovy = " + shaper_fovy);
	14999	+ }
	15000	+ }
	15001	+
14616	15002	void GoDown(int mod)
14617	15003	{
14618	15004	MODIFIERS \|= COMMAND;
	15005	+ boolean isVR = (mouseMode&VR)!=0;
14619	15006	/**/
14620	15007	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	15008	{
14627		- mouseMode = mouseMode; // VR??
14628		- } else
14629		- {
14630		- mouseMode \|= BACKFORTH;
	15009	+// if (isVR)
	15010	+// manipCamera.RotateInterest(0, speed);
	15011	+// else
	15012	+ if (isVR)
	15013	+ ViewAngle(-speed*delta);
	15014	+ else
	15015	+ manipCamera.Translate(0, -speed*delta, getWidth());
14631	15016	}
	15017	+ else
	15018	+ {
	15019	+ if (isVR)
	15020	+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
	15021	+ else
	15022	+ manipCamera.RotatePosition(0, -speed);
	15023	+ }
	15024	+
	15025	+ /**/
	15026	+// if ((mod & SHIFT) == SHIFT)
	15027	+// {
	15028	+// mouseMode = mouseMode; // VR??
	15029	+// } else
	15030	+// {
	15031	+// mouseMode \|= BACKFORTH;
	15032	+// }
14632	15033
	15034	+ targetLookAt.set(manipCamera.lookAt);
	15035	+
14633	15036	//prevX = X = anchorX;
14634	15037	prevY = Y = anchorY - (int) (renderCamera.Distance());
14635	15038	}
14636	15039
14637	15040	void GoUp(int mod)
14638	15041	{
	15042	+ RigidBody.justclicked = true;
	15043	+
14639	15044	MODIFIERS \|= COMMAND;
14640	15045	/**/
	15046	+ boolean isVR = (mouseMode&VR)!=0;
	15047	+
14641	15048	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	15049	{
14648		- mouseMode = mouseMode;
14649		- } else
14650		- {
14651		- mouseMode \|= BACKFORTH;
	15050	+// if (isVR)
	15051	+// manipCamera.RotateInterest(0, -speed);
	15052	+// else
	15053	+ if (isVR)
	15054	+ ViewAngle(speed*delta);
	15055	+ else
	15056	+ manipCamera.Translate(0, speed*delta, getWidth());
14652	15057	}
	15058	+ else
	15059	+ {
	15060	+ if (isVR)
	15061	+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
	15062	+ else
	15063	+ manipCamera.RotatePosition(0, speed);
	15064	+ }
	15065	+
	15066	+ /**/
	15067	+// if ((mod & SHIFT) == SHIFT)
	15068	+// {
	15069	+// mouseMode = mouseMode;
	15070	+// } else
	15071	+// {
	15072	+// mouseMode \|= BACKFORTH;
	15073	+// }
14653	15074
	15075	+ targetLookAt.set(manipCamera.lookAt);
	15076	+
14654	15077	//prevX = X = anchorX;
14655	15078	prevY = Y = anchorY + (int) (renderCamera.Distance());
14656	15079	}
..	..	@@ -14660,18 +15083,29 @@
14660	15083	MODIFIERS \|= COMMAND;
14661	15084	/**/
14662	15085	if((mod&SHIFT) == SHIFT)
14663		- manipCamera.Translate(speed*delta, 0, getWidth());
	15086	+ manipCamera.Translate(speed, 0, getWidth());
14664	15087	else
14665		- manipCamera.RotatePosition(speed, 0);
	15088	+ {
	15089	+ if ((mouseMode&VR)!=0)
	15090	+ manipCamera.RotateInterest(-speed*manipCamera.shaper_fovy/90, 0);
	15091	+ else
	15092	+ manipCamera.RotatePosition(speed*manipCamera.shaper_fovy/90, 0);
	15093	+ }
	15094	+
14666	15095	/**/
14667		- if ((mod & SHIFT) == SHIFT)
14668		- {
14669		- mouseMode = mouseMode;
14670		- } else
14671		- {
14672		- mouseMode \|= ROTATE;
14673		- } // TRANSLATE;
	15096	+// if ((mod & SHIFT) == SHIFT)
	15097	+// {
	15098	+// mouseMode = mouseMode;
	15099	+// } else
	15100	+// {
	15101	+// mouseMode \|= ROTATE;
	15102	+// } // TRANSLATE;
14674	15103
	15104	+ //System.err.println("lookAt = " + manipCamera.lookAt);
	15105	+ //System.err.println("location = " + manipCamera.location);
	15106	+
	15107	+ targetLookAt.set(manipCamera.lookAt);
	15108	+
14675	15109	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
14676	15110	prevY = Y = anchorY;
14677	15111	}
..	..	@@ -14681,18 +15115,26 @@
14681	15115	MODIFIERS \|= COMMAND;
14682	15116	/**/
14683	15117	if((mod&SHIFT) == SHIFT)
14684		- manipCamera.Translate(-speed*delta, 0, getWidth());
	15118	+ manipCamera.Translate(-speed, 0, getWidth());
14685	15119	else
14686		- manipCamera.RotatePosition(-speed, 0);
	15120	+ {
	15121	+ if ((mouseMode&VR)!=0)
	15122	+ manipCamera.RotateInterest(speed*manipCamera.shaper_fovy/90, 0);
	15123	+ else
	15124	+ manipCamera.RotatePosition(-speed*manipCamera.shaper_fovy/90, 0);
	15125	+ }
	15126	+
14687	15127	/**/
14688		- if ((mod & SHIFT) == SHIFT)
14689		- {
14690		- mouseMode = mouseMode;
14691		- } else
14692		- {
14693		- mouseMode \|= ROTATE;
14694		- } // TRANSLATE;
	15128	+// if ((mod & SHIFT) == SHIFT)
	15129	+// {
	15130	+// mouseMode = mouseMode;
	15131	+// } else
	15132	+// {
	15133	+// mouseMode \|= ROTATE;
	15134	+// } // TRANSLATE;
14695	15135
	15136	+ targetLookAt.set(manipCamera.lookAt);
	15137	+
14696	15138	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
14697	15139	prevY = Y = anchorY;
14698	15140	}
..	..	@@ -14826,6 +15268,11 @@
14826	15268	if ((mouseMode & ZOOM) != 0)
14827	15269	{
14828	15270	//if ((mouseMode & BACKFORTH) != 0)
	15271	+ if ((modifiersex & SHIFT) == SHIFT)
	15272	+ {
	15273	+ ViewAngle(dy);
	15274	+ }
	15275	+ else
14829	15276	if ((mouseMode & VR) != 0)
14830	15277	manipCamera.BackForth(dx, dy, getWidth());
14831	15278	else
..	..	@@ -14896,6 +15343,9 @@
14896	15343
14897	15344	public void mouseMoved(MouseEvent e)
14898	15345	{
	15346	+//object.editWindow.frame.
	15347	+ setCursor(Cursor.getDefaultCursor());
	15348	+
14899	15349	//System.out.println("mouseMoved: " + e);
14900	15350	if (isRenderer)
14901	15351	return;
..	..	@@ -14924,6 +15374,12 @@
14924	15374
14925	15375	public void mouseReleased(MouseEvent e)
14926	15376	{
	15377	+ if (isRenderer && !movingcamera)
	15378	+ {
	15379	+ RigidBody.justclicked = true;
	15380	+ System.out.println("justclicked: " + e);
	15381	+ }
	15382	+
14927	15383	Globals.MOUSEDRAGGED = false;
14928	15384
14929	15385	movingcamera = false;
..	..	@@ -15080,8 +15536,10 @@
15080	15536	mouseMode \|= ZOOM;
15081	15537	}
15082	15538
15083		- boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
15084		- if (capsLocked) // \|\| (modifiers & META) == META)
	15539	+ //boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
	15540	+ boolean vr = capsLocked && !lightMode;
	15541	+
	15542	+ if (vr) // \|\| (modifiers & META) == META)
15085	15543	{
15086	15544	mouseMode \|= VR; // BACKFORTH;
15087	15545	}
..	..	@@ -15093,7 +15551,8 @@
15093	15551	{
15094	15552	mouseMode \|= SELECT;
15095	15553	}
15096		- if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
	15554	+ if (//(modifiersex & SHIFT) == SHIFT \|\|
	15555	+ forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
15097	15556	{
15098	15557	mouseMode &= ~VR;
15099	15558	mouseMode \|= TRANSLATE;
..	..	@@ -15137,8 +15596,18 @@
15137	15596	float SATPOW = 1; // 2; // 0.5f;
15138	15597	float BRIPOW = 1; // 0.5f; // 0.5f;
15139	15598
	15599	+static BufferedImage cursorImg = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB);
	15600	+
	15601	+// Create a new blank cursor.
	15602	+static Cursor blankCursor = Toolkit.getDefaultToolkit().createCustomCursor(
	15603	+ cursorImg, new Point(0, 0), "blank cursor");
	15604	+
15140	15605	public void keyPressed(int key)
15141	15606	{
	15607	+// Set the blank cursor to the JFrame.
	15608	+//object.editWindow.frame.
	15609	+ setCursor(blankCursor);
	15610	+
15142	15611	if (key >= '0' && key <= '5')
15143	15612	clampbit = (key-'0');
15144	15613
..	..	@@ -15195,8 +15664,8 @@
15195	15664	case 'K':
15196	15665	KOMPACTTEXTURE ^= true;
15197	15666	//textures.clear();
15198		- break;
15199		- case 'P': // Texture Projection macros
	15667	+ // break;
	15668	+ //case 'P': // Texture Projection macros
15200	15669	// SAVETEXTURE ^= true;
15201	15670	macromode = true;
15202	15671	Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
..	..	@@ -15297,8 +15766,8 @@
15297	15766	RevertCamera();
15298	15767	repaint();
15299	15768	break;
15300		- case 'l':
15301		- //case 'L':
	15769	+ //case 'l':
	15770	+ case 'L':
15302	15771	if (lightMode)
15303	15772	{
15304	15773	lightMode = false;
..	..	@@ -15317,7 +15786,7 @@
15317	15786	targetLookAt.set(manipCamera.lookAt);
15318	15787	repaint();
15319	15788	break;
15320		- case 'p':
	15789	+ case 'P': // p':
15321	15790	// c'est quoi ca au juste? spherical ^= true;
15322	15791	Skinshader ^= true; programInitialized = false;
15323	15792	repaint();
..	..	@@ -15328,7 +15797,8 @@
15328	15797	break;
15329	15798	case 'm':
15330	15799	{
15331		- PrintMemory();
	15800	+ //PrintMemory();
	15801	+ ToggleImageFlip();
15332	15802	break;
15333	15803	}
15334	15804	case 'M':
..	..	@@ -15355,14 +15825,14 @@
15355	15825	repaint();
15356	15826	break;
15357	15827	case 'O':
15358		- Globals.drawMode = OCCLUSION; // WARNING
15359		- repaint();
15360		- break;
	15828	+ // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
	15829	+ //repaint();
	15830	+ //break;
15361	15831	case 'o':
15362	15832	OCCLUSION_CULLING ^= true;
15363	15833	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
15364	15834	break;
15365		- case '0': envyoff ^= true; repaint(); break;
	15835	+ //case '0': envyoff ^= true; repaint(); break;
15366	15836	case '1':
15367	15837	case '2':
15368	15838	case '3':
..	..	@@ -15372,7 +15842,7 @@
15372	15842	case '7':
15373	15843	case '8':
15374	15844	case '9':
15375		- if (envyoff)
	15845	+ if (true) // envyoff)
15376	15846	{
15377	15847	BGcolor = (key - '1')/8.f;
15378	15848	}
..	..	@@ -15449,7 +15919,21 @@
15449	15919	// kompactbit = 6;
15450	15920	// break;
15451	15921	case ' ':
	15922	+ capsLocked ^= true;
	15923	+ repaint();
	15924	+ break;
	15925	+ case 'l':
15452	15926	lightMode ^= true;
	15927	+ if (lightMode)
	15928	+ {
	15929	+ keepshadow = Globals.RENDERSHADOW;
	15930	+ Globals.RENDERSHADOW = false;
	15931	+ }
	15932	+ else
	15933	+ {
	15934	+ Globals.RENDERSHADOW = keepshadow;
	15935	+ }
	15936	+
15453	15937	Globals.lighttouched = true;
15454	15938	manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
15455	15939	targetLookAt.set(manipCamera.lookAt);
..	..	@@ -15457,6 +15941,10 @@
15457	15941	break;
15458	15942	//case '`' :
15459	15943	case ESC:
	15944	+ if (FULLSCREEN)
	15945	+ object.editWindow.ToggleFullScreen();
	15946	+ break;
	15947	+ case 'p':
15460	15948	RENDERPROGRAM += 1;
15461	15949	RENDERPROGRAM %= 3;
15462	15950
..	..	@@ -15495,6 +15983,10 @@
15495	15983	case ENTER:
15496	15984	// object.editWindow.ScreenFit(); // Edit();
15497	15985	ToggleLive();
	15986	+ if (capsLocked)
	15987	+ {
	15988	+ Globals.WALK ^= true;
	15989	+ }
15498	15990	break;
15499	15991	case DELETE:
15500	15992	ClearSelection();
..	..	@@ -15531,17 +16023,23 @@
15531	16023	object.GetWindow().refreshContents(true);
15532	16024	break;
15533	16025	case '{':
15534		- manipCamera.shaper_fovy /= 1.1;
	16026	+ double factor = 1.1;
	16027	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16028	+ manipCamera.shaper_fovy /= factor;
15535	16029	System.out.println("FOV = " + manipCamera.shaper_fovy);
15536	16030	repaint();
15537	16031	break;
15538	16032	case '}':
15539		- manipCamera.shaper_fovy *= 1.1;
	16033	+ factor = 1.1;
	16034	+ if (manipCamera.shaper_fovy * factor < 150)
	16035	+ manipCamera.shaper_fovy *= factor;
15540	16036	System.out.println("FOV = " + manipCamera.shaper_fovy);
15541	16037	repaint();
15542	16038	break;
15543	16039	case '[':
15544		- manipCamera.shaper_fovy /= 1.01;
	16040	+ factor = 1.01;
	16041	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16042	+ manipCamera.shaper_fovy /= factor;
15545	16043	if (false) //manipCamera.hAspect == 0)
15546	16044	{
15547	16045	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -15557,7 +16055,9 @@
15557	16055	break;
15558	16056	case ']':
15559	16057	//manipCamera.shaper_fovy += (180 - manipCamera.shaper_fovy)*0.1;
15560		- manipCamera.shaper_fovy *= 1.01;
	16058	+ factor = 1.01;
	16059	+ if (manipCamera.shaper_fovy * factor < 150)
	16060	+ manipCamera.shaper_fovy *= factor;
15561	16061	if (false) //manipCamera.hAspect == 0)
15562	16062	{
15563	16063	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -15595,98 +16095,113 @@
15595	16095	}
15596	16096	}
15597	16097
	16098	+ boolean keys[] = new boolean[256];
	16099	+ int speedkey[] = new int[256];
	16100	+ int modifiers = 0;
	16101	+
15598	16102	public void processKeyEvent(KeyEvent e)
15599	16103	{
15600	16104	switch (e.getID())
15601	16105	{
15602	16106	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		- }
	16107	+ keys[e.getKeyCode()] = true;
	16108	+ modifiers = e.getModifiersEx();
	16109	+ keyPressed(e.getKeyChar(), modifiers);
	16110	+ //Globals.theRenderer.keyPressed(e.getKeyChar());
	16111	+ repaint();
15670	16112	break;
15671		- case KeyEvent.KEY_TYPED:
15672		- break;
	16113	+// if (!autorepeat)
	16114	+// {
	16115	+// //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
	16116	+// keyPressed(e.getKeyChar(), e.getModifiersEx());
	16117	+// }
	16118	+// if (manipCamera == lightCamera)
	16119	+// {
	16120	+// switch (e.getKeyCode())
	16121	+// {
	16122	+// case DOWN_ARROW:
	16123	+// lightCamera.DECAL /= 2;
	16124	+// repaint();
	16125	+// break;
	16126	+// case UP_ARROW:
	16127	+// lightCamera.DECAL *= 2;
	16128	+// repaint();
	16129	+// break;
	16130	+// case LEFT_ARROW:
	16131	+// lightCamera.SCALE /= 2;
	16132	+// repaint();
	16133	+// break;
	16134	+// case RIGHT_ARROW:
	16135	+// lightCamera.SCALE *= 2;
	16136	+// repaint();
	16137	+// break;
	16138	+// default:
	16139	+// break;
	16140	+// }
	16141	+//
	16142	+// System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
	16143	+// } else
	16144	+// {
	16145	+// if (true) // !autorepeat)
	16146	+// {
	16147	+// boolean reset = true;
	16148	+//
	16149	+// switch (e.getKeyCode())
	16150	+// {
	16151	+// case DOWN_ARROW:
	16152	+// GoDown(e.getModifiersEx());
	16153	+// repaint();
	16154	+// break;
	16155	+// case UP_ARROW:
	16156	+// GoUp(e.getModifiersEx());
	16157	+// repaint();
	16158	+// break;
	16159	+// case LEFT_ARROW:
	16160	+// GoLeft(e.getModifiersEx());
	16161	+// repaint();
	16162	+// break;
	16163	+// case RIGHT_ARROW:
	16164	+// GoRight(e.getModifiersEx());
	16165	+// repaint();
	16166	+// break;
	16167	+// default:
	16168	+// reset = false;
	16169	+// break;
	16170	+// }
	16171	+//
	16172	+// if (reset)
	16173	+// {
	16174	+// autorepeat = true;
	16175	+//
	16176	+// targetLookAt.set(manipCamera.lookAt);
	16177	+// }
	16178	+// }
	16179	+// }
	16180	+// break;
	16181	+// case KeyEvent.KEY_TYPED:
	16182	+// break;
15673	16183	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		- }
	16184	+ keys[e.getKeyCode()] = false;
	16185	+ modifiers = e.getModifiersEx();
15687	16186	keyReleased(e.getKeyChar(), e.getModifiersEx());
	16187	+ repaint();
15688	16188	break;
15689		- }
	16189	+// {
	16190	+// switch (e.getKeyCode())
	16191	+// {
	16192	+// case DOWN_ARROW:
	16193	+// case UP_ARROW:
	16194	+// case LEFT_ARROW:
	16195	+// case RIGHT_ARROW:
	16196	+// MODIFIERS &= ~COMMAND;
	16197	+// autorepeat = false;
	16198	+// break;
	16199	+// default:
	16200	+// break;
	16201	+// }
	16202	+// keyReleased(e.getKeyChar(), e.getModifiersEx());
	16203	+// break;
	16204	+// }
15690	16205	default:
15691	16206	break;
15692	16207	}
..	..	@@ -16077,14 +16592,14 @@
16077	16592	{
16078	16593	switch (hitSomething)
16079	16594	{
16080		- case Object3D.hitCenter: gr.setColor(Color.pink);
	16595	+ case Object3D.hitCenter: gr.setColor(Color.white);
16081	16596	gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
16082	16597	break;
16083	16598	case Object3D.hitRotate: gr.setColor(Color.yellow);
16084	16599	gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
16085	16600	break;
16086	16601	case Object3D.hitScale: gr.setColor(Color.cyan);
16087		- gr.drawLine(X, Y, 0, 0);
	16602	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
16088	16603	break;
16089	16604	}
16090	16605
..	..	@@ -16103,7 +16618,7 @@
16103	16618	if (hasMarquee)
16104	16619	{
16105	16620	gr.setXORMode(Color.white);
16106		- gr.setColor(Color.red);
	16621	+ gr.setColor(Color.white);
16107	16622	if (!firstime)
16108	16623	{
16109	16624	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -16262,7 +16777,8 @@
16262	16777
16263	16778	public boolean mouseDrag(Event evt, int x, int y)
16264	16779	{
16265		- //System.out.println("mouseDrag: " + evt);
	16780	+ System.out.println("mouseDrag: " + evt);
	16781	+ System.exit(0);
16266	16782	/*
16267	16783	drag = true;
16268	16784	//System.out.println("Mouse DRAG");
..	..	@@ -16381,6 +16897,7 @@
16381	16897	public boolean mouseUp(Event evt, int x, int y)
16382	16898	{
16383	16899	System.out.println("mouseUp: " + evt);
	16900	+ System.exit(0);
16384	16901	/*
16385	16902	locked = false;
16386	16903	if (isRenderer)
..	..	@@ -16570,6 +17087,8 @@
16570	17087	private /static/ boolean firstime;
16571	17088	private /static/ cVector newView = new cVector();
16572	17089	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	17090	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	17091	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
16573	17092	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16574	17093	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16575	17094	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16582,22 +17101,56 @@
16582	17101	{
16583	17102	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16584	17103
	17104	+ int usedsuf = 0;
	17105	+
16585	17106	for (int i = 0; i < suffixes.length; i++)
16586	17107	{
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)
	17108	+ String[] suffixe = suffixes;
	17109	+ String[] fallback = suffixes2;
	17110	+ String[] fallfallback = suffixes3;
	17111	+
	17112	+ for (int c=usedsuf; --c>=0;)
16592	17113	{
16593		- throw new IOException("Unable to load texture " + resourceName);
	17114	+// String[] temp = suffixe;
	17115	+// suffixe = fallback;
	17116	+// fallback = fallfallback;
	17117	+// fallfallback = temp;
16594	17118	}
	17119	+
	17120	+ String resourceName = basename + suffixe[i] + "." + suffix;
	17121	+ TextureData data;
	17122	+
	17123	+ try
	17124	+ {
	17125	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	17126	+ mipmapped,
	17127	+ FileUtil.getFileSuffix(resourceName));
	17128	+ }
	17129	+ catch (Exception e)
	17130	+ {
	17131	+ try
	17132	+ {
	17133	+ resourceName = basename + fallback[i] + "." + suffix;
	17134	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	17135	+ mipmapped,
	17136	+ FileUtil.getFileSuffix(resourceName));
	17137	+ }
	17138	+ catch (Exception e2)
	17139	+ {
	17140	+ resourceName = basename + fallfallback[i] + "." + suffix;
	17141	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	17142	+ mipmapped,
	17143	+ FileUtil.getFileSuffix(resourceName));
	17144	+ }
	17145	+ }
	17146	+
16595	17147	//System.out.println("Target = " + targets[i]);
16596	17148	cubemap.updateImage(data, targets[i]);
16597	17149	}
16598	17150
16599	17151	return cubemap;
16600	17152	}
	17153	+
16601	17154	int bigsphere = -1;
16602	17155
16603	17156	float BGcolor = 0.5f;
..	..	@@ -16606,14 +17159,16 @@
16606	17159
16607	17160	private void DrawSkyBox(GL gl, float ratio)
16608	17161	{
16609		- if (envyoff \|\| cubemap == null)
	17162	+ if (//envyoff \|\|
	17163	+ WIREFRAME \|\|
	17164	+ cubemap == null)
16610	17165	{
16611	17166	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16612	17167	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
16613	17168	return;
16614	17169	}
16615	17170
16616		- if (WIREFRAME)
	17171	+ //if (WIREFRAME)
16617	17172	gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL);
16618	17173
16619	17174	gl.glDisable(gl.GL_CULL_FACE);
..	..	@@ -16623,14 +17178,14 @@
16623	17178	gl.glLoadIdentity();
16624	17179	gl.glScalef(1,ratio,1);
16625	17180
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);
	17181	+// colorV[0] = 2;
	17182	+// colorV[1] = 2;
	17183	+// colorV[2] = 2;
	17184	+// colorV[3] = 1;
	17185	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	17186	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	17187	+//
	17188	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
16634	17189
16635	17190	//gl.glActiveTexture(GL.GL_TEXTURE1);
16636	17191	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
..	..	@@ -16644,7 +17199,7 @@
16644	17199	// GL_NORMAL_MAP texgen mode. Temporarily enabling lighting
16645	17200	// causes the normals to be sent down. Thanks to Ken Dyke.
16646	17201	//gl.glEnable(GL.GL_LIGHTING);
16647		- gl.glEnable(GL.GL_LIGHTING);
	17202	+ gl.glDisable(GL.GL_LIGHTING);
16648	17203
16649	17204	gl.glTexGeni(GL.GL_S, GL.GL_TEXTURE_GEN_MODE, GL.GL_NORMAL_MAP);
16650	17205	gl.glTexGeni(GL.GL_T, GL.GL_TEXTURE_GEN_MODE, GL.GL_NORMAL_MAP);
..	..	@@ -16663,6 +17218,7 @@
16663	17218	{
16664	17219	gl.glScalef(1.0f, -1.0f, 1.0f);
16665	17220	}
	17221	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16666	17222	gl.glMultMatrixd(viewrot_1, 0);
16667	17223	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16668	17224	//viewer.updateInverseRotation(gl);
..	..	@@ -16703,7 +17259,8 @@
16703	17259	gl.glDisable(GL.GL_TEXTURE_GEN_R);
16704	17260
16705	17261	cubemap.disable();
16706		- ////cubemap.unbind();
	17262	+ //cubemap.dispose();
	17263	+
16707	17264	if (CULLFACE)
16708	17265	{
16709	17266	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -16711,6 +17268,8 @@
16711	17268
16712	17269	if (WIREFRAME)
16713	17270	gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_LINE);
	17271	+ else
	17272	+ gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL);
16714	17273	}
16715	17274
16716	17275	private void DrawChecker(GL gl)
..	..	@@ -16759,7 +17318,7 @@
16759	17318	gl.glScalef(1.0f, -1.0f, 1.0f);
16760	17319	}
16761	17320
16762		- gl.glNormal3f(0.0f, 0.0f, 1.0f);
	17321	+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
16763	17322
16764	17323	float step = 2; // 0.1666f; //0.25f;
16765	17324	float stepv = 2; // step * 1652 / 998;
..	..	@@ -17048,7 +17607,7 @@
17048	17607
17049	17608	float depth = depths[y * TEX_SIZE + x];
17050	17609
17051		- if (pointselection && mouseMode == SELECT && depth != 0 && depth != 1)
	17610	+ if (pointselection && (mouseMode & SELECT) == SELECT && depth != 0 && depth != 1)
17052	17611	{
17053	17612	pointselection = false;
17054	17613
..	..	@@ -17239,6 +17798,7 @@
17239	17798
17240	17799	public void init(GLAutoDrawable drawable)
17241	17800	{
	17801	+ if (Globals.DEBUG)
17242	17802	System.out.println("shadow buffer init");
17243	17803
17244	17804	GL gl = drawable.getGL();
..	..	@@ -17467,10 +18027,14 @@
17467	18027	gl.glFlush();
17468	18028
17469	18029	/**/
17470		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
	18030	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
17471	18031
17472		- float[] pixels = occlusionsizebuffer.array();
	18032	+ float[] depths = occlusiondepthbuffer.array();
17473	18033
	18034	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
	18035	+
	18036	+ int[] pixels = selectsizebuffer.array();
	18037	+
17474	18038	double r = 0, g = 0, b = 0;
17475	18039
17476	18040	double count = 0;
..	..	@@ -17481,7 +18045,7 @@
17481	18045
17482	18046	double FACTOR = 1;
17483	18047
17484		- for (int i = 0; i < pixels.length; i++)
	18048	+ for (int i = 0; i < depths.length; i++)
17485	18049	{
17486	18050	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
17487	18051	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -17564,7 +18128,7 @@
17564	18128
17565	18129	double scale = ray.z; // 1; // cos
17566	18130
17567		- float depth = pixels[newindex];
	18131	+ float depth = depths[newindex];
17568	18132
17569	18133	/*
17570	18134	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -17707,6 +18271,11 @@
17707	18271	static boolean DEBUG_SELECTION = false;
17708	18272	boolean OCCLUSION_CULLING = false; //true;
17709	18273	public boolean lightMode = false;
	18274	+
	18275	+ private boolean keepshadow;
	18276	+
	18277	+ static public boolean capsLocked = false; // VR
	18278	+
17710	18279	static public int indexcount = 0;
17711	18280	/static/ cColor vertexOcclusion = new cColor();
17712	18281	//private int selection_view = -1;
..	..	@@ -17761,11 +18330,14 @@
17761	18330	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17762	18331	static IntBuffer bigAAbuffer;
17763	18332	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17764		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	18333	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17765	18334	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17766	18335	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17767	18336	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17768		- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	18337	+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	18338	+
	18339	+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	18340	+
17769	18341	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17770	18342	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17771	18343	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();