~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -173,7 +173,7 @@
173	173	static boolean doublesided = false; // true; // reversed normals are awful for conformance
174	174	boolean anisotropy = true;
175	175	boolean softshadow = true; // slower but better false;
176		- boolean opacityhalo = false;
	176	+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
177	177
178	178	boolean macromode = false;
179	179
..	..	@@ -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,50 +12466,74 @@
12399	12466
12400	12467	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12401	12468
12402		- String program =
	12469	+ String programmin =
12403	12470	// Min shader
12404	12471	"!!ARBfp1.0\n" +
12405		- "PARAM zero123 = { 0.0, 1.0, 2.0, 3.0 };" +
	12472	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
12406	12473	"PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
12407	12474	"PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
12408	12475	"PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
12409	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];" +
12410	12480	"TEMP temp;" +
12411	12481	"TEMP light;" +
12412	12482	"TEMP ndotl;" +
12413	12483	"TEMP normal;" +
12414	12484	"TEMP depth;" +
	12485	+ "TEMP eye;" +
	12486	+ "TEMP pos;" +
12415	12487
12416	12488	"MAD normal, fragment.color, zero123.z, -zero123.y;" +
12417		-
	12489	+ Normalize("normal") +
12418	12490	"MOV light, state.light[0].position;" +
12419	12491	"DP3 ndotl.x, light, normal;" +
12420	12492
12421	12493	// shadow
12422		- "MOV temp, fragment.texcoord[1];" +
12423		- TextureFetch("depth", "temp", "1") +
	12494	+ "MOV pos, fragment.texcoord[1];" +
	12495	+ "MOV temp, pos;" +
	12496	+ ShadowTextureFetch("depth", "temp", "1") +
12424	12497	//"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
12425		- "SLT temp.x, fragment.texcoord[1].z, depth.z;" +
12426		-
	12498	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
12427	12499
12428	12500	// No shadow when out of frustum
12429	12501	//"SGE temp.y, depth.z, zero123.y;" +
12430	12502	//"LRP temp.x, temp.y, zero123.y, temp.x;" +
12431	12503
12432		- "MUL ndotl.x, ndotl.x, temp.x;" +
12433		- "MAX ndotl.x, ndotl.x, pow2.y;" +
	12504	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
12434	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
12435	12524	"TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12525	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
12436	12526	"MUL temp, temp, ndotl.x;" +
12437	12527
12438	12528	"MUL temp, temp, zero123.z;" +
12439	12529
12440		- "MOV temp.w, zero123.y;" + // reset alpha
	12530	+ //"MUL temp, temp, ndotl.y;" +
12441	12531
	12532	+ "MOV temp.w, zero123.y;" + // reset alpha
12442	12533	"MOV result.color, temp;" +
12443	12534	"END";
12444	12535
12445		- String program2 =
	12536	+ String programmax =
12446	12537	"!!ARBfp1.0\n" +
12447	12538
12448	12539	//"OPTION ARB_fragment_program_shadow;" +
..	..	@@ -12580,20 +12671,20 @@
12580	12671	"MUL temp, floor, mapgrid.x;" +
12581	12672	//"TEX depth0, temp, texture[1], 2D;" +
12582	12673	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12583		- TextureFetch("depth0", "temp", "1") +
	12674	+ ShadowTextureFetch("depth0", "temp", "1") +
12584	12675	"") +
12585	12676	"ADD temp.x, temp.x, mapgrid.x;" +
12586	12677	//"TEX depth1, temp, texture[1], 2D;" +
12587	12678	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12588		- TextureFetch("depth1", "temp", "1") +
	12679	+ ShadowTextureFetch("depth1", "temp", "1") +
12589	12680	"") +
12590	12681	"ADD temp.y, temp.y, mapgrid.x;" +
12591	12682	//"TEX depth2, temp, texture[1], 2D;" +
12592		- TextureFetch("depth2", "temp", "1") +
	12683	+ ShadowTextureFetch("depth2", "temp", "1") +
12593	12684	"SUB temp.x, temp.x, mapgrid.x;" +
12594	12685	//"TEX depth3, temp, texture[1], 2D;" +
12595	12686	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12596		- TextureFetch("depth3", "temp", "1") +
	12687	+ ShadowTextureFetch("depth3", "temp", "1") +
12597	12688	"") +
12598	12689	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12599	12690	//"MOV params, material;" +
..	..	@@ -12967,7 +13058,7 @@
12967	13058	// display shadow only (fakedepth == 0)
12968	13059	"SUB temp.x, half.x, shadow.x;" +
12969	13060	"MOV temp.y, -params5.z;" + // params6.x;" +
12970		- "SLT temp.z, temp.y, -one2048th.x;" +
	13061	+ "SLT temp.z, temp.y, -c256i.x;" +
12971	13062	"SUB temp.y, one.x, temp.z;" +
12972	13063	"MUL temp.x, temp.x, temp.y;" +
12973	13064	"KIL temp.x;" +
..	..	@@ -13298,6 +13389,13 @@
13298	13389	//once = true;
13299	13390	}
13300	13391
	13392	+ String program = programmax;
	13393	+
	13394	+ if (Globals.MINSHADER)
	13395	+ {
	13396	+ program = programmin;
	13397	+ }
	13398	+
13301	13399	System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13302	13400	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13303	13401	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
..	..	@@ -13391,25 +13489,26 @@
13391	13489	return out;
13392	13490	}
13393	13491
13394		- String TextureFetch(String dest, String src, String unit)
	13492	+ // Also does frustum culling
	13493	+ String ShadowTextureFetch(String dest, String src, String unit)
13395	13494	{
13396	13495	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13397	13496	"SGE " + src + ".w, " + src + ".x, eps.x;" +
13398	13497	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13498	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13499	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
13399	13500	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13400		- "SLT " + src + ".z, " + src + ".x, one.x;" +
13401		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13402		- "SLT " + src + ".z, " + src + ".y, one.x;" +
13403		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13501	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13502	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
13404	13503	//"SWZ buffer, temp, w,w,w,w;";
13405		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13504	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13406	13505	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
13407	13506	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
13408	13507	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13409		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13508	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13410	13509
13411		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13412		- //"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;";
13413	13512	}
13414	13513
13415	13514	String Shadow(String depth, String shadow)
..	..	@@ -14254,14 +14353,15 @@
14254	14353	drag = false;
14255	14354	//System.out.println("Mouse DOWN");
14256	14355	editObj = false;
14257		- ClickInfo info = new ClickInfo();
14258		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14259		- info.pane = this;
14260		- info.camera = renderCamera;
14261		- info.x = x;
14262		- info.y = y;
14263		- info.modifiers = modifiersex;
14264		- 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);
14265	14365	if (!editObj)
14266	14366	{
14267	14367	hasMarquee = true;
..	..	@@ -14545,9 +14645,9 @@
14545	14645	MODIFIERS \|= COMMAND;
14546	14646	/**/
14547	14647	if((mod&SHIFT) == SHIFT)
14548		- manipCamera.RotatePosition(0, -speed);
14549		- else
14550	14648	manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14649	+ else
	14650	+ manipCamera.RotatePosition(0, -speed);
14551	14651	/**/
14552	14652	if ((mod & SHIFT) == SHIFT)
14553	14653	{
..	..	@@ -14566,9 +14666,9 @@
14566	14666	MODIFIERS \|= COMMAND;
14567	14667	/**/
14568	14668	if((mod&SHIFT) == SHIFT)
14569		- manipCamera.RotatePosition(0, speed);
14570		- else
14571	14669	manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14670	+ else
	14671	+ manipCamera.RotatePosition(0, speed);
14572	14672	/**/
14573	14673	if ((mod & SHIFT) == SHIFT)
14574	14674	{
..	..	@@ -14661,15 +14761,16 @@
14661	14761	if (editObj)
14662	14762	{
14663	14763	drag = true;
14664		- ClickInfo info = new ClickInfo();
14665		- info.bounds.setBounds(0, 0,
	14764	+ //ClickInfo info = new ClickInfo();
	14765	+ object.clickInfo.bounds.setBounds(0, 0,
14666	14766	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14667		- info.pane = this;
14668		- info.camera = renderCamera;
14669		- info.x = x;
14670		- info.y = y;
14671		- object.GetWindow().copy
14672		- .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);
14673	14774	} else
14674	14775	{
14675	14776	if (x < startX)
..	..	@@ -14818,24 +14919,27 @@
14818	14919	}
14819	14920	}
14820	14921
	14922	+// ClickInfo clickInfo = new ClickInfo();
	14923	+
14821	14924	public void mouseMoved(MouseEvent e)
14822	14925	{
14823	14926	//System.out.println("mouseMoved: " + e);
14824	14927	if (isRenderer)
14825	14928	return;
14826	14929
14827		- ClickInfo ci = new ClickInfo();
14828		- ci.x = e.getX();
14829		- ci.y = e.getY();
14830		- ci.modifiers = e.getModifiersEx();
14831		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14832		- ci.pane = this;
14833		- 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;
14834	14937	if (!isRenderer)
14835	14938	{
14836	14939	//ObjEditor editWindow = object.editWindow;
14837	14940	//Object3D copy = editWindow.copy;
14838		- if (object.doEditClick(ci, 0))
	14941	+ if (object.doEditClick(//clickInfo,
	14942	+ 0))
14839	14943	{
14840	14944	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14841	14945	} else
..	..	@@ -15285,20 +15389,24 @@
15285	15389	OCCLUSION_CULLING ^= true;
15286	15390	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
15287	15391	break;
15288		- case '0': envyoff ^= true; repaint(); break;
	15392	+ //case '0': envyoff ^= true; repaint(); break;
15289	15393	case '1':
15290	15394	case '2':
15291	15395	case '3':
15292	15396	case '4':
15293	15397	case '5':
15294		- newenvy = Character.getNumericValue(key);
15295		- repaint();
15296		- break;
15297	15398	case '6':
15298	15399	case '7':
15299	15400	case '8':
15300	15401	case '9':
15301		- 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	+ }
15302	15410	repaint();
15303	15411	break;
15304	15412	case '!':
..	..	@@ -15861,8 +15969,6 @@
15861	15969
15862	15970	int width = getBounds().width;
15863	15971	int height = getBounds().height;
15864		- ClickInfo info = new ClickInfo();
15865		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15866	15972	//Image img = CreateImage(width, height);
15867	15973	//System.out.println("width = " + width + "; height = " + height + "\n");
15868	15974
..	..	@@ -15939,31 +16045,37 @@
15939	16045	}
15940	16046	if (object != null && !hasMarquee)
15941	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	+
15942	16054	if (isRenderer)
15943	16055	{
15944		- info.flags++;
	16056	+ object.clickInfo.flags++;
15945	16057	double frameAspect = (double) width / (double) height;
15946	16058	if (frameAspect > renderCamera.aspect)
15947	16059	{
15948	16060	int desired = (int) ((double) height * renderCamera.aspect);
15949		- info.bounds.width -= width - desired;
15950		- info.bounds.x += (width - desired) / 2;
	16061	+ object.clickInfo.bounds.width -= width - desired;
	16062	+ object.clickInfo.bounds.x += (width - desired) / 2;
15951	16063	} else
15952	16064	{
15953	16065	int desired = (int) ((double) width / renderCamera.aspect);
15954		- info.bounds.height -= height - desired;
15955		- info.bounds.y += (height - desired) / 2;
	16066	+ object.clickInfo.bounds.height -= height - desired;
	16067	+ object.clickInfo.bounds.y += (height - desired) / 2;
15956	16068	}
15957	16069	}
15958	16070
15959		- info.g = gr;
15960		- info.camera = renderCamera;
	16071	+ object.clickInfo.g = gr;
	16072	+ object.clickInfo.camera = renderCamera;
15961	16073	/*
15962	16074	// Memory intensive (brep.verticescopy)
15963	16075	if (!(object instanceof Composite))
15964	16076	object.draw(info, 0, false); // SLOW :
15965	16077	*/
15966		- if (!isRenderer)
	16078	+ if (!isRenderer) // && drag)
15967	16079	{
15968	16080	Grafreed.Assert(object != null);
15969	16081	Grafreed.Assert(object.selection != null);
..	..	@@ -15971,9 +16083,9 @@
15971	16083	{
15972	16084	int hitSomething = object.selection.get(0).hitSomething;
15973	16085
15974		- info.DX = 0;
15975		- info.DY = 0;
15976		- info.W = 1;
	16086	+ object.clickInfo.DX = 0;
	16087	+ object.clickInfo.DY = 0;
	16088	+ object.clickInfo.W = 1;
15977	16089	if (hitSomething == Object3D.hitCenter)
15978	16090	{
15979	16091	info.DX = X;
..	..	@@ -15985,7 +16097,8 @@
15985	16097	info.DY -= info.bounds.height/2;
15986	16098	}
15987	16099
15988		- object.drawEditHandles(info, 0);
	16100	+ object.drawEditHandles(//info,
	16101	+ 0);
15989	16102
15990	16103	if (drag && (X != 0 \|\| Y != 0))
15991	16104	{
..	..	@@ -16484,6 +16597,8 @@
16484	16597	private /static/ boolean firstime;
16485	16598	private /static/ cVector newView = new cVector();
16486	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"};
16487	16602	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16488	16603	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16489	16604	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16496,29 +16611,67 @@
16496	16611	{
16497	16612	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16498	16613
	16614	+ int usedsuf = 0;
	16615	+
16499	16616	for (int i = 0; i < suffixes.length; i++)
16500	16617	{
16501		- String resourceName = basename + suffixes[i] + "." + suffix;
16502		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16503		- mipmapped,
16504		- FileUtil.getFileSuffix(resourceName));
16505		- if (data == null)
	16618	+ String[] suffixe = suffixes;
	16619	+ String[] fallback = suffixes2;
	16620	+ String[] fallfallback = suffixes3;
	16621	+
	16622	+ for (int c=usedsuf; --c>=0;)
16506	16623	{
16507		- throw new IOException("Unable to load texture " + resourceName);
	16624	+// String[] temp = suffixe;
	16625	+// suffixe = fallback;
	16626	+// fallback = fallfallback;
	16627	+// fallfallback = temp;
16508	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	+
16509	16657	//System.out.println("Target = " + targets[i]);
16510	16658	cubemap.updateImage(data, targets[i]);
16511	16659	}
16512	16660
16513	16661	return cubemap;
16514	16662	}
	16663	+
16515	16664	int bigsphere = -1;
16516	16665
16517	16666	float BGcolor = 0.5f;
16518	16667
16519		- private void DrawSkyBox(GL gl)
	16668	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16669	+
	16670	+ private void DrawSkyBox(GL gl, float ratio)
16520	16671	{
16521		- if (envyoff \|\| cubemap == null)
	16672	+ if (//envyoff \|\|
	16673	+ WIREFRAME \|\|
	16674	+ cubemap == null)
16522	16675	{
16523	16676	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16524	16677	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -16533,7 +16686,17 @@
16533	16686	// Compensates for ExaminerViewer's modification of modelview matrix
16534	16687	gl.glMatrixMode(GL.GL_MODELVIEW);
16535	16688	gl.glLoadIdentity();
	16689	+ gl.glScalef(1,ratio,1);
16536	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	+
16537	16700	//gl.glActiveTexture(GL.GL_TEXTURE1);
16538	16701	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16539	16702
..	..	@@ -16565,6 +16728,7 @@
16565	16728	{
16566	16729	gl.glScalef(1.0f, -1.0f, 1.0f);
16567	16730	}
	16731	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16568	16732	gl.glMultMatrixd(viewrot_1, 0);
16569	16733	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16570	16734	//viewer.updateInverseRotation(gl);
..	..	@@ -16823,7 +16987,7 @@
16823	16987	//new Exception().printStackTrace();
16824	16988	System.out.println("select buffer init");
16825	16989	// Use debug pipeline
16826		- drawable.setGL(new DebugGL(drawable.getGL()));
	16990	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16827	16991
16828	16992	GL gl = drawable.getGL();
16829	16993
..	..	@@ -17369,10 +17533,14 @@
17369	17533	gl.glFlush();
17370	17534
17371	17535	/**/
17372		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
	17536	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
17373	17537
17374		- float[] pixels = occlusionsizebuffer.array();
	17538	+ float[] depths = occlusiondepthbuffer.array();
17375	17539
	17540	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
	17541	+
	17542	+ int[] pixels = selectsizebuffer.array();
	17543	+
17376	17544	double r = 0, g = 0, b = 0;
17377	17545
17378	17546	double count = 0;
..	..	@@ -17383,7 +17551,7 @@
17383	17551
17384	17552	double FACTOR = 1;
17385	17553
17386		- for (int i = 0; i < pixels.length; i++)
	17554	+ for (int i = 0; i < depths.length; i++)
17387	17555	{
17388	17556	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
17389	17557	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -17466,7 +17634,7 @@
17466	17634
17467	17635	double scale = ray.z; // 1; // cos
17468	17636
17469		- float depth = pixels[newindex];
	17637	+ float depth = depths[newindex];
17470	17638
17471	17639	/*
17472	17640	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -17663,11 +17831,14 @@
17663	17831	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17664	17832	static IntBuffer bigAAbuffer;
17665	17833	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17666		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	17834	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17667	17835	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17668	17836	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17669	17837	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17670		- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17838	+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17839	+
	17840	+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17841	+
17671	17842	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17672	17843	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17673	17844	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();