~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -18,7 +18,10 @@
18	18	import javax.imageio.ImageIO;
19	19	import javax.imageio.ImageWriteParam;
20	20	import javax.imageio.ImageWriter;
	21	+import javax.imageio.ImageReadParam;
	22	+import javax.imageio.ImageReader;
21	23	import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
	24	+import javax.imageio.stream.ImageInputStream;
22	25	import javax.imageio.stream.ImageOutputStream;
23	26	import javax.imageio.ImageWriteParam;
24	27
..	..	@@ -30,6 +33,7 @@
30	33	import java.nio.*;
31	34
32	35	import gleem.linalg.Mat4f;
	36	+import javax.imageio.ImageTypeSpecifier;
33	37
34	38	class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
35	39	{
..	..	@@ -37,7 +41,6 @@
37	41	static boolean[] selectedstack = new boolean[65536];
38	42	static int materialdepth = 0;
39	43
40		- static boolean DEBUG = false;
41	44	static boolean FRUSTUM = false; // still bogus true; // frustum culling
42	45
43	46	// camera change fix
..	..	@@ -45,6 +48,39 @@
45	48	static boolean ABORTED = false;
46	49
47	50	static int STEP = 1;
	51	+
	52	+ private static BufferedImage CreateBim(byte[] bytes, int width, int height)
	53	+ {
	54	+ int[] pixels = new int[bytes.length/3];
	55	+ for (int i=pixels.length; --i>=0;)
	56	+ {
	57	+ int i3 = i*3;
	58	+ pixels[i] = 0xFF;
	59	+ pixels[i] <<= 8;
	60	+ pixels[i] \|= bytes[i3+2] & 0xFF;
	61	+ pixels[i] <<= 8;
	62	+ pixels[i] \|= bytes[i3+1] & 0xFF;
	63	+ pixels[i] <<= 8;
	64	+ pixels[i] \|= bytes[i3] & 0xFF;
	65	+ }
	66	+ /*
	67	+ int r=0,g=0,b=0,a=0;
	68	+ for (int i=0; i<width; i++)
	69	+ for (int j=0; j<height; j++)
	70	+ {
	71	+ int index = j*width+i;
	72	+ int p = pixels[index];
	73	+ a = ((p>>24) & 0xFF);
	74	+ r = ((p>>16) & 0xFF);
	75	+ g = ((p>>8) & 0xFF);
	76	+ b = (p & 0xFF);
	77	+ pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
	78	+ }
	79	+ /**/
	80	+ BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
	81	+ rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	82	+ return rendImage;
	83	+ }
48	84
49	85	/static/ private boolean CULLFACE = false; // true;
50	86	/static/ boolean NEAREST = false; // true;
..	..	@@ -56,14 +92,12 @@
56	92	static int CURRENTANTIALIAS = 0; // 1;
57	93	/static/ boolean RENDERSHADOW = true;
58	94	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
59		- static boolean ANIMATION = false;
60		- static String filename;
61	95
62	96	boolean DISPLAYTEXT = false;
63	97	//boolean REDUCETEXTURE = true;
64	98	boolean CACHETEXTURE = true;
65	99	boolean CLEANCACHE = false; // true;
66		- boolean MIPMAP = false; // true;
	100	+ boolean MIPMAP = false; // true; // never works...
67	101	boolean COMPRESSTEXTURE = false;
68	102	boolean KOMPACTTEXTURE = false; // true;
69	103	boolean RESIZETEXTURE = false;
..	..	@@ -76,7 +110,11 @@
76	110	//private Mat4f spotlightTransform = new Mat4f();
77	111	//private Mat4f spotlightInverseTransform = new Mat4f();
78	112	static GLContext glcontext = null;
79		- /static/ com.sun.opengl.util.texture.Texture cubemap;
	113	+ /static/ com.sun.opengl.util.texture.Texture cubemap; // Either custom or rgb
	114	+ /static/ com.sun.opengl.util.texture.Texture cubemapcustom;
	115	+ /static/ com.sun.opengl.util.texture.Texture cubemaprgb;
	116	+ boolean transformMode;
	117	+
80	118	boolean reverseUP = false;
81	119	static boolean frozen = false;
82	120	boolean enablebackspace = false; // patch for back buffer refresh
..	..	@@ -92,6 +130,8 @@
92	130
93	131	static int tickcount = 0; // slow pose issue
94	132
	133	+static boolean BUTTONLESSWHEEL = false;
	134	+static boolean ZOOMBOXMODE = false;
95	135	static boolean BOXMODE = false;
96	136	static boolean IMAGEFLIP = false;
97	137	static boolean SMOOTHFOCUS = false;
..	..	@@ -106,7 +146,7 @@
106	146	static boolean OEIL = true;
107	147	static boolean OEILONCE = false; // do oeilon then oeiloff
108	148	static boolean LOOKAT = true;
109		-static boolean RANDOM = true; // false;
	149	+static boolean SWITCH = true; // false;
110	150	static boolean HANDLES = false; // selection doesn't work!!
111	151	static boolean PAINTMODE = false;
112	152
..	..	@@ -137,7 +177,7 @@
137	177	static boolean doublesided = false; // true; // reversed normals are awful for conformance
138	178	boolean anisotropy = true;
139	179	boolean softshadow = true; // slower but better false;
140		- boolean opacityhalo = false;
	180	+ boolean opacityhalo = false; // reverse the halo effect (e.g. glass)
141	181
142	182	boolean macromode = false;
143	183
..	..	@@ -150,12 +190,25 @@
150	190	defaultcaps.setAccumAlphaBits(16);
151	191	}
152	192
153		- static CameraPane theRenderer;
	193	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	194	+
	195	+ public com.sun.opengl.util.texture.Texture LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	196	+ {
	197	+ try
	198	+ {
	199	+ return LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	200	+ } catch (IOException e)
	201	+ {
	202	+ System.out.println("NAME = " + name);
	203	+ e.printStackTrace(); // throw new RuntimeException(e);
	204	+ return null;
	205	+ }
	206	+ }
154	207
155	208	void SetAsGLRenderer(boolean b)
156	209	{
157	210	isRenderer = b;
158		- theRenderer = this;
	211	+ Globals.theRenderer = this;
159	212	}
160	213
161	214	CameraPane(Object3D o, Camera cam, boolean withcontext)
..	..	@@ -170,7 +223,8 @@
170	223
171	224	SetCamera(cam);
172	225
173		- SetLight(new Camera(new cVector(10, 10, -20)));
	226	+ // Warning: not used.
	227	+ SetLight(new Camera(new cVector(15, 10, -20)));
174	228
175	229	object = o;
176	230
..	..	@@ -193,9 +247,43 @@
193	247
194	248	/// INTERFACE
195	249
	250	+ public javax.media.opengl.GL GetGL0()
	251	+ {
	252	+ return null;
	253	+ }
	254	+
	255	+ public int GenList()
	256	+ {
	257	+ javax.media.opengl.GL gl = GetGL();
	258	+ return gl.glGenLists(1);
	259	+ }
	260	+
	261	+ public void NewList(int id)
	262	+ {
	263	+ javax.media.opengl.GL gl = GetGL();
	264	+ gl.glNewList(id, gl.GL_COMPILE); //_AND_EXECUTE);
	265	+ }
	266	+
	267	+ public void CallList(int id)
	268	+ {
	269	+ javax.media.opengl.GL gl = GetGL();
	270	+ gl.glCallList(id);
	271	+ }
	272	+
	273	+ public void EndList()
	274	+ {
	275	+ javax.media.opengl.GL gl = GetGL();
	276	+ gl.glEndList();
	277	+ }
	278	+
196	279	public boolean IsBoxMode()
197	280	{
198	281	return BOXMODE;
	282	+ }
	283	+
	284	+ public boolean IsZoomBoxMode()
	285	+ {
	286	+ return ZOOMBOXMODE;
199	287	}
200	288
201	289	public void ClearDepth()
..	..	@@ -293,7 +381,7 @@
293	381	cStatic.objectstack[materialdepth++] = obj;
294	382	//System.out.println("material " + material);
295	383	//Applet3D.tracein(this, selected);
296		- display.vector2buffer = obj.projectedVertices;
	384	+ //display.vector2buffer = obj.projectedVertices;
297	385	if (obj instanceof Camera)
298	386	{
299	387	display.options1[0] = material.shift;
..	..	@@ -302,14 +390,28 @@
302	390	display.options1[2] = material.shadowbias;
303	391	display.options1[3] = material.aniso;
304	392	display.options1[4] = material.anisoV;
	393	+// System.out.println("display.options1[0] " + display.options1[0]);
	394	+// System.out.println("display.options1[1] " + display.options1[1]);
	395	+// System.out.println("display.options1[2] " + display.options1[2]);
	396	+// System.out.println("display.options1[3] " + display.options1[3]);
	397	+// System.out.println("display.options1[4] " + display.options1[4]);
305	398	display.options2[0] = material.opacity;
306	399	display.options2[1] = material.diffuse;
307	400	display.options2[2] = material.factor;
	401	+// System.out.println("display.options2[0] " + display.options2[0]);
	402	+// System.out.println("display.options2[1] " + display.options2[1]);
	403	+// System.out.println("display.options2[2] " + display.options2[2]);
308	404
309	405	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	406	+// System.out.println("display.options3[0] " + display.options3[0]);
	407	+// System.out.println("display.options3[1] " + display.options3[1]);
	408	+// System.out.println("display.options3[2] " + display.options3[2]);
310	409	display.options4[0] = material.cameralight/0.2f;
311	410	display.options4[1] = material.subsurface;
312	411	display.options4[2] = material.sheen;
	412	+// System.out.println("display.options4[0] " + display.options4[0]);
	413	+// System.out.println("display.options4[1] " + display.options4[1]);
	414	+// System.out.println("display.options4[2] " + display.options4[2]);
313	415
314	416	// if (display.CURRENTANTIALIAS > 0)
315	417	// display.options3[3] /= 4;
..	..	@@ -325,7 +427,7 @@
325	427	/**/
326	428	} else
327	429	{
328		- DrawMaterial(material, selected);
	430	+ DrawMaterial(material, selected, obj.projectedVertices);
329	431	}
330	432	} else
331	433	{
..	..	@@ -349,8 +451,8 @@
349	451	cStatic.objectstack[materialdepth++] = obj;
350	452	//System.out.println("material " + material);
351	453	//Applet3D.tracein("selected ", selected);
352		- display.vector2buffer = obj.projectedVertices;
353		- display.DrawMaterial(material, selected);
	454	+ //display.vector2buffer = obj.projectedVertices;
	455	+ display.DrawMaterial(material, selected, obj.projectedVertices);
354	456	}
355	457	}
356	458
..	..	@@ -367,8 +469,8 @@
367	469	materialdepth -= 1;
368	470	if (materialdepth > 0)
369	471	{
370		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
371		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	472	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	473	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
372	474	}
373	475	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
374	476	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -388,8 +490,8 @@
388	490	materialdepth -= 1;
389	491	if (materialdepth > 0)
390	492	{
391		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
392		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	493	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	494	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
393	495	}
394	496	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
395	497	//else
..	..	@@ -430,10 +532,12 @@
430	532	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
431	533	{
432	534	//gl.glBegin(gl.GL_TRIANGLES);
433		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	535	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	536	+ // TEST LIVE NORMALS && !obj.dontselect
	537	+ ;
434	538	if (!hasnorm)
435	539	{
436		- // System.out.println("FUCK!!");
	540	+ // System.out.println("Mesh normal");
437	541	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
438	542	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
439	543	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -816,7 +920,7 @@
816	920
817	921	if ((i % 100) == 0 && i != 0)
818	922	{
819		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	923	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
820	924	//System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
821	925	System.out.println((int) (100.0 * i / (br.positions.length / 3)) + "% (" + i + " of " + (br.positions.length / 3) + ")");
822	926	}
..	..	@@ -848,7 +952,7 @@
848	952
849	953	if ((i % 100) == 0 && i != 0)
850	954	{
851		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	955	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
852	956	//System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
853	957	System.out.println((int) (100.0 * i / br.VertexCount()) + "% (" + i + " of " + br.VertexCount() + ")");
854	958	}
..	..	@@ -1061,8 +1165,345 @@
1061	1165	gl.glMatrixMode(gl.GL_MODELVIEW);
1062	1166	}
1063	1167
	1168	+ public void DrawBox(cVector min, cVector max)
	1169	+ {
	1170	+ javax.media.opengl.GL gl = GetGL();
	1171	+ gl.glBegin(gl.GL_LINES);
	1172	+
	1173	+ gl.glVertex3d(min.x, min.y, min.z);
	1174	+ gl.glVertex3d(min.x, min.y, max.z);
	1175	+ gl.glVertex3d(min.x, min.y, min.z);
	1176	+ gl.glVertex3d(min.x, max.y, min.z);
	1177	+ gl.glVertex3d(min.x, min.y, min.z);
	1178	+ gl.glVertex3d(max.x, min.y, min.z);
	1179	+
	1180	+ gl.glVertex3d(max.x, max.y, max.z);
	1181	+ gl.glVertex3d(min.x, max.y, max.z);
	1182	+ gl.glVertex3d(max.x, max.y, max.z);
	1183	+ gl.glVertex3d(max.x, min.y, max.z);
	1184	+ gl.glVertex3d(max.x, max.y, max.z);
	1185	+ gl.glVertex3d(max.x, max.y, min.z);
	1186	+
	1187	+ gl.glEnd();
	1188	+ }
	1189	+
	1190	+ public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
	1191	+ {
	1192	+ int[] strips = bRep.getRawIndices();
	1193	+
	1194	+ javax.media.opengl.GL gl = GetGL();
	1195	+
	1196	+ // TRIANGLE STRIP ARRAY
	1197	+ if (bRep.trimmed)
	1198	+ {
	1199	+ float[] v = bRep.getRawVertices();
	1200	+ float[] n = bRep.getRawNormals();
	1201	+ float[] c = bRep.getRawColors();
	1202	+ float[] uv = bRep.getRawUVMap();
	1203	+
	1204	+ int count2 = 0;
	1205	+ int count3 = 0;
	1206	+
	1207	+ if (n.length > 0)
	1208	+ {
	1209	+ for (int i = 0; i < strips.length; i++)
	1210	+ {
	1211	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1212	+
	1213	+ /*
	1214	+ boolean locked = false;
	1215	+ float eps = 0.1f;
	1216	+ boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	1217	+
	1218	+ int dot = 0;
	1219	+
	1220	+ if ((dot&1) == 0)
	1221	+ dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	1222	+
	1223	+ if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	1224	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	1225	+ else
	1226	+ {
	1227	+ locked = true;
	1228	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1229	+ }
	1230	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	1231	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	1232	+ if (hasnorm)
	1233	+ {
	1234	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	1235	+ gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
	1236	+ }
	1237	+
	1238	+ if ((dot&4) == 0)
	1239	+ dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	1240	+
	1241	+ if (wrap \|\| !locked && (dot&8) != 0)
	1242	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	1243	+ else
	1244	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1245	+
	1246	+ f.dot = dot;
	1247	+ */
	1248	+
	1249	+ if (!selectmode)
	1250	+ {
	1251	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1252	+ {
	1253	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1254	+ } else
	1255	+ {
	1256	+ gl.glNormal3f(0, 0, 1);
	1257	+ }
	1258	+
	1259	+ if (c != null)
	1260	+ //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
	1261	+ {
	1262	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1263	+ }
	1264	+ }
	1265	+
	1266	+ if (flipV)
	1267	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1268	+ else
	1269	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1270	+
	1271	+ //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1272	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1273	+
	1274	+ count2 += 2;
	1275	+ count3 += 3;
	1276	+ if (!selectmode)
	1277	+ {
	1278	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1279	+ {
	1280	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1281	+ } else
	1282	+ {
	1283	+ gl.glNormal3f(0, 0, 1);
	1284	+ }
	1285	+ if (c != null)
	1286	+ {
	1287	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1288	+ }
	1289	+ }
	1290	+
	1291	+ if (flipV)
	1292	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1293	+ else
	1294	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1295	+
	1296	+ //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1297	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1298	+
	1299	+ count2 += 2;
	1300	+ count3 += 3;
	1301	+ for (int j = 0; j < strips[i] - 2; j++)
	1302	+ {
	1303	+ //gl.glTexCoord2d(...);
	1304	+ if (!selectmode)
	1305	+ {
	1306	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1307	+ {
	1308	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1309	+ } else
	1310	+ {
	1311	+ gl.glNormal3f(0, 0, 1);
	1312	+ }
	1313	+ if (c != null)
	1314	+ {
	1315	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1316	+ }
	1317	+ }
	1318	+
	1319	+ if (flipV)
	1320	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1321	+ else
	1322	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1323	+
	1324	+ //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
	1325	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1326	+
	1327	+ count2 += 2;
	1328	+ count3 += 3;
	1329	+ }
	1330	+
	1331	+ gl.glEnd();
	1332	+ }
	1333	+ }
	1334	+
	1335	+ assert count3 == v.length;
	1336	+ }
	1337	+ else // !trimmed
	1338	+ {
	1339	+ int count = 0;
	1340	+ for (int i = 0; i < strips.length; i++)
	1341	+ {
	1342	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1343	+
	1344	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	1345	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	1346	+
	1347	+ drawVertex(gl, p, flipV, selectmode);
	1348	+ drawVertex(gl, q, flipV, selectmode);
	1349	+
	1350	+ for (int j = 0; j < strips[i] - 2; j++)
	1351	+ {
	1352	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	1353	+
	1354	+ // if (j%2 == 0)
	1355	+ // drawFace(p, q, r, display, null);
	1356	+ // else
	1357	+ // drawFace(p, r, q, display, null);
	1358	+
	1359	+ // p = q;
	1360	+ // q = r;
	1361	+ drawVertex(gl, r, flipV, selectmode);
	1362	+ }
	1363	+
	1364	+ gl.glEnd();
	1365	+ }
	1366	+ }
	1367	+ }
	1368	+
	1369	+ static cSpring.Point3D temp = new cSpring.Point3D();
	1370	+ static cSpring.Point3D temp2 = new cSpring.Point3D();
	1371	+ static cSpring.Point3D temp3 = new cSpring.Point3D();
	1372	+
	1373	+ public void DrawDynamicMesh(cMesh mesh)
	1374	+ {
	1375	+ GL gl = GetGL(); // getGL();
	1376	+
	1377	+ cSpring.PhysicsController3D Phys = mesh.Phys;
	1378	+
	1379	+ gl.glDisable(gl.GL_LIGHTING);
	1380	+
	1381	+ gl.glLineWidth(1);
	1382	+ gl.glColor3f(1,1,1);
	1383	+ gl.glBegin(gl.GL_LINES);
	1384	+ double scale = 0;
	1385	+ int count = 0;
	1386	+ for (int s=0; s<Phys.allSprings.size(); s++)
	1387	+ {
	1388	+ cSpring.Spring spring = Phys.allSprings.get(s);
	1389	+ if(s == 0)
	1390	+ {
	1391	+ //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
	1392	+ }
	1393	+ if (mesh.showsprings)
	1394	+ {
	1395	+ temp.set(spring.a.position);
	1396	+ temp.add(spring.b.position);
	1397	+ temp.mul(0.5);
	1398	+ temp2.set(spring.a.position);
	1399	+ temp2.sub(spring.b.position);
	1400	+ temp2.mul(spring.restLength/2);
	1401	+ temp.sub(temp2);
	1402	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1403	+ temp.add(temp2);
	1404	+ temp.add(temp2);
	1405	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1406	+ }
	1407	+
	1408	+ if (spring.isHandle)
	1409	+ continue;
	1410	+
	1411	+ //if (scale < spring.restLength)
	1412	+ scale += spring.restLength;
	1413	+ count++;
	1414	+ }
	1415	+ gl.glEnd();
	1416	+
	1417	+ if (count == 0)
	1418	+ scale = 0.01;
	1419	+ else
	1420	+ scale /= count * 3;
	1421	+
	1422	+ //scale = 0.25;
	1423	+
	1424	+ if (mesh.ShowInfo())
	1425	+ {
	1426	+ gl.glLineWidth(4);
	1427	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1428	+ {
	1429	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1430	+ if (node.mass == 0)
	1431	+ continue;
	1432	+
	1433	+ int i = node.springs==null?-1:node.springs.size();
	1434	+ gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
	1435	+ //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
	1436	+ //temp.normalize();
	1437	+ //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
	1438	+ gl.glBegin(gl.GL_LINES);
	1439	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1440	+ //gl.glVertex3d(node.position.x + node.normal.xscale, node.position.y + node.normal.yscale, node.position.z + node.normal.z*scale);
	1441	+ gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
	1442	+ node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
	1443	+ node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
	1444	+ gl.glEnd();
	1445	+ }
	1446	+
	1447	+ gl.glLineWidth(8);
	1448	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1449	+ {
	1450	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1451	+
	1452	+ if (node.springs != null)
	1453	+ {
	1454	+ for (int i=0; i<node.springs.size(); i+=1)
	1455	+ {
	1456	+ cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
	1457	+
	1458	+ int c = i+1;
	1459	+ // c = node.springs.get(i).nbcopies;
	1460	+
	1461	+ gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
	1462	+ gl.glBegin(gl.GL_LINES);
	1463	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1464	+ gl.glVertex3d(f.position.x/3+node.position.x2/3, f.position.y/3+node.position.y2/3, f.position.z/3+node.position.z*2/3);
	1465	+ gl.glEnd();
	1466	+ }
	1467	+ }
	1468	+ }
	1469	+
	1470	+ gl.glLineWidth(1);
	1471	+ }
	1472	+
	1473	+ gl.glEnable(gl.GL_LIGHTING);
	1474	+ }
	1475	+
1064	1476	/// INTERFACE
1065	1477
	1478	+ public void StartTriangles()
	1479	+ {
	1480	+ javax.media.opengl.GL gl = GetGL();
	1481	+ gl.glBegin(gl.GL_TRIANGLES);
	1482	+ }
	1483	+
	1484	+ public void EndTriangles()
	1485	+ {
	1486	+ GetGL().glEnd();
	1487	+ }
	1488	+
	1489	+ void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
	1490	+ {
	1491	+ if (!selectmode)
	1492	+ {
	1493	+ gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1494	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	1495	+
	1496	+ if (flipV)
	1497	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	1498	+ else
	1499	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1500	+ }
	1501	+
	1502	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	1503	+ }
	1504	+
	1505	+ float[] colorV = new float[4];
	1506	+
1066	1507	void SetColor(Object3D obj, Vertex p0)
1067	1508	{
1068	1509	CameraPane display = this;
..	..	@@ -1130,8 +1571,6 @@
1130	1571	{
1131	1572	return;
1132	1573	}
1133		-
1134		- float[] colorV = new float[3];
1135	1574
1136	1575	if (false) // marked)
1137	1576	{
..	..	@@ -1240,7 +1679,7 @@
1240	1679	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1241	1680	}
1242	1681
1243		- void DrawMaterial(cMaterial material, boolean selected)
	1682	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1244	1683	{
1245	1684	CameraPane display = this;
1246	1685	//new Exception().printStackTrace();
..	..	@@ -1256,18 +1695,18 @@
1256	1695	//col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
1257	1696	if (!material.multiply)
1258	1697	{
1259		- display.color = color;
	1698	+ display.color = material.color;
1260	1699	display.saturation = material.modulation;
1261	1700	}
1262	1701	else
1263	1702	{
1264		- display.color = color2;
	1703	+ display.color = material.color2;
1265	1704	display.saturation = material.modulation2;
1266	1705	}
1267	1706
1268	1707	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1269	1708
1270		- float[] colorV = GrafreeD.colorV;
	1709	+ float[] colorV = Grafreed.colorV;
1271	1710
1272	1711	/**/
1273	1712	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1275,7 +1714,7 @@
1275	1714	colorV[0] = display.modelParams0[0] * material.diffuse;
1276	1715	colorV[1] = display.modelParams0[1] * material.diffuse;
1277	1716	colorV[2] = display.modelParams0[2] * material.diffuse;
1278		- colorV[3] = material.opacity;
	1717	+ colorV[3] = 1; // material.opacity;
1279	1718
1280	1719	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1281	1720	//System.out.println("Opacity = " + opacity);
..	..	@@ -1383,9 +1822,9 @@
1383	1822	display.modelParams7[2] = 0;
1384	1823	display.modelParams7[3] = 0;
1385	1824
1386		- display.modelParams6[0] = 100; // criss de bug de bump
	1825	+ //display.modelParams6[0] = 100; // criss de bug de bump
1387	1826
1388		- Object3D.cVector2[] extparams = display.vector2buffer;
	1827	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1389	1828	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1390	1829	{
1391	1830	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1527,7 +1966,7 @@
1527	1966	void PushMatrix(double[][] matrix)
1528	1967	{
1529	1968	// GrafreeD.tracein(matrix);
1530		- PushMatrix(matrix,1);
	1969	+ PushMatrix(matrix, 1);
1531	1970	}
1532	1971
1533	1972	void PushMatrix()
..	..	@@ -1624,7 +2063,7 @@
1624	2063
1625	2064	static int camerachangeframe;
1626	2065
1627		- boolean SetCamera(Camera cam)
	2066	+ public boolean SetCamera(Camera cam)
1628	2067	{
1629	2068	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
1630	2069	// return false;
..	..	@@ -1681,7 +2120,7 @@
1681	2120	//System.err.println("Oeil on");
1682	2121	OEIL = true;
1683	2122	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
1684		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2123	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
1685	2124	//pingthread.StepToTarget(true);
1686	2125	}
1687	2126
..	..	@@ -1752,33 +2191,6 @@
1752	2191	mainDL ^= true;
1753	2192	}
1754	2193
1755		- void ToggleTexture()
1756		- {
1757		- textureon ^= true;
1758		- }
1759		-
1760		- void ToggleLive()
1761		- {
1762		- Globals.setLIVE(Globals.isLIVE() ^ true);
1763		-
1764		- System.err.println("LIVE = " + Globals.isLIVE());
1765		-
1766		- if (!Globals.isLIVE()) // save sound
1767		- GrafreeD.savesound = true; // wav.save();
1768		- // else
1769		- repaint(); // start loop // may 2013
1770		- }
1771		-
1772		- void ToggleSupport()
1773		- {
1774		- SUPPORT ^= true;
1775		- }
1776		-
1777		- void ToggleAbort()
1778		- {
1779		- ABORTMODE ^= true;
1780		- }
1781		-
1782	2194	void ToggleFullScreen()
1783	2195	{
1784	2196	FULLSCREEN ^= true;
..	..	@@ -1789,72 +2201,94 @@
1789	2201	Globals.CROWD ^= true;
1790	2202	}
1791	2203
1792		- void ToggleInertia()
1793		- {
1794		- INERTIA ^= true;
1795		- }
1796		-
1797	2204	void ToggleLocal()
1798	2205	{
1799	2206	LOCALTRANSFORM ^= true;
1800	2207	}
1801	2208
1802		- void ToggleFast()
	2209	+ public void ToggleTexture()
	2210	+ {
	2211	+ textureon ^= true;
	2212	+ }
	2213	+
	2214	+ public void ToggleLive()
	2215	+ {
	2216	+ Globals.setLIVE(Globals.isLIVE() ^ true);
	2217	+
	2218	+ System.err.println("LIVE = " + Globals.isLIVE());
	2219	+
	2220	+ if (!Globals.isLIVE()) // save sound
	2221	+ Grafreed.savesound = true; // wav.save();
	2222	+ // else
	2223	+ repaint(); // start loop // may 2013
	2224	+ }
	2225	+
	2226	+ public void ToggleSupport()
	2227	+ {
	2228	+ SUPPORT ^= true;
	2229	+ }
	2230	+
	2231	+ public void ToggleAbort()
	2232	+ {
	2233	+ ABORTMODE ^= true;
	2234	+ }
	2235	+
	2236	+ public void ToggleInertia()
	2237	+ {
	2238	+ INERTIA ^= true;
	2239	+ }
	2240	+
	2241	+ public void ToggleFast()
1803	2242	{
1804	2243	FAST ^= true;
1805	2244	}
1806	2245
1807		- void ToggleSlowPose()
	2246	+ public void ToggleSlowPose()
1808	2247	{
1809	2248	SLOWPOSE ^= true;
1810	2249	}
1811	2250
1812		- void ToggleFootContact()
1813		- {
1814		- FOOTCONTACT ^= true;
1815		- }
1816		-
1817		- void ToggleBoxMode()
	2251	+ public void ToggleBoxMode()
1818	2252	{
1819	2253	BOXMODE ^= true;
1820	2254	}
1821	2255
1822		- void ToggleSmoothFocus()
	2256	+ public void ToggleZoomBoxMode()
	2257	+ {
	2258	+ ZOOMBOXMODE ^= true;
	2259	+ }
	2260	+
	2261	+ public void ToggleSmoothFocus()
1823	2262	{
1824	2263	SMOOTHFOCUS ^= true;
1825	2264	}
1826	2265
1827		- void ToggleImageFlip()
	2266	+ public void ToggleImageFlip()
1828	2267	{
1829	2268	IMAGEFLIP ^= true;
1830	2269	}
1831	2270
1832		- void ToggleSpeakerMocap()
	2271	+ public void ToggleSpeakerMocap()
1833	2272	{
1834	2273	SPEAKERMOCAP ^= true;
1835	2274	}
1836	2275
1837		- void ToggleSpeakerCamera()
	2276	+ public void ToggleSpeakerCamera()
1838	2277	{
1839	2278	SPEAKERCAMERA ^= true;
1840	2279	}
1841	2280
1842		- void ToggleSpeakerFocus()
	2281	+ public void ToggleSpeakerFocus()
1843	2282	{
1844	2283	SPEAKERFOCUS ^= true;
1845	2284	}
1846	2285
1847		- void ToggleDebug()
1848		- {
1849		- DEBUG ^= true;
1850		- }
1851		-
1852		- void ToggleFrustum()
	2286	+ public void ToggleFrustum()
1853	2287	{
1854	2288	FRUSTUM ^= true;
1855	2289	}
1856	2290
1857		- void ToggleTrack()
	2291	+ public void ToggleTrack()
1858	2292	{
1859	2293	TRACK ^= true;
1860	2294	if (TRACK)
..	..	@@ -1873,25 +2307,35 @@
1873	2307	repaint();
1874	2308	}
1875	2309
1876		- void ToggleTrackOnce()
	2310	+ public void ToggleTrackOnce()
1877	2311	{
1878	2312	TRACKONCE ^= true;
1879	2313	}
1880	2314
1881		- void ToggleShadowTrack()
	2315	+ public void ToggleShadowTrack()
1882	2316	{
1883	2317	SHADOWTRACK ^= true;
1884	2318	repaint();
1885	2319	}
1886	2320
1887		- void ToggleOeil()
	2321	+ public void ToggleOeil()
1888	2322	{
1889	2323	OEIL ^= true;
1890	2324	}
1891	2325
1892		- void ToggleOeilOnce()
	2326	+ public void ToggleOeilOnce()
1893	2327	{
1894	2328	OEILONCE ^= true;
	2329	+ }
	2330	+
	2331	+ void ToggleFootContact()
	2332	+ {
	2333	+ FOOTCONTACT ^= true;
	2334	+ }
	2335	+
	2336	+ void ToggleDebug()
	2337	+ {
	2338	+ Globals.DEBUG ^= true;
1895	2339	}
1896	2340
1897	2341	void ToggleLookAt()
..	..	@@ -1899,9 +2343,9 @@
1899	2343	LOOKAT ^= true;
1900	2344	}
1901	2345
1902		- void ToggleRandom()
	2346	+ void ToggleSwitch()
1903	2347	{
1904		- RANDOM ^= true;
	2348	+ SWITCH ^= true;
1905	2349	}
1906	2350
1907	2351	void ToggleHandles()
..	..	@@ -1909,10 +2353,17 @@
1909	2353	HANDLES ^= true;
1910	2354	}
1911	2355
	2356	+ Object3D paintFolder;
	2357	+
1912	2358	void TogglePaint()
1913	2359	{
1914	2360	PAINTMODE ^= true;
1915	2361	paintcount = 0;
	2362	+
	2363	+ if (PAINTMODE)
	2364	+ {
	2365	+ paintFolder = GetFolder();
	2366	+ }
1916	2367	}
1917	2368
1918	2369	void SwapCamera(int a, int b)
..	..	@@ -2008,7 +2459,22 @@
2008	2459	{
2009	2460	return currentGL;
2010	2461	}
2011		-
	2462	+
	2463	+ static private BufferedImage CreateBim(TextureData texturedata)
	2464	+ {
	2465	+ Grafreed.Assert(texturedata != null);
	2466	+
	2467	+ int width = texturedata.getWidth();
	2468	+ int height = texturedata.getHeight();
	2469	+
	2470	+ Buffer buffer = texturedata.getBuffer();
	2471	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2472	+
	2473	+ byte[] bytes = bytebuf.array();
	2474	+
	2475	+ return CreateBim(bytes, width, height);
	2476	+ }
	2477	+
2012	2478	/**/
2013	2479	class CacheTexture
2014	2480	{
..	..	@@ -2017,28 +2483,31 @@
2017	2483
2018	2484	int resolution;
2019	2485
2020		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2486	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2021	2487	{
2022		- texture = tex;
	2488	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2489	+ texturedata = texdata;
2023	2490	resolution = res;
2024	2491	}
2025	2492	}
2026	2493	/**/
2027	2494
2028	2495	// TEXTURE static Texture texture;
2029		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2030		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2031		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2496	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2497	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2498	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2499	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2500	+
2032	2501	int pigmentdepth = 0;
2033	2502	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2034	2503	int bumpdepth = 0;
2035	2504	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2036	2505	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2037	2506	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2038		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2507	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2039	2508	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2040	2509
2041		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2510	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2042	2511	{
2043	2512	TextureData texturedata = null;
2044	2513
..	..	@@ -2048,7 +2517,7 @@
2048	2517	com.sun.opengl.util.texture.TextureIO.newTextureData(
2049	2518	getClass().getClassLoader().getResourceAsStream(name),
2050	2519	true,
2051		- com.sun.opengl.util.texture.TextureIO.PNG);
	2520	+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
2052	2521	} catch (java.io.IOException e)
2053	2522	{
2054	2523	throw new javax.media.opengl.GLException(e);
..	..	@@ -2057,13 +2526,34 @@
2057	2526	if (bump)
2058	2527	texturedata = ConvertBump(texturedata, false);
2059	2528
2060		- com.sun.opengl.util.texture.Texture texture =
2061		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2529	+// com.sun.opengl.util.texture.Texture texture =
	2530	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
2062	2531
2063		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2064		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2532	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2533	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
2065	2534
2066		- return texture;
	2535	+ return texturedata;
	2536	+ }
	2537	+
	2538	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2539	+ {
	2540	+ TextureData texturedata = null;
	2541	+
	2542	+ try
	2543	+ {
	2544	+ texturedata =
	2545	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2546	+ bim,
	2547	+ true);
	2548	+ } catch (Exception e)
	2549	+ {
	2550	+ throw new javax.media.opengl.GLException(e);
	2551	+ }
	2552	+
	2553	+ if (bump)
	2554	+ texturedata = ConvertBump(texturedata, false);
	2555	+
	2556	+ return texturedata;
2067	2557	}
2068	2558
2069	2559	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3136,6 +3626,8 @@
3136	3626
3137	3627	System.out.println("LOADING TEXTURE : " + name);
3138	3628
	3629	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3630	+
3139	3631	//
3140	3632	if (false) // compressbit > 0)
3141	3633	{
..	..	@@ -3840,6 +4332,7 @@
3840	4332
3841	4333	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
3842	4334	{
	4335	+ new Exception().printStackTrace();
3843	4336	System.exit(0);
3844	4337	com.sun.opengl.util.texture.Texture texture = null;
3845	4338
..	..	@@ -7533,7 +8026,7 @@
7533	8026	String pigment = Object3D.GetPigment(tex);
7534	8027	String bump = Object3D.GetBump(tex);
7535	8028
7536		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8029	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7537	8030	{
7538	8031	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7539	8032	// System.out.println("; bump = " + bump);
..	..	@@ -7548,11 +8041,69 @@
7548	8041	pigment = null;
7549	8042	}
7550	8043
7551		- ReleaseTexture(bump, true);
7552		- ReleaseTexture(pigment, false);
	8044	+ ReleaseTexture(tex, true);
	8045	+ ReleaseTexture(tex, false);
7553	8046	}
7554	8047
7555		- void ReleaseTexture(String tex, boolean bump)
	8048	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8049	+ {
	8050	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8051	+ {
	8052	+ return;
	8053	+ }
	8054	+
	8055	+ if (tex == null)
	8056	+ {
	8057	+ ReleaseTexture(null, false);
	8058	+ return;
	8059	+ }
	8060	+
	8061	+ String pigment = Object3D.GetPigment(tex);
	8062	+
	8063	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8064	+ {
	8065	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8066	+ // System.out.println("; bump = " + bump);
	8067	+ }
	8068	+
	8069	+ if (pigment.equals(""))
	8070	+ {
	8071	+ pigment = null;
	8072	+ }
	8073	+
	8074	+ ReleaseTexture(tex, false);
	8075	+ }
	8076	+
	8077	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8078	+ {
	8079	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8080	+ {
	8081	+ return;
	8082	+ }
	8083	+
	8084	+ if (tex == null)
	8085	+ {
	8086	+ ReleaseTexture(null, true);
	8087	+ return;
	8088	+ }
	8089	+
	8090	+ String bump = Object3D.GetBump(tex);
	8091	+
	8092	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8093	+ {
	8094	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8095	+ // System.out.println("; bump = " + bump);
	8096	+ }
	8097	+
	8098	+ if (bump.equals(""))
	8099	+ {
	8100	+ bump = null;
	8101	+ }
	8102	+
	8103	+ ReleaseTexture(tex, true);
	8104	+ }
	8105	+
	8106	+ void ReleaseTexture(cTexture tex, boolean bump)
7556	8107	{
7557	8108	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7558	8109	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7563,7 +8114,7 @@
7563	8114	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7564	8115
7565	8116	if (tex != null)
7566		- texture = textures.get(tex);
	8117	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7567	8118
7568	8119	// //assert( texture != null );
7569	8120	// if (texture == null)
..	..	@@ -7655,7 +8206,55 @@
7655	8206	}
7656	8207	}
7657	8208
7658		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8209	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
	8210	+ {
	8211	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8212	+// ambientOcclusion ) // \|\| !textureon)
	8213	+// {
	8214	+// return; // false;
	8215	+// }
	8216	+//
	8217	+// if (tex == null)
	8218	+// {
	8219	+// BindTexture(null,false,resolution);
	8220	+// BindTexture(null,true,resolution);
	8221	+// return;
	8222	+// }
	8223	+//
	8224	+// String pigment = Object3D.GetPigment(tex);
	8225	+// String bump = Object3D.GetBump(tex);
	8226	+//
	8227	+// usedtextures.add(pigment);
	8228	+// usedtextures.add(bump);
	8229	+//
	8230	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8231	+// {
	8232	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8233	+// // System.out.println("; bump = " + bump);
	8234	+// }
	8235	+//
	8236	+// if (bump.equals(""))
	8237	+// {
	8238	+// bump = null;
	8239	+// }
	8240	+// if (pigment.equals(""))
	8241	+// {
	8242	+// pigment = null;
	8243	+// }
	8244	+//
	8245	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8246	+// BindTexture(pigment, false, resolution);
	8247	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8248	+// BindTexture(bump, true, resolution);
	8249	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8250	+//
	8251	+// return; // true;
	8252	+
	8253	+ BindPigmentTexture(tex, resolution);
	8254	+ BindBumpTexture(tex, resolution);
	8255	+ }
	8256	+
	8257	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
7659	8258	{
7660	8259	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7661	8260	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7666,17 +8265,47 @@
7666	8265	if (tex == null)
7667	8266	{
7668	8267	BindTexture(null,false,resolution);
7669		- BindTexture(null,true,resolution);
7670	8268	return;
7671	8269	}
7672	8270
7673	8271	String pigment = Object3D.GetPigment(tex);
	8272	+
	8273	+ usedtextures.add(tex);
	8274	+
	8275	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8276	+ {
	8277	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8278	+ // System.out.println("; bump = " + bump);
	8279	+ }
	8280	+
	8281	+ if (pigment.equals(""))
	8282	+ {
	8283	+ pigment = null;
	8284	+ }
	8285	+
	8286	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8287	+ BindTexture(tex, false, resolution);
	8288	+ }
	8289	+
	8290	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8291	+ {
	8292	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8293	+ ambientOcclusion ) // \|\| !textureon)
	8294	+ {
	8295	+ return; // false;
	8296	+ }
	8297	+
	8298	+ if (tex == null)
	8299	+ {
	8300	+ BindTexture(null,true,resolution);
	8301	+ return;
	8302	+ }
	8303	+
7674	8304	String bump = Object3D.GetBump(tex);
7675	8305
7676		- usedtextures.put(pigment, pigment);
7677		- usedtextures.put(bump, bump);
	8306	+ usedtextures.add(tex);
7678	8307
7679		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8308	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7680	8309	{
7681	8310	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
7682	8311	// System.out.println("; bump = " + bump);
..	..	@@ -7686,43 +8315,94 @@
7686	8315	{
7687	8316	bump = null;
7688	8317	}
7689		- if (pigment.equals(""))
7690		- {
7691		- pigment = null;
7692		- }
7693	8318
7694		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
7695		- BindTexture(pigment, false, resolution);
7696	8319	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
7697		- BindTexture(bump, true, resolution);
	8320	+ BindTexture(tex, true, resolution);
7698	8321	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
7699		-
7700		- return; // true;
7701	8322	}
7702	8323
7703		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8324	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8325	+
	8326	+ private boolean FileExists(String tex)
7704	8327	{
7705		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8328	+ if (missingTextures.contains(tex))
	8329	+ {
	8330	+ return false;
	8331	+ }
	8332	+
	8333	+ boolean fileExists = new File(tex).exists();
	8334	+
	8335	+ if (!fileExists)
	8336	+ {
	8337	+ // If file exists, the "new File()" is not executed sgain
	8338	+ missingTextures.add(tex);
	8339	+ }
	8340	+
	8341	+ return fileExists;
	8342	+ }
	8343	+
	8344	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
	8345	+ {
	8346	+ CacheTexture texturecache = null;
7706	8347
7707	8348	if (tex != null)
7708	8349	{
7709		- String texname = tex;
	8350	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8351	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
7710	8352
7711		- String[] split = tex.split("Textures");
7712		- if (split.length > 1)
7713		- texname = "/Users/nbriere/Textures" + split[split.length-1];
7714		- else
7715		- if (!texname.startsWith("/"))
7716		- texname = "/Users/nbriere/Textures/" + texname;
	8353	+ if (texname.equals("") && texdata == null)
	8354	+ {
	8355	+ return null;
	8356	+ }
	8357	+
	8358	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8359	+
	8360	+// String[] split = tex.split("Textures");
	8361	+// if (split.length > 1)
	8362	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8363	+// else
	8364	+// if (!texname.startsWith("/"))
	8365	+// texname = "/Users/nbriere/Textures/" + texname;
	8366	+ if (!FileExists(texname) && !texname.startsWith("@"))
	8367	+ {
	8368	+ texname = fallbackTextureName;
	8369	+ }
7717	8370
7718	8371	if (CACHETEXTURE)
7719		- texture = textures.get(texname); // TEXTURE CACHE
7720		-
7721		- TextureData texturedata = null;
7722		-
7723		- if (texture == null \|\| texture.resolution < resolution)
7724	8372	{
7725		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8373	+ if (texdata == null)
	8374	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8375	+ else
	8376	+ texturecache = bimtextures.get(texdata);
	8377	+ }
	8378	+
	8379	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8380	+ {
	8381	+ TextureData texturedata = null;
	8382	+
	8383	+ if (texdata != null && textureon)
	8384	+ {
	8385	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8386	+
	8387	+ try
	8388	+ {
	8389	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8390	+ }
	8391	+ catch (Exception e)
	8392	+ {
	8393	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8394	+ }
	8395	+
	8396	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8397	+ bimtextures.put(texdata, texturecache);
	8398	+
	8399	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8400	+
	8401	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8402	+ //bim2 = bim;
	8403	+ }
	8404	+ else
	8405	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
7726	8406	{
7727	8407	assert(!bump);
7728	8408	// if (bump)
..	..	@@ -7733,19 +8413,23 @@
7733	8413	// }
7734	8414	// else
7735	8415	// {
7736		- texture = textures.get(tex);
7737		- if (texture == null)
	8416	+ // texturecache = textures.get(texname); // suspicious
	8417	+ if (texturecache == null)
7738	8418	{
7739		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8419	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
7740	8420	}
	8421	+ else
	8422	+ new Exception().printStackTrace();
7741	8423	// }
7742	8424	} else
7743		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8425	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
7744	8426	{
7745	8427	assert(bump);
7746		- texture = textures.get(tex);
7747		- if (texture == null)
7748		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8428	+ // texturecache = textures.get(texname); // suspicious
	8429	+ if (texturecache == null)
	8430	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8431	+ else
	8432	+ new Exception().printStackTrace();
7749	8433	} else
7750	8434	{
7751	8435	//if (tex.equals("IMMORTAL"))
..	..	@@ -7753,11 +8437,22 @@
7753	8437	// texture = GetResourceTexture("default.png");
7754	8438	//} else
7755	8439	//{
7756		- if (tex.equals("WHITE_NOISE"))
	8440	+ if (texname.endsWith("WHITE_NOISE"))
7757	8441	{
7758		- texture = textures.get(tex);
7759		- if (texture == null)
7760		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8442	+ // texturecache = textures.get(texname); // suspicious
	8443	+ if (texturecache == null)
	8444	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8445	+ else
	8446	+ new Exception().printStackTrace();
	8447	+ } else
	8448	+ {
	8449	+ if (texname.startsWith("@"))
	8450	+ {
	8451	+ // texturecache = textures.get(texname); // suspicious
	8452	+ if (texturecache == null)
	8453	+ texturecache = new CacheTexture(GetResourceTexture(texname.substring(1), bump),resolution);
	8454	+ else
	8455	+ new Exception().printStackTrace();
7761	8456	} else
7762	8457	{
7763	8458	if (textureon)
..	..	@@ -7782,7 +8477,7 @@
7782	8477	}
7783	8478
7784	8479	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
7785		- if (!new File(cachename).exists())
	8480	+ if (!FileExists(cachename))
7786	8481	cachename = texname;
7787	8482	else
7788	8483	processbump = false; // don't process bump map again
..	..	@@ -7804,7 +8499,7 @@
7804	8499	}
7805	8500
7806	8501	cachename = texname.substring(0, texname.length()-4)+ext+".png";
7807		- if (!new File(cachename).exists())
	8502	+ if (!FileExists(cachename))
7808	8503	cachename = texname;
7809	8504	else
7810	8505	processbump = false; // don't process bump map again
..	..	@@ -7813,20 +8508,23 @@
7813	8508	texturedata = GetFileTexture(cachename, processbump, resolution);
7814	8509
7815	8510
7816		- if (texturedata != null)
7817		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8511	+ if (texturedata == null)
	8512	+ throw new Exception();
	8513	+
	8514	+ texturecache = new CacheTexture(texturedata,resolution);
7818	8515	//texture = GetTexture(tex, bump);
7819	8516	}
	8517	+ }
7820	8518	}
7821	8519	//}
7822	8520	}
7823	8521
7824		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8522	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
7825	8523	{
7826	8524	//return false;
7827	8525
7828	8526	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
7829		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8527	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
7830	8528	{
7831	8529	// String ext = "_highres";
7832	8530	// if (REDUCETEXTURE)
..	..	@@ -7843,52 +8541,17 @@
7843	8541	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
7844	8542	if (!cachefile.exists())
7845	8543	{
7846		- // cache to disk
7847		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
7848		- //buffers[0].
7849		-
7850		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
7851		- int[] pixels = new int[bytebuf.capacity()/3];
7852		-
7853		- // squared size heuristic...
7854		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8544	+ //if (texturedata.getWidth() == texturedata.getHeight())
7855	8545	{
7856		- for (int i=pixels.length; --i>=0;)
7857		- {
7858		- int i3 = i*3;
7859		- pixels[i] = 0xFF;
7860		- pixels[i] <<= 8;
7861		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
7862		- pixels[i] <<= 8;
7863		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
7864		- pixels[i] <<= 8;
7865		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
7866		- }
7867		-
7868		- /*
7869		- int r=0,g=0,b=0,a=0;
7870		- for (int i=0; i<width; i++)
7871		- for (int j=0; j<height; j++)
7872		- {
7873		- int index = j*width+i;
7874		- int p = pixels[index];
7875		- a = ((p>>24) & 0xFF);
7876		- r = ((p>>16) & 0xFF);
7877		- g = ((p>>8) & 0xFF);
7878		- b = (p & 0xFF);
7879		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
7880		- }
7881		- /**/
7882		- int width = (int)Math.sqrt(pixels.length); // squared
7883		- int height = width;
7884		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
7885		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8546	+ BufferedImage rendImage = CreateBim(texturedata);
	8547	+
7886	8548	ImageWriter writer = null;
7887	8549	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
7888	8550	if (iter.hasNext()) {
7889	8551	writer = (ImageWriter)iter.next();
7890	8552	}
7891		- float compressionQuality = 0.9f;
	8553	+
	8554	+ float compressionQuality = 0.85f;
7892	8555	try
7893	8556	{
7894	8557	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -7905,18 +8568,20 @@
7905	8568	}
7906	8569	}
7907	8570	}
7908		-
	8571	+
	8572	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8573	+
7909	8574	//System.out.println("Texture = " + tex);
7910		- if (textures.containsKey(texname))
	8575	+ if (textures.containsKey(tex))
7911	8576	{
7912		- CacheTexture thetex = textures.get(texname);
	8577	+ CacheTexture thetex = textures.get(tex);
7913	8578	thetex.texture.disable();
7914	8579	thetex.texture.dispose();
7915		- textures.remove(texname);
	8580	+ textures.remove(tex);
7916	8581	}
7917	8582
7918		- texture.texturedata = texturedata;
7919		- textures.put(texname, texture);
	8583	+ //texture.texturedata = texturedata;
	8584	+ textures.put(tex, texturecache);
7920	8585
7921	8586	// newtex = true;
7922	8587	}
..	..	@@ -7932,10 +8597,44 @@
7932	8597	}
7933	8598	}
7934	8599
7935		- return texture;
	8600	+ return texturecache;
7936	8601	}
7937	8602
7938		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8603	+ static void EmbedTextures(cTexture tex)
	8604	+ {
	8605	+ if (tex.pigmentdata == null)
	8606	+ {
	8607	+ //String texname = Object3D.GetPigment(tex);
	8608	+
	8609	+ CacheTexture texturecache = texturepigment.get(tex);
	8610	+
	8611	+ if (texturecache != null)
	8612	+ {
	8613	+ tex.pw = texturecache.texturedata.getWidth();
	8614	+ tex.ph = texturecache.texturedata.getHeight();
	8615	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8616	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8617	+ ;
	8618	+ //, tex.pw, tex.ph), 0.5f);
	8619	+ }
	8620	+ }
	8621	+
	8622	+ if (tex.bumpdata == null)
	8623	+ {
	8624	+ //String texname = Object3D.GetBump(tex);
	8625	+
	8626	+ CacheTexture texturecache = texturebump.get(tex);
	8627	+
	8628	+ if (texturecache != null)
	8629	+ {
	8630	+ tex.bw = texturecache.texturedata.getWidth();
	8631	+ tex.bh = texturecache.texturedata.getHeight();
	8632	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8633	+ }
	8634	+ }
	8635	+ }
	8636	+
	8637	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
7939	8638	{
7940	8639	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7941	8640
..	..	@@ -7953,21 +8652,21 @@
7953	8652	return texture!=null?texture.texture:null;
7954	8653	}
7955	8654
7956		- com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8655	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
7957	8656	{
7958	8657	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7959	8658
7960	8659	return texture!=null?texture.texturedata:null;
7961	8660	}
7962	8661
7963		- boolean BindTexture(String tex, boolean bump, int resolution)
	8662	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
7964	8663	{
7965	8664	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
7966	8665	{
7967	8666	return false;
7968	8667	}
7969	8668
7970		- boolean newtex = false;
	8669	+ //boolean newtex = false;
7971	8670
7972	8671	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
7973	8672
..	..	@@ -7999,9 +8698,75 @@
7999	8698	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
8000	8699	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
8001	8700
8002		- return newtex;
	8701	+ return true; // Warning: not used.
8003	8702	}
8004	8703
	8704	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8705	+ {
	8706	+ try
	8707	+ {
	8708	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8709	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8710	+ ImageWriter writer = writers.next();
	8711	+
	8712	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8713	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8714	+ param.setCompressionQuality(quality);
	8715	+
	8716	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8717	+ writer.setOutput(ios);
	8718	+ writer.write(null, new IIOImage(image, null, null), param);
	8719	+
	8720	+ byte[] data = baos.toByteArray();
	8721	+ writer.dispose();
	8722	+ return data;
	8723	+ }
	8724	+ catch (Exception e)
	8725	+ {
	8726	+ e.printStackTrace();
	8727	+ return null;
	8728	+ }
	8729	+ }
	8730	+
	8731	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8732	+ {
	8733	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8734	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8735	+ ImageReader reader = writers.next();
	8736	+
	8737	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8738	+
	8739	+ ImageReadParam param = reader.getDefaultReadParam();
	8740	+ param.setDestination(bim);
	8741	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8742	+
	8743	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8744	+ reader.setInput(ios);
	8745	+ BufferedImage bim2 = reader.read(0, param);
	8746	+ reader.dispose();
	8747	+
	8748	+// WritableRaster raster = bim2.getRaster();
	8749	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8750	+// byte[] bytes = data.getData();
	8751	+//
	8752	+// int[] pixels = new int[bytes.length/3];
	8753	+// for (int i=pixels.length; --i>=0;)
	8754	+// {
	8755	+// int i3 = i*3;
	8756	+// pixels[i] = 0xFF;
	8757	+// pixels[i] <<= 8;
	8758	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8759	+// pixels[i] <<= 8;
	8760	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8761	+// pixels[i] <<= 8;
	8762	+// pixels[i] \|= bytes[i3] & 0xFF;
	8763	+// }
	8764	+//
	8765	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8766	+
	8767	+ return bim;
	8768	+ }
	8769	+
8005	8770	ShadowBuffer shadowPBuf;
8006	8771	AntialiasBuffer antialiasPBuf;
8007	8772	int MAXSTACK;
..	..	@@ -8018,10 +8783,12 @@
8018	8783
8019	8784	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8020	8785	MAXSTACK = temp[0];
8021		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8786	+ if (Globals.DEBUG)
	8787	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8022	8788	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8023	8789	MAXSTACK = temp[0];
8024		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8790	+ if (Globals.DEBUG)
	8791	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8025	8792
8026	8793	// Use debug pipeline
8027	8794	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8029,7 +8796,8 @@
8029	8796	gl = drawable.getGL(); //
8030	8797
8031	8798	GL gl3 = getGL();
8032		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8799	+ if (Globals.DEBUG)
	8800	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8033	8801
8034	8802
8035	8803	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8194,7 +8962,7 @@
8194	8962
8195	8963	if (cubemap == null)
8196	8964	{
8197		- LoadEnvy(5);
	8965	+ //LoadEnvy(1);
8198	8966	}
8199	8967
8200	8968	//cubemap.enable();
..	..	@@ -8470,6 +9238,8 @@
8470	9238
8471	9239	void LoadEnvy(int which)
8472	9240	{
	9241	+ assert(false);
	9242	+
8473	9243	String name;
8474	9244	String ext;
8475	9245
..	..	@@ -8481,37 +9251,58 @@
8481	9251	cubemap = null;
8482	9252	return;
8483	9253	case 1:
8484		- name = "cubemaps/box_";
8485		- ext = "png";
	9254	+ name = "cubemaps/rgb/";
	9255	+ ext = "jpg";
8486	9256	reverseUP = false;
8487	9257	break;
8488	9258	case 2:
8489		- name = "cubemaps/uffizi_";
8490		- ext = "png";
8491		- break; // reverseUP = true; break;
	9259	+ name = "cubemaps/uffizi/";
	9260	+ ext = "jpg";
	9261	+ reverseUP = false;
	9262	+ break;
8492	9263	case 3:
8493		- name = "cubemaps/CloudyHills_";
8494		- ext = "tga";
	9264	+ name = "cubemaps/CloudyHills/";
	9265	+ ext = "jpg";
8495	9266	reverseUP = false;
8496	9267	break;
8497	9268	case 4:
8498		- name = "cubemaps/cornell_";
	9269	+ name = "cubemaps/cornell/";
8499	9270	ext = "png";
8500	9271	reverseUP = false;
8501	9272	break;
	9273	+ case 5:
	9274	+ name = "cubemaps/skycube/";
	9275	+ ext = "jpg";
	9276	+ reverseUP = false;
	9277	+ break;
	9278	+ case 6:
	9279	+ name = "cubemaps/SaintLazarusChurch3/";
	9280	+ ext = "jpg";
	9281	+ reverseUP = false;
	9282	+ break;
	9283	+ case 7:
	9284	+ name = "cubemaps/Sodermalmsallen/";
	9285	+ ext = "jpg";
	9286	+ reverseUP = false;
	9287	+ break;
	9288	+ case 8:
	9289	+ name = "cubemaps/Sodermalmsallen2/";
	9290	+ ext = "jpg";
	9291	+ reverseUP = false;
	9292	+ break;
	9293	+ case 9:
	9294	+ name = "cubemaps/UnionSquare/";
	9295	+ ext = "jpg";
	9296	+ reverseUP = false;
	9297	+ break;
8502	9298	default:
8503		- name = "cubemaps/rgb_";
8504		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9299	+ name = "cubemaps/box/";
	9300	+ ext = "png"; /mipmap = true;/
	9301	+ reverseUP = false;
8505	9302	break;
8506	9303	}
8507		-
8508		- try
8509		- {
8510		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
8511		- } catch (IOException e)
8512		- {
8513		- throw new RuntimeException(e);
8514		- }
	9304	+
	9305	+ LoadSkybox(name, ext, mipmap);
8515	9306	}
8516	9307
8517	9308	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -8543,8 +9334,12 @@
8543	9334	static double[] model = new double[16];
8544	9335	double[] camera2light = new double[16];
8545	9336	double[] light2camera = new double[16];
8546		- int newenvy = -1;
8547		- boolean envyoff = true; // false;
	9337	+
	9338	+ //int newenvy = -1;
	9339	+ //boolean envyoff = false;
	9340	+
	9341	+ String loadedskyboxname;
	9342	+
8548	9343	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
8549	9344	//float[] light0 = { 0,0,0 };
8550	9345	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -8837,11 +9632,35 @@
8837	9632	jy8[3] = 0.5f;
8838	9633	}
8839	9634
8840		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9635	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
8841	9636	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
8842	9637	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
8843	9638	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
8844	9639
	9640	+ void ResetOptions()
	9641	+ {
	9642	+ options1[0] = 100;
	9643	+ options1[1] = 0.025f;
	9644	+ options1[2] = 0.01f;
	9645	+ options1[3] = 0;
	9646	+ options1[4] = 0;
	9647	+
	9648	+ options2[0] = 0;
	9649	+ options2[1] = 0.75f;
	9650	+ options2[2] = 0;
	9651	+ options2[3] = 0;
	9652	+
	9653	+ options3[0] = 1;
	9654	+ options3[1] = 1;
	9655	+ options3[2] = 1;
	9656	+ options3[3] = 0;
	9657	+
	9658	+ options4[0] = 1;
	9659	+ options4[1] = 0;
	9660	+ options4[2] = 1;
	9661	+ options4[3] = 0;
	9662	+ }
	9663	+
8845	9664	static int imagecount = 0; // movie generation
8846	9665
8847	9666	static int jitter = 0;
..	..	@@ -8937,8 +9756,8 @@
8937	9756	assert (parentcam != renderCamera);
8938	9757
8939	9758	if (renderCamera != lightCamera)
8940		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8941		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9759	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9760	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
8942	9761
8943	9762	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
8944	9763
..	..	@@ -8953,8 +9772,8 @@
8953	9772	LA.matCopy(renderCamera.fromScreen, matrix);
8954	9773
8955	9774	if (renderCamera != lightCamera)
8956		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8957		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9775	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9776	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
8958	9777
8959	9778	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
8960	9779
..	..	@@ -9000,10 +9819,12 @@
9000	9819	rati = 1 / rati;
9001	9820	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9002	9821	}
9003		- assert (newenvy == -1);
	9822	+
	9823	+ //assert (newenvy == -1);
	9824	+
9004	9825	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9005	9826	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9006		- DrawSkyBox(gl);
	9827	+ DrawSkyBox(gl, (float)rati);
9007	9828	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9008	9829	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9009	9830	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -9026,7 +9847,7 @@
9026	9847	//gl.glFlush();
9027	9848	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9028	9849
9029		- if (ANIMATION && ABORTED)
	9850	+ if (Globals.ANIMATION && ABORTED)
9030	9851	{
9031	9852	System.err.println(" ABORTED FRAME");
9032	9853	break;
..	..	@@ -9056,7 +9877,7 @@
9056	9877	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9057	9878
9058	9879	// save image
9059		- if (ANIMATION && !ABORTED)
	9880	+ if (Globals.ANIMATION && !ABORTED)
9060	9881	{
9061	9882	VPwidth = viewport[2];
9062	9883	VPheight = viewport[3];
..	..	@@ -9167,11 +9988,11 @@
9167	9988
9168	9989	// imagecount++;
9169	9990
9170		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9991	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
9171	9992
9172	9993	if (!BOXMODE)
9173	9994	{
9174		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9995	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
9175	9996	}
9176	9997
9177	9998	if (!BOXMODE)
..	..	@@ -9209,7 +10030,7 @@
9209	10030	ABORTED = false;
9210	10031	}
9211	10032	else
9212		- GrafreeD.wav.cursor += 735 * ACSIZE;
	10033	+ Grafreed.wav.cursor += 735 * ACSIZE;
9213	10034
9214	10035	if (false)
9215	10036	{
..	..	@@ -9872,11 +10693,11 @@
9872	10693
9873	10694	public void display(GLAutoDrawable drawable)
9874	10695	{
9875		- if (GrafreeD.savesound && GrafreeD.hassound)
	10696	+ if (Grafreed.savesound && Grafreed.hassound)
9876	10697	{
9877		- GrafreeD.wav.save();
9878		- GrafreeD.savesound = false;
9879		- GrafreeD.hassound = false;
	10698	+ Grafreed.wav.save();
	10699	+ Grafreed.savesound = false;
	10700	+ Grafreed.hassound = false;
9880	10701	}
9881	10702	// if (DEBUG_SELECTION)
9882	10703	// {
..	..	@@ -9952,6 +10773,7 @@
9952	10773	ANTIALIAS = 0;
9953	10774	//System.out.println("RESTART");
9954	10775	AAtimer.restart();
	10776	+ Globals.TIMERRUNNING = true;
9955	10777	}
9956	10778	}
9957	10779	}
..	..	@@ -10006,7 +10828,7 @@
10006	10828	Object3D theobject = object;
10007	10829	Object3D theparent = object.parent;
10008	10830	object.parent = null;
10009		- object = (Object3D)GrafreeD.clone(object);
	10831	+ object = (Object3D)Grafreed.clone(object);
10010	10832	object.Stripify();
10011	10833	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10012	10834	theobject.PreprocessOcclusion(this);
..	..	@@ -10019,13 +10841,14 @@
10019	10841	ambientOcclusion = false;
10020	10842	}
10021	10843
10022		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10844	+ if (//Globals.lighttouched &&
	10845	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10023	10846	{
10024	10847	//if (RENDERSHADOW) // ?
10025	10848	if (!IsFrozen())
10026	10849	{
10027	10850	// dec 2012
10028		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10851	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10029	10852	{
10030	10853	Globals.framecount++;
10031	10854	shadowbuffer.display();
..	..	@@ -10038,7 +10861,7 @@
10038	10861
10039	10862	if (wait)
10040	10863	{
10041		- Sleep(500);
	10864	+ Sleep(200); // blocks everything
10042	10865
10043	10866	wait = false;
10044	10867	}
..	..	@@ -10152,8 +10975,8 @@
10152	10975
10153	10976	// if (parentcam != renderCamera) // not a light
10154	10977	if (cam != lightCamera)
10155		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10156		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10978	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10979	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10157	10980
10158	10981	for (int j = 0; j < 4; j++)
10159	10982	{
..	..	@@ -10167,8 +10990,8 @@
10167	10990
10168	10991	// if (parentcam != renderCamera) // not a light
10169	10992	if (cam != lightCamera)
10170		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10171		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10993	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10994	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10172	10995
10173	10996	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10174	10997
..	..	@@ -10254,13 +11077,43 @@
10254	11077	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10255	11078	}
10256	11079
10257		- if (newenvy > -1)
	11080	+// if (newenvy > -1)
	11081	+// {
	11082	+// LoadEnvy(newenvy);
	11083	+// }
	11084	+//
	11085	+// newenvy = -1;
	11086	+
	11087	+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
10258	11088	{
10259		- LoadEnvy(newenvy);
	11089	+ if (cubemaprgb == null)
	11090	+ {
	11091	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
	11092	+ }
	11093	+
	11094	+ cubemap = cubemaprgb;
10260	11095	}
10261		-
10262		- newenvy = -1;
10263		-
	11096	+ else
	11097	+ {
	11098	+ if (object.skyboxname != null)
	11099	+ {
	11100	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11101	+ {
	11102	+ if (cubemap != null && cubemap != cubemaprgb)
	11103	+ cubemap.dispose();
	11104	+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11105	+ loadedskyboxname = object.skyboxname;
	11106	+ }
	11107	+ }
	11108	+ else
	11109	+ {
	11110	+ cubemapcustom = null;
	11111	+ loadedskyboxname = null;
	11112	+ }
	11113	+
	11114	+ cubemap = cubemapcustom;
	11115	+ }
	11116	+
10264	11117	ratio = ((double) getWidth()) / getHeight();
10265	11118	//System.out.println("ratio = " + ratio);
10266	11119
..	..	@@ -10276,7 +11129,7 @@
10276	11129
10277	11130	if (!IsFrozen() && !ambientOcclusion)
10278	11131	{
10279		- DrawSkyBox(gl);
	11132	+ DrawSkyBox(gl, (float)ratio);
10280	11133	}
10281	11134
10282	11135	//if (selection_view == -1)
..	..	@@ -10427,7 +11280,16 @@
10427	11280	// Bump noise
10428	11281	gl.glActiveTexture(GL.GL_TEXTURE6);
10429	11282	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10430		- BindTexture(NOISE_TEXTURE, false, 2);
	11283	+
	11284	+ try
	11285	+ {
	11286	+ BindTexture(NOISE_TEXTURE, false, 2);
	11287	+ }
	11288	+ catch (Exception e)
	11289	+ {
	11290	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11291	+ }
	11292	+
10431	11293
10432	11294	gl.glActiveTexture(GL.GL_TEXTURE0);
10433	11295	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10450,9 +11312,9 @@
10450	11312
10451	11313	gl.glMatrixMode(GL.GL_MODELVIEW);
10452	11314
10453		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10454		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10455		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11315	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11316	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11317	+gl.glEnable(gl.GL_MULTISAMPLE);
10456	11318	} else
10457	11319	{
10458	11320	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10463,7 +11325,7 @@
10463	11325	//System.out.println("BLENDING ON");
10464	11326	gl.glEnable(GL.GL_BLEND);
10465	11327	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10466		-
	11328	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10467	11329	gl.glMatrixMode(gl.GL_PROJECTION);
10468	11330	gl.glLoadIdentity();
10469	11331
..	..	@@ -10552,8 +11414,8 @@
10552	11414	System.err.println("parentcam != renderCamera");
10553	11415
10554	11416	// if (cam != lightCamera)
10555		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10556		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11417	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11418	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
10557	11419	}
10558	11420
10559	11421	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10574,8 +11436,8 @@
10574	11436	if (true) // TODO
10575	11437	{
10576	11438	if (cam != lightCamera)
10577		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10578		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11439	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11440	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10579	11441	}
10580	11442
10581	11443	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -10712,7 +11574,7 @@
10712	11574	}
10713	11575	}
10714	11576
10715		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11577	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
10716	11578	{
10717	11579	//gl.glDepthFunc(GL.GL_LEQUAL);
10718	11580	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -10720,24 +11582,21 @@
10720	11582
10721	11583	boolean texon = textureon;
10722	11584
10723		- if (RENDERPROGRAM > 0)
10724		- {
10725		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
10726		- textureon = false;
10727		- }
	11585	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11586	+ textureon = false;
	11587	+
10728	11588	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
10729	11589	//System.out.println("ALLO");
10730	11590	gl.glColorMask(false, false, false, false);
10731	11591	DrawObject(gl);
10732		- if (RENDERPROGRAM > 0)
10733		- {
10734		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
10735		- textureon = texon;
10736		- }
	11592	+
	11593	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11594	+ textureon = texon;
	11595	+
10737	11596	gl.glColorMask(true, true, true, true);
10738	11597
10739	11598	gl.glDepthFunc(GL.GL_EQUAL);
10740		- //gl.glDepthMask(false);
	11599	+ gl.glDepthMask(false);
10741	11600	}
10742	11601
10743	11602	if (false) // DrawMode() == SHADOW)
..	..	@@ -10891,8 +11750,14 @@
10891	11750	{
10892	11751	renderpass++;
10893	11752	// System.out.println("Draw object... ");
	11753	+ STEP = 1;
10894	11754	if (FAST) // in case there is no script
10895		- STEP = 16;
	11755	+ STEP = 8;
	11756	+
	11757	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11758	+ {
	11759	+ STEP *= 4;
	11760	+ }
10896	11761
10897	11762	//object.FullInvariants();
10898	11763
..	..	@@ -10906,23 +11771,44 @@
10906	11771	e.printStackTrace();
10907	11772	}
10908	11773
10909		- if (GrafreeD.RENDERME > 0)
10910		- GrafreeD.RENDERME--; // mechante magouille
	11774	+ if (Grafreed.RENDERME > 0)
	11775	+ Grafreed.RENDERME--; // mechante magouille
10911	11776
10912	11777	Globals.ONESTEP = false;
10913	11778	}
10914	11779
10915	11780	static boolean zoomonce = false;
10916	11781
	11782	+ static void CreateSelectedPoint()
	11783	+ {
	11784	+ if (selectedpoint == null)
	11785	+ {
	11786	+ debugpointG = new Sphere();
	11787	+ debugpointP = new Sphere();
	11788	+ debugpointC = new Sphere();
	11789	+ debugpointR = new Sphere();
	11790	+
	11791	+ selectedpoint = new Superellipsoid();
	11792	+
	11793	+ for (int i=0; i<8; i++)
	11794	+ {
	11795	+ debugpoints[i] = new Sphere();
	11796	+ }
	11797	+ }
	11798	+ }
	11799	+
10917	11800	void DrawObject(GL gl, boolean draw)
10918	11801	{
	11802	+ // To clear camera values
	11803	+ ResetOptions();
	11804	+
10919	11805	//System.out.println("DRAW OBJECT " + mouseDown);
10920	11806	// DrawMode() = SELECTION;
10921	11807	//GL gl = getGL();
10922	11808	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
10923	11809	{
10924	11810	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
10925		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11811	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
10926	11812	pingthread.StepToTarget(true); // true);
10927	11813	// zoomonce = false;
10928	11814	}
..	..	@@ -10977,7 +11863,14 @@
10977	11863
10978	11864	usedtextures.clear();
10979	11865
10980		- BindTextures(DEFAULT_TEXTURES, 2);
	11866	+ try
	11867	+ {
	11868	+ BindTextures(DEFAULT_TEXTURES, 2);
	11869	+ }
	11870	+ catch (Exception e)
	11871	+ {
	11872	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11873	+ }
10981	11874	}
10982	11875	//System.out.println("--> " + stackdepth);
10983	11876	// GrafreeD.traceon();
..	..	@@ -10987,8 +11880,9 @@
10987	11880
10988	11881	if (DrawMode() == DEFAULT)
10989	11882	{
10990		- if (DEBUG)
	11883	+ if (Globals.DEBUG)
10991	11884	{
	11885	+ CreateSelectedPoint();
10992	11886	float radius = 0.05f;
10993	11887	if (selectedpoint.radius != radius)
10994	11888	{
..	..	@@ -11042,20 +11936,32 @@
11042	11936	ReleaseTextures(DEFAULT_TEXTURES);
11043	11937
11044	11938	if (CLEANCACHE)
11045		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11939	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11046	11940	{
11047		- String tex = e.nextElement();
	11941	+ cTexture tex = e.nextElement();
11048	11942
11049	11943	// System.out.println("Texture --------- " + tex);
11050	11944
11051		- if (tex.equals("WHITE_NOISE"))
	11945	+ if (tex.equals("WHITE_NOISE:"))
11052	11946	continue;
11053	11947
11054		- if (!usedtextures.containsKey(tex))
	11948	+ if (!usedtextures.contains(tex))
11055	11949	{
	11950	+ CacheTexture gettex = texturepigment.get(tex);
11056	11951	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11057		- textures.get(tex).texture.dispose();
11058		- textures.remove(tex);
	11952	+ if (gettex != null)
	11953	+ {
	11954	+ gettex.texture.dispose();
	11955	+ texturepigment.remove(tex);
	11956	+ }
	11957	+
	11958	+ gettex = texturebump.get(tex);
	11959	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11960	+ if (gettex != null)
	11961	+ {
	11962	+ gettex.texture.dispose();
	11963	+ texturebump.remove(tex);
	11964	+ }
11059	11965	}
11060	11966	}
11061	11967	}
..	..	@@ -11068,7 +11974,14 @@
11068	11974	if (checker != null && DrawMode() == DEFAULT)
11069	11975	{
11070	11976	//BindTexture(IMMORTAL_TEXTURE);
11071		- BindTextures(checker.GetTextures(), checker.texres);
	11977	+ try
	11978	+ {
	11979	+ BindTextures(checker.GetTextures(), checker.texres);
	11980	+ }
	11981	+ catch (Exception e)
	11982	+ {
	11983	+ System.err.println("FAILED: " + checker.GetTextures());
	11984	+ }
11072	11985	// NEAREST
11073	11986	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11074	11987	DrawChecker(gl);
..	..	@@ -11150,7 +12063,7 @@
11150	12063	return;
11151	12064	}
11152	12065
11153		- String string = obj.GetToolTip();
	12066	+ String string = obj.toString(); //.GetToolTip();
11154	12067
11155	12068	GL gl = GetGL();
11156	12069
..	..	@@ -11467,8 +12380,8 @@
11467	12380	//obj.TransformToWorld(light, light);
11468	12381	for (int i = tp.size(); --i >= 0;)
11469	12382	{
11470		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11471		- LA.xformPos(light, tp.get(i).toParent, light);
	12383	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12384	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11472	12385	}
11473	12386
11474	12387
..	..	@@ -11485,8 +12398,8 @@
11485	12398	parentcam = cameras[0];
11486	12399	}
11487	12400
11488		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11489		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12401	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12402	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11490	12403
11491	12404	LA.xformPos(light, renderCamera.toScreen, light);
11492	12405
..	..	@@ -11576,8 +12489,76 @@
11576	12489
11577	12490	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
11578	12491
11579		- String program =
	12492	+ String programmin =
	12493	+ // Min shader
11580	12494	"!!ARBfp1.0\n" +
	12495	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12496	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12497	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12498	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12499	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12500	+ "PARAM light2cam0 = program.env[10];" +
	12501	+ "PARAM light2cam1 = program.env[11];" +
	12502	+ "PARAM light2cam2 = program.env[12];" +
	12503	+ "TEMP temp;" +
	12504	+ "TEMP light;" +
	12505	+ "TEMP ndotl;" +
	12506	+ "TEMP normal;" +
	12507	+ "TEMP depth;" +
	12508	+ "TEMP eye;" +
	12509	+ "TEMP pos;" +
	12510	+
	12511	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12512	+ Normalize("normal") +
	12513	+ "MOV light, state.light[0].position;" +
	12514	+ "DP3 ndotl.x, light, normal;" +
	12515	+
	12516	+ // shadow
	12517	+ "MOV pos, fragment.texcoord[1];" +
	12518	+ "MOV temp, pos;" +
	12519	+ ShadowTextureFetch("depth", "temp", "1") +
	12520	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12521	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12522	+
	12523	+ // No shadow when out of frustum
	12524	+ //"SGE temp.y, depth.z, zero123.y;" +
	12525	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12526	+
	12527	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12528	+
	12529	+ // Backlit
	12530	+ "MOV pos.w, zero123.y;" +
	12531	+ "DP4 eye.x, pos, light2cam0;" +
	12532	+ "DP4 eye.y, pos, light2cam1;" +
	12533	+ "DP4 eye.z, pos, light2cam2;" +
	12534	+ Normalize("eye") +
	12535	+
	12536	+ "DP3 ndotl.y, -eye, normal;" +
	12537	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12538	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12539	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12540	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12541	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12542	+
	12543	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12544	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12545	+
	12546	+ // Pigment
	12547	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12548	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12549	+ "MUL temp, temp, ndotl.x;" +
	12550	+
	12551	+ "MUL temp, temp, zero123.z;" +
	12552	+
	12553	+ //"MUL temp, temp, ndotl.y;" +
	12554	+
	12555	+ "MOV temp.w, zero123.y;" + // reset alpha
	12556	+ "MOV result.color, temp;" +
	12557	+ "END";
	12558	+
	12559	+ String programmax =
	12560	+ "!!ARBfp1.0\n" +
	12561	+
11581	12562	//"OPTION ARB_fragment_program_shadow;" +
11582	12563	"PARAM light2cam0 = program.env[10];" +
11583	12564	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -11692,8 +12673,7 @@
11692	12673	"TEMP shininess;" +
11693	12674	"\n" +
11694	12675	"MOV texSamp, one;" +
11695		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
11696		-
	12676	+
11697	12677	"MOV mapgrid.x, one2048th.x;" +
11698	12678	"MOV temp, fragment.texcoord[1];" +
11699	12679	/*
..	..	@@ -11714,20 +12694,20 @@
11714	12694	"MUL temp, floor, mapgrid.x;" +
11715	12695	//"TEX depth0, temp, texture[1], 2D;" +
11716	12696	(((mode & FP_SOFTSHADOW) == 0) ? "" :
11717		- TextureFetch("depth0", "temp", "1") +
	12697	+ ShadowTextureFetch("depth0", "temp", "1") +
11718	12698	"") +
11719	12699	"ADD temp.x, temp.x, mapgrid.x;" +
11720	12700	//"TEX depth1, temp, texture[1], 2D;" +
11721	12701	(((mode & FP_SOFTSHADOW) == 0) ? "" :
11722		- TextureFetch("depth1", "temp", "1") +
	12702	+ ShadowTextureFetch("depth1", "temp", "1") +
11723	12703	"") +
11724	12704	"ADD temp.y, temp.y, mapgrid.x;" +
11725	12705	//"TEX depth2, temp, texture[1], 2D;" +
11726		- TextureFetch("depth2", "temp", "1") +
	12706	+ ShadowTextureFetch("depth2", "temp", "1") +
11727	12707	"SUB temp.x, temp.x, mapgrid.x;" +
11728	12708	//"TEX depth3, temp, texture[1], 2D;" +
11729	12709	(((mode & FP_SOFTSHADOW) == 0) ? "" :
11730		- TextureFetch("depth3", "temp", "1") +
	12710	+ ShadowTextureFetch("depth3", "temp", "1") +
11731	12711	"") +
11732	12712	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
11733	12713	//"MOV params, material;" +
..	..	@@ -12098,10 +13078,10 @@
12098	13078	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12099	13079	"") +
12100	13080
12101		- // display shadow only (bump == 0)
	13081	+ // display shadow only (fakedepth == 0)
12102	13082	"SUB temp.x, half.x, shadow.x;" +
12103		- "MOV temp.y, -params6.x;" +
12104		- "SLT temp.z, temp.y, zero.x;" +
	13083	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	13084	+ "SLT temp.z, temp.y, -c256i.x;" +
12105	13085	"SUB temp.y, one.x, temp.z;" +
12106	13086	"MUL temp.x, temp.x, temp.y;" +
12107	13087	"KIL temp.x;" +
..	..	@@ -12230,8 +13210,10 @@
12230	13210	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12231	13211
12232	13212	"SUB temp.x, one.x, ndotl.x;" +
12233		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
12234		- "ADD temp.y, one.y, options2.y;" + // sursurface
	13213	+ // Tuning for default skin
	13214	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	13215	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	13216	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12235	13217	"MUL temp.x, temp.x, temp.y;" +
12236	13218
12237	13219	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12430,8 +13412,19 @@
12430	13412	//once = true;
12431	13413	}
12432	13414
12433		- System.out.print("Program #" + mode + "; length = " + program.length());
12434		- System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13415	+ String program = programmax;
	13416	+
	13417	+ if (Globals.MINSHADER)
	13418	+ {
	13419	+ program = programmin;
	13420	+ }
	13421	+
	13422	+ if (Globals.DEBUG)
	13423	+ {
	13424	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
	13425	+ System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13426	+ }
	13427	+
12435	13428	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12436	13429
12437	13430	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -12478,7 +13471,8 @@
12478	13471	"\n" +
12479	13472	"END\n";
12480	13473
12481		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13474	+ if (Globals.DEBUG)
	13475	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
12482	13476	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12483	13477
12484	13478	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -12523,25 +13517,26 @@
12523	13517	return out;
12524	13518	}
12525	13519
12526		- String TextureFetch(String dest, String src, String unit)
	13520	+ // Also does frustum culling
	13521	+ String ShadowTextureFetch(String dest, String src, String unit)
12527	13522	{
12528	13523	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12529	13524	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12530	13525	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13526	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13527	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12531	13528	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12532		- "SLT " + src + ".z, " + src + ".x, one.x;" +
12533		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12534		- "SLT " + src + ".z, " + src + ".y, one.x;" +
12535		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13529	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13530	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12536	13531	//"SWZ buffer, temp, w,w,w,w;";
12537		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13532	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12538	13533	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12539	13534	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12540	13535	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12541		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13536	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12542	13537
12543		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12544		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13538	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13539	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12545	13540	}
12546	13541
12547	13542	String Shadow(String depth, String shadow)
..	..	@@ -12563,12 +13558,16 @@
12563	13558
12564	13559	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12565	13560	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13561	+
	13562	+ // Compare fragment depth in light space with shadowmap.
12566	13563	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12567	13564	"SGE temp.y, temp.x, zero.x;" +
12568		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13565	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13566	+
	13567	+ // Reverse comparison
12569	13568	"SUB temp.x, one.x, temp.x;" +
12570	13569	"MUL " + shadow + ".x, temp.x, temp.y;" +
12571		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13570	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12572	13571	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12573	13572
12574	13573	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12582,6 +13581,10 @@
12582	13581	// No shadow for backface
12583	13582	"DP3 temp.x, normal, lightd;" +
12584	13583	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13584	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13585	+
	13586	+ // No shadow when out of frustum
	13587	+ "SGE temp.x, " + depth + ".z, one.z;" +
12585	13588	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12586	13589	"";
12587	13590	}
..	..	@@ -12728,7 +13731,8 @@
12728	13731	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
12729	13732	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
12730	13733	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
12731		- Object3D.cVector2[] vector2buffer;
	13734	+
	13735	+ //Object3D.cVector2[] vector2buffer;
12732	13736
12733	13737	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
12734	13738	// OUT : diff, spec
..	..	@@ -12744,9 +13748,10 @@
12744	13748	"DP3 " + dest + ".z," + "normals," + "eye;" +
12745	13749	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
12746	13750	//"MOV " + dest + ".w," + "normal.z;" +
12747		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
12748		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
12749		- //"MOV " + dest + ".z," + "params2.w;" +
	13751	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13752	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13753	+
	13754	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
12750	13755	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
12751	13756	"RCP " + dest + ".w," + dest + ".w;" +
12752	13757	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13140,7 +14145,7 @@
13140	14145	public void mousePressed(MouseEvent e)
13141	14146	{
13142	14147	//System.out.println("mousePressed: " + e);
13143		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	14148	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13144	14149	}
13145	14150
13146	14151	static long prevtime = 0;
..	..	@@ -13167,6 +14172,7 @@
13167	14172
13168	14173	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
13169	14174
	14175	+ if (BUTTONLESSWHEEL)
13170	14176	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
13171	14177	{
13172	14178	return;
..	..	@@ -13175,7 +14181,7 @@
13175	14181	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13176	14182
13177	14183	// TIMER
13178		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	14184	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13179	14185	{
13180	14186	keepboxmode = BOXMODE;
13181	14187	keepsupport = SUPPORT;
..	..	@@ -13215,8 +14221,8 @@
13215	14221	// mode \|= META;
13216	14222	//}
13217	14223
13218		- SetMouseMode(WHEEL \| e.getModifiersEx());
13219		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	14224	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	14225	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13220	14226	anchorX = ax;
13221	14227	anchorY = ay;
13222	14228	prevX = px;
..	..	@@ -13250,6 +14256,7 @@
13250	14256	else
13251	14257	if (evt.getSource() == AAtimer)
13252	14258	{
	14259	+ Globals.TIMERRUNNING = false;
13253	14260	if (mouseDown)
13254	14261	{
13255	14262	//new Exception().printStackTrace();
..	..	@@ -13275,6 +14282,10 @@
13275	14282	// LIVE = waslive;
13276	14283	// wasliveok = true;
13277	14284	// waslive = false;
	14285	+
	14286	+ // May 2019 Forget it:
	14287	+ if (true)
	14288	+ return;
13278	14289
13279	14290	// source == timer
13280	14291	if (mouseDown)
..	..	@@ -13305,7 +14316,7 @@
13305	14316
13306	14317	// fev 2014???
13307	14318	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13308		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14319	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13309	14320	pingthread.StepToTarget(true); // true);
13310	14321	}
13311	14322	// if (!LIVE)
..	..	@@ -13314,12 +14325,13 @@
13314	14325
13315	14326	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13316	14327
13317		- void clickStart(int x, int y, int modifiers)
	14328	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13318	14329	{
13319	14330	if (!wasliveok)
13320	14331	return;
13321	14332
13322	14333	AAtimer.restart(); //
	14334	+ Globals.TIMERRUNNING = true;
13323	14335
13324	14336	// waslive = LIVE;
13325	14337	// LIVE = false;
..	..	@@ -13331,7 +14343,7 @@
13331	14343	// touched = true; // main DL
13332	14344	if (isRenderer)
13333	14345	{
13334		- SetMouseMode(modifiers);
	14346	+ SetMouseMode(modifiers, modifiersex);
13335	14347	}
13336	14348
13337	14349	selectX = anchorX = x;
..	..	@@ -13344,7 +14356,7 @@
13344	14356	clicked = true;
13345	14357	hold = false;
13346	14358
13347		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14359	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13348	14360	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13349	14361	{
13350	14362	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13369,14 +14381,15 @@
13369	14381	drag = false;
13370	14382	//System.out.println("Mouse DOWN");
13371	14383	editObj = false;
13372		- ClickInfo info = new ClickInfo();
13373		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13374		- info.pane = this;
13375		- info.camera = renderCamera;
13376		- info.x = x;
13377		- info.y = y;
13378		- info.modifiers = modifiers;
13379		- editObj = object.doEditClick(info, 0);
	14384	+ //ClickInfo info = new ClickInfo();
	14385	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14386	+ object.clickInfo.pane = this;
	14387	+ object.clickInfo.camera = renderCamera;
	14388	+ object.clickInfo.x = x;
	14389	+ object.clickInfo.y = y;
	14390	+ object.clickInfo.modifiers = modifiersex;
	14391	+ editObj = object.doEditClick(//info,
	14392	+ 0);
13380	14393	if (!editObj)
13381	14394	{
13382	14395	hasMarquee = true;
..	..	@@ -13392,11 +14405,14 @@
13392	14405
13393	14406	public void mouseDragged(MouseEvent e)
13394	14407	{
	14408	+ Globals.MOUSEDRAGGED = true;
	14409	+
	14410	+ //System.out.println("mouseDragged: " + e);
13395	14411	if (isRenderer)
13396	14412	movingcamera = true;
	14413	+
13397	14414	//if (drawing)
13398	14415	//return;
13399		- //System.out.println("mouseDragged: " + e);
13400	14416	if ((e.getModifiersEx() & CTRL) != 0
13401	14417	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
13402	14418	{
..	..	@@ -13404,7 +14420,7 @@
13404	14420	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13405	14421	}
13406	14422	else
13407		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14423	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13408	14424
13409	14425	//try { Thread.sleep(1); } catch (Exception ex) {}
13410	14426	}
..	..	@@ -13577,6 +14593,7 @@
13577	14593
13578	14594	public void run()
13579	14595	{
	14596	+ new Exception().printStackTrace();
13580	14597	System.exit(0);
13581	14598	for (;;)
13582	14599	{
..	..	@@ -13640,7 +14657,7 @@
13640	14657	{
13641	14658	Globals.lighttouched = true;
13642	14659	}
13643		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14660	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
13644	14661	}
13645	14662	//else
13646	14663	}
..	..	@@ -13654,12 +14671,18 @@
13654	14671	void GoDown(int mod)
13655	14672	{
13656	14673	MODIFIERS \|= COMMAND;
13657		- /*
	14674	+ boolean isVR = (mouseMode&VR)!=0;
	14675	+ /**/
13658	14676	if((mod&SHIFT) == SHIFT)
13659		- manipCamera.RotatePosition(0, -speed);
	14677	+ {
	14678	+ if (isVR)
	14679	+ manipCamera.RotateInterest(0, -speed);
	14680	+ else
	14681	+ manipCamera.RotatePosition(0, -speed);
	14682	+ }
13660	14683	else
13661		- manipCamera.BackForth(0, -speed*delta, getWidth());
13662		- */
	14684	+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
	14685	+ /**/
13663	14686	if ((mod & SHIFT) == SHIFT)
13664	14687	{
13665	14688	mouseMode = mouseMode; // VR??
..	..	@@ -13668,6 +14691,8 @@
13668	14691	mouseMode \|= BACKFORTH;
13669	14692	}
13670	14693
	14694	+ targetLookAt.set(manipCamera.lookAt);
	14695	+
13671	14696	//prevX = X = anchorX;
13672	14697	prevY = Y = anchorY - (int) (renderCamera.Distance());
13673	14698	}
..	..	@@ -13675,12 +14700,19 @@
13675	14700	void GoUp(int mod)
13676	14701	{
13677	14702	MODIFIERS \|= COMMAND;
13678		- /*
	14703	+ /**/
	14704	+ boolean isVR = (mouseMode&VR)!=0;
	14705	+
13679	14706	if((mod&SHIFT) == SHIFT)
13680		- manipCamera.RotatePosition(0, speed);
	14707	+ {
	14708	+ if (isVR)
	14709	+ manipCamera.RotateInterest(0, speed);
	14710	+ else
	14711	+ manipCamera.RotatePosition(0, speed);
	14712	+ }
13681	14713	else
13682		- manipCamera.BackForth(0, speed*delta, getWidth());
13683		- */
	14714	+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
	14715	+ /**/
13684	14716	if ((mod & SHIFT) == SHIFT)
13685	14717	{
13686	14718	mouseMode = mouseMode;
..	..	@@ -13689,6 +14721,8 @@
13689	14721	mouseMode \|= BACKFORTH;
13690	14722	}
13691	14723
	14724	+ targetLookAt.set(manipCamera.lookAt);
	14725	+
13692	14726	//prevX = X = anchorX;
13693	14727	prevY = Y = anchorY + (int) (renderCamera.Distance());
13694	14728	}
..	..	@@ -13696,12 +14730,17 @@
13696	14730	void GoLeft(int mod)
13697	14731	{
13698	14732	MODIFIERS \|= COMMAND;
13699		- /*
	14733	+ /**/
13700	14734	if((mod&SHIFT) == SHIFT)
13701		- manipCamera.RotatePosition(speed, 0);
	14735	+ manipCamera.Translate(speed*delta, 0, getWidth());
13702	14736	else
13703		- manipCamera.Translate(speed*delta, 0, getWidth());
13704		- */
	14737	+ {
	14738	+ if ((mouseMode&VR)!=0)
	14739	+ manipCamera.RotateInterest(-speed, 0);
	14740	+ else
	14741	+ manipCamera.RotatePosition(speed, 0);
	14742	+ }
	14743	+ /**/
13705	14744	if ((mod & SHIFT) == SHIFT)
13706	14745	{
13707	14746	mouseMode = mouseMode;
..	..	@@ -13710,6 +14749,8 @@
13710	14749	mouseMode \|= ROTATE;
13711	14750	} // TRANSLATE;
13712	14751
	14752	+ targetLookAt.set(manipCamera.lookAt);
	14753	+
13713	14754	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
13714	14755	prevY = Y = anchorY;
13715	14756	}
..	..	@@ -13717,12 +14758,18 @@
13717	14758	void GoRight(int mod)
13718	14759	{
13719	14760	MODIFIERS \|= COMMAND;
13720		- /*
	14761	+ /**/
13721	14762	if((mod&SHIFT) == SHIFT)
13722		- manipCamera.RotatePosition(-speed, 0);
	14763	+ manipCamera.Translate(-speed*delta, 0, getWidth());
13723	14764	else
13724		- manipCamera.Translate(-speed*delta, 0, getWidth());
13725		- */
	14765	+ {
	14766	+ if ((mouseMode&VR)!=0)
	14767	+ manipCamera.RotateInterest(speed, 0);
	14768	+ else
	14769	+ manipCamera.RotatePosition(-speed, 0);
	14770	+ }
	14771	+
	14772	+ /**/
13726	14773	if ((mod & SHIFT) == SHIFT)
13727	14774	{
13728	14775	mouseMode = mouseMode;
..	..	@@ -13731,6 +14778,8 @@
13731	14778	mouseMode \|= ROTATE;
13732	14779	} // TRANSLATE;
13733	14780
	14781	+ targetLookAt.set(manipCamera.lookAt);
	14782	+
13734	14783	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
13735	14784	prevY = Y = anchorY;
13736	14785	}
..	..	@@ -13740,7 +14789,7 @@
13740	14789	int X, Y;
13741	14790	boolean SX, SY;
13742	14791
13743		- void drag(int x, int y, int modifiers)
	14792	+ void drag(int x, int y, int modifiers, int modifiersex)
13744	14793	{
13745	14794	if (IsFrozen())
13746	14795	{
..	..	@@ -13749,17 +14798,17 @@
13749	14798
13750	14799	drag = true; // NEW
13751	14800
13752		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14801	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
13753	14802
13754	14803	X = x;
13755	14804	Y = y;
13756	14805	// floating state for animation
13757		- MODIFIERS = modifiers;
13758		- modifiers &= ~1024;
	14806	+ MODIFIERS = modifiersex;
	14807	+ modifiersex &= ~1024;
13759	14808	if (false) // modifiers != 0)
13760	14809	{
13761	14810	//new Exception().printStackTrace();
13762		- System.out.println("mouseDragged: " + modifiers);
	14811	+ System.out.println("mouseDragged: " + modifiersex);
13763	14812	System.out.println("SHIFT = " + SHIFT);
13764	14813	System.out.println("CONTROL = " + COMMAND);
13765	14814	System.out.println("META = " + META);
..	..	@@ -13772,14 +14821,16 @@
13772	14821	if (editObj)
13773	14822	{
13774	14823	drag = true;
13775		- ClickInfo info = new ClickInfo();
13776		- info.bounds.setBounds(0, 0,
	14824	+ //ClickInfo info = new ClickInfo();
	14825	+ object.clickInfo.bounds.setBounds(0, 0,
13777	14826	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13778		- info.pane = this;
13779		- info.camera = renderCamera;
13780		- info.x = x;
13781		- info.y = y;
13782		- object.editWindow.copy.doEditDrag(info);
	14827	+ object.clickInfo.pane = this;
	14828	+ object.clickInfo.camera = renderCamera;
	14829	+ object.clickInfo.x = x;
	14830	+ object.clickInfo.y = y;
	14831	+ object //.GetWindow().copy
	14832	+ .doEditDrag(//info,
	14833	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
13783	14834	} else
13784	14835	{
13785	14836	if (x < startX)
..	..	@@ -13928,23 +14979,27 @@
13928	14979	}
13929	14980	}
13930	14981
	14982	+// ClickInfo clickInfo = new ClickInfo();
	14983	+
13931	14984	public void mouseMoved(MouseEvent e)
13932	14985	{
13933	14986	//System.out.println("mouseMoved: " + e);
13934		-
13935	14987	if (isRenderer)
13936	14988	return;
13937	14989
13938		- ClickInfo ci = new ClickInfo();
13939		- ci.x = e.getX();
13940		- ci.y = e.getY();
13941		- ci.modifiers = e.getModifiersEx();
13942		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13943		- ci.pane = this;
13944		- ci.camera = renderCamera;
	14990	+ // Mouse cursor feedback
	14991	+ object.clickInfo.x = e.getX();
	14992	+ object.clickInfo.y = e.getY();
	14993	+ object.clickInfo.modifiers = e.getModifiersEx();
	14994	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14995	+ object.clickInfo.pane = this;
	14996	+ object.clickInfo.camera = renderCamera;
13945	14997	if (!isRenderer)
13946	14998	{
13947		- if (object.editWindow.copy.doEditClick(ci, 0))
	14999	+ //ObjEditor editWindow = object.editWindow;
	15000	+ //Object3D copy = editWindow.copy;
	15001	+ if (object.doEditClick(//clickInfo,
	15002	+ 0))
13948	15003	{
13949	15004	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
13950	15005	} else
..	..	@@ -13956,7 +15011,11 @@
13956	15011
13957	15012	public void mouseReleased(MouseEvent e)
13958	15013	{
	15014	+ Globals.MOUSEDRAGGED = false;
	15015	+
13959	15016	movingcamera = false;
	15017	+ X = 0; // getBounds().width/2;
	15018	+ Y = 0; // getBounds().height/2;
13960	15019	//System.out.println("mouseReleased: " + e);
13961	15020	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13962	15021	}
..	..	@@ -13979,9 +15038,9 @@
13979	15038	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
13980	15039	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
13981	15040
13982		- if (control \|\| command \|\| IsFrozen())
	15041	+// No delay if (control \|\| command \|\| IsFrozen())
13983	15042	timeout = true;
13984		- else
	15043	+// ?? May 2019 else
13985	15044	// timer.setDelay((modifiers & 128) != 0?0:350);
13986	15045	mouseDown = false;
13987	15046	if (!control && !command) // june 2013
..	..	@@ -14091,7 +15150,7 @@
14091	15150	System.out.println("keyReleased: " + e);
14092	15151	}
14093	15152
14094		- void SetMouseMode(int modifiers)
	15153	+ void SetMouseMode(int modifiers, int modifiersex)
14095	15154	{
14096	15155	//System.out.println("SetMouseMode = " + modifiers);
14097	15156	//modifiers &= ~1024;
..	..	@@ -14103,25 +15162,25 @@
14103	15162	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14104	15163	// return;
14105	15164	//System.out.println("SetMode = " + modifiers);
14106		- if ((modifiers & WHEEL) == WHEEL)
	15165	+ if ((modifiersex & WHEEL) == WHEEL)
14107	15166	{
14108	15167	mouseMode \|= ZOOM;
14109	15168	}
14110	15169
14111	15170	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14112		- if (capsLocked \|\| (modifiers & META) == META)
	15171	+ if (capsLocked) // \|\| (modifiers & META) == META)
14113	15172	{
14114	15173	mouseMode \|= VR; // BACKFORTH;
14115	15174	}
14116		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	15175	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14117	15176	{
14118	15177	mouseMode \|= SELECT;
14119	15178	}
14120		- if ((modifiers & COMMAND) == COMMAND)
	15179	+ if ((modifiersex & COMMAND) == COMMAND)
14121	15180	{
14122	15181	mouseMode \|= SELECT;
14123	15182	}
14124		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	15183	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14125	15184	{
14126	15185	mouseMode &= ~VR;
14127	15186	mouseMode \|= TRANSLATE;
..	..	@@ -14150,10 +15209,10 @@
14150	15209
14151	15210	if (isRenderer) //
14152	15211	{
14153		- SetMouseMode(modifiers);
	15212	+ SetMouseMode(0, modifiers);
14154	15213	}
14155	15214
14156		- theRenderer.keyPressed(key);
	15215	+ Globals.theRenderer.keyPressed(key);
14157	15216	}
14158	15217
14159	15218	int kompactbit = 4; // power bit
..	..	@@ -14165,7 +15224,7 @@
14165	15224	float SATPOW = 1; // 2; // 0.5f;
14166	15225	float BRIPOW = 1; // 0.5f; // 0.5f;
14167	15226
14168		- void keyPressed(int key)
	15227	+ public void keyPressed(int key)
14169	15228	{
14170	15229	if (key >= '0' && key <= '5')
14171	15230	clampbit = (key-'0');
..	..	@@ -14212,7 +15271,8 @@
14212	15271	// break;
14213	15272	case 'T':
14214	15273	CACHETEXTURE ^= true;
14215		- textures.clear();
	15274	+ texturepigment.clear();
	15275	+ texturebump.clear();
14216	15276	// repaint();
14217	15277	break;
14218	15278	case 'Y':
..	..	@@ -14297,7 +15357,9 @@
14297	15357	case 'E' : COMPACT ^= true;
14298	15358	repaint();
14299	15359	break;
14300		- case 'W' : DEBUGHSB ^= true;
	15360	+ case 'W' : // Wide Window (fullscreen)
	15361	+ //DEBUGHSB ^= true;
	15362	+ ObjEditor.theFrame.ToggleFullScreen();
14301	15363	repaint();
14302	15364	break;
14303	15365	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14322,8 +15384,8 @@
14322	15384	RevertCamera();
14323	15385	repaint();
14324	15386	break;
14325		- case 'L':
14326	15387	case 'l':
	15388	+ //case 'L':
14327	15389	if (lightMode)
14328	15390	{
14329	15391	lightMode = false;
..	..	@@ -14387,20 +15449,24 @@
14387	15449	OCCLUSION_CULLING ^= true;
14388	15450	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14389	15451	break;
14390		- case '0': envyoff ^= true; repaint(); break;
	15452	+ //case '0': envyoff ^= true; repaint(); break;
14391	15453	case '1':
14392	15454	case '2':
14393	15455	case '3':
14394	15456	case '4':
14395	15457	case '5':
14396		- newenvy = Character.getNumericValue(key);
14397		- repaint();
14398		- break;
14399	15458	case '6':
14400	15459	case '7':
14401	15460	case '8':
14402	15461	case '9':
14403		- BGcolor = (key - '6')/3.f;
	15462	+ if (true) // envyoff)
	15463	+ {
	15464	+ BGcolor = (key - '1')/8.f;
	15465	+ }
	15466	+ else
	15467	+ {
	15468	+ //newenvy = Character.getNumericValue(key);
	15469	+ }
14404	15470	repaint();
14405	15471	break;
14406	15472	case '!':
..	..	@@ -14466,9 +15532,9 @@
14466	15532	case '_':
14467	15533	kompactbit = 5;
14468	15534	break;
14469		- case '+':
14470		- kompactbit = 6;
14471		- break;
	15535	+// case '+':
	15536	+// kompactbit = 6;
	15537	+// break;
14472	15538	case ' ':
14473	15539	lightMode ^= true;
14474	15540	Globals.lighttouched = true;
..	..	@@ -14480,13 +15546,14 @@
14480	15546	case ESC:
14481	15547	RENDERPROGRAM += 1;
14482	15548	RENDERPROGRAM %= 3;
	15549	+
14483	15550	repaint();
14484	15551	break;
14485	15552	case 'Z':
14486	15553	//RESIZETEXTURE ^= true;
14487	15554	//break;
14488	15555	case 'z':
14489		- RENDERSHADOW ^= true;
	15556	+ Globals.RENDERSHADOW ^= true;
14490	15557	Globals.lighttouched = true;
14491	15558	repaint();
14492	15559	break;
..	..	@@ -14519,8 +15586,9 @@
14519	15586	case DELETE:
14520	15587	ClearSelection();
14521	15588	break;
14522		- /*
14523	15589	case '+':
	15590	+
	15591	+ /*
14524	15592	//fontsize += 1;
14525	15593	bbzoom *= 2;
14526	15594	repaint();
..	..	@@ -14537,17 +15605,17 @@
14537	15605	case '=':
14538	15606	IncDepth();
14539	15607	//fontsize += 1;
14540		- object.editWindow.refreshContents(true);
	15608	+ object.GetWindow().refreshContents(true);
14541	15609	maskbit = 6;
14542	15610	break;
14543	15611	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14544	15612	DecDepth();
14545	15613	maskbit = 5;
14546	15614	//if(fontsize > 1) fontsize -= 1;
14547		- if (object.editWindow == null)
14548		- new Exception().printStackTrace();
14549		- else
14550		- object.editWindow.refreshContents(true);
	15615	+// if (object.editWindow == null)
	15616	+// new Exception().printStackTrace();
	15617	+// else
	15618	+ object.GetWindow().refreshContents(true);
14551	15619	break;
14552	15620	case '{':
14553	15621	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14602,6 +15670,7 @@
14602	15670	}
14603	15671	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
14604	15672	}
	15673	+
14605	15674	static double OCCLUSIONBOOST = 1; // 0.5;
14606	15675
14607	15676	void keyReleased(int key, int modifiers)
..	..	@@ -14609,11 +15678,11 @@
14609	15678	//mode = ROTATE;
14610	15679	if ((MODIFIERS & COMMAND) == 0) // VR??
14611	15680	{
14612		- SetMouseMode(modifiers);
	15681	+ SetMouseMode(0, modifiers);
14613	15682	}
14614	15683	}
14615	15684
14616		- protected void processKeyEvent(KeyEvent e)
	15685	+ public void processKeyEvent(KeyEvent e)
14617	15686	{
14618	15687	switch (e.getID())
14619	15688	{
..	..	@@ -14743,8 +15812,9 @@
14743	15812
14744	15813	protected void processMouseMotionEvent(MouseEvent e)
14745	15814	{
14746		- //System.out.println("processMouseMotionEvent: " + mouseMode);
14747		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15815	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15816	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15817	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
14748	15818	{
14749	15819	mouseMoved(e);
14750	15820	} else
..	..	@@ -14769,11 +15839,12 @@
14769	15839	}
14770	15840	*/
14771	15841
14772		- object.editWindow.EditSelection();
	15842	+ object.GetWindow().EditSelection(false);
14773	15843	}
14774	15844
14775	15845	void SelectParent()
14776	15846	{
	15847	+ new Exception().printStackTrace();
14777	15848	System.exit(0);
14778	15849	Composite group = (Composite) object;
14779	15850	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -14785,10 +15856,10 @@
14785	15856	{
14786	15857	//selectees.remove(i);
14787	15858	System.out.println("select parent of " + elem);
14788		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15859	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
14789	15860	} else
14790	15861	{
14791		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15862	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
14792	15863	}
14793	15864
14794	15865	first = false;
..	..	@@ -14797,6 +15868,7 @@
14797	15868
14798	15869	void SelectChildren()
14799	15870	{
	15871	+ new Exception().printStackTrace();
14800	15872	System.exit(0);
14801	15873	/*
14802	15874	Composite group = (Composite) object;
..	..	@@ -14829,12 +15901,12 @@
14829	15901	for (int j = 0; j < group.children.size(); j++)
14830	15902	{
14831	15903	elem = (Object3D) group.children.elementAt(j);
14832		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15904	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
14833	15905	first = false;
14834	15906	}
14835	15907	} else
14836	15908	{
14837		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15909	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
14838	15910	}
14839	15911
14840	15912	first = false;
..	..	@@ -14845,21 +15917,21 @@
14845	15917	{
14846	15918	//Composite group = (Composite) object;
14847	15919	Object3D group = object;
14848		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15920	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
14849	15921	}
14850	15922
14851	15923	void ResetTransform(int mask)
14852	15924	{
14853	15925	//Composite group = (Composite) object;
14854	15926	Object3D group = object;
14855		- group.editWindow.ResetTransform(mask);
	15927	+ group.GetWindow().ResetTransform(mask);
14856	15928	}
14857	15929
14858	15930	void FlipTransform()
14859	15931	{
14860	15932	//Composite group = (Composite) object;
14861	15933	Object3D group = object;
14862		- group.editWindow.FlipTransform();
	15934	+ group.GetWindow().FlipTransform();
14863	15935	// group.editWindow.ReduceMesh(true);
14864	15936	}
14865	15937
..	..	@@ -14867,7 +15939,7 @@
14867	15939	{
14868	15940	//Composite group = (Composite) object;
14869	15941	Object3D group = object;
14870		- group.editWindow.PrintMemory();
	15942	+ group.GetWindow().PrintMemory();
14871	15943	// group.editWindow.ReduceMesh(true);
14872	15944	}
14873	15945
..	..	@@ -14875,7 +15947,7 @@
14875	15947	{
14876	15948	//Composite group = (Composite) object;
14877	15949	Object3D group = object;
14878		- group.editWindow.ResetCentroid();
	15950	+ group.GetWindow().ResetCentroid();
14879	15951	}
14880	15952
14881	15953	void IncDepth()
..	..	@@ -14957,11 +16029,11 @@
14957	16029
14958	16030	int width = getBounds().width;
14959	16031	int height = getBounds().height;
14960		- ClickInfo info = new ClickInfo();
14961		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
14962	16032	//Image img = CreateImage(width, height);
14963	16033	//System.out.println("width = " + width + "; height = " + height + "\n");
	16034	+
14964	16035	Graphics gr = g; // img.getGraphics();
	16036	+
14965	16037	if (!hasMarquee)
14966	16038	{
14967	16039	if (Xmin < Xmax) // !locked)
..	..	@@ -15033,44 +16105,92 @@
15033	16105	}
15034	16106	if (object != null && !hasMarquee)
15035	16107	{
	16108	+ if (object.clickInfo == null)
	16109	+ object.clickInfo = new ClickInfo();
	16110	+ ClickInfo info = object.clickInfo;
	16111	+ //ClickInfo info = new ClickInfo();
	16112	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16113	+
15036	16114	if (isRenderer)
15037	16115	{
15038		- info.flags++;
	16116	+ object.clickInfo.flags++;
15039	16117	double frameAspect = (double) width / (double) height;
15040	16118	if (frameAspect > renderCamera.aspect)
15041	16119	{
15042	16120	int desired = (int) ((double) height * renderCamera.aspect);
15043		- info.bounds.width -= width - desired;
15044		- info.bounds.x += (width - desired) / 2;
	16121	+ object.clickInfo.bounds.width -= width - desired;
	16122	+ object.clickInfo.bounds.x += (width - desired) / 2;
15045	16123	} else
15046	16124	{
15047	16125	int desired = (int) ((double) width / renderCamera.aspect);
15048		- info.bounds.height -= height - desired;
15049		- info.bounds.y += (height - desired) / 2;
	16126	+ object.clickInfo.bounds.height -= height - desired;
	16127	+ object.clickInfo.bounds.y += (height - desired) / 2;
15050	16128	}
15051	16129	}
15052		- info.g = gr;
15053		- info.camera = renderCamera;
	16130	+
	16131	+ object.clickInfo.g = gr;
	16132	+ object.clickInfo.camera = renderCamera;
15054	16133	/*
15055	16134	// Memory intensive (brep.verticescopy)
15056	16135	if (!(object instanceof Composite))
15057	16136	object.draw(info, 0, false); // SLOW :
15058	16137	*/
15059		- if (!isRenderer)
	16138	+ if (!isRenderer) // && drag)
15060	16139	{
15061		- object.drawEditHandles(info, 0);
	16140	+ Grafreed.Assert(object != null);
	16141	+ Grafreed.Assert(object.selection != null);
	16142	+ if (object.selection.Size() > 0)
	16143	+ {
	16144	+ int hitSomething = object.selection.get(0).hitSomething;
	16145	+
	16146	+ object.clickInfo.DX = 0;
	16147	+ object.clickInfo.DY = 0;
	16148	+ object.clickInfo.W = 1;
	16149	+ if (hitSomething == Object3D.hitCenter)
	16150	+ {
	16151	+ info.DX = X;
	16152	+ if (X != 0)
	16153	+ info.DX -= info.bounds.width/2;
	16154	+
	16155	+ info.DY = Y;
	16156	+ if (Y != 0)
	16157	+ info.DY -= info.bounds.height/2;
	16158	+ }
	16159	+
	16160	+ object.drawEditHandles(//info,
	16161	+ 0);
	16162	+
	16163	+ if (drag && (X != 0 \|\| Y != 0))
	16164	+ {
	16165	+ switch (hitSomething)
	16166	+ {
	16167	+ case Object3D.hitCenter: gr.setColor(Color.white);
	16168	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16169	+ break;
	16170	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16171	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16172	+ break;
	16173	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16174	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16175	+ break;
	16176	+ }
	16177	+
	16178	+ }
	16179	+ }
15062	16180	}
15063	16181	}
	16182	+
15064	16183	if (isRenderer)
15065	16184	{
15066	16185	//gr.setColor(Color.black);
15067	16186	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15068	16187	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15069	16188	}
	16189	+
15070	16190	if (hasMarquee)
15071	16191	{
15072	16192	gr.setXORMode(Color.white);
15073		- gr.setColor(Color.red);
	16193	+ gr.setColor(Color.white);
15074	16194	if (!firstime)
15075	16195	{
15076	16196	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -15179,6 +16299,7 @@
15179	16299	public boolean mouseDown(Event evt, int x, int y)
15180	16300	{
15181	16301	System.out.println("mouseDown: " + evt);
	16302	+ System.exit(0);
15182	16303	/*
15183	16304	locked = true;
15184	16305	drag = false;
..	..	@@ -15222,7 +16343,7 @@
15222	16343	{
15223	16344	keyPressed(0, modifiers);
15224	16345	}
15225		- clickStart(x, y, modifiers);
	16346	+ // clickStart(x, y, modifiers);
15226	16347	return true;
15227	16348	}
15228	16349
..	..	@@ -15340,7 +16461,7 @@
15340	16461	{
15341	16462	keyReleased(0, 0);
15342	16463	}
15343		- drag(x, y, modifiers);
	16464	+ drag(x, y, 0, modifiers);
15344	16465	return true;
15345	16466	}
15346	16467
..	..	@@ -15472,7 +16593,7 @@
15472	16593	Object3D object;
15473	16594	static Object3D trackedobject;
15474	16595	Camera renderCamera; // Light or Eye (or Occlusion)
15475		- /static/ Camera manipCamera; // Light or Eye
	16596	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15476	16597	/static/ Camera eyeCamera;
15477	16598	/static/ Camera lightCamera;
15478	16599	int cameracount;
..	..	@@ -15536,6 +16657,8 @@
15536	16657	private /static/ boolean firstime;
15537	16658	private /static/ cVector newView = new cVector();
15538	16659	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16660	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16661	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
15539	16662	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
15540	16663	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
15541	16664	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -15548,29 +16671,67 @@
15548	16671	{
15549	16672	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
15550	16673
	16674	+ int usedsuf = 0;
	16675	+
15551	16676	for (int i = 0; i < suffixes.length; i++)
15552	16677	{
15553		- String resourceName = basename + suffixes[i] + "." + suffix;
15554		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
15555		- mipmapped,
15556		- FileUtil.getFileSuffix(resourceName));
15557		- if (data == null)
	16678	+ String[] suffixe = suffixes;
	16679	+ String[] fallback = suffixes2;
	16680	+ String[] fallfallback = suffixes3;
	16681	+
	16682	+ for (int c=usedsuf; --c>=0;)
15558	16683	{
15559		- throw new IOException("Unable to load texture " + resourceName);
	16684	+// String[] temp = suffixe;
	16685	+// suffixe = fallback;
	16686	+// fallback = fallfallback;
	16687	+// fallfallback = temp;
15560	16688	}
	16689	+
	16690	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16691	+ TextureData data;
	16692	+
	16693	+ try
	16694	+ {
	16695	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16696	+ mipmapped,
	16697	+ FileUtil.getFileSuffix(resourceName));
	16698	+ }
	16699	+ catch (Exception e)
	16700	+ {
	16701	+ try
	16702	+ {
	16703	+ resourceName = basename + fallback[i] + "." + suffix;
	16704	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16705	+ mipmapped,
	16706	+ FileUtil.getFileSuffix(resourceName));
	16707	+ }
	16708	+ catch (Exception e2)
	16709	+ {
	16710	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16711	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16712	+ mipmapped,
	16713	+ FileUtil.getFileSuffix(resourceName));
	16714	+ }
	16715	+ }
	16716	+
15561	16717	//System.out.println("Target = " + targets[i]);
15562	16718	cubemap.updateImage(data, targets[i]);
15563	16719	}
15564	16720
15565	16721	return cubemap;
15566	16722	}
	16723	+
15567	16724	int bigsphere = -1;
15568	16725
15569	16726	float BGcolor = 0.5f;
15570	16727
15571		- private void DrawSkyBox(GL gl)
	16728	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16729	+
	16730	+ private void DrawSkyBox(GL gl, float ratio)
15572	16731	{
15573		- if (envyoff \|\| cubemap == null)
	16732	+ if (//envyoff \|\|
	16733	+ WIREFRAME \|\|
	16734	+ cubemap == null)
15574	16735	{
15575	16736	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
15576	16737	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -15585,7 +16746,17 @@
15585	16746	// Compensates for ExaminerViewer's modification of modelview matrix
15586	16747	gl.glMatrixMode(GL.GL_MODELVIEW);
15587	16748	gl.glLoadIdentity();
	16749	+ gl.glScalef(1,ratio,1);
15588	16750
	16751	+// colorV[0] = 2;
	16752	+// colorV[1] = 2;
	16753	+// colorV[2] = 2;
	16754	+// colorV[3] = 1;
	16755	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16756	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16757	+//
	16758	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16759	+
15589	16760	//gl.glActiveTexture(GL.GL_TEXTURE1);
15590	16761	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
15591	16762
..	..	@@ -15617,6 +16788,7 @@
15617	16788	{
15618	16789	gl.glScalef(1.0f, -1.0f, 1.0f);
15619	16790	}
	16791	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
15620	16792	gl.glMultMatrixd(viewrot_1, 0);
15621	16793	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
15622	16794	//viewer.updateInverseRotation(gl);
..	..	@@ -15657,7 +16829,8 @@
15657	16829	gl.glDisable(GL.GL_TEXTURE_GEN_R);
15658	16830
15659	16831	cubemap.disable();
15660		- ////cubemap.unbind();
	16832	+ //cubemap.dispose();
	16833	+
15661	16834	if (CULLFACE)
15662	16835	{
15663	16836	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -15757,16 +16930,16 @@
15757	16930	cStatic.objectstack[materialdepth++] = checker;
15758	16931	//System.out.println("material " + material);
15759	16932	//Applet3D.tracein(this, selected);
15760		- vector2buffer = checker.projectedVertices;
	16933	+ //vector2buffer = checker.projectedVertices;
15761	16934
15762	16935	//checker.GetMaterial().Draw(this, false); // true);
15763		- DrawMaterial(checker.GetMaterial(), false); // true);
	16936	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
15764	16937
15765	16938	materialdepth -= 1;
15766	16939	if (materialdepth > 0)
15767	16940	{
15768		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
15769		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16941	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16942	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
15770	16943	}
15771	16944	//checker.GetMaterial().opacity = 1f;
15772	16945	////checker.GetMaterial().ambient = 1f;
..	..	@@ -15852,6 +17025,14 @@
15852	17025	}
15853	17026	}
15854	17027
	17028	+ private Object3D GetFolder()
	17029	+ {
	17030	+ Object3D folder = object.GetWindow().copy;
	17031	+ if (object.GetWindow().copy.selection.Size() > 0)
	17032	+ folder = object.GetWindow().copy.selection.elementAt(0);
	17033	+ return folder;
	17034	+ }
	17035	+
15855	17036	class SelectBuffer implements GLEventListener
15856	17037	{
15857	17038
..	..	@@ -15867,7 +17048,7 @@
15867	17048	//new Exception().printStackTrace();
15868	17049	System.out.println("select buffer init");
15869	17050	// Use debug pipeline
15870		- drawable.setGL(new DebugGL(drawable.getGL()));
	17051	+ //drawable.setGL(new DebugGL(drawable.getGL()));
15871	17052
15872	17053	GL gl = drawable.getGL();
15873	17054
..	..	@@ -15910,6 +17091,7 @@
15910	17091	{
15911	17092	if (!selection)
15912	17093	{
	17094	+ new Exception().printStackTrace();
15913	17095	System.exit(0);
15914	17096	return;
15915	17097	}
..	..	@@ -15930,6 +17112,17 @@
15930	17112
15931	17113	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
15932	17114
	17115	+ if (PAINTMODE)
	17116	+ {
	17117	+ if (object.GetWindow().copy.selection.Size() > 0)
	17118	+ {
	17119	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17120	+
	17121	+ // Make what you paint not selectable.
	17122	+ paintobj.ResetSelectable();
	17123	+ }
	17124	+ }
	17125	+
15933	17126	//int tmp = selection_view;
15934	17127	//selection_view = -1;
15935	17128	int temp = DrawMode();
..	..	@@ -15941,6 +17134,17 @@
15941	17134	// temp = DEFAULT; // patch for selection debug
15942	17135	Globals.drawMode = temp; // WARNING
15943	17136
	17137	+ if (PAINTMODE)
	17138	+ {
	17139	+ if (object.GetWindow().copy.selection.Size() > 0)
	17140	+ {
	17141	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17142	+
	17143	+ // Revert.
	17144	+ paintobj.RestoreSelectable();
	17145	+ }
	17146	+ }
	17147	+
15944	17148	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
15945	17149
15946	17150	// trying different ways of getting the depth info over
..	..	@@ -15988,6 +17192,8 @@
15988	17192	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
15989	17193	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
15990	17194	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17195	+
	17196	+ CreateSelectedPoint();
15991	17197
15992	17198	// Will fit the mesh !!!
15993	17199	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16037,34 +17243,36 @@
16037	17243	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]));
16038	17244	}
16039	17245
16040		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	17246	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16041	17247	}
16042	17248	}
16043	17249
16044	17250	if (!movingcamera && !PAINTMODE)
16045		- object.editWindow.ScreenFitPoint(); // fev 2014
	17251	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16046	17252
16047		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17253	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16048	17254	{
16049		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17255	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16050	17256
16051		- Object3D group = new Object3D("inst" + paintcount++);
	17257	+ if (object.GetWindow().copy.selection.Size() > 0)
	17258	+ {
	17259	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16052	17260
16053		- group.CreateMaterial(); // use a void leaf to select instances
16054		-
16055		- group.add(paintobj); // link
16056		-
16057		- object.editWindow.SnapObject(group);
16058		-
16059		- Object3D folder = object.editWindow.copy;
16060		-
16061		- if (object.editWindow.copy.selection.Size() > 0)
16062		- folder = object.editWindow.copy.selection.elementAt(0);
16063		-
16064		- folder.add(group);
16065		-
16066		- object.editWindow.ResetModel();
16067		- object.editWindow.refreshContents();
	17261	+ Object3D inst = new Object3D("inst" + paintcount++);
	17262	+
	17263	+ inst.CreateMaterial(); // use a void leaf to select instances
	17264	+
	17265	+ inst.add(paintobj); // link
	17266	+
	17267	+ object.GetWindow().SnapObject(inst);
	17268	+
	17269	+ Object3D folder = paintFolder; // GetFolder();
	17270	+
	17271	+ folder.add(inst);
	17272	+
	17273	+ object.GetWindow().ResetModel();
	17274	+ object.GetWindow().refreshContents();
	17275	+ }
16068	17276	}
16069	17277	else
16070	17278	paintcount = 0;
..	..	@@ -16103,6 +17311,11 @@
16103	17311	//System.out.println("objects[color] = " + objects[color]);
16104	17312	//objects[color].Select();
16105	17313	indexcount = 0;
	17314	+ ObjEditor window = object.GetWindow();
	17315	+ if (window != null && deselect)
	17316	+ {
	17317	+ window.Select(null, deselect, true);
	17318	+ }
16106	17319	object.Select(color, deselect);
16107	17320	}
16108	17321
..	..	@@ -16153,6 +17366,7 @@
16153	17366
16154	17367	public void init(GLAutoDrawable drawable)
16155	17368	{
	17369	+ if (Globals.DEBUG)
16156	17370	System.out.println("shadow buffer init");
16157	17371
16158	17372	GL gl = drawable.getGL();
..	..	@@ -16202,7 +17416,7 @@
16202	17416	gl.glDisable(gl.GL_CULL_FACE);
16203	17417	}
16204	17418
16205		- if (!RENDERSHADOW)
	17419	+ if (!Globals.RENDERSHADOW)
16206	17420	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16207	17421
16208	17422	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16212,7 +17426,7 @@
16212	17426	//gl.glColorMask(false, false, false, false);
16213	17427
16214	17428	//render_scene_from_light_view(gl, drawable, 0, 0);
16215		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17429	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16216	17430	{
16217	17431	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16218	17432
..	..	@@ -16381,10 +17595,14 @@
16381	17595	gl.glFlush();
16382	17596
16383	17597	/**/
16384		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
	17598	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
16385	17599
16386		- float[] pixels = occlusionsizebuffer.array();
	17600	+ float[] depths = occlusiondepthbuffer.array();
16387	17601
	17602	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
	17603	+
	17604	+ int[] pixels = selectsizebuffer.array();
	17605	+
16388	17606	double r = 0, g = 0, b = 0;
16389	17607
16390	17608	double count = 0;
..	..	@@ -16395,7 +17613,7 @@
16395	17613
16396	17614	double FACTOR = 1;
16397	17615
16398		- for (int i = 0; i < pixels.length; i++)
	17616	+ for (int i = 0; i < depths.length; i++)
16399	17617	{
16400	17618	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
16401	17619	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -16478,7 +17696,7 @@
16478	17696
16479	17697	double scale = ray.z; // 1; // cos
16480	17698
16481		- float depth = pixels[newindex];
	17699	+ float depth = depths[newindex];
16482	17700
16483	17701	/*
16484	17702	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -16628,23 +17846,15 @@
16628	17846	int AAbuffersize = 0;
16629	17847
16630	17848	//double[] selectedpoint = new double[3];
16631		- static Superellipsoid selectedpoint = new Superellipsoid();
	17849	+ static Superellipsoid selectedpoint;
16632	17850	static Sphere previousselectedpoint = null;
16633		- static Sphere debugpointG = new Sphere();
16634		- static Sphere debugpointP = new Sphere();
16635		- static Sphere debugpointC = new Sphere();
16636		- static Sphere debugpointR = new Sphere();
	17851	+ static Sphere debugpointG;
	17852	+ static Sphere debugpointP;
	17853	+ static Sphere debugpointC;
	17854	+ static Sphere debugpointR;
16637	17855
16638	17856	static Sphere debugpoints[] = new Sphere[8];
16639	17857
16640		- static
16641		- {
16642		- for (int i=0; i<8; i++)
16643		- {
16644		- debugpoints[i] = new Sphere();
16645		- }
16646		- }
16647		-
16648	17858	static void InitPoints(float radius)
16649	17859	{
16650	17860	for (int i=0; i<8; i++)
..	..	@@ -16683,11 +17893,14 @@
16683	17893	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
16684	17894	static IntBuffer bigAAbuffer;
16685	17895	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
16686		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	17896	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
16687	17897	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
16688	17898	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
16689	17899	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
16690		- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17900	+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17901	+
	17902	+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17903	+
16691	17904	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
16692	17905	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
16693	17906	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();
..	..	@@ -16696,10 +17909,11 @@
16696	17909	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
16697	17910	// Depth buffer format
16698	17911	//private int depth_format;
16699		- static public void NextIndex(Object3D o, GL gl)
	17912	+
	17913	+ public void NextIndex()
16700	17914	{
16701	17915	indexcount+=16;
16702		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17916	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
16703	17917	//objects[indexcount] = o;
16704	17918	//System.out.println("indexcount = " + indexcount);
16705	17919	}