~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -187,6 +187,18 @@
187	187	}
188	188
189	189	private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	190	+
	191	+ public void LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	192	+ {
	193	+ try
	194	+ {
	195	+ cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	196	+ } catch (IOException e)
	197	+ {
	198	+ System.out.println("NAME = " + name);
	199	+ e.printStackTrace(); // throw new RuntimeException(e);
	200	+ }
	201	+ }
190	202
191	203	void SetAsGLRenderer(boolean b)
192	204	{
..	..	@@ -206,7 +218,8 @@
206	218
207	219	SetCamera(cam);
208	220
209		- SetLight(new Camera(new cVector(10, 10, -20)));
	221	+ // Warning: not used.
	222	+ SetLight(new Camera(new cVector(15, 10, -20)));
210	223
211	224	object = o;
212	225
..	..	@@ -1484,6 +1497,8 @@
1484	1497	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1485	1498	}
1486	1499
	1500	+ float[] colorV = new float[4];
	1501	+
1487	1502	void SetColor(Object3D obj, Vertex p0)
1488	1503	{
1489	1504	CameraPane display = this;
..	..	@@ -1551,8 +1566,6 @@
1551	1566	{
1552	1567	return;
1553	1568	}
1554		-
1555		- float[] colorV = new float[3];
1556	1569
1557	1570	if (false) // marked)
1558	1571	{
..	..	@@ -8345,7 +8358,7 @@
8345	8358	// else
8346	8359	// if (!texname.startsWith("/"))
8347	8360	// texname = "/Users/nbriere/Textures/" + texname;
8348		- if (!FileExists(texname))
	8361	+ if (!FileExists(texname) && !texname.startsWith("@"))
8349	8362	{
8350	8363	texname = fallbackTextureName;
8351	8364	}
..	..	@@ -8428,6 +8441,15 @@
8428	8441	new Exception().printStackTrace();
8429	8442	} else
8430	8443	{
	8444	+ if (texname.startsWith("@"))
	8445	+ {
	8446	+ // texturecache = textures.get(texname); // suspicious
	8447	+ if (texturecache == null)
	8448	+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
	8449	+ else
	8450	+ new Exception().printStackTrace();
	8451	+ } else
	8452	+ {
8431	8453	if (textureon)
8432	8454	{
8433	8455	String cachename = texname;
..	..	@@ -8487,6 +8509,7 @@
8487	8509	texturecache = new CacheTexture(texturedata,resolution);
8488	8510	//texture = GetTexture(tex, bump);
8489	8511	}
	8512	+ }
8490	8513	}
8491	8514	//}
8492	8515	}
..	..	@@ -8755,10 +8778,12 @@
8755	8778
8756	8779	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8757	8780	MAXSTACK = temp[0];
8758		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8781	+ if (Globals.DEBUG)
	8782	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8759	8783	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8760	8784	MAXSTACK = temp[0];
8761		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8785	+ if (Globals.DEBUG)
	8786	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8762	8787
8763	8788	// Use debug pipeline
8764	8789	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8766,7 +8791,8 @@
8766	8791	gl = drawable.getGL(); //
8767	8792
8768	8793	GL gl3 = getGL();
8769		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8794	+ if (Globals.DEBUG)
	8795	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8770	8796
8771	8797
8772	8798	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8931,7 +8957,7 @@
8931	8957
8932	8958	if (cubemap == null)
8933	8959	{
8934		- LoadEnvy(5);
	8960	+ //LoadEnvy(1);
8935	8961	}
8936	8962
8937	8963	//cubemap.enable();
..	..	@@ -9218,37 +9244,58 @@
9218	9244	cubemap = null;
9219	9245	return;
9220	9246	case 1:
9221		- name = "cubemaps/box_";
9222		- ext = "png";
	9247	+ name = "cubemaps/rgb/";
	9248	+ ext = "jpg";
9223	9249	reverseUP = false;
9224	9250	break;
9225	9251	case 2:
9226		- name = "cubemaps/uffizi_";
9227		- ext = "png";
9228		- break; // reverseUP = true; break;
	9252	+ name = "cubemaps/uffizi/";
	9253	+ ext = "jpg";
	9254	+ reverseUP = false;
	9255	+ break;
9229	9256	case 3:
9230		- name = "cubemaps/CloudyHills_";
9231		- ext = "tga";
	9257	+ name = "cubemaps/CloudyHills/";
	9258	+ ext = "jpg";
9232	9259	reverseUP = false;
9233	9260	break;
9234	9261	case 4:
9235		- name = "cubemaps/cornell_";
	9262	+ name = "cubemaps/cornell/";
9236	9263	ext = "png";
9237	9264	reverseUP = false;
9238	9265	break;
	9266	+ case 5:
	9267	+ name = "cubemaps/skycube/";
	9268	+ ext = "jpg";
	9269	+ reverseUP = false;
	9270	+ break;
	9271	+ case 6:
	9272	+ name = "cubemaps/SaintLazarusChurch3/";
	9273	+ ext = "jpg";
	9274	+ reverseUP = false;
	9275	+ break;
	9276	+ case 7:
	9277	+ name = "cubemaps/Sodermalmsallen/";
	9278	+ ext = "jpg";
	9279	+ reverseUP = false;
	9280	+ break;
	9281	+ case 8:
	9282	+ name = "cubemaps/Sodermalmsallen2/";
	9283	+ ext = "jpg";
	9284	+ reverseUP = false;
	9285	+ break;
	9286	+ case 9:
	9287	+ name = "cubemaps/UnionSquare/";
	9288	+ ext = "jpg";
	9289	+ reverseUP = false;
	9290	+ break;
9239	9291	default:
9240		- name = "cubemaps/rgb_";
9241		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9292	+ name = "cubemaps/box/";
	9293	+ ext = "png"; /mipmap = true;/
	9294	+ reverseUP = false;
9242	9295	break;
9243	9296	}
9244		-
9245		- try
9246		- {
9247		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9248		- } catch (IOException e)
9249		- {
9250		- throw new RuntimeException(e);
9251		- }
	9297	+
	9298	+ LoadSkybox(name, ext, mipmap);
9252	9299	}
9253	9300
9254	9301	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -9280,8 +9327,12 @@
9280	9327	static double[] model = new double[16];
9281	9328	double[] camera2light = new double[16];
9282	9329	double[] light2camera = new double[16];
9283		- int newenvy = -1;
9284		- boolean envyoff = true; // false;
	9330	+
	9331	+ //int newenvy = -1;
	9332	+ //boolean envyoff = false;
	9333	+
	9334	+ String loadedskyboxname;
	9335	+
9285	9336	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
9286	9337	//float[] light0 = { 0,0,0 };
9287	9338	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9699,7 +9750,7 @@
9699	9750
9700	9751	if (renderCamera != lightCamera)
9701	9752	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9702		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9753	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9703	9754
9704	9755	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9705	9756
..	..	@@ -9715,7 +9766,7 @@
9715	9766
9716	9767	if (renderCamera != lightCamera)
9717	9768	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9718		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9769	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9719	9770
9720	9771	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9721	9772
..	..	@@ -9761,10 +9812,12 @@
9761	9812	rati = 1 / rati;
9762	9813	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9763	9814	}
9764		- assert (newenvy == -1);
	9815	+
	9816	+ //assert (newenvy == -1);
	9817	+
9765	9818	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9766	9819	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9767		- DrawSkyBox(gl);
	9820	+ DrawSkyBox(gl, (float)rati);
9768	9821	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9769	9822	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9770	9823	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -10801,7 +10854,7 @@
10801	10854
10802	10855	if (wait)
10803	10856	{
10804		- Sleep(500);
	10857	+ Sleep(200); // blocks everything
10805	10858
10806	10859	wait = false;
10807	10860	}
..	..	@@ -10916,7 +10969,7 @@
10916	10969	// if (parentcam != renderCamera) // not a light
10917	10970	if (cam != lightCamera)
10918	10971	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10919		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	10972	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10920	10973
10921	10974	for (int j = 0; j < 4; j++)
10922	10975	{
..	..	@@ -10931,7 +10984,7 @@
10931	10984	// if (parentcam != renderCamera) // not a light
10932	10985	if (cam != lightCamera)
10933	10986	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10934		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	10987	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10935	10988
10936	10989	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10937	10990
..	..	@@ -11017,13 +11070,27 @@
11017	11070	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
11018	11071	}
11019	11072
11020		- if (newenvy > -1)
	11073	+// if (newenvy > -1)
	11074	+// {
	11075	+// LoadEnvy(newenvy);
	11076	+// }
	11077	+//
	11078	+// newenvy = -1;
	11079	+
	11080	+ if (object.skyboxname != null)
11021	11081	{
11022		- LoadEnvy(newenvy);
	11082	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11083	+ {
	11084	+ LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11085	+ loadedskyboxname = object.skyboxname;
	11086	+ }
11023	11087	}
11024		-
11025		- newenvy = -1;
11026		-
	11088	+ else
	11089	+ {
	11090	+ cubemap = null;
	11091	+ loadedskyboxname = null;
	11092	+ }
	11093	+
11027	11094	ratio = ((double) getWidth()) / getHeight();
11028	11095	//System.out.println("ratio = " + ratio);
11029	11096
..	..	@@ -11039,7 +11106,7 @@
11039	11106
11040	11107	if (!IsFrozen() && !ambientOcclusion)
11041	11108	{
11042		- DrawSkyBox(gl);
	11109	+ DrawSkyBox(gl, (float)ratio);
11043	11110	}
11044	11111
11045	11112	//if (selection_view == -1)
..	..	@@ -11325,7 +11392,7 @@
11325	11392
11326	11393	// if (cam != lightCamera)
11327	11394	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11328		- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
	11395	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
11329	11396	}
11330	11397
11331	11398	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -12399,8 +12466,76 @@
12399	12466
12400	12467	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12401	12468
12402		- String program =
	12469	+ String programmin =
	12470	+ // Min shader
12403	12471	"!!ARBfp1.0\n" +
	12472	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12473	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12474	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12475	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12476	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12477	+ "PARAM light2cam0 = program.env[10];" +
	12478	+ "PARAM light2cam1 = program.env[11];" +
	12479	+ "PARAM light2cam2 = program.env[12];" +
	12480	+ "TEMP temp;" +
	12481	+ "TEMP light;" +
	12482	+ "TEMP ndotl;" +
	12483	+ "TEMP normal;" +
	12484	+ "TEMP depth;" +
	12485	+ "TEMP eye;" +
	12486	+ "TEMP pos;" +
	12487	+
	12488	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12489	+ Normalize("normal") +
	12490	+ "MOV light, state.light[0].position;" +
	12491	+ "DP3 ndotl.x, light, normal;" +
	12492	+
	12493	+ // shadow
	12494	+ "MOV pos, fragment.texcoord[1];" +
	12495	+ "MOV temp, pos;" +
	12496	+ ShadowTextureFetch("depth", "temp", "1") +
	12497	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12498	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12499	+
	12500	+ // No shadow when out of frustum
	12501	+ //"SGE temp.y, depth.z, zero123.y;" +
	12502	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12503	+
	12504	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12505	+
	12506	+ // Backlit
	12507	+ "MOV pos.w, zero123.y;" +
	12508	+ "DP4 eye.x, pos, light2cam0;" +
	12509	+ "DP4 eye.y, pos, light2cam1;" +
	12510	+ "DP4 eye.z, pos, light2cam2;" +
	12511	+ Normalize("eye") +
	12512	+
	12513	+ "DP3 ndotl.y, -eye, normal;" +
	12514	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12515	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12516	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12517	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12518	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12519	+
	12520	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12521	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12522	+
	12523	+ // Pigment
	12524	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12525	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12526	+ "MUL temp, temp, ndotl.x;" +
	12527	+
	12528	+ "MUL temp, temp, zero123.z;" +
	12529	+
	12530	+ //"MUL temp, temp, ndotl.y;" +
	12531	+
	12532	+ "MOV temp.w, zero123.y;" + // reset alpha
	12533	+ "MOV result.color, temp;" +
	12534	+ "END";
	12535	+
	12536	+ String programmax =
	12537	+ "!!ARBfp1.0\n" +
	12538	+
12404	12539	//"OPTION ARB_fragment_program_shadow;" +
12405	12540	"PARAM light2cam0 = program.env[10];" +
12406	12541	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12515,8 +12650,7 @@
12515	12650	"TEMP shininess;" +
12516	12651	"\n" +
12517	12652	"MOV texSamp, one;" +
12518		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12519		-
	12653	+
12520	12654	"MOV mapgrid.x, one2048th.x;" +
12521	12655	"MOV temp, fragment.texcoord[1];" +
12522	12656	/*
..	..	@@ -12537,20 +12671,20 @@
12537	12671	"MUL temp, floor, mapgrid.x;" +
12538	12672	//"TEX depth0, temp, texture[1], 2D;" +
12539	12673	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12540		- TextureFetch("depth0", "temp", "1") +
	12674	+ ShadowTextureFetch("depth0", "temp", "1") +
12541	12675	"") +
12542	12676	"ADD temp.x, temp.x, mapgrid.x;" +
12543	12677	//"TEX depth1, temp, texture[1], 2D;" +
12544	12678	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12545		- TextureFetch("depth1", "temp", "1") +
	12679	+ ShadowTextureFetch("depth1", "temp", "1") +
12546	12680	"") +
12547	12681	"ADD temp.y, temp.y, mapgrid.x;" +
12548	12682	//"TEX depth2, temp, texture[1], 2D;" +
12549		- TextureFetch("depth2", "temp", "1") +
	12683	+ ShadowTextureFetch("depth2", "temp", "1") +
12550	12684	"SUB temp.x, temp.x, mapgrid.x;" +
12551	12685	//"TEX depth3, temp, texture[1], 2D;" +
12552	12686	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12553		- TextureFetch("depth3", "temp", "1") +
	12687	+ ShadowTextureFetch("depth3", "temp", "1") +
12554	12688	"") +
12555	12689	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12556	12690	//"MOV params, material;" +
..	..	@@ -12921,10 +13055,10 @@
12921	13055	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12922	13056	"") +
12923	13057
12924		- // display shadow only (bump == 0)
	13058	+ // display shadow only (fakedepth == 0)
12925	13059	"SUB temp.x, half.x, shadow.x;" +
12926	13060	"MOV temp.y, -params5.z;" + // params6.x;" +
12927		- "SLT temp.z, temp.y, -one2048th.x;" +
	13061	+ "SLT temp.z, temp.y, -c256i.x;" +
12928	13062	"SUB temp.y, one.x, temp.z;" +
12929	13063	"MUL temp.x, temp.x, temp.y;" +
12930	13064	"KIL temp.x;" +
..	..	@@ -13255,6 +13389,13 @@
13255	13389	//once = true;
13256	13390	}
13257	13391
	13392	+ String program = programmax;
	13393	+
	13394	+ if (Globals.MINSHADER)
	13395	+ {
	13396	+ program = programmin;
	13397	+ }
	13398	+
13258	13399	System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13259	13400	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13260	13401	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
..	..	@@ -13348,25 +13489,26 @@
13348	13489	return out;
13349	13490	}
13350	13491
13351		- String TextureFetch(String dest, String src, String unit)
	13492	+ // Also does frustum culling
	13493	+ String ShadowTextureFetch(String dest, String src, String unit)
13352	13494	{
13353	13495	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13354	13496	"SGE " + src + ".w, " + src + ".x, eps.x;" +
13355	13497	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13498	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13499	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
13356	13500	"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;" +
	13501	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13502	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
13361	13503	//"SWZ buffer, temp, w,w,w,w;";
13362		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13504	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13363	13505	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
13364	13506	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
13365	13507	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13366		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13508	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13367	13509
13368		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13369		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13510	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13511	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13370	13512	}
13371	13513
13372	13514	String Shadow(String depth, String shadow)
..	..	@@ -13413,7 +13555,7 @@
13413	13555	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13414	13556	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13415	13557
13416		- // No shadow when out of frustrum
	13558	+ // No shadow when out of frustum
13417	13559	"SGE temp.x, " + depth + ".z, one.z;" +
13418	13560	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13419	13561	"";
..	..	@@ -14211,14 +14353,15 @@
14211	14353	drag = false;
14212	14354	//System.out.println("Mouse DOWN");
14213	14355	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);
	14356	+ //ClickInfo info = new ClickInfo();
	14357	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14358	+ object.clickInfo.pane = this;
	14359	+ object.clickInfo.camera = renderCamera;
	14360	+ object.clickInfo.x = x;
	14361	+ object.clickInfo.y = y;
	14362	+ object.clickInfo.modifiers = modifiersex;
	14363	+ editObj = object.doEditClick(//info,
	14364	+ 0);
14222	14365	if (!editObj)
14223	14366	{
14224	14367	hasMarquee = true;
..	..	@@ -14502,9 +14645,9 @@
14502	14645	MODIFIERS \|= COMMAND;
14503	14646	/**/
14504	14647	if((mod&SHIFT) == SHIFT)
14505		- manipCamera.RotatePosition(0, -speed);
14506		- else
14507	14648	manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14649	+ else
	14650	+ manipCamera.RotatePosition(0, -speed);
14508	14651	/**/
14509	14652	if ((mod & SHIFT) == SHIFT)
14510	14653	{
..	..	@@ -14523,9 +14666,9 @@
14523	14666	MODIFIERS \|= COMMAND;
14524	14667	/**/
14525	14668	if((mod&SHIFT) == SHIFT)
14526		- manipCamera.RotatePosition(0, speed);
14527		- else
14528	14669	manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14670	+ else
	14671	+ manipCamera.RotatePosition(0, speed);
14529	14672	/**/
14530	14673	if ((mod & SHIFT) == SHIFT)
14531	14674	{
..	..	@@ -14618,15 +14761,16 @@
14618	14761	if (editObj)
14619	14762	{
14620	14763	drag = true;
14621		- ClickInfo info = new ClickInfo();
14622		- info.bounds.setBounds(0, 0,
	14764	+ //ClickInfo info = new ClickInfo();
	14765	+ object.clickInfo.bounds.setBounds(0, 0,
14623	14766	(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);
	14767	+ object.clickInfo.pane = this;
	14768	+ object.clickInfo.camera = renderCamera;
	14769	+ object.clickInfo.x = x;
	14770	+ object.clickInfo.y = y;
	14771	+ object //.GetWindow().copy
	14772	+ .doEditDrag(//info,
	14773	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14630	14774	} else
14631	14775	{
14632	14776	if (x < startX)
..	..	@@ -14775,24 +14919,27 @@
14775	14919	}
14776	14920	}
14777	14921
	14922	+// ClickInfo clickInfo = new ClickInfo();
	14923	+
14778	14924	public void mouseMoved(MouseEvent e)
14779	14925	{
14780	14926	//System.out.println("mouseMoved: " + e);
14781	14927	if (isRenderer)
14782	14928	return;
14783	14929
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;
	14930	+ // Mouse cursor feedback
	14931	+ object.clickInfo.x = e.getX();
	14932	+ object.clickInfo.y = e.getY();
	14933	+ object.clickInfo.modifiers = e.getModifiersEx();
	14934	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14935	+ object.clickInfo.pane = this;
	14936	+ object.clickInfo.camera = renderCamera;
14791	14937	if (!isRenderer)
14792	14938	{
14793	14939	//ObjEditor editWindow = object.editWindow;
14794	14940	//Object3D copy = editWindow.copy;
14795		- if (object.doEditClick(ci, 0))
	14941	+ if (object.doEditClick(//clickInfo,
	14942	+ 0))
14796	14943	{
14797	14944	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14798	14945	} else
..	..	@@ -15242,20 +15389,24 @@
15242	15389	OCCLUSION_CULLING ^= true;
15243	15390	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
15244	15391	break;
15245		- case '0': envyoff ^= true; repaint(); break;
	15392	+ //case '0': envyoff ^= true; repaint(); break;
15246	15393	case '1':
15247	15394	case '2':
15248	15395	case '3':
15249	15396	case '4':
15250	15397	case '5':
15251		- newenvy = Character.getNumericValue(key);
15252		- repaint();
15253		- break;
15254	15398	case '6':
15255	15399	case '7':
15256	15400	case '8':
15257	15401	case '9':
15258		- BGcolor = (key - '6')/3.f;
	15402	+ if (true) // envyoff)
	15403	+ {
	15404	+ BGcolor = (key - '1')/8.f;
	15405	+ }
	15406	+ else
	15407	+ {
	15408	+ //newenvy = Character.getNumericValue(key);
	15409	+ }
15259	15410	repaint();
15260	15411	break;
15261	15412	case '!':
..	..	@@ -15818,8 +15969,6 @@
15818	15969
15819	15970	int width = getBounds().width;
15820	15971	int height = getBounds().height;
15821		- ClickInfo info = new ClickInfo();
15822		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15823	15972	//Image img = CreateImage(width, height);
15824	15973	//System.out.println("width = " + width + "; height = " + height + "\n");
15825	15974
..	..	@@ -15896,31 +16045,37 @@
15896	16045	}
15897	16046	if (object != null && !hasMarquee)
15898	16047	{
	16048	+ if (object.clickInfo == null)
	16049	+ object.clickInfo = new ClickInfo();
	16050	+ ClickInfo info = object.clickInfo;
	16051	+ //ClickInfo info = new ClickInfo();
	16052	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16053	+
15899	16054	if (isRenderer)
15900	16055	{
15901		- info.flags++;
	16056	+ object.clickInfo.flags++;
15902	16057	double frameAspect = (double) width / (double) height;
15903	16058	if (frameAspect > renderCamera.aspect)
15904	16059	{
15905	16060	int desired = (int) ((double) height * renderCamera.aspect);
15906		- info.bounds.width -= width - desired;
15907		- info.bounds.x += (width - desired) / 2;
	16061	+ object.clickInfo.bounds.width -= width - desired;
	16062	+ object.clickInfo.bounds.x += (width - desired) / 2;
15908	16063	} else
15909	16064	{
15910	16065	int desired = (int) ((double) width / renderCamera.aspect);
15911		- info.bounds.height -= height - desired;
15912		- info.bounds.y += (height - desired) / 2;
	16066	+ object.clickInfo.bounds.height -= height - desired;
	16067	+ object.clickInfo.bounds.y += (height - desired) / 2;
15913	16068	}
15914	16069	}
15915	16070
15916		- info.g = gr;
15917		- info.camera = renderCamera;
	16071	+ object.clickInfo.g = gr;
	16072	+ object.clickInfo.camera = renderCamera;
15918	16073	/*
15919	16074	// Memory intensive (brep.verticescopy)
15920	16075	if (!(object instanceof Composite))
15921	16076	object.draw(info, 0, false); // SLOW :
15922	16077	*/
15923		- if (!isRenderer)
	16078	+ if (!isRenderer) // && drag)
15924	16079	{
15925	16080	Grafreed.Assert(object != null);
15926	16081	Grafreed.Assert(object.selection != null);
..	..	@@ -15928,9 +16083,9 @@
15928	16083	{
15929	16084	int hitSomething = object.selection.get(0).hitSomething;
15930	16085
15931		- info.DX = 0;
15932		- info.DY = 0;
15933		- info.W = 1;
	16086	+ object.clickInfo.DX = 0;
	16087	+ object.clickInfo.DY = 0;
	16088	+ object.clickInfo.W = 1;
15934	16089	if (hitSomething == Object3D.hitCenter)
15935	16090	{
15936	16091	info.DX = X;
..	..	@@ -15942,7 +16097,8 @@
15942	16097	info.DY -= info.bounds.height/2;
15943	16098	}
15944	16099
15945		- object.drawEditHandles(info, 0);
	16100	+ object.drawEditHandles(//info,
	16101	+ 0);
15946	16102
15947	16103	if (drag && (X != 0 \|\| Y != 0))
15948	16104	{
..	..	@@ -16441,6 +16597,8 @@
16441	16597	private /static/ boolean firstime;
16442	16598	private /static/ cVector newView = new cVector();
16443	16599	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16600	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16601	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
16444	16602	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16445	16603	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16446	16604	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16453,29 +16611,67 @@
16453	16611	{
16454	16612	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16455	16613
	16614	+ int usedsuf = 0;
	16615	+
16456	16616	for (int i = 0; i < suffixes.length; i++)
16457	16617	{
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)
	16618	+ String[] suffixe = suffixes;
	16619	+ String[] fallback = suffixes2;
	16620	+ String[] fallfallback = suffixes3;
	16621	+
	16622	+ for (int c=usedsuf; --c>=0;)
16463	16623	{
16464		- throw new IOException("Unable to load texture " + resourceName);
	16624	+// String[] temp = suffixe;
	16625	+// suffixe = fallback;
	16626	+// fallback = fallfallback;
	16627	+// fallfallback = temp;
16465	16628	}
	16629	+
	16630	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16631	+ TextureData data;
	16632	+
	16633	+ try
	16634	+ {
	16635	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16636	+ mipmapped,
	16637	+ FileUtil.getFileSuffix(resourceName));
	16638	+ }
	16639	+ catch (Exception e)
	16640	+ {
	16641	+ try
	16642	+ {
	16643	+ resourceName = basename + fallback[i] + "." + suffix;
	16644	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16645	+ mipmapped,
	16646	+ FileUtil.getFileSuffix(resourceName));
	16647	+ }
	16648	+ catch (Exception e2)
	16649	+ {
	16650	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16651	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16652	+ mipmapped,
	16653	+ FileUtil.getFileSuffix(resourceName));
	16654	+ }
	16655	+ }
	16656	+
16466	16657	//System.out.println("Target = " + targets[i]);
16467	16658	cubemap.updateImage(data, targets[i]);
16468	16659	}
16469	16660
16470	16661	return cubemap;
16471	16662	}
	16663	+
16472	16664	int bigsphere = -1;
16473	16665
16474	16666	float BGcolor = 0.5f;
16475	16667
16476		- private void DrawSkyBox(GL gl)
	16668	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16669	+
	16670	+ private void DrawSkyBox(GL gl, float ratio)
16477	16671	{
16478		- if (envyoff \|\| cubemap == null)
	16672	+ if (//envyoff \|\|
	16673	+ WIREFRAME \|\|
	16674	+ cubemap == null)
16479	16675	{
16480	16676	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16481	16677	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -16490,7 +16686,17 @@
16490	16686	// Compensates for ExaminerViewer's modification of modelview matrix
16491	16687	gl.glMatrixMode(GL.GL_MODELVIEW);
16492	16688	gl.glLoadIdentity();
	16689	+ gl.glScalef(1,ratio,1);
16493	16690
	16691	+// colorV[0] = 2;
	16692	+// colorV[1] = 2;
	16693	+// colorV[2] = 2;
	16694	+// colorV[3] = 1;
	16695	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16696	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16697	+//
	16698	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16699	+
16494	16700	//gl.glActiveTexture(GL.GL_TEXTURE1);
16495	16701	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16496	16702
..	..	@@ -16522,6 +16728,7 @@
16522	16728	{
16523	16729	gl.glScalef(1.0f, -1.0f, 1.0f);
16524	16730	}
	16731	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16525	16732	gl.glMultMatrixd(viewrot_1, 0);
16526	16733	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16527	16734	//viewer.updateInverseRotation(gl);
..	..	@@ -16780,7 +16987,7 @@
16780	16987	//new Exception().printStackTrace();
16781	16988	System.out.println("select buffer init");
16782	16989	// Use debug pipeline
16783		- drawable.setGL(new DebugGL(drawable.getGL()));
	16990	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16784	16991
16785	16992	GL gl = drawable.getGL();
16786	16993