~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
..	..	@@ -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	{
..	..	@@ -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,
..	..	@@ -10801,7 +10861,7 @@
10801	10861
10802	10862	if (wait)
10803	10863	{
10804		- Sleep(500);
	10864	+ Sleep(200); // blocks everything
10805	10865
10806	10866	wait = false;
10807	10867	}
..	..	@@ -10916,7 +10976,7 @@
10916	10976	// if (parentcam != renderCamera) // not a light
10917	10977	if (cam != lightCamera)
10918	10978	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10919		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	10979	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10920	10980
10921	10981	for (int j = 0; j < 4; j++)
10922	10982	{
..	..	@@ -10931,7 +10991,7 @@
10931	10991	// if (parentcam != renderCamera) // not a light
10932	10992	if (cam != lightCamera)
10933	10993	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10934		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	10994	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10935	10995
10936	10996	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10937	10997
..	..	@@ -11017,13 +11077,43 @@
11017	11077	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
11018	11078	}
11019	11079
11020		- if (newenvy > -1)
	11080	+// if (newenvy > -1)
	11081	+// {
	11082	+// LoadEnvy(newenvy);
	11083	+// }
	11084	+//
	11085	+// newenvy = -1;
	11086	+
	11087	+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
11021	11088	{
11022		- LoadEnvy(newenvy);
	11089	+ if (cubemaprgb == null)
	11090	+ {
	11091	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb" + "/", "jpg", false);
	11092	+ }
	11093	+
	11094	+ cubemap = cubemaprgb;
11023	11095	}
11024		-
11025		- newenvy = -1;
11026		-
	11096	+ else
	11097	+ {
	11098	+ if (object.skyboxname != null)
	11099	+ {
	11100	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11101	+ {
	11102	+ if (cubemap != null && cubemap != cubemaprgb)
	11103	+ cubemap.dispose();
	11104	+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11105	+ loadedskyboxname = object.skyboxname;
	11106	+ }
	11107	+ }
	11108	+ else
	11109	+ {
	11110	+ cubemapcustom = null;
	11111	+ loadedskyboxname = null;
	11112	+ }
	11113	+
	11114	+ cubemap = cubemapcustom;
	11115	+ }
	11116	+
11027	11117	ratio = ((double) getWidth()) / getHeight();
11028	11118	//System.out.println("ratio = " + ratio);
11029	11119
..	..	@@ -11039,7 +11129,7 @@
11039	11129
11040	11130	if (!IsFrozen() && !ambientOcclusion)
11041	11131	{
11042		- DrawSkyBox(gl);
	11132	+ DrawSkyBox(gl, (float)ratio);
11043	11133	}
11044	11134
11045	11135	//if (selection_view == -1)
..	..	@@ -11325,7 +11415,7 @@
11325	11415
11326	11416	// if (cam != lightCamera)
11327	11417	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11328		- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
	11418	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
11329	11419	}
11330	11420
11331	11421	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -12399,51 +12489,74 @@
12399	12489
12400	12490	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12401	12491
12402		- String program =
	12492	+ String programmin =
12403	12493	// Min shader
12404	12494	"!!ARBfp1.0\n" +
12405		- "PARAM zero123 = { 0.0, 1.0, 2.0, 1.25 };" +
	12495	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
12406	12496	"PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
12407	12497	"PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
12408	12498	"PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
12409	12499	"PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12500	+ "PARAM light2cam0 = program.env[10];" +
	12501	+ "PARAM light2cam1 = program.env[11];" +
	12502	+ "PARAM light2cam2 = program.env[12];" +
12410	12503	"TEMP temp;" +
12411	12504	"TEMP light;" +
12412	12505	"TEMP ndotl;" +
12413	12506	"TEMP normal;" +
12414	12507	"TEMP depth;" +
	12508	+ "TEMP eye;" +
	12509	+ "TEMP pos;" +
12415	12510
12416	12511	"MAD normal, fragment.color, zero123.z, -zero123.y;" +
12417		-
	12512	+ Normalize("normal") +
12418	12513	"MOV light, state.light[0].position;" +
12419	12514	"DP3 ndotl.x, light, normal;" +
12420	12515
12421	12516	// shadow
12422		- "MOV temp, fragment.texcoord[1];" +
12423		- TextureFetch("depth", "temp", "1") +
	12517	+ "MOV pos, fragment.texcoord[1];" +
	12518	+ "MOV temp, pos;" +
	12519	+ ShadowTextureFetch("depth", "temp", "1") +
12424	12520	//"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
12425		- "SLT temp.x, fragment.texcoord[1].z, depth.z;" +
12426		-
	12521	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
12427	12522
12428	12523	// No shadow when out of frustum
12429	12524	//"SGE temp.y, depth.z, zero123.y;" +
12430	12525	//"LRP temp.x, temp.y, zero123.y, temp.x;" +
12431	12526
12432		- "MUL ndotl.x, ndotl.x, temp.x;" +
12433		- "MAX ndotl.x, ndotl.x, pow2.y;" +
	12527	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
12434	12528
	12529	+ // Backlit
	12530	+ "MOV pos.w, zero123.y;" +
	12531	+ "DP4 eye.x, pos, light2cam0;" +
	12532	+ "DP4 eye.y, pos, light2cam1;" +
	12533	+ "DP4 eye.z, pos, light2cam2;" +
	12534	+ Normalize("eye") +
	12535	+
	12536	+ "DP3 ndotl.y, -eye, normal;" +
	12537	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12538	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12539	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12540	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12541	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12542	+
	12543	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12544	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12545	+
	12546	+ // Pigment
12435	12547	"TEX temp, fragment.texcoord[0], texture[0], 2D;" +
12436	12548	"LRP temp, zero123.w, temp, one;" + // texture proportion
12437	12549	"MUL temp, temp, ndotl.x;" +
12438	12550
12439	12551	"MUL temp, temp, zero123.z;" +
12440	12552
12441		- "MOV temp.w, zero123.y;" + // reset alpha
	12553	+ //"MUL temp, temp, ndotl.y;" +
12442	12554
	12555	+ "MOV temp.w, zero123.y;" + // reset alpha
12443	12556	"MOV result.color, temp;" +
12444	12557	"END";
12445	12558
12446		- String program2 =
	12559	+ String programmax =
12447	12560	"!!ARBfp1.0\n" +
12448	12561
12449	12562	//"OPTION ARB_fragment_program_shadow;" +
..	..	@@ -12581,20 +12694,20 @@
12581	12694	"MUL temp, floor, mapgrid.x;" +
12582	12695	//"TEX depth0, temp, texture[1], 2D;" +
12583	12696	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12584		- TextureFetch("depth0", "temp", "1") +
	12697	+ ShadowTextureFetch("depth0", "temp", "1") +
12585	12698	"") +
12586	12699	"ADD temp.x, temp.x, mapgrid.x;" +
12587	12700	//"TEX depth1, temp, texture[1], 2D;" +
12588	12701	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12589		- TextureFetch("depth1", "temp", "1") +
	12702	+ ShadowTextureFetch("depth1", "temp", "1") +
12590	12703	"") +
12591	12704	"ADD temp.y, temp.y, mapgrid.x;" +
12592	12705	//"TEX depth2, temp, texture[1], 2D;" +
12593		- TextureFetch("depth2", "temp", "1") +
	12706	+ ShadowTextureFetch("depth2", "temp", "1") +
12594	12707	"SUB temp.x, temp.x, mapgrid.x;" +
12595	12708	//"TEX depth3, temp, texture[1], 2D;" +
12596	12709	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12597		- TextureFetch("depth3", "temp", "1") +
	12710	+ ShadowTextureFetch("depth3", "temp", "1") +
12598	12711	"") +
12599	12712	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12600	12713	//"MOV params, material;" +
..	..	@@ -12968,7 +13081,7 @@
12968	13081	// display shadow only (fakedepth == 0)
12969	13082	"SUB temp.x, half.x, shadow.x;" +
12970	13083	"MOV temp.y, -params5.z;" + // params6.x;" +
12971		- "SLT temp.z, temp.y, -one2048th.x;" +
	13084	+ "SLT temp.z, temp.y, -c256i.x;" +
12972	13085	"SUB temp.y, one.x, temp.z;" +
12973	13086	"MUL temp.x, temp.x, temp.y;" +
12974	13087	"KIL temp.x;" +
..	..	@@ -13299,6 +13412,13 @@
13299	13412	//once = true;
13300	13413	}
13301	13414
	13415	+ String program = programmax;
	13416	+
	13417	+ if (Globals.MINSHADER)
	13418	+ {
	13419	+ program = programmin;
	13420	+ }
	13421	+
13302	13422	System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13303	13423	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13304	13424	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
..	..	@@ -13392,7 +13512,8 @@
13392	13512	return out;
13393	13513	}
13394	13514
13395		- String TextureFetch(String dest, String src, String unit)
	13515	+ // Also does frustum culling
	13516	+ String ShadowTextureFetch(String dest, String src, String unit)
13396	13517	{
13397	13518	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13398	13519	"SGE " + src + ".w, " + src + ".x, eps.x;" +
..	..	@@ -14255,14 +14376,15 @@
14255	14376	drag = false;
14256	14377	//System.out.println("Mouse DOWN");
14257	14378	editObj = false;
14258		- ClickInfo info = new ClickInfo();
14259		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14260		- info.pane = this;
14261		- info.camera = renderCamera;
14262		- info.x = x;
14263		- info.y = y;
14264		- info.modifiers = modifiersex;
14265		- editObj = object.doEditClick(info, 0);
	14379	+ //ClickInfo info = new ClickInfo();
	14380	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14381	+ object.clickInfo.pane = this;
	14382	+ object.clickInfo.camera = renderCamera;
	14383	+ object.clickInfo.x = x;
	14384	+ object.clickInfo.y = y;
	14385	+ object.clickInfo.modifiers = modifiersex;
	14386	+ editObj = object.doEditClick(//info,
	14387	+ 0);
14266	14388	if (!editObj)
14267	14389	{
14268	14390	hasMarquee = true;
..	..	@@ -14546,9 +14668,9 @@
14546	14668	MODIFIERS \|= COMMAND;
14547	14669	/**/
14548	14670	if((mod&SHIFT) == SHIFT)
14549		- manipCamera.RotatePosition(0, -speed);
14550		- else
14551	14671	manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14672	+ else
	14673	+ manipCamera.RotatePosition(0, -speed);
14552	14674	/**/
14553	14675	if ((mod & SHIFT) == SHIFT)
14554	14676	{
..	..	@@ -14567,9 +14689,9 @@
14567	14689	MODIFIERS \|= COMMAND;
14568	14690	/**/
14569	14691	if((mod&SHIFT) == SHIFT)
14570		- manipCamera.RotatePosition(0, speed);
14571		- else
14572	14692	manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14693	+ else
	14694	+ manipCamera.RotatePosition(0, speed);
14573	14695	/**/
14574	14696	if ((mod & SHIFT) == SHIFT)
14575	14697	{
..	..	@@ -14662,15 +14784,16 @@
14662	14784	if (editObj)
14663	14785	{
14664	14786	drag = true;
14665		- ClickInfo info = new ClickInfo();
14666		- info.bounds.setBounds(0, 0,
	14787	+ //ClickInfo info = new ClickInfo();
	14788	+ object.clickInfo.bounds.setBounds(0, 0,
14667	14789	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14668		- info.pane = this;
14669		- info.camera = renderCamera;
14670		- info.x = x;
14671		- info.y = y;
14672		- object.GetWindow().copy
14673		- .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
	14790	+ object.clickInfo.pane = this;
	14791	+ object.clickInfo.camera = renderCamera;
	14792	+ object.clickInfo.x = x;
	14793	+ object.clickInfo.y = y;
	14794	+ object //.GetWindow().copy
	14795	+ .doEditDrag(//info,
	14796	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14674	14797	} else
14675	14798	{
14676	14799	if (x < startX)
..	..	@@ -14819,24 +14942,27 @@
14819	14942	}
14820	14943	}
14821	14944
	14945	+// ClickInfo clickInfo = new ClickInfo();
	14946	+
14822	14947	public void mouseMoved(MouseEvent e)
14823	14948	{
14824	14949	//System.out.println("mouseMoved: " + e);
14825	14950	if (isRenderer)
14826	14951	return;
14827	14952
14828		- ClickInfo ci = new ClickInfo();
14829		- ci.x = e.getX();
14830		- ci.y = e.getY();
14831		- ci.modifiers = e.getModifiersEx();
14832		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14833		- ci.pane = this;
14834		- ci.camera = renderCamera;
	14953	+ // Mouse cursor feedback
	14954	+ object.clickInfo.x = e.getX();
	14955	+ object.clickInfo.y = e.getY();
	14956	+ object.clickInfo.modifiers = e.getModifiersEx();
	14957	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14958	+ object.clickInfo.pane = this;
	14959	+ object.clickInfo.camera = renderCamera;
14835	14960	if (!isRenderer)
14836	14961	{
14837	14962	//ObjEditor editWindow = object.editWindow;
14838	14963	//Object3D copy = editWindow.copy;
14839		- if (object.doEditClick(ci, 0))
	14964	+ if (object.doEditClick(//clickInfo,
	14965	+ 0))
14840	14966	{
14841	14967	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14842	14968	} else
..	..	@@ -15286,20 +15412,24 @@
15286	15412	OCCLUSION_CULLING ^= true;
15287	15413	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
15288	15414	break;
15289		- case '0': envyoff ^= true; repaint(); break;
	15415	+ //case '0': envyoff ^= true; repaint(); break;
15290	15416	case '1':
15291	15417	case '2':
15292	15418	case '3':
15293	15419	case '4':
15294	15420	case '5':
15295		- newenvy = Character.getNumericValue(key);
15296		- repaint();
15297		- break;
15298	15421	case '6':
15299	15422	case '7':
15300	15423	case '8':
15301	15424	case '9':
15302		- BGcolor = (key - '6')/3.f;
	15425	+ if (true) // envyoff)
	15426	+ {
	15427	+ BGcolor = (key - '1')/8.f;
	15428	+ }
	15429	+ else
	15430	+ {
	15431	+ //newenvy = Character.getNumericValue(key);
	15432	+ }
15303	15433	repaint();
15304	15434	break;
15305	15435	case '!':
..	..	@@ -15862,8 +15992,6 @@
15862	15992
15863	15993	int width = getBounds().width;
15864	15994	int height = getBounds().height;
15865		- ClickInfo info = new ClickInfo();
15866		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15867	15995	//Image img = CreateImage(width, height);
15868	15996	//System.out.println("width = " + width + "; height = " + height + "\n");
15869	15997
..	..	@@ -15940,31 +16068,37 @@
15940	16068	}
15941	16069	if (object != null && !hasMarquee)
15942	16070	{
	16071	+ if (object.clickInfo == null)
	16072	+ object.clickInfo = new ClickInfo();
	16073	+ ClickInfo info = object.clickInfo;
	16074	+ //ClickInfo info = new ClickInfo();
	16075	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16076	+
15943	16077	if (isRenderer)
15944	16078	{
15945		- info.flags++;
	16079	+ object.clickInfo.flags++;
15946	16080	double frameAspect = (double) width / (double) height;
15947	16081	if (frameAspect > renderCamera.aspect)
15948	16082	{
15949	16083	int desired = (int) ((double) height * renderCamera.aspect);
15950		- info.bounds.width -= width - desired;
15951		- info.bounds.x += (width - desired) / 2;
	16084	+ object.clickInfo.bounds.width -= width - desired;
	16085	+ object.clickInfo.bounds.x += (width - desired) / 2;
15952	16086	} else
15953	16087	{
15954	16088	int desired = (int) ((double) width / renderCamera.aspect);
15955		- info.bounds.height -= height - desired;
15956		- info.bounds.y += (height - desired) / 2;
	16089	+ object.clickInfo.bounds.height -= height - desired;
	16090	+ object.clickInfo.bounds.y += (height - desired) / 2;
15957	16091	}
15958	16092	}
15959	16093
15960		- info.g = gr;
15961		- info.camera = renderCamera;
	16094	+ object.clickInfo.g = gr;
	16095	+ object.clickInfo.camera = renderCamera;
15962	16096	/*
15963	16097	// Memory intensive (brep.verticescopy)
15964	16098	if (!(object instanceof Composite))
15965	16099	object.draw(info, 0, false); // SLOW :
15966	16100	*/
15967		- if (!isRenderer)
	16101	+ if (!isRenderer) // && drag)
15968	16102	{
15969	16103	Grafreed.Assert(object != null);
15970	16104	Grafreed.Assert(object.selection != null);
..	..	@@ -15972,9 +16106,9 @@
15972	16106	{
15973	16107	int hitSomething = object.selection.get(0).hitSomething;
15974	16108
15975		- info.DX = 0;
15976		- info.DY = 0;
15977		- info.W = 1;
	16109	+ object.clickInfo.DX = 0;
	16110	+ object.clickInfo.DY = 0;
	16111	+ object.clickInfo.W = 1;
15978	16112	if (hitSomething == Object3D.hitCenter)
15979	16113	{
15980	16114	info.DX = X;
..	..	@@ -15986,7 +16120,8 @@
15986	16120	info.DY -= info.bounds.height/2;
15987	16121	}
15988	16122
15989		- object.drawEditHandles(info, 0);
	16123	+ object.drawEditHandles(//info,
	16124	+ 0);
15990	16125
15991	16126	if (drag && (X != 0 \|\| Y != 0))
15992	16127	{
..	..	@@ -16485,6 +16620,8 @@
16485	16620	private /static/ boolean firstime;
16486	16621	private /static/ cVector newView = new cVector();
16487	16622	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16623	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16624	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
16488	16625	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16489	16626	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16490	16627	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16497,29 +16634,67 @@
16497	16634	{
16498	16635	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16499	16636
	16637	+ int usedsuf = 0;
	16638	+
16500	16639	for (int i = 0; i < suffixes.length; i++)
16501	16640	{
16502		- String resourceName = basename + suffixes[i] + "." + suffix;
16503		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16504		- mipmapped,
16505		- FileUtil.getFileSuffix(resourceName));
16506		- if (data == null)
	16641	+ String[] suffixe = suffixes;
	16642	+ String[] fallback = suffixes2;
	16643	+ String[] fallfallback = suffixes3;
	16644	+
	16645	+ for (int c=usedsuf; --c>=0;)
16507	16646	{
16508		- throw new IOException("Unable to load texture " + resourceName);
	16647	+// String[] temp = suffixe;
	16648	+// suffixe = fallback;
	16649	+// fallback = fallfallback;
	16650	+// fallfallback = temp;
16509	16651	}
	16652	+
	16653	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16654	+ TextureData data;
	16655	+
	16656	+ try
	16657	+ {
	16658	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16659	+ mipmapped,
	16660	+ FileUtil.getFileSuffix(resourceName));
	16661	+ }
	16662	+ catch (Exception e)
	16663	+ {
	16664	+ try
	16665	+ {
	16666	+ resourceName = basename + fallback[i] + "." + suffix;
	16667	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16668	+ mipmapped,
	16669	+ FileUtil.getFileSuffix(resourceName));
	16670	+ }
	16671	+ catch (Exception e2)
	16672	+ {
	16673	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16674	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16675	+ mipmapped,
	16676	+ FileUtil.getFileSuffix(resourceName));
	16677	+ }
	16678	+ }
	16679	+
16510	16680	//System.out.println("Target = " + targets[i]);
16511	16681	cubemap.updateImage(data, targets[i]);
16512	16682	}
16513	16683
16514	16684	return cubemap;
16515	16685	}
	16686	+
16516	16687	int bigsphere = -1;
16517	16688
16518	16689	float BGcolor = 0.5f;
16519	16690
16520		- private void DrawSkyBox(GL gl)
	16691	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16692	+
	16693	+ private void DrawSkyBox(GL gl, float ratio)
16521	16694	{
16522		- if (envyoff \|\| cubemap == null)
	16695	+ if (//envyoff \|\|
	16696	+ WIREFRAME \|\|
	16697	+ cubemap == null)
16523	16698	{
16524	16699	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16525	16700	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -16534,7 +16709,17 @@
16534	16709	// Compensates for ExaminerViewer's modification of modelview matrix
16535	16710	gl.glMatrixMode(GL.GL_MODELVIEW);
16536	16711	gl.glLoadIdentity();
	16712	+ gl.glScalef(1,ratio,1);
16537	16713
	16714	+// colorV[0] = 2;
	16715	+// colorV[1] = 2;
	16716	+// colorV[2] = 2;
	16717	+// colorV[3] = 1;
	16718	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16719	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16720	+//
	16721	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16722	+
16538	16723	//gl.glActiveTexture(GL.GL_TEXTURE1);
16539	16724	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16540	16725
..	..	@@ -16566,6 +16751,7 @@
16566	16751	{
16567	16752	gl.glScalef(1.0f, -1.0f, 1.0f);
16568	16753	}
	16754	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16569	16755	gl.glMultMatrixd(viewrot_1, 0);
16570	16756	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16571	16757	//viewer.updateInverseRotation(gl);
..	..	@@ -16606,7 +16792,8 @@
16606	16792	gl.glDisable(GL.GL_TEXTURE_GEN_R);
16607	16793
16608	16794	cubemap.disable();
16609		- ////cubemap.unbind();
	16795	+ //cubemap.dispose();
	16796	+
16610	16797	if (CULLFACE)
16611	16798	{
16612	16799	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -16824,7 +17011,7 @@
16824	17011	//new Exception().printStackTrace();
16825	17012	System.out.println("select buffer init");
16826	17013	// Use debug pipeline
16827		- drawable.setGL(new DebugGL(drawable.getGL()));
	17014	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16828	17015
16829	17016	GL gl = drawable.getGL();
16830	17017
..	..	@@ -17370,10 +17557,14 @@
17370	17557	gl.glFlush();
17371	17558
17372	17559	/**/
17373		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
	17560	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
17374	17561
17375		- float[] pixels = occlusionsizebuffer.array();
	17562	+ float[] depths = occlusiondepthbuffer.array();
17376	17563
	17564	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
	17565	+
	17566	+ int[] pixels = selectsizebuffer.array();
	17567	+
17377	17568	double r = 0, g = 0, b = 0;
17378	17569
17379	17570	double count = 0;
..	..	@@ -17384,7 +17575,7 @@
17384	17575
17385	17576	double FACTOR = 1;
17386	17577
17387		- for (int i = 0; i < pixels.length; i++)
	17578	+ for (int i = 0; i < depths.length; i++)
17388	17579	{
17389	17580	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
17390	17581	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -17467,7 +17658,7 @@
17467	17658
17468	17659	double scale = ray.z; // 1; // cos
17469	17660
17470		- float depth = pixels[newindex];
	17661	+ float depth = depths[newindex];
17471	17662
17472	17663	/*
17473	17664	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -17664,11 +17855,14 @@
17664	17855	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17665	17856	static IntBuffer bigAAbuffer;
17666	17857	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17667		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	17858	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17668	17859	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17669	17860	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17670	17861	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17671		- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17862	+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17863	+
	17864	+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17865	+
17672	17866	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17673	17867	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17674	17868	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();