~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
..	..	@@ -188,15 +192,16 @@
188	192
189	193	private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
190	194
191		- public void LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	195	+ public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
192	196	{
193	197	try
194	198	{
195		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	199	+ return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
196	200	} catch (IOException e)
197	201	{
198	202	System.out.println("NAME = " + name);
199	203	e.printStackTrace(); // throw new RuntimeException(e);
	204	+ return null;
200	205	}
201	206	}
202	207
..	..	@@ -537,7 +542,8 @@
537	542	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
538	543	LA.vecCross(obj.v0, obj.v1, obj.v2);
539	544	LA.vecNormalize(obj.v2);
540		- 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);
541	547	}
542	548
543	549	// P
..	..	@@ -559,7 +565,7 @@
559	565	y += ny * obj.NORMALPUSH;
560	566	z += nz * obj.NORMALPUSH;
561	567
562		- gl.glNormal3f(nx, ny, nz);
	568	+ SetGLNormal(gl, nx, ny, nz);
563	569	}
564	570	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
565	571	SetColor(obj, pv);
..	..	@@ -591,7 +597,7 @@
591	597	y += ny * obj.NORMALPUSH;
592	598	z += nz * obj.NORMALPUSH;
593	599
594		- gl.glNormal3f(nx, ny, nz);
	600	+ SetGLNormal(gl, nx, ny, nz);
595	601	}
596	602	//System.out.println("vertexq = " + qv.s + ", " + qv.t);
597	603	// boolean locked = false;
..	..	@@ -639,7 +645,7 @@
639	645	y += ny * obj.NORMALPUSH;
640	646	z += nz * obj.NORMALPUSH;
641	647
642		- gl.glNormal3f(nx, ny, nz);
	648	+ SetGLNormal(gl, nx, ny, nz);
643	649	}
644	650
645	651	// if ((dot&4) == 0)
..	..	@@ -875,7 +881,7 @@
875	881	//// tris.postdraw(this);
876	882	}
877	883
878		- static Camera localcamera = new Camera();
	884	+ static Camera localAOcamera = new Camera();
879	885	static cVector from = new cVector();
880	886	static cVector to = new cVector();
881	887
..	..	@@ -884,7 +890,7 @@
884	890	CameraPane cp = this;
885	891
886	892	Camera keep = cp.RenderCamera();
887		- cp.renderCamera = localcamera;
	893	+ cp.renderCamera = localAOcamera;
888	894
889	895	if (br.trimmed)
890	896	{
..	..	@@ -902,7 +908,7 @@
902	908	br.positions[i3 + 2] + br.normals[i3 + 2]);
903	909	LA.xformPos(from, transform, from);
904	910	LA.xformPos(to, transform, to); // RIGID ONLY
905		- localcamera.setAim(from, to);
	911	+ localAOcamera.setAim(from, to);
906	912
907	913	CameraPane.occlusionbuffer.display();
908	914
..	..	@@ -936,7 +942,7 @@
936	942	to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
937	943	LA.xformPos(from, transform, from);
938	944	LA.xformPos(to, transform, to); // RIGID ONLY
939		- localcamera.setAim(from, to);
	945	+ localAOcamera.setAim(from, to);
940	946
941	947	CameraPane.occlusionbuffer.display();
942	948
..	..	@@ -1245,10 +1251,10 @@
1245	1251	{
1246	1252	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1247	1253	{
1248		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1254	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1249	1255	} else
1250	1256	{
1251		- gl.glNormal3f(0, 0, 1);
	1257	+ SetGLNormal(gl, 0, 0, 1);
1252	1258	}
1253	1259
1254	1260	if (c != null)
..	..	@@ -1272,10 +1278,10 @@
1272	1278	{
1273	1279	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1274	1280	{
1275		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1281	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1276	1282	} else
1277	1283	{
1278		- gl.glNormal3f(0, 0, 1);
	1284	+ SetGLNormal(gl, 0, 0, 1);
1279	1285	}
1280	1286	if (c != null)
1281	1287	{
..	..	@@ -1300,10 +1306,10 @@
1300	1306	{
1301	1307	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1302	1308	{
1303		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1309	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1304	1310	} else
1305	1311	{
1306		- gl.glNormal3f(0, 0, 1);
	1312	+ SetGLNormal(gl, 0, 0, 1);
1307	1313	}
1308	1314	if (c != null)
1309	1315	{
..	..	@@ -1485,7 +1491,7 @@
1485	1491	{
1486	1492	if (!selectmode)
1487	1493	{
1488		- 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);
1489	1495	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
1490	1496
1491	1497	if (flipV)
..	..	@@ -1814,7 +1820,7 @@
1814	1820
1815	1821	display.modelParams7[0] = 0;
1816	1822	display.modelParams7[1] = 1000;
1817		- display.modelParams7[2] = 0;
	1823	+ display.modelParams7[2] = material.parallax;
1818	1824	display.modelParams7[3] = 0;
1819	1825
1820	1826	//display.modelParams6[0] = 100; // criss de bug de bump
..	..	@@ -2047,9 +2053,9 @@
2047	2053	switch(viewcode)
2048	2054	{
2049	2055	case 0: return "main";
2050		- case 1: return "one";
2051		- case 2: return "two";
2052		- case 3: return "three";
	2056	+ case 1: return "Red";
	2057	+ case 2: return "Green";
	2058	+ case 3: return "Blue";
2053	2059	case 4: return "light";
2054	2060	}
2055	2061
..	..	@@ -2470,6 +2476,18 @@
2470	2476	return CreateBim(bytes, width, height);
2471	2477	}
2472	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	+
2473	2491	/**/
2474	2492	class CacheTexture
2475	2493	{
..	..	@@ -2512,7 +2530,7 @@
2512	2530	com.sun.opengl.util.texture.TextureIO.newTextureData(
2513	2531	getClass().getClassLoader().getResourceAsStream(name),
2514	2532	true,
2515		- com.sun.opengl.util.texture.TextureIO.PNG);
	2533	+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
2516	2534	} catch (java.io.IOException e)
2517	2535	{
2518	2536	throw new javax.media.opengl.GLException(e);
..	..	@@ -8358,7 +8376,7 @@
8358	8376	// else
8359	8377	// if (!texname.startsWith("/"))
8360	8378	// texname = "/Users/nbriere/Textures/" + texname;
8361		- if (!FileExists(texname))
	8379	+ if (!FileExists(texname) && !texname.startsWith("@"))
8362	8380	{
8363	8381	texname = fallbackTextureName;
8364	8382	}
..	..	@@ -8441,6 +8459,15 @@
8441	8459	new Exception().printStackTrace();
8442	8460	} else
8443	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	+ {
8444	8471	if (textureon)
8445	8472	{
8446	8473	String cachename = texname;
..	..	@@ -8500,6 +8527,7 @@
8500	8527	texturecache = new CacheTexture(texturedata,resolution);
8501	8528	//texture = GetTexture(tex, bump);
8502	8529	}
	8530	+ }
8503	8531	}
8504	8532	//}
8505	8533	}
..	..	@@ -8768,10 +8796,12 @@
8768	8796
8769	8797	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8770	8798	MAXSTACK = temp[0];
8771		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8799	+ if (Globals.DEBUG)
	8800	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8772	8801	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8773	8802	MAXSTACK = temp[0];
8774		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8803	+ if (Globals.DEBUG)
	8804	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8775	8805
8776	8806	// Use debug pipeline
8777	8807	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8779,7 +8809,8 @@
8779	8809	gl = drawable.getGL(); //
8780	8810
8781	8811	GL gl3 = getGL();
8782		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8812	+ if (Globals.DEBUG)
	8813	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8783	8814
8784	8815
8785	8816	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -9220,6 +9251,8 @@
9220	9251
9221	9252	void LoadEnvy(int which)
9222	9253	{
	9254	+ assert(false);
	9255	+
9223	9256	String name;
9224	9257	String ext;
9225	9258
..	..	@@ -10670,9 +10703,18 @@
10670	10703	static boolean init = false;
10671	10704
10672	10705	double[][] matrix = LA.newMatrix();
	10706	+
	10707	+ // This is to refresh the UI of the material panel.
	10708	+ ObjEditor patchMaterial;
10673	10709
10674	10710	public void display(GLAutoDrawable drawable)
10675	10711	{
	10712	+ if (patchMaterial.patchMaterial)
	10713	+ {
	10714	+ patchMaterial.patchMaterial = false;
	10715	+ patchMaterial.objectPanel.setSelectedIndex(1);
	10716	+ }
	10717	+
10676	10718	if (Grafreed.savesound && Grafreed.hassound)
10677	10719	{
10678	10720	Grafreed.wav.save();
..	..	@@ -10841,7 +10883,7 @@
10841	10883
10842	10884	if (wait)
10843	10885	{
10844		- Sleep(500);
	10886	+ Sleep(200); // blocks everything
10845	10887
10846	10888	wait = false;
10847	10889	}
..	..	@@ -11064,18 +11106,34 @@
11064	11106	//
11065	11107	// newenvy = -1;
11066	11108
11067		- if (object.skyboxname != null)
	11109	+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
11068	11110	{
11069		- if (!object.skyboxname.equals(this.loadedskyboxname))
	11111	+ if (cubemaprgb == null)
11070	11112	{
11071		- LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
11072		- loadedskyboxname = object.skyboxname;
	11113	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
11073	11114	}
	11115	+
	11116	+ cubemap = cubemaprgb;
11074	11117	}
11075	11118	else
11076	11119	{
11077		- cubemap = null;
11078		- loadedskyboxname = null;
	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;
11079	11137	}
11080	11138
11081	11139	ratio = ((double) getWidth()) / getHeight();
..	..	@@ -12456,8 +12514,9 @@
12456	12514	String programmin =
12457	12515	// Min shader
12458	12516	"!!ARBfp1.0\n" +
12459		- "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
12460		- "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 };" +
12461	12520	"PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
12462	12521	"PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
12463	12522	"PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
..	..	@@ -12472,10 +12531,11 @@
12472	12531	"TEMP eye;" +
12473	12532	"TEMP pos;" +
12474	12533
12475		- "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12534	+ "MAD normal, fragment.color, zero12t.z, -zero12t.y;" +
12476	12535	Normalize("normal") +
12477	12536	"MOV light, state.light[0].position;" +
12478	12537	"DP3 ndotl.x, light, normal;" +
	12538	+ "MAX ndotl.x, ndotl.x, zero12t.x;" +
12479	12539
12480	12540	// shadow
12481	12541	"MOV pos, fragment.texcoord[1];" +
..	..	@@ -12491,7 +12551,7 @@
12491	12551	"MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
12492	12552
12493	12553	// Backlit
12494		- "MOV pos.w, zero123.y;" +
	12554	+ "MOV pos.w, zero12t.y;" + // one
12495	12555	"DP4 eye.x, pos, light2cam0;" +
12496	12556	"DP4 eye.y, pos, light2cam1;" +
12497	12557	"DP4 eye.z, pos, light2cam2;" +
..	..	@@ -12499,24 +12559,28 @@
12499	12559
12500	12560	"DP3 ndotl.y, -eye, normal;" +
12501	12561	//"MUL ndotl.y, ndotl.y, pow2.x;" +
12502		- "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
12503		- "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
12504	12565	//"SUB ndotl.y, zero123.y, ndotl.y;" +
12505	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;" +
12506	12569
12507	12570	//"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
12508	12571	//"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
12509	12572
12510	12573	// Pigment
12511	12574	"TEX temp, fragment.texcoord[0], texture[0], 2D;" +
12512		- "LRP temp, zero123.w, temp, one;" + // texture proportion
12513		- "MUL temp, temp, ndotl.x;" +
12514		-
12515		- "MUL temp, temp, zero123.z;" +
	12575	+ "LRP temp, zero12t.w, temp, one;" + // texture proportion
	12576	+ "MUL temp, temp, zero12t.w;" + // Times x
12516	12577
12517	12578	//"MUL temp, temp, ndotl.y;" +
	12579	+ "MAD ndotl.x, pow_2.xxxx, ndotl.yyyy, ndotl.x;" +
12518	12580
12519		- "MOV temp.w, zero123.y;" + // reset alpha
	12581	+ "MUL temp, temp, ndotl.x;" + // lambert
	12582	+
	12583	+ "MOV temp.w, zero12t.y;" + // reset alpha
12520	12584	"MOV result.color, temp;" +
12521	12585	"END";
12522	12586
..	..	@@ -12548,7 +12612,7 @@
12548	12612	"PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
12549	12613	"PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
12550	12614	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12551		- "PARAM params7 = program.env[7];" + // noise power, opacity power
	12615	+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
12552	12616	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
12553	12617	"PARAM options1 = program.env[62];" + // fog rgb color
12554	12618	"PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
..	..	@@ -12793,7 +12857,7 @@
12793	12857	"POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
12794	12858	// mar 2013 ??? "KIL alpha.a;" +
12795	12859	"MOV alpha, texSamp.aaaa;" + // y;" +
12796		- "KIL alpha.a;" +
	12860	+ "KIL alpha.a;" + // not sure with parallax mapping
12797	12861	/*
12798	12862	"MUL temp.xy, temp, two;" +
12799	12863	"TXB bump, temp, texture[0], 2D;" +
..	..	@@ -12879,11 +12943,6 @@
12879	12943	"SUB bump0, bump0, half;" +
12880	12944	"ADD bump, bump, bump0;" +
12881	12945
12882		- "MOV temp.x, texSamp.a;" +
12883		- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12884		- //"LRP texSamp0, params5.x, texSamp0, one;" +
12885		- "MOV texSamp.a, temp.x;" +
12886		-
12887	12946	// double-sided
12888	12947	/**/
12889	12948	(doublesided?"DP3 temp.z, normal, eye;" +
..	..	@@ -12893,26 +12952,73 @@
12893	12952	"ADD temp.x, temp.x, one.x;" +
12894	12953	"MUL normal, normal, temp.xxxx;":""
12895	12954	) +
12896		- /**/
12897		-//// Normalize("normal") +
12898		-//// "MAX normal.z, eps.x, normal.z;" +
12899		-// Normalize("normal") +
12900		- "MOV normald, normal;" +
12901		- "MOV normals, normal;" +
	12955	+ /**/
	12956	+
	12957	+ "MOV temp, fragment.texcoord[4];" +
12902	12958
12903	12959	// UV base
12904	12960	//"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
12905	12961	//"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
12906	12962	//"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
12907		- "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
12908		- "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
12909		- "DP3 UP.z,state.matrix.texture[7].row[2],Y;" +
	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	+
12910	12968	"XPD V, normal, UP;" +
12911	12969	Normalize("V") +
12912	12970	"XPD U, V, normal;" +
12913	12971	Normalize("U") +
12914	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	+
12915	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;" +
12916	13022
12917	13023	//"MOV temp, fragment.texcoord[0];" +
12918	13024	//
..	..	@@ -13383,8 +13489,12 @@
13383	13489	program = programmin;
13384	13490	}
13385	13491
13386		- System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13387		- System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	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	+
13388	13498	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13389	13499
13390	13500	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13431,7 +13541,8 @@
13431	13541	"\n" +
13432	13542	"END\n";
13433	13543
13434		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13544	+ if (Globals.DEBUG)
	13545	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13435	13546	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13436	13547
13437	13548	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13689,7 +13800,7 @@
13689	13800	/static/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
13690	13801	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13691	13802	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13692		- /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
13693	13804
13694	13805	//Object3D.cVector2[] vector2buffer;
13695	13806
..	..	@@ -13856,7 +13967,7 @@
13856	13967	"PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
13857	13968	"PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
13858	13969	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
13859		- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
	13970	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
13860	13971	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
13861	13972	"PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
13862	13973	//"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
..	..	@@ -13917,7 +14028,7 @@
13917	14028	"DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
13918	14029	"DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
13919	14030	"DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
13920		- //"MOV result.texcoord, vertex.texcoord;" +
	14031	+ //"MOV result.texcoord, vertex.fogcoord;" +
13921	14032	"MOV result.texcoord, temp;" +
13922	14033	// border fade
13923	14034	"MOV result.texcoord[3], vertex.texcoord;" +
..	..	@@ -13964,7 +14075,9 @@
13964	14075
13965	14076	//"ADD temp.z, temp.z, one;" +
13966	14077
13967		- "MOV result.color, temp;"
	14078	+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
	14079	+
	14080	+ "MOV result.color, temp;" // Normal
13968	14081	: "MOV result.color, vertex.color;") +
13969	14082	((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
13970	14083	: "") +
..	..	@@ -14623,18 +14736,24 @@
14623	14736	}
14624	14737	}
14625	14738	PingThread pingthread = new PingThread();
14626		- int delta = 5;
14627		- int speed = 5;
	14739	+ int delta = 2;
	14740	+ int speed = 10;
14628	14741	boolean autorepeat = false;
14629	14742
14630	14743	void GoDown(int mod)
14631	14744	{
14632	14745	MODIFIERS \|= COMMAND;
	14746	+ boolean isVR = (mouseMode&VR)!=0;
14633	14747	/**/
14634	14748	if((mod&SHIFT) == SHIFT)
14635		- manipCamera.RotatePosition(0, -speed);
	14749	+ {
	14750	+ if (isVR)
	14751	+ manipCamera.RotateInterest(0, -speed);
	14752	+ else
	14753	+ manipCamera.RotatePosition(0, -speed);
	14754	+ }
14636	14755	else
14637		- manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14756	+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
14638	14757	/**/
14639	14758	if ((mod & SHIFT) == SHIFT)
14640	14759	{
..	..	@@ -14644,6 +14763,8 @@
14644	14763	mouseMode \|= BACKFORTH;
14645	14764	}
14646	14765
	14766	+ targetLookAt.set(manipCamera.lookAt);
	14767	+
14647	14768	//prevX = X = anchorX;
14648	14769	prevY = Y = anchorY - (int) (renderCamera.Distance());
14649	14770	}
..	..	@@ -14652,10 +14773,17 @@
14652	14773	{
14653	14774	MODIFIERS \|= COMMAND;
14654	14775	/**/
	14776	+ boolean isVR = (mouseMode&VR)!=0;
	14777	+
14655	14778	if((mod&SHIFT) == SHIFT)
14656		- manipCamera.RotatePosition(0, speed);
	14779	+ {
	14780	+ if (isVR)
	14781	+ manipCamera.RotateInterest(0, speed);
	14782	+ else
	14783	+ manipCamera.RotatePosition(0, speed);
	14784	+ }
14657	14785	else
14658		- manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14786	+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
14659	14787	/**/
14660	14788	if ((mod & SHIFT) == SHIFT)
14661	14789	{
..	..	@@ -14665,6 +14793,8 @@
14665	14793	mouseMode \|= BACKFORTH;
14666	14794	}
14667	14795
	14796	+ targetLookAt.set(manipCamera.lookAt);
	14797	+
14668	14798	//prevX = X = anchorX;
14669	14799	prevY = Y = anchorY + (int) (renderCamera.Distance());
14670	14800	}
..	..	@@ -14674,9 +14804,14 @@
14674	14804	MODIFIERS \|= COMMAND;
14675	14805	/**/
14676	14806	if((mod&SHIFT) == SHIFT)
14677		- manipCamera.Translate(speed*delta, 0, getWidth());
	14807	+ manipCamera.Translate(speed*delta, 0, getWidth());
14678	14808	else
14679		- manipCamera.RotatePosition(speed, 0);
	14809	+ {
	14810	+ if ((mouseMode&VR)!=0)
	14811	+ manipCamera.RotateInterest(-speed, 0);
	14812	+ else
	14813	+ manipCamera.RotatePosition(speed, 0);
	14814	+ }
14680	14815	/**/
14681	14816	if ((mod & SHIFT) == SHIFT)
14682	14817	{
..	..	@@ -14686,6 +14821,8 @@
14686	14821	mouseMode \|= ROTATE;
14687	14822	} // TRANSLATE;
14688	14823
	14824	+ targetLookAt.set(manipCamera.lookAt);
	14825	+
14689	14826	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
14690	14827	prevY = Y = anchorY;
14691	14828	}
..	..	@@ -14695,9 +14832,15 @@
14695	14832	MODIFIERS \|= COMMAND;
14696	14833	/**/
14697	14834	if((mod&SHIFT) == SHIFT)
14698		- manipCamera.Translate(-speed*delta, 0, getWidth());
	14835	+ manipCamera.Translate(-speed*delta, 0, getWidth());
14699	14836	else
14700		- manipCamera.RotatePosition(-speed, 0);
	14837	+ {
	14838	+ if ((mouseMode&VR)!=0)
	14839	+ manipCamera.RotateInterest(speed, 0);
	14840	+ else
	14841	+ manipCamera.RotatePosition(-speed, 0);
	14842	+ }
	14843	+
14701	14844	/**/
14702	14845	if ((mod & SHIFT) == SHIFT)
14703	14846	{
..	..	@@ -14707,6 +14850,8 @@
14707	14850	mouseMode \|= ROTATE;
14708	14851	} // TRANSLATE;
14709	14852
	14853	+ targetLookAt.set(manipCamera.lookAt);
	14854	+
14710	14855	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
14711	14856	prevY = Y = anchorY;
14712	14857	}
..	..	@@ -15209,8 +15354,8 @@
15209	15354	case 'K':
15210	15355	KOMPACTTEXTURE ^= true;
15211	15356	//textures.clear();
15212		- break;
15213		- case 'P': // Texture Projection macros
	15357	+ // break;
	15358	+ //case 'P': // Texture Projection macros
15214	15359	// SAVETEXTURE ^= true;
15215	15360	macromode = true;
15216	15361	Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
..	..	@@ -15331,7 +15476,7 @@
15331	15476	targetLookAt.set(manipCamera.lookAt);
15332	15477	repaint();
15333	15478	break;
15334		- case 'p':
	15479	+ case 'P': // p':
15335	15480	// c'est quoi ca au juste? spherical ^= true;
15336	15481	Skinshader ^= true; programInitialized = false;
15337	15482	repaint();
..	..	@@ -15369,7 +15514,7 @@
15369	15514	repaint();
15370	15515	break;
15371	15516	case 'O':
15372		- Globals.drawMode = OCCLUSION; // WARNING
	15517	+ // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
15373	15518	repaint();
15374	15519	break;
15375	15520	case 'o':
..	..	@@ -16091,7 +16236,7 @@
16091	16236	{
16092	16237	switch (hitSomething)
16093	16238	{
16094		- case Object3D.hitCenter: gr.setColor(Color.pink);
	16239	+ case Object3D.hitCenter: gr.setColor(Color.white);
16095	16240	gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
16096	16241	break;
16097	16242	case Object3D.hitRotate: gr.setColor(Color.yellow);
..	..	@@ -16117,7 +16262,7 @@
16117	16262	if (hasMarquee)
16118	16263	{
16119	16264	gr.setXORMode(Color.white);
16120		- gr.setColor(Color.red);
	16265	+ gr.setColor(Color.white);
16121	16266	if (!firstime)
16122	16267	{
16123	16268	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -16657,6 +16802,7 @@
16657	16802	private void DrawSkyBox(GL gl, float ratio)
16658	16803	{
16659	16804	if (//envyoff \|\|
	16805	+ WIREFRAME \|\|
16660	16806	cubemap == null)
16661	16807	{
16662	16808	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
..	..	@@ -16755,7 +16901,8 @@
16755	16901	gl.glDisable(GL.GL_TEXTURE_GEN_R);
16756	16902
16757	16903	cubemap.disable();
16758		- ////cubemap.unbind();
	16904	+ //cubemap.dispose();
	16905	+
16759	16906	if (CULLFACE)
16760	16907	{
16761	16908	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -16811,7 +16958,7 @@
16811	16958	gl.glScalef(1.0f, -1.0f, 1.0f);
16812	16959	}
16813	16960
16814		- gl.glNormal3f(0.0f, 0.0f, 1.0f);
	16961	+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
16815	16962
16816	16963	float step = 2; // 0.1666f; //0.25f;
16817	16964	float stepv = 2; // step * 1652 / 998;
..	..	@@ -17291,6 +17438,7 @@
17291	17438
17292	17439	public void init(GLAutoDrawable drawable)
17293	17440	{
	17441	+ if (Globals.DEBUG)
17294	17442	System.out.println("shadow buffer init");
17295	17443
17296	17444	GL gl = drawable.getGL();
..	..	@@ -17519,10 +17667,14 @@
17519	17667	gl.glFlush();
17520	17668
17521	17669	/**/
17522		- 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);
17523	17671
17524		- float[] pixels = occlusionsizebuffer.array();
	17672	+ float[] depths = occlusiondepthbuffer.array();
17525	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	+
17526	17678	double r = 0, g = 0, b = 0;
17527	17679
17528	17680	double count = 0;
..	..	@@ -17533,7 +17685,7 @@
17533	17685
17534	17686	double FACTOR = 1;
17535	17687
17536		- for (int i = 0; i < pixels.length; i++)
	17688	+ for (int i = 0; i < depths.length; i++)
17537	17689	{
17538	17690	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
17539	17691	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -17616,7 +17768,7 @@
17616	17768
17617	17769	double scale = ray.z; // 1; // cos
17618	17770
17619		- float depth = pixels[newindex];
	17771	+ float depth = depths[newindex];
17620	17772
17621	17773	/*
17622	17774	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -17813,11 +17965,14 @@
17813	17965	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17814	17966	static IntBuffer bigAAbuffer;
17815	17967	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17816		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	17968	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17817	17969	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17818	17970	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17819	17971	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17820		- 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	+
17821	17976	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17822	17977	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17823	17978	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();