~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;
..	..	@@ -106,7 +110,11 @@
106	110	//private Mat4f spotlightTransform = new Mat4f();
107	111	//private Mat4f spotlightInverseTransform = new Mat4f();
108	112	static GLContext glcontext = null;
109		- /static/ com.sun.opengl.util.texture.Texture cubemap;
	113	+ /static/ com.sun.opengl.util.texture.Texture cubemap; // Either custom or rgb
	114	+ /static/ com.sun.opengl.util.texture.Texture cubemapcustom;
	115	+ /static/ com.sun.opengl.util.texture.Texture cubemaprgb;
	116	+ boolean transformMode;
	117	+
110	118	boolean reverseUP = false;
111	119	static boolean frozen = false;
112	120	boolean enablebackspace = false; // patch for back buffer refresh
..	..	@@ -160,7 +168,7 @@
160	168
161	169
162	170	// OPTIONS
163		- boolean Skinshader = true;
	171	+ boolean Skinshader = false; // true;
164	172	boolean cameraLight = false;
165	173	boolean UVdebug = false;
166	174	boolean Udebug = false;
..	..	@@ -169,7 +177,7 @@
169	177	static boolean doublesided = false; // true; // reversed normals are awful for conformance
170	178	boolean anisotropy = true;
171	179	boolean softshadow = true; // slower but better false;
172		- boolean opacityhalo = false;
	180	+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
173	181
174	182	boolean macromode = false;
175	183
..	..	@@ -183,6 +191,19 @@
183	191	}
184	192
185	193	private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	194	+
	195	+ public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	196	+ {
	197	+ try
	198	+ {
	199	+ return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	200	+ } catch (IOException e)
	201	+ {
	202	+ System.out.println("NAME = " + name);
	203	+ e.printStackTrace(); // throw new RuntimeException(e);
	204	+ return null;
	205	+ }
	206	+ }
186	207
187	208	void SetAsGLRenderer(boolean b)
188	209	{
..	..	@@ -202,7 +223,8 @@
202	223
203	224	SetCamera(cam);
204	225
205		- SetLight(new Camera(new cVector(10, 10, -20)));
	226	+ // Warning: not used.
	227	+ SetLight(new Camera(new cVector(15, 10, -20)));
206	228
207	229	object = o;
208	230
..	..	@@ -1480,6 +1502,8 @@
1480	1502	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1481	1503	}
1482	1504
	1505	+ float[] colorV = new float[4];
	1506	+
1483	1507	void SetColor(Object3D obj, Vertex p0)
1484	1508	{
1485	1509	CameraPane display = this;
..	..	@@ -1547,8 +1571,6 @@
1547	1571	{
1548	1572	return;
1549	1573	}
1550		-
1551		- float[] colorV = new float[3];
1552	1574
1553	1575	if (false) // marked)
1554	1576	{
..	..	@@ -1797,7 +1819,7 @@
1797	1819
1798	1820	display.modelParams7[0] = 0;
1799	1821	display.modelParams7[1] = 1000;
1800		- display.modelParams7[2] = 0;
	1822	+ display.modelParams7[2] = material.parallax;
1801	1823	display.modelParams7[3] = 0;
1802	1824
1803	1825	//display.modelParams6[0] = 100; // criss de bug de bump
..	..	@@ -2030,9 +2052,9 @@
2030	2052	switch(viewcode)
2031	2053	{
2032	2054	case 0: return "main";
2033		- case 1: return "one";
2034		- case 2: return "two";
2035		- case 3: return "three";
	2055	+ case 1: return "Red";
	2056	+ case 2: return "Green";
	2057	+ case 3: return "Blue";
2036	2058	case 4: return "light";
2037	2059	}
2038	2060
..	..	@@ -2495,7 +2517,7 @@
2495	2517	com.sun.opengl.util.texture.TextureIO.newTextureData(
2496	2518	getClass().getClassLoader().getResourceAsStream(name),
2497	2519	true,
2498		- com.sun.opengl.util.texture.TextureIO.PNG);
	2520	+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
2499	2521	} catch (java.io.IOException e)
2500	2522	{
2501	2523	throw new javax.media.opengl.GLException(e);
..	..	@@ -8341,7 +8363,7 @@
8341	8363	// else
8342	8364	// if (!texname.startsWith("/"))
8343	8365	// texname = "/Users/nbriere/Textures/" + texname;
8344		- if (!FileExists(texname))
	8366	+ if (!FileExists(texname) && !texname.startsWith("@"))
8345	8367	{
8346	8368	texname = fallbackTextureName;
8347	8369	}
..	..	@@ -8358,14 +8380,26 @@
8358	8380	{
8359	8381	TextureData texturedata = null;
8360	8382
8361		- if (texdata != null)
	8383	+ if (texdata != null && textureon)
8362	8384	{
8363		- BufferedImage bim = //new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8385	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
8364	8386
8365		- CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8387	+ try
	8388	+ {
	8389	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8390	+ }
	8391	+ catch (Exception e)
	8392	+ {
	8393	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8394	+ }
8366	8395
8367	8396	texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
8368	8397	bimtextures.put(texdata, texturecache);
	8398	+
	8399	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8400	+
	8401	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8402	+ //bim2 = bim;
8369	8403	}
8370	8404	else
8371	8405	if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
..	..	@@ -8408,6 +8442,15 @@
8408	8442	// texturecache = textures.get(texname); // suspicious
8409	8443	if (texturecache == null)
8410	8444	texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8445	+ else
	8446	+ new Exception().printStackTrace();
	8447	+ } else
	8448	+ {
	8449	+ if (texname.startsWith("@"))
	8450	+ {
	8451	+ // texturecache = textures.get(texname); // suspicious
	8452	+ if (texturecache == null)
	8453	+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
8411	8454	else
8412	8455	new Exception().printStackTrace();
8413	8456	} else
..	..	@@ -8471,6 +8514,7 @@
8471	8514	texturecache = new CacheTexture(texturedata,resolution);
8472	8515	//texture = GetTexture(tex, bump);
8473	8516	}
	8517	+ }
8474	8518	}
8475	8519	//}
8476	8520	}
..	..	@@ -8560,29 +8604,32 @@
8560	8604	{
8561	8605	if (tex.pigmentdata == null)
8562	8606	{
8563		- String texname = Object3D.GetPigment(tex);
	8607	+ //String texname = Object3D.GetPigment(tex);
8564	8608
8565	8609	CacheTexture texturecache = texturepigment.get(tex);
8566	8610
8567	8611	if (texturecache != null)
8568	8612	{
8569		- tex.pigmentdata = ((ByteBuffer)texturecache.texturedata.getBuffer()).array();
8570	8613	tex.pw = texturecache.texturedata.getWidth();
8571	8614	tex.ph = texturecache.texturedata.getHeight();
	8615	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8616	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8617	+ ;
	8618	+ //, tex.pw, tex.ph), 0.5f);
8572	8619	}
8573	8620	}
8574	8621
8575	8622	if (tex.bumpdata == null)
8576	8623	{
8577		- String texname = Object3D.GetBump(tex);
	8624	+ //String texname = Object3D.GetBump(tex);
8578	8625
8579	8626	CacheTexture texturecache = texturebump.get(tex);
8580	8627
8581	8628	if (texturecache != null)
8582	8629	{
8583		- tex.bumpdata = ((ByteBuffer)texturecache.texturedata.getBuffer()).array();
8584	8630	tex.bw = texturecache.texturedata.getWidth();
8585	8631	tex.bh = texturecache.texturedata.getHeight();
	8632	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
8586	8633	}
8587	8634	}
8588	8635	}
..	..	@@ -8654,6 +8701,72 @@
8654	8701	return true; // Warning: not used.
8655	8702	}
8656	8703
	8704	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8705	+ {
	8706	+ try
	8707	+ {
	8708	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8709	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8710	+ ImageWriter writer = writers.next();
	8711	+
	8712	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8713	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8714	+ param.setCompressionQuality(quality);
	8715	+
	8716	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8717	+ writer.setOutput(ios);
	8718	+ writer.write(null, new IIOImage(image, null, null), param);
	8719	+
	8720	+ byte[] data = baos.toByteArray();
	8721	+ writer.dispose();
	8722	+ return data;
	8723	+ }
	8724	+ catch (Exception e)
	8725	+ {
	8726	+ e.printStackTrace();
	8727	+ return null;
	8728	+ }
	8729	+ }
	8730	+
	8731	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8732	+ {
	8733	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8734	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8735	+ ImageReader reader = writers.next();
	8736	+
	8737	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8738	+
	8739	+ ImageReadParam param = reader.getDefaultReadParam();
	8740	+ param.setDestination(bim);
	8741	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8742	+
	8743	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8744	+ reader.setInput(ios);
	8745	+ BufferedImage bim2 = reader.read(0, param);
	8746	+ reader.dispose();
	8747	+
	8748	+// WritableRaster raster = bim2.getRaster();
	8749	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8750	+// byte[] bytes = data.getData();
	8751	+//
	8752	+// int[] pixels = new int[bytes.length/3];
	8753	+// for (int i=pixels.length; --i>=0;)
	8754	+// {
	8755	+// int i3 = i*3;
	8756	+// pixels[i] = 0xFF;
	8757	+// pixels[i] <<= 8;
	8758	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8759	+// pixels[i] <<= 8;
	8760	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8761	+// pixels[i] <<= 8;
	8762	+// pixels[i] \|= bytes[i3] & 0xFF;
	8763	+// }
	8764	+//
	8765	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8766	+
	8767	+ return bim;
	8768	+ }
	8769	+
8657	8770	ShadowBuffer shadowPBuf;
8658	8771	AntialiasBuffer antialiasPBuf;
8659	8772	int MAXSTACK;
..	..	@@ -8670,10 +8783,12 @@
8670	8783
8671	8784	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8672	8785	MAXSTACK = temp[0];
8673		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8786	+ if (Globals.DEBUG)
	8787	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8674	8788	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8675	8789	MAXSTACK = temp[0];
8676		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8790	+ if (Globals.DEBUG)
	8791	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8677	8792
8678	8793	// Use debug pipeline
8679	8794	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8681,7 +8796,8 @@
8681	8796	gl = drawable.getGL(); //
8682	8797
8683	8798	GL gl3 = getGL();
8684		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8799	+ if (Globals.DEBUG)
	8800	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8685	8801
8686	8802
8687	8803	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8846,7 +8962,7 @@
8846	8962
8847	8963	if (cubemap == null)
8848	8964	{
8849		- LoadEnvy(5);
	8965	+ //LoadEnvy(1);
8850	8966	}
8851	8967
8852	8968	//cubemap.enable();
..	..	@@ -9122,6 +9238,8 @@
9122	9238
9123	9239	void LoadEnvy(int which)
9124	9240	{
	9241	+ assert(false);
	9242	+
9125	9243	String name;
9126	9244	String ext;
9127	9245
..	..	@@ -9133,37 +9251,58 @@
9133	9251	cubemap = null;
9134	9252	return;
9135	9253	case 1:
9136		- name = "cubemaps/box_";
9137		- ext = "png";
	9254	+ name = "cubemaps/rgb/";
	9255	+ ext = "jpg";
9138	9256	reverseUP = false;
9139	9257	break;
9140	9258	case 2:
9141		- name = "cubemaps/uffizi_";
9142		- ext = "png";
9143		- break; // reverseUP = true; break;
	9259	+ name = "cubemaps/uffizi/";
	9260	+ ext = "jpg";
	9261	+ reverseUP = false;
	9262	+ break;
9144	9263	case 3:
9145		- name = "cubemaps/CloudyHills_";
9146		- ext = "tga";
	9264	+ name = "cubemaps/CloudyHills/";
	9265	+ ext = "jpg";
9147	9266	reverseUP = false;
9148	9267	break;
9149	9268	case 4:
9150		- name = "cubemaps/cornell_";
	9269	+ name = "cubemaps/cornell/";
9151	9270	ext = "png";
9152	9271	reverseUP = false;
9153	9272	break;
	9273	+ case 5:
	9274	+ name = "cubemaps/skycube/";
	9275	+ ext = "jpg";
	9276	+ reverseUP = false;
	9277	+ break;
	9278	+ case 6:
	9279	+ name = "cubemaps/SaintLazarusChurch3/";
	9280	+ ext = "jpg";
	9281	+ reverseUP = false;
	9282	+ break;
	9283	+ case 7:
	9284	+ name = "cubemaps/Sodermalmsallen/";
	9285	+ ext = "jpg";
	9286	+ reverseUP = false;
	9287	+ break;
	9288	+ case 8:
	9289	+ name = "cubemaps/Sodermalmsallen2/";
	9290	+ ext = "jpg";
	9291	+ reverseUP = false;
	9292	+ break;
	9293	+ case 9:
	9294	+ name = "cubemaps/UnionSquare/";
	9295	+ ext = "jpg";
	9296	+ reverseUP = false;
	9297	+ break;
9154	9298	default:
9155		- name = "cubemaps/rgb_";
9156		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9299	+ name = "cubemaps/box/";
	9300	+ ext = "png"; /mipmap = true;/
	9301	+ reverseUP = false;
9157	9302	break;
9158	9303	}
9159		-
9160		- try
9161		- {
9162		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9163		- } catch (IOException e)
9164		- {
9165		- throw new RuntimeException(e);
9166		- }
	9304	+
	9305	+ LoadSkybox(name, ext, mipmap);
9167	9306	}
9168	9307
9169	9308	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -9195,8 +9334,12 @@
9195	9334	static double[] model = new double[16];
9196	9335	double[] camera2light = new double[16];
9197	9336	double[] light2camera = new double[16];
9198		- int newenvy = -1;
9199		- boolean envyoff = true; // false;
	9337	+
	9338	+ //int newenvy = -1;
	9339	+ //boolean envyoff = false;
	9340	+
	9341	+ String loadedskyboxname;
	9342	+
9200	9343	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
9201	9344	//float[] light0 = { 0,0,0 };
9202	9345	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9614,7 +9757,7 @@
9614	9757
9615	9758	if (renderCamera != lightCamera)
9616	9759	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9617		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9760	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9618	9761
9619	9762	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9620	9763
..	..	@@ -9630,7 +9773,7 @@
9630	9773
9631	9774	if (renderCamera != lightCamera)
9632	9775	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9633		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9776	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9634	9777
9635	9778	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9636	9779
..	..	@@ -9676,10 +9819,12 @@
9676	9819	rati = 1 / rati;
9677	9820	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9678	9821	}
9679		- assert (newenvy == -1);
	9822	+
	9823	+ //assert (newenvy == -1);
	9824	+
9680	9825	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9681	9826	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9682		- DrawSkyBox(gl);
	9827	+ DrawSkyBox(gl, (float)rati);
9683	9828	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9684	9829	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9685	9830	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -10545,9 +10690,18 @@
10545	10690	static boolean init = false;
10546	10691
10547	10692	double[][] matrix = LA.newMatrix();
	10693	+
	10694	+ // This is to refresh the UI of the material panel.
	10695	+ ObjEditor patchMaterial;
10548	10696
10549	10697	public void display(GLAutoDrawable drawable)
10550	10698	{
	10699	+ if (patchMaterial.patchMaterial)
	10700	+ {
	10701	+ patchMaterial.patchMaterial = false;
	10702	+ patchMaterial.objectPanel.setSelectedIndex(1);
	10703	+ }
	10704	+
10551	10705	if (Grafreed.savesound && Grafreed.hassound)
10552	10706	{
10553	10707	Grafreed.wav.save();
..	..	@@ -10716,7 +10870,7 @@
10716	10870
10717	10871	if (wait)
10718	10872	{
10719		- Sleep(500);
	10873	+ Sleep(200); // blocks everything
10720	10874
10721	10875	wait = false;
10722	10876	}
..	..	@@ -10831,7 +10985,7 @@
10831	10985	// if (parentcam != renderCamera) // not a light
10832	10986	if (cam != lightCamera)
10833	10987	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10834		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	10988	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10835	10989
10836	10990	for (int j = 0; j < 4; j++)
10837	10991	{
..	..	@@ -10846,7 +11000,7 @@
10846	11000	// if (parentcam != renderCamera) // not a light
10847	11001	if (cam != lightCamera)
10848	11002	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10849		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	11003	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10850	11004
10851	11005	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10852	11006
..	..	@@ -10932,13 +11086,43 @@
10932	11086	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10933	11087	}
10934	11088
10935		- if (newenvy > -1)
	11089	+// if (newenvy > -1)
	11090	+// {
	11091	+// LoadEnvy(newenvy);
	11092	+// }
	11093	+//
	11094	+// newenvy = -1;
	11095	+
	11096	+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
10936	11097	{
10937		- LoadEnvy(newenvy);
	11098	+ if (cubemaprgb == null)
	11099	+ {
	11100	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
	11101	+ }
	11102	+
	11103	+ cubemap = cubemaprgb;
10938	11104	}
10939		-
10940		- newenvy = -1;
10941		-
	11105	+ else
	11106	+ {
	11107	+ if (object.skyboxname != null)
	11108	+ {
	11109	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11110	+ {
	11111	+ if (cubemap != null && cubemap != cubemaprgb)
	11112	+ cubemap.dispose();
	11113	+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11114	+ loadedskyboxname = object.skyboxname;
	11115	+ }
	11116	+ }
	11117	+ else
	11118	+ {
	11119	+ cubemapcustom = null;
	11120	+ loadedskyboxname = null;
	11121	+ }
	11122	+
	11123	+ cubemap = cubemapcustom;
	11124	+ }
	11125	+
10942	11126	ratio = ((double) getWidth()) / getHeight();
10943	11127	//System.out.println("ratio = " + ratio);
10944	11128
..	..	@@ -10954,7 +11138,7 @@
10954	11138
10955	11139	if (!IsFrozen() && !ambientOcclusion)
10956	11140	{
10957		- DrawSkyBox(gl);
	11141	+ DrawSkyBox(gl, (float)ratio);
10958	11142	}
10959	11143
10960	11144	//if (selection_view == -1)
..	..	@@ -11240,7 +11424,7 @@
11240	11424
11241	11425	// if (cam != lightCamera)
11242	11426	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11243		- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
	11427	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
11244	11428	}
11245	11429
11246	11430	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -11399,7 +11583,7 @@
11399	11583	}
11400	11584	}
11401	11585
11402		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11586	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11403	11587	{
11404	11588	//gl.glDepthFunc(GL.GL_LEQUAL);
11405	11589	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11407,24 +11591,21 @@
11407	11591
11408	11592	boolean texon = textureon;
11409	11593
11410		- if (RENDERPROGRAM > 0)
11411		- {
11412		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11413		- textureon = false;
11414		- }
	11594	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11595	+ textureon = false;
	11596	+
11415	11597	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11416	11598	//System.out.println("ALLO");
11417	11599	gl.glColorMask(false, false, false, false);
11418	11600	DrawObject(gl);
11419		- if (RENDERPROGRAM > 0)
11420		- {
11421		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11422		- textureon = texon;
11423		- }
	11601	+
	11602	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11603	+ textureon = texon;
	11604	+
11424	11605	gl.glColorMask(true, true, true, true);
11425	11606
11426	11607	gl.glDepthFunc(GL.GL_EQUAL);
11427		- //gl.glDepthMask(false);
	11608	+ gl.glDepthMask(false);
11428	11609	}
11429	11610
11430	11611	if (false) // DrawMode() == SHADOW)
..	..	@@ -12317,8 +12498,76 @@
12317	12498
12318	12499	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12319	12500
12320		- String program =
	12501	+ String programmin =
	12502	+ // Min shader
12321	12503	"!!ARBfp1.0\n" +
	12504	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12505	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12506	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12507	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12508	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12509	+ "PARAM light2cam0 = program.env[10];" +
	12510	+ "PARAM light2cam1 = program.env[11];" +
	12511	+ "PARAM light2cam2 = program.env[12];" +
	12512	+ "TEMP temp;" +
	12513	+ "TEMP light;" +
	12514	+ "TEMP ndotl;" +
	12515	+ "TEMP normal;" +
	12516	+ "TEMP depth;" +
	12517	+ "TEMP eye;" +
	12518	+ "TEMP pos;" +
	12519	+
	12520	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12521	+ Normalize("normal") +
	12522	+ "MOV light, state.light[0].position;" +
	12523	+ "DP3 ndotl.x, light, normal;" +
	12524	+
	12525	+ // shadow
	12526	+ "MOV pos, fragment.texcoord[1];" +
	12527	+ "MOV temp, pos;" +
	12528	+ ShadowTextureFetch("depth", "temp", "1") +
	12529	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12530	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12531	+
	12532	+ // No shadow when out of frustum
	12533	+ //"SGE temp.y, depth.z, zero123.y;" +
	12534	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12535	+
	12536	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12537	+
	12538	+ // Backlit
	12539	+ "MOV pos.w, zero123.y;" +
	12540	+ "DP4 eye.x, pos, light2cam0;" +
	12541	+ "DP4 eye.y, pos, light2cam1;" +
	12542	+ "DP4 eye.z, pos, light2cam2;" +
	12543	+ Normalize("eye") +
	12544	+
	12545	+ "DP3 ndotl.y, -eye, normal;" +
	12546	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12547	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12548	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12549	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12550	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12551	+
	12552	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12553	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12554	+
	12555	+ // Pigment
	12556	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12557	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12558	+ "MUL temp, temp, ndotl.x;" +
	12559	+
	12560	+ "MUL temp, temp, zero123.z;" +
	12561	+
	12562	+ //"MUL temp, temp, ndotl.y;" +
	12563	+
	12564	+ "MOV temp.w, zero123.y;" + // reset alpha
	12565	+ "MOV result.color, temp;" +
	12566	+ "END";
	12567	+
	12568	+ String programmax =
	12569	+ "!!ARBfp1.0\n" +
	12570	+
12322	12571	//"OPTION ARB_fragment_program_shadow;" +
12323	12572	"PARAM light2cam0 = program.env[10];" +
12324	12573	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12344,7 +12593,7 @@
12344	12593	"PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
12345	12594	"PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
12346	12595	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12347		- "PARAM params7 = program.env[7];" + // noise power, opacity power
	12596	+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
12348	12597	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
12349	12598	"PARAM options1 = program.env[62];" + // fog rgb color
12350	12599	"PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
..	..	@@ -12433,8 +12682,7 @@
12433	12682	"TEMP shininess;" +
12434	12683	"\n" +
12435	12684	"MOV texSamp, one;" +
12436		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12437		-
	12685	+
12438	12686	"MOV mapgrid.x, one2048th.x;" +
12439	12687	"MOV temp, fragment.texcoord[1];" +
12440	12688	/*
..	..	@@ -12455,20 +12703,20 @@
12455	12703	"MUL temp, floor, mapgrid.x;" +
12456	12704	//"TEX depth0, temp, texture[1], 2D;" +
12457	12705	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12458		- TextureFetch("depth0", "temp", "1") +
	12706	+ ShadowTextureFetch("depth0", "temp", "1") +
12459	12707	"") +
12460	12708	"ADD temp.x, temp.x, mapgrid.x;" +
12461	12709	//"TEX depth1, temp, texture[1], 2D;" +
12462	12710	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12463		- TextureFetch("depth1", "temp", "1") +
	12711	+ ShadowTextureFetch("depth1", "temp", "1") +
12464	12712	"") +
12465	12713	"ADD temp.y, temp.y, mapgrid.x;" +
12466	12714	//"TEX depth2, temp, texture[1], 2D;" +
12467		- TextureFetch("depth2", "temp", "1") +
	12715	+ ShadowTextureFetch("depth2", "temp", "1") +
12468	12716	"SUB temp.x, temp.x, mapgrid.x;" +
12469	12717	//"TEX depth3, temp, texture[1], 2D;" +
12470	12718	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12471		- TextureFetch("depth3", "temp", "1") +
	12719	+ ShadowTextureFetch("depth3", "temp", "1") +
12472	12720	"") +
12473	12721	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12474	12722	//"MOV params, material;" +
..	..	@@ -12590,7 +12838,7 @@
12590	12838	"POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
12591	12839	// mar 2013 ??? "KIL alpha.a;" +
12592	12840	"MOV alpha, texSamp.aaaa;" + // y;" +
12593		- "KIL alpha.a;" +
	12841	+ "KIL alpha.a;" + // not sure with parallax mapping
12594	12842	/*
12595	12843	"MUL temp.xy, temp, two;" +
12596	12844	"TXB bump, temp, texture[0], 2D;" +
..	..	@@ -12676,11 +12924,6 @@
12676	12924	"SUB bump0, bump0, half;" +
12677	12925	"ADD bump, bump, bump0;" +
12678	12926
12679		- "MOV temp.x, texSamp.a;" +
12680		- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12681		- //"LRP texSamp0, params5.x, texSamp0, one;" +
12682		- "MOV texSamp.a, temp.x;" +
12683		-
12684	12927	// double-sided
12685	12928	/**/
12686	12929	(doublesided?"DP3 temp.z, normal, eye;" +
..	..	@@ -12710,6 +12953,41 @@
12710	12953	Normalize("U") +
12711	12954
12712	12955	// parallax mapping
	12956	+
	12957	+ "DP3 temp2.x, V, eye;" +
	12958	+ "DP3 temp2.y, U, eye;" +
	12959	+ "DP3 temp2.z, normal, eye;" +
	12960	+ "RCP temp2.z, temp2.z;" +
	12961	+
	12962	+ "DP3 temp2.w, texSamp, texSamp;" + // Height
	12963	+ "RSQ temp2.w, temp2.w;" +
	12964	+ "RCP temp2.w, temp2.w;" +
	12965	+
	12966	+ "SUB temp2.w, temp2.w, half;" +
	12967	+// "SGE temp.x, temp2.w, eps.x;" +
	12968	+// "MUL temp2.w, temp2.w, temp.x;" +
	12969	+
	12970	+ //"MOV texSamp, U;" +
	12971	+
	12972	+ "MUL temp2.z, temp2.z, temp2.w;" +
	12973	+ "MUL temp2.z, temp2.z, params7.z;" + // parallax
	12974	+
	12975	+ "MUL temp2, temp2, temp2.z;" +
	12976	+
	12977	+ "MOV temp, fragment.texcoord[0];" +
	12978	+
	12979	+ "SUB temp, temp, temp2;" +
	12980	+
	12981	+ "TEX texSamp, temp, texture[0], 2D;" +
	12982	+ "POW texSamp.a, texSamp.a, params6.w;" + // punch through
	12983	+ "MOV alpha, texSamp.aaaa;" +
	12984	+
	12985	+// parallax mapping
	12986	+
	12987	+ "MOV temp.x, texSamp.a;" +
	12988	+ "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
	12989	+ //"LRP texSamp0, params5.x, texSamp0, one;" +
	12990	+ "MOV texSamp.a, temp.x;" +
12713	12991
12714	12992	//"MOV temp, fragment.texcoord[0];" +
12715	12993	//
..	..	@@ -12839,10 +13117,10 @@
12839	13117	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12840	13118	"") +
12841	13119
12842		- // display shadow only (bump == 0)
	13120	+ // display shadow only (fakedepth == 0)
12843	13121	"SUB temp.x, half.x, shadow.x;" +
12844	13122	"MOV temp.y, -params5.z;" + // params6.x;" +
12845		- "SLT temp.z, temp.y, -one2048th.x;" +
	13123	+ "SLT temp.z, temp.y, -c256i.x;" +
12846	13124	"SUB temp.y, one.x, temp.z;" +
12847	13125	"MUL temp.x, temp.x, temp.y;" +
12848	13126	"KIL temp.x;" +
..	..	@@ -13173,8 +13451,19 @@
13173	13451	//once = true;
13174	13452	}
13175	13453
13176		- System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13177		- System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13454	+ String program = programmax;
	13455	+
	13456	+ if (Globals.MINSHADER)
	13457	+ {
	13458	+ program = programmin;
	13459	+ }
	13460	+
	13461	+ if (Globals.DEBUG)
	13462	+ {
	13463	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
	13464	+ System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13465	+ }
	13466	+
13178	13467	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13179	13468
13180	13469	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13221,7 +13510,8 @@
13221	13510	"\n" +
13222	13511	"END\n";
13223	13512
13224		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13513	+ if (Globals.DEBUG)
	13514	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13225	13515	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13226	13516
13227	13517	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13266,25 +13556,26 @@
13266	13556	return out;
13267	13557	}
13268	13558
13269		- String TextureFetch(String dest, String src, String unit)
	13559	+ // Also does frustum culling
	13560	+ String ShadowTextureFetch(String dest, String src, String unit)
13270	13561	{
13271	13562	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13272	13563	"SGE " + src + ".w, " + src + ".x, eps.x;" +
13273	13564	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13565	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13566	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
13274	13567	"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;" +
	13568	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13569	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
13279	13570	//"SWZ buffer, temp, w,w,w,w;";
13280		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13571	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13281	13572	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
13282	13573	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
13283	13574	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13284		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13575	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13285	13576
13286		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13287		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13577	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13578	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13288	13579	}
13289	13580
13290	13581	String Shadow(String depth, String shadow)
..	..	@@ -13331,7 +13622,7 @@
13331	13622	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13332	13623	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13333	13624
13334		- // No shadow when out of frustrum
	13625	+ // No shadow when out of frustum
13335	13626	"SGE temp.x, " + depth + ".z, one.z;" +
13336	13627	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13337	13628	"";
..	..	@@ -13478,7 +13769,7 @@
13478	13769	/static/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
13479	13770	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13480	13771	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13481		- /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
	13772	+ /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
13482	13773
13483	13774	//Object3D.cVector2[] vector2buffer;
13484	13775
..	..	@@ -14129,14 +14420,15 @@
14129	14420	drag = false;
14130	14421	//System.out.println("Mouse DOWN");
14131	14422	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);
	14423	+ //ClickInfo info = new ClickInfo();
	14424	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14425	+ object.clickInfo.pane = this;
	14426	+ object.clickInfo.camera = renderCamera;
	14427	+ object.clickInfo.x = x;
	14428	+ object.clickInfo.y = y;
	14429	+ object.clickInfo.modifiers = modifiersex;
	14430	+ editObj = object.doEditClick(//info,
	14431	+ 0);
14140	14432	if (!editObj)
14141	14433	{
14142	14434	hasMarquee = true;
..	..	@@ -14418,11 +14710,17 @@
14418	14710	void GoDown(int mod)
14419	14711	{
14420	14712	MODIFIERS \|= COMMAND;
	14713	+ boolean isVR = (mouseMode&VR)!=0;
14421	14714	/**/
14422	14715	if((mod&SHIFT) == SHIFT)
14423		- manipCamera.RotatePosition(0, -speed);
	14716	+ {
	14717	+ if (isVR)
	14718	+ manipCamera.RotateInterest(0, -speed);
	14719	+ else
	14720	+ manipCamera.RotatePosition(0, -speed);
	14721	+ }
14424	14722	else
14425		- manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14723	+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
14426	14724	/**/
14427	14725	if ((mod & SHIFT) == SHIFT)
14428	14726	{
..	..	@@ -14432,6 +14730,8 @@
14432	14730	mouseMode \|= BACKFORTH;
14433	14731	}
14434	14732
	14733	+ targetLookAt.set(manipCamera.lookAt);
	14734	+
14435	14735	//prevX = X = anchorX;
14436	14736	prevY = Y = anchorY - (int) (renderCamera.Distance());
14437	14737	}
..	..	@@ -14440,10 +14740,17 @@
14440	14740	{
14441	14741	MODIFIERS \|= COMMAND;
14442	14742	/**/
	14743	+ boolean isVR = (mouseMode&VR)!=0;
	14744	+
14443	14745	if((mod&SHIFT) == SHIFT)
14444		- manipCamera.RotatePosition(0, speed);
	14746	+ {
	14747	+ if (isVR)
	14748	+ manipCamera.RotateInterest(0, speed);
	14749	+ else
	14750	+ manipCamera.RotatePosition(0, speed);
	14751	+ }
14445	14752	else
14446		- manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14753	+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
14447	14754	/**/
14448	14755	if ((mod & SHIFT) == SHIFT)
14449	14756	{
..	..	@@ -14453,6 +14760,8 @@
14453	14760	mouseMode \|= BACKFORTH;
14454	14761	}
14455	14762
	14763	+ targetLookAt.set(manipCamera.lookAt);
	14764	+
14456	14765	//prevX = X = anchorX;
14457	14766	prevY = Y = anchorY + (int) (renderCamera.Distance());
14458	14767	}
..	..	@@ -14462,9 +14771,14 @@
14462	14771	MODIFIERS \|= COMMAND;
14463	14772	/**/
14464	14773	if((mod&SHIFT) == SHIFT)
14465		- manipCamera.Translate(speed*delta, 0, getWidth());
	14774	+ manipCamera.Translate(speed*delta, 0, getWidth());
14466	14775	else
14467		- manipCamera.RotatePosition(speed, 0);
	14776	+ {
	14777	+ if ((mouseMode&VR)!=0)
	14778	+ manipCamera.RotateInterest(-speed, 0);
	14779	+ else
	14780	+ manipCamera.RotatePosition(speed, 0);
	14781	+ }
14468	14782	/**/
14469	14783	if ((mod & SHIFT) == SHIFT)
14470	14784	{
..	..	@@ -14474,6 +14788,8 @@
14474	14788	mouseMode \|= ROTATE;
14475	14789	} // TRANSLATE;
14476	14790
	14791	+ targetLookAt.set(manipCamera.lookAt);
	14792	+
14477	14793	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
14478	14794	prevY = Y = anchorY;
14479	14795	}
..	..	@@ -14483,9 +14799,15 @@
14483	14799	MODIFIERS \|= COMMAND;
14484	14800	/**/
14485	14801	if((mod&SHIFT) == SHIFT)
14486		- manipCamera.Translate(-speed*delta, 0, getWidth());
	14802	+ manipCamera.Translate(-speed*delta, 0, getWidth());
14487	14803	else
14488		- manipCamera.RotatePosition(-speed, 0);
	14804	+ {
	14805	+ if ((mouseMode&VR)!=0)
	14806	+ manipCamera.RotateInterest(speed, 0);
	14807	+ else
	14808	+ manipCamera.RotatePosition(-speed, 0);
	14809	+ }
	14810	+
14489	14811	/**/
14490	14812	if ((mod & SHIFT) == SHIFT)
14491	14813	{
..	..	@@ -14495,6 +14817,8 @@
14495	14817	mouseMode \|= ROTATE;
14496	14818	} // TRANSLATE;
14497	14819
	14820	+ targetLookAt.set(manipCamera.lookAt);
	14821	+
14498	14822	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
14499	14823	prevY = Y = anchorY;
14500	14824	}
..	..	@@ -14536,15 +14860,16 @@
14536	14860	if (editObj)
14537	14861	{
14538	14862	drag = true;
14539		- ClickInfo info = new ClickInfo();
14540		- info.bounds.setBounds(0, 0,
	14863	+ //ClickInfo info = new ClickInfo();
	14864	+ object.clickInfo.bounds.setBounds(0, 0,
14541	14865	(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);
	14866	+ object.clickInfo.pane = this;
	14867	+ object.clickInfo.camera = renderCamera;
	14868	+ object.clickInfo.x = x;
	14869	+ object.clickInfo.y = y;
	14870	+ object //.GetWindow().copy
	14871	+ .doEditDrag(//info,
	14872	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14548	14873	} else
14549	14874	{
14550	14875	if (x < startX)
..	..	@@ -14693,24 +15018,27 @@
14693	15018	}
14694	15019	}
14695	15020
	15021	+// ClickInfo clickInfo = new ClickInfo();
	15022	+
14696	15023	public void mouseMoved(MouseEvent e)
14697	15024	{
14698	15025	//System.out.println("mouseMoved: " + e);
14699	15026	if (isRenderer)
14700	15027	return;
14701	15028
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;
	15029	+ // Mouse cursor feedback
	15030	+ object.clickInfo.x = e.getX();
	15031	+ object.clickInfo.y = e.getY();
	15032	+ object.clickInfo.modifiers = e.getModifiersEx();
	15033	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	15034	+ object.clickInfo.pane = this;
	15035	+ object.clickInfo.camera = renderCamera;
14709	15036	if (!isRenderer)
14710	15037	{
14711	15038	//ObjEditor editWindow = object.editWindow;
14712	15039	//Object3D copy = editWindow.copy;
14713		- if (object.doEditClick(ci, 0))
	15040	+ if (object.doEditClick(//clickInfo,
	15041	+ 0))
14714	15042	{
14715	15043	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14716	15044	} else
..	..	@@ -14993,8 +15321,8 @@
14993	15321	case 'K':
14994	15322	KOMPACTTEXTURE ^= true;
14995	15323	//textures.clear();
14996		- break;
14997		- case 'P': // Texture Projection macros
	15324	+ // break;
	15325	+ //case 'P': // Texture Projection macros
14998	15326	// SAVETEXTURE ^= true;
14999	15327	macromode = true;
15000	15328	Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
..	..	@@ -15115,7 +15443,7 @@
15115	15443	targetLookAt.set(manipCamera.lookAt);
15116	15444	repaint();
15117	15445	break;
15118		- case 'p':
	15446	+ case 'P': // p':
15119	15447	// c'est quoi ca au juste? spherical ^= true;
15120	15448	Skinshader ^= true; programInitialized = false;
15121	15449	repaint();
..	..	@@ -15160,20 +15488,24 @@
15160	15488	OCCLUSION_CULLING ^= true;
15161	15489	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
15162	15490	break;
15163		- case '0': envyoff ^= true; repaint(); break;
	15491	+ //case '0': envyoff ^= true; repaint(); break;
15164	15492	case '1':
15165	15493	case '2':
15166	15494	case '3':
15167	15495	case '4':
15168	15496	case '5':
15169		- newenvy = Character.getNumericValue(key);
15170		- repaint();
15171		- break;
15172	15497	case '6':
15173	15498	case '7':
15174	15499	case '8':
15175	15500	case '9':
15176		- BGcolor = (key - '6')/3.f;
	15501	+ if (true) // envyoff)
	15502	+ {
	15503	+ BGcolor = (key - '1')/8.f;
	15504	+ }
	15505	+ else
	15506	+ {
	15507	+ //newenvy = Character.getNumericValue(key);
	15508	+ }
15177	15509	repaint();
15178	15510	break;
15179	15511	case '!':
..	..	@@ -15736,8 +16068,6 @@
15736	16068
15737	16069	int width = getBounds().width;
15738	16070	int height = getBounds().height;
15739		- ClickInfo info = new ClickInfo();
15740		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15741	16071	//Image img = CreateImage(width, height);
15742	16072	//System.out.println("width = " + width + "; height = " + height + "\n");
15743	16073
..	..	@@ -15814,31 +16144,37 @@
15814	16144	}
15815	16145	if (object != null && !hasMarquee)
15816	16146	{
	16147	+ if (object.clickInfo == null)
	16148	+ object.clickInfo = new ClickInfo();
	16149	+ ClickInfo info = object.clickInfo;
	16150	+ //ClickInfo info = new ClickInfo();
	16151	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16152	+
15817	16153	if (isRenderer)
15818	16154	{
15819		- info.flags++;
	16155	+ object.clickInfo.flags++;
15820	16156	double frameAspect = (double) width / (double) height;
15821	16157	if (frameAspect > renderCamera.aspect)
15822	16158	{
15823	16159	int desired = (int) ((double) height * renderCamera.aspect);
15824		- info.bounds.width -= width - desired;
15825		- info.bounds.x += (width - desired) / 2;
	16160	+ object.clickInfo.bounds.width -= width - desired;
	16161	+ object.clickInfo.bounds.x += (width - desired) / 2;
15826	16162	} else
15827	16163	{
15828	16164	int desired = (int) ((double) width / renderCamera.aspect);
15829		- info.bounds.height -= height - desired;
15830		- info.bounds.y += (height - desired) / 2;
	16165	+ object.clickInfo.bounds.height -= height - desired;
	16166	+ object.clickInfo.bounds.y += (height - desired) / 2;
15831	16167	}
15832	16168	}
15833	16169
15834		- info.g = gr;
15835		- info.camera = renderCamera;
	16170	+ object.clickInfo.g = gr;
	16171	+ object.clickInfo.camera = renderCamera;
15836	16172	/*
15837	16173	// Memory intensive (brep.verticescopy)
15838	16174	if (!(object instanceof Composite))
15839	16175	object.draw(info, 0, false); // SLOW :
15840	16176	*/
15841		- if (!isRenderer)
	16177	+ if (!isRenderer) // && drag)
15842	16178	{
15843	16179	Grafreed.Assert(object != null);
15844	16180	Grafreed.Assert(object.selection != null);
..	..	@@ -15846,9 +16182,9 @@
15846	16182	{
15847	16183	int hitSomething = object.selection.get(0).hitSomething;
15848	16184
15849		- info.DX = 0;
15850		- info.DY = 0;
15851		- info.W = 1;
	16185	+ object.clickInfo.DX = 0;
	16186	+ object.clickInfo.DY = 0;
	16187	+ object.clickInfo.W = 1;
15852	16188	if (hitSomething == Object3D.hitCenter)
15853	16189	{
15854	16190	info.DX = X;
..	..	@@ -15860,13 +16196,14 @@
15860	16196	info.DY -= info.bounds.height/2;
15861	16197	}
15862	16198
15863		- object.drawEditHandles(info, 0);
	16199	+ object.drawEditHandles(//info,
	16200	+ 0);
15864	16201
15865	16202	if (drag && (X != 0 \|\| Y != 0))
15866	16203	{
15867	16204	switch (hitSomething)
15868	16205	{
15869		- case Object3D.hitCenter: gr.setColor(Color.pink);
	16206	+ case Object3D.hitCenter: gr.setColor(Color.white);
15870	16207	gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15871	16208	break;
15872	16209	case Object3D.hitRotate: gr.setColor(Color.yellow);
..	..	@@ -15892,7 +16229,7 @@
15892	16229	if (hasMarquee)
15893	16230	{
15894	16231	gr.setXORMode(Color.white);
15895		- gr.setColor(Color.red);
	16232	+ gr.setColor(Color.white);
15896	16233	if (!firstime)
15897	16234	{
15898	16235	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -16359,6 +16696,8 @@
16359	16696	private /static/ boolean firstime;
16360	16697	private /static/ cVector newView = new cVector();
16361	16698	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16699	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16700	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
16362	16701	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16363	16702	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16364	16703	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16371,29 +16710,67 @@
16371	16710	{
16372	16711	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16373	16712
	16713	+ int usedsuf = 0;
	16714	+
16374	16715	for (int i = 0; i < suffixes.length; i++)
16375	16716	{
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)
	16717	+ String[] suffixe = suffixes;
	16718	+ String[] fallback = suffixes2;
	16719	+ String[] fallfallback = suffixes3;
	16720	+
	16721	+ for (int c=usedsuf; --c>=0;)
16381	16722	{
16382		- throw new IOException("Unable to load texture " + resourceName);
	16723	+// String[] temp = suffixe;
	16724	+// suffixe = fallback;
	16725	+// fallback = fallfallback;
	16726	+// fallfallback = temp;
16383	16727	}
	16728	+
	16729	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16730	+ TextureData data;
	16731	+
	16732	+ try
	16733	+ {
	16734	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16735	+ mipmapped,
	16736	+ FileUtil.getFileSuffix(resourceName));
	16737	+ }
	16738	+ catch (Exception e)
	16739	+ {
	16740	+ try
	16741	+ {
	16742	+ resourceName = basename + fallback[i] + "." + suffix;
	16743	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16744	+ mipmapped,
	16745	+ FileUtil.getFileSuffix(resourceName));
	16746	+ }
	16747	+ catch (Exception e2)
	16748	+ {
	16749	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16750	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16751	+ mipmapped,
	16752	+ FileUtil.getFileSuffix(resourceName));
	16753	+ }
	16754	+ }
	16755	+
16384	16756	//System.out.println("Target = " + targets[i]);
16385	16757	cubemap.updateImage(data, targets[i]);
16386	16758	}
16387	16759
16388	16760	return cubemap;
16389	16761	}
	16762	+
16390	16763	int bigsphere = -1;
16391	16764
16392	16765	float BGcolor = 0.5f;
16393	16766
16394		- private void DrawSkyBox(GL gl)
	16767	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16768	+
	16769	+ private void DrawSkyBox(GL gl, float ratio)
16395	16770	{
16396		- if (envyoff \|\| cubemap == null)
	16771	+ if (//envyoff \|\|
	16772	+ WIREFRAME \|\|
	16773	+ cubemap == null)
16397	16774	{
16398	16775	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16399	16776	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -16408,7 +16785,17 @@
16408	16785	// Compensates for ExaminerViewer's modification of modelview matrix
16409	16786	gl.glMatrixMode(GL.GL_MODELVIEW);
16410	16787	gl.glLoadIdentity();
	16788	+ gl.glScalef(1,ratio,1);
16411	16789
	16790	+// colorV[0] = 2;
	16791	+// colorV[1] = 2;
	16792	+// colorV[2] = 2;
	16793	+// colorV[3] = 1;
	16794	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16795	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16796	+//
	16797	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16798	+
16412	16799	//gl.glActiveTexture(GL.GL_TEXTURE1);
16413	16800	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16414	16801
..	..	@@ -16440,6 +16827,7 @@
16440	16827	{
16441	16828	gl.glScalef(1.0f, -1.0f, 1.0f);
16442	16829	}
	16830	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16443	16831	gl.glMultMatrixd(viewrot_1, 0);
16444	16832	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16445	16833	//viewer.updateInverseRotation(gl);
..	..	@@ -16480,7 +16868,8 @@
16480	16868	gl.glDisable(GL.GL_TEXTURE_GEN_R);
16481	16869
16482	16870	cubemap.disable();
16483		- ////cubemap.unbind();
	16871	+ //cubemap.dispose();
	16872	+
16484	16873	if (CULLFACE)
16485	16874	{
16486	16875	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -16698,7 +17087,7 @@
16698	17087	//new Exception().printStackTrace();
16699	17088	System.out.println("select buffer init");
16700	17089	// Use debug pipeline
16701		- drawable.setGL(new DebugGL(drawable.getGL()));
	17090	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16702	17091
16703	17092	GL gl = drawable.getGL();
16704	17093
..	..	@@ -17016,6 +17405,7 @@
17016	17405
17017	17406	public void init(GLAutoDrawable drawable)
17018	17407	{
	17408	+ if (Globals.DEBUG)
17019	17409	System.out.println("shadow buffer init");
17020	17410
17021	17411	GL gl = drawable.getGL();
..	..	@@ -17244,10 +17634,14 @@
17244	17634	gl.glFlush();
17245	17635
17246	17636	/**/
17247		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
	17637	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
17248	17638
17249		- float[] pixels = occlusionsizebuffer.array();
	17639	+ float[] depths = occlusiondepthbuffer.array();
17250	17640
	17641	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
	17642	+
	17643	+ int[] pixels = selectsizebuffer.array();
	17644	+
17251	17645	double r = 0, g = 0, b = 0;
17252	17646
17253	17647	double count = 0;
..	..	@@ -17258,7 +17652,7 @@
17258	17652
17259	17653	double FACTOR = 1;
17260	17654
17261		- for (int i = 0; i < pixels.length; i++)
	17655	+ for (int i = 0; i < depths.length; i++)
17262	17656	{
17263	17657	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
17264	17658	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -17341,7 +17735,7 @@
17341	17735
17342	17736	double scale = ray.z; // 1; // cos
17343	17737
17344		- float depth = pixels[newindex];
	17738	+ float depth = depths[newindex];
17345	17739
17346	17740	/*
17347	17741	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -17538,11 +17932,14 @@
17538	17932	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17539	17933	static IntBuffer bigAAbuffer;
17540	17934	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17541		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	17935	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17542	17936	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17543	17937	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17544	17938	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17545		- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17939	+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17940	+
	17941	+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17942	+
17546	17943	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17547	17944	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17548	17945	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();