~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,10 +33,14 @@
30	33	import java.nio.*;
31	34
32	35	import gleem.linalg.Mat4f;
	36	+import javax.imageio.ImageTypeSpecifier;
33	37
34		-class CameraPane extends GLCanvas implements Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
	38	+class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
35	39	{
36		- static boolean DEBUG = false;
	40	+ static cMaterial[] materialstack = new cMaterial[65536];
	41	+ static boolean[] selectedstack = new boolean[65536];
	42	+ static int materialdepth = 0;
	43	+
37	44	static boolean FRUSTUM = false; // still bogus true; // frustum culling
38	45
39	46	// camera change fix
..	..	@@ -42,25 +49,40 @@
42	49
43	50	static int STEP = 1;
44	51
45		- static boolean ONESTEP = false; // do LIVE once
46		-
47		- /**
48		- * @return the LIVE
49		- */
50		- public static boolean isLIVE()
	52	+ private static BufferedImage CreateBim(byte[] bytes, int width, int height)
51	53	{
52		- return LIVE \|\| ONESTEP;
	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;
53	83	}
54	84
55		- /**
56		- * @param aLIVE the LIVE to set
57		- */
58		- public static void setLIVE(boolean aLIVE)
59		- {
60		- LIVE = aLIVE;
61		- }
62		-
63		- /static/ boolean CULLFACE = false; // true;
	85	+ /static/ private boolean CULLFACE = false; // true;
64	86	/static/ boolean NEAREST = false; // true;
65	87	/static/ boolean WIREFRAME = false; // true;
66	88
..	..	@@ -70,14 +92,12 @@
70	92	static int CURRENTANTIALIAS = 0; // 1;
71	93	/static/ boolean RENDERSHADOW = true;
72	94	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
73		- static boolean ANIMATION = false;
74		- static String filename;
75	95
76	96	boolean DISPLAYTEXT = false;
77	97	//boolean REDUCETEXTURE = true;
78	98	boolean CACHETEXTURE = true;
79	99	boolean CLEANCACHE = false; // true;
80		- boolean MIPMAP = false; // true;
	100	+ boolean MIPMAP = false; // true; // never works...
81	101	boolean COMPRESSTEXTURE = false;
82	102	boolean KOMPACTTEXTURE = false; // true;
83	103	boolean RESIZETEXTURE = false;
..	..	@@ -97,10 +117,8 @@
97	117
98	118	static boolean textureon = true;
99	119	static boolean LOCALTRANSFORM = false;
100		-private static boolean LIVE = false;
101	120	static boolean FULLSCREEN = false;
102	121	static boolean SUPPORT = true;
103		-static boolean CROWD = false;
104	122	static boolean INERTIA = true;
105	123	static boolean FAST = false;
106	124	static boolean SLOWPOSE = false;
..	..	@@ -108,6 +126,8 @@
108	126
109	127	static int tickcount = 0; // slow pose issue
110	128
	129	+static boolean BUTTONLESSWHEEL = false;
	130	+static boolean ZOOMBOXMODE = false;
111	131	static boolean BOXMODE = false;
112	132	static boolean IMAGEFLIP = false;
113	133	static boolean SMOOTHFOCUS = false;
..	..	@@ -122,7 +142,7 @@
122	142	static boolean OEIL = true;
123	143	static boolean OEILONCE = false; // do oeilon then oeiloff
124	144	static boolean LOOKAT = true;
125		-static boolean RANDOM = true; // false;
	145	+static boolean SWITCH = true; // false;
126	146	static boolean HANDLES = false; // selection doesn't work!!
127	147	static boolean PAINTMODE = false;
128	148
..	..	@@ -165,12 +185,13 @@
165	185	defaultcaps.setAccumBlueBits(16);
166	186	defaultcaps.setAccumAlphaBits(16);
167	187	}
168		- static CameraPane theRenderer;
169		-
	188	+
	189	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	190	+
170	191	void SetAsGLRenderer(boolean b)
171	192	{
172	193	isRenderer = b;
173		- theRenderer = this;
	194	+ Globals.theRenderer = this;
174	195	}
175	196
176	197	CameraPane(Object3D o, Camera cam, boolean withcontext)
..	..	@@ -206,12 +227,53 @@
206	227	return CURRENTANTIALIAS > 0;
207	228	}
208	229
209		- void ClearDepth()
	230	+ /// INTERFACE
	231	+
	232	+ public javax.media.opengl.GL GetGL0()
	233	+ {
	234	+ return null;
	235	+ }
	236	+
	237	+ public int GenList()
	238	+ {
	239	+ javax.media.opengl.GL gl = GetGL();
	240	+ return gl.glGenLists(1);
	241	+ }
	242	+
	243	+ public void NewList(int id)
	244	+ {
	245	+ javax.media.opengl.GL gl = GetGL();
	246	+ gl.glNewList(id, gl.GL_COMPILE); //_AND_EXECUTE);
	247	+ }
	248	+
	249	+ public void CallList(int id)
	250	+ {
	251	+ javax.media.opengl.GL gl = GetGL();
	252	+ gl.glCallList(id);
	253	+ }
	254	+
	255	+ public void EndList()
	256	+ {
	257	+ javax.media.opengl.GL gl = GetGL();
	258	+ gl.glEndList();
	259	+ }
	260	+
	261	+ public boolean IsBoxMode()
	262	+ {
	263	+ return BOXMODE;
	264	+ }
	265	+
	266	+ public boolean IsZoomBoxMode()
	267	+ {
	268	+ return ZOOMBOXMODE;
	269	+ }
	270	+
	271	+ public void ClearDepth()
210	272	{
211	273	GetGL().glClear(GetGL().GL_DEPTH_BUFFER_BIT);
212	274	}
213	275
214		- void DepthTest(boolean depthtest)
	276	+ public void DepthTest(boolean depthtest)
215	277	{
216	278	if (depthtest)
217	279	GetGL().glDepthFunc(GL.GL_LEQUAL);
..	..	@@ -219,7 +281,7 @@
219	281	GetGL().glDepthFunc(GL.GL_ALWAYS);
220	282	}
221	283
222		- void DepthWrite(boolean depthwrite)
	284	+ public void DepthWrite(boolean depthwrite)
223	285	{
224	286	if (depthwrite)
225	287	GetGL().glDepthMask(true);
..	..	@@ -227,12 +289,1616 @@
227	289	GetGL().glDepthMask(false);
228	290	}
229	291
230		- void BackFaceCull(boolean bfc)
	292	+ public void BackFaceCull(boolean bfc)
231	293	{
232	294	if (bfc)
233	295	GetGL().glEnable(GetGL().GL_CULL_FACE);
234	296	else
235	297	GetGL().glDisable(GetGL().GL_CULL_FACE);
	298	+ }
	299	+
	300	+ public boolean BackFaceCullMode()
	301	+ {
	302	+ return this.CULLFACE;
	303	+ }
	304	+
	305	+ public boolean IsAmbientOcclusionOn()
	306	+ {
	307	+ return this.ambientOcclusion;
	308	+ }
	309	+
	310	+ public boolean IsDebugSelection()
	311	+ {
	312	+ return DEBUG_SELECTION;
	313	+ }
	314	+
	315	+ public boolean IsFrozen()
	316	+ {
	317	+ boolean selectmode = this.DrawMode() == SELECTION \|\| this.IsDebugSelection();
	318	+
	319	+ return !selectmode && cameracount == 0; // != 0;
	320	+ }
	321	+
	322	+ // Currently in Globals
	323	+ public int DrawMode()
	324	+ {
	325	+ return Globals.DrawMode();
	326	+ }
	327	+
	328	+ public Camera EyeCamera()
	329	+ {
	330	+ return eyeCamera;
	331	+ }
	332	+
	333	+ public Camera LightCamera()
	334	+ {
	335	+ return lightCamera;
	336	+ }
	337	+
	338	+ public Camera ManipCamera()
	339	+ {
	340	+ return manipCamera;
	341	+ }
	342	+
	343	+ public Camera RenderCamera()
	344	+ {
	345	+ return renderCamera;
	346	+ }
	347	+
	348	+ public Camera[] Cameras()
	349	+ {
	350	+ return cameras;
	351	+ }
	352	+
	353	+ public void PushMaterial(Object3D obj, boolean selected)
	354	+ {
	355	+ CameraPane display = this;
	356	+ javax.media.opengl.GL gl = display.GetGL();
	357	+ cMaterial material = obj.material;
	358	+
	359	+ if (material != null)
	360	+ {
	361	+ materialstack[materialdepth] = material;
	362	+ selectedstack[materialdepth] = selected;
	363	+ cStatic.objectstack[materialdepth++] = obj;
	364	+ //System.out.println("material " + material);
	365	+ //Applet3D.tracein(this, selected);
	366	+ //display.vector2buffer = obj.projectedVertices;
	367	+ if (obj instanceof Camera)
	368	+ {
	369	+ display.options1[0] = material.shift;
	370	+ //System.out.println("shift " + material.shift);
	371	+ display.options1[1] = material.lightarea;
	372	+ display.options1[2] = material.shadowbias;
	373	+ display.options1[3] = material.aniso;
	374	+ display.options1[4] = material.anisoV;
	375	+// System.out.println("display.options1[0] " + display.options1[0]);
	376	+// System.out.println("display.options1[1] " + display.options1[1]);
	377	+// System.out.println("display.options1[2] " + display.options1[2]);
	378	+// System.out.println("display.options1[3] " + display.options1[3]);
	379	+// System.out.println("display.options1[4] " + display.options1[4]);
	380	+ display.options2[0] = material.opacity;
	381	+ display.options2[1] = material.diffuse;
	382	+ display.options2[2] = material.factor;
	383	+// System.out.println("display.options2[0] " + display.options2[0]);
	384	+// System.out.println("display.options2[1] " + display.options2[1]);
	385	+// System.out.println("display.options2[2] " + display.options2[2]);
	386	+
	387	+ cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	388	+// System.out.println("display.options3[0] " + display.options3[0]);
	389	+// System.out.println("display.options3[1] " + display.options3[1]);
	390	+// System.out.println("display.options3[2] " + display.options3[2]);
	391	+ display.options4[0] = material.cameralight/0.2f;
	392	+ display.options4[1] = material.subsurface;
	393	+ display.options4[2] = material.sheen;
	394	+// System.out.println("display.options4[0] " + display.options4[0]);
	395	+// System.out.println("display.options4[1] " + display.options4[1]);
	396	+// System.out.println("display.options4[2] " + display.options4[2]);
	397	+
	398	+ // if (display.CURRENTANTIALIAS > 0)
	399	+ // display.options3[3] /= 4;
	400	+
	401	+ /*
	402	+ System.out.println("Focus = " + display.options1[0]);
	403	+ System.out.println("Aperture = " + display.options1[1]);
	404	+ System.out.println("ShadowBlur = " + display.options1[2]);
	405	+ System.out.println("Antialiasing = " + display.options1[3]);
	406	+ System.out.println("Fog = " + display.options2[0]);
	407	+ System.out.println("Intensity = " + display.options2[1]);
	408	+ System.out.println("Elevation = " + display.options2[2]);
	409	+ /**/
	410	+ } else
	411	+ {
	412	+ DrawMaterial(material, selected, obj.projectedVertices);
	413	+ }
	414	+ } else
	415	+ {
	416	+ if (selected && CameraPane.flash)
	417	+ {
	418	+ display.modelParams4[1] = 100;
	419	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	420	+ }
	421	+ }
	422	+ }
	423	+
	424	+ public void PushMaterial2(Object3D obj, boolean selected)
	425	+ {
	426	+ CameraPane display = this;
	427	+ cMaterial material = obj.material;
	428	+
	429	+ if (material != null)
	430	+ {
	431	+ materialstack[materialdepth] = material;
	432	+ selectedstack[materialdepth] = selected;
	433	+ cStatic.objectstack[materialdepth++] = obj;
	434	+ //System.out.println("material " + material);
	435	+ //Applet3D.tracein("selected ", selected);
	436	+ //display.vector2buffer = obj.projectedVertices;
	437	+ display.DrawMaterial(material, selected, obj.projectedVertices);
	438	+ }
	439	+ }
	440	+
	441	+ public void PopMaterial(Object3D obj, boolean selected)
	442	+ {
	443	+ CameraPane display = this;
	444	+ javax.media.opengl.GL gl = display.GetGL();
	445	+ cMaterial material = obj.material;
	446	+
	447	+ //if (parent != null && parent.GetMaterial() != null)
	448	+ // parent.GetMaterial().Draw(display, parent.IsSelected(this));
	449	+ if (material != null)
	450	+ {
	451	+ materialdepth -= 1;
	452	+ if (materialdepth > 0)
	453	+ {
	454	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	455	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
	456	+ }
	457	+ //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
	458	+ } else if (selected && CameraPane.flash && obj.GetMaterial() != null)
	459	+ {
	460	+ display.modelParams4[1] = obj.GetMaterial().cameralight;
	461	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	462	+ }
	463	+ }
	464	+
	465	+ public void PopMaterial2(Object3D obj)
	466	+ {
	467	+ CameraPane display = this;
	468	+ cMaterial material = obj.material;
	469	+
	470	+ if (material != null)
	471	+ {
	472	+ materialdepth -= 1;
	473	+ if (materialdepth > 0)
	474	+ {
	475	+ //display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	476	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
	477	+ }
	478	+ //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
	479	+ //else
	480	+ //material.Draw(display, false);
	481	+ }
	482	+ }
	483	+
	484	+ public void DrawFace(Object3D obj, Vertex pv, Vertex qv, Vertex rv, Face face)
	485	+ {
	486	+ CameraPane display = this;
	487	+
	488	+ if (pv.y == -10000 \|\|
	489	+ qv.y == -10000 \|\|
	490	+ rv.y == -10000)
	491	+ return;
	492	+
	493	+// float b = f.nbiterations & 1;
	494	+// float g = (f.nbiterations>>1) & 1;
	495	+// float r = (f.nbiterations>>2) & 1;
	496	+//
	497	+// //if (f.weight == 10000)
	498	+// //{
	499	+// // r = 1; g = b = 0;
	500	+// //}
	501	+// //else
	502	+// //{
	503	+// // assert(f.weight < 10000);
	504	+// r = g = b = (float)bRep.FaceWeight(f)*100;
	505	+// if (r<0)
	506	+// assert(r>=0);
	507	+// //}
	508	+
	509	+ javax.media.opengl.GL gl = display.GetGL();
	510	+
	511	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
	512	+
	513	+ //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
	514	+ if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
	515	+ {
	516	+ //gl.glBegin(gl.GL_TRIANGLES);
	517	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	518	+ // TEST LIVE NORMALS && !obj.dontselect
	519	+ ;
	520	+ if (!hasnorm)
	521	+ {
	522	+ // System.out.println("Mesh normal");
	523	+ LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
	524	+ LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
	525	+ LA.vecCross(obj.v0, obj.v1, obj.v2);
	526	+ LA.vecNormalize(obj.v2);
	527	+ gl.glNormal3f((float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
	528	+ }
	529	+
	530	+ // P
	531	+ float x = (float)pv.x;
	532	+ float y = (float)pv.y;
	533	+ float z = (float)pv.z;
	534	+
	535	+ if (hasnorm)
	536	+ {
	537	+// if (!pv.norm.normalized())
	538	+// assert(pv.norm.normalized());
	539	+
	540	+ //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
	541	+ float nx = (float)pv.norm.x;
	542	+ float ny = (float)pv.norm.y;
	543	+ float nz = (float)pv.norm.z;
	544	+
	545	+ x += nx * obj.NORMALPUSH;
	546	+ y += ny * obj.NORMALPUSH;
	547	+ z += nz * obj.NORMALPUSH;
	548	+
	549	+ gl.glNormal3f(nx, ny, nz);
	550	+ }
	551	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	552	+ SetColor(obj, pv);
	553	+ //gl.glColor4f(r, g, b, 1);
	554	+ //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
	555	+ if (obj.flipV)
	556	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	557	+ else
	558	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	559	+ //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
	560	+
	561	+ gl.glVertex3f(x, y, z);
	562	+
	563	+ // Q
	564	+ x = (float)qv.x;
	565	+ y = (float)qv.y;
	566	+ z = (float)qv.z;
	567	+
	568	+// Print(pv);
	569	+ if (hasnorm)
	570	+ {
	571	+// assert(qv.norm.normalized());
	572	+ //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
	573	+ float nx = (float)qv.norm.x;
	574	+ float ny = (float)qv.norm.y;
	575	+ float nz = (float)qv.norm.z;
	576	+
	577	+ x += nx * obj.NORMALPUSH;
	578	+ y += ny * obj.NORMALPUSH;
	579	+ z += nz * obj.NORMALPUSH;
	580	+
	581	+ gl.glNormal3f(nx, ny, nz);
	582	+ }
	583	+ //System.out.println("vertexq = " + qv.s + ", " + qv.t);
	584	+ // boolean locked = false;
	585	+ // float eps = 0.1f;
	586	+ // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	587	+
	588	+ // int dot = 0; //*/ (int)f.dot;
	589	+
	590	+ // if ((dot&1) == 0)
	591	+ // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	592	+
	593	+ // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	594	+ if (obj.flipV)
	595	+ gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
	596	+ else
	597	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	598	+ // else
	599	+ // {
	600	+ // locked = true;
	601	+ // gl.glTexCoord2f((float) pv.s, (float) pv.t);
	602	+ // }
	603	+ gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
	604	+ SetColor(obj, qv);
	605	+
	606	+ gl.glVertex3f(x, y, z);
	607	+ //gl.glColor4f(r, g, b, 1);
	608	+ //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
	609	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	610	+// Print(qv);
	611	+
	612	+ // R
	613	+ x = (float)rv.x;
	614	+ y = (float)rv.y;
	615	+ z = (float)rv.z;
	616	+
	617	+ if (hasnorm)
	618	+ {
	619	+// assert(rv.norm.normalized());
	620	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	621	+ float nx = (float)rv.norm.x;
	622	+ float ny = (float)rv.norm.y;
	623	+ float nz = (float)rv.norm.z;
	624	+
	625	+ x += nx * obj.NORMALPUSH;
	626	+ y += ny * obj.NORMALPUSH;
	627	+ z += nz * obj.NORMALPUSH;
	628	+
	629	+ gl.glNormal3f(nx, ny, nz);
	630	+ }
	631	+
	632	+ // if ((dot&4) == 0)
	633	+ // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	634	+
	635	+ // if (wrap \|\| !locked && (dot&8) != 0)
	636	+ if (obj.flipV)
	637	+ gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
	638	+ else
	639	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	640	+ // else
	641	+ // gl.glTexCoord2f((float) pv.s, (float) pv.t);
	642	+
	643	+ // f.dot = dot;
	644	+
	645	+ gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
	646	+ SetColor(obj, rv);
	647	+ //gl.glColor4f(r, g, b, 1);
	648	+ //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
	649	+ //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
	650	+ gl.glVertex3f(x, y, z);
	651	+// Print(rv);
	652	+ //gl.glEnd();
	653	+ }
	654	+ else
	655	+ {
	656	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	657	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	658	+ gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
	659	+
	660	+ }
	661	+
	662	+ if (false) // (attributes & WIREFRAME) != 0)
	663	+ {
	664	+ gl.glDisable(gl.GL_LIGHTING);
	665	+
	666	+ gl.glBegin(gl.GL_LINE_LOOP);
	667	+ gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
	668	+ gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
	669	+ gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
	670	+ gl.glEnd();
	671	+
	672	+ gl.glEnable(gl.GL_LIGHTING);
	673	+ }
	674	+ }
	675	+
	676	+ /**
	677	+ * <code>draw</code> renders a <code>TriMesh</code> object including
	678	+ * it's normals, colors, textures and vertices.
	679	+ *
	680	+ * @see Renderer#draw(TriMesh)
	681	+ * @param tris
	682	+ * the mesh to render.
	683	+ */
	684	+ public void DrawParticles(TriMesh geo, Object3D shape, boolean selected, boolean rotate) // TriMesh tris)
	685	+ {
	686	+ CameraPane display = this;
	687	+
	688	+ float r = display.modelParams0[0];
	689	+ float g = display.modelParams0[1];
	690	+ float b = display.modelParams0[2];
	691	+ float opacity = display.modelParams5[1];
	692	+
	693	+ //final GL gl = GLU.getCurrentGL();
	694	+ GL gl = display.GetGL(); // getGL();
	695	+
	696	+ FloatBuffer vertBuf = geo.vertBuf;
	697	+
	698	+ int v = vertBuf.capacity();
	699	+
	700	+ int count = 0;
	701	+
	702	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	703	+ gl.glEnable(gl.GL_CULL_FACE);
	704	+ // gl.glScalef(1.0f/1024,1.0f/1024,1.0f/1024);
	705	+ for (int i=0; i<v/3; i++)
	706	+ {
	707	+ int index3 = i*3;
	708	+
	709	+ if (geo.sizeBuf.get(index3+1) == 0)
	710	+ continue;
	711	+
	712	+ count++;
	713	+
	714	+ int index4 = i*4;
	715	+
	716	+ float tx = vertBuf.get(index3);
	717	+ float ty = vertBuf.get(index3+1);
	718	+ float tz = vertBuf.get(index3+2);
	719	+
	720	+ // if (tx == 0 && ty == 0 && tz == 0)
	721	+ // continue;
	722	+
	723	+ gl.glMatrixMode(gl.GL_TEXTURE);
	724	+ gl.glPushMatrix();
	725	+
	726	+ float[] texmat = geo.texmat;
	727	+ texmat[12] = texmat[13] = texmat[14] = i;
	728	+
	729	+ gl.glMultMatrixf(texmat, 0);
	730	+
	731	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	732	+ gl.glPushMatrix();
	733	+
	734	+ gl.glTranslatef(tx,ty,tz);
	735	+
	736	+ if (rotate)
	737	+ gl.glRotatef(i, 0, 1, 0);
	738	+
	739	+ float size = geo.sizeBuf.get(index3) / 100;
	740	+ gl.glScalef(size,size,size);
	741	+
	742	+ float cr = geo.colorBuf.get(index4);
	743	+ float cg = geo.colorBuf.get(index4+1);
	744	+ float cb = geo.colorBuf.get(index4+2);
	745	+ float ca = geo.colorBuf.get(index4+3);
	746	+
	747	+ display.modelParams0[0] = r * cr;
	748	+ display.modelParams0[1] = g * cg;
	749	+ display.modelParams0[2] = b * cb;
	750	+
	751	+ display.modelParams5[1] = opacity * ca;
	752	+
	753	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	754	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	755	+
	756	+ RandomNode.globalseed = (int)geo.sizeBuf.get(index3+2); // i;
	757	+ RandomNode.globalseed2 = RandomNode.globalseed;
	758	+
	759	+// gl.glColor4f(cr,cg,cb,ca);
	760	+ // gl.glScalef(1024/16,1024/16,1024/16);
	761	+ shape.Draw/Node/(display,null,selected,false); // blocked
	762	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	763	+ //gl.glTranslatef(-tx,-ty,-tz);
	764	+ gl.glPopMatrix();
	765	+
	766	+ gl.glMatrixMode(gl.GL_TEXTURE);
	767	+ gl.glPopMatrix();
	768	+ }
	769	+ // gl.glScalef(1024,1024,1024);
	770	+ if (!cf)
	771	+ gl.glDisable(gl.GL_CULL_FACE);
	772	+
	773	+ display.modelParams0[0] = r;
	774	+ display.modelParams0[1] = g;
	775	+ display.modelParams0[2] = b;
	776	+
	777	+ display.modelParams5[1] = opacity;
	778	+
	779	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	780	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	781	+
	782	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	783	+
	784	+// System.err.println("total = " + v/3 + "; displayed = " + count);
	785	+ if (true)
	786	+ return;
	787	+
	788	+//// if (!tris.predraw(this))
	789	+//// {
	790	+//// return;
	791	+//// }
	792	+//// if (Debug.stats)
	793	+//// {
	794	+//// StatCollector.addStat(StatType.STAT_TRIANGLE_COUNT, tris.getTriangleCount());
	795	+//// StatCollector.addStat(StatType.STAT_VERTEX_COUNT, tris.getVertexCount());
	796	+//// StatCollector.addStat(StatType.STAT_GEOM_COUNT, 1);
	797	+//// }
	798	+////
	799	+//// if (tris.getDisplayListID() != -1)
	800	+//// {
	801	+//// renderDisplayList(tris);
	802	+//// return;
	803	+//// }
	804	+////
	805	+//// if (!generatingDisplayList)
	806	+//// {
	807	+//// applyStates(tris.states, tris);
	808	+//// }
	809	+//// if (Debug.stats)
	810	+//// {
	811	+//// StatCollector.startStat(StatType.STAT_RENDER_TIMER);
	812	+//// }
	813	+//// boolean transformed = doTransforms(tris);
	814	+//
	815	+// int glMode = GL.GL_TRIANGLES;
	816	+// switch (getMode())
	817	+// {
	818	+// case Triangles:
	819	+// glMode = GL.GL_TRIANGLES;
	820	+// break;
	821	+// case Strip:
	822	+// glMode = GL.GL_TRIANGLE_STRIP;
	823	+// break;
	824	+// case Fan:
	825	+// glMode = GL.GL_TRIANGLE_FAN;
	826	+// break;
	827	+// }
	828	+//
	829	+// if (!predrawGeometry(gl))
	830	+// {
	831	+// // make sure only the necessary indices are sent through on old
	832	+// // cards.
	833	+// IntBuffer indices = this.getIndexBuffer();
	834	+// if (indices == null)
	835	+// {
	836	+// logger.severe("missing indices on geometry object: " + this.toString());
	837	+// } else
	838	+// {
	839	+// indices.rewind();
	840	+// indices.limit(this.getMaxIndex());
	841	+//
	842	+// gl.glDrawElements(glMode, indices.limit(), GL.GL_UNSIGNED_INT, indices); // TODO Check <count> and assumed <type> of GL_UNSIGNED_INT
	843	+//
	844	+// indices.clear();
	845	+// }
	846	+// } else
	847	+// {
	848	+// gl.glDrawElements(glMode, this.getIndexBuffer().limit(),
	849	+// GL.GL_UNSIGNED_INT, 0);
	850	+// }
	851	+//
	852	+//// postdrawGeometry(tris);
	853	+//// if (transformed)
	854	+//// {
	855	+//// undoTransforms(tris);
	856	+//// }
	857	+////
	858	+//// if (Debug.stats)
	859	+//// {
	860	+//// StatCollector.endStat(StatType.STAT_RENDER_TIMER);
	861	+//// }
	862	+//// tris.postdraw(this);
	863	+ }
	864	+
	865	+ static Camera localcamera = new Camera();
	866	+ static cVector from = new cVector();
	867	+ static cVector to = new cVector();
	868	+
	869	+ public void PrepOcclusion(BoundaryRep br, double[][] transform)
	870	+ {
	871	+ CameraPane cp = this;
	872	+
	873	+ Camera keep = cp.RenderCamera();
	874	+ cp.renderCamera = localcamera;
	875	+
	876	+ if (br.trimmed)
	877	+ {
	878	+ float[] colors = new float[br.positions.length / 3];
	879	+
	880	+ int i3 = 0;
	881	+ for (int i = 0; i < br.positions.length / 3; i++, i3 += 3)
	882	+ {
	883	+ if (br.normals[i3] == 0 && br.normals[i3+1] == 0 && br.normals[i3+2] == 0)
	884	+ continue;
	885	+
	886	+ from.set(br.positions[i3], br.positions[i3 + 1], br.positions[i3 + 2]);
	887	+ to.set(br.positions[i3] + br.normals[i3],
	888	+ br.positions[i3 + 1] + br.normals[i3 + 1],
	889	+ br.positions[i3 + 2] + br.normals[i3 + 2]);
	890	+ LA.xformPos(from, transform, from);
	891	+ LA.xformPos(to, transform, to); // RIGID ONLY
	892	+ localcamera.setAim(from, to);
	893	+
	894	+ CameraPane.occlusionbuffer.display();
	895	+
	896	+ if (CameraPane.DEBUG_OCCLUSION)
	897	+ cp.display(); // debug
	898	+
	899	+ colors[i] = cp.vertexOcclusion.r;
	900	+ //colors[i3 + 1] = cp.vertexOcclusion.g;
	901	+ //colors[i3 + 2] = cp.vertexOcclusion.b;
	902	+
	903	+ if ((i % 100) == 0 && i != 0)
	904	+ {
	905	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	906	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	907	+ System.out.println((int) (100.0 * i / (br.positions.length / 3)) + "% (" + i + " of " + (br.positions.length / 3) + ")");
	908	+ }
	909	+ }
	910	+
	911	+ br.colors = colors;
	912	+ }
	913	+ else
	914	+ {
	915	+ for (int i = 0; i < br.VertexCount(); i++)
	916	+ {
	917	+ Vertex v = br.GetVertex(i);
	918	+
	919	+ if (v.norm == null \|\| v.norm.x == 0 && v.norm.y == 0 && v.norm.z == 0)
	920	+ continue;
	921	+
	922	+ from.set(v.x, v.y, v.z);
	923	+ to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
	924	+ LA.xformPos(from, transform, from);
	925	+ LA.xformPos(to, transform, to); // RIGID ONLY
	926	+ localcamera.setAim(from, to);
	927	+
	928	+ CameraPane.occlusionbuffer.display();
	929	+
	930	+ if (CameraPane.DEBUG_OCCLUSION)
	931	+ cp.display(); // debug
	932	+
	933	+ v.AO = cp.vertexOcclusion.r;
	934	+
	935	+ if ((i % 100) == 0 && i != 0)
	936	+ {
	937	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	938	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	939	+ System.out.println((int) (100.0 * i / br.VertexCount()) + "% (" + i + " of " + br.VertexCount() + ")");
	940	+ }
	941	+ }
	942	+ }
	943	+
	944	+ //System.out.println("done.");
	945	+
	946	+ cp.renderCamera = keep;
	947	+ }
	948	+
	949	+ void DrawPointFLow(PointFlow pointFlow, Object3D /Composite/ root, boolean selected, boolean blocked)
	950	+ {
	951	+ CameraPane display = this;
	952	+ pointFlow.CreateHT();
	953	+
	954	+ float r = display.modelParams0[0];
	955	+ float g = display.modelParams0[1];
	956	+ float b = display.modelParams0[2];
	957	+ float opacity = display.modelParams5[1];
	958	+
	959	+ //final GL gl = GLU.getCurrentGL();
	960	+ GL gl = display.GetGL(); // getGL();
	961	+
	962	+ int s = pointFlow.points.size();
	963	+
	964	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	965	+ gl.glEnable(gl.GL_CULL_FACE);
	966	+
	967	+ for (int i=s; --i>=0;)
	968	+ //for (int i=0; i<s; i++)
	969	+ {
	970	+ cVector v = pointFlow.points.get(i);
	971	+
	972	+ double mindist = Double.MAX_VALUE;
	973	+
	974	+ double size = pointFlow.minimumSize;
	975	+
	976	+ double distancenext = 0;
	977	+
	978	+ if (i > 0)
	979	+ {
	980	+ cVector w = pointFlow.points.get(i-1);
	981	+
	982	+ double dist = w.distance(v);
	983	+
	984	+ distancenext = dist;
	985	+
	986	+ if (mindist > dist)
	987	+ {
	988	+ mindist = dist;
	989	+ size = mindist*pointFlow.resizefactor;
	990	+ }
	991	+ }
	992	+
	993	+ if (i < s-1)
	994	+ {
	995	+ cVector w = pointFlow.points.get(i+1);
	996	+
	997	+ double dist = w.distance(v);
	998	+
	999	+ if (mindist > dist)
	1000	+ {
	1001	+ mindist = dist;
	1002	+ size = mindist*pointFlow.resizefactor;
	1003	+ }
	1004	+ }
	1005	+
	1006	+ if (size < pointFlow.minimumSize)
	1007	+ size = pointFlow.minimumSize;
	1008	+ if (size > pointFlow.maximumSize)
	1009	+ size = pointFlow.maximumSize;
	1010	+
	1011	+ double tx = v.x;
	1012	+ double ty = v.y;
	1013	+ double tz = v.z;
	1014	+
	1015	+ // if (tx == 0 && ty == 0 && tz == 0)
	1016	+ // continue;
	1017	+
	1018	+ gl.glMatrixMode(gl.GL_TEXTURE);
	1019	+ gl.glPushMatrix();
	1020	+ pointFlow.texmat[12] = pointFlow.texmat[13] = pointFlow.texmat[14] = i;
	1021	+
	1022	+ gl.glMultMatrixf(pointFlow.texmat, 0);
	1023	+
	1024	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	1025	+ gl.glPushMatrix();
	1026	+
	1027	+ gl.glTranslated(tx,ty,tz);
	1028	+
	1029	+ gl.glScaled(size,size,size);
	1030	+
	1031	+// float cr = colorBuf.get(index4);
	1032	+// float cg = colorBuf.get(index4+1);
	1033	+// float cb = colorBuf.get(index4+2);
	1034	+// float ca = colorBuf.get(index4+3);
	1035	+//
	1036	+// display.modelParams0[0] = r * cr;
	1037	+// display.modelParams0[1] = g * cg;
	1038	+// display.modelParams0[2] = b * cb;
	1039	+//
	1040	+// display.modelParams5[1] = opacity * ca;
	1041	+//
	1042	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1043	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1044	+//
	1045	+// RandomNode.globalseed = (int)sizeBuf.get(index3+2); // i;
	1046	+// RandomNode.globalseed2 = RandomNode.globalseed;
	1047	+//
	1048	+//// gl.glColor4f(cr,cg,cb,ca);
	1049	+// // gl.glScalef(1024/16,1024/16,1024/16);
	1050	+ pointFlow.geo.Draw/Node/(display,null,selected, blocked);
	1051	+
	1052	+ gl.glPopMatrix();
	1053	+
	1054	+ double step = size/4; //
	1055	+
	1056	+ if (i == 0 \|\| size == 0 \|\| distancenext > 8*size \|\| distancenext < step)
	1057	+ continue;
	1058	+
	1059	+ int nbsteps = (int)(distancenext/step);
	1060	+
	1061	+ step = distancenext/nbsteps;
	1062	+
	1063	+ cVector next = pointFlow.points.get(i-1);
	1064	+
	1065	+ tmp.set(next);
	1066	+ tmp.sub(v);
	1067	+ tmp.normalize();
	1068	+ tmp.mul(step);
	1069	+
	1070	+ // calculate next size
	1071	+ mindist = Double.MAX_VALUE;
	1072	+
	1073	+ double nextsize = pointFlow.minimumSize;
	1074	+
	1075	+ if (i > 1)
	1076	+ {
	1077	+ cVector w = pointFlow.points.get(i-2);
	1078	+
	1079	+ double dist = w.distance(next);
	1080	+
	1081	+ if (mindist > dist)
	1082	+ {
	1083	+ mindist = dist;
	1084	+ nextsize = mindist*pointFlow.resizefactor;
	1085	+ }
	1086	+ }
	1087	+
	1088	+ double dist = v.distance(next);
	1089	+
	1090	+ if (mindist > dist)
	1091	+ {
	1092	+ mindist = dist;
	1093	+ nextsize = mindist*pointFlow.resizefactor;
	1094	+ }
	1095	+
	1096	+ if (nextsize < pointFlow.minimumSize)
	1097	+ nextsize = pointFlow.minimumSize;
	1098	+ if (nextsize > pointFlow.maximumSize)
	1099	+ nextsize = pointFlow.maximumSize;
	1100	+ //
	1101	+
	1102	+ double count = 0;
	1103	+
	1104	+ while (distancenext > 0.000000001) // step
	1105	+ {
	1106	+ gl.glPushMatrix();
	1107	+
	1108	+ gl.glTranslated(tx + tmp.xcount, ty + tmp.ycount, tz + tmp.z*count);
	1109	+
	1110	+ double K = count/nbsteps;
	1111	+
	1112	+ double intersize = Knextsize + (1-K)size;
	1113	+
	1114	+ gl.glScaled(intersize,intersize,intersize);
	1115	+
	1116	+ pointFlow.geo.Draw/Node/(display,null,selected,blocked);
	1117	+
	1118	+ count++;
	1119	+
	1120	+ distancenext -= step;
	1121	+
	1122	+ gl.glPopMatrix();
	1123	+ }
	1124	+
	1125	+ if (count != nbsteps)
	1126	+ assert(count == nbsteps);
	1127	+
	1128	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	1129	+ //gl.glTranslatef(-tx,-ty,-tz);
	1130	+
	1131	+ gl.glMatrixMode(gl.GL_TEXTURE);
	1132	+ gl.glPopMatrix();
	1133	+ }
	1134	+
	1135	+ if (!cf)
	1136	+ gl.glDisable(gl.GL_CULL_FACE);
	1137	+
	1138	+// display.modelParams0[0] = r;
	1139	+// display.modelParams0[1] = g;
	1140	+// display.modelParams0[2] = b;
	1141	+//
	1142	+// display.modelParams5[1] = opacity;
	1143	+//
	1144	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1145	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1146	+
	1147	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	1148	+ }
	1149	+
	1150	+ public void DrawBox(cVector min, cVector max)
	1151	+ {
	1152	+ javax.media.opengl.GL gl = GetGL();
	1153	+ gl.glBegin(gl.GL_LINES);
	1154	+
	1155	+ gl.glVertex3d(min.x, min.y, min.z);
	1156	+ gl.glVertex3d(min.x, min.y, max.z);
	1157	+ gl.glVertex3d(min.x, min.y, min.z);
	1158	+ gl.glVertex3d(min.x, max.y, min.z);
	1159	+ gl.glVertex3d(min.x, min.y, min.z);
	1160	+ gl.glVertex3d(max.x, min.y, min.z);
	1161	+
	1162	+ gl.glVertex3d(max.x, max.y, max.z);
	1163	+ gl.glVertex3d(min.x, max.y, max.z);
	1164	+ gl.glVertex3d(max.x, max.y, max.z);
	1165	+ gl.glVertex3d(max.x, min.y, max.z);
	1166	+ gl.glVertex3d(max.x, max.y, max.z);
	1167	+ gl.glVertex3d(max.x, max.y, min.z);
	1168	+
	1169	+ gl.glEnd();
	1170	+ }
	1171	+
	1172	+ public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
	1173	+ {
	1174	+ int[] strips = bRep.getRawIndices();
	1175	+
	1176	+ javax.media.opengl.GL gl = GetGL();
	1177	+
	1178	+ // TRIANGLE STRIP ARRAY
	1179	+ if (bRep.trimmed)
	1180	+ {
	1181	+ float[] v = bRep.getRawVertices();
	1182	+ float[] n = bRep.getRawNormals();
	1183	+ float[] c = bRep.getRawColors();
	1184	+ float[] uv = bRep.getRawUVMap();
	1185	+
	1186	+ int count2 = 0;
	1187	+ int count3 = 0;
	1188	+
	1189	+ if (n.length > 0)
	1190	+ {
	1191	+ for (int i = 0; i < strips.length; i++)
	1192	+ {
	1193	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1194	+
	1195	+ /*
	1196	+ boolean locked = false;
	1197	+ float eps = 0.1f;
	1198	+ boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	1199	+
	1200	+ int dot = 0;
	1201	+
	1202	+ if ((dot&1) == 0)
	1203	+ dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	1204	+
	1205	+ if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	1206	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	1207	+ else
	1208	+ {
	1209	+ locked = true;
	1210	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1211	+ }
	1212	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	1213	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	1214	+ if (hasnorm)
	1215	+ {
	1216	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	1217	+ gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
	1218	+ }
	1219	+
	1220	+ if ((dot&4) == 0)
	1221	+ dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	1222	+
	1223	+ if (wrap \|\| !locked && (dot&8) != 0)
	1224	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	1225	+ else
	1226	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1227	+
	1228	+ f.dot = dot;
	1229	+ */
	1230	+
	1231	+ if (!selectmode)
	1232	+ {
	1233	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1234	+ {
	1235	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1236	+ } else
	1237	+ {
	1238	+ gl.glNormal3f(0, 0, 1);
	1239	+ }
	1240	+
	1241	+ if (c != null)
	1242	+ //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
	1243	+ {
	1244	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1245	+ }
	1246	+ }
	1247	+
	1248	+ if (flipV)
	1249	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1250	+ else
	1251	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1252	+
	1253	+ //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1254	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1255	+
	1256	+ count2 += 2;
	1257	+ count3 += 3;
	1258	+ if (!selectmode)
	1259	+ {
	1260	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1261	+ {
	1262	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1263	+ } else
	1264	+ {
	1265	+ gl.glNormal3f(0, 0, 1);
	1266	+ }
	1267	+ if (c != null)
	1268	+ {
	1269	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1270	+ }
	1271	+ }
	1272	+
	1273	+ if (flipV)
	1274	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1275	+ else
	1276	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1277	+
	1278	+ //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1279	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1280	+
	1281	+ count2 += 2;
	1282	+ count3 += 3;
	1283	+ for (int j = 0; j < strips[i] - 2; j++)
	1284	+ {
	1285	+ //gl.glTexCoord2d(...);
	1286	+ if (!selectmode)
	1287	+ {
	1288	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1289	+ {
	1290	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1291	+ } else
	1292	+ {
	1293	+ gl.glNormal3f(0, 0, 1);
	1294	+ }
	1295	+ if (c != null)
	1296	+ {
	1297	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1298	+ }
	1299	+ }
	1300	+
	1301	+ if (flipV)
	1302	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1303	+ else
	1304	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1305	+
	1306	+ //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
	1307	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1308	+
	1309	+ count2 += 2;
	1310	+ count3 += 3;
	1311	+ }
	1312	+
	1313	+ gl.glEnd();
	1314	+ }
	1315	+ }
	1316	+
	1317	+ assert count3 == v.length;
	1318	+ }
	1319	+ else // !trimmed
	1320	+ {
	1321	+ int count = 0;
	1322	+ for (int i = 0; i < strips.length; i++)
	1323	+ {
	1324	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1325	+
	1326	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	1327	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	1328	+
	1329	+ drawVertex(gl, p, flipV, selectmode);
	1330	+ drawVertex(gl, q, flipV, selectmode);
	1331	+
	1332	+ for (int j = 0; j < strips[i] - 2; j++)
	1333	+ {
	1334	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	1335	+
	1336	+ // if (j%2 == 0)
	1337	+ // drawFace(p, q, r, display, null);
	1338	+ // else
	1339	+ // drawFace(p, r, q, display, null);
	1340	+
	1341	+ // p = q;
	1342	+ // q = r;
	1343	+ drawVertex(gl, r, flipV, selectmode);
	1344	+ }
	1345	+
	1346	+ gl.glEnd();
	1347	+ }
	1348	+ }
	1349	+ }
	1350	+
	1351	+ static cSpring.Point3D temp = new cSpring.Point3D();
	1352	+ static cSpring.Point3D temp2 = new cSpring.Point3D();
	1353	+ static cSpring.Point3D temp3 = new cSpring.Point3D();
	1354	+
	1355	+ public void DrawDynamicMesh(cMesh mesh)
	1356	+ {
	1357	+ GL gl = GetGL(); // getGL();
	1358	+
	1359	+ cSpring.PhysicsController3D Phys = mesh.Phys;
	1360	+
	1361	+ gl.glDisable(gl.GL_LIGHTING);
	1362	+
	1363	+ gl.glLineWidth(1);
	1364	+ gl.glColor3f(1,1,1);
	1365	+ gl.glBegin(gl.GL_LINES);
	1366	+ double scale = 0;
	1367	+ int count = 0;
	1368	+ for (int s=0; s<Phys.allSprings.size(); s++)
	1369	+ {
	1370	+ cSpring.Spring spring = Phys.allSprings.get(s);
	1371	+ if(s == 0)
	1372	+ {
	1373	+ //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
	1374	+ }
	1375	+ if (mesh.showsprings)
	1376	+ {
	1377	+ temp.set(spring.a.position);
	1378	+ temp.add(spring.b.position);
	1379	+ temp.mul(0.5);
	1380	+ temp2.set(spring.a.position);
	1381	+ temp2.sub(spring.b.position);
	1382	+ temp2.mul(spring.restLength/2);
	1383	+ temp.sub(temp2);
	1384	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1385	+ temp.add(temp2);
	1386	+ temp.add(temp2);
	1387	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1388	+ }
	1389	+
	1390	+ if (spring.isHandle)
	1391	+ continue;
	1392	+
	1393	+ //if (scale < spring.restLength)
	1394	+ scale += spring.restLength;
	1395	+ count++;
	1396	+ }
	1397	+ gl.glEnd();
	1398	+
	1399	+ if (count == 0)
	1400	+ scale = 0.01;
	1401	+ else
	1402	+ scale /= count * 3;
	1403	+
	1404	+ //scale = 0.25;
	1405	+
	1406	+ if (mesh.ShowInfo())
	1407	+ {
	1408	+ gl.glLineWidth(4);
	1409	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1410	+ {
	1411	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1412	+ if (node.mass == 0)
	1413	+ continue;
	1414	+
	1415	+ int i = node.springs==null?-1:node.springs.size();
	1416	+ gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
	1417	+ //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
	1418	+ //temp.normalize();
	1419	+ //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
	1420	+ gl.glBegin(gl.GL_LINES);
	1421	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1422	+ //gl.glVertex3d(node.position.x + node.normal.xscale, node.position.y + node.normal.yscale, node.position.z + node.normal.z*scale);
	1423	+ gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
	1424	+ node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
	1425	+ node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
	1426	+ gl.glEnd();
	1427	+ }
	1428	+
	1429	+ gl.glLineWidth(8);
	1430	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1431	+ {
	1432	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1433	+
	1434	+ if (node.springs != null)
	1435	+ {
	1436	+ for (int i=0; i<node.springs.size(); i+=1)
	1437	+ {
	1438	+ cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
	1439	+
	1440	+ int c = i+1;
	1441	+ // c = node.springs.get(i).nbcopies;
	1442	+
	1443	+ gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
	1444	+ gl.glBegin(gl.GL_LINES);
	1445	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1446	+ 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);
	1447	+ gl.glEnd();
	1448	+ }
	1449	+ }
	1450	+ }
	1451	+
	1452	+ gl.glLineWidth(1);
	1453	+ }
	1454	+
	1455	+ gl.glEnable(gl.GL_LIGHTING);
	1456	+ }
	1457	+
	1458	+ /// INTERFACE
	1459	+
	1460	+ public void StartTriangles()
	1461	+ {
	1462	+ javax.media.opengl.GL gl = GetGL();
	1463	+ gl.glBegin(gl.GL_TRIANGLES);
	1464	+ }
	1465	+
	1466	+ public void EndTriangles()
	1467	+ {
	1468	+ GetGL().glEnd();
	1469	+ }
	1470	+
	1471	+ void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
	1472	+ {
	1473	+ if (!selectmode)
	1474	+ {
	1475	+ gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1476	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	1477	+
	1478	+ if (flipV)
	1479	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	1480	+ else
	1481	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1482	+ }
	1483	+
	1484	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	1485	+ }
	1486	+
	1487	+ void SetColor(Object3D obj, Vertex p0)
	1488	+ {
	1489	+ CameraPane display = this;
	1490	+ BoundaryRep bRep = obj.bRep;
	1491	+
	1492	+ if (RENDERPROGRAM == 0)
	1493	+ {
	1494	+ float r = 0;
	1495	+ if (bRep != null)
	1496	+ {
	1497	+ if (bRep.stripified)
	1498	+ {
	1499	+ r = 1;
	1500	+ }
	1501	+ }
	1502	+ float g = 0;
	1503	+ if (bRep != null)
	1504	+ {
	1505	+ if (bRep.trimmed)
	1506	+ {
	1507	+ g = 1;
	1508	+ }
	1509	+ }
	1510	+ float b = 0;
	1511	+ if (obj.support != null && obj.link2master)
	1512	+ {
	1513	+ b = 1;
	1514	+ }
	1515	+ display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
	1516	+ return;
	1517	+ }
	1518	+
	1519	+ if (display.DrawMode() != CameraPane.SHADOW)
	1520	+ return;
	1521	+
	1522	+ javax.media.opengl.GL gl = display.GetGL();
	1523	+// if (true) return;
	1524	+// float ao = p.AO;
	1525	+//
	1526	+// // if (ao == 0 && !bRep.AOdone) // transient problem!
	1527	+// // ao = 1;
	1528	+//
	1529	+// gl.glColor4f(ao, ao, ao, 1);
	1530	+
	1531	+// CameraPane.selectedpoint.
	1532	+// getAverage(cStatic.point1, true);
	1533	+ if (CameraPane.pointflow == null) // !random) // live)
	1534	+ {
	1535	+ return;
	1536	+ }
	1537	+
	1538	+ cStatic.point1.set(0,0,0);
	1539	+ LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
	1540	+
	1541	+ cStatic.point1.sub(p0);
	1542	+
	1543	+
	1544	+// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
	1545	+// {
	1546	+// return;
	1547	+// }
	1548	+
	1549	+ //if (true)
	1550	+ if (cStatic.point1.dot(cStatic.point1) > 0.000001)
	1551	+ {
	1552	+ return;
	1553	+ }
	1554	+
	1555	+ float[] colorV = new float[3];
	1556	+
	1557	+ if (false) // marked)
	1558	+ {
	1559	+ // debug rigging weights
	1560	+ for (int object = 0; object < p0.vertexlinks.length; object++)
	1561	+ {
	1562	+ float weight = p0.weights[object] / p0.totalweight;
	1563	+
	1564	+ // if (weight < 0.1)
	1565	+ // {
	1566	+ // assert(weight == 0);
	1567	+ // continue;
	1568	+ // }
	1569	+
	1570	+ if (p0.vertexlinks[object] == -1)
	1571	+ continue;
	1572	+
	1573	+ Vertex q = obj.support.bRep.GetVertex(p0.vertexlinks[object]);
	1574	+
	1575	+ int color = //1 << object; //
	1576	+ //p.vertexlinks.length;
	1577	+ obj.support.bRep.supports[p0.closestsupport].links[object];
	1578	+ colorV[2] += (color & 1) * weight;
	1579	+ colorV[1] += ((color & 2) >> 1) * weight;
	1580	+ colorV[0] += ((color & 4) >> 2) * weight;
	1581	+ }
	1582	+ }
	1583	+ else
	1584	+ {
	1585	+ if (obj.drawingstarted)
	1586	+ {
	1587	+ // find next point
	1588	+ if (bRep.GetVertex(0).faceindices == null)
	1589	+ {
	1590	+ bRep.InitFaceIndices();
	1591	+ }
	1592	+
	1593	+ double ymin = p0.y;
	1594	+
	1595	+ Vertex newp = p0;
	1596	+
	1597	+ for (int fii = 0; fii < p0.faceindices.length; fii++)
	1598	+ {
	1599	+ int fi = p0.faceindices[fii];
	1600	+
	1601	+ if (fi == -1)
	1602	+ break;
	1603	+
	1604	+ Face f = bRep.GetFace(fi);
	1605	+
	1606	+ Vertex p = bRep.GetVertex(f.p);
	1607	+ Vertex q = bRep.GetVertex(f.q);
	1608	+ Vertex r = bRep.GetVertex(f.r);
	1609	+
	1610	+ int swap = (int)(Math.random()*3);
	1611	+
	1612	+// for (int s=swap; --s>=0;)
	1613	+// {
	1614	+// Vertex t = p;
	1615	+// p = q;
	1616	+// q = r;
	1617	+// r = t;
	1618	+// }
	1619	+ if (ymin > p.y)
	1620	+ {
	1621	+ ymin = p.y;
	1622	+ newp = p;
	1623	+// break;
	1624	+ }
	1625	+ if (ymin > q.y)
	1626	+ {
	1627	+ ymin = q.y;
	1628	+ newp = q;
	1629	+// break;
	1630	+ }
	1631	+ if (ymin > r.y)
	1632	+ {
	1633	+ ymin = r.y;
	1634	+ newp = r;
	1635	+// break;
	1636	+ }
	1637	+ }
	1638	+
	1639	+ CameraPane.selectedpoint.toParent[3][0] = newp.x;
	1640	+ CameraPane.selectedpoint.toParent[3][1] = newp.y;
	1641	+ CameraPane.selectedpoint.toParent[3][2] = newp.z;
	1642	+
	1643	+ obj.drawingstarted = false;
	1644	+
	1645	+ // return;
	1646	+ }
	1647	+
	1648	+ if (false) // CameraPane.DRAW
	1649	+ {
	1650	+ p0.AO = colorV[0] = 2;
	1651	+ colorV[1] = 2;
	1652	+ colorV[2] = 2;
	1653	+ }
	1654	+
	1655	+ CameraPane.pointflow.add(p0);
	1656	+ CameraPane.pointflow.Touch();
	1657	+ }
	1658	+
	1659	+// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
	1660	+// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
	1661	+// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
	1662	+ }
	1663	+
	1664	+ void DrawMaterial(cMaterial material, boolean selected, Object3D.cVector2[] others)
	1665	+ {
	1666	+ CameraPane display = this;
	1667	+ //new Exception().printStackTrace();
	1668	+
	1669	+ if (display.IsFrozen() && !selected \|\| display.IsAmbientOcclusionOn()) // \|\| display.drawMode == display.SHADOW)
	1670	+ {
	1671	+ return;
	1672	+ }
	1673	+
	1674	+ javax.media.opengl.GL gl = display.GetGL();
	1675	+
	1676	+ //Color col = Color.getHSBColor(color,modulation,1);
	1677	+ //col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
	1678	+ if (!material.multiply)
	1679	+ {
	1680	+ display.color = material.color;
	1681	+ display.saturation = material.modulation;
	1682	+ }
	1683	+ else
	1684	+ {
	1685	+ display.color = material.color2;
	1686	+ display.saturation = material.modulation2;
	1687	+ }
	1688	+
	1689	+ cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
	1690	+
	1691	+ float[] colorV = Grafreed.colorV;
	1692	+
	1693	+ /**/
	1694	+ if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
	1695	+ {
	1696	+ colorV[0] = display.modelParams0[0] * material.diffuse;
	1697	+ colorV[1] = display.modelParams0[1] * material.diffuse;
	1698	+ colorV[2] = display.modelParams0[2] * material.diffuse;
	1699	+ colorV[3] = 1; // material.opacity;
	1700	+
	1701	+ gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
	1702	+ //System.out.println("Opacity = " + opacity);
	1703	+
	1704	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
	1705	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1706	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
	1707	+
	1708	+ float amb = material.ambient;
	1709	+ if (amb < material.cameralight)
	1710	+ {
	1711	+ amb = material.cameralight;
	1712	+ }
	1713	+ colorV[0] = display.modelParams0[0] * material.diffuse * amb;
	1714	+ colorV[1] = display.modelParams0[1] * material.diffuse * amb;
	1715	+ colorV[2] = display.modelParams0[2] * material.diffuse * amb;
	1716	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_AMBIENT, colorV, 0);
	1717	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1718	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT, colorV, 0);
	1719	+
	1720	+ /**/
	1721	+ colorV[0] = ((1 - material.metalness) + display.modelParams0[0] * material.metalness) * material.specular;
	1722	+ colorV[1] = ((1 - material.metalness) + display.modelParams0[1] * material.metalness) * material.specular;
	1723	+ colorV[2] = ((1 - material.metalness) + display.modelParams0[2] * material.metalness) * material.specular;
	1724	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_SPECULAR, colorV, 0);
	1725	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1726	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_SPECULAR, colorV, 0);
	1727	+ colorV[0] = 10 / material.shininess; // 1/0.005f;
	1728	+ //System.out.println("shininess = " + colorV[0]);
	1729	+ if (colorV[0] > 128)
	1730	+ {
	1731	+ colorV[0] = 128;
	1732	+ }
	1733	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_SHININESS, colorV, 0);
	1734	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_SHININESS, colorV, 0);
	1735	+ /**/
	1736	+ }
	1737	+ /**/
	1738	+
	1739	+ //selected = false;
	1740	+ selected = selected && display.flash;
	1741	+
	1742	+ //display.modelParams0[0] = 0; // pigment.r;
	1743	+ //display.modelParams0[1] = 0; // pigment.g;
	1744	+ //display.modelParams0[2] = 0; // pigment.b;
	1745	+ if (!material.multiply)
	1746	+ {
	1747	+ display.modelParams0[3] = material.metalness;
	1748	+ display.modelParams1[0] = material.diffuse;
	1749	+ display.modelParams1[1] = material.specular;
	1750	+ display.modelParams1[2] = 1 / material.shininess;
	1751	+ display.modelParams1[3] = material.shift;
	1752	+ display.modelParams2[0] = material.ambient;
	1753	+ display.modelParams2[1] = material.lightarea;
	1754	+ //System.out.println("light area = " + lightarea);
	1755	+ display.modelParams2[2] = 1 / material.factor; // diffuseness
	1756	+ display.modelParams2[3] = material.velvet;
	1757	+ display.modelParams3[0] = material.sheen;
	1758	+ display.modelParams3[1] = material.subsurface;
	1759	+ display.modelParams3[2] = material.bump; // backlit
	1760	+ display.modelParams3[3] = material.aniso;
	1761	+ display.modelParams4[0] = material.anisoV;
	1762	+ display.modelParams4[1] = selected ? 100 : material.cameralight;
	1763	+ //System.out.println("selected = " + selected);
	1764	+ display.modelParams4[2] = material.diffuseness;
	1765	+ display.modelParams4[3] = material.shadow;
	1766	+ display.modelParams5[0] = material.texture;
	1767	+ display.modelParams5[1] = material.opacity;
	1768	+ display.modelParams5[2] = material.fakedepth;
	1769	+ display.modelParams5[3] = CameraPane.SHADOWCULLFACE ? 0f : (material.shadowbias - 0.005f) / 10;
	1770	+ }
	1771	+ else
	1772	+ {
	1773	+ display.modelParams0[3] = material.metalness2;
	1774	+ display.modelParams1[0] = material.diffuse2;
	1775	+ display.modelParams1[1] = material.specular2;
	1776	+ display.modelParams1[2] = material.shininess2;
	1777	+ display.modelParams1[3] = material.shift2;
	1778	+ display.modelParams2[0] = material.ambient2;
	1779	+ display.modelParams2[1] = material.lightarea2;
	1780	+ display.modelParams2[2] = material.factor2;
	1781	+ display.modelParams2[3] = material.velvet2;
	1782	+ display.modelParams3[0] = material.sheen2;
	1783	+ display.modelParams3[1] = material.subsurface2;
	1784	+ display.modelParams3[2] = material.bump2;
	1785	+ display.modelParams3[3] = material.aniso2;
	1786	+ display.modelParams4[0] = material.anisoV2;
	1787	+ display.modelParams4[1] = material.cameralight2;
	1788	+ //System.out.println("selected = " + selected);
	1789	+ display.modelParams4[2] = material.diffuseness2;
	1790	+ display.modelParams4[3] = material.shadow2;
	1791	+ display.modelParams5[0] = material.texture2;
	1792	+ display.modelParams5[1] = material.opacity2;
	1793	+ display.modelParams5[2] = material.fakedepth2;
	1794	+ display.modelParams5[3] = material.shadowbias2;
	1795	+ }
	1796	+
	1797	+ display.modelParams6[0] = 0;
	1798	+ display.modelParams6[1] = 0;
	1799	+ display.modelParams6[2] = 0;
	1800	+ display.modelParams6[3] = 0;
	1801	+
	1802	+ display.modelParams7[0] = 0;
	1803	+ display.modelParams7[1] = 1000;
	1804	+ display.modelParams7[2] = 0;
	1805	+ display.modelParams7[3] = 0;
	1806	+
	1807	+ //display.modelParams6[0] = 100; // criss de bug de bump
	1808	+
	1809	+ Object3D.cVector2[] extparams = others; // display.vector2buffer;
	1810	+ if (extparams != null && extparams.length > 0 && extparams[0] != null)
	1811	+ {
	1812	+ display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
	1813	+ display.modelParams6[1] = extparams[0].y / 1000.0f; // noise
	1814	+ if (extparams.length > 1)
	1815	+ {
	1816	+ display.modelParams6[2] = extparams[1].x / 1000.0f; // borderfade
	1817	+ display.modelParams6[3] = extparams[1].y / 1000.0f; // (float)Math.exp(-extparams[1].y / 1000.0f); // fog punchthrough
	1818	+ if (extparams.length > 2)
	1819	+ {
	1820	+ display.modelParams7[0] = extparams[2].x / 1000.0f; // noise power
	1821	+ float x = extparams[2].y / 1000.0f;
	1822	+ //if (x == 0)
	1823	+ // x = 1f;
	1824	+ display.modelParams7[1] = 1 / x / x / x / x / x / x / x / x / x / x / x / x / x; // (float)Math.pow(-Math.log((extparams[2].y+0.00) / 1000.0f), 1); // opacity power
	1825	+ if (extparams[2].y > 0)
	1826	+ {
	1827	+ //System.out.println("extparams[1].y = " + extparams[1].y);
	1828	+ //System.out.println("extparams[2].y = " + extparams[2].y);
	1829	+ //System.out.println("opacity power = " + display.modelParams7[1]);
	1830	+ }
	1831	+ }
	1832	+ }
	1833	+ }
	1834	+
	1835	+ //if (display.modelParams6[2] != 0)
	1836	+ /*
	1837	+ System.out.println("modelParams0[0] = " + display.modelParams0[0]);
	1838	+ System.out.println("modelParams0[1] = " + display.modelParams0[1]);
	1839	+ System.out.println("modelParams0[2] = " + display.modelParams0[2]);
	1840	+ System.out.println("modelParams0[3] = " + display.modelParams0[3]);
	1841	+ System.out.println("modelParams1[0] = " + display.modelParams1[0]);
	1842	+ System.out.println("modelParams1[1] = " + display.modelParams1[1]);
	1843	+ System.out.println("modelParams1[2] = " + display.modelParams1[2]);
	1844	+ System.out.println("modelParams1[3] = " + display.modelParams1[3]);
	1845	+ System.out.println("modelParams2[0] = " + display.modelParams2[0]);
	1846	+ System.out.println("modelParams2[1] = " + display.modelParams2[1]);
	1847	+ System.out.println("modelParams2[2] = " + display.modelParams2[2]);
	1848	+ System.out.println("modelParams2[3] = " + display.modelParams2[3]);
	1849	+ System.out.println("modelParams3[0] = " + display.modelParams3[0]);
	1850	+ System.out.println("modelParams3[1] = " + display.modelParams3[1]);
	1851	+ System.out.println("modelParams3[2] = " + display.modelParams3[2]);
	1852	+ System.out.println("modelParams3[3] = " + display.modelParams3[3]);
	1853	+ System.out.println("modelParams4[0] = " + display.modelParams4[0]);
	1854	+ System.out.println("modelParams4[1] = " + display.modelParams4[1]);
	1855	+ System.out.println("modelParams4[2] = " + display.modelParams4[2]);
	1856	+ System.out.println("modelParams4[3] = " + display.modelParams4[3]);
	1857	+ System.out.println("modelParams5[0] = " + display.modelParams5[0]);
	1858	+ System.out.println("modelParams5[1] = " + display.modelParams5[1]);
	1859	+ System.out.println("modelParams5[2] = " + display.modelParams5[2]);
	1860	+ System.out.println("modelParams5[3] = " + display.modelParams5[3]);
	1861	+ System.out.println("modelParams6[0] = " + display.modelParams6[0]);
	1862	+ System.out.println("modelParams6[1] = " + display.modelParams6[1]);
	1863	+ System.out.println("modelParams6[2] = " + display.modelParams6[2]);
	1864	+ System.out.println("modelParams6[3] = " + display.modelParams6[3]);
	1865	+ System.out.println("modelParams7[0] = " + display.modelParams7[0]);
	1866	+ System.out.println("modelParams7[1] = " + display.modelParams7[1]);
	1867	+ System.out.println("modelParams7[2] = " + display.modelParams7[2]);
	1868	+ System.out.println("modelParams7[3] = " + display.modelParams7[3]);
	1869	+ /**/
	1870	+ //assert (display.modelParams6[2] == 0);
	1871	+
	1872	+ //System.out.println("noise power = " + display.modelParams7[0]);
	1873	+ //System.out.println("shadowbias = " + shadowbias);
	1874	+
	1875	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1876	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 1, display.modelParams1, 0);
	1877	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 2, display.modelParams2, 0);
	1878	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 3, display.modelParams3, 0);
	1879	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	1880	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1881	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 6, display.modelParams6, 0);
	1882	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 7, display.modelParams7, 0);
	1883	+
	1884	+ int mode = display.FP_SHADER;
	1885	+
	1886	+ if (material.aniso != material.anisoV \|\| material.aniso > 0.002)
	1887	+ {
	1888	+ mode \|= display.FP_ANISO;
	1889	+ }
	1890	+
	1891	+ display.EnableProgram(mode);
	1892	+
	1893	+ //System.out.println("opacity power = " + display.modelParams7[1]);
	1894	+
	1895	+ if (!material.multiply)
	1896	+ {
	1897	+ if (Globals.drawMode == CameraPane.SHADOW)
	1898	+ gl.glDepthMask(material.opacity >= 0.9 && display.modelParams7[1] > 0.1);
	1899	+ else
	1900	+ gl.glDepthMask(material.opacity >= 0.99);
	1901	+ }
236	1902	}
237	1903
238	1904	int matrixdepth = 0; // 10000; // CONFLICT WITH cMESH... WARNING WARNING WARNING WARNING WARNING WARNING !!!!!!!!!!!! 0;
..	..	@@ -253,7 +1919,7 @@
253	1919	currentGL.glMultMatrixd(model, 0);
254	1920	}
255	1921
256		- void PushMatrix(double[][] matrix, int count)
	1922	+ public void PushMatrix(double[][] matrix, int count) // INTERFACE
257	1923	{
258	1924	matrixdepth++;
259	1925	// GrafreeD.tracein(matrix);
..	..	@@ -282,7 +1948,7 @@
282	1948	void PushMatrix(double[][] matrix)
283	1949	{
284	1950	// GrafreeD.tracein(matrix);
285		- PushMatrix(matrix,1);
	1951	+ PushMatrix(matrix, 1);
286	1952	}
287	1953
288	1954	void PushMatrix()
..	..	@@ -298,7 +1964,7 @@
298	1964
299	1965	double[][] tmpmat = new double[4][4];
300	1966
301		- void PopMatrix(double[][] inverse)
	1967	+ public void PopMatrix(double[][] inverse) // INTERFACE
302	1968	{
303	1969	--matrixdepth;
304	1970
..	..	@@ -338,7 +2004,7 @@
338	2004	PushTextureMatrix(matrix, 1);
339	2005	}
340	2006
341		- void PushTextureMatrix(double[][] matrix, int count)
	2007	+ public void PushTextureMatrix(double[][] matrix, int count) // INTERFACE
342	2008	{
343	2009	currentGL.glActiveTexture(GetGL().GL_TEXTURE0);
344	2010
..	..	@@ -352,7 +2018,7 @@
352	2018	currentGL.glMatrixMode(GetGL().GL_MODELVIEW);
353	2019	}
354	2020
355		- void PopTextureMatrix(double[][] inverse)
	2021	+ public void PopTextureMatrix(double[][] inverse) // INTERFACE
356	2022	{
357	2023	currentGL.glActiveTexture(GetGL().GL_TEXTURE0);
358	2024	currentGL.glMatrixMode(GetGL().GL_TEXTURE);
..	..	@@ -379,15 +2045,15 @@
379	2045
380	2046	static int camerachangeframe;
381	2047
382		- boolean SetCamera(Camera cam)
	2048	+ public boolean SetCamera(Camera cam)
383	2049	{
384	2050	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
385	2051	// return false;
386	2052
387		- if (REFUSEMODE && isLIVE() && camerachangeframe != 0 && camerachangeframe != framecount)
	2053	+ if (REFUSEMODE && Globals.isLIVE() && camerachangeframe != 0 && camerachangeframe != Globals.framecount)
388	2054	{
389	2055	// check for last change
390		- if (framecount < camerachangeframe + 400) // 120 == 1 second
	2056	+ if (Globals.framecount < camerachangeframe + 400) // 120 == 1 second
391	2057	{
392	2058	// refuse the camera change
393	2059	System.err.println("Camera " + cam + " REFUSED");
..	..	@@ -395,7 +2061,7 @@
395	2061	}
396	2062	}
397	2063
398		- camerachangeframe = framecount;
	2064	+ camerachangeframe = Globals.framecount;
399	2065
400	2066	cam.hAspect = -1; // Read only
401	2067
..	..	@@ -426,7 +2092,7 @@
426	2092	{
427	2093	//System.err.println("Oeil on");
428	2094	TRACK = true;
429		-// JUNE 2014 if (TRACK && trackedobject != null && drawMode == SHADOW) // && !lightMode)
	2095	+// JUNE 2014 if (TRACK && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
430	2096	// object.editWindow.ScreenFit(trackedobject);
431	2097	//pingthread.StepToTarget(true);
432	2098	}
..	..	@@ -435,8 +2101,8 @@
435	2101	{
436	2102	//System.err.println("Oeil on");
437	2103	OEIL = true;
438		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && drawMode == SHADOW) // && !lightMode)
439		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	2104	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
	2105	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
440	2106	//pingthread.StepToTarget(true);
441	2107	}
442	2108
..	..	@@ -499,39 +2165,12 @@
499	2165	{
500	2166	frozen ^= true;
501	2167	// Weird...
502		- lighttouched = true;
	2168	+ Globals.lighttouched = true;
503	2169	}
504	2170
505	2171	void ToggleDL()
506	2172	{
507	2173	mainDL ^= true;
508		- }
509		-
510		- void ToggleTexture()
511		- {
512		- textureon ^= true;
513		- }
514		-
515		- void ToggleLive()
516		- {
517		- setLIVE(isLIVE() ^ true);
518		-
519		- System.err.println("LIVE = " + isLIVE());
520		-
521		- if (!isLIVE()) // save sound
522		- GrafreeD.savesound = true; // wav.save();
523		- // else
524		- repaint(); // start loop // may 2013
525		- }
526		-
527		- void ToggleSupport()
528		- {
529		- SUPPORT ^= true;
530		- }
531		-
532		- void ToggleAbort()
533		- {
534		- ABORTMODE ^= true;
535	2174	}
536	2175
537	2176	void ToggleFullScreen()
..	..	@@ -541,12 +2180,7 @@
541	2180
542	2181	void ToggleCrowd()
543	2182	{
544		- CROWD ^= true;
545		- }
546		-
547		- void ToggleInertia()
548		- {
549		- INERTIA ^= true;
	2183	+ Globals.CROWD ^= true;
550	2184	}
551	2185
552	2186	void ToggleLocal()
..	..	@@ -554,62 +2188,89 @@
554	2188	LOCALTRANSFORM ^= true;
555	2189	}
556	2190
557		- void ToggleFast()
	2191	+ public void ToggleTexture()
	2192	+ {
	2193	+ textureon ^= true;
	2194	+ }
	2195	+
	2196	+ public void ToggleLive()
	2197	+ {
	2198	+ Globals.setLIVE(Globals.isLIVE() ^ true);
	2199	+
	2200	+ System.err.println("LIVE = " + Globals.isLIVE());
	2201	+
	2202	+ if (!Globals.isLIVE()) // save sound
	2203	+ Grafreed.savesound = true; // wav.save();
	2204	+ // else
	2205	+ repaint(); // start loop // may 2013
	2206	+ }
	2207	+
	2208	+ public void ToggleSupport()
	2209	+ {
	2210	+ SUPPORT ^= true;
	2211	+ }
	2212	+
	2213	+ public void ToggleAbort()
	2214	+ {
	2215	+ ABORTMODE ^= true;
	2216	+ }
	2217	+
	2218	+ public void ToggleInertia()
	2219	+ {
	2220	+ INERTIA ^= true;
	2221	+ }
	2222	+
	2223	+ public void ToggleFast()
558	2224	{
559	2225	FAST ^= true;
560	2226	}
561	2227
562		- void ToggleSlowPose()
	2228	+ public void ToggleSlowPose()
563	2229	{
564	2230	SLOWPOSE ^= true;
565	2231	}
566	2232
567		- void ToggleFootContact()
568		- {
569		- FOOTCONTACT ^= true;
570		- }
571		-
572		- void ToggleBoxMode()
	2233	+ public void ToggleBoxMode()
573	2234	{
574	2235	BOXMODE ^= true;
575	2236	}
576	2237
577		- void ToggleSmoothFocus()
	2238	+ public void ToggleZoomBoxMode()
	2239	+ {
	2240	+ ZOOMBOXMODE ^= true;
	2241	+ }
	2242	+
	2243	+ public void ToggleSmoothFocus()
578	2244	{
579	2245	SMOOTHFOCUS ^= true;
580	2246	}
581	2247
582		- void ToggleImageFlip()
	2248	+ public void ToggleImageFlip()
583	2249	{
584	2250	IMAGEFLIP ^= true;
585	2251	}
586	2252
587		- void ToggleSpeakerMocap()
	2253	+ public void ToggleSpeakerMocap()
588	2254	{
589	2255	SPEAKERMOCAP ^= true;
590	2256	}
591	2257
592		- void ToggleSpeakerCamera()
	2258	+ public void ToggleSpeakerCamera()
593	2259	{
594	2260	SPEAKERCAMERA ^= true;
595	2261	}
596	2262
597		- void ToggleSpeakerFocus()
	2263	+ public void ToggleSpeakerFocus()
598	2264	{
599	2265	SPEAKERFOCUS ^= true;
600	2266	}
601	2267
602		- void ToggleDebug()
603		- {
604		- DEBUG ^= true;
605		- }
606		-
607		- void ToggleFrustum()
	2268	+ public void ToggleFrustum()
608	2269	{
609	2270	FRUSTUM ^= true;
610	2271	}
611	2272
612		- void ToggleTrack()
	2273	+ public void ToggleTrack()
613	2274	{
614	2275	TRACK ^= true;
615	2276	if (TRACK)
..	..	@@ -628,25 +2289,35 @@
628	2289	repaint();
629	2290	}
630	2291
631		- void ToggleTrackOnce()
	2292	+ public void ToggleTrackOnce()
632	2293	{
633	2294	TRACKONCE ^= true;
634	2295	}
635	2296
636		- void ToggleShadowTrack()
	2297	+ public void ToggleShadowTrack()
637	2298	{
638	2299	SHADOWTRACK ^= true;
639	2300	repaint();
640	2301	}
641	2302
642		- void ToggleOeil()
	2303	+ public void ToggleOeil()
643	2304	{
644	2305	OEIL ^= true;
645	2306	}
646	2307
647		- void ToggleOeilOnce()
	2308	+ public void ToggleOeilOnce()
648	2309	{
649	2310	OEILONCE ^= true;
	2311	+ }
	2312	+
	2313	+ void ToggleFootContact()
	2314	+ {
	2315	+ FOOTCONTACT ^= true;
	2316	+ }
	2317	+
	2318	+ void ToggleDebug()
	2319	+ {
	2320	+ Globals.DEBUG ^= true;
650	2321	}
651	2322
652	2323	void ToggleLookAt()
..	..	@@ -654,9 +2325,9 @@
654	2325	LOOKAT ^= true;
655	2326	}
656	2327
657		- void ToggleRandom()
	2328	+ void ToggleSwitch()
658	2329	{
659		- RANDOM ^= true;
	2330	+ SWITCH ^= true;
660	2331	}
661	2332
662	2333	void ToggleHandles()
..	..	@@ -664,10 +2335,17 @@
664	2335	HANDLES ^= true;
665	2336	}
666	2337
	2338	+ Object3D paintFolder;
	2339	+
667	2340	void TogglePaint()
668	2341	{
669	2342	PAINTMODE ^= true;
670	2343	paintcount = 0;
	2344	+
	2345	+ if (PAINTMODE)
	2346	+ {
	2347	+ paintFolder = GetFolder();
	2348	+ }
671	2349	}
672	2350
673	2351	void SwapCamera(int a, int b)
..	..	@@ -759,11 +2437,26 @@
759	2437
760	2438	GL currentGL;
761	2439
762		- GL GetGL()
	2440	+ public GL GetGL() // INTERFACE
763	2441	{
764	2442	return currentGL;
765	2443	}
766		-
	2444	+
	2445	+ static private BufferedImage CreateBim(TextureData texturedata)
	2446	+ {
	2447	+ Grafreed.Assert(texturedata != null);
	2448	+
	2449	+ int width = texturedata.getWidth();
	2450	+ int height = texturedata.getHeight();
	2451	+
	2452	+ Buffer buffer = texturedata.getBuffer();
	2453	+ ByteBuffer bytebuf = (ByteBuffer)buffer;
	2454	+
	2455	+ byte[] bytes = bytebuf.array();
	2456	+
	2457	+ return CreateBim(bytes, width, height);
	2458	+ }
	2459	+
767	2460	/**/
768	2461	class CacheTexture
769	2462	{
..	..	@@ -772,28 +2465,31 @@
772	2465
773	2466	int resolution;
774	2467
775		- CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
	2468	+ CacheTexture(com.sun.opengl.util.texture.TextureData texdata, int res)
776	2469	{
777		- texture = tex;
	2470	+ texture = com.sun.opengl.util.texture.TextureIO.newTexture(texdata);
	2471	+ texturedata = texdata;
778	2472	resolution = res;
779	2473	}
780	2474	}
781	2475	/**/
782	2476
783	2477	// TEXTURE static Texture texture;
784		- static public java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/> textures
785		- = new java.util.Hashtable<String, CacheTexture/com.sun.opengl.util.texture.Texture/>();
786		- static public java.util.Hashtable<String, String> usedtextures = new java.util.Hashtable<String, String>();
	2478	+ static public Hashtable<cTexture, CacheTexture> texturepigment = new Hashtable<cTexture, CacheTexture>();
	2479	+ static public Hashtable<cTexture, CacheTexture> texturebump = new Hashtable<cTexture, CacheTexture>();
	2480	+ static public Hashtable<byte[], CacheTexture> bimtextures = new Hashtable<byte[], CacheTexture>();
	2481	+ static public java.util.HashSet<cTexture> usedtextures = new java.util.HashSet<cTexture>();
	2482	+
787	2483	int pigmentdepth = 0;
788	2484	public com.sun.opengl.util.texture.Texture[] pigmentstack = new com.sun.opengl.util.texture.Texture[65536];
789	2485	int bumpdepth = 0;
790	2486	public com.sun.opengl.util.texture.Texture[] bumpstack = new com.sun.opengl.util.texture.Texture[65536];
791	2487	//public static String DEFAULT_TEXTURE = "DEFAULT_TEXTURE";
792	2488	public static cTexture DEFAULT_TEXTURES = new cTexture("DEFAULT_TEXTURE" + ":" + "DEFAULT_TEXTURE_BUMP");
793		- public static String NOISE_TEXTURE = "WHITE_NOISE";
	2489	+ public static cTexture NOISE_TEXTURE = new cTexture("WHITE_NOISE:");
794	2490	// public static cTexture IMMORTAL_TEXTURE = new cTexture("IMMORTAL");
795	2491
796		- com.sun.opengl.util.texture.Texture GetResourceTexture(String name, boolean bump)
	2492	+ com.sun.opengl.util.texture.TextureData GetResourceTexture(String name, boolean bump)
797	2493	{
798	2494	TextureData texturedata = null;
799	2495
..	..	@@ -812,13 +2508,34 @@
812	2508	if (bump)
813	2509	texturedata = ConvertBump(texturedata, false);
814	2510
815		- com.sun.opengl.util.texture.Texture texture =
816		- com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
	2511	+// com.sun.opengl.util.texture.Texture texture =
	2512	+// com.sun.opengl.util.texture.TextureIO.newTexture(texturedata);
817	2513
818		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
819		- texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
	2514	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_S, javax.media.opengl.GL.GL_REPEAT);
	2515	+ //texture.setTexParameteri(javax.media.opengl.GL.GL_TEXTURE_WRAP_T, javax.media.opengl.GL.GL_REPEAT);
820	2516
821		- return texture;
	2517	+ return texturedata;
	2518	+ }
	2519	+
	2520	+ com.sun.opengl.util.texture.TextureData GetBimTexture(BufferedImage bim, boolean bump)
	2521	+ {
	2522	+ TextureData texturedata = null;
	2523	+
	2524	+ try
	2525	+ {
	2526	+ texturedata =
	2527	+ com.sun.opengl.util.texture.TextureIO.newTextureData(
	2528	+ bim,
	2529	+ true);
	2530	+ } catch (Exception e)
	2531	+ {
	2532	+ throw new javax.media.opengl.GLException(e);
	2533	+ }
	2534	+
	2535	+ if (bump)
	2536	+ texturedata = ConvertBump(texturedata, false);
	2537	+
	2538	+ return texturedata;
822	2539	}
823	2540
824	2541	boolean HUESMOOTH = true; // wrap around bug... true;
..	..	@@ -1891,6 +3608,8 @@
1891	3608
1892	3609	System.out.println("LOADING TEXTURE : " + name);
1893	3610
	3611	+ Object x = texturedata.getMipmapData(); // .getBuffer();
	3612	+
1894	3613	//
1895	3614	if (false) // compressbit > 0)
1896	3615	{
..	..	@@ -2595,6 +4314,7 @@
2595	4314
2596	4315	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
2597	4316	{
	4317	+ new Exception().printStackTrace();
2598	4318	System.exit(0);
2599	4319	com.sun.opengl.util.texture.Texture texture = null;
2600	4320
..	..	@@ -6271,7 +7991,7 @@
6271	7991	return null;
6272	7992	}
6273	7993
6274		- void ReleaseTextures(cTexture tex)
	7994	+ public void ReleaseTextures(cTexture tex) // INTERFACE
6275	7995	{
6276	7996	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
6277	7997	{
..	..	@@ -6288,7 +8008,7 @@
6288	8008	String pigment = Object3D.GetPigment(tex);
6289	8009	String bump = Object3D.GetBump(tex);
6290	8010
6291		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8011	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
6292	8012	{
6293	8013	// System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
6294	8014	// System.out.println("; bump = " + bump);
..	..	@@ -6303,13 +8023,71 @@
6303	8023	pigment = null;
6304	8024	}
6305	8025
6306		- ReleaseTexture(bump, true);
6307		- ReleaseTexture(pigment, false);
	8026	+ ReleaseTexture(tex, true);
	8027	+ ReleaseTexture(tex, false);
6308	8028	}
6309	8029
6310		- void ReleaseTexture(String tex, boolean bump)
	8030	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
6311	8031	{
6312		- if (// drawMode != 0 \|\| /tex == null \|\|/
	8032	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8033	+ {
	8034	+ return;
	8035	+ }
	8036	+
	8037	+ if (tex == null)
	8038	+ {
	8039	+ ReleaseTexture(null, false);
	8040	+ return;
	8041	+ }
	8042	+
	8043	+ String pigment = Object3D.GetPigment(tex);
	8044	+
	8045	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8046	+ {
	8047	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8048	+ // System.out.println("; bump = " + bump);
	8049	+ }
	8050	+
	8051	+ if (pigment.equals(""))
	8052	+ {
	8053	+ pigment = null;
	8054	+ }
	8055	+
	8056	+ ReleaseTexture(tex, false);
	8057	+ }
	8058	+
	8059	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	8060	+ {
	8061	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	8062	+ {
	8063	+ return;
	8064	+ }
	8065	+
	8066	+ if (tex == null)
	8067	+ {
	8068	+ ReleaseTexture(null, true);
	8069	+ return;
	8070	+ }
	8071	+
	8072	+ String bump = Object3D.GetBump(tex);
	8073	+
	8074	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8075	+ {
	8076	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	8077	+ // System.out.println("; bump = " + bump);
	8078	+ }
	8079	+
	8080	+ if (bump.equals(""))
	8081	+ {
	8082	+ bump = null;
	8083	+ }
	8084	+
	8085	+ ReleaseTexture(tex, true);
	8086	+ }
	8087	+
	8088	+ void ReleaseTexture(cTexture tex, boolean bump)
	8089	+ {
	8090	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
6313	8091	ambientOcclusion ) // \|\| !textureon)
6314	8092	{
6315	8093	return;
..	..	@@ -6318,7 +8096,7 @@
6318	8096	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
6319	8097
6320	8098	if (tex != null)
6321		- texture = textures.get(tex);
	8099	+ texture = bump ? texturebump.get(tex) : texturepigment.get(tex);
6322	8100
6323	8101	// //assert( texture != null );
6324	8102	// if (texture == null)
..	..	@@ -6410,9 +8188,57 @@
6410	8188	}
6411	8189	}
6412	8190
6413		- /boolean/ void BindTextures(cTexture tex, int resolution)
	8191	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
6414	8192	{
6415		- if (// drawMode != 0 \|\| /tex == null \|\|/
	8193	+// if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8194	+// ambientOcclusion ) // \|\| !textureon)
	8195	+// {
	8196	+// return; // false;
	8197	+// }
	8198	+//
	8199	+// if (tex == null)
	8200	+// {
	8201	+// BindTexture(null,false,resolution);
	8202	+// BindTexture(null,true,resolution);
	8203	+// return;
	8204	+// }
	8205	+//
	8206	+// String pigment = Object3D.GetPigment(tex);
	8207	+// String bump = Object3D.GetBump(tex);
	8208	+//
	8209	+// usedtextures.add(pigment);
	8210	+// usedtextures.add(bump);
	8211	+//
	8212	+// //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8213	+// {
	8214	+// // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8215	+// // System.out.println("; bump = " + bump);
	8216	+// }
	8217	+//
	8218	+// if (bump.equals(""))
	8219	+// {
	8220	+// bump = null;
	8221	+// }
	8222	+// if (pigment.equals(""))
	8223	+// {
	8224	+// pigment = null;
	8225	+// }
	8226	+//
	8227	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8228	+// BindTexture(pigment, false, resolution);
	8229	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8230	+// BindTexture(bump, true, resolution);
	8231	+// GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8232	+//
	8233	+// return; // true;
	8234	+
	8235	+ BindPigmentTexture(tex, resolution);
	8236	+ BindBumpTexture(tex, resolution);
	8237	+ }
	8238	+
	8239	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8240	+ {
	8241	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
6416	8242	ambientOcclusion ) // \|\| !textureon)
6417	8243	{
6418	8244	return; // false;
..	..	@@ -6421,17 +8247,47 @@
6421	8247	if (tex == null)
6422	8248	{
6423	8249	BindTexture(null,false,resolution);
6424		- BindTexture(null,true,resolution);
6425	8250	return;
6426	8251	}
6427	8252
6428	8253	String pigment = Object3D.GetPigment(tex);
	8254	+
	8255	+ usedtextures.add(tex);
	8256	+
	8257	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8258	+ {
	8259	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8260	+ // System.out.println("; bump = " + bump);
	8261	+ }
	8262	+
	8263	+ if (pigment.equals(""))
	8264	+ {
	8265	+ pigment = null;
	8266	+ }
	8267	+
	8268	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8269	+ BindTexture(tex, false, resolution);
	8270	+ }
	8271	+
	8272	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8273	+ {
	8274	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8275	+ ambientOcclusion ) // \|\| !textureon)
	8276	+ {
	8277	+ return; // false;
	8278	+ }
	8279	+
	8280	+ if (tex == null)
	8281	+ {
	8282	+ BindTexture(null,true,resolution);
	8283	+ return;
	8284	+ }
	8285	+
6429	8286	String bump = Object3D.GetBump(tex);
6430	8287
6431		- usedtextures.put(pigment, pigment);
6432		- usedtextures.put(bump, bump);
	8288	+ usedtextures.add(tex);
6433	8289
6434		- if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8290	+ //if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
6435	8291	{
6436	8292	// System.out.print("BIND +++++++++++++++ pigment = " + pigment);
6437	8293	// System.out.println("; bump = " + bump);
..	..	@@ -6441,43 +8297,94 @@
6441	8297	{
6442	8298	bump = null;
6443	8299	}
6444		- if (pigment.equals(""))
6445		- {
6446		- pigment = null;
6447		- }
6448	8300
6449		- GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
6450		- BindTexture(pigment, false, resolution);
6451	8301	GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
6452		- BindTexture(bump, true, resolution);
	8302	+ BindTexture(tex, true, resolution);
6453	8303	GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
6454		-
6455		- return; // true;
6456	8304	}
6457	8305
6458		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8306	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8307	+
	8308	+ private boolean FileExists(String tex)
6459	8309	{
6460		- CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
	8310	+ if (missingTextures.contains(tex))
	8311	+ {
	8312	+ return false;
	8313	+ }
	8314	+
	8315	+ boolean fileExists = new File(tex).exists();
	8316	+
	8317	+ if (!fileExists)
	8318	+ {
	8319	+ // If file exists, the "new File()" is not executed sgain
	8320	+ missingTextures.add(tex);
	8321	+ }
	8322	+
	8323	+ return fileExists;
	8324	+ }
	8325	+
	8326	+ CacheTexture GetCacheTexture(cTexture tex, boolean bump, int resolution) throws Exception
	8327	+ {
	8328	+ CacheTexture texturecache = null;
6461	8329
6462	8330	if (tex != null)
6463	8331	{
6464		- String texname = tex;
	8332	+ String texname = bump ? Object3D.GetBump(tex) : Object3D.GetPigment(tex);
	8333	+ byte[] texdata = bump ? tex.bumpdata : tex.pigmentdata;
6465	8334
6466		- String[] split = tex.split("Textures");
6467		- if (split.length > 1)
6468		- texname = "/Users/nbriere/Textures" + split[split.length-1];
6469		- else
6470		- if (!texname.startsWith("/"))
6471		- texname = "/Users/nbriere/Textures/" + texname;
	8335	+ if (texname.equals("") && texdata == null)
	8336	+ {
	8337	+ return null;
	8338	+ }
	8339	+
	8340	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8341	+
	8342	+// String[] split = tex.split("Textures");
	8343	+// if (split.length > 1)
	8344	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8345	+// else
	8346	+// if (!texname.startsWith("/"))
	8347	+// texname = "/Users/nbriere/Textures/" + texname;
	8348	+ if (!FileExists(texname))
	8349	+ {
	8350	+ texname = fallbackTextureName;
	8351	+ }
6472	8352
6473	8353	if (CACHETEXTURE)
6474		- texture = textures.get(texname); // TEXTURE CACHE
6475		-
6476		- TextureData texturedata = null;
6477		-
6478		- if (texture == null \|\| texture.resolution < resolution)
6479	8354	{
6480		- if (tex.equals("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
	8355	+ if (texdata == null)
	8356	+ texturecache = bump ? texturebump.get(tex) : texturepigment.get(tex);
	8357	+ else
	8358	+ texturecache = bimtextures.get(texdata);
	8359	+ }
	8360	+
	8361	+ if (texturecache == null \|\| texturecache.resolution != -1 && texturecache.resolution < resolution)
	8362	+ {
	8363	+ TextureData texturedata = null;
	8364	+
	8365	+ if (texdata != null && textureon)
	8366	+ {
	8367	+ BufferedImage bim; // = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8368	+
	8369	+ try
	8370	+ {
	8371	+ bim = DecompressJPEG(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8372	+ }
	8373	+ catch (Exception e)
	8374	+ {
	8375	+ bim = CreateBim(texdata, bump?tex.bw:tex.pw, bump?tex.bh:tex.ph);
	8376	+ }
	8377	+
	8378	+ texturecache = new CacheTexture(GetBimTexture(bim, bump), -1);
	8379	+ bimtextures.put(texdata, texturecache);
	8380	+
	8381	+ //BufferedImage bim3 = new BufferedImage(bump?tex.bw:tex.pw, bump?tex.bh:tex.ph, BufferedImage.TYPE_INT_RGB);
	8382	+
	8383	+ //Object bim2 = CreateBim(texturecache.texturedata);
	8384	+ //bim2 = bim;
	8385	+ }
	8386	+ else
	8387	+ if (texname.endsWith("DEFAULT_TEXTURE")) // \|\|*/ tex.equals(""))
6481	8388	{
6482	8389	assert(!bump);
6483	8390	// if (bump)
..	..	@@ -6488,19 +8395,23 @@
6488	8395	// }
6489	8396	// else
6490	8397	// {
6491		- texture = textures.get(tex);
6492		- if (texture == null)
	8398	+ // texturecache = textures.get(texname); // suspicious
	8399	+ if (texturecache == null)
6493	8400	{
6494		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8401	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
6495	8402	}
	8403	+ else
	8404	+ new Exception().printStackTrace();
6496	8405	// }
6497	8406	} else
6498		- if (tex.equals("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
	8407	+ if (texname.endsWith("DEFAULT_TEXTURE_BUMP")) // \|\|*/ tex.equals(""))
6499	8408	{
6500	8409	assert(bump);
6501		- texture = textures.get(tex);
6502		- if (texture == null)
6503		- texture = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8410	+ // texturecache = textures.get(texname); // suspicious
	8411	+ if (texturecache == null)
	8412	+ texturecache = new CacheTexture(GetResourceTexture("default.png", bump),resolution);
	8413	+ else
	8414	+ new Exception().printStackTrace();
6504	8415	} else
6505	8416	{
6506	8417	//if (tex.equals("IMMORTAL"))
..	..	@@ -6508,11 +8419,13 @@
6508	8419	// texture = GetResourceTexture("default.png");
6509	8420	//} else
6510	8421	//{
6511		- if (tex.equals("WHITE_NOISE"))
	8422	+ if (texname.endsWith("WHITE_NOISE"))
6512	8423	{
6513		- texture = textures.get(tex);
6514		- if (texture == null)
6515		- texture = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8424	+ // texturecache = textures.get(texname); // suspicious
	8425	+ if (texturecache == null)
	8426	+ texturecache = new CacheTexture(GetResourceTexture("whitenoise.png", bump),resolution);
	8427	+ else
	8428	+ new Exception().printStackTrace();
6516	8429	} else
6517	8430	{
6518	8431	if (textureon)
..	..	@@ -6537,7 +8450,7 @@
6537	8450	}
6538	8451
6539	8452	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
6540		- if (!new File(cachename).exists())
	8453	+ if (!FileExists(cachename))
6541	8454	cachename = texname;
6542	8455	else
6543	8456	processbump = false; // don't process bump map again
..	..	@@ -6559,7 +8472,7 @@
6559	8472	}
6560	8473
6561	8474	cachename = texname.substring(0, texname.length()-4)+ext+".png";
6562		- if (!new File(cachename).exists())
	8475	+ if (!FileExists(cachename))
6563	8476	cachename = texname;
6564	8477	else
6565	8478	processbump = false; // don't process bump map again
..	..	@@ -6568,20 +8481,22 @@
6568	8481	texturedata = GetFileTexture(cachename, processbump, resolution);
6569	8482
6570	8483
6571		- if (texturedata != null)
6572		- texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
	8484	+ if (texturedata == null)
	8485	+ throw new Exception();
	8486	+
	8487	+ texturecache = new CacheTexture(texturedata,resolution);
6573	8488	//texture = GetTexture(tex, bump);
6574	8489	}
6575	8490	}
6576	8491	//}
6577	8492	}
6578	8493
6579		- if (/CACHETEXTURE &&/ texture != null && textureon)
	8494	+ if (texdata == null && /CACHETEXTURE &&/ texturecache != null && textureon)
6580	8495	{
6581	8496	//return false;
6582	8497
6583	8498	// System.out.println("CACHE +++++++++++++++ TEXTURE : " + texname + " (" + texture.getEstimatedMemorySize() + ")");
6584		- if (texturedata != null && (texname.endsWith(".jpg") \|\| texname.endsWith(".JPG")))
	8499	+ if (texturedata != null && texname.toLowerCase().endsWith(".jpg"))
6585	8500	{
6586	8501	// String ext = "_highres";
6587	8502	// if (REDUCETEXTURE)
..	..	@@ -6598,52 +8513,17 @@
6598	8513	File cachefile = new File(texname.substring(0, texname.length()-4)+ext+".jpg");
6599	8514	if (!cachefile.exists())
6600	8515	{
6601		- // cache to disk
6602		- Buffer buffer = texturedata.getBuffer(); // getMipmapData();
6603		- //buffers[0].
6604		-
6605		- ByteBuffer bytebuf = (ByteBuffer)buffer; // ).asIntBuffer();
6606		- int[] pixels = new int[bytebuf.capacity()/3];
6607		-
6608		- // squared size heuristic...
6609		- if ((int)Math.sqrt(pixels.length) == Math.sqrt(pixels.length))
	8516	+ //if (texturedata.getWidth() == texturedata.getHeight())
6610	8517	{
6611		- for (int i=pixels.length; --i>=0;)
6612		- {
6613		- int i3 = i*3;
6614		- pixels[i] = 0xFF;
6615		- pixels[i] <<= 8;
6616		- pixels[i] \|= bytebuf.get(i3+2) & 0xFF;
6617		- pixels[i] <<= 8;
6618		- pixels[i] \|= bytebuf.get(i3+1) & 0xFF;
6619		- pixels[i] <<= 8;
6620		- pixels[i] \|= bytebuf.get(i3) & 0xFF;
6621		- }
6622		-
6623		- /*
6624		- int r=0,g=0,b=0,a=0;
6625		- for (int i=0; i<width; i++)
6626		- for (int j=0; j<height; j++)
6627		- {
6628		- int index = j*width+i;
6629		- int p = pixels[index];
6630		- a = ((p>>24) & 0xFF);
6631		- r = ((p>>16) & 0xFF);
6632		- g = ((p>>8) & 0xFF);
6633		- b = (p & 0xFF);
6634		- pixels[index] = (a<<24) \| (b<<16) \| (g<<8) \| r;
6635		- }
6636		- /**/
6637		- int width = (int)Math.sqrt(pixels.length); // squared
6638		- int height = width;
6639		- BufferedImage rendImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // ImageIO.read(infile);
6640		- rendImage.setRGB(0,0,width,height,pixels,width*(height-1),-width);
	8518	+ BufferedImage rendImage = CreateBim(texturedata);
	8519	+
6641	8520	ImageWriter writer = null;
6642	8521	Iterator iter = ImageIO.getImageWritersByFormatName("jpg");
6643	8522	if (iter.hasNext()) {
6644	8523	writer = (ImageWriter)iter.next();
6645	8524	}
6646		- float compressionQuality = 0.9f;
	8525	+
	8526	+ float compressionQuality = 0.85f;
6647	8527	try
6648	8528	{
6649	8529	ImageOutputStream ios = ImageIO.createImageOutputStream(cachefile);
..	..	@@ -6660,18 +8540,20 @@
6660	8540	}
6661	8541	}
6662	8542	}
6663		-
	8543	+
	8544	+ Hashtable<cTexture, CacheTexture> textures = bump ? texturebump : texturepigment;
	8545	+
6664	8546	//System.out.println("Texture = " + tex);
6665		- if (textures.containsKey(texname))
	8547	+ if (textures.containsKey(tex))
6666	8548	{
6667		- CacheTexture thetex = textures.get(texname);
	8549	+ CacheTexture thetex = textures.get(tex);
6668	8550	thetex.texture.disable();
6669	8551	thetex.texture.dispose();
6670		- textures.remove(texname);
	8552	+ textures.remove(tex);
6671	8553	}
6672	8554
6673		- texture.texturedata = texturedata;
6674		- textures.put(texname, texture);
	8555	+ //texture.texturedata = texturedata;
	8556	+ textures.put(tex, texturecache);
6675	8557
6676	8558	// newtex = true;
6677	8559	}
..	..	@@ -6687,10 +8569,44 @@
6687	8569	}
6688	8570	}
6689	8571
6690		- return texture;
	8572	+ return texturecache;
6691	8573	}
6692	8574
6693		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8575	+ static void EmbedTextures(cTexture tex)
	8576	+ {
	8577	+ if (tex.pigmentdata == null)
	8578	+ {
	8579	+ //String texname = Object3D.GetPigment(tex);
	8580	+
	8581	+ CacheTexture texturecache = texturepigment.get(tex);
	8582	+
	8583	+ if (texturecache != null)
	8584	+ {
	8585	+ tex.pw = texturecache.texturedata.getWidth();
	8586	+ tex.ph = texturecache.texturedata.getHeight();
	8587	+ tex.pigmentdata = //CompressJPEG(CreateBim
	8588	+ ((ByteBuffer)texturecache.texturedata.getBuffer()).array()
	8589	+ ;
	8590	+ //, tex.pw, tex.ph), 0.5f);
	8591	+ }
	8592	+ }
	8593	+
	8594	+ if (tex.bumpdata == null)
	8595	+ {
	8596	+ //String texname = Object3D.GetBump(tex);
	8597	+
	8598	+ CacheTexture texturecache = texturebump.get(tex);
	8599	+
	8600	+ if (texturecache != null)
	8601	+ {
	8602	+ tex.bw = texturecache.texturedata.getWidth();
	8603	+ tex.bh = texturecache.texturedata.getHeight();
	8604	+ tex.bumpdata = CompressJPEG(CreateBim(((ByteBuffer)texturecache.texturedata.getBuffer()).array(), tex.bw, tex.bh), 0.5f);
	8605	+ }
	8606	+ }
	8607	+ }
	8608	+
	8609	+ com.sun.opengl.util.texture.Texture GetTexture(cTexture tex, boolean bump, int resolution) throws Exception
6694	8610	{
6695	8611	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
6696	8612
..	..	@@ -6708,21 +8624,21 @@
6708	8624	return texture!=null?texture.texture:null;
6709	8625	}
6710	8626
6711		- com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8627	+ public com.sun.opengl.util.texture.TextureData GetTextureData(cTexture tex, boolean bump, int resolution) throws Exception
6712	8628	{
6713	8629	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
6714	8630
6715	8631	return texture!=null?texture.texturedata:null;
6716	8632	}
6717	8633
6718		- boolean BindTexture(String tex, boolean bump, int resolution)
	8634	+ boolean BindTexture(cTexture tex, boolean bump, int resolution) throws Exception
6719	8635	{
6720	8636	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
6721	8637	{
6722	8638	return false;
6723	8639	}
6724	8640
6725		- boolean newtex = false;
	8641	+ //boolean newtex = false;
6726	8642
6727	8643	com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
6728	8644
..	..	@@ -6754,9 +8670,75 @@
6754	8670	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_S, GetGL().GL_REPEAT);
6755	8671	texture.setTexParameteri(GetGL().GL_TEXTURE_WRAP_T, GetGL().GL_REPEAT);
6756	8672
6757		- return newtex;
	8673	+ return true; // Warning: not used.
6758	8674	}
6759	8675
	8676	+ public static byte[] CompressJPEG(BufferedImage image, float quality)
	8677	+ {
	8678	+ try
	8679	+ {
	8680	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	8681	+ Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
	8682	+ ImageWriter writer = writers.next();
	8683	+
	8684	+ ImageWriteParam param = writer.getDefaultWriteParam();
	8685	+ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
	8686	+ param.setCompressionQuality(quality);
	8687	+
	8688	+ ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
	8689	+ writer.setOutput(ios);
	8690	+ writer.write(null, new IIOImage(image, null, null), param);
	8691	+
	8692	+ byte[] data = baos.toByteArray();
	8693	+ writer.dispose();
	8694	+ return data;
	8695	+ }
	8696	+ catch (Exception e)
	8697	+ {
	8698	+ e.printStackTrace();
	8699	+ return null;
	8700	+ }
	8701	+ }
	8702	+
	8703	+ public static BufferedImage DecompressJPEG(byte[] image, int w, int h) throws IOException
	8704	+ {
	8705	+ ByteArrayInputStream baos = new ByteArrayInputStream(image);
	8706	+ Iterator<ImageReader> writers = ImageIO.getImageReadersByFormatName("jpg");
	8707	+ ImageReader reader = writers.next();
	8708	+
	8709	+ BufferedImage bim = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
	8710	+
	8711	+ ImageReadParam param = reader.getDefaultReadParam();
	8712	+ param.setDestination(bim);
	8713	+ //param.setDestinationType(ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_INT_RGB));
	8714	+
	8715	+ ImageInputStream ios = ImageIO.createImageInputStream(baos);
	8716	+ reader.setInput(ios);
	8717	+ BufferedImage bim2 = reader.read(0, param);
	8718	+ reader.dispose();
	8719	+
	8720	+// WritableRaster raster = bim2.getRaster();
	8721	+// DataBufferByte data = (DataBufferByte) raster.getDataBuffer();
	8722	+// byte[] bytes = data.getData();
	8723	+//
	8724	+// int[] pixels = new int[bytes.length/3];
	8725	+// for (int i=pixels.length; --i>=0;)
	8726	+// {
	8727	+// int i3 = i*3;
	8728	+// pixels[i] = 0xFF;
	8729	+// pixels[i] <<= 8;
	8730	+// pixels[i] \|= bytes[i3+2] & 0xFF;
	8731	+// pixels[i] <<= 8;
	8732	+// pixels[i] \|= bytes[i3+1] & 0xFF;
	8733	+// pixels[i] <<= 8;
	8734	+// pixels[i] \|= bytes[i3] & 0xFF;
	8735	+// }
	8736	+//
	8737	+// bim.setRGB(0,0,w,h, pixels, w*(h-1),-w);
	8738	+
	8739	+ return bim;
	8740	+ }
	8741	+
6760	8742	ShadowBuffer shadowPBuf;
6761	8743	AntialiasBuffer antialiasPBuf;
6762	8744	int MAXSTACK;
..	..	@@ -7312,9 +9294,9 @@
7312	9294	static boolean occlusionInitialized = false;
7313	9295	boolean selection = false;
7314	9296	boolean pointselection = false;
7315		- /static/ boolean lighttouched = true;
	9297	+ ///static/ boolean lighttouched = true;
7316	9298	boolean deselect;
7317		- boolean ambientOcclusion = false;
	9299	+ private boolean ambientOcclusion = false;
7318	9300	static boolean flash = false;
7319	9301	/static/ boolean wait = false;
7320	9302	boolean displaydone = false; // after repaint() calls
..	..	@@ -7592,18 +9574,40 @@
7592	9574	jy8[3] = 0.5f;
7593	9575	}
7594	9576
7595		- float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
	9577	+ float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
7596	9578	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
7597	9579	float[] options3 = new float[]{1, 1, 1, 0}; // fog color
7598	9580	float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
7599	9581
	9582	+ void ResetOptions()
	9583	+ {
	9584	+ options1[0] = 100;
	9585	+ options1[1] = 0.025f;
	9586	+ options1[2] = 0.01f;
	9587	+ options1[3] = 0;
	9588	+ options1[4] = 0;
	9589	+
	9590	+ options2[0] = 0;
	9591	+ options2[1] = 0.75f;
	9592	+ options2[2] = 0;
	9593	+ options2[3] = 0;
	9594	+
	9595	+ options3[0] = 1;
	9596	+ options3[1] = 1;
	9597	+ options3[2] = 1;
	9598	+ options3[3] = 0;
	9599	+
	9600	+ options4[0] = 1;
	9601	+ options4[1] = 0;
	9602	+ options4[2] = 1;
	9603	+ options4[3] = 0;
	9604	+ }
	9605	+
7600	9606	static int imagecount = 0; // movie generation
7601	9607
7602	9608	static int jitter = 0;
7603	9609
7604	9610	boolean restartframe = false;
7605		-
7606		- static int framecount = 0; // general-purpose global count
7607	9611
7608	9612	void displayAntiAliased(javax.media.opengl.GL gl)
7609	9613	{
..	..	@@ -7635,7 +9639,7 @@
7635	9639	gl.glClear(gl.GL_ACCUM_BUFFER_BIT);
7636	9640	for (jitter = 0; jitter < ACSIZE; jitter++) //, GrafreeD.wav.cursor += LIVE ? 735 : 0)
7637	9641	{
7638		- framecount++;
	9642	+ Globals.framecount++;
7639	9643
7640	9644	if (CameraPane.tickcount > 0)
7641	9645	CameraPane.tickcount--;
..	..	@@ -7673,7 +9677,7 @@
7673	9677
7674	9678	gl.glLightfv(gl.GL_LIGHT0, gl.GL_POSITION, pos, 0);
7675	9679	*/
7676		- lighttouched = true;
	9680	+ Globals.lighttouched = true;
7677	9681	//System.err.println(" shadowbuffer: " + jitter);
7678	9682	shadowbuffer.display();
7679	9683
..	..	@@ -7694,8 +9698,8 @@
7694	9698	assert (parentcam != renderCamera);
7695	9699
7696	9700	if (renderCamera != lightCamera)
7697		- for (int count = parentcam.GetTransformCount(); --count>=0;)
7698		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9701	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9702	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
7699	9703
7700	9704	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
7701	9705
..	..	@@ -7710,8 +9714,8 @@
7710	9714	LA.matCopy(renderCamera.fromScreen, matrix);
7711	9715
7712	9716	if (renderCamera != lightCamera)
7713		- for (int count = parentcam.GetTransformCount(); --count>=0;)
7714		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9717	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9718	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
7715	9719
7716	9720	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
7717	9721
..	..	@@ -7783,7 +9787,7 @@
7783	9787	//gl.glFlush();
7784	9788	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
7785	9789
7786		- if (ANIMATION && ABORTED)
	9790	+ if (Globals.ANIMATION && ABORTED)
7787	9791	{
7788	9792	System.err.println(" ABORTED FRAME");
7789	9793	break;
..	..	@@ -7813,7 +9817,7 @@
7813	9817	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
7814	9818
7815	9819	// save image
7816		- if (ANIMATION && !ABORTED)
	9820	+ if (Globals.ANIMATION && !ABORTED)
7817	9821	{
7818	9822	VPwidth = viewport[2];
7819	9823	VPheight = viewport[3];
..	..	@@ -7924,11 +9928,11 @@
7924	9928
7925	9929	// imagecount++;
7926	9930
7927		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9931	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
7928	9932
7929	9933	if (!BOXMODE)
7930	9934	{
7931		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9935	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
7932	9936	}
7933	9937
7934	9938	if (!BOXMODE)
..	..	@@ -7966,7 +9970,7 @@
7966	9970	ABORTED = false;
7967	9971	}
7968	9972	else
7969		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9973	+ Grafreed.wav.cursor += 735 * ACSIZE;
7970	9974
7971	9975	if (false)
7972	9976	{
..	..	@@ -8620,13 +10624,6 @@
8620	10624	}
8621	10625	}
8622	10626
8623		- boolean IsFrozen()
8624		- {
8625		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
8626		-
8627		- return !selectmode && cameracount == 0; // != 0;
8628		- }
8629		-
8630	10627	boolean niceon = false;
8631	10628	javax.swing.Timer AAtimer = new javax.swing.Timer(750, this);
8632	10629	boolean currentlydrawing = false;
..	..	@@ -8636,16 +10633,16 @@
8636	10633
8637	10634	public void display(GLAutoDrawable drawable)
8638	10635	{
8639		- if (GrafreeD.savesound && GrafreeD.hassound)
	10636	+ if (Grafreed.savesound && Grafreed.hassound)
8640	10637	{
8641		- GrafreeD.wav.save();
8642		- GrafreeD.savesound = false;
8643		- GrafreeD.hassound = false;
	10638	+ Grafreed.wav.save();
	10639	+ Grafreed.savesound = false;
	10640	+ Grafreed.hassound = false;
8644	10641	}
8645	10642	// if (DEBUG_SELECTION)
8646	10643	// {
8647		-// if (drawMode != SELECTION)
8648		-// drawMode = SELECTION;
	10644	+// if (DrawMode() != SELECTION)
	10645	+// DrawMode() = SELECTION;
8649	10646	// }
8650	10647
8651	10648	if (!isRenderer)
..	..	@@ -8701,9 +10698,9 @@
8701	10698
8702	10699	//ANTIALIAS = 0;
8703	10700
8704		- if (drawMode == DEFAULT) // && CURRENTANTIALIAS > 0)
	10701	+ if (DrawMode() == DEFAULT) // && CURRENTANTIALIAS > 0)
8705	10702	{
8706		- if (niceon \|\| isLIVE())
	10703	+ if (niceon \|\| Globals.isLIVE())
8707	10704	{
8708	10705	//if(active == 0)
8709	10706	// antialiaser = null;
..	..	@@ -8716,6 +10713,7 @@
8716	10713	ANTIALIAS = 0;
8717	10714	//System.out.println("RESTART");
8718	10715	AAtimer.restart();
	10716	+ Globals.TIMERRUNNING = true;
8719	10717	}
8720	10718	}
8721	10719	}
..	..	@@ -8728,7 +10726,7 @@
8728	10726	assert eyeCamera.shaper_zFar == 1E5f; // 500.0f;
8729	10727	*/
8730	10728
8731		- if (drawMode == DEFAULT)
	10729	+ if (DrawMode() == DEFAULT)
8732	10730	{
8733	10731	currentlydrawing = true;
8734	10732	}
..	..	@@ -8759,18 +10757,18 @@
8759	10757
8760	10758	// if(Applet3D.clipboard != null)
8761	10759	// System.out.println("Clipboard = " + Applet3D.clipboard); //.get(0).parent);
8762		-//drawMode = SELECTION;
	10760	+//DrawMode() = SELECTION;
8763	10761	indexcount = 0;
8764	10762
8765		- if (drawMode == OCCLUSION)
	10763	+ if (DrawMode() == OCCLUSION)
8766	10764	{
8767		- drawMode = DEFAULT;
	10765	+ Globals.drawMode = DEFAULT; // WARNING
8768	10766	ambientOcclusion = true;
8769	10767	setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
8770	10768	Object3D theobject = object;
8771	10769	Object3D theparent = object.parent;
8772	10770	object.parent = null;
8773		- object = (Object3D)GrafreeD.clone(object);
	10771	+ object = (Object3D)Grafreed.clone(object);
8774	10772	object.Stripify();
8775	10773	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
8776	10774	theobject.PreprocessOcclusion(this);
..	..	@@ -8783,19 +10781,20 @@
8783	10781	ambientOcclusion = false;
8784	10782	}
8785	10783
8786		- if (lighttouched && drawMode == DEFAULT && !lightMode) // && !FROZEN)
	10784	+ if (//Globals.lighttouched &&
	10785	+ DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
8787	10786	{
8788	10787	//if (RENDERSHADOW) // ?
8789	10788	if (!IsFrozen())
8790	10789	{
8791	10790	// dec 2012
8792		- if (!ambientOcclusion && !(!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0))
	10791	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
8793	10792	{
8794		- framecount++;
	10793	+ Globals.framecount++;
8795	10794	shadowbuffer.display();
8796	10795	}
8797	10796	}
8798		- lighttouched = false; // ??
	10797	+ Globals.lighttouched = false; // ??
8799	10798	//drawing = true;
8800	10799	//lighttouched = true;
8801	10800	}
..	..	@@ -8816,9 +10815,9 @@
8816	10815	//eyeCamera.shaper_fovy = 1;
8817	10816	}
8818	10817
8819		- if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && drawMode == DEFAULT) // SELECTION)
	10818	+ if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && DrawMode() == DEFAULT) // SELECTION)
8820	10819	{
8821		- //System.out.println("drawMode = " + drawMode);
	10820	+ //System.out.println("DrawMode() = " + DrawMode());
8822	10821	vertexMode \|= VP_PASS;
8823	10822	//vertexMode \|= VP_PROJECTION;
8824	10823	if (!ambientOcclusion)
..	..	@@ -8878,7 +10877,7 @@
8878	10877	Camera cam = renderCamera; // lightMode?lightCamera:eyeCamera;
8879	10878	//Camera lightcam = new Camera(light0);
8880	10879
8881		- if (drawMode == SHADOW)
	10880	+ if (DrawMode() == SHADOW)
8882	10881	{
8883	10882	/*
8884	10883	gl.glMatrixMode(GL.GL_MODELVIEW);
..	..	@@ -8916,8 +10915,8 @@
8916	10915
8917	10916	// if (parentcam != renderCamera) // not a light
8918	10917	if (cam != lightCamera)
8919		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8920		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10918	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10919	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
8921	10920
8922	10921	for (int j = 0; j < 4; j++)
8923	10922	{
..	..	@@ -8931,8 +10930,8 @@
8931	10930
8932	10931	// if (parentcam != renderCamera) // not a light
8933	10932	if (cam != lightCamera)
8934		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8935		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10933	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10934	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
8936	10935
8937	10936	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
8938	10937
..	..	@@ -8968,7 +10967,7 @@
8968	10967	gl.glClear(gl.GL_DEPTH_BUFFER_BIT);
8969	10968	} else
8970	10969	{
8971		- if (drawMode != DEFAULT)
	10970	+ if (DrawMode() != DEFAULT)
8972	10971	{
8973	10972	gl.glClearColor(1, 1, 1, 0);
8974	10973	} // 1);
..	..	@@ -9033,7 +11032,7 @@
9033	11032
9034	11033	fast &= !ambientOcclusion;
9035	11034
9036		- if (drawMode == DEFAULT)
	11035	+ if (DrawMode() == DEFAULT)
9037	11036	{
9038	11037	//gl.glEnable(gl.GL_ALPHA_TEST);
9039	11038	//gl.glActiveTexture(GL.GL_TEXTURE0);
..	..	@@ -9191,7 +11190,16 @@
9191	11190	// Bump noise
9192	11191	gl.glActiveTexture(GL.GL_TEXTURE6);
9193	11192	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
9194		- BindTexture(NOISE_TEXTURE, false, 2);
	11193	+
	11194	+ try
	11195	+ {
	11196	+ BindTexture(NOISE_TEXTURE, false, 2);
	11197	+ }
	11198	+ catch (Exception e)
	11199	+ {
	11200	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	11201	+ }
	11202	+
9195	11203
9196	11204	gl.glActiveTexture(GL.GL_TEXTURE0);
9197	11205	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -9214,9 +11222,9 @@
9214	11222
9215	11223	gl.glMatrixMode(GL.GL_MODELVIEW);
9216	11224
9217		-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
9218		-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
9219		-//gl.glEnable(gl.GL_MULTISAMPLE);
	11225	+gl.glEnable(gl.GL_POLYGON_SMOOTH);
	11226	+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
	11227	+gl.glEnable(gl.GL_MULTISAMPLE);
9220	11228	} else
9221	11229	{
9222	11230	//gl.glDisable(GL.GL_TEXTURE_2D);
..	..	@@ -9227,11 +11235,11 @@
9227	11235	//System.out.println("BLENDING ON");
9228	11236	gl.glEnable(GL.GL_BLEND);
9229	11237	gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
9230		-
	11238	+// gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
9231	11239	gl.glMatrixMode(gl.GL_PROJECTION);
9232	11240	gl.glLoadIdentity();
9233	11241
9234		- if (drawMode == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
	11242	+ if (DrawMode() == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
9235	11243	{
9236	11244	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
9237	11245	double scale = lightCamera.SCALE / lightCamera.Distance();
..	..	@@ -9289,7 +11297,7 @@
9289	11297	//gl.glPushMatrix();
9290	11298	gl.glLoadIdentity();
9291	11299
9292		- if (!ambientOcclusion) // drawMode != OCCLUSION)
	11300	+ if (!ambientOcclusion) // DrawMode() != OCCLUSION)
9293	11301	{
9294	11302	//LA.xformPos(light0, lightCamera.fromScreen, light);
9295	11303	LA.xformDir(dirlight, lightCamera.fromScreen, lightposition);
..	..	@@ -9316,8 +11324,8 @@
9316	11324	System.err.println("parentcam != renderCamera");
9317	11325
9318	11326	// if (cam != lightCamera)
9319		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9320		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11327	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11328	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
9321	11329	}
9322	11330
9323	11331	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -9338,8 +11346,8 @@
9338	11346	if (true) // TODO
9339	11347	{
9340	11348	if (cam != lightCamera)
9341		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9342		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11349	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11350	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
9343	11351	}
9344	11352
9345	11353	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -9376,7 +11384,7 @@
9376	11384	}
9377	11385
9378	11386	/**/
9379		- if (true) // drawMode == SELECTION) // != DEFAULT)
	11387	+ if (true) // DrawMode() == SELECTION) // != DEFAULT)
9380	11388	gl.glDisable(gl.GL_LIGHTING);
9381	11389	else
9382	11390	gl.glEnable(gl.GL_LIGHTING);
..	..	@@ -9394,7 +11402,7 @@
9394	11402
9395	11403	lightslot = 64;
9396	11404
9397		- if (!frozen && !ambientOcclusion && isRenderer && drawMode == DEFAULT)
	11405	+ if (!frozen && !ambientOcclusion && isRenderer && DrawMode() == DEFAULT)
9398	11406	{
9399	11407	DrawLights(object);
9400	11408	}
..	..	@@ -9405,7 +11413,7 @@
9405	11413	fragmentMode \|= (lightslot - 64) << 2; // 1; // first bit is available for aniso
9406	11414	//System.out.println("fragmentMode = " + fragmentMode);
9407	11415
9408		- if (drawMode == DEFAULT \|\| drawMode == SELECTION \|\| DEBUG_SELECTION)
	11416	+ if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| IsDebugSelection())
9409	11417	{
9410	11418	/*
9411	11419	if (CULLFACE \|\| (ambientOcclusion && OCCLUSION_CULLING))
..	..	@@ -9438,7 +11446,7 @@
9438	11446	}
9439	11447	}
9440	11448
9441		- if (drawMode == DEFAULT)
	11449	+ if (DrawMode() == DEFAULT)
9442	11450	{
9443	11451	if (WIREFRAME && !ambientOcclusion)
9444	11452	{
..	..	@@ -9456,7 +11464,7 @@
9456	11464	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9457	11465	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9458	11466
9459		- if (!fast/RENDERPROGRAM != 0/ && (drawMode == DEFAULT \|\| drawMode == SHADOW)) // && !WIREFRAME) //
	11467	+ if (!fast/RENDERPROGRAM != 0/ && (DrawMode() == DEFAULT \|\| DrawMode() == SHADOW)) // && !WIREFRAME) //
9460	11468	{
9461	11469	if (vertexMode != 0) // && !fast)
9462	11470	{
..	..	@@ -9476,7 +11484,7 @@
9476	11484	}
9477	11485	}
9478	11486
9479		- if (false) // fast && !IsFreezed() && drawMode != SELECTION && !ambientOcclusion)
	11487	+ if (false) //RENDERPROGRAM > 0 && DrawMode() == DEFAULT) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
9480	11488	{
9481	11489	//gl.glDepthFunc(GL.GL_LEQUAL);
9482	11490	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -9484,27 +11492,24 @@
9484	11492
9485	11493	boolean texon = textureon;
9486	11494
9487		- if (RENDERPROGRAM > 0)
9488		- {
9489		- gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9490		- textureon = false;
9491		- }
	11495	+ gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11496	+ textureon = false;
	11497	+
9492	11498	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9493	11499	//System.out.println("ALLO");
9494	11500	gl.glColorMask(false, false, false, false);
9495	11501	DrawObject(gl);
9496		- if (RENDERPROGRAM > 0)
9497		- {
9498		- gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9499		- textureon = texon;
9500		- }
	11502	+
	11503	+ gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
	11504	+ textureon = texon;
	11505	+
9501	11506	gl.glColorMask(true, true, true, true);
9502	11507
9503	11508	gl.glDepthFunc(GL.GL_EQUAL);
9504		- //gl.glDepthMask(false);
	11509	+ gl.glDepthMask(false);
9505	11510	}
9506	11511
9507		- if (false) // drawMode == SHADOW)
	11512	+ if (false) // DrawMode() == SHADOW)
9508	11513	{
9509	11514	//SetColumnMajorData(cameraInverseTransform, view_1);
9510	11515	//System.out.println("light = " + cameraInverseTransform);
..	..	@@ -9518,16 +11523,16 @@
9518	11523	//System.out.println("object = " + object);
9519	11524	if (!frozen && !imageLocked)
9520	11525	{
9521		- if (!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0)
	11526	+ if (!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0)
9522	11527	{
9523	11528	displayAntiAliased(gl);
9524	11529	} else
9525	11530	{
9526	11531	programcount = 0;
9527		- int keepmode = drawMode;
	11532	+ int keepmode = DrawMode();
9528	11533	// if (DEBUG_SELECTION)
9529	11534	// {
9530		-// drawMode = SELECTION;
	11535	+// DrawMode() = SELECTION;
9531	11536	// }
9532	11537	// for point selection
9533	11538	// gl.glGetDoublev(gl.GL_MODELVIEW_MATRIX, tempmat, 0);
..	..	@@ -9537,10 +11542,10 @@
9537	11542	DrawObject(gl);
9538	11543
9539	11544	// jan 2013 System.err.println("RESET ABORT (display)");
9540		- // if (drawMode == DEFAULT)
	11545	+ // if (DrawMode() == DEFAULT)
9541	11546	// ABORTED = false;
9542	11547	fullreset = false;
9543		- drawMode = keepmode;
	11548	+ Globals.drawMode = keepmode; // WARNING
9544	11549	//System.out.println("PROGRAM SWITCH " + programcount);
9545	11550	}
9546	11551	}
..	..	@@ -9548,11 +11553,11 @@
9548	11553	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9549	11554	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9550	11555
9551		- if (drawMode == DEFAULT)
	11556	+ if (DrawMode() == DEFAULT)
9552	11557	{
9553	11558	ReleaseTexture(NOISE_TEXTURE, false);
9554	11559	}
9555		- //if (drawMode == DEFAULT)
	11560	+ //if (DrawMode() == DEFAULT)
9556	11561	{
9557	11562
9558	11563	gl.glActiveTexture(GL.GL_TEXTURE1);
..	..	@@ -9564,7 +11569,7 @@
9564	11569	//else
9565	11570	//gl.glDisable(gl.GL_TEXTURE_2D);
9566	11571	//gl.glPopMatrix();
9567		- if (imageCompleted && ANTIALIAS > 0 && drawMode == DEFAULT && cam != lightCamera && !ambientOcclusion)
	11572	+ if (imageCompleted && ANTIALIAS > 0 && DrawMode() == DEFAULT && cam != lightCamera && !ambientOcclusion)
9568	11573	{
9569	11574	//new Exception().printStackTrace();
9570	11575	//System.out.println("Draw image " + width + ", " + height);
..	..	@@ -9606,7 +11611,7 @@
9606	11611	//gl.glFlush();
9607	11612	}
9608	11613
9609		- if (flash && drawMode == DEFAULT)
	11614	+ if (flash && DrawMode() == DEFAULT)
9610	11615	{
9611	11616	flash = false;
9612	11617	wait = true;
..	..	@@ -9614,9 +11619,9 @@
9614	11619	}
9615	11620
9616	11621	//drawing = false;
9617		- //if(drawMode == DEFAULT)
	11622	+ //if(DrawMode() == DEFAULT)
9618	11623	// niceon = false;
9619		- if (drawMode == DEFAULT)
	11624	+ if (DrawMode() == DEFAULT)
9620	11625	{
9621	11626	currentlydrawing = false;
9622	11627	}
..	..	@@ -9636,7 +11641,7 @@
9636	11641	repaint();
9637	11642	}
9638	11643
9639		- if (isLIVE() && drawMode == DEFAULT) // may 2013
	11644	+ if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
9640	11645	repaint();
9641	11646
9642	11647	displaydone = true;
..	..	@@ -9655,8 +11660,14 @@
9655	11660	{
9656	11661	renderpass++;
9657	11662	// System.out.println("Draw object... ");
	11663	+ STEP = 1;
9658	11664	if (FAST) // in case there is no script
9659		- STEP = 16;
	11665	+ STEP = 8;
	11666	+
	11667	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11668	+ {
	11669	+ STEP *= 4;
	11670	+ }
9660	11671
9661	11672	//object.FullInvariants();
9662	11673
..	..	@@ -9670,23 +11681,44 @@
9670	11681	e.printStackTrace();
9671	11682	}
9672	11683
9673		- if (GrafreeD.RENDERME > 0)
9674		- GrafreeD.RENDERME--; // mechante magouille
	11684	+ if (Grafreed.RENDERME > 0)
	11685	+ Grafreed.RENDERME--; // mechante magouille
9675	11686
9676		- ONESTEP = false;
	11687	+ Globals.ONESTEP = false;
9677	11688	}
9678	11689
9679	11690	static boolean zoomonce = false;
9680	11691
	11692	+ static void CreateSelectedPoint()
	11693	+ {
	11694	+ if (selectedpoint == null)
	11695	+ {
	11696	+ debugpointG = new Sphere();
	11697	+ debugpointP = new Sphere();
	11698	+ debugpointC = new Sphere();
	11699	+ debugpointR = new Sphere();
	11700	+
	11701	+ selectedpoint = new Superellipsoid();
	11702	+
	11703	+ for (int i=0; i<8; i++)
	11704	+ {
	11705	+ debugpoints[i] = new Sphere();
	11706	+ }
	11707	+ }
	11708	+ }
	11709	+
9681	11710	void DrawObject(GL gl, boolean draw)
9682	11711	{
	11712	+ // To clear camera values
	11713	+ ResetOptions();
	11714	+
9683	11715	//System.out.println("DRAW OBJECT " + mouseDown);
9684		-// drawMode = SELECTION;
	11716	+// DrawMode() = SELECTION;
9685	11717	//GL gl = getGL();
9686	11718	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
9687	11719	{
9688		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && drawMode == SHADOW) // && !lightMode)
9689		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	11720	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
	11721	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
9690	11722	pingthread.StepToTarget(true); // true);
9691	11723	// zoomonce = false;
9692	11724	}
..	..	@@ -9706,9 +11738,9 @@
9706	11738	callist = gl.glGenLists(1);
9707	11739	}
9708	11740
9709		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	11741	+ boolean selectmode = DrawMode() == SELECTION \|\| IsDebugSelection();
9710	11742
9711		- boolean active = !selectmode; // drawMode != SELECTION; // mouseDown;
	11743	+ boolean active = !selectmode; // DrawMode() != SELECTION; // mouseDown;
9712	11744
9713	11745	if (!mainDL \|\| !active \|\| touched)
9714	11746	{
..	..	@@ -9735,13 +11767,20 @@
9735	11767	PushMatrix(ClickInfo.matbuffer);
9736	11768	}
9737	11769
9738		- if (drawMode == 0)
	11770	+ if (DrawMode() == 0)
9739	11771	{
9740	11772	// System.out.println("CLEAR +++++++++++++++ +++++++++++++++ +++++++++++++++ +++++++++++++++");
9741	11773
9742	11774	usedtextures.clear();
9743	11775
9744		- BindTextures(DEFAULT_TEXTURES, 2);
	11776	+ try
	11777	+ {
	11778	+ BindTextures(DEFAULT_TEXTURES, 2);
	11779	+ }
	11780	+ catch (Exception e)
	11781	+ {
	11782	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11783	+ }
9745	11784	}
9746	11785	//System.out.println("--> " + stackdepth);
9747	11786	// GrafreeD.traceon();
..	..	@@ -9749,10 +11788,11 @@
9749	11788	// DRAW
9750	11789	object.draw(this, /(Composite)/ object, false, false);
9751	11790
9752		- if (drawMode == DEFAULT)
	11791	+ if (DrawMode() == DEFAULT)
9753	11792	{
9754		- if (DEBUG)
	11793	+ if (Globals.DEBUG)
9755	11794	{
	11795	+ CreateSelectedPoint();
9756	11796	float radius = 0.05f;
9757	11797	if (selectedpoint.radius != radius)
9758	11798	{
..	..	@@ -9801,38 +11841,57 @@
9801	11841	}
9802	11842	// GrafreeD.traceoff();
9803	11843	//System.out.println(stackdepth);
9804		- if (drawMode == 0)
	11844	+ if (DrawMode() == 0)
9805	11845	{
9806	11846	ReleaseTextures(DEFAULT_TEXTURES);
9807	11847
9808	11848	if (CLEANCACHE)
9809		- for (java.util.Enumeration<String> e = textures.keys() ; e.hasMoreElements();)
	11849	+ for (java.util.Enumeration<cTexture> e = texturepigment.keys() ; e.hasMoreElements();)
9810	11850	{
9811		- String tex = e.nextElement();
	11851	+ cTexture tex = e.nextElement();
9812	11852
9813	11853	// System.out.println("Texture --------- " + tex);
9814	11854
9815		- if (tex.equals("WHITE_NOISE"))
	11855	+ if (tex.equals("WHITE_NOISE:"))
9816	11856	continue;
9817	11857
9818		- if (!usedtextures.containsKey(tex))
	11858	+ if (!usedtextures.contains(tex))
9819	11859	{
	11860	+ CacheTexture gettex = texturepigment.get(tex);
9820	11861	// System.out.println("DISPOSE +++++++++++++++ " + tex);
9821		- textures.get(tex).texture.dispose();
9822		- textures.remove(tex);
	11862	+ if (gettex != null)
	11863	+ {
	11864	+ gettex.texture.dispose();
	11865	+ texturepigment.remove(tex);
	11866	+ }
	11867	+
	11868	+ gettex = texturebump.get(tex);
	11869	+ // System.out.println("DISPOSE +++++++++++++++ " + tex);
	11870	+ if (gettex != null)
	11871	+ {
	11872	+ gettex.texture.dispose();
	11873	+ texturebump.remove(tex);
	11874	+ }
9823	11875	}
9824	11876	}
9825	11877	}
9826	11878
9827	11879	checker = null;
9828	11880
9829		- if (!ambientOcclusion && !IsFrozen() && drawMode == DEFAULT)
	11881	+ if (!ambientOcclusion && !IsFrozen() && DrawMode() == DEFAULT)
9830	11882	FindChecker(object);
9831	11883
9832		- if (checker != null && drawMode == DEFAULT)
	11884	+ if (checker != null && DrawMode() == DEFAULT)
9833	11885	{
9834	11886	//BindTexture(IMMORTAL_TEXTURE);
9835		- BindTextures(checker.GetTextures(), checker.texres);
	11887	+ try
	11888	+ {
	11889	+ BindTextures(checker.GetTextures(), checker.texres);
	11890	+ }
	11891	+ catch (Exception e)
	11892	+ {
	11893	+ System.err.println("FAILED: " + checker.GetTextures());
	11894	+ }
9836	11895	// NEAREST
9837	11896	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
9838	11897	DrawChecker(gl);
..	..	@@ -9851,7 +11910,7 @@
9851	11910	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9852	11911	//gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9853	11912
9854		- if (DISPLAYTEXT && drawMode == DEFAULT)
	11913	+ if (DISPLAYTEXT && DrawMode() == DEFAULT)
9855	11914	{
9856	11915	// Draw it once, then use the raster
9857	11916	Balloon(gl, balloon.createGraphics());
..	..	@@ -9907,14 +11966,14 @@
9907	11966	int[] xs = new int[3];
9908	11967	int[] ys = new int[3];
9909	11968
9910		- void DrawString(Object3D obj) // String string)
	11969	+ public void DrawString(Object3D obj) // String string) // INTERFACE
9911	11970	{
9912		- if (!DISPLAYTEXT \|\| drawMode != DEFAULT)
	11971	+ if (!DISPLAYTEXT \|\| DrawMode() != DEFAULT)
9913	11972	{
9914	11973	return;
9915	11974	}
9916	11975
9917		- String string = obj.GetToolTip();
	11976	+ String string = obj.toString(); //.GetToolTip();
9918	11977
9919	11978	GL gl = GetGL();
9920	11979
..	..	@@ -10231,8 +12290,8 @@
10231	12290	//obj.TransformToWorld(light, light);
10232	12291	for (int i = tp.size(); --i >= 0;)
10233	12292	{
10234		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
10235		- LA.xformPos(light, tp.get(i).toParent, light);
	12293	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12294	+ LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
10236	12295	}
10237	12296
10238	12297
..	..	@@ -10249,8 +12308,8 @@
10249	12308	parentcam = cameras[0];
10250	12309	}
10251	12310
10252		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10253		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12311	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12312	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
10254	12313
10255	12314	LA.xformPos(light, renderCamera.toScreen, light);
10256	12315
..	..	@@ -10864,8 +12923,8 @@
10864	12923
10865	12924	// display shadow only (bump == 0)
10866	12925	"SUB temp.x, half.x, shadow.x;" +
10867		- "MOV temp.y, -params6.x;" +
10868		- "SLT temp.z, temp.y, zero.x;" +
	12926	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12927	+ "SLT temp.z, temp.y, -one2048th.x;" +
10869	12928	"SUB temp.y, one.x, temp.z;" +
10870	12929	"MUL temp.x, temp.x, temp.y;" +
10871	12930	"KIL temp.x;" +
..	..	@@ -10994,8 +13053,10 @@
10994	13053	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
10995	13054
10996	13055	"SUB temp.x, one.x, ndotl.x;" +
10997		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
10998		- "ADD temp.y, one.y, options2.y;" + // sursurface
	13056	+ // Tuning for default skin
	13057	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	13058	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	13059	+ "ADD temp.y, one.y, options2.y;" + // subsurface
10999	13060	"MUL temp.x, temp.x, temp.y;" +
11000	13061
11001	13062	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -11194,7 +13255,7 @@
11194	13255	//once = true;
11195	13256	}
11196	13257
11197		- System.out.print("Program #" + mode + "; length = " + program.length());
	13258	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
11198	13259	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
11199	13260	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
11200	13261
..	..	@@ -11327,12 +13388,16 @@
11327	13388
11328	13389	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
11329	13390	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13391	+
	13392	+ // Compare fragment depth in light space with shadowmap.
11330	13393	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
11331	13394	"SGE temp.y, temp.x, zero.x;" +
11332		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13395	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13396	+
	13397	+ // Reverse comparison
11333	13398	"SUB temp.x, one.x, temp.x;" +
11334	13399	"MUL " + shadow + ".x, temp.x, temp.y;" +
11335		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13400	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
11336	13401	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
11337	13402
11338	13403	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -11346,6 +13411,10 @@
11346	13411	// No shadow for backface
11347	13412	"DP3 temp.x, normal, lightd;" +
11348	13413	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13414	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13415	+
	13416	+ // No shadow when out of frustrum
	13417	+ "SGE temp.x, " + depth + ".z, one.z;" +
11349	13418	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
11350	13419	"";
11351	13420	}
..	..	@@ -11492,7 +13561,8 @@
11492	13561	/static/ float[] modelParams5 = new float[]{0, 0, 0, 0}; // texture, opacity, fakedepth, shadowbias
11493	13562	/static/ float[] modelParams6 = new float[]{0, 0, 0, 0}; // bump, noise, borderfade, fog punchthrough
11494	13563	/static/ float[] modelParams7 = new float[]{0, 0, 0, 0}; // noise power, opacity power
11495		- Object3D.cVector2[] vector2buffer;
	13564	+
	13565	+ //Object3D.cVector2[] vector2buffer;
11496	13566
11497	13567	// IN : ndotl, ndoth, xxx, NdotL //, snininess, lightarea
11498	13568	// OUT : diff, spec
..	..	@@ -11508,9 +13578,10 @@
11508	13578	"DP3 " + dest + ".z," + "normals," + "eye;" +
11509	13579	"MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
11510	13580	//"MOV " + dest + ".w," + "normal.z;" +
11511		- "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
11512		- "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
11513		- //"MOV " + dest + ".z," + "params2.w;" +
	13581	+// "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
	13582	+// "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
	13583	+
	13584	+ "MOV " + dest + ".z," + "params2.w;" + // EXACT
11514	13585	"POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
11515	13586	"RCP " + dest + ".w," + dest + ".w;" +
11516	13587	//"RSQ " + dest + ".w," + dest + ".w;" +
..	..	@@ -11904,7 +13975,7 @@
11904	13975	public void mousePressed(MouseEvent e)
11905	13976	{
11906	13977	//System.out.println("mousePressed: " + e);
11907		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13978	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
11908	13979	}
11909	13980
11910	13981	static long prevtime = 0;
..	..	@@ -11931,6 +14002,7 @@
11931	14002
11932	14003	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
11933	14004
	14005	+ if (BUTTONLESSWHEEL)
11934	14006	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
11935	14007	{
11936	14008	return;
..	..	@@ -11939,7 +14011,7 @@
11939	14011	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
11940	14012
11941	14013	// TIMER
11942		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	14014	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
11943	14015	{
11944	14016	keepboxmode = BOXMODE;
11945	14017	keepsupport = SUPPORT;
..	..	@@ -11979,8 +14051,8 @@
11979	14051	// mode \|= META;
11980	14052	//}
11981	14053
11982		- SetMouseMode(WHEEL \| e.getModifiersEx());
11983		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	14054	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	14055	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
11984	14056	anchorX = ax;
11985	14057	anchorY = ay;
11986	14058	prevX = px;
..	..	@@ -12014,6 +14086,7 @@
12014	14086	else
12015	14087	if (evt.getSource() == AAtimer)
12016	14088	{
	14089	+ Globals.TIMERRUNNING = false;
12017	14090	if (mouseDown)
12018	14091	{
12019	14092	//new Exception().printStackTrace();
..	..	@@ -12039,6 +14112,10 @@
12039	14112	// LIVE = waslive;
12040	14113	// wasliveok = true;
12041	14114	// waslive = false;
	14115	+
	14116	+ // May 2019 Forget it:
	14117	+ if (true)
	14118	+ return;
12042	14119
12043	14120	// source == timer
12044	14121	if (mouseDown)
..	..	@@ -12068,8 +14145,8 @@
12068	14145	// ObjEditor.tweenManager.update(1f / 60f);
12069	14146
12070	14147	// fev 2014???
12071		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && drawMode == SHADOW) // && !lightMode)
12072		- object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
	14148	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
	14149	+ object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
12073	14150	pingthread.StepToTarget(true); // true);
12074	14151	}
12075	14152	// if (!LIVE)
..	..	@@ -12078,12 +14155,13 @@
12078	14155
12079	14156	javax.swing.Timer timer = new javax.swing.Timer(350, this);
12080	14157
12081		- void clickStart(int x, int y, int modifiers)
	14158	+ void clickStart(int x, int y, int modifiers, int modifiersex)
12082	14159	{
12083	14160	if (!wasliveok)
12084	14161	return;
12085	14162
12086	14163	AAtimer.restart(); //
	14164	+ Globals.TIMERRUNNING = true;
12087	14165
12088	14166	// waslive = LIVE;
12089	14167	// LIVE = false;
..	..	@@ -12095,7 +14173,7 @@
12095	14173	// touched = true; // main DL
12096	14174	if (isRenderer)
12097	14175	{
12098		- SetMouseMode(modifiers);
	14176	+ SetMouseMode(modifiers, modifiersex);
12099	14177	}
12100	14178
12101	14179	selectX = anchorX = x;
..	..	@@ -12108,7 +14186,7 @@
12108	14186	clicked = true;
12109	14187	hold = false;
12110	14188
12111		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	14189	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
12112	14190	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
12113	14191	{
12114	14192	// System.out.println("RESTART II " + modifiers);
..	..	@@ -12139,7 +14217,7 @@
12139	14217	info.camera = renderCamera;
12140	14218	info.x = x;
12141	14219	info.y = y;
12142		- info.modifiers = modifiers;
	14220	+ info.modifiers = modifiersex;
12143	14221	editObj = object.doEditClick(info, 0);
12144	14222	if (!editObj)
12145	14223	{
..	..	@@ -12156,11 +14234,14 @@
12156	14234
12157	14235	public void mouseDragged(MouseEvent e)
12158	14236	{
	14237	+ Globals.MOUSEDRAGGED = true;
	14238	+
	14239	+ //System.out.println("mouseDragged: " + e);
12159	14240	if (isRenderer)
12160	14241	movingcamera = true;
	14242	+
12161	14243	//if (drawing)
12162	14244	//return;
12163		- //System.out.println("mouseDragged: " + e);
12164	14245	if ((e.getModifiersEx() & CTRL) != 0
12165	14246	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
12166	14247	{
..	..	@@ -12168,7 +14249,7 @@
12168	14249	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12169	14250	}
12170	14251	else
12171		- drag(e.getX(), e.getY(), e.getModifiersEx());
	14252	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
12172	14253
12173	14254	//try { Thread.sleep(1); } catch (Exception ex) {}
12174	14255	}
..	..	@@ -12180,6 +14261,11 @@
12180	14261	cVector tmp = new cVector();
12181	14262	cVector tmp2 = new cVector();
12182	14263	boolean isMoving;
	14264	+
	14265	+ public cVector TargetLookAt()
	14266	+ {
	14267	+ return targetLookAt;
	14268	+ }
12183	14269
12184	14270	class PingThread extends Thread
12185	14271	{
..	..	@@ -12319,7 +14405,7 @@
12319	14405	//System.out.println("---------------- ---------- Paint " + tmp.length2());
12320	14406	if (lightMode)
12321	14407	{
12322		- lighttouched = true;
	14408	+ Globals.lighttouched = true;
12323	14409	}
12324	14410
12325	14411	if (OEILONCE && OEIL)
..	..	@@ -12336,6 +14422,7 @@
12336	14422
12337	14423	public void run()
12338	14424	{
	14425	+ new Exception().printStackTrace();
12339	14426	System.exit(0);
12340	14427	for (;;)
12341	14428	{
..	..	@@ -12377,7 +14464,7 @@
12377	14464	mouseDown = false;
12378	14465	if (lightMode)
12379	14466	{
12380		- lighttouched = true;
	14467	+ Globals.lighttouched = true;
12381	14468	}
12382	14469	repaint();
12383	14470	alreadypainted = true;
..	..	@@ -12385,7 +14472,7 @@
12385	14472	isMoving = false;
12386	14473	} //??
12387	14474
12388		- if (isLIVE() && !alreadypainted)
	14475	+ if (Globals.isLIVE() && !alreadypainted)
12389	14476	{
12390	14477	// FOR DEBUG BREAKPOINT USING PAUSE: while (true)
12391	14478	repaint();
..	..	@@ -12397,9 +14484,9 @@
12397	14484	{
12398	14485	if (lightMode)
12399	14486	{
12400		- lighttouched = true;
	14487	+ Globals.lighttouched = true;
12401	14488	}
12402		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14489	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
12403	14490	}
12404	14491	//else
12405	14492	}
..	..	@@ -12413,12 +14500,12 @@
12413	14500	void GoDown(int mod)
12414	14501	{
12415	14502	MODIFIERS \|= COMMAND;
12416		- /*
	14503	+ /**/
12417	14504	if((mod&SHIFT) == SHIFT)
12418	14505	manipCamera.RotatePosition(0, -speed);
12419	14506	else
12420		- manipCamera.BackForth(0, -speed*delta, getWidth());
12421		- */
	14507	+ manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
	14508	+ /**/
12422	14509	if ((mod & SHIFT) == SHIFT)
12423	14510	{
12424	14511	mouseMode = mouseMode; // VR??
..	..	@@ -12434,12 +14521,12 @@
12434	14521	void GoUp(int mod)
12435	14522	{
12436	14523	MODIFIERS \|= COMMAND;
12437		- /*
	14524	+ /**/
12438	14525	if((mod&SHIFT) == SHIFT)
12439	14526	manipCamera.RotatePosition(0, speed);
12440	14527	else
12441		- manipCamera.BackForth(0, speed*delta, getWidth());
12442		- */
	14528	+ manipCamera.BackForth(0, speed*delta, 0); // getWidth());
	14529	+ /**/
12443	14530	if ((mod & SHIFT) == SHIFT)
12444	14531	{
12445	14532	mouseMode = mouseMode;
..	..	@@ -12455,12 +14542,12 @@
12455	14542	void GoLeft(int mod)
12456	14543	{
12457	14544	MODIFIERS \|= COMMAND;
12458		- /*
	14545	+ /**/
12459	14546	if((mod&SHIFT) == SHIFT)
12460		- manipCamera.RotatePosition(speed, 0);
12461		- else
12462	14547	manipCamera.Translate(speed*delta, 0, getWidth());
12463		- */
	14548	+ else
	14549	+ manipCamera.RotatePosition(speed, 0);
	14550	+ /**/
12464	14551	if ((mod & SHIFT) == SHIFT)
12465	14552	{
12466	14553	mouseMode = mouseMode;
..	..	@@ -12476,12 +14563,12 @@
12476	14563	void GoRight(int mod)
12477	14564	{
12478	14565	MODIFIERS \|= COMMAND;
12479		- /*
	14566	+ /**/
12480	14567	if((mod&SHIFT) == SHIFT)
12481		- manipCamera.RotatePosition(-speed, 0);
12482		- else
12483	14568	manipCamera.Translate(-speed*delta, 0, getWidth());
12484		- */
	14569	+ else
	14570	+ manipCamera.RotatePosition(-speed, 0);
	14571	+ /**/
12485	14572	if ((mod & SHIFT) == SHIFT)
12486	14573	{
12487	14574	mouseMode = mouseMode;
..	..	@@ -12499,7 +14586,7 @@
12499	14586	int X, Y;
12500	14587	boolean SX, SY;
12501	14588
12502		- void drag(int x, int y, int modifiers)
	14589	+ void drag(int x, int y, int modifiers, int modifiersex)
12503	14590	{
12504	14591	if (IsFrozen())
12505	14592	{
..	..	@@ -12508,17 +14595,17 @@
12508	14595
12509	14596	drag = true; // NEW
12510	14597
12511		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14598	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
12512	14599
12513	14600	X = x;
12514	14601	Y = y;
12515	14602	// floating state for animation
12516		- MODIFIERS = modifiers;
12517		- modifiers &= ~1024;
	14603	+ MODIFIERS = modifiersex;
	14604	+ modifiersex &= ~1024;
12518	14605	if (false) // modifiers != 0)
12519	14606	{
12520	14607	//new Exception().printStackTrace();
12521		- System.out.println("mouseDragged: " + modifiers);
	14608	+ System.out.println("mouseDragged: " + modifiersex);
12522	14609	System.out.println("SHIFT = " + SHIFT);
12523	14610	System.out.println("CONTROL = " + COMMAND);
12524	14611	System.out.println("META = " + META);
..	..	@@ -12538,7 +14625,8 @@
12538	14625	info.camera = renderCamera;
12539	14626	info.x = x;
12540	14627	info.y = y;
12541		- object.editWindow.copy.doEditDrag(info);
	14628	+ object.GetWindow().copy
	14629	+ .doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
12542	14630	} else
12543	14631	{
12544	14632	if (x < startX)
..	..	@@ -12651,7 +14739,7 @@
12651	14739
12652	14740	if (manipCamera == lightCamera)
12653	14741	{
12654		- lighttouched = true;
	14742	+ Globals.lighttouched = true;
12655	14743	}
12656	14744	/*
12657	14745	switch (mode)
..	..	@@ -12690,7 +14778,6 @@
12690	14778	public void mouseMoved(MouseEvent e)
12691	14779	{
12692	14780	//System.out.println("mouseMoved: " + e);
12693		-
12694	14781	if (isRenderer)
12695	14782	return;
12696	14783
..	..	@@ -12703,7 +14790,9 @@
12703	14790	ci.camera = renderCamera;
12704	14791	if (!isRenderer)
12705	14792	{
12706		- if (object.editWindow.copy.doEditClick(ci, 0))
	14793	+ //ObjEditor editWindow = object.editWindow;
	14794	+ //Object3D copy = editWindow.copy;
	14795	+ if (object.doEditClick(ci, 0))
12707	14796	{
12708	14797	setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
12709	14798	} else
..	..	@@ -12715,7 +14804,11 @@
12715	14804
12716	14805	public void mouseReleased(MouseEvent e)
12717	14806	{
	14807	+ Globals.MOUSEDRAGGED = false;
	14808	+
12718	14809	movingcamera = false;
	14810	+ X = 0; // getBounds().width/2;
	14811	+ Y = 0; // getBounds().height/2;
12719	14812	//System.out.println("mouseReleased: " + e);
12720	14813	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12721	14814	}
..	..	@@ -12738,9 +14831,9 @@
12738	14831	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
12739	14832	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
12740	14833
12741		- if (control \|\| command \|\| IsFrozen())
	14834	+// No delay if (control \|\| command \|\| IsFrozen())
12742	14835	timeout = true;
12743		- else
	14836	+// ?? May 2019 else
12744	14837	// timer.setDelay((modifiers & 128) != 0?0:350);
12745	14838	mouseDown = false;
12746	14839	if (!control && !command) // june 2013
..	..	@@ -12850,7 +14943,7 @@
12850	14943	System.out.println("keyReleased: " + e);
12851	14944	}
12852	14945
12853		- void SetMouseMode(int modifiers)
	14946	+ void SetMouseMode(int modifiers, int modifiersex)
12854	14947	{
12855	14948	//System.out.println("SetMouseMode = " + modifiers);
12856	14949	//modifiers &= ~1024;
..	..	@@ -12862,25 +14955,25 @@
12862	14955	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
12863	14956	// return;
12864	14957	//System.out.println("SetMode = " + modifiers);
12865		- if ((modifiers & WHEEL) == WHEEL)
	14958	+ if ((modifiersex & WHEEL) == WHEEL)
12866	14959	{
12867	14960	mouseMode \|= ZOOM;
12868	14961	}
12869	14962
12870	14963	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
12871		- if (capsLocked \|\| (modifiers & META) == META)
	14964	+ if (capsLocked) // \|\| (modifiers & META) == META)
12872	14965	{
12873	14966	mouseMode \|= VR; // BACKFORTH;
12874	14967	}
12875		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14968	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
12876	14969	{
12877	14970	mouseMode \|= SELECT;
12878	14971	}
12879		- if ((modifiers & COMMAND) == COMMAND)
	14972	+ if ((modifiersex & COMMAND) == COMMAND)
12880	14973	{
12881	14974	mouseMode \|= SELECT;
12882	14975	}
12883		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14976	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
12884	14977	{
12885	14978	mouseMode &= ~VR;
12886	14979	mouseMode \|= TRANSLATE;
..	..	@@ -12909,10 +15002,10 @@
12909	15002
12910	15003	if (isRenderer) //
12911	15004	{
12912		- SetMouseMode(modifiers);
	15005	+ SetMouseMode(0, modifiers);
12913	15006	}
12914	15007
12915		- theRenderer.keyPressed(key);
	15008	+ Globals.theRenderer.keyPressed(key);
12916	15009	}
12917	15010
12918	15011	int kompactbit = 4; // power bit
..	..	@@ -12924,7 +15017,7 @@
12924	15017	float SATPOW = 1; // 2; // 0.5f;
12925	15018	float BRIPOW = 1; // 0.5f; // 0.5f;
12926	15019
12927		- void keyPressed(int key)
	15020	+ public void keyPressed(int key)
12928	15021	{
12929	15022	if (key >= '0' && key <= '5')
12930	15023	clampbit = (key-'0');
..	..	@@ -12971,7 +15064,8 @@
12971	15064	// break;
12972	15065	case 'T':
12973	15066	CACHETEXTURE ^= true;
12974		- textures.clear();
	15067	+ texturepigment.clear();
	15068	+ texturebump.clear();
12975	15069	// repaint();
12976	15070	break;
12977	15071	case 'Y':
..	..	@@ -13039,7 +15133,7 @@
13039	15133	case 'B':
13040	15134	BRISMOOTH ^= true;
13041	15135	SHADOWCULLFACE ^= true;
13042		- lighttouched = true;
	15136	+ Globals.lighttouched = true;
13043	15137	repaint();
13044	15138	break;
13045	15139	case 'b':
..	..	@@ -13056,7 +15150,9 @@
13056	15150	case 'E' : COMPACT ^= true;
13057	15151	repaint();
13058	15152	break;
13059		- case 'W' : DEBUGHSB ^= true;
	15153	+ case 'W' : // Wide Window (fullscreen)
	15154	+ //DEBUGHSB ^= true;
	15155	+ ObjEditor.theFrame.ToggleFullScreen();
13060	15156	repaint();
13061	15157	break;
13062	15158	case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
..	..	@@ -13081,8 +15177,8 @@
13081	15177	RevertCamera();
13082	15178	repaint();
13083	15179	break;
13084		- case 'L':
13085	15180	case 'l':
	15181	+ //case 'L':
13086	15182	if (lightMode)
13087	15183	{
13088	15184	lightMode = false;
..	..	@@ -13139,7 +15235,7 @@
13139	15235	repaint();
13140	15236	break;
13141	15237	case 'O':
13142		- drawMode = OCCLUSION;
	15238	+ Globals.drawMode = OCCLUSION; // WARNING
13143	15239	repaint();
13144	15240	break;
13145	15241	case 'o':
..	..	@@ -13225,12 +15321,12 @@
13225	15321	case '_':
13226	15322	kompactbit = 5;
13227	15323	break;
13228		- case '+':
13229		- kompactbit = 6;
13230		- break;
	15324	+// case '+':
	15325	+// kompactbit = 6;
	15326	+// break;
13231	15327	case ' ':
13232	15328	lightMode ^= true;
13233		- lighttouched = true;
	15329	+ Globals.lighttouched = true;
13234	15330	manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
13235	15331	targetLookAt.set(manipCamera.lookAt);
13236	15332	repaint();
..	..	@@ -13239,14 +15335,15 @@
13239	15335	case ESC:
13240	15336	RENDERPROGRAM += 1;
13241	15337	RENDERPROGRAM %= 3;
	15338	+
13242	15339	repaint();
13243	15340	break;
13244	15341	case 'Z':
13245	15342	//RESIZETEXTURE ^= true;
13246	15343	//break;
13247	15344	case 'z':
13248		- RENDERSHADOW ^= true;
13249		- lighttouched = true;
	15345	+ Globals.RENDERSHADOW ^= true;
	15346	+ Globals.lighttouched = true;
13250	15347	repaint();
13251	15348	break;
13252	15349	//case UP:
..	..	@@ -13278,8 +15375,9 @@
13278	15375	case DELETE:
13279	15376	ClearSelection();
13280	15377	break;
13281		- /*
13282	15378	case '+':
	15379	+
	15380	+ /*
13283	15381	//fontsize += 1;
13284	15382	bbzoom *= 2;
13285	15383	repaint();
..	..	@@ -13296,17 +15394,17 @@
13296	15394	case '=':
13297	15395	IncDepth();
13298	15396	//fontsize += 1;
13299		- object.editWindow.refreshContents(true);
	15397	+ object.GetWindow().refreshContents(true);
13300	15398	maskbit = 6;
13301	15399	break;
13302	15400	case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
13303	15401	DecDepth();
13304	15402	maskbit = 5;
13305	15403	//if(fontsize > 1) fontsize -= 1;
13306		- if (object.editWindow == null)
13307		- new Exception().printStackTrace();
13308		- else
13309		- object.editWindow.refreshContents(true);
	15404	+// if (object.editWindow == null)
	15405	+// new Exception().printStackTrace();
	15406	+// else
	15407	+ object.GetWindow().refreshContents(true);
13310	15408	break;
13311	15409	case '{':
13312	15410	manipCamera.shaper_fovy /= 1.1;
..	..	@@ -13361,6 +15459,7 @@
13361	15459	}
13362	15460	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
13363	15461	}
	15462	+
13364	15463	static double OCCLUSIONBOOST = 1; // 0.5;
13365	15464
13366	15465	void keyReleased(int key, int modifiers)
..	..	@@ -13368,11 +15467,11 @@
13368	15467	//mode = ROTATE;
13369	15468	if ((MODIFIERS & COMMAND) == 0) // VR??
13370	15469	{
13371		- SetMouseMode(modifiers);
	15470	+ SetMouseMode(0, modifiers);
13372	15471	}
13373	15472	}
13374	15473
13375		- protected void processKeyEvent(KeyEvent e)
	15474	+ public void processKeyEvent(KeyEvent e)
13376	15475	{
13377	15476	switch (e.getID())
13378	15477	{
..	..	@@ -13502,8 +15601,9 @@
13502	15601
13503	15602	protected void processMouseMotionEvent(MouseEvent e)
13504	15603	{
13505		- //System.out.println("processMouseMotionEvent: " + mouseMode);
13506		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15604	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15605	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15606	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
13507	15607	{
13508	15608	mouseMoved(e);
13509	15609	} else
..	..	@@ -13528,11 +15628,12 @@
13528	15628	}
13529	15629	*/
13530	15630
13531		- object.editWindow.EditSelection();
	15631	+ object.GetWindow().EditSelection(false);
13532	15632	}
13533	15633
13534	15634	void SelectParent()
13535	15635	{
	15636	+ new Exception().printStackTrace();
13536	15637	System.exit(0);
13537	15638	Composite group = (Composite) object;
13538	15639	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -13544,10 +15645,10 @@
13544	15645	{
13545	15646	//selectees.remove(i);
13546	15647	System.out.println("select parent of " + elem);
13547		- group.editWindow.Select(elem.parent.GetTreePath(), first, true);
	15648	+ group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
13548	15649	} else
13549	15650	{
13550		- group.editWindow.Select(elem.GetTreePath(), first, true);
	15651	+ group.GetWindow().Select(elem.GetTreePath(), first, true);
13551	15652	}
13552	15653
13553	15654	first = false;
..	..	@@ -13556,6 +15657,7 @@
13556	15657
13557	15658	void SelectChildren()
13558	15659	{
	15660	+ new Exception().printStackTrace();
13559	15661	System.exit(0);
13560	15662	/*
13561	15663	Composite group = (Composite) object;
..	..	@@ -13588,12 +15690,12 @@
13588	15690	for (int j = 0; j < group.children.size(); j++)
13589	15691	{
13590	15692	elem = (Object3D) group.children.elementAt(j);
13591		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15693	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
13592	15694	first = false;
13593	15695	}
13594	15696	} else
13595	15697	{
13596		- object.editWindow.Select(elem.GetTreePath(), first, true);
	15698	+ object.GetWindow().Select(elem.GetTreePath(), first, true);
13597	15699	}
13598	15700
13599	15701	first = false;
..	..	@@ -13604,21 +15706,21 @@
13604	15706	{
13605	15707	//Composite group = (Composite) object;
13606	15708	Object3D group = object;
13607		- group.editWindow.loadClipboard(true); // ClearSelection(false);
	15709	+ group.GetWindow().loadClipboard(true); // ClearSelection(false);
13608	15710	}
13609	15711
13610	15712	void ResetTransform(int mask)
13611	15713	{
13612	15714	//Composite group = (Composite) object;
13613	15715	Object3D group = object;
13614		- group.editWindow.ResetTransform(mask);
	15716	+ group.GetWindow().ResetTransform(mask);
13615	15717	}
13616	15718
13617	15719	void FlipTransform()
13618	15720	{
13619	15721	//Composite group = (Composite) object;
13620	15722	Object3D group = object;
13621		- group.editWindow.FlipTransform();
	15723	+ group.GetWindow().FlipTransform();
13622	15724	// group.editWindow.ReduceMesh(true);
13623	15725	}
13624	15726
..	..	@@ -13626,7 +15728,7 @@
13626	15728	{
13627	15729	//Composite group = (Composite) object;
13628	15730	Object3D group = object;
13629		- group.editWindow.PrintMemory();
	15731	+ group.GetWindow().PrintMemory();
13630	15732	// group.editWindow.ReduceMesh(true);
13631	15733	}
13632	15734
..	..	@@ -13634,7 +15736,7 @@
13634	15736	{
13635	15737	//Composite group = (Composite) object;
13636	15738	Object3D group = object;
13637		- group.editWindow.ResetCentroid();
	15739	+ group.GetWindow().ResetCentroid();
13638	15740	}
13639	15741
13640	15742	void IncDepth()
..	..	@@ -13720,7 +15822,9 @@
13720	15822	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
13721	15823	//Image img = CreateImage(width, height);
13722	15824	//System.out.println("width = " + width + "; height = " + height + "\n");
	15825	+
13723	15826	Graphics gr = g; // img.getGraphics();
	15827	+
13724	15828	if (!hasMarquee)
13725	15829	{
13726	15830	if (Xmin < Xmax) // !locked)
..	..	@@ -13808,6 +15912,7 @@
13808	15912	info.bounds.y += (height - desired) / 2;
13809	15913	}
13810	15914	}
	15915	+
13811	15916	info.g = gr;
13812	15917	info.camera = renderCamera;
13813	15918	/*
..	..	@@ -13817,15 +15922,55 @@
13817	15922	*/
13818	15923	if (!isRenderer)
13819	15924	{
13820		- object.drawEditHandles(info, 0);
	15925	+ Grafreed.Assert(object != null);
	15926	+ Grafreed.Assert(object.selection != null);
	15927	+ if (object.selection.Size() > 0)
	15928	+ {
	15929	+ int hitSomething = object.selection.get(0).hitSomething;
	15930	+
	15931	+ info.DX = 0;
	15932	+ info.DY = 0;
	15933	+ info.W = 1;
	15934	+ if (hitSomething == Object3D.hitCenter)
	15935	+ {
	15936	+ info.DX = X;
	15937	+ if (X != 0)
	15938	+ info.DX -= info.bounds.width/2;
	15939	+
	15940	+ info.DY = Y;
	15941	+ if (Y != 0)
	15942	+ info.DY -= info.bounds.height/2;
	15943	+ }
	15944	+
	15945	+ object.drawEditHandles(info, 0);
	15946	+
	15947	+ if (drag && (X != 0 \|\| Y != 0))
	15948	+ {
	15949	+ switch (hitSomething)
	15950	+ {
	15951	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15952	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15953	+ break;
	15954	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15955	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15956	+ break;
	15957	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15958	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15959	+ break;
	15960	+ }
	15961	+
	15962	+ }
	15963	+ }
13821	15964	}
13822	15965	}
	15966	+
13823	15967	if (isRenderer)
13824	15968	{
13825	15969	//gr.setColor(Color.black);
13826	15970	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
13827	15971	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
13828	15972	}
	15973	+
13829	15974	if (hasMarquee)
13830	15975	{
13831	15976	gr.setXORMode(Color.white);
..	..	@@ -13848,6 +15993,7 @@
13848	15993	//if (g != gr) g.drawImage(img, 0, 0, width, height, null);
13849	15994	}
13850	15995
	15996	+ // To avoid clear.
13851	15997	public void update(Graphics g)
13852	15998	{
13853	15999	paint(g);
..	..	@@ -13937,6 +16083,7 @@
13937	16083	public boolean mouseDown(Event evt, int x, int y)
13938	16084	{
13939	16085	System.out.println("mouseDown: " + evt);
	16086	+ System.exit(0);
13940	16087	/*
13941	16088	locked = true;
13942	16089	drag = false;
..	..	@@ -13980,7 +16127,7 @@
13980	16127	{
13981	16128	keyPressed(0, modifiers);
13982	16129	}
13983		- clickStart(x, y, modifiers);
	16130	+ // clickStart(x, y, modifiers);
13984	16131	return true;
13985	16132	}
13986	16133
..	..	@@ -14098,7 +16245,7 @@
14098	16245	{
14099	16246	keyReleased(0, 0);
14100	16247	}
14101		- drag(x, y, modifiers);
	16248	+ drag(x, y, 0, modifiers);
14102	16249	return true;
14103	16250	}
14104	16251
..	..	@@ -14230,7 +16377,7 @@
14230	16377	Object3D object;
14231	16378	static Object3D trackedobject;
14232	16379	Camera renderCamera; // Light or Eye (or Occlusion)
14233		- /static/ Camera manipCamera; // Light or Eye
	16380	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
14234	16381	/static/ Camera eyeCamera;
14235	16382	/static/ Camera lightCamera;
14236	16383	int cameracount;
..	..	@@ -14510,20 +16657,21 @@
14510	16657	/**/
14511	16658	//checker.GetMaterial().opacity = 1.1f;
14512	16659	////checker.GetMaterial().ambient = 0.99f;
14513		- Object3D.materialstack[Object3D.materialdepth] = checker.material;
14514		- Object3D.selectedstack[Object3D.materialdepth] = false;
14515		- cStatic.objectstack[Object3D.materialdepth++] = checker;
	16660	+ materialstack[materialdepth] = checker.material;
	16661	+ selectedstack[materialdepth] = false;
	16662	+ cStatic.objectstack[materialdepth++] = checker;
14516	16663	//System.out.println("material " + material);
14517	16664	//Applet3D.tracein(this, selected);
14518		- vector2buffer = checker.projectedVertices;
	16665	+ //vector2buffer = checker.projectedVertices;
14519	16666
14520		- checker.GetMaterial().Draw(this, false); // true);
	16667	+ //checker.GetMaterial().Draw(this, false); // true);
	16668	+ DrawMaterial(checker.GetMaterial(), false, checker.projectedVertices); // true);
14521	16669
14522		- Object3D.materialdepth -= 1;
14523		- if (Object3D.materialdepth > 0)
	16670	+ materialdepth -= 1;
	16671	+ if (materialdepth > 0)
14524	16672	{
14525		- vector2buffer = cStatic.objectstack[Object3D.materialdepth - 1].projectedVertices;
14526		- Object3D.materialstack[Object3D.materialdepth - 1].Draw(this, Object3D.selectedstack[Object3D.materialdepth - 1]);
	16673	+ //vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16674	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1], cStatic.objectstack[materialdepth - 1].projectedVertices);
14527	16675	}
14528	16676	//checker.GetMaterial().opacity = 1f;
14529	16677	////checker.GetMaterial().ambient = 1f;
..	..	@@ -14609,6 +16757,14 @@
14609	16757	}
14610	16758	}
14611	16759
	16760	+ private Object3D GetFolder()
	16761	+ {
	16762	+ Object3D folder = object.GetWindow().copy;
	16763	+ if (object.GetWindow().copy.selection.Size() > 0)
	16764	+ folder = object.GetWindow().copy.selection.elementAt(0);
	16765	+ return folder;
	16766	+ }
	16767	+
14612	16768	class SelectBuffer implements GLEventListener
14613	16769	{
14614	16770
..	..	@@ -14667,6 +16823,7 @@
14667	16823	{
14668	16824	if (!selection)
14669	16825	{
	16826	+ new Exception().printStackTrace();
14670	16827	System.exit(0);
14671	16828	return;
14672	16829	}
..	..	@@ -14687,17 +16844,39 @@
14687	16844
14688	16845	//gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
14689	16846
	16847	+ if (PAINTMODE)
	16848	+ {
	16849	+ if (object.GetWindow().copy.selection.Size() > 0)
	16850	+ {
	16851	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16852	+
	16853	+ // Make what you paint not selectable.
	16854	+ paintobj.ResetSelectable();
	16855	+ }
	16856	+ }
	16857	+
14690	16858	//int tmp = selection_view;
14691	16859	//selection_view = -1;
14692		- int temp = drawMode;
14693		- drawMode = SELECTION;
	16860	+ int temp = DrawMode();
	16861	+ Globals.drawMode = SELECTION; // WARNING
14694	16862	indexcount = 0;
14695	16863	parent.display(drawable);
14696	16864	//selection_view = tmp;
14697	16865	//if (temp == SELECTION)
14698	16866	// temp = DEFAULT; // patch for selection debug
14699		- drawMode = temp;
	16867	+ Globals.drawMode = temp; // WARNING
14700	16868
	16869	+ if (PAINTMODE)
	16870	+ {
	16871	+ if (object.GetWindow().copy.selection.Size() > 0)
	16872	+ {
	16873	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
	16874	+
	16875	+ // Revert.
	16876	+ paintobj.RestoreSelectable();
	16877	+ }
	16878	+ }
	16879	+
14701	16880	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
14702	16881
14703	16882	// trying different ways of getting the depth info over
..	..	@@ -14745,6 +16924,8 @@
14745	16924	// System.err.println("view = " + view[4] + " " + view[5] + " " + view[6] + " " + view[7]);
14746	16925	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
14747	16926	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
	16927	+
	16928	+ CreateSelectedPoint();
14748	16929
14749	16930	// Will fit the mesh !!!
14750	16931	selectedpoint.toParent[0][0] = 0.0001;
..	..	@@ -14794,34 +16975,36 @@
14794	16975	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]));
14795	16976	}
14796	16977
14797		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16978	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
14798	16979	}
14799	16980	}
14800	16981
14801	16982	if (!movingcamera && !PAINTMODE)
14802		- object.editWindow.ScreenFitPoint(); // fev 2014
	16983	+ object.GetWindow().ScreenFitPoint(); // fev 2014
14803	16984
14804		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16985	+ if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
14805	16986	{
14806		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16987	+ //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
14807	16988
14808		- Object3D group = new Object3D("inst" + paintcount++);
	16989	+ if (object.GetWindow().copy.selection.Size() > 0)
	16990	+ {
	16991	+ Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
14809	16992
14810		- group.CreateMaterial(); // use a void leaf to select instances
14811		-
14812		- group.add(paintobj); // link
14813		-
14814		- object.editWindow.SnapObject(group);
14815		-
14816		- Object3D folder = object.editWindow.copy;
14817		-
14818		- if (object.editWindow.copy.selection.Size() > 0)
14819		- folder = object.editWindow.copy.selection.elementAt(0);
14820		-
14821		- folder.add(group);
14822		-
14823		- object.editWindow.ResetModel();
14824		- object.editWindow.refreshContents();
	16993	+ Object3D inst = new Object3D("inst" + paintcount++);
	16994	+
	16995	+ inst.CreateMaterial(); // use a void leaf to select instances
	16996	+
	16997	+ inst.add(paintobj); // link
	16998	+
	16999	+ object.GetWindow().SnapObject(inst);
	17000	+
	17001	+ Object3D folder = paintFolder; // GetFolder();
	17002	+
	17003	+ folder.add(inst);
	17004	+
	17005	+ object.GetWindow().ResetModel();
	17006	+ object.GetWindow().refreshContents();
	17007	+ }
14825	17008	}
14826	17009	else
14827	17010	paintcount = 0;
..	..	@@ -14860,6 +17043,11 @@
14860	17043	//System.out.println("objects[color] = " + objects[color]);
14861	17044	//objects[color].Select();
14862	17045	indexcount = 0;
	17046	+ ObjEditor window = object.GetWindow();
	17047	+ if (window != null && deselect)
	17048	+ {
	17049	+ window.Select(null, deselect, true);
	17050	+ }
14863	17051	object.Select(color, deselect);
14864	17052	}
14865	17053
..	..	@@ -14959,7 +17147,7 @@
14959	17147	gl.glDisable(gl.GL_CULL_FACE);
14960	17148	}
14961	17149
14962		- if (!RENDERSHADOW)
	17150	+ if (!Globals.RENDERSHADOW)
14963	17151	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
14964	17152
14965	17153	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -14969,14 +17157,14 @@
14969	17157	//gl.glColorMask(false, false, false, false);
14970	17158
14971	17159	//render_scene_from_light_view(gl, drawable, 0, 0);
14972		- if (RENDERSHADOW && lighttouched && !movingcamera) // && !parent.IsFreezed())
	17160	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
14973	17161	{
14974	17162	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
14975	17163
14976		- int temp = drawMode;
14977		- drawMode = SHADOW;
	17164	+ int temp = DrawMode();
	17165	+ Globals.drawMode = SHADOW; // WARNING
14978	17166	parent.display(drawable);
14979		- drawMode = temp;
	17167	+ Globals.drawMode = temp; // WARNING
14980	17168	}
14981	17169
14982	17170	gl.glCullFace(gl.GL_BACK);
..	..	@@ -15029,7 +17217,6 @@
15029	17217
15030	17218	class AntialiasBuffer implements GLEventListener
15031	17219	{
15032		-
15033	17220	CameraPane parent = null;
15034	17221
15035	17222	AntialiasBuffer(CameraPane p)
..	..	@@ -15374,12 +17561,6 @@
15374	17561	GLUT glut = new GLUT();
15375	17562
15376	17563
15377		- static final public int DEFAULT = 0;
15378		- static final public int SELECTION = 1;
15379		- static final public int SHADOW = 2;
15380		- static final public int OCCLUSION = 3;
15381		- static
15382		- public int drawMode = DEFAULT;
15383	17564	public boolean spherical = false;
15384	17565	static boolean DEBUG_OCCLUSION = false;
15385	17566	static boolean DEBUG_SELECTION = false;
..	..	@@ -15392,23 +17573,15 @@
15392	17573	int AAbuffersize = 0;
15393	17574
15394	17575	//double[] selectedpoint = new double[3];
15395		- static Superellipsoid selectedpoint = new Superellipsoid();
	17576	+ static Superellipsoid selectedpoint;
15396	17577	static Sphere previousselectedpoint = null;
15397		- static Sphere debugpointG = new Sphere();
15398		- static Sphere debugpointP = new Sphere();
15399		- static Sphere debugpointC = new Sphere();
15400		- static Sphere debugpointR = new Sphere();
	17578	+ static Sphere debugpointG;
	17579	+ static Sphere debugpointP;
	17580	+ static Sphere debugpointC;
	17581	+ static Sphere debugpointR;
15401	17582
15402	17583	static Sphere debugpoints[] = new Sphere[8];
15403	17584
15404		- static
15405		- {
15406		- for (int i=0; i<8; i++)
15407		- {
15408		- debugpoints[i] = new Sphere();
15409		- }
15410		- }
15411		-
15412	17585	static void InitPoints(float radius)
15413	17586	{
15414	17587	for (int i=0; i<8; i++)
..	..	@@ -15428,7 +17601,7 @@
15428	17601	}
15429	17602	}
15430	17603
15431		- static void DrawPoints(CameraPane cpane)
	17604	+ static void DrawPoints(iCameraPane cpane)
15432	17605	{
15433	17606	for (int i=0; i<8; i++) // first and last are red
15434	17607	{
..	..	@@ -15460,10 +17633,11 @@
15460	17633	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
15461	17634	// Depth buffer format
15462	17635	//private int depth_format;
15463		- static public void NextIndex(Object3D o, GL gl)
	17636	+
	17637	+ public void NextIndex()
15464	17638	{
15465	17639	indexcount+=16;
15466		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17640	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
15467	17641	//objects[indexcount] = o;
15468	17642	//System.out.println("indexcount = " + indexcount);
15469	17643	}