~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
..	..	@@ -128,7 +168,7 @@
128	168
129	169
130	170	// OPTIONS
131		- boolean Skinshader = true;
	171	+ boolean Skinshader = false; // true;
132	172	boolean cameraLight = false;
133	173	boolean UVdebug = false;
134	174	boolean Udebug = false;
..	..	@@ -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
..	..	@@ -148,6 +188,21 @@
148	188	defaultcaps.setAccumGreenBits(16);
149	189	defaultcaps.setAccumBlueBits(16);
150	190	defaultcaps.setAccumAlphaBits(16);
	191	+ }
	192	+
	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	+ }
151	206	}
152	207
153	208	void SetAsGLRenderer(boolean b)
..	..	@@ -168,7 +223,8 @@
168	223
169	224	SetCamera(cam);
170	225
171		- SetLight(new Camera(new cVector(10, 10, -20)));
	226	+ // Warning: not used.
	227	+ SetLight(new Camera(new cVector(15, 10, -20)));
172	228
173	229	object = o;
174	230
..	..	@@ -191,9 +247,43 @@
191	247
192	248	/// INTERFACE
193	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	+
194	279	public boolean IsBoxMode()
195	280	{
196	281	return BOXMODE;
	282	+ }
	283	+
	284	+ public boolean IsZoomBoxMode()
	285	+ {
	286	+ return ZOOMBOXMODE;
197	287	}
198	288
199	289	public void ClearDepth()
..	..	@@ -291,7 +381,7 @@
291	381	cStatic.objectstack[materialdepth++] = obj;
292	382	//System.out.println("material " + material);
293	383	//Applet3D.tracein(this, selected);
294		- display.vector2buffer = obj.projectedVertices;
	384	+ //display.vector2buffer = obj.projectedVertices;
295	385	if (obj instanceof Camera)
296	386	{
297	387	display.options1[0] = material.shift;
..	..	@@ -300,14 +390,28 @@
300	390	display.options1[2] = material.shadowbias;
301	391	display.options1[3] = material.aniso;
302	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]);
303	398	display.options2[0] = material.opacity;
304	399	display.options2[1] = material.diffuse;
305	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]);
306	404
307	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]);
308	409	display.options4[0] = material.cameralight/0.2f;
309	410	display.options4[1] = material.subsurface;
310	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]);
311	415
312	416	// if (display.CURRENTANTIALIAS > 0)
313	417	// display.options3[3] /= 4;
..	..	@@ -323,7 +427,7 @@
323	427	/**/
324	428	} else
325	429	{
326		- DrawMaterial(material, selected);
	430	+ DrawMaterial(material, selected, obj.projectedVertices);
327	431	}
328	432	} else
329	433	{
..	..	@@ -347,8 +451,8 @@
347	451	cStatic.objectstack[materialdepth++] = obj;
348	452	//System.out.println("material " + material);
349	453	//Applet3D.tracein("selected ", selected);
350		- display.vector2buffer = obj.projectedVertices;
351		- display.DrawMaterial(material, selected);
	454	+ //display.vector2buffer = obj.projectedVertices;
	455	+ display.DrawMaterial(material, selected, obj.projectedVertices);
352	456	}
353	457	}
354	458
..	..	@@ -365,8 +469,8 @@
365	469	materialdepth -= 1;
366	470	if (materialdepth > 0)
367	471	{
368		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
369		- 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);
370	474	}
371	475	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
372	476	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -386,8 +490,8 @@
386	490	materialdepth -= 1;
387	491	if (materialdepth > 0)
388	492	{
389		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
390		- 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);
391	495	}
392	496	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
393	497	//else
..	..	@@ -428,10 +532,12 @@
428	532	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
429	533	{
430	534	//gl.glBegin(gl.GL_TRIANGLES);
431		- 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	+ ;
432	538	if (!hasnorm)
433	539	{
434		- // System.out.println("FUCK!!");
	540	+ // System.out.println("Mesh normal");
435	541	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
436	542	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
437	543	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -1059,8 +1165,345 @@
1059	1165	gl.glMatrixMode(gl.GL_MODELVIEW);
1060	1166	}
1061	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	+
1062	1476	/// INTERFACE
1063	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	+
1064	1507	void SetColor(Object3D obj, Vertex p0)
1065	1508	{
1066	1509	CameraPane display = this;
..	..	@@ -1128,8 +1571,6 @@
1128	1571	{
1129	1572	return;
1130	1573	}
1131		-
1132		- float[] colorV = new float[3];
1133	1574
1134	1575	if (false) // marked)
1135	1576	{
..	..	@@ -1238,7 +1679,7 @@
1238	1679	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
1239	1680	}
1240	1681
1241		- void DrawMaterial(cMaterial material, boolean selected)
	1682	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
1242	1683	{
1243	1684	CameraPane display = this;
1244	1685	//new Exception().printStackTrace();
..	..	@@ -1254,18 +1695,18 @@
1254	1695	//col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
1255	1696	if (!material.multiply)
1256	1697	{
1257		- display.color = color;
	1698	+ display.color = material.color;
1258	1699	display.saturation = material.modulation;
1259	1700	}
1260	1701	else
1261	1702	{
1262		- display.color = color2;
	1703	+ display.color = material.color2;
1263	1704	display.saturation = material.modulation2;
1264	1705	}
1265	1706
1266	1707	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
1267	1708
1268		- float[] colorV = GrafreeD.colorV;
	1709	+ float[] colorV = Grafreed.colorV;
1269	1710
1270	1711	/**/
1271	1712	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -1273,7 +1714,7 @@
1273	1714	colorV[0] = display.modelParams0[0] * material.diffuse;
1274	1715	colorV[1] = display.modelParams0[1] * material.diffuse;
1275	1716	colorV[2] = display.modelParams0[2] * material.diffuse;
1276		- colorV[3] = material.opacity;
	1717	+ colorV[3] = 1; // material.opacity;
1277	1718
1278	1719	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
1279	1720	//System.out.println("Opacity = " + opacity);
..	..	@@ -1381,9 +1822,9 @@
1381	1822	display.modelParams7[2] = 0;
1382	1823	display.modelParams7[3] = 0;
1383	1824
1384		- display.modelParams6[0] = 100; // criss de bug de bump
	1825	+ //display.modelParams6[0] = 100; // criss de bug de bump
1385	1826
1386		- Object3D.cVector2[] extparams = display.vector2buffer;
	1827	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
1387	1828	if (extparams != null && extparams.length > 0 && extparams[0] != null)
1388	1829	{
1389	1830	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1525,7 +1966,7 @@
1525	1966	void PushMatrix(double[][] matrix)
1526	1967	{
1527	1968	// GrafreeD.tracein(matrix);
1528		- PushMatrix(matrix,1);
	1969	+ PushMatrix(matrix, 1);
1529	1970	}
1530	1971
1531	1972	void PushMatrix()
..	..	@@ -1611,9 +2052,9 @@
1611	2052	switch(viewcode)
1612	2053	{
1613	2054	case 0: return "main";
1614		- case 1: return "one";
1615		- case 2: return "two";
1616		- case 3: return "three";
	2055	+ case 1: return "Red";
	2056	+ case 2: return "Green";
	2057	+ case 3: return "Blue";
1617	2058	case 4: return "light";
1618	2059	}
1619	2060
..	..	@@ -1679,7 +2120,7 @@
1679	2120	//System.err.println("Oeil on");
1680	2121	OEIL = true;
1681	2122	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
1682		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2123	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
1683	2124	//pingthread.StepToTarget(true);
1684	2125	}
1685	2126
..	..	@@ -1777,7 +2218,7 @@
1777	2218	System.err.println("LIVE = " + Globals.isLIVE());
1778	2219
1779	2220	if (!Globals.isLIVE()) // save sound
1780		- GrafreeD.savesound = true; // wav.save();
	2221	+ Grafreed.savesound = true; // wav.save();
1781	2222	// else
1782	2223	repaint(); // start loop // may 2013
1783	2224	}
..	..	@@ -1810,6 +2251,11 @@
1810	2251	public void ToggleBoxMode()
1811	2252	{
1812	2253	BOXMODE ^= true;
	2254	+ }
	2255	+
	2256	+ public void ToggleZoomBoxMode()
	2257	+ {
	2258	+ ZOOMBOXMODE ^= true;
1813	2259	}
1814	2260
1815	2261	public void ToggleSmoothFocus()
..	..	@@ -1889,7 +2335,7 @@
1889	2335
1890	2336	void ToggleDebug()
1891	2337	{
1892		- DEBUG ^= true;
	2338	+ Globals.DEBUG ^= true;
1893	2339	}
1894	2340
1895	2341	void ToggleLookAt()
..	..	@@ -1897,9 +2343,9 @@
1897	2343	LOOKAT ^= true;
1898	2344	}
1899	2345
1900		- void ToggleRandom()
	2346	+ void ToggleSwitch()
1901	2347	{
1902		- RANDOM ^= true;
	2348	+ SWITCH ^= true;
1903	2349	}
1904	2350
1905	2351	void ToggleHandles()
..	..	@@ -1907,10 +2353,17 @@
1907	2353	HANDLES ^= true;
1908	2354	}
1909	2355
	2356	+ Object3D paintFolder;
	2357	+
1910	2358	void TogglePaint()
1911	2359	{
1912	2360	PAINTMODE ^= true;
1913	2361	paintcount = 0;
	2362	+
	2363	+ if (PAINTMODE)
	2364	+ {
	2365	+ paintFolder = GetFolder();
	2366	+ }
1914	2367	}
1915	2368
1916	2369	void SwapCamera(int a, int b)
..	..	@@ -2006,7 +2459,22 @@
2006	2459	{
2007	2460	return currentGL;
2008	2461	}
2009		-
	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	+
2010	2478	/**/
2011	2479	class CacheTexture
2012	2480	{
..	..	@@ -2015,28 +2483,31 @@
2015	2483
2016	2484	int resolution;
2017	2485
2018		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2486	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
2019	2487	{
2020		- texture = tex;
	2488	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2489	+ texturedata = texdata;
2021	2490	resolution = res;
2022	2491	}
2023	2492	}
2024	2493	/**/
2025	2494
2026	2495	// TEXTURE static Texture texture;
2027		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
2028		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
2029		- 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	+
2030	2501	int pigmentdepth = 0;
2031	2502	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
2032	2503	int bumpdepth = 0;
2033	2504	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
2034	2505	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
2035	2506	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
2036		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2507	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
2037	2508	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
2038	2509
2039		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2510	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
2040	2511	{
2041	2512	TextureData texturedata = null;
2042	2513
..	..	@@ -2046,7 +2517,7 @@
2046	2517	com.sun.opengl.util.texture.TextureIO.newTextureData(
2047	2518	getClass().getClassLoader().getResourceAsStream(name),
2048	2519	true,
2049		- com.sun.opengl.util.texture.TextureIO.PNG);
	2520	+ GetFormat(name)); // com.sun.opengl.util.texture.TextureIO.PNG);
2050	2521	} catch (java.io.IOException e)
2051	2522	{
2052	2523	throw new javax.media.opengl.GLException(e);
..	..	@@ -2055,13 +2526,34 @@
2055	2526	if (bump)
2056	2527	texturedata = ConvertBump(texturedata, false);
2057	2528
2058		- com.sun.opengl.util.texture.Texture texture =
2059		- 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);
2060	2531
2061		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
2062		- 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);
2063	2534
2064		- 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;
2065	2557	}
2066	2558
2067	2559	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -3134,6 +3626,8 @@
3134	3626
3135	3627	System.out.println("LOADING TEXTURE : " + name);
3136	3628
	3629	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3630	+
3137	3631	//
3138	3632	if (false) // compressbit > 0)
3139	3633	{
..	..	@@ -3838,6 +4332,7 @@
3838	4332
3839	4333	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
3840	4334	{
	4335	+ new Exception().printStackTrace();
3841	4336	System.exit(0);
3842	4337	com.sun.opengl.util.texture.Texture texture = null;
3843	4338
..	..	@@ -7531,7 +8026,7 @@
7531	8026	String pigment = Object3D.GetPigment(tex);
7532	8027	String bump = Object3D.GetBump(tex);
7533	8028
7534		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8029	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7535	8030	{
7536	8031	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7537	8032	// System.out.println("; bump = " + bump);
..	..	@@ -7546,11 +8041,69 @@
7546	8041	pigment = null;
7547	8042	}
7548	8043
7549		- ReleaseTexture(bump, true);
7550		- ReleaseTexture(pigment, false);
	8044	+ ReleaseTexture(tex, true);
	8045	+ ReleaseTexture(tex, false);
7551	8046	}
7552	8047
7553		- 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)
7554	8107	{
7555	8108	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7556	8109	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7561,7 +8114,7 @@
7561	8114	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7562	8115
7563	8116	if (tex != null)
7564		- texture = textures.get(tex);
	8117	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7565	8118
7566	8119	// //assert( texture != null );
7567	8120	// if (texture == null)
..	..	@@ -7653,7 +8206,55 @@
7653	8206	}
7654	8207	}
7655	8208
7656		- /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
7657	8258	{
7658	8259	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7659	8260	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7664,17 +8265,47 @@
7664	8265	if (tex == null)
7665	8266	{
7666	8267	BindTexture(null,false,resolution);
7667		- BindTexture(null,true,resolution);
7668	8268	return;
7669	8269	}
7670	8270
7671	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	+
7672	8304	String bump = Object3D.GetBump(tex);
7673	8305
7674		- usedtextures.put(pigment, pigment);
7675		- usedtextures.put(bump, bump);
	8306	+ usedtextures.add(tex);
7676	8307
7677		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8308	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7678	8309	{
7679	8310	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
7680	8311	// System.out.println("; bump = " + bump);
..	..	@@ -7684,43 +8315,94 @@
7684	8315	{
7685	8316	bump = null;
7686	8317	}
7687		- if (pigment.equals(""))
7688		- {
7689		- pigment = null;
7690		- }
7691	8318
7692		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
7693		- BindTexture(pigment, false, resolution);
7694	8319	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
7695		- BindTexture(bump, true, resolution);
	8320	+ BindTexture(tex, true, resolution);
7696	8321	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
7697		-
7698		- return; // true;
7699	8322	}
7700	8323
7701		- 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)
7702	8327	{
7703		- 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;
7704	8347
7705	8348	if (tex != null)
7706	8349	{
7707		- String texname = tex;
	8350	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8351	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
7708	8352
7709		- String[] split = tex.split("Textures");
7710		- if (split.length > 1)
7711		- texname = "/Users/nbriere/Textures" + split[split.length-1];
7712		- else
7713		- if (!texname.startsWith("/"))
7714		- 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	+ }
7715	8370
7716	8371	if (CACHETEXTURE)
7717		- texture = textures.get(texname); // TEXTURE CACHE
7718		-
7719		- TextureData texturedata = null;
7720		-
7721		- if (texture == null \|\| texture.resolution < resolution)
7722	8372	{
7723		- 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(""))
7724	8406	{
7725	8407	assert(!bump);
7726	8408	// if (bump)
..	..	@@ -7731,19 +8413,23 @@
7731	8413	// }
7732	8414	// else
7733	8415	// {
7734		- texture = textures.get(tex);
7735		- if (texture == null)
	8416	+ // texturecache = textures.get(texname); // suspicious
	8417	+ if (texturecache == null)
7736	8418	{
7737		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8419	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
7738	8420	}
	8421	+ else
	8422	+ new Exception().printStackTrace();
7739	8423	// }
7740	8424	} else
7741		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8425	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
7742	8426	{
7743	8427	assert(bump);
7744		- texture = textures.get(tex);
7745		- if (texture == null)
7746		- 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();
7747	8433	} else
7748	8434	{
7749	8435	//if (tex.equals("IMMORTAL"))
..	..	@@ -7751,11 +8437,22 @@
7751	8437	// texture = GetResourceTexture("default.png");
7752	8438	//} else
7753	8439	//{
7754		- if (tex.equals("WHITE_NOISE"))
	8440	+ if (texname.endsWith("WHITE_NOISE"))
7755	8441	{
7756		- texture = textures.get(tex);
7757		- if (texture == null)
7758		- 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();
7759	8456	} else
7760	8457	{
7761	8458	if (textureon)
..	..	@@ -7780,7 +8477,7 @@
7780	8477	}
7781	8478
7782	8479	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
7783		- if (!new File(cachename).exists())
	8480	+ if (!FileExists(cachename))
7784	8481	cachename = texname;
7785	8482	else
7786	8483	processbump = false; // don't process bump map again
..	..	@@ -7802,7 +8499,7 @@
7802	8499	}
7803	8500
7804	8501	cachename = texname.substring(0, texname.length()-4)+ext+".png";
7805		- if (!new File(cachename).exists())
	8502	+ if (!FileExists(cachename))
7806	8503	cachename = texname;
7807	8504	else
7808	8505	processbump = false; // don't process bump map again
..	..	@@ -7811,20 +8508,23 @@
7811	8508	texturedata = GetFileTexture(cachename, processbump, resolution);
7812	8509
7813	8510
7814		- if (texturedata != null)
7815		- 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);
7816	8515	//texture = GetTexture(tex, bump);
7817	8516	}
	8517	+ }
7818	8518	}
7819	8519	//}
7820	8520	}
7821	8521
7822		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8522	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
7823	8523	{
7824	8524	//return false;
7825	8525
7826	8526	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
7827		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8527	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
7828	8528	{
7829	8529	// String ext = "_highres";
7830	8530	// if (REDUCETEXTURE)
..	..	@@ -7841,52 +8541,17 @@
7841	8541	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
7842	8542	if (!cachefile.exists())
7843	8543	{
7844		- // cache to disk
7845		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
7846		- //buffers[0].
7847		-
7848		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
7849		- int[] pixels = new int[bytebuf.capacity()/3];
7850		-
7851		- // squared size heuristic...
7852		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8544	+ //if (texturedata.getWidth() == texturedata.getHeight())
7853	8545	{
7854		- for (int i=pixels.length; --i>=0;)
7855		- {
7856		- int i3 = i*3;
7857		- pixels[i] = 0xFF;
7858		- pixels[i] <<= 8;
7859		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
7860		- pixels[i] <<= 8;
7861		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
7862		- pixels[i] <<= 8;
7863		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
7864		- }
7865		-
7866		- /*
7867		- int r=0,g=0,b=0,a=0;
7868		- for (int i=0; i<width; i++)
7869		- for (int j=0; j<height; j++)
7870		- {
7871		- int index = j*width+i;
7872		- int p = pixels[index];
7873		- a = ((p>>24) & 0xFF);
7874		- r = ((p>>16) & 0xFF);
7875		- g = ((p>>8) & 0xFF);
7876		- b = (p & 0xFF);
7877		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
7878		- }
7879		- /**/
7880		- int width = (int)Math.sqrt(pixels.length); // squared
7881		- int height = width;
7882		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
7883		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8546	+ BufferedImage rendImage = CreateBim(texturedata);
	8547	+
7884	8548	ImageWriter writer = null;
7885	8549	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
7886	8550	if (iter.hasNext()) {
7887	8551	writer = (ImageWriter)iter.next();
7888	8552	}
7889		- float compressionQuality = 0.9f;
	8553	+
	8554	+ float compressionQuality = 0.85f;
7890	8555	try
7891	8556	{
7892	8557	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -7903,18 +8568,20 @@
7903	8568	}
7904	8569	}
7905	8570	}
7906		-
	8571	+
	8572	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8573	+
7907	8574	//System.out.println("Texture = " + tex);
7908		- if (textures.containsKey(texname))
	8575	+ if (textures.containsKey(tex))
7909	8576	{
7910		- CacheTexture thetex = textures.get(texname);
	8577	+ CacheTexture thetex = textures.get(tex);
7911	8578	thetex.texture.disable();
7912	8579	thetex.texture.dispose();
7913		- textures.remove(texname);
	8580	+ textures.remove(tex);
7914	8581	}
7915	8582
7916		- texture.texturedata = texturedata;
7917		- textures.put(texname, texture);
	8583	+ //texture.texturedata = texturedata;
	8584	+ textures.put(tex, texturecache);
7918	8585
7919	8586	// newtex = true;
7920	8587	}
..	..	@@ -7930,10 +8597,44 @@
7930	8597	}
7931	8598	}
7932	8599
7933		- return texture;
	8600	+ return texturecache;
7934	8601	}
7935	8602
7936		- 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
7937	8638	{
7938	8639	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7939	8640
..	..	@@ -7951,21 +8652,21 @@
7951	8652	return texture!=null?texture.texture:null;
7952	8653	}
7953	8654
7954		- public 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
7955	8656	{
7956	8657	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7957	8658
7958	8659	return texture!=null?texture.texturedata:null;
7959	8660	}
7960	8661
7961		- boolean BindTexture(String tex, boolean bump, int resolution)
	8662	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
7962	8663	{
7963	8664	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
7964	8665	{
7965	8666	return false;
7966	8667	}
7967	8668
7968		- boolean newtex = false;
	8669	+ //boolean newtex = false;
7969	8670
7970	8671	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
7971	8672
..	..	@@ -7997,9 +8698,75 @@
7997	8698	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
7998	8699	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
7999	8700
8000		- return newtex;
	8701	+ return true; // Warning: not used.
8001	8702	}
8002	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	+
8003	8770	ShadowBuffer shadowPBuf;
8004	8771	AntialiasBuffer antialiasPBuf;
8005	8772	int MAXSTACK;
..	..	@@ -8016,10 +8783,12 @@
8016	8783
8017	8784	gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8018	8785	MAXSTACK = temp[0];
8019		- System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
	8786	+ if (Globals.DEBUG)
	8787	+ System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8020	8788	gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8021	8789	MAXSTACK = temp[0];
8022		- System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
	8790	+ if (Globals.DEBUG)
	8791	+ System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8023	8792
8024	8793	// Use debug pipeline
8025	8794	//drawable.setGL(new DebugGL(gl)); //
..	..	@@ -8027,7 +8796,8 @@
8027	8796	gl = drawable.getGL(); //
8028	8797
8029	8798	GL gl3 = getGL();
8030		- System.out.println("INIT GL IS: " + gl.getClass().getName());
	8799	+ if (Globals.DEBUG)
	8800	+ System.out.println("INIT GL IS: " + gl.getClass().getName());
8031	8801
8032	8802
8033	8803	//float pos[] = { 100, 100, 100, 0 };
..	..	@@ -8192,7 +8962,7 @@
8192	8962
8193	8963	if (cubemap == null)
8194	8964	{
8195		- LoadEnvy(5);
	8965	+ //LoadEnvy(1);
8196	8966	}
8197	8967
8198	8968	//cubemap.enable();
..	..	@@ -8468,6 +9238,8 @@
8468	9238
8469	9239	void LoadEnvy(int which)
8470	9240	{
	9241	+ assert(false);
	9242	+
8471	9243	String name;
8472	9244	String ext;
8473	9245
..	..	@@ -8479,37 +9251,58 @@
8479	9251	cubemap = null;
8480	9252	return;
8481	9253	case 1:
8482		- name = "cubemaps/box_";
8483		- ext = "png";
	9254	+ name = "cubemaps/rgb/";
	9255	+ ext = "jpg";
8484	9256	reverseUP = false;
8485	9257	break;
8486	9258	case 2:
8487		- name = "cubemaps/uffizi_";
8488		- ext = "png";
8489		- break; // reverseUP = true; break;
	9259	+ name = "cubemaps/uffizi/";
	9260	+ ext = "jpg";
	9261	+ reverseUP = false;
	9262	+ break;
8490	9263	case 3:
8491		- name = "cubemaps/CloudyHills_";
8492		- ext = "tga";
	9264	+ name = "cubemaps/CloudyHills/";
	9265	+ ext = "jpg";
8493	9266	reverseUP = false;
8494	9267	break;
8495	9268	case 4:
8496		- name = "cubemaps/cornell_";
	9269	+ name = "cubemaps/cornell/";
8497	9270	ext = "png";
8498	9271	reverseUP = false;
8499	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;
8500	9298	default:
8501		- name = "cubemaps/rgb_";
8502		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9299	+ name = "cubemaps/box/";
	9300	+ ext = "png"; /mipmap = true;/
	9301	+ reverseUP = false;
8503	9302	break;
8504	9303	}
8505		-
8506		- try
8507		- {
8508		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
8509		- } catch (IOException e)
8510		- {
8511		- throw new RuntimeException(e);
8512		- }
	9304	+
	9305	+ LoadSkybox(name, ext, mipmap);
8513	9306	}
8514	9307
8515	9308	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -8541,8 +9334,12 @@
8541	9334	static double[] model = new double[16];
8542	9335	double[] camera2light = new double[16];
8543	9336	double[] light2camera = new double[16];
8544		- int newenvy = -1;
8545		- boolean envyoff = true; // false;
	9337	+
	9338	+ //int newenvy = -1;
	9339	+ //boolean envyoff = false;
	9340	+
	9341	+ String loadedskyboxname;
	9342	+
8546	9343	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
8547	9344	//float[] light0 = { 0,0,0 };
8548	9345	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -8835,11 +9632,35 @@
8835	9632	jy8[3] = 0.5f;
8836	9633	}
8837	9634
8838		- 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
8839	9636	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
8840	9637	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
8841	9638	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
8842	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	+
8843	9664	static int imagecount = 0; // movie generation
8844	9665
8845	9666	static int jitter = 0;
..	..	@@ -8935,8 +9756,8 @@
8935	9756	assert (parentcam != renderCamera);
8936	9757
8937	9758	if (renderCamera != lightCamera)
8938		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8939		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9759	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9760	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
8940	9761
8941	9762	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
8942	9763
..	..	@@ -8951,8 +9772,8 @@
8951	9772	LA.matCopy(renderCamera.fromScreen, matrix);
8952	9773
8953	9774	if (renderCamera != lightCamera)
8954		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8955		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9775	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9776	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
8956	9777
8957	9778	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
8958	9779
..	..	@@ -8998,10 +9819,12 @@
8998	9819	rati = 1 / rati;
8999	9820	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
9000	9821	}
9001		- assert (newenvy == -1);
	9822	+
	9823	+ //assert (newenvy == -1);
	9824	+
9002	9825	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9003	9826	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9004		- DrawSkyBox(gl);
	9827	+ DrawSkyBox(gl, (float)rati);
9005	9828	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9006	9829	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9007	9830	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -9024,7 +9847,7 @@
9024	9847	//gl.glFlush();
9025	9848	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
9026	9849
9027		- if (ANIMATION && ABORTED)
	9850	+ if (Globals.ANIMATION && ABORTED)
9028	9851	{
9029	9852	System.err.println(" ABORTED FRAME");
9030	9853	break;
..	..	@@ -9054,7 +9877,7 @@
9054	9877	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
9055	9878
9056	9879	// save image
9057		- if (ANIMATION && !ABORTED)
	9880	+ if (Globals.ANIMATION && !ABORTED)
9058	9881	{
9059	9882	VPwidth = viewport[2];
9060	9883	VPheight = viewport[3];
..	..	@@ -9165,11 +9988,11 @@
9165	9988
9166	9989	// imagecount++;
9167	9990
9168		- 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;
9169	9992
9170	9993	if (!BOXMODE)
9171	9994	{
9172		- 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) + ")");
9173	9996	}
9174	9997
9175	9998	if (!BOXMODE)
..	..	@@ -9207,7 +10030,7 @@
9207	10030	ABORTED = false;
9208	10031	}
9209	10032	else
9210		- GrafreeD.wav.cursor += 735 * ACSIZE;
	10033	+ Grafreed.wav.cursor += 735 * ACSIZE;
9211	10034
9212	10035	if (false)
9213	10036	{
..	..	@@ -9867,14 +10690,23 @@
9867	10690	static boolean init = false;
9868	10691
9869	10692	double[][] matrix = LA.newMatrix();
	10693	+
	10694	+ // This is to refresh the UI of the material panel.
	10695	+ ObjEditor patchMaterial;
9870	10696
9871	10697	public void display(GLAutoDrawable drawable)
9872	10698	{
9873		- if (GrafreeD.savesound && GrafreeD.hassound)
	10699	+ if (patchMaterial.patchMaterial)
9874	10700	{
9875		- GrafreeD.wav.save();
9876		- GrafreeD.savesound = false;
9877		- GrafreeD.hassound = false;
	10701	+ patchMaterial.patchMaterial = false;
	10702	+ patchMaterial.objectPanel.setSelectedIndex(1);
	10703	+ }
	10704	+
	10705	+ if (Grafreed.savesound && Grafreed.hassound)
	10706	+ {
	10707	+ Grafreed.wav.save();
	10708	+ Grafreed.savesound = false;
	10709	+ Grafreed.hassound = false;
9878	10710	}
9879	10711	// if (DEBUG_SELECTION)
9880	10712	// {
..	..	@@ -9950,6 +10782,7 @@
9950	10782	ANTIALIAS = 0;
9951	10783	//System.out.println("RESTART");
9952	10784	AAtimer.restart();
	10785	+ Globals.TIMERRUNNING = true;
9953	10786	}
9954	10787	}
9955	10788	}
..	..	@@ -10004,7 +10837,7 @@
10004	10837	Object3D theobject = object;
10005	10838	Object3D theparent = object.parent;
10006	10839	object.parent = null;
10007		- object = (Object3D)GrafreeD.clone(object);
	10840	+ object = (Object3D)Grafreed.clone(object);
10008	10841	object.Stripify();
10009	10842	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
10010	10843	theobject.PreprocessOcclusion(this);
..	..	@@ -10017,13 +10850,14 @@
10017	10850	ambientOcclusion = false;
10018	10851	}
10019	10852
10020		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10853	+ if (//Globals.lighttouched &&
	10854	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
10021	10855	{
10022	10856	//if (RENDERSHADOW) // ?
10023	10857	if (!IsFrozen())
10024	10858	{
10025	10859	// dec 2012
10026		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10860	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
10027	10861	{
10028	10862	Globals.framecount++;
10029	10863	shadowbuffer.display();
..	..	@@ -10036,7 +10870,7 @@
10036	10870
10037	10871	if (wait)
10038	10872	{
10039		- Sleep(500);
	10873	+ Sleep(200); // blocks everything
10040	10874
10041	10875	wait = false;
10042	10876	}
..	..	@@ -10150,8 +10984,8 @@
10150	10984
10151	10985	// if (parentcam != renderCamera) // not a light
10152	10986	if (cam != lightCamera)
10153		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10154		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10987	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10988	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
10155	10989
10156	10990	for (int j = 0; j < 4; j++)
10157	10991	{
..	..	@@ -10165,8 +10999,8 @@
10165	10999
10166	11000	// if (parentcam != renderCamera) // not a light
10167	11001	if (cam != lightCamera)
10168		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10169		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	11002	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11003	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
10170	11004
10171	11005	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
10172	11006
..	..	@@ -10252,13 +11086,43 @@
10252	11086	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
10253	11087	}
10254	11088
10255		- if (newenvy > -1)
	11089	+// if (newenvy > -1)
	11090	+// {
	11091	+// LoadEnvy(newenvy);
	11092	+// }
	11093	+//
	11094	+// newenvy = -1;
	11095	+
	11096	+ if (transformMode) // object.skyboxname != null && object.skyboxname.equals("cubemaps/default-skyboxes/rgb"))
10256	11097	{
10257		- LoadEnvy(newenvy);
	11098	+ if (cubemaprgb == null)
	11099	+ {
	11100	+ cubemaprgb = LoadSkybox("cubemaps/default-skyboxes/rgb2" + "/", "jpg", false);
	11101	+ }
	11102	+
	11103	+ cubemap = cubemaprgb;
10258	11104	}
10259		-
10260		- newenvy = -1;
10261		-
	11105	+ else
	11106	+ {
	11107	+ if (object.skyboxname != null)
	11108	+ {
	11109	+ if (!object.skyboxname.equals(this.loadedskyboxname))
	11110	+ {
	11111	+ if (cubemap != null && cubemap != cubemaprgb)
	11112	+ cubemap.dispose();
	11113	+ cubemapcustom = LoadSkybox(object.skyboxname + "/", object.skyboxext, false);
	11114	+ loadedskyboxname = object.skyboxname;
	11115	+ }
	11116	+ }
	11117	+ else
	11118	+ {
	11119	+ cubemapcustom = null;
	11120	+ loadedskyboxname = null;
	11121	+ }
	11122	+
	11123	+ cubemap = cubemapcustom;
	11124	+ }
	11125	+
10262	11126	ratio = ((double) getWidth()) / getHeight();
10263	11127	//System.out.println("ratio = " + ratio);
10264	11128
..	..	@@ -10274,7 +11138,7 @@
10274	11138
10275	11139	if (!IsFrozen() && !ambientOcclusion)
10276	11140	{
10277		- DrawSkyBox(gl);
	11141	+ DrawSkyBox(gl, (float)ratio);
10278	11142	}
10279	11143
10280	11144	//if (selection_view == -1)
..	..	@@ -10425,7 +11289,16 @@
10425	11289	// Bump noise
10426	11290	gl.glActiveTexture(GL.GL_TEXTURE6);
10427	11291	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
10428		- BindTexture(NOISE_TEXTURE, false, 2);
	11292	+
	11293	+ try
	11294	+ {
	11295	+ BindTexture(NOISE_TEXTURE, false, 2);
	11296	+ }
	11297	+ catch (Exception e)
	11298	+ {
	11299	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11300	+ }
	11301	+
10429	11302
10430	11303	gl.glActiveTexture(GL.GL_TEXTURE0);
10431	11304	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -10448,9 +11321,9 @@
10448	11321
10449	11322	gl.glMatrixMode(GL.GL_MODELVIEW);
10450	11323
10451		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10452		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10453		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11324	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11325	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11326	+gl.glEnable(gl.GL_MULTISAMPLE);
10454	11327	} else
10455	11328	{
10456	11329	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -10461,7 +11334,7 @@
10461	11334	//System.out.println("BLENDING ON");
10462	11335	gl.glEnable(GL.GL_BLEND);
10463	11336	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
10464		-
	11337	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
10465	11338	gl.glMatrixMode(gl.GL_PROJECTION);
10466	11339	gl.glLoadIdentity();
10467	11340
..	..	@@ -10550,8 +11423,8 @@
10550	11423	System.err.println("parentcam != renderCamera");
10551	11424
10552	11425	// if (cam != lightCamera)
10553		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10554		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11426	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11427	+ LA.xformDir(lightposition, parentcam.GlobalTransformInv(), lightposition); // may 2013
10555	11428	}
10556	11429
10557	11430	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10572,8 +11445,8 @@
10572	11445	if (true) // TODO
10573	11446	{
10574	11447	if (cam != lightCamera)
10575		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10576		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11448	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11449	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10577	11450	}
10578	11451
10579	11452	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -10710,7 +11583,7 @@
10710	11583	}
10711	11584	}
10712	11585
10713		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11586	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
10714	11587	{
10715	11588	//gl.glDepthFunc(GL.GL_LEQUAL);
10716	11589	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -10718,24 +11591,21 @@
10718	11591
10719	11592	boolean texon = textureon;
10720	11593
10721		- if (RENDERPROGRAM > 0)
10722		- {
10723		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
10724		- textureon = false;
10725		- }
	11594	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11595	+ textureon = false;
	11596	+
10726	11597	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
10727	11598	//System.out.println("ALLO");
10728	11599	gl.glColorMask(false, false, false, false);
10729	11600	DrawObject(gl);
10730		- if (RENDERPROGRAM > 0)
10731		- {
10732		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
10733		- textureon = texon;
10734		- }
	11601	+
	11602	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11603	+ textureon = texon;
	11604	+
10735	11605	gl.glColorMask(true, true, true, true);
10736	11606
10737	11607	gl.glDepthFunc(GL.GL_EQUAL);
10738		- //gl.glDepthMask(false);
	11608	+ gl.glDepthMask(false);
10739	11609	}
10740	11610
10741	11611	if (false) // DrawMode() == SHADOW)
..	..	@@ -10889,8 +11759,14 @@
10889	11759	{
10890	11760	renderpass++;
10891	11761	// System.out.println("Draw object... ");
	11762	+ STEP = 1;
10892	11763	if (FAST) // in case there is no script
10893		- STEP = 16;
	11764	+ STEP = 8;
	11765	+
	11766	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11767	+ {
	11768	+ STEP *= 4;
	11769	+ }
10894	11770
10895	11771	//object.FullInvariants();
10896	11772
..	..	@@ -10904,23 +11780,44 @@
10904	11780	e.printStackTrace();
10905	11781	}
10906	11782
10907		- if (GrafreeD.RENDERME > 0)
10908		- GrafreeD.RENDERME--; // mechante magouille
	11783	+ if (Grafreed.RENDERME > 0)
	11784	+ Grafreed.RENDERME--; // mechante magouille
10909	11785
10910	11786	Globals.ONESTEP = false;
10911	11787	}
10912	11788
10913	11789	static boolean zoomonce = false;
10914	11790
	11791	+ static void CreateSelectedPoint()
	11792	+ {
	11793	+ if (selectedpoint == null)
	11794	+ {
	11795	+ debugpointG = new Sphere();
	11796	+ debugpointP = new Sphere();
	11797	+ debugpointC = new Sphere();
	11798	+ debugpointR = new Sphere();
	11799	+
	11800	+ selectedpoint = new Superellipsoid();
	11801	+
	11802	+ for (int i=0; i<8; i++)
	11803	+ {
	11804	+ debugpoints[i] = new Sphere();
	11805	+ }
	11806	+ }
	11807	+ }
	11808	+
10915	11809	void DrawObject(GL gl, boolean draw)
10916	11810	{
	11811	+ // To clear camera values
	11812	+ ResetOptions();
	11813	+
10917	11814	//System.out.println("DRAW OBJECT " + mouseDown);
10918	11815	// DrawMode() = SELECTION;
10919	11816	//GL gl = getGL();
10920	11817	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
10921	11818	{
10922	11819	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
10923		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11820	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
10924	11821	pingthread.StepToTarget(true); // true);
10925	11822	// zoomonce = false;
10926	11823	}
..	..	@@ -10975,7 +11872,14 @@
10975	11872
10976	11873	usedtextures.clear();
10977	11874
10978		- BindTextures(DEFAULT_TEXTURES, 2);
	11875	+ try
	11876	+ {
	11877	+ BindTextures(DEFAULT_TEXTURES, 2);
	11878	+ }
	11879	+ catch (Exception e)
	11880	+ {
	11881	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11882	+ }
10979	11883	}
10980	11884	//System.out.println("--> " + stackdepth);
10981	11885	// GrafreeD.traceon();
..	..	@@ -10985,8 +11889,9 @@
10985	11889
10986	11890	if (DrawMode() == DEFAULT)
10987	11891	{
10988		- if (DEBUG)
	11892	+ if (Globals.DEBUG)
10989	11893	{
	11894	+ CreateSelectedPoint();
10990	11895	float radius = 0.05f;
10991	11896	if (selectedpoint.radius != radius)
10992	11897	{
..	..	@@ -11040,20 +11945,32 @@
11040	11945	ReleaseTextures(DEFAULT_TEXTURES);
11041	11946
11042	11947	if (CLEANCACHE)
11043		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11948	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
11044	11949	{
11045		- String tex = e.nextElement();
	11950	+ cTexture tex = e.nextElement();
11046	11951
11047	11952	// System.out.println("Texture --------- " + tex);
11048	11953
11049		- if (tex.equals("WHITE_NOISE"))
	11954	+ if (tex.equals("WHITE_NOISE:"))
11050	11955	continue;
11051	11956
11052		- if (!usedtextures.containsKey(tex))
	11957	+ if (!usedtextures.contains(tex))
11053	11958	{
	11959	+ CacheTexture gettex = texturepigment.get(tex);
11054	11960	// System.out.println("DISPOSE +++++++++++++++ " + tex);
11055		- textures.get(tex).texture.dispose();
11056		- textures.remove(tex);
	11961	+ if (gettex != null)
	11962	+ {
	11963	+ gettex.texture.dispose();
	11964	+ texturepigment.remove(tex);
	11965	+ }
	11966	+
	11967	+ gettex = texturebump.get(tex);
	11968	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11969	+ if (gettex != null)
	11970	+ {
	11971	+ gettex.texture.dispose();
	11972	+ texturebump.remove(tex);
	11973	+ }
11057	11974	}
11058	11975	}
11059	11976	}
..	..	@@ -11066,7 +11983,14 @@
11066	11983	if (checker != null && DrawMode() == DEFAULT)
11067	11984	{
11068	11985	//BindTexture(IMMORTAL_TEXTURE);
11069		- BindTextures(checker.GetTextures(), checker.texres);
	11986	+ try
	11987	+ {
	11988	+ BindTextures(checker.GetTextures(), checker.texres);
	11989	+ }
	11990	+ catch (Exception e)
	11991	+ {
	11992	+ System.err.println("FAILED: " + checker.GetTextures());
	11993	+ }
11070	11994	// NEAREST
11071	11995	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
11072	11996	DrawChecker(gl);
..	..	@@ -11148,7 +12072,7 @@
11148	12072	return;
11149	12073	}
11150	12074
11151		- String string = obj.GetToolTip();
	12075	+ String string = obj.toString(); //.GetToolTip();
11152	12076
11153	12077	GL gl = GetGL();
11154	12078
..	..	@@ -11465,8 +12389,8 @@
11465	12389	//obj.TransformToWorld(light, light);
11466	12390	for (int i = tp.size(); --i >= 0;)
11467	12391	{
11468		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
11469		- LA.xformPos(light, tp.get(i).toParent, light);
	12392	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12393	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
11470	12394	}
11471	12395
11472	12396
..	..	@@ -11483,8 +12407,8 @@
11483	12407	parentcam = cameras[0];
11484	12408	}
11485	12409
11486		- for (int count = parentcam.GetTransformCount(); --count>=0;)
11487		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12410	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12411	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
11488	12412
11489	12413	LA.xformPos(light, renderCamera.toScreen, light);
11490	12414
..	..	@@ -11574,8 +12498,76 @@
11574	12498
11575	12499	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
11576	12500
11577		- String program =
	12501	+ String programmin =
	12502	+ // Min shader
11578	12503	"!!ARBfp1.0\n" +
	12504	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12505	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12506	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12507	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12508	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12509	+ "PARAM light2cam0 = program.env[10];" +
	12510	+ "PARAM light2cam1 = program.env[11];" +
	12511	+ "PARAM light2cam2 = program.env[12];" +
	12512	+ "TEMP temp;" +
	12513	+ "TEMP light;" +
	12514	+ "TEMP ndotl;" +
	12515	+ "TEMP normal;" +
	12516	+ "TEMP depth;" +
	12517	+ "TEMP eye;" +
	12518	+ "TEMP pos;" +
	12519	+
	12520	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12521	+ Normalize("normal") +
	12522	+ "MOV light, state.light[0].position;" +
	12523	+ "DP3 ndotl.x, light, normal;" +
	12524	+
	12525	+ // shadow
	12526	+ "MOV pos, fragment.texcoord[1];" +
	12527	+ "MOV temp, pos;" +
	12528	+ ShadowTextureFetch("depth", "temp", "1") +
	12529	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12530	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12531	+
	12532	+ // No shadow when out of frustum
	12533	+ //"SGE temp.y, depth.z, zero123.y;" +
	12534	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12535	+
	12536	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12537	+
	12538	+ // Backlit
	12539	+ "MOV pos.w, zero123.y;" +
	12540	+ "DP4 eye.x, pos, light2cam0;" +
	12541	+ "DP4 eye.y, pos, light2cam1;" +
	12542	+ "DP4 eye.z, pos, light2cam2;" +
	12543	+ Normalize("eye") +
	12544	+
	12545	+ "DP3 ndotl.y, -eye, normal;" +
	12546	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12547	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12548	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12549	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12550	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12551	+
	12552	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12553	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12554	+
	12555	+ // Pigment
	12556	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12557	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12558	+ "MUL temp, temp, ndotl.x;" +
	12559	+
	12560	+ "MUL temp, temp, zero123.z;" +
	12561	+
	12562	+ //"MUL temp, temp, ndotl.y;" +
	12563	+
	12564	+ "MOV temp.w, zero123.y;" + // reset alpha
	12565	+ "MOV result.color, temp;" +
	12566	+ "END";
	12567	+
	12568	+ String programmax =
	12569	+ "!!ARBfp1.0\n" +
	12570	+
11579	12571	//"OPTION ARB_fragment_program_shadow;" +
11580	12572	"PARAM light2cam0 = program.env[10];" +
11581	12573	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -11690,8 +12682,7 @@
11690	12682	"TEMP shininess;" +
11691	12683	"\n" +
11692	12684	"MOV texSamp, one;" +
11693		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
11694		-
	12685	+
11695	12686	"MOV mapgrid.x, one2048th.x;" +
11696	12687	"MOV temp, fragment.texcoord[1];" +
11697	12688	/*
..	..	@@ -11712,20 +12703,20 @@
11712	12703	"MUL temp, floor, mapgrid.x;" +
11713	12704	//"TEX depth0, temp, texture[1], 2D;" +
11714	12705	(((mode & FP_SOFTSHADOW) == 0) ? "" :
11715		- TextureFetch("depth0", "temp", "1") +
	12706	+ ShadowTextureFetch("depth0", "temp", "1") +
11716	12707	"") +
11717	12708	"ADD temp.x, temp.x, mapgrid.x;" +
11718	12709	//"TEX depth1, temp, texture[1], 2D;" +
11719	12710	(((mode & FP_SOFTSHADOW) == 0) ? "" :
11720		- TextureFetch("depth1", "temp", "1") +
	12711	+ ShadowTextureFetch("depth1", "temp", "1") +
11721	12712	"") +
11722	12713	"ADD temp.y, temp.y, mapgrid.x;" +
11723	12714	//"TEX depth2, temp, texture[1], 2D;" +
11724		- TextureFetch("depth2", "temp", "1") +
	12715	+ ShadowTextureFetch("depth2", "temp", "1") +
11725	12716	"SUB temp.x, temp.x, mapgrid.x;" +
11726	12717	//"TEX depth3, temp, texture[1], 2D;" +
11727	12718	(((mode & FP_SOFTSHADOW) == 0) ? "" :
11728		- TextureFetch("depth3", "temp", "1") +
	12719	+ ShadowTextureFetch("depth3", "temp", "1") +
11729	12720	"") +
11730	12721	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
11731	12722	//"MOV params, material;" +
..	..	@@ -12096,10 +13087,10 @@
12096	13087	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
12097	13088	"") +
12098	13089
12099		- // display shadow only (bump == 0)
	13090	+ // display shadow only (fakedepth == 0)
12100	13091	"SUB temp.x, half.x, shadow.x;" +
12101		- "MOV temp.y, -params6.x;" +
12102		- "SLT temp.z, temp.y, zero.x;" +
	13092	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	13093	+ "SLT temp.z, temp.y, -c256i.x;" +
12103	13094	"SUB temp.y, one.x, temp.z;" +
12104	13095	"MUL temp.x, temp.x, temp.y;" +
12105	13096	"KIL temp.x;" +
..	..	@@ -12228,8 +13219,10 @@
12228	13219	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
12229	13220
12230	13221	"SUB temp.x, one.x, ndotl.x;" +
12231		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
12232		- "ADD temp.y, one.y, options2.y;" + // sursurface
	13222	+ // Tuning for default skin
	13223	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	13224	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	13225	+ "ADD temp.y, one.y, options2.y;" + // subsurface
12233	13226	"MUL temp.x, temp.x, temp.y;" +
12234	13227
12235	13228	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -12428,8 +13421,19 @@
12428	13421	//once = true;
12429	13422	}
12430	13423
12431		- System.out.print("Program #" + mode + "; length = " + program.length());
12432		- System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13424	+ String program = programmax;
	13425	+
	13426	+ if (Globals.MINSHADER)
	13427	+ {
	13428	+ program = programmin;
	13429	+ }
	13430	+
	13431	+ if (Globals.DEBUG)
	13432	+ {
	13433	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
	13434	+ System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
	13435	+ }
	13436	+
12433	13437	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12434	13438
12435	13439	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -12476,7 +13480,8 @@
12476	13480	"\n" +
12477	13481	"END\n";
12478	13482
12479		- System.out.println("Program shadow #" + 0 + "; length = " + program.length());
	13483	+ if (Globals.DEBUG)
	13484	+ System.out.println("Program shadow #" + 0 + "; length = " + program.length());
12480	13485	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
12481	13486
12482	13487	//gl.glNewList(displayListID, GL.GL_COMPILE);
..	..	@@ -12521,25 +13526,26 @@
12521	13526	return out;
12522	13527	}
12523	13528
12524		- String TextureFetch(String dest, String src, String unit)
	13529	+ // Also does frustum culling
	13530	+ String ShadowTextureFetch(String dest, String src, String unit)
12525	13531	{
12526	13532	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12527	13533	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12528	13534	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13535	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13536	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12529	13537	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12530		- "SLT " + src + ".z, " + src + ".x, one.x;" +
12531		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12532		- "SLT " + src + ".z, " + src + ".y, one.x;" +
12533		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13538	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13539	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12534	13540	//"SWZ buffer, temp, w,w,w,w;";
12535		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13541	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12536	13542	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12537	13543	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12538	13544	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12539		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13545	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12540	13546
12541		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12542		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13547	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13548	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12543	13549	}
12544	13550
12545	13551	String Shadow(String depth, String shadow)
..	..	@@ -12561,12 +13567,16 @@
12561	13567
12562	13568	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12563	13569	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13570	+
	13571	+ // Compare fragment depth in light space with shadowmap.
12564	13572	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12565	13573	"SGE temp.y, temp.x, zero.x;" +
12566		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13574	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13575	+
	13576	+ // Reverse comparison
12567	13577	"SUB temp.x, one.x, temp.x;" +
12568	13578	"MUL " + shadow + ".x, temp.x, temp.y;" +
12569		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13579	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12570	13580	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12571	13581
12572	13582	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12580,6 +13590,10 @@
12580	13590	// No shadow for backface
12581	13591	"DP3 temp.x, normal, lightd;" +
12582	13592	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13593	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13594	+
	13595	+ // No shadow when out of frustum
	13596	+ "SGE temp.x, " + depth + ".z, one.z;" +
12583	13597	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12584	13598	"";
12585	13599	}
..	..	@@ -12726,7 +13740,8 @@
12726	13740	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
12727	13741	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
12728	13742	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
12729		- Object3D.cVector2[] vector2buffer;
	13743	+
	13744	+ //Object3D.cVector2[] vector2buffer;
12730	13745
12731	13746	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
12732	13747	// OUT : diff, spec
..	..	@@ -12742,9 +13757,10 @@
12742	13757	"DP3 " + dest + ".z," + "normals," + "eye;" +
12743	13758	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
12744	13759	//"MOV " + dest + ".w," + "normal.z;" +
12745		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
12746		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
12747		- //"MOV " + dest + ".z," + "params2.w;" +
	13760	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13761	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13762	+
	13763	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
12748	13764	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
12749	13765	"RCP " + dest + ".w," + dest + ".w;" +
12750	13766	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -13138,7 +14154,7 @@
13138	14154	public void mousePressed(MouseEvent e)
13139	14155	{
13140	14156	//System.out.println("mousePressed: " + e);
13141		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	14157	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13142	14158	}
13143	14159
13144	14160	static long prevtime = 0;
..	..	@@ -13165,6 +14181,7 @@
13165	14181
13166	14182	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
13167	14183
	14184	+ if (BUTTONLESSWHEEL)
13168	14185	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
13169	14186	{
13170	14187	return;
..	..	@@ -13173,7 +14190,7 @@
13173	14190	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13174	14191
13175	14192	// TIMER
13176		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	14193	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
13177	14194	{
13178	14195	keepboxmode = BOXMODE;
13179	14196	keepsupport = SUPPORT;
..	..	@@ -13213,8 +14230,8 @@
13213	14230	// mode \|= META;
13214	14231	//}
13215	14232
13216		- SetMouseMode(WHEEL \| e.getModifiersEx());
13217		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	14233	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	14234	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
13218	14235	anchorX = ax;
13219	14236	anchorY = ay;
13220	14237	prevX = px;
..	..	@@ -13248,6 +14265,7 @@
13248	14265	else
13249	14266	if (evt.getSource() == AAtimer)
13250	14267	{
	14268	+ Globals.TIMERRUNNING = false;
13251	14269	if (mouseDown)
13252	14270	{
13253	14271	//new Exception().printStackTrace();
..	..	@@ -13273,6 +14291,10 @@
13273	14291	// LIVE = waslive;
13274	14292	// wasliveok = true;
13275	14293	// waslive = false;
	14294	+
	14295	+ // May 2019 Forget it:
	14296	+ if (true)
	14297	+ return;
13276	14298
13277	14299	// source == timer
13278	14300	if (mouseDown)
..	..	@@ -13303,7 +14325,7 @@
13303	14325
13304	14326	// fev 2014???
13305	14327	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13306		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14328	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13307	14329	pingthread.StepToTarget(true); // true);
13308	14330	}
13309	14331	// if (!LIVE)
..	..	@@ -13312,12 +14334,13 @@
13312	14334
13313	14335	javax.swing.Timer timer = new javax.swing.Timer(350, this);
13314	14336
13315		- void clickStart(int x, int y, int modifiers)
	14337	+ void clickStart(int x, int y, int modifiers, int modifiersex)
13316	14338	{
13317	14339	if (!wasliveok)
13318	14340	return;
13319	14341
13320	14342	AAtimer.restart(); //
	14343	+ Globals.TIMERRUNNING = true;
13321	14344
13322	14345	// waslive = LIVE;
13323	14346	// LIVE = false;
..	..	@@ -13329,7 +14352,7 @@
13329	14352	// touched = true; // main DL
13330	14353	if (isRenderer)
13331	14354	{
13332		- SetMouseMode(modifiers);
	14355	+ SetMouseMode(modifiers, modifiersex);
13333	14356	}
13334	14357
13335	14358	selectX = anchorX = x;
..	..	@@ -13342,7 +14365,7 @@
13342	14365	clicked = true;
13343	14366	hold = false;
13344	14367
13345		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14368	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
13346	14369	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
13347	14370	{
13348	14371	// System.out.println("RESTART II " + modifiers);
..	..	@@ -13367,14 +14390,15 @@
13367	14390	drag = false;
13368	14391	//System.out.println("Mouse DOWN");
13369	14392	editObj = false;
13370		- ClickInfo info = new ClickInfo();
13371		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13372		- info.pane = this;
13373		- info.camera = renderCamera;
13374		- info.x = x;
13375		- info.y = y;
13376		- info.modifiers = modifiers;
13377		- editObj = object.doEditClick(info, 0);
	14393	+ //ClickInfo info = new ClickInfo();
	14394	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14395	+ object.clickInfo.pane = this;
	14396	+ object.clickInfo.camera = renderCamera;
	14397	+ object.clickInfo.x = x;
	14398	+ object.clickInfo.y = y;
	14399	+ object.clickInfo.modifiers = modifiersex;
	14400	+ editObj = object.doEditClick(//info,
	14401	+ 0);
13378	14402	if (!editObj)
13379	14403	{
13380	14404	hasMarquee = true;
..	..	@@ -13390,11 +14414,14 @@
13390	14414
13391	14415	public void mouseDragged(MouseEvent e)
13392	14416	{
	14417	+ Globals.MOUSEDRAGGED = true;
	14418	+
	14419	+ //System.out.println("mouseDragged: " + e);
13393	14420	if (isRenderer)
13394	14421	movingcamera = true;
	14422	+
13395	14423	//if (drawing)
13396	14424	//return;
13397		- //System.out.println("mouseDragged: " + e);
13398	14425	if ((e.getModifiersEx() & CTRL) != 0
13399	14426	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
13400	14427	{
..	..	@@ -13402,7 +14429,7 @@
13402	14429	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13403	14430	}
13404	14431	else
13405		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14432	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
13406	14433
13407	14434	//try { Thread.sleep(1); } catch (Exception ex) {}
13408	14435	}
..	..	@@ -13575,6 +14602,7 @@
13575	14602
13576	14603	public void run()
13577	14604	{
	14605	+ new Exception().printStackTrace();
13578	14606	System.exit(0);
13579	14607	for (;;)
13580	14608	{
..	..	@@ -13638,7 +14666,7 @@
13638	14666	{
13639	14667	Globals.lighttouched = true;
13640	14668	}
13641		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14669	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
13642	14670	}
13643	14671	//else
13644	14672	}
..	..	@@ -13652,12 +14680,18 @@
13652	14680	void GoDown(int mod)
13653	14681	{
13654	14682	MODIFIERS \|= COMMAND;
13655		- /*
	14683	+ boolean isVR = (mouseMode&VR)!=0;
	14684	+ /**/
13656	14685	if((mod&SHIFT) == SHIFT)
13657		- manipCamera.RotatePosition(0, -speed);
	14686	+ {
	14687	+ if (isVR)
	14688	+ manipCamera.RotateInterest(0, -speed);
	14689	+ else
	14690	+ manipCamera.RotatePosition(0, -speed);
	14691	+ }
13658	14692	else
13659		- manipCamera.BackForth(0, -speed*delta, getWidth());
13660		- */
	14693	+ manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
	14694	+ /**/
13661	14695	if ((mod & SHIFT) == SHIFT)
13662	14696	{
13663	14697	mouseMode = mouseMode; // VR??
..	..	@@ -13666,6 +14700,8 @@
13666	14700	mouseMode \|= BACKFORTH;
13667	14701	}
13668	14702
	14703	+ targetLookAt.set(manipCamera.lookAt);
	14704	+
13669	14705	//prevX = X = anchorX;
13670	14706	prevY = Y = anchorY - (int) (renderCamera.Distance());
13671	14707	}
..	..	@@ -13673,12 +14709,19 @@
13673	14709	void GoUp(int mod)
13674	14710	{
13675	14711	MODIFIERS \|= COMMAND;
13676		- /*
	14712	+ /**/
	14713	+ boolean isVR = (mouseMode&VR)!=0;
	14714	+
13677	14715	if((mod&SHIFT) == SHIFT)
13678		- manipCamera.RotatePosition(0, speed);
	14716	+ {
	14717	+ if (isVR)
	14718	+ manipCamera.RotateInterest(0, speed);
	14719	+ else
	14720	+ manipCamera.RotatePosition(0, speed);
	14721	+ }
13679	14722	else
13680		- manipCamera.BackForth(0, speed*delta, getWidth());
13681		- */
	14723	+ manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
	14724	+ /**/
13682	14725	if ((mod & SHIFT) == SHIFT)
13683	14726	{
13684	14727	mouseMode = mouseMode;
..	..	@@ -13687,6 +14730,8 @@
13687	14730	mouseMode \|= BACKFORTH;
13688	14731	}
13689	14732
	14733	+ targetLookAt.set(manipCamera.lookAt);
	14734	+
13690	14735	//prevX = X = anchorX;
13691	14736	prevY = Y = anchorY + (int) (renderCamera.Distance());
13692	14737	}
..	..	@@ -13694,12 +14739,17 @@
13694	14739	void GoLeft(int mod)
13695	14740	{
13696	14741	MODIFIERS \|= COMMAND;
13697		- /*
	14742	+ /**/
13698	14743	if((mod&SHIFT) == SHIFT)
13699		- manipCamera.RotatePosition(speed, 0);
	14744	+ manipCamera.Translate(speed*delta, 0, getWidth());
13700	14745	else
13701		- manipCamera.Translate(speed*delta, 0, getWidth());
13702		- */
	14746	+ {
	14747	+ if ((mouseMode&VR)!=0)
	14748	+ manipCamera.RotateInterest(-speed, 0);
	14749	+ else
	14750	+ manipCamera.RotatePosition(speed, 0);
	14751	+ }
	14752	+ /**/
13703	14753	if ((mod & SHIFT) == SHIFT)
13704	14754	{
13705	14755	mouseMode = mouseMode;
..	..	@@ -13708,6 +14758,8 @@
13708	14758	mouseMode \|= ROTATE;
13709	14759	} // TRANSLATE;
13710	14760
	14761	+ targetLookAt.set(manipCamera.lookAt);
	14762	+
13711	14763	prevX = X = anchorX - 10; // (int)(10*renderCamera.Distance());
13712	14764	prevY = Y = anchorY;
13713	14765	}
..	..	@@ -13715,12 +14767,18 @@
13715	14767	void GoRight(int mod)
13716	14768	{
13717	14769	MODIFIERS \|= COMMAND;
13718		- /*
	14770	+ /**/
13719	14771	if((mod&SHIFT) == SHIFT)
13720		- manipCamera.RotatePosition(-speed, 0);
	14772	+ manipCamera.Translate(-speed*delta, 0, getWidth());
13721	14773	else
13722		- manipCamera.Translate(-speed*delta, 0, getWidth());
13723		- */
	14774	+ {
	14775	+ if ((mouseMode&VR)!=0)
	14776	+ manipCamera.RotateInterest(speed, 0);
	14777	+ else
	14778	+ manipCamera.RotatePosition(-speed, 0);
	14779	+ }
	14780	+
	14781	+ /**/
13724	14782	if ((mod & SHIFT) == SHIFT)
13725	14783	{
13726	14784	mouseMode = mouseMode;
..	..	@@ -13729,6 +14787,8 @@
13729	14787	mouseMode \|= ROTATE;
13730	14788	} // TRANSLATE;
13731	14789
	14790	+ targetLookAt.set(manipCamera.lookAt);
	14791	+
13732	14792	prevX = X = anchorX + 10; // (int)(10*renderCamera.Distance());
13733	14793	prevY = Y = anchorY;
13734	14794	}
..	..	@@ -13738,7 +14798,7 @@
13738	14798	int X, Y;
13739	14799	boolean SX, SY;
13740	14800
13741		- void drag(int x, int y, int modifiers)
	14801	+ void drag(int x, int y, int modifiers, int modifiersex)
13742	14802	{
13743	14803	if (IsFrozen())
13744	14804	{
..	..	@@ -13747,17 +14807,17 @@
13747	14807
13748	14808	drag = true; // NEW
13749	14809
13750		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14810	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
13751	14811
13752	14812	X = x;
13753	14813	Y = y;
13754	14814	// floating state for animation
13755		- MODIFIERS = modifiers;
13756		- modifiers &= ~1024;
	14815	+ MODIFIERS = modifiersex;
	14816	+ modifiersex &= ~1024;
13757	14817	if (false) // modifiers != 0)
13758	14818	{
13759	14819	//new Exception().printStackTrace();
13760		- System.out.println("mouseDragged: " + modifiers);
	14820	+ System.out.println("mouseDragged: " + modifiersex);
13761	14821	System.out.println("SHIFT = " + SHIFT);
13762	14822	System.out.println("CONTROL = " + COMMAND);
13763	14823	System.out.println("META = " + META);
..	..	@@ -13770,14 +14830,16 @@
13770	14830	if (editObj)
13771	14831	{
13772	14832	drag = true;
13773		- ClickInfo info = new ClickInfo();
13774		- info.bounds.setBounds(0, 0,
	14833	+ //ClickInfo info = new ClickInfo();
	14834	+ object.clickInfo.bounds.setBounds(0, 0,
13775	14835	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13776		- info.pane = this;
13777		- info.camera = renderCamera;
13778		- info.x = x;
13779		- info.y = y;
13780		- object.editWindow.copy.doEditDrag(info);
	14836	+ object.clickInfo.pane = this;
	14837	+ object.clickInfo.camera = renderCamera;
	14838	+ object.clickInfo.x = x;
	14839	+ object.clickInfo.y = y;
	14840	+ object //.GetWindow().copy
	14841	+ .doEditDrag(//info,
	14842	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
13781	14843	} else
13782	14844	{
13783	14845	if (x < startX)
..	..	@@ -13926,23 +14988,27 @@
13926	14988	}
13927	14989	}
13928	14990
	14991	+// ClickInfo clickInfo = new ClickInfo();
	14992	+
13929	14993	public void mouseMoved(MouseEvent e)
13930	14994	{
13931	14995	//System.out.println("mouseMoved: " + e);
13932		-
13933	14996	if (isRenderer)
13934	14997	return;
13935	14998
13936		- ClickInfo ci = new ClickInfo();
13937		- ci.x = e.getX();
13938		- ci.y = e.getY();
13939		- ci.modifiers = e.getModifiersEx();
13940		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13941		- ci.pane = this;
13942		- ci.camera = renderCamera;
	14999	+ // Mouse cursor feedback
	15000	+ object.clickInfo.x = e.getX();
	15001	+ object.clickInfo.y = e.getY();
	15002	+ object.clickInfo.modifiers = e.getModifiersEx();
	15003	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	15004	+ object.clickInfo.pane = this;
	15005	+ object.clickInfo.camera = renderCamera;
13943	15006	if (!isRenderer)
13944	15007	{
13945		- if (object.editWindow.copy.doEditClick(ci, 0))
	15008	+ //ObjEditor editWindow = object.editWindow;
	15009	+ //Object3D copy = editWindow.copy;
	15010	+ if (object.doEditClick(//clickInfo,
	15011	+ 0))
13946	15012	{
13947	15013	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
13948	15014	} else
..	..	@@ -13954,7 +15020,11 @@
13954	15020
13955	15021	public void mouseReleased(MouseEvent e)
13956	15022	{
	15023	+ Globals.MOUSEDRAGGED = false;
	15024	+
13957	15025	movingcamera = false;
	15026	+ X = 0; // getBounds().width/2;
	15027	+ Y = 0; // getBounds().height/2;
13958	15028	//System.out.println("mouseReleased: " + e);
13959	15029	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13960	15030	}
..	..	@@ -13977,9 +15047,9 @@
13977	15047	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
13978	15048	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
13979	15049
13980		- if (control \|\| command \|\| IsFrozen())
	15050	+// No delay if (control \|\| command \|\| IsFrozen())
13981	15051	timeout = true;
13982		- else
	15052	+// ?? May 2019 else
13983	15053	// timer.setDelay((modifiers & 128) != 0?0:350);
13984	15054	mouseDown = false;
13985	15055	if (!control && !command) // june 2013
..	..	@@ -14089,7 +15159,7 @@
14089	15159	System.out.println("keyReleased: " + e);
14090	15160	}
14091	15161
14092		- void SetMouseMode(int modifiers)
	15162	+ void SetMouseMode(int modifiers, int modifiersex)
14093	15163	{
14094	15164	//System.out.println("SetMouseMode = " + modifiers);
14095	15165	//modifiers &= ~1024;
..	..	@@ -14101,25 +15171,25 @@
14101	15171	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
14102	15172	// return;
14103	15173	//System.out.println("SetMode = " + modifiers);
14104		- if ((modifiers & WHEEL) == WHEEL)
	15174	+ if ((modifiersex & WHEEL) == WHEEL)
14105	15175	{
14106	15176	mouseMode \|= ZOOM;
14107	15177	}
14108	15178
14109	15179	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14110		- if (capsLocked \|\| (modifiers & META) == META)
	15180	+ if (capsLocked) // \|\| (modifiers & META) == META)
14111	15181	{
14112	15182	mouseMode \|= VR; // BACKFORTH;
14113	15183	}
14114		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	15184	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
14115	15185	{
14116	15186	mouseMode \|= SELECT;
14117	15187	}
14118		- if ((modifiers & COMMAND) == COMMAND)
	15188	+ if ((modifiersex & COMMAND) == COMMAND)
14119	15189	{
14120	15190	mouseMode \|= SELECT;
14121	15191	}
14122		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	15192	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
14123	15193	{
14124	15194	mouseMode &= ~VR;
14125	15195	mouseMode \|= TRANSLATE;
..	..	@@ -14148,7 +15218,7 @@
14148	15218
14149	15219	if (isRenderer) //
14150	15220	{
14151		- SetMouseMode(modifiers);
	15221	+ SetMouseMode(0, modifiers);
14152	15222	}
14153	15223
14154	15224	Globals.theRenderer.keyPressed(key);
..	..	@@ -14210,7 +15280,8 @@
14210	15280	// break;
14211	15281	case 'T':
14212	15282	CACHETEXTURE ^= true;
14213		- textures.clear();
	15283	+ texturepigment.clear();
	15284	+ texturebump.clear();
14214	15285	// repaint();
14215	15286	break;
14216	15287	case 'Y':
..	..	@@ -14220,8 +15291,8 @@
14220	15291	case 'K':
14221	15292	KOMPACTTEXTURE ^= true;
14222	15293	//textures.clear();
14223		- break;
14224		- case 'P': // Texture Projection macros
	15294	+ // break;
	15295	+ //case 'P': // Texture Projection macros
14225	15296	// SAVETEXTURE ^= true;
14226	15297	macromode = true;
14227	15298	Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
..	..	@@ -14295,7 +15366,9 @@
14295	15366	case 'E' : COMPACT ^= true;
14296	15367	repaint();
14297	15368	break;
14298		- case 'W' : DEBUGHSB ^= true;
	15369	+ case 'W' : // Wide Window (fullscreen)
	15370	+ //DEBUGHSB ^= true;
	15371	+ ObjEditor.theFrame.ToggleFullScreen();
14299	15372	repaint();
14300	15373	break;
14301	15374	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -14320,8 +15393,8 @@
14320	15393	RevertCamera();
14321	15394	repaint();
14322	15395	break;
14323		- case 'L':
14324	15396	case 'l':
	15397	+ //case 'L':
14325	15398	if (lightMode)
14326	15399	{
14327	15400	lightMode = false;
..	..	@@ -14340,7 +15413,7 @@
14340	15413	targetLookAt.set(manipCamera.lookAt);
14341	15414	repaint();
14342	15415	break;
14343		- case 'p':
	15416	+ case 'P': // p':
14344	15417	// c'est quoi ca au juste? spherical ^= true;
14345	15418	Skinshader ^= true; programInitialized = false;
14346	15419	repaint();
..	..	@@ -14385,20 +15458,24 @@
14385	15458	OCCLUSION_CULLING ^= true;
14386	15459	System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
14387	15460	break;
14388		- case '0': envyoff ^= true; repaint(); break;
	15461	+ //case '0': envyoff ^= true; repaint(); break;
14389	15462	case '1':
14390	15463	case '2':
14391	15464	case '3':
14392	15465	case '4':
14393	15466	case '5':
14394		- newenvy = Character.getNumericValue(key);
14395		- repaint();
14396		- break;
14397	15467	case '6':
14398	15468	case '7':
14399	15469	case '8':
14400	15470	case '9':
14401		- BGcolor = (key - '6')/3.f;
	15471	+ if (true) // envyoff)
	15472	+ {
	15473	+ BGcolor = (key - '1')/8.f;
	15474	+ }
	15475	+ else
	15476	+ {
	15477	+ //newenvy = Character.getNumericValue(key);
	15478	+ }
14402	15479	repaint();
14403	15480	break;
14404	15481	case '!':
..	..	@@ -14464,9 +15541,9 @@
14464	15541	case '_':
14465	15542	kompactbit = 5;
14466	15543	break;
14467		- case '+':
14468		- kompactbit = 6;
14469		- break;
	15544	+// case '+':
	15545	+// kompactbit = 6;
	15546	+// break;
14470	15547	case ' ':
14471	15548	lightMode ^= true;
14472	15549	Globals.lighttouched = true;
..	..	@@ -14478,13 +15555,14 @@
14478	15555	case ESC:
14479	15556	RENDERPROGRAM += 1;
14480	15557	RENDERPROGRAM %= 3;
	15558	+
14481	15559	repaint();
14482	15560	break;
14483	15561	case 'Z':
14484	15562	//RESIZETEXTURE ^= true;
14485	15563	//break;
14486	15564	case 'z':
14487		- RENDERSHADOW ^= true;
	15565	+ Globals.RENDERSHADOW ^= true;
14488	15566	Globals.lighttouched = true;
14489	15567	repaint();
14490	15568	break;
..	..	@@ -14517,8 +15595,9 @@
14517	15595	case DELETE:
14518	15596	ClearSelection();
14519	15597	break;
14520		- /*
14521	15598	case '+':
	15599	+
	15600	+ /*
14522	15601	//fontsize += 1;
14523	15602	bbzoom *= 2;
14524	15603	repaint();
..	..	@@ -14535,17 +15614,17 @@
14535	15614	case '=':
14536	15615	IncDepth();
14537	15616	//fontsize += 1;
14538		- object.editWindow.refreshContents(true);
	15617	+ object.GetWindow().refreshContents(true);
14539	15618	maskbit = 6;
14540	15619	break;
14541	15620	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14542	15621	DecDepth();
14543	15622	maskbit = 5;
14544	15623	//if(fontsize > 1) fontsize -= 1;
14545		- if (object.editWindow == null)
14546		- new Exception().printStackTrace();
14547		- else
14548		- object.editWindow.refreshContents(true);
	15624	+// if (object.editWindow == null)
	15625	+// new Exception().printStackTrace();
	15626	+// else
	15627	+ object.GetWindow().refreshContents(true);
14549	15628	break;
14550	15629	case '{':
14551	15630	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14608,7 +15687,7 @@
14608	15687	//mode = ROTATE;
14609	15688	if ((MODIFIERS & COMMAND) == 0) // VR??
14610	15689	{
14611		- SetMouseMode(modifiers);
	15690	+ SetMouseMode(0, modifiers);
14612	15691	}
14613	15692	}
14614	15693
..	..	@@ -14742,8 +15821,9 @@
14742	15821
14743	15822	protected void processMouseMotionEvent(MouseEvent e)
14744	15823	{
14745		- //System.out.println("processMouseMotionEvent: " + mouseMode);
14746		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15824	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15825	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15826	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
14747	15827	{
14748	15828	mouseMoved(e);
14749	15829	} else
..	..	@@ -14768,11 +15848,12 @@
14768	15848	}
14769	15849	*/
14770	15850
14771		- object.editWindow.EditSelection();
	15851	+ object.GetWindow().EditSelection(false);
14772	15852	}
14773	15853
14774	15854	void SelectParent()
14775	15855	{
	15856	+ new Exception().printStackTrace();
14776	15857	System.exit(0);
14777	15858	Composite group = (Composite) object;
14778	15859	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -14784,10 +15865,10 @@
14784	15865	{
14785	15866	//selectees.remove(i);
14786	15867	System.out.println("select parent of " + elem);
14787		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15868	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
14788	15869	} else
14789	15870	{
14790		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15871	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
14791	15872	}
14792	15873
14793	15874	first = false;
..	..	@@ -14796,6 +15877,7 @@
14796	15877
14797	15878	void SelectChildren()
14798	15879	{
	15880	+ new Exception().printStackTrace();
14799	15881	System.exit(0);
14800	15882	/*
14801	15883	Composite group = (Composite) object;
..	..	@@ -14828,12 +15910,12 @@
14828	15910	for (int j = 0; j < group.children.size(); j++)
14829	15911	{
14830	15912	elem = (Object3D) group.children.elementAt(j);
14831		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15913	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
14832	15914	first = false;
14833	15915	}
14834	15916	} else
14835	15917	{
14836		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15918	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
14837	15919	}
14838	15920
14839	15921	first = false;
..	..	@@ -14844,21 +15926,21 @@
14844	15926	{
14845	15927	//Composite group = (Composite) object;
14846	15928	Object3D group = object;
14847		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15929	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
14848	15930	}
14849	15931
14850	15932	void ResetTransform(int mask)
14851	15933	{
14852	15934	//Composite group = (Composite) object;
14853	15935	Object3D group = object;
14854		- group.editWindow.ResetTransform(mask);
	15936	+ group.GetWindow().ResetTransform(mask);
14855	15937	}
14856	15938
14857	15939	void FlipTransform()
14858	15940	{
14859	15941	//Composite group = (Composite) object;
14860	15942	Object3D group = object;
14861		- group.editWindow.FlipTransform();
	15943	+ group.GetWindow().FlipTransform();
14862	15944	// group.editWindow.ReduceMesh(true);
14863	15945	}
14864	15946
..	..	@@ -14866,7 +15948,7 @@
14866	15948	{
14867	15949	//Composite group = (Composite) object;
14868	15950	Object3D group = object;
14869		- group.editWindow.PrintMemory();
	15951	+ group.GetWindow().PrintMemory();
14870	15952	// group.editWindow.ReduceMesh(true);
14871	15953	}
14872	15954
..	..	@@ -14874,7 +15956,7 @@
14874	15956	{
14875	15957	//Composite group = (Composite) object;
14876	15958	Object3D group = object;
14877		- group.editWindow.ResetCentroid();
	15959	+ group.GetWindow().ResetCentroid();
14878	15960	}
14879	15961
14880	15962	void IncDepth()
..	..	@@ -14956,11 +16038,11 @@
14956	16038
14957	16039	int width = getBounds().width;
14958	16040	int height = getBounds().height;
14959		- ClickInfo info = new ClickInfo();
14960		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
14961	16041	//Image img = CreateImage(width, height);
14962	16042	//System.out.println("width = " + width + "; height = " + height + "\n");
	16043	+
14963	16044	Graphics gr = g; // img.getGraphics();
	16045	+
14964	16046	if (!hasMarquee)
14965	16047	{
14966	16048	if (Xmin < Xmax) // !locked)
..	..	@@ -15032,44 +16114,92 @@
15032	16114	}
15033	16115	if (object != null && !hasMarquee)
15034	16116	{
	16117	+ if (object.clickInfo == null)
	16118	+ object.clickInfo = new ClickInfo();
	16119	+ ClickInfo info = object.clickInfo;
	16120	+ //ClickInfo info = new ClickInfo();
	16121	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16122	+
15035	16123	if (isRenderer)
15036	16124	{
15037		- info.flags++;
	16125	+ object.clickInfo.flags++;
15038	16126	double frameAspect = (double) width / (double) height;
15039	16127	if (frameAspect > renderCamera.aspect)
15040	16128	{
15041	16129	int desired = (int) ((double) height * renderCamera.aspect);
15042		- info.bounds.width -= width - desired;
15043		- info.bounds.x += (width - desired) / 2;
	16130	+ object.clickInfo.bounds.width -= width - desired;
	16131	+ object.clickInfo.bounds.x += (width - desired) / 2;
15044	16132	} else
15045	16133	{
15046	16134	int desired = (int) ((double) width / renderCamera.aspect);
15047		- info.bounds.height -= height - desired;
15048		- info.bounds.y += (height - desired) / 2;
	16135	+ object.clickInfo.bounds.height -= height - desired;
	16136	+ object.clickInfo.bounds.y += (height - desired) / 2;
15049	16137	}
15050	16138	}
15051		- info.g = gr;
15052		- info.camera = renderCamera;
	16139	+
	16140	+ object.clickInfo.g = gr;
	16141	+ object.clickInfo.camera = renderCamera;
15053	16142	/*
15054	16143	// Memory intensive (brep.verticescopy)
15055	16144	if (!(object instanceof Composite))
15056	16145	object.draw(info, 0, false); // SLOW :
15057	16146	*/
15058		- if (!isRenderer)
	16147	+ if (!isRenderer) // && drag)
15059	16148	{
15060		- object.drawEditHandles(info, 0);
	16149	+ Grafreed.Assert(object != null);
	16150	+ Grafreed.Assert(object.selection != null);
	16151	+ if (object.selection.Size() > 0)
	16152	+ {
	16153	+ int hitSomething = object.selection.get(0).hitSomething;
	16154	+
	16155	+ object.clickInfo.DX = 0;
	16156	+ object.clickInfo.DY = 0;
	16157	+ object.clickInfo.W = 1;
	16158	+ if (hitSomething == Object3D.hitCenter)
	16159	+ {
	16160	+ info.DX = X;
	16161	+ if (X != 0)
	16162	+ info.DX -= info.bounds.width/2;
	16163	+
	16164	+ info.DY = Y;
	16165	+ if (Y != 0)
	16166	+ info.DY -= info.bounds.height/2;
	16167	+ }
	16168	+
	16169	+ object.drawEditHandles(//info,
	16170	+ 0);
	16171	+
	16172	+ if (drag && (X != 0 \|\| Y != 0))
	16173	+ {
	16174	+ switch (hitSomething)
	16175	+ {
	16176	+ case Object3D.hitCenter: gr.setColor(Color.white);
	16177	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16178	+ break;
	16179	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16180	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16181	+ break;
	16182	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16183	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16184	+ break;
	16185	+ }
	16186	+
	16187	+ }
	16188	+ }
15061	16189	}
15062	16190	}
	16191	+
15063	16192	if (isRenderer)
15064	16193	{
15065	16194	//gr.setColor(Color.black);
15066	16195	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
15067	16196	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
15068	16197	}
	16198	+
15069	16199	if (hasMarquee)
15070	16200	{
15071	16201	gr.setXORMode(Color.white);
15072		- gr.setColor(Color.red);
	16202	+ gr.setColor(Color.white);
15073	16203	if (!firstime)
15074	16204	{
15075	16205	gr.drawRect(prevmarqX, prevmarqY, prevmarqW, prevmarqH);
..	..	@@ -15178,6 +16308,7 @@
15178	16308	public boolean mouseDown(Event evt, int x, int y)
15179	16309	{
15180	16310	System.out.println("mouseDown: " + evt);
	16311	+ System.exit(0);
15181	16312	/*
15182	16313	locked = true;
15183	16314	drag = false;
..	..	@@ -15221,7 +16352,7 @@
15221	16352	{
15222	16353	keyPressed(0, modifiers);
15223	16354	}
15224		- clickStart(x, y, modifiers);
	16355	+ // clickStart(x, y, modifiers);
15225	16356	return true;
15226	16357	}
15227	16358
..	..	@@ -15339,7 +16470,7 @@
15339	16470	{
15340	16471	keyReleased(0, 0);
15341	16472	}
15342		- drag(x, y, modifiers);
	16473	+ drag(x, y, 0, modifiers);
15343	16474	return true;
15344	16475	}
15345	16476
..	..	@@ -15471,7 +16602,7 @@
15471	16602	Object3D object;
15472	16603	static Object3D trackedobject;
15473	16604	Camera renderCamera; // Light or Eye (or Occlusion)
15474		- /static/ Camera manipCamera; // Light or Eye
	16605	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
15475	16606	/static/ Camera eyeCamera;
15476	16607	/static/ Camera lightCamera;
15477	16608	int cameracount;
..	..	@@ -15535,6 +16666,8 @@
15535	16666	private /static/ boolean firstime;
15536	16667	private /static/ cVector newView = new cVector();
15537	16668	private static final String[] suffixes = {"posx", "negx", "posy", "negy", "posz", "negz"};
	16669	+ private static final String[] suffixes2 = {"east", "west", "top", "bottom", "north", "south"};
	16670	+ private static final String[] suffixes3 = {"ft", "bk", "up", "dn", "rt", "lf"};
15538	16671	private static final int[] targets = {GL.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
15539	16672	GL.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
15540	16673	GL.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
..	..	@@ -15547,29 +16680,67 @@
15547	16680	{
15548	16681	com.sun.opengl.util.texture.Texture cubemap = TextureIO.newTexture(GL.GL_TEXTURE_CUBE_MAP);
15549	16682
	16683	+ int usedsuf = 0;
	16684	+
15550	16685	for (int i = 0; i < suffixes.length; i++)
15551	16686	{
15552		- String resourceName = basename + suffixes[i] + "." + suffix;
15553		- TextureData data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
15554		- mipmapped,
15555		- FileUtil.getFileSuffix(resourceName));
15556		- if (data == null)
	16687	+ String[] suffixe = suffixes;
	16688	+ String[] fallback = suffixes2;
	16689	+ String[] fallfallback = suffixes3;
	16690	+
	16691	+ for (int c=usedsuf; --c>=0;)
15557	16692	{
15558		- throw new IOException("Unable to load texture " + resourceName);
	16693	+// String[] temp = suffixe;
	16694	+// suffixe = fallback;
	16695	+// fallback = fallfallback;
	16696	+// fallfallback = temp;
15559	16697	}
	16698	+
	16699	+ String resourceName = basename + suffixe[i] + "." + suffix;
	16700	+ TextureData data;
	16701	+
	16702	+ try
	16703	+ {
	16704	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16705	+ mipmapped,
	16706	+ FileUtil.getFileSuffix(resourceName));
	16707	+ }
	16708	+ catch (Exception e)
	16709	+ {
	16710	+ try
	16711	+ {
	16712	+ resourceName = basename + fallback[i] + "." + suffix;
	16713	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16714	+ mipmapped,
	16715	+ FileUtil.getFileSuffix(resourceName));
	16716	+ }
	16717	+ catch (Exception e2)
	16718	+ {
	16719	+ resourceName = basename + fallfallback[i] + "." + suffix;
	16720	+ data = TextureIO.newTextureData(scope.getResourceAsStream(resourceName),
	16721	+ mipmapped,
	16722	+ FileUtil.getFileSuffix(resourceName));
	16723	+ }
	16724	+ }
	16725	+
15560	16726	//System.out.println("Target = " + targets[i]);
15561	16727	cubemap.updateImage(data, targets[i]);
15562	16728	}
15563	16729
15564	16730	return cubemap;
15565	16731	}
	16732	+
15566	16733	int bigsphere = -1;
15567	16734
15568	16735	float BGcolor = 0.5f;
15569	16736
15570		- private void DrawSkyBox(GL gl)
	16737	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16738	+
	16739	+ private void DrawSkyBox(GL gl, float ratio)
15571	16740	{
15572		- if (envyoff \|\| cubemap == null)
	16741	+ if (//envyoff \|\|
	16742	+ WIREFRAME \|\|
	16743	+ cubemap == null)
15573	16744	{
15574	16745	gl.glClearColor(BGcolor, BGcolor, BGcolor, 1);
15575	16746	gl.glClear(gl.GL_COLOR_BUFFER_BIT);
..	..	@@ -15584,7 +16755,17 @@
15584	16755	// Compensates for ExaminerViewer's modification of modelview matrix
15585	16756	gl.glMatrixMode(GL.GL_MODELVIEW);
15586	16757	gl.glLoadIdentity();
	16758	+ gl.glScalef(1,ratio,1);
15587	16759
	16760	+// colorV[0] = 2;
	16761	+// colorV[1] = 2;
	16762	+// colorV[2] = 2;
	16763	+// colorV[3] = 1;
	16764	+// gl.glDisable(gl.GL_COLOR_MATERIAL);
	16765	+// gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16766	+//
	16767	+// gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16768	+
15588	16769	//gl.glActiveTexture(GL.GL_TEXTURE1);
15589	16770	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
15590	16771
..	..	@@ -15616,6 +16797,7 @@
15616	16797	{
15617	16798	gl.glScalef(1.0f, -1.0f, 1.0f);
15618	16799	}
	16800	+ gl.glScalef(-1.0f, 1.0f, 1.0f);
15619	16801	gl.glMultMatrixd(viewrot_1, 0);
15620	16802	gl.glTranslatef(0, 0, 0.5f); // (float)lightCamera.Distance()); // 0.5f);
15621	16803	//viewer.updateInverseRotation(gl);
..	..	@@ -15656,7 +16838,8 @@
15656	16838	gl.glDisable(GL.GL_TEXTURE_GEN_R);
15657	16839
15658	16840	cubemap.disable();
15659		- ////cubemap.unbind();
	16841	+ //cubemap.dispose();
	16842	+
15660	16843	if (CULLFACE)
15661	16844	{
15662	16845	gl.glEnable(gl.GL_CULL_FACE);
..	..	@@ -15756,16 +16939,16 @@
15756	16939	cStatic.objectstack[materialdepth++] = checker;
15757	16940	//System.out.println("material " + material);
15758	16941	//Applet3D.tracein(this, selected);
15759		- vector2buffer = checker.projectedVertices;
	16942	+ //vector2buffer = checker.projectedVertices;
15760	16943
15761	16944	//checker.GetMaterial().Draw(this, false); // true);
15762		- DrawMaterial(checker.GetMaterial(), false); // true);
	16945	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
15763	16946
15764	16947	materialdepth -= 1;
15765	16948	if (materialdepth > 0)
15766	16949	{
15767		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
15768		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16950	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16951	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
15769	16952	}
15770	16953	//checker.GetMaterial().opacity = 1f;
15771	16954	////checker.GetMaterial().ambient = 1f;
..	..	@@ -15851,6 +17034,14 @@
15851	17034	}
15852	17035	}
15853	17036
	17037	+ private Object3D GetFolder()
	17038	+ {
	17039	+ Object3D folder = object.GetWindow().copy;
	17040	+ if (object.GetWindow().copy.selection.Size() > 0)
	17041	+ folder = object.GetWindow().copy.selection.elementAt(0);
	17042	+ return folder;
	17043	+ }
	17044	+
15854	17045	class SelectBuffer implements GLEventListener
15855	17046	{
15856	17047
..	..	@@ -15866,7 +17057,7 @@
15866	17057	//new Exception().printStackTrace();
15867	17058	System.out.println("select buffer init");
15868	17059	// Use debug pipeline
15869		- drawable.setGL(new DebugGL(drawable.getGL()));
	17060	+ //drawable.setGL(new DebugGL(drawable.getGL()));
15870	17061
15871	17062	GL gl = drawable.getGL();
15872	17063
..	..	@@ -15909,6 +17100,7 @@
15909	17100	{
15910	17101	if (!selection)
15911	17102	{
	17103	+ new Exception().printStackTrace();
15912	17104	System.exit(0);
15913	17105	return;
15914	17106	}
..	..	@@ -15929,6 +17121,17 @@
15929	17121
15930	17122	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
15931	17123
	17124	+ if (PAINTMODE)
	17125	+ {
	17126	+ if (object.GetWindow().copy.selection.Size() > 0)
	17127	+ {
	17128	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17129	+
	17130	+ // Make what you paint not selectable.
	17131	+ paintobj.ResetSelectable();
	17132	+ }
	17133	+ }
	17134	+
15932	17135	//int tmp = selection_view;
15933	17136	//selection_view = -1;
15934	17137	int temp = DrawMode();
..	..	@@ -15940,6 +17143,17 @@
15940	17143	// temp = DEFAULT; // patch for selection debug
15941	17144	Globals.drawMode = temp; // WARNING
15942	17145
	17146	+ if (PAINTMODE)
	17147	+ {
	17148	+ if (object.GetWindow().copy.selection.Size() > 0)
	17149	+ {
	17150	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17151	+
	17152	+ // Revert.
	17153	+ paintobj.RestoreSelectable();
	17154	+ }
	17155	+ }
	17156	+
15943	17157	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
15944	17158
15945	17159	// trying different ways of getting the depth info over
..	..	@@ -15987,6 +17201,8 @@
15987	17201	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
15988	17202	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
15989	17203	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17204	+
	17205	+ CreateSelectedPoint();
15990	17206
15991	17207	// Will fit the mesh !!!
15992	17208	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -16036,34 +17252,36 @@
16036	17252	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]));
16037	17253	}
16038	17254
16039		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	17255	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
16040	17256	}
16041	17257	}
16042	17258
16043	17259	if (!movingcamera && !PAINTMODE)
16044		- object.editWindow.ScreenFitPoint(); // fev 2014
	17260	+ object.GetWindow().ScreenFitPoint(); // fev 2014
16045	17261
16046		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17262	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16047	17263	{
16048		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17264	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16049	17265
16050		- Object3D group = new Object3D("inst" + paintcount++);
	17266	+ if (object.GetWindow().copy.selection.Size() > 0)
	17267	+ {
	17268	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16051	17269
16052		- group.CreateMaterial(); // use a void leaf to select instances
16053		-
16054		- group.add(paintobj); // link
16055		-
16056		- object.editWindow.SnapObject(group);
16057		-
16058		- Object3D folder = object.editWindow.copy;
16059		-
16060		- if (object.editWindow.copy.selection.Size() > 0)
16061		- folder = object.editWindow.copy.selection.elementAt(0);
16062		-
16063		- folder.add(group);
16064		-
16065		- object.editWindow.ResetModel();
16066		- object.editWindow.refreshContents();
	17270	+ Object3D inst = new Object3D("inst" + paintcount++);
	17271	+
	17272	+ inst.CreateMaterial(); // use a void leaf to select instances
	17273	+
	17274	+ inst.add(paintobj); // link
	17275	+
	17276	+ object.GetWindow().SnapObject(inst);
	17277	+
	17278	+ Object3D folder = paintFolder; // GetFolder();
	17279	+
	17280	+ folder.add(inst);
	17281	+
	17282	+ object.GetWindow().ResetModel();
	17283	+ object.GetWindow().refreshContents();
	17284	+ }
16067	17285	}
16068	17286	else
16069	17287	paintcount = 0;
..	..	@@ -16102,6 +17320,11 @@
16102	17320	//System.out.println("objects[color] = " + objects[color]);
16103	17321	//objects[color].Select();
16104	17322	indexcount = 0;
	17323	+ ObjEditor window = object.GetWindow();
	17324	+ if (window != null && deselect)
	17325	+ {
	17326	+ window.Select(null, deselect, true);
	17327	+ }
16105	17328	object.Select(color, deselect);
16106	17329	}
16107	17330
..	..	@@ -16152,6 +17375,7 @@
16152	17375
16153	17376	public void init(GLAutoDrawable drawable)
16154	17377	{
	17378	+ if (Globals.DEBUG)
16155	17379	System.out.println("shadow buffer init");
16156	17380
16157	17381	GL gl = drawable.getGL();
..	..	@@ -16201,7 +17425,7 @@
16201	17425	gl.glDisable(gl.GL_CULL_FACE);
16202	17426	}
16203	17427
16204		- if (!RENDERSHADOW)
	17428	+ if (!Globals.RENDERSHADOW)
16205	17429	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16206	17430
16207	17431	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -16211,7 +17435,7 @@
16211	17435	//gl.glColorMask(false, false, false, false);
16212	17436
16213	17437	//render_scene_from_light_view(gl, drawable, 0, 0);
16214		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17438	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
16215	17439	{
16216	17440	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
16217	17441
..	..	@@ -16380,10 +17604,14 @@
16380	17604	gl.glFlush();
16381	17605
16382	17606	/**/
16383		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
	17607	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusiondepthbuffer);
16384	17608
16385		- float[] pixels = occlusionsizebuffer.array();
	17609	+ float[] depths = occlusiondepthbuffer.array();
16386	17610
	17611	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusioncolorbuffer);
	17612	+
	17613	+ int[] pixels = selectsizebuffer.array();
	17614	+
16387	17615	double r = 0, g = 0, b = 0;
16388	17616
16389	17617	double count = 0;
..	..	@@ -16394,7 +17622,7 @@
16394	17622
16395	17623	double FACTOR = 1;
16396	17624
16397		- for (int i = 0; i < pixels.length; i++)
	17625	+ for (int i = 0; i < depths.length; i++)
16398	17626	{
16399	17627	int x = i / OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
16400	17628	int y = i % OCCLUSION_SIZE - OCCLUSION_SIZE / 2;
..	..	@@ -16477,7 +17705,7 @@
16477	17705
16478	17706	double scale = ray.z; // 1; // cos
16479	17707
16480		- float depth = pixels[newindex];
	17708	+ float depth = depths[newindex];
16481	17709
16482	17710	/*
16483	17711	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -16627,23 +17855,15 @@
16627	17855	int AAbuffersize = 0;
16628	17856
16629	17857	//double[] selectedpoint = new double[3];
16630		- static Superellipsoid selectedpoint = new Superellipsoid();
	17858	+ static Superellipsoid selectedpoint;
16631	17859	static Sphere previousselectedpoint = null;
16632		- static Sphere debugpointG = new Sphere();
16633		- static Sphere debugpointP = new Sphere();
16634		- static Sphere debugpointC = new Sphere();
16635		- static Sphere debugpointR = new Sphere();
	17860	+ static Sphere debugpointG;
	17861	+ static Sphere debugpointP;
	17862	+ static Sphere debugpointC;
	17863	+ static Sphere debugpointR;
16636	17864
16637	17865	static Sphere debugpoints[] = new Sphere[8];
16638	17866
16639		- static
16640		- {
16641		- for (int i=0; i<8; i++)
16642		- {
16643		- debugpoints[i] = new Sphere();
16644		- }
16645		- }
16646		-
16647	17867	static void InitPoints(float radius)
16648	17868	{
16649	17869	for (int i=0; i<8; i++)
..	..	@@ -16682,11 +17902,14 @@
16682	17902	static IntBuffer AAbuffer; // = IntBuffer.allocate(MAX_SIZE*MAX_SIZE);
16683	17903	static IntBuffer bigAAbuffer;
16684	17904	static java.nio.FloatBuffer histogram = BufferUtil.newFloatBuffer(HISTOGRAM_SIZE * 3);
16685		- static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
	17905	+ //static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
16686	17906	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
16687	17907	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
16688	17908	//static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
16689		- static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17909	+ static java.nio.FloatBuffer occlusiondepthbuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17910	+
	17911	+ static IntBuffer occlusioncolorbuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17912	+
16690	17913	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
16691	17914	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
16692	17915	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();
..	..	@@ -16695,10 +17918,11 @@
16695	17918	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
16696	17919	// Depth buffer format
16697	17920	//private int depth_format;
16698		- static public void NextIndex(Object3D o, GL gl)
	17921	+
	17922	+ public void NextIndex()
16699	17923	{
16700	17924	indexcount+=16;
16701		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17925	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
16702	17926	//objects[indexcount] = o;
16703	17927	//System.out.println("indexcount = " + indexcount);
16704	17928	}