~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -1,4 +1,5 @@
1	1
	2	+import com.bulletphysics.dynamics.RigidBody;
2	3	import java.awt.*;
3	4	import java.awt.event.*;
4	5	import java.awt.image.*;
..	..	@@ -18,7 +19,10 @@
18	19	import javax.imageio.ImageIO;
19	20	import javax.imageio.ImageWriteParam;
20	21	import javax.imageio.ImageWriter;
	22	+import javax.imageio.ImageReadParam;
	23	+import javax.imageio.ImageReader;
21	24	import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
	25	+import javax.imageio.stream.ImageInputStream;
22	26	import javax.imageio.stream.ImageOutputStream;
23	27	import javax.imageio.ImageWriteParam;
24	28
..	..	@@ -30,6 +34,7 @@
30	34	import java.nio.*;
31	35
32	36	import gleem.linalg.Mat4f;
	37	+import javax.imageio.ImageTypeSpecifier;
33	38
34	39	class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
35	40	{
..	..	@@ -44,6 +49,39 @@
44	49	static boolean ABORTED = false;
45	50
46	51	static int STEP = 1;
	52	+
	53	+ private static BufferedImage CreateBim(byte[] bytes, int width, int height)
	54	+ {
	55	+ int[] pixels = new int[bytes.length/3];
	56	+ for (int i=pixels.length; --i>=0;)
	57	+ {
	58	+ int i3 = i*3;
	59	+ pixels[i] = 0xFF;
	60	+ pixels[i] <<= 8;
	61	+ pixels[i] \|= bytes[i3+2] & 0xFF;
	62	+ pixels[i] <<= 8;
	63	+ pixels[i] \|= bytes[i3+1] & 0xFF;
	64	+ pixels[i] <<= 8;
	65	+ pixels[i] \|= bytes[i3] & 0xFF;
	66	+ }
	67	+ /*
	68	+ int r=0,g=0,b=0,a=0;
	69	+ for (int i=0; i<width; i++)
	70	+ for (int j=0; j<height; j++)
	71	+ {
	72	+ int index = j*width+i;
	73	+ int p = pixels[index];
	74	+ a = ((p>>24) & 0xFF);
	75	+ r = ((p>>16) & 0xFF);
	76	+ g = ((p>>8) & 0xFF);
	77	+ b = (p & 0xFF);
	78	+ pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
	79	+ }
	80	+ /**/
	81	+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
	82	+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	83	+ return rendImage;
	84	+ }
47	85
48	86	/static/ private boolean CULLFACE = false; // true;
49	87	/static/ boolean NEAREST = false; // true;
..	..	@@ -60,7 +98,7 @@
60	98	//boolean REDUCETEXTURE = true;
61	99	boolean CACHETEXTURE = true;
62	100	boolean CLEANCACHE = false; // true;
63		- boolean MIPMAP = false; // true;
	101	+ boolean MIPMAP = false; // true; // never works...
64	102	boolean COMPRESSTEXTURE = false;
65	103	boolean KOMPACTTEXTURE = false; // true;
66	104	boolean RESIZETEXTURE = false;
..	..	@@ -73,7 +111,11 @@
73	111	//private Mat4f spotlightTransform = new Mat4f();
74	112	//private Mat4f spotlightInverseTransform = new Mat4f();
75	113	static GLContext glcontext = null;
76		- /static/ com.sun.opengl.util.texture.Texture cubemap;
	114	+ /static/ com.sun.opengl.util.texture.Texture cubemap; // Either custom or rgb
	115	+ /static/ com.sun.opengl.util.texture.Texture cubemapcustom;
	116	+ /static/ com.sun.opengl.util.texture.Texture cubemaprgb;
	117	+ boolean transformMode;
	118	+
77	119	boolean reverseUP = false;
78	120	static boolean frozen = false;
79	121	boolean enablebackspace = false; // patch for back buffer refresh
..	..	@@ -82,7 +124,7 @@
82	124	static boolean LOCALTRANSFORM = false;
83	125	static boolean FULLSCREEN = false;
84	126	static boolean SUPPORT = true;
85		-static boolean INERTIA = true;
	127	+static boolean INERTIA = false; // true;
86	128	static boolean FAST = false;
87	129	static boolean SLOWPOSE = false;
88	130	static boolean FOOTCONTACT = true;
..	..	@@ -93,7 +135,7 @@
93	135	static boolean ZOOMBOXMODE = false;
94	136	static boolean BOXMODE = false;
95	137	static boolean IMAGEFLIP = false;
96		-static boolean SMOOTHFOCUS = false;
	138	+static boolean SMOOTHFOCUS = true; // false;
97	139	static boolean SPEAKERMOCAP = true; // jan 2014 false;
98	140	static boolean SPEAKERCAMERA = false;
99	141	static boolean SPEAKERFOCUS = false;
..	..	@@ -127,16 +169,16 @@
127	169
128	170
129	171	// OPTIONS
130		- boolean Skinshader = true;
	172	+ boolean Skinshader = false; // true;
131	173	boolean cameraLight = false;
132	174	boolean UVdebug = false;
133	175	boolean Udebug = false;
134	176	boolean Vdebug = false;
135	177	boolean NORMALdebug = false;
136		- static boolean doublesided = false; // true; // reversed normals are awful for conformance
	178	+ static boolean doublesided = true; // false; // reversed normals are awful for conformance
137	179	boolean anisotropy = true;
138	180	boolean softshadow = true; // slower but better false;
139		- boolean opacityhalo = false;
	181	+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
140	182
141	183	boolean macromode = false;
142	184
..	..	@@ -150,6 +192,19 @@
150	192	}
151	193
152	194	private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	195	+
	196	+ public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	197	+ {
	198	+ try
	199	+ {
	200	+ return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	201	+ } catch (IOException e)
	202	+ {
	203	+ System.out.println("NAME = " + name);
	204	+ e.printStackTrace(); // throw new RuntimeException(e);
	205	+ return null;
	206	+ }
	207	+ }
153	208
154	209	void SetAsGLRenderer(boolean b)
155	210	{
..	..	@@ -167,9 +222,10 @@
167	222	cameras = new Camera[2];
168	223	targetLookAts = new cVector[2];
169	224
170		- SetCamera(cam);
	225	+ SetCamera(cam, true);
171	226
172		- SetLight(new Camera(new cVector(10, 10, -20)));
	227	+ // Warning: not used.
	228	+ //SetLight(new Camera(new cVector(15, 10, -20)));
173	229
174	230	object = o;
175	231
..	..	@@ -194,7 +250,7 @@
194	250
195	251	public javax.media.opengl.GL GetGL0()
196	252	{
197		- return null;
	253	+ return currentGL;
198	254	}
199	255
200	256	public int GenList()
..	..	@@ -487,7 +543,8 @@
487	543	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
488	544	LA.vecCross(obj.v0, obj.v1, obj.v2);
489	545	LA.vecNormalize(obj.v2);
490		- gl.glNormal3f((float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
	546	+
	547	+ SetGLNormal(gl, (float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
491	548	}
492	549
493	550	// P
..	..	@@ -509,7 +566,7 @@
509	566	y += ny * obj.NORMALPUSH;
510	567	z += nz * obj.NORMALPUSH;
511	568
512		- gl.glNormal3f(nx, ny, nz);
	569	+ SetGLNormal(gl, nx, ny, nz);
513	570	}
514	571	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
515	572	SetColor(obj, pv);
..	..	@@ -541,7 +598,7 @@
541	598	y += ny * obj.NORMALPUSH;
542	599	z += nz * obj.NORMALPUSH;
543	600
544		- gl.glNormal3f(nx, ny, nz);
	601	+ SetGLNormal(gl, nx, ny, nz);
545	602	}
546	603	//System.out.println("vertexq = " + qv.s + ", " + qv.t);
547	604	// boolean locked = false;
..	..	@@ -589,7 +646,7 @@
589	646	y += ny * obj.NORMALPUSH;
590	647	z += nz * obj.NORMALPUSH;
591	648
592		- gl.glNormal3f(nx, ny, nz);
	649	+ SetGLNormal(gl, nx, ny, nz);
593	650	}
594	651
595	652	// if ((dot&4) == 0)
..	..	@@ -825,7 +882,7 @@
825	882	//// tris.postdraw(this);
826	883	}
827	884
828		- static Camera localcamera = new Camera();
	885	+ static Camera localAOcamera = new Camera();
829	886	static cVector from = new cVector();
830	887	static cVector to = new cVector();
831	888
..	..	@@ -834,7 +891,7 @@
834	891	CameraPane cp = this;
835	892
836	893	Camera keep = cp.RenderCamera();
837		- cp.renderCamera = localcamera;
	894	+ cp.renderCamera = localAOcamera;
838	895
839	896	if (br.trimmed)
840	897	{
..	..	@@ -852,7 +909,7 @@
852	909	br.positions[i3 + 2] + br.normals[i3 + 2]);
853	910	LA.xformPos(from, transform, from);
854	911	LA.xformPos(to, transform, to); // RIGID ONLY
855		- localcamera.setAim(from, to);
	912	+ localAOcamera.setAim(from, to);
856	913
857	914	CameraPane.occlusionbuffer.display();
858	915
..	..	@@ -886,7 +943,7 @@
886	943	to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
887	944	LA.xformPos(from, transform, from);
888	945	LA.xformPos(to, transform, to); // RIGID ONLY
889		- localcamera.setAim(from, to);
	946	+ localAOcamera.setAim(from, to);
890	947
891	948	CameraPane.occlusionbuffer.display();
892	949
..	..	@@ -1195,10 +1252,10 @@
1195	1252	{
1196	1253	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1197	1254	{
1198		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1255	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1199	1256	} else
1200	1257	{
1201		- gl.glNormal3f(0, 0, 1);
	1258	+ SetGLNormal(gl, 0, 0, 1);
1202	1259	}
1203	1260
1204	1261	if (c != null)
..	..	@@ -1222,10 +1279,10 @@
1222	1279	{
1223	1280	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1224	1281	{
1225		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1282	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1226	1283	} else
1227	1284	{
1228		- gl.glNormal3f(0, 0, 1);
	1285	+ SetGLNormal(gl, 0, 0, 1);
1229	1286	}
1230	1287	if (c != null)
1231	1288	{
..	..	@@ -1250,10 +1307,10 @@
1250	1307	{
1251	1308	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1252	1309	{
1253		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1310	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1254	1311	} else
1255	1312	{
1256		- gl.glNormal3f(0, 0, 1);
	1313	+ SetGLNormal(gl, 0, 0, 1);
1257	1314	}
1258	1315	if (c != null)
1259	1316	{
..	..	@@ -1435,7 +1492,7 @@
1435	1492	{
1436	1493	if (!selectmode)
1437	1494	{
1438		- gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1495	+ SetGLNormal(gl, (float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
1439	1496	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
1440	1497
1441	1498	if (flipV)
..	..	@@ -1447,6 +1504,8 @@
1447	1504	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1448	1505	}
1449	1506
	1507	+ float[] colorV = new float[4];
	1508	+
1450	1509	void SetColor(Object3D obj, Vertex p0)
1451	1510	{
1452	1511	CameraPane display = this;
..	..	@@ -1471,7 +1530,7 @@
1471	1530	}
1472	1531	}
1473	1532	float b = 0;
1474		- if (obj.support != null && obj.link2master)
	1533	+ if (obj.support != null && obj.Link2Support())
1475	1534	{
1476	1535	b = 1;
1477	1536	}
..	..	@@ -1514,8 +1573,6 @@
1514	1573	{
1515	1574	return;
1516	1575	}
1517		-
1518		- float[] colorV = new float[3];
1519	1576
1520	1577	if (false) // marked)
1521	1578	{
..	..	@@ -1764,7 +1821,7 @@
1764	1821
1765	1822	display.modelParams7[0] = 0;
1766	1823	display.modelParams7[1] = 1000;
1767		- display.modelParams7[2] = 0;
	1824	+ display.modelParams7[2] = material.parallax;
1768	1825	display.modelParams7[3] = 0;
1769	1826
1770	1827	//display.modelParams6[0] = 100; // criss de bug de bump
..	..	@@ -1997,9 +2054,9 @@
1997	2054	switch(viewcode)
1998	2055	{
1999	2056	case 0: return "main";
2000		- case 1: return "one";
2001		- case 2: return "two";
2002		- case 3: return "three";
	2057	+ case 1: return "Red";
	2058	+ case 2: return "Green";
	2059	+ case 3: return "Blue";
2003	2060	case 4: return "light";
2004	2061	}
2005	2062
..	..	@@ -2008,7 +2065,7 @@
2008	2065
2009	2066	static int camerachangeframe;
2010	2067
2011		- public boolean SetCamera(Camera cam)
	2068	+ public boolean SetCamera(Camera cam, boolean set)
2012	2069	{
2013	2070	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
2014	2071	// return false;
..	..	@@ -2026,7 +2083,8 @@
2026	2083
2027	2084	camerachangeframe = Globals.framecount;
2028	2085
2029		- cam.hAspect = -1; // Read only
	2086	+ if (cam != null)
	2087	+ cam.hAspect = -1; // Read only
2030	2088
2031	2089	cameras[0] = cam;
2032	2090	targetLookAts[0] = new cVector(cam.lookAt);
..	..	@@ -2036,11 +2094,14 @@
2036	2094	{
2037	2095	cameras[i] = new Camera(cam.viewCode);
2038	2096	}
2039		-
2040		- cameras[i].setAim(cam.location, cam.lookAt);
2041		- cameras[i].shaper_fovy = cam.shaper_fovy;
2042		- cameras[i].UP.set(cam.UP);
2043		- targetLookAts[i] = new cVector(cameras[i].lookAt);
	2097	+
	2098	+ if (set)
	2099	+ {
	2100	+ cameras[i].setAim(cam.location, cam.lookAt);
	2101	+ cameras[i].shaper_fovy = cam.shaper_fovy;
	2102	+ cameras[i].UP.set(cam.UP);
	2103	+ targetLookAts[i] = new cVector(cameras[i].lookAt);
	2104	+ }
2044	2105	}
2045	2106	cameracount = 0;
2046	2107	targetLookAt = targetLookAts[cameracount];
..	..	@@ -2049,7 +2110,7 @@
2049	2110	// Start with free camera
2050	2111	SwitchCameras(true);
2051	2112
2052		- pingthread.jump = true; // optional?
	2113	+// pingthread.jump = true; // optional?
2053	2114
2054	2115	if (TRACKONCE)
2055	2116	{
..	..	@@ -2065,7 +2126,7 @@
2065	2126	//System.err.println("Oeil on");
2066	2127	OEIL = true;
2067	2128	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2068		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2129	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2069	2130	//pingthread.StepToTarget(true);
2070	2131	}
2071	2132
..	..	@@ -2236,18 +2297,6 @@
2236	2297	public void ToggleTrack()
2237	2298	{
2238	2299	TRACK ^= true;
2239		- if (TRACK)
2240		- {
2241		- if (object.selection != null &&
2242		- object.selection.size() > 0 &&
2243		- object.selection.elementAt(0) != null &&
2244		- !(object.selection.elementAt(0) instanceof Camera) &&
2245		- !(object.selection.elementAt(0) instanceof ScriptNode))
2246		- {
2247		- trackedobject = object.selection.elementAt(0);
2248		- repaint();
2249		- }
2250		- }
2251	2300
2252	2301	repaint();
2253	2302	}
..	..	@@ -2298,10 +2347,17 @@
2298	2347	HANDLES ^= true;
2299	2348	}
2300	2349
	2350	+ Object3D paintFolder;
	2351	+
2301	2352	void TogglePaint()
2302	2353	{
2303	2354	PAINTMODE ^= true;
2304	2355	paintcount = 0;
	2356	+
	2357	+ if (PAINTMODE)
	2358	+ {
	2359	+ paintFolder = GetFolder();
	2360	+ }
2305	2361	}
2306	2362
2307	2363	void SwapCamera(int a, int b)
..	..	@@ -2332,7 +2388,8 @@
2332	2388	{
2333	2389	//System.out.println("PROTECTION = " + cam.hAspect);
2334	2390	//assert (cam.hAspect == 0);
2335		- cam.hAspect = 0;
	2391	+ if (cam != null)
	2392	+ cam.hAspect = 0;
2336	2393	lightCamera = cam;
2337	2394	}
2338	2395
..	..	@@ -2398,126 +2455,31 @@
2398	2455	return currentGL;
2399	2456	}
2400	2457
2401		- private void GetRemoteZip(String url, String name, boolean unzip, boolean save)
	2458	+ static private BufferedImage CreateBim(TextureData texturedata)
2402	2459	{
2403		- java.net.URL u;
2404		- InputStream is = null;
2405		- DataInputStream dis;
2406		- java.util.zip.ZipInputStream zis;
2407		- //String s;
	2460	+ Grafreed.Assert(texturedata != null);
	2461	+
	2462	+ int width = texturedata.getWidth();
	2463	+ int height = texturedata.getHeight();
	2464	+
	2465	+ Buffer buffer = texturedata.getBuffer();
	2466	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2467	+
	2468	+ byte[] bytes = bytebuf.array();
	2469	+
	2470	+ return CreateBim(bytes, width, height);
	2471	+ }
2408	2472
2409		- System.out.println("GetRemoteZip " + name);
2410		-
2411		- int total = 0; // dis.available();
	2473	+ private void SetGLNormal(javax.media.opengl.GL gl, float nx, float ny, float nz)
	2474	+ {
	2475	+ gl.glNormal3f(nx, ny, nz);
2412	2476
2413		- byte[] bytes = new byte[16384];
2414		-
2415		- try
2416		- {
2417		- u = new java.net.URL(url + name);
2418		- is = u.openStream();
2419		-
2420		- System.out.println(url + name);
2421		-
2422		- if (unzip)
2423		- {
2424		- //dis = new DataInputStream(new BufferedInputStream(is));
2425		- zis = new java.util.zip.ZipInputStream(new BufferedInputStream(is));
2426		- //while ((s = dis.readLine()) != null)
2427		-
2428		- if (save)
2429		- new java.io.File(name).mkdirs();
2430		-
2431		- // FileOutputStream stream = new FileOutputStream("test.zip");
2432		- //
2433		- // int count;
2434		- //
2435		- // while ((count = dis.read(bytes)) != -1)
2436		- // {
2437		- // //System.out.println(s);
2438		- // System.out.println(count);
2439		- // total += count;
2440		- // stream.write(bytes);
2441		- // }
2442		- //
2443		- // stream.close();
2444		-
2445		- // now iterate through each item in the stream. The get next
2446		- // entry call will return a ZipEntry for each file in the
2447		- // stream
2448		- java.util.zip.ZipEntry entry;
2449		- while((entry = zis.getNextEntry())!=null)
2450		- {
2451		- if (entry.getName().endsWith(".gsm"))
2452		- {
2453		- continue;
2454		- }
2455		-
2456		- String s = String.format("Entry: %s len %d added %TD",
2457		- entry.getName(), entry.getSize(),
2458		- new java.util.Date(entry.getTime()));
2459		- System.out.println(s);
2460		-
2461		- if (save)
2462		- {
2463		- // Once we get the entry from the stream, the stream is
2464		- // positioned read to read the raw data, and we keep
2465		- // reading until read returns 0 or less.
2466		- String outpath = name + "/" + entry.getName();
2467		- FileOutputStream output = null;
2468		- try
2469		- {
2470		- output = new FileOutputStream(outpath);
2471		- int len = 0;
2472		- while ((len = zis.read(bytes)) > 0)
2473		- {
2474		- output.write(bytes, 0, len);
2475		- }
2476		- }
2477		- finally
2478		- {
2479		- // we must always close the output file
2480		- if(output!=null) output.close();
2481		- }
2482		- }
2483		- }
2484		- }
2485		- }
2486		- catch (java.net.MalformedURLException mue)
2487		- {
2488		- System.err.println("Ouch - a MalformedURLException happened.");
2489		- mue.printStackTrace();
2490		- //System.exit(2);
2491		- }
2492		- catch (IOException ioe)
2493		- {
2494		- //System.err.println("Oops - an IOException happened.");
2495		- //ioe.printStackTrace();
2496		- //System.exit(3);
2497		- }
2498		- finally
2499		- {
2500		- try
2501		- {
2502		- if (is != null)
2503		- is.close();
2504		- }
2505		- catch (IOException ioe)
2506		- {
2507		- }
2508		- }
2509		-
2510		- // System.out.println("length = " + total);
2511		-
2512		-// try
2513		-// {
2514		-// Runtime.getRuntime().exec("/usr/local/bin/wget https://archive3d.net/?a=download&do=get&id=7caca905");
2515		-// }
2516		-// catch (Exception e)
2517		-// {
2518		-// e.printStackTrace();
2519		-// }
2520		-
	2477	+ if (ny > 0.9 \|\| ny < -0.9)
	2478	+ // Ground or ceiling
	2479	+ gl.glVertexAttrib3f(4, 1, 0, 0);
	2480	+ else
	2481	+ // Walls
	2482	+ gl.glVertexAttrib3f(4, 0, 1, 0);
2521	2483	}
2522	2484
2523	2485	/**/
..	..	@@ -2528,28 +2490,31 @@
2528	2490
2529	2491	int resolution;
2530	2492
2531		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2493	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2532	2494	{
2533		- texture = tex;
	2495	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2496	+ texturedata = texdata;
2534	2497	resolution = res;
2535	2498	}
2536	2499	}
2537	2500	/**/
2538	2501
2539	2502	// TEXTURE static Texture texture;
2540		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2541		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2542		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2503	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2504	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2505	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2506	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2507	+
2543	2508	int pigmentdepth = 0;
2544	2509	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2545	2510	int bumpdepth = 0;
2546	2511	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2547	2512	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2548	2513	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2549		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2514	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2550	2515	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2551	2516
2552		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2517	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2553	2518	{
2554	2519	TextureData texturedata = null;
2555	2520
..	..	@@ -2559,7 +2524,7 @@
2559	2524	com.sun.opengl.util.texture.TextureIO.newTextureData(
2560	2525	getClass().getClassLoader().getResourceAsStream(name),
2561	2526	true,
2562		- com.sun.opengl.util.texture.TextureIO.PNG);
	2527	+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
2563	2528	} catch (java.io.IOException e)
2564	2529	{
2565	2530	throw new javax.media.opengl.GLException(e);
..	..	@@ -2568,13 +2533,34 @@
2568	2533	if (bump)
2569	2534	texturedata = ConvertBump(texturedata, false);
2570	2535
2571		- com.sun.opengl.util.texture.Texture texture =
2572		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2536	+// com.sun.opengl.util.texture.Texture texture =
	2537	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2573	2538
2574		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2575		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2539	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2540	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2576	2541
2577		- return texture;
	2542	+ return texturedata;
	2543	+ }
	2544	+
	2545	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2546	+ {
	2547	+ TextureData texturedata = null;
	2548	+
	2549	+ try
	2550	+ {
	2551	+ texturedata =
	2552	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2553	+ bim,
	2554	+ true);
	2555	+ } catch (Exception e)
	2556	+ {
	2557	+ throw new javax.media.opengl.GLException(e);
	2558	+ }
	2559	+
	2560	+ if (bump)
	2561	+ texturedata = ConvertBump(texturedata, false);
	2562	+
	2563	+ return texturedata;
2578	2564	}
2579	2565
2580	2566	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3604,6 +3590,8 @@
3604	3590	};
3605	3591	/**/
3606	3592
	3593	+ static Object3D lastObject;
	3594	+
3607	3595	//com.sun.opengl.util.texture.Texture
3608	3596	TextureData
3609	3597	GetFileTexture(String name, boolean bump, int resolution)
..	..	@@ -3640,6 +3628,8 @@
3640	3628	// return null;
3641	3629	//if (i == 2)
3642	3630	// return null;
	3631	+ // TIFF issue sept 2019
	3632	+ System.err.println("lastObject = " + lastObject);
3643	3633	e.printStackTrace();
3644	3634	name = name.split("\\.tif")[0] + ".jpg";
3645	3635	}
..	..	@@ -3647,6 +3637,8 @@
3647	3637
3648	3638	System.out.println("LOADING TEXTURE : " + name);
3649	3639
	3640	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3641	+
3650	3642	//
3651	3643	if (false) // compressbit > 0)
3652	3644	{
..	..	@@ -6970,30 +6962,30 @@
6970	6962	short residu = 0;
6971	6963
6972	6964	// wraparound workarounds
6973		- short fuck = (short) (buffer[i] & 0xFF);
	6965	+ short ww = (short) (buffer[i] & 0xFF);
6974	6966	/*
6975		- residu += (fuck%2);
6976		- if(fuck/2 < 256-residu/2)
	6967	+ residu += (ww%2);
	6968	+ if(ww/2 < 256-residu/2)
6977	6969	{
6978		- fuck = (short)((fuck/2) + residu/2);
	6970	+ ww = (short)((ww/2) + residu/2);
6979	6971	if(residu == 2)
6980	6972	residu = 0;
6981	6973	}
6982	6974	else
6983	6975	{
6984	6976	residu = 0;
6985		- fuck /= 2;
	6977	+ ww /= 2;
6986	6978	}
6987	6979	*/
6988		- if (i < imglength / 3 \|\| rnd.nextFloat() < 0.5 \|\| fuck >= 254)
	6980	+ if (i < imglength / 3 \|\| rnd.nextFloat() < 0.5 \|\| ww >= 254)
6989	6981	{
6990		- fuck /= 2;
	6982	+ ww /= 2;
6991	6983	} else
6992	6984	{
6993		- fuck = (short) ((fuck / 2) + fuck % 2);
	6985	+ ww = (short) ((ww / 2) + ww % 2);
6994	6986	}
6995	6987
6996		- buffer[i] = (byte) fuck;
	6988	+ buffer[i] = (byte) ww;
6997	6989	}
6998	6990	//System.out.print(bytes[i] + " ");
6999	6991	//if(buffer[i] >= 0 && buffer[i]<=eps-1) buffer[i] = eps;
..	..	@@ -8045,7 +8037,7 @@
8045	8037	String pigment = Object3D.GetPigment(tex);
8046	8038	String bump = Object3D.GetBump(tex);
8047	8039
8048		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8040	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8049	8041	{
8050	8042	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
8051	8043	// System.out.println("; bump = " + bump);
..	..	@@ -8060,8 +8052,8 @@
8060	8052	pigment = null;
8061	8053	}
8062	8054
8063		- ReleaseTexture(bump, true);
8064		- ReleaseTexture(pigment, false);
	8055	+ ReleaseTexture(tex, true);
	8056	+ ReleaseTexture(tex, false);
8065	8057	}
8066	8058
8067	8059	public void ReleasePigmentTexture(cTexture tex) // INTERFACE
..	..	@@ -8079,7 +8071,7 @@
8079	8071
8080	8072	String pigment = Object3D.GetPigment(tex);
8081	8073
8082		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8074	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8083	8075	{
8084	8076	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
8085	8077	// System.out.println("; bump = " + bump);
..	..	@@ -8090,7 +8082,7 @@
8090	8082	pigment = null;
8091	8083	}
8092	8084
8093		- ReleaseTexture(pigment, false);
	8085	+ ReleaseTexture(tex, false);
8094	8086	}
8095	8087
8096	8088	public void ReleaseBumpTexture(cTexture tex) // INTERFACE
..	..	@@ -8108,7 +8100,7 @@
8108	8100
8109	8101	String bump = Object3D.GetBump(tex);
8110	8102
8111		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8103	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8112	8104	{
8113	8105	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
8114	8106	// System.out.println("; bump = " + bump);
..	..	@@ -8119,10 +8111,10 @@
8119	8111	bump = null;
8120	8112	}
8121	8113
8122		- ReleaseTexture(bump, true);
	8114	+ ReleaseTexture(tex, true);
8123	8115	}
8124	8116
8125		- void ReleaseTexture(String tex, boolean bump)
	8117	+ void ReleaseTexture(cTexture tex, boolean bump)
8126	8118	{
8127	8119	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8128	8120	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8133,7 +8125,7 @@
8133	8125	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
8134	8126
8135	8127	if (tex != null)
8136		- texture = textures.get(tex);
	8128	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
8137	8129
8138	8130	// //assert( texture != null );
8139	8131	// if (texture == null)
..	..	@@ -8227,47 +8219,50 @@
8227	8219
8228	8220	/boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
8229	8221	{
8230		- if (// DrawMode() != 0 \|\| /tex == null \|\|/
8231		- ambientOcclusion ) // \|\| !textureon)
8232		- {
8233		- return; // false;
8234		- }
8235		-
8236		- if (tex == null)
8237		- {
8238		- BindTexture(null,false,resolution);
8239		- BindTexture(null,true,resolution);
8240		- return;
8241		- }
	8222	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8223	+// ambientOcclusion ) // \|\| !textureon)
	8224	+// {
	8225	+// return; // false;
	8226	+// }
	8227	+//
	8228	+// if (tex == null)
	8229	+// {
	8230	+// BindTexture(null,false,resolution);
	8231	+// BindTexture(null,true,resolution);
	8232	+// return;
	8233	+// }
	8234	+//
	8235	+// String pigment = Object3D.GetPigment(tex);
	8236	+// String bump = Object3D.GetBump(tex);
	8237	+//
	8238	+// usedtextures.add(pigment);
	8239	+// usedtextures.add(bump);
	8240	+//
	8241	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8242	+// {
	8243	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8244	+// // System.out.println("; bump = " + bump);
	8245	+// }
	8246	+//
	8247	+// if (bump.equals(""))
	8248	+// {
	8249	+// bump = null;
	8250	+// }
	8251	+// if (pigment.equals(""))
	8252	+// {
	8253	+// pigment = null;
	8254	+// }
	8255	+//
	8256	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8257	+// BindTexture(pigment, false, resolution);
	8258	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8259	+// BindTexture(bump, true, resolution);
	8260	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8261	+//
	8262	+// return; // true;
8242	8263
8243		- String pigment = Object3D.GetPigment(tex);
8244		- String bump = Object3D.GetBump(tex);
8245		-
8246		- usedtextures.put(pigment, pigment);
8247		- usedtextures.put(bump, bump);
8248		-
8249		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8250		- {
8251		- // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8252		- // System.out.println("; bump = " + bump);
8253		- }
8254		-
8255		- if (bump.equals(""))
8256		- {
8257		- bump = null;
8258		- }
8259		- if (pigment.equals(""))
8260		- {
8261		- pigment = null;
8262		- }
8263		-
8264		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8265		- BindTexture(pigment, false, resolution);
8266		- GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8267		- BindTexture(bump, true, resolution);
8268		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8269		-
8270		- return; // true;
	8264	+ BindPigmentTexture(tex, resolution);
	8265	+ BindBumpTexture(tex, resolution);
8271	8266	}
8272	8267
8273	8268	/boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8286,9 +8281,9 @@
8286	8281
8287	8282	String pigment = Object3D.GetPigment(tex);
8288	8283
8289		- usedtextures.put(pigment, pigment);
	8284	+ usedtextures.add(tex);
8290	8285
8291		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8286	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8292	8287	{
8293	8288	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8294	8289	// System.out.println("; bump = " + bump);
..	..	@@ -8300,7 +8295,7 @@
8300	8295	}
8301	8296
8302	8297	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8303		- BindTexture(pigment, false, resolution);
	8298	+ BindTexture(tex, false, resolution);
8304	8299	}
8305	8300
8306	8301	/boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
..	..	@@ -8319,9 +8314,9 @@
8319	8314
8320	8315	String bump = Object3D.GetBump(tex);
8321	8316
8322		- usedtextures.put(bump, bump);
	8317	+ usedtextures.add(tex);
8323	8318
8324		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8319	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8325	8320	{
8326	8321	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8327	8322	// System.out.println("; bump = " + bump);
..	..	@@ -8333,7 +8328,7 @@
8333	8328	}
8334	8329
8335	8330	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8336		- BindTexture(bump, true, resolution);
	8331	+ BindTexture(tex, true, resolution);
8337	8332	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8338	8333	}
8339	8334
..	..	@@ -8357,13 +8352,19 @@
8357	8352	return fileExists;
8358	8353	}
8359	8354
8360		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
	8355	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
8361	8356	{
8362		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8357	+ CacheTexture texturecache = null;
8363	8358
8364	8359	if (tex != null)
8365	8360	{
8366		- String texname = tex;
	8361	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8362	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
	8363	+
	8364	+ if (texname.equals("") && texdata == null)
	8365	+ {
	8366	+ return null;
	8367	+ }
8367	8368
8368	8369	String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
8369	8370
..	..	@@ -8373,19 +8374,46 @@
8373	8374	// else
8374	8375	// if (!texname.startsWith("/"))
8375	8376	// texname = "/Users/nbriere/Textures/" + texname;
8376		- if (!FileExists(tex))
	8377	+ if (!FileExists(texname) && !texname.startsWith("@"))
8377	8378	{
8378	8379	texname = fallbackTextureName;
8379	8380	}
8380	8381
8381	8382	if (CACHETEXTURE)
8382		- texture = textures.get(texname); // TEXTURE CACHE
8383		-
8384		- TextureData texturedata = null;
8385		-
8386		- if (texture == null \|\| texture.resolution < resolution)
8387	8383	{
8388		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8384	+ if (texdata == null)
	8385	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8386	+ else
	8387	+ texturecache = bimtextures.get(texdata);
	8388	+ }
	8389	+
	8390	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8391	+ {
	8392	+ TextureData texturedata = null;
	8393	+
	8394	+ if (texdata != null && textureon)
	8395	+ {
	8396	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8397	+
	8398	+ try
	8399	+ {
	8400	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8401	+ }
	8402	+ catch (Exception e)
	8403	+ {
	8404	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8405	+ }
	8406	+
	8407	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8408	+ bimtextures.put(texdata, texturecache);
	8409	+
	8410	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8411	+
	8412	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8413	+ //bim2 = bim;
	8414	+ }
	8415	+ else
	8416	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
8389	8417	{
8390	8418	assert(!bump);
8391	8419	// if (bump)
..	..	@@ -8396,19 +8424,23 @@
8396	8424	// }
8397	8425	// else
8398	8426	// {
8399		- texture = textures.get(tex);
8400		- if (texture == null)
	8427	+ // texturecache = textures.get(texname); // suspicious
	8428	+ if (texturecache == null)
8401	8429	{
8402		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8430	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8403	8431	}
	8432	+ else
	8433	+ new Exception().printStackTrace();
8404	8434	// }
8405	8435	} else
8406		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8436	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8407	8437	{
8408	8438	assert(bump);
8409		- texture = textures.get(tex);
8410		- if (texture == null)
8411		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8439	+ // texturecache = textures.get(texname); // suspicious
	8440	+ if (texturecache == null)
	8441	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8442	+ else
	8443	+ new Exception().printStackTrace();
8412	8444	} else
8413	8445	{
8414	8446	//if (tex.equals("IMMORTAL"))
..	..	@@ -8416,11 +8448,22 @@
8416	8448	// texture = GetResourceTexture("default.png");
8417	8449	//} else
8418	8450	//{
8419		- if (tex.equals("WHITE_NOISE"))
	8451	+ if (texname.endsWith("WHITE_NOISE"))
8420	8452	{
8421		- texture = textures.get(tex);
8422		- if (texture == null)
8423		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8453	+ // texturecache = textures.get(texname); // suspicious
	8454	+ if (texturecache == null)
	8455	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.jpg", bump),resolution);
	8456	+ else
	8457	+ new Exception().printStackTrace();
	8458	+ } else
	8459	+ {
	8460	+ if (texname.startsWith("@") && textureon)
	8461	+ {
	8462	+ // texturecache = textures.get(texname); // suspicious
	8463	+ if (texturecache == null)
	8464	+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
	8465	+ else
	8466	+ new Exception().printStackTrace();
8424	8467	} else
8425	8468	{
8426	8469	if (textureon)
..	..	@@ -8479,19 +8522,20 @@
8479	8522	if (texturedata == null)
8480	8523	throw new Exception();
8481	8524
8482		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8525	+ texturecache = new CacheTexture(texturedata,resolution);
8483	8526	//texture = GetTexture(tex, bump);
8484	8527	}
	8528	+ }
8485	8529	}
8486	8530	//}
8487	8531	}
8488	8532
8489		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8533	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8490	8534	{
8491	8535	//return false;
8492	8536
8493	8537	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8494		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8538	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8495	8539	{
8496	8540	// String ext = "_highres";
8497	8541	// if (REDUCETEXTURE)
..	..	@@ -8508,52 +8552,17 @@
8508	8552	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8509	8553	if (!cachefile.exists())
8510	8554	{
8511		- // cache to disk
8512		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8513		- //buffers[0].
8514		-
8515		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8516		- int[] pixels = new int[bytebuf.capacity()/3];
8517		-
8518		- // squared size heuristic...
8519		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8555	+ //if (texturedata.getWidth() == texturedata.getHeight())
8520	8556	{
8521		- for (int i=pixels.length; --i>=0;)
8522		- {
8523		- int i3 = i*3;
8524		- pixels[i] = 0xFF;
8525		- pixels[i] <<= 8;
8526		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8527		- pixels[i] <<= 8;
8528		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8529		- pixels[i] <<= 8;
8530		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8531		- }
8532		-
8533		- /*
8534		- int r=0,g=0,b=0,a=0;
8535		- for (int i=0; i<width; i++)
8536		- for (int j=0; j<height; j++)
8537		- {
8538		- int index = j*width+i;
8539		- int p = pixels[index];
8540		- a = ((p>>24) & 0xFF);
8541		- r = ((p>>16) & 0xFF);
8542		- g = ((p>>8) & 0xFF);
8543		- b = (p & 0xFF);
8544		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8545		- }
8546		- /**/
8547		- int width = (int)Math.sqrt(pixels.length); // squared
8548		- int height = width;
8549		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8550		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8557	+ BufferedImage rendImage = CreateBim(texturedata);
	8558	+
8551	8559	ImageWriter writer = null;
8552	8560	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8553	8561	if (iter.hasNext()) {
8554	8562	writer = (ImageWriter)iter.next();
8555	8563	}
8556		- float compressionQuality = 0.9f;
	8564	+
	8565	+ float compressionQuality = 0.85f;
8557	8566	try
8558	8567	{
8559	8568	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8570,18 +8579,20 @@
8570	8579	}
8571	8580	}
8572	8581	}
8573		-
	8582	+
	8583	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8584	+
8574	8585	//System.out.println("Texture = " + tex);
8575		- if (textures.containsKey(texname))
	8586	+ if (textures.containsKey(tex))
8576	8587	{
8577		- CacheTexture thetex = textures.get(texname);
	8588	+ CacheTexture thetex = textures.get(tex);
8578	8589	thetex.texture.disable();
8579	8590	thetex.texture.dispose();
8580		- textures.remove(texname);
	8591	+ textures.remove(tex);
8581	8592	}
8582	8593
8583		- texture.texturedata = texturedata;
8584		- textures.put(texname, texture);
	8594	+ //texture.texturedata = texturedata;
	8595	+ textures.put(tex, texturecache);
8585	8596
8586	8597	// newtex = true;
8587	8598	}
..	..	@@ -8597,10 +8608,46 @@
8597	8608	}
8598	8609	}
8599	8610
8600		- return texture;
	8611	+ return texturecache;
8601	8612	}
8602	8613
8603		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
	8614	+ static void EmbedTextures(cTexture tex)
	8615	+ {
	8616	+ if (tex.pigmentdata == null)
	8617	+ {
	8618	+ //String texname = Object3D.GetPigment(tex);
	8619	+
	8620	+ CacheTexture texturecache = texturepigment.get(tex);
	8621	+
	8622	+ if (texturecache != null)
	8623	+ {
	8624	+ tex.pw = texturecache.texturedata.getWidth();
	8625	+ tex.ph = texturecache.texturedata.getHeight();
	8626	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8627	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8628	+ ;
	8629	+ //, tex.pw, tex.ph), 0.5f);
	8630	+ }
	8631	+ }
	8632	+
	8633	+ if (tex.bumpdata == null)
	8634	+ {
	8635	+ //String texname = Object3D.GetBump(tex);
	8636	+
	8637	+ CacheTexture texturecache = texturebump.get(tex);
	8638	+
	8639	+ if (texturecache != null)
	8640	+ {
	8641	+ tex.bw = texturecache.texturedata.getWidth();
	8642	+ tex.bh = texturecache.texturedata.getHeight();
	8643	+ tex.bumpdata = //CompressJPEG(CreateBim(
	8644	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array();
	8645	+ //, tex.bw, tex.bh), 0.5f);
	8646	+ }
	8647	+ }
	8648	+ }
	8649	+
	8650	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
8604	8651	{
8605	8652	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8606	8653
..	..	@@ -8618,21 +8665,21 @@
8618	8665	return texture!=null?texture.texture:null;
8619	8666	}
8620	8667
8621		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
	8668	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8622	8669	{
8623	8670	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8624	8671
8625	8672	return texture!=null?texture.texturedata:null;
8626	8673	}
8627	8674
8628		- boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
	8675	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8629	8676	{
8630	8677	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8631	8678	{
8632	8679	return false;
8633	8680	}
8634	8681
8635		- boolean newtex = false;
	8682	+ //boolean newtex = false;
8636	8683
8637	8684	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8638	8685
..	..	@@ -8664,9 +8711,75 @@
8664	8711	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8665	8712	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8666	8713
8667		- return newtex;
	8714	+ return true; // Warning: not used.
8668	8715	}
8669	8716
	8717	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8718	+ {
	8719	+ try
	8720	+ {
	8721	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8722	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8723	+ ImageWriter writer = writers.next();
	8724	+
	8725	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8726	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8727	+ param.setCompressionQuality(quality);
	8728	+
	8729	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8730	+ writer.setOutput(ios);
	8731	+ writer.write(null, new IIOImage(image, null, null), param);
	8732	+
	8733	+ byte[] data = baos.toByteArray();
	8734	+ writer.dispose();
	8735	+ return data;
	8736	+ }
	8737	+ catch (Exception e)
	8738	+ {
	8739	+ e.printStackTrace();
	8740	+ return null;
	8741	+ }
	8742	+ }
	8743	+
	8744	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8745	+ {
	8746	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8747	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8748	+ ImageReader reader = writers.next();
	8749	+
	8750	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8751	+
	8752	+ ImageReadParam param = reader.getDefaultReadParam();
	8753	+ param.setDestination(bim);
	8754	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8755	+
	8756	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8757	+ reader.setInput(ios);
	8758	+ BufferedImage bim2 = reader.read(0, param);
	8759	+ reader.dispose();
	8760	+
	8761	+// WritableRaster raster = bim2.getRaster();
	8762	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8763	+// byte[] bytes = data.getData();
	8764	+//
	8765	+// int[] pixels = new int[bytes.length/3];
	8766	+// for (int i=pixels.length; --i>=0;)
	8767	+// {
	8768	+// int i3 = i*3;
	8769	+// pixels[i] = 0xFF;
	8770	+// pixels[i] <<= 8;
	8771	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8772	+// pixels[i] <<= 8;
	8773	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8774	+// pixels[i] <<= 8;
	8775	+// pixels[i] \|= bytes[i3] & 0xFF;
	8776	+// }
	8777	+//
	8778	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8779	+
	8780	+ return bim;
	8781	+ }
	8782	+
8670	8783	ShadowBuffer shadowPBuf;
8671	8784	AntialiasBuffer antialiasPBuf;
8672	8785	int MAXSTACK;
..	..	@@ -8683,10 +8796,12 @@
8683	8796
8684	8797	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8685	8798	MAXSTACK = temp[0];
8686		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8799	+ if (Globals.DEBUG)
	8800	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8687	8801	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8688	8802	MAXSTACK = temp[0];
8689		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8803	+ if (Globals.DEBUG)
	8804	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8690	8805
8691	8806	// Use debug pipeline
8692	8807	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8694,7 +8809,8 @@
8694	8809	gl = drawable.getGL(); //
8695	8810
8696	8811	GL gl3 = getGL();
8697		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8812	+ if (Globals.DEBUG)
	8813	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8698	8814
8699	8815
8700	8816	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8859,7 +8975,7 @@
8859	8975
8860	8976	if (cubemap == null)
8861	8977	{
8862		- LoadEnvy(5);
	8978	+ //LoadEnvy(1);
8863	8979	}
8864	8980
8865	8981	//cubemap.enable();
..	..	@@ -9135,6 +9251,8 @@
9135	9251
9136	9252	void LoadEnvy(int which)
9137	9253	{
	9254	+ assert(false);
	9255	+
9138	9256	String name;
9139	9257	String ext;
9140	9258
..	..	@@ -9146,37 +9264,58 @@
9146	9264	cubemap = null;
9147	9265	return;
9148	9266	case 1:
9149		- name = "cubemaps/box_";
9150		- ext = "png";
	9267	+ name = "cubemaps/rgb/";
	9268	+ ext = "jpg";
9151	9269	reverseUP = false;
9152	9270	break;
9153	9271	case 2:
9154		- name = "cubemaps/uffizi_";
9155		- ext = "png";
9156		- break; // reverseUP = true; break;
	9272	+ name = "cubemaps/uffizi/";
	9273	+ ext = "jpg";
	9274	+ reverseUP = false;
	9275	+ break;
9157	9276	case 3:
9158		- name = "cubemaps/CloudyHills_";
9159		- ext = "tga";
	9277	+ name = "cubemaps/CloudyHills/";
	9278	+ ext = "jpg";
9160	9279	reverseUP = false;
9161	9280	break;
9162	9281	case 4:
9163		- name = "cubemaps/cornell_";
	9282	+ name = "cubemaps/cornell/";
9164	9283	ext = "png";
9165	9284	reverseUP = false;
9166	9285	break;
	9286	+ case 5:
	9287	+ name = "cubemaps/skycube/";
	9288	+ ext = "jpg";
	9289	+ reverseUP = false;
	9290	+ break;
	9291	+ case 6:
	9292	+ name = "cubemaps/SaintLazarusChurch3/";
	9293	+ ext = "jpg";
	9294	+ reverseUP = false;
	9295	+ break;
	9296	+ case 7:
	9297	+ name = "cubemaps/Sodermalmsallen/";
	9298	+ ext = "jpg";
	9299	+ reverseUP = false;
	9300	+ break;
	9301	+ case 8:
	9302	+ name = "cubemaps/Sodermalmsallen2/";
	9303	+ ext = "jpg";
	9304	+ reverseUP = false;
	9305	+ break;
	9306	+ case 9:
	9307	+ name = "cubemaps/UnionSquare/";
	9308	+ ext = "jpg";
	9309	+ reverseUP = false;
	9310	+ break;
9167	9311	default:
9168		- name = "cubemaps/rgb_";
9169		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9312	+ name = "cubemaps/box/";
	9313	+ ext = "png"; /mipmap = true;/
	9314	+ reverseUP = false;
9170	9315	break;
9171	9316	}
9172		-
9173		- try
9174		- {
9175		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
9176		- } catch (IOException e)
9177		- {
9178		- throw new RuntimeException(e);
9179		- }
	9317	+
	9318	+ LoadSkybox(name, ext, mipmap);
9180	9319	}
9181	9320
9182	9321	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -9208,8 +9347,12 @@
9208	9347	static double[] model = new double[16];
9209	9348	double[] camera2light = new double[16];
9210	9349	double[] light2camera = new double[16];
9211		- int newenvy = -1;
9212		- boolean envyoff = true; // false;
	9350	+
	9351	+ //int newenvy = -1;
	9352	+ //boolean envyoff = false;
	9353	+
	9354	+ String loadedskyboxname;
	9355	+
9213	9356	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
9214	9357	//float[] light0 = { 0,0,0 };
9215	9358	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9627,7 +9770,7 @@
9627	9770
9628	9771	if (renderCamera != lightCamera)
9629	9772	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9630		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	9773	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9631	9774
9632	9775	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9633	9776
..	..	@@ -9643,7 +9786,7 @@
9643	9786
9644	9787	if (renderCamera != lightCamera)
9645	9788	//for (int count = parentcam.GetTransformCount(); --count>=0;)
9646		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	9789	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9647	9790
9648	9791	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9649	9792
..	..	@@ -9689,13 +9832,18 @@
9689	9832	rati = 1 / rati;
9690	9833	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9691	9834	}
9692		- assert (newenvy == -1);
	9835	+
	9836	+ //assert (newenvy == -1);
	9837	+
9693	9838	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9694	9839	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9695		- DrawSkyBox(gl);
	9840	+ DrawSkyBox(gl, (float)rati);
9696	9841	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9697	9842	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9698		- accPerspective(gl, renderCamera.shaper_fovy / ratio,
	9843	+
	9844	+ boolean vr = capsLocked && !lightMode;
	9845	+
	9846	+ accPerspective(gl, renderCamera.shaper_fovy / ratio * (vr ? 1.2 : 1),
9699	9847	ratio,
9700	9848	//near_plane, far_plane,
9701	9849	renderCamera.shaper_zNear * renderCamera.Distance(), renderCamera.shaper_zFar * renderCamera.Distance(),
..	..	@@ -10558,9 +10706,18 @@
10558	10706	static boolean init = false;
10559	10707
10560	10708	double[][] matrix = LA.newMatrix();
	10709	+
	10710	+ // This is to refresh the UI of the material panel.
	10711	+ ObjEditor patchMaterial;
10561	10712
10562	10713	public void display(GLAutoDrawable drawable)
10563	10714	{
	10715	+ if (patchMaterial.patchMaterial)
	10716	+ {
	10717	+ patchMaterial.patchMaterial = false;
	10718	+ patchMaterial.objectTabbedPane.setSelectedIndex(1);
	10719	+ }
	10720	+
10564	10721	if (Grafreed.savesound && Grafreed.hassound)
10565	10722	{
10566	10723	Grafreed.wav.save();
..	..	@@ -10604,7 +10761,9 @@
10604	10761	}
10605	10762	/**/
10606	10763
10607		- if (selection)
	10764	+ boolean control = ((modifiers & CTRL) != 0);
	10765	+
	10766	+ if (selection && (!Globals.isLIVE() \|\| control))
10608	10767	{
10609	10768	selectbuffer.display();
10610	10769	return;
..	..	@@ -10656,6 +10815,112 @@
10656	10815
10657	10816	if (DrawMode() == DEFAULT)
10658	10817	{
	10818	+ if (manipCamera == lightCamera)
	10819	+ {
	10820	+// switch (e.getKeyCode())
	10821	+// {
	10822	+// case DOWN_ARROW:
	10823	+// lightCamera.DECAL /= 2;
	10824	+// repaint();
	10825	+// break;
	10826	+// case UP_ARROW:
	10827	+// lightCamera.DECAL *= 2;
	10828	+// repaint();
	10829	+// break;
	10830	+// case LEFT_ARROW:
	10831	+// lightCamera.SCALE /= 2;
	10832	+// repaint();
	10833	+// break;
	10834	+// case RIGHT_ARROW:
	10835	+// lightCamera.SCALE *= 2;
	10836	+// repaint();
	10837	+// break;
	10838	+// default:
	10839	+// break;
	10840	+ if (keys[DOWN_ARROW])
	10841	+ {
	10842	+ lightCamera.DECAL /= 2;
	10843	+ }
	10844	+
	10845	+ if (keys[UP_ARROW])
	10846	+ {
	10847	+ lightCamera.DECAL *= 2;
	10848	+ }
	10849	+
	10850	+ if (keys[LEFT_ARROW])
	10851	+ {
	10852	+ lightCamera.SCALE /= 2;
	10853	+ }
	10854	+
	10855	+ if (keys[RIGHT_ARROW])
	10856	+ {
	10857	+ lightCamera.SCALE *= 2;
	10858	+ }
	10859	+ }
	10860	+ else
	10861	+ {
	10862	+ //pingthread.mute = true;
	10863	+
	10864	+ boolean keyon = false;
	10865	+
	10866	+ if (keys[DOWN_ARROW])
	10867	+ {
	10868	+ speed = ++speedkey[DOWN_ARROW];
	10869	+ if (speed > 20)
	10870	+ speed = 20;
	10871	+ GoDown(modifiers);
	10872	+ keyon = true;
	10873	+ }
	10874	+ else
	10875	+ speedkey[DOWN_ARROW] = 0;
	10876	+
	10877	+ if (keys[UP_ARROW])
	10878	+ {
	10879	+ speed = ++speedkey[UP_ARROW];
	10880	+ if (speed > 20)
	10881	+ speed = 20;
	10882	+ GoUp(modifiers);
	10883	+ keyon = true;
	10884	+ }
	10885	+ else
	10886	+ speedkey[UP_ARROW] = 0;
	10887	+
	10888	+ if (keys[LEFT_ARROW])
	10889	+ {
	10890	+ speed = ++speedkey[LEFT_ARROW];
	10891	+ if (speed > 20)
	10892	+ speed = 20;
	10893	+ GoLeft(modifiers);
	10894	+ keyon = true;
	10895	+ }
	10896	+ else
	10897	+ speedkey[LEFT_ARROW] = 0;
	10898	+
	10899	+ if (keys[RIGHT_ARROW])
	10900	+ {
	10901	+ speed = ++speedkey[RIGHT_ARROW];
	10902	+ if (speed > 20)
	10903	+ speed = 20;
	10904	+ GoRight(modifiers);
	10905	+ keyon = true;
	10906	+ }
	10907	+ else
	10908	+ speedkey[RIGHT_ARROW] = 0;
	10909	+
	10910	+ if (Globals.WALK && capsLocked)
	10911	+ {
	10912	+ Walk();
	10913	+ keyon = true;
	10914	+ }
	10915	+
	10916	+ if (keyon)
	10917	+ {
	10918	+ repaint();
	10919	+ }
	10920	+
	10921	+ //pingthread.mute = false;
	10922	+ }
	10923	+
10659	10924	currentlydrawing = true;
10660	10925	}
10661	10926
..	..	@@ -10729,7 +10994,7 @@
10729	10994
10730	10995	if (wait)
10731	10996	{
10732		- Sleep(500);
	10997	+ Sleep(200); // blocks everything
10733	10998
10734	10999	wait = false;
10735	11000	}
..	..	@@ -10844,7 +11109,7 @@
10844	11109	// if (parentcam != renderCamera) // not a light
10845	11110	if (cam != lightCamera)
10846	11111	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10847		- LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
	11112	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10848	11113
10849	11114	for (int j = 0; j < 4; j++)
10850	11115	{
..	..	@@ -10859,7 +11124,7 @@
10859	11124	// if (parentcam != renderCamera) // not a light
10860	11125	if (cam != lightCamera)
10861	11126	//for (int count = parentcam.GetTransformCount(); --count>=0;)
10862		- LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
	11127	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10863	11128
10864	11129	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10865	11130
..	..	@@ -10945,13 +11210,43 @@
10945	11210	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10946	11211	}
10947	11212
10948		- if (newenvy > -1)
	11213	+// if (newenvy > -1)
	11214	+// {
	11215	+// LoadEnvy(newenvy);
	11216	+// }
	11217	+//
	11218	+// newenvy = -1;
	11219	+
	11220	+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
10949	11221	{
10950		- LoadEnvy(newenvy);
	11222	+ if (cubemaprgb == null)
	11223	+ {
	11224	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
	11225	+ }
	11226	+
	11227	+ cubemap = cubemaprgb;
10951	11228	}
10952		-
10953		- newenvy = -1;
10954		-
	11229	+ else
	11230	+ {
	11231	+ if (object.skyboxname != null)
	11232	+ {
	11233	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11234	+ {
	11235	+ if (cubemap != null && cubemap != cubemaprgb)
	11236	+ cubemap.dispose();
	11237	+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11238	+ loadedskyboxname = object.skyboxname;
	11239	+ }
	11240	+ }
	11241	+ else
	11242	+ {
	11243	+ cubemapcustom = null;
	11244	+ loadedskyboxname = null;
	11245	+ }
	11246	+
	11247	+ cubemap = cubemapcustom;
	11248	+ }
	11249	+
10955	11250	ratio = ((double) getWidth()) / getHeight();
10956	11251	//System.out.println("ratio = " + ratio);
10957	11252
..	..	@@ -10967,7 +11262,7 @@
10967	11262
10968	11263	if (!IsFrozen() && !ambientOcclusion)
10969	11264	{
10970		- DrawSkyBox(gl);
	11265	+ DrawSkyBox(gl, (float)ratio);
10971	11266	}
10972	11267
10973	11268	//if (selection_view == -1)
..	..	@@ -11150,8 +11445,8 @@
11150	11445
11151	11446	gl.glMatrixMode(GL.GL_MODELVIEW);
11152	11447
11153		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
11154	11448	//gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11449	+//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
11155	11450	//gl.glEnable(gl.GL_MULTISAMPLE);
11156	11451	} else
11157	11452	{
..	..	@@ -11163,7 +11458,7 @@
11163	11458	//System.out.println("BLENDING ON");
11164	11459	gl.glEnable(GL.GL_BLEND);
11165	11460	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
11166		-
	11461	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
11167	11462	gl.glMatrixMode(gl.GL_PROJECTION);
11168	11463	gl.glLoadIdentity();
11169	11464
..	..	@@ -11213,7 +11508,10 @@
11213	11508	//gl.glOrtho(-BOOST, BOOST, -BOOST, BOOST, 0.001, 1000);
11214	11509	} else
11215	11510	{
11216		- glu.gluPerspective(cam.shaper_fovy / ratio, ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
	11511	+ boolean vr = capsLocked && !lightMode;
	11512	+
	11513	+ glu.gluPerspective(cam.shaper_fovy / ratio * (vr ? 1.2 : 1),
	11514	+ ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
11217	11515	}
11218	11516	}
11219	11517
..	..	@@ -11253,7 +11551,7 @@
11253	11551
11254	11552	// if (cam != lightCamera)
11255	11553	//for (int count = parentcam.GetTransformCount(); --count>=0;)
11256		- LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
	11554	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
11257	11555	}
11258	11556
11259	11557	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -11412,7 +11710,7 @@
11412	11710	}
11413	11711	}
11414	11712
11415		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11713	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11416	11714	{
11417	11715	//gl.glDepthFunc(GL.GL_LEQUAL);
11418	11716	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11420,24 +11718,21 @@
11420	11718
11421	11719	boolean texon = textureon;
11422	11720
11423		- if (RENDERPROGRAM > 0)
11424		- {
11425		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11426		- textureon = false;
11427		- }
	11721	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11722	+ textureon = false;
	11723	+
11428	11724	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11429	11725	//System.out.println("ALLO");
11430	11726	gl.glColorMask(false, false, false, false);
11431	11727	DrawObject(gl);
11432		- if (RENDERPROGRAM > 0)
11433		- {
11434		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11435		- textureon = texon;
11436		- }
	11728	+
	11729	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11730	+ textureon = texon;
	11731	+
11437	11732	gl.glColorMask(true, true, true, true);
11438	11733
11439	11734	gl.glDepthFunc(GL.GL_EQUAL);
11440		- //gl.glDepthMask(false);
	11735	+ gl.glDepthMask(false);
11441	11736	}
11442	11737
11443	11738	if (false) // DrawMode() == SHADOW)
..	..	@@ -11572,8 +11867,11 @@
11572	11867	repaint();
11573	11868	}
11574	11869
11575		- if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
	11870	+ if (Globals.isLIVE() && DrawMode() == DEFAULT \|\| pingthread.live) // may 2013
	11871	+ {
	11872	+ renderCamera.computeTransform();
11576	11873	repaint();
	11874	+ }
11577	11875
11578	11876	displaydone = true;
11579	11877	}
..	..	@@ -11648,9 +11946,23 @@
11648	11946	//GL gl = getGL();
11649	11947	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11650	11948	{
	11949	+ if (TRACK)
	11950	+ {
	11951	+ if (object.selection != null &&
	11952	+ object.selection.size() > 0 &&
	11953	+ object.selection.elementAt(0) != null &&
	11954	+ !(object.selection.elementAt(0) instanceof Camera) &&
	11955	+ !(object.selection.elementAt(0) instanceof ScriptNode))
	11956	+ {
	11957	+ trackedobject = object.selection.elementAt(0);
	11958	+ //repaint();
	11959	+ }
	11960	+ else
	11961	+ trackedobject = null;
	11962	+ }
11651	11963	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11652		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11653		- pingthread.StepToTarget(true); // true);
	11964	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11965	+ pingthread.StepToTarget(); // true);
11654	11966	// zoomonce = false;
11655	11967	}
11656	11968
..	..	@@ -11777,20 +12089,32 @@
11777	12089	ReleaseTextures(DEFAULT_TEXTURES);
11778	12090
11779	12091	if (CLEANCACHE)
11780		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	12092	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11781	12093	{
11782		- String tex = e.nextElement();
	12094	+ cTexture tex = e.nextElement();
11783	12095
11784	12096	// System.out.println("Texture --------- " + tex);
11785	12097
11786		- if (tex.equals("WHITE_NOISE"))
	12098	+ if (tex.equals("WHITE_NOISE:"))
11787	12099	continue;
11788	12100
11789		- if (!usedtextures.containsKey(tex))
	12101	+ if (!usedtextures.contains(tex))
11790	12102	{
	12103	+ CacheTexture gettex = texturepigment.get(tex);
11791	12104	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11792		- textures.get(tex).texture.dispose();
11793		- textures.remove(tex);
	12105	+ if (gettex != null)
	12106	+ {
	12107	+ gettex.texture.dispose();
	12108	+ texturepigment.remove(tex);
	12109	+ }
	12110	+
	12111	+ gettex = texturebump.get(tex);
	12112	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	12113	+ if (gettex != null)
	12114	+ {
	12115	+ gettex.texture.dispose();
	12116	+ texturebump.remove(tex);
	12117	+ }
11794	12118	}
11795	12119	}
11796	12120	}
..	..	@@ -12318,8 +12642,82 @@
12318	12642
12319	12643	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
12320	12644
12321		- String program =
	12645	+ String programmin =
	12646	+ // Min shader
12322	12647	"!!ARBfp1.0\n" +
	12648	+ "PARAM zero12t = { 0.0, 1.0, 2, 1.25 };" +
	12649	+ "PARAM pow_2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12650	+ "PARAM pow2 = { 2, 4, 8, 0.0 };" +
	12651	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12652	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12653	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12654	+ "PARAM light2cam0 = program.env[10];" +
	12655	+ "PARAM light2cam1 = program.env[11];" +
	12656	+ "PARAM light2cam2 = program.env[12];" +
	12657	+ "TEMP temp;" +
	12658	+ "TEMP light;" +
	12659	+ "TEMP ndotl;" +
	12660	+ "TEMP normal;" +
	12661	+ "TEMP depth;" +
	12662	+ "TEMP eye;" +
	12663	+ "TEMP pos;" +
	12664	+
	12665	+ "MAD normal, fragment.color, zero12t.z, -zero12t.y;" +
	12666	+ Normalize("normal") +
	12667	+ "MOV light, state.light[0].position;" +
	12668	+ "DP3 ndotl.x, light, normal;" +
	12669	+ "MAX ndotl.x, ndotl.x, zero12t.x;" +
	12670	+
	12671	+ // shadow
	12672	+ "MOV pos, fragment.texcoord[1];" +
	12673	+ "MOV temp, pos;" +
	12674	+ ShadowTextureFetch("depth", "temp", "1") +
	12675	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12676	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12677	+
	12678	+ // No shadow when out of frustum
	12679	+ //"SGE temp.y, depth.z, zero123.y;" +
	12680	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12681	+
	12682	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12683	+
	12684	+ // Backlit
	12685	+ "MOV pos.w, zero12t.y;" + // one
	12686	+ "DP4 eye.x, pos, light2cam0;" +
	12687	+ "DP4 eye.y, pos, light2cam1;" +
	12688	+ "DP4 eye.z, pos, light2cam2;" +
	12689	+ Normalize("eye") +
	12690	+
	12691	+ "DP3 ndotl.y, -eye, normal;" +
	12692	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12693	+ "POW ndotl.y, ndotl.y, pow2.x;" + // backlit
	12694	+ "SUB ndotl.y, zero12t.y, ndotl.y;" + // 1 - y
	12695	+ //"POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12696	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12697	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12698	+ "ADD ndotl.y, ndotl.y, one.x;" +
	12699	+ "MUL ndotl.y, ndotl.y, pow_2.x;" +
	12700	+
	12701	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12702	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12703	+
	12704	+ // Pigment
	12705	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12706	+ "LRP temp, zero12t.w, temp, one;" + // texture proportion
	12707	+ "MUL temp, temp, zero12t.w;" + // Times x
	12708	+
	12709	+ //"MUL temp, temp, ndotl.y;" +
	12710	+ "MAD ndotl.x, pow_2.xxxx, ndotl.yyyy, ndotl.x;" +
	12711	+
	12712	+ "MUL temp, temp, ndotl.x;" + // lambert
	12713	+
	12714	+ "MOV temp.w, zero12t.y;" + // reset alpha
	12715	+ "MOV result.color, temp;" +
	12716	+ "END";
	12717	+
	12718	+ String programmax =
	12719	+ "!!ARBfp1.0\n" +
	12720	+
12323	12721	//"OPTION ARB_fragment_program_shadow;" +
12324	12722	"PARAM light2cam0 = program.env[10];" +
12325	12723	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -12345,7 +12743,7 @@
12345	12743	"PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
12346	12744	"PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
12347	12745	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
12348		- "PARAM params7 = program.env[7];" + // noise power, opacity power
	12746	+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
12349	12747	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
12350	12748	"PARAM options1 = program.env[62];" + // fog rgb color
12351	12749	"PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
..	..	@@ -12434,8 +12832,7 @@
12434	12832	"TEMP shininess;" +
12435	12833	"\n" +
12436	12834	"MOV texSamp, one;" +
12437		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12438		-
	12835	+
12439	12836	"MOV mapgrid.x, one2048th.x;" +
12440	12837	"MOV temp, fragment.texcoord[1];" +
12441	12838	/*
..	..	@@ -12456,20 +12853,20 @@
12456	12853	"MUL temp, floor, mapgrid.x;" +
12457	12854	//"TEX depth0, temp, texture[1], 2D;" +
12458	12855	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12459		- TextureFetch("depth0", "temp", "1") +
	12856	+ ShadowTextureFetch("depth0", "temp", "1") +
12460	12857	"") +
12461	12858	"ADD temp.x, temp.x, mapgrid.x;" +
12462	12859	//"TEX depth1, temp, texture[1], 2D;" +
12463	12860	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12464		- TextureFetch("depth1", "temp", "1") +
	12861	+ ShadowTextureFetch("depth1", "temp", "1") +
12465	12862	"") +
12466	12863	"ADD temp.y, temp.y, mapgrid.x;" +
12467	12864	//"TEX depth2, temp, texture[1], 2D;" +
12468		- TextureFetch("depth2", "temp", "1") +
	12865	+ ShadowTextureFetch("depth2", "temp", "1") +
12469	12866	"SUB temp.x, temp.x, mapgrid.x;" +
12470	12867	//"TEX depth3, temp, texture[1], 2D;" +
12471	12868	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12472		- TextureFetch("depth3", "temp", "1") +
	12869	+ ShadowTextureFetch("depth3", "temp", "1") +
12473	12870	"") +
12474	12871	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12475	12872	//"MOV params, material;" +
..	..	@@ -12591,7 +12988,7 @@
12591	12988	"POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
12592	12989	// mar 2013 ??? "KIL alpha.a;" +
12593	12990	"MOV alpha, texSamp.aaaa;" + // y;" +
12594		- "KIL alpha.a;" +
	12991	+ "KIL alpha.a;" + // not sure with parallax mapping
12595	12992	/*
12596	12993	"MUL temp.xy, temp, two;" +
12597	12994	"TXB bump, temp, texture[0], 2D;" +
..	..	@@ -12677,11 +13074,6 @@
12677	13074	"SUB bump0, bump0, half;" +
12678	13075	"ADD bump, bump, bump0;" +
12679	13076
12680		- "MOV temp.x, texSamp.a;" +
12681		- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12682		- //"LRP texSamp0, params5.x, texSamp0, one;" +
12683		- "MOV texSamp.a, temp.x;" +
12684		-
12685	13077	// double-sided
12686	13078	/**/
12687	13079	(doublesided?"DP3 temp.z, normal, eye;" +
..	..	@@ -12691,26 +13083,73 @@
12691	13083	"ADD temp.x, temp.x, one.x;" +
12692	13084	"MUL normal, normal, temp.xxxx;":""
12693	13085	) +
12694		- /**/
12695		-//// Normalize("normal") +
12696		-//// "MAX normal.z, eps.x, normal.z;" +
12697		-// Normalize("normal") +
12698		- "MOV normald, normal;" +
12699		- "MOV normals, normal;" +
	13086	+ /**/
	13087	+
	13088	+ "MOV temp, fragment.texcoord[4];" +
12700	13089
12701	13090	// UV base
12702	13091	//"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
12703	13092	//"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
12704	13093	//"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
12705		- "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
12706		- "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
12707		- "DP3 UP.z,state.matrix.texture[7].row[2],Y;" +
	13094	+ "DP3 UP.x,state.matrix.texture[7].row[0],temp;" +
	13095	+ "DP3 UP.y,state.matrix.texture[7].row[1],temp;" +
	13096	+ "DP3 UP.z,state.matrix.texture[7].row[2],temp;" +
	13097	+ Normalize("UP") +
	13098	+
12708	13099	"XPD V, normal, UP;" +
12709	13100	Normalize("V") +
12710	13101	"XPD U, V, normal;" +
12711	13102	Normalize("U") +
12712	13103
	13104	+ "MOV temp, fragment.texcoord[0];" +
	13105	+
	13106	+// "MAD normal, -temp.x, U, normal;" +
	13107	+// "MAD normal, -temp.y, V, normal;" +
	13108	+// Normalize("normal") +
	13109	+
	13110	+//// "MAX normal.z, eps.x, normal.z;" +
	13111	+// Normalize("normal") +
	13112	+ "MOV normald, normal;" +
	13113	+ "MOV normals, normal;" +
	13114	+
12713	13115	// parallax mapping
	13116	+
	13117	+ "DP3 temp2.x, V, eye;" +
	13118	+ "DP3 temp2.y, U, eye;" +
	13119	+ "DP3 temp2.z, normal, eye;" +
	13120	+ "RCP temp2.z, temp2.z;" +
	13121	+
	13122	+ "DP3 temp2.w, texSamp, texSamp;" + // Height
	13123	+ "RSQ temp2.w, temp2.w;" +
	13124	+ "RCP temp2.w, temp2.w;" +
	13125	+
	13126	+ "SUB temp2.w, temp2.w, half;" +
	13127	+ // "SGE temp.x, temp2.w, eps.x;" +
	13128	+ // "MUL temp2.w, temp2.w, temp.x;" +
	13129	+
	13130	+ // "MOV texSamp, U;" +
	13131	+
	13132	+ "MUL temp2.z, temp2.z, temp2.w;" +
	13133	+ "MUL temp2.z, temp2.z, params7.z;" + // parallax
	13134	+
	13135	+ "MUL temp2, temp2, temp2.z;" +
	13136	+
	13137	+ "SUB temp, temp, temp2;" +
	13138	+
	13139	+ "TEX temp, temp, texture[0], 2D;" +
	13140	+ "POW temp.a, temp.a, params6.w;" + // punch through
	13141	+
	13142	+ "ADD texSamp, temp, texSamp;" +
	13143	+ "MUL texSamp.xyz, half, texSamp;" +
	13144	+
	13145	+ "MOV alpha, texSamp.aaaa;" +
	13146	+
	13147	+// parallax mapping
	13148	+
	13149	+ "MOV temp.x, texSamp.a;" +
	13150	+ "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
	13151	+ //"LRP texSamp0, params5.x, texSamp0, one;" +
	13152	+ "MOV texSamp.a, temp.x;" +
12714	13153
12715	13154	//"MOV temp, fragment.texcoord[0];" +
12716	13155	//
..	..	@@ -12840,10 +13279,10 @@
12840	13279	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12841	13280	"") +
12842	13281
12843		- // display shadow only (bump == 0)
	13282	+ // display shadow only (fakedepth == 0)
12844	13283	"SUB temp.x, half.x, shadow.x;" +
12845	13284	"MOV temp.y, -params5.z;" + // params6.x;" +
12846		- "SLT temp.z, temp.y, -one2048th.x;" +
	13285	+ "SLT temp.z, temp.y, -c256i.x;" +
12847	13286	"SUB temp.y, one.x, temp.z;" +
12848	13287	"MUL temp.x, temp.x, temp.y;" +
12849	13288	"KIL temp.x;" +
..	..	@@ -13174,8 +13613,19 @@
13174	13613	//once = true;
13175	13614	}
13176	13615
13177		- System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
13178		- System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13616	+ String program = programmax;
	13617	+
	13618	+ if (Globals.MINSHADER)
	13619	+ {
	13620	+ program = programmin;
	13621	+ }
	13622	+
	13623	+ if (Globals.DEBUG)
	13624	+ {
	13625	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
	13626	+ System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13627	+ }
	13628	+
13179	13629	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13180	13630
13181	13631	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13222,7 +13672,8 @@
13222	13672	"\n" +
13223	13673	"END\n";
13224	13674
13225		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13675	+ if (Globals.DEBUG)
	13676	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
13226	13677	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
13227	13678
13228	13679	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -13267,25 +13718,26 @@
13267	13718	return out;
13268	13719	}
13269	13720
13270		- String TextureFetch(String dest, String src, String unit)
	13721	+ // Also does frustum culling
	13722	+ String ShadowTextureFetch(String dest, String src, String unit)
13271	13723	{
13272	13724	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
13273	13725	"SGE " + src + ".w, " + src + ".x, eps.x;" +
13274	13726	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13727	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13728	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
13275	13729	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13276		- "SLT " + src + ".z, " + src + ".x, one.x;" +
13277		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
13278		- "SLT " + src + ".z, " + src + ".y, one.x;" +
13279		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13730	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13731	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
13280	13732	//"SWZ buffer, temp, w,w,w,w;";
13281		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13733	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
13282	13734	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
13283	13735	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
13284	13736	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
13285		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13737	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13286	13738
13287		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
13288		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13739	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13740	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
13289	13741	}
13290	13742
13291	13743	String Shadow(String depth, String shadow)
..	..	@@ -13332,7 +13784,7 @@
13332	13784	"SLT temp.x, temp.x, zero.x;" + // shadoweps
13333	13785	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13334	13786
13335		- // No shadow when out of frustrum
	13787	+ // No shadow when out of frustum
13336	13788	"SGE temp.x, " + depth + ".z, one.z;" +
13337	13789	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
13338	13790	"";
..	..	@@ -13479,7 +13931,7 @@
13479	13931	/static/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
13480	13932	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13481	13933	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13482		- /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
	13934	+ /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
13483	13935
13484	13936	//Object3D.cVector2[] vector2buffer;
13485	13937
..	..	@@ -13646,7 +14098,7 @@
13646	14098	"PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
13647	14099	"PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
13648	14100	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
13649		- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
	14101	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
13650	14102	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
13651	14103	"PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
13652	14104	//"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
..	..	@@ -13707,7 +14159,7 @@
13707	14159	"DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
13708	14160	"DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
13709	14161	"DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
13710		- //"MOV result.texcoord, vertex.texcoord;" +
	14162	+ //"MOV result.texcoord, vertex.fogcoord;" +
13711	14163	"MOV result.texcoord, temp;" +
13712	14164	// border fade
13713	14165	"MOV result.texcoord[3], vertex.texcoord;" +
..	..	@@ -13754,7 +14206,9 @@
13754	14206
13755	14207	//"ADD temp.z, temp.z, one;" +
13756	14208
13757		- "MOV result.color, temp;"
	14209	+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
	14210	+
	14211	+ "MOV result.color, temp;" // Normal
13758	14212	: "MOV result.color, vertex.color;") +
13759	14213	((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
13760	14214	: "") +
..	..	@@ -13889,6 +14343,7 @@
13889	14343	public void mouseClicked(MouseEvent e)
13890	14344	{
13891	14345	System.out.println("mouseClicked: " + e);
	14346	+ System.exit(0);
13892	14347	}
13893	14348
13894	14349	public void mousePressed(MouseEvent e)
..	..	@@ -13927,10 +14382,12 @@
13927	14382	return;
13928	14383	}
13929	14384
13930		- boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
	14385	+ //boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
	14386	+
	14387	+ boolean vr = capsLocked && !lightMode;
13931	14388
13932	14389	// TIMER
13933		- if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	14390	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !vr) // VR
13934	14391	{
13935	14392	keepboxmode = BOXMODE;
13936	14393	keepsupport = SUPPORT;
..	..	@@ -13971,7 +14428,7 @@
13971	14428	//}
13972	14429
13973	14430	SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
13974		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
	14431	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, e.getModifiers(), e.getModifiersEx());
13975	14432	anchorX = ax;
13976	14433	anchorY = ay;
13977	14434	prevX = px;
..	..	@@ -14065,9 +14522,10 @@
14065	14522
14066	14523	// fev 2014???
14067	14524	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
14068		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
14069		- pingthread.StepToTarget(true); // true);
	14525	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14526	+ pingthread.StepToTarget(); // true);
14070	14527	}
	14528	+
14071	14529	// if (!LIVE)
14072	14530	super.repaint();
14073	14531	}
..	..	@@ -14130,14 +14588,15 @@
14130	14588	drag = false;
14131	14589	//System.out.println("Mouse DOWN");
14132	14590	editObj = false;
14133		- ClickInfo info = new ClickInfo();
14134		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14135		- info.pane = this;
14136		- info.camera = renderCamera;
14137		- info.x = x;
14138		- info.y = y;
14139		- info.modifiers = modifiersex;
14140		- editObj = object.doEditClick(info, 0);
	14591	+ //ClickInfo info = new ClickInfo();
	14592	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14593	+ object.clickInfo.pane = this;
	14594	+ object.clickInfo.camera = renderCamera;
	14595	+ object.clickInfo.x = x;
	14596	+ object.clickInfo.y = y;
	14597	+ object.clickInfo.modifiers = modifiersex;
	14598	+ editObj = object.doEditClick(//info,
	14599	+ 0);
14141	14600	if (!editObj)
14142	14601	{
14143	14602	hasMarquee = true;
..	..	@@ -14161,8 +14620,8 @@
14161	14620
14162	14621	//if (drawing)
14163	14622	//return;
14164		- if ((e.getModifiersEx() & CTRL) != 0
14165		- \|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
	14623	+ if ((e.getModifiersEx() & CTRL) != 0 \|\|
	14624	+ (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
14166	14625	{
14167	14626	//System.out.println("mouseDragged: " + e);
14168	14627	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
..	..	@@ -14186,9 +14645,17 @@
14186	14645	return targetLookAt;
14187	14646	}
14188	14647
	14648	+ javax.vecmath.Point3d eye = new javax.vecmath.Point3d();
	14649	+ javax.vecmath.Point3d eye2 = new javax.vecmath.Point3d();
	14650	+ javax.vecmath.Vector3d dir = new javax.vecmath.Vector3d();
	14651	+
	14652	+
14189	14653	class PingThread extends Thread
14190	14654	{
14191	14655	boolean jump;
	14656	+ boolean live;
	14657	+
	14658	+ boolean mute = false;
14192	14659
14193	14660	// void JumpToTarget()
14194	14661	// {
..	..	@@ -14204,6 +14671,95 @@
14204	14671	// only one thread!? synchronized
14205	14672	void StepToTarget(boolean jump)
14206	14673	{
	14674	+ RigidBody.pos.x = 0;
	14675	+ RigidBody.pos.y = 0;
	14676	+ RigidBody.pos.z = 0;
	14677	+ if (RigidBody.justclicked)
	14678	+ {
	14679	+// RigidBody.pos.x = (float)manipCamera.lookAt.x;
	14680	+// RigidBody.pos.y = (float)manipCamera.lookAt.y;
	14681	+// RigidBody.pos.z = (float)manipCamera.lookAt.z;
	14682	+ // System.err.println("selected point = " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][1]) + " " + Trunk(selectedpoint.toParent[3][2]));
	14683	+ CreateSelectedPoint();
	14684	+
	14685	+ RigidBody.pos.x = (float)selectedpoint.toParent[3][0];
	14686	+ RigidBody.pos.y = (float)selectedpoint.toParent[3][1];
	14687	+ RigidBody.pos.z = (float)selectedpoint.toParent[3][2];
	14688	+
	14689	+ RigidBody.wind.set(RigidBody.pos);
	14690	+ RigidBody.wind.x -= (float)manipCamera.location.x;
	14691	+ RigidBody.wind.y -= (float)manipCamera.location.y;
	14692	+ RigidBody.wind.z -= (float)manipCamera.location.z;
	14693	+ RigidBody.wind.normalize();
	14694	+ }
	14695	+
	14696	+ if (mute)
	14697	+ return;
	14698	+
	14699	+ if (capsLocked && manipCamera.viewCode == 0)
	14700	+ {
	14701	+ eye.x = manipCamera.location.x;
	14702	+ eye.y = manipCamera.location.y + 0.25;
	14703	+ eye.z = manipCamera.location.z;
	14704	+
	14705	+ dir.y = -1;
	14706	+
	14707	+ Ray ray = new Ray(eye, dir);
	14708	+
	14709	+ IntersectResult res = new IntersectResult();
	14710	+ res.t = Double.POSITIVE_INFINITY;
	14711	+
	14712	+ tmp.set(targetLookAt);
	14713	+ tmp.sub(manipCamera.location);
	14714	+
	14715	+ double dist = tmp.length();
	14716	+
	14717	+ tmp.normalize();
	14718	+
	14719	+ eye2.x = manipCamera.location.x + tmp.x * 0.25;
	14720	+ eye2.y = manipCamera.location.y + 0.25;
	14721	+ eye2.z = manipCamera.location.z + tmp.z * 0.25;
	14722	+
	14723	+ Ray ray2 = new Ray(eye2, dir);
	14724	+
	14725	+ IntersectResult res2 = new IntersectResult();
	14726	+ res2.t = Double.POSITIVE_INFINITY;
	14727	+
	14728	+ if (object.intersect(ray, res) && object.intersect(ray2, res2) && Math.abs(res.t - res2.t) < 0.25)
	14729	+ {
	14730	+ //tmp.set(manipCamera.location);
	14731	+
	14732	+ manipCamera.location.x = ray.eyePoint.x + ray.viewDirection.x * res.t;
	14733	+ manipCamera.location.y = ray.eyePoint.y + ray.viewDirection.y * res.t + 0.5;
	14734	+ manipCamera.location.z = ray.eyePoint.z + ray.viewDirection.z * res.t;
	14735	+
	14736	+ //tmp.sub(manipCamera.location);
	14737	+
	14738	+ targetLookAt.x = ray2.eyePoint.x + ray2.viewDirection.x * res2.t;
	14739	+ targetLookAt.y = ray2.eyePoint.y + ray2.viewDirection.y * res2.t + 0.5;
	14740	+ targetLookAt.z = ray2.eyePoint.z + ray2.viewDirection.z * res2.t;
	14741	+
	14742	+ targetLookAt.sub(manipCamera.location);
	14743	+ targetLookAt.normalize();
	14744	+ targetLookAt.mul(dist);
	14745	+ targetLookAt.add(manipCamera.location);
	14746	+
	14747	+ //if (tmp.dot(tmp) > 0.000001)
	14748	+ // System.out.println("INTERSECTION " + manipCamera.location);
	14749	+
	14750	+ manipCamera.lookAt.set(targetLookAt);
	14751	+
	14752	+ tmp.x = res.n.x;
	14753	+ tmp.y = res.n.y;
	14754	+ tmp.z = res.n.z;
	14755	+ tmp.x += res2.n.x;
	14756	+ tmp.y += res2.n.y;
	14757	+ tmp.z += res2.n.z;
	14758	+ tmp.normalize();
	14759	+ manipCamera.UP.set(tmp);
	14760	+ }
	14761	+ }
	14762	+
14207	14763	tmp.set(targetLookAt);
14208	14764	tmp.sub(manipCamera.lookAt); // june 2014
14209	14765
..	..	@@ -14241,7 +14797,7 @@
14241	14797
14242	14798	if (tmp.dot(tmp) > 1) // may 2014. far away: jump to target
14243	14799	{
14244		- jump = true; // step = 1;
	14800	+ // sep 2019 jump = true; // step = 1;
14245	14801	}
14246	14802
14247	14803	if (OEILONCE && OEIL)
..	..	@@ -14276,7 +14832,10 @@
14276	14832	if (tmp.dot(tmp) < 0.00001)
14277	14833	{
14278	14834	zoomonce = false;
	14835	+ live = false;
14279	14836	}
	14837	+ else
	14838	+ live = true;
14280	14839
14281	14840	tmp.mul(step > step2 ? step : step2);
14282	14841	}
..	..	@@ -14303,7 +14862,7 @@
14303	14862	{
14304	14863	if (LOOKAT)
14305	14864	manipCamera.lookAt.add(tmp);
14306		- if (OEIL)
	14865	+ if (OEIL && !capsLocked)
14307	14866	manipCamera.location.add(tmp);
14308	14867
14309	14868	{
..	..	@@ -14318,7 +14877,10 @@
14318	14877	lightCamera.computeTransform();
14319	14878	}
14320	14879	}
14321		- manipCamera.computeTransform();
	14880	+ if (tmp.x != 0 \|\| tmp.y != 0 \|\| tmp.z != 0)
	14881	+ {
	14882	+ manipCamera.computeTransform();
	14883	+ }
14322	14884	}
14323	14885	// ?????? mouseDown = true;
14324	14886	//System.out.println("---------------- ---------- Paint " + tmp.length2());
..	..	@@ -14411,49 +14973,107 @@
14411	14973	}
14412	14974	}
14413	14975	}
	14976	+
14414	14977	PingThread pingthread = new PingThread();
14415		- int delta = 5;
14416		- int speed = 5;
	14978	+ int delta = 1;
	14979	+ int speed = 1;
	14980	+ int walk = 8;
14417	14981	boolean autorepeat = false;
14418	14982
	14983	+ void Walk()
	14984	+ {
	14985	+ manipCamera.BackForth(0, walk, 1000);
	14986	+
	14987	+ targetLookAt.set(manipCamera.lookAt);
	14988	+ }
	14989	+
	14990	+ void ViewAngle(float dy)
	14991	+ {
	14992	+ double factor = Math.exp(-dy/300.0); // (1 + dy/100);
	14993	+
	14994	+ if (manipCamera.shaper_fovy * factor > 1 &&
	14995	+ manipCamera.shaper_fovy * factor < 150)
	14996	+ {
	14997	+ manipCamera.shaper_fovy *= factor;
	14998	+ //System.out.println("fovy = " + shaper_fovy);
	14999	+ }
	15000	+ }
	15001	+
14419	15002	void GoDown(int mod)
14420	15003	{
14421	15004	MODIFIERS \|= COMMAND;
14422		- /*
	15005	+ boolean isVR = (mouseMode&VR)!=0;
	15006	+ /**/
14423	15007	if((mod&SHIFT) == SHIFT)
14424		- manipCamera.RotatePosition(0, -speed);
14425		- else
14426		- manipCamera.BackForth(0, -speed*delta, getWidth());
14427		- */
14428		- if ((mod & SHIFT) == SHIFT)
14429	15008	{
14430		- mouseMode = mouseMode; // VR??
14431		- } else
14432		- {
14433		- mouseMode \|= BACKFORTH;
	15009	+// if (isVR)
	15010	+// manipCamera.RotateInterest(0, speed);
	15011	+// else
	15012	+ if (isVR)
	15013	+ ViewAngle(-speed*delta);
	15014	+ else
	15015	+ manipCamera.Translate(0, -speed*delta, getWidth());
14434	15016	}
	15017	+ else
	15018	+ {
	15019	+ if (isVR)
	15020	+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
	15021	+ else
	15022	+ manipCamera.RotatePosition(0, -speed);
	15023	+ }
	15024	+
	15025	+ /**/
	15026	+// if ((mod & SHIFT) == SHIFT)
	15027	+// {
	15028	+// mouseMode = mouseMode; // VR??
	15029	+// } else
	15030	+// {
	15031	+// mouseMode \|= BACKFORTH;
	15032	+// }
14435	15033
	15034	+ targetLookAt.set(manipCamera.lookAt);
	15035	+
14436	15036	//prevX = X = anchorX;
14437	15037	prevY = Y = anchorY - (int) (renderCamera.Distance());
14438	15038	}
14439	15039
14440	15040	void GoUp(int mod)
14441	15041	{
	15042	+ RigidBody.justclicked = true;
	15043	+
14442	15044	MODIFIERS \|= COMMAND;
14443		- /*
	15045	+ /**/
	15046	+ boolean isVR = (mouseMode&VR)!=0;
	15047	+
14444	15048	if((mod&SHIFT) == SHIFT)
14445		- manipCamera.RotatePosition(0, speed);
14446		- else
14447		- manipCamera.BackForth(0, speed*delta, getWidth());
14448		- */
14449		- if ((mod & SHIFT) == SHIFT)
14450	15049	{
14451		- mouseMode = mouseMode;
14452		- } else
14453		- {
14454		- mouseMode \|= BACKFORTH;
	15050	+// if (isVR)
	15051	+// manipCamera.RotateInterest(0, -speed);
	15052	+// else
	15053	+ if (isVR)
	15054	+ ViewAngle(speed*delta);
	15055	+ else
	15056	+ manipCamera.Translate(0, speed*delta, getWidth());
14455	15057	}
	15058	+ else
	15059	+ {
	15060	+ if (isVR)
	15061	+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
	15062	+ else
	15063	+ manipCamera.RotatePosition(0, speed);
	15064	+ }
	15065	+
	15066	+ /**/
	15067	+// if ((mod & SHIFT) == SHIFT)
	15068	+// {
	15069	+// mouseMode = mouseMode;
	15070	+// } else
	15071	+// {
	15072	+// mouseMode \|= BACKFORTH;
	15073	+// }
14456	15074
	15075	+ targetLookAt.set(manipCamera.lookAt);
	15076	+
14457	15077	//prevX = X = anchorX;
14458	15078	prevY = Y = anchorY + (int) (renderCamera.Distance());
14459	15079	}
..	..	@@ -14461,20 +15081,31 @@
14461	15081	void GoLeft(int mod)
14462	15082	{
14463	15083	MODIFIERS \|= COMMAND;
14464		- /*
	15084	+ /**/
14465	15085	if((mod&SHIFT) == SHIFT)
14466		- manipCamera.RotatePosition(speed, 0);
	15086	+ manipCamera.Translate(speed, 0, getWidth());
14467	15087	else
14468		- manipCamera.Translate(speed*delta, 0, getWidth());
14469		- */
14470		- if ((mod & SHIFT) == SHIFT)
14471	15088	{
14472		- mouseMode = mouseMode;
14473		- } else
14474		- {
14475		- mouseMode \|= ROTATE;
14476		- } // TRANSLATE;
	15089	+ if ((mouseMode&VR)!=0)
	15090	+ manipCamera.RotateInterest(-speed*manipCamera.shaper_fovy/90, 0);
	15091	+ else
	15092	+ manipCamera.RotatePosition(speed*manipCamera.shaper_fovy/90, 0);
	15093	+ }
	15094	+
	15095	+ /**/
	15096	+// if ((mod & SHIFT) == SHIFT)
	15097	+// {
	15098	+// mouseMode = mouseMode;
	15099	+// } else
	15100	+// {
	15101	+// mouseMode \|= ROTATE;
	15102	+// } // TRANSLATE;
14477	15103
	15104	+ //System.err.println("lookAt = " + manipCamera.lookAt);
	15105	+ //System.err.println("location = " + manipCamera.location);
	15106	+
	15107	+ targetLookAt.set(manipCamera.lookAt);
	15108	+
14478	15109	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
14479	15110	prevY = Y = anchorY;
14480	15111	}
..	..	@@ -14482,20 +15113,28 @@
14482	15113	void GoRight(int mod)
14483	15114	{
14484	15115	MODIFIERS \|= COMMAND;
14485		- /*
	15116	+ /**/
14486	15117	if((mod&SHIFT) == SHIFT)
14487		- manipCamera.RotatePosition(-speed, 0);
	15118	+ manipCamera.Translate(-speed, 0, getWidth());
14488	15119	else
14489		- manipCamera.Translate(-speed*delta, 0, getWidth());
14490		- */
14491		- if ((mod & SHIFT) == SHIFT)
14492	15120	{
14493		- mouseMode = mouseMode;
14494		- } else
14495		- {
14496		- mouseMode \|= ROTATE;
14497		- } // TRANSLATE;
	15121	+ if ((mouseMode&VR)!=0)
	15122	+ manipCamera.RotateInterest(speed*manipCamera.shaper_fovy/90, 0);
	15123	+ else
	15124	+ manipCamera.RotatePosition(-speed*manipCamera.shaper_fovy/90, 0);
	15125	+ }
	15126	+
	15127	+ /**/
	15128	+// if ((mod & SHIFT) == SHIFT)
	15129	+// {
	15130	+// mouseMode = mouseMode;
	15131	+// } else
	15132	+// {
	15133	+// mouseMode \|= ROTATE;
	15134	+// } // TRANSLATE;
14498	15135
	15136	+ targetLookAt.set(manipCamera.lookAt);
	15137	+
14499	15138	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
14500	15139	prevY = Y = anchorY;
14501	15140	}
..	..	@@ -14537,15 +15176,16 @@
14537	15176	if (editObj)
14538	15177	{
14539	15178	drag = true;
14540		- ClickInfo info = new ClickInfo();
14541		- info.bounds.setBounds(0, 0,
	15179	+ //ClickInfo info = new ClickInfo();
	15180	+ object.clickInfo.bounds.setBounds(0, 0,
14542	15181	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14543		- info.pane = this;
14544		- info.camera = renderCamera;
14545		- info.x = x;
14546		- info.y = y;
14547		- object.GetWindow().copy
14548		- .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
	15182	+ object.clickInfo.pane = this;
	15183	+ object.clickInfo.camera = renderCamera;
	15184	+ object.clickInfo.x = x;
	15185	+ object.clickInfo.y = y;
	15186	+ object //.GetWindow().copy
	15187	+ .doEditDrag(//info,
	15188	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
14549	15189	} else
14550	15190	{
14551	15191	if (x < startX)
..	..	@@ -14628,6 +15268,11 @@
14628	15268	if ((mouseMode & ZOOM) != 0)
14629	15269	{
14630	15270	//if ((mouseMode & BACKFORTH) != 0)
	15271	+ if ((modifiersex & SHIFT) == SHIFT)
	15272	+ {
	15273	+ ViewAngle(dy);
	15274	+ }
	15275	+ else
14631	15276	if ((mouseMode & VR) != 0)
14632	15277	manipCamera.BackForth(dx, dy, getWidth());
14633	15278	else
..	..	@@ -14694,24 +15339,30 @@
14694	15339	}
14695	15340	}
14696	15341
	15342	+// ClickInfo clickInfo = new ClickInfo();
	15343	+
14697	15344	public void mouseMoved(MouseEvent e)
14698	15345	{
	15346	+//object.editWindow.frame.
	15347	+ setCursor(Cursor.getDefaultCursor());
	15348	+
14699	15349	//System.out.println("mouseMoved: " + e);
14700	15350	if (isRenderer)
14701	15351	return;
14702	15352
14703		- ClickInfo ci = new ClickInfo();
14704		- ci.x = e.getX();
14705		- ci.y = e.getY();
14706		- ci.modifiers = e.getModifiersEx();
14707		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14708		- ci.pane = this;
14709		- ci.camera = renderCamera;
	15353	+ // Mouse cursor feedback
	15354	+ object.clickInfo.x = e.getX();
	15355	+ object.clickInfo.y = e.getY();
	15356	+ object.clickInfo.modifiers = e.getModifiersEx();
	15357	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	15358	+ object.clickInfo.pane = this;
	15359	+ object.clickInfo.camera = renderCamera;
14710	15360	if (!isRenderer)
14711	15361	{
14712	15362	//ObjEditor editWindow = object.editWindow;
14713	15363	//Object3D copy = editWindow.copy;
14714		- if (object.doEditClick(ci, 0))
	15364	+ if (object.doEditClick(//clickInfo,
	15365	+ 0))
14715	15366	{
14716	15367	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14717	15368	} else
..	..	@@ -14723,10 +15374,17 @@
14723	15374
14724	15375	public void mouseReleased(MouseEvent e)
14725	15376	{
	15377	+ if (isRenderer && !movingcamera)
	15378	+ {
	15379	+ RigidBody.justclicked = true;
	15380	+ System.out.println("justclicked: " + e);
	15381	+ }
	15382	+
14726	15383	Globals.MOUSEDRAGGED = false;
14727	15384
14728	15385	movingcamera = false;
14729		- X = Y = 0;
	15386	+ X = 0; // getBounds().width/2;
	15387	+ Y = 0; // getBounds().height/2;
14730	15388	//System.out.println("mouseReleased: " + e);
14731	15389	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14732	15390	}
..	..	@@ -14878,8 +15536,10 @@
14878	15536	mouseMode \|= ZOOM;
14879	15537	}
14880	15538
14881		- boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14882		- if (capsLocked) // \|\| (modifiers & META) == META)
	15539	+ //boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
	15540	+ boolean vr = capsLocked && !lightMode;
	15541	+
	15542	+ if (vr) // \|\| (modifiers & META) == META)
14883	15543	{
14884	15544	mouseMode \|= VR; // BACKFORTH;
14885	15545	}
..	..	@@ -14891,7 +15551,8 @@
14891	15551	{
14892	15552	mouseMode \|= SELECT;
14893	15553	}
14894		- if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
	15554	+ if (//(modifiersex & SHIFT) == SHIFT \|\|
	15555	+ forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14895	15556	{
14896	15557	mouseMode &= ~VR;
14897	15558	mouseMode \|= TRANSLATE;
..	..	@@ -14935,8 +15596,18 @@
14935	15596	float SATPOW = 1; // 2; // 0.5f;
14936	15597	float BRIPOW = 1; // 0.5f; // 0.5f;
14937	15598
	15599	+static BufferedImage cursorImg = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB);
	15600	+
	15601	+// Create a new blank cursor.
	15602	+static Cursor blankCursor = Toolkit.getDefaultToolkit().createCustomCursor(
	15603	+ cursorImg, new Point(0, 0), "blank cursor");
	15604	+
14938	15605	public void keyPressed(int key)
14939	15606	{
	15607	+// Set the blank cursor to the JFrame.
	15608	+//object.editWindow.frame.
	15609	+ setCursor(blankCursor);
	15610	+
14940	15611	if (key >= '0' && key <= '5')
14941	15612	clampbit = (key-'0');
14942	15613
..	..	@@ -14982,7 +15653,8 @@
14982	15653	// break;
14983	15654	case 'T':
14984	15655	CACHETEXTURE ^= true;
14985		- textures.clear();
	15656	+ texturepigment.clear();
	15657	+ texturebump.clear();
14986	15658	// repaint();
14987	15659	break;
14988	15660	case 'Y':
..	..	@@ -14992,8 +15664,8 @@
14992	15664	case 'K':
14993	15665	KOMPACTTEXTURE ^= true;
14994	15666	//textures.clear();
14995		- break;
14996		- case 'P': // Texture Projection macros
	15667	+ // break;
	15668	+ //case 'P': // Texture Projection macros
14997	15669	// SAVETEXTURE ^= true;
14998	15670	macromode = true;
14999	15671	Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
..	..	@@ -15067,7 +15739,9 @@
15067	15739	case 'E' : COMPACT ^= true;
15068	15740	repaint();
15069	15741	break;
15070		- case 'W' : DEBUGHSB ^= true;
	15742	+ case 'W' : // Wide Window (fullscreen)
	15743	+ //DEBUGHSB ^= true;
	15744	+ ObjEditor.theFrame.ToggleFullScreen();
15071	15745	repaint();
15072	15746	break;
15073	15747	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -15092,13 +15766,7 @@
15092	15766	RevertCamera();
15093	15767	repaint();
15094	15768	break;
15095		- case 'l':
15096		- lightMode ^= true;
15097		- Globals.lighttouched = true;
15098		- manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
15099		- targetLookAt.set(manipCamera.lookAt);
15100		- repaint();
15101		- break;
	15769	+ //case 'l':
15102	15770	case 'L':
15103	15771	if (lightMode)
15104	15772	{
..	..	@@ -15118,7 +15786,7 @@
15118	15786	targetLookAt.set(manipCamera.lookAt);
15119	15787	repaint();
15120	15788	break;
15121		- case 'p':
	15789	+ case 'P': // p':
15122	15790	// c'est quoi ca au juste? spherical ^= true;
15123	15791	Skinshader ^= true; programInitialized = false;
15124	15792	repaint();
..	..	@@ -15129,7 +15797,8 @@
15129	15797	break;
15130	15798	case 'm':
15131	15799	{
15132		- PrintMemory();
	15800	+ //PrintMemory();
	15801	+ ToggleImageFlip();
15133	15802	break;
15134	15803	}
15135	15804	case 'M':
..	..	@@ -15156,27 +15825,31 @@
15156	15825	repaint();
15157	15826	break;
15158	15827	case 'O':
15159		- Globals.drawMode = OCCLUSION; // WARNING
15160		- repaint();
15161		- break;
	15828	+ // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
	15829	+ //repaint();
	15830	+ //break;
15162	15831	case 'o':
15163	15832	OCCLUSION_CULLING ^= true;
15164	15833	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
15165	15834	break;
15166		- case '0': envyoff ^= true; repaint(); break;
	15835	+ //case '0': envyoff ^= true; repaint(); break;
15167	15836	case '1':
15168	15837	case '2':
15169	15838	case '3':
15170	15839	case '4':
15171	15840	case '5':
15172		- newenvy = Character.getNumericValue(key);
15173		- repaint();
15174		- break;
15175	15841	case '6':
15176	15842	case '7':
15177	15843	case '8':
15178	15844	case '9':
15179		- BGcolor = (key - '6')/3.f;
	15845	+ if (true) // envyoff)
	15846	+ {
	15847	+ BGcolor = (key - '1')/8.f;
	15848	+ }
	15849	+ else
	15850	+ {
	15851	+ //newenvy = Character.getNumericValue(key);
	15852	+ }
15180	15853	repaint();
15181	15854	break;
15182	15855	case '!':
..	..	@@ -15246,11 +15919,32 @@
15246	15919	// kompactbit = 6;
15247	15920	// break;
15248	15921	case ' ':
15249		- ObjEditor.theFrame.ToggleFullScreen();
	15922	+ capsLocked ^= true;
	15923	+ repaint();
	15924	+ break;
	15925	+ case 'l':
	15926	+ lightMode ^= true;
	15927	+ if (lightMode)
	15928	+ {
	15929	+ keepshadow = Globals.RENDERSHADOW;
	15930	+ Globals.RENDERSHADOW = false;
	15931	+ }
	15932	+ else
	15933	+ {
	15934	+ Globals.RENDERSHADOW = keepshadow;
	15935	+ }
	15936	+
	15937	+ Globals.lighttouched = true;
	15938	+ manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
	15939	+ targetLookAt.set(manipCamera.lookAt);
15250	15940	repaint();
15251	15941	break;
15252	15942	//case '`' :
15253	15943	case ESC:
	15944	+ if (FULLSCREEN)
	15945	+ object.editWindow.ToggleFullScreen();
	15946	+ break;
	15947	+ case 'p':
15254	15948	RENDERPROGRAM += 1;
15255	15949	RENDERPROGRAM %= 3;
15256	15950
..	..	@@ -15289,18 +15983,16 @@
15289	15983	case ENTER:
15290	15984	// object.editWindow.ScreenFit(); // Edit();
15291	15985	ToggleLive();
	15986	+ if (capsLocked)
	15987	+ {
	15988	+ Globals.WALK ^= true;
	15989	+ }
15292	15990	break;
15293	15991	case DELETE:
15294	15992	ClearSelection();
15295	15993	break;
15296	15994	case '+':
15297	15995
15298		- //for (int i=0; i<0x7FFFFFFF; i++)
15299		- {
15300		- //String.format("%08X", i); // "7caca905"
15301		- GetRemoteZip("https://archive3d.net/?a=download&do=get&id=", "7caca905", true, true);
15302		- }
15303		-
15304	15996	/*
15305	15997	//fontsize += 1;
15306	15998	bbzoom *= 2;
..	..	@@ -15318,30 +16010,36 @@
15318	16010	case '=':
15319	16011	IncDepth();
15320	16012	//fontsize += 1;
15321		- object.editWindow.refreshContents(true);
	16013	+ object.GetWindow().refreshContents(true);
15322	16014	maskbit = 6;
15323	16015	break;
15324	16016	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
15325	16017	DecDepth();
15326	16018	maskbit = 5;
15327	16019	//if(fontsize > 1) fontsize -= 1;
15328		- if (object.editWindow == null)
15329		- new Exception().printStackTrace();
15330		- else
15331		- object.editWindow.refreshContents(true);
	16020	+// if (object.editWindow == null)
	16021	+// new Exception().printStackTrace();
	16022	+// else
	16023	+ object.GetWindow().refreshContents(true);
15332	16024	break;
15333	16025	case '{':
15334		- manipCamera.shaper_fovy /= 1.1;
	16026	+ double factor = 1.1;
	16027	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16028	+ manipCamera.shaper_fovy /= factor;
15335	16029	System.out.println("FOV = " + manipCamera.shaper_fovy);
15336	16030	repaint();
15337	16031	break;
15338	16032	case '}':
15339		- manipCamera.shaper_fovy *= 1.1;
	16033	+ factor = 1.1;
	16034	+ if (manipCamera.shaper_fovy * factor < 150)
	16035	+ manipCamera.shaper_fovy *= factor;
15340	16036	System.out.println("FOV = " + manipCamera.shaper_fovy);
15341	16037	repaint();
15342	16038	break;
15343	16039	case '[':
15344		- manipCamera.shaper_fovy /= 1.01;
	16040	+ factor = 1.01;
	16041	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16042	+ manipCamera.shaper_fovy /= factor;
15345	16043	if (false) //manipCamera.hAspect == 0)
15346	16044	{
15347	16045	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -15357,7 +16055,9 @@
15357	16055	break;
15358	16056	case ']':
15359	16057	//manipCamera.shaper_fovy += (180 - manipCamera.shaper_fovy)*0.1;
15360		- manipCamera.shaper_fovy *= 1.01;
	16058	+ factor = 1.01;
	16059	+ if (manipCamera.shaper_fovy * factor < 150)
	16060	+ manipCamera.shaper_fovy *= factor;
15361	16061	if (false) //manipCamera.hAspect == 0)
15362	16062	{
15363	16063	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -15395,98 +16095,113 @@
15395	16095	}
15396	16096	}
15397	16097
	16098	+ boolean keys[] = new boolean[256];
	16099	+ int speedkey[] = new int[256];
	16100	+ int modifiers = 0;
	16101	+
15398	16102	public void processKeyEvent(KeyEvent e)
15399	16103	{
15400	16104	switch (e.getID())
15401	16105	{
15402	16106	case KeyEvent.KEY_PRESSED:
15403		- if (!autorepeat)
15404		- {
15405		- //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
15406		- keyPressed(e.getKeyChar(), e.getModifiersEx());
15407		- }
15408		- if (manipCamera == lightCamera)
15409		- {
15410		- switch (e.getKeyCode())
15411		- {
15412		- case DOWN_ARROW:
15413		- lightCamera.DECAL /= 2;
15414		- repaint();
15415		- break;
15416		- case UP_ARROW:
15417		- lightCamera.DECAL *= 2;
15418		- repaint();
15419		- break;
15420		- case LEFT_ARROW:
15421		- lightCamera.SCALE /= 2;
15422		- repaint();
15423		- break;
15424		- case RIGHT_ARROW:
15425		- lightCamera.SCALE *= 2;
15426		- repaint();
15427		- break;
15428		- default:
15429		- break;
15430		- }
15431		-
15432		- System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
15433		- } else
15434		- {
15435		- if (true) // !autorepeat)
15436		- {
15437		- boolean reset = true;
15438		-
15439		- switch (e.getKeyCode())
15440		- {
15441		- case DOWN_ARROW:
15442		- GoDown(e.getModifiersEx());
15443		- repaint();
15444		- break;
15445		- case UP_ARROW:
15446		- GoUp(e.getModifiersEx());
15447		- repaint();
15448		- break;
15449		- case LEFT_ARROW:
15450		- GoLeft(e.getModifiersEx());
15451		- repaint();
15452		- break;
15453		- case RIGHT_ARROW:
15454		- GoRight(e.getModifiersEx());
15455		- repaint();
15456		- break;
15457		- default:
15458		- reset = false;
15459		- break;
15460		- }
15461		-
15462		- if (reset)
15463		- {
15464		- autorepeat = true;
15465		-
15466		- targetLookAt.set(manipCamera.lookAt);
15467		- }
15468		- }
15469		- }
	16107	+ keys[e.getKeyCode()] = true;
	16108	+ modifiers = e.getModifiersEx();
	16109	+ keyPressed(e.getKeyChar(), modifiers);
	16110	+ //Globals.theRenderer.keyPressed(e.getKeyChar());
	16111	+ repaint();
15470	16112	break;
15471		- case KeyEvent.KEY_TYPED:
15472		- break;
	16113	+// if (!autorepeat)
	16114	+// {
	16115	+// //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
	16116	+// keyPressed(e.getKeyChar(), e.getModifiersEx());
	16117	+// }
	16118	+// if (manipCamera == lightCamera)
	16119	+// {
	16120	+// switch (e.getKeyCode())
	16121	+// {
	16122	+// case DOWN_ARROW:
	16123	+// lightCamera.DECAL /= 2;
	16124	+// repaint();
	16125	+// break;
	16126	+// case UP_ARROW:
	16127	+// lightCamera.DECAL *= 2;
	16128	+// repaint();
	16129	+// break;
	16130	+// case LEFT_ARROW:
	16131	+// lightCamera.SCALE /= 2;
	16132	+// repaint();
	16133	+// break;
	16134	+// case RIGHT_ARROW:
	16135	+// lightCamera.SCALE *= 2;
	16136	+// repaint();
	16137	+// break;
	16138	+// default:
	16139	+// break;
	16140	+// }
	16141	+//
	16142	+// System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
	16143	+// } else
	16144	+// {
	16145	+// if (true) // !autorepeat)
	16146	+// {
	16147	+// boolean reset = true;
	16148	+//
	16149	+// switch (e.getKeyCode())
	16150	+// {
	16151	+// case DOWN_ARROW:
	16152	+// GoDown(e.getModifiersEx());
	16153	+// repaint();
	16154	+// break;
	16155	+// case UP_ARROW:
	16156	+// GoUp(e.getModifiersEx());
	16157	+// repaint();
	16158	+// break;
	16159	+// case LEFT_ARROW:
	16160	+// GoLeft(e.getModifiersEx());
	16161	+// repaint();
	16162	+// break;
	16163	+// case RIGHT_ARROW:
	16164	+// GoRight(e.getModifiersEx());
	16165	+// repaint();
	16166	+// break;
	16167	+// default:
	16168	+// reset = false;
	16169	+// break;
	16170	+// }
	16171	+//
	16172	+// if (reset)
	16173	+// {
	16174	+// autorepeat = true;
	16175	+//
	16176	+// targetLookAt.set(manipCamera.lookAt);
	16177	+// }
	16178	+// }
	16179	+// }
	16180	+// break;
	16181	+// case KeyEvent.KEY_TYPED:
	16182	+// break;
15473	16183	case KeyEvent.KEY_RELEASED:
15474		- {
15475		- switch (e.getKeyCode())
15476		- {
15477		- case DOWN_ARROW:
15478		- case UP_ARROW:
15479		- case LEFT_ARROW:
15480		- case RIGHT_ARROW:
15481		- MODIFIERS &= ~COMMAND;
15482		- autorepeat = false;
15483		- break;
15484		- default:
15485		- break;
15486		- }
	16184	+ keys[e.getKeyCode()] = false;
	16185	+ modifiers = e.getModifiersEx();
15487	16186	keyReleased(e.getKeyChar(), e.getModifiersEx());
	16187	+ repaint();
15488	16188	break;
15489		- }
	16189	+// {
	16190	+// switch (e.getKeyCode())
	16191	+// {
	16192	+// case DOWN_ARROW:
	16193	+// case UP_ARROW:
	16194	+// case LEFT_ARROW:
	16195	+// case RIGHT_ARROW:
	16196	+// MODIFIERS &= ~COMMAND;
	16197	+// autorepeat = false;
	16198	+// break;
	16199	+// default:
	16200	+// break;
	16201	+// }
	16202	+// keyReleased(e.getKeyChar(), e.getModifiersEx());
	16203	+// break;
	16204	+// }
15490	16205	default:
15491	16206	break;
15492	16207	}
..	..	@@ -15552,7 +16267,7 @@
15552	16267	}
15553	16268	*/
15554	16269
15555		- object.editWindow.EditSelection(false);
	16270	+ object.GetWindow().EditSelection(false);
15556	16271	}
15557	16272
15558	16273	void SelectParent()
..	..	@@ -15569,10 +16284,10 @@
15569	16284	{
15570	16285	//selectees.remove(i);
15571	16286	System.out.println("select parent of " + elem);
15572		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	16287	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15573	16288	} else
15574	16289	{
15575		- group.editWindow.Select(elem.GetTreePath(), first, true);
	16290	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15576	16291	}
15577	16292
15578	16293	first = false;
..	..	@@ -15614,12 +16329,12 @@
15614	16329	for (int j = 0; j < group.children.size(); j++)
15615	16330	{
15616	16331	elem = (Object3D) group.children.elementAt(j);
15617		- object.editWindow.Select(elem.GetTreePath(), first, true);
	16332	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15618	16333	first = false;
15619	16334	}
15620	16335	} else
15621	16336	{
15622		- object.editWindow.Select(elem.GetTreePath(), first, true);
	16337	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15623	16338	}
15624	16339
15625	16340	first = false;
..	..	@@ -15630,21 +16345,21 @@
15630	16345	{
15631	16346	//Composite group = (Composite) object;
15632	16347	Object3D group = object;
15633		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	16348	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15634	16349	}
15635	16350
15636	16351	void ResetTransform(int mask)
15637	16352	{
15638	16353	//Composite group = (Composite) object;
15639	16354	Object3D group = object;
15640		- group.editWindow.ResetTransform(mask);
	16355	+ group.GetWindow().ResetTransform(mask);
15641	16356	}
15642	16357
15643	16358	void FlipTransform()
15644	16359	{
15645	16360	//Composite group = (Composite) object;
15646	16361	Object3D group = object;
15647		- group.editWindow.FlipTransform();
	16362	+ group.GetWindow().FlipTransform();
15648	16363	// group.editWindow.ReduceMesh(true);
15649	16364	}
15650	16365
..	..	@@ -15652,7 +16367,7 @@
15652	16367	{
15653	16368	//Composite group = (Composite) object;
15654	16369	Object3D group = object;
15655		- group.editWindow.PrintMemory();
	16370	+ group.GetWindow().PrintMemory();
15656	16371	// group.editWindow.ReduceMesh(true);
15657	16372	}
15658	16373
..	..	@@ -15660,7 +16375,7 @@
15660	16375	{
15661	16376	//Composite group = (Composite) object;
15662	16377	Object3D group = object;
15663		- group.editWindow.ResetCentroid();
	16378	+ group.GetWindow().ResetCentroid();
15664	16379	}
15665	16380
15666	16381	void IncDepth()
..	..	@@ -15742,8 +16457,6 @@
15742	16457
15743	16458	int width = getBounds().width;
15744	16459	int height = getBounds().height;
15745		- ClickInfo info = new ClickInfo();
15746		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15747	16460	//Image img = CreateImage(width, height);
15748	16461	//System.out.println("width = " + width + "; height = " + height + "\n");
15749	16462
..	..	@@ -15820,48 +16533,77 @@
15820	16533	}
15821	16534	if (object != null && !hasMarquee)
15822	16535	{
	16536	+ if (object.clickInfo == null)
	16537	+ object.clickInfo = new ClickInfo();
	16538	+ ClickInfo info = object.clickInfo;
	16539	+ //ClickInfo info = new ClickInfo();
	16540	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16541	+
15823	16542	if (isRenderer)
15824	16543	{
15825		- info.flags++;
	16544	+ object.clickInfo.flags++;
15826	16545	double frameAspect = (double) width / (double) height;
15827	16546	if (frameAspect > renderCamera.aspect)
15828	16547	{
15829	16548	int desired = (int) ((double) height * renderCamera.aspect);
15830		- info.bounds.width -= width - desired;
15831		- info.bounds.x += (width - desired) / 2;
	16549	+ object.clickInfo.bounds.width -= width - desired;
	16550	+ object.clickInfo.bounds.x += (width - desired) / 2;
15832	16551	} else
15833	16552	{
15834	16553	int desired = (int) ((double) width / renderCamera.aspect);
15835		- info.bounds.height -= height - desired;
15836		- info.bounds.y += (height - desired) / 2;
	16554	+ object.clickInfo.bounds.height -= height - desired;
	16555	+ object.clickInfo.bounds.y += (height - desired) / 2;
15837	16556	}
15838	16557	}
15839		- info.g = gr;
15840		- info.camera = renderCamera;
	16558	+
	16559	+ object.clickInfo.g = gr;
	16560	+ object.clickInfo.camera = renderCamera;
15841	16561	/*
15842	16562	// Memory intensive (brep.verticescopy)
15843	16563	if (!(object instanceof Composite))
15844	16564	object.draw(info, 0, false); // SLOW :
15845	16565	*/
15846		- if (!isRenderer)
	16566	+ if (!isRenderer) // && drag)
15847	16567	{
15848		- object.drawEditHandles(info, 0);
15849		-
15850		- if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	16568	+ Grafreed.Assert(object != null);
	16569	+ Grafreed.Assert(object.selection != null);
	16570	+ if (object.selection.Size() > 0)
15851	16571	{
15852		- switch (object.selection.get(0).hitSomething)
	16572	+ int hitSomething = object.selection.get(0).hitSomething;
	16573	+
	16574	+ object.clickInfo.DX = 0;
	16575	+ object.clickInfo.DY = 0;
	16576	+ object.clickInfo.W = 1;
	16577	+ if (hitSomething == Object3D.hitCenter)
15853	16578	{
15854		- case Object3D.hitCenter: gr.setColor(Color.pink);
15855		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15856		- break;
15857		- case Object3D.hitRotate: gr.setColor(Color.yellow);
15858		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15859		- break;
15860		- case Object3D.hitScale: gr.setColor(Color.cyan);
15861		- gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15862		- break;
	16579	+ info.DX = X;
	16580	+ if (X != 0)
	16581	+ info.DX -= info.bounds.width/2;
	16582	+
	16583	+ info.DY = Y;
	16584	+ if (Y != 0)
	16585	+ info.DY -= info.bounds.height/2;
15863	16586	}
15864		-
	16587	+
	16588	+ object.drawEditHandles(//info,
	16589	+ 0);
	16590	+
	16591	+ if (drag && (X != 0 \|\| Y != 0))
	16592	+ {
	16593	+ switch (hitSomething)
	16594	+ {
	16595	+ case Object3D.hitCenter: gr.setColor(Color.white);
	16596	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16597	+ break;
	16598	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16599	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16600	+ break;
	16601	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16602	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16603	+ break;
	16604	+ }
	16605	+
	16606	+ }
15865	16607	}
15866	16608	}
15867	16609	}
..	..	@@ -15876,7 +16618,7 @@
15876	16618	if (hasMarquee)
15877	16619	{
15878	16620	gr.setXORMode(Color.white);
15879		- gr.setColor(Color.red);
	16621	+ gr.setColor(Color.white);
15880	16622	if (!firstime)
15881	16623	{
15882	16624	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -16035,7 +16777,8 @@
16035	16777
16036	16778	public boolean mouseDrag(Event evt, int x, int y)
16037	16779	{
16038		- //System.out.println("mouseDrag: " + evt);
	16780	+ System.out.println("mouseDrag: " + evt);
	16781	+ System.exit(0);
16039	16782	/*
16040	16783	drag = true;
16041	16784	//System.out.println("Mouse DRAG");
..	..	@@ -16154,6 +16897,7 @@
16154	16897	public boolean mouseUp(Event evt, int x, int y)
16155	16898	{
16156	16899	System.out.println("mouseUp: " + evt);
	16900	+ System.exit(0);
16157	16901	/*
16158	16902	locked = false;
16159	16903	if (isRenderer)
..	..	@@ -16343,6 +17087,8 @@
16343	17087	private /static/ boolean firstime;
16344	17088	private /static/ cVector newView = new cVector();
16345	17089	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	17090	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	17091	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
16346	17092	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
16347	17093	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
16348	17094	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -16355,36 +17101,74 @@
16355	17101	{
16356	17102	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
16357	17103
	17104	+ int usedsuf = 0;
	17105	+
16358	17106	for (int i = 0; i < suffixes.length; i++)
16359	17107	{
16360		- String resourceName = basename + suffixes[i] + "." + suffix;
16361		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
16362		- mipmapped,
16363		- FileUtil.getFileSuffix(resourceName));
16364		- if (data == null)
	17108	+ String[] suffixe = suffixes;
	17109	+ String[] fallback = suffixes2;
	17110	+ String[] fallfallback = suffixes3;
	17111	+
	17112	+ for (int c=usedsuf; --c>=0;)
16365	17113	{
16366		- throw new IOException("Unable to load texture " + resourceName);
	17114	+// String[] temp = suffixe;
	17115	+// suffixe = fallback;
	17116	+// fallback = fallfallback;
	17117	+// fallfallback = temp;
16367	17118	}
	17119	+
	17120	+ String resourceName = basename + suffixe[i] + "." + suffix;
	17121	+ TextureData data;
	17122	+
	17123	+ try
	17124	+ {
	17125	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	17126	+ mipmapped,
	17127	+ FileUtil.getFileSuffix(resourceName));
	17128	+ }
	17129	+ catch (Exception e)
	17130	+ {
	17131	+ try
	17132	+ {
	17133	+ resourceName = basename + fallback[i] + "." + suffix;
	17134	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	17135	+ mipmapped,
	17136	+ FileUtil.getFileSuffix(resourceName));
	17137	+ }
	17138	+ catch (Exception e2)
	17139	+ {
	17140	+ resourceName = basename + fallfallback[i] + "." + suffix;
	17141	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	17142	+ mipmapped,
	17143	+ FileUtil.getFileSuffix(resourceName));
	17144	+ }
	17145	+ }
	17146	+
16368	17147	//System.out.println("Target = " + targets[i]);
16369	17148	cubemap.updateImage(data, targets[i]);
16370	17149	}
16371	17150
16372	17151	return cubemap;
16373	17152	}
	17153	+
16374	17154	int bigsphere = -1;
16375	17155
16376	17156	float BGcolor = 0.5f;
16377	17157
16378		- private void DrawSkyBox(GL gl)
	17158	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	17159	+
	17160	+ private void DrawSkyBox(GL gl, float ratio)
16379	17161	{
16380		- if (envyoff \|\| cubemap == null)
	17162	+ if (//envyoff \|\|
	17163	+ WIREFRAME \|\|
	17164	+ cubemap == null)
16381	17165	{
16382	17166	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
16383	17167	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
16384	17168	return;
16385	17169	}
16386	17170
16387		- if (WIREFRAME)
	17171	+ //if (WIREFRAME)
16388	17172	gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL);
16389	17173
16390	17174	gl.glDisable(gl.GL_CULL_FACE);
..	..	@@ -16392,7 +17176,17 @@
16392	17176	// Compensates for ExaminerViewer's modification of modelview matrix
16393	17177	gl.glMatrixMode(GL.GL_MODELVIEW);
16394	17178	gl.glLoadIdentity();
	17179	+ gl.glScalef(1,ratio,1);
16395	17180
	17181	+// colorV[0] = 2;
	17182	+// colorV[1] = 2;
	17183	+// colorV[2] = 2;
	17184	+// colorV[3] = 1;
	17185	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	17186	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	17187	+//
	17188	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	17189	+
16396	17190	//gl.glActiveTexture(GL.GL_TEXTURE1);
16397	17191	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
16398	17192
..	..	@@ -16424,6 +17218,7 @@
16424	17218	{
16425	17219	gl.glScalef(1.0f, -1.0f, 1.0f);
16426	17220	}
	17221	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
16427	17222	gl.glMultMatrixd(viewrot_1, 0);
16428	17223	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
16429	17224	//viewer.updateInverseRotation(gl);
..	..	@@ -16464,7 +17259,8 @@
16464	17259	gl.glDisable(GL.GL_TEXTURE_GEN_R);
16465	17260
16466	17261	cubemap.disable();
16467		- ////cubemap.unbind();
	17262	+ //cubemap.dispose();
	17263	+
16468	17264	if (CULLFACE)
16469	17265	{
16470	17266	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -16472,6 +17268,8 @@
16472	17268
16473	17269	if (WIREFRAME)
16474	17270	gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_LINE);
	17271	+ else
	17272	+ gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL);
16475	17273	}
16476	17274
16477	17275	private void DrawChecker(GL gl)
..	..	@@ -16520,7 +17318,7 @@
16520	17318	gl.glScalef(1.0f, -1.0f, 1.0f);
16521	17319	}
16522	17320
16523		- gl.glNormal3f(0.0f, 0.0f, 1.0f);
	17321	+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
16524	17322
16525	17323	float step = 2; // 0.1666f; //0.25f;
16526	17324	float stepv = 2; // step * 1652 / 998;
..	..	@@ -16659,6 +17457,14 @@
16659	17457	}
16660	17458	}
16661	17459
	17460	+ private Object3D GetFolder()
	17461	+ {
	17462	+ Object3D folder = object.GetWindow().copy;
	17463	+ if (object.GetWindow().copy.selection.Size() > 0)
	17464	+ folder = object.GetWindow().copy.selection.elementAt(0);
	17465	+ return folder;
	17466	+ }
	17467	+
16662	17468	class SelectBuffer implements GLEventListener
16663	17469	{
16664	17470
..	..	@@ -16674,7 +17480,7 @@
16674	17480	//new Exception().printStackTrace();
16675	17481	System.out.println("select buffer init");
16676	17482	// Use debug pipeline
16677		- drawable.setGL(new DebugGL(drawable.getGL()));
	17483	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16678	17484
16679	17485	GL gl = drawable.getGL();
16680	17486
..	..	@@ -16738,6 +17544,17 @@
16738	17544
16739	17545	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16740	17546
	17547	+ if (PAINTMODE)
	17548	+ {
	17549	+ if (object.GetWindow().copy.selection.Size() > 0)
	17550	+ {
	17551	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17552	+
	17553	+ // Make what you paint not selectable.
	17554	+ paintobj.ResetSelectable();
	17555	+ }
	17556	+ }
	17557	+
16741	17558	//int tmp = selection_view;
16742	17559	//selection_view = -1;
16743	17560	int temp = DrawMode();
..	..	@@ -16749,6 +17566,17 @@
16749	17566	// temp = DEFAULT; // patch for selection debug
16750	17567	Globals.drawMode = temp; // WARNING
16751	17568
	17569	+ if (PAINTMODE)
	17570	+ {
	17571	+ if (object.GetWindow().copy.selection.Size() > 0)
	17572	+ {
	17573	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17574	+
	17575	+ // Revert.
	17576	+ paintobj.RestoreSelectable();
	17577	+ }
	17578	+ }
	17579	+
16752	17580	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16753	17581
16754	17582	// trying different ways of getting the depth info over
..	..	@@ -16779,7 +17607,7 @@
16779	17607
16780	17608	float depth = depths[y * TEX_SIZE + x];
16781	17609
16782		- if (pointselection && mouseMode == SELECT && depth != 0 && depth != 1)
	17610	+ if (pointselection && (mouseMode & SELECT) == SELECT && depth != 0 && depth != 1)
16783	17611	{
16784	17612	pointselection = false;
16785	17613
..	..	@@ -16852,29 +17680,31 @@
16852	17680	}
16853	17681
16854	17682	if (!movingcamera && !PAINTMODE)
16855		- object.editWindow.ScreenFitPoint(); // fev 2014
	17683	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16856	17684
16857		- if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17685	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16858	17686	{
16859		- Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17687	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16860	17688
16861		- Object3D group = new Object3D("inst" + paintcount++);
	17689	+ if (object.GetWindow().copy.selection.Size() > 0)
	17690	+ {
	17691	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16862	17692
16863		- group.CreateMaterial(); // use a void leaf to select instances
16864		-
16865		- group.add(paintobj); // link
16866		-
16867		- object.editWindow.SnapObject(group);
16868		-
16869		- Object3D folder = object.editWindow.copy;
16870		-
16871		- if (object.editWindow.copy.selection.Size() > 0)
16872		- folder = object.editWindow.copy.selection.elementAt(0);
16873		-
16874		- folder.add(group);
16875		-
16876		- object.editWindow.ResetModel();
16877		- object.editWindow.refreshContents();
	17693	+ Object3D inst = new Object3D("inst" + paintcount++);
	17694	+
	17695	+ inst.CreateMaterial(); // use a void leaf to select instances
	17696	+
	17697	+ inst.add(paintobj); // link
	17698	+
	17699	+ object.GetWindow().SnapObject(inst);
	17700	+
	17701	+ Object3D folder = paintFolder; // GetFolder();
	17702	+
	17703	+ folder.add(inst);
	17704	+
	17705	+ object.GetWindow().ResetModel();
	17706	+ object.GetWindow().refreshContents();
	17707	+ }
16878	17708	}
16879	17709	else
16880	17710	paintcount = 0;
..	..	@@ -16968,6 +17798,7 @@
16968	17798
16969	17799	public void init(GLAutoDrawable drawable)
16970	17800	{
	17801	+ if (Globals.DEBUG)
16971	17802	System.out.println("shadow buffer init");
16972	17803
16973	17804	GL gl = drawable.getGL();
..	..	@@ -17196,10 +18027,14 @@
17196	18027	gl.glFlush();
17197	18028
17198	18029	/**/
17199		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
	18030	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
17200	18031
17201		- float[] pixels = occlusionsizebuffer.array();
	18032	+ float[] depths = occlusiondepthbuffer.array();
17202	18033
	18034	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
	18035	+
	18036	+ int[] pixels = selectsizebuffer.array();
	18037	+
17203	18038	double r = 0, g = 0, b = 0;
17204	18039
17205	18040	double count = 0;
..	..	@@ -17210,7 +18045,7 @@
17210	18045
17211	18046	double FACTOR = 1;
17212	18047
17213		- for (int i = 0; i < pixels.length; i++)
	18048	+ for (int i = 0; i < depths.length; i++)
17214	18049	{
17215	18050	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
17216	18051	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -17293,7 +18128,7 @@
17293	18128
17294	18129	double scale = ray.z; // 1; // cos
17295	18130
17296		- float depth = pixels[newindex];
	18131	+ float depth = depths[newindex];
17297	18132
17298	18133	/*
17299	18134	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -17436,6 +18271,11 @@
17436	18271	static boolean DEBUG_SELECTION = false;
17437	18272	boolean OCCLUSION_CULLING = false; //true;
17438	18273	public boolean lightMode = false;
	18274	+
	18275	+ private boolean keepshadow;
	18276	+
	18277	+ static public boolean capsLocked = false; // VR
	18278	+
17439	18279	static public int indexcount = 0;
17440	18280	/static/ cColor vertexOcclusion = new cColor();
17441	18281	//private int selection_view = -1;
..	..	@@ -17490,11 +18330,14 @@
17490	18330	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17491	18331	static IntBuffer bigAAbuffer;
17492	18332	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17493		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	18333	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17494	18334	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17495	18335	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17496	18336	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17497		- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	18337	+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	18338	+
	18339	+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	18340	+
17498	18341	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17499	18342	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17500	18343	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();