~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	{
..	..	@@ -8341,7 +8358,7 @@
8341	8358	// else
8342	8359	// if (!texname.startsWith("/"))
8343	8360	// texname = "/Users/nbriere/Textures/" + texname;
8344		- if (!FileExists(texname))
	8361	+ if (!FileExists(texname) && !texname.startsWith("@"))
8345	8362	{
8346	8363	texname = fallbackTextureName;
8347	8364	}
..	..	@@ -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(""))
..	..	@@ -8408,6 +8437,15 @@
8408	8437	// texturecache = textures.get(texname); // suspicious
8409	8438	if (texturecache == null)
8410	8439	texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8440	+ else
	8441	+ new Exception().printStackTrace();
	8442	+ } else
	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);
8411	8449	else
8412	8450	new Exception().printStackTrace();
8413	8451	} else
..	..	@@ -8471,6 +8509,7 @@
8471	8509	texturecache = new CacheTexture(texturedata,resolution);
8472	8510	//texture = GetTexture(tex, bump);
8473	8511	}
	8512	+ }
8474	8513	}
8475	8514	//}
8476	8515	}
..	..	@@ -8560,29 +8599,32 @@
8560	8599	{
8561	8600	if (tex.pigmentdata == null)
8562	8601	{
8563		- String texname = Object3D.GetPigment(tex);
	8602	+ //String texname = Object3D.GetPigment(tex);
8564	8603
8565	8604	CacheTexture texturecache = texturepigment.get(tex);
8566	8605
8567	8606	if (texturecache != null)
8568	8607	{
8569		- tex.pigmentdata = ((ByteBuffer)texturecache.texturedata.getBuffer()).array();
8570	8608	tex.pw = texturecache.texturedata.getWidth();
8571	8609	tex.ph = texturecache.texturedata.getHeight();
	8610	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8611	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8612	+ ;
	8613	+ //, tex.pw, tex.ph), 0.5f);
8572	8614	}
8573	8615	}
8574	8616
8575	8617	if (tex.bumpdata == null)
8576	8618	{
8577		- String texname = Object3D.GetBump(tex);
	8619	+ //String texname = Object3D.GetBump(tex);
8578	8620
8579	8621	CacheTexture texturecache = texturebump.get(tex);
8580	8622
8581	8623	if (texturecache != null)
8582	8624	{
8583		- tex.bumpdata = ((ByteBuffer)texturecache.texturedata.getBuffer()).array();
8584	8625	tex.bw = texturecache.texturedata.getWidth();
8585	8626	tex.bh = texturecache.texturedata.getHeight();
	8627	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
8586	8628	}
8587	8629	}
8588	8630	}
..	..	@@ -8654,6 +8696,72 @@
8654	8696	return true; // Warning: not used.
8655	8697	}
8656	8698
	8699	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8700	+ {
	8701	+ try
	8702	+ {
	8703	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8704	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8705	+ ImageWriter writer = writers.next();
	8706	+
	8707	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8708	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8709	+ param.setCompressionQuality(quality);
	8710	+
	8711	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8712	+ writer.setOutput(ios);
	8713	+ writer.write(null, new IIOImage(image, null, null), param);
	8714	+
	8715	+ byte[] data = baos.toByteArray();
	8716	+ writer.dispose();
	8717	+ return data;
	8718	+ }
	8719	+ catch (Exception e)
	8720	+ {
	8721	+ e.printStackTrace();
	8722	+ return null;
	8723	+ }
	8724	+ }
	8725	+
	8726	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8727	+ {
	8728	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8729	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8730	+ ImageReader reader = writers.next();
	8731	+
	8732	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8733	+
	8734	+ ImageReadParam param = reader.getDefaultReadParam();
	8735	+ param.setDestination(bim);
	8736	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8737	+
	8738	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8739	+ reader.setInput(ios);
	8740	+ BufferedImage bim2 = reader.read(0, param);
	8741	+ reader.dispose();
	8742	+
	8743	+// WritableRaster raster = bim2.getRaster();
	8744	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8745	+// byte[] bytes = data.getData();
	8746	+//
	8747	+// int[] pixels = new int[bytes.length/3];
	8748	+// for (int i=pixels.length; --i>=0;)
	8749	+// {
	8750	+// int i3 = i*3;
	8751	+// pixels[i] = 0xFF;
	8752	+// pixels[i] <<= 8;
	8753	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8754	+// pixels[i] <<= 8;
	8755	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8756	+// pixels[i] <<= 8;
	8757	+// pixels[i] \|= bytes[i3] & 0xFF;
	8758	+// }
	8759	+//
	8760	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8761	+
	8762	+ return bim;
	8763	+ }
	8764	+
8657	8765	ShadowBuffer shadowPBuf;
8658	8766	AntialiasBuffer antialiasPBuf;
8659	8767	int MAXSTACK;
..	..	@@ -8670,10 +8778,12 @@
8670	8778
8671	8779	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8672	8780	MAXSTACK = temp[0];
8673		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8781	+ if (Globals.DEBUG)
	8782	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8674	8783	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8675	8784	MAXSTACK = temp[0];
8676		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8785	+ if (Globals.DEBUG)
	8786	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8677	8787
8678	8788	// Use debug pipeline
8679	8789	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8681,7 +8791,8 @@
8681	8791	gl = drawable.getGL(); //
8682	8792
8683	8793	GL gl3 = getGL();
8684		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8794	+ if (Globals.DEBUG)
	8795	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8685	8796
8686	8797
8687	8798	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8846,7 +8957,7 @@
8846	8957
8847	8958	if (cubemap == null)
8848	8959	{
8849		- LoadEnvy(5);
	8960	+ //LoadEnvy(1);
8850	8961	}
8851	8962
8852	8963	//cubemap.enable();
..	..	@@ -9133,37 +9244,58 @@
9133	9244	cubemap = null;
9134	9245	return;
9135	9246	case 1:
9136		- name = "cubemaps/box_";
9137		- ext = "png";
	9247	+ name = "cubemaps/rgb/";
	9248	+ ext = "jpg";
9138	9249	reverseUP = false;
9139	9250	break;
9140	9251	case 2:
9141		- name = "cubemaps/uffizi_";
9142		- ext = "png";
9143		- break; // reverseUP = true; break;
	9252	+ name = "cubemaps/uffizi/";
	9253	+ ext = "jpg";
	9254	+ reverseUP = false;
	9255	+ break;
9144	9256	case 3:
9145		- name = "cubemaps/CloudyHills_";
9146		- ext = "tga";
	9257	+ name = "cubemaps/CloudyHills/";
	9258	+ ext = "jpg";
9147	9259	reverseUP = false;
9148	9260	break;
9149	9261	case 4:
9150		- name = "cubemaps/cornell_";
	9262	+ name = "cubemaps/cornell/";
9151	9263	ext = "png";
9152	9264	reverseUP = false;
9153	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;
9154	9291	default:
9155		- name = "cubemaps/rgb_";
9156		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9292	+ name = "cubemaps/box/";
	9293	+ ext = "png"; /mipmap = true;/
	9294	+ reverseUP = false;
9157	9295	break;
9158	9296	}
9159		-
9160		- try
9161		- {
9162		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9163		- } catch (IOException e)
9164		- {
9165		- throw new RuntimeException(e);
9166		- }
	9297	+
	9298	+ LoadSkybox(name, ext, mipmap);
9167	9299	}
9168	9300
9169	9301	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -9195,8 +9327,12 @@
9195	9327	static double[] model = new double[16];
9196	9328	double[] camera2light = new double[16];
9197	9329	double[] light2camera = new double[16];
9198		- int newenvy = -1;
9199		- boolean envyoff = true; // false;
	9330	+
	9331	+ //int newenvy = -1;
	9332	+ //boolean envyoff = false;
	9333	+
	9334	+ String loadedskyboxname;
	9335	+
9200	9336	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
9201	9337	//float[] light0 = { 0,0,0 };
9202	9338	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9614,7 +9750,7 @@
9614	9750
9615	9751	if (renderCamera != lightCamera)
9616	9752	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9617		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9753	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9618	9754
9619	9755	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9620	9756
..	..	@@ -9630,7 +9766,7 @@
9630	9766
9631	9767	if (renderCamera != lightCamera)
9632	9768	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9633		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9769	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9634	9770
9635	9771	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9636	9772
..	..	@@ -9676,10 +9812,12 @@
9676	9812	rati = 1 / rati;
9677	9813	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9678	9814	}
9679		- assert (newenvy == -1);
	9815	+
	9816	+ //assert (newenvy == -1);
	9817	+
9680	9818	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9681	9819	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9682		- DrawSkyBox(gl);
	9820	+ DrawSkyBox(gl, (float)rati);
9683	9821	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9684	9822	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9685	9823	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -10716,7 +10854,7 @@
10716	10854
10717	10855	if (wait)
10718	10856	{
10719		- Sleep(500);
	10857	+ Sleep(200); // blocks everything
10720	10858
10721	10859	wait = false;
10722	10860	}
..	..	@@ -10831,7 +10969,7 @@
10831	10969	// if (parentcam != renderCamera) // not a light
10832	10970	if (cam != lightCamera)
10833	10971	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10834		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	10972	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10835	10973
10836	10974	for (int j = 0; j < 4; j++)
10837	10975	{
..	..	@@ -10846,7 +10984,7 @@
10846	10984	// if (parentcam != renderCamera) // not a light
10847	10985	if (cam != lightCamera)
10848	10986	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10849		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	10987	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10850	10988
10851	10989	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10852	10990
..	..	@@ -10932,13 +11070,27 @@
10932	11070	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10933	11071	}
10934	11072
10935		- if (newenvy > -1)
	11073	+// if (newenvy > -1)
	11074	+// {
	11075	+// LoadEnvy(newenvy);
	11076	+// }
	11077	+//
	11078	+// newenvy = -1;
	11079	+
	11080	+ if (object.skyboxname != null)
10936	11081	{
10937		- LoadEnvy(newenvy);
	11082	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11083	+ {
	11084	+ LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11085	+ loadedskyboxname = object.skyboxname;
	11086	+ }
10938	11087	}
10939		-
10940		- newenvy = -1;
10941		-
	11088	+ else
	11089	+ {
	11090	+ cubemap = null;
	11091	+ loadedskyboxname = null;
	11092	+ }
	11093	+
10942	11094	ratio = ((double) getWidth()) / getHeight();
10943	11095	//System.out.println("ratio = " + ratio);
10944	11096
..	..	@@ -10954,7 +11106,7 @@
10954	11106
10955	11107	if (!IsFrozen() && !ambientOcclusion)
10956	11108	{
10957		- DrawSkyBox(gl);
	11109	+ DrawSkyBox(gl, (float)ratio);
10958	11110	}
10959	11111
10960	11112	//if (selection_view == -1)
..	..	@@ -11240,7 +11392,7 @@
11240	11392
11241	11393	// if (cam != lightCamera)
11242	11394	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11243		- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
	11395	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
11244	11396	}
11245	11397
11246	11398	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -11399,7 +11551,7 @@
11399	11551	}
11400	11552	}
11401	11553
11402		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11554	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11403	11555	{
11404	11556	//gl.glDepthFunc(GL.GL_LEQUAL);
11405	11557	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11407,24 +11559,21 @@
11407	11559
11408	11560	boolean texon = textureon;
11409	11561
11410		- if (RENDERPROGRAM > 0)
11411		- {
11412		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11413		- textureon = false;
11414		- }
	11562	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11563	+ textureon = false;
	11564	+
11415	11565	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11416	11566	//System.out.println("ALLO");
11417	11567	gl.glColorMask(false, false, false, false);
11418	11568	DrawObject(gl);
11419		- if (RENDERPROGRAM > 0)
11420		- {
11421		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11422		- textureon = texon;
11423		- }
	11569	+
	11570	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11571	+ textureon = texon;
	11572	+
11424	11573	gl.glColorMask(true, true, true, true);
11425	11574
11426	11575	gl.glDepthFunc(GL.GL_EQUAL);
11427		- //gl.glDepthMask(false);
	11576	+ gl.glDepthMask(false);
11428	11577	}
11429	11578
11430	11579	if (false) // DrawMode() == SHADOW)
..	..	@@ -12317,8 +12466,76 @@
12317	12466
12318	12467	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12319	12468
12320		- String program =
	12469	+ String programmin =
	12470	+ // Min shader
12321	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	+
12322	12539	//"OPTION ARB_fragment_program_shadow;" +
12323	12540	"PARAM light2cam0 = program.env[10];" +
12324	12541	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12433,8 +12650,7 @@
12433	12650	"TEMP shininess;" +
12434	12651	"\n" +
12435	12652	"MOV texSamp, one;" +
12436		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12437		-
	12653	+
12438	12654	"MOV mapgrid.x, one2048th.x;" +
12439	12655	"MOV temp, fragment.texcoord[1];" +
12440	12656	/*
..	..	@@ -12455,20 +12671,20 @@
12455	12671	"MUL temp, floor, mapgrid.x;" +
12456	12672	//"TEX depth0, temp, texture[1], 2D;" +
12457	12673	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12458		- TextureFetch("depth0", "temp", "1") +
	12674	+ ShadowTextureFetch("depth0", "temp", "1") +
12459	12675	"") +
12460	12676	"ADD temp.x, temp.x, mapgrid.x;" +
12461	12677	//"TEX depth1, temp, texture[1], 2D;" +
12462	12678	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12463		- TextureFetch("depth1", "temp", "1") +
	12679	+ ShadowTextureFetch("depth1", "temp", "1") +
12464	12680	"") +
12465	12681	"ADD temp.y, temp.y, mapgrid.x;" +
12466	12682	//"TEX depth2, temp, texture[1], 2D;" +
12467		- TextureFetch("depth2", "temp", "1") +
	12683	+ ShadowTextureFetch("depth2", "temp", "1") +
12468	12684	"SUB temp.x, temp.x, mapgrid.x;" +
12469	12685	//"TEX depth3, temp, texture[1], 2D;" +
12470	12686	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12471		- TextureFetch("depth3", "temp", "1") +
	12687	+ ShadowTextureFetch("depth3", "temp", "1") +
12472	12688	"") +
12473	12689	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12474	12690	//"MOV params, material;" +
..	..	@@ -12839,10 +13055,10 @@
12839	13055	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12840	13056	"") +
12841	13057
12842		- // display shadow only (bump == 0)
	13058	+ // display shadow only (fakedepth == 0)
12843	13059	"SUB temp.x, half.x, shadow.x;" +
12844	13060	"MOV temp.y, -params5.z;" + // params6.x;" +
12845		- "SLT temp.z, temp.y, -one2048th.x;" +
	13061	+ "SLT temp.z, temp.y, -c256i.x;" +
12846	13062	"SUB temp.y, one.x, temp.z;" +
12847	13063	"MUL temp.x, temp.x, temp.y;" +
12848	13064	"KIL temp.x;" +
..	..	@@ -13173,6 +13389,13 @@
13173	13389	//once = true;
13174	13390	}
13175	13391
	13392	+ String program = programmax;
	13393	+
	13394	+ if (Globals.MINSHADER)
	13395	+ {
	13396	+ program = programmin;
	13397	+ }
	13398	+
13176	13399	System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13177	13400	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
13178	13401	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
..	..	@@ -13266,25 +13489,26 @@
13266	13489	return out;
13267	13490	}
13268	13491
13269		- String TextureFetch(String dest, String src, String unit)
	13492	+ // Also does frustum culling
	13493	+ String ShadowTextureFetch(String dest, String src, String unit)
13270	13494	{
13271	13495	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13272	13496	"SGE " + src + ".w, " + src + ".x, eps.x;" +
13273	13497	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13498	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13499	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
13274	13500	"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;" +
	13501	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13502	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
13279	13503	//"SWZ buffer, temp, w,w,w,w;";
13280		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13504	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13281	13505	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
13282	13506	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
13283	13507	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13284		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13508	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13285	13509
13286		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13287		- //"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;";
13288	13512	}
13289	13513
13290	13514	String Shadow(String depth, String shadow)
..	..	@@ -13331,7 +13555,7 @@
13331	13555	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13332	13556	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13333	13557
13334		- // No shadow when out of frustrum
	13558	+ // No shadow when out of frustum
13335	13559	"SGE temp.x, " + depth + ".z, one.z;" +
13336	13560	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13337	13561	"";
..	..	@@ -14129,14 +14353,15 @@
14129	14353	drag = false;
14130	14354	//System.out.println("Mouse DOWN");
14131	14355	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);
	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);
14140	14365	if (!editObj)
14141	14366	{
14142	14367	hasMarquee = true;
..	..	@@ -14420,9 +14645,9 @@
14420	14645	MODIFIERS \|= COMMAND;
14421	14646	/**/
14422	14647	if((mod&SHIFT) == SHIFT)
14423		- manipCamera.RotatePosition(0, -speed);
14424		- else
14425	14648	manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14649	+ else
	14650	+ manipCamera.RotatePosition(0, -speed);
14426	14651	/**/
14427	14652	if ((mod & SHIFT) == SHIFT)
14428	14653	{
..	..	@@ -14441,9 +14666,9 @@
14441	14666	MODIFIERS \|= COMMAND;
14442	14667	/**/
14443	14668	if((mod&SHIFT) == SHIFT)
14444		- manipCamera.RotatePosition(0, speed);
14445		- else
14446	14669	manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14670	+ else
	14671	+ manipCamera.RotatePosition(0, speed);
14447	14672	/**/
14448	14673	if ((mod & SHIFT) == SHIFT)
14449	14674	{
..	..	@@ -14536,15 +14761,16 @@
14536	14761	if (editObj)
14537	14762	{
14538	14763	drag = true;
14539		- ClickInfo info = new ClickInfo();
14540		- info.bounds.setBounds(0, 0,
	14764	+ //ClickInfo info = new ClickInfo();
	14765	+ object.clickInfo.bounds.setBounds(0, 0,
14541	14766	(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);
	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);
14548	14774	} else
14549	14775	{
14550	14776	if (x < startX)
..	..	@@ -14693,24 +14919,27 @@
14693	14919	}
14694	14920	}
14695	14921
	14922	+// ClickInfo clickInfo = new ClickInfo();
	14923	+
14696	14924	public void mouseMoved(MouseEvent e)
14697	14925	{
14698	14926	//System.out.println("mouseMoved: " + e);
14699	14927	if (isRenderer)
14700	14928	return;
14701	14929
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;
	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;
14709	14937	if (!isRenderer)
14710	14938	{
14711	14939	//ObjEditor editWindow = object.editWindow;
14712	14940	//Object3D copy = editWindow.copy;
14713		- if (object.doEditClick(ci, 0))
	14941	+ if (object.doEditClick(//clickInfo,
	14942	+ 0))
14714	14943	{
14715	14944	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14716	14945	} else
..	..	@@ -15160,20 +15389,24 @@
15160	15389	OCCLUSION_CULLING ^= true;
15161	15390	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
15162	15391	break;
15163		- case '0': envyoff ^= true; repaint(); break;
	15392	+ //case '0': envyoff ^= true; repaint(); break;
15164	15393	case '1':
15165	15394	case '2':
15166	15395	case '3':
15167	15396	case '4':
15168	15397	case '5':
15169		- newenvy = Character.getNumericValue(key);
15170		- repaint();
15171		- break;
15172	15398	case '6':
15173	15399	case '7':
15174	15400	case '8':
15175	15401	case '9':
15176		- 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	+ }
15177	15410	repaint();
15178	15411	break;
15179	15412	case '!':
..	..	@@ -15736,8 +15969,6 @@
15736	15969
15737	15970	int width = getBounds().width;
15738	15971	int height = getBounds().height;
15739		- ClickInfo info = new ClickInfo();
15740		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15741	15972	//Image img = CreateImage(width, height);
15742	15973	//System.out.println("width = " + width + "; height = " + height + "\n");
15743	15974
..	..	@@ -15814,31 +16045,37 @@
15814	16045	}
15815	16046	if (object != null && !hasMarquee)
15816	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	+
15817	16054	if (isRenderer)
15818	16055	{
15819		- info.flags++;
	16056	+ object.clickInfo.flags++;
15820	16057	double frameAspect = (double) width / (double) height;
15821	16058	if (frameAspect > renderCamera.aspect)
15822	16059	{
15823	16060	int desired = (int) ((double) height * renderCamera.aspect);
15824		- info.bounds.width -= width - desired;
15825		- info.bounds.x += (width - desired) / 2;
	16061	+ object.clickInfo.bounds.width -= width - desired;
	16062	+ object.clickInfo.bounds.x += (width - desired) / 2;
15826	16063	} else
15827	16064	{
15828	16065	int desired = (int) ((double) width / renderCamera.aspect);
15829		- info.bounds.height -= height - desired;
15830		- info.bounds.y += (height - desired) / 2;
	16066	+ object.clickInfo.bounds.height -= height - desired;
	16067	+ object.clickInfo.bounds.y += (height - desired) / 2;
15831	16068	}
15832	16069	}
15833	16070
15834		- info.g = gr;
15835		- info.camera = renderCamera;
	16071	+ object.clickInfo.g = gr;
	16072	+ object.clickInfo.camera = renderCamera;
15836	16073	/*
15837	16074	// Memory intensive (brep.verticescopy)
15838	16075	if (!(object instanceof Composite))
15839	16076	object.draw(info, 0, false); // SLOW :
15840	16077	*/
15841		- if (!isRenderer)
	16078	+ if (!isRenderer) // && drag)
15842	16079	{
15843	16080	Grafreed.Assert(object != null);
15844	16081	Grafreed.Assert(object.selection != null);
..	..	@@ -15846,9 +16083,9 @@
15846	16083	{
15847	16084	int hitSomething = object.selection.get(0).hitSomething;
15848	16085
15849		- info.DX = 0;
15850		- info.DY = 0;
15851		- info.W = 1;
	16086	+ object.clickInfo.DX = 0;
	16087	+ object.clickInfo.DY = 0;
	16088	+ object.clickInfo.W = 1;
15852	16089	if (hitSomething == Object3D.hitCenter)
15853	16090	{
15854	16091	info.DX = X;
..	..	@@ -15860,7 +16097,8 @@
15860	16097	info.DY -= info.bounds.height/2;
15861	16098	}
15862	16099
15863		- object.drawEditHandles(info, 0);
	16100	+ object.drawEditHandles(//info,
	16101	+ 0);
15864	16102
15865	16103	if (drag && (X != 0 \|\| Y != 0))
15866	16104	{
..	..	@@ -16359,6 +16597,8 @@
16359	16597	private /static/ boolean firstime;
16360	16598	private /static/ cVector newView = new cVector();
16361	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"};
16362	16602	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16363	16603	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16364	16604	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16371,29 +16611,67 @@
16371	16611	{
16372	16612	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16373	16613
	16614	+ int usedsuf = 0;
	16615	+
16374	16616	for (int i = 0; i < suffixes.length; i++)
16375	16617	{
16376		- String resourceName = basename + suffixes[i] + "." + suffix;
16377		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16378		- mipmapped,
16379		- FileUtil.getFileSuffix(resourceName));
16380		- if (data == null)
	16618	+ String[] suffixe = suffixes;
	16619	+ String[] fallback = suffixes2;
	16620	+ String[] fallfallback = suffixes3;
	16621	+
	16622	+ for (int c=usedsuf; --c>=0;)
16381	16623	{
16382		- throw new IOException("Unable to load texture " + resourceName);
	16624	+// String[] temp = suffixe;
	16625	+// suffixe = fallback;
	16626	+// fallback = fallfallback;
	16627	+// fallfallback = temp;
16383	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	+
16384	16657	//System.out.println("Target = " + targets[i]);
16385	16658	cubemap.updateImage(data, targets[i]);
16386	16659	}
16387	16660
16388	16661	return cubemap;
16389	16662	}
	16663	+
16390	16664	int bigsphere = -1;
16391	16665
16392	16666	float BGcolor = 0.5f;
16393	16667
16394		- private void DrawSkyBox(GL gl)
	16668	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16669	+
	16670	+ private void DrawSkyBox(GL gl, float ratio)
16395	16671	{
16396		- if (envyoff \|\| cubemap == null)
	16672	+ if (//envyoff \|\|
	16673	+ WIREFRAME \|\|
	16674	+ cubemap == null)
16397	16675	{
16398	16676	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16399	16677	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -16408,7 +16686,17 @@
16408	16686	// Compensates for ExaminerViewer's modification of modelview matrix
16409	16687	gl.glMatrixMode(GL.GL_MODELVIEW);
16410	16688	gl.glLoadIdentity();
	16689	+ gl.glScalef(1,ratio,1);
16411	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	+
16412	16700	//gl.glActiveTexture(GL.GL_TEXTURE1);
16413	16701	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16414	16702
..	..	@@ -16440,6 +16728,7 @@
16440	16728	{
16441	16729	gl.glScalef(1.0f, -1.0f, 1.0f);
16442	16730	}
	16731	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16443	16732	gl.glMultMatrixd(viewrot_1, 0);
16444	16733	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16445	16734	//viewer.updateInverseRotation(gl);
..	..	@@ -16698,7 +16987,7 @@
16698	16987	//new Exception().printStackTrace();
16699	16988	System.out.println("select buffer init");
16700	16989	// Use debug pipeline
16701		- drawable.setGL(new DebugGL(drawable.getGL()));
	16990	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16702	16991
16703	16992	GL gl = drawable.getGL();
16704	16993