~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;
..	..	@@ -92,6 +126,8 @@
92	126
93	127	static int tickcount = 0; // slow pose issue
94	128
	129	+static boolean BUTTONLESSWHEEL = false;
	130	+static boolean ZOOMBOXMODE = false;
95	131	static boolean BOXMODE = false;
96	132	static boolean IMAGEFLIP = false;
97	133	static boolean SMOOTHFOCUS = false;
..	..	@@ -106,7 +142,7 @@
106	142	static boolean OEIL = true;
107	143	static boolean OEILONCE = false; // do oeilon then oeiloff
108	144	static boolean LOOKAT = true;
109		-static boolean RANDOM = true; // false;
	145	+static boolean SWITCH = true; // false;
110	146	static boolean HANDLES = false; // selection doesn't work!!
111	147	static boolean PAINTMODE = false;
112	148
..	..	@@ -149,12 +185,25 @@
149	185	defaultcaps.setAccumBlueBits(16);
150	186	defaultcaps.setAccumAlphaBits(16);
151	187	}
152		- static CameraPane theRenderer;
	188	+
	189	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
153	190
	191	+ public void LoadSkybox(String name, String ext, boolean mipmap) throws GLException
	192	+ {
	193	+ try
	194	+ {
	195	+ cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
	196	+ } catch (IOException e)
	197	+ {
	198	+ System.out.println("NAME = " + name);
	199	+ e.printStackTrace(); // throw new RuntimeException(e);
	200	+ }
	201	+ }
	202	+
154	203	void SetAsGLRenderer(boolean b)
155	204	{
156	205	isRenderer = b;
157		- theRenderer = this;
	206	+ Globals.theRenderer = this;
158	207	}
159	208
160	209	CameraPane(Object3D o, Camera cam, boolean withcontext)
..	..	@@ -169,7 +218,8 @@
169	218
170	219	SetCamera(cam);
171	220
172		- SetLight(new Camera(new cVector(10, 10, -20)));
	221	+ // Warning: not used.
	222	+ SetLight(new Camera(new cVector(15, 10, -20)));
173	223
174	224	object = o;
175	225
..	..	@@ -191,6 +241,45 @@
191	241	}
192	242
193	243	/// INTERFACE
	244	+
	245	+ public javax.media.opengl.GL GetGL0()
	246	+ {
	247	+ return null;
	248	+ }
	249	+
	250	+ public int GenList()
	251	+ {
	252	+ javax.media.opengl.GL gl = GetGL();
	253	+ return gl.glGenLists(1);
	254	+ }
	255	+
	256	+ public void NewList(int id)
	257	+ {
	258	+ javax.media.opengl.GL gl = GetGL();
	259	+ gl.glNewList(id, gl.GL_COMPILE); //_AND_EXECUTE);
	260	+ }
	261	+
	262	+ public void CallList(int id)
	263	+ {
	264	+ javax.media.opengl.GL gl = GetGL();
	265	+ gl.glCallList(id);
	266	+ }
	267	+
	268	+ public void EndList()
	269	+ {
	270	+ javax.media.opengl.GL gl = GetGL();
	271	+ gl.glEndList();
	272	+ }
	273	+
	274	+ public boolean IsBoxMode()
	275	+ {
	276	+ return BOXMODE;
	277	+ }
	278	+
	279	+ public boolean IsZoomBoxMode()
	280	+ {
	281	+ return ZOOMBOXMODE;
	282	+ }
194	283
195	284	public void ClearDepth()
196	285	{
..	..	@@ -231,9 +320,14 @@
231	320	return this.ambientOcclusion;
232	321	}
233	322
	323	+ public boolean IsDebugSelection()
	324	+ {
	325	+ return DEBUG_SELECTION;
	326	+ }
	327	+
234	328	public boolean IsFrozen()
235	329	{
236		- boolean selectmode = this.DrawMode() == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	330	+ boolean selectmode = this.DrawMode() == SELECTION \|\| this.IsDebugSelection();
237	331
238	332	return !selectmode && cameracount == 0; // != 0;
239	333	}
..	..	@@ -254,9 +348,19 @@
254	348	return lightCamera;
255	349	}
256	350
	351	+ public Camera ManipCamera()
	352	+ {
	353	+ return manipCamera;
	354	+ }
	355	+
257	356	public Camera RenderCamera()
258	357	{
259	358	return renderCamera;
	359	+ }
	360	+
	361	+ public Camera[] Cameras()
	362	+ {
	363	+ return cameras;
260	364	}
261	365
262	366	public void PushMaterial(Object3D obj, boolean selected)
..	..	@@ -272,7 +376,7 @@
272	376	cStatic.objectstack[materialdepth++] = obj;
273	377	//System.out.println("material " + material);
274	378	//Applet3D.tracein(this, selected);
275		- display.vector2buffer = obj.projectedVertices;
	379	+ //display.vector2buffer = obj.projectedVertices;
276	380	if (obj instanceof Camera)
277	381	{
278	382	display.options1[0] = material.shift;
..	..	@@ -281,14 +385,28 @@
281	385	display.options1[2] = material.shadowbias;
282	386	display.options1[3] = material.aniso;
283	387	display.options1[4] = material.anisoV;
	388	+// System.out.println("display.options1[0] " + display.options1[0]);
	389	+// System.out.println("display.options1[1] " + display.options1[1]);
	390	+// System.out.println("display.options1[2] " + display.options1[2]);
	391	+// System.out.println("display.options1[3] " + display.options1[3]);
	392	+// System.out.println("display.options1[4] " + display.options1[4]);
284	393	display.options2[0] = material.opacity;
285	394	display.options2[1] = material.diffuse;
286	395	display.options2[2] = material.factor;
	396	+// System.out.println("display.options2[0] " + display.options2[0]);
	397	+// System.out.println("display.options2[1] " + display.options2[1]);
	398	+// System.out.println("display.options2[2] " + display.options2[2]);
287	399
288	400	cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	401	+// System.out.println("display.options3[0] " + display.options3[0]);
	402	+// System.out.println("display.options3[1] " + display.options3[1]);
	403	+// System.out.println("display.options3[2] " + display.options3[2]);
289	404	display.options4[0] = material.cameralight/0.2f;
290	405	display.options4[1] = material.subsurface;
291	406	display.options4[2] = material.sheen;
	407	+// System.out.println("display.options4[0] " + display.options4[0]);
	408	+// System.out.println("display.options4[1] " + display.options4[1]);
	409	+// System.out.println("display.options4[2] " + display.options4[2]);
292	410
293	411	// if (display.CURRENTANTIALIAS > 0)
294	412	// display.options3[3] /= 4;
..	..	@@ -304,7 +422,7 @@
304	422	/**/
305	423	} else
306	424	{
307		- DrawMaterial(material, selected);
	425	+ DrawMaterial(material, selected, obj.projectedVertices);
308	426	}
309	427	} else
310	428	{
..	..	@@ -328,8 +446,8 @@
328	446	cStatic.objectstack[materialdepth++] = obj;
329	447	//System.out.println("material " + material);
330	448	//Applet3D.tracein("selected ", selected);
331		- display.vector2buffer = obj.projectedVertices;
332		- display.DrawMaterial(material, selected);
	449	+ //display.vector2buffer = obj.projectedVertices;
	450	+ display.DrawMaterial(material, selected, obj.projectedVertices);
333	451	}
334	452	}
335	453
..	..	@@ -346,8 +464,8 @@
346	464	materialdepth -= 1;
347	465	if (materialdepth > 0)
348	466	{
349		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
350		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	467	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	468	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
351	469	}
352	470	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
353	471	} else if (selected && CameraPane.flash && obj.GetMaterial() != null)
..	..	@@ -367,8 +485,8 @@
367	485	materialdepth -= 1;
368	486	if (materialdepth > 0)
369	487	{
370		- display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
371		- display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	488	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	489	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
372	490	}
373	491	//Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
374	492	//else
..	..	@@ -403,16 +521,18 @@
403	521
404	522	javax.media.opengl.GL gl = display.GetGL();
405	523
406		- boolean selectmode = display.DrawMode() == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	524	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
407	525
408	526	//System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
409	527	if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
410	528	{
411	529	//gl.glBegin(gl.GL_TRIANGLES);
412		- boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	530	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	531	+ // TEST LIVE NORMALS && !obj.dontselect
	532	+ ;
413	533	if (!hasnorm)
414	534	{
415		- // System.out.println("FUCK!!");
	535	+ // System.out.println("Mesh normal");
416	536	LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
417	537	LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
418	538	LA.vecCross(obj.v0, obj.v1, obj.v2);
..	..	@@ -566,8 +686,819 @@
566	686	}
567	687	}
568	688
	689	+ /**
	690	+ * <code>draw</code> renders a <code>TriMesh</code> object including
	691	+ * it's normals, colors, textures and vertices.
	692	+ *
	693	+ * @see Renderer#draw(TriMesh)
	694	+ * @param tris
	695	+ * the mesh to render.
	696	+ */
	697	+ public void DrawParticles(TriMesh geo, Object3D shape, boolean selected, boolean rotate) // TriMesh tris)
	698	+ {
	699	+ CameraPane display = this;
	700	+
	701	+ float r = display.modelParams0[0];
	702	+ float g = display.modelParams0[1];
	703	+ float b = display.modelParams0[2];
	704	+ float opacity = display.modelParams5[1];
	705	+
	706	+ //final GL gl = GLU.getCurrentGL();
	707	+ GL gl = display.GetGL(); // getGL();
	708	+
	709	+ FloatBuffer vertBuf = geo.vertBuf;
	710	+
	711	+ int v = vertBuf.capacity();
	712	+
	713	+ int count = 0;
	714	+
	715	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	716	+ gl.glEnable(gl.GL_CULL_FACE);
	717	+ // gl.glScalef(1.0f/1024,1.0f/1024,1.0f/1024);
	718	+ for (int i=0; i<v/3; i++)
	719	+ {
	720	+ int index3 = i*3;
	721	+
	722	+ if (geo.sizeBuf.get(index3+1) == 0)
	723	+ continue;
	724	+
	725	+ count++;
	726	+
	727	+ int index4 = i*4;
	728	+
	729	+ float tx = vertBuf.get(index3);
	730	+ float ty = vertBuf.get(index3+1);
	731	+ float tz = vertBuf.get(index3+2);
	732	+
	733	+ // if (tx == 0 && ty == 0 && tz == 0)
	734	+ // continue;
	735	+
	736	+ gl.glMatrixMode(gl.GL_TEXTURE);
	737	+ gl.glPushMatrix();
	738	+
	739	+ float[] texmat = geo.texmat;
	740	+ texmat[12] = texmat[13] = texmat[14] = i;
	741	+
	742	+ gl.glMultMatrixf(texmat, 0);
	743	+
	744	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	745	+ gl.glPushMatrix();
	746	+
	747	+ gl.glTranslatef(tx,ty,tz);
	748	+
	749	+ if (rotate)
	750	+ gl.glRotatef(i, 0, 1, 0);
	751	+
	752	+ float size = geo.sizeBuf.get(index3) / 100;
	753	+ gl.glScalef(size,size,size);
	754	+
	755	+ float cr = geo.colorBuf.get(index4);
	756	+ float cg = geo.colorBuf.get(index4+1);
	757	+ float cb = geo.colorBuf.get(index4+2);
	758	+ float ca = geo.colorBuf.get(index4+3);
	759	+
	760	+ display.modelParams0[0] = r * cr;
	761	+ display.modelParams0[1] = g * cg;
	762	+ display.modelParams0[2] = b * cb;
	763	+
	764	+ display.modelParams5[1] = opacity * ca;
	765	+
	766	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	767	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	768	+
	769	+ RandomNode.globalseed = (int)geo.sizeBuf.get(index3+2); // i;
	770	+ RandomNode.globalseed2 = RandomNode.globalseed;
	771	+
	772	+// gl.glColor4f(cr,cg,cb,ca);
	773	+ // gl.glScalef(1024/16,1024/16,1024/16);
	774	+ shape.Draw/Node/(display,null,selected,false); // blocked
	775	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	776	+ //gl.glTranslatef(-tx,-ty,-tz);
	777	+ gl.glPopMatrix();
	778	+
	779	+ gl.glMatrixMode(gl.GL_TEXTURE);
	780	+ gl.glPopMatrix();
	781	+ }
	782	+ // gl.glScalef(1024,1024,1024);
	783	+ if (!cf)
	784	+ gl.glDisable(gl.GL_CULL_FACE);
	785	+
	786	+ display.modelParams0[0] = r;
	787	+ display.modelParams0[1] = g;
	788	+ display.modelParams0[2] = b;
	789	+
	790	+ display.modelParams5[1] = opacity;
	791	+
	792	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	793	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	794	+
	795	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	796	+
	797	+// System.err.println("total = " + v/3 + "; displayed = " + count);
	798	+ if (true)
	799	+ return;
	800	+
	801	+//// if (!tris.predraw(this))
	802	+//// {
	803	+//// return;
	804	+//// }
	805	+//// if (Debug.stats)
	806	+//// {
	807	+//// StatCollector.addStat(StatType.STAT_TRIANGLE_COUNT, tris.getTriangleCount());
	808	+//// StatCollector.addStat(StatType.STAT_VERTEX_COUNT, tris.getVertexCount());
	809	+//// StatCollector.addStat(StatType.STAT_GEOM_COUNT, 1);
	810	+//// }
	811	+////
	812	+//// if (tris.getDisplayListID() != -1)
	813	+//// {
	814	+//// renderDisplayList(tris);
	815	+//// return;
	816	+//// }
	817	+////
	818	+//// if (!generatingDisplayList)
	819	+//// {
	820	+//// applyStates(tris.states, tris);
	821	+//// }
	822	+//// if (Debug.stats)
	823	+//// {
	824	+//// StatCollector.startStat(StatType.STAT_RENDER_TIMER);
	825	+//// }
	826	+//// boolean transformed = doTransforms(tris);
	827	+//
	828	+// int glMode = GL.GL_TRIANGLES;
	829	+// switch (getMode())
	830	+// {
	831	+// case Triangles:
	832	+// glMode = GL.GL_TRIANGLES;
	833	+// break;
	834	+// case Strip:
	835	+// glMode = GL.GL_TRIANGLE_STRIP;
	836	+// break;
	837	+// case Fan:
	838	+// glMode = GL.GL_TRIANGLE_FAN;
	839	+// break;
	840	+// }
	841	+//
	842	+// if (!predrawGeometry(gl))
	843	+// {
	844	+// // make sure only the necessary indices are sent through on old
	845	+// // cards.
	846	+// IntBuffer indices = this.getIndexBuffer();
	847	+// if (indices == null)
	848	+// {
	849	+// logger.severe("missing indices on geometry object: " + this.toString());
	850	+// } else
	851	+// {
	852	+// indices.rewind();
	853	+// indices.limit(this.getMaxIndex());
	854	+//
	855	+// gl.glDrawElements(glMode, indices.limit(), GL.GL_UNSIGNED_INT, indices); // TODO Check <count> and assumed <type> of GL_UNSIGNED_INT
	856	+//
	857	+// indices.clear();
	858	+// }
	859	+// } else
	860	+// {
	861	+// gl.glDrawElements(glMode, this.getIndexBuffer().limit(),
	862	+// GL.GL_UNSIGNED_INT, 0);
	863	+// }
	864	+//
	865	+//// postdrawGeometry(tris);
	866	+//// if (transformed)
	867	+//// {
	868	+//// undoTransforms(tris);
	869	+//// }
	870	+////
	871	+//// if (Debug.stats)
	872	+//// {
	873	+//// StatCollector.endStat(StatType.STAT_RENDER_TIMER);
	874	+//// }
	875	+//// tris.postdraw(this);
	876	+ }
	877	+
	878	+ static Camera localcamera = new Camera();
	879	+ static cVector from = new cVector();
	880	+ static cVector to = new cVector();
	881	+
	882	+ public void PrepOcclusion(BoundaryRep br, double[][] transform)
	883	+ {
	884	+ CameraPane cp = this;
	885	+
	886	+ Camera keep = cp.RenderCamera();
	887	+ cp.renderCamera = localcamera;
	888	+
	889	+ if (br.trimmed)
	890	+ {
	891	+ float[] colors = new float[br.positions.length / 3];
	892	+
	893	+ int i3 = 0;
	894	+ for (int i = 0; i < br.positions.length / 3; i++, i3 += 3)
	895	+ {
	896	+ if (br.normals[i3] == 0 && br.normals[i3+1] == 0 && br.normals[i3+2] == 0)
	897	+ continue;
	898	+
	899	+ from.set(br.positions[i3], br.positions[i3 + 1], br.positions[i3 + 2]);
	900	+ to.set(br.positions[i3] + br.normals[i3],
	901	+ br.positions[i3 + 1] + br.normals[i3 + 1],
	902	+ br.positions[i3 + 2] + br.normals[i3 + 2]);
	903	+ LA.xformPos(from, transform, from);
	904	+ LA.xformPos(to, transform, to); // RIGID ONLY
	905	+ localcamera.setAim(from, to);
	906	+
	907	+ CameraPane.occlusionbuffer.display();
	908	+
	909	+ if (CameraPane.DEBUG_OCCLUSION)
	910	+ cp.display(); // debug
	911	+
	912	+ colors[i] = cp.vertexOcclusion.r;
	913	+ //colors[i3 + 1] = cp.vertexOcclusion.g;
	914	+ //colors[i3 + 2] = cp.vertexOcclusion.b;
	915	+
	916	+ if ((i % 100) == 0 && i != 0)
	917	+ {
	918	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	919	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	920	+ System.out.println((int) (100.0 * i / (br.positions.length / 3)) + "% (" + i + " of " + (br.positions.length / 3) + ")");
	921	+ }
	922	+ }
	923	+
	924	+ br.colors = colors;
	925	+ }
	926	+ else
	927	+ {
	928	+ for (int i = 0; i < br.VertexCount(); i++)
	929	+ {
	930	+ Vertex v = br.GetVertex(i);
	931	+
	932	+ if (v.norm == null \|\| v.norm.x == 0 && v.norm.y == 0 && v.norm.z == 0)
	933	+ continue;
	934	+
	935	+ from.set(v.x, v.y, v.z);
	936	+ to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
	937	+ LA.xformPos(from, transform, from);
	938	+ LA.xformPos(to, transform, to); // RIGID ONLY
	939	+ localcamera.setAim(from, to);
	940	+
	941	+ CameraPane.occlusionbuffer.display();
	942	+
	943	+ if (CameraPane.DEBUG_OCCLUSION)
	944	+ cp.display(); // debug
	945	+
	946	+ v.AO = cp.vertexOcclusion.r;
	947	+
	948	+ if ((i % 100) == 0 && i != 0)
	949	+ {
	950	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	951	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	952	+ System.out.println((int) (100.0 * i / br.VertexCount()) + "% (" + i + " of " + br.VertexCount() + ")");
	953	+ }
	954	+ }
	955	+ }
	956	+
	957	+ //System.out.println("done.");
	958	+
	959	+ cp.renderCamera = keep;
	960	+ }
	961	+
	962	+ void DrawPointFLow(PointFlow pointFlow, Object3D /Composite/ root, boolean selected, boolean blocked)
	963	+ {
	964	+ CameraPane display = this;
	965	+ pointFlow.CreateHT();
	966	+
	967	+ float r = display.modelParams0[0];
	968	+ float g = display.modelParams0[1];
	969	+ float b = display.modelParams0[2];
	970	+ float opacity = display.modelParams5[1];
	971	+
	972	+ //final GL gl = GLU.getCurrentGL();
	973	+ GL gl = display.GetGL(); // getGL();
	974	+
	975	+ int s = pointFlow.points.size();
	976	+
	977	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	978	+ gl.glEnable(gl.GL_CULL_FACE);
	979	+
	980	+ for (int i=s; --i>=0;)
	981	+ //for (int i=0; i<s; i++)
	982	+ {
	983	+ cVector v = pointFlow.points.get(i);
	984	+
	985	+ double mindist = Double.MAX_VALUE;
	986	+
	987	+ double size = pointFlow.minimumSize;
	988	+
	989	+ double distancenext = 0;
	990	+
	991	+ if (i > 0)
	992	+ {
	993	+ cVector w = pointFlow.points.get(i-1);
	994	+
	995	+ double dist = w.distance(v);
	996	+
	997	+ distancenext = dist;
	998	+
	999	+ if (mindist > dist)
	1000	+ {
	1001	+ mindist = dist;
	1002	+ size = mindist*pointFlow.resizefactor;
	1003	+ }
	1004	+ }
	1005	+
	1006	+ if (i < s-1)
	1007	+ {
	1008	+ cVector w = pointFlow.points.get(i+1);
	1009	+
	1010	+ double dist = w.distance(v);
	1011	+
	1012	+ if (mindist > dist)
	1013	+ {
	1014	+ mindist = dist;
	1015	+ size = mindist*pointFlow.resizefactor;
	1016	+ }
	1017	+ }
	1018	+
	1019	+ if (size < pointFlow.minimumSize)
	1020	+ size = pointFlow.minimumSize;
	1021	+ if (size > pointFlow.maximumSize)
	1022	+ size = pointFlow.maximumSize;
	1023	+
	1024	+ double tx = v.x;
	1025	+ double ty = v.y;
	1026	+ double tz = v.z;
	1027	+
	1028	+ // if (tx == 0 && ty == 0 && tz == 0)
	1029	+ // continue;
	1030	+
	1031	+ gl.glMatrixMode(gl.GL_TEXTURE);
	1032	+ gl.glPushMatrix();
	1033	+ pointFlow.texmat[12] = pointFlow.texmat[13] = pointFlow.texmat[14] = i;
	1034	+
	1035	+ gl.glMultMatrixf(pointFlow.texmat, 0);
	1036	+
	1037	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	1038	+ gl.glPushMatrix();
	1039	+
	1040	+ gl.glTranslated(tx,ty,tz);
	1041	+
	1042	+ gl.glScaled(size,size,size);
	1043	+
	1044	+// float cr = colorBuf.get(index4);
	1045	+// float cg = colorBuf.get(index4+1);
	1046	+// float cb = colorBuf.get(index4+2);
	1047	+// float ca = colorBuf.get(index4+3);
	1048	+//
	1049	+// display.modelParams0[0] = r * cr;
	1050	+// display.modelParams0[1] = g * cg;
	1051	+// display.modelParams0[2] = b * cb;
	1052	+//
	1053	+// display.modelParams5[1] = opacity * ca;
	1054	+//
	1055	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1056	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1057	+//
	1058	+// RandomNode.globalseed = (int)sizeBuf.get(index3+2); // i;
	1059	+// RandomNode.globalseed2 = RandomNode.globalseed;
	1060	+//
	1061	+//// gl.glColor4f(cr,cg,cb,ca);
	1062	+// // gl.glScalef(1024/16,1024/16,1024/16);
	1063	+ pointFlow.geo.Draw/Node/(display,null,selected, blocked);
	1064	+
	1065	+ gl.glPopMatrix();
	1066	+
	1067	+ double step = size/4; //
	1068	+
	1069	+ if (i == 0 \|\| size == 0 \|\| distancenext > 8*size \|\| distancenext < step)
	1070	+ continue;
	1071	+
	1072	+ int nbsteps = (int)(distancenext/step);
	1073	+
	1074	+ step = distancenext/nbsteps;
	1075	+
	1076	+ cVector next = pointFlow.points.get(i-1);
	1077	+
	1078	+ tmp.set(next);
	1079	+ tmp.sub(v);
	1080	+ tmp.normalize();
	1081	+ tmp.mul(step);
	1082	+
	1083	+ // calculate next size
	1084	+ mindist = Double.MAX_VALUE;
	1085	+
	1086	+ double nextsize = pointFlow.minimumSize;
	1087	+
	1088	+ if (i > 1)
	1089	+ {
	1090	+ cVector w = pointFlow.points.get(i-2);
	1091	+
	1092	+ double dist = w.distance(next);
	1093	+
	1094	+ if (mindist > dist)
	1095	+ {
	1096	+ mindist = dist;
	1097	+ nextsize = mindist*pointFlow.resizefactor;
	1098	+ }
	1099	+ }
	1100	+
	1101	+ double dist = v.distance(next);
	1102	+
	1103	+ if (mindist > dist)
	1104	+ {
	1105	+ mindist = dist;
	1106	+ nextsize = mindist*pointFlow.resizefactor;
	1107	+ }
	1108	+
	1109	+ if (nextsize < pointFlow.minimumSize)
	1110	+ nextsize = pointFlow.minimumSize;
	1111	+ if (nextsize > pointFlow.maximumSize)
	1112	+ nextsize = pointFlow.maximumSize;
	1113	+ //
	1114	+
	1115	+ double count = 0;
	1116	+
	1117	+ while (distancenext > 0.000000001) // step
	1118	+ {
	1119	+ gl.glPushMatrix();
	1120	+
	1121	+ gl.glTranslated(tx + tmp.xcount, ty + tmp.ycount, tz + tmp.z*count);
	1122	+
	1123	+ double K = count/nbsteps;
	1124	+
	1125	+ double intersize = Knextsize + (1-K)size;
	1126	+
	1127	+ gl.glScaled(intersize,intersize,intersize);
	1128	+
	1129	+ pointFlow.geo.Draw/Node/(display,null,selected,blocked);
	1130	+
	1131	+ count++;
	1132	+
	1133	+ distancenext -= step;
	1134	+
	1135	+ gl.glPopMatrix();
	1136	+ }
	1137	+
	1138	+ if (count != nbsteps)
	1139	+ assert(count == nbsteps);
	1140	+
	1141	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	1142	+ //gl.glTranslatef(-tx,-ty,-tz);
	1143	+
	1144	+ gl.glMatrixMode(gl.GL_TEXTURE);
	1145	+ gl.glPopMatrix();
	1146	+ }
	1147	+
	1148	+ if (!cf)
	1149	+ gl.glDisable(gl.GL_CULL_FACE);
	1150	+
	1151	+// display.modelParams0[0] = r;
	1152	+// display.modelParams0[1] = g;
	1153	+// display.modelParams0[2] = b;
	1154	+//
	1155	+// display.modelParams5[1] = opacity;
	1156	+//
	1157	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1158	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1159	+
	1160	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	1161	+ }
	1162	+
	1163	+ public void DrawBox(cVector min, cVector max)
	1164	+ {
	1165	+ javax.media.opengl.GL gl = GetGL();
	1166	+ gl.glBegin(gl.GL_LINES);
	1167	+
	1168	+ gl.glVertex3d(min.x, min.y, min.z);
	1169	+ gl.glVertex3d(min.x, min.y, max.z);
	1170	+ gl.glVertex3d(min.x, min.y, min.z);
	1171	+ gl.glVertex3d(min.x, max.y, min.z);
	1172	+ gl.glVertex3d(min.x, min.y, min.z);
	1173	+ gl.glVertex3d(max.x, min.y, min.z);
	1174	+
	1175	+ gl.glVertex3d(max.x, max.y, max.z);
	1176	+ gl.glVertex3d(min.x, max.y, max.z);
	1177	+ gl.glVertex3d(max.x, max.y, max.z);
	1178	+ gl.glVertex3d(max.x, min.y, max.z);
	1179	+ gl.glVertex3d(max.x, max.y, max.z);
	1180	+ gl.glVertex3d(max.x, max.y, min.z);
	1181	+
	1182	+ gl.glEnd();
	1183	+ }
	1184	+
	1185	+ public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
	1186	+ {
	1187	+ int[] strips = bRep.getRawIndices();
	1188	+
	1189	+ javax.media.opengl.GL gl = GetGL();
	1190	+
	1191	+ // TRIANGLE STRIP ARRAY
	1192	+ if (bRep.trimmed)
	1193	+ {
	1194	+ float[] v = bRep.getRawVertices();
	1195	+ float[] n = bRep.getRawNormals();
	1196	+ float[] c = bRep.getRawColors();
	1197	+ float[] uv = bRep.getRawUVMap();
	1198	+
	1199	+ int count2 = 0;
	1200	+ int count3 = 0;
	1201	+
	1202	+ if (n.length > 0)
	1203	+ {
	1204	+ for (int i = 0; i < strips.length; i++)
	1205	+ {
	1206	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1207	+
	1208	+ /*
	1209	+ boolean locked = false;
	1210	+ float eps = 0.1f;
	1211	+ boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	1212	+
	1213	+ int dot = 0;
	1214	+
	1215	+ if ((dot&1) == 0)
	1216	+ dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	1217	+
	1218	+ if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	1219	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	1220	+ else
	1221	+ {
	1222	+ locked = true;
	1223	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1224	+ }
	1225	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	1226	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	1227	+ if (hasnorm)
	1228	+ {
	1229	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	1230	+ gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
	1231	+ }
	1232	+
	1233	+ if ((dot&4) == 0)
	1234	+ dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	1235	+
	1236	+ if (wrap \|\| !locked && (dot&8) != 0)
	1237	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	1238	+ else
	1239	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1240	+
	1241	+ f.dot = dot;
	1242	+ */
	1243	+
	1244	+ if (!selectmode)
	1245	+ {
	1246	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1247	+ {
	1248	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1249	+ } else
	1250	+ {
	1251	+ gl.glNormal3f(0, 0, 1);
	1252	+ }
	1253	+
	1254	+ if (c != null)
	1255	+ //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
	1256	+ {
	1257	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1258	+ }
	1259	+ }
	1260	+
	1261	+ if (flipV)
	1262	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1263	+ else
	1264	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1265	+
	1266	+ //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1267	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1268	+
	1269	+ count2 += 2;
	1270	+ count3 += 3;
	1271	+ if (!selectmode)
	1272	+ {
	1273	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1274	+ {
	1275	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1276	+ } else
	1277	+ {
	1278	+ gl.glNormal3f(0, 0, 1);
	1279	+ }
	1280	+ if (c != null)
	1281	+ {
	1282	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1283	+ }
	1284	+ }
	1285	+
	1286	+ if (flipV)
	1287	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1288	+ else
	1289	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1290	+
	1291	+ //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1292	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1293	+
	1294	+ count2 += 2;
	1295	+ count3 += 3;
	1296	+ for (int j = 0; j < strips[i] - 2; j++)
	1297	+ {
	1298	+ //gl.glTexCoord2d(...);
	1299	+ if (!selectmode)
	1300	+ {
	1301	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1302	+ {
	1303	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1304	+ } else
	1305	+ {
	1306	+ gl.glNormal3f(0, 0, 1);
	1307	+ }
	1308	+ if (c != null)
	1309	+ {
	1310	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1311	+ }
	1312	+ }
	1313	+
	1314	+ if (flipV)
	1315	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1316	+ else
	1317	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1318	+
	1319	+ //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
	1320	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1321	+
	1322	+ count2 += 2;
	1323	+ count3 += 3;
	1324	+ }
	1325	+
	1326	+ gl.glEnd();
	1327	+ }
	1328	+ }
	1329	+
	1330	+ assert count3 == v.length;
	1331	+ }
	1332	+ else // !trimmed
	1333	+ {
	1334	+ int count = 0;
	1335	+ for (int i = 0; i < strips.length; i++)
	1336	+ {
	1337	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1338	+
	1339	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	1340	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	1341	+
	1342	+ drawVertex(gl, p, flipV, selectmode);
	1343	+ drawVertex(gl, q, flipV, selectmode);
	1344	+
	1345	+ for (int j = 0; j < strips[i] - 2; j++)
	1346	+ {
	1347	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	1348	+
	1349	+ // if (j%2 == 0)
	1350	+ // drawFace(p, q, r, display, null);
	1351	+ // else
	1352	+ // drawFace(p, r, q, display, null);
	1353	+
	1354	+ // p = q;
	1355	+ // q = r;
	1356	+ drawVertex(gl, r, flipV, selectmode);
	1357	+ }
	1358	+
	1359	+ gl.glEnd();
	1360	+ }
	1361	+ }
	1362	+ }
	1363	+
	1364	+ static cSpring.Point3D temp = new cSpring.Point3D();
	1365	+ static cSpring.Point3D temp2 = new cSpring.Point3D();
	1366	+ static cSpring.Point3D temp3 = new cSpring.Point3D();
	1367	+
	1368	+ public void DrawDynamicMesh(cMesh mesh)
	1369	+ {
	1370	+ GL gl = GetGL(); // getGL();
	1371	+
	1372	+ cSpring.PhysicsController3D Phys = mesh.Phys;
	1373	+
	1374	+ gl.glDisable(gl.GL_LIGHTING);
	1375	+
	1376	+ gl.glLineWidth(1);
	1377	+ gl.glColor3f(1,1,1);
	1378	+ gl.glBegin(gl.GL_LINES);
	1379	+ double scale = 0;
	1380	+ int count = 0;
	1381	+ for (int s=0; s<Phys.allSprings.size(); s++)
	1382	+ {
	1383	+ cSpring.Spring spring = Phys.allSprings.get(s);
	1384	+ if(s == 0)
	1385	+ {
	1386	+ //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
	1387	+ }
	1388	+ if (mesh.showsprings)
	1389	+ {
	1390	+ temp.set(spring.a.position);
	1391	+ temp.add(spring.b.position);
	1392	+ temp.mul(0.5);
	1393	+ temp2.set(spring.a.position);
	1394	+ temp2.sub(spring.b.position);
	1395	+ temp2.mul(spring.restLength/2);
	1396	+ temp.sub(temp2);
	1397	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1398	+ temp.add(temp2);
	1399	+ temp.add(temp2);
	1400	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1401	+ }
	1402	+
	1403	+ if (spring.isHandle)
	1404	+ continue;
	1405	+
	1406	+ //if (scale < spring.restLength)
	1407	+ scale += spring.restLength;
	1408	+ count++;
	1409	+ }
	1410	+ gl.glEnd();
	1411	+
	1412	+ if (count == 0)
	1413	+ scale = 0.01;
	1414	+ else
	1415	+ scale /= count * 3;
	1416	+
	1417	+ //scale = 0.25;
	1418	+
	1419	+ if (mesh.ShowInfo())
	1420	+ {
	1421	+ gl.glLineWidth(4);
	1422	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1423	+ {
	1424	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1425	+ if (node.mass == 0)
	1426	+ continue;
	1427	+
	1428	+ int i = node.springs==null?-1:node.springs.size();
	1429	+ gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
	1430	+ //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
	1431	+ //temp.normalize();
	1432	+ //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
	1433	+ gl.glBegin(gl.GL_LINES);
	1434	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1435	+ //gl.glVertex3d(node.position.x + node.normal.xscale, node.position.y + node.normal.yscale, node.position.z + node.normal.z*scale);
	1436	+ gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
	1437	+ node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
	1438	+ node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
	1439	+ gl.glEnd();
	1440	+ }
	1441	+
	1442	+ gl.glLineWidth(8);
	1443	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1444	+ {
	1445	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1446	+
	1447	+ if (node.springs != null)
	1448	+ {
	1449	+ for (int i=0; i<node.springs.size(); i+=1)
	1450	+ {
	1451	+ cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
	1452	+
	1453	+ int c = i+1;
	1454	+ // c = node.springs.get(i).nbcopies;
	1455	+
	1456	+ gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
	1457	+ gl.glBegin(gl.GL_LINES);
	1458	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1459	+ 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);
	1460	+ gl.glEnd();
	1461	+ }
	1462	+ }
	1463	+ }
	1464	+
	1465	+ gl.glLineWidth(1);
	1466	+ }
	1467	+
	1468	+ gl.glEnable(gl.GL_LIGHTING);
	1469	+ }
	1470	+
569	1471	/// INTERFACE
570	1472
	1473	+ public void StartTriangles()
	1474	+ {
	1475	+ javax.media.opengl.GL gl = GetGL();
	1476	+ gl.glBegin(gl.GL_TRIANGLES);
	1477	+ }
	1478	+
	1479	+ public void EndTriangles()
	1480	+ {
	1481	+ GetGL().glEnd();
	1482	+ }
	1483	+
	1484	+ void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
	1485	+ {
	1486	+ if (!selectmode)
	1487	+ {
	1488	+ gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1489	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	1490	+
	1491	+ if (flipV)
	1492	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	1493	+ else
	1494	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1495	+ }
	1496	+
	1497	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	1498	+ }
	1499	+
	1500	+ float[] colorV = new float[4];
	1501	+
571	1502	void SetColor(Object3D obj, Vertex p0)
572	1503	{
573	1504	CameraPane display = this;
..	..	@@ -635,8 +1566,6 @@
635	1566	{
636	1567	return;
637	1568	}
638		-
639		- float[] colorV = new float[3];
640	1569
641	1570	if (false) // marked)
642	1571	{
..	..	@@ -745,7 +1674,7 @@
745	1674	// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
746	1675	}
747	1676
748		- void DrawMaterial(cMaterial material, boolean selected)
	1677	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
749	1678	{
750	1679	CameraPane display = this;
751	1680	//new Exception().printStackTrace();
..	..	@@ -761,18 +1690,18 @@
761	1690	//col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
762	1691	if (!material.multiply)
763	1692	{
764		- display.color = color;
	1693	+ display.color = material.color;
765	1694	display.saturation = material.modulation;
766	1695	}
767	1696	else
768	1697	{
769		- display.color = color2;
	1698	+ display.color = material.color2;
770	1699	display.saturation = material.modulation2;
771	1700	}
772	1701
773	1702	cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
774	1703
775		- float[] colorV = GrafreeD.colorV;
	1704	+ float[] colorV = Grafreed.colorV;
776	1705
777	1706	/**/
778	1707	if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
..	..	@@ -780,7 +1709,7 @@
780	1709	colorV[0] = display.modelParams0[0] * material.diffuse;
781	1710	colorV[1] = display.modelParams0[1] * material.diffuse;
782	1711	colorV[2] = display.modelParams0[2] * material.diffuse;
783		- colorV[3] = material.opacity;
	1712	+ colorV[3] = 1; // material.opacity;
784	1713
785	1714	gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
786	1715	//System.out.println("Opacity = " + opacity);
..	..	@@ -888,9 +1817,9 @@
888	1817	display.modelParams7[2] = 0;
889	1818	display.modelParams7[3] = 0;
890	1819
891		- display.modelParams6[0] = 100; // criss de bug de bump
	1820	+ //display.modelParams6[0] = 100; // criss de bug de bump
892	1821
893		- Object3D.cVector2[] extparams = display.vector2buffer;
	1822	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
894	1823	if (extparams != null && extparams.length > 0 && extparams[0] != null)
895	1824	{
896	1825	display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
..	..	@@ -1032,7 +1961,7 @@
1032	1961	void PushMatrix(double[][] matrix)
1033	1962	{
1034	1963	// GrafreeD.tracein(matrix);
1035		- PushMatrix(matrix,1);
	1964	+ PushMatrix(matrix, 1);
1036	1965	}
1037	1966
1038	1967	void PushMatrix()
..	..	@@ -1129,7 +2058,7 @@
1129	2058
1130	2059	static int camerachangeframe;
1131	2060
1132		- boolean SetCamera(Camera cam)
	2061	+ public boolean SetCamera(Camera cam)
1133	2062	{
1134	2063	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
1135	2064	// return false;
..	..	@@ -1186,7 +2115,7 @@
1186	2115	//System.err.println("Oeil on");
1187	2116	OEIL = true;
1188	2117	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
1189		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2118	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
1190	2119	//pingthread.StepToTarget(true);
1191	2120	}
1192	2121
..	..	@@ -1257,33 +2186,6 @@
1257	2186	mainDL ^= true;
1258	2187	}
1259	2188
1260		- void ToggleTexture()
1261		- {
1262		- textureon ^= true;
1263		- }
1264		-
1265		- void ToggleLive()
1266		- {
1267		- Globals.setLIVE(Globals.isLIVE() ^ true);
1268		-
1269		- System.err.println("LIVE = " + Globals.isLIVE());
1270		-
1271		- if (!Globals.isLIVE()) // save sound
1272		- GrafreeD.savesound = true; // wav.save();
1273		- // else
1274		- repaint(); // start loop // may 2013
1275		- }
1276		-
1277		- void ToggleSupport()
1278		- {
1279		- SUPPORT ^= true;
1280		- }
1281		-
1282		- void ToggleAbort()
1283		- {
1284		- ABORTMODE ^= true;
1285		- }
1286		-
1287	2189	void ToggleFullScreen()
1288	2190	{
1289	2191	FULLSCREEN ^= true;
..	..	@@ -1294,72 +2196,94 @@
1294	2196	Globals.CROWD ^= true;
1295	2197	}
1296	2198
1297		- void ToggleInertia()
1298		- {
1299		- INERTIA ^= true;
1300		- }
1301		-
1302	2199	void ToggleLocal()
1303	2200	{
1304	2201	LOCALTRANSFORM ^= true;
1305	2202	}
1306	2203
1307		- void ToggleFast()
	2204	+ public void ToggleTexture()
	2205	+ {
	2206	+ textureon ^= true;
	2207	+ }
	2208	+
	2209	+ public void ToggleLive()
	2210	+ {
	2211	+ Globals.setLIVE(Globals.isLIVE() ^ true);
	2212	+
	2213	+ System.err.println("LIVE = " + Globals.isLIVE());
	2214	+
	2215	+ if (!Globals.isLIVE()) // save sound
	2216	+ Grafreed.savesound = true; // wav.save();
	2217	+ // else
	2218	+ repaint(); // start loop // may 2013
	2219	+ }
	2220	+
	2221	+ public void ToggleSupport()
	2222	+ {
	2223	+ SUPPORT ^= true;
	2224	+ }
	2225	+
	2226	+ public void ToggleAbort()
	2227	+ {
	2228	+ ABORTMODE ^= true;
	2229	+ }
	2230	+
	2231	+ public void ToggleInertia()
	2232	+ {
	2233	+ INERTIA ^= true;
	2234	+ }
	2235	+
	2236	+ public void ToggleFast()
1308	2237	{
1309	2238	FAST ^= true;
1310	2239	}
1311	2240
1312		- void ToggleSlowPose()
	2241	+ public void ToggleSlowPose()
1313	2242	{
1314	2243	SLOWPOSE ^= true;
1315	2244	}
1316	2245
1317		- void ToggleFootContact()
1318		- {
1319		- FOOTCONTACT ^= true;
1320		- }
1321		-
1322		- void ToggleBoxMode()
	2246	+ public void ToggleBoxMode()
1323	2247	{
1324	2248	BOXMODE ^= true;
1325	2249	}
1326	2250
1327		- void ToggleSmoothFocus()
	2251	+ public void ToggleZoomBoxMode()
	2252	+ {
	2253	+ ZOOMBOXMODE ^= true;
	2254	+ }
	2255	+
	2256	+ public void ToggleSmoothFocus()
1328	2257	{
1329	2258	SMOOTHFOCUS ^= true;
1330	2259	}
1331	2260
1332		- void ToggleImageFlip()
	2261	+ public void ToggleImageFlip()
1333	2262	{
1334	2263	IMAGEFLIP ^= true;
1335	2264	}
1336	2265
1337		- void ToggleSpeakerMocap()
	2266	+ public void ToggleSpeakerMocap()
1338	2267	{
1339	2268	SPEAKERMOCAP ^= true;
1340	2269	}
1341	2270
1342		- void ToggleSpeakerCamera()
	2271	+ public void ToggleSpeakerCamera()
1343	2272	{
1344	2273	SPEAKERCAMERA ^= true;
1345	2274	}
1346	2275
1347		- void ToggleSpeakerFocus()
	2276	+ public void ToggleSpeakerFocus()
1348	2277	{
1349	2278	SPEAKERFOCUS ^= true;
1350	2279	}
1351	2280
1352		- void ToggleDebug()
1353		- {
1354		- DEBUG ^= true;
1355		- }
1356		-
1357		- void ToggleFrustum()
	2281	+ public void ToggleFrustum()
1358	2282	{
1359	2283	FRUSTUM ^= true;
1360	2284	}
1361	2285
1362		- void ToggleTrack()
	2286	+ public void ToggleTrack()
1363	2287	{
1364	2288	TRACK ^= true;
1365	2289	if (TRACK)
..	..	@@ -1378,25 +2302,35 @@
1378	2302	repaint();
1379	2303	}
1380	2304
1381		- void ToggleTrackOnce()
	2305	+ public void ToggleTrackOnce()
1382	2306	{
1383	2307	TRACKONCE ^= true;
1384	2308	}
1385	2309
1386		- void ToggleShadowTrack()
	2310	+ public void ToggleShadowTrack()
1387	2311	{
1388	2312	SHADOWTRACK ^= true;
1389	2313	repaint();
1390	2314	}
1391	2315
1392		- void ToggleOeil()
	2316	+ public void ToggleOeil()
1393	2317	{
1394	2318	OEIL ^= true;
1395	2319	}
1396	2320
1397		- void ToggleOeilOnce()
	2321	+ public void ToggleOeilOnce()
1398	2322	{
1399	2323	OEILONCE ^= true;
	2324	+ }
	2325	+
	2326	+ void ToggleFootContact()
	2327	+ {
	2328	+ FOOTCONTACT ^= true;
	2329	+ }
	2330	+
	2331	+ void ToggleDebug()
	2332	+ {
	2333	+ Globals.DEBUG ^= true;
1400	2334	}
1401	2335
1402	2336	void ToggleLookAt()
..	..	@@ -1404,9 +2338,9 @@
1404	2338	LOOKAT ^= true;
1405	2339	}
1406	2340
1407		- void ToggleRandom()
	2341	+ void ToggleSwitch()
1408	2342	{
1409		- RANDOM ^= true;
	2343	+ SWITCH ^= true;
1410	2344	}
1411	2345
1412	2346	void ToggleHandles()
..	..	@@ -1414,10 +2348,17 @@
1414	2348	HANDLES ^= true;
1415	2349	}
1416	2350
	2351	+ Object3D paintFolder;
	2352	+
1417	2353	void TogglePaint()
1418	2354	{
1419	2355	PAINTMODE ^= true;
1420	2356	paintcount = 0;
	2357	+
	2358	+ if (PAINTMODE)
	2359	+ {
	2360	+ paintFolder = GetFolder();
	2361	+ }
1421	2362	}
1422	2363
1423	2364	void SwapCamera(int a, int b)
..	..	@@ -1513,7 +2454,22 @@
1513	2454	{
1514	2455	return currentGL;
1515	2456	}
1516		-
	2457	+
	2458	+ static private BufferedImage CreateBim(TextureData texturedata)
	2459	+ {
	2460	+ Grafreed.Assert(texturedata != null);
	2461	+
	2462	+ int width = texturedata.getWidth();
	2463	+ int height = texturedata.getHeight();
	2464	+
	2465	+ Buffer buffer = texturedata.getBuffer();
	2466	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2467	+
	2468	+ byte[] bytes = bytebuf.array();
	2469	+
	2470	+ return CreateBim(bytes, width, height);
	2471	+ }
	2472	+
1517	2473	/**/
1518	2474	class CacheTexture
1519	2475	{
..	..	@@ -1522,28 +2478,31 @@
1522	2478
1523	2479	int resolution;
1524	2480
1525		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2481	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
1526	2482	{
1527		- texture = tex;
	2483	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2484	+ texturedata = texdata;
1528	2485	resolution = res;
1529	2486	}
1530	2487	}
1531	2488	/**/
1532	2489
1533	2490	// TEXTURE static Texture texture;
1534		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
1535		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
1536		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2491	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2492	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2493	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2494	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2495	+
1537	2496	int pigmentdepth = 0;
1538	2497	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
1539	2498	int bumpdepth = 0;
1540	2499	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
1541	2500	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
1542	2501	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
1543		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2502	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
1544	2503	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
1545	2504
1546		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2505	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
1547	2506	{
1548	2507	TextureData texturedata = null;
1549	2508
..	..	@@ -1562,13 +2521,34 @@
1562	2521	if (bump)
1563	2522	texturedata = ConvertBump(texturedata, false);
1564	2523
1565		- com.sun.opengl.util.texture.Texture texture =
1566		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2524	+// com.sun.opengl.util.texture.Texture texture =
	2525	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
1567	2526
1568		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
1569		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2527	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2528	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
1570	2529
1571		- return texture;
	2530	+ return texturedata;
	2531	+ }
	2532	+
	2533	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2534	+ {
	2535	+ TextureData texturedata = null;
	2536	+
	2537	+ try
	2538	+ {
	2539	+ texturedata =
	2540	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2541	+ bim,
	2542	+ true);
	2543	+ } catch (Exception e)
	2544	+ {
	2545	+ throw new javax.media.opengl.GLException(e);
	2546	+ }
	2547	+
	2548	+ if (bump)
	2549	+ texturedata = ConvertBump(texturedata, false);
	2550	+
	2551	+ return texturedata;
1572	2552	}
1573	2553
1574	2554	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -2641,6 +3621,8 @@
2641	3621
2642	3622	System.out.println("LOADING TEXTURE : " + name);
2643	3623
	3624	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3625	+
2644	3626	//
2645	3627	if (false) // compressbit > 0)
2646	3628	{
..	..	@@ -3345,6 +4327,7 @@
3345	4327
3346	4328	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
3347	4329	{
	4330	+ new Exception().printStackTrace();
3348	4331	System.exit(0);
3349	4332	com.sun.opengl.util.texture.Texture texture = null;
3350	4333
..	..	@@ -7038,7 +8021,7 @@
7038	8021	String pigment = Object3D.GetPigment(tex);
7039	8022	String bump = Object3D.GetBump(tex);
7040	8023
7041		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8024	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7042	8025	{
7043	8026	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
7044	8027	// System.out.println("; bump = " + bump);
..	..	@@ -7053,11 +8036,69 @@
7053	8036	pigment = null;
7054	8037	}
7055	8038
7056		- ReleaseTexture(bump, true);
7057		- ReleaseTexture(pigment, false);
	8039	+ ReleaseTexture(tex, true);
	8040	+ ReleaseTexture(tex, false);
7058	8041	}
7059	8042
7060		- void ReleaseTexture(String tex, boolean bump)
	8043	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	8044	+ {
	8045	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8046	+ {
	8047	+ return;
	8048	+ }
	8049	+
	8050	+ if (tex == null)
	8051	+ {
	8052	+ ReleaseTexture(null, false);
	8053	+ return;
	8054	+ }
	8055	+
	8056	+ String pigment = Object3D.GetPigment(tex);
	8057	+
	8058	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8059	+ {
	8060	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8061	+ // System.out.println("; bump = " + bump);
	8062	+ }
	8063	+
	8064	+ if (pigment.equals(""))
	8065	+ {
	8066	+ pigment = null;
	8067	+ }
	8068	+
	8069	+ ReleaseTexture(tex, false);
	8070	+ }
	8071	+
	8072	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8073	+ {
	8074	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8075	+ {
	8076	+ return;
	8077	+ }
	8078	+
	8079	+ if (tex == null)
	8080	+ {
	8081	+ ReleaseTexture(null, true);
	8082	+ return;
	8083	+ }
	8084	+
	8085	+ String bump = Object3D.GetBump(tex);
	8086	+
	8087	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8088	+ {
	8089	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8090	+ // System.out.println("; bump = " + bump);
	8091	+ }
	8092	+
	8093	+ if (bump.equals(""))
	8094	+ {
	8095	+ bump = null;
	8096	+ }
	8097	+
	8098	+ ReleaseTexture(tex, true);
	8099	+ }
	8100	+
	8101	+ void ReleaseTexture(cTexture tex, boolean bump)
7061	8102	{
7062	8103	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7063	8104	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7068,7 +8109,7 @@
7068	8109	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
7069	8110
7070	8111	if (tex != null)
7071		- texture = textures.get(tex);
	8112	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
7072	8113
7073	8114	// //assert( texture != null );
7074	8115	// if (texture == null)
..	..	@@ -7160,7 +8201,55 @@
7160	8201	}
7161	8202	}
7162	8203
7163		- /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
	8204	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
	8205	+ {
	8206	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8207	+// ambientOcclusion ) // \|\| !textureon)
	8208	+// {
	8209	+// return; // false;
	8210	+// }
	8211	+//
	8212	+// if (tex == null)
	8213	+// {
	8214	+// BindTexture(null,false,resolution);
	8215	+// BindTexture(null,true,resolution);
	8216	+// return;
	8217	+// }
	8218	+//
	8219	+// String pigment = Object3D.GetPigment(tex);
	8220	+// String bump = Object3D.GetBump(tex);
	8221	+//
	8222	+// usedtextures.add(pigment);
	8223	+// usedtextures.add(bump);
	8224	+//
	8225	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8226	+// {
	8227	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8228	+// // System.out.println("; bump = " + bump);
	8229	+// }
	8230	+//
	8231	+// if (bump.equals(""))
	8232	+// {
	8233	+// bump = null;
	8234	+// }
	8235	+// if (pigment.equals(""))
	8236	+// {
	8237	+// pigment = null;
	8238	+// }
	8239	+//
	8240	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8241	+// BindTexture(pigment, false, resolution);
	8242	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8243	+// BindTexture(bump, true, resolution);
	8244	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8245	+//
	8246	+// return; // true;
	8247	+
	8248	+ BindPigmentTexture(tex, resolution);
	8249	+ BindBumpTexture(tex, resolution);
	8250	+ }
	8251	+
	8252	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
7164	8253	{
7165	8254	if (// DrawMode() != 0 \|\| /tex == null \|\|/
7166	8255	ambientOcclusion ) // \|\| !textureon)
..	..	@@ -7171,17 +8260,47 @@
7171	8260	if (tex == null)
7172	8261	{
7173	8262	BindTexture(null,false,resolution);
7174		- BindTexture(null,true,resolution);
7175	8263	return;
7176	8264	}
7177	8265
7178	8266	String pigment = Object3D.GetPigment(tex);
	8267	+
	8268	+ usedtextures.add(tex);
	8269	+
	8270	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8271	+ {
	8272	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8273	+ // System.out.println("; bump = " + bump);
	8274	+ }
	8275	+
	8276	+ if (pigment.equals(""))
	8277	+ {
	8278	+ pigment = null;
	8279	+ }
	8280	+
	8281	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8282	+ BindTexture(tex, false, resolution);
	8283	+ }
	8284	+
	8285	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8286	+ {
	8287	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8288	+ ambientOcclusion ) // \|\| !textureon)
	8289	+ {
	8290	+ return; // false;
	8291	+ }
	8292	+
	8293	+ if (tex == null)
	8294	+ {
	8295	+ BindTexture(null,true,resolution);
	8296	+ return;
	8297	+ }
	8298	+
7179	8299	String bump = Object3D.GetBump(tex);
7180	8300
7181		- usedtextures.put(pigment, pigment);
7182		- usedtextures.put(bump, bump);
	8301	+ usedtextures.add(tex);
7183	8302
7184		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8303	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
7185	8304	{
7186	8305	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
7187	8306	// System.out.println("; bump = " + bump);
..	..	@@ -7191,43 +8310,94 @@
7191	8310	{
7192	8311	bump = null;
7193	8312	}
7194		- if (pigment.equals(""))
7195		- {
7196		- pigment = null;
7197		- }
7198	8313
7199		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
7200		- BindTexture(pigment, false, resolution);
7201	8314	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
7202		- BindTexture(bump, true, resolution);
	8315	+ BindTexture(tex, true, resolution);
7203	8316	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
7204		-
7205		- return; // true;
7206	8317	}
7207	8318
7208		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8319	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8320	+
	8321	+ private boolean FileExists(String tex)
7209	8322	{
7210		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8323	+ if (missingTextures.contains(tex))
	8324	+ {
	8325	+ return false;
	8326	+ }
	8327	+
	8328	+ boolean fileExists = new File(tex).exists();
	8329	+
	8330	+ if (!fileExists)
	8331	+ {
	8332	+ // If file exists, the "new File()" is not executed sgain
	8333	+ missingTextures.add(tex);
	8334	+ }
	8335	+
	8336	+ return fileExists;
	8337	+ }
	8338	+
	8339	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
	8340	+ {
	8341	+ CacheTexture texturecache = null;
7211	8342
7212	8343	if (tex != null)
7213	8344	{
7214		- String texname = tex;
	8345	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8346	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
7215	8347
7216		- String[] split = tex.split("Textures");
7217		- if (split.length > 1)
7218		- texname = "/Users/nbriere/Textures" + split[split.length-1];
7219		- else
7220		- if (!texname.startsWith("/"))
7221		- texname = "/Users/nbriere/Textures/" + texname;
	8348	+ if (texname.equals("") && texdata == null)
	8349	+ {
	8350	+ return null;
	8351	+ }
	8352	+
	8353	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8354	+
	8355	+// String[] split = tex.split("Textures");
	8356	+// if (split.length > 1)
	8357	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8358	+// else
	8359	+// if (!texname.startsWith("/"))
	8360	+// texname = "/Users/nbriere/Textures/" + texname;
	8361	+ if (!FileExists(texname))
	8362	+ {
	8363	+ texname = fallbackTextureName;
	8364	+ }
7222	8365
7223	8366	if (CACHETEXTURE)
7224		- texture = textures.get(texname); // TEXTURE CACHE
7225		-
7226		- TextureData texturedata = null;
7227		-
7228		- if (texture == null \|\| texture.resolution < resolution)
7229	8367	{
7230		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8368	+ if (texdata == null)
	8369	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8370	+ else
	8371	+ texturecache = bimtextures.get(texdata);
	8372	+ }
	8373	+
	8374	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8375	+ {
	8376	+ TextureData texturedata = null;
	8377	+
	8378	+ if (texdata != null && textureon)
	8379	+ {
	8380	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8381	+
	8382	+ try
	8383	+ {
	8384	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8385	+ }
	8386	+ catch (Exception e)
	8387	+ {
	8388	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8389	+ }
	8390	+
	8391	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8392	+ bimtextures.put(texdata, texturecache);
	8393	+
	8394	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8395	+
	8396	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8397	+ //bim2 = bim;
	8398	+ }
	8399	+ else
	8400	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
7231	8401	{
7232	8402	assert(!bump);
7233	8403	// if (bump)
..	..	@@ -7238,19 +8408,23 @@
7238	8408	// }
7239	8409	// else
7240	8410	// {
7241		- texture = textures.get(tex);
7242		- if (texture == null)
	8411	+ // texturecache = textures.get(texname); // suspicious
	8412	+ if (texturecache == null)
7243	8413	{
7244		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8414	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
7245	8415	}
	8416	+ else
	8417	+ new Exception().printStackTrace();
7246	8418	// }
7247	8419	} else
7248		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8420	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
7249	8421	{
7250	8422	assert(bump);
7251		- texture = textures.get(tex);
7252		- if (texture == null)
7253		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8423	+ // texturecache = textures.get(texname); // suspicious
	8424	+ if (texturecache == null)
	8425	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8426	+ else
	8427	+ new Exception().printStackTrace();
7254	8428	} else
7255	8429	{
7256	8430	//if (tex.equals("IMMORTAL"))
..	..	@@ -7258,11 +8432,13 @@
7258	8432	// texture = GetResourceTexture("default.png");
7259	8433	//} else
7260	8434	//{
7261		- if (tex.equals("WHITE_NOISE"))
	8435	+ if (texname.endsWith("WHITE_NOISE"))
7262	8436	{
7263		- texture = textures.get(tex);
7264		- if (texture == null)
7265		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8437	+ // texturecache = textures.get(texname); // suspicious
	8438	+ if (texturecache == null)
	8439	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8440	+ else
	8441	+ new Exception().printStackTrace();
7266	8442	} else
7267	8443	{
7268	8444	if (textureon)
..	..	@@ -7287,7 +8463,7 @@
7287	8463	}
7288	8464
7289	8465	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
7290		- if (!new File(cachename).exists())
	8466	+ if (!FileExists(cachename))
7291	8467	cachename = texname;
7292	8468	else
7293	8469	processbump = false; // don't process bump map again
..	..	@@ -7309,7 +8485,7 @@
7309	8485	}
7310	8486
7311	8487	cachename = texname.substring(0, texname.length()-4)+ext+".png";
7312		- if (!new File(cachename).exists())
	8488	+ if (!FileExists(cachename))
7313	8489	cachename = texname;
7314	8490	else
7315	8491	processbump = false; // don't process bump map again
..	..	@@ -7318,20 +8494,22 @@
7318	8494	texturedata = GetFileTexture(cachename, processbump, resolution);
7319	8495
7320	8496
7321		- if (texturedata != null)
7322		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8497	+ if (texturedata == null)
	8498	+ throw new Exception();
	8499	+
	8500	+ texturecache = new CacheTexture(texturedata,resolution);
7323	8501	//texture = GetTexture(tex, bump);
7324	8502	}
7325	8503	}
7326	8504	//}
7327	8505	}
7328	8506
7329		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8507	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
7330	8508	{
7331	8509	//return false;
7332	8510
7333	8511	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
7334		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8512	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
7335	8513	{
7336	8514	// String ext = "_highres";
7337	8515	// if (REDUCETEXTURE)
..	..	@@ -7348,52 +8526,17 @@
7348	8526	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
7349	8527	if (!cachefile.exists())
7350	8528	{
7351		- // cache to disk
7352		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
7353		- //buffers[0].
7354		-
7355		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
7356		- int[] pixels = new int[bytebuf.capacity()/3];
7357		-
7358		- // squared size heuristic...
7359		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8529	+ //if (texturedata.getWidth() == texturedata.getHeight())
7360	8530	{
7361		- for (int i=pixels.length; --i>=0;)
7362		- {
7363		- int i3 = i*3;
7364		- pixels[i] = 0xFF;
7365		- pixels[i] <<= 8;
7366		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
7367		- pixels[i] <<= 8;
7368		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
7369		- pixels[i] <<= 8;
7370		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
7371		- }
7372		-
7373		- /*
7374		- int r=0,g=0,b=0,a=0;
7375		- for (int i=0; i<width; i++)
7376		- for (int j=0; j<height; j++)
7377		- {
7378		- int index = j*width+i;
7379		- int p = pixels[index];
7380		- a = ((p>>24) & 0xFF);
7381		- r = ((p>>16) & 0xFF);
7382		- g = ((p>>8) & 0xFF);
7383		- b = (p & 0xFF);
7384		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
7385		- }
7386		- /**/
7387		- int width = (int)Math.sqrt(pixels.length); // squared
7388		- int height = width;
7389		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
7390		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8531	+ BufferedImage rendImage = CreateBim(texturedata);
	8532	+
7391	8533	ImageWriter writer = null;
7392	8534	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
7393	8535	if (iter.hasNext()) {
7394	8536	writer = (ImageWriter)iter.next();
7395	8537	}
7396		- float compressionQuality = 0.9f;
	8538	+
	8539	+ float compressionQuality = 0.85f;
7397	8540	try
7398	8541	{
7399	8542	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -7410,18 +8553,20 @@
7410	8553	}
7411	8554	}
7412	8555	}
7413		-
	8556	+
	8557	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8558	+
7414	8559	//System.out.println("Texture = " + tex);
7415		- if (textures.containsKey(texname))
	8560	+ if (textures.containsKey(tex))
7416	8561	{
7417		- CacheTexture thetex = textures.get(texname);
	8562	+ CacheTexture thetex = textures.get(tex);
7418	8563	thetex.texture.disable();
7419	8564	thetex.texture.dispose();
7420		- textures.remove(texname);
	8565	+ textures.remove(tex);
7421	8566	}
7422	8567
7423		- texture.texturedata = texturedata;
7424		- textures.put(texname, texture);
	8568	+ //texture.texturedata = texturedata;
	8569	+ textures.put(tex, texturecache);
7425	8570
7426	8571	// newtex = true;
7427	8572	}
..	..	@@ -7437,10 +8582,44 @@
7437	8582	}
7438	8583	}
7439	8584
7440		- return texture;
	8585	+ return texturecache;
7441	8586	}
7442	8587
7443		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8588	+ static void EmbedTextures(cTexture tex)
	8589	+ {
	8590	+ if (tex.pigmentdata == null)
	8591	+ {
	8592	+ //String texname = Object3D.GetPigment(tex);
	8593	+
	8594	+ CacheTexture texturecache = texturepigment.get(tex);
	8595	+
	8596	+ if (texturecache != null)
	8597	+ {
	8598	+ tex.pw = texturecache.texturedata.getWidth();
	8599	+ tex.ph = texturecache.texturedata.getHeight();
	8600	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8601	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8602	+ ;
	8603	+ //, tex.pw, tex.ph), 0.5f);
	8604	+ }
	8605	+ }
	8606	+
	8607	+ if (tex.bumpdata == null)
	8608	+ {
	8609	+ //String texname = Object3D.GetBump(tex);
	8610	+
	8611	+ CacheTexture texturecache = texturebump.get(tex);
	8612	+
	8613	+ if (texturecache != null)
	8614	+ {
	8615	+ tex.bw = texturecache.texturedata.getWidth();
	8616	+ tex.bh = texturecache.texturedata.getHeight();
	8617	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8618	+ }
	8619	+ }
	8620	+ }
	8621	+
	8622	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
7444	8623	{
7445	8624	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7446	8625
..	..	@@ -7458,21 +8637,21 @@
7458	8637	return texture!=null?texture.texture:null;
7459	8638	}
7460	8639
7461		- com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8640	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
7462	8641	{
7463	8642	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
7464	8643
7465	8644	return texture!=null?texture.texturedata:null;
7466	8645	}
7467	8646
7468		- boolean BindTexture(String tex, boolean bump, int resolution)
	8647	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
7469	8648	{
7470	8649	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
7471	8650	{
7472	8651	return false;
7473	8652	}
7474	8653
7475		- boolean newtex = false;
	8654	+ //boolean newtex = false;
7476	8655
7477	8656	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
7478	8657
..	..	@@ -7504,9 +8683,75 @@
7504	8683	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
7505	8684	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
7506	8685
7507		- return newtex;
	8686	+ return true; // Warning: not used.
7508	8687	}
7509	8688
	8689	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8690	+ {
	8691	+ try
	8692	+ {
	8693	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8694	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8695	+ ImageWriter writer = writers.next();
	8696	+
	8697	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8698	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8699	+ param.setCompressionQuality(quality);
	8700	+
	8701	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8702	+ writer.setOutput(ios);
	8703	+ writer.write(null, new IIOImage(image, null, null), param);
	8704	+
	8705	+ byte[] data = baos.toByteArray();
	8706	+ writer.dispose();
	8707	+ return data;
	8708	+ }
	8709	+ catch (Exception e)
	8710	+ {
	8711	+ e.printStackTrace();
	8712	+ return null;
	8713	+ }
	8714	+ }
	8715	+
	8716	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8717	+ {
	8718	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8719	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8720	+ ImageReader reader = writers.next();
	8721	+
	8722	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8723	+
	8724	+ ImageReadParam param = reader.getDefaultReadParam();
	8725	+ param.setDestination(bim);
	8726	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8727	+
	8728	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8729	+ reader.setInput(ios);
	8730	+ BufferedImage bim2 = reader.read(0, param);
	8731	+ reader.dispose();
	8732	+
	8733	+// WritableRaster raster = bim2.getRaster();
	8734	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8735	+// byte[] bytes = data.getData();
	8736	+//
	8737	+// int[] pixels = new int[bytes.length/3];
	8738	+// for (int i=pixels.length; --i>=0;)
	8739	+// {
	8740	+// int i3 = i*3;
	8741	+// pixels[i] = 0xFF;
	8742	+// pixels[i] <<= 8;
	8743	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8744	+// pixels[i] <<= 8;
	8745	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8746	+// pixels[i] <<= 8;
	8747	+// pixels[i] \|= bytes[i3] & 0xFF;
	8748	+// }
	8749	+//
	8750	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8751	+
	8752	+ return bim;
	8753	+ }
	8754	+
7510	8755	ShadowBuffer shadowPBuf;
7511	8756	AntialiasBuffer antialiasPBuf;
7512	8757	int MAXSTACK;
..	..	@@ -7699,7 +8944,7 @@
7699	8944
7700	8945	if (cubemap == null)
7701	8946	{
7702		- LoadEnvy(5);
	8947	+ //LoadEnvy(1);
7703	8948	}
7704	8949
7705	8950	//cubemap.enable();
..	..	@@ -7986,37 +9231,58 @@
7986	9231	cubemap = null;
7987	9232	return;
7988	9233	case 1:
7989		- name = "cubemaps/box_";
7990		- ext = "png";
	9234	+ name = "cubemaps/rgb/";
	9235	+ ext = "jpg";
7991	9236	reverseUP = false;
7992	9237	break;
7993	9238	case 2:
7994		- name = "cubemaps/uffizi_";
7995		- ext = "png";
7996		- break; // reverseUP = true; break;
	9239	+ name = "cubemaps/uffizi/";
	9240	+ ext = "jpg";
	9241	+ reverseUP = false;
	9242	+ break;
7997	9243	case 3:
7998		- name = "cubemaps/CloudyHills_";
7999		- ext = "tga";
	9244	+ name = "cubemaps/CloudyHills/";
	9245	+ ext = "jpg";
8000	9246	reverseUP = false;
8001	9247	break;
8002	9248	case 4:
8003		- name = "cubemaps/cornell_";
	9249	+ name = "cubemaps/cornell/";
8004	9250	ext = "png";
8005	9251	reverseUP = false;
8006	9252	break;
	9253	+ case 5:
	9254	+ name = "cubemaps/skycube/";
	9255	+ ext = "jpg";
	9256	+ reverseUP = false;
	9257	+ break;
	9258	+ case 6:
	9259	+ name = "cubemaps/SaintLazarusChurch3/";
	9260	+ ext = "jpg";
	9261	+ reverseUP = false;
	9262	+ break;
	9263	+ case 7:
	9264	+ name = "cubemaps/Sodermalmsallen/";
	9265	+ ext = "jpg";
	9266	+ reverseUP = false;
	9267	+ break;
	9268	+ case 8:
	9269	+ name = "cubemaps/Sodermalmsallen2/";
	9270	+ ext = "jpg";
	9271	+ reverseUP = false;
	9272	+ break;
	9273	+ case 9:
	9274	+ name = "cubemaps/UnionSquare/";
	9275	+ ext = "jpg";
	9276	+ reverseUP = false;
	9277	+ break;
8007	9278	default:
8008		- name = "cubemaps/rgb_";
8009		- ext = "png"; /mipmap = true;/ reverseUP = false;
	9279	+ name = "cubemaps/box/";
	9280	+ ext = "png"; /mipmap = true;/
	9281	+ reverseUP = false;
8010	9282	break;
8011	9283	}
8012		-
8013		- try
8014		- {
8015		- cubemap = LoadCubemap(getClass().getClassLoader(), name, ext, mipmap);
8016		- } catch (IOException e)
8017		- {
8018		- throw new RuntimeException(e);
8019		- }
	9284	+
	9285	+ LoadSkybox(name, ext, mipmap);
8020	9286	}
8021	9287
8022	9288	public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height)
..	..	@@ -8048,8 +9314,13 @@
8048	9314	static double[] model = new double[16];
8049	9315	double[] camera2light = new double[16];
8050	9316	double[] light2camera = new double[16];
8051		- int newenvy = -1;
	9317	+
	9318	+ //int newenvy = -1;
8052	9319	boolean envyoff = true; // false;
	9320	+ String skyboxname = "";
	9321	+ String skyboxext;
	9322	+ String loadedskyboxname = "";
	9323	+
8053	9324	cVector light0 = new cVector(0, 0, 0); // 1,3,2);
8054	9325	//float[] light0 = { 0,0,0 };
8055	9326	cVector dirlight = new cVector(0, 0, 1); // 1,3,2);
..	..	@@ -8342,11 +9613,35 @@
8342	9613	jy8[3] = 0.5f;
8343	9614	}
8344	9615
8345		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9616	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
8346	9617	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
8347	9618	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
8348	9619	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
8349	9620
	9621	+ void ResetOptions()
	9622	+ {
	9623	+ options1[0] = 100;
	9624	+ options1[1] = 0.025f;
	9625	+ options1[2] = 0.01f;
	9626	+ options1[3] = 0;
	9627	+ options1[4] = 0;
	9628	+
	9629	+ options2[0] = 0;
	9630	+ options2[1] = 0.75f;
	9631	+ options2[2] = 0;
	9632	+ options2[3] = 0;
	9633	+
	9634	+ options3[0] = 1;
	9635	+ options3[1] = 1;
	9636	+ options3[2] = 1;
	9637	+ options3[3] = 0;
	9638	+
	9639	+ options4[0] = 1;
	9640	+ options4[1] = 0;
	9641	+ options4[2] = 1;
	9642	+ options4[3] = 0;
	9643	+ }
	9644	+
8350	9645	static int imagecount = 0; // movie generation
8351	9646
8352	9647	static int jitter = 0;
..	..	@@ -8442,8 +9737,8 @@
8442	9737	assert (parentcam != renderCamera);
8443	9738
8444	9739	if (renderCamera != lightCamera)
8445		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8446		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9740	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9741	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
8447	9742
8448	9743	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
8449	9744
..	..	@@ -8458,8 +9753,8 @@
8458	9753	LA.matCopy(renderCamera.fromScreen, matrix);
8459	9754
8460	9755	if (renderCamera != lightCamera)
8461		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8462		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9756	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9757	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
8463	9758
8464	9759	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
8465	9760
..	..	@@ -8505,10 +9800,12 @@
8505	9800	rati = 1 / rati;
8506	9801	gl.glOrtho(-skyscale / rati, skyscale / rati, -skyscale, skyscale, 0.001, 1000);
8507	9802	}
8508		- assert (newenvy == -1);
	9803	+
	9804	+ //assert (newenvy == -1);
	9805	+
8509	9806	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
8510	9807	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
8511		- DrawSkyBox(gl);
	9808	+ DrawSkyBox(gl, (float)rati);
8512	9809	gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
8513	9810	gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
8514	9811	accPerspective(gl, renderCamera.shaper_fovy / ratio,
..	..	@@ -8531,7 +9828,7 @@
8531	9828	//gl.glFlush();
8532	9829	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
8533	9830
8534		- if (ANIMATION && ABORTED)
	9831	+ if (Globals.ANIMATION && ABORTED)
8535	9832	{
8536	9833	System.err.println(" ABORTED FRAME");
8537	9834	break;
..	..	@@ -8561,7 +9858,7 @@
8561	9858	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
8562	9859
8563	9860	// save image
8564		- if (ANIMATION && !ABORTED)
	9861	+ if (Globals.ANIMATION && !ABORTED)
8565	9862	{
8566	9863	VPwidth = viewport[2];
8567	9864	VPheight = viewport[3];
..	..	@@ -8672,11 +9969,11 @@
8672	9969
8673	9970	// imagecount++;
8674	9971
8675		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9972	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
8676	9973
8677	9974	if (!BOXMODE)
8678	9975	{
8679		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9976	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
8680	9977	}
8681	9978
8682	9979	if (!BOXMODE)
..	..	@@ -8714,7 +10011,7 @@
8714	10011	ABORTED = false;
8715	10012	}
8716	10013	else
8717		- GrafreeD.wav.cursor += 735 * ACSIZE;
	10014	+ Grafreed.wav.cursor += 735 * ACSIZE;
8718	10015
8719	10016	if (false)
8720	10017	{
..	..	@@ -9377,11 +10674,11 @@
9377	10674
9378	10675	public void display(GLAutoDrawable drawable)
9379	10676	{
9380		- if (GrafreeD.savesound && GrafreeD.hassound)
	10677	+ if (Grafreed.savesound && Grafreed.hassound)
9381	10678	{
9382		- GrafreeD.wav.save();
9383		- GrafreeD.savesound = false;
9384		- GrafreeD.hassound = false;
	10679	+ Grafreed.wav.save();
	10680	+ Grafreed.savesound = false;
	10681	+ Grafreed.hassound = false;
9385	10682	}
9386	10683	// if (DEBUG_SELECTION)
9387	10684	// {
..	..	@@ -9457,6 +10754,7 @@
9457	10754	ANTIALIAS = 0;
9458	10755	//System.out.println("RESTART");
9459	10756	AAtimer.restart();
	10757	+ Globals.TIMERRUNNING = true;
9460	10758	}
9461	10759	}
9462	10760	}
..	..	@@ -9511,7 +10809,7 @@
9511	10809	Object3D theobject = object;
9512	10810	Object3D theparent = object.parent;
9513	10811	object.parent = null;
9514		- object = (Object3D)GrafreeD.clone(object);
	10812	+ object = (Object3D)Grafreed.clone(object);
9515	10813	object.Stripify();
9516	10814	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
9517	10815	theobject.PreprocessOcclusion(this);
..	..	@@ -9524,13 +10822,14 @@
9524	10822	ambientOcclusion = false;
9525	10823	}
9526	10824
9527		- if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
	10825	+ if (//Globals.lighttouched &&
	10826	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
9528	10827	{
9529	10828	//if (RENDERSHADOW) // ?
9530	10829	if (!IsFrozen())
9531	10830	{
9532	10831	// dec 2012
9533		- if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
	10832	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
9534	10833	{
9535	10834	Globals.framecount++;
9536	10835	shadowbuffer.display();
..	..	@@ -9657,8 +10956,8 @@
9657	10956
9658	10957	// if (parentcam != renderCamera) // not a light
9659	10958	if (cam != lightCamera)
9660		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9661		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10959	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10960	+ LA.matConcat(matrix, parentcam.GlobalTransformInv(), matrix);
9662	10961
9663	10962	for (int j = 0; j < 4; j++)
9664	10963	{
..	..	@@ -9672,8 +10971,8 @@
9672	10971
9673	10972	// if (parentcam != renderCamera) // not a light
9674	10973	if (cam != lightCamera)
9675		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9676		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10974	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10975	+ LA.matConcat(parentcam.GlobalTransform(), matrix, matrix);
9677	10976
9678	10977	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
9679	10978
..	..	@@ -9759,13 +11058,19 @@
9759	11058	gl.glOrtho(-skyscale / ratio, skyscale / ratio, -skyscale, skyscale, 0.001, 1000);
9760	11059	}
9761	11060
9762		- if (newenvy > -1)
	11061	+// if (newenvy > -1)
	11062	+// {
	11063	+// LoadEnvy(newenvy);
	11064	+// }
	11065	+//
	11066	+// newenvy = -1;
	11067	+
	11068	+ if (!skyboxname.equals(this.loadedskyboxname))
9763	11069	{
9764		- LoadEnvy(newenvy);
	11070	+ LoadSkybox(skyboxname + "/", skyboxext, false);
	11071	+ loadedskyboxname = skyboxname;
9765	11072	}
9766		-
9767		- newenvy = -1;
9768		-
	11073	+
9769	11074	ratio = ((double) getWidth()) / getHeight();
9770	11075	//System.out.println("ratio = " + ratio);
9771	11076
..	..	@@ -9781,7 +11086,7 @@
9781	11086
9782	11087	if (!IsFrozen() && !ambientOcclusion)
9783	11088	{
9784		- DrawSkyBox(gl);
	11089	+ DrawSkyBox(gl, (float)ratio);
9785	11090	}
9786	11091
9787	11092	//if (selection_view == -1)
..	..	@@ -9932,7 +11237,16 @@
9932	11237	// Bump noise
9933	11238	gl.glActiveTexture(GL.GL_TEXTURE6);
9934	11239	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
9935		- BindTexture(NOISE_TEXTURE, false, 2);
	11240	+
	11241	+ try
	11242	+ {
	11243	+ BindTexture(NOISE_TEXTURE, false, 2);
	11244	+ }
	11245	+ catch (Exception e)
	11246	+ {
	11247	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11248	+ }
	11249	+
9936	11250
9937	11251	gl.glActiveTexture(GL.GL_TEXTURE0);
9938	11252	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -9955,9 +11269,9 @@
9955	11269
9956	11270	gl.glMatrixMode(GL.GL_MODELVIEW);
9957	11271
9958		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
9959		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
9960		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11272	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11273	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11274	+gl.glEnable(gl.GL_MULTISAMPLE);
9961	11275	} else
9962	11276	{
9963	11277	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -9968,7 +11282,7 @@
9968	11282	//System.out.println("BLENDING ON");
9969	11283	gl.glEnable(GL.GL_BLEND);
9970	11284	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
9971		-
	11285	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
9972	11286	gl.glMatrixMode(gl.GL_PROJECTION);
9973	11287	gl.glLoadIdentity();
9974	11288
..	..	@@ -10057,8 +11371,8 @@
10057	11371	System.err.println("parentcam != renderCamera");
10058	11372
10059	11373	// if (cam != lightCamera)
10060		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10061		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11374	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11375	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
10062	11376	}
10063	11377
10064	11378	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -10079,8 +11393,8 @@
10079	11393	if (true) // TODO
10080	11394	{
10081	11395	if (cam != lightCamera)
10082		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10083		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11396	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11397	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
10084	11398	}
10085	11399
10086	11400	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -10146,7 +11460,7 @@
10146	11460	fragmentMode \|= (lightslot - 64) << 2; // 1; // first bit is available for aniso
10147	11461	//System.out.println("fragmentMode = " + fragmentMode);
10148	11462
10149		- if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| DEBUG_SELECTION)
	11463	+ if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| IsDebugSelection())
10150	11464	{
10151	11465	/*
10152	11466	if (CULLFACE \|\| (ambientOcclusion && OCCLUSION_CULLING))
..	..	@@ -10217,7 +11531,7 @@
10217	11531	}
10218	11532	}
10219	11533
10220		- if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
	11534	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
10221	11535	{
10222	11536	//gl.glDepthFunc(GL.GL_LEQUAL);
10223	11537	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -10225,24 +11539,21 @@
10225	11539
10226	11540	boolean texon = textureon;
10227	11541
10228		- if (RENDERPROGRAM > 0)
10229		- {
10230		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
10231		- textureon = false;
10232		- }
	11542	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11543	+ textureon = false;
	11544	+
10233	11545	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
10234	11546	//System.out.println("ALLO");
10235	11547	gl.glColorMask(false, false, false, false);
10236	11548	DrawObject(gl);
10237		- if (RENDERPROGRAM > 0)
10238		- {
10239		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
10240		- textureon = texon;
10241		- }
	11549	+
	11550	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11551	+ textureon = texon;
	11552	+
10242	11553	gl.glColorMask(true, true, true, true);
10243	11554
10244	11555	gl.glDepthFunc(GL.GL_EQUAL);
10245		- //gl.glDepthMask(false);
	11556	+ gl.glDepthMask(false);
10246	11557	}
10247	11558
10248	11559	if (false) // DrawMode() == SHADOW)
..	..	@@ -10396,8 +11707,14 @@
10396	11707	{
10397	11708	renderpass++;
10398	11709	// System.out.println("Draw object... ");
	11710	+ STEP = 1;
10399	11711	if (FAST) // in case there is no script
10400		- STEP = 16;
	11712	+ STEP = 8;
	11713	+
	11714	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11715	+ {
	11716	+ STEP *= 4;
	11717	+ }
10401	11718
10402	11719	//object.FullInvariants();
10403	11720
..	..	@@ -10411,23 +11728,44 @@
10411	11728	e.printStackTrace();
10412	11729	}
10413	11730
10414		- if (GrafreeD.RENDERME > 0)
10415		- GrafreeD.RENDERME--; // mechante magouille
	11731	+ if (Grafreed.RENDERME > 0)
	11732	+ Grafreed.RENDERME--; // mechante magouille
10416	11733
10417	11734	Globals.ONESTEP = false;
10418	11735	}
10419	11736
10420	11737	static boolean zoomonce = false;
10421	11738
	11739	+ static void CreateSelectedPoint()
	11740	+ {
	11741	+ if (selectedpoint == null)
	11742	+ {
	11743	+ debugpointG = new Sphere();
	11744	+ debugpointP = new Sphere();
	11745	+ debugpointC = new Sphere();
	11746	+ debugpointR = new Sphere();
	11747	+
	11748	+ selectedpoint = new Superellipsoid();
	11749	+
	11750	+ for (int i=0; i<8; i++)
	11751	+ {
	11752	+ debugpoints[i] = new Sphere();
	11753	+ }
	11754	+ }
	11755	+ }
	11756	+
10422	11757	void DrawObject(GL gl, boolean draw)
10423	11758	{
	11759	+ // To clear camera values
	11760	+ ResetOptions();
	11761	+
10424	11762	//System.out.println("DRAW OBJECT " + mouseDown);
10425	11763	// DrawMode() = SELECTION;
10426	11764	//GL gl = getGL();
10427	11765	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
10428	11766	{
10429	11767	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
10430		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11768	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
10431	11769	pingthread.StepToTarget(true); // true);
10432	11770	// zoomonce = false;
10433	11771	}
..	..	@@ -10447,7 +11785,7 @@
10447	11785	callist = gl.glGenLists(1);
10448	11786	}
10449	11787
10450		- boolean selectmode = DrawMode() == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	11788	+ boolean selectmode = DrawMode() == SELECTION \|\| IsDebugSelection();
10451	11789
10452	11790	boolean active = !selectmode; // DrawMode() != SELECTION; // mouseDown;
10453	11791
..	..	@@ -10482,7 +11820,14 @@
10482	11820
10483	11821	usedtextures.clear();
10484	11822
10485		- BindTextures(DEFAULT_TEXTURES, 2);
	11823	+ try
	11824	+ {
	11825	+ BindTextures(DEFAULT_TEXTURES, 2);
	11826	+ }
	11827	+ catch (Exception e)
	11828	+ {
	11829	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11830	+ }
10486	11831	}
10487	11832	//System.out.println("--> " + stackdepth);
10488	11833	// GrafreeD.traceon();
..	..	@@ -10492,8 +11837,9 @@
10492	11837
10493	11838	if (DrawMode() == DEFAULT)
10494	11839	{
10495		- if (DEBUG)
	11840	+ if (Globals.DEBUG)
10496	11841	{
	11842	+ CreateSelectedPoint();
10497	11843	float radius = 0.05f;
10498	11844	if (selectedpoint.radius != radius)
10499	11845	{
..	..	@@ -10547,20 +11893,32 @@
10547	11893	ReleaseTextures(DEFAULT_TEXTURES);
10548	11894
10549	11895	if (CLEANCACHE)
10550		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11896	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
10551	11897	{
10552		- String tex = e.nextElement();
	11898	+ cTexture tex = e.nextElement();
10553	11899
10554	11900	// System.out.println("Texture --------- " + tex);
10555	11901
10556		- if (tex.equals("WHITE_NOISE"))
	11902	+ if (tex.equals("WHITE_NOISE:"))
10557	11903	continue;
10558	11904
10559		- if (!usedtextures.containsKey(tex))
	11905	+ if (!usedtextures.contains(tex))
10560	11906	{
	11907	+ CacheTexture gettex = texturepigment.get(tex);
10561	11908	// System.out.println("DISPOSE +++++++++++++++ " + tex);
10562		- textures.get(tex).texture.dispose();
10563		- textures.remove(tex);
	11909	+ if (gettex != null)
	11910	+ {
	11911	+ gettex.texture.dispose();
	11912	+ texturepigment.remove(tex);
	11913	+ }
	11914	+
	11915	+ gettex = texturebump.get(tex);
	11916	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11917	+ if (gettex != null)
	11918	+ {
	11919	+ gettex.texture.dispose();
	11920	+ texturebump.remove(tex);
	11921	+ }
10564	11922	}
10565	11923	}
10566	11924	}
..	..	@@ -10573,7 +11931,14 @@
10573	11931	if (checker != null && DrawMode() == DEFAULT)
10574	11932	{
10575	11933	//BindTexture(IMMORTAL_TEXTURE);
10576		- BindTextures(checker.GetTextures(), checker.texres);
	11934	+ try
	11935	+ {
	11936	+ BindTextures(checker.GetTextures(), checker.texres);
	11937	+ }
	11938	+ catch (Exception e)
	11939	+ {
	11940	+ System.err.println("FAILED: " + checker.GetTextures());
	11941	+ }
10577	11942	// NEAREST
10578	11943	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
10579	11944	DrawChecker(gl);
..	..	@@ -10655,7 +12020,7 @@
10655	12020	return;
10656	12021	}
10657	12022
10658		- String string = obj.GetToolTip();
	12023	+ String string = obj.toString(); //.GetToolTip();
10659	12024
10660	12025	GL gl = GetGL();
10661	12026
..	..	@@ -10972,8 +12337,8 @@
10972	12337	//obj.TransformToWorld(light, light);
10973	12338	for (int i = tp.size(); --i >= 0;)
10974	12339	{
10975		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
10976		- LA.xformPos(light, tp.get(i).toParent, light);
	12340	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12341	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
10977	12342	}
10978	12343
10979	12344
..	..	@@ -10990,8 +12355,8 @@
10990	12355	parentcam = cameras[0];
10991	12356	}
10992	12357
10993		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10994		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12358	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12359	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
10995	12360
10996	12361	LA.xformPos(light, renderCamera.toScreen, light);
10997	12362
..	..	@@ -11081,8 +12446,76 @@
11081	12446
11082	12447	//gl.glProgramEnvParameter4fvARB(GL.GL_FRAGMENT_PROGRAM_ARB, 127, lightParams, 0);
11083	12448
	12449	+ String program0 =
	12450	+ // Min shader
	12451	+ "!!ARBfp1.0\n" +
	12452	+ "PARAM zero123 = { 0.0, 1.0, 2, 1.25 };" +
	12453	+ "PARAM pow2 = { 0.5, 0.25, 0.125, 0.0 };" +
	12454	+ "PARAM one = { 1.0, 1.0, 1.0, 1.0 };" +
	12455	+ "PARAM eps = { 0.001, 0.001, 0.001, 1.0 };" +
	12456	+ "PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
	12457	+ "PARAM light2cam0 = program.env[10];" +
	12458	+ "PARAM light2cam1 = program.env[11];" +
	12459	+ "PARAM light2cam2 = program.env[12];" +
	12460	+ "TEMP temp;" +
	12461	+ "TEMP light;" +
	12462	+ "TEMP ndotl;" +
	12463	+ "TEMP normal;" +
	12464	+ "TEMP depth;" +
	12465	+ "TEMP eye;" +
	12466	+ "TEMP pos;" +
	12467	+
	12468	+ "MAD normal, fragment.color, zero123.z, -zero123.y;" +
	12469	+ Normalize("normal") +
	12470	+ "MOV light, state.light[0].position;" +
	12471	+ "DP3 ndotl.x, light, normal;" +
	12472	+
	12473	+ // shadow
	12474	+ "MOV pos, fragment.texcoord[1];" +
	12475	+ "MOV temp, pos;" +
	12476	+ ShadowTextureFetch("depth", "temp", "1") +
	12477	+ //"TEX depth, fragment.texcoord[1], texture[1], 2D;" +
	12478	+ "SLT ndotl.z, fragment.texcoord[1].z, depth.z;" +
	12479	+
	12480	+ // No shadow when out of frustum
	12481	+ //"SGE temp.y, depth.z, zero123.y;" +
	12482	+ //"LRP temp.x, temp.y, zero123.y, temp.x;" +
	12483	+
	12484	+ "MUL ndotl.x, ndotl.x, ndotl.z;" + // Shadow
	12485	+
	12486	+ // Backlit
	12487	+ "MOV pos.w, zero123.y;" +
	12488	+ "DP4 eye.x, pos, light2cam0;" +
	12489	+ "DP4 eye.y, pos, light2cam1;" +
	12490	+ "DP4 eye.z, pos, light2cam2;" +
	12491	+ Normalize("eye") +
	12492	+
	12493	+ "DP3 ndotl.y, -eye, normal;" +
	12494	+ //"MUL ndotl.y, ndotl.y, pow2.x;" +
	12495	+ "POW ndotl.y, ndotl.y, pow2.z;" + // backlit
	12496	+ "SUB ndotl.y, zero123.y, ndotl.y;" +
	12497	+ //"SUB ndotl.y, zero123.y, ndotl.y;" +
	12498	+ //"MUL ndotl.y, ndotl.y, pow2.z;" +
	12499	+
	12500	+ //"MAX ndotl.x, ndotl.x, ndotl.y;" + // Ambient
	12501	+ //"MAX ndotl.x, ndotl.x, pow2.y;" + // Ambient
	12502	+
	12503	+ // Pigment
	12504	+ "TEX temp, fragment.texcoord[0], texture[0], 2D;" +
	12505	+ "LRP temp, zero123.w, temp, one;" + // texture proportion
	12506	+ "MUL temp, temp, ndotl.x;" +
	12507	+
	12508	+ "MUL temp, temp, zero123.z;" +
	12509	+
	12510	+ //"MUL temp, temp, ndotl.y;" +
	12511	+
	12512	+ "MOV temp.w, zero123.y;" + // reset alpha
	12513	+ "MOV result.color, temp;" +
	12514	+ "END";
	12515	+
11084	12516	String program =
11085	12517	"!!ARBfp1.0\n" +
	12518	+
11086	12519	//"OPTION ARB_fragment_program_shadow;" +
11087	12520	"PARAM light2cam0 = program.env[10];" +
11088	12521	"PARAM light2cam1 = program.env[11];" +
..	..	@@ -11197,8 +12630,7 @@
11197	12630	"TEMP shininess;" +
11198	12631	"\n" +
11199	12632	"MOV texSamp, one;" +
11200		- //"TEX texSamp, fragment.texcoord[0], texture[0], 2D;" +
11201		-
	12633	+
11202	12634	"MOV mapgrid.x, one2048th.x;" +
11203	12635	"MOV temp, fragment.texcoord[1];" +
11204	12636	/*
..	..	@@ -11219,20 +12651,20 @@
11219	12651	"MUL temp, floor, mapgrid.x;" +
11220	12652	//"TEX depth0, temp, texture[1], 2D;" +
11221	12653	(((mode & FP_SOFTSHADOW) == 0) ? "" :
11222		- TextureFetch("depth0", "temp", "1") +
	12654	+ ShadowTextureFetch("depth0", "temp", "1") +
11223	12655	"") +
11224	12656	"ADD temp.x, temp.x, mapgrid.x;" +
11225	12657	//"TEX depth1, temp, texture[1], 2D;" +
11226	12658	(((mode & FP_SOFTSHADOW) == 0) ? "" :
11227		- TextureFetch("depth1", "temp", "1") +
	12659	+ ShadowTextureFetch("depth1", "temp", "1") +
11228	12660	"") +
11229	12661	"ADD temp.y, temp.y, mapgrid.x;" +
11230	12662	//"TEX depth2, temp, texture[1], 2D;" +
11231		- TextureFetch("depth2", "temp", "1") +
	12663	+ ShadowTextureFetch("depth2", "temp", "1") +
11232	12664	"SUB temp.x, temp.x, mapgrid.x;" +
11233	12665	//"TEX depth3, temp, texture[1], 2D;" +
11234	12666	(((mode & FP_SOFTSHADOW) == 0) ? "" :
11235		- TextureFetch("depth3", "temp", "1") +
	12667	+ ShadowTextureFetch("depth3", "temp", "1") +
11236	12668	"") +
11237	12669	//"MUL texSamp0, texSamp0, state.material.front.diffuse;" +
11238	12670	//"MOV params, material;" +
..	..	@@ -11603,10 +13035,10 @@
11603	13035	"MAD shadow.x, buffer.x, frac.y, shadow.x;" +
11604	13036	"") +
11605	13037
11606		- // display shadow only (bump == 0)
	13038	+ // display shadow only (fakedepth == 0)
11607	13039	"SUB temp.x, half.x, shadow.x;" +
11608		- "MOV temp.y, -params6.x;" +
11609		- "SLT temp.z, temp.y, zero.x;" +
	13040	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	13041	+ "SLT temp.z, temp.y, -one2048th.x;" +
11610	13042	"SUB temp.y, one.x, temp.z;" +
11611	13043	"MUL temp.x, temp.x, temp.y;" +
11612	13044	"KIL temp.x;" +
..	..	@@ -11735,8 +13167,10 @@
11735	13167	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
11736	13168
11737	13169	"SUB temp.x, one.x, ndotl.x;" +
11738		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
11739		- "ADD temp.y, one.y, options2.y;" + // sursurface
	13170	+ // Tuning for default skin
	13171	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	13172	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	13173	+ "ADD temp.y, one.y, options2.y;" + // subsurface
11740	13174	"MUL temp.x, temp.x, temp.y;" +
11741	13175
11742	13176	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -11935,7 +13369,7 @@
11935	13369	//once = true;
11936	13370	}
11937	13371
11938		- System.out.print("Program #" + mode + "; length = " + program.length());
	13372	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
11939	13373	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
11940	13374	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
11941	13375
..	..	@@ -12028,25 +13462,26 @@
12028	13462	return out;
12029	13463	}
12030	13464
12031		- String TextureFetch(String dest, String src, String unit)
	13465	+ // Also does frustum culling
	13466	+ String ShadowTextureFetch(String dest, String src, String unit)
12032	13467	{
12033	13468	return "TEX " + dest + ", " + src + ", texture[" + unit + "], 2D;" +
12034	13469	"SGE " + src + ".w, " + src + ".x, eps.x;" +
12035	13470	"SGE " + src + ".z, " + src + ".y, eps.x;" +
	13471	+ "SLT " + dest + ".x, " + src + ".x, one.x;" +
	13472	+ "SLT " + dest + ".y, " + src + ".y, one.x;" +
12036	13473	"MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12037		- "SLT " + src + ".z, " + src + ".x, one.x;" +
12038		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
12039		- "SLT " + src + ".z, " + src + ".y, one.x;" +
12040		- "MUL " + src + ".w, " + src + ".z, " + src + ".w;" +
	13474	+ "MUL " + src + ".w, " + dest + ".x, " + src + ".w;" +
	13475	+ "MUL " + src + ".w, " + dest + ".y, " + src + ".w;" +
12041	13476	//"SWZ buffer, temp, w,w,w,w;";
12042		- "MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
	13477	+ //"MUL " + dest + ".z, " + dest + ".z, " + src + ".w;" +
12043	13478	"SUB " + src + ".z, " + "one.x, " + src + ".w;" +
12044	13479	//"MUL " + src + ".z, " + src + ".z, infinity.x;" +
12045	13480	//"ADD " + dest + ".z, " + dest + ".z, " + src + ".z;";
12046		- "MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
	13481	+ //"MAD " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12047	13482
12048		- //"LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
12049		- //"LRP " + dest + ".z" + ", " + src + ".w, infinity.x," + dest + ".z;";
	13483	+ //?? "LRP " + dest + ".z, " + src + ".w," + dest + ".z, infinity.x;";
	13484	+ "LRP " + dest + ".z, " + src + ".z, infinity.x," + dest + ".z;";
12050	13485	}
12051	13486
12052	13487	String Shadow(String depth, String shadow)
..	..	@@ -12068,12 +13503,16 @@
12068	13503
12069	13504	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
12070	13505	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13506	+
	13507	+ // Compare fragment depth in light space with shadowmap.
12071	13508	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
12072	13509	"SGE temp.y, temp.x, zero.x;" +
12073		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13510	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13511	+
	13512	+ // Reverse comparison
12074	13513	"SUB temp.x, one.x, temp.x;" +
12075	13514	"MUL " + shadow + ".x, temp.x, temp.y;" +
12076		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13515	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
12077	13516	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
12078	13517
12079	13518	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -12087,6 +13526,10 @@
12087	13526	// No shadow for backface
12088	13527	"DP3 temp.x, normal, lightd;" +
12089	13528	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13529	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13530	+
	13531	+ // No shadow when out of frustum
	13532	+ "SGE temp.x, " + depth + ".z, one.z;" +
12090	13533	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
12091	13534	"";
12092	13535	}
..	..	@@ -12233,7 +13676,8 @@
12233	13676	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
12234	13677	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
12235	13678	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
12236		- Object3D.cVector2[] vector2buffer;
	13679	+
	13680	+ //Object3D.cVector2[] vector2buffer;
12237	13681
12238	13682	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
12239	13683	// OUT : diff, spec
..	..	@@ -12249,9 +13693,10 @@
12249	13693	"DP3 " + dest + ".z," + "normals," + "eye;" +
12250	13694	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
12251	13695	//"MOV " + dest + ".w," + "normal.z;" +
12252		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
12253		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
12254		- //"MOV " + dest + ".z," + "params2.w;" +
	13696	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13697	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13698	+
	13699	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
12255	13700	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
12256	13701	"RCP " + dest + ".w," + dest + ".w;" +
12257	13702	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -12645,7 +14090,7 @@
12645	14090	public void mousePressed(MouseEvent e)
12646	14091	{
12647	14092	//System.out.println("mousePressed: " + e);
12648		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	14093	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
12649	14094	}
12650	14095
12651	14096	static long prevtime = 0;
..	..	@@ -12672,6 +14117,7 @@
12672	14117
12673	14118	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
12674	14119
	14120	+ if (BUTTONLESSWHEEL)
12675	14121	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
12676	14122	{
12677	14123	return;
..	..	@@ -12680,7 +14126,7 @@
12680	14126	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
12681	14127
12682	14128	// TIMER
12683		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	14129	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
12684	14130	{
12685	14131	keepboxmode = BOXMODE;
12686	14132	keepsupport = SUPPORT;
..	..	@@ -12720,8 +14166,8 @@
12720	14166	// mode \|= META;
12721	14167	//}
12722	14168
12723		- SetMouseMode(WHEEL \| e.getModifiersEx());
12724		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	14169	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	14170	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
12725	14171	anchorX = ax;
12726	14172	anchorY = ay;
12727	14173	prevX = px;
..	..	@@ -12755,6 +14201,7 @@
12755	14201	else
12756	14202	if (evt.getSource() == AAtimer)
12757	14203	{
	14204	+ Globals.TIMERRUNNING = false;
12758	14205	if (mouseDown)
12759	14206	{
12760	14207	//new Exception().printStackTrace();
..	..	@@ -12780,6 +14227,10 @@
12780	14227	// LIVE = waslive;
12781	14228	// wasliveok = true;
12782	14229	// waslive = false;
	14230	+
	14231	+ // May 2019 Forget it:
	14232	+ if (true)
	14233	+ return;
12783	14234
12784	14235	// source == timer
12785	14236	if (mouseDown)
..	..	@@ -12810,7 +14261,7 @@
12810	14261
12811	14262	// fev 2014???
12812	14263	if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
12813		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14264	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
12814	14265	pingthread.StepToTarget(true); // true);
12815	14266	}
12816	14267	// if (!LIVE)
..	..	@@ -12819,12 +14270,13 @@
12819	14270
12820	14271	javax.swing.Timer timer = new javax.swing.Timer(350, this);
12821	14272
12822		- void clickStart(int x, int y, int modifiers)
	14273	+ void clickStart(int x, int y, int modifiers, int modifiersex)
12823	14274	{
12824	14275	if (!wasliveok)
12825	14276	return;
12826	14277
12827	14278	AAtimer.restart(); //
	14279	+ Globals.TIMERRUNNING = true;
12828	14280
12829	14281	// waslive = LIVE;
12830	14282	// LIVE = false;
..	..	@@ -12836,7 +14288,7 @@
12836	14288	// touched = true; // main DL
12837	14289	if (isRenderer)
12838	14290	{
12839		- SetMouseMode(modifiers);
	14291	+ SetMouseMode(modifiers, modifiersex);
12840	14292	}
12841	14293
12842	14294	selectX = anchorX = x;
..	..	@@ -12849,7 +14301,7 @@
12849	14301	clicked = true;
12850	14302	hold = false;
12851	14303
12852		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14304	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
12853	14305	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
12854	14306	{
12855	14307	// System.out.println("RESTART II " + modifiers);
..	..	@@ -12874,14 +14326,15 @@
12874	14326	drag = false;
12875	14327	//System.out.println("Mouse DOWN");
12876	14328	editObj = false;
12877		- ClickInfo info = new ClickInfo();
12878		- info.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
12879		- info.pane = this;
12880		- info.camera = renderCamera;
12881		- info.x = x;
12882		- info.y = y;
12883		- info.modifiers = modifiers;
12884		- editObj = object.doEditClick(info, 0);
	14329	+ //ClickInfo info = new ClickInfo();
	14330	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14331	+ object.clickInfo.pane = this;
	14332	+ object.clickInfo.camera = renderCamera;
	14333	+ object.clickInfo.x = x;
	14334	+ object.clickInfo.y = y;
	14335	+ object.clickInfo.modifiers = modifiersex;
	14336	+ editObj = object.doEditClick(//info,
	14337	+ 0);
12885	14338	if (!editObj)
12886	14339	{
12887	14340	hasMarquee = true;
..	..	@@ -12897,11 +14350,14 @@
12897	14350
12898	14351	public void mouseDragged(MouseEvent e)
12899	14352	{
	14353	+ Globals.MOUSEDRAGGED = true;
	14354	+
	14355	+ //System.out.println("mouseDragged: " + e);
12900	14356	if (isRenderer)
12901	14357	movingcamera = true;
	14358	+
12902	14359	//if (drawing)
12903	14360	//return;
12904		- //System.out.println("mouseDragged: " + e);
12905	14361	if ((e.getModifiersEx() & CTRL) != 0
12906	14362	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
12907	14363	{
..	..	@@ -12909,7 +14365,7 @@
12909	14365	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12910	14366	}
12911	14367	else
12912		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14368	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
12913	14369
12914	14370	//try { Thread.sleep(1); } catch (Exception ex) {}
12915	14371	}
..	..	@@ -12921,6 +14377,11 @@
12921	14377	cVector tmp = new cVector();
12922	14378	cVector tmp2 = new cVector();
12923	14379	boolean isMoving;
	14380	+
	14381	+ public cVector TargetLookAt()
	14382	+ {
	14383	+ return targetLookAt;
	14384	+ }
12924	14385
12925	14386	class PingThread extends Thread
12926	14387	{
..	..	@@ -13077,6 +14538,7 @@
13077	14538
13078	14539	public void run()
13079	14540	{
	14541	+ new Exception().printStackTrace();
13080	14542	System.exit(0);
13081	14543	for (;;)
13082	14544	{
..	..	@@ -13140,7 +14602,7 @@
13140	14602	{
13141	14603	Globals.lighttouched = true;
13142	14604	}
13143		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14605	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
13144	14606	}
13145	14607	//else
13146	14608	}
..	..	@@ -13154,12 +14616,12 @@
13154	14616	void GoDown(int mod)
13155	14617	{
13156	14618	MODIFIERS \|= COMMAND;
13157		- /*
	14619	+ /**/
13158	14620	if((mod&SHIFT) == SHIFT)
13159	14621	manipCamera.RotatePosition(0, -speed);
13160	14622	else
13161		- manipCamera.BackForth(0, -speed*delta, getWidth());
13162		- */
	14623	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14624	+ /**/
13163	14625	if ((mod & SHIFT) == SHIFT)
13164	14626	{
13165	14627	mouseMode = mouseMode; // VR??
..	..	@@ -13175,12 +14637,12 @@
13175	14637	void GoUp(int mod)
13176	14638	{
13177	14639	MODIFIERS \|= COMMAND;
13178		- /*
	14640	+ /**/
13179	14641	if((mod&SHIFT) == SHIFT)
13180	14642	manipCamera.RotatePosition(0, speed);
13181	14643	else
13182		- manipCamera.BackForth(0, speed*delta, getWidth());
13183		- */
	14644	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14645	+ /**/
13184	14646	if ((mod & SHIFT) == SHIFT)
13185	14647	{
13186	14648	mouseMode = mouseMode;
..	..	@@ -13196,12 +14658,12 @@
13196	14658	void GoLeft(int mod)
13197	14659	{
13198	14660	MODIFIERS \|= COMMAND;
13199		- /*
	14661	+ /**/
13200	14662	if((mod&SHIFT) == SHIFT)
13201		- manipCamera.RotatePosition(speed, 0);
13202		- else
13203	14663	manipCamera.Translate(speed*delta, 0, getWidth());
13204		- */
	14664	+ else
	14665	+ manipCamera.RotatePosition(speed, 0);
	14666	+ /**/
13205	14667	if ((mod & SHIFT) == SHIFT)
13206	14668	{
13207	14669	mouseMode = mouseMode;
..	..	@@ -13217,12 +14679,12 @@
13217	14679	void GoRight(int mod)
13218	14680	{
13219	14681	MODIFIERS \|= COMMAND;
13220		- /*
	14682	+ /**/
13221	14683	if((mod&SHIFT) == SHIFT)
13222		- manipCamera.RotatePosition(-speed, 0);
13223		- else
13224	14684	manipCamera.Translate(-speed*delta, 0, getWidth());
13225		- */
	14685	+ else
	14686	+ manipCamera.RotatePosition(-speed, 0);
	14687	+ /**/
13226	14688	if ((mod & SHIFT) == SHIFT)
13227	14689	{
13228	14690	mouseMode = mouseMode;
..	..	@@ -13240,7 +14702,7 @@
13240	14702	int X, Y;
13241	14703	boolean SX, SY;
13242	14704
13243		- void drag(int x, int y, int modifiers)
	14705	+ void drag(int x, int y, int modifiers, int modifiersex)
13244	14706	{
13245	14707	if (IsFrozen())
13246	14708	{
..	..	@@ -13249,17 +14711,17 @@
13249	14711
13250	14712	drag = true; // NEW
13251	14713
13252		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14714	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
13253	14715
13254	14716	X = x;
13255	14717	Y = y;
13256	14718	// floating state for animation
13257		- MODIFIERS = modifiers;
13258		- modifiers &= ~1024;
	14719	+ MODIFIERS = modifiersex;
	14720	+ modifiersex &= ~1024;
13259	14721	if (false) // modifiers != 0)
13260	14722	{
13261	14723	//new Exception().printStackTrace();
13262		- System.out.println("mouseDragged: " + modifiers);
	14724	+ System.out.println("mouseDragged: " + modifiersex);
13263	14725	System.out.println("SHIFT = " + SHIFT);
13264	14726	System.out.println("CONTROL = " + COMMAND);
13265	14727	System.out.println("META = " + META);
..	..	@@ -13272,14 +14734,16 @@
13272	14734	if (editObj)
13273	14735	{
13274	14736	drag = true;
13275		- ClickInfo info = new ClickInfo();
13276		- info.bounds.setBounds(0, 0,
	14737	+ //ClickInfo info = new ClickInfo();
	14738	+ object.clickInfo.bounds.setBounds(0, 0,
13277	14739	(int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13278		- info.pane = this;
13279		- info.camera = renderCamera;
13280		- info.x = x;
13281		- info.y = y;
13282		- object.editWindow.copy.doEditDrag(info);
	14740	+ object.clickInfo.pane = this;
	14741	+ object.clickInfo.camera = renderCamera;
	14742	+ object.clickInfo.x = x;
	14743	+ object.clickInfo.y = y;
	14744	+ object //.GetWindow().copy
	14745	+ .doEditDrag(//info,
	14746	+ (modifiers & MouseEvent.BUTTON3_MASK) != 0);
13283	14747	} else
13284	14748	{
13285	14749	if (x < startX)
..	..	@@ -13428,23 +14892,27 @@
13428	14892	}
13429	14893	}
13430	14894
	14895	+// ClickInfo clickInfo = new ClickInfo();
	14896	+
13431	14897	public void mouseMoved(MouseEvent e)
13432	14898	{
13433	14899	//System.out.println("mouseMoved: " + e);
13434		-
13435	14900	if (isRenderer)
13436	14901	return;
13437	14902
13438		- ClickInfo ci = new ClickInfo();
13439		- ci.x = e.getX();
13440		- ci.y = e.getY();
13441		- ci.modifiers = e.getModifiersEx();
13442		- ci.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
13443		- ci.pane = this;
13444		- ci.camera = renderCamera;
	14903	+ // Mouse cursor feedback
	14904	+ object.clickInfo.x = e.getX();
	14905	+ object.clickInfo.y = e.getY();
	14906	+ object.clickInfo.modifiers = e.getModifiersEx();
	14907	+ object.clickInfo.bounds.setBounds(0, 0, (int) (getBounds().width * zoom), (int) (getBounds().height * zoom));
	14908	+ object.clickInfo.pane = this;
	14909	+ object.clickInfo.camera = renderCamera;
13445	14910	if (!isRenderer)
13446	14911	{
13447		- if (object.editWindow.copy.doEditClick(ci, 0))
	14912	+ //ObjEditor editWindow = object.editWindow;
	14913	+ //Object3D copy = editWindow.copy;
	14914	+ if (object.doEditClick(//clickInfo,
	14915	+ 0))
13448	14916	{
13449	14917	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
13450	14918	} else
..	..	@@ -13456,7 +14924,11 @@
13456	14924
13457	14925	public void mouseReleased(MouseEvent e)
13458	14926	{
	14927	+ Globals.MOUSEDRAGGED = false;
	14928	+
13459	14929	movingcamera = false;
	14930	+ X = 0; // getBounds().width/2;
	14931	+ Y = 0; // getBounds().height/2;
13460	14932	//System.out.println("mouseReleased: " + e);
13461	14933	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
13462	14934	}
..	..	@@ -13479,9 +14951,9 @@
13479	14951	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
13480	14952	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
13481	14953
13482		- if (control \|\| command \|\| IsFrozen())
	14954	+// No delay if (control \|\| command \|\| IsFrozen())
13483	14955	timeout = true;
13484		- else
	14956	+// ?? May 2019 else
13485	14957	// timer.setDelay((modifiers & 128) != 0?0:350);
13486	14958	mouseDown = false;
13487	14959	if (!control && !command) // june 2013
..	..	@@ -13591,7 +15063,7 @@
13591	15063	System.out.println("keyReleased: " + e);
13592	15064	}
13593	15065
13594		- void SetMouseMode(int modifiers)
	15066	+ void SetMouseMode(int modifiers, int modifiersex)
13595	15067	{
13596	15068	//System.out.println("SetMouseMode = " + modifiers);
13597	15069	//modifiers &= ~1024;
..	..	@@ -13603,25 +15075,25 @@
13603	15075	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
13604	15076	// return;
13605	15077	//System.out.println("SetMode = " + modifiers);
13606		- if ((modifiers & WHEEL) == WHEEL)
	15078	+ if ((modifiersex & WHEEL) == WHEEL)
13607	15079	{
13608	15080	mouseMode \|= ZOOM;
13609	15081	}
13610	15082
13611	15083	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
13612		- if (capsLocked \|\| (modifiers & META) == META)
	15084	+ if (capsLocked) // \|\| (modifiers & META) == META)
13613	15085	{
13614	15086	mouseMode \|= VR; // BACKFORTH;
13615	15087	}
13616		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	15088	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
13617	15089	{
13618	15090	mouseMode \|= SELECT;
13619	15091	}
13620		- if ((modifiers & COMMAND) == COMMAND)
	15092	+ if ((modifiersex & COMMAND) == COMMAND)
13621	15093	{
13622	15094	mouseMode \|= SELECT;
13623	15095	}
13624		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	15096	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
13625	15097	{
13626	15098	mouseMode &= ~VR;
13627	15099	mouseMode \|= TRANSLATE;
..	..	@@ -13650,10 +15122,10 @@
13650	15122
13651	15123	if (isRenderer) //
13652	15124	{
13653		- SetMouseMode(modifiers);
	15125	+ SetMouseMode(0, modifiers);
13654	15126	}
13655	15127
13656		- theRenderer.keyPressed(key);
	15128	+ Globals.theRenderer.keyPressed(key);
13657	15129	}
13658	15130
13659	15131	int kompactbit = 4; // power bit
..	..	@@ -13665,7 +15137,7 @@
13665	15137	float SATPOW = 1; // 2; // 0.5f;
13666	15138	float BRIPOW = 1; // 0.5f; // 0.5f;
13667	15139
13668		- void keyPressed(int key)
	15140	+ public void keyPressed(int key)
13669	15141	{
13670	15142	if (key >= '0' && key <= '5')
13671	15143	clampbit = (key-'0');
..	..	@@ -13712,7 +15184,8 @@
13712	15184	// break;
13713	15185	case 'T':
13714	15186	CACHETEXTURE ^= true;
13715		- textures.clear();
	15187	+ texturepigment.clear();
	15188	+ texturebump.clear();
13716	15189	// repaint();
13717	15190	break;
13718	15191	case 'Y':
..	..	@@ -13797,7 +15270,9 @@
13797	15270	case 'E' : COMPACT ^= true;
13798	15271	repaint();
13799	15272	break;
13800		- case 'W' : DEBUGHSB ^= true;
	15273	+ case 'W' : // Wide Window (fullscreen)
	15274	+ //DEBUGHSB ^= true;
	15275	+ ObjEditor.theFrame.ToggleFullScreen();
13801	15276	repaint();
13802	15277	break;
13803	15278	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -13822,8 +15297,8 @@
13822	15297	RevertCamera();
13823	15298	repaint();
13824	15299	break;
13825		- case 'L':
13826	15300	case 'l':
	15301	+ //case 'L':
13827	15302	if (lightMode)
13828	15303	{
13829	15304	lightMode = false;
..	..	@@ -13893,14 +15368,18 @@
13893	15368	case '3':
13894	15369	case '4':
13895	15370	case '5':
13896		- newenvy = Character.getNumericValue(key);
13897		- repaint();
13898		- break;
13899	15371	case '6':
13900	15372	case '7':
13901	15373	case '8':
13902	15374	case '9':
13903		- BGcolor = (key - '6')/3.f;
	15375	+ if (envyoff)
	15376	+ {
	15377	+ BGcolor = (key - '1')/8.f;
	15378	+ }
	15379	+ else
	15380	+ {
	15381	+ //newenvy = Character.getNumericValue(key);
	15382	+ }
13904	15383	repaint();
13905	15384	break;
13906	15385	case '!':
..	..	@@ -13966,9 +15445,9 @@
13966	15445	case '_':
13967	15446	kompactbit = 5;
13968	15447	break;
13969		- case '+':
13970		- kompactbit = 6;
13971		- break;
	15448	+// case '+':
	15449	+// kompactbit = 6;
	15450	+// break;
13972	15451	case ' ':
13973	15452	lightMode ^= true;
13974	15453	Globals.lighttouched = true;
..	..	@@ -13980,13 +15459,14 @@
13980	15459	case ESC:
13981	15460	RENDERPROGRAM += 1;
13982	15461	RENDERPROGRAM %= 3;
	15462	+
13983	15463	repaint();
13984	15464	break;
13985	15465	case 'Z':
13986	15466	//RESIZETEXTURE ^= true;
13987	15467	//break;
13988	15468	case 'z':
13989		- RENDERSHADOW ^= true;
	15469	+ Globals.RENDERSHADOW ^= true;
13990	15470	Globals.lighttouched = true;
13991	15471	repaint();
13992	15472	break;
..	..	@@ -14019,8 +15499,9 @@
14019	15499	case DELETE:
14020	15500	ClearSelection();
14021	15501	break;
14022		- /*
14023	15502	case '+':
	15503	+
	15504	+ /*
14024	15505	//fontsize += 1;
14025	15506	bbzoom *= 2;
14026	15507	repaint();
..	..	@@ -14037,17 +15518,17 @@
14037	15518	case '=':
14038	15519	IncDepth();
14039	15520	//fontsize += 1;
14040		- object.editWindow.refreshContents(true);
	15521	+ object.GetWindow().refreshContents(true);
14041	15522	maskbit = 6;
14042	15523	break;
14043	15524	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
14044	15525	DecDepth();
14045	15526	maskbit = 5;
14046	15527	//if(fontsize > 1) fontsize -= 1;
14047		- if (object.editWindow == null)
14048		- new Exception().printStackTrace();
14049		- else
14050		- object.editWindow.refreshContents(true);
	15528	+// if (object.editWindow == null)
	15529	+// new Exception().printStackTrace();
	15530	+// else
	15531	+ object.GetWindow().refreshContents(true);
14051	15532	break;
14052	15533	case '{':
14053	15534	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -14102,6 +15583,7 @@
14102	15583	}
14103	15584	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
14104	15585	}
	15586	+
14105	15587	static double OCCLUSIONBOOST = 1; // 0.5;
14106	15588
14107	15589	void keyReleased(int key, int modifiers)
..	..	@@ -14109,11 +15591,11 @@
14109	15591	//mode = ROTATE;
14110	15592	if ((MODIFIERS & COMMAND) == 0) // VR??
14111	15593	{
14112		- SetMouseMode(modifiers);
	15594	+ SetMouseMode(0, modifiers);
14113	15595	}
14114	15596	}
14115	15597
14116		- protected void processKeyEvent(KeyEvent e)
	15598	+ public void processKeyEvent(KeyEvent e)
14117	15599	{
14118	15600	switch (e.getID())
14119	15601	{
..	..	@@ -14243,8 +15725,9 @@
14243	15725
14244	15726	protected void processMouseMotionEvent(MouseEvent e)
14245	15727	{
14246		- //System.out.println("processMouseMotionEvent: " + mouseMode);
14247		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15728	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15729	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15730	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
14248	15731	{
14249	15732	mouseMoved(e);
14250	15733	} else
..	..	@@ -14269,11 +15752,12 @@
14269	15752	}
14270	15753	*/
14271	15754
14272		- object.editWindow.EditSelection();
	15755	+ object.GetWindow().EditSelection(false);
14273	15756	}
14274	15757
14275	15758	void SelectParent()
14276	15759	{
	15760	+ new Exception().printStackTrace();
14277	15761	System.exit(0);
14278	15762	Composite group = (Composite) object;
14279	15763	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -14285,10 +15769,10 @@
14285	15769	{
14286	15770	//selectees.remove(i);
14287	15771	System.out.println("select parent of " + elem);
14288		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15772	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
14289	15773	} else
14290	15774	{
14291		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15775	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
14292	15776	}
14293	15777
14294	15778	first = false;
..	..	@@ -14297,6 +15781,7 @@
14297	15781
14298	15782	void SelectChildren()
14299	15783	{
	15784	+ new Exception().printStackTrace();
14300	15785	System.exit(0);
14301	15786	/*
14302	15787	Composite group = (Composite) object;
..	..	@@ -14329,12 +15814,12 @@
14329	15814	for (int j = 0; j < group.children.size(); j++)
14330	15815	{
14331	15816	elem = (Object3D) group.children.elementAt(j);
14332		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15817	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
14333	15818	first = false;
14334	15819	}
14335	15820	} else
14336	15821	{
14337		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15822	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
14338	15823	}
14339	15824
14340	15825	first = false;
..	..	@@ -14345,21 +15830,21 @@
14345	15830	{
14346	15831	//Composite group = (Composite) object;
14347	15832	Object3D group = object;
14348		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15833	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
14349	15834	}
14350	15835
14351	15836	void ResetTransform(int mask)
14352	15837	{
14353	15838	//Composite group = (Composite) object;
14354	15839	Object3D group = object;
14355		- group.editWindow.ResetTransform(mask);
	15840	+ group.GetWindow().ResetTransform(mask);
14356	15841	}
14357	15842
14358	15843	void FlipTransform()
14359	15844	{
14360	15845	//Composite group = (Composite) object;
14361	15846	Object3D group = object;
14362		- group.editWindow.FlipTransform();
	15847	+ group.GetWindow().FlipTransform();
14363	15848	// group.editWindow.ReduceMesh(true);
14364	15849	}
14365	15850
..	..	@@ -14367,7 +15852,7 @@
14367	15852	{
14368	15853	//Composite group = (Composite) object;
14369	15854	Object3D group = object;
14370		- group.editWindow.PrintMemory();
	15855	+ group.GetWindow().PrintMemory();
14371	15856	// group.editWindow.ReduceMesh(true);
14372	15857	}
14373	15858
..	..	@@ -14375,7 +15860,7 @@
14375	15860	{
14376	15861	//Composite group = (Composite) object;
14377	15862	Object3D group = object;
14378		- group.editWindow.ResetCentroid();
	15863	+ group.GetWindow().ResetCentroid();
14379	15864	}
14380	15865
14381	15866	void IncDepth()
..	..	@@ -14457,11 +15942,11 @@
14457	15942
14458	15943	int width = getBounds().width;
14459	15944	int height = getBounds().height;
14460		- ClickInfo info = new ClickInfo();
14461		- info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
14462	15945	//Image img = CreateImage(width, height);
14463	15946	//System.out.println("width = " + width + "; height = " + height + "\n");
	15947	+
14464	15948	Graphics gr = g; // img.getGraphics();
	15949	+
14465	15950	if (!hasMarquee)
14466	15951	{
14467	15952	if (Xmin < Xmax) // !locked)
..	..	@@ -14533,40 +16018,88 @@
14533	16018	}
14534	16019	if (object != null && !hasMarquee)
14535	16020	{
	16021	+ if (object.clickInfo == null)
	16022	+ object.clickInfo = new ClickInfo();
	16023	+ ClickInfo info = object.clickInfo;
	16024	+ //ClickInfo info = new ClickInfo();
	16025	+ info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
	16026	+
14536	16027	if (isRenderer)
14537	16028	{
14538		- info.flags++;
	16029	+ object.clickInfo.flags++;
14539	16030	double frameAspect = (double) width / (double) height;
14540	16031	if (frameAspect > renderCamera.aspect)
14541	16032	{
14542	16033	int desired = (int) ((double) height * renderCamera.aspect);
14543		- info.bounds.width -= width - desired;
14544		- info.bounds.x += (width - desired) / 2;
	16034	+ object.clickInfo.bounds.width -= width - desired;
	16035	+ object.clickInfo.bounds.x += (width - desired) / 2;
14545	16036	} else
14546	16037	{
14547	16038	int desired = (int) ((double) width / renderCamera.aspect);
14548		- info.bounds.height -= height - desired;
14549		- info.bounds.y += (height - desired) / 2;
	16039	+ object.clickInfo.bounds.height -= height - desired;
	16040	+ object.clickInfo.bounds.y += (height - desired) / 2;
14550	16041	}
14551	16042	}
14552		- info.g = gr;
14553		- info.camera = renderCamera;
	16043	+
	16044	+ object.clickInfo.g = gr;
	16045	+ object.clickInfo.camera = renderCamera;
14554	16046	/*
14555	16047	// Memory intensive (brep.verticescopy)
14556	16048	if (!(object instanceof Composite))
14557	16049	object.draw(info, 0, false); // SLOW :
14558	16050	*/
14559		- if (!isRenderer)
	16051	+ if (!isRenderer) // && drag)
14560	16052	{
14561		- object.drawEditHandles(info, 0);
	16053	+ Grafreed.Assert(object != null);
	16054	+ Grafreed.Assert(object.selection != null);
	16055	+ if (object.selection.Size() > 0)
	16056	+ {
	16057	+ int hitSomething = object.selection.get(0).hitSomething;
	16058	+
	16059	+ object.clickInfo.DX = 0;
	16060	+ object.clickInfo.DY = 0;
	16061	+ object.clickInfo.W = 1;
	16062	+ if (hitSomething == Object3D.hitCenter)
	16063	+ {
	16064	+ info.DX = X;
	16065	+ if (X != 0)
	16066	+ info.DX -= info.bounds.width/2;
	16067	+
	16068	+ info.DY = Y;
	16069	+ if (Y != 0)
	16070	+ info.DY -= info.bounds.height/2;
	16071	+ }
	16072	+
	16073	+ object.drawEditHandles(//info,
	16074	+ 0);
	16075	+
	16076	+ if (drag && (X != 0 \|\| Y != 0))
	16077	+ {
	16078	+ switch (hitSomething)
	16079	+ {
	16080	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	16081	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16082	+ break;
	16083	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	16084	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	16085	+ break;
	16086	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	16087	+ gr.drawLine(X, Y, 0, 0);
	16088	+ break;
	16089	+ }
	16090	+
	16091	+ }
	16092	+ }
14562	16093	}
14563	16094	}
	16095	+
14564	16096	if (isRenderer)
14565	16097	{
14566	16098	//gr.setColor(Color.black);
14567	16099	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
14568	16100	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
14569	16101	}
	16102	+
14570	16103	if (hasMarquee)
14571	16104	{
14572	16105	gr.setXORMode(Color.white);
..	..	@@ -14679,6 +16212,7 @@
14679	16212	public boolean mouseDown(Event evt, int x, int y)
14680	16213	{
14681	16214	System.out.println("mouseDown: " + evt);
	16215	+ System.exit(0);
14682	16216	/*
14683	16217	locked = true;
14684	16218	drag = false;
..	..	@@ -14722,7 +16256,7 @@
14722	16256	{
14723	16257	keyPressed(0, modifiers);
14724	16258	}
14725		- clickStart(x, y, modifiers);
	16259	+ // clickStart(x, y, modifiers);
14726	16260	return true;
14727	16261	}
14728	16262
..	..	@@ -14840,7 +16374,7 @@
14840	16374	{
14841	16375	keyReleased(0, 0);
14842	16376	}
14843		- drag(x, y, modifiers);
	16377	+ drag(x, y, 0, modifiers);
14844	16378	return true;
14845	16379	}
14846	16380
..	..	@@ -14972,7 +16506,7 @@
14972	16506	Object3D object;
14973	16507	static Object3D trackedobject;
14974	16508	Camera renderCamera; // Light or Eye (or Occlusion)
14975		- /static/ Camera manipCamera; // Light or Eye
	16509	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
14976	16510	/static/ Camera eyeCamera;
14977	16511	/static/ Camera lightCamera;
14978	16512	int cameracount;
..	..	@@ -15068,7 +16602,9 @@
15068	16602
15069	16603	float BGcolor = 0.5f;
15070	16604
15071		- private void DrawSkyBox(GL gl)
	16605	+ float ambientLight[] = {1f, 1f, 1f, 1.0f};
	16606	+
	16607	+ private void DrawSkyBox(GL gl, float ratio)
15072	16608	{
15073	16609	if (envyoff \|\| cubemap == null)
15074	16610	{
..	..	@@ -15085,7 +16621,17 @@
15085	16621	// Compensates for ExaminerViewer's modification of modelview matrix
15086	16622	gl.glMatrixMode(GL.GL_MODELVIEW);
15087	16623	gl.glLoadIdentity();
	16624	+ gl.glScalef(1,ratio,1);
15088	16625
	16626	+ colorV[0] = 2;
	16627	+ colorV[1] = 2;
	16628	+ colorV[2] = 2;
	16629	+ colorV[3] = 1;
	16630	+ gl.glDisable(gl.GL_COLOR_MATERIAL);
	16631	+ gl.glMaterialfv(gl.GL_FRONT_AND_BACK, gl.GL_AMBIENT, colorV, 0);
	16632	+
	16633	+ gl.glLightModelfv(gl.GL_LIGHT_MODEL_AMBIENT, ambientLight, 0);
	16634	+
15089	16635	//gl.glActiveTexture(GL.GL_TEXTURE1);
15090	16636	//gl.glDisable(GL.GL_TEXTURE_CUBE_MAP);
15091	16637
..	..	@@ -15098,7 +16644,7 @@
15098	16644	// GL_NORMAL_MAP texgen mode. Temporarily enabling lighting
15099	16645	// causes the normals to be sent down. Thanks to Ken Dyke.
15100	16646	//gl.glEnable(GL.GL_LIGHTING);
15101		- gl.glDisable(GL.GL_LIGHTING);
	16647	+ gl.glEnable(GL.GL_LIGHTING);
15102	16648
15103	16649	gl.glTexGeni(GL.GL_S, GL.GL_TEXTURE_GEN_MODE, GL.GL_NORMAL_MAP);
15104	16650	gl.glTexGeni(GL.GL_T, GL.GL_TEXTURE_GEN_MODE, GL.GL_NORMAL_MAP);
..	..	@@ -15257,16 +16803,16 @@
15257	16803	cStatic.objectstack[materialdepth++] = checker;
15258	16804	//System.out.println("material " + material);
15259	16805	//Applet3D.tracein(this, selected);
15260		- vector2buffer = checker.projectedVertices;
	16806	+ //vector2buffer = checker.projectedVertices;
15261	16807
15262	16808	//checker.GetMaterial().Draw(this, false); // true);
15263		- DrawMaterial(checker.GetMaterial(), false); // true);
	16809	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
15264	16810
15265	16811	materialdepth -= 1;
15266	16812	if (materialdepth > 0)
15267	16813	{
15268		- vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
15269		- DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	16814	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16815	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
15270	16816	}
15271	16817	//checker.GetMaterial().opacity = 1f;
15272	16818	////checker.GetMaterial().ambient = 1f;
..	..	@@ -15352,6 +16898,14 @@
15352	16898	}
15353	16899	}
15354	16900
	16901	+ private Object3D GetFolder()
	16902	+ {
	16903	+ Object3D folder = object.GetWindow().copy;
	16904	+ if (object.GetWindow().copy.selection.Size() > 0)
	16905	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16906	+ return folder;
	16907	+ }
	16908	+
15355	16909	class SelectBuffer implements GLEventListener
15356	16910	{
15357	16911
..	..	@@ -15367,7 +16921,7 @@
15367	16921	//new Exception().printStackTrace();
15368	16922	System.out.println("select buffer init");
15369	16923	// Use debug pipeline
15370		- drawable.setGL(new DebugGL(drawable.getGL()));
	16924	+ //drawable.setGL(new DebugGL(drawable.getGL()));
15371	16925
15372	16926	GL gl = drawable.getGL();
15373	16927
..	..	@@ -15410,6 +16964,7 @@
15410	16964	{
15411	16965	if (!selection)
15412	16966	{
	16967	+ new Exception().printStackTrace();
15413	16968	System.exit(0);
15414	16969	return;
15415	16970	}
..	..	@@ -15430,6 +16985,17 @@
15430	16985
15431	16986	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
15432	16987
	16988	+ if (PAINTMODE)
	16989	+ {
	16990	+ if (object.GetWindow().copy.selection.Size() > 0)
	16991	+ {
	16992	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16993	+
	16994	+ // Make what you paint not selectable.
	16995	+ paintobj.ResetSelectable();
	16996	+ }
	16997	+ }
	16998	+
15433	16999	//int tmp = selection_view;
15434	17000	//selection_view = -1;
15435	17001	int temp = DrawMode();
..	..	@@ -15441,6 +17007,17 @@
15441	17007	// temp = DEFAULT; // patch for selection debug
15442	17008	Globals.drawMode = temp; // WARNING
15443	17009
	17010	+ if (PAINTMODE)
	17011	+ {
	17012	+ if (object.GetWindow().copy.selection.Size() > 0)
	17013	+ {
	17014	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	17015	+
	17016	+ // Revert.
	17017	+ paintobj.RestoreSelectable();
	17018	+ }
	17019	+ }
	17020	+
15444	17021	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
15445	17022
15446	17023	// trying different ways of getting the depth info over
..	..	@@ -15488,6 +17065,8 @@
15488	17065	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
15489	17066	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
15490	17067	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	17068	+
	17069	+ CreateSelectedPoint();
15491	17070
15492	17071	// Will fit the mesh !!!
15493	17072	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -15537,34 +17116,36 @@
15537	17116	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]));
15538	17117	}
15539	17118
15540		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	17119	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
15541	17120	}
15542	17121	}
15543	17122
15544	17123	if (!movingcamera && !PAINTMODE)
15545		- object.editWindow.ScreenFitPoint(); // fev 2014
	17124	+ object.GetWindow().ScreenFitPoint(); // fev 2014
15546	17125
15547		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	17126	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
15548	17127	{
15549		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	17128	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
15550	17129
15551		- Object3D group = new Object3D("inst" + paintcount++);
	17130	+ if (object.GetWindow().copy.selection.Size() > 0)
	17131	+ {
	17132	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
15552	17133
15553		- group.CreateMaterial(); // use a void leaf to select instances
15554		-
15555		- group.add(paintobj); // link
15556		-
15557		- object.editWindow.SnapObject(group);
15558		-
15559		- Object3D folder = object.editWindow.copy;
15560		-
15561		- if (object.editWindow.copy.selection.Size() > 0)
15562		- folder = object.editWindow.copy.selection.elementAt(0);
15563		-
15564		- folder.add(group);
15565		-
15566		- object.editWindow.ResetModel();
15567		- object.editWindow.refreshContents();
	17134	+ Object3D inst = new Object3D("inst" + paintcount++);
	17135	+
	17136	+ inst.CreateMaterial(); // use a void leaf to select instances
	17137	+
	17138	+ inst.add(paintobj); // link
	17139	+
	17140	+ object.GetWindow().SnapObject(inst);
	17141	+
	17142	+ Object3D folder = paintFolder; // GetFolder();
	17143	+
	17144	+ folder.add(inst);
	17145	+
	17146	+ object.GetWindow().ResetModel();
	17147	+ object.GetWindow().refreshContents();
	17148	+ }
15568	17149	}
15569	17150	else
15570	17151	paintcount = 0;
..	..	@@ -15603,6 +17184,11 @@
15603	17184	//System.out.println("objects[color] = " + objects[color]);
15604	17185	//objects[color].Select();
15605	17186	indexcount = 0;
	17187	+ ObjEditor window = object.GetWindow();
	17188	+ if (window != null && deselect)
	17189	+ {
	17190	+ window.Select(null, deselect, true);
	17191	+ }
15606	17192	object.Select(color, deselect);
15607	17193	}
15608	17194
..	..	@@ -15702,7 +17288,7 @@
15702	17288	gl.glDisable(gl.GL_CULL_FACE);
15703	17289	}
15704	17290
15705		- if (!RENDERSHADOW)
	17291	+ if (!Globals.RENDERSHADOW)
15706	17292	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
15707	17293
15708	17294	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -15712,7 +17298,7 @@
15712	17298	//gl.glColorMask(false, false, false, false);
15713	17299
15714	17300	//render_scene_from_light_view(gl, drawable, 0, 0);
15715		- if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
	17301	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
15716	17302	{
15717	17303	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
15718	17304
..	..	@@ -15772,7 +17358,6 @@
15772	17358
15773	17359	class AntialiasBuffer implements GLEventListener
15774	17360	{
15775		-
15776	17361	CameraPane parent = null;
15777	17362
15778	17363	AntialiasBuffer(CameraPane p)
..	..	@@ -16129,23 +17714,15 @@
16129	17714	int AAbuffersize = 0;
16130	17715
16131	17716	//double[] selectedpoint = new double[3];
16132		- static Superellipsoid selectedpoint = new Superellipsoid();
	17717	+ static Superellipsoid selectedpoint;
16133	17718	static Sphere previousselectedpoint = null;
16134		- static Sphere debugpointG = new Sphere();
16135		- static Sphere debugpointP = new Sphere();
16136		- static Sphere debugpointC = new Sphere();
16137		- static Sphere debugpointR = new Sphere();
	17719	+ static Sphere debugpointG;
	17720	+ static Sphere debugpointP;
	17721	+ static Sphere debugpointC;
	17722	+ static Sphere debugpointR;
16138	17723
16139	17724	static Sphere debugpoints[] = new Sphere[8];
16140	17725
16141		- static
16142		- {
16143		- for (int i=0; i<8; i++)
16144		- {
16145		- debugpoints[i] = new Sphere();
16146		- }
16147		- }
16148		-
16149	17726	static void InitPoints(float radius)
16150	17727	{
16151	17728	for (int i=0; i<8; i++)
..	..	@@ -16165,7 +17742,7 @@
16165	17742	}
16166	17743	}
16167	17744
16168		- static void DrawPoints(CameraPane cpane)
	17745	+ static void DrawPoints(iCameraPane cpane)
16169	17746	{
16170	17747	for (int i=0; i<8; i++) // first and last are red
16171	17748	{
..	..	@@ -16197,10 +17774,11 @@
16197	17774	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
16198	17775	// Depth buffer format
16199	17776	//private int depth_format;
16200		- static public void NextIndex(Object3D o, GL gl)
	17777	+
	17778	+ public void NextIndex()
16201	17779	{
16202	17780	indexcount+=16;
16203		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17781	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
16204	17782	//objects[indexcount] = o;
16205	17783	//System.out.println("indexcount = " + indexcount);
16206	17784	}