~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
..	..	@@ -187,6 +192,19 @@
187	192	}
188	193
189	194	private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	195	+
	196	+ public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	197	+ {
	198	+ try
	199	+ {
	200	+ return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	201	+ } catch (IOException e)
	202	+ {
	203	+ System.out.println("NAME = " + name);
	204	+ e.printStackTrace(); // throw new RuntimeException(e);
	205	+ return null;
	206	+ }
	207	+ }
190	208
191	209	void SetAsGLRenderer(boolean b)
192	210	{
..	..	@@ -204,9 +222,10 @@
204	222	cameras = new Camera[2];
205	223	targetLookAts = new cVector[2];
206	224
207		- SetCamera(cam);
	225	+ SetCamera(cam, true);
208	226
209		- SetLight(new Camera(new cVector(10, 10, -20)));
	227	+ // Warning: not used.
	228	+ //SetLight(new Camera(new cVector(15, 10, -20)));
210	229
211	230	object = o;
212	231
..	..	@@ -231,7 +250,7 @@
231	250
232	251	public javax.media.opengl.GL GetGL0()
233	252	{
234		- return null;
	253	+ return currentGL;
235	254	}
236	255
237	256	public int GenList()
..	..	@@ -524,7 +543,8 @@
524	543	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
525	544	LA.vecCross(obj.v0, obj.v1, obj.v2);
526	545	LA.vecNormalize(obj.v2);
527		- 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);
528	548	}
529	549
530	550	// P
..	..	@@ -546,7 +566,7 @@
546	566	y += ny * obj.NORMALPUSH;
547	567	z += nz * obj.NORMALPUSH;
548	568
549		- gl.glNormal3f(nx, ny, nz);
	569	+ SetGLNormal(gl, nx, ny, nz);
550	570	}
551	571	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
552	572	SetColor(obj, pv);
..	..	@@ -578,7 +598,7 @@
578	598	y += ny * obj.NORMALPUSH;
579	599	z += nz * obj.NORMALPUSH;
580	600
581		- gl.glNormal3f(nx, ny, nz);
	601	+ SetGLNormal(gl, nx, ny, nz);
582	602	}
583	603	//System.out.println("vertexq = " + qv.s + ", " + qv.t);
584	604	// boolean locked = false;
..	..	@@ -626,7 +646,7 @@
626	646	y += ny * obj.NORMALPUSH;
627	647	z += nz * obj.NORMALPUSH;
628	648
629		- gl.glNormal3f(nx, ny, nz);
	649	+ SetGLNormal(gl, nx, ny, nz);
630	650	}
631	651
632	652	// if ((dot&4) == 0)
..	..	@@ -862,7 +882,7 @@
862	882	//// tris.postdraw(this);
863	883	}
864	884
865		- static Camera localcamera = new Camera();
	885	+ static Camera localAOcamera = new Camera();
866	886	static cVector from = new cVector();
867	887	static cVector to = new cVector();
868	888
..	..	@@ -871,7 +891,7 @@
871	891	CameraPane cp = this;
872	892
873	893	Camera keep = cp.RenderCamera();
874		- cp.renderCamera = localcamera;
	894	+ cp.renderCamera = localAOcamera;
875	895
876	896	if (br.trimmed)
877	897	{
..	..	@@ -889,7 +909,7 @@
889	909	br.positions[i3 + 2] + br.normals[i3 + 2]);
890	910	LA.xformPos(from, transform, from);
891	911	LA.xformPos(to, transform, to); // RIGID ONLY
892		- localcamera.setAim(from, to);
	912	+ localAOcamera.setAim(from, to);
893	913
894	914	CameraPane.occlusionbuffer.display();
895	915
..	..	@@ -923,7 +943,7 @@
923	943	to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
924	944	LA.xformPos(from, transform, from);
925	945	LA.xformPos(to, transform, to); // RIGID ONLY
926		- localcamera.setAim(from, to);
	946	+ localAOcamera.setAim(from, to);
927	947
928	948	CameraPane.occlusionbuffer.display();
929	949
..	..	@@ -1232,10 +1252,10 @@
1232	1252	{
1233	1253	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1234	1254	{
1235		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1255	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1236	1256	} else
1237	1257	{
1238		- gl.glNormal3f(0, 0, 1);
	1258	+ SetGLNormal(gl, 0, 0, 1);
1239	1259	}
1240	1260
1241	1261	if (c != null)
..	..	@@ -1259,10 +1279,10 @@
1259	1279	{
1260	1280	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1261	1281	{
1262		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1282	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1263	1283	} else
1264	1284	{
1265		- gl.glNormal3f(0, 0, 1);
	1285	+ SetGLNormal(gl, 0, 0, 1);
1266	1286	}
1267	1287	if (c != null)
1268	1288	{
..	..	@@ -1287,10 +1307,10 @@
1287	1307	{
1288	1308	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1289	1309	{
1290		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1310	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1291	1311	} else
1292	1312	{
1293		- gl.glNormal3f(0, 0, 1);
	1313	+ SetGLNormal(gl, 0, 0, 1);
1294	1314	}
1295	1315	if (c != null)
1296	1316	{
..	..	@@ -1472,7 +1492,7 @@
1472	1492	{
1473	1493	if (!selectmode)
1474	1494	{
1475		- 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);
1476	1496	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
1477	1497
1478	1498	if (flipV)
..	..	@@ -1484,6 +1504,8 @@
1484	1504	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1485	1505	}
1486	1506
	1507	+ float[] colorV = new float[4];
	1508	+
1487	1509	void SetColor(Object3D obj, Vertex p0)
1488	1510	{
1489	1511	CameraPane display = this;
..	..	@@ -1508,7 +1530,7 @@
1508	1530	}
1509	1531	}
1510	1532	float b = 0;
1511		- if (obj.support != null && obj.link2master)
	1533	+ if (obj.support != null && obj.Link2Support())
1512	1534	{
1513	1535	b = 1;
1514	1536	}
..	..	@@ -1551,8 +1573,6 @@
1551	1573	{
1552	1574	return;
1553	1575	}
1554		-
1555		- float[] colorV = new float[3];
1556	1576
1557	1577	if (false) // marked)
1558	1578	{
..	..	@@ -1801,7 +1821,7 @@
1801	1821
1802	1822	display.modelParams7[0] = 0;
1803	1823	display.modelParams7[1] = 1000;
1804		- display.modelParams7[2] = 0;
	1824	+ display.modelParams7[2] = material.parallax;
1805	1825	display.modelParams7[3] = 0;
1806	1826
1807	1827	//display.modelParams6[0] = 100; // criss de bug de bump
..	..	@@ -2034,9 +2054,9 @@
2034	2054	switch(viewcode)
2035	2055	{
2036	2056	case 0: return "main";
2037		- case 1: return "one";
2038		- case 2: return "two";
2039		- case 3: return "three";
	2057	+ case 1: return "Red";
	2058	+ case 2: return "Green";
	2059	+ case 3: return "Blue";
2040	2060	case 4: return "light";
2041	2061	}
2042	2062
..	..	@@ -2045,7 +2065,7 @@
2045	2065
2046	2066	static int camerachangeframe;
2047	2067
2048		- public boolean SetCamera(Camera cam)
	2068	+ public boolean SetCamera(Camera cam, boolean set)
2049	2069	{
2050	2070	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
2051	2071	// return false;
..	..	@@ -2063,7 +2083,8 @@
2063	2083
2064	2084	camerachangeframe = Globals.framecount;
2065	2085
2066		- cam.hAspect = -1; // Read only
	2086	+ if (cam != null)
	2087	+ cam.hAspect = -1; // Read only
2067	2088
2068	2089	cameras[0] = cam;
2069	2090	targetLookAts[0] = new cVector(cam.lookAt);
..	..	@@ -2073,11 +2094,14 @@
2073	2094	{
2074	2095	cameras[i] = new Camera(cam.viewCode);
2075	2096	}
2076		-
2077		- cameras[i].setAim(cam.location, cam.lookAt);
2078		- cameras[i].shaper_fovy = cam.shaper_fovy;
2079		- cameras[i].UP.set(cam.UP);
2080		- 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	+ }
2081	2105	}
2082	2106	cameracount = 0;
2083	2107	targetLookAt = targetLookAts[cameracount];
..	..	@@ -2086,7 +2110,7 @@
2086	2110	// Start with free camera
2087	2111	SwitchCameras(true);
2088	2112
2089		- pingthread.jump = true; // optional?
	2113	+// pingthread.jump = true; // optional?
2090	2114
2091	2115	if (TRACKONCE)
2092	2116	{
..	..	@@ -2273,18 +2297,6 @@
2273	2297	public void ToggleTrack()
2274	2298	{
2275	2299	TRACK ^= true;
2276		- if (TRACK)
2277		- {
2278		- if (object.selection != null &&
2279		- object.selection.size() > 0 &&
2280		- object.selection.elementAt(0) != null &&
2281		- !(object.selection.elementAt(0) instanceof Camera) &&
2282		- !(object.selection.elementAt(0) instanceof ScriptNode))
2283		- {
2284		- trackedobject = object.selection.elementAt(0);
2285		- repaint();
2286		- }
2287		- }
2288	2300
2289	2301	repaint();
2290	2302	}
..	..	@@ -2376,7 +2388,8 @@
2376	2388	{
2377	2389	//System.out.println("PROTECTION = " + cam.hAspect);
2378	2390	//assert (cam.hAspect == 0);
2379		- cam.hAspect = 0;
	2391	+ if (cam != null)
	2392	+ cam.hAspect = 0;
2380	2393	lightCamera = cam;
2381	2394	}
2382	2395
..	..	@@ -2457,6 +2470,18 @@
2457	2470	return CreateBim(bytes, width, height);
2458	2471	}
2459	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	+
2460	2485	/**/
2461	2486	class CacheTexture
2462	2487	{
..	..	@@ -2499,7 +2524,7 @@
2499	2524	com.sun.opengl.util.texture.TextureIO.newTextureData(
2500	2525	getClass().getClassLoader().getResourceAsStream(name),
2501	2526	true,
2502		- com.sun.opengl.util.texture.TextureIO.PNG);
	2527	+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
2503	2528	} catch (java.io.IOException e)
2504	2529	{
2505	2530	throw new javax.media.opengl.GLException(e);
..	..	@@ -3565,6 +3590,8 @@
3565	3590	};
3566	3591	/**/
3567	3592
	3593	+ static Object3D lastObject;
	3594	+
3568	3595	//com.sun.opengl.util.texture.Texture
3569	3596	TextureData
3570	3597	GetFileTexture(String name, boolean bump, int resolution)
..	..	@@ -3601,6 +3628,8 @@
3601	3628	// return null;
3602	3629	//if (i == 2)
3603	3630	// return null;
	3631	+ // TIFF issue sept 2019
	3632	+ System.err.println("lastObject = " + lastObject);
3604	3633	e.printStackTrace();
3605	3634	name = name.split("\\.tif")[0] + ".jpg";
3606	3635	}
..	..	@@ -6933,30 +6962,30 @@
6933	6962	short residu = 0;
6934	6963
6935	6964	// wraparound workarounds
6936		- short fuck = (short) (buffer[i] & 0xFF);
	6965	+ short ww = (short) (buffer[i] & 0xFF);
6937	6966	/*
6938		- residu += (fuck%2);
6939		- if(fuck/2 < 256-residu/2)
	6967	+ residu += (ww%2);
	6968	+ if(ww/2 < 256-residu/2)
6940	6969	{
6941		- fuck = (short)((fuck/2) + residu/2);
	6970	+ ww = (short)((ww/2) + residu/2);
6942	6971	if(residu == 2)
6943	6972	residu = 0;
6944	6973	}
6945	6974	else
6946	6975	{
6947	6976	residu = 0;
6948		- fuck /= 2;
	6977	+ ww /= 2;
6949	6978	}
6950	6979	*/
6951		- if (i < imglength / 3 \|\| rnd.nextFloat() < 0.5 \|\| fuck >= 254)
	6980	+ if (i < imglength / 3 \|\| rnd.nextFloat() < 0.5 \|\| ww >= 254)
6952	6981	{
6953		- fuck /= 2;
	6982	+ ww /= 2;
6954	6983	} else
6955	6984	{
6956		- fuck = (short) ((fuck / 2) + fuck % 2);
	6985	+ ww = (short) ((ww / 2) + ww % 2);
6957	6986	}
6958	6987
6959		- buffer[i] = (byte) fuck;
	6988	+ buffer[i] = (byte) ww;
6960	6989	}
6961	6990	//System.out.print(bytes[i] + " ");
6962	6991	//if(buffer[i] >= 0 && buffer[i]<=eps-1) buffer[i] = eps;
..	..	@@ -8345,7 +8374,7 @@
8345	8374	// else
8346	8375	// if (!texname.startsWith("/"))
8347	8376	// texname = "/Users/nbriere/Textures/" + texname;
8348		- if (!FileExists(texname))
	8377	+ if (!FileExists(texname) && !texname.startsWith("@"))
8349	8378	{
8350	8379	texname = fallbackTextureName;
8351	8380	}
..	..	@@ -8423,7 +8452,16 @@
8423	8452	{
8424	8453	// texturecache = textures.get(texname); // suspicious
8425	8454	if (texturecache == null)
8426		- 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);
8427	8465	else
8428	8466	new Exception().printStackTrace();
8429	8467	} else
..	..	@@ -8487,6 +8525,7 @@
8487	8525	texturecache = new CacheTexture(texturedata,resolution);
8488	8526	//texture = GetTexture(tex, bump);
8489	8527	}
	8528	+ }
8490	8529	}
8491	8530	//}
8492	8531	}
..	..	@@ -8601,7 +8640,9 @@
8601	8640	{
8602	8641	tex.bw = texturecache.texturedata.getWidth();
8603	8642	tex.bh = texturecache.texturedata.getHeight();
8604		- 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);
8605	8646	}
8606	8647	}
8607	8648	}
..	..	@@ -8755,10 +8796,12 @@
8755	8796
8756	8797	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8757	8798	MAXSTACK = temp[0];
8758		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8799	+ if (Globals.DEBUG)
	8800	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8759	8801	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8760	8802	MAXSTACK = temp[0];
8761		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8803	+ if (Globals.DEBUG)
	8804	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8762	8805
8763	8806	// Use debug pipeline
8764	8807	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8766,7 +8809,8 @@
8766	8809	gl = drawable.getGL(); //
8767	8810
8768	8811	GL gl3 = getGL();
8769		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8812	+ if (Globals.DEBUG)
	8813	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8770	8814
8771	8815
8772	8816	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8931,7 +8975,7 @@
8931	8975
8932	8976	if (cubemap == null)
8933	8977	{
8934		- LoadEnvy(5);
	8978	+ //LoadEnvy(1);
8935	8979	}
8936	8980
8937	8981	//cubemap.enable();
..	..	@@ -9207,6 +9251,8 @@
9207	9251
9208	9252	void LoadEnvy(int which)
9209	9253	{
	9254	+ assert(false);
	9255	+
9210	9256	String name;
9211	9257	String ext;
9212	9258
..	..	@@ -9218,37 +9264,58 @@
9218	9264	cubemap = null;
9219	9265	return;
9220	9266	case 1:
9221		- name = "cubemaps/box_";
9222		- ext = "png";
	9267	+ name = "cubemaps/rgb/";
	9268	+ ext = "jpg";
9223	9269	reverseUP = false;
9224	9270	break;
9225	9271	case 2:
9226		- name = "cubemaps/uffizi_";
9227		- ext = "png";
9228		- break; // reverseUP = true; break;
	9272	+ name = "cubemaps/uffizi/";
	9273	+ ext = "jpg";
	9274	+ reverseUP = false;
	9275	+ break;
9229	9276	case 3:
9230		- name = "cubemaps/CloudyHills_";
9231		- ext = "tga";
	9277	+ name = "cubemaps/CloudyHills/";
	9278	+ ext = "jpg";
9232	9279	reverseUP = false;
9233	9280	break;
9234	9281	case 4:
9235		- name = "cubemaps/cornell_";
	9282	+ name = "cubemaps/cornell/";
9236	9283	ext = "png";
9237	9284	reverseUP = false;
9238	9285	break;
	9286	+ case 5:
	9287	+ name = "cubemaps/skycube/";
	9288	+ ext = "jpg";
	9289	+ reverseUP = false;
	9290	+ break;
	9291	+ case 6:
	9292	+ name = "cubemaps/SaintLazarusChurch3/";
	9293	+ ext = "jpg";
	9294	+ reverseUP = false;
	9295	+ break;
	9296	+ case 7:
	9297	+ name = "cubemaps/Sodermalmsallen/";
	9298	+ ext = "jpg";
	9299	+ reverseUP = false;
	9300	+ break;
	9301	+ case 8:
	9302	+ name = "cubemaps/Sodermalmsallen2/";
	9303	+ ext = "jpg";
	9304	+ reverseUP = false;
	9305	+ break;
	9306	+ case 9:
	9307	+ name = "cubemaps/UnionSquare/";
	9308	+ ext = "jpg";
	9309	+ reverseUP = false;
	9310	+ break;
9239	9311	default:
9240		- name = "cubemaps/rgb_";
9241		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9312	+ name = "cubemaps/box/";
	9313	+ ext = "png"; /mipmap = true;/
	9314	+ reverseUP = false;
9242	9315	break;
9243	9316	}
9244		-
9245		- try
9246		- {
9247		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9248		- } catch (IOException e)
9249		- {
9250		- throw new RuntimeException(e);
9251		- }
	9317	+
	9318	+ LoadSkybox(name, ext, mipmap);
9252	9319	}
9253	9320
9254	9321	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -9280,8 +9347,12 @@
9280	9347	static double[] model = new double[16];
9281	9348	double[] camera2light = new double[16];
9282	9349	double[] light2camera = new double[16];
9283		- int newenvy = -1;
9284		- boolean envyoff = true; // false;
	9350	+
	9351	+ //int newenvy = -1;
	9352	+ //boolean envyoff = false;
	9353	+
	9354	+ String loadedskyboxname;
	9355	+
9285	9356	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
9286	9357	//float[] light0 = { 0,0,0 };
9287	9358	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9699,7 +9770,7 @@
9699	9770
9700	9771	if (renderCamera != lightCamera)
9701	9772	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9702		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9773	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9703	9774
9704	9775	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9705	9776
..	..	@@ -9715,7 +9786,7 @@
9715	9786
9716	9787	if (renderCamera != lightCamera)
9717	9788	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9718		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9789	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9719	9790
9720	9791	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9721	9792
..	..	@@ -9761,13 +9832,18 @@
9761	9832	rati = 1 / rati;
9762	9833	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9763	9834	}
9764		- assert (newenvy == -1);
	9835	+
	9836	+ //assert (newenvy == -1);
	9837	+
9765	9838	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9766	9839	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9767		- DrawSkyBox(gl);
	9840	+ DrawSkyBox(gl, (float)rati);
9768	9841	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9769	9842	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9770		- accPerspective(gl, renderCamera.shaper_fovy / ratio,
	9843	+
	9844	+ boolean vr = capsLocked && !lightMode;
	9845	+
	9846	+ accPerspective(gl, renderCamera.shaper_fovy / ratio * (vr ? 1.2 : 1),
9771	9847	ratio,
9772	9848	//near_plane, far_plane,
9773	9849	renderCamera.shaper_zNear * renderCamera.Distance(), renderCamera.shaper_zFar * renderCamera.Distance(),
..	..	@@ -10630,9 +10706,18 @@
10630	10706	static boolean init = false;
10631	10707
10632	10708	double[][] matrix = LA.newMatrix();
	10709	+
	10710	+ // This is to refresh the UI of the material panel.
	10711	+ ObjEditor patchMaterial;
10633	10712
10634	10713	public void display(GLAutoDrawable drawable)
10635	10714	{
	10715	+ if (patchMaterial.patchMaterial)
	10716	+ {
	10717	+ patchMaterial.patchMaterial = false;
	10718	+ patchMaterial.objectTabbedPane.setSelectedIndex(1);
	10719	+ }
	10720	+
10636	10721	if (Grafreed.savesound && Grafreed.hassound)
10637	10722	{
10638	10723	Grafreed.wav.save();
..	..	@@ -10676,7 +10761,9 @@
10676	10761	}
10677	10762	/**/
10678	10763
10679		- if (selection)
	10764	+ boolean control = ((modifiers & CTRL) != 0);
	10765	+
	10766	+ if (selection && (!Globals.isLIVE() \|\| control))
10680	10767	{
10681	10768	selectbuffer.display();
10682	10769	return;
..	..	@@ -10728,6 +10815,112 @@
10728	10815
10729	10816	if (DrawMode() == DEFAULT)
10730	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	+
10731	10924	currentlydrawing = true;
10732	10925	}
10733	10926
..	..	@@ -10801,7 +10994,7 @@
10801	10994
10802	10995	if (wait)
10803	10996	{
10804		- Sleep(500);
	10997	+ Sleep(200); // blocks everything
10805	10998
10806	10999	wait = false;
10807	11000	}
..	..	@@ -10916,7 +11109,7 @@
10916	11109	// if (parentcam != renderCamera) // not a light
10917	11110	if (cam != lightCamera)
10918	11111	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10919		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	11112	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10920	11113
10921	11114	for (int j = 0; j < 4; j++)
10922	11115	{
..	..	@@ -10931,7 +11124,7 @@
10931	11124	// if (parentcam != renderCamera) // not a light
10932	11125	if (cam != lightCamera)
10933	11126	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10934		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	11127	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10935	11128
10936	11129	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10937	11130
..	..	@@ -11017,13 +11210,43 @@
11017	11210	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
11018	11211	}
11019	11212
11020		- if (newenvy > -1)
	11213	+// if (newenvy > -1)
	11214	+// {
	11215	+// LoadEnvy(newenvy);
	11216	+// }
	11217	+//
	11218	+// newenvy = -1;
	11219	+
	11220	+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
11021	11221	{
11022		- LoadEnvy(newenvy);
	11222	+ if (cubemaprgb == null)
	11223	+ {
	11224	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
	11225	+ }
	11226	+
	11227	+ cubemap = cubemaprgb;
11023	11228	}
11024		-
11025		- newenvy = -1;
11026		-
	11229	+ else
	11230	+ {
	11231	+ if (object.skyboxname != null)
	11232	+ {
	11233	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11234	+ {
	11235	+ if (cubemap != null && cubemap != cubemaprgb)
	11236	+ cubemap.dispose();
	11237	+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11238	+ loadedskyboxname = object.skyboxname;
	11239	+ }
	11240	+ }
	11241	+ else
	11242	+ {
	11243	+ cubemapcustom = null;
	11244	+ loadedskyboxname = null;
	11245	+ }
	11246	+
	11247	+ cubemap = cubemapcustom;
	11248	+ }
	11249	+
11027	11250	ratio = ((double) getWidth()) / getHeight();
11028	11251	//System.out.println("ratio = " + ratio);
11029	11252
..	..	@@ -11039,7 +11262,7 @@
11039	11262
11040	11263	if (!IsFrozen() && !ambientOcclusion)
11041	11264	{
11042		- DrawSkyBox(gl);
	11265	+ DrawSkyBox(gl, (float)ratio);
11043	11266	}
11044	11267
11045	11268	//if (selection_view == -1)
..	..	@@ -11222,9 +11445,9 @@
11222	11445
11223	11446	gl.glMatrixMode(GL.GL_MODELVIEW);
11224	11447
11225		-gl.glEnable(gl.GL_POLYGON_SMOOTH);
11226		-gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
11227		-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);
11228	11451	} else
11229	11452	{
11230	11453	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -11285,7 +11508,10 @@
11285	11508	//gl.glOrtho(-BOOST, BOOST, -BOOST, BOOST, 0.001, 1000);
11286	11509	} else
11287	11510	{
11288		- 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());
11289	11515	}
11290	11516	}
11291	11517
..	..	@@ -11325,7 +11551,7 @@
11325	11551
11326	11552	// if (cam != lightCamera)
11327	11553	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11328		- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
	11554	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
11329	11555	}
11330	11556
11331	11557	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -11641,8 +11867,11 @@
11641	11867	repaint();
11642	11868	}
11643	11869
11644		- if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
	11870	+ if (Globals.isLIVE() && DrawMode() == DEFAULT \|\| pingthread.live) // may 2013
	11871	+ {
	11872	+ renderCamera.computeTransform();
11645	11873	repaint();
	11874	+ }
11646	11875
11647	11876	displaydone = true;
11648	11877	}
..	..	@@ -11717,9 +11946,23 @@
11717	11946	//GL gl = getGL();
11718	11947	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11719	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	+ }
11720	11963	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11721	11964	object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11722		- pingthread.StepToTarget(true); // true);
	11965	+ pingthread.StepToTarget(); // true);
11723	11966	// zoomonce = false;
11724	11967	}
11725	11968
..	..	@@ -12399,8 +12642,82 @@
12399	12642
12400	12643	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12401	12644
12402		- String program =
	12645	+ String programmin =
	12646	+ // Min shader
12403	12647	"!!ARBfp1.0\n" +
	12648	+ "PARAM zero12t = { 0.0, 1.0, 2, 1.25 };" +
	12649	+ "PARAM pow_2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12650	+ "PARAM pow2 = { 2, 4, 8, 0.0 };" +
	12651	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12652	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12653	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12654	+ "PARAM light2cam0 = program.env[10];" +
	12655	+ "PARAM light2cam1 = program.env[11];" +
	12656	+ "PARAM light2cam2 = program.env[12];" +
	12657	+ "TEMP temp;" +
	12658	+ "TEMP light;" +
	12659	+ "TEMP ndotl;" +
	12660	+ "TEMP normal;" +
	12661	+ "TEMP depth;" +
	12662	+ "TEMP eye;" +
	12663	+ "TEMP pos;" +
	12664	+
	12665	+ "MAD normal, fragment.color, zero12t.z, -zero12t.y;" +
	12666	+ Normalize("normal") +
	12667	+ "MOV light, state.light[0].position;" +
	12668	+ "DP3 ndotl.x, light, normal;" +
	12669	+ "MAX ndotl.x, ndotl.x, zero12t.x;" +
	12670	+
	12671	+ // shadow
	12672	+ "MOV pos, fragment.texcoord[1];" +
	12673	+ "MOV temp, pos;" +
	12674	+ ShadowTextureFetch("depth", "temp", "1") +
	12675	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12676	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12677	+
	12678	+ // No shadow when out of frustum
	12679	+ //"SGE temp.y, depth.z, zero123.y;" +
	12680	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12681	+
	12682	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12683	+
	12684	+ // Backlit
	12685	+ "MOV pos.w, zero12t.y;" + // one
	12686	+ "DP4 eye.x, pos, light2cam0;" +
	12687	+ "DP4 eye.y, pos, light2cam1;" +
	12688	+ "DP4 eye.z, pos, light2cam2;" +
	12689	+ Normalize("eye") +
	12690	+
	12691	+ "DP3 ndotl.y, -eye, normal;" +
	12692	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12693	+ "POW ndotl.y, ndotl.y, pow2.x;" + // backlit
	12694	+ "SUB ndotl.y, zero12t.y, ndotl.y;" + // 1 - y
	12695	+ //"POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12696	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12697	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12698	+ "ADD ndotl.y, ndotl.y, one.x;" +
	12699	+ "MUL ndotl.y, ndotl.y, pow_2.x;" +
	12700	+
	12701	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12702	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12703	+
	12704	+ // Pigment
	12705	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12706	+ "LRP temp, zero12t.w, temp, one;" + // texture proportion
	12707	+ "MUL temp, temp, zero12t.w;" + // Times x
	12708	+
	12709	+ //"MUL temp, temp, ndotl.y;" +
	12710	+ "MAD ndotl.x, pow_2.xxxx, ndotl.yyyy, ndotl.x;" +
	12711	+
	12712	+ "MUL temp, temp, ndotl.x;" + // lambert
	12713	+
	12714	+ "MOV temp.w, zero12t.y;" + // reset alpha
	12715	+ "MOV result.color, temp;" +
	12716	+ "END";
	12717	+
	12718	+ String programmax =
	12719	+ "!!ARBfp1.0\n" +
	12720	+
12404	12721	//"OPTION ARB_fragment_program_shadow;" +
12405	12722	"PARAM light2cam0 = program.env[10];" +
12406	12723	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12426,7 +12743,7 @@
12426	12743	"PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
12427	12744	"PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
12428	12745	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12429		- "PARAM params7 = program.env[7];" + // noise power, opacity power
	12746	+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
12430	12747	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
12431	12748	"PARAM options1 = program.env[62];" + // fog rgb color
12432	12749	"PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
..	..	@@ -12515,8 +12832,7 @@
12515	12832	"TEMP shininess;" +
12516	12833	"\n" +
12517	12834	"MOV texSamp, one;" +
12518		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12519		-
	12835	+
12520	12836	"MOV mapgrid.x, one2048th.x;" +
12521	12837	"MOV temp, fragment.texcoord[1];" +
12522	12838	/*
..	..	@@ -12537,20 +12853,20 @@
12537	12853	"MUL temp, floor, mapgrid.x;" +
12538	12854	//"TEX depth0, temp, texture[1], 2D;" +
12539	12855	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12540		- TextureFetch("depth0", "temp", "1") +
	12856	+ ShadowTextureFetch("depth0", "temp", "1") +
12541	12857	"") +
12542	12858	"ADD temp.x, temp.x, mapgrid.x;" +
12543	12859	//"TEX depth1, temp, texture[1], 2D;" +
12544	12860	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12545		- TextureFetch("depth1", "temp", "1") +
	12861	+ ShadowTextureFetch("depth1", "temp", "1") +
12546	12862	"") +
12547	12863	"ADD temp.y, temp.y, mapgrid.x;" +
12548	12864	//"TEX depth2, temp, texture[1], 2D;" +
12549		- TextureFetch("depth2", "temp", "1") +
	12865	+ ShadowTextureFetch("depth2", "temp", "1") +
12550	12866	"SUB temp.x, temp.x, mapgrid.x;" +
12551	12867	//"TEX depth3, temp, texture[1], 2D;" +
12552	12868	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12553		- TextureFetch("depth3", "temp", "1") +
	12869	+ ShadowTextureFetch("depth3", "temp", "1") +
12554	12870	"") +
12555	12871	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12556	12872	//"MOV params, material;" +
..	..	@@ -12672,7 +12988,7 @@
12672	12988	"POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
12673	12989	// mar 2013 ??? "KIL alpha.a;" +
12674	12990	"MOV alpha, texSamp.aaaa;" + // y;" +
12675		- "KIL alpha.a;" +
	12991	+ "KIL alpha.a;" + // not sure with parallax mapping
12676	12992	/*
12677	12993	"MUL temp.xy, temp, two;" +
12678	12994	"TXB bump, temp, texture[0], 2D;" +
..	..	@@ -12758,11 +13074,6 @@
12758	13074	"SUB bump0, bump0, half;" +
12759	13075	"ADD bump, bump, bump0;" +
12760	13076
12761		- "MOV temp.x, texSamp.a;" +
12762		- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12763		- //"LRP texSamp0, params5.x, texSamp0, one;" +
12764		- "MOV texSamp.a, temp.x;" +
12765		-
12766	13077	// double-sided
12767	13078	/**/
12768	13079	(doublesided?"DP3 temp.z, normal, eye;" +
..	..	@@ -12772,26 +13083,73 @@
12772	13083	"ADD temp.x, temp.x, one.x;" +
12773	13084	"MUL normal, normal, temp.xxxx;":""
12774	13085	) +
12775		- /**/
12776		-//// Normalize("normal") +
12777		-//// "MAX normal.z, eps.x, normal.z;" +
12778		-// Normalize("normal") +
12779		- "MOV normald, normal;" +
12780		- "MOV normals, normal;" +
	13086	+ /**/
	13087	+
	13088	+ "MOV temp, fragment.texcoord[4];" +
12781	13089
12782	13090	// UV base
12783	13091	//"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
12784	13092	//"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
12785	13093	//"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
12786		- "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
12787		- "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
12788		- "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	+
12789	13099	"XPD V, normal, UP;" +
12790	13100	Normalize("V") +
12791	13101	"XPD U, V, normal;" +
12792	13102	Normalize("U") +
12793	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	+
12794	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;" +
12795	13153
12796	13154	//"MOV temp, fragment.texcoord[0];" +
12797	13155	//
..	..	@@ -12921,10 +13279,10 @@
12921	13279	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12922	13280	"") +
12923	13281
12924		- // display shadow only (bump == 0)
	13282	+ // display shadow only (fakedepth == 0)
12925	13283	"SUB temp.x, half.x, shadow.x;" +
12926	13284	"MOV temp.y, -params5.z;" + // params6.x;" +
12927		- "SLT temp.z, temp.y, -one2048th.x;" +
	13285	+ "SLT temp.z, temp.y, -c256i.x;" +
12928	13286	"SUB temp.y, one.x, temp.z;" +
12929	13287	"MUL temp.x, temp.x, temp.y;" +
12930	13288	"KIL temp.x;" +
..	..	@@ -13255,8 +13613,19 @@
13255	13613	//once = true;
13256	13614	}
13257	13615
13258		- System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13259		- 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	+
13260	13629	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13261	13630
13262	13631	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13303,7 +13672,8 @@
13303	13672	"\n" +
13304	13673	"END\n";
13305	13674
13306		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13675	+ if (Globals.DEBUG)
	13676	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13307	13677	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13308	13678
13309	13679	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13348,25 +13718,26 @@
13348	13718	return out;
13349	13719	}
13350	13720
13351		- String TextureFetch(String dest, String src, String unit)
	13721	+ // Also does frustum culling
	13722	+ String ShadowTextureFetch(String dest, String src, String unit)
13352	13723	{
13353	13724	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13354	13725	"SGE " + src + ".w, " + src + ".x, eps.x;" +
13355	13726	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13727	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13728	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
13356	13729	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13357		- "SLT " + src + ".z, " + src + ".x, one.x;" +
13358		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13359		- "SLT " + src + ".z, " + src + ".y, one.x;" +
13360		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13730	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13731	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
13361	13732	//"SWZ buffer, temp, w,w,w,w;";
13362		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13733	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13363	13734	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
13364	13735	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
13365	13736	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13366		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13737	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13367	13738
13368		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13369		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13739	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13740	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13370	13741	}
13371	13742
13372	13743	String Shadow(String depth, String shadow)
..	..	@@ -13413,7 +13784,7 @@
13413	13784	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13414	13785	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13415	13786
13416		- // No shadow when out of frustrum
	13787	+ // No shadow when out of frustum
13417	13788	"SGE temp.x, " + depth + ".z, one.z;" +
13418	13789	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13419	13790	"";
..	..	@@ -13560,7 +13931,7 @@
13560	13931	/static/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
13561	13932	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13562	13933	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13563		- /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
13564	13935
13565	13936	//Object3D.cVector2[] vector2buffer;
13566	13937
..	..	@@ -13727,7 +14098,7 @@
13727	14098	"PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
13728	14099	"PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
13729	14100	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
13730		- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
	14101	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
13731	14102	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
13732	14103	"PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
13733	14104	//"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
..	..	@@ -13788,7 +14159,7 @@
13788	14159	"DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
13789	14160	"DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
13790	14161	"DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
13791		- //"MOV result.texcoord, vertex.texcoord;" +
	14162	+ //"MOV result.texcoord, vertex.fogcoord;" +
13792	14163	"MOV result.texcoord, temp;" +
13793	14164	// border fade
13794	14165	"MOV result.texcoord[3], vertex.texcoord;" +
..	..	@@ -13835,7 +14206,9 @@
13835	14206
13836	14207	//"ADD temp.z, temp.z, one;" +
13837	14208
13838		- "MOV result.color, temp;"
	14209	+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
	14210	+
	14211	+ "MOV result.color, temp;" // Normal
13839	14212	: "MOV result.color, vertex.color;") +
13840	14213	((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
13841	14214	: "") +
..	..	@@ -13970,6 +14343,7 @@
13970	14343	public void mouseClicked(MouseEvent e)
13971	14344	{
13972	14345	System.out.println("mouseClicked: " + e);
	14346	+ System.exit(0);
13973	14347	}
13974	14348
13975	14349	public void mousePressed(MouseEvent e)
..	..	@@ -14008,10 +14382,12 @@
14008	14382	return;
14009	14383	}
14010	14384
14011		- 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;
14012	14388
14013	14389	// TIMER
14014		- if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	14390	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !vr) // VR
14015	14391	{
14016	14392	keepboxmode = BOXMODE;
14017	14393	keepsupport = SUPPORT;
..	..	@@ -14052,7 +14428,7 @@
14052	14428	//}
14053	14429
14054	14430	SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
14055		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
	14431	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, e.getModifiers(), e.getModifiersEx());
14056	14432	anchorX = ax;
14057	14433	anchorY = ay;
14058	14434	prevX = px;
..	..	@@ -14147,8 +14523,9 @@
14147	14523	// fev 2014???
14148	14524	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
14149	14525	object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
14150		- pingthread.StepToTarget(true); // true);
	14526	+ pingthread.StepToTarget(); // true);
14151	14527	}
	14528	+
14152	14529	// if (!LIVE)
14153	14530	super.repaint();
14154	14531	}
..	..	@@ -14211,14 +14588,15 @@
14211	14588	drag = false;
14212	14589	//System.out.println("Mouse DOWN");
14213	14590	editObj = false;
14214		- ClickInfo info = new ClickInfo();
14215		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14216		- info.pane = this;
14217		- info.camera = renderCamera;
14218		- info.x = x;
14219		- info.y = y;
14220		- info.modifiers = modifiersex;
14221		- editObj = object.doEditClick(info, 0);
	14591	+ //ClickInfo info = new ClickInfo();
	14592	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14593	+ object.clickInfo.pane = this;
	14594	+ object.clickInfo.camera = renderCamera;
	14595	+ object.clickInfo.x = x;
	14596	+ object.clickInfo.y = y;
	14597	+ object.clickInfo.modifiers = modifiersex;
	14598	+ editObj = object.doEditClick(//info,
	14599	+ 0);
14222	14600	if (!editObj)
14223	14601	{
14224	14602	hasMarquee = true;
..	..	@@ -14242,8 +14620,8 @@
14242	14620
14243	14621	//if (drawing)
14244	14622	//return;
14245		- if ((e.getModifiersEx() & CTRL) != 0
14246		- \|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
	14623	+ if ((e.getModifiersEx() & CTRL) != 0 \|\|
	14624	+ (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
14247	14625	{
14248	14626	//System.out.println("mouseDragged: " + e);
14249	14627	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
..	..	@@ -14267,9 +14645,17 @@
14267	14645	return targetLookAt;
14268	14646	}
14269	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	+
14270	14653	class PingThread extends Thread
14271	14654	{
14272	14655	boolean jump;
	14656	+ boolean live;
	14657	+
	14658	+ boolean mute = false;
14273	14659
14274	14660	// void JumpToTarget()
14275	14661	// {
..	..	@@ -14285,6 +14671,95 @@
14285	14671	// only one thread!? synchronized
14286	14672	void StepToTarget(boolean jump)
14287	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	+
14288	14763	tmp.set(targetLookAt);
14289	14764	tmp.sub(manipCamera.lookAt); // june 2014
14290	14765
..	..	@@ -14322,7 +14797,7 @@
14322	14797
14323	14798	if (tmp.dot(tmp) > 1) // may 2014. far away: jump to target
14324	14799	{
14325		- jump = true; // step = 1;
	14800	+ // sep 2019 jump = true; // step = 1;
14326	14801	}
14327	14802
14328	14803	if (OEILONCE && OEIL)
..	..	@@ -14357,7 +14832,10 @@
14357	14832	if (tmp.dot(tmp) < 0.00001)
14358	14833	{
14359	14834	zoomonce = false;
	14835	+ live = false;
14360	14836	}
	14837	+ else
	14838	+ live = true;
14361	14839
14362	14840	tmp.mul(step > step2 ? step : step2);
14363	14841	}
..	..	@@ -14384,7 +14862,7 @@
14384	14862	{
14385	14863	if (LOOKAT)
14386	14864	manipCamera.lookAt.add(tmp);
14387		- if (OEIL)
	14865	+ if (OEIL && !capsLocked)
14388	14866	manipCamera.location.add(tmp);
14389	14867
14390	14868	{
..	..	@@ -14399,7 +14877,10 @@
14399	14877	lightCamera.computeTransform();
14400	14878	}
14401	14879	}
14402		- manipCamera.computeTransform();
	14880	+ if (tmp.x != 0 \|\| tmp.y != 0 \|\| tmp.z != 0)
	14881	+ {
	14882	+ manipCamera.computeTransform();
	14883	+ }
14403	14884	}
14404	14885	// ?????? mouseDown = true;
14405	14886	//System.out.println("---------------- ---------- Paint " + tmp.length2());
..	..	@@ -14492,49 +14973,107 @@
14492	14973	}
14493	14974	}
14494	14975	}
	14976	+
14495	14977	PingThread pingthread = new PingThread();
14496		- int delta = 5;
14497		- int speed = 5;
	14978	+ int delta = 1;
	14979	+ int speed = 1;
	14980	+ int walk = 8;
14498	14981	boolean autorepeat = false;
14499	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	+
14500	15002	void GoDown(int mod)
14501	15003	{
14502	15004	MODIFIERS \|= COMMAND;
	15005	+ boolean isVR = (mouseMode&VR)!=0;
14503	15006	/**/
14504	15007	if((mod&SHIFT) == SHIFT)
14505		- manipCamera.RotatePosition(0, -speed);
14506		- else
14507		- manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14508		- /**/
14509		- if ((mod & SHIFT) == SHIFT)
14510	15008	{
14511		- mouseMode = mouseMode; // VR??
14512		- } else
14513		- {
14514		- 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());
14515	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	+// }
14516	15033
	15034	+ targetLookAt.set(manipCamera.lookAt);
	15035	+
14517	15036	//prevX = X = anchorX;
14518	15037	prevY = Y = anchorY - (int) (renderCamera.Distance());
14519	15038	}
14520	15039
14521	15040	void GoUp(int mod)
14522	15041	{
	15042	+ RigidBody.justclicked = true;
	15043	+
14523	15044	MODIFIERS \|= COMMAND;
14524	15045	/**/
	15046	+ boolean isVR = (mouseMode&VR)!=0;
	15047	+
14525	15048	if((mod&SHIFT) == SHIFT)
14526		- manipCamera.RotatePosition(0, speed);
14527		- else
14528		- manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14529		- /**/
14530		- if ((mod & SHIFT) == SHIFT)
14531	15049	{
14532		- mouseMode = mouseMode;
14533		- } else
14534		- {
14535		- 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());
14536	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	+// }
14537	15074
	15075	+ targetLookAt.set(manipCamera.lookAt);
	15076	+
14538	15077	//prevX = X = anchorX;
14539	15078	prevY = Y = anchorY + (int) (renderCamera.Distance());
14540	15079	}
..	..	@@ -14544,18 +15083,29 @@
14544	15083	MODIFIERS \|= COMMAND;
14545	15084	/**/
14546	15085	if((mod&SHIFT) == SHIFT)
14547		- manipCamera.Translate(speed*delta, 0, getWidth());
	15086	+ manipCamera.Translate(speed, 0, getWidth());
14548	15087	else
14549		- 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	+
14550	15095	/**/
14551		- if ((mod & SHIFT) == SHIFT)
14552		- {
14553		- mouseMode = mouseMode;
14554		- } else
14555		- {
14556		- mouseMode \|= ROTATE;
14557		- } // TRANSLATE;
	15096	+// if ((mod & SHIFT) == SHIFT)
	15097	+// {
	15098	+// mouseMode = mouseMode;
	15099	+// } else
	15100	+// {
	15101	+// mouseMode \|= ROTATE;
	15102	+// } // TRANSLATE;
14558	15103
	15104	+ //System.err.println("lookAt = " + manipCamera.lookAt);
	15105	+ //System.err.println("location = " + manipCamera.location);
	15106	+
	15107	+ targetLookAt.set(manipCamera.lookAt);
	15108	+
14559	15109	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
14560	15110	prevY = Y = anchorY;
14561	15111	}
..	..	@@ -14565,18 +15115,26 @@
14565	15115	MODIFIERS \|= COMMAND;
14566	15116	/**/
14567	15117	if((mod&SHIFT) == SHIFT)
14568		- manipCamera.Translate(-speed*delta, 0, getWidth());
	15118	+ manipCamera.Translate(-speed, 0, getWidth());
14569	15119	else
14570		- 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	+
14571	15127	/**/
14572		- if ((mod & SHIFT) == SHIFT)
14573		- {
14574		- mouseMode = mouseMode;
14575		- } else
14576		- {
14577		- mouseMode \|= ROTATE;
14578		- } // TRANSLATE;
	15128	+// if ((mod & SHIFT) == SHIFT)
	15129	+// {
	15130	+// mouseMode = mouseMode;
	15131	+// } else
	15132	+// {
	15133	+// mouseMode \|= ROTATE;
	15134	+// } // TRANSLATE;
14579	15135
	15136	+ targetLookAt.set(manipCamera.lookAt);
	15137	+
14580	15138	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
14581	15139	prevY = Y = anchorY;
14582	15140	}
..	..	@@ -14618,15 +15176,16 @@
14618	15176	if (editObj)
14619	15177	{
14620	15178	drag = true;
14621		- ClickInfo info = new ClickInfo();
14622		- info.bounds.setBounds(0, 0,
	15179	+ //ClickInfo info = new ClickInfo();
	15180	+ object.clickInfo.bounds.setBounds(0, 0,
14623	15181	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14624		- info.pane = this;
14625		- info.camera = renderCamera;
14626		- info.x = x;
14627		- info.y = y;
14628		- object.GetWindow().copy
14629		- .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
	15182	+ object.clickInfo.pane = this;
	15183	+ object.clickInfo.camera = renderCamera;
	15184	+ object.clickInfo.x = x;
	15185	+ object.clickInfo.y = y;
	15186	+ object //.GetWindow().copy
	15187	+ .doEditDrag(//info,
	15188	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14630	15189	} else
14631	15190	{
14632	15191	if (x < startX)
..	..	@@ -14709,6 +15268,11 @@
14709	15268	if ((mouseMode & ZOOM) != 0)
14710	15269	{
14711	15270	//if ((mouseMode & BACKFORTH) != 0)
	15271	+ if ((modifiersex & SHIFT) == SHIFT)
	15272	+ {
	15273	+ ViewAngle(dy);
	15274	+ }
	15275	+ else
14712	15276	if ((mouseMode & VR) != 0)
14713	15277	manipCamera.BackForth(dx, dy, getWidth());
14714	15278	else
..	..	@@ -14775,24 +15339,30 @@
14775	15339	}
14776	15340	}
14777	15341
	15342	+// ClickInfo clickInfo = new ClickInfo();
	15343	+
14778	15344	public void mouseMoved(MouseEvent e)
14779	15345	{
	15346	+//object.editWindow.frame.
	15347	+ setCursor(Cursor.getDefaultCursor());
	15348	+
14780	15349	//System.out.println("mouseMoved: " + e);
14781	15350	if (isRenderer)
14782	15351	return;
14783	15352
14784		- ClickInfo ci = new ClickInfo();
14785		- ci.x = e.getX();
14786		- ci.y = e.getY();
14787		- ci.modifiers = e.getModifiersEx();
14788		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14789		- ci.pane = this;
14790		- ci.camera = renderCamera;
	15353	+ // Mouse cursor feedback
	15354	+ object.clickInfo.x = e.getX();
	15355	+ object.clickInfo.y = e.getY();
	15356	+ object.clickInfo.modifiers = e.getModifiersEx();
	15357	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	15358	+ object.clickInfo.pane = this;
	15359	+ object.clickInfo.camera = renderCamera;
14791	15360	if (!isRenderer)
14792	15361	{
14793	15362	//ObjEditor editWindow = object.editWindow;
14794	15363	//Object3D copy = editWindow.copy;
14795		- if (object.doEditClick(ci, 0))
	15364	+ if (object.doEditClick(//clickInfo,
	15365	+ 0))
14796	15366	{
14797	15367	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14798	15368	} else
..	..	@@ -14804,6 +15374,12 @@
14804	15374
14805	15375	public void mouseReleased(MouseEvent e)
14806	15376	{
	15377	+ if (isRenderer && !movingcamera)
	15378	+ {
	15379	+ RigidBody.justclicked = true;
	15380	+ System.out.println("justclicked: " + e);
	15381	+ }
	15382	+
14807	15383	Globals.MOUSEDRAGGED = false;
14808	15384
14809	15385	movingcamera = false;
..	..	@@ -14960,8 +15536,10 @@
14960	15536	mouseMode \|= ZOOM;
14961	15537	}
14962	15538
14963		- boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14964		- 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)
14965	15543	{
14966	15544	mouseMode \|= VR; // BACKFORTH;
14967	15545	}
..	..	@@ -14973,7 +15551,8 @@
14973	15551	{
14974	15552	mouseMode \|= SELECT;
14975	15553	}
14976		- if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
	15554	+ if (//(modifiersex & SHIFT) == SHIFT \|\|
	15555	+ forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14977	15556	{
14978	15557	mouseMode &= ~VR;
14979	15558	mouseMode \|= TRANSLATE;
..	..	@@ -15017,8 +15596,18 @@
15017	15596	float SATPOW = 1; // 2; // 0.5f;
15018	15597	float BRIPOW = 1; // 0.5f; // 0.5f;
15019	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	+
15020	15605	public void keyPressed(int key)
15021	15606	{
	15607	+// Set the blank cursor to the JFrame.
	15608	+//object.editWindow.frame.
	15609	+ setCursor(blankCursor);
	15610	+
15022	15611	if (key >= '0' && key <= '5')
15023	15612	clampbit = (key-'0');
15024	15613
..	..	@@ -15075,8 +15664,8 @@
15075	15664	case 'K':
15076	15665	KOMPACTTEXTURE ^= true;
15077	15666	//textures.clear();
15078		- break;
15079		- case 'P': // Texture Projection macros
	15667	+ // break;
	15668	+ //case 'P': // Texture Projection macros
15080	15669	// SAVETEXTURE ^= true;
15081	15670	macromode = true;
15082	15671	Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
..	..	@@ -15177,8 +15766,8 @@
15177	15766	RevertCamera();
15178	15767	repaint();
15179	15768	break;
15180		- case 'l':
15181		- //case 'L':
	15769	+ //case 'l':
	15770	+ case 'L':
15182	15771	if (lightMode)
15183	15772	{
15184	15773	lightMode = false;
..	..	@@ -15197,7 +15786,7 @@
15197	15786	targetLookAt.set(manipCamera.lookAt);
15198	15787	repaint();
15199	15788	break;
15200		- case 'p':
	15789	+ case 'P': // p':
15201	15790	// c'est quoi ca au juste? spherical ^= true;
15202	15791	Skinshader ^= true; programInitialized = false;
15203	15792	repaint();
..	..	@@ -15208,7 +15797,8 @@
15208	15797	break;
15209	15798	case 'm':
15210	15799	{
15211		- PrintMemory();
	15800	+ //PrintMemory();
	15801	+ ToggleImageFlip();
15212	15802	break;
15213	15803	}
15214	15804	case 'M':
..	..	@@ -15235,27 +15825,31 @@
15235	15825	repaint();
15236	15826	break;
15237	15827	case 'O':
15238		- Globals.drawMode = OCCLUSION; // WARNING
15239		- repaint();
15240		- break;
	15828	+ // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
	15829	+ //repaint();
	15830	+ //break;
15241	15831	case 'o':
15242	15832	OCCLUSION_CULLING ^= true;
15243	15833	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
15244	15834	break;
15245		- case '0': envyoff ^= true; repaint(); break;
	15835	+ //case '0': envyoff ^= true; repaint(); break;
15246	15836	case '1':
15247	15837	case '2':
15248	15838	case '3':
15249	15839	case '4':
15250	15840	case '5':
15251		- newenvy = Character.getNumericValue(key);
15252		- repaint();
15253		- break;
15254	15841	case '6':
15255	15842	case '7':
15256	15843	case '8':
15257	15844	case '9':
15258		- BGcolor = (key - '6')/3.f;
	15845	+ if (true) // envyoff)
	15846	+ {
	15847	+ BGcolor = (key - '1')/8.f;
	15848	+ }
	15849	+ else
	15850	+ {
	15851	+ //newenvy = Character.getNumericValue(key);
	15852	+ }
15259	15853	repaint();
15260	15854	break;
15261	15855	case '!':
..	..	@@ -15325,7 +15919,21 @@
15325	15919	// kompactbit = 6;
15326	15920	// break;
15327	15921	case ' ':
	15922	+ capsLocked ^= true;
	15923	+ repaint();
	15924	+ break;
	15925	+ case 'l':
15328	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	+
15329	15937	Globals.lighttouched = true;
15330	15938	manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
15331	15939	targetLookAt.set(manipCamera.lookAt);
..	..	@@ -15333,6 +15941,10 @@
15333	15941	break;
15334	15942	//case '`' :
15335	15943	case ESC:
	15944	+ if (FULLSCREEN)
	15945	+ object.editWindow.ToggleFullScreen();
	15946	+ break;
	15947	+ case 'p':
15336	15948	RENDERPROGRAM += 1;
15337	15949	RENDERPROGRAM %= 3;
15338	15950
..	..	@@ -15371,6 +15983,10 @@
15371	15983	case ENTER:
15372	15984	// object.editWindow.ScreenFit(); // Edit();
15373	15985	ToggleLive();
	15986	+ if (capsLocked)
	15987	+ {
	15988	+ Globals.WALK ^= true;
	15989	+ }
15374	15990	break;
15375	15991	case DELETE:
15376	15992	ClearSelection();
..	..	@@ -15407,17 +16023,23 @@
15407	16023	object.GetWindow().refreshContents(true);
15408	16024	break;
15409	16025	case '{':
15410		- manipCamera.shaper_fovy /= 1.1;
	16026	+ double factor = 1.1;
	16027	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16028	+ manipCamera.shaper_fovy /= factor;
15411	16029	System.out.println("FOV = " + manipCamera.shaper_fovy);
15412	16030	repaint();
15413	16031	break;
15414	16032	case '}':
15415		- manipCamera.shaper_fovy *= 1.1;
	16033	+ factor = 1.1;
	16034	+ if (manipCamera.shaper_fovy * factor < 150)
	16035	+ manipCamera.shaper_fovy *= factor;
15416	16036	System.out.println("FOV = " + manipCamera.shaper_fovy);
15417	16037	repaint();
15418	16038	break;
15419	16039	case '[':
15420		- manipCamera.shaper_fovy /= 1.01;
	16040	+ factor = 1.01;
	16041	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16042	+ manipCamera.shaper_fovy /= factor;
15421	16043	if (false) //manipCamera.hAspect == 0)
15422	16044	{
15423	16045	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -15433,7 +16055,9 @@
15433	16055	break;
15434	16056	case ']':
15435	16057	//manipCamera.shaper_fovy += (180 - manipCamera.shaper_fovy)*0.1;
15436		- manipCamera.shaper_fovy *= 1.01;
	16058	+ factor = 1.01;
	16059	+ if (manipCamera.shaper_fovy * factor < 150)
	16060	+ manipCamera.shaper_fovy *= factor;
15437	16061	if (false) //manipCamera.hAspect == 0)
15438	16062	{
15439	16063	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -15471,98 +16095,113 @@
15471	16095	}
15472	16096	}
15473	16097
	16098	+ boolean keys[] = new boolean[256];
	16099	+ int speedkey[] = new int[256];
	16100	+ int modifiers = 0;
	16101	+
15474	16102	public void processKeyEvent(KeyEvent e)
15475	16103	{
15476	16104	switch (e.getID())
15477	16105	{
15478	16106	case KeyEvent.KEY_PRESSED:
15479		- if (!autorepeat)
15480		- {
15481		- //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
15482		- keyPressed(e.getKeyChar(), e.getModifiersEx());
15483		- }
15484		- if (manipCamera == lightCamera)
15485		- {
15486		- switch (e.getKeyCode())
15487		- {
15488		- case DOWN_ARROW:
15489		- lightCamera.DECAL /= 2;
15490		- repaint();
15491		- break;
15492		- case UP_ARROW:
15493		- lightCamera.DECAL *= 2;
15494		- repaint();
15495		- break;
15496		- case LEFT_ARROW:
15497		- lightCamera.SCALE /= 2;
15498		- repaint();
15499		- break;
15500		- case RIGHT_ARROW:
15501		- lightCamera.SCALE *= 2;
15502		- repaint();
15503		- break;
15504		- default:
15505		- break;
15506		- }
15507		-
15508		- System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
15509		- } else
15510		- {
15511		- if (true) // !autorepeat)
15512		- {
15513		- boolean reset = true;
15514		-
15515		- switch (e.getKeyCode())
15516		- {
15517		- case DOWN_ARROW:
15518		- GoDown(e.getModifiersEx());
15519		- repaint();
15520		- break;
15521		- case UP_ARROW:
15522		- GoUp(e.getModifiersEx());
15523		- repaint();
15524		- break;
15525		- case LEFT_ARROW:
15526		- GoLeft(e.getModifiersEx());
15527		- repaint();
15528		- break;
15529		- case RIGHT_ARROW:
15530		- GoRight(e.getModifiersEx());
15531		- repaint();
15532		- break;
15533		- default:
15534		- reset = false;
15535		- break;
15536		- }
15537		-
15538		- if (reset)
15539		- {
15540		- autorepeat = true;
15541		-
15542		- targetLookAt.set(manipCamera.lookAt);
15543		- }
15544		- }
15545		- }
	16107	+ keys[e.getKeyCode()] = true;
	16108	+ modifiers = e.getModifiersEx();
	16109	+ keyPressed(e.getKeyChar(), modifiers);
	16110	+ //Globals.theRenderer.keyPressed(e.getKeyChar());
	16111	+ repaint();
15546	16112	break;
15547		- case KeyEvent.KEY_TYPED:
15548		- 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;
15549	16183	case KeyEvent.KEY_RELEASED:
15550		- {
15551		- switch (e.getKeyCode())
15552		- {
15553		- case DOWN_ARROW:
15554		- case UP_ARROW:
15555		- case LEFT_ARROW:
15556		- case RIGHT_ARROW:
15557		- MODIFIERS &= ~COMMAND;
15558		- autorepeat = false;
15559		- break;
15560		- default:
15561		- break;
15562		- }
	16184	+ keys[e.getKeyCode()] = false;
	16185	+ modifiers = e.getModifiersEx();
15563	16186	keyReleased(e.getKeyChar(), e.getModifiersEx());
	16187	+ repaint();
15564	16188	break;
15565		- }
	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	+// }
15566	16205	default:
15567	16206	break;
15568	16207	}
..	..	@@ -15818,8 +16457,6 @@
15818	16457
15819	16458	int width = getBounds().width;
15820	16459	int height = getBounds().height;
15821		- ClickInfo info = new ClickInfo();
15822		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15823	16460	//Image img = CreateImage(width, height);
15824	16461	//System.out.println("width = " + width + "; height = " + height + "\n");
15825	16462
..	..	@@ -15896,31 +16533,37 @@
15896	16533	}
15897	16534	if (object != null && !hasMarquee)
15898	16535	{
	16536	+ if (object.clickInfo == null)
	16537	+ object.clickInfo = new ClickInfo();
	16538	+ ClickInfo info = object.clickInfo;
	16539	+ //ClickInfo info = new ClickInfo();
	16540	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16541	+
15899	16542	if (isRenderer)
15900	16543	{
15901		- info.flags++;
	16544	+ object.clickInfo.flags++;
15902	16545	double frameAspect = (double) width / (double) height;
15903	16546	if (frameAspect > renderCamera.aspect)
15904	16547	{
15905	16548	int desired = (int) ((double) height * renderCamera.aspect);
15906		- info.bounds.width -= width - desired;
15907		- info.bounds.x += (width - desired) / 2;
	16549	+ object.clickInfo.bounds.width -= width - desired;
	16550	+ object.clickInfo.bounds.x += (width - desired) / 2;
15908	16551	} else
15909	16552	{
15910	16553	int desired = (int) ((double) width / renderCamera.aspect);
15911		- info.bounds.height -= height - desired;
15912		- info.bounds.y += (height - desired) / 2;
	16554	+ object.clickInfo.bounds.height -= height - desired;
	16555	+ object.clickInfo.bounds.y += (height - desired) / 2;
15913	16556	}
15914	16557	}
15915	16558
15916		- info.g = gr;
15917		- info.camera = renderCamera;
	16559	+ object.clickInfo.g = gr;
	16560	+ object.clickInfo.camera = renderCamera;
15918	16561	/*
15919	16562	// Memory intensive (brep.verticescopy)
15920	16563	if (!(object instanceof Composite))
15921	16564	object.draw(info, 0, false); // SLOW :
15922	16565	*/
15923		- if (!isRenderer)
	16566	+ if (!isRenderer) // && drag)
15924	16567	{
15925	16568	Grafreed.Assert(object != null);
15926	16569	Grafreed.Assert(object.selection != null);
..	..	@@ -15928,9 +16571,9 @@
15928	16571	{
15929	16572	int hitSomething = object.selection.get(0).hitSomething;
15930	16573
15931		- info.DX = 0;
15932		- info.DY = 0;
15933		- info.W = 1;
	16574	+ object.clickInfo.DX = 0;
	16575	+ object.clickInfo.DY = 0;
	16576	+ object.clickInfo.W = 1;
15934	16577	if (hitSomething == Object3D.hitCenter)
15935	16578	{
15936	16579	info.DX = X;
..	..	@@ -15942,13 +16585,14 @@
15942	16585	info.DY -= info.bounds.height/2;
15943	16586	}
15944	16587
15945		- object.drawEditHandles(info, 0);
	16588	+ object.drawEditHandles(//info,
	16589	+ 0);
15946	16590
15947	16591	if (drag && (X != 0 \|\| Y != 0))
15948	16592	{
15949	16593	switch (hitSomething)
15950	16594	{
15951		- case Object3D.hitCenter: gr.setColor(Color.pink);
	16595	+ case Object3D.hitCenter: gr.setColor(Color.white);
15952	16596	gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15953	16597	break;
15954	16598	case Object3D.hitRotate: gr.setColor(Color.yellow);
..	..	@@ -15974,7 +16618,7 @@
15974	16618	if (hasMarquee)
15975	16619	{
15976	16620	gr.setXORMode(Color.white);
15977		- gr.setColor(Color.red);
	16621	+ gr.setColor(Color.white);
15978	16622	if (!firstime)
15979	16623	{
15980	16624	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -16133,7 +16777,8 @@
16133	16777
16134	16778	public boolean mouseDrag(Event evt, int x, int y)
16135	16779	{
16136		- //System.out.println("mouseDrag: " + evt);
	16780	+ System.out.println("mouseDrag: " + evt);
	16781	+ System.exit(0);
16137	16782	/*
16138	16783	drag = true;
16139	16784	//System.out.println("Mouse DRAG");
..	..	@@ -16252,6 +16897,7 @@
16252	16897	public boolean mouseUp(Event evt, int x, int y)
16253	16898	{
16254	16899	System.out.println("mouseUp: " + evt);
	16900	+ System.exit(0);
16255	16901	/*
16256	16902	locked = false;
16257	16903	if (isRenderer)
..	..	@@ -16441,6 +17087,8 @@
16441	17087	private /static/ boolean firstime;
16442	17088	private /static/ cVector newView = new cVector();
16443	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"};
16444	17092	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16445	17093	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16446	17094	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16453,36 +17101,74 @@
16453	17101	{
16454	17102	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16455	17103
	17104	+ int usedsuf = 0;
	17105	+
16456	17106	for (int i = 0; i < suffixes.length; i++)
16457	17107	{
16458		- String resourceName = basename + suffixes[i] + "." + suffix;
16459		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16460		- mipmapped,
16461		- FileUtil.getFileSuffix(resourceName));
16462		- if (data == null)
	17108	+ String[] suffixe = suffixes;
	17109	+ String[] fallback = suffixes2;
	17110	+ String[] fallfallback = suffixes3;
	17111	+
	17112	+ for (int c=usedsuf; --c>=0;)
16463	17113	{
16464		- throw new IOException("Unable to load texture " + resourceName);
	17114	+// String[] temp = suffixe;
	17115	+// suffixe = fallback;
	17116	+// fallback = fallfallback;
	17117	+// fallfallback = temp;
16465	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	+
16466	17147	//System.out.println("Target = " + targets[i]);
16467	17148	cubemap.updateImage(data, targets[i]);
16468	17149	}
16469	17150
16470	17151	return cubemap;
16471	17152	}
	17153	+
16472	17154	int bigsphere = -1;
16473	17155
16474	17156	float BGcolor = 0.5f;
16475	17157
16476		- private void DrawSkyBox(GL gl)
	17158	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	17159	+
	17160	+ private void DrawSkyBox(GL gl, float ratio)
16477	17161	{
16478		- if (envyoff \|\| cubemap == null)
	17162	+ if (//envyoff \|\|
	17163	+ WIREFRAME \|\|
	17164	+ cubemap == null)
16479	17165	{
16480	17166	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16481	17167	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
16482	17168	return;
16483	17169	}
16484	17170
16485		- if (WIREFRAME)
	17171	+ //if (WIREFRAME)
16486	17172	gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL);
16487	17173
16488	17174	gl.glDisable(gl.GL_CULL_FACE);
..	..	@@ -16490,7 +17176,17 @@
16490	17176	// Compensates for ExaminerViewer's modification of modelview matrix
16491	17177	gl.glMatrixMode(GL.GL_MODELVIEW);
16492	17178	gl.glLoadIdentity();
	17179	+ gl.glScalef(1,ratio,1);
16493	17180
	17181	+// colorV[0] = 2;
	17182	+// colorV[1] = 2;
	17183	+// colorV[2] = 2;
	17184	+// colorV[3] = 1;
	17185	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	17186	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	17187	+//
	17188	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	17189	+
16494	17190	//gl.glActiveTexture(GL.GL_TEXTURE1);
16495	17191	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16496	17192
..	..	@@ -16522,6 +17218,7 @@
16522	17218	{
16523	17219	gl.glScalef(1.0f, -1.0f, 1.0f);
16524	17220	}
	17221	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16525	17222	gl.glMultMatrixd(viewrot_1, 0);
16526	17223	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16527	17224	//viewer.updateInverseRotation(gl);
..	..	@@ -16562,7 +17259,8 @@
16562	17259	gl.glDisable(GL.GL_TEXTURE_GEN_R);
16563	17260
16564	17261	cubemap.disable();
16565		- ////cubemap.unbind();
	17262	+ //cubemap.dispose();
	17263	+
16566	17264	if (CULLFACE)
16567	17265	{
16568	17266	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -16570,6 +17268,8 @@
16570	17268
16571	17269	if (WIREFRAME)
16572	17270	gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_LINE);
	17271	+ else
	17272	+ gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL);
16573	17273	}
16574	17274
16575	17275	private void DrawChecker(GL gl)
..	..	@@ -16618,7 +17318,7 @@
16618	17318	gl.glScalef(1.0f, -1.0f, 1.0f);
16619	17319	}
16620	17320
16621		- gl.glNormal3f(0.0f, 0.0f, 1.0f);
	17321	+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
16622	17322
16623	17323	float step = 2; // 0.1666f; //0.25f;
16624	17324	float stepv = 2; // step * 1652 / 998;
..	..	@@ -16780,7 +17480,7 @@
16780	17480	//new Exception().printStackTrace();
16781	17481	System.out.println("select buffer init");
16782	17482	// Use debug pipeline
16783		- drawable.setGL(new DebugGL(drawable.getGL()));
	17483	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16784	17484
16785	17485	GL gl = drawable.getGL();
16786	17486
..	..	@@ -16907,7 +17607,7 @@
16907	17607
16908	17608	float depth = depths[y * TEX_SIZE + x];
16909	17609
16910		- if (pointselection && mouseMode == SELECT && depth != 0 && depth != 1)
	17610	+ if (pointselection && (mouseMode & SELECT) == SELECT && depth != 0 && depth != 1)
16911	17611	{
16912	17612	pointselection = false;
16913	17613
..	..	@@ -17098,6 +17798,7 @@
17098	17798
17099	17799	public void init(GLAutoDrawable drawable)
17100	17800	{
	17801	+ if (Globals.DEBUG)
17101	17802	System.out.println("shadow buffer init");
17102	17803
17103	17804	GL gl = drawable.getGL();
..	..	@@ -17326,10 +18027,14 @@
17326	18027	gl.glFlush();
17327	18028
17328	18029	/**/
17329		- 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);
17330	18031
17331		- float[] pixels = occlusionsizebuffer.array();
	18032	+ float[] depths = occlusiondepthbuffer.array();
17332	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	+
17333	18038	double r = 0, g = 0, b = 0;
17334	18039
17335	18040	double count = 0;
..	..	@@ -17340,7 +18045,7 @@
17340	18045
17341	18046	double FACTOR = 1;
17342	18047
17343		- for (int i = 0; i < pixels.length; i++)
	18048	+ for (int i = 0; i < depths.length; i++)
17344	18049	{
17345	18050	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
17346	18051	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -17423,7 +18128,7 @@
17423	18128
17424	18129	double scale = ray.z; // 1; // cos
17425	18130
17426		- float depth = pixels[newindex];
	18131	+ float depth = depths[newindex];
17427	18132
17428	18133	/*
17429	18134	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -17566,6 +18271,11 @@
17566	18271	static boolean DEBUG_SELECTION = false;
17567	18272	boolean OCCLUSION_CULLING = false; //true;
17568	18273	public boolean lightMode = false;
	18274	+
	18275	+ private boolean keepshadow;
	18276	+
	18277	+ static public boolean capsLocked = false; // VR
	18278	+
17569	18279	static public int indexcount = 0;
17570	18280	/static/ cColor vertexOcclusion = new cColor();
17571	18281	//private int selection_view = -1;
..	..	@@ -17620,11 +18330,14 @@
17620	18330	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17621	18331	static IntBuffer bigAAbuffer;
17622	18332	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17623		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	18333	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17624	18334	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17625	18335	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17626	18336	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17627		- 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	+
17628	18341	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17629	18342	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17630	18343	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();