~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -31,8 +31,12 @@
31	31
32	32	import gleem.linalg.Mat4f;
33	33
34		-class CameraPane extends GLCanvas implements Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
	34	+class CameraPane extends GLCanvas implements iCameraPane, Runnable, GLEventListener, ActionListener, MouseWheelListener, MouseMotionListener, MouseListener, KeyListener
35	35	{
	36	+ static cMaterial[] materialstack = new cMaterial[65536];
	37	+ static boolean[] selectedstack = new boolean[65536];
	38	+ static int materialdepth = 0;
	39	+
36	40	static boolean DEBUG = false;
37	41	static boolean FRUSTUM = false; // still bogus true; // frustum culling
38	42
..	..	@@ -42,25 +46,7 @@
42	46
43	47	static int STEP = 1;
44	48
45		- static boolean ONESTEP = false; // do LIVE once
46		-
47		- /**
48		- * @return the LIVE
49		- */
50		- public static boolean isLIVE()
51		- {
52		- return LIVE \|\| ONESTEP;
53		- }
54		-
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;
	49	+ /static/ private boolean CULLFACE = false; // true;
64	50	/static/ boolean NEAREST = false; // true;
65	51	/static/ boolean WIREFRAME = false; // true;
66	52
..	..	@@ -97,10 +83,8 @@
97	83
98	84	static boolean textureon = true;
99	85	static boolean LOCALTRANSFORM = false;
100		-private static boolean LIVE = false;
101	86	static boolean FULLSCREEN = false;
102	87	static boolean SUPPORT = true;
103		-static boolean CROWD = false;
104	88	static boolean INERTIA = true;
105	89	static boolean FAST = false;
106	90	static boolean SLOWPOSE = false;
..	..	@@ -173,17 +157,47 @@
173	157	theRenderer = this;
174	158	}
175	159
	160	+ CameraPane(Object3D o, Camera cam, boolean withcontext)
	161	+ {
	162	+ super(defaultcaps, null, withcontext?glcontext:null, null);
	163	+
	164	+ //System.out.println("AMERICA AREA = " + (9458886 + 9210755 + 8480395 + 2736391 + 1943018 + 1289475 + 1141569 + 1069350 + 911559 + 721229 + 395886 + 377972 + 246700 + 211156 + 173985 + 141133 + 118279 + 112079 + 108523));
	165	+ glcontext = getContext();
	166	+
	167	+ cameras = new Camera[2];
	168	+ targetLookAts = new cVector[2];
	169	+
	170	+ SetCamera(cam);
	171	+
	172	+ SetLight(new Camera(new cVector(10, 10, -20)));
	173	+
	174	+ object = o;
	175	+
	176	+ setBackground(Color.white);
	177	+
	178	+ addKeyListener(this);
	179	+ addMouseListener(this);
	180	+ addMouseMotionListener(this);
	181	+ addMouseWheelListener(this);
	182	+ //System.out.println("addGLEventListener: " + this);
	183	+ addGLEventListener(this);
	184	+
	185	+// pingthread.start(); // may 2013
	186	+ }
	187	+
176	188	static boolean AntialiasingEnabled()
177	189	{
178	190	return CURRENTANTIALIAS > 0;
179	191	}
180	192
181		- void ClearDepth()
	193	+ /// INTERFACE
	194	+
	195	+ public void ClearDepth()
182	196	{
183	197	GetGL().glClear(GetGL().GL_DEPTH_BUFFER_BIT);
184	198	}
185	199
186		- void DepthTest(boolean depthtest)
	200	+ public void DepthTest(boolean depthtest)
187	201	{
188	202	if (depthtest)
189	203	GetGL().glDepthFunc(GL.GL_LEQUAL);
..	..	@@ -191,7 +205,7 @@
191	205	GetGL().glDepthFunc(GL.GL_ALWAYS);
192	206	}
193	207
194		- void DepthWrite(boolean depthwrite)
	208	+ public void DepthWrite(boolean depthwrite)
195	209	{
196	210	if (depthwrite)
197	211	GetGL().glDepthMask(true);
..	..	@@ -199,12 +213,776 @@
199	213	GetGL().glDepthMask(false);
200	214	}
201	215
202		- void BackFaceCull(boolean bfc)
	216	+ public void BackFaceCull(boolean bfc)
203	217	{
204	218	if (bfc)
205	219	GetGL().glEnable(GetGL().GL_CULL_FACE);
206	220	else
207	221	GetGL().glDisable(GetGL().GL_CULL_FACE);
	222	+ }
	223	+
	224	+ public boolean BackFaceCullMode()
	225	+ {
	226	+ return this.CULLFACE;
	227	+ }
	228	+
	229	+ public boolean IsAmbientOcclusionOn()
	230	+ {
	231	+ return this.ambientOcclusion;
	232	+ }
	233	+
	234	+ public boolean IsFrozen()
	235	+ {
	236	+ boolean selectmode = this.DrawMode() == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	237	+
	238	+ return !selectmode && cameracount == 0; // != 0;
	239	+ }
	240	+
	241	+ // Currently in Globals
	242	+ public int DrawMode()
	243	+ {
	244	+ return Globals.DrawMode();
	245	+ }
	246	+
	247	+ public Camera EyeCamera()
	248	+ {
	249	+ return eyeCamera;
	250	+ }
	251	+
	252	+ public Camera LightCamera()
	253	+ {
	254	+ return lightCamera;
	255	+ }
	256	+
	257	+ public Camera RenderCamera()
	258	+ {
	259	+ return renderCamera;
	260	+ }
	261	+
	262	+ public void PushMaterial(Object3D obj, boolean selected)
	263	+ {
	264	+ CameraPane display = this;
	265	+ javax.media.opengl.GL gl = display.GetGL();
	266	+ cMaterial material = obj.material;
	267	+
	268	+ if (material != null)
	269	+ {
	270	+ materialstack[materialdepth] = material;
	271	+ selectedstack[materialdepth] = selected;
	272	+ cStatic.objectstack[materialdepth++] = obj;
	273	+ //System.out.println("material " + material);
	274	+ //Applet3D.tracein(this, selected);
	275	+ display.vector2buffer = obj.projectedVertices;
	276	+ if (obj instanceof Camera)
	277	+ {
	278	+ display.options1[0] = material.shift;
	279	+ //System.out.println("shift " + material.shift);
	280	+ display.options1[1] = material.lightarea;
	281	+ display.options1[2] = material.shadowbias;
	282	+ display.options1[3] = material.aniso;
	283	+ display.options1[4] = material.anisoV;
	284	+ display.options2[0] = material.opacity;
	285	+ display.options2[1] = material.diffuse;
	286	+ display.options2[2] = material.factor;
	287	+
	288	+ cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	289	+ display.options4[0] = material.cameralight/0.2f;
	290	+ display.options4[1] = material.subsurface;
	291	+ display.options4[2] = material.sheen;
	292	+
	293	+ // if (display.CURRENTANTIALIAS > 0)
	294	+ // display.options3[3] /= 4;
	295	+
	296	+ /*
	297	+ System.out.println("Focus = " + display.options1[0]);
	298	+ System.out.println("Aperture = " + display.options1[1]);
	299	+ System.out.println("ShadowBlur = " + display.options1[2]);
	300	+ System.out.println("Antialiasing = " + display.options1[3]);
	301	+ System.out.println("Fog = " + display.options2[0]);
	302	+ System.out.println("Intensity = " + display.options2[1]);
	303	+ System.out.println("Elevation = " + display.options2[2]);
	304	+ /**/
	305	+ } else
	306	+ {
	307	+ DrawMaterial(material, selected);
	308	+ }
	309	+ } else
	310	+ {
	311	+ if (selected && CameraPane.flash)
	312	+ {
	313	+ display.modelParams4[1] = 100;
	314	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	315	+ }
	316	+ }
	317	+ }
	318	+
	319	+ public void PushMaterial2(Object3D obj, boolean selected)
	320	+ {
	321	+ CameraPane display = this;
	322	+ cMaterial material = obj.material;
	323	+
	324	+ if (material != null)
	325	+ {
	326	+ materialstack[materialdepth] = material;
	327	+ selectedstack[materialdepth] = selected;
	328	+ cStatic.objectstack[materialdepth++] = obj;
	329	+ //System.out.println("material " + material);
	330	+ //Applet3D.tracein("selected ", selected);
	331	+ display.vector2buffer = obj.projectedVertices;
	332	+ display.DrawMaterial(material, selected);
	333	+ }
	334	+ }
	335	+
	336	+ public void PopMaterial(Object3D obj, boolean selected)
	337	+ {
	338	+ CameraPane display = this;
	339	+ javax.media.opengl.GL gl = display.GetGL();
	340	+ cMaterial material = obj.material;
	341	+
	342	+ //if (parent != null && parent.GetMaterial() != null)
	343	+ // parent.GetMaterial().Draw(display, parent.IsSelected(this));
	344	+ if (material != null)
	345	+ {
	346	+ materialdepth -= 1;
	347	+ if (materialdepth > 0)
	348	+ {
	349	+ display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	350	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	351	+ }
	352	+ //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
	353	+ } else if (selected && CameraPane.flash && obj.GetMaterial() != null)
	354	+ {
	355	+ display.modelParams4[1] = obj.GetMaterial().cameralight;
	356	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	357	+ }
	358	+ }
	359	+
	360	+ public void PopMaterial2(Object3D obj)
	361	+ {
	362	+ CameraPane display = this;
	363	+ cMaterial material = obj.material;
	364	+
	365	+ if (material != null)
	366	+ {
	367	+ materialdepth -= 1;
	368	+ if (materialdepth > 0)
	369	+ {
	370	+ display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	371	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	372	+ }
	373	+ //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
	374	+ //else
	375	+ //material.Draw(display, false);
	376	+ }
	377	+ }
	378	+
	379	+ public void DrawFace(Object3D obj, Vertex pv, Vertex qv, Vertex rv, Face face)
	380	+ {
	381	+ CameraPane display = this;
	382	+
	383	+ if (pv.y == -10000 \|\|
	384	+ qv.y == -10000 \|\|
	385	+ rv.y == -10000)
	386	+ return;
	387	+
	388	+// float b = f.nbiterations & 1;
	389	+// float g = (f.nbiterations>>1) & 1;
	390	+// float r = (f.nbiterations>>2) & 1;
	391	+//
	392	+// //if (f.weight == 10000)
	393	+// //{
	394	+// // r = 1; g = b = 0;
	395	+// //}
	396	+// //else
	397	+// //{
	398	+// // assert(f.weight < 10000);
	399	+// r = g = b = (float)bRep.FaceWeight(f)*100;
	400	+// if (r<0)
	401	+// assert(r>=0);
	402	+// //}
	403	+
	404	+ javax.media.opengl.GL gl = display.GetGL();
	405	+
	406	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| CameraPane.DEBUG_SELECTION;
	407	+
	408	+ //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
	409	+ if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
	410	+ {
	411	+ //gl.glBegin(gl.GL_TRIANGLES);
	412	+ boolean hasnorm = pv.norm != null; // && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0);
	413	+ if (!hasnorm)
	414	+ {
	415	+ // System.out.println("FUCK!!");
	416	+ LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
	417	+ LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
	418	+ LA.vecCross(obj.v0, obj.v1, obj.v2);
	419	+ LA.vecNormalize(obj.v2);
	420	+ gl.glNormal3f((float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
	421	+ }
	422	+
	423	+ // P
	424	+ float x = (float)pv.x;
	425	+ float y = (float)pv.y;
	426	+ float z = (float)pv.z;
	427	+
	428	+ if (hasnorm)
	429	+ {
	430	+// if (!pv.norm.normalized())
	431	+// assert(pv.norm.normalized());
	432	+
	433	+ //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
	434	+ float nx = (float)pv.norm.x;
	435	+ float ny = (float)pv.norm.y;
	436	+ float nz = (float)pv.norm.z;
	437	+
	438	+ x += nx * obj.NORMALPUSH;
	439	+ y += ny * obj.NORMALPUSH;
	440	+ z += nz * obj.NORMALPUSH;
	441	+
	442	+ gl.glNormal3f(nx, ny, nz);
	443	+ }
	444	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	445	+ SetColor(obj, pv);
	446	+ //gl.glColor4f(r, g, b, 1);
	447	+ //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
	448	+ if (obj.flipV)
	449	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	450	+ else
	451	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	452	+ //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
	453	+
	454	+ gl.glVertex3f(x, y, z);
	455	+
	456	+ // Q
	457	+ x = (float)qv.x;
	458	+ y = (float)qv.y;
	459	+ z = (float)qv.z;
	460	+
	461	+// Print(pv);
	462	+ if (hasnorm)
	463	+ {
	464	+// assert(qv.norm.normalized());
	465	+ //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
	466	+ float nx = (float)qv.norm.x;
	467	+ float ny = (float)qv.norm.y;
	468	+ float nz = (float)qv.norm.z;
	469	+
	470	+ x += nx * obj.NORMALPUSH;
	471	+ y += ny * obj.NORMALPUSH;
	472	+ z += nz * obj.NORMALPUSH;
	473	+
	474	+ gl.glNormal3f(nx, ny, nz);
	475	+ }
	476	+ //System.out.println("vertexq = " + qv.s + ", " + qv.t);
	477	+ // boolean locked = false;
	478	+ // float eps = 0.1f;
	479	+ // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	480	+
	481	+ // int dot = 0; //*/ (int)f.dot;
	482	+
	483	+ // if ((dot&1) == 0)
	484	+ // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	485	+
	486	+ // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	487	+ if (obj.flipV)
	488	+ gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
	489	+ else
	490	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	491	+ // else
	492	+ // {
	493	+ // locked = true;
	494	+ // gl.glTexCoord2f((float) pv.s, (float) pv.t);
	495	+ // }
	496	+ gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
	497	+ SetColor(obj, qv);
	498	+
	499	+ gl.glVertex3f(x, y, z);
	500	+ //gl.glColor4f(r, g, b, 1);
	501	+ //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
	502	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	503	+// Print(qv);
	504	+
	505	+ // R
	506	+ x = (float)rv.x;
	507	+ y = (float)rv.y;
	508	+ z = (float)rv.z;
	509	+
	510	+ if (hasnorm)
	511	+ {
	512	+// assert(rv.norm.normalized());
	513	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	514	+ float nx = (float)rv.norm.x;
	515	+ float ny = (float)rv.norm.y;
	516	+ float nz = (float)rv.norm.z;
	517	+
	518	+ x += nx * obj.NORMALPUSH;
	519	+ y += ny * obj.NORMALPUSH;
	520	+ z += nz * obj.NORMALPUSH;
	521	+
	522	+ gl.glNormal3f(nx, ny, nz);
	523	+ }
	524	+
	525	+ // if ((dot&4) == 0)
	526	+ // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	527	+
	528	+ // if (wrap \|\| !locked && (dot&8) != 0)
	529	+ if (obj.flipV)
	530	+ gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
	531	+ else
	532	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	533	+ // else
	534	+ // gl.glTexCoord2f((float) pv.s, (float) pv.t);
	535	+
	536	+ // f.dot = dot;
	537	+
	538	+ gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
	539	+ SetColor(obj, rv);
	540	+ //gl.glColor4f(r, g, b, 1);
	541	+ //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
	542	+ //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
	543	+ gl.glVertex3f(x, y, z);
	544	+// Print(rv);
	545	+ //gl.glEnd();
	546	+ }
	547	+ else
	548	+ {
	549	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	550	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	551	+ gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
	552	+
	553	+ }
	554	+
	555	+ if (false) // (attributes & WIREFRAME) != 0)
	556	+ {
	557	+ gl.glDisable(gl.GL_LIGHTING);
	558	+
	559	+ gl.glBegin(gl.GL_LINE_LOOP);
	560	+ gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
	561	+ gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
	562	+ gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
	563	+ gl.glEnd();
	564	+
	565	+ gl.glEnable(gl.GL_LIGHTING);
	566	+ }
	567	+ }
	568	+
	569	+ /// INTERFACE
	570	+
	571	+ void SetColor(Object3D obj, Vertex p0)
	572	+ {
	573	+ CameraPane display = this;
	574	+ BoundaryRep bRep = obj.bRep;
	575	+
	576	+ if (RENDERPROGRAM == 0)
	577	+ {
	578	+ float r = 0;
	579	+ if (bRep != null)
	580	+ {
	581	+ if (bRep.stripified)
	582	+ {
	583	+ r = 1;
	584	+ }
	585	+ }
	586	+ float g = 0;
	587	+ if (bRep != null)
	588	+ {
	589	+ if (bRep.trimmed)
	590	+ {
	591	+ g = 1;
	592	+ }
	593	+ }
	594	+ float b = 0;
	595	+ if (obj.support != null && obj.link2master)
	596	+ {
	597	+ b = 1;
	598	+ }
	599	+ display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
	600	+ return;
	601	+ }
	602	+
	603	+ if (display.DrawMode() != CameraPane.SHADOW)
	604	+ return;
	605	+
	606	+ javax.media.opengl.GL gl = display.GetGL();
	607	+// if (true) return;
	608	+// float ao = p.AO;
	609	+//
	610	+// // if (ao == 0 && !bRep.AOdone) // transient problem!
	611	+// // ao = 1;
	612	+//
	613	+// gl.glColor4f(ao, ao, ao, 1);
	614	+
	615	+// CameraPane.selectedpoint.
	616	+// getAverage(cStatic.point1, true);
	617	+ if (CameraPane.pointflow == null) // !random) // live)
	618	+ {
	619	+ return;
	620	+ }
	621	+
	622	+ cStatic.point1.set(0,0,0);
	623	+ LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
	624	+
	625	+ cStatic.point1.sub(p0);
	626	+
	627	+
	628	+// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
	629	+// {
	630	+// return;
	631	+// }
	632	+
	633	+ //if (true)
	634	+ if (cStatic.point1.dot(cStatic.point1) > 0.000001)
	635	+ {
	636	+ return;
	637	+ }
	638	+
	639	+ float[] colorV = new float[3];
	640	+
	641	+ if (false) // marked)
	642	+ {
	643	+ // debug rigging weights
	644	+ for (int object = 0; object < p0.vertexlinks.length; object++)
	645	+ {
	646	+ float weight = p0.weights[object] / p0.totalweight;
	647	+
	648	+ // if (weight < 0.1)
	649	+ // {
	650	+ // assert(weight == 0);
	651	+ // continue;
	652	+ // }
	653	+
	654	+ if (p0.vertexlinks[object] == -1)
	655	+ continue;
	656	+
	657	+ Vertex q = obj.support.bRep.GetVertex(p0.vertexlinks[object]);
	658	+
	659	+ int color = //1 << object; //
	660	+ //p.vertexlinks.length;
	661	+ obj.support.bRep.supports[p0.closestsupport].links[object];
	662	+ colorV[2] += (color & 1) * weight;
	663	+ colorV[1] += ((color & 2) >> 1) * weight;
	664	+ colorV[0] += ((color & 4) >> 2) * weight;
	665	+ }
	666	+ }
	667	+ else
	668	+ {
	669	+ if (obj.drawingstarted)
	670	+ {
	671	+ // find next point
	672	+ if (bRep.GetVertex(0).faceindices == null)
	673	+ {
	674	+ bRep.InitFaceIndices();
	675	+ }
	676	+
	677	+ double ymin = p0.y;
	678	+
	679	+ Vertex newp = p0;
	680	+
	681	+ for (int fii = 0; fii < p0.faceindices.length; fii++)
	682	+ {
	683	+ int fi = p0.faceindices[fii];
	684	+
	685	+ if (fi == -1)
	686	+ break;
	687	+
	688	+ Face f = bRep.GetFace(fi);
	689	+
	690	+ Vertex p = bRep.GetVertex(f.p);
	691	+ Vertex q = bRep.GetVertex(f.q);
	692	+ Vertex r = bRep.GetVertex(f.r);
	693	+
	694	+ int swap = (int)(Math.random()*3);
	695	+
	696	+// for (int s=swap; --s>=0;)
	697	+// {
	698	+// Vertex t = p;
	699	+// p = q;
	700	+// q = r;
	701	+// r = t;
	702	+// }
	703	+ if (ymin > p.y)
	704	+ {
	705	+ ymin = p.y;
	706	+ newp = p;
	707	+// break;
	708	+ }
	709	+ if (ymin > q.y)
	710	+ {
	711	+ ymin = q.y;
	712	+ newp = q;
	713	+// break;
	714	+ }
	715	+ if (ymin > r.y)
	716	+ {
	717	+ ymin = r.y;
	718	+ newp = r;
	719	+// break;
	720	+ }
	721	+ }
	722	+
	723	+ CameraPane.selectedpoint.toParent[3][0] = newp.x;
	724	+ CameraPane.selectedpoint.toParent[3][1] = newp.y;
	725	+ CameraPane.selectedpoint.toParent[3][2] = newp.z;
	726	+
	727	+ obj.drawingstarted = false;
	728	+
	729	+ // return;
	730	+ }
	731	+
	732	+ if (false) // CameraPane.DRAW
	733	+ {
	734	+ p0.AO = colorV[0] = 2;
	735	+ colorV[1] = 2;
	736	+ colorV[2] = 2;
	737	+ }
	738	+
	739	+ CameraPane.pointflow.add(p0);
	740	+ CameraPane.pointflow.Touch();
	741	+ }
	742	+
	743	+// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
	744	+// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
	745	+// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
	746	+ }
	747	+
	748	+ void DrawMaterial(cMaterial material, boolean selected)
	749	+ {
	750	+ CameraPane display = this;
	751	+ //new Exception().printStackTrace();
	752	+
	753	+ if (display.IsFrozen() && !selected \|\| display.IsAmbientOcclusionOn()) // \|\| display.drawMode == display.SHADOW)
	754	+ {
	755	+ return;
	756	+ }
	757	+
	758	+ javax.media.opengl.GL gl = display.GetGL();
	759	+
	760	+ //Color col = Color.getHSBColor(color,modulation,1);
	761	+ //col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
	762	+ if (!material.multiply)
	763	+ {
	764	+ display.color = color;
	765	+ display.saturation = material.modulation;
	766	+ }
	767	+ else
	768	+ {
	769	+ display.color = color2;
	770	+ display.saturation = material.modulation2;
	771	+ }
	772	+
	773	+ cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
	774	+
	775	+ float[] colorV = GrafreeD.colorV;
	776	+
	777	+ /**/
	778	+ if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
	779	+ {
	780	+ colorV[0] = display.modelParams0[0] * material.diffuse;
	781	+ colorV[1] = display.modelParams0[1] * material.diffuse;
	782	+ colorV[2] = display.modelParams0[2] * material.diffuse;
	783	+ colorV[3] = material.opacity;
	784	+
	785	+ gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
	786	+ //System.out.println("Opacity = " + opacity);
	787	+
	788	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
	789	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	790	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
	791	+
	792	+ float amb = material.ambient;
	793	+ if (amb < material.cameralight)
	794	+ {
	795	+ amb = material.cameralight;
	796	+ }
	797	+ colorV[0] = display.modelParams0[0] * material.diffuse * amb;
	798	+ colorV[1] = display.modelParams0[1] * material.diffuse * amb;
	799	+ colorV[2] = display.modelParams0[2] * material.diffuse * amb;
	800	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_AMBIENT, colorV, 0);
	801	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	802	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT, colorV, 0);
	803	+
	804	+ /**/
	805	+ colorV[0] = ((1 - material.metalness) + display.modelParams0[0] * material.metalness) * material.specular;
	806	+ colorV[1] = ((1 - material.metalness) + display.modelParams0[1] * material.metalness) * material.specular;
	807	+ colorV[2] = ((1 - material.metalness) + display.modelParams0[2] * material.metalness) * material.specular;
	808	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_SPECULAR, colorV, 0);
	809	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	810	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_SPECULAR, colorV, 0);
	811	+ colorV[0] = 10 / material.shininess; // 1/0.005f;
	812	+ //System.out.println("shininess = " + colorV[0]);
	813	+ if (colorV[0] > 128)
	814	+ {
	815	+ colorV[0] = 128;
	816	+ }
	817	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_SHININESS, colorV, 0);
	818	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_SHININESS, colorV, 0);
	819	+ /**/
	820	+ }
	821	+ /**/
	822	+
	823	+ //selected = false;
	824	+ selected = selected && display.flash;
	825	+
	826	+ //display.modelParams0[0] = 0; // pigment.r;
	827	+ //display.modelParams0[1] = 0; // pigment.g;
	828	+ //display.modelParams0[2] = 0; // pigment.b;
	829	+ if (!material.multiply)
	830	+ {
	831	+ display.modelParams0[3] = material.metalness;
	832	+ display.modelParams1[0] = material.diffuse;
	833	+ display.modelParams1[1] = material.specular;
	834	+ display.modelParams1[2] = 1 / material.shininess;
	835	+ display.modelParams1[3] = material.shift;
	836	+ display.modelParams2[0] = material.ambient;
	837	+ display.modelParams2[1] = material.lightarea;
	838	+ //System.out.println("light area = " + lightarea);
	839	+ display.modelParams2[2] = 1 / material.factor; // diffuseness
	840	+ display.modelParams2[3] = material.velvet;
	841	+ display.modelParams3[0] = material.sheen;
	842	+ display.modelParams3[1] = material.subsurface;
	843	+ display.modelParams3[2] = material.bump; // backlit
	844	+ display.modelParams3[3] = material.aniso;
	845	+ display.modelParams4[0] = material.anisoV;
	846	+ display.modelParams4[1] = selected ? 100 : material.cameralight;
	847	+ //System.out.println("selected = " + selected);
	848	+ display.modelParams4[2] = material.diffuseness;
	849	+ display.modelParams4[3] = material.shadow;
	850	+ display.modelParams5[0] = material.texture;
	851	+ display.modelParams5[1] = material.opacity;
	852	+ display.modelParams5[2] = material.fakedepth;
	853	+ display.modelParams5[3] = CameraPane.SHADOWCULLFACE ? 0f : (material.shadowbias - 0.005f) / 10;
	854	+ }
	855	+ else
	856	+ {
	857	+ display.modelParams0[3] = material.metalness2;
	858	+ display.modelParams1[0] = material.diffuse2;
	859	+ display.modelParams1[1] = material.specular2;
	860	+ display.modelParams1[2] = material.shininess2;
	861	+ display.modelParams1[3] = material.shift2;
	862	+ display.modelParams2[0] = material.ambient2;
	863	+ display.modelParams2[1] = material.lightarea2;
	864	+ display.modelParams2[2] = material.factor2;
	865	+ display.modelParams2[3] = material.velvet2;
	866	+ display.modelParams3[0] = material.sheen2;
	867	+ display.modelParams3[1] = material.subsurface2;
	868	+ display.modelParams3[2] = material.bump2;
	869	+ display.modelParams3[3] = material.aniso2;
	870	+ display.modelParams4[0] = material.anisoV2;
	871	+ display.modelParams4[1] = material.cameralight2;
	872	+ //System.out.println("selected = " + selected);
	873	+ display.modelParams4[2] = material.diffuseness2;
	874	+ display.modelParams4[3] = material.shadow2;
	875	+ display.modelParams5[0] = material.texture2;
	876	+ display.modelParams5[1] = material.opacity2;
	877	+ display.modelParams5[2] = material.fakedepth2;
	878	+ display.modelParams5[3] = material.shadowbias2;
	879	+ }
	880	+
	881	+ display.modelParams6[0] = 0;
	882	+ display.modelParams6[1] = 0;
	883	+ display.modelParams6[2] = 0;
	884	+ display.modelParams6[3] = 0;
	885	+
	886	+ display.modelParams7[0] = 0;
	887	+ display.modelParams7[1] = 1000;
	888	+ display.modelParams7[2] = 0;
	889	+ display.modelParams7[3] = 0;
	890	+
	891	+ display.modelParams6[0] = 100; // criss de bug de bump
	892	+
	893	+ Object3D.cVector2[] extparams = display.vector2buffer;
	894	+ if (extparams != null && extparams.length > 0 && extparams[0] != null)
	895	+ {
	896	+ display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
	897	+ display.modelParams6[1] = extparams[0].y / 1000.0f; // noise
	898	+ if (extparams.length > 1)
	899	+ {
	900	+ display.modelParams6[2] = extparams[1].x / 1000.0f; // borderfade
	901	+ display.modelParams6[3] = extparams[1].y / 1000.0f; // (float)Math.exp(-extparams[1].y / 1000.0f); // fog punchthrough
	902	+ if (extparams.length > 2)
	903	+ {
	904	+ display.modelParams7[0] = extparams[2].x / 1000.0f; // noise power
	905	+ float x = extparams[2].y / 1000.0f;
	906	+ //if (x == 0)
	907	+ // x = 1f;
	908	+ 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
	909	+ if (extparams[2].y > 0)
	910	+ {
	911	+ //System.out.println("extparams[1].y = " + extparams[1].y);
	912	+ //System.out.println("extparams[2].y = " + extparams[2].y);
	913	+ //System.out.println("opacity power = " + display.modelParams7[1]);
	914	+ }
	915	+ }
	916	+ }
	917	+ }
	918	+
	919	+ //if (display.modelParams6[2] != 0)
	920	+ /*
	921	+ System.out.println("modelParams0[0] = " + display.modelParams0[0]);
	922	+ System.out.println("modelParams0[1] = " + display.modelParams0[1]);
	923	+ System.out.println("modelParams0[2] = " + display.modelParams0[2]);
	924	+ System.out.println("modelParams0[3] = " + display.modelParams0[3]);
	925	+ System.out.println("modelParams1[0] = " + display.modelParams1[0]);
	926	+ System.out.println("modelParams1[1] = " + display.modelParams1[1]);
	927	+ System.out.println("modelParams1[2] = " + display.modelParams1[2]);
	928	+ System.out.println("modelParams1[3] = " + display.modelParams1[3]);
	929	+ System.out.println("modelParams2[0] = " + display.modelParams2[0]);
	930	+ System.out.println("modelParams2[1] = " + display.modelParams2[1]);
	931	+ System.out.println("modelParams2[2] = " + display.modelParams2[2]);
	932	+ System.out.println("modelParams2[3] = " + display.modelParams2[3]);
	933	+ System.out.println("modelParams3[0] = " + display.modelParams3[0]);
	934	+ System.out.println("modelParams3[1] = " + display.modelParams3[1]);
	935	+ System.out.println("modelParams3[2] = " + display.modelParams3[2]);
	936	+ System.out.println("modelParams3[3] = " + display.modelParams3[3]);
	937	+ System.out.println("modelParams4[0] = " + display.modelParams4[0]);
	938	+ System.out.println("modelParams4[1] = " + display.modelParams4[1]);
	939	+ System.out.println("modelParams4[2] = " + display.modelParams4[2]);
	940	+ System.out.println("modelParams4[3] = " + display.modelParams4[3]);
	941	+ System.out.println("modelParams5[0] = " + display.modelParams5[0]);
	942	+ System.out.println("modelParams5[1] = " + display.modelParams5[1]);
	943	+ System.out.println("modelParams5[2] = " + display.modelParams5[2]);
	944	+ System.out.println("modelParams5[3] = " + display.modelParams5[3]);
	945	+ System.out.println("modelParams6[0] = " + display.modelParams6[0]);
	946	+ System.out.println("modelParams6[1] = " + display.modelParams6[1]);
	947	+ System.out.println("modelParams6[2] = " + display.modelParams6[2]);
	948	+ System.out.println("modelParams6[3] = " + display.modelParams6[3]);
	949	+ System.out.println("modelParams7[0] = " + display.modelParams7[0]);
	950	+ System.out.println("modelParams7[1] = " + display.modelParams7[1]);
	951	+ System.out.println("modelParams7[2] = " + display.modelParams7[2]);
	952	+ System.out.println("modelParams7[3] = " + display.modelParams7[3]);
	953	+ /**/
	954	+ //assert (display.modelParams6[2] == 0);
	955	+
	956	+ //System.out.println("noise power = " + display.modelParams7[0]);
	957	+ //System.out.println("shadowbias = " + shadowbias);
	958	+
	959	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	960	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 1, display.modelParams1, 0);
	961	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 2, display.modelParams2, 0);
	962	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 3, display.modelParams3, 0);
	963	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	964	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	965	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 6, display.modelParams6, 0);
	966	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 7, display.modelParams7, 0);
	967	+
	968	+ int mode = display.FP_SHADER;
	969	+
	970	+ if (material.aniso != material.anisoV \|\| material.aniso > 0.002)
	971	+ {
	972	+ mode \|= display.FP_ANISO;
	973	+ }
	974	+
	975	+ display.EnableProgram(mode);
	976	+
	977	+ //System.out.println("opacity power = " + display.modelParams7[1]);
	978	+
	979	+ if (!material.multiply)
	980	+ {
	981	+ if (Globals.drawMode == CameraPane.SHADOW)
	982	+ gl.glDepthMask(material.opacity >= 0.9 && display.modelParams7[1] > 0.1);
	983	+ else
	984	+ gl.glDepthMask(material.opacity >= 0.99);
	985	+ }
208	986	}
209	987
210	988	int matrixdepth = 0; // 10000; // CONFLICT WITH cMESH... WARNING WARNING WARNING WARNING WARNING WARNING !!!!!!!!!!!! 0;
..	..	@@ -225,10 +1003,10 @@
225	1003	currentGL.glMultMatrixd(model, 0);
226	1004	}
227	1005
228		- void PushMatrix(double[][] matrix, int count)
	1006	+ public void PushMatrix(double[][] matrix, int count) // INTERFACE
229	1007	{
230	1008	matrixdepth++;
231		- // GraphreeD.tracein(matrix);
	1009	+ // GrafreeD.tracein(matrix);
232	1010	if (matrix == null)
233	1011	return; // Identity
234	1012
..	..	@@ -253,13 +1031,13 @@
253	1031
254	1032	void PushMatrix(double[][] matrix)
255	1033	{
256		- // GraphreeD.tracein(matrix);
	1034	+ // GrafreeD.tracein(matrix);
257	1035	PushMatrix(matrix,1);
258	1036	}
259	1037
260	1038	void PushMatrix()
261	1039	{
262		- // GraphreeD.tracein(null);
	1040	+ // GrafreeD.tracein(null);
263	1041	if (matrixdepth++ < MAXSTACK - 1)
264	1042	{
265	1043	currentGL.glPushMatrix();
..	..	@@ -270,11 +1048,11 @@
270	1048
271	1049	double[][] tmpmat = new double[4][4];
272	1050
273		- void PopMatrix(double[][] inverse)
	1051	+ public void PopMatrix(double[][] inverse) // INTERFACE
274	1052	{
275	1053	--matrixdepth;
276	1054
277		- // GraphreeD.traceout(inverse);
	1055	+ // GrafreeD.traceout(inverse);
278	1056	if (inverse == null)
279	1057	return; // Identity
280	1058
..	..	@@ -292,7 +1070,7 @@
292	1070
293	1071	void PopMatrix()
294	1072	{
295		- // GraphreeD.traceout(null);
	1073	+ // GrafreeD.traceout(null);
296	1074	// inverse == null??
297	1075	if (--matrixdepth < MAXSTACK - 1)
298	1076	{
..	..	@@ -310,7 +1088,7 @@
310	1088	PushTextureMatrix(matrix, 1);
311	1089	}
312	1090
313		- void PushTextureMatrix(double[][] matrix, int count)
	1091	+ public void PushTextureMatrix(double[][] matrix, int count) // INTERFACE
314	1092	{
315	1093	currentGL.glActiveTexture(GetGL().GL_TEXTURE0);
316	1094
..	..	@@ -324,7 +1102,7 @@
324	1102	currentGL.glMatrixMode(GetGL().GL_MODELVIEW);
325	1103	}
326	1104
327		- void PopTextureMatrix(double[][] inverse)
	1105	+ public void PopTextureMatrix(double[][] inverse) // INTERFACE
328	1106	{
329	1107	currentGL.glActiveTexture(GetGL().GL_TEXTURE0);
330	1108	currentGL.glMatrixMode(GetGL().GL_TEXTURE);
..	..	@@ -356,10 +1134,10 @@
356	1134	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
357	1135	// return false;
358	1136
359		- if (REFUSEMODE && isLIVE() && camerachangeframe != 0 && camerachangeframe != framecount)
	1137	+ if (REFUSEMODE && Globals.isLIVE() && camerachangeframe != 0 && camerachangeframe != Globals.framecount)
360	1138	{
361	1139	// check for last change
362		- if (framecount < camerachangeframe + 400) // 120 == 1 second
	1140	+ if (Globals.framecount < camerachangeframe + 400) // 120 == 1 second
363	1141	{
364	1142	// refuse the camera change
365	1143	System.err.println("Camera " + cam + " REFUSED");
..	..	@@ -367,7 +1145,7 @@
367	1145	}
368	1146	}
369	1147
370		- camerachangeframe = framecount;
	1148	+ camerachangeframe = Globals.framecount;
371	1149
372	1150	cam.hAspect = -1; // Read only
373	1151
..	..	@@ -398,7 +1176,7 @@
398	1176	{
399	1177	//System.err.println("Oeil on");
400	1178	TRACK = true;
401		-// JUNE 2014 if (TRACK && trackedobject != null && drawMode == SHADOW) // && !lightMode)
	1179	+// JUNE 2014 if (TRACK && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
402	1180	// object.editWindow.ScreenFit(trackedobject);
403	1181	//pingthread.StepToTarget(true);
404	1182	}
..	..	@@ -407,7 +1185,7 @@
407	1185	{
408	1186	//System.err.println("Oeil on");
409	1187	OEIL = true;
410		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && drawMode == SHADOW) // && !lightMode)
	1188	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
411	1189	object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
412	1190	//pingthread.StepToTarget(true);
413	1191	}
..	..	@@ -471,7 +1249,7 @@
471	1249	{
472	1250	frozen ^= true;
473	1251	// Weird...
474		- lighttouched = true;
	1252	+ Globals.lighttouched = true;
475	1253	}
476	1254
477	1255	void ToggleDL()
..	..	@@ -486,12 +1264,12 @@
486	1264
487	1265	void ToggleLive()
488	1266	{
489		- setLIVE(isLIVE() ^ true);
	1267	+ Globals.setLIVE(Globals.isLIVE() ^ true);
490	1268
491		- System.err.println("LIVE = " + isLIVE());
	1269	+ System.err.println("LIVE = " + Globals.isLIVE());
492	1270
493		- if (!isLIVE()) // save sound
494		- GraphreeD.savesound = true; // wav.save();
	1271	+ if (!Globals.isLIVE()) // save sound
	1272	+ GrafreeD.savesound = true; // wav.save();
495	1273	// else
496	1274	repaint(); // start loop // may 2013
497	1275	}
..	..	@@ -513,7 +1291,7 @@
513	1291
514	1292	void ToggleCrowd()
515	1293	{
516		- CROWD ^= true;
	1294	+ Globals.CROWD ^= true;
517	1295	}
518	1296
519	1297	void ToggleInertia()
..	..	@@ -674,34 +1452,6 @@
674	1452	lightCamera = cam;
675	1453	}
676	1454
677		- CameraPane(Object3D o, Camera cam, boolean withcontext)
678		- {
679		- super(defaultcaps, null, withcontext?glcontext:null, null);
680		-
681		- //System.out.println("AMERICA AREA = " + (9458886 + 9210755 + 8480395 + 2736391 + 1943018 + 1289475 + 1141569 + 1069350 + 911559 + 721229 + 395886 + 377972 + 246700 + 211156 + 173985 + 141133 + 118279 + 112079 + 108523));
682		- glcontext = getContext();
683		-
684		- cameras = new Camera[2];
685		- targetLookAts = new cVector[2];
686		-
687		- SetCamera(cam);
688		-
689		- SetLight(new Camera(new cVector(10, 10, -20)));
690		-
691		- object = o;
692		-
693		- setBackground(Color.white);
694		-
695		- addKeyListener(this);
696		- addMouseListener(this);
697		- addMouseMotionListener(this);
698		- addMouseWheelListener(this);
699		- //System.out.println("addGLEventListener: " + this);
700		- addGLEventListener(this);
701		-
702		-// pingthread.start(); // may 2013
703		- }
704		-
705	1455	private static void ApplyTransform(GL gl, Mat4f xform)
706	1456	{
707	1457	float[] data = new float[16];
..	..	@@ -759,7 +1509,7 @@
759	1509
760	1510	GL currentGL;
761	1511
762		- GL GetGL()
	1512	+ public GL GetGL() // INTERFACE
763	1513	{
764	1514	return currentGL;
765	1515	}
..	..	@@ -768,6 +1518,8 @@
768	1518	class CacheTexture
769	1519	{
770	1520	com.sun.opengl.util.texture.Texture texture;
	1521	+ com.sun.opengl.util.texture.TextureData texturedata;
	1522	+
771	1523	int resolution;
772	1524
773	1525	CacheTexture(com.sun.opengl.util.texture.Texture tex, int res)
..	..	@@ -1998,10 +2750,12 @@
1998	2750	*/
1999	2751	TextureData ReduceTexture(TextureData texturedata, int resolution) // String name)
2000	2752	{
	2753	+ int pixelformat = texturedata.getPixelFormat();
	2754	+
2001	2755	int stride = 1;
2002		- if (texturedata.getPixelFormat() == GetGL().GL_RGB \|\| texturedata.getPixelFormat() == GetGL().GL_BGR) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE)
	2756	+ if (pixelformat == GetGL().GL_RGB \|\| pixelformat == GetGL().GL_BGR) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE)
2003	2757	stride = 3;
2004		- if (texturedata.getPixelFormat() == GetGL().GL_RGBA \|\| texturedata.getPixelFormat() == GetGL().GL_BGRA) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE_ALPHA)
	2758	+ if (pixelformat == GetGL().GL_RGBA \|\| pixelformat == GetGL().GL_BGRA) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE_ALPHA)
2005	2759	stride = 4;
2006	2760
2007	2761	int width = texturedata.getWidth();
..	..	@@ -6267,7 +7021,7 @@
6267	7021	return null;
6268	7022	}
6269	7023
6270		- void ReleaseTextures(cTexture tex)
	7024	+ public void ReleaseTextures(cTexture tex) // INTERFACE
6271	7025	{
6272	7026	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
6273	7027	{
..	..	@@ -6305,7 +7059,7 @@
6305	7059
6306	7060	void ReleaseTexture(String tex, boolean bump)
6307	7061	{
6308		- if (// drawMode != 0 \|\| /tex == null \|\|/
	7062	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
6309	7063	ambientOcclusion ) // \|\| !textureon)
6310	7064	{
6311	7065	return;
..	..	@@ -6331,7 +7085,7 @@
6331	7085	{
6332	7086	bumpdepth--;
6333	7087
6334		- // GraphreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
	7088	+ // GrafreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
6335	7089	if (bumpstack[bumpdepth] != (texture!=null?texture.texture:null))
6336	7090	{
6337	7091	// assert (bumpstack[bumpdepth] == texture);
..	..	@@ -6361,7 +7115,7 @@
6361	7115	{
6362	7116	pigmentdepth--;
6363	7117
6364		- // GraphreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
	7118	+ // GrafreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
6365	7119	if (pigmentstack[pigmentdepth] != (texture!=null?texture.texture:null))
6366	7120	{
6367	7121	// assert (pigmentstack[pigmentdepth] == texture);
..	..	@@ -6406,9 +7160,9 @@
6406	7160	}
6407	7161	}
6408	7162
6409		- /boolean/ void BindTextures(cTexture tex, int resolution)
	7163	+ /boolean/ public void BindTextures(cTexture tex, int resolution) // INTERFACE
6410	7164	{
6411		- if (// drawMode != 0 \|\| /tex == null \|\|/
	7165	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
6412	7166	ambientOcclusion ) // \|\| !textureon)
6413	7167	{
6414	7168	return; // false;
..	..	@@ -6451,7 +7205,7 @@
6451	7205	return; // true;
6452	7206	}
6453	7207
6454		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	7208	+ CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
6455	7209	{
6456	7210	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
6457	7211
..	..	@@ -6665,6 +7419,8 @@
6665	7419	thetex.texture.dispose();
6666	7420	textures.remove(texname);
6667	7421	}
	7422	+
	7423	+ texture.texturedata = texturedata;
6668	7424	textures.put(texname, texture);
6669	7425
6670	7426	// newtex = true;
..	..	@@ -6681,18 +7437,32 @@
6681	7437	}
6682	7438	}
6683	7439
	7440	+ return texture;
	7441	+ }
	7442	+
	7443	+ com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	7444	+ {
	7445	+ CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	7446	+
6684	7447	if (bump)
6685	7448	{
6686		- // GraphreeD.trace("PUSH BUMP " + tex + "(" + bumpdepth + ")" + " : " + texture);
	7449	+ // GrafreeD.trace("PUSH BUMP " + tex + "(" + bumpdepth + ")" + " : " + texture);
6687	7450	bumpstack[bumpdepth++] = texture!=null?texture.texture:null;
6688	7451	}
6689	7452	else
6690	7453	{
6691		- // GraphreeD.trace("PUSH PIGMENT " + tex + "(" + pigmentdepth + ")" + " : " + texture);
	7454	+ // GrafreeD.trace("PUSH PIGMENT " + tex + "(" + pigmentdepth + ")" + " : " + texture);
6692	7455	pigmentstack[pigmentdepth++] = texture!=null?texture.texture:null;
6693	7456	}
6694	7457
6695	7458	return texture!=null?texture.texture:null;
	7459	+ }
	7460	+
	7461	+ com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	7462	+ {
	7463	+ CacheTexture texture = GetCacheTexture(tex, bump, resolution);
	7464	+
	7465	+ return texture!=null?texture.texturedata:null;
6696	7466	}
6697	7467
6698	7468	boolean BindTexture(String tex, boolean bump, int resolution)
..	..	@@ -7292,9 +8062,9 @@
7292	8062	static boolean occlusionInitialized = false;
7293	8063	boolean selection = false;
7294	8064	boolean pointselection = false;
7295		- /static/ boolean lighttouched = true;
	8065	+ ///static/ boolean lighttouched = true;
7296	8066	boolean deselect;
7297		- boolean ambientOcclusion = false;
	8067	+ private boolean ambientOcclusion = false;
7298	8068	static boolean flash = false;
7299	8069	/static/ boolean wait = false;
7300	8070	boolean displaydone = false; // after repaint() calls
..	..	@@ -7424,6 +8194,8 @@
7424	8194	//gl.glFrustum(-0.5scale, 0.5scale, -0.5scale, 0.5scale, 1, 100);
7425	8195	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
7426	8196	double scale = lightCamera.SCALE / lightCamera.Distance();
	8197	+// PATCH FILLE AUX JEANS
	8198	+ //scale *= lightCamera.shaper_fovy / 25;
7427	8199	gl.glScaled(2 * scale, 2 * scale, -scale);
7428	8200	gl.glTranslated(0, 0, lightCamera.DECAL);
7429	8201
..	..	@@ -7572,15 +8344,14 @@
7572	8344
7573	8345	float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
7574	8346	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
7575		- float[] options3 = new float[]{1, 1, 1, 1}; // fog color. image intensity
	8347	+ float[] options3 = new float[]{1, 1, 1, 0}; // fog color
	8348	+ float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
7576	8349
7577	8350	static int imagecount = 0; // movie generation
7578	8351
7579	8352	static int jitter = 0;
7580	8353
7581	8354	boolean restartframe = false;
7582		-
7583		- static int framecount = 0; // general-purpose global count
7584	8355
7585	8356	void displayAntiAliased(javax.media.opengl.GL gl)
7586	8357	{
..	..	@@ -7610,14 +8381,14 @@
7610	8381
7611	8382	//System.out.println("start frame");
7612	8383	gl.glClear(gl.GL_ACCUM_BUFFER_BIT);
7613		- for (jitter = 0; jitter < ACSIZE; jitter++) //, GraphreeD.wav.cursor += LIVE ? 735 : 0)
	8384	+ for (jitter = 0; jitter < ACSIZE; jitter++) //, GrafreeD.wav.cursor += LIVE ? 735 : 0)
7614	8385	{
7615		- framecount++;
	8386	+ Globals.framecount++;
7616	8387
7617	8388	if (CameraPane.tickcount > 0)
7618	8389	CameraPane.tickcount--;
7619	8390
7620		-// GraphreeD.wav.cursor += 735; // 44100 Hz / 120 Hz * 2 (for 16 bits)
	8391	+// GrafreeD.wav.cursor += 735; // 44100 Hz / 120 Hz * 2 (for 16 bits)
7621	8392	// restartframe = true;
7622	8393	if (options1[2] > 100 && (jitter%2==0))
7623	8394	{
..	..	@@ -7650,7 +8421,7 @@
7650	8421
7651	8422	gl.glLightfv(gl.GL_LIGHT0, gl.GL_POSITION, pos, 0);
7652	8423	*/
7653		- lighttouched = true;
	8424	+ Globals.lighttouched = true;
7654	8425	//System.err.println(" shadowbuffer: " + jitter);
7655	8426	shadowbuffer.display();
7656	8427
..	..	@@ -7672,7 +8443,7 @@
7672	8443
7673	8444	if (renderCamera != lightCamera)
7674	8445	for (int count = parentcam.GetTransformCount(); --count>=0;)
7675		- LA.matConcat(parentcam.toParent, matrix, matrix);
	8446	+ LA.matConcat(matrix, parentcam.toParent, matrix);
7676	8447
7677	8448	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
7678	8449
..	..	@@ -7688,7 +8459,7 @@
7688	8459
7689	8460	if (renderCamera != lightCamera)
7690	8461	for (int count = parentcam.GetTransformCount(); --count>=0;)
7691		- LA.matConcat(matrix, parentcam.fromParent, matrix);
	8462	+ LA.matConcat(parentcam.fromParent, matrix, matrix);
7692	8463
7693	8464	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
7694	8465
..	..	@@ -7905,7 +8676,7 @@
7905	8676
7906	8677	if (!BOXMODE)
7907	8678	{
7908		- System.out.println("image: " + fullname + " (" + (GraphreeD.wav.cursor / 735 / 4) + ")");
	8679	+ System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
7909	8680	}
7910	8681
7911	8682	if (!BOXMODE)
..	..	@@ -7933,7 +8704,7 @@
7933	8704	{
7934	8705	if (ACSIZE > 1)
7935	8706	{
7936		- // System.err.println("image #" + (GraphreeD.wav.cursor / 735 / 4));
	8707	+ // System.err.println("image #" + (GrafreeD.wav.cursor / 735 / 4));
7937	8708	}
7938	8709	}
7939	8710
..	..	@@ -7943,7 +8714,7 @@
7943	8714	ABORTED = false;
7944	8715	}
7945	8716	else
7946		- GraphreeD.wav.cursor += 735 * ACSIZE;
	8717	+ GrafreeD.wav.cursor += 735 * ACSIZE;
7947	8718
7948	8719	if (false)
7949	8720	{
..	..	@@ -8597,13 +9368,6 @@
8597	9368	}
8598	9369	}
8599	9370
8600		- boolean IsFrozen()
8601		- {
8602		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
8603		-
8604		- return !selectmode && cameracount == 0; // != 0;
8605		- }
8606		-
8607	9371	boolean niceon = false;
8608	9372	javax.swing.Timer AAtimer = new javax.swing.Timer(750, this);
8609	9373	boolean currentlydrawing = false;
..	..	@@ -8613,16 +9377,16 @@
8613	9377
8614	9378	public void display(GLAutoDrawable drawable)
8615	9379	{
8616		- if (GraphreeD.savesound && GraphreeD.hassound)
	9380	+ if (GrafreeD.savesound && GrafreeD.hassound)
8617	9381	{
8618		- GraphreeD.wav.save();
8619		- GraphreeD.savesound = false;
8620		- GraphreeD.hassound = false;
	9382	+ GrafreeD.wav.save();
	9383	+ GrafreeD.savesound = false;
	9384	+ GrafreeD.hassound = false;
8621	9385	}
8622	9386	// if (DEBUG_SELECTION)
8623	9387	// {
8624		-// if (drawMode != SELECTION)
8625		-// drawMode = SELECTION;
	9388	+// if (DrawMode() != SELECTION)
	9389	+// DrawMode() = SELECTION;
8626	9390	// }
8627	9391
8628	9392	if (!isRenderer)
..	..	@@ -8678,9 +9442,9 @@
8678	9442
8679	9443	//ANTIALIAS = 0;
8680	9444
8681		- if (drawMode == DEFAULT) // && CURRENTANTIALIAS > 0)
	9445	+ if (DrawMode() == DEFAULT) // && CURRENTANTIALIAS > 0)
8682	9446	{
8683		- if (niceon \|\| isLIVE())
	9447	+ if (niceon \|\| Globals.isLIVE())
8684	9448	{
8685	9449	//if(active == 0)
8686	9450	// antialiaser = null;
..	..	@@ -8705,7 +9469,7 @@
8705	9469	assert eyeCamera.shaper_zFar == 1E5f; // 500.0f;
8706	9470	*/
8707	9471
8708		- if (drawMode == DEFAULT)
	9472	+ if (DrawMode() == DEFAULT)
8709	9473	{
8710	9474	currentlydrawing = true;
8711	9475	}
..	..	@@ -8736,18 +9500,18 @@
8736	9500
8737	9501	// if(Applet3D.clipboard != null)
8738	9502	// System.out.println("Clipboard = " + Applet3D.clipboard); //.get(0).parent);
8739		-//drawMode = SELECTION;
	9503	+//DrawMode() = SELECTION;
8740	9504	indexcount = 0;
8741	9505
8742		- if (drawMode == OCCLUSION)
	9506	+ if (DrawMode() == OCCLUSION)
8743	9507	{
8744		- drawMode = DEFAULT;
	9508	+ Globals.drawMode = DEFAULT; // WARNING
8745	9509	ambientOcclusion = true;
8746	9510	setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
8747	9511	Object3D theobject = object;
8748	9512	Object3D theparent = object.parent;
8749	9513	object.parent = null;
8750		- object = (Object3D)GraphreeD.clone(object);
	9514	+ object = (Object3D)GrafreeD.clone(object);
8751	9515	object.Stripify();
8752	9516	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
8753	9517	theobject.PreprocessOcclusion(this);
..	..	@@ -8760,19 +9524,19 @@
8760	9524	ambientOcclusion = false;
8761	9525	}
8762	9526
8763		- if (lighttouched && drawMode == DEFAULT && !lightMode) // && !FROZEN)
	9527	+ if (Globals.lighttouched && DrawMode() == DEFAULT && !lightMode) // && !FROZEN)
8764	9528	{
8765	9529	//if (RENDERSHADOW) // ?
8766	9530	if (!IsFrozen())
8767	9531	{
8768	9532	// dec 2012
8769		- if (!(!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0))
	9533	+ if (!ambientOcclusion && !(!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0))
8770	9534	{
8771		- framecount++;
	9535	+ Globals.framecount++;
8772	9536	shadowbuffer.display();
8773	9537	}
8774	9538	}
8775		- lighttouched = false; // ??
	9539	+ Globals.lighttouched = false; // ??
8776	9540	//drawing = true;
8777	9541	//lighttouched = true;
8778	9542	}
..	..	@@ -8793,9 +9557,9 @@
8793	9557	//eyeCamera.shaper_fovy = 1;
8794	9558	}
8795	9559
8796		- if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && drawMode == DEFAULT) // SELECTION)
	9560	+ if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && DrawMode() == DEFAULT) // SELECTION)
8797	9561	{
8798		- //System.out.println("drawMode = " + drawMode);
	9562	+ //System.out.println("DrawMode() = " + DrawMode());
8799	9563	vertexMode \|= VP_PASS;
8800	9564	//vertexMode \|= VP_PROJECTION;
8801	9565	if (!ambientOcclusion)
..	..	@@ -8855,7 +9619,7 @@
8855	9619	Camera cam = renderCamera; // lightMode?lightCamera:eyeCamera;
8856	9620	//Camera lightcam = new Camera(light0);
8857	9621
8858		- if (drawMode == SHADOW)
	9622	+ if (DrawMode() == SHADOW)
8859	9623	{
8860	9624	/*
8861	9625	gl.glMatrixMode(GL.GL_MODELVIEW);
..	..	@@ -8894,7 +9658,7 @@
8894	9658	// if (parentcam != renderCamera) // not a light
8895	9659	if (cam != lightCamera)
8896	9660	for (int count = parentcam.GetTransformCount(); --count>=0;)
8897		- LA.matConcat(parentcam.toParent, matrix, matrix);
	9661	+ LA.matConcat(matrix, parentcam.toParent, matrix);
8898	9662
8899	9663	for (int j = 0; j < 4; j++)
8900	9664	{
..	..	@@ -8909,7 +9673,7 @@
8909	9673	// if (parentcam != renderCamera) // not a light
8910	9674	if (cam != lightCamera)
8911	9675	for (int count = parentcam.GetTransformCount(); --count>=0;)
8912		- LA.matConcat(matrix, parentcam.fromParent, matrix);
	9676	+ LA.matConcat(parentcam.fromParent, matrix, matrix);
8913	9677
8914	9678	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
8915	9679
..	..	@@ -8945,7 +9709,7 @@
8945	9709	gl.glClear(gl.GL_DEPTH_BUFFER_BIT);
8946	9710	} else
8947	9711	{
8948		- if (drawMode != DEFAULT)
	9712	+ if (DrawMode() != DEFAULT)
8949	9713	{
8950	9714	gl.glClearColor(1, 1, 1, 0);
8951	9715	} // 1);
..	..	@@ -9010,7 +9774,7 @@
9010	9774
9011	9775	fast &= !ambientOcclusion;
9012	9776
9013		- if (drawMode == DEFAULT)
	9777	+ if (DrawMode() == DEFAULT)
9014	9778	{
9015	9779	//gl.glEnable(gl.GL_ALPHA_TEST);
9016	9780	//gl.glActiveTexture(GL.GL_TEXTURE0);
..	..	@@ -9071,6 +9835,8 @@
9071	9835	//gl.glFrustum(-0.5scale, 0.5scale, -0.5scale, 0.5scale, 1, 100);
9072	9836	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
9073	9837	double scale = lightCamera.SCALE / lightCamera.Distance();
	9838	+// PATCH FILLE AUX JEANS
	9839	+ //scale *= lightCamera.shaper_fovy / 25;
9074	9840	gl.glScaled(2 * scale, 2 * scale, -scale);
9075	9841	gl.glTranslated(0, 0, lightCamera.DECAL);
9076	9842
..	..	@@ -9206,10 +9972,12 @@
9206	9972	gl.glMatrixMode(gl.GL_PROJECTION);
9207	9973	gl.glLoadIdentity();
9208	9974
9209		- if (drawMode == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
	9975	+ if (DrawMode() == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
9210	9976	{
9211	9977	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
9212	9978	double scale = lightCamera.SCALE / lightCamera.Distance();
	9979	+// PATCH FILLE AUX JEANS
	9980	+ //scale *= lightCamera.shaper_fovy / 25;
9213	9981	gl.glScaled(2 * scale, 2 * scale, -scale);
9214	9982	gl.glTranslated(0, 0, lightCamera.DECAL);
9215	9983	//System.out.println("DECAL = " + LIGHTDECAL + "; SCALE = " + LIGHTSCALE);
..	..	@@ -9262,7 +10030,7 @@
9262	10030	//gl.glPushMatrix();
9263	10031	gl.glLoadIdentity();
9264	10032
9265		- if (!ambientOcclusion) // drawMode != OCCLUSION)
	10033	+ if (!ambientOcclusion) // DrawMode() != OCCLUSION)
9266	10034	{
9267	10035	//LA.xformPos(light0, lightCamera.fromScreen, light);
9268	10036	LA.xformDir(dirlight, lightCamera.fromScreen, lightposition);
..	..	@@ -9349,7 +10117,7 @@
9349	10117	}
9350	10118
9351	10119	/**/
9352		- if (true) // drawMode == SELECTION) // != DEFAULT)
	10120	+ if (true) // DrawMode() == SELECTION) // != DEFAULT)
9353	10121	gl.glDisable(gl.GL_LIGHTING);
9354	10122	else
9355	10123	gl.glEnable(gl.GL_LIGHTING);
..	..	@@ -9361,12 +10129,13 @@
9361	10129
9362	10130	gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 63, options2, 0);
9363	10131	gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 62, options3, 0);
	10132	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 61, options4, 0);
9364	10133
9365	10134	options2[0] *= renderCamera.Distance();
9366	10135
9367	10136	lightslot = 64;
9368	10137
9369		- if (!frozen && !ambientOcclusion && isRenderer && drawMode == DEFAULT)
	10138	+ if (!frozen && !ambientOcclusion && isRenderer && DrawMode() == DEFAULT)
9370	10139	{
9371	10140	DrawLights(object);
9372	10141	}
..	..	@@ -9377,7 +10146,7 @@
9377	10146	fragmentMode \|= (lightslot - 64) << 2; // 1; // first bit is available for aniso
9378	10147	//System.out.println("fragmentMode = " + fragmentMode);
9379	10148
9380		- if (drawMode == DEFAULT \|\| drawMode == SELECTION \|\| DEBUG_SELECTION)
	10149	+ if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| DEBUG_SELECTION)
9381	10150	{
9382	10151	/*
9383	10152	if (CULLFACE \|\| (ambientOcclusion && OCCLUSION_CULLING))
..	..	@@ -9410,7 +10179,7 @@
9410	10179	}
9411	10180	}
9412	10181
9413		- if (drawMode == DEFAULT)
	10182	+ if (DrawMode() == DEFAULT)
9414	10183	{
9415	10184	if (WIREFRAME && !ambientOcclusion)
9416	10185	{
..	..	@@ -9428,7 +10197,7 @@
9428	10197	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9429	10198	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9430	10199
9431		- if (!fast/RENDERPROGRAM != 0/ && (drawMode == DEFAULT \|\| drawMode == SHADOW)) // && !WIREFRAME) //
	10200	+ if (!fast/RENDERPROGRAM != 0/ && (DrawMode() == DEFAULT \|\| DrawMode() == SHADOW)) // && !WIREFRAME) //
9432	10201	{
9433	10202	if (vertexMode != 0) // && !fast)
9434	10203	{
..	..	@@ -9448,7 +10217,7 @@
9448	10217	}
9449	10218	}
9450	10219
9451		- if (false) // fast && !IsFreezed() && drawMode != SELECTION && !ambientOcclusion)
	10220	+ if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
9452	10221	{
9453	10222	//gl.glDepthFunc(GL.GL_LEQUAL);
9454	10223	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -9476,7 +10245,7 @@
9476	10245	//gl.glDepthMask(false);
9477	10246	}
9478	10247
9479		- if (false) // drawMode == SHADOW)
	10248	+ if (false) // DrawMode() == SHADOW)
9480	10249	{
9481	10250	//SetColumnMajorData(cameraInverseTransform, view_1);
9482	10251	//System.out.println("light = " + cameraInverseTransform);
..	..	@@ -9490,16 +10259,16 @@
9490	10259	//System.out.println("object = " + object);
9491	10260	if (!frozen && !imageLocked)
9492	10261	{
9493		- if (!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0)
	10262	+ if (!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0)
9494	10263	{
9495	10264	displayAntiAliased(gl);
9496	10265	} else
9497	10266	{
9498	10267	programcount = 0;
9499		- int keepmode = drawMode;
	10268	+ int keepmode = DrawMode();
9500	10269	// if (DEBUG_SELECTION)
9501	10270	// {
9502		-// drawMode = SELECTION;
	10271	+// DrawMode() = SELECTION;
9503	10272	// }
9504	10273	// for point selection
9505	10274	// gl.glGetDoublev(gl.GL_MODELVIEW_MATRIX, tempmat, 0);
..	..	@@ -9509,10 +10278,10 @@
9509	10278	DrawObject(gl);
9510	10279
9511	10280	// jan 2013 System.err.println("RESET ABORT (display)");
9512		- // if (drawMode == DEFAULT)
	10281	+ // if (DrawMode() == DEFAULT)
9513	10282	// ABORTED = false;
9514	10283	fullreset = false;
9515		- drawMode = keepmode;
	10284	+ Globals.drawMode = keepmode; // WARNING
9516	10285	//System.out.println("PROGRAM SWITCH " + programcount);
9517	10286	}
9518	10287	}
..	..	@@ -9520,11 +10289,11 @@
9520	10289	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9521	10290	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9522	10291
9523		- if (drawMode == DEFAULT)
	10292	+ if (DrawMode() == DEFAULT)
9524	10293	{
9525	10294	ReleaseTexture(NOISE_TEXTURE, false);
9526	10295	}
9527		- //if (drawMode == DEFAULT)
	10296	+ //if (DrawMode() == DEFAULT)
9528	10297	{
9529	10298
9530	10299	gl.glActiveTexture(GL.GL_TEXTURE1);
..	..	@@ -9536,7 +10305,7 @@
9536	10305	//else
9537	10306	//gl.glDisable(gl.GL_TEXTURE_2D);
9538	10307	//gl.glPopMatrix();
9539		- if (imageCompleted && ANTIALIAS > 0 && drawMode == DEFAULT && cam != lightCamera && !ambientOcclusion)
	10308	+ if (imageCompleted && ANTIALIAS > 0 && DrawMode() == DEFAULT && cam != lightCamera && !ambientOcclusion)
9540	10309	{
9541	10310	//new Exception().printStackTrace();
9542	10311	//System.out.println("Draw image " + width + ", " + height);
..	..	@@ -9578,7 +10347,7 @@
9578	10347	//gl.glFlush();
9579	10348	}
9580	10349
9581		- if (flash && drawMode == DEFAULT)
	10350	+ if (flash && DrawMode() == DEFAULT)
9582	10351	{
9583	10352	flash = false;
9584	10353	wait = true;
..	..	@@ -9586,9 +10355,9 @@
9586	10355	}
9587	10356
9588	10357	//drawing = false;
9589		- //if(drawMode == DEFAULT)
	10358	+ //if(DrawMode() == DEFAULT)
9590	10359	// niceon = false;
9591		- if (drawMode == DEFAULT)
	10360	+ if (DrawMode() == DEFAULT)
9592	10361	{
9593	10362	currentlydrawing = false;
9594	10363	}
..	..	@@ -9608,7 +10377,7 @@
9608	10377	repaint();
9609	10378	}
9610	10379
9611		- if (isLIVE() && drawMode == DEFAULT) // may 2013
	10380	+ if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
9612	10381	repaint();
9613	10382
9614	10383	displaydone = true;
..	..	@@ -9642,10 +10411,10 @@
9642	10411	e.printStackTrace();
9643	10412	}
9644	10413
9645		- if (GraphreeD.RENDERME > 0)
9646		- GraphreeD.RENDERME--; // mechante magouille
	10414	+ if (GrafreeD.RENDERME > 0)
	10415	+ GrafreeD.RENDERME--; // mechante magouille
9647	10416
9648		- ONESTEP = false;
	10417	+ Globals.ONESTEP = false;
9649	10418	}
9650	10419
9651	10420	static boolean zoomonce = false;
..	..	@@ -9653,11 +10422,11 @@
9653	10422	void DrawObject(GL gl, boolean draw)
9654	10423	{
9655	10424	//System.out.println("DRAW OBJECT " + mouseDown);
9656		-// drawMode = SELECTION;
	10425	+// DrawMode() = SELECTION;
9657	10426	//GL gl = getGL();
9658	10427	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
9659	10428	{
9660		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && drawMode == SHADOW) // && !lightMode)
	10429	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
9661	10430	object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
9662	10431	pingthread.StepToTarget(true); // true);
9663	10432	// zoomonce = false;
..	..	@@ -9678,9 +10447,9 @@
9678	10447	callist = gl.glGenLists(1);
9679	10448	}
9680	10449
9681		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	10450	+ boolean selectmode = DrawMode() == SELECTION \|\| CameraPane.DEBUG_SELECTION;
9682	10451
9683		- boolean active = !selectmode; // drawMode != SELECTION; // mouseDown;
	10452	+ boolean active = !selectmode; // DrawMode() != SELECTION; // mouseDown;
9684	10453
9685	10454	if (!mainDL \|\| !active \|\| touched)
9686	10455	{
..	..	@@ -9707,7 +10476,7 @@
9707	10476	PushMatrix(ClickInfo.matbuffer);
9708	10477	}
9709	10478
9710		- if (drawMode == 0)
	10479	+ if (DrawMode() == 0)
9711	10480	{
9712	10481	// System.out.println("CLEAR +++++++++++++++ +++++++++++++++ +++++++++++++++ +++++++++++++++");
9713	10482
..	..	@@ -9716,12 +10485,12 @@
9716	10485	BindTextures(DEFAULT_TEXTURES, 2);
9717	10486	}
9718	10487	//System.out.println("--> " + stackdepth);
9719		-// GraphreeD.traceon();
	10488	+// GrafreeD.traceon();
9720	10489
9721	10490	// DRAW
9722	10491	object.draw(this, /(Composite)/ object, false, false);
9723	10492
9724		- if (drawMode == DEFAULT)
	10493	+ if (DrawMode() == DEFAULT)
9725	10494	{
9726	10495	if (DEBUG)
9727	10496	{
..	..	@@ -9732,34 +10501,48 @@
9732	10501	selectedpoint.radius = radius;
9733	10502	selectedpoint.recalculate();
9734	10503	selectedpoint.material = new cMaterial();
9735		- selectedpoint.material.color = 0.25f;
	10504	+ selectedpoint.material.color = 0.15f; // Yellow
9736	10505	selectedpoint.material.modulation = 0.75f;
9737	10506
9738		- debugpoint.radius = radius;
9739		- debugpoint.recalculate();
9740		- debugpoint.material = new cMaterial();
9741		- debugpoint.material.color = 0.25f;
9742		- debugpoint.material.modulation = 0.75f;
	10507	+ debugpointG.radius = radius;
	10508	+ debugpointG.recalculate();
	10509	+ debugpointG.material = new cMaterial();
	10510	+ debugpointG.material.color = 0.25f; // Green
	10511	+ debugpointG.material.modulation = 0.75f;
9743	10512
9744		- debugpoint2.radius = radius;
9745		- debugpoint2.recalculate();
9746		- debugpoint2.material = new cMaterial();
9747		- debugpoint2.material.color = 0.75f;
9748		- debugpoint2.material.modulation = 0.75f;
	10513	+ debugpointP.radius = radius;
	10514	+ debugpointP.recalculate();
	10515	+ debugpointP.material = new cMaterial();
	10516	+ debugpointP.material.color = 0.75f; // Purple
	10517	+ debugpointP.material.modulation = 0.75f;
	10518	+
	10519	+ debugpointC.radius = radius;
	10520	+ debugpointC.recalculate();
	10521	+ debugpointC.material = new cMaterial();
	10522	+ debugpointC.material.color = 0.5f; // Cyan
	10523	+ debugpointC.material.modulation = 0.75f;
	10524	+
	10525	+ debugpointR.radius = radius;
	10526	+ debugpointR.recalculate();
	10527	+ debugpointR.material = new cMaterial();
	10528	+ debugpointR.material.color = 0f; // Red
	10529	+ debugpointR.material.modulation = 0.75f;
9749	10530
9750	10531	InitPoints(radius);
9751	10532	}
9752	10533	selectedpoint.draw(this, /(Composite)/ null, false, false);
9753		- //debugpoint.draw(this, /(Composite)/ null, false);
9754		- //debugpoint2.draw(this, /(Composite)/ null, false);
9755		- DrawPoints(this);
	10534	+ debugpointG.draw(this, /(Composite)/ null, false,false);
	10535	+ debugpointP.draw(this, /(Composite)/ null, false,false);
	10536	+ debugpointC.draw(this, /(Composite)/ null, false,false);
	10537	+ debugpointR.draw(this, /(Composite)/ null, false,false);
	10538	+ // DrawPoints(this);
9756	10539	}
9757	10540
9758	10541	// debugstuff.draw(this, /(Composite)/ null, false);
9759	10542	}
9760		-// GraphreeD.traceoff();
	10543	+// GrafreeD.traceoff();
9761	10544	//System.out.println(stackdepth);
9762		- if (drawMode == 0)
	10545	+ if (DrawMode() == 0)
9763	10546	{
9764	10547	ReleaseTextures(DEFAULT_TEXTURES);
9765	10548
..	..	@@ -9784,17 +10567,19 @@
9784	10567
9785	10568	checker = null;
9786	10569
9787		- if (!ambientOcclusion && !IsFrozen() && drawMode == DEFAULT)
	10570	+ if (!ambientOcclusion && !IsFrozen() && DrawMode() == DEFAULT)
9788	10571	FindChecker(object);
9789	10572
9790		- if (checker != null && drawMode == DEFAULT)
	10573	+ if (checker != null && DrawMode() == DEFAULT)
9791	10574	{
9792		- // BindTexture(IMMORTAL_TEXTURE);
	10575	+ //BindTexture(IMMORTAL_TEXTURE);
	10576	+ BindTextures(checker.GetTextures(), checker.texres);
9793	10577	// NEAREST
9794	10578	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
9795	10579	DrawChecker(gl);
9796	10580	//checker.Draw(this, null, false);
9797	10581	// ReleaseTexture(IMMORTAL_TEXTURE);
	10582	+ ReleaseTextures(checker.GetTextures());
9798	10583	}
9799	10584
9800	10585	if (object.parent != null)
..	..	@@ -9807,7 +10592,7 @@
9807	10592	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9808	10593	//gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9809	10594
9810		- if (DISPLAYTEXT && drawMode == DEFAULT)
	10595	+ if (DISPLAYTEXT && DrawMode() == DEFAULT)
9811	10596	{
9812	10597	// Draw it once, then use the raster
9813	10598	Balloon(gl, balloon.createGraphics());
..	..	@@ -9863,9 +10648,9 @@
9863	10648	int[] xs = new int[3];
9864	10649	int[] ys = new int[3];
9865	10650
9866		- void DrawString(Object3D obj) // String string)
	10651	+ public void DrawString(Object3D obj) // String string) // INTERFACE
9867	10652	{
9868		- if (!DISPLAYTEXT \|\| drawMode != DEFAULT)
	10653	+ if (!DISPLAYTEXT \|\| DrawMode() != DEFAULT)
9869	10654	{
9870	10655	return;
9871	10656	}
..	..	@@ -10253,7 +11038,7 @@
10253	11038	return;
10254	11039	}
10255	11040
10256		- if (obj instanceof CheckerIG)
	11041	+ if (obj instanceof Checker)
10257	11042	{
10258	11043	checker = obj;
10259	11044
..	..	@@ -10325,11 +11110,13 @@
10325	11110	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
10326	11111	"PARAM params7 = program.env[7];" + // noise power, opacity power
10327	11112	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
10328		- "PARAM options1 = program.env[62];" + // fog rgb color, image intensity
	11113	+ "PARAM options1 = program.env[62];" + // fog rgb color
	11114	+ "PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
10329	11115	"PARAM pointlight = program.env[127];" + // ...
10330	11116	"PARAM zero = { 0.0, 0.0, 0.0, 0.0 };" +
10331	11117	"PARAM halfhalf = { 0.25, 0.25, 0.25, 1.0 };" +
10332	11118	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
	11119	+ "PARAM threequarter = { 0.75, 0.75, 0.75, 1.0 };" +
10333	11120	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
10334	11121	"PARAM ten = { 10, 10, 10, 1.0 };" +
10335	11122	"PARAM one3rd = { 0.5, 0.33333333333, 0.333333333, 1.0 };" +
..	..	@@ -10350,6 +11137,7 @@
10350	11137	"PARAM lodbias = { 10,10,10,10 };" + // 20, -2, -20, 1.0 };" +
10351	11138	"PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
10352	11139	"PARAM one2048th = { 0.00048828125, 0.00048828125, 0.00048828125, 1.0 };" +
	11140	+ "PARAM ninetenth = { 0.9, 0.9, 0.9, 1.0 };" +
10353	11141	"PARAM almostone = { 0.999, 0.999, 0.999, 1.0 };" +
10354	11142	"PARAM c256 = { 256, 256, 256, 1.0 };" +
10355	11143	"PARAM c256i = { 0.00390625, 0.00390625, 0.00390625, 1.0 };" +
..	..	@@ -10390,6 +11178,10 @@
10390	11178	"TEMP R1;" +
10391	11179	"TEMP R2;" +
10392	11180	"TEMP R3;" +
	11181	+ "TEMP min;" +
	11182	+ "TEMP max;" +
	11183	+ "TEMP average;" +
	11184	+ "TEMP saturation;" +
10393	11185	"TEMP keep1;" +
10394	11186	"TEMP keep2;" +
10395	11187	"TEMP keep3;" +
..	..	@@ -10920,10 +11712,40 @@
10920	11712
10921	11713	// skin?
10922	11714	// Saturation for skin
10923		- /**/ // c'est ici
10924		- (Skinshader? "DP3 temp.x, final,one;" +
	11715	+ /**/
	11716	+ (Skinshader?
	11717	+ "DP3 average.x, final,one;" +
	11718	+ "MUL average, one3rd.xxxx,average.xxxx;" +
	11719	+
	11720	+ "MIN min.x, final.x,final.y;" +
	11721	+ "MIN min.x, min.x,final.z;" +
	11722	+
	11723	+ "MAX max.x, final.x,final.y;" +
	11724	+ "MAX max.x, max.x,final.z;" +
	11725	+ "MOV max, max.xxxx;" +
	11726	+
	11727	+ "SUB saturation, max, final;" +
	11728	+
	11729	+ "ADD temp.x, max.x, one10th.x;" +
	11730	+ "RCP temp.x, temp.x;" +
	11731	+ "MUL temp.x, temp.x, half.x;" +
	11732	+ "MUL saturation, saturation, temp.xxxx;" +
	11733	+
	11734	+ "DP3 ndotl.x, normald, light;" +
	11735	+ "MAX ndotl.x, ndotl.x, -ndotl.x;" +
	11736	+
	11737	+ "SUB temp.x, one.x, ndotl.x;" +
	11738	+ "ADD temp.x, temp.x, options2.z;" + // lightsheen
	11739	+ "ADD temp.y, one.y, options2.y;" + // sursurface
	11740	+ "MUL temp.x, temp.x, temp.y;" +
	11741	+
	11742	+ "MUL saturation, saturation, temp.xxxx;" +
	11743	+ "SUB_SAT temp, max, saturation;" +
	11744	+/**
	11745	+ "DP3 temp.x, final,one;" +
10925	11746	"MUL R2, one3rd.xxxx,temp.xxxx;" +
10926		- "SUB temp, final,R2;" +
	11747	+ "SUB temp, final, R2;" +
	11748	+
10927	11749	// using light angle
10928	11750	"DP3 ndotl.x, normald,light;" +
10929	11751	//"SLT ndotl.y, ndotl.x, zero.x;" +
..	..	@@ -10936,7 +11758,6 @@
10936	11758	// using light intensity
10937	11759	"MOV ndotl.z, R2.x;" +
10938	11760	"MUL ndotl.z, ndotl.z, ndotl.z;" + // tuning...
10939		-
10940	11761	// june 2014
10941	11762	"MAD R1.x, ndotl.z,slope.y,one.x;" +
10942	11763	// "SUB ndotl.x, one.x, ndotl.x;" +
..	..	@@ -10948,6 +11769,7 @@
10948	11769	//"MUL R2.y, shadow.x,R2.y;" + // avril 2014
10949	11770
10950	11771	"MAD temp.x, R2.y, ndotl.y, temp.x;" + // red shift (skin)
	11772	+/**/
10951	11773
10952	11774	// "ADD final, R2,temp;" +
10953	11775	"MOV final, temp;"
..	..	@@ -11037,7 +11859,7 @@
11037	11859	/**/
11038	11860	// HDR
11039	11861	"MOV temp.z, final.a;" +
11040		- "MUL final, final,options1.w;" +
	11862	+ "MUL final, final,options2.x;" +
11041	11863	"MOV final.a, temp.z;" +
11042	11864	/**/
11043	11865
..	..	@@ -11074,10 +11896,17 @@
11074	11896	"MOV final.z, zero.x;" +
11075	11897	"MOV final.a, one.w;":""
11076	11898	) +
	11899	+ /*
11077	11900	(NORMALdebug?"MOV final.x, normal.x;" +
11078	11901	"MOV final.y, normal.y;" +
11079	11902	"MOV final.z, normal.z;" +
11080	11903	"MOV final.a, one.w;":""
	11904	+ ) +
	11905	+ */
	11906	+ (NORMALdebug?"SUB final.x, one.x, final.x;" +
	11907	+ "SUB final.y, one.x, final.y;" +
	11908	+ "SUB final.z, one.x, final.z;" +
	11909	+ "MOV final.a, final.a;":""
11081	11910	) +
11082	11911	// "MOV final, bumpmap;" +
11083	11912	"MOV result.color, final;" +
..	..	@@ -11223,6 +12052,7 @@
11223	12052	String Shadow(String depth, String shadow)
11224	12053	{
11225	12054	return "MAX temp.x, ndotl.x, one64th.x;" +
	12055	+ "MIN temp.x, temp.x, ninetenth.x;" +
11226	12056	/**/
11227	12057	// Sine
11228	12058	"MUL temp.y, temp.x, temp.x;" +
..	..	@@ -11847,9 +12677,10 @@
11847	12677	return;
11848	12678	}
11849	12679
	12680	+ boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
11850	12681
11851	12682	// TIMER
11852		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0) // VR
	12683	+ if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
11853	12684	{
11854	12685	keepboxmode = BOXMODE;
11855	12686	keepsupport = SUPPORT;
..	..	@@ -11978,7 +12809,7 @@
11978	12809	// ObjEditor.tweenManager.update(1f / 60f);
11979	12810
11980	12811	// fev 2014???
11981		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && drawMode == SHADOW) // && !lightMode)
	12812	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
11982	12813	object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11983	12814	pingthread.StepToTarget(true); // true);
11984	12815	}
..	..	@@ -12229,7 +13060,7 @@
12229	13060	//System.out.println("---------------- ---------- Paint " + tmp.length2());
12230	13061	if (lightMode)
12231	13062	{
12232		- lighttouched = true;
	13063	+ Globals.lighttouched = true;
12233	13064	}
12234	13065
12235	13066	if (OEILONCE && OEIL)
..	..	@@ -12287,7 +13118,7 @@
12287	13118	mouseDown = false;
12288	13119	if (lightMode)
12289	13120	{
12290		- lighttouched = true;
	13121	+ Globals.lighttouched = true;
12291	13122	}
12292	13123	repaint();
12293	13124	alreadypainted = true;
..	..	@@ -12295,7 +13126,7 @@
12295	13126	isMoving = false;
12296	13127	} //??
12297	13128
12298		- if (isLIVE() && !alreadypainted)
	13129	+ if (Globals.isLIVE() && !alreadypainted)
12299	13130	{
12300	13131	// FOR DEBUG BREAKPOINT USING PAUSE: while (true)
12301	13132	repaint();
..	..	@@ -12307,7 +13138,7 @@
12307	13138	{
12308	13139	if (lightMode)
12309	13140	{
12310		- lighttouched = true;
	13141	+ Globals.lighttouched = true;
12311	13142	}
12312	13143	drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
12313	13144	}
..	..	@@ -12550,6 +13381,7 @@
12550	13381	{
12551	13382	manipCamera.Translate(dx, dy, getWidth());
12552	13383	}
	13384	+ else
12553	13385	if ((mouseMode & ZOOM) == 0 && (mouseMode & VR) != 0)
12554	13386	{
12555	13387	manipCamera.RotateInterest(dx, dy);
..	..	@@ -12560,7 +13392,7 @@
12560	13392
12561	13393	if (manipCamera == lightCamera)
12562	13394	{
12563		- lighttouched = true;
	13395	+ Globals.lighttouched = true;
12564	13396	}
12565	13397	/*
12566	13398	switch (mode)
..	..	@@ -12775,13 +13607,15 @@
12775	13607	{
12776	13608	mouseMode \|= ZOOM;
12777	13609	}
12778		- if ((modifiers & META) == META)
	13610	+
	13611	+ boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
	13612	+ if (capsLocked \|\| (modifiers & META) == META)
12779	13613	{
12780	13614	mouseMode \|= VR; // BACKFORTH;
12781	13615	}
12782	13616	if ((modifiers & CTRLCLICK) == CTRLCLICK)
12783	13617	{
12784		- mouseMode \|= SELECT; // BACKFORTH;
	13618	+ mouseMode \|= SELECT;
12785	13619	}
12786	13620	if ((modifiers & COMMAND) == COMMAND)
12787	13621	{
..	..	@@ -12789,6 +13623,7 @@
12789	13623	}
12790	13624	if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
12791	13625	{
	13626	+ mouseMode &= ~VR;
12792	13627	mouseMode \|= TRANSLATE;
12793	13628	}
12794	13629	// if ((modifiers & SHIFT_META) == SHIFT_META)
..	..	@@ -12945,7 +13780,7 @@
12945	13780	case 'B':
12946	13781	BRISMOOTH ^= true;
12947	13782	SHADOWCULLFACE ^= true;
12948		- lighttouched = true;
	13783	+ Globals.lighttouched = true;
12949	13784	repaint();
12950	13785	break;
12951	13786	case 'b':
..	..	@@ -13045,7 +13880,7 @@
13045	13880	repaint();
13046	13881	break;
13047	13882	case 'O':
13048		- drawMode = OCCLUSION;
	13883	+ Globals.drawMode = OCCLUSION; // WARNING
13049	13884	repaint();
13050	13885	break;
13051	13886	case 'o':
..	..	@@ -13136,7 +13971,7 @@
13136	13971	break;
13137	13972	case ' ':
13138	13973	lightMode ^= true;
13139		- lighttouched = true;
	13974	+ Globals.lighttouched = true;
13140	13975	manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
13141	13976	targetLookAt.set(manipCamera.lookAt);
13142	13977	repaint();
..	..	@@ -13148,11 +13983,11 @@
13148	13983	repaint();
13149	13984	break;
13150	13985	case 'Z':
13151		- RESIZETEXTURE ^= true;
13152		- break;
	13986	+ //RESIZETEXTURE ^= true;
	13987	+ //break;
13153	13988	case 'z':
13154	13989	RENDERSHADOW ^= true;
13155		- lighttouched = true;
	13990	+ Globals.lighttouched = true;
13156	13991	repaint();
13157	13992	break;
13158	13993	//case UP:
..	..	@@ -13178,7 +14013,8 @@
13178	14013	FlipTransform();
13179	14014	break;
13180	14015	case ENTER:
13181		- object.editWindow.ScreenFit(); // Edit();
	14016	+ // object.editWindow.ScreenFit(); // Edit();
	14017	+ ToggleLive();
13182	14018	break;
13183	14019	case DELETE:
13184	14020	ClearSelection();
..	..	@@ -13753,6 +14589,7 @@
13753	14589	//if (g != gr) g.drawImage(img, 0, 0, width, height, null);
13754	14590	}
13755	14591
	14592	+ // To avoid clear.
13756	14593	public void update(Graphics g)
13757	14594	{
13758	14595	paint(g);
..	..	@@ -14355,7 +15192,7 @@
14355	15192	gl.glPushAttrib(GL.GL_ALL_ATTRIB_BITS);
14356	15193	gl.glPushMatrix();
14357	15194	gl.glLoadIdentity();
14358		- PushMatrix(checker.toParent);
	15195	+ //PushMatrix(checker.toParent);
14359	15196
14360	15197	gl.glMatrixMode(GL.GL_TEXTURE);
14361	15198	gl.glPushMatrix();
..	..	@@ -14378,8 +15215,8 @@
14378	15215
14379	15216	gl.glNormal3f(0.0f, 0.0f, 1.0f);
14380	15217
14381		- float step = 0.1666f; //0.25f;
14382		- float stepv = step * 1652 / 998;
	15218	+ float step = 2; // 0.1666f; //0.25f;
	15219	+ float stepv = 2; // step * 1652 / 998;
14383	15220
14384	15221	int i0 = 0;
14385	15222	/*
..	..	@@ -14415,20 +15252,21 @@
14415	15252	/**/
14416	15253	//checker.GetMaterial().opacity = 1.1f;
14417	15254	////checker.GetMaterial().ambient = 0.99f;
14418		- Object3D.materialstack[Object3D.materialdepth] = checker.material;
14419		- Object3D.selectedstack[Object3D.materialdepth] = false;
14420		- cStatic.objectstack[Object3D.materialdepth++] = checker;
	15255	+ materialstack[materialdepth] = checker.material;
	15256	+ selectedstack[materialdepth] = false;
	15257	+ cStatic.objectstack[materialdepth++] = checker;
14421	15258	//System.out.println("material " + material);
14422	15259	//Applet3D.tracein(this, selected);
14423	15260	vector2buffer = checker.projectedVertices;
14424	15261
14425		- checker.GetMaterial().Draw(this, false); // true);
	15262	+ //checker.GetMaterial().Draw(this, false); // true);
	15263	+ DrawMaterial(checker.GetMaterial(), false); // true);
14426	15264
14427		- Object3D.materialdepth -= 1;
14428		- if (Object3D.materialdepth > 0)
	15265	+ materialdepth -= 1;
	15266	+ if (materialdepth > 0)
14429	15267	{
14430		- vector2buffer = cStatic.objectstack[Object3D.materialdepth - 1].projectedVertices;
14431		- Object3D.materialstack[Object3D.materialdepth - 1].Draw(this, Object3D.selectedstack[Object3D.materialdepth - 1]);
	15268	+ vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	15269	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
14432	15270	}
14433	15271	//checker.GetMaterial().opacity = 1f;
14434	15272	////checker.GetMaterial().ambient = 1f;
..	..	@@ -14449,15 +15287,27 @@
14449	15287
14450	15288	//float u = (i+1)/2;
14451	15289	//float v = (j+1)/2;
14452		- gl.glTexCoord2f((i + 1) / 2, (j + 1) / 2); // (1,0) // (i+1+step)/2,(j+1)/2);
	15290	+ if (checker.flipV)
	15291	+ gl.glTexCoord2f((i + 1) / 2, 1 - (j + 1) / 2);
	15292	+ else
	15293	+ gl.glTexCoord2f((i + 1) / 2, (j + 1) / 2); // (1,0) // (i+1+step)/2,(j+1)/2);
14453	15294	gl.glVertex3f(i, j, -0.5f);
14454	15295
	15296	+ if (checker.flipV)
	15297	+ gl.glTexCoord2f((i + 1 + step) / 2, 1 - (j + 1) / 2); // (1,1) // (i+1+step)/2,(j+1+step)/2);
	15298	+ else
14455	15299	gl.glTexCoord2f((i + 1 + step) / 2, (j + 1) / 2); // (1,1) // (i+1+step)/2,(j+1+step)/2);
14456	15300	gl.glVertex3f(i + step, j, -0.5f);
14457	15301
	15302	+ if (checker.flipV)
	15303	+ gl.glTexCoord2f((i + 1 + step) / 2, 1 - (j + 1 + stepv) / 2); // (0,1) //(i+1)/2,(j+1+step)/2);
	15304	+ else
14458	15305	gl.glTexCoord2f((i + 1 + step) / 2, (j + 1 + stepv) / 2); // (0,1) //(i+1)/2,(j+1+step)/2);
14459	15306	gl.glVertex3f(i + step, j + stepv, -0.5f);
14460	15307
	15308	+ if (checker.flipV)
	15309	+ gl.glTexCoord2f((i + 1) / 2, 1 - (j + 1 + stepv) / 2); // (0,0) //(i+1)/2,(j+1)/2);
	15310	+ else
14461	15311	gl.glTexCoord2f((i + 1) / 2, (j + 1 + stepv) / 2); // (0,0) //(i+1)/2,(j+1)/2);
14462	15312	gl.glVertex3f(i, j + stepv, -0.5f);
14463	15313	}
..	..	@@ -14469,7 +15319,7 @@
14469	15319	gl.glMatrixMode(GL.GL_PROJECTION);
14470	15320	gl.glPopMatrix();
14471	15321	gl.glMatrixMode(GL.GL_MODELVIEW);
14472		- PopMatrix(null); // checker.toParent); // null);
	15322	+ //PopMatrix(null); // checker.toParent); // null);
14473	15323	gl.glPopMatrix();
14474	15324	PopTextureMatrix(checker.toParent);
14475	15325	gl.glMatrixMode(GL.GL_TEXTURE);
..	..	@@ -14582,14 +15432,14 @@
14582	15432
14583	15433	//int tmp = selection_view;
14584	15434	//selection_view = -1;
14585		- int temp = drawMode;
14586		- drawMode = SELECTION;
	15435	+ int temp = DrawMode();
	15436	+ Globals.drawMode = SELECTION; // WARNING
14587	15437	indexcount = 0;
14588	15438	parent.display(drawable);
14589	15439	//selection_view = tmp;
14590	15440	//if (temp == SELECTION)
14591	15441	// temp = DEFAULT; // patch for selection debug
14592		- drawMode = temp;
	15442	+ Globals.drawMode = temp; // WARNING
14593	15443
14594	15444	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
14595	15445
..	..	@@ -14639,6 +15489,11 @@
14639	15489	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
14640	15490	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
14641	15491
	15492	+ // Will fit the mesh !!!
	15493	+ selectedpoint.toParent[0][0] = 0.0001;
	15494	+ selectedpoint.toParent[1][1] = 0.0001;
	15495	+ selectedpoint.toParent[2][2] = 0.0001;
	15496	+
14642	15497	glu.gluUnProject(x,y,depth,view,0,tempmat2,0,viewport,0,selectedpoint.toParent[3],0);
14643	15498
14644	15499	// if (object.selection != null && object.selection.Size() > 0)
..	..	@@ -14682,16 +15537,16 @@
14682	15537	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]));
14683	15538	}
14684	15539
14685		- previousselectedpoint = (Sphere) GraphreeD.clone(selectedpoint);
	15540	+ previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
14686	15541	}
14687	15542	}
14688	15543
14689	15544	if (!movingcamera && !PAINTMODE)
14690	15545	object.editWindow.ScreenFitPoint(); // fev 2014
14691	15546
14692		- if (PAINTMODE && GraphreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	15547	+ if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
14693	15548	{
14694		- Object3D paintobj = GraphreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	15549	+ Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
14695	15550
14696	15551	Object3D group = new Object3D("inst" + paintcount++);
14697	15552
..	..	@@ -14857,14 +15712,14 @@
14857	15712	//gl.glColorMask(false, false, false, false);
14858	15713
14859	15714	//render_scene_from_light_view(gl, drawable, 0, 0);
14860		- if (RENDERSHADOW && lighttouched && !movingcamera) // && !parent.IsFreezed())
	15715	+ if (RENDERSHADOW && Globals.lighttouched && !movingcamera) // && !parent.IsFreezed())
14861	15716	{
14862	15717	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
14863	15718
14864		- int temp = drawMode;
14865		- drawMode = SHADOW;
	15719	+ int temp = DrawMode();
	15720	+ Globals.drawMode = SHADOW; // WARNING
14866	15721	parent.display(drawable);
14867		- drawMode = temp;
	15722	+ Globals.drawMode = temp; // WARNING
14868	15723	}
14869	15724
14870	15725	gl.glCullFace(gl.GL_BACK);
..	..	@@ -15027,13 +15882,19 @@
15027	15882	gl.glFlush();
15028	15883
15029	15884	/**/
15030		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusionsizebuffer);
	15885	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
15031	15886
15032		- int[] pixels = occlusionsizebuffer.array();
	15887	+ float[] pixels = occlusionsizebuffer.array();
15033	15888
15034	15889	double r = 0, g = 0, b = 0;
15035	15890
15036	15891	double count = 0;
	15892	+
	15893	+ gl.glGetDoublev(gl.GL_PROJECTION_MATRIX, tempmat2, 0);
	15894	+
	15895	+ float mindepth = 1;
	15896	+
	15897	+ double FACTOR = 1;
15037	15898
15038	15899	for (int i = 0; i < pixels.length; i++)
15039	15900	{
..	..	@@ -15118,7 +15979,7 @@
15118	15979
15119	15980	double scale = ray.z; // 1; // cos
15120	15981
15121		- int p = pixels[newindex];
	15982	+ float depth = pixels[newindex];
15122	15983
15123	15984	/*
15124	15985	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -15142,10 +16003,23 @@
15142	16003	scale = (1 - modu) * modv;
15143	16004	*/
15144	16005
15145		- r += ((p >> 16) & 0xFF) * scale / 255;
15146		- g += ((p >> 8) & 0xFF) * scale / 255;
15147		- b += (p & 0xFF) * scale / 255;
	16006	+ //r += ((p >> 16) & 0xFF) * scale / 255;
	16007	+ //g += ((p >> 8) & 0xFF) * scale / 255;
	16008	+ //b += (p & 0xFF) * scale / 255;
	16009	+
	16010	+ if (mindepth > depth)
	16011	+ {
	16012	+ mindepth = depth;
	16013	+ }
15148	16014
	16015	+ double z_eye = tempmat2[34 + 2] / (depth -2.0 + 1.0 - tempmat2[2*4 + 2]);
	16016	+
	16017	+ double factor = 1 - Math.exp(-z_eye * z_eye / FACTOR);
	16018	+
	16019	+ r += factor * scale;
	16020	+ g += factor * scale;
	16021	+ b += factor * scale;
	16022	+
15149	16023	count += scale;
15150	16024	}
15151	16025
..	..	@@ -15243,12 +16117,6 @@
15243	16117	GLUT glut = new GLUT();
15244	16118
15245	16119
15246		- static final public int DEFAULT = 0;
15247		- static final public int SELECTION = 1;
15248		- static final public int SHADOW = 2;
15249		- static final public int OCCLUSION = 3;
15250		- static
15251		- public int drawMode = DEFAULT;
15252	16120	public boolean spherical = false;
15253	16121	static boolean DEBUG_OCCLUSION = false;
15254	16122	static boolean DEBUG_SELECTION = false;
..	..	@@ -15261,10 +16129,12 @@
15261	16129	int AAbuffersize = 0;
15262	16130
15263	16131	//double[] selectedpoint = new double[3];
15264		- static Sphere selectedpoint = new Sphere();
	16132	+ static Superellipsoid selectedpoint = new Superellipsoid();
15265	16133	static Sphere previousselectedpoint = null;
15266		- static Sphere debugpoint = new Sphere();
15267		- static Sphere debugpoint2 = new Sphere();
	16134	+ static Sphere debugpointG = new Sphere();
	16135	+ static Sphere debugpointP = new Sphere();
	16136	+ static Sphere debugpointC = new Sphere();
	16137	+ static Sphere debugpointR = new Sphere();
15268	16138
15269	16139	static Sphere debugpoints[] = new Sphere[8];
15270	16140
..	..	@@ -15317,7 +16187,8 @@
15317	16187	static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
15318	16188	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
15319	16189	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
15320		- static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	16190	+ //static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	16191	+ static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
15321	16192	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
15322	16193	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
15323	16194	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();