~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	{
..	..	@@ -206,7 +223,8 @@
206	223
207	224	SetCamera(cam);
208	225
209		- SetLight(new Camera(new cVector(10, 10, -20)));
	226	+ // Warning: not used.
	227	+ SetLight(new Camera(new cVector(15, 10, -20)));
210	228
211	229	object = o;
212	230
..	..	@@ -1484,6 +1502,8 @@
1484	1502	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1485	1503	}
1486	1504
	1505	+ float[] colorV = new float[4];
	1506	+
1487	1507	void SetColor(Object3D obj, Vertex p0)
1488	1508	{
1489	1509	CameraPane display = this;
..	..	@@ -1551,8 +1571,6 @@
1551	1571	{
1552	1572	return;
1553	1573	}
1554		-
1555		- float[] colorV = new float[3];
1556	1574
1557	1575	if (false) // marked)
1558	1576	{
..	..	@@ -1801,7 +1819,7 @@
1801	1819
1802	1820	display.modelParams7[0] = 0;
1803	1821	display.modelParams7[1] = 1000;
1804		- display.modelParams7[2] = 0;
	1822	+ display.modelParams7[2] = material.parallax;
1805	1823	display.modelParams7[3] = 0;
1806	1824
1807	1825	//display.modelParams6[0] = 100; // criss de bug de bump
..	..	@@ -2034,9 +2052,9 @@
2034	2052	switch(viewcode)
2035	2053	{
2036	2054	case 0: return "main";
2037		- case 1: return "one";
2038		- case 2: return "two";
2039		- case 3: return "three";
	2055	+ case 1: return "Red";
	2056	+ case 2: return "Green";
	2057	+ case 3: return "Blue";
2040	2058	case 4: return "light";
2041	2059	}
2042	2060
..	..	@@ -2499,7 +2517,7 @@
2499	2517	com.sun.opengl.util.texture.TextureIO.newTextureData(
2500	2518	getClass().getClassLoader().getResourceAsStream(name),
2501	2519	true,
2502		- com.sun.opengl.util.texture.TextureIO.PNG);
	2520	+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
2503	2521	} catch (java.io.IOException e)
2504	2522	{
2505	2523	throw new javax.media.opengl.GLException(e);
..	..	@@ -8345,7 +8363,7 @@
8345	8363	// else
8346	8364	// if (!texname.startsWith("/"))
8347	8365	// texname = "/Users/nbriere/Textures/" + texname;
8348		- if (!FileExists(texname))
	8366	+ if (!FileExists(texname) && !texname.startsWith("@"))
8349	8367	{
8350	8368	texname = fallbackTextureName;
8351	8369	}
..	..	@@ -8428,6 +8446,15 @@
8428	8446	new Exception().printStackTrace();
8429	8447	} else
8430	8448	{
	8449	+ if (texname.startsWith("@"))
	8450	+ {
	8451	+ // texturecache = textures.get(texname); // suspicious
	8452	+ if (texturecache == null)
	8453	+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
	8454	+ else
	8455	+ new Exception().printStackTrace();
	8456	+ } else
	8457	+ {
8431	8458	if (textureon)
8432	8459	{
8433	8460	String cachename = texname;
..	..	@@ -8487,6 +8514,7 @@
8487	8514	texturecache = new CacheTexture(texturedata,resolution);
8488	8515	//texture = GetTexture(tex, bump);
8489	8516	}
	8517	+ }
8490	8518	}
8491	8519	//}
8492	8520	}
..	..	@@ -8755,10 +8783,12 @@
8755	8783
8756	8784	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8757	8785	MAXSTACK = temp[0];
8758		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8786	+ if (Globals.DEBUG)
	8787	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8759	8788	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8760	8789	MAXSTACK = temp[0];
8761		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8790	+ if (Globals.DEBUG)
	8791	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8762	8792
8763	8793	// Use debug pipeline
8764	8794	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8766,7 +8796,8 @@
8766	8796	gl = drawable.getGL(); //
8767	8797
8768	8798	GL gl3 = getGL();
8769		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8799	+ if (Globals.DEBUG)
	8800	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8770	8801
8771	8802
8772	8803	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8931,7 +8962,7 @@
8931	8962
8932	8963	if (cubemap == null)
8933	8964	{
8934		- LoadEnvy(5);
	8965	+ //LoadEnvy(1);
8935	8966	}
8936	8967
8937	8968	//cubemap.enable();
..	..	@@ -9207,6 +9238,8 @@
9207	9238
9208	9239	void LoadEnvy(int which)
9209	9240	{
	9241	+ assert(false);
	9242	+
9210	9243	String name;
9211	9244	String ext;
9212	9245
..	..	@@ -9218,37 +9251,58 @@
9218	9251	cubemap = null;
9219	9252	return;
9220	9253	case 1:
9221		- name = "cubemaps/box_";
9222		- ext = "png";
	9254	+ name = "cubemaps/rgb/";
	9255	+ ext = "jpg";
9223	9256	reverseUP = false;
9224	9257	break;
9225	9258	case 2:
9226		- name = "cubemaps/uffizi_";
9227		- ext = "png";
9228		- break; // reverseUP = true; break;
	9259	+ name = "cubemaps/uffizi/";
	9260	+ ext = "jpg";
	9261	+ reverseUP = false;
	9262	+ break;
9229	9263	case 3:
9230		- name = "cubemaps/CloudyHills_";
9231		- ext = "tga";
	9264	+ name = "cubemaps/CloudyHills/";
	9265	+ ext = "jpg";
9232	9266	reverseUP = false;
9233	9267	break;
9234	9268	case 4:
9235		- name = "cubemaps/cornell_";
	9269	+ name = "cubemaps/cornell/";
9236	9270	ext = "png";
9237	9271	reverseUP = false;
9238	9272	break;
	9273	+ case 5:
	9274	+ name = "cubemaps/skycube/";
	9275	+ ext = "jpg";
	9276	+ reverseUP = false;
	9277	+ break;
	9278	+ case 6:
	9279	+ name = "cubemaps/SaintLazarusChurch3/";
	9280	+ ext = "jpg";
	9281	+ reverseUP = false;
	9282	+ break;
	9283	+ case 7:
	9284	+ name = "cubemaps/Sodermalmsallen/";
	9285	+ ext = "jpg";
	9286	+ reverseUP = false;
	9287	+ break;
	9288	+ case 8:
	9289	+ name = "cubemaps/Sodermalmsallen2/";
	9290	+ ext = "jpg";
	9291	+ reverseUP = false;
	9292	+ break;
	9293	+ case 9:
	9294	+ name = "cubemaps/UnionSquare/";
	9295	+ ext = "jpg";
	9296	+ reverseUP = false;
	9297	+ break;
9239	9298	default:
9240		- name = "cubemaps/rgb_";
9241		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9299	+ name = "cubemaps/box/";
	9300	+ ext = "png"; /mipmap = true;/
	9301	+ reverseUP = false;
9242	9302	break;
9243	9303	}
9244		-
9245		- try
9246		- {
9247		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9248		- } catch (IOException e)
9249		- {
9250		- throw new RuntimeException(e);
9251		- }
	9304	+
	9305	+ LoadSkybox(name, ext, mipmap);
9252	9306	}
9253	9307
9254	9308	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -9280,8 +9334,12 @@
9280	9334	static double[] model = new double[16];
9281	9335	double[] camera2light = new double[16];
9282	9336	double[] light2camera = new double[16];
9283		- int newenvy = -1;
9284		- boolean envyoff = true; // false;
	9337	+
	9338	+ //int newenvy = -1;
	9339	+ //boolean envyoff = false;
	9340	+
	9341	+ String loadedskyboxname;
	9342	+
9285	9343	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
9286	9344	//float[] light0 = { 0,0,0 };
9287	9345	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9699,7 +9757,7 @@
9699	9757
9700	9758	if (renderCamera != lightCamera)
9701	9759	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9702		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9760	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9703	9761
9704	9762	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9705	9763
..	..	@@ -9715,7 +9773,7 @@
9715	9773
9716	9774	if (renderCamera != lightCamera)
9717	9775	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9718		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9776	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9719	9777
9720	9778	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9721	9779
..	..	@@ -9761,10 +9819,12 @@
9761	9819	rati = 1 / rati;
9762	9820	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9763	9821	}
9764		- assert (newenvy == -1);
	9822	+
	9823	+ //assert (newenvy == -1);
	9824	+
9765	9825	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9766	9826	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9767		- DrawSkyBox(gl);
	9827	+ DrawSkyBox(gl, (float)rati);
9768	9828	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9769	9829	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9770	9830	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -10630,9 +10690,18 @@
10630	10690	static boolean init = false;
10631	10691
10632	10692	double[][] matrix = LA.newMatrix();
	10693	+
	10694	+ // This is to refresh the UI of the material panel.
	10695	+ ObjEditor patchMaterial;
10633	10696
10634	10697	public void display(GLAutoDrawable drawable)
10635	10698	{
	10699	+ if (patchMaterial.patchMaterial)
	10700	+ {
	10701	+ patchMaterial.patchMaterial = false;
	10702	+ patchMaterial.objectPanel.setSelectedIndex(1);
	10703	+ }
	10704	+
10636	10705	if (Grafreed.savesound && Grafreed.hassound)
10637	10706	{
10638	10707	Grafreed.wav.save();
..	..	@@ -10801,7 +10870,7 @@
10801	10870
10802	10871	if (wait)
10803	10872	{
10804		- Sleep(500);
	10873	+ Sleep(200); // blocks everything
10805	10874
10806	10875	wait = false;
10807	10876	}
..	..	@@ -10916,7 +10985,7 @@
10916	10985	// if (parentcam != renderCamera) // not a light
10917	10986	if (cam != lightCamera)
10918	10987	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10919		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	10988	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10920	10989
10921	10990	for (int j = 0; j < 4; j++)
10922	10991	{
..	..	@@ -10931,7 +11000,7 @@
10931	11000	// if (parentcam != renderCamera) // not a light
10932	11001	if (cam != lightCamera)
10933	11002	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10934		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	11003	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10935	11004
10936	11005	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10937	11006
..	..	@@ -11017,13 +11086,43 @@
11017	11086	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
11018	11087	}
11019	11088
11020		- if (newenvy > -1)
	11089	+// if (newenvy > -1)
	11090	+// {
	11091	+// LoadEnvy(newenvy);
	11092	+// }
	11093	+//
	11094	+// newenvy = -1;
	11095	+
	11096	+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
11021	11097	{
11022		- LoadEnvy(newenvy);
	11098	+ if (cubemaprgb == null)
	11099	+ {
	11100	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
	11101	+ }
	11102	+
	11103	+ cubemap = cubemaprgb;
11023	11104	}
11024		-
11025		- newenvy = -1;
11026		-
	11105	+ else
	11106	+ {
	11107	+ if (object.skyboxname != null)
	11108	+ {
	11109	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11110	+ {
	11111	+ if (cubemap != null && cubemap != cubemaprgb)
	11112	+ cubemap.dispose();
	11113	+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11114	+ loadedskyboxname = object.skyboxname;
	11115	+ }
	11116	+ }
	11117	+ else
	11118	+ {
	11119	+ cubemapcustom = null;
	11120	+ loadedskyboxname = null;
	11121	+ }
	11122	+
	11123	+ cubemap = cubemapcustom;
	11124	+ }
	11125	+
11027	11126	ratio = ((double) getWidth()) / getHeight();
11028	11127	//System.out.println("ratio = " + ratio);
11029	11128
..	..	@@ -11039,7 +11138,7 @@
11039	11138
11040	11139	if (!IsFrozen() && !ambientOcclusion)
11041	11140	{
11042		- DrawSkyBox(gl);
	11141	+ DrawSkyBox(gl, (float)ratio);
11043	11142	}
11044	11143
11045	11144	//if (selection_view == -1)
..	..	@@ -11325,7 +11424,7 @@
11325	11424
11326	11425	// if (cam != lightCamera)
11327	11426	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11328		- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
	11427	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
11329	11428	}
11330	11429
11331	11430	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -12399,8 +12498,76 @@
12399	12498
12400	12499	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12401	12500
12402		- String program =
	12501	+ String programmin =
	12502	+ // Min shader
12403	12503	"!!ARBfp1.0\n" +
	12504	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12505	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12506	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12507	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12508	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12509	+ "PARAM light2cam0 = program.env[10];" +
	12510	+ "PARAM light2cam1 = program.env[11];" +
	12511	+ "PARAM light2cam2 = program.env[12];" +
	12512	+ "TEMP temp;" +
	12513	+ "TEMP light;" +
	12514	+ "TEMP ndotl;" +
	12515	+ "TEMP normal;" +
	12516	+ "TEMP depth;" +
	12517	+ "TEMP eye;" +
	12518	+ "TEMP pos;" +
	12519	+
	12520	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12521	+ Normalize("normal") +
	12522	+ "MOV light, state.light[0].position;" +
	12523	+ "DP3 ndotl.x, light, normal;" +
	12524	+
	12525	+ // shadow
	12526	+ "MOV pos, fragment.texcoord[1];" +
	12527	+ "MOV temp, pos;" +
	12528	+ ShadowTextureFetch("depth", "temp", "1") +
	12529	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12530	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12531	+
	12532	+ // No shadow when out of frustum
	12533	+ //"SGE temp.y, depth.z, zero123.y;" +
	12534	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12535	+
	12536	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12537	+
	12538	+ // Backlit
	12539	+ "MOV pos.w, zero123.y;" +
	12540	+ "DP4 eye.x, pos, light2cam0;" +
	12541	+ "DP4 eye.y, pos, light2cam1;" +
	12542	+ "DP4 eye.z, pos, light2cam2;" +
	12543	+ Normalize("eye") +
	12544	+
	12545	+ "DP3 ndotl.y, -eye, normal;" +
	12546	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12547	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12548	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12549	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12550	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12551	+
	12552	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12553	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12554	+
	12555	+ // Pigment
	12556	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12557	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12558	+ "MUL temp, temp, ndotl.x;" +
	12559	+
	12560	+ "MUL temp, temp, zero123.z;" +
	12561	+
	12562	+ //"MUL temp, temp, ndotl.y;" +
	12563	+
	12564	+ "MOV temp.w, zero123.y;" + // reset alpha
	12565	+ "MOV result.color, temp;" +
	12566	+ "END";
	12567	+
	12568	+ String programmax =
	12569	+ "!!ARBfp1.0\n" +
	12570	+
12404	12571	//"OPTION ARB_fragment_program_shadow;" +
12405	12572	"PARAM light2cam0 = program.env[10];" +
12406	12573	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12426,7 +12593,7 @@
12426	12593	"PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
12427	12594	"PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
12428	12595	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12429		- "PARAM params7 = program.env[7];" + // noise power, opacity power
	12596	+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
12430	12597	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
12431	12598	"PARAM options1 = program.env[62];" + // fog rgb color
12432	12599	"PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
..	..	@@ -12515,8 +12682,7 @@
12515	12682	"TEMP shininess;" +
12516	12683	"\n" +
12517	12684	"MOV texSamp, one;" +
12518		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12519		-
	12685	+
12520	12686	"MOV mapgrid.x, one2048th.x;" +
12521	12687	"MOV temp, fragment.texcoord[1];" +
12522	12688	/*
..	..	@@ -12537,20 +12703,20 @@
12537	12703	"MUL temp, floor, mapgrid.x;" +
12538	12704	//"TEX depth0, temp, texture[1], 2D;" +
12539	12705	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12540		- TextureFetch("depth0", "temp", "1") +
	12706	+ ShadowTextureFetch("depth0", "temp", "1") +
12541	12707	"") +
12542	12708	"ADD temp.x, temp.x, mapgrid.x;" +
12543	12709	//"TEX depth1, temp, texture[1], 2D;" +
12544	12710	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12545		- TextureFetch("depth1", "temp", "1") +
	12711	+ ShadowTextureFetch("depth1", "temp", "1") +
12546	12712	"") +
12547	12713	"ADD temp.y, temp.y, mapgrid.x;" +
12548	12714	//"TEX depth2, temp, texture[1], 2D;" +
12549		- TextureFetch("depth2", "temp", "1") +
	12715	+ ShadowTextureFetch("depth2", "temp", "1") +
12550	12716	"SUB temp.x, temp.x, mapgrid.x;" +
12551	12717	//"TEX depth3, temp, texture[1], 2D;" +
12552	12718	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12553		- TextureFetch("depth3", "temp", "1") +
	12719	+ ShadowTextureFetch("depth3", "temp", "1") +
12554	12720	"") +
12555	12721	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12556	12722	//"MOV params, material;" +
..	..	@@ -12672,7 +12838,7 @@
12672	12838	"POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
12673	12839	// mar 2013 ??? "KIL alpha.a;" +
12674	12840	"MOV alpha, texSamp.aaaa;" + // y;" +
12675		- "KIL alpha.a;" +
	12841	+ "KIL alpha.a;" + // not sure with parallax mapping
12676	12842	/*
12677	12843	"MUL temp.xy, temp, two;" +
12678	12844	"TXB bump, temp, texture[0], 2D;" +
..	..	@@ -12758,11 +12924,6 @@
12758	12924	"SUB bump0, bump0, half;" +
12759	12925	"ADD bump, bump, bump0;" +
12760	12926
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	12927	// double-sided
12767	12928	/**/
12768	12929	(doublesided?"DP3 temp.z, normal, eye;" +
..	..	@@ -12792,6 +12953,41 @@
12792	12953	Normalize("U") +
12793	12954
12794	12955	// parallax mapping
	12956	+
	12957	+ "DP3 temp2.x, V, eye;" +
	12958	+ "DP3 temp2.y, U, eye;" +
	12959	+ "DP3 temp2.z, normal, eye;" +
	12960	+ "RCP temp2.z, temp2.z;" +
	12961	+
	12962	+ "DP3 temp2.w, texSamp, texSamp;" + // Height
	12963	+ "RSQ temp2.w, temp2.w;" +
	12964	+ "RCP temp2.w, temp2.w;" +
	12965	+
	12966	+ "SUB temp2.w, temp2.w, half;" +
	12967	+// "SGE temp.x, temp2.w, eps.x;" +
	12968	+// "MUL temp2.w, temp2.w, temp.x;" +
	12969	+
	12970	+ //"MOV texSamp, U;" +
	12971	+
	12972	+ "MUL temp2.z, temp2.z, temp2.w;" +
	12973	+ "MUL temp2.z, temp2.z, params7.z;" + // parallax
	12974	+
	12975	+ "MUL temp2, temp2, temp2.z;" +
	12976	+
	12977	+ "MOV temp, fragment.texcoord[0];" +
	12978	+
	12979	+ "SUB temp, temp, temp2;" +
	12980	+
	12981	+ "TEX texSamp, temp, texture[0], 2D;" +
	12982	+ "POW texSamp.a, texSamp.a, params6.w;" + // punch through
	12983	+ "MOV alpha, texSamp.aaaa;" +
	12984	+
	12985	+// parallax mapping
	12986	+
	12987	+ "MOV temp.x, texSamp.a;" +
	12988	+ "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
	12989	+ //"LRP texSamp0, params5.x, texSamp0, one;" +
	12990	+ "MOV texSamp.a, temp.x;" +
12795	12991
12796	12992	//"MOV temp, fragment.texcoord[0];" +
12797	12993	//
..	..	@@ -12921,10 +13117,10 @@
12921	13117	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12922	13118	"") +
12923	13119
12924		- // display shadow only (bump == 0)
	13120	+ // display shadow only (fakedepth == 0)
12925	13121	"SUB temp.x, half.x, shadow.x;" +
12926	13122	"MOV temp.y, -params5.z;" + // params6.x;" +
12927		- "SLT temp.z, temp.y, -one2048th.x;" +
	13123	+ "SLT temp.z, temp.y, -c256i.x;" +
12928	13124	"SUB temp.y, one.x, temp.z;" +
12929	13125	"MUL temp.x, temp.x, temp.y;" +
12930	13126	"KIL temp.x;" +
..	..	@@ -13255,8 +13451,19 @@
13255	13451	//once = true;
13256	13452	}
13257	13453
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 " : ""));
	13454	+ String program = programmax;
	13455	+
	13456	+ if (Globals.MINSHADER)
	13457	+ {
	13458	+ program = programmin;
	13459	+ }
	13460	+
	13461	+ if (Globals.DEBUG)
	13462	+ {
	13463	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
	13464	+ System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13465	+ }
	13466	+
13260	13467	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13261	13468
13262	13469	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13303,7 +13510,8 @@
13303	13510	"\n" +
13304	13511	"END\n";
13305	13512
13306		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13513	+ if (Globals.DEBUG)
	13514	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13307	13515	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13308	13516
13309	13517	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13348,25 +13556,26 @@
13348	13556	return out;
13349	13557	}
13350	13558
13351		- String TextureFetch(String dest, String src, String unit)
	13559	+ // Also does frustum culling
	13560	+ String ShadowTextureFetch(String dest, String src, String unit)
13352	13561	{
13353	13562	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13354	13563	"SGE " + src + ".w, " + src + ".x, eps.x;" +
13355	13564	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13565	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13566	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
13356	13567	"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;" +
	13568	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13569	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
13361	13570	//"SWZ buffer, temp, w,w,w,w;";
13362		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13571	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13363	13572	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
13364	13573	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
13365	13574	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13366		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13575	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13367	13576
13368		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13369		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13577	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13578	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13370	13579	}
13371	13580
13372	13581	String Shadow(String depth, String shadow)
..	..	@@ -13413,7 +13622,7 @@
13413	13622	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13414	13623	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13415	13624
13416		- // No shadow when out of frustrum
	13625	+ // No shadow when out of frustum
13417	13626	"SGE temp.x, " + depth + ".z, one.z;" +
13418	13627	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13419	13628	"";
..	..	@@ -13560,7 +13769,7 @@
13560	13769	/static/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
13561	13770	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13562	13771	/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
	13772	+ /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
13564	13773
13565	13774	//Object3D.cVector2[] vector2buffer;
13566	13775
..	..	@@ -14211,14 +14420,15 @@
14211	14420	drag = false;
14212	14421	//System.out.println("Mouse DOWN");
14213	14422	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);
	14423	+ //ClickInfo info = new ClickInfo();
	14424	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14425	+ object.clickInfo.pane = this;
	14426	+ object.clickInfo.camera = renderCamera;
	14427	+ object.clickInfo.x = x;
	14428	+ object.clickInfo.y = y;
	14429	+ object.clickInfo.modifiers = modifiersex;
	14430	+ editObj = object.doEditClick(//info,
	14431	+ 0);
14222	14432	if (!editObj)
14223	14433	{
14224	14434	hasMarquee = true;
..	..	@@ -14500,11 +14710,17 @@
14500	14710	void GoDown(int mod)
14501	14711	{
14502	14712	MODIFIERS \|= COMMAND;
	14713	+ boolean isVR = (mouseMode&VR)!=0;
14503	14714	/**/
14504	14715	if((mod&SHIFT) == SHIFT)
14505		- manipCamera.RotatePosition(0, -speed);
	14716	+ {
	14717	+ if (isVR)
	14718	+ manipCamera.RotateInterest(0, -speed);
	14719	+ else
	14720	+ manipCamera.RotatePosition(0, -speed);
	14721	+ }
14506	14722	else
14507		- manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14723	+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
14508	14724	/**/
14509	14725	if ((mod & SHIFT) == SHIFT)
14510	14726	{
..	..	@@ -14514,6 +14730,8 @@
14514	14730	mouseMode \|= BACKFORTH;
14515	14731	}
14516	14732
	14733	+ targetLookAt.set(manipCamera.lookAt);
	14734	+
14517	14735	//prevX = X = anchorX;
14518	14736	prevY = Y = anchorY - (int) (renderCamera.Distance());
14519	14737	}
..	..	@@ -14522,10 +14740,17 @@
14522	14740	{
14523	14741	MODIFIERS \|= COMMAND;
14524	14742	/**/
	14743	+ boolean isVR = (mouseMode&VR)!=0;
	14744	+
14525	14745	if((mod&SHIFT) == SHIFT)
14526		- manipCamera.RotatePosition(0, speed);
	14746	+ {
	14747	+ if (isVR)
	14748	+ manipCamera.RotateInterest(0, speed);
	14749	+ else
	14750	+ manipCamera.RotatePosition(0, speed);
	14751	+ }
14527	14752	else
14528		- manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14753	+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
14529	14754	/**/
14530	14755	if ((mod & SHIFT) == SHIFT)
14531	14756	{
..	..	@@ -14535,6 +14760,8 @@
14535	14760	mouseMode \|= BACKFORTH;
14536	14761	}
14537	14762
	14763	+ targetLookAt.set(manipCamera.lookAt);
	14764	+
14538	14765	//prevX = X = anchorX;
14539	14766	prevY = Y = anchorY + (int) (renderCamera.Distance());
14540	14767	}
..	..	@@ -14544,9 +14771,14 @@
14544	14771	MODIFIERS \|= COMMAND;
14545	14772	/**/
14546	14773	if((mod&SHIFT) == SHIFT)
14547		- manipCamera.Translate(speed*delta, 0, getWidth());
	14774	+ manipCamera.Translate(speed*delta, 0, getWidth());
14548	14775	else
14549		- manipCamera.RotatePosition(speed, 0);
	14776	+ {
	14777	+ if ((mouseMode&VR)!=0)
	14778	+ manipCamera.RotateInterest(-speed, 0);
	14779	+ else
	14780	+ manipCamera.RotatePosition(speed, 0);
	14781	+ }
14550	14782	/**/
14551	14783	if ((mod & SHIFT) == SHIFT)
14552	14784	{
..	..	@@ -14556,6 +14788,8 @@
14556	14788	mouseMode \|= ROTATE;
14557	14789	} // TRANSLATE;
14558	14790
	14791	+ targetLookAt.set(manipCamera.lookAt);
	14792	+
14559	14793	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
14560	14794	prevY = Y = anchorY;
14561	14795	}
..	..	@@ -14565,9 +14799,15 @@
14565	14799	MODIFIERS \|= COMMAND;
14566	14800	/**/
14567	14801	if((mod&SHIFT) == SHIFT)
14568		- manipCamera.Translate(-speed*delta, 0, getWidth());
	14802	+ manipCamera.Translate(-speed*delta, 0, getWidth());
14569	14803	else
14570		- manipCamera.RotatePosition(-speed, 0);
	14804	+ {
	14805	+ if ((mouseMode&VR)!=0)
	14806	+ manipCamera.RotateInterest(speed, 0);
	14807	+ else
	14808	+ manipCamera.RotatePosition(-speed, 0);
	14809	+ }
	14810	+
14571	14811	/**/
14572	14812	if ((mod & SHIFT) == SHIFT)
14573	14813	{
..	..	@@ -14577,6 +14817,8 @@
14577	14817	mouseMode \|= ROTATE;
14578	14818	} // TRANSLATE;
14579	14819
	14820	+ targetLookAt.set(manipCamera.lookAt);
	14821	+
14580	14822	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
14581	14823	prevY = Y = anchorY;
14582	14824	}
..	..	@@ -14618,15 +14860,16 @@
14618	14860	if (editObj)
14619	14861	{
14620	14862	drag = true;
14621		- ClickInfo info = new ClickInfo();
14622		- info.bounds.setBounds(0, 0,
	14863	+ //ClickInfo info = new ClickInfo();
	14864	+ object.clickInfo.bounds.setBounds(0, 0,
14623	14865	(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);
	14866	+ object.clickInfo.pane = this;
	14867	+ object.clickInfo.camera = renderCamera;
	14868	+ object.clickInfo.x = x;
	14869	+ object.clickInfo.y = y;
	14870	+ object //.GetWindow().copy
	14871	+ .doEditDrag(//info,
	14872	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14630	14873	} else
14631	14874	{
14632	14875	if (x < startX)
..	..	@@ -14775,24 +15018,27 @@
14775	15018	}
14776	15019	}
14777	15020
	15021	+// ClickInfo clickInfo = new ClickInfo();
	15022	+
14778	15023	public void mouseMoved(MouseEvent e)
14779	15024	{
14780	15025	//System.out.println("mouseMoved: " + e);
14781	15026	if (isRenderer)
14782	15027	return;
14783	15028
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;
	15029	+ // Mouse cursor feedback
	15030	+ object.clickInfo.x = e.getX();
	15031	+ object.clickInfo.y = e.getY();
	15032	+ object.clickInfo.modifiers = e.getModifiersEx();
	15033	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	15034	+ object.clickInfo.pane = this;
	15035	+ object.clickInfo.camera = renderCamera;
14791	15036	if (!isRenderer)
14792	15037	{
14793	15038	//ObjEditor editWindow = object.editWindow;
14794	15039	//Object3D copy = editWindow.copy;
14795		- if (object.doEditClick(ci, 0))
	15040	+ if (object.doEditClick(//clickInfo,
	15041	+ 0))
14796	15042	{
14797	15043	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14798	15044	} else
..	..	@@ -15075,8 +15321,8 @@
15075	15321	case 'K':
15076	15322	KOMPACTTEXTURE ^= true;
15077	15323	//textures.clear();
15078		- break;
15079		- case 'P': // Texture Projection macros
	15324	+ // break;
	15325	+ //case 'P': // Texture Projection macros
15080	15326	// SAVETEXTURE ^= true;
15081	15327	macromode = true;
15082	15328	Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
..	..	@@ -15197,7 +15443,7 @@
15197	15443	targetLookAt.set(manipCamera.lookAt);
15198	15444	repaint();
15199	15445	break;
15200		- case 'p':
	15446	+ case 'P': // p':
15201	15447	// c'est quoi ca au juste? spherical ^= true;
15202	15448	Skinshader ^= true; programInitialized = false;
15203	15449	repaint();
..	..	@@ -15242,20 +15488,24 @@
15242	15488	OCCLUSION_CULLING ^= true;
15243	15489	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
15244	15490	break;
15245		- case '0': envyoff ^= true; repaint(); break;
	15491	+ //case '0': envyoff ^= true; repaint(); break;
15246	15492	case '1':
15247	15493	case '2':
15248	15494	case '3':
15249	15495	case '4':
15250	15496	case '5':
15251		- newenvy = Character.getNumericValue(key);
15252		- repaint();
15253		- break;
15254	15497	case '6':
15255	15498	case '7':
15256	15499	case '8':
15257	15500	case '9':
15258		- BGcolor = (key - '6')/3.f;
	15501	+ if (true) // envyoff)
	15502	+ {
	15503	+ BGcolor = (key - '1')/8.f;
	15504	+ }
	15505	+ else
	15506	+ {
	15507	+ //newenvy = Character.getNumericValue(key);
	15508	+ }
15259	15509	repaint();
15260	15510	break;
15261	15511	case '!':
..	..	@@ -15818,8 +16068,6 @@
15818	16068
15819	16069	int width = getBounds().width;
15820	16070	int height = getBounds().height;
15821		- ClickInfo info = new ClickInfo();
15822		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15823	16071	//Image img = CreateImage(width, height);
15824	16072	//System.out.println("width = " + width + "; height = " + height + "\n");
15825	16073
..	..	@@ -15896,31 +16144,37 @@
15896	16144	}
15897	16145	if (object != null && !hasMarquee)
15898	16146	{
	16147	+ if (object.clickInfo == null)
	16148	+ object.clickInfo = new ClickInfo();
	16149	+ ClickInfo info = object.clickInfo;
	16150	+ //ClickInfo info = new ClickInfo();
	16151	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16152	+
15899	16153	if (isRenderer)
15900	16154	{
15901		- info.flags++;
	16155	+ object.clickInfo.flags++;
15902	16156	double frameAspect = (double) width / (double) height;
15903	16157	if (frameAspect > renderCamera.aspect)
15904	16158	{
15905	16159	int desired = (int) ((double) height * renderCamera.aspect);
15906		- info.bounds.width -= width - desired;
15907		- info.bounds.x += (width - desired) / 2;
	16160	+ object.clickInfo.bounds.width -= width - desired;
	16161	+ object.clickInfo.bounds.x += (width - desired) / 2;
15908	16162	} else
15909	16163	{
15910	16164	int desired = (int) ((double) width / renderCamera.aspect);
15911		- info.bounds.height -= height - desired;
15912		- info.bounds.y += (height - desired) / 2;
	16165	+ object.clickInfo.bounds.height -= height - desired;
	16166	+ object.clickInfo.bounds.y += (height - desired) / 2;
15913	16167	}
15914	16168	}
15915	16169
15916		- info.g = gr;
15917		- info.camera = renderCamera;
	16170	+ object.clickInfo.g = gr;
	16171	+ object.clickInfo.camera = renderCamera;
15918	16172	/*
15919	16173	// Memory intensive (brep.verticescopy)
15920	16174	if (!(object instanceof Composite))
15921	16175	object.draw(info, 0, false); // SLOW :
15922	16176	*/
15923		- if (!isRenderer)
	16177	+ if (!isRenderer) // && drag)
15924	16178	{
15925	16179	Grafreed.Assert(object != null);
15926	16180	Grafreed.Assert(object.selection != null);
..	..	@@ -15928,9 +16182,9 @@
15928	16182	{
15929	16183	int hitSomething = object.selection.get(0).hitSomething;
15930	16184
15931		- info.DX = 0;
15932		- info.DY = 0;
15933		- info.W = 1;
	16185	+ object.clickInfo.DX = 0;
	16186	+ object.clickInfo.DY = 0;
	16187	+ object.clickInfo.W = 1;
15934	16188	if (hitSomething == Object3D.hitCenter)
15935	16189	{
15936	16190	info.DX = X;
..	..	@@ -15942,13 +16196,14 @@
15942	16196	info.DY -= info.bounds.height/2;
15943	16197	}
15944	16198
15945		- object.drawEditHandles(info, 0);
	16199	+ object.drawEditHandles(//info,
	16200	+ 0);
15946	16201
15947	16202	if (drag && (X != 0 \|\| Y != 0))
15948	16203	{
15949	16204	switch (hitSomething)
15950	16205	{
15951		- case Object3D.hitCenter: gr.setColor(Color.pink);
	16206	+ case Object3D.hitCenter: gr.setColor(Color.white);
15952	16207	gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15953	16208	break;
15954	16209	case Object3D.hitRotate: gr.setColor(Color.yellow);
..	..	@@ -15974,7 +16229,7 @@
15974	16229	if (hasMarquee)
15975	16230	{
15976	16231	gr.setXORMode(Color.white);
15977		- gr.setColor(Color.red);
	16232	+ gr.setColor(Color.white);
15978	16233	if (!firstime)
15979	16234	{
15980	16235	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -16441,6 +16696,8 @@
16441	16696	private /static/ boolean firstime;
16442	16697	private /static/ cVector newView = new cVector();
16443	16698	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16699	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16700	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
16444	16701	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16445	16702	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16446	16703	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16453,29 +16710,67 @@
16453	16710	{
16454	16711	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16455	16712
	16713	+ int usedsuf = 0;
	16714	+
16456	16715	for (int i = 0; i < suffixes.length; i++)
16457	16716	{
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)
	16717	+ String[] suffixe = suffixes;
	16718	+ String[] fallback = suffixes2;
	16719	+ String[] fallfallback = suffixes3;
	16720	+
	16721	+ for (int c=usedsuf; --c>=0;)
16463	16722	{
16464		- throw new IOException("Unable to load texture " + resourceName);
	16723	+// String[] temp = suffixe;
	16724	+// suffixe = fallback;
	16725	+// fallback = fallfallback;
	16726	+// fallfallback = temp;
16465	16727	}
	16728	+
	16729	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16730	+ TextureData data;
	16731	+
	16732	+ try
	16733	+ {
	16734	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16735	+ mipmapped,
	16736	+ FileUtil.getFileSuffix(resourceName));
	16737	+ }
	16738	+ catch (Exception e)
	16739	+ {
	16740	+ try
	16741	+ {
	16742	+ resourceName = basename + fallback[i] + "." + suffix;
	16743	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16744	+ mipmapped,
	16745	+ FileUtil.getFileSuffix(resourceName));
	16746	+ }
	16747	+ catch (Exception e2)
	16748	+ {
	16749	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16750	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16751	+ mipmapped,
	16752	+ FileUtil.getFileSuffix(resourceName));
	16753	+ }
	16754	+ }
	16755	+
16466	16756	//System.out.println("Target = " + targets[i]);
16467	16757	cubemap.updateImage(data, targets[i]);
16468	16758	}
16469	16759
16470	16760	return cubemap;
16471	16761	}
	16762	+
16472	16763	int bigsphere = -1;
16473	16764
16474	16765	float BGcolor = 0.5f;
16475	16766
16476		- private void DrawSkyBox(GL gl)
	16767	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16768	+
	16769	+ private void DrawSkyBox(GL gl, float ratio)
16477	16770	{
16478		- if (envyoff \|\| cubemap == null)
	16771	+ if (//envyoff \|\|
	16772	+ WIREFRAME \|\|
	16773	+ cubemap == null)
16479	16774	{
16480	16775	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16481	16776	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -16490,7 +16785,17 @@
16490	16785	// Compensates for ExaminerViewer's modification of modelview matrix
16491	16786	gl.glMatrixMode(GL.GL_MODELVIEW);
16492	16787	gl.glLoadIdentity();
	16788	+ gl.glScalef(1,ratio,1);
16493	16789
	16790	+// colorV[0] = 2;
	16791	+// colorV[1] = 2;
	16792	+// colorV[2] = 2;
	16793	+// colorV[3] = 1;
	16794	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16795	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16796	+//
	16797	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16798	+
16494	16799	//gl.glActiveTexture(GL.GL_TEXTURE1);
16495	16800	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16496	16801
..	..	@@ -16522,6 +16827,7 @@
16522	16827	{
16523	16828	gl.glScalef(1.0f, -1.0f, 1.0f);
16524	16829	}
	16830	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16525	16831	gl.glMultMatrixd(viewrot_1, 0);
16526	16832	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16527	16833	//viewer.updateInverseRotation(gl);
..	..	@@ -16562,7 +16868,8 @@
16562	16868	gl.glDisable(GL.GL_TEXTURE_GEN_R);
16563	16869
16564	16870	cubemap.disable();
16565		- ////cubemap.unbind();
	16871	+ //cubemap.dispose();
	16872	+
16566	16873	if (CULLFACE)
16567	16874	{
16568	16875	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -16780,7 +17087,7 @@
16780	17087	//new Exception().printStackTrace();
16781	17088	System.out.println("select buffer init");
16782	17089	// Use debug pipeline
16783		- drawable.setGL(new DebugGL(drawable.getGL()));
	17090	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16784	17091
16785	17092	GL gl = drawable.getGL();
16786	17093
..	..	@@ -17098,6 +17405,7 @@
17098	17405
17099	17406	public void init(GLAutoDrawable drawable)
17100	17407	{
	17408	+ if (Globals.DEBUG)
17101	17409	System.out.println("shadow buffer init");
17102	17410
17103	17411	GL gl = drawable.getGL();
..	..	@@ -17326,10 +17634,14 @@
17326	17634	gl.glFlush();
17327	17635
17328	17636	/**/
17329		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
	17637	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
17330	17638
17331		- float[] pixels = occlusionsizebuffer.array();
	17639	+ float[] depths = occlusiondepthbuffer.array();
17332	17640
	17641	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
	17642	+
	17643	+ int[] pixels = selectsizebuffer.array();
	17644	+
17333	17645	double r = 0, g = 0, b = 0;
17334	17646
17335	17647	double count = 0;
..	..	@@ -17340,7 +17652,7 @@
17340	17652
17341	17653	double FACTOR = 1;
17342	17654
17343		- for (int i = 0; i < pixels.length; i++)
	17655	+ for (int i = 0; i < depths.length; i++)
17344	17656	{
17345	17657	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
17346	17658	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -17423,7 +17735,7 @@
17423	17735
17424	17736	double scale = ray.z; // 1; // cos
17425	17737
17426		- float depth = pixels[newindex];
	17738	+ float depth = depths[newindex];
17427	17739
17428	17740	/*
17429	17741	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -17620,11 +17932,14 @@
17620	17932	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17621	17933	static IntBuffer bigAAbuffer;
17622	17934	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17623		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	17935	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17624	17936	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17625	17937	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17626	17938	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17627		- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17939	+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17940	+
	17941	+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17942	+
17628	17943	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17629	17944	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17630	17945	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();