~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -110,7 +110,11 @@
110	110	//private Mat4f spotlightTransform = new Mat4f();
111	111	//private Mat4f spotlightInverseTransform = new Mat4f();
112	112	static GLContext glcontext = null;
113		- /static/ com.sun.opengl.util.texture.Texture cubemap;
	113	+ /static/ com.sun.opengl.util.texture.Texture cubemap; // Either custom or rgb
	114	+ /static/ com.sun.opengl.util.texture.Texture cubemapcustom;
	115	+ /static/ com.sun.opengl.util.texture.Texture cubemaprgb;
	116	+ boolean transformMode;
	117	+
114	118	boolean reverseUP = false;
115	119	static boolean frozen = false;
116	120	boolean enablebackspace = false; // patch for back buffer refresh
..	..	@@ -164,7 +168,7 @@
164	168
165	169
166	170	// OPTIONS
167		- boolean Skinshader = true;
	171	+ boolean Skinshader = false; // true;
168	172	boolean cameraLight = false;
169	173	boolean UVdebug = false;
170	174	boolean Udebug = false;
..	..	@@ -173,7 +177,7 @@
173	177	static boolean doublesided = false; // true; // reversed normals are awful for conformance
174	178	boolean anisotropy = true;
175	179	boolean softshadow = true; // slower but better false;
176		- boolean opacityhalo = false;
	180	+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
177	181
178	182	boolean macromode = false;
179	183
..	..	@@ -187,6 +191,19 @@
187	191	}
188	192
189	193	private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	194	+
	195	+ public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	196	+ {
	197	+ try
	198	+ {
	199	+ return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	200	+ } catch (IOException e)
	201	+ {
	202	+ System.out.println("NAME = " + name);
	203	+ e.printStackTrace(); // throw new RuntimeException(e);
	204	+ return null;
	205	+ }
	206	+ }
190	207
191	208	void SetAsGLRenderer(boolean b)
192	209	{
..	..	@@ -525,7 +542,8 @@
525	542	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
526	543	LA.vecCross(obj.v0, obj.v1, obj.v2);
527	544	LA.vecNormalize(obj.v2);
528		- gl.glNormal3f((float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
	545	+
	546	+ SetGLNormal(gl, (float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
529	547	}
530	548
531	549	// P
..	..	@@ -547,7 +565,7 @@
547	565	y += ny * obj.NORMALPUSH;
548	566	z += nz * obj.NORMALPUSH;
549	567
550		- gl.glNormal3f(nx, ny, nz);
	568	+ SetGLNormal(gl, nx, ny, nz);
551	569	}
552	570	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
553	571	SetColor(obj, pv);
..	..	@@ -579,7 +597,7 @@
579	597	y += ny * obj.NORMALPUSH;
580	598	z += nz * obj.NORMALPUSH;
581	599
582		- gl.glNormal3f(nx, ny, nz);
	600	+ SetGLNormal(gl, nx, ny, nz);
583	601	}
584	602	//System.out.println("vertexq = " + qv.s + ", " + qv.t);
585	603	// boolean locked = false;
..	..	@@ -627,7 +645,7 @@
627	645	y += ny * obj.NORMALPUSH;
628	646	z += nz * obj.NORMALPUSH;
629	647
630		- gl.glNormal3f(nx, ny, nz);
	648	+ SetGLNormal(gl, nx, ny, nz);
631	649	}
632	650
633	651	// if ((dot&4) == 0)
..	..	@@ -863,7 +881,7 @@
863	881	//// tris.postdraw(this);
864	882	}
865	883
866		- static Camera localcamera = new Camera();
	884	+ static Camera localAOcamera = new Camera();
867	885	static cVector from = new cVector();
868	886	static cVector to = new cVector();
869	887
..	..	@@ -872,7 +890,7 @@
872	890	CameraPane cp = this;
873	891
874	892	Camera keep = cp.RenderCamera();
875		- cp.renderCamera = localcamera;
	893	+ cp.renderCamera = localAOcamera;
876	894
877	895	if (br.trimmed)
878	896	{
..	..	@@ -890,7 +908,7 @@
890	908	br.positions[i3 + 2] + br.normals[i3 + 2]);
891	909	LA.xformPos(from, transform, from);
892	910	LA.xformPos(to, transform, to); // RIGID ONLY
893		- localcamera.setAim(from, to);
	911	+ localAOcamera.setAim(from, to);
894	912
895	913	CameraPane.occlusionbuffer.display();
896	914
..	..	@@ -924,7 +942,7 @@
924	942	to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
925	943	LA.xformPos(from, transform, from);
926	944	LA.xformPos(to, transform, to); // RIGID ONLY
927		- localcamera.setAim(from, to);
	945	+ localAOcamera.setAim(from, to);
928	946
929	947	CameraPane.occlusionbuffer.display();
930	948
..	..	@@ -1233,10 +1251,10 @@
1233	1251	{
1234	1252	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1235	1253	{
1236		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1254	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1237	1255	} else
1238	1256	{
1239		- gl.glNormal3f(0, 0, 1);
	1257	+ SetGLNormal(gl, 0, 0, 1);
1240	1258	}
1241	1259
1242	1260	if (c != null)
..	..	@@ -1260,10 +1278,10 @@
1260	1278	{
1261	1279	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1262	1280	{
1263		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1281	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1264	1282	} else
1265	1283	{
1266		- gl.glNormal3f(0, 0, 1);
	1284	+ SetGLNormal(gl, 0, 0, 1);
1267	1285	}
1268	1286	if (c != null)
1269	1287	{
..	..	@@ -1288,10 +1306,10 @@
1288	1306	{
1289	1307	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1290	1308	{
1291		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1309	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1292	1310	} else
1293	1311	{
1294		- gl.glNormal3f(0, 0, 1);
	1312	+ SetGLNormal(gl, 0, 0, 1);
1295	1313	}
1296	1314	if (c != null)
1297	1315	{
..	..	@@ -1473,7 +1491,7 @@
1473	1491	{
1474	1492	if (!selectmode)
1475	1493	{
1476		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1494	+ SetGLNormal(gl, (float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
1477	1495	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
1478	1496
1479	1497	if (flipV)
..	..	@@ -1485,6 +1503,8 @@
1485	1503	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1486	1504	}
1487	1505
	1506	+ float[] colorV = new float[4];
	1507	+
1488	1508	void SetColor(Object3D obj, Vertex p0)
1489	1509	{
1490	1510	CameraPane display = this;
..	..	@@ -1552,8 +1572,6 @@
1552	1572	{
1553	1573	return;
1554	1574	}
1555		-
1556		- float[] colorV = new float[3];
1557	1575
1558	1576	if (false) // marked)
1559	1577	{
..	..	@@ -1802,7 +1820,7 @@
1802	1820
1803	1821	display.modelParams7[0] = 0;
1804	1822	display.modelParams7[1] = 1000;
1805		- display.modelParams7[2] = 0;
	1823	+ display.modelParams7[2] = material.parallax;
1806	1824	display.modelParams7[3] = 0;
1807	1825
1808	1826	//display.modelParams6[0] = 100; // criss de bug de bump
..	..	@@ -2035,9 +2053,9 @@
2035	2053	switch(viewcode)
2036	2054	{
2037	2055	case 0: return "main";
2038		- case 1: return "one";
2039		- case 2: return "two";
2040		- case 3: return "three";
	2056	+ case 1: return "Red";
	2057	+ case 2: return "Green";
	2058	+ case 3: return "Blue";
2041	2059	case 4: return "light";
2042	2060	}
2043	2061
..	..	@@ -2458,6 +2476,18 @@
2458	2476	return CreateBim(bytes, width, height);
2459	2477	}
2460	2478
	2479	+ private void SetGLNormal(javax.media.opengl.GL gl, float nx, float ny, float nz)
	2480	+ {
	2481	+ gl.glNormal3f(nx, ny, nz);
	2482	+
	2483	+ if (ny > 0.9 \|\| ny < -0.9)
	2484	+ // Ground or ceiling
	2485	+ gl.glVertexAttrib3f(4, 1, 0, 0);
	2486	+ else
	2487	+ // Walls
	2488	+ gl.glVertexAttrib3f(4, 0, 1, 0);
	2489	+ }
	2490	+
2461	2491	/**/
2462	2492	class CacheTexture
2463	2493	{
..	..	@@ -2500,7 +2530,7 @@
2500	2530	com.sun.opengl.util.texture.TextureIO.newTextureData(
2501	2531	getClass().getClassLoader().getResourceAsStream(name),
2502	2532	true,
2503		- com.sun.opengl.util.texture.TextureIO.PNG);
	2533	+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
2504	2534	} catch (java.io.IOException e)
2505	2535	{
2506	2536	throw new javax.media.opengl.GLException(e);
..	..	@@ -8346,7 +8376,7 @@
8346	8376	// else
8347	8377	// if (!texname.startsWith("/"))
8348	8378	// texname = "/Users/nbriere/Textures/" + texname;
8349		- if (!FileExists(texname))
	8379	+ if (!FileExists(texname) && !texname.startsWith("@"))
8350	8380	{
8351	8381	texname = fallbackTextureName;
8352	8382	}
..	..	@@ -8429,6 +8459,15 @@
8429	8459	new Exception().printStackTrace();
8430	8460	} else
8431	8461	{
	8462	+ if (texname.startsWith("@"))
	8463	+ {
	8464	+ // texturecache = textures.get(texname); // suspicious
	8465	+ if (texturecache == null)
	8466	+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
	8467	+ else
	8468	+ new Exception().printStackTrace();
	8469	+ } else
	8470	+ {
8432	8471	if (textureon)
8433	8472	{
8434	8473	String cachename = texname;
..	..	@@ -8488,6 +8527,7 @@
8488	8527	texturecache = new CacheTexture(texturedata,resolution);
8489	8528	//texture = GetTexture(tex, bump);
8490	8529	}
	8530	+ }
8491	8531	}
8492	8532	//}
8493	8533	}
..	..	@@ -8756,10 +8796,12 @@
8756	8796
8757	8797	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8758	8798	MAXSTACK = temp[0];
8759		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8799	+ if (Globals.DEBUG)
	8800	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8760	8801	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8761	8802	MAXSTACK = temp[0];
8762		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8803	+ if (Globals.DEBUG)
	8804	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8763	8805
8764	8806	// Use debug pipeline
8765	8807	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8767,7 +8809,8 @@
8767	8809	gl = drawable.getGL(); //
8768	8810
8769	8811	GL gl3 = getGL();
8770		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8812	+ if (Globals.DEBUG)
	8813	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8771	8814
8772	8815
8773	8816	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8932,7 +8975,7 @@
8932	8975
8933	8976	if (cubemap == null)
8934	8977	{
8935		- LoadEnvy(5);
	8978	+ //LoadEnvy(1);
8936	8979	}
8937	8980
8938	8981	//cubemap.enable();
..	..	@@ -9208,6 +9251,8 @@
9208	9251
9209	9252	void LoadEnvy(int which)
9210	9253	{
	9254	+ assert(false);
	9255	+
9211	9256	String name;
9212	9257	String ext;
9213	9258
..	..	@@ -9219,37 +9264,58 @@
9219	9264	cubemap = null;
9220	9265	return;
9221	9266	case 1:
9222		- name = "cubemaps/box_";
9223		- ext = "png";
	9267	+ name = "cubemaps/rgb/";
	9268	+ ext = "jpg";
9224	9269	reverseUP = false;
9225	9270	break;
9226	9271	case 2:
9227		- name = "cubemaps/uffizi_";
9228		- ext = "png";
9229		- break; // reverseUP = true; break;
	9272	+ name = "cubemaps/uffizi/";
	9273	+ ext = "jpg";
	9274	+ reverseUP = false;
	9275	+ break;
9230	9276	case 3:
9231		- name = "cubemaps/CloudyHills_";
9232		- ext = "tga";
	9277	+ name = "cubemaps/CloudyHills/";
	9278	+ ext = "jpg";
9233	9279	reverseUP = false;
9234	9280	break;
9235	9281	case 4:
9236		- name = "cubemaps/cornell_";
	9282	+ name = "cubemaps/cornell/";
9237	9283	ext = "png";
9238	9284	reverseUP = false;
9239	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;
9240	9311	default:
9241		- name = "cubemaps/rgb_";
9242		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9312	+ name = "cubemaps/box/";
	9313	+ ext = "png"; /mipmap = true;/
	9314	+ reverseUP = false;
9243	9315	break;
9244	9316	}
9245		-
9246		- try
9247		- {
9248		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9249		- } catch (IOException e)
9250		- {
9251		- throw new RuntimeException(e);
9252		- }
	9317	+
	9318	+ LoadSkybox(name, ext, mipmap);
9253	9319	}
9254	9320
9255	9321	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -9281,8 +9347,12 @@
9281	9347	static double[] model = new double[16];
9282	9348	double[] camera2light = new double[16];
9283	9349	double[] light2camera = new double[16];
9284		- int newenvy = -1;
9285		- boolean envyoff = true; // false;
	9350	+
	9351	+ //int newenvy = -1;
	9352	+ //boolean envyoff = false;
	9353	+
	9354	+ String loadedskyboxname;
	9355	+
9286	9356	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
9287	9357	//float[] light0 = { 0,0,0 };
9288	9358	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9762,10 +9832,12 @@
9762	9832	rati = 1 / rati;
9763	9833	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9764	9834	}
9765		- assert (newenvy == -1);
	9835	+
	9836	+ //assert (newenvy == -1);
	9837	+
9766	9838	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9767	9839	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9768		- DrawSkyBox(gl);
	9840	+ DrawSkyBox(gl, (float)rati);
9769	9841	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9770	9842	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9771	9843	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -10631,9 +10703,18 @@
10631	10703	static boolean init = false;
10632	10704
10633	10705	double[][] matrix = LA.newMatrix();
	10706	+
	10707	+ // This is to refresh the UI of the material panel.
	10708	+ ObjEditor patchMaterial;
10634	10709
10635	10710	public void display(GLAutoDrawable drawable)
10636	10711	{
	10712	+ if (patchMaterial.patchMaterial)
	10713	+ {
	10714	+ patchMaterial.patchMaterial = false;
	10715	+ patchMaterial.objectPanel.setSelectedIndex(1);
	10716	+ }
	10717	+
10637	10718	if (Grafreed.savesound && Grafreed.hassound)
10638	10719	{
10639	10720	Grafreed.wav.save();
..	..	@@ -10802,7 +10883,7 @@
10802	10883
10803	10884	if (wait)
10804	10885	{
10805		- Sleep(500);
	10886	+ Sleep(200); // blocks everything
10806	10887
10807	10888	wait = false;
10808	10889	}
..	..	@@ -11018,13 +11099,43 @@
11018	11099	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
11019	11100	}
11020	11101
11021		- if (newenvy > -1)
	11102	+// if (newenvy > -1)
	11103	+// {
	11104	+// LoadEnvy(newenvy);
	11105	+// }
	11106	+//
	11107	+// newenvy = -1;
	11108	+
	11109	+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
11022	11110	{
11023		- LoadEnvy(newenvy);
	11111	+ if (cubemaprgb == null)
	11112	+ {
	11113	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
	11114	+ }
	11115	+
	11116	+ cubemap = cubemaprgb;
11024	11117	}
11025		-
11026		- newenvy = -1;
11027		-
	11118	+ else
	11119	+ {
	11120	+ if (object.skyboxname != null)
	11121	+ {
	11122	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11123	+ {
	11124	+ if (cubemap != null && cubemap != cubemaprgb)
	11125	+ cubemap.dispose();
	11126	+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11127	+ loadedskyboxname = object.skyboxname;
	11128	+ }
	11129	+ }
	11130	+ else
	11131	+ {
	11132	+ cubemapcustom = null;
	11133	+ loadedskyboxname = null;
	11134	+ }
	11135	+
	11136	+ cubemap = cubemapcustom;
	11137	+ }
	11138	+
11028	11139	ratio = ((double) getWidth()) / getHeight();
11029	11140	//System.out.println("ratio = " + ratio);
11030	11141
..	..	@@ -11040,7 +11151,7 @@
11040	11151
11041	11152	if (!IsFrozen() && !ambientOcclusion)
11042	11153	{
11043		- DrawSkyBox(gl);
	11154	+ DrawSkyBox(gl, (float)ratio);
11044	11155	}
11045	11156
11046	11157	//if (selection_view == -1)
..	..	@@ -11326,7 +11437,7 @@
11326	11437
11327	11438	// if (cam != lightCamera)
11328	11439	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11329		- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
	11440	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
11330	11441	}
11331	11442
11332	11443	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -12400,11 +12511,12 @@
12400	12511
12401	12512	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12402	12513
12403		- String program =
	12514	+ String programmin =
12404	12515	// Min shader
12405	12516	"!!ARBfp1.0\n" +
12406		- "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
12407		- "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12517	+ "PARAM zero12t = { 0.0, 1.0, 2, 1.25 };" +
	12518	+ "PARAM pow_2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12519	+ "PARAM pow2 = { 2, 4, 8, 0.0 };" +
12408	12520	"PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
12409	12521	"PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
12410	12522	"PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
..	..	@@ -12419,10 +12531,11 @@
12419	12531	"TEMP eye;" +
12420	12532	"TEMP pos;" +
12421	12533
12422		- "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12534	+ "MAD normal, fragment.color, zero12t.z, -zero12t.y;" +
12423	12535	Normalize("normal") +
12424	12536	"MOV light, state.light[0].position;" +
12425	12537	"DP3 ndotl.x, light, normal;" +
	12538	+ "MAX ndotl.x, ndotl.x, zero12t.x;" +
12426	12539
12427	12540	// shadow
12428	12541	"MOV pos, fragment.texcoord[1];" +
..	..	@@ -12438,7 +12551,7 @@
12438	12551	"MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
12439	12552
12440	12553	// Backlit
12441		- "MOV pos.w, zero123.y;" +
	12554	+ "MOV pos.w, zero12t.y;" + // one
12442	12555	"DP4 eye.x, pos, light2cam0;" +
12443	12556	"DP4 eye.y, pos, light2cam1;" +
12444	12557	"DP4 eye.z, pos, light2cam2;" +
..	..	@@ -12446,27 +12559,32 @@
12446	12559
12447	12560	"DP3 ndotl.y, -eye, normal;" +
12448	12561	//"MUL ndotl.y, ndotl.y, pow2.x;" +
12449		- "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
12450		- "SUB ndotl.y, zero123.y, ndotl.y;" +
	12562	+ "POW ndotl.y, ndotl.y, pow2.x;" + // backlit
	12563	+ "SUB ndotl.y, zero12t.y, ndotl.y;" + // 1 - y
	12564	+ //"POW ndotl.y, ndotl.y, pow2.z;" + // backlit
12451	12565	//"SUB ndotl.y, zero123.y, ndotl.y;" +
12452	12566	//"MUL ndotl.y, ndotl.y, pow2.z;" +
	12567	+ "ADD ndotl.y, ndotl.y, one.x;" +
	12568	+ "MUL ndotl.y, ndotl.y, pow_2.x;" +
12453	12569
12454		- "MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12570	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12571	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
12455	12572
12456	12573	// Pigment
12457	12574	"TEX temp, fragment.texcoord[0], texture[0], 2D;" +
12458		- "LRP temp, zero123.w, temp, one;" + // texture proportion
12459		- "MUL temp, temp, ndotl.x;" +
12460		-
12461		- "MUL temp, temp, zero123.z;" +
	12575	+ "LRP temp, zero12t.w, temp, one;" + // texture proportion
	12576	+ "MUL temp, temp, zero12t.w;" + // Times x
12462	12577
12463	12578	//"MUL temp, temp, ndotl.y;" +
	12579	+ "MAD ndotl.x, pow_2.xxxx, ndotl.yyyy, ndotl.x;" +
12464	12580
12465		- "MOV temp.w, zero123.y;" + // reset alpha
	12581	+ "MUL temp, temp, ndotl.x;" + // lambert
	12582	+
	12583	+ "MOV temp.w, zero12t.y;" + // reset alpha
12466	12584	"MOV result.color, temp;" +
12467	12585	"END";
12468	12586
12469		- String program2 =
	12587	+ String programmax =
12470	12588	"!!ARBfp1.0\n" +
12471	12589
12472	12590	//"OPTION ARB_fragment_program_shadow;" +
..	..	@@ -12494,7 +12612,7 @@
12494	12612	"PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
12495	12613	"PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
12496	12614	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12497		- "PARAM params7 = program.env[7];" + // noise power, opacity power
	12615	+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
12498	12616	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
12499	12617	"PARAM options1 = program.env[62];" + // fog rgb color
12500	12618	"PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
..	..	@@ -12739,7 +12857,7 @@
12739	12857	"POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
12740	12858	// mar 2013 ??? "KIL alpha.a;" +
12741	12859	"MOV alpha, texSamp.aaaa;" + // y;" +
12742		- "KIL alpha.a;" +
	12860	+ "KIL alpha.a;" + // not sure with parallax mapping
12743	12861	/*
12744	12862	"MUL temp.xy, temp, two;" +
12745	12863	"TXB bump, temp, texture[0], 2D;" +
..	..	@@ -12825,11 +12943,6 @@
12825	12943	"SUB bump0, bump0, half;" +
12826	12944	"ADD bump, bump, bump0;" +
12827	12945
12828		- "MOV temp.x, texSamp.a;" +
12829		- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12830		- //"LRP texSamp0, params5.x, texSamp0, one;" +
12831		- "MOV texSamp.a, temp.x;" +
12832		-
12833	12946	// double-sided
12834	12947	/**/
12835	12948	(doublesided?"DP3 temp.z, normal, eye;" +
..	..	@@ -12839,26 +12952,73 @@
12839	12952	"ADD temp.x, temp.x, one.x;" +
12840	12953	"MUL normal, normal, temp.xxxx;":""
12841	12954	) +
12842		- /**/
12843		-//// Normalize("normal") +
12844		-//// "MAX normal.z, eps.x, normal.z;" +
12845		-// Normalize("normal") +
12846		- "MOV normald, normal;" +
12847		- "MOV normals, normal;" +
	12955	+ /**/
	12956	+
	12957	+ "MOV temp, fragment.texcoord[4];" +
12848	12958
12849	12959	// UV base
12850	12960	//"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
12851	12961	//"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
12852	12962	//"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
12853		- "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
12854		- "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
12855		- "DP3 UP.z,state.matrix.texture[7].row[2],Y;" +
	12963	+ "DP3 UP.x,state.matrix.texture[7].row[0],temp;" +
	12964	+ "DP3 UP.y,state.matrix.texture[7].row[1],temp;" +
	12965	+ "DP3 UP.z,state.matrix.texture[7].row[2],temp;" +
	12966	+ Normalize("UP") +
	12967	+
12856	12968	"XPD V, normal, UP;" +
12857	12969	Normalize("V") +
12858	12970	"XPD U, V, normal;" +
12859	12971	Normalize("U") +
12860	12972
	12973	+ "MOV temp, fragment.texcoord[0];" +
	12974	+
	12975	+// "MAD normal, -temp.x, U, normal;" +
	12976	+// "MAD normal, -temp.y, V, normal;" +
	12977	+// Normalize("normal") +
	12978	+
	12979	+//// "MAX normal.z, eps.x, normal.z;" +
	12980	+// Normalize("normal") +
	12981	+ "MOV normald, normal;" +
	12982	+ "MOV normals, normal;" +
	12983	+
12861	12984	// parallax mapping
	12985	+
	12986	+ "DP3 temp2.x, V, eye;" +
	12987	+ "DP3 temp2.y, U, eye;" +
	12988	+ "DP3 temp2.z, normal, eye;" +
	12989	+ "RCP temp2.z, temp2.z;" +
	12990	+
	12991	+ "DP3 temp2.w, texSamp, texSamp;" + // Height
	12992	+ "RSQ temp2.w, temp2.w;" +
	12993	+ "RCP temp2.w, temp2.w;" +
	12994	+
	12995	+ "SUB temp2.w, temp2.w, half;" +
	12996	+ // "SGE temp.x, temp2.w, eps.x;" +
	12997	+ // "MUL temp2.w, temp2.w, temp.x;" +
	12998	+
	12999	+ // "MOV texSamp, U;" +
	13000	+
	13001	+ "MUL temp2.z, temp2.z, temp2.w;" +
	13002	+ "MUL temp2.z, temp2.z, params7.z;" + // parallax
	13003	+
	13004	+ "MUL temp2, temp2, temp2.z;" +
	13005	+
	13006	+ "SUB temp, temp, temp2;" +
	13007	+
	13008	+ "TEX temp, temp, texture[0], 2D;" +
	13009	+ "POW temp.a, temp.a, params6.w;" + // punch through
	13010	+
	13011	+ "ADD texSamp, temp, texSamp;" +
	13012	+ "MUL texSamp.xyz, half, texSamp;" +
	13013	+
	13014	+ "MOV alpha, texSamp.aaaa;" +
	13015	+
	13016	+// parallax mapping
	13017	+
	13018	+ "MOV temp.x, texSamp.a;" +
	13019	+ "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
	13020	+ //"LRP texSamp0, params5.x, texSamp0, one;" +
	13021	+ "MOV texSamp.a, temp.x;" +
12862	13022
12863	13023	//"MOV temp, fragment.texcoord[0];" +
12864	13024	//
..	..	@@ -12991,7 +13151,7 @@
12991	13151	// display shadow only (fakedepth == 0)
12992	13152	"SUB temp.x, half.x, shadow.x;" +
12993	13153	"MOV temp.y, -params5.z;" + // params6.x;" +
12994		- "SLT temp.z, temp.y, -one2048th.x;" +
	13154	+ "SLT temp.z, temp.y, -c256i.x;" +
12995	13155	"SUB temp.y, one.x, temp.z;" +
12996	13156	"MUL temp.x, temp.x, temp.y;" +
12997	13157	"KIL temp.x;" +
..	..	@@ -13322,8 +13482,19 @@
13322	13482	//once = true;
13323	13483	}
13324	13484
13325		- System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13326		- System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13485	+ String program = programmax;
	13486	+
	13487	+ if (Globals.MINSHADER)
	13488	+ {
	13489	+ program = programmin;
	13490	+ }
	13491	+
	13492	+ if (Globals.DEBUG)
	13493	+ {
	13494	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
	13495	+ System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13496	+ }
	13497	+
13327	13498	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13328	13499
13329	13500	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13370,7 +13541,8 @@
13370	13541	"\n" +
13371	13542	"END\n";
13372	13543
13373		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13544	+ if (Globals.DEBUG)
	13545	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13374	13546	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13375	13547
13376	13548	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13628,7 +13800,7 @@
13628	13800	/static/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
13629	13801	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13630	13802	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13631		- /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
	13803	+ /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
13632	13804
13633	13805	//Object3D.cVector2[] vector2buffer;
13634	13806
..	..	@@ -13795,7 +13967,7 @@
13795	13967	"PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
13796	13968	"PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
13797	13969	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
13798		- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
	13970	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
13799	13971	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
13800	13972	"PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
13801	13973	//"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
..	..	@@ -13856,7 +14028,7 @@
13856	14028	"DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
13857	14029	"DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
13858	14030	"DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
13859		- //"MOV result.texcoord, vertex.texcoord;" +
	14031	+ //"MOV result.texcoord, vertex.fogcoord;" +
13860	14032	"MOV result.texcoord, temp;" +
13861	14033	// border fade
13862	14034	"MOV result.texcoord[3], vertex.texcoord;" +
..	..	@@ -13903,7 +14075,9 @@
13903	14075
13904	14076	//"ADD temp.z, temp.z, one;" +
13905	14077
13906		- "MOV result.color, temp;"
	14078	+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
	14079	+
	14080	+ "MOV result.color, temp;" // Normal
13907	14081	: "MOV result.color, vertex.color;") +
13908	14082	((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
13909	14083	: "") +
..	..	@@ -14562,18 +14736,24 @@
14562	14736	}
14563	14737	}
14564	14738	PingThread pingthread = new PingThread();
14565		- int delta = 5;
14566		- int speed = 5;
	14739	+ int delta = 2;
	14740	+ int speed = 10;
14567	14741	boolean autorepeat = false;
14568	14742
14569	14743	void GoDown(int mod)
14570	14744	{
14571	14745	MODIFIERS \|= COMMAND;
	14746	+ boolean isVR = (mouseMode&VR)!=0;
14572	14747	/**/
14573	14748	if((mod&SHIFT) == SHIFT)
14574		- manipCamera.RotatePosition(0, -speed);
	14749	+ {
	14750	+ if (isVR)
	14751	+ manipCamera.RotateInterest(0, -speed);
	14752	+ else
	14753	+ manipCamera.RotatePosition(0, -speed);
	14754	+ }
14575	14755	else
14576		- manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14756	+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
14577	14757	/**/
14578	14758	if ((mod & SHIFT) == SHIFT)
14579	14759	{
..	..	@@ -14583,6 +14763,8 @@
14583	14763	mouseMode \|= BACKFORTH;
14584	14764	}
14585	14765
	14766	+ targetLookAt.set(manipCamera.lookAt);
	14767	+
14586	14768	//prevX = X = anchorX;
14587	14769	prevY = Y = anchorY - (int) (renderCamera.Distance());
14588	14770	}
..	..	@@ -14591,10 +14773,17 @@
14591	14773	{
14592	14774	MODIFIERS \|= COMMAND;
14593	14775	/**/
	14776	+ boolean isVR = (mouseMode&VR)!=0;
	14777	+
14594	14778	if((mod&SHIFT) == SHIFT)
14595		- manipCamera.RotatePosition(0, speed);
	14779	+ {
	14780	+ if (isVR)
	14781	+ manipCamera.RotateInterest(0, speed);
	14782	+ else
	14783	+ manipCamera.RotatePosition(0, speed);
	14784	+ }
14596	14785	else
14597		- manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14786	+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
14598	14787	/**/
14599	14788	if ((mod & SHIFT) == SHIFT)
14600	14789	{
..	..	@@ -14604,6 +14793,8 @@
14604	14793	mouseMode \|= BACKFORTH;
14605	14794	}
14606	14795
	14796	+ targetLookAt.set(manipCamera.lookAt);
	14797	+
14607	14798	//prevX = X = anchorX;
14608	14799	prevY = Y = anchorY + (int) (renderCamera.Distance());
14609	14800	}
..	..	@@ -14613,9 +14804,14 @@
14613	14804	MODIFIERS \|= COMMAND;
14614	14805	/**/
14615	14806	if((mod&SHIFT) == SHIFT)
14616		- manipCamera.Translate(speed*delta, 0, getWidth());
	14807	+ manipCamera.Translate(speed*delta, 0, getWidth());
14617	14808	else
14618		- manipCamera.RotatePosition(speed, 0);
	14809	+ {
	14810	+ if ((mouseMode&VR)!=0)
	14811	+ manipCamera.RotateInterest(-speed, 0);
	14812	+ else
	14813	+ manipCamera.RotatePosition(speed, 0);
	14814	+ }
14619	14815	/**/
14620	14816	if ((mod & SHIFT) == SHIFT)
14621	14817	{
..	..	@@ -14625,6 +14821,8 @@
14625	14821	mouseMode \|= ROTATE;
14626	14822	} // TRANSLATE;
14627	14823
	14824	+ targetLookAt.set(manipCamera.lookAt);
	14825	+
14628	14826	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
14629	14827	prevY = Y = anchorY;
14630	14828	}
..	..	@@ -14634,9 +14832,15 @@
14634	14832	MODIFIERS \|= COMMAND;
14635	14833	/**/
14636	14834	if((mod&SHIFT) == SHIFT)
14637		- manipCamera.Translate(-speed*delta, 0, getWidth());
	14835	+ manipCamera.Translate(-speed*delta, 0, getWidth());
14638	14836	else
14639		- manipCamera.RotatePosition(-speed, 0);
	14837	+ {
	14838	+ if ((mouseMode&VR)!=0)
	14839	+ manipCamera.RotateInterest(speed, 0);
	14840	+ else
	14841	+ manipCamera.RotatePosition(-speed, 0);
	14842	+ }
	14843	+
14640	14844	/**/
14641	14845	if ((mod & SHIFT) == SHIFT)
14642	14846	{
..	..	@@ -14646,6 +14850,8 @@
14646	14850	mouseMode \|= ROTATE;
14647	14851	} // TRANSLATE;
14648	14852
	14853	+ targetLookAt.set(manipCamera.lookAt);
	14854	+
14649	14855	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
14650	14856	prevY = Y = anchorY;
14651	14857	}
..	..	@@ -15148,8 +15354,8 @@
15148	15354	case 'K':
15149	15355	KOMPACTTEXTURE ^= true;
15150	15356	//textures.clear();
15151		- break;
15152		- case 'P': // Texture Projection macros
	15357	+ // break;
	15358	+ //case 'P': // Texture Projection macros
15153	15359	// SAVETEXTURE ^= true;
15154	15360	macromode = true;
15155	15361	Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
..	..	@@ -15270,7 +15476,7 @@
15270	15476	targetLookAt.set(manipCamera.lookAt);
15271	15477	repaint();
15272	15478	break;
15273		- case 'p':
	15479	+ case 'P': // p':
15274	15480	// c'est quoi ca au juste? spherical ^= true;
15275	15481	Skinshader ^= true; programInitialized = false;
15276	15482	repaint();
..	..	@@ -15308,27 +15514,31 @@
15308	15514	repaint();
15309	15515	break;
15310	15516	case 'O':
15311		- Globals.drawMode = OCCLUSION; // WARNING
	15517	+ // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
15312	15518	repaint();
15313	15519	break;
15314	15520	case 'o':
15315	15521	OCCLUSION_CULLING ^= true;
15316	15522	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
15317	15523	break;
15318		- case '0': envyoff ^= true; repaint(); break;
	15524	+ //case '0': envyoff ^= true; repaint(); break;
15319	15525	case '1':
15320	15526	case '2':
15321	15527	case '3':
15322	15528	case '4':
15323	15529	case '5':
15324		- newenvy = Character.getNumericValue(key);
15325		- repaint();
15326		- break;
15327	15530	case '6':
15328	15531	case '7':
15329	15532	case '8':
15330	15533	case '9':
15331		- BGcolor = (key - '6')/3.f;
	15534	+ if (true) // envyoff)
	15535	+ {
	15536	+ BGcolor = (key - '1')/8.f;
	15537	+ }
	15538	+ else
	15539	+ {
	15540	+ //newenvy = Character.getNumericValue(key);
	15541	+ }
15332	15542	repaint();
15333	15543	break;
15334	15544	case '!':
..	..	@@ -16026,14 +16236,14 @@
16026	16236	{
16027	16237	switch (hitSomething)
16028	16238	{
16029		- case Object3D.hitCenter: gr.setColor(Color.pink);
	16239	+ case Object3D.hitCenter: gr.setColor(Color.white);
16030	16240	gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
16031	16241	break;
16032	16242	case Object3D.hitRotate: gr.setColor(Color.yellow);
16033	16243	gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
16034	16244	break;
16035	16245	case Object3D.hitScale: gr.setColor(Color.cyan);
16036		- gr.drawLine(X, Y, 0, 0);
	16246	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
16037	16247	break;
16038	16248	}
16039	16249
..	..	@@ -16052,7 +16262,7 @@
16052	16262	if (hasMarquee)
16053	16263	{
16054	16264	gr.setXORMode(Color.white);
16055		- gr.setColor(Color.red);
	16265	+ gr.setColor(Color.white);
16056	16266	if (!firstime)
16057	16267	{
16058	16268	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -16519,6 +16729,8 @@
16519	16729	private /static/ boolean firstime;
16520	16730	private /static/ cVector newView = new cVector();
16521	16731	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16732	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16733	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
16522	16734	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16523	16735	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16524	16736	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16531,29 +16743,67 @@
16531	16743	{
16532	16744	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16533	16745
	16746	+ int usedsuf = 0;
	16747	+
16534	16748	for (int i = 0; i < suffixes.length; i++)
16535	16749	{
16536		- String resourceName = basename + suffixes[i] + "." + suffix;
16537		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16538		- mipmapped,
16539		- FileUtil.getFileSuffix(resourceName));
16540		- if (data == null)
	16750	+ String[] suffixe = suffixes;
	16751	+ String[] fallback = suffixes2;
	16752	+ String[] fallfallback = suffixes3;
	16753	+
	16754	+ for (int c=usedsuf; --c>=0;)
16541	16755	{
16542		- throw new IOException("Unable to load texture " + resourceName);
	16756	+// String[] temp = suffixe;
	16757	+// suffixe = fallback;
	16758	+// fallback = fallfallback;
	16759	+// fallfallback = temp;
16543	16760	}
	16761	+
	16762	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16763	+ TextureData data;
	16764	+
	16765	+ try
	16766	+ {
	16767	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16768	+ mipmapped,
	16769	+ FileUtil.getFileSuffix(resourceName));
	16770	+ }
	16771	+ catch (Exception e)
	16772	+ {
	16773	+ try
	16774	+ {
	16775	+ resourceName = basename + fallback[i] + "." + suffix;
	16776	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16777	+ mipmapped,
	16778	+ FileUtil.getFileSuffix(resourceName));
	16779	+ }
	16780	+ catch (Exception e2)
	16781	+ {
	16782	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16783	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16784	+ mipmapped,
	16785	+ FileUtil.getFileSuffix(resourceName));
	16786	+ }
	16787	+ }
	16788	+
16544	16789	//System.out.println("Target = " + targets[i]);
16545	16790	cubemap.updateImage(data, targets[i]);
16546	16791	}
16547	16792
16548	16793	return cubemap;
16549	16794	}
	16795	+
16550	16796	int bigsphere = -1;
16551	16797
16552	16798	float BGcolor = 0.5f;
16553	16799
16554		- private void DrawSkyBox(GL gl)
	16800	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16801	+
	16802	+ private void DrawSkyBox(GL gl, float ratio)
16555	16803	{
16556		- if (envyoff \|\| cubemap == null)
	16804	+ if (//envyoff \|\|
	16805	+ WIREFRAME \|\|
	16806	+ cubemap == null)
16557	16807	{
16558	16808	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16559	16809	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -16568,7 +16818,17 @@
16568	16818	// Compensates for ExaminerViewer's modification of modelview matrix
16569	16819	gl.glMatrixMode(GL.GL_MODELVIEW);
16570	16820	gl.glLoadIdentity();
	16821	+ gl.glScalef(1,ratio,1);
16571	16822
	16823	+// colorV[0] = 2;
	16824	+// colorV[1] = 2;
	16825	+// colorV[2] = 2;
	16826	+// colorV[3] = 1;
	16827	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16828	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16829	+//
	16830	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16831	+
16572	16832	//gl.glActiveTexture(GL.GL_TEXTURE1);
16573	16833	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16574	16834
..	..	@@ -16600,6 +16860,7 @@
16600	16860	{
16601	16861	gl.glScalef(1.0f, -1.0f, 1.0f);
16602	16862	}
	16863	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16603	16864	gl.glMultMatrixd(viewrot_1, 0);
16604	16865	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16605	16866	//viewer.updateInverseRotation(gl);
..	..	@@ -16640,7 +16901,8 @@
16640	16901	gl.glDisable(GL.GL_TEXTURE_GEN_R);
16641	16902
16642	16903	cubemap.disable();
16643		- ////cubemap.unbind();
	16904	+ //cubemap.dispose();
	16905	+
16644	16906	if (CULLFACE)
16645	16907	{
16646	16908	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -16696,7 +16958,7 @@
16696	16958	gl.glScalef(1.0f, -1.0f, 1.0f);
16697	16959	}
16698	16960
16699		- gl.glNormal3f(0.0f, 0.0f, 1.0f);
	16961	+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
16700	16962
16701	16963	float step = 2; // 0.1666f; //0.25f;
16702	16964	float stepv = 2; // step * 1652 / 998;
..	..	@@ -16858,7 +17120,7 @@
16858	17120	//new Exception().printStackTrace();
16859	17121	System.out.println("select buffer init");
16860	17122	// Use debug pipeline
16861		- drawable.setGL(new DebugGL(drawable.getGL()));
	17123	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16862	17124
16863	17125	GL gl = drawable.getGL();
16864	17126
..	..	@@ -17176,6 +17438,7 @@
17176	17438
17177	17439	public void init(GLAutoDrawable drawable)
17178	17440	{
	17441	+ if (Globals.DEBUG)
17179	17442	System.out.println("shadow buffer init");
17180	17443
17181	17444	GL gl = drawable.getGL();
..	..	@@ -17404,10 +17667,14 @@
17404	17667	gl.glFlush();
17405	17668
17406	17669	/**/
17407		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
	17670	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
17408	17671
17409		- float[] pixels = occlusionsizebuffer.array();
	17672	+ float[] depths = occlusiondepthbuffer.array();
17410	17673
	17674	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
	17675	+
	17676	+ int[] pixels = selectsizebuffer.array();
	17677	+
17411	17678	double r = 0, g = 0, b = 0;
17412	17679
17413	17680	double count = 0;
..	..	@@ -17418,7 +17685,7 @@
17418	17685
17419	17686	double FACTOR = 1;
17420	17687
17421		- for (int i = 0; i < pixels.length; i++)
	17688	+ for (int i = 0; i < depths.length; i++)
17422	17689	{
17423	17690	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
17424	17691	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -17501,7 +17768,7 @@
17501	17768
17502	17769	double scale = ray.z; // 1; // cos
17503	17770
17504		- float depth = pixels[newindex];
	17771	+ float depth = depths[newindex];
17505	17772
17506	17773	/*
17507	17774	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -17698,11 +17965,14 @@
17698	17965	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17699	17966	static IntBuffer bigAAbuffer;
17700	17967	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17701		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	17968	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17702	17969	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17703	17970	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17704	17971	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17705		- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17972	+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17973	+
	17974	+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17975	+
17706	17976	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17707	17977	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17708	17978	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();