~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -18,7 +18,10 @@
18	18	import javax.imageio.ImageIO;
19	19	import javax.imageio.ImageWriteParam;
20	20	import javax.imageio.ImageWriter;
	21	+import javax.imageio.ImageReadParam;
	22	+import javax.imageio.ImageReader;
21	23	import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
	24	+import javax.imageio.stream.ImageInputStream;
22	25	import javax.imageio.stream.ImageOutputStream;
23	26	import javax.imageio.ImageWriteParam;
24	27
..	..	@@ -30,6 +33,7 @@
30	33	import java.nio.*;
31	34
32	35	import gleem.linalg.Mat4f;
	36	+import javax.imageio.ImageTypeSpecifier;
33	37
34	38	class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
35	39	{
..	..	@@ -93,7 +97,7 @@
93	97	//boolean REDUCETEXTURE = true;
94	98	boolean CACHETEXTURE = true;
95	99	boolean CLEANCACHE = false; // true;
96		- boolean MIPMAP = true; // false; // true;
	100	+ boolean MIPMAP = false; // true; // never works...
97	101	boolean COMPRESSTEXTURE = false;
98	102	boolean KOMPACTTEXTURE = false; // true;
99	103	boolean RESIZETEXTURE = false;
..	..	@@ -183,6 +187,18 @@
183	187	}
184	188
185	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	+ }
186	202
187	203	void SetAsGLRenderer(boolean b)
188	204	{
..	..	@@ -202,7 +218,8 @@
202	218
203	219	SetCamera(cam);
204	220
205		- SetLight(new Camera(new cVector(10, 10, -20)));
	221	+ // Warning: not used.
	222	+ SetLight(new Camera(new cVector(15, 10, -20)));
206	223
207	224	object = o;
208	225
..	..	@@ -1480,6 +1497,8 @@
1480	1497	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1481	1498	}
1482	1499
	1500	+ float[] colorV = new float[4];
	1501	+
1483	1502	void SetColor(Object3D obj, Vertex p0)
1484	1503	{
1485	1504	CameraPane display = this;
..	..	@@ -1547,8 +1566,6 @@
1547	1566	{
1548	1567	return;
1549	1568	}
1550		-
1551		- float[] colorV = new float[3];
1552	1569
1553	1570	if (false) // marked)
1554	1571	{
..	..	@@ -8358,14 +8375,26 @@
8358	8375	{
8359	8376	TextureData texturedata = null;
8360	8377
8361		- if (texdata != null)
	8378	+ if (texdata != null && textureon)
8362	8379	{
8363		- BufferedImage bim = //new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8380	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
8364	8381
8365		- CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8382	+ try
	8383	+ {
	8384	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8385	+ }
	8386	+ catch (Exception e)
	8387	+ {
	8388	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8389	+ }
8366	8390
8367	8391	texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
8368	8392	bimtextures.put(texdata, texturecache);
	8393	+
	8394	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8395	+
	8396	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8397	+ //bim2 = bim;
8369	8398	}
8370	8399	else
8371	8400	if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
..	..	@@ -8560,29 +8589,32 @@
8560	8589	{
8561	8590	if (tex.pigmentdata == null)
8562	8591	{
8563		- String texname = Object3D.GetPigment(tex);
	8592	+ //String texname = Object3D.GetPigment(tex);
8564	8593
8565	8594	CacheTexture texturecache = texturepigment.get(tex);
8566	8595
8567	8596	if (texturecache != null)
8568	8597	{
8569		- tex.pigmentdata = ((ByteBuffer)texturecache.texturedata.getBuffer()).array();
8570	8598	tex.pw = texturecache.texturedata.getWidth();
8571	8599	tex.ph = texturecache.texturedata.getHeight();
	8600	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8601	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8602	+ ;
	8603	+ //, tex.pw, tex.ph), 0.5f);
8572	8604	}
8573	8605	}
8574	8606
8575	8607	if (tex.bumpdata == null)
8576	8608	{
8577		- String texname = Object3D.GetBump(tex);
	8609	+ //String texname = Object3D.GetBump(tex);
8578	8610
8579	8611	CacheTexture texturecache = texturebump.get(tex);
8580	8612
8581	8613	if (texturecache != null)
8582	8614	{
8583		- tex.bumpdata = ((ByteBuffer)texturecache.texturedata.getBuffer()).array();
8584	8615	tex.bw = texturecache.texturedata.getWidth();
8585	8616	tex.bh = texturecache.texturedata.getHeight();
	8617	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
8586	8618	}
8587	8619	}
8588	8620	}
..	..	@@ -8654,6 +8686,72 @@
8654	8686	return true; // Warning: not used.
8655	8687	}
8656	8688
	8689	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8690	+ {
	8691	+ try
	8692	+ {
	8693	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8694	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8695	+ ImageWriter writer = writers.next();
	8696	+
	8697	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8698	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8699	+ param.setCompressionQuality(quality);
	8700	+
	8701	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8702	+ writer.setOutput(ios);
	8703	+ writer.write(null, new IIOImage(image, null, null), param);
	8704	+
	8705	+ byte[] data = baos.toByteArray();
	8706	+ writer.dispose();
	8707	+ return data;
	8708	+ }
	8709	+ catch (Exception e)
	8710	+ {
	8711	+ e.printStackTrace();
	8712	+ return null;
	8713	+ }
	8714	+ }
	8715	+
	8716	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8717	+ {
	8718	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8719	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8720	+ ImageReader reader = writers.next();
	8721	+
	8722	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8723	+
	8724	+ ImageReadParam param = reader.getDefaultReadParam();
	8725	+ param.setDestination(bim);
	8726	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8727	+
	8728	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8729	+ reader.setInput(ios);
	8730	+ BufferedImage bim2 = reader.read(0, param);
	8731	+ reader.dispose();
	8732	+
	8733	+// WritableRaster raster = bim2.getRaster();
	8734	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8735	+// byte[] bytes = data.getData();
	8736	+//
	8737	+// int[] pixels = new int[bytes.length/3];
	8738	+// for (int i=pixels.length; --i>=0;)
	8739	+// {
	8740	+// int i3 = i*3;
	8741	+// pixels[i] = 0xFF;
	8742	+// pixels[i] <<= 8;
	8743	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8744	+// pixels[i] <<= 8;
	8745	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8746	+// pixels[i] <<= 8;
	8747	+// pixels[i] \|= bytes[i3] & 0xFF;
	8748	+// }
	8749	+//
	8750	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8751	+
	8752	+ return bim;
	8753	+ }
	8754	+
8657	8755	ShadowBuffer shadowPBuf;
8658	8756	AntialiasBuffer antialiasPBuf;
8659	8757	int MAXSTACK;
..	..	@@ -8846,7 +8944,7 @@
8846	8944
8847	8945	if (cubemap == null)
8848	8946	{
8849		- LoadEnvy(5);
	8947	+ //LoadEnvy(1);
8850	8948	}
8851	8949
8852	8950	//cubemap.enable();
..	..	@@ -9133,37 +9231,58 @@
9133	9231	cubemap = null;
9134	9232	return;
9135	9233	case 1:
9136		- name = "cubemaps/box_";
9137		- ext = "png";
	9234	+ name = "cubemaps/rgb/";
	9235	+ ext = "jpg";
9138	9236	reverseUP = false;
9139	9237	break;
9140	9238	case 2:
9141		- name = "cubemaps/uffizi_";
9142		- ext = "png";
9143		- break; // reverseUP = true; break;
	9239	+ name = "cubemaps/uffizi/";
	9240	+ ext = "jpg";
	9241	+ reverseUP = false;
	9242	+ break;
9144	9243	case 3:
9145		- name = "cubemaps/CloudyHills_";
9146		- ext = "tga";
	9244	+ name = "cubemaps/CloudyHills/";
	9245	+ ext = "jpg";
9147	9246	reverseUP = false;
9148	9247	break;
9149	9248	case 4:
9150		- name = "cubemaps/cornell_";
	9249	+ name = "cubemaps/cornell/";
9151	9250	ext = "png";
9152	9251	reverseUP = false;
9153	9252	break;
	9253	+ case 5:
	9254	+ name = "cubemaps/skycube/";
	9255	+ ext = "jpg";
	9256	+ reverseUP = false;
	9257	+ break;
	9258	+ case 6:
	9259	+ name = "cubemaps/SaintLazarusChurch3/";
	9260	+ ext = "jpg";
	9261	+ reverseUP = false;
	9262	+ break;
	9263	+ case 7:
	9264	+ name = "cubemaps/Sodermalmsallen/";
	9265	+ ext = "jpg";
	9266	+ reverseUP = false;
	9267	+ break;
	9268	+ case 8:
	9269	+ name = "cubemaps/Sodermalmsallen2/";
	9270	+ ext = "jpg";
	9271	+ reverseUP = false;
	9272	+ break;
	9273	+ case 9:
	9274	+ name = "cubemaps/UnionSquare/";
	9275	+ ext = "jpg";
	9276	+ reverseUP = false;
	9277	+ break;
9154	9278	default:
9155		- name = "cubemaps/rgb_";
9156		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9279	+ name = "cubemaps/box/";
	9280	+ ext = "png"; /mipmap = true;/
	9281	+ reverseUP = false;
9157	9282	break;
9158	9283	}
9159		-
9160		- try
9161		- {
9162		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9163		- } catch (IOException e)
9164		- {
9165		- throw new RuntimeException(e);
9166		- }
	9284	+
	9285	+ LoadSkybox(name, ext, mipmap);
9167	9286	}
9168	9287
9169	9288	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -9195,8 +9314,13 @@
9195	9314	static double[] model = new double[16];
9196	9315	double[] camera2light = new double[16];
9197	9316	double[] light2camera = new double[16];
9198		- int newenvy = -1;
	9317	+
	9318	+ //int newenvy = -1;
9199	9319	boolean envyoff = true; // false;
	9320	+ String skyboxname = "";
	9321	+ String skyboxext;
	9322	+ String loadedskyboxname = "";
	9323	+
9200	9324	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
9201	9325	//float[] light0 = { 0,0,0 };
9202	9326	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9614,7 +9738,7 @@
9614	9738
9615	9739	if (renderCamera != lightCamera)
9616	9740	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9617		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9741	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9618	9742
9619	9743	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9620	9744
..	..	@@ -9630,7 +9754,7 @@
9630	9754
9631	9755	if (renderCamera != lightCamera)
9632	9756	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9633		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9757	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9634	9758
9635	9759	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9636	9760
..	..	@@ -9676,10 +9800,12 @@
9676	9800	rati = 1 / rati;
9677	9801	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9678	9802	}
9679		- assert (newenvy == -1);
	9803	+
	9804	+ //assert (newenvy == -1);
	9805	+
9680	9806	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9681	9807	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9682		- DrawSkyBox(gl);
	9808	+ DrawSkyBox(gl, (float)rati);
9683	9809	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9684	9810	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9685	9811	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -10831,7 +10957,7 @@
10831	10957	// if (parentcam != renderCamera) // not a light
10832	10958	if (cam != lightCamera)
10833	10959	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10834		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	10960	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10835	10961
10836	10962	for (int j = 0; j < 4; j++)
10837	10963	{
..	..	@@ -10846,7 +10972,7 @@
10846	10972	// if (parentcam != renderCamera) // not a light
10847	10973	if (cam != lightCamera)
10848	10974	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10849		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	10975	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10850	10976
10851	10977	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10852	10978
..	..	@@ -10932,13 +11058,19 @@
10932	11058	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10933	11059	}
10934	11060
10935		- if (newenvy > -1)
	11061	+// if (newenvy > -1)
	11062	+// {
	11063	+// LoadEnvy(newenvy);
	11064	+// }
	11065	+//
	11066	+// newenvy = -1;
	11067	+
	11068	+ if (!skyboxname.equals(this.loadedskyboxname))
10936	11069	{
10937		- LoadEnvy(newenvy);
	11070	+ LoadSkybox(skyboxname + "/", skyboxext, false);
	11071	+ loadedskyboxname = skyboxname;
10938	11072	}
10939		-
10940		- newenvy = -1;
10941		-
	11073	+
10942	11074	ratio = ((double) getWidth()) / getHeight();
10943	11075	//System.out.println("ratio = " + ratio);
10944	11076
..	..	@@ -10954,7 +11086,7 @@
10954	11086
10955	11087	if (!IsFrozen() && !ambientOcclusion)
10956	11088	{
10957		- DrawSkyBox(gl);
	11089	+ DrawSkyBox(gl, (float)ratio);
10958	11090	}
10959	11091
10960	11092	//if (selection_view == -1)
..	..	@@ -11399,7 +11531,7 @@
11399	11531	}
11400	11532	}
11401	11533
11402		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11534	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11403	11535	{
11404	11536	//gl.glDepthFunc(GL.GL_LEQUAL);
11405	11537	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11407,24 +11539,21 @@
11407	11539
11408	11540	boolean texon = textureon;
11409	11541
11410		- if (RENDERPROGRAM > 0)
11411		- {
11412		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11413		- textureon = false;
11414		- }
	11542	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11543	+ textureon = false;
	11544	+
11415	11545	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11416	11546	//System.out.println("ALLO");
11417	11547	gl.glColorMask(false, false, false, false);
11418	11548	DrawObject(gl);
11419		- if (RENDERPROGRAM > 0)
11420		- {
11421		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11422		- textureon = texon;
11423		- }
	11549	+
	11550	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11551	+ textureon = texon;
	11552	+
11424	11553	gl.glColorMask(true, true, true, true);
11425	11554
11426	11555	gl.glDepthFunc(GL.GL_EQUAL);
11427		- //gl.glDepthMask(false);
	11556	+ gl.glDepthMask(false);
11428	11557	}
11429	11558
11430	11559	if (false) // DrawMode() == SHADOW)
..	..	@@ -12317,8 +12446,76 @@
12317	12446
12318	12447	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12319	12448
	12449	+ String program0 =
	12450	+ // Min shader
	12451	+ "!!ARBfp1.0\n" +
	12452	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12453	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12454	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12455	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12456	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12457	+ "PARAM light2cam0 = program.env[10];" +
	12458	+ "PARAM light2cam1 = program.env[11];" +
	12459	+ "PARAM light2cam2 = program.env[12];" +
	12460	+ "TEMP temp;" +
	12461	+ "TEMP light;" +
	12462	+ "TEMP ndotl;" +
	12463	+ "TEMP normal;" +
	12464	+ "TEMP depth;" +
	12465	+ "TEMP eye;" +
	12466	+ "TEMP pos;" +
	12467	+
	12468	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12469	+ Normalize("normal") +
	12470	+ "MOV light, state.light[0].position;" +
	12471	+ "DP3 ndotl.x, light, normal;" +
	12472	+
	12473	+ // shadow
	12474	+ "MOV pos, fragment.texcoord[1];" +
	12475	+ "MOV temp, pos;" +
	12476	+ ShadowTextureFetch("depth", "temp", "1") +
	12477	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12478	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12479	+
	12480	+ // No shadow when out of frustum
	12481	+ //"SGE temp.y, depth.z, zero123.y;" +
	12482	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12483	+
	12484	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12485	+
	12486	+ // Backlit
	12487	+ "MOV pos.w, zero123.y;" +
	12488	+ "DP4 eye.x, pos, light2cam0;" +
	12489	+ "DP4 eye.y, pos, light2cam1;" +
	12490	+ "DP4 eye.z, pos, light2cam2;" +
	12491	+ Normalize("eye") +
	12492	+
	12493	+ "DP3 ndotl.y, -eye, normal;" +
	12494	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12495	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12496	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12497	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12498	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12499	+
	12500	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12501	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12502	+
	12503	+ // Pigment
	12504	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12505	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12506	+ "MUL temp, temp, ndotl.x;" +
	12507	+
	12508	+ "MUL temp, temp, zero123.z;" +
	12509	+
	12510	+ //"MUL temp, temp, ndotl.y;" +
	12511	+
	12512	+ "MOV temp.w, zero123.y;" + // reset alpha
	12513	+ "MOV result.color, temp;" +
	12514	+ "END";
	12515	+
12320	12516	String program =
12321	12517	"!!ARBfp1.0\n" +
	12518	+
12322	12519	//"OPTION ARB_fragment_program_shadow;" +
12323	12520	"PARAM light2cam0 = program.env[10];" +
12324	12521	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12433,8 +12630,7 @@
12433	12630	"TEMP shininess;" +
12434	12631	"\n" +
12435	12632	"MOV texSamp, one;" +
12436		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12437		-
	12633	+
12438	12634	"MOV mapgrid.x, one2048th.x;" +
12439	12635	"MOV temp, fragment.texcoord[1];" +
12440	12636	/*
..	..	@@ -12455,20 +12651,20 @@
12455	12651	"MUL temp, floor, mapgrid.x;" +
12456	12652	//"TEX depth0, temp, texture[1], 2D;" +
12457	12653	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12458		- TextureFetch("depth0", "temp", "1") +
	12654	+ ShadowTextureFetch("depth0", "temp", "1") +
12459	12655	"") +
12460	12656	"ADD temp.x, temp.x, mapgrid.x;" +
12461	12657	//"TEX depth1, temp, texture[1], 2D;" +
12462	12658	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12463		- TextureFetch("depth1", "temp", "1") +
	12659	+ ShadowTextureFetch("depth1", "temp", "1") +
12464	12660	"") +
12465	12661	"ADD temp.y, temp.y, mapgrid.x;" +
12466	12662	//"TEX depth2, temp, texture[1], 2D;" +
12467		- TextureFetch("depth2", "temp", "1") +
	12663	+ ShadowTextureFetch("depth2", "temp", "1") +
12468	12664	"SUB temp.x, temp.x, mapgrid.x;" +
12469	12665	//"TEX depth3, temp, texture[1], 2D;" +
12470	12666	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12471		- TextureFetch("depth3", "temp", "1") +
	12667	+ ShadowTextureFetch("depth3", "temp", "1") +
12472	12668	"") +
12473	12669	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12474	12670	//"MOV params, material;" +
..	..	@@ -12839,10 +13035,10 @@
12839	13035	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12840	13036	"") +
12841	13037
12842		- // display shadow only (bump == 0)
	13038	+ // display shadow only (fakedepth == 0)
12843	13039	"SUB temp.x, half.x, shadow.x;" +
12844	13040	"MOV temp.y, -params5.z;" + // params6.x;" +
12845		- "SLT temp.z, temp.y, -one2048th.x;" +
	13041	+ "SLT temp.z, temp.y, -c256i.x;" +
12846	13042	"SUB temp.y, one.x, temp.z;" +
12847	13043	"MUL temp.x, temp.x, temp.y;" +
12848	13044	"KIL temp.x;" +
..	..	@@ -13266,25 +13462,26 @@
13266	13462	return out;
13267	13463	}
13268	13464
13269		- String TextureFetch(String dest, String src, String unit)
	13465	+ // Also does frustum culling
	13466	+ String ShadowTextureFetch(String dest, String src, String unit)
13270	13467	{
13271	13468	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13272	13469	"SGE " + src + ".w, " + src + ".x, eps.x;" +
13273	13470	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13471	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13472	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
13274	13473	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13275		- "SLT " + src + ".z, " + src + ".x, one.x;" +
13276		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13277		- "SLT " + src + ".z, " + src + ".y, one.x;" +
13278		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13474	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13475	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
13279	13476	//"SWZ buffer, temp, w,w,w,w;";
13280		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13477	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13281	13478	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
13282	13479	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
13283	13480	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13284		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13481	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13285	13482
13286		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13287		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13483	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13484	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13288	13485	}
13289	13486
13290	13487	String Shadow(String depth, String shadow)
..	..	@@ -13331,7 +13528,7 @@
13331	13528	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13332	13529	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13333	13530
13334		- // No shadow when out of frustrum
	13531	+ // No shadow when out of frustum
13335	13532	"SGE temp.x, " + depth + ".z, one.z;" +
13336	13533	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13337	13534	"";
..	..	@@ -14129,14 +14326,15 @@
14129	14326	drag = false;
14130	14327	//System.out.println("Mouse DOWN");
14131	14328	editObj = false;
14132		- ClickInfo info = new ClickInfo();
14133		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14134		- info.pane = this;
14135		- info.camera = renderCamera;
14136		- info.x = x;
14137		- info.y = y;
14138		- info.modifiers = modifiersex;
14139		- editObj = object.doEditClick(info, 0);
	14329	+ //ClickInfo info = new ClickInfo();
	14330	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14331	+ object.clickInfo.pane = this;
	14332	+ object.clickInfo.camera = renderCamera;
	14333	+ object.clickInfo.x = x;
	14334	+ object.clickInfo.y = y;
	14335	+ object.clickInfo.modifiers = modifiersex;
	14336	+ editObj = object.doEditClick(//info,
	14337	+ 0);
14140	14338	if (!editObj)
14141	14339	{
14142	14340	hasMarquee = true;
..	..	@@ -14536,15 +14734,16 @@
14536	14734	if (editObj)
14537	14735	{
14538	14736	drag = true;
14539		- ClickInfo info = new ClickInfo();
14540		- info.bounds.setBounds(0, 0,
	14737	+ //ClickInfo info = new ClickInfo();
	14738	+ object.clickInfo.bounds.setBounds(0, 0,
14541	14739	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14542		- info.pane = this;
14543		- info.camera = renderCamera;
14544		- info.x = x;
14545		- info.y = y;
14546		- object.GetWindow().copy
14547		- .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
	14740	+ object.clickInfo.pane = this;
	14741	+ object.clickInfo.camera = renderCamera;
	14742	+ object.clickInfo.x = x;
	14743	+ object.clickInfo.y = y;
	14744	+ object //.GetWindow().copy
	14745	+ .doEditDrag(//info,
	14746	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14548	14747	} else
14549	14748	{
14550	14749	if (x < startX)
..	..	@@ -14693,24 +14892,27 @@
14693	14892	}
14694	14893	}
14695	14894
	14895	+// ClickInfo clickInfo = new ClickInfo();
	14896	+
14696	14897	public void mouseMoved(MouseEvent e)
14697	14898	{
14698	14899	//System.out.println("mouseMoved: " + e);
14699	14900	if (isRenderer)
14700	14901	return;
14701	14902
14702		- ClickInfo ci = new ClickInfo();
14703		- ci.x = e.getX();
14704		- ci.y = e.getY();
14705		- ci.modifiers = e.getModifiersEx();
14706		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14707		- ci.pane = this;
14708		- ci.camera = renderCamera;
	14903	+ // Mouse cursor feedback
	14904	+ object.clickInfo.x = e.getX();
	14905	+ object.clickInfo.y = e.getY();
	14906	+ object.clickInfo.modifiers = e.getModifiersEx();
	14907	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14908	+ object.clickInfo.pane = this;
	14909	+ object.clickInfo.camera = renderCamera;
14709	14910	if (!isRenderer)
14710	14911	{
14711	14912	//ObjEditor editWindow = object.editWindow;
14712	14913	//Object3D copy = editWindow.copy;
14713		- if (object.doEditClick(ci, 0))
	14914	+ if (object.doEditClick(//clickInfo,
	14915	+ 0))
14714	14916	{
14715	14917	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14716	14918	} else
..	..	@@ -15166,14 +15368,18 @@
15166	15368	case '3':
15167	15369	case '4':
15168	15370	case '5':
15169		- newenvy = Character.getNumericValue(key);
15170		- repaint();
15171		- break;
15172	15371	case '6':
15173	15372	case '7':
15174	15373	case '8':
15175	15374	case '9':
15176		- BGcolor = (key - '6')/3.f;
	15375	+ if (envyoff)
	15376	+ {
	15377	+ BGcolor = (key - '1')/8.f;
	15378	+ }
	15379	+ else
	15380	+ {
	15381	+ //newenvy = Character.getNumericValue(key);
	15382	+ }
15177	15383	repaint();
15178	15384	break;
15179	15385	case '!':
..	..	@@ -15736,8 +15942,6 @@
15736	15942
15737	15943	int width = getBounds().width;
15738	15944	int height = getBounds().height;
15739		- ClickInfo info = new ClickInfo();
15740		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15741	15945	//Image img = CreateImage(width, height);
15742	15946	//System.out.println("width = " + width + "; height = " + height + "\n");
15743	15947
..	..	@@ -15814,31 +16018,37 @@
15814	16018	}
15815	16019	if (object != null && !hasMarquee)
15816	16020	{
	16021	+ if (object.clickInfo == null)
	16022	+ object.clickInfo = new ClickInfo();
	16023	+ ClickInfo info = object.clickInfo;
	16024	+ //ClickInfo info = new ClickInfo();
	16025	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16026	+
15817	16027	if (isRenderer)
15818	16028	{
15819		- info.flags++;
	16029	+ object.clickInfo.flags++;
15820	16030	double frameAspect = (double) width / (double) height;
15821	16031	if (frameAspect > renderCamera.aspect)
15822	16032	{
15823	16033	int desired = (int) ((double) height * renderCamera.aspect);
15824		- info.bounds.width -= width - desired;
15825		- info.bounds.x += (width - desired) / 2;
	16034	+ object.clickInfo.bounds.width -= width - desired;
	16035	+ object.clickInfo.bounds.x += (width - desired) / 2;
15826	16036	} else
15827	16037	{
15828	16038	int desired = (int) ((double) width / renderCamera.aspect);
15829		- info.bounds.height -= height - desired;
15830		- info.bounds.y += (height - desired) / 2;
	16039	+ object.clickInfo.bounds.height -= height - desired;
	16040	+ object.clickInfo.bounds.y += (height - desired) / 2;
15831	16041	}
15832	16042	}
15833	16043
15834		- info.g = gr;
15835		- info.camera = renderCamera;
	16044	+ object.clickInfo.g = gr;
	16045	+ object.clickInfo.camera = renderCamera;
15836	16046	/*
15837	16047	// Memory intensive (brep.verticescopy)
15838	16048	if (!(object instanceof Composite))
15839	16049	object.draw(info, 0, false); // SLOW :
15840	16050	*/
15841		- if (!isRenderer)
	16051	+ if (!isRenderer) // && drag)
15842	16052	{
15843	16053	Grafreed.Assert(object != null);
15844	16054	Grafreed.Assert(object.selection != null);
..	..	@@ -15846,9 +16056,9 @@
15846	16056	{
15847	16057	int hitSomething = object.selection.get(0).hitSomething;
15848	16058
15849		- info.DX = 0;
15850		- info.DY = 0;
15851		- info.W = 1;
	16059	+ object.clickInfo.DX = 0;
	16060	+ object.clickInfo.DY = 0;
	16061	+ object.clickInfo.W = 1;
15852	16062	if (hitSomething == Object3D.hitCenter)
15853	16063	{
15854	16064	info.DX = X;
..	..	@@ -15860,7 +16070,8 @@
15860	16070	info.DY -= info.bounds.height/2;
15861	16071	}
15862	16072
15863		- object.drawEditHandles(info, 0);
	16073	+ object.drawEditHandles(//info,
	16074	+ 0);
15864	16075
15865	16076	if (drag && (X != 0 \|\| Y != 0))
15866	16077	{
..	..	@@ -15873,7 +16084,7 @@
15873	16084	gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15874	16085	break;
15875	16086	case Object3D.hitScale: gr.setColor(Color.cyan);
15876		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16087	+ gr.drawLine(X, Y, 0, 0);
15877	16088	break;
15878	16089	}
15879	16090
..	..	@@ -16391,7 +16602,9 @@
16391	16602
16392	16603	float BGcolor = 0.5f;
16393	16604
16394		- private void DrawSkyBox(GL gl)
	16605	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16606	+
	16607	+ private void DrawSkyBox(GL gl, float ratio)
16395	16608	{
16396	16609	if (envyoff \|\| cubemap == null)
16397	16610	{
..	..	@@ -16408,7 +16621,17 @@
16408	16621	// Compensates for ExaminerViewer's modification of modelview matrix
16409	16622	gl.glMatrixMode(GL.GL_MODELVIEW);
16410	16623	gl.glLoadIdentity();
	16624	+ gl.glScalef(1,ratio,1);
16411	16625
	16626	+ colorV[0] = 2;
	16627	+ colorV[1] = 2;
	16628	+ colorV[2] = 2;
	16629	+ colorV[3] = 1;
	16630	+ gl.glDisable(gl.GL_COLOR_MATERIAL);
	16631	+ gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16632	+
	16633	+ gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16634	+
16412	16635	//gl.glActiveTexture(GL.GL_TEXTURE1);
16413	16636	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16414	16637
..	..	@@ -16421,7 +16644,7 @@
16421	16644	// GL_NORMAL_MAP texgen mode. Temporarily enabling lighting
16422	16645	// causes the normals to be sent down. Thanks to Ken Dyke.
16423	16646	//gl.glEnable(GL.GL_LIGHTING);
16424		- gl.glDisable(GL.GL_LIGHTING);
	16647	+ gl.glEnable(GL.GL_LIGHTING);
16425	16648
16426	16649	gl.glTexGeni(GL.GL_S, GL.GL_TEXTURE_GEN_MODE, GL.GL_NORMAL_MAP);
16427	16650	gl.glTexGeni(GL.GL_T, GL.GL_TEXTURE_GEN_MODE, GL.GL_NORMAL_MAP);
..	..	@@ -16698,7 +16921,7 @@
16698	16921	//new Exception().printStackTrace();
16699	16922	System.out.println("select buffer init");
16700	16923	// Use debug pipeline
16701		- drawable.setGL(new DebugGL(drawable.getGL()));
	16924	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16702	16925
16703	16926	GL gl = drawable.getGL();
16704	16927