~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	{
..	..	@@ -37,7 +42,6 @@
37	42	static boolean[] selectedstack = new boolean[65536];
38	43	static int materialdepth = 0;
39	44
40		- static boolean DEBUG = false;
41	45	static boolean FRUSTUM = false; // still bogus true; // frustum culling
42	46
43	47	// camera change fix
..	..	@@ -45,6 +49,39 @@
45	49	static boolean ABORTED = false;
46	50
47	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	+ }
48	85
49	86	/static/ private boolean CULLFACE = false; // true;
50	87	/static/ boolean NEAREST = false; // true;
..	..	@@ -56,14 +93,12 @@
56	93	static int CURRENTANTIALIAS = 0; // 1;
57	94	/static/ boolean RENDERSHADOW = true;
58	95	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
59		- static boolean ANIMATION = false;
60		- static String filename;
61	96
62	97	boolean DISPLAYTEXT = false;
63	98	//boolean REDUCETEXTURE = true;
64	99	boolean CACHETEXTURE = true;
65	100	boolean CLEANCACHE = false; // true;
66		- boolean MIPMAP = false; // true;
	101	+ boolean MIPMAP = false; // true; // never works...
67	102	boolean COMPRESSTEXTURE = false;
68	103	boolean KOMPACTTEXTURE = false; // true;
69	104	boolean RESIZETEXTURE = false;
..	..	@@ -76,7 +111,11 @@
76	111	//private Mat4f spotlightTransform = new Mat4f();
77	112	//private Mat4f spotlightInverseTransform = new Mat4f();
78	113	static GLContext glcontext = null;
79		- /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	+
80	119	boolean reverseUP = false;
81	120	static boolean frozen = false;
82	121	boolean enablebackspace = false; // patch for back buffer refresh
..	..	@@ -85,16 +124,18 @@
85	124	static boolean LOCALTRANSFORM = false;
86	125	static boolean FULLSCREEN = false;
87	126	static boolean SUPPORT = true;
88		-static boolean INERTIA = true;
	127	+static boolean INERTIA = false; // true;
89	128	static boolean FAST = false;
90	129	static boolean SLOWPOSE = false;
91	130	static boolean FOOTCONTACT = true;
92	131
93	132	static int tickcount = 0; // slow pose issue
94	133
	134	+static boolean BUTTONLESSWHEEL = false;
	135	+static boolean ZOOMBOXMODE = false;
95	136	static boolean BOXMODE = false;
96	137	static boolean IMAGEFLIP = false;
97		-static boolean SMOOTHFOCUS = false;
	138	+static boolean SMOOTHFOCUS = true; // false;
98	139	static boolean SPEAKERMOCAP = true; // jan 2014 false;
99	140	static boolean SPEAKERCAMERA = false;
100	141	static boolean SPEAKERFOCUS = false;
..	..	@@ -106,7 +147,7 @@
106	147	static boolean OEIL = true;
107	148	static boolean OEILONCE = false; // do oeilon then oeiloff
108	149	static boolean LOOKAT = true;
109		-static boolean RANDOM = true; // false;
	150	+static boolean SWITCH = true; // false;
110	151	static boolean HANDLES = false; // selection doesn't work!!
111	152	static boolean PAINTMODE = false;
112	153
..	..	@@ -128,16 +169,16 @@
128	169
129	170
130	171	// OPTIONS
131		- boolean Skinshader = true;
	172	+ boolean Skinshader = false; // true;
132	173	boolean cameraLight = false;
133	174	boolean UVdebug = false;
134	175	boolean Udebug = false;
135	176	boolean Vdebug = false;
136	177	boolean NORMALdebug = false;
137		- static boolean doublesided = false; // true; // reversed normals are awful for conformance
	178	+ static boolean doublesided = true; // false; // reversed normals are awful for conformance
138	179	boolean anisotropy = true;
139	180	boolean softshadow = true; // slower but better false;
140		- boolean opacityhalo = false;
	181	+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
141	182
142	183	boolean macromode = false;
143	184
..	..	@@ -148,6 +189,21 @@
148	189	defaultcaps.setAccumGreenBits(16);
149	190	defaultcaps.setAccumBlueBits(16);
150	191	defaultcaps.setAccumAlphaBits(16);
	192	+ }
	193	+
	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	+ }
151	207	}
152	208
153	209	void SetAsGLRenderer(boolean b)
..	..	@@ -166,9 +222,10 @@
166	222	cameras = new Camera[2];
167	223	targetLookAts = new cVector[2];
168	224
169		- SetCamera(cam);
	225	+ SetCamera(cam, true);
170	226
171		- SetLight(new Camera(new cVector(10, 10, -20)));
	227	+ // Warning: not used.
	228	+ //SetLight(new Camera(new cVector(15, 10, -20)));
172	229
173	230	object = o;
174	231
..	..	@@ -193,7 +250,7 @@
193	250
194	251	public javax.media.opengl.GL GetGL0()
195	252	{
196		- return null;
	253	+ return currentGL;
197	254	}
198	255
199	256	public int GenList()
..	..	@@ -223,6 +280,11 @@
223	280	public boolean IsBoxMode()
224	281	{
225	282	return BOXMODE;
	283	+ }
	284	+
	285	+ public boolean IsZoomBoxMode()
	286	+ {
	287	+ return ZOOMBOXMODE;
226	288	}
227	289
228	290	public void ClearDepth()
..	..	@@ -320,7 +382,7 @@
320	382	cStatic.objectstack[materialdepth++] = obj;
321	383	//System.out.println("material " + material);
322	384	//Applet3D.tracein(this, selected);
323		- display.vector2buffer = obj.projectedVertices;
	385	+ //display.vector2buffer = obj.projectedVertices;
324	386	if (obj instanceof Camera)
325	387	{
326	388	display.options1[0] = material.shift;
..	..	@@ -329,14 +391,28 @@
329	391	display.options1[2] = material.shadowbias;
330	392	display.options1[3] = material.aniso;
331	393	display.options1[4] = material.anisoV;
	394	+// System.out.println("display.options1[0] " + display.options1[0]);
	395	+// System.out.println("display.options1[1] " + display.options1[1]);
	396	+// System.out.println("display.options1[2] " + display.options1[2]);
	397	+// System.out.println("display.options1[3] " + display.options1[3]);
	398	+// System.out.println("display.options1[4] " + display.options1[4]);
332	399	display.options2[0] = material.opacity;
333	400	display.options2[1] = material.diffuse;
334	401	display.options2[2] = material.factor;
	402	+// System.out.println("display.options2[0] " + display.options2[0]);
	403	+// System.out.println("display.options2[1] " + display.options2[1]);
	404	+// System.out.println("display.options2[2] " + display.options2[2]);
335	405
336	406	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	407	+// System.out.println("display.options3[0] " + display.options3[0]);
	408	+// System.out.println("display.options3[1] " + display.options3[1]);
	409	+// System.out.println("display.options3[2] " + display.options3[2]);
337	410	display.options4[0] = material.cameralight/0.2f;
338	411	display.options4[1] = material.subsurface;
339	412	display.options4[2] = material.sheen;
	413	+// System.out.println("display.options4[0] " + display.options4[0]);
	414	+// System.out.println("display.options4[1] " + display.options4[1]);
	415	+// System.out.println("display.options4[2] " + display.options4[2]);
340	416
341	417	// if (display.CURRENTANTIALIAS > 0)
342	418	// display.options3[3] /= 4;
..	..	@@ -352,7 +428,7 @@
352	428	/**/
353	429	} else
354	430	{
355		- DrawMaterial(material, selected);
	431	+ DrawMaterial(material, selected, obj.projectedVertices);
356	432	}
357	433	} else
358	434	{
..	..	@@ -376,8 +452,8 @@
376	452	cStatic.objectstack[materialdepth++] = obj;
377	453	//System.out.println("material " + material);
378	454	//Applet3D.tracein("selected ", selected);
379		- display.vector2buffer = obj.projectedVertices;
380		- display.DrawMaterial(material, selected);
	455	+ //display.vector2buffer = obj.projectedVertices;
	456	+ display.DrawMaterial(material, selected, obj.projectedVertices);
381	457	}
382	458	}
383	459
..	..	@@ -394,8 +470,8 @@
394	470	materialdepth -= 1;
395	471	if (materialdepth > 0)
396	472	{
397		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
398		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	473	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	474	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
399	475	}
400	476	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
401	477	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -415,8 +491,8 @@
415	491	materialdepth -= 1;
416	492	if (materialdepth > 0)
417	493	{
418		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
419		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	494	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	495	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
420	496	}
421	497	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
422	498	//else
..	..	@@ -457,15 +533,18 @@
457	533	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
458	534	{
459	535	//gl.glBegin(gl.GL_TRIANGLES);
460		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	536	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	537	+ // TEST LIVE NORMALS && !obj.dontselect
	538	+ ;
461	539	if (!hasnorm)
462	540	{
463		- // System.out.println("FUCK!!");
	541	+ // System.out.println("Mesh normal");
464	542	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
465	543	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
466	544	LA.vecCross(obj.v0, obj.v1, obj.v2);
467	545	LA.vecNormalize(obj.v2);
468		- 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);
469	548	}
470	549
471	550	// P
..	..	@@ -487,7 +566,7 @@
487	566	y += ny * obj.NORMALPUSH;
488	567	z += nz * obj.NORMALPUSH;
489	568
490		- gl.glNormal3f(nx, ny, nz);
	569	+ SetGLNormal(gl, nx, ny, nz);
491	570	}
492	571	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
493	572	SetColor(obj, pv);
..	..	@@ -519,7 +598,7 @@
519	598	y += ny * obj.NORMALPUSH;
520	599	z += nz * obj.NORMALPUSH;
521	600
522		- gl.glNormal3f(nx, ny, nz);
	601	+ SetGLNormal(gl, nx, ny, nz);
523	602	}
524	603	//System.out.println("vertexq = " + qv.s + ", " + qv.t);
525	604	// boolean locked = false;
..	..	@@ -567,7 +646,7 @@
567	646	y += ny * obj.NORMALPUSH;
568	647	z += nz * obj.NORMALPUSH;
569	648
570		- gl.glNormal3f(nx, ny, nz);
	649	+ SetGLNormal(gl, nx, ny, nz);
571	650	}
572	651
573	652	// if ((dot&4) == 0)
..	..	@@ -803,7 +882,7 @@
803	882	//// tris.postdraw(this);
804	883	}
805	884
806		- static Camera localcamera = new Camera();
	885	+ static Camera localAOcamera = new Camera();
807	886	static cVector from = new cVector();
808	887	static cVector to = new cVector();
809	888
..	..	@@ -812,7 +891,7 @@
812	891	CameraPane cp = this;
813	892
814	893	Camera keep = cp.RenderCamera();
815		- cp.renderCamera = localcamera;
	894	+ cp.renderCamera = localAOcamera;
816	895
817	896	if (br.trimmed)
818	897	{
..	..	@@ -830,7 +909,7 @@
830	909	br.positions[i3 + 2] + br.normals[i3 + 2]);
831	910	LA.xformPos(from, transform, from);
832	911	LA.xformPos(to, transform, to); // RIGID ONLY
833		- localcamera.setAim(from, to);
	912	+ localAOcamera.setAim(from, to);
834	913
835	914	CameraPane.occlusionbuffer.display();
836	915
..	..	@@ -864,7 +943,7 @@
864	943	to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
865	944	LA.xformPos(from, transform, from);
866	945	LA.xformPos(to, transform, to); // RIGID ONLY
867		- localcamera.setAim(from, to);
	946	+ localAOcamera.setAim(from, to);
868	947
869	948	CameraPane.occlusionbuffer.display();
870	949
..	..	@@ -1173,10 +1252,10 @@
1173	1252	{
1174	1253	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1175	1254	{
1176		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1255	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1177	1256	} else
1178	1257	{
1179		- gl.glNormal3f(0, 0, 1);
	1258	+ SetGLNormal(gl, 0, 0, 1);
1180	1259	}
1181	1260
1182	1261	if (c != null)
..	..	@@ -1185,10 +1264,12 @@
1185	1264	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1186	1265	}
1187	1266	}
	1267	+
1188	1268	if (flipV)
1189	1269	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1190	1270	else
1191	1271	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1272	+
1192	1273	//System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1193	1274	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1194	1275
..	..	@@ -1198,20 +1279,22 @@
1198	1279	{
1199	1280	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1200	1281	{
1201		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1282	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1202	1283	} else
1203	1284	{
1204		- gl.glNormal3f(0, 0, 1);
	1285	+ SetGLNormal(gl, 0, 0, 1);
1205	1286	}
1206	1287	if (c != null)
1207	1288	{
1208	1289	gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
1209	1290	}
1210	1291	}
	1292	+
1211	1293	if (flipV)
1212	1294	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1213	1295	else
1214	1296	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1297	+
1215	1298	//System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
1216	1299	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
1217	1300
..	..	@@ -1224,10 +1307,10 @@
1224	1307	{
1225	1308	if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
1226	1309	{
1227		- gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1310	+ SetGLNormal(gl, n[count3], n[count3 + 1], n[count3 + 2]);
1228	1311	} else
1229	1312	{
1230		- gl.glNormal3f(0, 0, 1);
	1313	+ SetGLNormal(gl, 0, 0, 1);
1231	1314	}
1232	1315	if (c != null)
1233	1316	{
..	..	@@ -1239,8 +1322,10 @@
1239	1322	gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
1240	1323	else
1241	1324	gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1325	+
1242	1326	//System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
1243	1327	gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1328	+
1244	1329	count2 += 2;
1245	1330	count3 += 3;
1246	1331	}
..	..	@@ -1407,7 +1492,7 @@
1407	1492	{
1408	1493	if (!selectmode)
1409	1494	{
1410		- 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);
1411	1496	gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
1412	1497
1413	1498	if (flipV)
..	..	@@ -1419,6 +1504,8 @@
1419	1504	gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
1420	1505	}
1421	1506
	1507	+ float[] colorV = new float[4];
	1508	+
1422	1509	void SetColor(Object3D obj, Vertex p0)
1423	1510	{
1424	1511	CameraPane display = this;
..	..	@@ -1443,7 +1530,7 @@
1443	1530	}
1444	1531	}
1445	1532	float b = 0;
1446		- if (obj.support != null && obj.link2master)
	1533	+ if (obj.support != null && obj.Link2Support())
1447	1534	{
1448	1535	b = 1;
1449	1536	}
..	..	@@ -1486,8 +1573,6 @@
1486	1573	{
1487	1574	return;
1488	1575	}
1489		-
1490		- float[] colorV = new float[3];
1491	1576
1492	1577	if (false) // marked)
1493	1578	{
..	..	@@ -1596,7 +1681,7 @@
1596	1681	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1597	1682	}
1598	1683
1599		- void DrawMaterial(cMaterial material, boolean selected)
	1684	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1600	1685	{
1601	1686	CameraPane display = this;
1602	1687	//new Exception().printStackTrace();
..	..	@@ -1612,18 +1697,18 @@
1612	1697	//col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
1613	1698	if (!material.multiply)
1614	1699	{
1615		- display.color = color;
	1700	+ display.color = material.color;
1616	1701	display.saturation = material.modulation;
1617	1702	}
1618	1703	else
1619	1704	{
1620		- display.color = color2;
	1705	+ display.color = material.color2;
1621	1706	display.saturation = material.modulation2;
1622	1707	}
1623	1708
1624	1709	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1625	1710
1626		- float[] colorV = GrafreeD.colorV;
	1711	+ float[] colorV = Grafreed.colorV;
1627	1712
1628	1713	/**/
1629	1714	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1631,7 +1716,7 @@
1631	1716	colorV[0] = display.modelParams0[0] * material.diffuse;
1632	1717	colorV[1] = display.modelParams0[1] * material.diffuse;
1633	1718	colorV[2] = display.modelParams0[2] * material.diffuse;
1634		- colorV[3] = material.opacity;
	1719	+ colorV[3] = 1; // material.opacity;
1635	1720
1636	1721	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1637	1722	//System.out.println("Opacity = " + opacity);
..	..	@@ -1736,12 +1821,12 @@
1736	1821
1737	1822	display.modelParams7[0] = 0;
1738	1823	display.modelParams7[1] = 1000;
1739		- display.modelParams7[2] = 0;
	1824	+ display.modelParams7[2] = material.parallax;
1740	1825	display.modelParams7[3] = 0;
1741	1826
1742		- display.modelParams6[0] = 100; // criss de bug de bump
	1827	+ //display.modelParams6[0] = 100; // criss de bug de bump
1743	1828
1744		- Object3D.cVector2[] extparams = display.vector2buffer;
	1829	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1745	1830	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1746	1831	{
1747	1832	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1883,7 +1968,7 @@
1883	1968	void PushMatrix(double[][] matrix)
1884	1969	{
1885	1970	// GrafreeD.tracein(matrix);
1886		- PushMatrix(matrix,1);
	1971	+ PushMatrix(matrix, 1);
1887	1972	}
1888	1973
1889	1974	void PushMatrix()
..	..	@@ -1969,9 +2054,9 @@
1969	2054	switch(viewcode)
1970	2055	{
1971	2056	case 0: return "main";
1972		- case 1: return "one";
1973		- case 2: return "two";
1974		- case 3: return "three";
	2057	+ case 1: return "Red";
	2058	+ case 2: return "Green";
	2059	+ case 3: return "Blue";
1975	2060	case 4: return "light";
1976	2061	}
1977	2062
..	..	@@ -1980,7 +2065,7 @@
1980	2065
1981	2066	static int camerachangeframe;
1982	2067
1983		- public boolean SetCamera(Camera cam)
	2068	+ public boolean SetCamera(Camera cam, boolean set)
1984	2069	{
1985	2070	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
1986	2071	// return false;
..	..	@@ -1998,7 +2083,8 @@
1998	2083
1999	2084	camerachangeframe = Globals.framecount;
2000	2085
2001		- cam.hAspect = -1; // Read only
	2086	+ if (cam != null)
	2087	+ cam.hAspect = -1; // Read only
2002	2088
2003	2089	cameras[0] = cam;
2004	2090	targetLookAts[0] = new cVector(cam.lookAt);
..	..	@@ -2008,11 +2094,14 @@
2008	2094	{
2009	2095	cameras[i] = new Camera(cam.viewCode);
2010	2096	}
2011		-
2012		- cameras[i].setAim(cam.location, cam.lookAt);
2013		- cameras[i].shaper_fovy = cam.shaper_fovy;
2014		- cameras[i].UP.set(cam.UP);
2015		- 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	+ }
2016	2105	}
2017	2106	cameracount = 0;
2018	2107	targetLookAt = targetLookAts[cameracount];
..	..	@@ -2021,7 +2110,7 @@
2021	2110	// Start with free camera
2022	2111	SwitchCameras(true);
2023	2112
2024		- pingthread.jump = true; // optional?
	2113	+// pingthread.jump = true; // optional?
2025	2114
2026	2115	if (TRACKONCE)
2027	2116	{
..	..	@@ -2037,7 +2126,7 @@
2037	2126	//System.err.println("Oeil on");
2038	2127	OEIL = true;
2039	2128	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2040		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2129	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2041	2130	//pingthread.StepToTarget(true);
2042	2131	}
2043	2132
..	..	@@ -2135,7 +2224,7 @@
2135	2224	System.err.println("LIVE = " + Globals.isLIVE());
2136	2225
2137	2226	if (!Globals.isLIVE()) // save sound
2138		- GrafreeD.savesound = true; // wav.save();
	2227	+ Grafreed.savesound = true; // wav.save();
2139	2228	// else
2140	2229	repaint(); // start loop // may 2013
2141	2230	}
..	..	@@ -2168,6 +2257,11 @@
2168	2257	public void ToggleBoxMode()
2169	2258	{
2170	2259	BOXMODE ^= true;
	2260	+ }
	2261	+
	2262	+ public void ToggleZoomBoxMode()
	2263	+ {
	2264	+ ZOOMBOXMODE ^= true;
2171	2265	}
2172	2266
2173	2267	public void ToggleSmoothFocus()
..	..	@@ -2203,18 +2297,6 @@
2203	2297	public void ToggleTrack()
2204	2298	{
2205	2299	TRACK ^= true;
2206		- if (TRACK)
2207		- {
2208		- if (object.selection != null &&
2209		- object.selection.size() > 0 &&
2210		- object.selection.elementAt(0) != null &&
2211		- !(object.selection.elementAt(0) instanceof Camera) &&
2212		- !(object.selection.elementAt(0) instanceof ScriptNode))
2213		- {
2214		- trackedobject = object.selection.elementAt(0);
2215		- repaint();
2216		- }
2217		- }
2218	2300
2219	2301	repaint();
2220	2302	}
..	..	@@ -2247,7 +2329,7 @@
2247	2329
2248	2330	void ToggleDebug()
2249	2331	{
2250		- DEBUG ^= true;
	2332	+ Globals.DEBUG ^= true;
2251	2333	}
2252	2334
2253	2335	void ToggleLookAt()
..	..	@@ -2255,9 +2337,9 @@
2255	2337	LOOKAT ^= true;
2256	2338	}
2257	2339
2258		- void ToggleRandom()
	2340	+ void ToggleSwitch()
2259	2341	{
2260		- RANDOM ^= true;
	2342	+ SWITCH ^= true;
2261	2343	}
2262	2344
2263	2345	void ToggleHandles()
..	..	@@ -2265,10 +2347,17 @@
2265	2347	HANDLES ^= true;
2266	2348	}
2267	2349
	2350	+ Object3D paintFolder;
	2351	+
2268	2352	void TogglePaint()
2269	2353	{
2270	2354	PAINTMODE ^= true;
2271	2355	paintcount = 0;
	2356	+
	2357	+ if (PAINTMODE)
	2358	+ {
	2359	+ paintFolder = GetFolder();
	2360	+ }
2272	2361	}
2273	2362
2274	2363	void SwapCamera(int a, int b)
..	..	@@ -2299,7 +2388,8 @@
2299	2388	{
2300	2389	//System.out.println("PROTECTION = " + cam.hAspect);
2301	2390	//assert (cam.hAspect == 0);
2302		- cam.hAspect = 0;
	2391	+ if (cam != null)
	2392	+ cam.hAspect = 0;
2303	2393	lightCamera = cam;
2304	2394	}
2305	2395
..	..	@@ -2364,7 +2454,34 @@
2364	2454	{
2365	2455	return currentGL;
2366	2456	}
2367		-
	2457	+
	2458	+ static private BufferedImage CreateBim(TextureData texturedata)
	2459	+ {
	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	+ }
	2472	+
	2473	+ private void SetGLNormal(javax.media.opengl.GL gl, float nx, float ny, float nz)
	2474	+ {
	2475	+ gl.glNormal3f(nx, ny, nz);
	2476	+
	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);
	2483	+ }
	2484	+
2368	2485	/**/
2369	2486	class CacheTexture
2370	2487	{
..	..	@@ -2373,28 +2490,31 @@
2373	2490
2374	2491	int resolution;
2375	2492
2376		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2493	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2377	2494	{
2378		- texture = tex;
	2495	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2496	+ texturedata = texdata;
2379	2497	resolution = res;
2380	2498	}
2381	2499	}
2382	2500	/**/
2383	2501
2384	2502	// TEXTURE static Texture texture;
2385		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2386		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2387		- 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	+
2388	2508	int pigmentdepth = 0;
2389	2509	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2390	2510	int bumpdepth = 0;
2391	2511	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2392	2512	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2393	2513	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2394		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2514	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2395	2515	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2396	2516
2397		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2517	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2398	2518	{
2399	2519	TextureData texturedata = null;
2400	2520
..	..	@@ -2404,7 +2524,7 @@
2404	2524	com.sun.opengl.util.texture.TextureIO.newTextureData(
2405	2525	getClass().getClassLoader().getResourceAsStream(name),
2406	2526	true,
2407		- com.sun.opengl.util.texture.TextureIO.PNG);
	2527	+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
2408	2528	} catch (java.io.IOException e)
2409	2529	{
2410	2530	throw new javax.media.opengl.GLException(e);
..	..	@@ -2413,13 +2533,34 @@
2413	2533	if (bump)
2414	2534	texturedata = ConvertBump(texturedata, false);
2415	2535
2416		- com.sun.opengl.util.texture.Texture texture =
2417		- 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);
2418	2538
2419		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2420		- 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);
2421	2541
2422		- 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;
2423	2564	}
2424	2565
2425	2566	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3449,6 +3590,8 @@
3449	3590	};
3450	3591	/**/
3451	3592
	3593	+ static Object3D lastObject;
	3594	+
3452	3595	//com.sun.opengl.util.texture.Texture
3453	3596	TextureData
3454	3597	GetFileTexture(String name, boolean bump, int resolution)
..	..	@@ -3485,6 +3628,8 @@
3485	3628	// return null;
3486	3629	//if (i == 2)
3487	3630	// return null;
	3631	+ // TIFF issue sept 2019
	3632	+ System.err.println("lastObject = " + lastObject);
3488	3633	e.printStackTrace();
3489	3634	name = name.split("\\.tif")[0] + ".jpg";
3490	3635	}
..	..	@@ -3492,6 +3637,8 @@
3492	3637
3493	3638	System.out.println("LOADING TEXTURE : " + name);
3494	3639
	3640	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3641	+
3495	3642	//
3496	3643	if (false) // compressbit > 0)
3497	3644	{
..	..	@@ -4196,6 +4343,7 @@
4196	4343
4197	4344	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
4198	4345	{
	4346	+ new Exception().printStackTrace();
4199	4347	System.exit(0);
4200	4348	com.sun.opengl.util.texture.Texture texture = null;
4201	4349
..	..	@@ -6814,30 +6962,30 @@
6814	6962	short residu = 0;
6815	6963
6816	6964	// wraparound workarounds
6817		- short fuck = (short) (buffer[i] & 0xFF);
	6965	+ short ww = (short) (buffer[i] & 0xFF);
6818	6966	/*
6819		- residu += (fuck%2);
6820		- if(fuck/2 < 256-residu/2)
	6967	+ residu += (ww%2);
	6968	+ if(ww/2 < 256-residu/2)
6821	6969	{
6822		- fuck = (short)((fuck/2) + residu/2);
	6970	+ ww = (short)((ww/2) + residu/2);
6823	6971	if(residu == 2)
6824	6972	residu = 0;
6825	6973	}
6826	6974	else
6827	6975	{
6828	6976	residu = 0;
6829		- fuck /= 2;
	6977	+ ww /= 2;
6830	6978	}
6831	6979	*/
6832		- if (i < imglength / 3 \|\| rnd.nextFloat() < 0.5 \|\| fuck >= 254)
	6980	+ if (i < imglength / 3 \|\| rnd.nextFloat() < 0.5 \|\| ww >= 254)
6833	6981	{
6834		- fuck /= 2;
	6982	+ ww /= 2;
6835	6983	} else
6836	6984	{
6837		- fuck = (short) ((fuck / 2) + fuck % 2);
	6985	+ ww = (short) ((ww / 2) + ww % 2);
6838	6986	}
6839	6987
6840		- buffer[i] = (byte) fuck;
	6988	+ buffer[i] = (byte) ww;
6841	6989	}
6842	6990	//System.out.print(bytes[i] + " ");
6843	6991	//if(buffer[i] >= 0 && buffer[i]<=eps-1) buffer[i] = eps;
..	..	@@ -7889,7 +8037,7 @@
7889	8037	String pigment = Object3D.GetPigment(tex);
7890	8038	String bump = Object3D.GetBump(tex);
7891	8039
7892		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8040	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7893	8041	{
7894	8042	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7895	8043	// System.out.println("; bump = " + bump);
..	..	@@ -7904,11 +8052,69 @@
7904	8052	pigment = null;
7905	8053	}
7906	8054
7907		- ReleaseTexture(bump, true);
7908		- ReleaseTexture(pigment, false);
	8055	+ ReleaseTexture(tex, true);
	8056	+ ReleaseTexture(tex, false);
7909	8057	}
7910	8058
7911		- void ReleaseTexture(String tex, boolean bump)
	8059	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8060	+ {
	8061	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8062	+ {
	8063	+ return;
	8064	+ }
	8065	+
	8066	+ if (tex == null)
	8067	+ {
	8068	+ ReleaseTexture(null, false);
	8069	+ return;
	8070	+ }
	8071	+
	8072	+ String pigment = Object3D.GetPigment(tex);
	8073	+
	8074	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8075	+ {
	8076	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8077	+ // System.out.println("; bump = " + bump);
	8078	+ }
	8079	+
	8080	+ if (pigment.equals(""))
	8081	+ {
	8082	+ pigment = null;
	8083	+ }
	8084	+
	8085	+ ReleaseTexture(tex, false);
	8086	+ }
	8087	+
	8088	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8089	+ {
	8090	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8091	+ {
	8092	+ return;
	8093	+ }
	8094	+
	8095	+ if (tex == null)
	8096	+ {
	8097	+ ReleaseTexture(null, true);
	8098	+ return;
	8099	+ }
	8100	+
	8101	+ String bump = Object3D.GetBump(tex);
	8102	+
	8103	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8104	+ {
	8105	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8106	+ // System.out.println("; bump = " + bump);
	8107	+ }
	8108	+
	8109	+ if (bump.equals(""))
	8110	+ {
	8111	+ bump = null;
	8112	+ }
	8113	+
	8114	+ ReleaseTexture(tex, true);
	8115	+ }
	8116	+
	8117	+ void ReleaseTexture(cTexture tex, boolean bump)
7912	8118	{
7913	8119	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7914	8120	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7919,7 +8125,7 @@
7919	8125	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7920	8126
7921	8127	if (tex != null)
7922		- texture = textures.get(tex);
	8128	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7923	8129
7924	8130	// //assert( texture != null );
7925	8131	// if (texture == null)
..	..	@@ -8011,7 +8217,55 @@
8011	8217	}
8012	8218	}
8013	8219
8014		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8220	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
	8221	+ {
	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;
	8263	+
	8264	+ BindPigmentTexture(tex, resolution);
	8265	+ BindBumpTexture(tex, resolution);
	8266	+ }
	8267	+
	8268	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
8015	8269	{
8016	8270	if (// DrawMode() != 0 \|\| /tex == null \|\|/
8017	8271	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -8022,17 +8276,47 @@
8022	8276	if (tex == null)
8023	8277	{
8024	8278	BindTexture(null,false,resolution);
8025		- BindTexture(null,true,resolution);
8026	8279	return;
8027	8280	}
8028	8281
8029	8282	String pigment = Object3D.GetPigment(tex);
	8283	+
	8284	+ usedtextures.add(tex);
	8285	+
	8286	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8287	+ {
	8288	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8289	+ // System.out.println("; bump = " + bump);
	8290	+ }
	8291	+
	8292	+ if (pigment.equals(""))
	8293	+ {
	8294	+ pigment = null;
	8295	+ }
	8296	+
	8297	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8298	+ BindTexture(tex, false, resolution);
	8299	+ }
	8300	+
	8301	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8302	+ {
	8303	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8304	+ ambientOcclusion ) // \|\| !textureon)
	8305	+ {
	8306	+ return; // false;
	8307	+ }
	8308	+
	8309	+ if (tex == null)
	8310	+ {
	8311	+ BindTexture(null,true,resolution);
	8312	+ return;
	8313	+ }
	8314	+
8030	8315	String bump = Object3D.GetBump(tex);
8031	8316
8032		- usedtextures.put(pigment, pigment);
8033		- usedtextures.put(bump, bump);
	8317	+ usedtextures.add(tex);
8034	8318
8035		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8319	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
8036	8320	{
8037	8321	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
8038	8322	// System.out.println("; bump = " + bump);
..	..	@@ -8042,43 +8326,94 @@
8042	8326	{
8043	8327	bump = null;
8044	8328	}
8045		- if (pigment.equals(""))
8046		- {
8047		- pigment = null;
8048		- }
8049	8329
8050		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8051		- BindTexture(pigment, false, resolution);
8052	8330	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
8053		- BindTexture(bump, true, resolution);
	8331	+ BindTexture(tex, true, resolution);
8054	8332	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
8055		-
8056		- return; // true;
8057	8333	}
8058	8334
8059		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8335	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8336	+
	8337	+ private boolean FileExists(String tex)
8060	8338	{
8061		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8339	+ if (missingTextures.contains(tex))
	8340	+ {
	8341	+ return false;
	8342	+ }
	8343	+
	8344	+ boolean fileExists = new File(tex).exists();
	8345	+
	8346	+ if (!fileExists)
	8347	+ {
	8348	+ // If file exists, the "new File()" is not executed sgain
	8349	+ missingTextures.add(tex);
	8350	+ }
	8351	+
	8352	+ return fileExists;
	8353	+ }
	8354	+
	8355	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
	8356	+ {
	8357	+ CacheTexture texturecache = null;
8062	8358
8063	8359	if (tex != null)
8064	8360	{
8065		- String texname = tex;
	8361	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8362	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
8066	8363
8067		- String[] split = tex.split("Textures");
8068		- if (split.length > 1)
8069		- texname = "/Users/nbriere/Textures" + split[split.length-1];
8070		- else
8071		- if (!texname.startsWith("/"))
8072		- texname = "/Users/nbriere/Textures/" + texname;
	8364	+ if (texname.equals("") && texdata == null)
	8365	+ {
	8366	+ return null;
	8367	+ }
	8368	+
	8369	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8370	+
	8371	+// String[] split = tex.split("Textures");
	8372	+// if (split.length > 1)
	8373	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8374	+// else
	8375	+// if (!texname.startsWith("/"))
	8376	+// texname = "/Users/nbriere/Textures/" + texname;
	8377	+ if (!FileExists(texname) && !texname.startsWith("@"))
	8378	+ {
	8379	+ texname = fallbackTextureName;
	8380	+ }
8073	8381
8074	8382	if (CACHETEXTURE)
8075		- texture = textures.get(texname); // TEXTURE CACHE
8076		-
8077		- TextureData texturedata = null;
8078		-
8079		- if (texture == null \|\| texture.resolution < resolution)
8080	8383	{
8081		- 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(""))
8082	8417	{
8083	8418	assert(!bump);
8084	8419	// if (bump)
..	..	@@ -8089,19 +8424,23 @@
8089	8424	// }
8090	8425	// else
8091	8426	// {
8092		- texture = textures.get(tex);
8093		- if (texture == null)
	8427	+ // texturecache = textures.get(texname); // suspicious
	8428	+ if (texturecache == null)
8094	8429	{
8095		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8430	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
8096	8431	}
	8432	+ else
	8433	+ new Exception().printStackTrace();
8097	8434	// }
8098	8435	} else
8099		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8436	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
8100	8437	{
8101	8438	assert(bump);
8102		- texture = textures.get(tex);
8103		- if (texture == null)
8104		- 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();
8105	8444	} else
8106	8445	{
8107	8446	//if (tex.equals("IMMORTAL"))
..	..	@@ -8109,11 +8448,22 @@
8109	8448	// texture = GetResourceTexture("default.png");
8110	8449	//} else
8111	8450	//{
8112		- if (tex.equals("WHITE_NOISE"))
	8451	+ if (texname.endsWith("WHITE_NOISE"))
8113	8452	{
8114		- texture = textures.get(tex);
8115		- if (texture == null)
8116		- 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();
8117	8467	} else
8118	8468	{
8119	8469	if (textureon)
..	..	@@ -8138,7 +8488,7 @@
8138	8488	}
8139	8489
8140	8490	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
8141		- if (!new File(cachename).exists())
	8491	+ if (!FileExists(cachename))
8142	8492	cachename = texname;
8143	8493	else
8144	8494	processbump = false; // don't process bump map again
..	..	@@ -8160,7 +8510,7 @@
8160	8510	}
8161	8511
8162	8512	cachename = texname.substring(0, texname.length()-4)+ext+".png";
8163		- if (!new File(cachename).exists())
	8513	+ if (!FileExists(cachename))
8164	8514	cachename = texname;
8165	8515	else
8166	8516	processbump = false; // don't process bump map again
..	..	@@ -8169,20 +8519,23 @@
8169	8519	texturedata = GetFileTexture(cachename, processbump, resolution);
8170	8520
8171	8521
8172		- if (texturedata != null)
8173		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8522	+ if (texturedata == null)
	8523	+ throw new Exception();
	8524	+
	8525	+ texturecache = new CacheTexture(texturedata,resolution);
8174	8526	//texture = GetTexture(tex, bump);
8175	8527	}
	8528	+ }
8176	8529	}
8177	8530	//}
8178	8531	}
8179	8532
8180		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8533	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
8181	8534	{
8182	8535	//return false;
8183	8536
8184	8537	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
8185		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8538	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
8186	8539	{
8187	8540	// String ext = "_highres";
8188	8541	// if (REDUCETEXTURE)
..	..	@@ -8199,52 +8552,17 @@
8199	8552	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
8200	8553	if (!cachefile.exists())
8201	8554	{
8202		- // cache to disk
8203		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
8204		- //buffers[0].
8205		-
8206		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
8207		- int[] pixels = new int[bytebuf.capacity()/3];
8208		-
8209		- // squared size heuristic...
8210		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8555	+ //if (texturedata.getWidth() == texturedata.getHeight())
8211	8556	{
8212		- for (int i=pixels.length; --i>=0;)
8213		- {
8214		- int i3 = i*3;
8215		- pixels[i] = 0xFF;
8216		- pixels[i] <<= 8;
8217		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
8218		- pixels[i] <<= 8;
8219		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
8220		- pixels[i] <<= 8;
8221		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
8222		- }
8223		-
8224		- /*
8225		- int r=0,g=0,b=0,a=0;
8226		- for (int i=0; i<width; i++)
8227		- for (int j=0; j<height; j++)
8228		- {
8229		- int index = j*width+i;
8230		- int p = pixels[index];
8231		- a = ((p>>24) & 0xFF);
8232		- r = ((p>>16) & 0xFF);
8233		- g = ((p>>8) & 0xFF);
8234		- b = (p & 0xFF);
8235		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
8236		- }
8237		- /**/
8238		- int width = (int)Math.sqrt(pixels.length); // squared
8239		- int height = width;
8240		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
8241		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8557	+ BufferedImage rendImage = CreateBim(texturedata);
	8558	+
8242	8559	ImageWriter writer = null;
8243	8560	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
8244	8561	if (iter.hasNext()) {
8245	8562	writer = (ImageWriter)iter.next();
8246	8563	}
8247		- float compressionQuality = 0.9f;
	8564	+
	8565	+ float compressionQuality = 0.85f;
8248	8566	try
8249	8567	{
8250	8568	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -8261,18 +8579,20 @@
8261	8579	}
8262	8580	}
8263	8581	}
8264		-
	8582	+
	8583	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8584	+
8265	8585	//System.out.println("Texture = " + tex);
8266		- if (textures.containsKey(texname))
	8586	+ if (textures.containsKey(tex))
8267	8587	{
8268		- CacheTexture thetex = textures.get(texname);
	8588	+ CacheTexture thetex = textures.get(tex);
8269	8589	thetex.texture.disable();
8270	8590	thetex.texture.dispose();
8271		- textures.remove(texname);
	8591	+ textures.remove(tex);
8272	8592	}
8273	8593
8274		- texture.texturedata = texturedata;
8275		- textures.put(texname, texture);
	8594	+ //texture.texturedata = texturedata;
	8595	+ textures.put(tex, texturecache);
8276	8596
8277	8597	// newtex = true;
8278	8598	}
..	..	@@ -8288,10 +8608,46 @@
8288	8608	}
8289	8609	}
8290	8610
8291		- return texture;
	8611	+ return texturecache;
8292	8612	}
8293	8613
8294		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	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
8295	8651	{
8296	8652	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8297	8653
..	..	@@ -8309,21 +8665,21 @@
8309	8665	return texture!=null?texture.texture:null;
8310	8666	}
8311	8667
8312		- public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8668	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
8313	8669	{
8314	8670	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
8315	8671
8316	8672	return texture!=null?texture.texturedata:null;
8317	8673	}
8318	8674
8319		- boolean BindTexture(String tex, boolean bump, int resolution)
	8675	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
8320	8676	{
8321	8677	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
8322	8678	{
8323	8679	return false;
8324	8680	}
8325	8681
8326		- boolean newtex = false;
	8682	+ //boolean newtex = false;
8327	8683
8328	8684	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
8329	8685
..	..	@@ -8355,9 +8711,75 @@
8355	8711	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8356	8712	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8357	8713
8358		- return newtex;
	8714	+ return true; // Warning: not used.
8359	8715	}
8360	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	+
8361	8783	ShadowBuffer shadowPBuf;
8362	8784	AntialiasBuffer antialiasPBuf;
8363	8785	int MAXSTACK;
..	..	@@ -8374,10 +8796,12 @@
8374	8796
8375	8797	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8376	8798	MAXSTACK = temp[0];
8377		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8799	+ if (Globals.DEBUG)
	8800	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8378	8801	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8379	8802	MAXSTACK = temp[0];
8380		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8803	+ if (Globals.DEBUG)
	8804	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8381	8805
8382	8806	// Use debug pipeline
8383	8807	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8385,7 +8809,8 @@
8385	8809	gl = drawable.getGL(); //
8386	8810
8387	8811	GL gl3 = getGL();
8388		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8812	+ if (Globals.DEBUG)
	8813	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8389	8814
8390	8815
8391	8816	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8550,7 +8975,7 @@
8550	8975
8551	8976	if (cubemap == null)
8552	8977	{
8553		- LoadEnvy(5);
	8978	+ //LoadEnvy(1);
8554	8979	}
8555	8980
8556	8981	//cubemap.enable();
..	..	@@ -8826,6 +9251,8 @@
8826	9251
8827	9252	void LoadEnvy(int which)
8828	9253	{
	9254	+ assert(false);
	9255	+
8829	9256	String name;
8830	9257	String ext;
8831	9258
..	..	@@ -8837,37 +9264,58 @@
8837	9264	cubemap = null;
8838	9265	return;
8839	9266	case 1:
8840		- name = "cubemaps/box_";
8841		- ext = "png";
	9267	+ name = "cubemaps/rgb/";
	9268	+ ext = "jpg";
8842	9269	reverseUP = false;
8843	9270	break;
8844	9271	case 2:
8845		- name = "cubemaps/uffizi_";
8846		- ext = "png";
8847		- break; // reverseUP = true; break;
	9272	+ name = "cubemaps/uffizi/";
	9273	+ ext = "jpg";
	9274	+ reverseUP = false;
	9275	+ break;
8848	9276	case 3:
8849		- name = "cubemaps/CloudyHills_";
8850		- ext = "tga";
	9277	+ name = "cubemaps/CloudyHills/";
	9278	+ ext = "jpg";
8851	9279	reverseUP = false;
8852	9280	break;
8853	9281	case 4:
8854		- name = "cubemaps/cornell_";
	9282	+ name = "cubemaps/cornell/";
8855	9283	ext = "png";
8856	9284	reverseUP = false;
8857	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;
8858	9311	default:
8859		- name = "cubemaps/rgb_";
8860		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9312	+ name = "cubemaps/box/";
	9313	+ ext = "png"; /mipmap = true;/
	9314	+ reverseUP = false;
8861	9315	break;
8862	9316	}
8863		-
8864		- try
8865		- {
8866		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
8867		- } catch (IOException e)
8868		- {
8869		- throw new RuntimeException(e);
8870		- }
	9317	+
	9318	+ LoadSkybox(name, ext, mipmap);
8871	9319	}
8872	9320
8873	9321	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -8899,8 +9347,12 @@
8899	9347	static double[] model = new double[16];
8900	9348	double[] camera2light = new double[16];
8901	9349	double[] light2camera = new double[16];
8902		- int newenvy = -1;
8903		- boolean envyoff = true; // false;
	9350	+
	9351	+ //int newenvy = -1;
	9352	+ //boolean envyoff = false;
	9353	+
	9354	+ String loadedskyboxname;
	9355	+
8904	9356	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
8905	9357	//float[] light0 = { 0,0,0 };
8906	9358	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -9193,11 +9645,35 @@
9193	9645	jy8[3] = 0.5f;
9194	9646	}
9195	9647
9196		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9648	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9197	9649	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
9198	9650	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
9199	9651	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
9200	9652
	9653	+ void ResetOptions()
	9654	+ {
	9655	+ options1[0] = 100;
	9656	+ options1[1] = 0.025f;
	9657	+ options1[2] = 0.01f;
	9658	+ options1[3] = 0;
	9659	+ options1[4] = 0;
	9660	+
	9661	+ options2[0] = 0;
	9662	+ options2[1] = 0.75f;
	9663	+ options2[2] = 0;
	9664	+ options2[3] = 0;
	9665	+
	9666	+ options3[0] = 1;
	9667	+ options3[1] = 1;
	9668	+ options3[2] = 1;
	9669	+ options3[3] = 0;
	9670	+
	9671	+ options4[0] = 1;
	9672	+ options4[1] = 0;
	9673	+ options4[2] = 1;
	9674	+ options4[3] = 0;
	9675	+ }
	9676	+
9201	9677	static int imagecount = 0; // movie generation
9202	9678
9203	9679	static int jitter = 0;
..	..	@@ -9293,8 +9769,8 @@
9293	9769	assert (parentcam != renderCamera);
9294	9770
9295	9771	if (renderCamera != lightCamera)
9296		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9297		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9772	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9773	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9298	9774
9299	9775	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
9300	9776
..	..	@@ -9309,8 +9785,8 @@
9309	9785	LA.matCopy(renderCamera.fromScreen, matrix);
9310	9786
9311	9787	if (renderCamera != lightCamera)
9312		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9313		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9788	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9789	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9314	9790
9315	9791	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
9316	9792
..	..	@@ -9356,13 +9832,18 @@
9356	9832	rati = 1 / rati;
9357	9833	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9358	9834	}
9359		- assert (newenvy == -1);
	9835	+
	9836	+ //assert (newenvy == -1);
	9837	+
9360	9838	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9361	9839	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9362		- DrawSkyBox(gl);
	9840	+ DrawSkyBox(gl, (float)rati);
9363	9841	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9364	9842	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9365		- accPerspective(gl, renderCamera.shaper_fovy / ratio,
	9843	+
	9844	+ boolean vr = capsLocked && !lightMode;
	9845	+
	9846	+ accPerspective(gl, renderCamera.shaper_fovy / ratio * (vr ? 1.2 : 1),
9366	9847	ratio,
9367	9848	//near_plane, far_plane,
9368	9849	renderCamera.shaper_zNear * renderCamera.Distance(), renderCamera.shaper_zFar * renderCamera.Distance(),
..	..	@@ -9382,7 +9863,7 @@
9382	9863	//gl.glFlush();
9383	9864	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9384	9865
9385		- if (ANIMATION && ABORTED)
	9866	+ if (Globals.ANIMATION && ABORTED)
9386	9867	{
9387	9868	System.err.println(" ABORTED FRAME");
9388	9869	break;
..	..	@@ -9412,7 +9893,7 @@
9412	9893	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9413	9894
9414	9895	// save image
9415		- if (ANIMATION && !ABORTED)
	9896	+ if (Globals.ANIMATION && !ABORTED)
9416	9897	{
9417	9898	VPwidth = viewport[2];
9418	9899	VPheight = viewport[3];
..	..	@@ -9523,11 +10004,11 @@
9523	10004
9524	10005	// imagecount++;
9525	10006
9526		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	10007	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9527	10008
9528	10009	if (!BOXMODE)
9529	10010	{
9530		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	10011	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9531	10012	}
9532	10013
9533	10014	if (!BOXMODE)
..	..	@@ -9565,7 +10046,7 @@
9565	10046	ABORTED = false;
9566	10047	}
9567	10048	else
9568		- GrafreeD.wav.cursor += 735 * ACSIZE;
	10049	+ Grafreed.wav.cursor += 735 * ACSIZE;
9569	10050
9570	10051	if (false)
9571	10052	{
..	..	@@ -10225,14 +10706,23 @@
10225	10706	static boolean init = false;
10226	10707
10227	10708	double[][] matrix = LA.newMatrix();
	10709	+
	10710	+ // This is to refresh the UI of the material panel.
	10711	+ ObjEditor patchMaterial;
10228	10712
10229	10713	public void display(GLAutoDrawable drawable)
10230	10714	{
10231		- if (GrafreeD.savesound && GrafreeD.hassound)
	10715	+ if (patchMaterial.patchMaterial)
10232	10716	{
10233		- GrafreeD.wav.save();
10234		- GrafreeD.savesound = false;
10235		- GrafreeD.hassound = false;
	10717	+ patchMaterial.patchMaterial = false;
	10718	+ patchMaterial.objectTabbedPane.setSelectedIndex(1);
	10719	+ }
	10720	+
	10721	+ if (Grafreed.savesound && Grafreed.hassound)
	10722	+ {
	10723	+ Grafreed.wav.save();
	10724	+ Grafreed.savesound = false;
	10725	+ Grafreed.hassound = false;
10236	10726	}
10237	10727	// if (DEBUG_SELECTION)
10238	10728	// {
..	..	@@ -10271,7 +10761,9 @@
10271	10761	}
10272	10762	/**/
10273	10763
10274		- if (selection)
	10764	+ boolean control = ((modifiers & CTRL) != 0);
	10765	+
	10766	+ if (selection && (!Globals.isLIVE() \|\| control))
10275	10767	{
10276	10768	selectbuffer.display();
10277	10769	return;
..	..	@@ -10308,6 +10800,7 @@
10308	10800	ANTIALIAS = 0;
10309	10801	//System.out.println("RESTART");
10310	10802	AAtimer.restart();
	10803	+ Globals.TIMERRUNNING = true;
10311	10804	}
10312	10805	}
10313	10806	}
..	..	@@ -10322,6 +10815,112 @@
10322	10815
10323	10816	if (DrawMode() == DEFAULT)
10324	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	+
10325	10924	currentlydrawing = true;
10326	10925	}
10327	10926
..	..	@@ -10362,7 +10961,7 @@
10362	10961	Object3D theobject = object;
10363	10962	Object3D theparent = object.parent;
10364	10963	object.parent = null;
10365		- object = (Object3D)GrafreeD.clone(object);
	10964	+ object = (Object3D)Grafreed.clone(object);
10366	10965	object.Stripify();
10367	10966	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10368	10967	theobject.PreprocessOcclusion(this);
..	..	@@ -10375,13 +10974,14 @@
10375	10974	ambientOcclusion = false;
10376	10975	}
10377	10976
10378		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10977	+ if (//Globals.lighttouched &&
	10978	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10379	10979	{
10380	10980	//if (RENDERSHADOW) // ?
10381	10981	if (!IsFrozen())
10382	10982	{
10383	10983	// dec 2012
10384		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10984	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10385	10985	{
10386	10986	Globals.framecount++;
10387	10987	shadowbuffer.display();
..	..	@@ -10394,7 +10994,7 @@
10394	10994
10395	10995	if (wait)
10396	10996	{
10397		- Sleep(500);
	10997	+ Sleep(200); // blocks everything
10398	10998
10399	10999	wait = false;
10400	11000	}
..	..	@@ -10508,8 +11108,8 @@
10508	11108
10509	11109	// if (parentcam != renderCamera) // not a light
10510	11110	if (cam != lightCamera)
10511		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10512		- LA.matConcat(matrix, parentcam.toParent, matrix);
	11111	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11112	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10513	11113
10514	11114	for (int j = 0; j < 4; j++)
10515	11115	{
..	..	@@ -10523,8 +11123,8 @@
10523	11123
10524	11124	// if (parentcam != renderCamera) // not a light
10525	11125	if (cam != lightCamera)
10526		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10527		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	11126	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11127	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10528	11128
10529	11129	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10530	11130
..	..	@@ -10610,13 +11210,43 @@
10610	11210	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10611	11211	}
10612	11212
10613		- 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"))
10614	11221	{
10615		- LoadEnvy(newenvy);
	11222	+ if (cubemaprgb == null)
	11223	+ {
	11224	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
	11225	+ }
	11226	+
	11227	+ cubemap = cubemaprgb;
10616	11228	}
10617		-
10618		- newenvy = -1;
10619		-
	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	+
10620	11250	ratio = ((double) getWidth()) / getHeight();
10621	11251	//System.out.println("ratio = " + ratio);
10622	11252
..	..	@@ -10632,7 +11262,7 @@
10632	11262
10633	11263	if (!IsFrozen() && !ambientOcclusion)
10634	11264	{
10635		- DrawSkyBox(gl);
	11265	+ DrawSkyBox(gl, (float)ratio);
10636	11266	}
10637	11267
10638	11268	//if (selection_view == -1)
..	..	@@ -10783,7 +11413,16 @@
10783	11413	// Bump noise
10784	11414	gl.glActiveTexture(GL.GL_TEXTURE6);
10785	11415	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10786		- BindTexture(NOISE_TEXTURE, false, 2);
	11416	+
	11417	+ try
	11418	+ {
	11419	+ BindTexture(NOISE_TEXTURE, false, 2);
	11420	+ }
	11421	+ catch (Exception e)
	11422	+ {
	11423	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11424	+ }
	11425	+
10787	11426
10788	11427	gl.glActiveTexture(GL.GL_TEXTURE0);
10789	11428	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10806,8 +11445,8 @@
10806	11445
10807	11446	gl.glMatrixMode(GL.GL_MODELVIEW);
10808	11447
10809		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10810	11448	//gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11449	+//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10811	11450	//gl.glEnable(gl.GL_MULTISAMPLE);
10812	11451	} else
10813	11452	{
..	..	@@ -10819,7 +11458,7 @@
10819	11458	//System.out.println("BLENDING ON");
10820	11459	gl.glEnable(GL.GL_BLEND);
10821	11460	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10822		-
	11461	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10823	11462	gl.glMatrixMode(gl.GL_PROJECTION);
10824	11463	gl.glLoadIdentity();
10825	11464
..	..	@@ -10869,7 +11508,10 @@
10869	11508	//gl.glOrtho(-BOOST, BOOST, -BOOST, BOOST, 0.001, 1000);
10870	11509	} else
10871	11510	{
10872		- 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());
10873	11515	}
10874	11516	}
10875	11517
..	..	@@ -10908,8 +11550,8 @@
10908	11550	System.err.println("parentcam != renderCamera");
10909	11551
10910	11552	// if (cam != lightCamera)
10911		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10912		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11553	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11554	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
10913	11555	}
10914	11556
10915	11557	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10930,8 +11572,8 @@
10930	11572	if (true) // TODO
10931	11573	{
10932	11574	if (cam != lightCamera)
10933		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10934		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11575	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11576	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10935	11577	}
10936	11578
10937	11579	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -11068,7 +11710,7 @@
11068	11710	}
11069	11711	}
11070	11712
11071		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11713	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
11072	11714	{
11073	11715	//gl.glDepthFunc(GL.GL_LEQUAL);
11074	11716	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -11076,24 +11718,21 @@
11076	11718
11077	11719	boolean texon = textureon;
11078	11720
11079		- if (RENDERPROGRAM > 0)
11080		- {
11081		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
11082		- textureon = false;
11083		- }
	11721	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11722	+ textureon = false;
	11723	+
11084	11724	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
11085	11725	//System.out.println("ALLO");
11086	11726	gl.glColorMask(false, false, false, false);
11087	11727	DrawObject(gl);
11088		- if (RENDERPROGRAM > 0)
11089		- {
11090		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
11091		- textureon = texon;
11092		- }
	11728	+
	11729	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11730	+ textureon = texon;
	11731	+
11093	11732	gl.glColorMask(true, true, true, true);
11094	11733
11095	11734	gl.glDepthFunc(GL.GL_EQUAL);
11096		- //gl.glDepthMask(false);
	11735	+ gl.glDepthMask(false);
11097	11736	}
11098	11737
11099	11738	if (false) // DrawMode() == SHADOW)
..	..	@@ -11228,8 +11867,11 @@
11228	11867	repaint();
11229	11868	}
11230	11869
11231		- if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
	11870	+ if (Globals.isLIVE() && DrawMode() == DEFAULT \|\| pingthread.live) // may 2013
	11871	+ {
	11872	+ renderCamera.computeTransform();
11232	11873	repaint();
	11874	+ }
11233	11875
11234	11876	displaydone = true;
11235	11877	}
..	..	@@ -11247,8 +11889,14 @@
11247	11889	{
11248	11890	renderpass++;
11249	11891	// System.out.println("Draw object... ");
	11892	+ STEP = 1;
11250	11893	if (FAST) // in case there is no script
11251		- STEP = 16;
	11894	+ STEP = 8;
	11895	+
	11896	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11897	+ {
	11898	+ STEP *= 4;
	11899	+ }
11252	11900
11253	11901	//object.FullInvariants();
11254	11902
..	..	@@ -11262,24 +11910,59 @@
11262	11910	e.printStackTrace();
11263	11911	}
11264	11912
11265		- if (GrafreeD.RENDERME > 0)
11266		- GrafreeD.RENDERME--; // mechante magouille
	11913	+ if (Grafreed.RENDERME > 0)
	11914	+ Grafreed.RENDERME--; // mechante magouille
11267	11915
11268	11916	Globals.ONESTEP = false;
11269	11917	}
11270	11918
11271	11919	static boolean zoomonce = false;
11272	11920
	11921	+ static void CreateSelectedPoint()
	11922	+ {
	11923	+ if (selectedpoint == null)
	11924	+ {
	11925	+ debugpointG = new Sphere();
	11926	+ debugpointP = new Sphere();
	11927	+ debugpointC = new Sphere();
	11928	+ debugpointR = new Sphere();
	11929	+
	11930	+ selectedpoint = new Superellipsoid();
	11931	+
	11932	+ for (int i=0; i<8; i++)
	11933	+ {
	11934	+ debugpoints[i] = new Sphere();
	11935	+ }
	11936	+ }
	11937	+ }
	11938	+
11273	11939	void DrawObject(GL gl, boolean draw)
11274	11940	{
	11941	+ // To clear camera values
	11942	+ ResetOptions();
	11943	+
11275	11944	//System.out.println("DRAW OBJECT " + mouseDown);
11276	11945	// DrawMode() = SELECTION;
11277	11946	//GL gl = getGL();
11278	11947	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
11279	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	+ }
11280	11963	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11281		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11282		- pingthread.StepToTarget(true); // true);
	11964	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11965	+ pingthread.StepToTarget(); // true);
11283	11966	// zoomonce = false;
11284	11967	}
11285	11968
..	..	@@ -11333,7 +12016,14 @@
11333	12016
11334	12017	usedtextures.clear();
11335	12018
11336		- BindTextures(DEFAULT_TEXTURES, 2);
	12019	+ try
	12020	+ {
	12021	+ BindTextures(DEFAULT_TEXTURES, 2);
	12022	+ }
	12023	+ catch (Exception e)
	12024	+ {
	12025	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	12026	+ }
11337	12027	}
11338	12028	//System.out.println("--> " + stackdepth);
11339	12029	// GrafreeD.traceon();
..	..	@@ -11343,8 +12033,9 @@
11343	12033
11344	12034	if (DrawMode() == DEFAULT)
11345	12035	{
11346		- if (DEBUG)
	12036	+ if (Globals.DEBUG)
11347	12037	{
	12038	+ CreateSelectedPoint();
11348	12039	float radius = 0.05f;
11349	12040	if (selectedpoint.radius != radius)
11350	12041	{
..	..	@@ -11398,20 +12089,32 @@
11398	12089	ReleaseTextures(DEFAULT_TEXTURES);
11399	12090
11400	12091	if (CLEANCACHE)
11401		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	12092	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11402	12093	{
11403		- String tex = e.nextElement();
	12094	+ cTexture tex = e.nextElement();
11404	12095
11405	12096	// System.out.println("Texture --------- " + tex);
11406	12097
11407		- if (tex.equals("WHITE_NOISE"))
	12098	+ if (tex.equals("WHITE_NOISE:"))
11408	12099	continue;
11409	12100
11410		- if (!usedtextures.containsKey(tex))
	12101	+ if (!usedtextures.contains(tex))
11411	12102	{
	12103	+ CacheTexture gettex = texturepigment.get(tex);
11412	12104	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11413		- textures.get(tex).texture.dispose();
11414		- 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	+ }
11415	12118	}
11416	12119	}
11417	12120	}
..	..	@@ -11424,7 +12127,14 @@
11424	12127	if (checker != null && DrawMode() == DEFAULT)
11425	12128	{
11426	12129	//BindTexture(IMMORTAL_TEXTURE);
11427		- BindTextures(checker.GetTextures(), checker.texres);
	12130	+ try
	12131	+ {
	12132	+ BindTextures(checker.GetTextures(), checker.texres);
	12133	+ }
	12134	+ catch (Exception e)
	12135	+ {
	12136	+ System.err.println("FAILED: " + checker.GetTextures());
	12137	+ }
11428	12138	// NEAREST
11429	12139	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11430	12140	DrawChecker(gl);
..	..	@@ -11506,7 +12216,7 @@
11506	12216	return;
11507	12217	}
11508	12218
11509		- String string = obj.GetToolTip();
	12219	+ String string = obj.toString(); //.GetToolTip();
11510	12220
11511	12221	GL gl = GetGL();
11512	12222
..	..	@@ -11823,8 +12533,8 @@
11823	12533	//obj.TransformToWorld(light, light);
11824	12534	for (int i = tp.size(); --i >= 0;)
11825	12535	{
11826		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11827		- LA.xformPos(light, tp.get(i).toParent, light);
	12536	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12537	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11828	12538	}
11829	12539
11830	12540
..	..	@@ -11841,8 +12551,8 @@
11841	12551	parentcam = cameras[0];
11842	12552	}
11843	12553
11844		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11845		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12554	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12555	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11846	12556
11847	12557	LA.xformPos(light, renderCamera.toScreen, light);
11848	12558
..	..	@@ -11932,8 +12642,82 @@
11932	12642
11933	12643	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
11934	12644
11935		- String program =
	12645	+ String programmin =
	12646	+ // Min shader
11936	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	+
11937	12721	//"OPTION ARB_fragment_program_shadow;" +
11938	12722	"PARAM light2cam0 = program.env[10];" +
11939	12723	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -11959,7 +12743,7 @@
11959	12743	"PARAM params4 = program.env[4];" + // anisoV, cameralight, selfshadow, shadow
11960	12744	"PARAM params5 = program.env[5];" + // texture, opacity, fakedepth, shadowbias
11961	12745	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
11962		- "PARAM params7 = program.env[7];" + // noise power, opacity power
	12746	+ "PARAM params7 = program.env[7];" + // noise power, opacity power, parallax
11963	12747	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
11964	12748	"PARAM options1 = program.env[62];" + // fog rgb color
11965	12749	"PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
..	..	@@ -12048,8 +12832,7 @@
12048	12832	"TEMP shininess;" +
12049	12833	"\n" +
12050	12834	"MOV texSamp, one;" +
12051		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
12052		-
	12835	+
12053	12836	"MOV mapgrid.x, one2048th.x;" +
12054	12837	"MOV temp, fragment.texcoord[1];" +
12055	12838	/*
..	..	@@ -12070,20 +12853,20 @@
12070	12853	"MUL temp, floor, mapgrid.x;" +
12071	12854	//"TEX depth0, temp, texture[1], 2D;" +
12072	12855	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12073		- TextureFetch("depth0", "temp", "1") +
	12856	+ ShadowTextureFetch("depth0", "temp", "1") +
12074	12857	"") +
12075	12858	"ADD temp.x, temp.x, mapgrid.x;" +
12076	12859	//"TEX depth1, temp, texture[1], 2D;" +
12077	12860	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12078		- TextureFetch("depth1", "temp", "1") +
	12861	+ ShadowTextureFetch("depth1", "temp", "1") +
12079	12862	"") +
12080	12863	"ADD temp.y, temp.y, mapgrid.x;" +
12081	12864	//"TEX depth2, temp, texture[1], 2D;" +
12082		- TextureFetch("depth2", "temp", "1") +
	12865	+ ShadowTextureFetch("depth2", "temp", "1") +
12083	12866	"SUB temp.x, temp.x, mapgrid.x;" +
12084	12867	//"TEX depth3, temp, texture[1], 2D;" +
12085	12868	(((mode & FP_SOFTSHADOW) == 0) ? "" :
12086		- TextureFetch("depth3", "temp", "1") +
	12869	+ ShadowTextureFetch("depth3", "temp", "1") +
12087	12870	"") +
12088	12871	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
12089	12872	//"MOV params, material;" +
..	..	@@ -12205,7 +12988,7 @@
12205	12988	"POW texSamp.a, texSamp.a, params6.w;" + // fog punch through shortcut
12206	12989	// mar 2013 ??? "KIL alpha.a;" +
12207	12990	"MOV alpha, texSamp.aaaa;" + // y;" +
12208		- "KIL alpha.a;" +
	12991	+ "KIL alpha.a;" + // not sure with parallax mapping
12209	12992	/*
12210	12993	"MUL temp.xy, temp, two;" +
12211	12994	"TXB bump, temp, texture[0], 2D;" +
..	..	@@ -12291,11 +13074,6 @@
12291	13074	"SUB bump0, bump0, half;" +
12292	13075	"ADD bump, bump, bump0;" +
12293	13076
12294		- "MOV temp.x, texSamp.a;" +
12295		- "LRP texSamp, params5.x, texSamp, one;" + // texture proportion
12296		- //"LRP texSamp0, params5.x, texSamp0, one;" +
12297		- "MOV texSamp.a, temp.x;" +
12298		-
12299	13077	// double-sided
12300	13078	/**/
12301	13079	(doublesided?"DP3 temp.z, normal, eye;" +
..	..	@@ -12305,26 +13083,73 @@
12305	13083	"ADD temp.x, temp.x, one.x;" +
12306	13084	"MUL normal, normal, temp.xxxx;":""
12307	13085	) +
12308		- /**/
12309		-//// Normalize("normal") +
12310		-//// "MAX normal.z, eps.x, normal.z;" +
12311		-// Normalize("normal") +
12312		- "MOV normald, normal;" +
12313		- "MOV normals, normal;" +
	13086	+ /**/
	13087	+
	13088	+ "MOV temp, fragment.texcoord[4];" +
12314	13089
12315	13090	// UV base
12316	13091	//"DP3 UP.x,state.matrix.modelview.row[0],Y;" +
12317	13092	//"DP3 UP.y,state.matrix.modelview.row[1],Y;" +
12318	13093	//"DP3 UP.z,state.matrix.modelview.row[2],Y;" +
12319		- "DP3 UP.x,state.matrix.texture[7].row[0],Y;" +
12320		- "DP3 UP.y,state.matrix.texture[7].row[1],Y;" +
12321		- "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	+
12322	13099	"XPD V, normal, UP;" +
12323	13100	Normalize("V") +
12324	13101	"XPD U, V, normal;" +
12325	13102	Normalize("U") +
12326	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	+
12327	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;" +
12328	13153
12329	13154	//"MOV temp, fragment.texcoord[0];" +
12330	13155	//
..	..	@@ -12454,10 +13279,10 @@
12454	13279	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12455	13280	"") +
12456	13281
12457		- // display shadow only (bump == 0)
	13282	+ // display shadow only (fakedepth == 0)
12458	13283	"SUB temp.x, half.x, shadow.x;" +
12459		- "MOV temp.y, -params6.x;" +
12460		- "SLT temp.z, temp.y, zero.x;" +
	13284	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	13285	+ "SLT temp.z, temp.y, -c256i.x;" +
12461	13286	"SUB temp.y, one.x, temp.z;" +
12462	13287	"MUL temp.x, temp.x, temp.y;" +
12463	13288	"KIL temp.x;" +
..	..	@@ -12586,8 +13411,10 @@
12586	13411	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12587	13412
12588	13413	"SUB temp.x, one.x, ndotl.x;" +
12589		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
12590		- "ADD temp.y, one.y, options2.y;" + // sursurface
	13414	+ // Tuning for default skin
	13415	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	13416	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	13417	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12591	13418	"MUL temp.x, temp.x, temp.y;" +
12592	13419
12593	13420	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12786,8 +13613,19 @@
12786	13613	//once = true;
12787	13614	}
12788	13615
12789		- System.out.print("Program #" + mode + "; length = " + program.length());
12790		- 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	+
12791	13629	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12792	13630
12793	13631	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -12834,7 +13672,8 @@
12834	13672	"\n" +
12835	13673	"END\n";
12836	13674
12837		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13675	+ if (Globals.DEBUG)
	13676	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
12838	13677	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12839	13678
12840	13679	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -12879,25 +13718,26 @@
12879	13718	return out;
12880	13719	}
12881	13720
12882		- String TextureFetch(String dest, String src, String unit)
	13721	+ // Also does frustum culling
	13722	+ String ShadowTextureFetch(String dest, String src, String unit)
12883	13723	{
12884	13724	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12885	13725	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12886	13726	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13727	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13728	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12887	13729	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12888		- "SLT " + src + ".z, " + src + ".x, one.x;" +
12889		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12890		- "SLT " + src + ".z, " + src + ".y, one.x;" +
12891		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13730	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13731	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12892	13732	//"SWZ buffer, temp, w,w,w,w;";
12893		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13733	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12894	13734	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12895	13735	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12896	13736	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12897		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13737	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12898	13738
12899		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12900		- //"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;";
12901	13741	}
12902	13742
12903	13743	String Shadow(String depth, String shadow)
..	..	@@ -12919,12 +13759,16 @@
12919	13759
12920	13760	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12921	13761	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13762	+
	13763	+ // Compare fragment depth in light space with shadowmap.
12922	13764	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12923	13765	"SGE temp.y, temp.x, zero.x;" +
12924		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13766	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13767	+
	13768	+ // Reverse comparison
12925	13769	"SUB temp.x, one.x, temp.x;" +
12926	13770	"MUL " + shadow + ".x, temp.x, temp.y;" +
12927		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13771	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12928	13772	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12929	13773
12930	13774	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12938,6 +13782,10 @@
12938	13782	// No shadow for backface
12939	13783	"DP3 temp.x, normal, lightd;" +
12940	13784	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13785	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13786	+
	13787	+ // No shadow when out of frustum
	13788	+ "SGE temp.x, " + depth + ".z, one.z;" +
12941	13789	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12942	13790	"";
12943	13791	}
..	..	@@ -13083,8 +13931,9 @@
13083	13931	/static/ float[] modelParams4 = new float[]{0, 0, 0, 0}; // anisoV, cameralight, selfshadow, shadow
13084	13932	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
13085	13933	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
13086		- /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
13087		- Object3D.cVector2[] vector2buffer;
	13934	+ /static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power, parallax
	13935	+
	13936	+ //Object3D.cVector2[] vector2buffer;
13088	13937
13089	13938	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
13090	13939	// OUT : diff, spec
..	..	@@ -13100,9 +13949,10 @@
13100	13949	"DP3 " + dest + ".z," + "normals," + "eye;" +
13101	13950	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13102	13951	//"MOV " + dest + ".w," + "normal.z;" +
13103		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13104		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13105		- //"MOV " + dest + ".z," + "params2.w;" +
	13952	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13953	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13954	+
	13955	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
13106	13956	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13107	13957	"RCP " + dest + ".w," + dest + ".w;" +
13108	13958	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13248,7 +14098,7 @@
13248	14098	"PARAM p[4] = { state.matrix.projection }; # modelview projection matrix\n" +
13249	14099	"PARAM zero = { 0.0, 0.0, 0.0, 1.0 };" +
13250	14100	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
13251		- "PARAM one = { 1.0, 1.0, 1.0, 0.0 };" +
	14101	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
13252	14102	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
13253	14103	"PARAM third = { 0.33333333333, 0.33333333333, 0.33333333333, 1.0 };" +
13254	14104	//"PARAM v256 = { 256.0, 256.0, 256.0, 1.0 };" +
..	..	@@ -13309,7 +14159,7 @@
13309	14159	"DP4 temp.x,state.matrix.texture[0].inverse.row[0],vertex.texcoord;" +
13310	14160	"DP4 temp.y,state.matrix.texture[0].inverse.row[1],vertex.texcoord;" +
13311	14161	"DP4 temp.z,state.matrix.texture[0].inverse.row[2],vertex.texcoord;" +
13312		- //"MOV result.texcoord, vertex.texcoord;" +
	14162	+ //"MOV result.texcoord, vertex.fogcoord;" +
13313	14163	"MOV result.texcoord, temp;" +
13314	14164	// border fade
13315	14165	"MOV result.texcoord[3], vertex.texcoord;" +
..	..	@@ -13356,7 +14206,9 @@
13356	14206
13357	14207	//"ADD temp.z, temp.z, one;" +
13358	14208
13359		- "MOV result.color, temp;"
	14209	+ "MOV result.texcoord[4], vertex.attrib[4];" + // U dir
	14210	+
	14211	+ "MOV result.color, temp;" // Normal
13360	14212	: "MOV result.color, vertex.color;") +
13361	14213	((mode & VP_PROJECTION) != 0 ? "MOV result.color, zero;"
13362	14214	: "") +
..	..	@@ -13491,12 +14343,13 @@
13491	14343	public void mouseClicked(MouseEvent e)
13492	14344	{
13493	14345	System.out.println("mouseClicked: " + e);
	14346	+ System.exit(0);
13494	14347	}
13495	14348
13496	14349	public void mousePressed(MouseEvent e)
13497	14350	{
13498	14351	//System.out.println("mousePressed: " + e);
13499		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	14352	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13500	14353	}
13501	14354
13502	14355	static long prevtime = 0;
..	..	@@ -13523,15 +14376,18 @@
13523	14376
13524	14377	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
13525	14378
	14379	+ if (BUTTONLESSWHEEL)
13526	14380	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
13527	14381	{
13528	14382	return;
13529	14383	}
13530	14384
13531		- 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;
13532	14388
13533	14389	// TIMER
13534		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	14390	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !vr) // VR
13535	14391	{
13536	14392	keepboxmode = BOXMODE;
13537	14393	keepsupport = SUPPORT;
..	..	@@ -13571,8 +14427,8 @@
13571	14427	// mode \|= META;
13572	14428	//}
13573	14429
13574		- SetMouseMode(WHEEL \| e.getModifiersEx());
13575		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	14430	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	14431	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, e.getModifiers(), e.getModifiersEx());
13576	14432	anchorX = ax;
13577	14433	anchorY = ay;
13578	14434	prevX = px;
..	..	@@ -13606,6 +14462,7 @@
13606	14462	else
13607	14463	if (evt.getSource() == AAtimer)
13608	14464	{
	14465	+ Globals.TIMERRUNNING = false;
13609	14466	if (mouseDown)
13610	14467	{
13611	14468	//new Exception().printStackTrace();
..	..	@@ -13631,6 +14488,10 @@
13631	14488	// LIVE = waslive;
13632	14489	// wasliveok = true;
13633	14490	// waslive = false;
	14491	+
	14492	+ // May 2019 Forget it:
	14493	+ if (true)
	14494	+ return;
13634	14495
13635	14496	// source == timer
13636	14497	if (mouseDown)
..	..	@@ -13661,21 +14522,23 @@
13661	14522
13662	14523	// fev 2014???
13663	14524	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13664		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13665		- pingthread.StepToTarget(true); // true);
	14525	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14526	+ pingthread.StepToTarget(); // true);
13666	14527	}
	14528	+
13667	14529	// if (!LIVE)
13668	14530	super.repaint();
13669	14531	}
13670	14532
13671	14533	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13672	14534
13673		- void clickStart(int x, int y, int modifiers)
	14535	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13674	14536	{
13675	14537	if (!wasliveok)
13676	14538	return;
13677	14539
13678	14540	AAtimer.restart(); //
	14541	+ Globals.TIMERRUNNING = true;
13679	14542
13680	14543	// waslive = LIVE;
13681	14544	// LIVE = false;
..	..	@@ -13687,7 +14550,7 @@
13687	14550	// touched = true; // main DL
13688	14551	if (isRenderer)
13689	14552	{
13690		- SetMouseMode(modifiers);
	14553	+ SetMouseMode(modifiers, modifiersex);
13691	14554	}
13692	14555
13693	14556	selectX = anchorX = x;
..	..	@@ -13700,7 +14563,7 @@
13700	14563	clicked = true;
13701	14564	hold = false;
13702	14565
13703		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14566	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13704	14567	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13705	14568	{
13706	14569	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13725,14 +14588,15 @@
13725	14588	drag = false;
13726	14589	//System.out.println("Mouse DOWN");
13727	14590	editObj = false;
13728		- ClickInfo info = new ClickInfo();
13729		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13730		- info.pane = this;
13731		- info.camera = renderCamera;
13732		- info.x = x;
13733		- info.y = y;
13734		- info.modifiers = modifiers;
13735		- 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);
13736	14600	if (!editObj)
13737	14601	{
13738	14602	hasMarquee = true;
..	..	@@ -13748,19 +14612,22 @@
13748	14612
13749	14613	public void mouseDragged(MouseEvent e)
13750	14614	{
	14615	+ Globals.MOUSEDRAGGED = true;
	14616	+
	14617	+ //System.out.println("mouseDragged: " + e);
13751	14618	if (isRenderer)
13752	14619	movingcamera = true;
	14620	+
13753	14621	//if (drawing)
13754	14622	//return;
13755		- //System.out.println("mouseDragged: " + e);
13756		- if ((e.getModifiersEx() & CTRL) != 0
13757		- \|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
	14623	+ if ((e.getModifiersEx() & CTRL) != 0 \|\|
	14624	+ (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
13758	14625	{
13759	14626	//System.out.println("mouseDragged: " + e);
13760	14627	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13761	14628	}
13762	14629	else
13763		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14630	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13764	14631
13765	14632	//try { Thread.sleep(1); } catch (Exception ex) {}
13766	14633	}
..	..	@@ -13778,9 +14645,17 @@
13778	14645	return targetLookAt;
13779	14646	}
13780	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	+
13781	14653	class PingThread extends Thread
13782	14654	{
13783	14655	boolean jump;
	14656	+ boolean live;
	14657	+
	14658	+ boolean mute = false;
13784	14659
13785	14660	// void JumpToTarget()
13786	14661	// {
..	..	@@ -13796,6 +14671,95 @@
13796	14671	// only one thread!? synchronized
13797	14672	void StepToTarget(boolean jump)
13798	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	+
13799	14763	tmp.set(targetLookAt);
13800	14764	tmp.sub(manipCamera.lookAt); // june 2014
13801	14765
..	..	@@ -13833,7 +14797,7 @@
13833	14797
13834	14798	if (tmp.dot(tmp) > 1) // may 2014. far away: jump to target
13835	14799	{
13836		- jump = true; // step = 1;
	14800	+ // sep 2019 jump = true; // step = 1;
13837	14801	}
13838	14802
13839	14803	if (OEILONCE && OEIL)
..	..	@@ -13868,7 +14832,10 @@
13868	14832	if (tmp.dot(tmp) < 0.00001)
13869	14833	{
13870	14834	zoomonce = false;
	14835	+ live = false;
13871	14836	}
	14837	+ else
	14838	+ live = true;
13872	14839
13873	14840	tmp.mul(step > step2 ? step : step2);
13874	14841	}
..	..	@@ -13895,7 +14862,7 @@
13895	14862	{
13896	14863	if (LOOKAT)
13897	14864	manipCamera.lookAt.add(tmp);
13898		- if (OEIL)
	14865	+ if (OEIL && !capsLocked)
13899	14866	manipCamera.location.add(tmp);
13900	14867
13901	14868	{
..	..	@@ -13910,7 +14877,10 @@
13910	14877	lightCamera.computeTransform();
13911	14878	}
13912	14879	}
13913		- manipCamera.computeTransform();
	14880	+ if (tmp.x != 0 \|\| tmp.y != 0 \|\| tmp.z != 0)
	14881	+ {
	14882	+ manipCamera.computeTransform();
	14883	+ }
13914	14884	}
13915	14885	// ?????? mouseDown = true;
13916	14886	//System.out.println("---------------- ---------- Paint " + tmp.length2());
..	..	@@ -13933,6 +14903,7 @@
13933	14903
13934	14904	public void run()
13935	14905	{
	14906	+ new Exception().printStackTrace();
13936	14907	System.exit(0);
13937	14908	for (;;)
13938	14909	{
..	..	@@ -13996,55 +14967,113 @@
13996	14967	{
13997	14968	Globals.lighttouched = true;
13998	14969	}
13999		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14970	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
14000	14971	}
14001	14972	//else
14002	14973	}
14003	14974	}
14004	14975	}
	14976	+
14005	14977	PingThread pingthread = new PingThread();
14006		- int delta = 5;
14007		- int speed = 5;
	14978	+ int delta = 1;
	14979	+ int speed = 1;
	14980	+ int walk = 8;
14008	14981	boolean autorepeat = false;
14009	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	+
14010	15002	void GoDown(int mod)
14011	15003	{
14012	15004	MODIFIERS \|= COMMAND;
14013		- /*
	15005	+ boolean isVR = (mouseMode&VR)!=0;
	15006	+ /**/
14014	15007	if((mod&SHIFT) == SHIFT)
14015		- manipCamera.RotatePosition(0, -speed);
14016		- else
14017		- manipCamera.BackForth(0, -speed*delta, getWidth());
14018		- */
14019		- if ((mod & SHIFT) == SHIFT)
14020	15008	{
14021		- mouseMode = mouseMode; // VR??
14022		- } else
14023		- {
14024		- 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());
14025	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	+// }
14026	15033
	15034	+ targetLookAt.set(manipCamera.lookAt);
	15035	+
14027	15036	//prevX = X = anchorX;
14028	15037	prevY = Y = anchorY - (int) (renderCamera.Distance());
14029	15038	}
14030	15039
14031	15040	void GoUp(int mod)
14032	15041	{
	15042	+ RigidBody.justclicked = true;
	15043	+
14033	15044	MODIFIERS \|= COMMAND;
14034		- /*
	15045	+ /**/
	15046	+ boolean isVR = (mouseMode&VR)!=0;
	15047	+
14035	15048	if((mod&SHIFT) == SHIFT)
14036		- manipCamera.RotatePosition(0, speed);
14037		- else
14038		- manipCamera.BackForth(0, speed*delta, getWidth());
14039		- */
14040		- if ((mod & SHIFT) == SHIFT)
14041	15049	{
14042		- mouseMode = mouseMode;
14043		- } else
14044		- {
14045		- 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());
14046	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	+// }
14047	15074
	15075	+ targetLookAt.set(manipCamera.lookAt);
	15076	+
14048	15077	//prevX = X = anchorX;
14049	15078	prevY = Y = anchorY + (int) (renderCamera.Distance());
14050	15079	}
..	..	@@ -14052,20 +15081,31 @@
14052	15081	void GoLeft(int mod)
14053	15082	{
14054	15083	MODIFIERS \|= COMMAND;
14055		- /*
	15084	+ /**/
14056	15085	if((mod&SHIFT) == SHIFT)
14057		- manipCamera.RotatePosition(speed, 0);
	15086	+ manipCamera.Translate(speed, 0, getWidth());
14058	15087	else
14059		- manipCamera.Translate(speed*delta, 0, getWidth());
14060		- */
14061		- if ((mod & SHIFT) == SHIFT)
14062	15088	{
14063		- mouseMode = mouseMode;
14064		- } else
14065		- {
14066		- mouseMode \|= ROTATE;
14067		- } // 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;
14068	15103
	15104	+ //System.err.println("lookAt = " + manipCamera.lookAt);
	15105	+ //System.err.println("location = " + manipCamera.location);
	15106	+
	15107	+ targetLookAt.set(manipCamera.lookAt);
	15108	+
14069	15109	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
14070	15110	prevY = Y = anchorY;
14071	15111	}
..	..	@@ -14073,20 +15113,28 @@
14073	15113	void GoRight(int mod)
14074	15114	{
14075	15115	MODIFIERS \|= COMMAND;
14076		- /*
	15116	+ /**/
14077	15117	if((mod&SHIFT) == SHIFT)
14078		- manipCamera.RotatePosition(-speed, 0);
	15118	+ manipCamera.Translate(-speed, 0, getWidth());
14079	15119	else
14080		- manipCamera.Translate(-speed*delta, 0, getWidth());
14081		- */
14082		- if ((mod & SHIFT) == SHIFT)
14083	15120	{
14084		- mouseMode = mouseMode;
14085		- } else
14086		- {
14087		- mouseMode \|= ROTATE;
14088		- } // 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;
14089	15135
	15136	+ targetLookAt.set(manipCamera.lookAt);
	15137	+
14090	15138	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
14091	15139	prevY = Y = anchorY;
14092	15140	}
..	..	@@ -14096,7 +15144,7 @@
14096	15144	int X, Y;
14097	15145	boolean SX, SY;
14098	15146
14099		- void drag(int x, int y, int modifiers)
	15147	+ void drag(int x, int y, int modifiers, int modifiersex)
14100	15148	{
14101	15149	if (IsFrozen())
14102	15150	{
..	..	@@ -14105,17 +15153,17 @@
14105	15153
14106	15154	drag = true; // NEW
14107	15155
14108		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	15156	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
14109	15157
14110	15158	X = x;
14111	15159	Y = y;
14112	15160	// floating state for animation
14113		- MODIFIERS = modifiers;
14114		- modifiers &= ~1024;
	15161	+ MODIFIERS = modifiersex;
	15162	+ modifiersex &= ~1024;
14115	15163	if (false) // modifiers != 0)
14116	15164	{
14117	15165	//new Exception().printStackTrace();
14118		- System.out.println("mouseDragged: " + modifiers);
	15166	+ System.out.println("mouseDragged: " + modifiersex);
14119	15167	System.out.println("SHIFT = " + SHIFT);
14120	15168	System.out.println("CONTROL = " + COMMAND);
14121	15169	System.out.println("META = " + META);
..	..	@@ -14128,14 +15176,16 @@
14128	15176	if (editObj)
14129	15177	{
14130	15178	drag = true;
14131		- ClickInfo info = new ClickInfo();
14132		- info.bounds.setBounds(0, 0,
	15179	+ //ClickInfo info = new ClickInfo();
	15180	+ object.clickInfo.bounds.setBounds(0, 0,
14133	15181	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14134		- info.pane = this;
14135		- info.camera = renderCamera;
14136		- info.x = x;
14137		- info.y = y;
14138		- object.editWindow.copy.doEditDrag(info);
	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);
14139	15189	} else
14140	15190	{
14141	15191	if (x < startX)
..	..	@@ -14218,6 +15268,11 @@
14218	15268	if ((mouseMode & ZOOM) != 0)
14219	15269	{
14220	15270	//if ((mouseMode & BACKFORTH) != 0)
	15271	+ if ((modifiersex & SHIFT) == SHIFT)
	15272	+ {
	15273	+ ViewAngle(dy);
	15274	+ }
	15275	+ else
14221	15276	if ((mouseMode & VR) != 0)
14222	15277	manipCamera.BackForth(dx, dy, getWidth());
14223	15278	else
..	..	@@ -14284,23 +15339,30 @@
14284	15339	}
14285	15340	}
14286	15341
	15342	+// ClickInfo clickInfo = new ClickInfo();
	15343	+
14287	15344	public void mouseMoved(MouseEvent e)
14288	15345	{
14289		- //System.out.println("mouseMoved: " + e);
	15346	+//object.editWindow.frame.
	15347	+ setCursor(Cursor.getDefaultCursor());
14290	15348
	15349	+ //System.out.println("mouseMoved: " + e);
14291	15350	if (isRenderer)
14292	15351	return;
14293	15352
14294		- ClickInfo ci = new ClickInfo();
14295		- ci.x = e.getX();
14296		- ci.y = e.getY();
14297		- ci.modifiers = e.getModifiersEx();
14298		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
14299		- ci.pane = this;
14300		- 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;
14301	15360	if (!isRenderer)
14302	15361	{
14303		- if (object.editWindow.copy.doEditClick(ci, 0))
	15362	+ //ObjEditor editWindow = object.editWindow;
	15363	+ //Object3D copy = editWindow.copy;
	15364	+ if (object.doEditClick(//clickInfo,
	15365	+ 0))
14304	15366	{
14305	15367	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
14306	15368	} else
..	..	@@ -14312,7 +15374,17 @@
14312	15374
14313	15375	public void mouseReleased(MouseEvent e)
14314	15376	{
	15377	+ if (isRenderer && !movingcamera)
	15378	+ {
	15379	+ RigidBody.justclicked = true;
	15380	+ System.out.println("justclicked: " + e);
	15381	+ }
	15382	+
	15383	+ Globals.MOUSEDRAGGED = false;
	15384	+
14315	15385	movingcamera = false;
	15386	+ X = 0; // getBounds().width/2;
	15387	+ Y = 0; // getBounds().height/2;
14316	15388	//System.out.println("mouseReleased: " + e);
14317	15389	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14318	15390	}
..	..	@@ -14335,9 +15407,9 @@
14335	15407	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
14336	15408	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
14337	15409
14338		- if (control \|\| command \|\| IsFrozen())
	15410	+// No delay if (control \|\| command \|\| IsFrozen())
14339	15411	timeout = true;
14340		- else
	15412	+// ?? May 2019 else
14341	15413	// timer.setDelay((modifiers & 128) != 0?0:350);
14342	15414	mouseDown = false;
14343	15415	if (!control && !command) // june 2013
..	..	@@ -14447,7 +15519,7 @@
14447	15519	System.out.println("keyReleased: " + e);
14448	15520	}
14449	15521
14450		- void SetMouseMode(int modifiers)
	15522	+ void SetMouseMode(int modifiers, int modifiersex)
14451	15523	{
14452	15524	//System.out.println("SetMouseMode = " + modifiers);
14453	15525	//modifiers &= ~1024;
..	..	@@ -14459,25 +15531,28 @@
14459	15531	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14460	15532	// return;
14461	15533	//System.out.println("SetMode = " + modifiers);
14462		- if ((modifiers & WHEEL) == WHEEL)
	15534	+ if ((modifiersex & WHEEL) == WHEEL)
14463	15535	{
14464	15536	mouseMode \|= ZOOM;
14465	15537	}
14466	15538
14467		- boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14468		- 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)
14469	15543	{
14470	15544	mouseMode \|= VR; // BACKFORTH;
14471	15545	}
14472		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	15546	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14473	15547	{
14474	15548	mouseMode \|= SELECT;
14475	15549	}
14476		- if ((modifiers & COMMAND) == COMMAND)
	15550	+ if ((modifiersex & COMMAND) == COMMAND)
14477	15551	{
14478	15552	mouseMode \|= SELECT;
14479	15553	}
14480		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	15554	+ if (//(modifiersex & SHIFT) == SHIFT \|\|
	15555	+ forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14481	15556	{
14482	15557	mouseMode &= ~VR;
14483	15558	mouseMode \|= TRANSLATE;
..	..	@@ -14506,7 +15581,7 @@
14506	15581
14507	15582	if (isRenderer) //
14508	15583	{
14509		- SetMouseMode(modifiers);
	15584	+ SetMouseMode(0, modifiers);
14510	15585	}
14511	15586
14512	15587	Globals.theRenderer.keyPressed(key);
..	..	@@ -14521,8 +15596,18 @@
14521	15596	float SATPOW = 1; // 2; // 0.5f;
14522	15597	float BRIPOW = 1; // 0.5f; // 0.5f;
14523	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	+
14524	15605	public void keyPressed(int key)
14525	15606	{
	15607	+// Set the blank cursor to the JFrame.
	15608	+//object.editWindow.frame.
	15609	+ setCursor(blankCursor);
	15610	+
14526	15611	if (key >= '0' && key <= '5')
14527	15612	clampbit = (key-'0');
14528	15613
..	..	@@ -14568,7 +15653,8 @@
14568	15653	// break;
14569	15654	case 'T':
14570	15655	CACHETEXTURE ^= true;
14571		- textures.clear();
	15656	+ texturepigment.clear();
	15657	+ texturebump.clear();
14572	15658	// repaint();
14573	15659	break;
14574	15660	case 'Y':
..	..	@@ -14578,8 +15664,8 @@
14578	15664	case 'K':
14579	15665	KOMPACTTEXTURE ^= true;
14580	15666	//textures.clear();
14581		- break;
14582		- case 'P': // Texture Projection macros
	15667	+ // break;
	15668	+ //case 'P': // Texture Projection macros
14583	15669	// SAVETEXTURE ^= true;
14584	15670	macromode = true;
14585	15671	Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
..	..	@@ -14653,7 +15739,9 @@
14653	15739	case 'E' : COMPACT ^= true;
14654	15740	repaint();
14655	15741	break;
14656		- case 'W' : DEBUGHSB ^= true;
	15742	+ case 'W' : // Wide Window (fullscreen)
	15743	+ //DEBUGHSB ^= true;
	15744	+ ObjEditor.theFrame.ToggleFullScreen();
14657	15745	repaint();
14658	15746	break;
14659	15747	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14678,8 +15766,8 @@
14678	15766	RevertCamera();
14679	15767	repaint();
14680	15768	break;
	15769	+ //case 'l':
14681	15770	case 'L':
14682		- case 'l':
14683	15771	if (lightMode)
14684	15772	{
14685	15773	lightMode = false;
..	..	@@ -14698,7 +15786,7 @@
14698	15786	targetLookAt.set(manipCamera.lookAt);
14699	15787	repaint();
14700	15788	break;
14701		- case 'p':
	15789	+ case 'P': // p':
14702	15790	// c'est quoi ca au juste? spherical ^= true;
14703	15791	Skinshader ^= true; programInitialized = false;
14704	15792	repaint();
..	..	@@ -14709,7 +15797,8 @@
14709	15797	break;
14710	15798	case 'm':
14711	15799	{
14712		- PrintMemory();
	15800	+ //PrintMemory();
	15801	+ ToggleImageFlip();
14713	15802	break;
14714	15803	}
14715	15804	case 'M':
..	..	@@ -14736,27 +15825,31 @@
14736	15825	repaint();
14737	15826	break;
14738	15827	case 'O':
14739		- Globals.drawMode = OCCLUSION; // WARNING
14740		- repaint();
14741		- break;
	15828	+ // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
	15829	+ //repaint();
	15830	+ //break;
14742	15831	case 'o':
14743	15832	OCCLUSION_CULLING ^= true;
14744	15833	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14745	15834	break;
14746		- case '0': envyoff ^= true; repaint(); break;
	15835	+ //case '0': envyoff ^= true; repaint(); break;
14747	15836	case '1':
14748	15837	case '2':
14749	15838	case '3':
14750	15839	case '4':
14751	15840	case '5':
14752		- newenvy = Character.getNumericValue(key);
14753		- repaint();
14754		- break;
14755	15841	case '6':
14756	15842	case '7':
14757	15843	case '8':
14758	15844	case '9':
14759		- 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	+ }
14760	15853	repaint();
14761	15854	break;
14762	15855	case '!':
..	..	@@ -14822,11 +15915,25 @@
14822	15915	case '_':
14823	15916	kompactbit = 5;
14824	15917	break;
14825		- case '+':
14826		- kompactbit = 6;
14827		- break;
	15918	+// case '+':
	15919	+// kompactbit = 6;
	15920	+// break;
14828	15921	case ' ':
	15922	+ capsLocked ^= true;
	15923	+ repaint();
	15924	+ break;
	15925	+ case 'l':
14829	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	+
14830	15937	Globals.lighttouched = true;
14831	15938	manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14832	15939	targetLookAt.set(manipCamera.lookAt);
..	..	@@ -14834,15 +15941,20 @@
14834	15941	break;
14835	15942	//case '`' :
14836	15943	case ESC:
	15944	+ if (FULLSCREEN)
	15945	+ object.editWindow.ToggleFullScreen();
	15946	+ break;
	15947	+ case 'p':
14837	15948	RENDERPROGRAM += 1;
14838	15949	RENDERPROGRAM %= 3;
	15950	+
14839	15951	repaint();
14840	15952	break;
14841	15953	case 'Z':
14842	15954	//RESIZETEXTURE ^= true;
14843	15955	//break;
14844	15956	case 'z':
14845		- RENDERSHADOW ^= true;
	15957	+ Globals.RENDERSHADOW ^= true;
14846	15958	Globals.lighttouched = true;
14847	15959	repaint();
14848	15960	break;
..	..	@@ -14871,12 +15983,17 @@
14871	15983	case ENTER:
14872	15984	// object.editWindow.ScreenFit(); // Edit();
14873	15985	ToggleLive();
	15986	+ if (capsLocked)
	15987	+ {
	15988	+ Globals.WALK ^= true;
	15989	+ }
14874	15990	break;
14875	15991	case DELETE:
14876	15992	ClearSelection();
14877	15993	break;
14878		- /*
14879	15994	case '+':
	15995	+
	15996	+ /*
14880	15997	//fontsize += 1;
14881	15998	bbzoom *= 2;
14882	15999	repaint();
..	..	@@ -14893,30 +16010,36 @@
14893	16010	case '=':
14894	16011	IncDepth();
14895	16012	//fontsize += 1;
14896		- object.editWindow.refreshContents(true);
	16013	+ object.GetWindow().refreshContents(true);
14897	16014	maskbit = 6;
14898	16015	break;
14899	16016	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14900	16017	DecDepth();
14901	16018	maskbit = 5;
14902	16019	//if(fontsize > 1) fontsize -= 1;
14903		- if (object.editWindow == null)
14904		- new Exception().printStackTrace();
14905		- else
14906		- object.editWindow.refreshContents(true);
	16020	+// if (object.editWindow == null)
	16021	+// new Exception().printStackTrace();
	16022	+// else
	16023	+ object.GetWindow().refreshContents(true);
14907	16024	break;
14908	16025	case '{':
14909		- manipCamera.shaper_fovy /= 1.1;
	16026	+ double factor = 1.1;
	16027	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16028	+ manipCamera.shaper_fovy /= factor;
14910	16029	System.out.println("FOV = " + manipCamera.shaper_fovy);
14911	16030	repaint();
14912	16031	break;
14913	16032	case '}':
14914		- manipCamera.shaper_fovy *= 1.1;
	16033	+ factor = 1.1;
	16034	+ if (manipCamera.shaper_fovy * factor < 150)
	16035	+ manipCamera.shaper_fovy *= factor;
14915	16036	System.out.println("FOV = " + manipCamera.shaper_fovy);
14916	16037	repaint();
14917	16038	break;
14918	16039	case '[':
14919		- manipCamera.shaper_fovy /= 1.01;
	16040	+ factor = 1.01;
	16041	+ if (manipCamera.shaper_fovy / factor > 0.1)
	16042	+ manipCamera.shaper_fovy /= factor;
14920	16043	if (false) //manipCamera.hAspect == 0)
14921	16044	{
14922	16045	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -14932,7 +16055,9 @@
14932	16055	break;
14933	16056	case ']':
14934	16057	//manipCamera.shaper_fovy += (180 - manipCamera.shaper_fovy)*0.1;
14935		- manipCamera.shaper_fovy *= 1.01;
	16058	+ factor = 1.01;
	16059	+ if (manipCamera.shaper_fovy * factor < 150)
	16060	+ manipCamera.shaper_fovy *= factor;
14936	16061	if (false) //manipCamera.hAspect == 0)
14937	16062	{
14938	16063	double x = Math.tan(manipCamera.shaper_fovy * Math.PI / 180 / 2);
..	..	@@ -14966,102 +16091,117 @@
14966	16091	//mode = ROTATE;
14967	16092	if ((MODIFIERS & COMMAND) == 0) // VR??
14968	16093	{
14969		- SetMouseMode(modifiers);
	16094	+ SetMouseMode(0, modifiers);
14970	16095	}
14971	16096	}
14972	16097
	16098	+ boolean keys[] = new boolean[256];
	16099	+ int speedkey[] = new int[256];
	16100	+ int modifiers = 0;
	16101	+
14973	16102	public void processKeyEvent(KeyEvent e)
14974	16103	{
14975	16104	switch (e.getID())
14976	16105	{
14977	16106	case KeyEvent.KEY_PRESSED:
14978		- if (!autorepeat)
14979		- {
14980		- //System.out.println("processKeyEvent: " + KeyEvent.getKeyText(e.getKeyCode()));
14981		- keyPressed(e.getKeyChar(), e.getModifiersEx());
14982		- }
14983		- if (manipCamera == lightCamera)
14984		- {
14985		- switch (e.getKeyCode())
14986		- {
14987		- case DOWN_ARROW:
14988		- lightCamera.DECAL /= 2;
14989		- repaint();
14990		- break;
14991		- case UP_ARROW:
14992		- lightCamera.DECAL *= 2;
14993		- repaint();
14994		- break;
14995		- case LEFT_ARROW:
14996		- lightCamera.SCALE /= 2;
14997		- repaint();
14998		- break;
14999		- case RIGHT_ARROW:
15000		- lightCamera.SCALE *= 2;
15001		- repaint();
15002		- break;
15003		- default:
15004		- break;
15005		- }
15006		-
15007		- System.out.println("DECAL = " + lightCamera.DECAL + "; SCALE = " + lightCamera.SCALE);
15008		- } else
15009		- {
15010		- if (true) // !autorepeat)
15011		- {
15012		- boolean reset = true;
15013		-
15014		- switch (e.getKeyCode())
15015		- {
15016		- case DOWN_ARROW:
15017		- GoDown(e.getModifiersEx());
15018		- repaint();
15019		- break;
15020		- case UP_ARROW:
15021		- GoUp(e.getModifiersEx());
15022		- repaint();
15023		- break;
15024		- case LEFT_ARROW:
15025		- GoLeft(e.getModifiersEx());
15026		- repaint();
15027		- break;
15028		- case RIGHT_ARROW:
15029		- GoRight(e.getModifiersEx());
15030		- repaint();
15031		- break;
15032		- default:
15033		- reset = false;
15034		- break;
15035		- }
15036		-
15037		- if (reset)
15038		- {
15039		- autorepeat = true;
15040		-
15041		- targetLookAt.set(manipCamera.lookAt);
15042		- }
15043		- }
15044		- }
	16107	+ keys[e.getKeyCode()] = true;
	16108	+ modifiers = e.getModifiersEx();
	16109	+ keyPressed(e.getKeyChar(), modifiers);
	16110	+ //Globals.theRenderer.keyPressed(e.getKeyChar());
	16111	+ repaint();
15045	16112	break;
15046		- case KeyEvent.KEY_TYPED:
15047		- 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;
15048	16183	case KeyEvent.KEY_RELEASED:
15049		- {
15050		- switch (e.getKeyCode())
15051		- {
15052		- case DOWN_ARROW:
15053		- case UP_ARROW:
15054		- case LEFT_ARROW:
15055		- case RIGHT_ARROW:
15056		- MODIFIERS &= ~COMMAND;
15057		- autorepeat = false;
15058		- break;
15059		- default:
15060		- break;
15061		- }
	16184	+ keys[e.getKeyCode()] = false;
	16185	+ modifiers = e.getModifiersEx();
15062	16186	keyReleased(e.getKeyChar(), e.getModifiersEx());
	16187	+ repaint();
15063	16188	break;
15064		- }
	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	+// }
15065	16205	default:
15066	16206	break;
15067	16207	}
..	..	@@ -15100,8 +16240,9 @@
15100	16240
15101	16241	protected void processMouseMotionEvent(MouseEvent e)
15102	16242	{
15103		- //System.out.println("processMouseMotionEvent: " + mouseMode);
15104		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	16243	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	16244	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	16245	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
15105	16246	{
15106	16247	mouseMoved(e);
15107	16248	} else
..	..	@@ -15126,11 +16267,12 @@
15126	16267	}
15127	16268	*/
15128	16269
15129		- object.editWindow.EditSelection();
	16270	+ object.GetWindow().EditSelection(false);
15130	16271	}
15131	16272
15132	16273	void SelectParent()
15133	16274	{
	16275	+ new Exception().printStackTrace();
15134	16276	System.exit(0);
15135	16277	Composite group = (Composite) object;
15136	16278	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -15142,10 +16284,10 @@
15142	16284	{
15143	16285	//selectees.remove(i);
15144	16286	System.out.println("select parent of " + elem);
15145		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	16287	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
15146	16288	} else
15147	16289	{
15148		- group.editWindow.Select(elem.GetTreePath(), first, true);
	16290	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
15149	16291	}
15150	16292
15151	16293	first = false;
..	..	@@ -15154,6 +16296,7 @@
15154	16296
15155	16297	void SelectChildren()
15156	16298	{
	16299	+ new Exception().printStackTrace();
15157	16300	System.exit(0);
15158	16301	/*
15159	16302	Composite group = (Composite) object;
..	..	@@ -15186,12 +16329,12 @@
15186	16329	for (int j = 0; j < group.children.size(); j++)
15187	16330	{
15188	16331	elem = (Object3D) group.children.elementAt(j);
15189		- object.editWindow.Select(elem.GetTreePath(), first, true);
	16332	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15190	16333	first = false;
15191	16334	}
15192	16335	} else
15193	16336	{
15194		- object.editWindow.Select(elem.GetTreePath(), first, true);
	16337	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
15195	16338	}
15196	16339
15197	16340	first = false;
..	..	@@ -15202,21 +16345,21 @@
15202	16345	{
15203	16346	//Composite group = (Composite) object;
15204	16347	Object3D group = object;
15205		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	16348	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
15206	16349	}
15207	16350
15208	16351	void ResetTransform(int mask)
15209	16352	{
15210	16353	//Composite group = (Composite) object;
15211	16354	Object3D group = object;
15212		- group.editWindow.ResetTransform(mask);
	16355	+ group.GetWindow().ResetTransform(mask);
15213	16356	}
15214	16357
15215	16358	void FlipTransform()
15216	16359	{
15217	16360	//Composite group = (Composite) object;
15218	16361	Object3D group = object;
15219		- group.editWindow.FlipTransform();
	16362	+ group.GetWindow().FlipTransform();
15220	16363	// group.editWindow.ReduceMesh(true);
15221	16364	}
15222	16365
..	..	@@ -15224,7 +16367,7 @@
15224	16367	{
15225	16368	//Composite group = (Composite) object;
15226	16369	Object3D group = object;
15227		- group.editWindow.PrintMemory();
	16370	+ group.GetWindow().PrintMemory();
15228	16371	// group.editWindow.ReduceMesh(true);
15229	16372	}
15230	16373
..	..	@@ -15232,7 +16375,7 @@
15232	16375	{
15233	16376	//Composite group = (Composite) object;
15234	16377	Object3D group = object;
15235		- group.editWindow.ResetCentroid();
	16378	+ group.GetWindow().ResetCentroid();
15236	16379	}
15237	16380
15238	16381	void IncDepth()
..	..	@@ -15314,11 +16457,11 @@
15314	16457
15315	16458	int width = getBounds().width;
15316	16459	int height = getBounds().height;
15317		- ClickInfo info = new ClickInfo();
15318		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
15319	16460	//Image img = CreateImage(width, height);
15320	16461	//System.out.println("width = " + width + "; height = " + height + "\n");
	16462	+
15321	16463	Graphics gr = g; // img.getGraphics();
	16464	+
15322	16465	if (!hasMarquee)
15323	16466	{
15324	16467	if (Xmin < Xmax) // !locked)
..	..	@@ -15390,44 +16533,92 @@
15390	16533	}
15391	16534	if (object != null && !hasMarquee)
15392	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	+
15393	16542	if (isRenderer)
15394	16543	{
15395		- info.flags++;
	16544	+ object.clickInfo.flags++;
15396	16545	double frameAspect = (double) width / (double) height;
15397	16546	if (frameAspect > renderCamera.aspect)
15398	16547	{
15399	16548	int desired = (int) ((double) height * renderCamera.aspect);
15400		- info.bounds.width -= width - desired;
15401		- info.bounds.x += (width - desired) / 2;
	16549	+ object.clickInfo.bounds.width -= width - desired;
	16550	+ object.clickInfo.bounds.x += (width - desired) / 2;
15402	16551	} else
15403	16552	{
15404	16553	int desired = (int) ((double) width / renderCamera.aspect);
15405		- info.bounds.height -= height - desired;
15406		- info.bounds.y += (height - desired) / 2;
	16554	+ object.clickInfo.bounds.height -= height - desired;
	16555	+ object.clickInfo.bounds.y += (height - desired) / 2;
15407	16556	}
15408	16557	}
15409		- info.g = gr;
15410		- info.camera = renderCamera;
	16558	+
	16559	+ object.clickInfo.g = gr;
	16560	+ object.clickInfo.camera = renderCamera;
15411	16561	/*
15412	16562	// Memory intensive (brep.verticescopy)
15413	16563	if (!(object instanceof Composite))
15414	16564	object.draw(info, 0, false); // SLOW :
15415	16565	*/
15416		- if (!isRenderer)
	16566	+ if (!isRenderer) // && drag)
15417	16567	{
15418		- object.drawEditHandles(info, 0);
	16568	+ Grafreed.Assert(object != null);
	16569	+ Grafreed.Assert(object.selection != null);
	16570	+ if (object.selection.Size() > 0)
	16571	+ {
	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)
	16578	+ {
	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;
	16586	+ }
	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	+ }
	16607	+ }
15419	16608	}
15420	16609	}
	16610	+
15421	16611	if (isRenderer)
15422	16612	{
15423	16613	//gr.setColor(Color.black);
15424	16614	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15425	16615	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15426	16616	}
	16617	+
15427	16618	if (hasMarquee)
15428	16619	{
15429	16620	gr.setXORMode(Color.white);
15430		- gr.setColor(Color.red);
	16621	+ gr.setColor(Color.white);
15431	16622	if (!firstime)
15432	16623	{
15433	16624	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -15536,6 +16727,7 @@
15536	16727	public boolean mouseDown(Event evt, int x, int y)
15537	16728	{
15538	16729	System.out.println("mouseDown: " + evt);
	16730	+ System.exit(0);
15539	16731	/*
15540	16732	locked = true;
15541	16733	drag = false;
..	..	@@ -15579,13 +16771,14 @@
15579	16771	{
15580	16772	keyPressed(0, modifiers);
15581	16773	}
15582		- clickStart(x, y, modifiers);
	16774	+ // clickStart(x, y, modifiers);
15583	16775	return true;
15584	16776	}
15585	16777
15586	16778	public boolean mouseDrag(Event evt, int x, int y)
15587	16779	{
15588		- //System.out.println("mouseDrag: " + evt);
	16780	+ System.out.println("mouseDrag: " + evt);
	16781	+ System.exit(0);
15589	16782	/*
15590	16783	drag = true;
15591	16784	//System.out.println("Mouse DRAG");
..	..	@@ -15697,13 +16890,14 @@
15697	16890	{
15698	16891	keyReleased(0, 0);
15699	16892	}
15700		- drag(x, y, modifiers);
	16893	+ drag(x, y, 0, modifiers);
15701	16894	return true;
15702	16895	}
15703	16896
15704	16897	public boolean mouseUp(Event evt, int x, int y)
15705	16898	{
15706	16899	System.out.println("mouseUp: " + evt);
	16900	+ System.exit(0);
15707	16901	/*
15708	16902	locked = false;
15709	16903	if (isRenderer)
..	..	@@ -15829,7 +17023,7 @@
15829	17023	Object3D object;
15830	17024	static Object3D trackedobject;
15831	17025	Camera renderCamera; // Light or Eye (or Occlusion)
15832		- /static/ Camera manipCamera; // Light or Eye
	17026	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15833	17027	/static/ Camera eyeCamera;
15834	17028	/static/ Camera lightCamera;
15835	17029	int cameracount;
..	..	@@ -15893,6 +17087,8 @@
15893	17087	private /static/ boolean firstime;
15894	17088	private /static/ cVector newView = new cVector();
15895	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"};
15896	17092	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
15897	17093	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
15898	17094	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -15905,36 +17101,74 @@
15905	17101	{
15906	17102	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
15907	17103
	17104	+ int usedsuf = 0;
	17105	+
15908	17106	for (int i = 0; i < suffixes.length; i++)
15909	17107	{
15910		- String resourceName = basename + suffixes[i] + "." + suffix;
15911		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
15912		- mipmapped,
15913		- FileUtil.getFileSuffix(resourceName));
15914		- if (data == null)
	17108	+ String[] suffixe = suffixes;
	17109	+ String[] fallback = suffixes2;
	17110	+ String[] fallfallback = suffixes3;
	17111	+
	17112	+ for (int c=usedsuf; --c>=0;)
15915	17113	{
15916		- throw new IOException("Unable to load texture " + resourceName);
	17114	+// String[] temp = suffixe;
	17115	+// suffixe = fallback;
	17116	+// fallback = fallfallback;
	17117	+// fallfallback = temp;
15917	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	+
15918	17147	//System.out.println("Target = " + targets[i]);
15919	17148	cubemap.updateImage(data, targets[i]);
15920	17149	}
15921	17150
15922	17151	return cubemap;
15923	17152	}
	17153	+
15924	17154	int bigsphere = -1;
15925	17155
15926	17156	float BGcolor = 0.5f;
15927	17157
15928		- private void DrawSkyBox(GL gl)
	17158	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	17159	+
	17160	+ private void DrawSkyBox(GL gl, float ratio)
15929	17161	{
15930		- if (envyoff \|\| cubemap == null)
	17162	+ if (//envyoff \|\|
	17163	+ WIREFRAME \|\|
	17164	+ cubemap == null)
15931	17165	{
15932	17166	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
15933	17167	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
15934	17168	return;
15935	17169	}
15936	17170
15937		- if (WIREFRAME)
	17171	+ //if (WIREFRAME)
15938	17172	gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL);
15939	17173
15940	17174	gl.glDisable(gl.GL_CULL_FACE);
..	..	@@ -15942,7 +17176,17 @@
15942	17176	// Compensates for ExaminerViewer's modification of modelview matrix
15943	17177	gl.glMatrixMode(GL.GL_MODELVIEW);
15944	17178	gl.glLoadIdentity();
	17179	+ gl.glScalef(1,ratio,1);
15945	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	+
15946	17190	//gl.glActiveTexture(GL.GL_TEXTURE1);
15947	17191	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
15948	17192
..	..	@@ -15974,6 +17218,7 @@
15974	17218	{
15975	17219	gl.glScalef(1.0f, -1.0f, 1.0f);
15976	17220	}
	17221	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
15977	17222	gl.glMultMatrixd(viewrot_1, 0);
15978	17223	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
15979	17224	//viewer.updateInverseRotation(gl);
..	..	@@ -16014,7 +17259,8 @@
16014	17259	gl.glDisable(GL.GL_TEXTURE_GEN_R);
16015	17260
16016	17261	cubemap.disable();
16017		- ////cubemap.unbind();
	17262	+ //cubemap.dispose();
	17263	+
16018	17264	if (CULLFACE)
16019	17265	{
16020	17266	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -16022,6 +17268,8 @@
16022	17268
16023	17269	if (WIREFRAME)
16024	17270	gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_LINE);
	17271	+ else
	17272	+ gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL);
16025	17273	}
16026	17274
16027	17275	private void DrawChecker(GL gl)
..	..	@@ -16070,7 +17318,7 @@
16070	17318	gl.glScalef(1.0f, -1.0f, 1.0f);
16071	17319	}
16072	17320
16073		- gl.glNormal3f(0.0f, 0.0f, 1.0f);
	17321	+ SetGLNormal(gl, 0.0f, 0.0f, 1.0f);
16074	17322
16075	17323	float step = 2; // 0.1666f; //0.25f;
16076	17324	float stepv = 2; // step * 1652 / 998;
..	..	@@ -16114,16 +17362,16 @@
16114	17362	cStatic.objectstack[materialdepth++] = checker;
16115	17363	//System.out.println("material " + material);
16116	17364	//Applet3D.tracein(this, selected);
16117		- vector2buffer = checker.projectedVertices;
	17365	+ //vector2buffer = checker.projectedVertices;
16118	17366
16119	17367	//checker.GetMaterial().Draw(this, false); // true);
16120		- DrawMaterial(checker.GetMaterial(), false); // true);
	17368	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
16121	17369
16122	17370	materialdepth -= 1;
16123	17371	if (materialdepth > 0)
16124	17372	{
16125		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
16126		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	17373	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	17374	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
16127	17375	}
16128	17376	//checker.GetMaterial().opacity = 1f;
16129	17377	////checker.GetMaterial().ambient = 1f;
..	..	@@ -16209,6 +17457,14 @@
16209	17457	}
16210	17458	}
16211	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	+
16212	17468	class SelectBuffer implements GLEventListener
16213	17469	{
16214	17470
..	..	@@ -16224,7 +17480,7 @@
16224	17480	//new Exception().printStackTrace();
16225	17481	System.out.println("select buffer init");
16226	17482	// Use debug pipeline
16227		- drawable.setGL(new DebugGL(drawable.getGL()));
	17483	+ //drawable.setGL(new DebugGL(drawable.getGL()));
16228	17484
16229	17485	GL gl = drawable.getGL();
16230	17486
..	..	@@ -16267,6 +17523,7 @@
16267	17523	{
16268	17524	if (!selection)
16269	17525	{
	17526	+ new Exception().printStackTrace();
16270	17527	System.exit(0);
16271	17528	return;
16272	17529	}
..	..	@@ -16287,6 +17544,17 @@
16287	17544
16288	17545	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
16289	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	+
16290	17558	//int tmp = selection_view;
16291	17559	//selection_view = -1;
16292	17560	int temp = DrawMode();
..	..	@@ -16298,6 +17566,17 @@
16298	17566	// temp = DEFAULT; // patch for selection debug
16299	17567	Globals.drawMode = temp; // WARNING
16300	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	+
16301	17580	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
16302	17581
16303	17582	// trying different ways of getting the depth info over
..	..	@@ -16328,7 +17607,7 @@
16328	17607
16329	17608	float depth = depths[y * TEX_SIZE + x];
16330	17609
16331		- if (pointselection && mouseMode == SELECT && depth != 0 && depth != 1)
	17610	+ if (pointselection && (mouseMode & SELECT) == SELECT && depth != 0 && depth != 1)
16332	17611	{
16333	17612	pointselection = false;
16334	17613
..	..	@@ -16345,6 +17624,8 @@
16345	17624	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
16346	17625	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
16347	17626	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17627	+
	17628	+ CreateSelectedPoint();
16348	17629
16349	17630	// Will fit the mesh !!!
16350	17631	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16394,34 +17675,36 @@
16394	17675	System.out.println("; fromto " + sel + " " + Trunk(previousselectedpoint.toParent[3][0]) + " " + Trunk(previousselectedpoint.toParent[3][2]) + " " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][2]));
16395	17676	}
16396	17677
16397		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	17678	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16398	17679	}
16399	17680	}
16400	17681
16401	17682	if (!movingcamera && !PAINTMODE)
16402		- object.editWindow.ScreenFitPoint(); // fev 2014
	17683	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16403	17684
16404		- 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)
16405	17686	{
16406		- 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);
16407	17688
16408		- Object3D group = new Object3D("inst" + paintcount++);
	17689	+ if (object.GetWindow().copy.selection.Size() > 0)
	17690	+ {
	17691	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16409	17692
16410		- group.CreateMaterial(); // use a void leaf to select instances
16411		-
16412		- group.add(paintobj); // link
16413		-
16414		- object.editWindow.SnapObject(group);
16415		-
16416		- Object3D folder = object.editWindow.copy;
16417		-
16418		- if (object.editWindow.copy.selection.Size() > 0)
16419		- folder = object.editWindow.copy.selection.elementAt(0);
16420		-
16421		- folder.add(group);
16422		-
16423		- object.editWindow.ResetModel();
16424		- 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	+ }
16425	17708	}
16426	17709	else
16427	17710	paintcount = 0;
..	..	@@ -16460,6 +17743,11 @@
16460	17743	//System.out.println("objects[color] = " + objects[color]);
16461	17744	//objects[color].Select();
16462	17745	indexcount = 0;
	17746	+ ObjEditor window = object.GetWindow();
	17747	+ if (window != null && deselect)
	17748	+ {
	17749	+ window.Select(null, deselect, true);
	17750	+ }
16463	17751	object.Select(color, deselect);
16464	17752	}
16465	17753
..	..	@@ -16510,6 +17798,7 @@
16510	17798
16511	17799	public void init(GLAutoDrawable drawable)
16512	17800	{
	17801	+ if (Globals.DEBUG)
16513	17802	System.out.println("shadow buffer init");
16514	17803
16515	17804	GL gl = drawable.getGL();
..	..	@@ -16559,7 +17848,7 @@
16559	17848	gl.glDisable(gl.GL_CULL_FACE);
16560	17849	}
16561	17850
16562		- if (!RENDERSHADOW)
	17851	+ if (!Globals.RENDERSHADOW)
16563	17852	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16564	17853
16565	17854	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16569,7 +17858,7 @@
16569	17858	//gl.glColorMask(false, false, false, false);
16570	17859
16571	17860	//render_scene_from_light_view(gl, drawable, 0, 0);
16572		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17861	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16573	17862	{
16574	17863	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16575	17864
..	..	@@ -16738,10 +18027,14 @@
16738	18027	gl.glFlush();
16739	18028
16740	18029	/**/
16741		- 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);
16742	18031
16743		- float[] pixels = occlusionsizebuffer.array();
	18032	+ float[] depths = occlusiondepthbuffer.array();
16744	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	+
16745	18038	double r = 0, g = 0, b = 0;
16746	18039
16747	18040	double count = 0;
..	..	@@ -16752,7 +18045,7 @@
16752	18045
16753	18046	double FACTOR = 1;
16754	18047
16755		- for (int i = 0; i < pixels.length; i++)
	18048	+ for (int i = 0; i < depths.length; i++)
16756	18049	{
16757	18050	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
16758	18051	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -16835,7 +18128,7 @@
16835	18128
16836	18129	double scale = ray.z; // 1; // cos
16837	18130
16838		- float depth = pixels[newindex];
	18131	+ float depth = depths[newindex];
16839	18132
16840	18133	/*
16841	18134	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -16978,6 +18271,11 @@
16978	18271	static boolean DEBUG_SELECTION = false;
16979	18272	boolean OCCLUSION_CULLING = false; //true;
16980	18273	public boolean lightMode = false;
	18274	+
	18275	+ private boolean keepshadow;
	18276	+
	18277	+ static public boolean capsLocked = false; // VR
	18278	+
16981	18279	static public int indexcount = 0;
16982	18280	/static/ cColor vertexOcclusion = new cColor();
16983	18281	//private int selection_view = -1;
..	..	@@ -16985,23 +18283,15 @@
16985	18283	int AAbuffersize = 0;
16986	18284
16987	18285	//double[] selectedpoint = new double[3];
16988		- static Superellipsoid selectedpoint = new Superellipsoid();
	18286	+ static Superellipsoid selectedpoint;
16989	18287	static Sphere previousselectedpoint = null;
16990		- static Sphere debugpointG = new Sphere();
16991		- static Sphere debugpointP = new Sphere();
16992		- static Sphere debugpointC = new Sphere();
16993		- static Sphere debugpointR = new Sphere();
	18288	+ static Sphere debugpointG;
	18289	+ static Sphere debugpointP;
	18290	+ static Sphere debugpointC;
	18291	+ static Sphere debugpointR;
16994	18292
16995	18293	static Sphere debugpoints[] = new Sphere[8];
16996	18294
16997		- static
16998		- {
16999		- for (int i=0; i<8; i++)
17000		- {
17001		- debugpoints[i] = new Sphere();
17002		- }
17003		- }
17004		-
17005	18295	static void InitPoints(float radius)
17006	18296	{
17007	18297	for (int i=0; i<8; i++)
..	..	@@ -17040,11 +18330,14 @@
17040	18330	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
17041	18331	static IntBuffer bigAAbuffer;
17042	18332	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
17043		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	18333	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
17044	18334	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17045	18335	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
17046	18336	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
17047		- 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	+
17048	18341	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
17049	18342	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
17050	18343	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();