~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
..	..	@@ -70,8 +56,6 @@
70	56	static int CURRENTANTIALIAS = 0; // 1;
71	57	/static/ boolean RENDERSHADOW = true;
72	58	/static/ int RENDERPROGRAM = 2; // 0 == none, 1 == fast, 2 == normal
73		- static boolean ANIMATION = false;
74		- static String filename;
75	59
76	60	boolean DISPLAYTEXT = false;
77	61	//boolean REDUCETEXTURE = true;
..	..	@@ -97,10 +81,8 @@
97	81
98	82	static boolean textureon = true;
99	83	static boolean LOCALTRANSFORM = false;
100		-private static boolean LIVE = false;
101	84	static boolean FULLSCREEN = false;
102	85	static boolean SUPPORT = true;
103		-static boolean CROWD = false;
104	86	static boolean INERTIA = true;
105	87	static boolean FAST = false;
106	88	static boolean SLOWPOSE = false;
..	..	@@ -108,6 +90,8 @@
108	90
109	91	static int tickcount = 0; // slow pose issue
110	92
	93	+static boolean BUTTONLESSWHEEL = false;
	94	+static boolean ZOOMBOXMODE = false;
111	95	static boolean BOXMODE = false;
112	96	static boolean IMAGEFLIP = false;
113	97	static boolean SMOOTHFOCUS = false;
..	..	@@ -122,7 +106,7 @@
122	106	static boolean OEIL = true;
123	107	static boolean OEILONCE = false; // do oeilon then oeiloff
124	108	static boolean LOOKAT = true;
125		-static boolean RANDOM = true; // false;
	109	+static boolean SWITCH = true; // false;
126	110	static boolean HANDLES = false; // selection doesn't work!!
127	111	static boolean PAINTMODE = false;
128	112
..	..	@@ -165,12 +149,41 @@
165	149	defaultcaps.setAccumBlueBits(16);
166	150	defaultcaps.setAccumAlphaBits(16);
167	151	}
168		- static CameraPane theRenderer;
169		-
	152	+
	153	+ private File defaultDirectory = javax.swing.filechooser.FileSystemView.getFileSystemView().getDefaultDirectory();
	154	+
170	155	void SetAsGLRenderer(boolean b)
171	156	{
172	157	isRenderer = b;
173		- theRenderer = this;
	158	+ Globals.theRenderer = this;
	159	+ }
	160	+
	161	+ CameraPane(Object3D o, Camera cam, boolean withcontext)
	162	+ {
	163	+ super(defaultcaps, null, withcontext?glcontext:null, null);
	164	+
	165	+ //System.out.println("AMERICA AREA = " + (9458886 + 9210755 + 8480395 + 2736391 + 1943018 + 1289475 + 1141569 + 1069350 + 911559 + 721229 + 395886 + 377972 + 246700 + 211156 + 173985 + 141133 + 118279 + 112079 + 108523));
	166	+ glcontext = getContext();
	167	+
	168	+ cameras = new Camera[2];
	169	+ targetLookAts = new cVector[2];
	170	+
	171	+ SetCamera(cam);
	172	+
	173	+ SetLight(new Camera(new cVector(10, 10, -20)));
	174	+
	175	+ object = o;
	176	+
	177	+ setBackground(Color.white);
	178	+
	179	+ addKeyListener(this);
	180	+ addMouseListener(this);
	181	+ addMouseMotionListener(this);
	182	+ addMouseWheelListener(this);
	183	+ //System.out.println("addGLEventListener: " + this);
	184	+ addGLEventListener(this);
	185	+
	186	+// pingthread.start(); // may 2013
174	187	}
175	188
176	189	static boolean AntialiasingEnabled()
..	..	@@ -178,12 +191,53 @@
178	191	return CURRENTANTIALIAS > 0;
179	192	}
180	193
181		- void ClearDepth()
	194	+ /// INTERFACE
	195	+
	196	+ public javax.media.opengl.GL GetGL0()
	197	+ {
	198	+ return null;
	199	+ }
	200	+
	201	+ public int GenList()
	202	+ {
	203	+ javax.media.opengl.GL gl = GetGL();
	204	+ return gl.glGenLists(1);
	205	+ }
	206	+
	207	+ public void NewList(int id)
	208	+ {
	209	+ javax.media.opengl.GL gl = GetGL();
	210	+ gl.glNewList(id, gl.GL_COMPILE); //_AND_EXECUTE);
	211	+ }
	212	+
	213	+ public void CallList(int id)
	214	+ {
	215	+ javax.media.opengl.GL gl = GetGL();
	216	+ gl.glCallList(id);
	217	+ }
	218	+
	219	+ public void EndList()
	220	+ {
	221	+ javax.media.opengl.GL gl = GetGL();
	222	+ gl.glEndList();
	223	+ }
	224	+
	225	+ public boolean IsBoxMode()
	226	+ {
	227	+ return BOXMODE;
	228	+ }
	229	+
	230	+ public boolean IsZoomBoxMode()
	231	+ {
	232	+ return ZOOMBOXMODE;
	233	+ }
	234	+
	235	+ public void ClearDepth()
182	236	{
183	237	GetGL().glClear(GetGL().GL_DEPTH_BUFFER_BIT);
184	238	}
185	239
186		- void DepthTest(boolean depthtest)
	240	+ public void DepthTest(boolean depthtest)
187	241	{
188	242	if (depthtest)
189	243	GetGL().glDepthFunc(GL.GL_LEQUAL);
..	..	@@ -191,7 +245,7 @@
191	245	GetGL().glDepthFunc(GL.GL_ALWAYS);
192	246	}
193	247
194		- void DepthWrite(boolean depthwrite)
	248	+ public void DepthWrite(boolean depthwrite)
195	249	{
196	250	if (depthwrite)
197	251	GetGL().glDepthMask(true);
..	..	@@ -199,12 +253,1602 @@
199	253	GetGL().glDepthMask(false);
200	254	}
201	255
202		- void BackFaceCull(boolean bfc)
	256	+ public void BackFaceCull(boolean bfc)
203	257	{
204	258	if (bfc)
205	259	GetGL().glEnable(GetGL().GL_CULL_FACE);
206	260	else
207	261	GetGL().glDisable(GetGL().GL_CULL_FACE);
	262	+ }
	263	+
	264	+ public boolean BackFaceCullMode()
	265	+ {
	266	+ return this.CULLFACE;
	267	+ }
	268	+
	269	+ public boolean IsAmbientOcclusionOn()
	270	+ {
	271	+ return this.ambientOcclusion;
	272	+ }
	273	+
	274	+ public boolean IsDebugSelection()
	275	+ {
	276	+ return DEBUG_SELECTION;
	277	+ }
	278	+
	279	+ public boolean IsFrozen()
	280	+ {
	281	+ boolean selectmode = this.DrawMode() == SELECTION \|\| this.IsDebugSelection();
	282	+
	283	+ return !selectmode && cameracount == 0; // != 0;
	284	+ }
	285	+
	286	+ // Currently in Globals
	287	+ public int DrawMode()
	288	+ {
	289	+ return Globals.DrawMode();
	290	+ }
	291	+
	292	+ public Camera EyeCamera()
	293	+ {
	294	+ return eyeCamera;
	295	+ }
	296	+
	297	+ public Camera LightCamera()
	298	+ {
	299	+ return lightCamera;
	300	+ }
	301	+
	302	+ public Camera ManipCamera()
	303	+ {
	304	+ return manipCamera;
	305	+ }
	306	+
	307	+ public Camera RenderCamera()
	308	+ {
	309	+ return renderCamera;
	310	+ }
	311	+
	312	+ public Camera[] Cameras()
	313	+ {
	314	+ return cameras;
	315	+ }
	316	+
	317	+ public void PushMaterial(Object3D obj, boolean selected)
	318	+ {
	319	+ CameraPane display = this;
	320	+ javax.media.opengl.GL gl = display.GetGL();
	321	+ cMaterial material = obj.material;
	322	+
	323	+ if (material != null)
	324	+ {
	325	+ materialstack[materialdepth] = material;
	326	+ selectedstack[materialdepth] = selected;
	327	+ cStatic.objectstack[materialdepth++] = obj;
	328	+ //System.out.println("material " + material);
	329	+ //Applet3D.tracein(this, selected);
	330	+ display.vector2buffer = obj.projectedVertices;
	331	+ if (obj instanceof Camera)
	332	+ {
	333	+ display.options1[0] = material.shift;
	334	+ //System.out.println("shift " + material.shift);
	335	+ display.options1[1] = material.lightarea;
	336	+ display.options1[2] = material.shadowbias;
	337	+ display.options1[3] = material.aniso;
	338	+ display.options1[4] = material.anisoV;
	339	+ display.options2[0] = material.opacity;
	340	+ display.options2[1] = material.diffuse;
	341	+ display.options2[2] = material.factor;
	342	+
	343	+ cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
	344	+ display.options4[0] = material.cameralight/0.2f;
	345	+ display.options4[1] = material.subsurface;
	346	+ display.options4[2] = material.sheen;
	347	+
	348	+ // if (display.CURRENTANTIALIAS > 0)
	349	+ // display.options3[3] /= 4;
	350	+
	351	+ /*
	352	+ System.out.println("Focus = " + display.options1[0]);
	353	+ System.out.println("Aperture = " + display.options1[1]);
	354	+ System.out.println("ShadowBlur = " + display.options1[2]);
	355	+ System.out.println("Antialiasing = " + display.options1[3]);
	356	+ System.out.println("Fog = " + display.options2[0]);
	357	+ System.out.println("Intensity = " + display.options2[1]);
	358	+ System.out.println("Elevation = " + display.options2[2]);
	359	+ /**/
	360	+ } else
	361	+ {
	362	+ DrawMaterial(material, selected);
	363	+ }
	364	+ } else
	365	+ {
	366	+ if (selected && CameraPane.flash)
	367	+ {
	368	+ display.modelParams4[1] = 100;
	369	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	370	+ }
	371	+ }
	372	+ }
	373	+
	374	+ public void PushMaterial2(Object3D obj, boolean selected)
	375	+ {
	376	+ CameraPane display = this;
	377	+ cMaterial material = obj.material;
	378	+
	379	+ if (material != null)
	380	+ {
	381	+ materialstack[materialdepth] = material;
	382	+ selectedstack[materialdepth] = selected;
	383	+ cStatic.objectstack[materialdepth++] = obj;
	384	+ //System.out.println("material " + material);
	385	+ //Applet3D.tracein("selected ", selected);
	386	+ display.vector2buffer = obj.projectedVertices;
	387	+ display.DrawMaterial(material, selected);
	388	+ }
	389	+ }
	390	+
	391	+ public void PopMaterial(Object3D obj, boolean selected)
	392	+ {
	393	+ CameraPane display = this;
	394	+ javax.media.opengl.GL gl = display.GetGL();
	395	+ cMaterial material = obj.material;
	396	+
	397	+ //if (parent != null && parent.GetMaterial() != null)
	398	+ // parent.GetMaterial().Draw(display, parent.IsSelected(this));
	399	+ if (material != null)
	400	+ {
	401	+ materialdepth -= 1;
	402	+ if (materialdepth > 0)
	403	+ {
	404	+ display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	405	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	406	+ }
	407	+ //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
	408	+ } else if (selected && CameraPane.flash && obj.GetMaterial() != null)
	409	+ {
	410	+ display.modelParams4[1] = obj.GetMaterial().cameralight;
	411	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	412	+ }
	413	+ }
	414	+
	415	+ public void PopMaterial2(Object3D obj)
	416	+ {
	417	+ CameraPane display = this;
	418	+ cMaterial material = obj.material;
	419	+
	420	+ if (material != null)
	421	+ {
	422	+ materialdepth -= 1;
	423	+ if (materialdepth > 0)
	424	+ {
	425	+ display.vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	426	+ display.DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
	427	+ }
	428	+ //Applet3D.traceout("selected ", (stackdepth>0)?selectedstack[stackdepth-1]:"???");
	429	+ //else
	430	+ //material.Draw(display, false);
	431	+ }
	432	+ }
	433	+
	434	+ public void DrawFace(Object3D obj, Vertex pv, Vertex qv, Vertex rv, Face face)
	435	+ {
	436	+ CameraPane display = this;
	437	+
	438	+ if (pv.y == -10000 \|\|
	439	+ qv.y == -10000 \|\|
	440	+ rv.y == -10000)
	441	+ return;
	442	+
	443	+// float b = f.nbiterations & 1;
	444	+// float g = (f.nbiterations>>1) & 1;
	445	+// float r = (f.nbiterations>>2) & 1;
	446	+//
	447	+// //if (f.weight == 10000)
	448	+// //{
	449	+// // r = 1; g = b = 0;
	450	+// //}
	451	+// //else
	452	+// //{
	453	+// // assert(f.weight < 10000);
	454	+// r = g = b = (float)bRep.FaceWeight(f)*100;
	455	+// if (r<0)
	456	+// assert(r>=0);
	457	+// //}
	458	+
	459	+ javax.media.opengl.GL gl = display.GetGL();
	460	+
	461	+ boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
	462	+
	463	+ //System.out.println("p = " + pv + "; q = " + qv + "; r = " + rv);
	464	+ if (!selectmode) // display.drawMode != display.SELECTION) // && display.drawMode != display.SHADOW) // (attributes & FILL) != 0)
	465	+ {
	466	+ //gl.glBegin(gl.GL_TRIANGLES);
	467	+ boolean hasnorm = pv.norm != null && (pv.norm.x != 0 \|\| pv.norm.y != 0 \|\| pv.norm.z != 0)
	468	+ // TEST LIVE NORMALS && !obj.dontselect
	469	+ ;
	470	+ if (!hasnorm)
	471	+ {
	472	+ // System.out.println("Mesh normal");
	473	+ LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
	474	+ LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
	475	+ LA.vecCross(obj.v0, obj.v1, obj.v2);
	476	+ LA.vecNormalize(obj.v2);
	477	+ gl.glNormal3f((float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
	478	+ }
	479	+
	480	+ // P
	481	+ float x = (float)pv.x;
	482	+ float y = (float)pv.y;
	483	+ float z = (float)pv.z;
	484	+
	485	+ if (hasnorm)
	486	+ {
	487	+// if (!pv.norm.normalized())
	488	+// assert(pv.norm.normalized());
	489	+
	490	+ //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
	491	+ float nx = (float)pv.norm.x;
	492	+ float ny = (float)pv.norm.y;
	493	+ float nz = (float)pv.norm.z;
	494	+
	495	+ x += nx * obj.NORMALPUSH;
	496	+ y += ny * obj.NORMALPUSH;
	497	+ z += nz * obj.NORMALPUSH;
	498	+
	499	+ gl.glNormal3f(nx, ny, nz);
	500	+ }
	501	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	502	+ SetColor(obj, pv);
	503	+ //gl.glColor4f(r, g, b, 1);
	504	+ //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
	505	+ if (obj.flipV)
	506	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	507	+ else
	508	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	509	+ //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
	510	+
	511	+ gl.glVertex3f(x, y, z);
	512	+
	513	+ // Q
	514	+ x = (float)qv.x;
	515	+ y = (float)qv.y;
	516	+ z = (float)qv.z;
	517	+
	518	+// Print(pv);
	519	+ if (hasnorm)
	520	+ {
	521	+// assert(qv.norm.normalized());
	522	+ //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
	523	+ float nx = (float)qv.norm.x;
	524	+ float ny = (float)qv.norm.y;
	525	+ float nz = (float)qv.norm.z;
	526	+
	527	+ x += nx * obj.NORMALPUSH;
	528	+ y += ny * obj.NORMALPUSH;
	529	+ z += nz * obj.NORMALPUSH;
	530	+
	531	+ gl.glNormal3f(nx, ny, nz);
	532	+ }
	533	+ //System.out.println("vertexq = " + qv.s + ", " + qv.t);
	534	+ // boolean locked = false;
	535	+ // float eps = 0.1f;
	536	+ // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	537	+
	538	+ // int dot = 0; //*/ (int)f.dot;
	539	+
	540	+ // if ((dot&1) == 0)
	541	+ // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	542	+
	543	+ // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	544	+ if (obj.flipV)
	545	+ gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
	546	+ else
	547	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	548	+ // else
	549	+ // {
	550	+ // locked = true;
	551	+ // gl.glTexCoord2f((float) pv.s, (float) pv.t);
	552	+ // }
	553	+ gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
	554	+ SetColor(obj, qv);
	555	+
	556	+ gl.glVertex3f(x, y, z);
	557	+ //gl.glColor4f(r, g, b, 1);
	558	+ //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
	559	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	560	+// Print(qv);
	561	+
	562	+ // R
	563	+ x = (float)rv.x;
	564	+ y = (float)rv.y;
	565	+ z = (float)rv.z;
	566	+
	567	+ if (hasnorm)
	568	+ {
	569	+// assert(rv.norm.normalized());
	570	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	571	+ float nx = (float)rv.norm.x;
	572	+ float ny = (float)rv.norm.y;
	573	+ float nz = (float)rv.norm.z;
	574	+
	575	+ x += nx * obj.NORMALPUSH;
	576	+ y += ny * obj.NORMALPUSH;
	577	+ z += nz * obj.NORMALPUSH;
	578	+
	579	+ gl.glNormal3f(nx, ny, nz);
	580	+ }
	581	+
	582	+ // if ((dot&4) == 0)
	583	+ // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	584	+
	585	+ // if (wrap \|\| !locked && (dot&8) != 0)
	586	+ if (obj.flipV)
	587	+ gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
	588	+ else
	589	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	590	+ // else
	591	+ // gl.glTexCoord2f((float) pv.s, (float) pv.t);
	592	+
	593	+ // f.dot = dot;
	594	+
	595	+ gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
	596	+ SetColor(obj, rv);
	597	+ //gl.glColor4f(r, g, b, 1);
	598	+ //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
	599	+ //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
	600	+ gl.glVertex3f(x, y, z);
	601	+// Print(rv);
	602	+ //gl.glEnd();
	603	+ }
	604	+ else
	605	+ {
	606	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	607	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	608	+ gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
	609	+
	610	+ }
	611	+
	612	+ if (false) // (attributes & WIREFRAME) != 0)
	613	+ {
	614	+ gl.glDisable(gl.GL_LIGHTING);
	615	+
	616	+ gl.glBegin(gl.GL_LINE_LOOP);
	617	+ gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
	618	+ gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
	619	+ gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
	620	+ gl.glEnd();
	621	+
	622	+ gl.glEnable(gl.GL_LIGHTING);
	623	+ }
	624	+ }
	625	+
	626	+ /**
	627	+ * <code>draw</code> renders a <code>TriMesh</code> object including
	628	+ * it's normals, colors, textures and vertices.
	629	+ *
	630	+ * @see Renderer#draw(TriMesh)
	631	+ * @param tris
	632	+ * the mesh to render.
	633	+ */
	634	+ public void DrawParticles(TriMesh geo, Object3D shape, boolean selected, boolean rotate) // TriMesh tris)
	635	+ {
	636	+ CameraPane display = this;
	637	+
	638	+ float r = display.modelParams0[0];
	639	+ float g = display.modelParams0[1];
	640	+ float b = display.modelParams0[2];
	641	+ float opacity = display.modelParams5[1];
	642	+
	643	+ //final GL gl = GLU.getCurrentGL();
	644	+ GL gl = display.GetGL(); // getGL();
	645	+
	646	+ FloatBuffer vertBuf = geo.vertBuf;
	647	+
	648	+ int v = vertBuf.capacity();
	649	+
	650	+ int count = 0;
	651	+
	652	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	653	+ gl.glEnable(gl.GL_CULL_FACE);
	654	+ // gl.glScalef(1.0f/1024,1.0f/1024,1.0f/1024);
	655	+ for (int i=0; i<v/3; i++)
	656	+ {
	657	+ int index3 = i*3;
	658	+
	659	+ if (geo.sizeBuf.get(index3+1) == 0)
	660	+ continue;
	661	+
	662	+ count++;
	663	+
	664	+ int index4 = i*4;
	665	+
	666	+ float tx = vertBuf.get(index3);
	667	+ float ty = vertBuf.get(index3+1);
	668	+ float tz = vertBuf.get(index3+2);
	669	+
	670	+ // if (tx == 0 && ty == 0 && tz == 0)
	671	+ // continue;
	672	+
	673	+ gl.glMatrixMode(gl.GL_TEXTURE);
	674	+ gl.glPushMatrix();
	675	+
	676	+ float[] texmat = geo.texmat;
	677	+ texmat[12] = texmat[13] = texmat[14] = i;
	678	+
	679	+ gl.glMultMatrixf(texmat, 0);
	680	+
	681	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	682	+ gl.glPushMatrix();
	683	+
	684	+ gl.glTranslatef(tx,ty,tz);
	685	+
	686	+ if (rotate)
	687	+ gl.glRotatef(i, 0, 1, 0);
	688	+
	689	+ float size = geo.sizeBuf.get(index3) / 100;
	690	+ gl.glScalef(size,size,size);
	691	+
	692	+ float cr = geo.colorBuf.get(index4);
	693	+ float cg = geo.colorBuf.get(index4+1);
	694	+ float cb = geo.colorBuf.get(index4+2);
	695	+ float ca = geo.colorBuf.get(index4+3);
	696	+
	697	+ display.modelParams0[0] = r * cr;
	698	+ display.modelParams0[1] = g * cg;
	699	+ display.modelParams0[2] = b * cb;
	700	+
	701	+ display.modelParams5[1] = opacity * ca;
	702	+
	703	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	704	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	705	+
	706	+ RandomNode.globalseed = (int)geo.sizeBuf.get(index3+2); // i;
	707	+ RandomNode.globalseed2 = RandomNode.globalseed;
	708	+
	709	+// gl.glColor4f(cr,cg,cb,ca);
	710	+ // gl.glScalef(1024/16,1024/16,1024/16);
	711	+ shape.Draw/Node/(display,null,selected,false); // blocked
	712	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	713	+ //gl.glTranslatef(-tx,-ty,-tz);
	714	+ gl.glPopMatrix();
	715	+
	716	+ gl.glMatrixMode(gl.GL_TEXTURE);
	717	+ gl.glPopMatrix();
	718	+ }
	719	+ // gl.glScalef(1024,1024,1024);
	720	+ if (!cf)
	721	+ gl.glDisable(gl.GL_CULL_FACE);
	722	+
	723	+ display.modelParams0[0] = r;
	724	+ display.modelParams0[1] = g;
	725	+ display.modelParams0[2] = b;
	726	+
	727	+ display.modelParams5[1] = opacity;
	728	+
	729	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	730	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	731	+
	732	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	733	+
	734	+// System.err.println("total = " + v/3 + "; displayed = " + count);
	735	+ if (true)
	736	+ return;
	737	+
	738	+//// if (!tris.predraw(this))
	739	+//// {
	740	+//// return;
	741	+//// }
	742	+//// if (Debug.stats)
	743	+//// {
	744	+//// StatCollector.addStat(StatType.STAT_TRIANGLE_COUNT, tris.getTriangleCount());
	745	+//// StatCollector.addStat(StatType.STAT_VERTEX_COUNT, tris.getVertexCount());
	746	+//// StatCollector.addStat(StatType.STAT_GEOM_COUNT, 1);
	747	+//// }
	748	+////
	749	+//// if (tris.getDisplayListID() != -1)
	750	+//// {
	751	+//// renderDisplayList(tris);
	752	+//// return;
	753	+//// }
	754	+////
	755	+//// if (!generatingDisplayList)
	756	+//// {
	757	+//// applyStates(tris.states, tris);
	758	+//// }
	759	+//// if (Debug.stats)
	760	+//// {
	761	+//// StatCollector.startStat(StatType.STAT_RENDER_TIMER);
	762	+//// }
	763	+//// boolean transformed = doTransforms(tris);
	764	+//
	765	+// int glMode = GL.GL_TRIANGLES;
	766	+// switch (getMode())
	767	+// {
	768	+// case Triangles:
	769	+// glMode = GL.GL_TRIANGLES;
	770	+// break;
	771	+// case Strip:
	772	+// glMode = GL.GL_TRIANGLE_STRIP;
	773	+// break;
	774	+// case Fan:
	775	+// glMode = GL.GL_TRIANGLE_FAN;
	776	+// break;
	777	+// }
	778	+//
	779	+// if (!predrawGeometry(gl))
	780	+// {
	781	+// // make sure only the necessary indices are sent through on old
	782	+// // cards.
	783	+// IntBuffer indices = this.getIndexBuffer();
	784	+// if (indices == null)
	785	+// {
	786	+// logger.severe("missing indices on geometry object: " + this.toString());
	787	+// } else
	788	+// {
	789	+// indices.rewind();
	790	+// indices.limit(this.getMaxIndex());
	791	+//
	792	+// gl.glDrawElements(glMode, indices.limit(), GL.GL_UNSIGNED_INT, indices); // TODO Check <count> and assumed <type> of GL_UNSIGNED_INT
	793	+//
	794	+// indices.clear();
	795	+// }
	796	+// } else
	797	+// {
	798	+// gl.glDrawElements(glMode, this.getIndexBuffer().limit(),
	799	+// GL.GL_UNSIGNED_INT, 0);
	800	+// }
	801	+//
	802	+//// postdrawGeometry(tris);
	803	+//// if (transformed)
	804	+//// {
	805	+//// undoTransforms(tris);
	806	+//// }
	807	+////
	808	+//// if (Debug.stats)
	809	+//// {
	810	+//// StatCollector.endStat(StatType.STAT_RENDER_TIMER);
	811	+//// }
	812	+//// tris.postdraw(this);
	813	+ }
	814	+
	815	+ static Camera localcamera = new Camera();
	816	+ static cVector from = new cVector();
	817	+ static cVector to = new cVector();
	818	+
	819	+ public void PrepOcclusion(BoundaryRep br, double[][] transform)
	820	+ {
	821	+ CameraPane cp = this;
	822	+
	823	+ Camera keep = cp.RenderCamera();
	824	+ cp.renderCamera = localcamera;
	825	+
	826	+ if (br.trimmed)
	827	+ {
	828	+ float[] colors = new float[br.positions.length / 3];
	829	+
	830	+ int i3 = 0;
	831	+ for (int i = 0; i < br.positions.length / 3; i++, i3 += 3)
	832	+ {
	833	+ if (br.normals[i3] == 0 && br.normals[i3+1] == 0 && br.normals[i3+2] == 0)
	834	+ continue;
	835	+
	836	+ from.set(br.positions[i3], br.positions[i3 + 1], br.positions[i3 + 2]);
	837	+ to.set(br.positions[i3] + br.normals[i3],
	838	+ br.positions[i3 + 1] + br.normals[i3 + 1],
	839	+ br.positions[i3 + 2] + br.normals[i3 + 2]);
	840	+ LA.xformPos(from, transform, from);
	841	+ LA.xformPos(to, transform, to); // RIGID ONLY
	842	+ localcamera.setAim(from, to);
	843	+
	844	+ CameraPane.occlusionbuffer.display();
	845	+
	846	+ if (CameraPane.DEBUG_OCCLUSION)
	847	+ cp.display(); // debug
	848	+
	849	+ colors[i] = cp.vertexOcclusion.r;
	850	+ //colors[i3 + 1] = cp.vertexOcclusion.g;
	851	+ //colors[i3 + 2] = cp.vertexOcclusion.b;
	852	+
	853	+ if ((i % 100) == 0 && i != 0)
	854	+ {
	855	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	856	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	857	+ System.out.println((int) (100.0 * i / (br.positions.length / 3)) + "% (" + i + " of " + (br.positions.length / 3) + ")");
	858	+ }
	859	+ }
	860	+
	861	+ br.colors = colors;
	862	+ }
	863	+ else
	864	+ {
	865	+ for (int i = 0; i < br.VertexCount(); i++)
	866	+ {
	867	+ Vertex v = br.GetVertex(i);
	868	+
	869	+ if (v.norm == null \|\| v.norm.x == 0 && v.norm.y == 0 && v.norm.z == 0)
	870	+ continue;
	871	+
	872	+ from.set(v.x, v.y, v.z);
	873	+ to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
	874	+ LA.xformPos(from, transform, from);
	875	+ LA.xformPos(to, transform, to); // RIGID ONLY
	876	+ localcamera.setAim(from, to);
	877	+
	878	+ CameraPane.occlusionbuffer.display();
	879	+
	880	+ if (CameraPane.DEBUG_OCCLUSION)
	881	+ cp.display(); // debug
	882	+
	883	+ v.AO = cp.vertexOcclusion.r;
	884	+
	885	+ if ((i % 100) == 0 && i != 0)
	886	+ {
	887	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	888	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	889	+ System.out.println((int) (100.0 * i / br.VertexCount()) + "% (" + i + " of " + br.VertexCount() + ")");
	890	+ }
	891	+ }
	892	+ }
	893	+
	894	+ //System.out.println("done.");
	895	+
	896	+ cp.renderCamera = keep;
	897	+ }
	898	+
	899	+ void DrawPointFLow(PointFlow pointFlow, Object3D /Composite/ root, boolean selected, boolean blocked)
	900	+ {
	901	+ CameraPane display = this;
	902	+ pointFlow.CreateHT();
	903	+
	904	+ float r = display.modelParams0[0];
	905	+ float g = display.modelParams0[1];
	906	+ float b = display.modelParams0[2];
	907	+ float opacity = display.modelParams5[1];
	908	+
	909	+ //final GL gl = GLU.getCurrentGL();
	910	+ GL gl = display.GetGL(); // getGL();
	911	+
	912	+ int s = pointFlow.points.size();
	913	+
	914	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	915	+ gl.glEnable(gl.GL_CULL_FACE);
	916	+
	917	+ for (int i=s; --i>=0;)
	918	+ //for (int i=0; i<s; i++)
	919	+ {
	920	+ cVector v = pointFlow.points.get(i);
	921	+
	922	+ double mindist = Double.MAX_VALUE;
	923	+
	924	+ double size = pointFlow.minimumSize;
	925	+
	926	+ double distancenext = 0;
	927	+
	928	+ if (i > 0)
	929	+ {
	930	+ cVector w = pointFlow.points.get(i-1);
	931	+
	932	+ double dist = w.distance(v);
	933	+
	934	+ distancenext = dist;
	935	+
	936	+ if (mindist > dist)
	937	+ {
	938	+ mindist = dist;
	939	+ size = mindist*pointFlow.resizefactor;
	940	+ }
	941	+ }
	942	+
	943	+ if (i < s-1)
	944	+ {
	945	+ cVector w = pointFlow.points.get(i+1);
	946	+
	947	+ double dist = w.distance(v);
	948	+
	949	+ if (mindist > dist)
	950	+ {
	951	+ mindist = dist;
	952	+ size = mindist*pointFlow.resizefactor;
	953	+ }
	954	+ }
	955	+
	956	+ if (size < pointFlow.minimumSize)
	957	+ size = pointFlow.minimumSize;
	958	+ if (size > pointFlow.maximumSize)
	959	+ size = pointFlow.maximumSize;
	960	+
	961	+ double tx = v.x;
	962	+ double ty = v.y;
	963	+ double tz = v.z;
	964	+
	965	+ // if (tx == 0 && ty == 0 && tz == 0)
	966	+ // continue;
	967	+
	968	+ gl.glMatrixMode(gl.GL_TEXTURE);
	969	+ gl.glPushMatrix();
	970	+ pointFlow.texmat[12] = pointFlow.texmat[13] = pointFlow.texmat[14] = i;
	971	+
	972	+ gl.glMultMatrixf(pointFlow.texmat, 0);
	973	+
	974	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	975	+ gl.glPushMatrix();
	976	+
	977	+ gl.glTranslated(tx,ty,tz);
	978	+
	979	+ gl.glScaled(size,size,size);
	980	+
	981	+// float cr = colorBuf.get(index4);
	982	+// float cg = colorBuf.get(index4+1);
	983	+// float cb = colorBuf.get(index4+2);
	984	+// float ca = colorBuf.get(index4+3);
	985	+//
	986	+// display.modelParams0[0] = r * cr;
	987	+// display.modelParams0[1] = g * cg;
	988	+// display.modelParams0[2] = b * cb;
	989	+//
	990	+// display.modelParams5[1] = opacity * ca;
	991	+//
	992	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	993	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	994	+//
	995	+// RandomNode.globalseed = (int)sizeBuf.get(index3+2); // i;
	996	+// RandomNode.globalseed2 = RandomNode.globalseed;
	997	+//
	998	+//// gl.glColor4f(cr,cg,cb,ca);
	999	+// // gl.glScalef(1024/16,1024/16,1024/16);
	1000	+ pointFlow.geo.Draw/Node/(display,null,selected, blocked);
	1001	+
	1002	+ gl.glPopMatrix();
	1003	+
	1004	+ double step = size/4; //
	1005	+
	1006	+ if (i == 0 \|\| size == 0 \|\| distancenext > 8*size \|\| distancenext < step)
	1007	+ continue;
	1008	+
	1009	+ int nbsteps = (int)(distancenext/step);
	1010	+
	1011	+ step = distancenext/nbsteps;
	1012	+
	1013	+ cVector next = pointFlow.points.get(i-1);
	1014	+
	1015	+ tmp.set(next);
	1016	+ tmp.sub(v);
	1017	+ tmp.normalize();
	1018	+ tmp.mul(step);
	1019	+
	1020	+ // calculate next size
	1021	+ mindist = Double.MAX_VALUE;
	1022	+
	1023	+ double nextsize = pointFlow.minimumSize;
	1024	+
	1025	+ if (i > 1)
	1026	+ {
	1027	+ cVector w = pointFlow.points.get(i-2);
	1028	+
	1029	+ double dist = w.distance(next);
	1030	+
	1031	+ if (mindist > dist)
	1032	+ {
	1033	+ mindist = dist;
	1034	+ nextsize = mindist*pointFlow.resizefactor;
	1035	+ }
	1036	+ }
	1037	+
	1038	+ double dist = v.distance(next);
	1039	+
	1040	+ if (mindist > dist)
	1041	+ {
	1042	+ mindist = dist;
	1043	+ nextsize = mindist*pointFlow.resizefactor;
	1044	+ }
	1045	+
	1046	+ if (nextsize < pointFlow.minimumSize)
	1047	+ nextsize = pointFlow.minimumSize;
	1048	+ if (nextsize > pointFlow.maximumSize)
	1049	+ nextsize = pointFlow.maximumSize;
	1050	+ //
	1051	+
	1052	+ double count = 0;
	1053	+
	1054	+ while (distancenext > 0.000000001) // step
	1055	+ {
	1056	+ gl.glPushMatrix();
	1057	+
	1058	+ gl.glTranslated(tx + tmp.xcount, ty + tmp.ycount, tz + tmp.z*count);
	1059	+
	1060	+ double K = count/nbsteps;
	1061	+
	1062	+ double intersize = Knextsize + (1-K)size;
	1063	+
	1064	+ gl.glScaled(intersize,intersize,intersize);
	1065	+
	1066	+ pointFlow.geo.Draw/Node/(display,null,selected,blocked);
	1067	+
	1068	+ count++;
	1069	+
	1070	+ distancenext -= step;
	1071	+
	1072	+ gl.glPopMatrix();
	1073	+ }
	1074	+
	1075	+ if (count != nbsteps)
	1076	+ assert(count == nbsteps);
	1077	+
	1078	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	1079	+ //gl.glTranslatef(-tx,-ty,-tz);
	1080	+
	1081	+ gl.glMatrixMode(gl.GL_TEXTURE);
	1082	+ gl.glPopMatrix();
	1083	+ }
	1084	+
	1085	+ if (!cf)
	1086	+ gl.glDisable(gl.GL_CULL_FACE);
	1087	+
	1088	+// display.modelParams0[0] = r;
	1089	+// display.modelParams0[1] = g;
	1090	+// display.modelParams0[2] = b;
	1091	+//
	1092	+// display.modelParams5[1] = opacity;
	1093	+//
	1094	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1095	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1096	+
	1097	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	1098	+ }
	1099	+
	1100	+ public void DrawBox(cVector min, cVector max)
	1101	+ {
	1102	+ javax.media.opengl.GL gl = GetGL();
	1103	+ gl.glBegin(gl.GL_LINES);
	1104	+
	1105	+ gl.glVertex3d(min.x, min.y, min.z);
	1106	+ gl.glVertex3d(min.x, min.y, max.z);
	1107	+ gl.glVertex3d(min.x, min.y, min.z);
	1108	+ gl.glVertex3d(min.x, max.y, min.z);
	1109	+ gl.glVertex3d(min.x, min.y, min.z);
	1110	+ gl.glVertex3d(max.x, min.y, min.z);
	1111	+
	1112	+ gl.glVertex3d(max.x, max.y, max.z);
	1113	+ gl.glVertex3d(min.x, max.y, max.z);
	1114	+ gl.glVertex3d(max.x, max.y, max.z);
	1115	+ gl.glVertex3d(max.x, min.y, max.z);
	1116	+ gl.glVertex3d(max.x, max.y, max.z);
	1117	+ gl.glVertex3d(max.x, max.y, min.z);
	1118	+
	1119	+ gl.glEnd();
	1120	+ }
	1121	+
	1122	+ public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
	1123	+ {
	1124	+ int[] strips = bRep.getRawIndices();
	1125	+
	1126	+ javax.media.opengl.GL gl = GetGL();
	1127	+
	1128	+ // TRIANGLE STRIP ARRAY
	1129	+ if (bRep.trimmed)
	1130	+ {
	1131	+ float[] v = bRep.getRawVertices();
	1132	+ float[] n = bRep.getRawNormals();
	1133	+ float[] c = bRep.getRawColors();
	1134	+ float[] uv = bRep.getRawUVMap();
	1135	+
	1136	+ int count2 = 0;
	1137	+ int count3 = 0;
	1138	+
	1139	+ if (n.length > 0)
	1140	+ {
	1141	+ for (int i = 0; i < strips.length; i++)
	1142	+ {
	1143	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1144	+
	1145	+ /*
	1146	+ boolean locked = false;
	1147	+ float eps = 0.1f;
	1148	+ boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	1149	+
	1150	+ int dot = 0;
	1151	+
	1152	+ if ((dot&1) == 0)
	1153	+ dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	1154	+
	1155	+ if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	1156	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	1157	+ else
	1158	+ {
	1159	+ locked = true;
	1160	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1161	+ }
	1162	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	1163	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	1164	+ if (hasnorm)
	1165	+ {
	1166	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	1167	+ gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
	1168	+ }
	1169	+
	1170	+ if ((dot&4) == 0)
	1171	+ dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	1172	+
	1173	+ if (wrap \|\| !locked && (dot&8) != 0)
	1174	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	1175	+ else
	1176	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1177	+
	1178	+ f.dot = dot;
	1179	+ */
	1180	+
	1181	+ if (!selectmode)
	1182	+ {
	1183	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1184	+ {
	1185	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1186	+ } else
	1187	+ {
	1188	+ gl.glNormal3f(0, 0, 1);
	1189	+ }
	1190	+
	1191	+ if (c != null)
	1192	+ //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
	1193	+ {
	1194	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1195	+ }
	1196	+ }
	1197	+
	1198	+ if (flipV)
	1199	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1200	+ else
	1201	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1202	+
	1203	+ //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1204	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1205	+
	1206	+ count2 += 2;
	1207	+ count3 += 3;
	1208	+ if (!selectmode)
	1209	+ {
	1210	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1211	+ {
	1212	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1213	+ } else
	1214	+ {
	1215	+ gl.glNormal3f(0, 0, 1);
	1216	+ }
	1217	+ if (c != null)
	1218	+ {
	1219	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1220	+ }
	1221	+ }
	1222	+
	1223	+ if (flipV)
	1224	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1225	+ else
	1226	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1227	+
	1228	+ //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1229	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1230	+
	1231	+ count2 += 2;
	1232	+ count3 += 3;
	1233	+ for (int j = 0; j < strips[i] - 2; j++)
	1234	+ {
	1235	+ //gl.glTexCoord2d(...);
	1236	+ if (!selectmode)
	1237	+ {
	1238	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1239	+ {
	1240	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1241	+ } else
	1242	+ {
	1243	+ gl.glNormal3f(0, 0, 1);
	1244	+ }
	1245	+ if (c != null)
	1246	+ {
	1247	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1248	+ }
	1249	+ }
	1250	+
	1251	+ if (flipV)
	1252	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1253	+ else
	1254	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1255	+
	1256	+ //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
	1257	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1258	+
	1259	+ count2 += 2;
	1260	+ count3 += 3;
	1261	+ }
	1262	+
	1263	+ gl.glEnd();
	1264	+ }
	1265	+ }
	1266	+
	1267	+ assert count3 == v.length;
	1268	+ }
	1269	+ else // !trimmed
	1270	+ {
	1271	+ int count = 0;
	1272	+ for (int i = 0; i < strips.length; i++)
	1273	+ {
	1274	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1275	+
	1276	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	1277	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	1278	+
	1279	+ drawVertex(gl, p, flipV, selectmode);
	1280	+ drawVertex(gl, q, flipV, selectmode);
	1281	+
	1282	+ for (int j = 0; j < strips[i] - 2; j++)
	1283	+ {
	1284	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	1285	+
	1286	+ // if (j%2 == 0)
	1287	+ // drawFace(p, q, r, display, null);
	1288	+ // else
	1289	+ // drawFace(p, r, q, display, null);
	1290	+
	1291	+ // p = q;
	1292	+ // q = r;
	1293	+ drawVertex(gl, r, flipV, selectmode);
	1294	+ }
	1295	+
	1296	+ gl.glEnd();
	1297	+ }
	1298	+ }
	1299	+ }
	1300	+
	1301	+ static cSpring.Point3D temp = new cSpring.Point3D();
	1302	+ static cSpring.Point3D temp2 = new cSpring.Point3D();
	1303	+ static cSpring.Point3D temp3 = new cSpring.Point3D();
	1304	+
	1305	+ public void DrawDynamicMesh(cMesh mesh)
	1306	+ {
	1307	+ GL gl = GetGL(); // getGL();
	1308	+
	1309	+ cSpring.PhysicsController3D Phys = mesh.Phys;
	1310	+
	1311	+ gl.glDisable(gl.GL_LIGHTING);
	1312	+
	1313	+ gl.glLineWidth(1);
	1314	+ gl.glColor3f(1,1,1);
	1315	+ gl.glBegin(gl.GL_LINES);
	1316	+ double scale = 0;
	1317	+ int count = 0;
	1318	+ for (int s=0; s<Phys.allSprings.size(); s++)
	1319	+ {
	1320	+ cSpring.Spring spring = Phys.allSprings.get(s);
	1321	+ if(s == 0)
	1322	+ {
	1323	+ //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
	1324	+ }
	1325	+ if (mesh.showsprings)
	1326	+ {
	1327	+ temp.set(spring.a.position);
	1328	+ temp.add(spring.b.position);
	1329	+ temp.mul(0.5);
	1330	+ temp2.set(spring.a.position);
	1331	+ temp2.sub(spring.b.position);
	1332	+ temp2.mul(spring.restLength/2);
	1333	+ temp.sub(temp2);
	1334	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1335	+ temp.add(temp2);
	1336	+ temp.add(temp2);
	1337	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1338	+ }
	1339	+
	1340	+ if (spring.isHandle)
	1341	+ continue;
	1342	+
	1343	+ //if (scale < spring.restLength)
	1344	+ scale += spring.restLength;
	1345	+ count++;
	1346	+ }
	1347	+ gl.glEnd();
	1348	+
	1349	+ if (count == 0)
	1350	+ scale = 0.01;
	1351	+ else
	1352	+ scale /= count * 3;
	1353	+
	1354	+ //scale = 0.25;
	1355	+
	1356	+ if (mesh.ShowInfo())
	1357	+ {
	1358	+ gl.glLineWidth(4);
	1359	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1360	+ {
	1361	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1362	+ if (node.mass == 0)
	1363	+ continue;
	1364	+
	1365	+ int i = node.springs==null?-1:node.springs.size();
	1366	+ gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
	1367	+ //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
	1368	+ //temp.normalize();
	1369	+ //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
	1370	+ gl.glBegin(gl.GL_LINES);
	1371	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1372	+ //gl.glVertex3d(node.position.x + node.normal.xscale, node.position.y + node.normal.yscale, node.position.z + node.normal.z*scale);
	1373	+ gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
	1374	+ node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
	1375	+ node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
	1376	+ gl.glEnd();
	1377	+ }
	1378	+
	1379	+ gl.glLineWidth(8);
	1380	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1381	+ {
	1382	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1383	+
	1384	+ if (node.springs != null)
	1385	+ {
	1386	+ for (int i=0; i<node.springs.size(); i+=1)
	1387	+ {
	1388	+ cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
	1389	+
	1390	+ int c = i+1;
	1391	+ // c = node.springs.get(i).nbcopies;
	1392	+
	1393	+ gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
	1394	+ gl.glBegin(gl.GL_LINES);
	1395	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1396	+ 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);
	1397	+ gl.glEnd();
	1398	+ }
	1399	+ }
	1400	+ }
	1401	+
	1402	+ gl.glLineWidth(1);
	1403	+ }
	1404	+
	1405	+ gl.glEnable(gl.GL_LIGHTING);
	1406	+ }
	1407	+
	1408	+ /// INTERFACE
	1409	+
	1410	+ public void StartTriangles()
	1411	+ {
	1412	+ javax.media.opengl.GL gl = GetGL();
	1413	+ gl.glBegin(gl.GL_TRIANGLES);
	1414	+ }
	1415	+
	1416	+ public void EndTriangles()
	1417	+ {
	1418	+ GetGL().glEnd();
	1419	+ }
	1420	+
	1421	+ void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
	1422	+ {
	1423	+ if (!selectmode)
	1424	+ {
	1425	+ gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1426	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	1427	+
	1428	+ if (flipV)
	1429	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	1430	+ else
	1431	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1432	+ }
	1433	+
	1434	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	1435	+ }
	1436	+
	1437	+ void SetColor(Object3D obj, Vertex p0)
	1438	+ {
	1439	+ CameraPane display = this;
	1440	+ BoundaryRep bRep = obj.bRep;
	1441	+
	1442	+ if (RENDERPROGRAM == 0)
	1443	+ {
	1444	+ float r = 0;
	1445	+ if (bRep != null)
	1446	+ {
	1447	+ if (bRep.stripified)
	1448	+ {
	1449	+ r = 1;
	1450	+ }
	1451	+ }
	1452	+ float g = 0;
	1453	+ if (bRep != null)
	1454	+ {
	1455	+ if (bRep.trimmed)
	1456	+ {
	1457	+ g = 1;
	1458	+ }
	1459	+ }
	1460	+ float b = 0;
	1461	+ if (obj.support != null && obj.link2master)
	1462	+ {
	1463	+ b = 1;
	1464	+ }
	1465	+ display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
	1466	+ return;
	1467	+ }
	1468	+
	1469	+ if (display.DrawMode() != CameraPane.SHADOW)
	1470	+ return;
	1471	+
	1472	+ javax.media.opengl.GL gl = display.GetGL();
	1473	+// if (true) return;
	1474	+// float ao = p.AO;
	1475	+//
	1476	+// // if (ao == 0 && !bRep.AOdone) // transient problem!
	1477	+// // ao = 1;
	1478	+//
	1479	+// gl.glColor4f(ao, ao, ao, 1);
	1480	+
	1481	+// CameraPane.selectedpoint.
	1482	+// getAverage(cStatic.point1, true);
	1483	+ if (CameraPane.pointflow == null) // !random) // live)
	1484	+ {
	1485	+ return;
	1486	+ }
	1487	+
	1488	+ cStatic.point1.set(0,0,0);
	1489	+ LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
	1490	+
	1491	+ cStatic.point1.sub(p0);
	1492	+
	1493	+
	1494	+// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
	1495	+// {
	1496	+// return;
	1497	+// }
	1498	+
	1499	+ //if (true)
	1500	+ if (cStatic.point1.dot(cStatic.point1) > 0.000001)
	1501	+ {
	1502	+ return;
	1503	+ }
	1504	+
	1505	+ float[] colorV = new float[3];
	1506	+
	1507	+ if (false) // marked)
	1508	+ {
	1509	+ // debug rigging weights
	1510	+ for (int object = 0; object < p0.vertexlinks.length; object++)
	1511	+ {
	1512	+ float weight = p0.weights[object] / p0.totalweight;
	1513	+
	1514	+ // if (weight < 0.1)
	1515	+ // {
	1516	+ // assert(weight == 0);
	1517	+ // continue;
	1518	+ // }
	1519	+
	1520	+ if (p0.vertexlinks[object] == -1)
	1521	+ continue;
	1522	+
	1523	+ Vertex q = obj.support.bRep.GetVertex(p0.vertexlinks[object]);
	1524	+
	1525	+ int color = //1 << object; //
	1526	+ //p.vertexlinks.length;
	1527	+ obj.support.bRep.supports[p0.closestsupport].links[object];
	1528	+ colorV[2] += (color & 1) * weight;
	1529	+ colorV[1] += ((color & 2) >> 1) * weight;
	1530	+ colorV[0] += ((color & 4) >> 2) * weight;
	1531	+ }
	1532	+ }
	1533	+ else
	1534	+ {
	1535	+ if (obj.drawingstarted)
	1536	+ {
	1537	+ // find next point
	1538	+ if (bRep.GetVertex(0).faceindices == null)
	1539	+ {
	1540	+ bRep.InitFaceIndices();
	1541	+ }
	1542	+
	1543	+ double ymin = p0.y;
	1544	+
	1545	+ Vertex newp = p0;
	1546	+
	1547	+ for (int fii = 0; fii < p0.faceindices.length; fii++)
	1548	+ {
	1549	+ int fi = p0.faceindices[fii];
	1550	+
	1551	+ if (fi == -1)
	1552	+ break;
	1553	+
	1554	+ Face f = bRep.GetFace(fi);
	1555	+
	1556	+ Vertex p = bRep.GetVertex(f.p);
	1557	+ Vertex q = bRep.GetVertex(f.q);
	1558	+ Vertex r = bRep.GetVertex(f.r);
	1559	+
	1560	+ int swap = (int)(Math.random()*3);
	1561	+
	1562	+// for (int s=swap; --s>=0;)
	1563	+// {
	1564	+// Vertex t = p;
	1565	+// p = q;
	1566	+// q = r;
	1567	+// r = t;
	1568	+// }
	1569	+ if (ymin > p.y)
	1570	+ {
	1571	+ ymin = p.y;
	1572	+ newp = p;
	1573	+// break;
	1574	+ }
	1575	+ if (ymin > q.y)
	1576	+ {
	1577	+ ymin = q.y;
	1578	+ newp = q;
	1579	+// break;
	1580	+ }
	1581	+ if (ymin > r.y)
	1582	+ {
	1583	+ ymin = r.y;
	1584	+ newp = r;
	1585	+// break;
	1586	+ }
	1587	+ }
	1588	+
	1589	+ CameraPane.selectedpoint.toParent[3][0] = newp.x;
	1590	+ CameraPane.selectedpoint.toParent[3][1] = newp.y;
	1591	+ CameraPane.selectedpoint.toParent[3][2] = newp.z;
	1592	+
	1593	+ obj.drawingstarted = false;
	1594	+
	1595	+ // return;
	1596	+ }
	1597	+
	1598	+ if (false) // CameraPane.DRAW
	1599	+ {
	1600	+ p0.AO = colorV[0] = 2;
	1601	+ colorV[1] = 2;
	1602	+ colorV[2] = 2;
	1603	+ }
	1604	+
	1605	+ CameraPane.pointflow.add(p0);
	1606	+ CameraPane.pointflow.Touch();
	1607	+ }
	1608	+
	1609	+// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
	1610	+// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
	1611	+// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
	1612	+ }
	1613	+
	1614	+ void DrawMaterial(cMaterial material, boolean selected)
	1615	+ {
	1616	+ CameraPane display = this;
	1617	+ //new Exception().printStackTrace();
	1618	+
	1619	+ if (display.IsFrozen() && !selected \|\| display.IsAmbientOcclusionOn()) // \|\| display.drawMode == display.SHADOW)
	1620	+ {
	1621	+ return;
	1622	+ }
	1623	+
	1624	+ javax.media.opengl.GL gl = display.GetGL();
	1625	+
	1626	+ //Color col = Color.getHSBColor(color,modulation,1);
	1627	+ //col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
	1628	+ if (!material.multiply)
	1629	+ {
	1630	+ display.color = material.color;
	1631	+ display.saturation = material.modulation;
	1632	+ }
	1633	+ else
	1634	+ {
	1635	+ display.color = material.color2;
	1636	+ display.saturation = material.modulation2;
	1637	+ }
	1638	+
	1639	+ cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
	1640	+
	1641	+ float[] colorV = Grafreed.colorV;
	1642	+
	1643	+ /**/
	1644	+ if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
	1645	+ {
	1646	+ colorV[0] = display.modelParams0[0] * material.diffuse;
	1647	+ colorV[1] = display.modelParams0[1] * material.diffuse;
	1648	+ colorV[2] = display.modelParams0[2] * material.diffuse;
	1649	+ colorV[3] = material.opacity;
	1650	+
	1651	+ gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
	1652	+ //System.out.println("Opacity = " + opacity);
	1653	+
	1654	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
	1655	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1656	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
	1657	+
	1658	+ float amb = material.ambient;
	1659	+ if (amb < material.cameralight)
	1660	+ {
	1661	+ amb = material.cameralight;
	1662	+ }
	1663	+ colorV[0] = display.modelParams0[0] * material.diffuse * amb;
	1664	+ colorV[1] = display.modelParams0[1] * material.diffuse * amb;
	1665	+ colorV[2] = display.modelParams0[2] * material.diffuse * amb;
	1666	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_AMBIENT, colorV, 0);
	1667	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1668	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT, colorV, 0);
	1669	+
	1670	+ /**/
	1671	+ colorV[0] = ((1 - material.metalness) + display.modelParams0[0] * material.metalness) * material.specular;
	1672	+ colorV[1] = ((1 - material.metalness) + display.modelParams0[1] * material.metalness) * material.specular;
	1673	+ colorV[2] = ((1 - material.metalness) + display.modelParams0[2] * material.metalness) * material.specular;
	1674	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_SPECULAR, colorV, 0);
	1675	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1676	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_SPECULAR, colorV, 0);
	1677	+ colorV[0] = 10 / material.shininess; // 1/0.005f;
	1678	+ //System.out.println("shininess = " + colorV[0]);
	1679	+ if (colorV[0] > 128)
	1680	+ {
	1681	+ colorV[0] = 128;
	1682	+ }
	1683	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_SHININESS, colorV, 0);
	1684	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_SHININESS, colorV, 0);
	1685	+ /**/
	1686	+ }
	1687	+ /**/
	1688	+
	1689	+ //selected = false;
	1690	+ selected = selected && display.flash;
	1691	+
	1692	+ //display.modelParams0[0] = 0; // pigment.r;
	1693	+ //display.modelParams0[1] = 0; // pigment.g;
	1694	+ //display.modelParams0[2] = 0; // pigment.b;
	1695	+ if (!material.multiply)
	1696	+ {
	1697	+ display.modelParams0[3] = material.metalness;
	1698	+ display.modelParams1[0] = material.diffuse;
	1699	+ display.modelParams1[1] = material.specular;
	1700	+ display.modelParams1[2] = 1 / material.shininess;
	1701	+ display.modelParams1[3] = material.shift;
	1702	+ display.modelParams2[0] = material.ambient;
	1703	+ display.modelParams2[1] = material.lightarea;
	1704	+ //System.out.println("light area = " + lightarea);
	1705	+ display.modelParams2[2] = 1 / material.factor; // diffuseness
	1706	+ display.modelParams2[3] = material.velvet;
	1707	+ display.modelParams3[0] = material.sheen;
	1708	+ display.modelParams3[1] = material.subsurface;
	1709	+ display.modelParams3[2] = material.bump; // backlit
	1710	+ display.modelParams3[3] = material.aniso;
	1711	+ display.modelParams4[0] = material.anisoV;
	1712	+ display.modelParams4[1] = selected ? 100 : material.cameralight;
	1713	+ //System.out.println("selected = " + selected);
	1714	+ display.modelParams4[2] = material.diffuseness;
	1715	+ display.modelParams4[3] = material.shadow;
	1716	+ display.modelParams5[0] = material.texture;
	1717	+ display.modelParams5[1] = material.opacity;
	1718	+ display.modelParams5[2] = material.fakedepth;
	1719	+ display.modelParams5[3] = CameraPane.SHADOWCULLFACE ? 0f : (material.shadowbias - 0.005f) / 10;
	1720	+ }
	1721	+ else
	1722	+ {
	1723	+ display.modelParams0[3] = material.metalness2;
	1724	+ display.modelParams1[0] = material.diffuse2;
	1725	+ display.modelParams1[1] = material.specular2;
	1726	+ display.modelParams1[2] = material.shininess2;
	1727	+ display.modelParams1[3] = material.shift2;
	1728	+ display.modelParams2[0] = material.ambient2;
	1729	+ display.modelParams2[1] = material.lightarea2;
	1730	+ display.modelParams2[2] = material.factor2;
	1731	+ display.modelParams2[3] = material.velvet2;
	1732	+ display.modelParams3[0] = material.sheen2;
	1733	+ display.modelParams3[1] = material.subsurface2;
	1734	+ display.modelParams3[2] = material.bump2;
	1735	+ display.modelParams3[3] = material.aniso2;
	1736	+ display.modelParams4[0] = material.anisoV2;
	1737	+ display.modelParams4[1] = material.cameralight2;
	1738	+ //System.out.println("selected = " + selected);
	1739	+ display.modelParams4[2] = material.diffuseness2;
	1740	+ display.modelParams4[3] = material.shadow2;
	1741	+ display.modelParams5[0] = material.texture2;
	1742	+ display.modelParams5[1] = material.opacity2;
	1743	+ display.modelParams5[2] = material.fakedepth2;
	1744	+ display.modelParams5[3] = material.shadowbias2;
	1745	+ }
	1746	+
	1747	+ display.modelParams6[0] = 0;
	1748	+ display.modelParams6[1] = 0;
	1749	+ display.modelParams6[2] = 0;
	1750	+ display.modelParams6[3] = 0;
	1751	+
	1752	+ display.modelParams7[0] = 0;
	1753	+ display.modelParams7[1] = 1000;
	1754	+ display.modelParams7[2] = 0;
	1755	+ display.modelParams7[3] = 0;
	1756	+
	1757	+ display.modelParams6[0] = 100; // criss de bug de bump
	1758	+
	1759	+ Object3D.cVector2[] extparams = display.vector2buffer;
	1760	+ if (extparams != null && extparams.length > 0 && extparams[0] != null)
	1761	+ {
	1762	+ display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
	1763	+ display.modelParams6[1] = extparams[0].y / 1000.0f; // noise
	1764	+ if (extparams.length > 1)
	1765	+ {
	1766	+ display.modelParams6[2] = extparams[1].x / 1000.0f; // borderfade
	1767	+ display.modelParams6[3] = extparams[1].y / 1000.0f; // (float)Math.exp(-extparams[1].y / 1000.0f); // fog punchthrough
	1768	+ if (extparams.length > 2)
	1769	+ {
	1770	+ display.modelParams7[0] = extparams[2].x / 1000.0f; // noise power
	1771	+ float x = extparams[2].y / 1000.0f;
	1772	+ //if (x == 0)
	1773	+ // x = 1f;
	1774	+ 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
	1775	+ if (extparams[2].y > 0)
	1776	+ {
	1777	+ //System.out.println("extparams[1].y = " + extparams[1].y);
	1778	+ //System.out.println("extparams[2].y = " + extparams[2].y);
	1779	+ //System.out.println("opacity power = " + display.modelParams7[1]);
	1780	+ }
	1781	+ }
	1782	+ }
	1783	+ }
	1784	+
	1785	+ //if (display.modelParams6[2] != 0)
	1786	+ /*
	1787	+ System.out.println("modelParams0[0] = " + display.modelParams0[0]);
	1788	+ System.out.println("modelParams0[1] = " + display.modelParams0[1]);
	1789	+ System.out.println("modelParams0[2] = " + display.modelParams0[2]);
	1790	+ System.out.println("modelParams0[3] = " + display.modelParams0[3]);
	1791	+ System.out.println("modelParams1[0] = " + display.modelParams1[0]);
	1792	+ System.out.println("modelParams1[1] = " + display.modelParams1[1]);
	1793	+ System.out.println("modelParams1[2] = " + display.modelParams1[2]);
	1794	+ System.out.println("modelParams1[3] = " + display.modelParams1[3]);
	1795	+ System.out.println("modelParams2[0] = " + display.modelParams2[0]);
	1796	+ System.out.println("modelParams2[1] = " + display.modelParams2[1]);
	1797	+ System.out.println("modelParams2[2] = " + display.modelParams2[2]);
	1798	+ System.out.println("modelParams2[3] = " + display.modelParams2[3]);
	1799	+ System.out.println("modelParams3[0] = " + display.modelParams3[0]);
	1800	+ System.out.println("modelParams3[1] = " + display.modelParams3[1]);
	1801	+ System.out.println("modelParams3[2] = " + display.modelParams3[2]);
	1802	+ System.out.println("modelParams3[3] = " + display.modelParams3[3]);
	1803	+ System.out.println("modelParams4[0] = " + display.modelParams4[0]);
	1804	+ System.out.println("modelParams4[1] = " + display.modelParams4[1]);
	1805	+ System.out.println("modelParams4[2] = " + display.modelParams4[2]);
	1806	+ System.out.println("modelParams4[3] = " + display.modelParams4[3]);
	1807	+ System.out.println("modelParams5[0] = " + display.modelParams5[0]);
	1808	+ System.out.println("modelParams5[1] = " + display.modelParams5[1]);
	1809	+ System.out.println("modelParams5[2] = " + display.modelParams5[2]);
	1810	+ System.out.println("modelParams5[3] = " + display.modelParams5[3]);
	1811	+ System.out.println("modelParams6[0] = " + display.modelParams6[0]);
	1812	+ System.out.println("modelParams6[1] = " + display.modelParams6[1]);
	1813	+ System.out.println("modelParams6[2] = " + display.modelParams6[2]);
	1814	+ System.out.println("modelParams6[3] = " + display.modelParams6[3]);
	1815	+ System.out.println("modelParams7[0] = " + display.modelParams7[0]);
	1816	+ System.out.println("modelParams7[1] = " + display.modelParams7[1]);
	1817	+ System.out.println("modelParams7[2] = " + display.modelParams7[2]);
	1818	+ System.out.println("modelParams7[3] = " + display.modelParams7[3]);
	1819	+ /**/
	1820	+ //assert (display.modelParams6[2] == 0);
	1821	+
	1822	+ //System.out.println("noise power = " + display.modelParams7[0]);
	1823	+ //System.out.println("shadowbias = " + shadowbias);
	1824	+
	1825	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1826	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 1, display.modelParams1, 0);
	1827	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 2, display.modelParams2, 0);
	1828	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 3, display.modelParams3, 0);
	1829	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	1830	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1831	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 6, display.modelParams6, 0);
	1832	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 7, display.modelParams7, 0);
	1833	+
	1834	+ int mode = display.FP_SHADER;
	1835	+
	1836	+ if (material.aniso != material.anisoV \|\| material.aniso > 0.002)
	1837	+ {
	1838	+ mode \|= display.FP_ANISO;
	1839	+ }
	1840	+
	1841	+ display.EnableProgram(mode);
	1842	+
	1843	+ //System.out.println("opacity power = " + display.modelParams7[1]);
	1844	+
	1845	+ if (!material.multiply)
	1846	+ {
	1847	+ if (Globals.drawMode == CameraPane.SHADOW)
	1848	+ gl.glDepthMask(material.opacity >= 0.9 && display.modelParams7[1] > 0.1);
	1849	+ else
	1850	+ gl.glDepthMask(material.opacity >= 0.99);
	1851	+ }
208	1852	}
209	1853
210	1854	int matrixdepth = 0; // 10000; // CONFLICT WITH cMESH... WARNING WARNING WARNING WARNING WARNING WARNING !!!!!!!!!!!! 0;
..	..	@@ -225,10 +1869,10 @@
225	1869	currentGL.glMultMatrixd(model, 0);
226	1870	}
227	1871
228		- void PushMatrix(double[][] matrix, int count)
	1872	+ public void PushMatrix(double[][] matrix, int count) // INTERFACE
229	1873	{
230	1874	matrixdepth++;
231		- // GraphreeD.tracein(matrix);
	1875	+ // GrafreeD.tracein(matrix);
232	1876	if (matrix == null)
233	1877	return; // Identity
234	1878
..	..	@@ -253,13 +1897,13 @@
253	1897
254	1898	void PushMatrix(double[][] matrix)
255	1899	{
256		- // GraphreeD.tracein(matrix);
257		- PushMatrix(matrix,1);
	1900	+ // GrafreeD.tracein(matrix);
	1901	+ PushMatrix(matrix, 1);
258	1902	}
259	1903
260	1904	void PushMatrix()
261	1905	{
262		- // GraphreeD.tracein(null);
	1906	+ // GrafreeD.tracein(null);
263	1907	if (matrixdepth++ < MAXSTACK - 1)
264	1908	{
265	1909	currentGL.glPushMatrix();
..	..	@@ -270,11 +1914,11 @@
270	1914
271	1915	double[][] tmpmat = new double[4][4];
272	1916
273		- void PopMatrix(double[][] inverse)
	1917	+ public void PopMatrix(double[][] inverse) // INTERFACE
274	1918	{
275	1919	--matrixdepth;
276	1920
277		- // GraphreeD.traceout(inverse);
	1921	+ // GrafreeD.traceout(inverse);
278	1922	if (inverse == null)
279	1923	return; // Identity
280	1924
..	..	@@ -292,7 +1936,7 @@
292	1936
293	1937	void PopMatrix()
294	1938	{
295		- // GraphreeD.traceout(null);
	1939	+ // GrafreeD.traceout(null);
296	1940	// inverse == null??
297	1941	if (--matrixdepth < MAXSTACK - 1)
298	1942	{
..	..	@@ -310,7 +1954,7 @@
310	1954	PushTextureMatrix(matrix, 1);
311	1955	}
312	1956
313		- void PushTextureMatrix(double[][] matrix, int count)
	1957	+ public void PushTextureMatrix(double[][] matrix, int count) // INTERFACE
314	1958	{
315	1959	currentGL.glActiveTexture(GetGL().GL_TEXTURE0);
316	1960
..	..	@@ -324,7 +1968,7 @@
324	1968	currentGL.glMatrixMode(GetGL().GL_MODELVIEW);
325	1969	}
326	1970
327		- void PopTextureMatrix(double[][] inverse)
	1971	+ public void PopTextureMatrix(double[][] inverse) // INTERFACE
328	1972	{
329	1973	currentGL.glActiveTexture(GetGL().GL_TEXTURE0);
330	1974	currentGL.glMatrixMode(GetGL().GL_TEXTURE);
..	..	@@ -351,15 +1995,15 @@
351	1995
352	1996	static int camerachangeframe;
353	1997
354		- boolean SetCamera(Camera cam)
	1998	+ public boolean SetCamera(Camera cam)
355	1999	{
356	2000	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
357	2001	// return false;
358	2002
359		- if (REFUSEMODE && isLIVE() && camerachangeframe != 0 && camerachangeframe != framecount)
	2003	+ if (REFUSEMODE && Globals.isLIVE() && camerachangeframe != 0 && camerachangeframe != Globals.framecount)
360	2004	{
361	2005	// check for last change
362		- if (framecount < camerachangeframe + 400) // 120 == 1 second
	2006	+ if (Globals.framecount < camerachangeframe + 400) // 120 == 1 second
363	2007	{
364	2008	// refuse the camera change
365	2009	System.err.println("Camera " + cam + " REFUSED");
..	..	@@ -367,7 +2011,7 @@
367	2011	}
368	2012	}
369	2013
370		- camerachangeframe = framecount;
	2014	+ camerachangeframe = Globals.framecount;
371	2015
372	2016	cam.hAspect = -1; // Read only
373	2017
..	..	@@ -398,7 +2042,7 @@
398	2042	{
399	2043	//System.err.println("Oeil on");
400	2044	TRACK = true;
401		-// JUNE 2014 if (TRACK && trackedobject != null && drawMode == SHADOW) // && !lightMode)
	2045	+// JUNE 2014 if (TRACK && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
402	2046	// object.editWindow.ScreenFit(trackedobject);
403	2047	//pingthread.StepToTarget(true);
404	2048	}
..	..	@@ -407,7 +2051,7 @@
407	2051	{
408	2052	//System.err.println("Oeil on");
409	2053	OEIL = true;
410		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && drawMode == SHADOW) // && !lightMode)
	2054	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
411	2055	object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
412	2056	//pingthread.StepToTarget(true);
413	2057	}
..	..	@@ -471,39 +2115,12 @@
471	2115	{
472	2116	frozen ^= true;
473	2117	// Weird...
474		- lighttouched = true;
	2118	+ Globals.lighttouched = true;
475	2119	}
476	2120
477	2121	void ToggleDL()
478	2122	{
479	2123	mainDL ^= true;
480		- }
481		-
482		- void ToggleTexture()
483		- {
484		- textureon ^= true;
485		- }
486		-
487		- void ToggleLive()
488		- {
489		- setLIVE(isLIVE() ^ true);
490		-
491		- System.err.println("LIVE = " + isLIVE());
492		-
493		- if (!isLIVE()) // save sound
494		- GraphreeD.savesound = true; // wav.save();
495		- // else
496		- repaint(); // start loop // may 2013
497		- }
498		-
499		- void ToggleSupport()
500		- {
501		- SUPPORT ^= true;
502		- }
503		-
504		- void ToggleAbort()
505		- {
506		- ABORTMODE ^= true;
507	2124	}
508	2125
509	2126	void ToggleFullScreen()
..	..	@@ -513,12 +2130,7 @@
513	2130
514	2131	void ToggleCrowd()
515	2132	{
516		- CROWD ^= true;
517		- }
518		-
519		- void ToggleInertia()
520		- {
521		- INERTIA ^= true;
	2133	+ Globals.CROWD ^= true;
522	2134	}
523	2135
524	2136	void ToggleLocal()
..	..	@@ -526,62 +2138,89 @@
526	2138	LOCALTRANSFORM ^= true;
527	2139	}
528	2140
529		- void ToggleFast()
	2141	+ public void ToggleTexture()
	2142	+ {
	2143	+ textureon ^= true;
	2144	+ }
	2145	+
	2146	+ public void ToggleLive()
	2147	+ {
	2148	+ Globals.setLIVE(Globals.isLIVE() ^ true);
	2149	+
	2150	+ System.err.println("LIVE = " + Globals.isLIVE());
	2151	+
	2152	+ if (!Globals.isLIVE()) // save sound
	2153	+ Grafreed.savesound = true; // wav.save();
	2154	+ // else
	2155	+ repaint(); // start loop // may 2013
	2156	+ }
	2157	+
	2158	+ public void ToggleSupport()
	2159	+ {
	2160	+ SUPPORT ^= true;
	2161	+ }
	2162	+
	2163	+ public void ToggleAbort()
	2164	+ {
	2165	+ ABORTMODE ^= true;
	2166	+ }
	2167	+
	2168	+ public void ToggleInertia()
	2169	+ {
	2170	+ INERTIA ^= true;
	2171	+ }
	2172	+
	2173	+ public void ToggleFast()
530	2174	{
531	2175	FAST ^= true;
532	2176	}
533	2177
534		- void ToggleSlowPose()
	2178	+ public void ToggleSlowPose()
535	2179	{
536	2180	SLOWPOSE ^= true;
537	2181	}
538	2182
539		- void ToggleFootContact()
540		- {
541		- FOOTCONTACT ^= true;
542		- }
543		-
544		- void ToggleBoxMode()
	2183	+ public void ToggleBoxMode()
545	2184	{
546	2185	BOXMODE ^= true;
547	2186	}
548	2187
549		- void ToggleSmoothFocus()
	2188	+ public void ToggleZoomBoxMode()
	2189	+ {
	2190	+ ZOOMBOXMODE ^= true;
	2191	+ }
	2192	+
	2193	+ public void ToggleSmoothFocus()
550	2194	{
551	2195	SMOOTHFOCUS ^= true;
552	2196	}
553	2197
554		- void ToggleImageFlip()
	2198	+ public void ToggleImageFlip()
555	2199	{
556	2200	IMAGEFLIP ^= true;
557	2201	}
558	2202
559		- void ToggleSpeakerMocap()
	2203	+ public void ToggleSpeakerMocap()
560	2204	{
561	2205	SPEAKERMOCAP ^= true;
562	2206	}
563	2207
564		- void ToggleSpeakerCamera()
	2208	+ public void ToggleSpeakerCamera()
565	2209	{
566	2210	SPEAKERCAMERA ^= true;
567	2211	}
568	2212
569		- void ToggleSpeakerFocus()
	2213	+ public void ToggleSpeakerFocus()
570	2214	{
571	2215	SPEAKERFOCUS ^= true;
572	2216	}
573	2217
574		- void ToggleDebug()
575		- {
576		- DEBUG ^= true;
577		- }
578		-
579		- void ToggleFrustum()
	2218	+ public void ToggleFrustum()
580	2219	{
581	2220	FRUSTUM ^= true;
582	2221	}
583	2222
584		- void ToggleTrack()
	2223	+ public void ToggleTrack()
585	2224	{
586	2225	TRACK ^= true;
587	2226	if (TRACK)
..	..	@@ -600,25 +2239,35 @@
600	2239	repaint();
601	2240	}
602	2241
603		- void ToggleTrackOnce()
	2242	+ public void ToggleTrackOnce()
604	2243	{
605	2244	TRACKONCE ^= true;
606	2245	}
607	2246
608		- void ToggleShadowTrack()
	2247	+ public void ToggleShadowTrack()
609	2248	{
610	2249	SHADOWTRACK ^= true;
611	2250	repaint();
612	2251	}
613	2252
614		- void ToggleOeil()
	2253	+ public void ToggleOeil()
615	2254	{
616	2255	OEIL ^= true;
617	2256	}
618	2257
619		- void ToggleOeilOnce()
	2258	+ public void ToggleOeilOnce()
620	2259	{
621	2260	OEILONCE ^= true;
	2261	+ }
	2262	+
	2263	+ void ToggleFootContact()
	2264	+ {
	2265	+ FOOTCONTACT ^= true;
	2266	+ }
	2267	+
	2268	+ void ToggleDebug()
	2269	+ {
	2270	+ DEBUG ^= true;
622	2271	}
623	2272
624	2273	void ToggleLookAt()
..	..	@@ -626,9 +2275,9 @@
626	2275	LOOKAT ^= true;
627	2276	}
628	2277
629		- void ToggleRandom()
	2278	+ void ToggleSwitch()
630	2279	{
631		- RANDOM ^= true;
	2280	+ SWITCH ^= true;
632	2281	}
633	2282
634	2283	void ToggleHandles()
..	..	@@ -672,34 +2321,6 @@
672	2321	//assert (cam.hAspect == 0);
673	2322	cam.hAspect = 0;
674	2323	lightCamera = cam;
675		- }
676		-
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	2324	}
704	2325
705	2326	private static void ApplyTransform(GL gl, Mat4f xform)
..	..	@@ -759,11 +2380,11 @@
759	2380
760	2381	GL currentGL;
761	2382
762		- GL GetGL()
	2383	+ public GL GetGL() // INTERFACE
763	2384	{
764	2385	return currentGL;
765	2386	}
766		-
	2387	+
767	2388	/**/
768	2389	class CacheTexture
769	2390	{
..	..	@@ -2000,10 +3621,12 @@
2000	3621	*/
2001	3622	TextureData ReduceTexture(TextureData texturedata, int resolution) // String name)
2002	3623	{
	3624	+ int pixelformat = texturedata.getPixelFormat();
	3625	+
2003	3626	int stride = 1;
2004		- if (texturedata.getPixelFormat() == GetGL().GL_RGB \|\| texturedata.getPixelFormat() == GetGL().GL_BGR) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE)
	3627	+ if (pixelformat == GetGL().GL_RGB \|\| pixelformat == GetGL().GL_BGR) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE)
2005	3628	stride = 3;
2006		- if (texturedata.getPixelFormat() == GetGL().GL_RGBA \|\| texturedata.getPixelFormat() == GetGL().GL_BGRA) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE_ALPHA)
	3629	+ if (pixelformat == GetGL().GL_RGBA \|\| pixelformat == GetGL().GL_BGRA) // \|\| texturedata.getPixelFormat() == GL.GL_LUMINANCE_ALPHA)
2007	3630	stride = 4;
2008	3631
2009	3632	int width = texturedata.getWidth();
..	..	@@ -2593,6 +4216,7 @@
2593	4216
2594	4217	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
2595	4218	{
	4219	+ new Exception().printStackTrace();
2596	4220	System.exit(0);
2597	4221	com.sun.opengl.util.texture.Texture texture = null;
2598	4222
..	..	@@ -6269,7 +7893,7 @@
6269	7893	return null;
6270	7894	}
6271	7895
6272		- void ReleaseTextures(cTexture tex)
	7896	+ public void ReleaseTextures(cTexture tex) // INTERFACE
6273	7897	{
6274	7898	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
6275	7899	{
..	..	@@ -6305,9 +7929,67 @@
6305	7929	ReleaseTexture(pigment, false);
6306	7930	}
6307	7931
	7932	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	7933	+ {
	7934	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7935	+ {
	7936	+ return;
	7937	+ }
	7938	+
	7939	+ if (tex == null)
	7940	+ {
	7941	+ ReleaseTexture(null, false);
	7942	+ return;
	7943	+ }
	7944	+
	7945	+ String pigment = Object3D.GetPigment(tex);
	7946	+
	7947	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7948	+ {
	7949	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7950	+ // System.out.println("; bump = " + bump);
	7951	+ }
	7952	+
	7953	+ if (pigment.equals(""))
	7954	+ {
	7955	+ pigment = null;
	7956	+ }
	7957	+
	7958	+ ReleaseTexture(pigment, false);
	7959	+ }
	7960	+
	7961	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	7962	+ {
	7963	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7964	+ {
	7965	+ return;
	7966	+ }
	7967	+
	7968	+ if (tex == null)
	7969	+ {
	7970	+ ReleaseTexture(null, true);
	7971	+ return;
	7972	+ }
	7973	+
	7974	+ String bump = Object3D.GetBump(tex);
	7975	+
	7976	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7977	+ {
	7978	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7979	+ // System.out.println("; bump = " + bump);
	7980	+ }
	7981	+
	7982	+ if (bump.equals(""))
	7983	+ {
	7984	+ bump = null;
	7985	+ }
	7986	+
	7987	+ ReleaseTexture(bump, true);
	7988	+ }
	7989	+
6308	7990	void ReleaseTexture(String tex, boolean bump)
6309	7991	{
6310		- if (// drawMode != 0 \|\| /tex == null \|\|/
	7992	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
6311	7993	ambientOcclusion ) // \|\| !textureon)
6312	7994	{
6313	7995	return;
..	..	@@ -6333,7 +8015,7 @@
6333	8015	{
6334	8016	bumpdepth--;
6335	8017
6336		- // GraphreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
	8018	+ // GrafreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
6337	8019	if (bumpstack[bumpdepth] != (texture!=null?texture.texture:null))
6338	8020	{
6339	8021	// assert (bumpstack[bumpdepth] == texture);
..	..	@@ -6363,7 +8045,7 @@
6363	8045	{
6364	8046	pigmentdepth--;
6365	8047
6366		- // GraphreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
	8048	+ // GrafreeD.trace("POP " + tex + "(" + pigmentdepth + ")" + " : " + pigmentstack[pigmentdepth] + " vs " + texture);
6367	8049	if (pigmentstack[pigmentdepth] != (texture!=null?texture.texture:null))
6368	8050	{
6369	8051	// assert (pigmentstack[pigmentdepth] == texture);
..	..	@@ -6408,9 +8090,9 @@
6408	8090	}
6409	8091	}
6410	8092
6411		- /boolean/ void BindTextures(cTexture tex, int resolution)
	8093	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
6412	8094	{
6413		- if (// drawMode != 0 \|\| /tex == null \|\|/
	8095	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
6414	8096	ambientOcclusion ) // \|\| !textureon)
6415	8097	{
6416	8098	return; // false;
..	..	@@ -6453,7 +8135,94 @@
6453	8135	return; // true;
6454	8136	}
6455	8137
6456		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8138	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8139	+ {
	8140	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8141	+ ambientOcclusion ) // \|\| !textureon)
	8142	+ {
	8143	+ return; // false;
	8144	+ }
	8145	+
	8146	+ if (tex == null)
	8147	+ {
	8148	+ BindTexture(null,false,resolution);
	8149	+ return;
	8150	+ }
	8151	+
	8152	+ String pigment = Object3D.GetPigment(tex);
	8153	+
	8154	+ usedtextures.put(pigment, pigment);
	8155	+
	8156	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8157	+ {
	8158	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8159	+ // System.out.println("; bump = " + bump);
	8160	+ }
	8161	+
	8162	+ if (pigment.equals(""))
	8163	+ {
	8164	+ pigment = null;
	8165	+ }
	8166	+
	8167	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8168	+ BindTexture(pigment, false, resolution);
	8169	+ }
	8170	+
	8171	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8172	+ {
	8173	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8174	+ ambientOcclusion ) // \|\| !textureon)
	8175	+ {
	8176	+ return; // false;
	8177	+ }
	8178	+
	8179	+ if (tex == null)
	8180	+ {
	8181	+ BindTexture(null,true,resolution);
	8182	+ return;
	8183	+ }
	8184	+
	8185	+ String bump = Object3D.GetBump(tex);
	8186	+
	8187	+ usedtextures.put(bump, bump);
	8188	+
	8189	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8190	+ {
	8191	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8192	+ // System.out.println("; bump = " + bump);
	8193	+ }
	8194	+
	8195	+ if (bump.equals(""))
	8196	+ {
	8197	+ bump = null;
	8198	+ }
	8199	+
	8200	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8201	+ BindTexture(bump, true, resolution);
	8202	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8203	+ }
	8204	+
	8205	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8206	+
	8207	+ private boolean FileExists(String tex)
	8208	+ {
	8209	+ if (missingTextures.contains(tex))
	8210	+ {
	8211	+ return false;
	8212	+ }
	8213	+
	8214	+ boolean fileExists = new File(tex).exists();
	8215	+
	8216	+ if (!fileExists)
	8217	+ {
	8218	+ // If file exists, the "new File()" is not executed sgain
	8219	+ missingTextures.add(tex);
	8220	+ }
	8221	+
	8222	+ return fileExists;
	8223	+ }
	8224	+
	8225	+ CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
6457	8226	{
6458	8227	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
6459	8228
..	..	@@ -6461,12 +8230,18 @@
6461	8230	{
6462	8231	String texname = tex;
6463	8232
6464		- String[] split = tex.split("Textures");
6465		- if (split.length > 1)
6466		- texname = "/Users/nbriere/Textures" + split[split.length-1];
6467		- else
6468		- if (!texname.startsWith("/"))
6469		- texname = "/Users/nbriere/Textures/" + texname;
	8233	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8234	+
	8235	+// String[] split = tex.split("Textures");
	8236	+// if (split.length > 1)
	8237	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8238	+// else
	8239	+// if (!texname.startsWith("/"))
	8240	+// texname = "/Users/nbriere/Textures/" + texname;
	8241	+ if (!FileExists(tex))
	8242	+ {
	8243	+ texname = fallbackTextureName;
	8244	+ }
6470	8245
6471	8246	if (CACHETEXTURE)
6472	8247	texture = textures.get(texname); // TEXTURE CACHE
..	..	@@ -6535,7 +8310,7 @@
6535	8310	}
6536	8311
6537	8312	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
6538		- if (!new File(cachename).exists())
	8313	+ if (!FileExists(cachename))
6539	8314	cachename = texname;
6540	8315	else
6541	8316	processbump = false; // don't process bump map again
..	..	@@ -6557,7 +8332,7 @@
6557	8332	}
6558	8333
6559	8334	cachename = texname.substring(0, texname.length()-4)+ext+".png";
6560		- if (!new File(cachename).exists())
	8335	+ if (!FileExists(cachename))
6561	8336	cachename = texname;
6562	8337	else
6563	8338	processbump = false; // don't process bump map again
..	..	@@ -6566,7 +8341,9 @@
6566	8341	texturedata = GetFileTexture(cachename, processbump, resolution);
6567	8342
6568	8343
6569		- if (texturedata != null)
	8344	+ if (texturedata == null)
	8345	+ throw new Exception();
	8346	+
6570	8347	texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
6571	8348	//texture = GetTexture(tex, bump);
6572	8349	}
..	..	@@ -6688,32 +8465,32 @@
6688	8465	return texture;
6689	8466	}
6690	8467
6691		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8468	+ com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
6692	8469	{
6693	8470	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
6694	8471
6695	8472	if (bump)
6696	8473	{
6697		- // GraphreeD.trace("PUSH BUMP " + tex + "(" + bumpdepth + ")" + " : " + texture);
	8474	+ // GrafreeD.trace("PUSH BUMP " + tex + "(" + bumpdepth + ")" + " : " + texture);
6698	8475	bumpstack[bumpdepth++] = texture!=null?texture.texture:null;
6699	8476	}
6700	8477	else
6701	8478	{
6702		- // GraphreeD.trace("PUSH PIGMENT " + tex + "(" + pigmentdepth + ")" + " : " + texture);
	8479	+ // GrafreeD.trace("PUSH PIGMENT " + tex + "(" + pigmentdepth + ")" + " : " + texture);
6703	8480	pigmentstack[pigmentdepth++] = texture!=null?texture.texture:null;
6704	8481	}
6705	8482
6706	8483	return texture!=null?texture.texture:null;
6707	8484	}
6708	8485
6709		- com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8486	+ public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
6710	8487	{
6711	8488	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
6712	8489
6713	8490	return texture!=null?texture.texturedata:null;
6714	8491	}
6715	8492
6716		- boolean BindTexture(String tex, boolean bump, int resolution)
	8493	+ boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
6717	8494	{
6718	8495	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
6719	8496	{
..	..	@@ -7310,9 +9087,9 @@
7310	9087	static boolean occlusionInitialized = false;
7311	9088	boolean selection = false;
7312	9089	boolean pointselection = false;
7313		- /static/ boolean lighttouched = true;
	9090	+ ///static/ boolean lighttouched = true;
7314	9091	boolean deselect;
7315		- boolean ambientOcclusion = false;
	9092	+ private boolean ambientOcclusion = false;
7316	9093	static boolean flash = false;
7317	9094	/static/ boolean wait = false;
7318	9095	boolean displaydone = false; // after repaint() calls
..	..	@@ -7442,6 +9219,8 @@
7442	9219	//gl.glFrustum(-0.5scale, 0.5scale, -0.5scale, 0.5scale, 1, 100);
7443	9220	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
7444	9221	double scale = lightCamera.SCALE / lightCamera.Distance();
	9222	+// PATCH FILLE AUX JEANS
	9223	+ //scale *= lightCamera.shaper_fovy / 25;
7445	9224	gl.glScaled(2 * scale, 2 * scale, -scale);
7446	9225	gl.glTranslated(0, 0, lightCamera.DECAL);
7447	9226
..	..	@@ -7590,15 +9369,14 @@
7590	9369
7591	9370	float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
7592	9371	float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
7593		- float[] options3 = new float[]{1, 1, 1, 1}; // fog color. image intensity
	9372	+ float[] options3 = new float[]{1, 1, 1, 0}; // fog color
	9373	+ float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
7594	9374
7595	9375	static int imagecount = 0; // movie generation
7596	9376
7597	9377	static int jitter = 0;
7598	9378
7599	9379	boolean restartframe = false;
7600		-
7601		- static int framecount = 0; // general-purpose global count
7602	9380
7603	9381	void displayAntiAliased(javax.media.opengl.GL gl)
7604	9382	{
..	..	@@ -7628,14 +9406,14 @@
7628	9406
7629	9407	//System.out.println("start frame");
7630	9408	gl.glClear(gl.GL_ACCUM_BUFFER_BIT);
7631		- for (jitter = 0; jitter < ACSIZE; jitter++) //, GraphreeD.wav.cursor += LIVE ? 735 : 0)
	9409	+ for (jitter = 0; jitter < ACSIZE; jitter++) //, GrafreeD.wav.cursor += LIVE ? 735 : 0)
7632	9410	{
7633		- framecount++;
	9411	+ Globals.framecount++;
7634	9412
7635	9413	if (CameraPane.tickcount > 0)
7636	9414	CameraPane.tickcount--;
7637	9415
7638		-// GraphreeD.wav.cursor += 735; // 44100 Hz / 120 Hz * 2 (for 16 bits)
	9416	+// GrafreeD.wav.cursor += 735; // 44100 Hz / 120 Hz * 2 (for 16 bits)
7639	9417	// restartframe = true;
7640	9418	if (options1[2] > 100 && (jitter%2==0))
7641	9419	{
..	..	@@ -7668,7 +9446,7 @@
7668	9446
7669	9447	gl.glLightfv(gl.GL_LIGHT0, gl.GL_POSITION, pos, 0);
7670	9448	*/
7671		- lighttouched = true;
	9449	+ Globals.lighttouched = true;
7672	9450	//System.err.println(" shadowbuffer: " + jitter);
7673	9451	shadowbuffer.display();
7674	9452
..	..	@@ -7689,8 +9467,8 @@
7689	9467	assert (parentcam != renderCamera);
7690	9468
7691	9469	if (renderCamera != lightCamera)
7692		- for (int count = parentcam.GetTransformCount(); --count>=0;)
7693		- LA.matConcat(parentcam.toParent, matrix, matrix);
	9470	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9471	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
7694	9472
7695	9473	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
7696	9474
..	..	@@ -7705,8 +9483,8 @@
7705	9483	LA.matCopy(renderCamera.fromScreen, matrix);
7706	9484
7707	9485	if (renderCamera != lightCamera)
7708		- for (int count = parentcam.GetTransformCount(); --count>=0;)
7709		- LA.matConcat(matrix, parentcam.fromParent, matrix);
	9486	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9487	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
7710	9488
7711	9489	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
7712	9490
..	..	@@ -7778,7 +9556,7 @@
7778	9556	//gl.glFlush();
7779	9557	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
7780	9558
7781		- if (ANIMATION && ABORTED)
	9559	+ if (Globals.ANIMATION && ABORTED)
7782	9560	{
7783	9561	System.err.println(" ABORTED FRAME");
7784	9562	break;
..	..	@@ -7808,7 +9586,7 @@
7808	9586	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
7809	9587
7810	9588	// save image
7811		- if (ANIMATION && !ABORTED)
	9589	+ if (Globals.ANIMATION && !ABORTED)
7812	9590	{
7813	9591	VPwidth = viewport[2];
7814	9592	VPheight = viewport[3];
..	..	@@ -7919,11 +9697,11 @@
7919	9697
7920	9698	// imagecount++;
7921	9699
7922		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9700	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
7923	9701
7924	9702	if (!BOXMODE)
7925	9703	{
7926		- System.out.println("image: " + fullname + " (" + (GraphreeD.wav.cursor / 735 / 4) + ")");
	9704	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
7927	9705	}
7928	9706
7929	9707	if (!BOXMODE)
..	..	@@ -7951,7 +9729,7 @@
7951	9729	{
7952	9730	if (ACSIZE > 1)
7953	9731	{
7954		- // System.err.println("image #" + (GraphreeD.wav.cursor / 735 / 4));
	9732	+ // System.err.println("image #" + (GrafreeD.wav.cursor / 735 / 4));
7955	9733	}
7956	9734	}
7957	9735
..	..	@@ -7961,7 +9739,7 @@
7961	9739	ABORTED = false;
7962	9740	}
7963	9741	else
7964		- GraphreeD.wav.cursor += 735 * ACSIZE;
	9742	+ Grafreed.wav.cursor += 735 * ACSIZE;
7965	9743
7966	9744	if (false)
7967	9745	{
..	..	@@ -8615,13 +10393,6 @@
8615	10393	}
8616	10394	}
8617	10395
8618		- boolean IsFrozen()
8619		- {
8620		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
8621		-
8622		- return !selectmode && cameracount == 0; // != 0;
8623		- }
8624		-
8625	10396	boolean niceon = false;
8626	10397	javax.swing.Timer AAtimer = new javax.swing.Timer(750, this);
8627	10398	boolean currentlydrawing = false;
..	..	@@ -8631,16 +10402,16 @@
8631	10402
8632	10403	public void display(GLAutoDrawable drawable)
8633	10404	{
8634		- if (GraphreeD.savesound && GraphreeD.hassound)
	10405	+ if (Grafreed.savesound && Grafreed.hassound)
8635	10406	{
8636		- GraphreeD.wav.save();
8637		- GraphreeD.savesound = false;
8638		- GraphreeD.hassound = false;
	10407	+ Grafreed.wav.save();
	10408	+ Grafreed.savesound = false;
	10409	+ Grafreed.hassound = false;
8639	10410	}
8640	10411	// if (DEBUG_SELECTION)
8641	10412	// {
8642		-// if (drawMode != SELECTION)
8643		-// drawMode = SELECTION;
	10413	+// if (DrawMode() != SELECTION)
	10414	+// DrawMode() = SELECTION;
8644	10415	// }
8645	10416
8646	10417	if (!isRenderer)
..	..	@@ -8696,9 +10467,9 @@
8696	10467
8697	10468	//ANTIALIAS = 0;
8698	10469
8699		- if (drawMode == DEFAULT) // && CURRENTANTIALIAS > 0)
	10470	+ if (DrawMode() == DEFAULT) // && CURRENTANTIALIAS > 0)
8700	10471	{
8701		- if (niceon \|\| isLIVE())
	10472	+ if (niceon \|\| Globals.isLIVE())
8702	10473	{
8703	10474	//if(active == 0)
8704	10475	// antialiaser = null;
..	..	@@ -8723,7 +10494,7 @@
8723	10494	assert eyeCamera.shaper_zFar == 1E5f; // 500.0f;
8724	10495	*/
8725	10496
8726		- if (drawMode == DEFAULT)
	10497	+ if (DrawMode() == DEFAULT)
8727	10498	{
8728	10499	currentlydrawing = true;
8729	10500	}
..	..	@@ -8754,18 +10525,18 @@
8754	10525
8755	10526	// if(Applet3D.clipboard != null)
8756	10527	// System.out.println("Clipboard = " + Applet3D.clipboard); //.get(0).parent);
8757		-//drawMode = SELECTION;
	10528	+//DrawMode() = SELECTION;
8758	10529	indexcount = 0;
8759	10530
8760		- if (drawMode == OCCLUSION)
	10531	+ if (DrawMode() == OCCLUSION)
8761	10532	{
8762		- drawMode = DEFAULT;
	10533	+ Globals.drawMode = DEFAULT; // WARNING
8763	10534	ambientOcclusion = true;
8764	10535	setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
8765	10536	Object3D theobject = object;
8766	10537	Object3D theparent = object.parent;
8767	10538	object.parent = null;
8768		- object = (Object3D)GraphreeD.clone(object);
	10539	+ object = (Object3D)Grafreed.clone(object);
8769	10540	object.Stripify();
8770	10541	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
8771	10542	theobject.PreprocessOcclusion(this);
..	..	@@ -8778,19 +10549,19 @@
8778	10549	ambientOcclusion = false;
8779	10550	}
8780	10551
8781		- if (lighttouched && drawMode == DEFAULT && !lightMode) // && !FROZEN)
	10552	+ if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
8782	10553	{
8783	10554	//if (RENDERSHADOW) // ?
8784	10555	if (!IsFrozen())
8785	10556	{
8786	10557	// dec 2012
8787		- if (!(!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0))
	10558	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
8788	10559	{
8789		- framecount++;
	10560	+ Globals.framecount++;
8790	10561	shadowbuffer.display();
8791	10562	}
8792	10563	}
8793		- lighttouched = false; // ??
	10564	+ Globals.lighttouched = false; // ??
8794	10565	//drawing = true;
8795	10566	//lighttouched = true;
8796	10567	}
..	..	@@ -8811,9 +10582,9 @@
8811	10582	//eyeCamera.shaper_fovy = 1;
8812	10583	}
8813	10584
8814		- if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && drawMode == DEFAULT) // SELECTION)
	10585	+ if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && DrawMode() == DEFAULT) // SELECTION)
8815	10586	{
8816		- //System.out.println("drawMode = " + drawMode);
	10587	+ //System.out.println("DrawMode() = " + DrawMode());
8817	10588	vertexMode \|= VP_PASS;
8818	10589	//vertexMode \|= VP_PROJECTION;
8819	10590	if (!ambientOcclusion)
..	..	@@ -8873,7 +10644,7 @@
8873	10644	Camera cam = renderCamera; // lightMode?lightCamera:eyeCamera;
8874	10645	//Camera lightcam = new Camera(light0);
8875	10646
8876		- if (drawMode == SHADOW)
	10647	+ if (DrawMode() == SHADOW)
8877	10648	{
8878	10649	/*
8879	10650	gl.glMatrixMode(GL.GL_MODELVIEW);
..	..	@@ -8911,8 +10682,8 @@
8911	10682
8912	10683	// if (parentcam != renderCamera) // not a light
8913	10684	if (cam != lightCamera)
8914		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8915		- LA.matConcat(parentcam.toParent, matrix, matrix);
	10685	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10686	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
8916	10687
8917	10688	for (int j = 0; j < 4; j++)
8918	10689	{
..	..	@@ -8926,8 +10697,8 @@
8926	10697
8927	10698	// if (parentcam != renderCamera) // not a light
8928	10699	if (cam != lightCamera)
8929		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8930		- LA.matConcat(matrix, parentcam.fromParent, matrix);
	10700	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10701	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
8931	10702
8932	10703	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
8933	10704
..	..	@@ -8963,7 +10734,7 @@
8963	10734	gl.glClear(gl.GL_DEPTH_BUFFER_BIT);
8964	10735	} else
8965	10736	{
8966		- if (drawMode != DEFAULT)
	10737	+ if (DrawMode() != DEFAULT)
8967	10738	{
8968	10739	gl.glClearColor(1, 1, 1, 0);
8969	10740	} // 1);
..	..	@@ -9028,7 +10799,7 @@
9028	10799
9029	10800	fast &= !ambientOcclusion;
9030	10801
9031		- if (drawMode == DEFAULT)
	10802	+ if (DrawMode() == DEFAULT)
9032	10803	{
9033	10804	//gl.glEnable(gl.GL_ALPHA_TEST);
9034	10805	//gl.glActiveTexture(GL.GL_TEXTURE0);
..	..	@@ -9089,6 +10860,8 @@
9089	10860	//gl.glFrustum(-0.5scale, 0.5scale, -0.5scale, 0.5scale, 1, 100);
9090	10861	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
9091	10862	double scale = lightCamera.SCALE / lightCamera.Distance();
	10863	+// PATCH FILLE AUX JEANS
	10864	+ //scale *= lightCamera.shaper_fovy / 25;
9092	10865	gl.glScaled(2 * scale, 2 * scale, -scale);
9093	10866	gl.glTranslated(0, 0, lightCamera.DECAL);
9094	10867
..	..	@@ -9184,7 +10957,16 @@
9184	10957	// Bump noise
9185	10958	gl.glActiveTexture(GL.GL_TEXTURE6);
9186	10959	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
9187		- BindTexture(NOISE_TEXTURE, false, 2);
	10960	+
	10961	+ try
	10962	+ {
	10963	+ BindTexture(NOISE_TEXTURE, false, 2);
	10964	+ }
	10965	+ catch (Exception e)
	10966	+ {
	10967	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	10968	+ }
	10969	+
9188	10970
9189	10971	gl.glActiveTexture(GL.GL_TEXTURE0);
9190	10972	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -9224,10 +11006,12 @@
9224	11006	gl.glMatrixMode(gl.GL_PROJECTION);
9225	11007	gl.glLoadIdentity();
9226	11008
9227		- if (drawMode == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
	11009	+ if (DrawMode() == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
9228	11010	{
9229	11011	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
9230	11012	double scale = lightCamera.SCALE / lightCamera.Distance();
	11013	+// PATCH FILLE AUX JEANS
	11014	+ //scale *= lightCamera.shaper_fovy / 25;
9231	11015	gl.glScaled(2 * scale, 2 * scale, -scale);
9232	11016	gl.glTranslated(0, 0, lightCamera.DECAL);
9233	11017	//System.out.println("DECAL = " + LIGHTDECAL + "; SCALE = " + LIGHTSCALE);
..	..	@@ -9280,7 +11064,7 @@
9280	11064	//gl.glPushMatrix();
9281	11065	gl.glLoadIdentity();
9282	11066
9283		- if (!ambientOcclusion) // drawMode != OCCLUSION)
	11067	+ if (!ambientOcclusion) // DrawMode() != OCCLUSION)
9284	11068	{
9285	11069	//LA.xformPos(light0, lightCamera.fromScreen, light);
9286	11070	LA.xformDir(dirlight, lightCamera.fromScreen, lightposition);
..	..	@@ -9307,8 +11091,8 @@
9307	11091	System.err.println("parentcam != renderCamera");
9308	11092
9309	11093	// if (cam != lightCamera)
9310		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9311		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11094	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11095	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
9312	11096	}
9313	11097
9314	11098	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -9329,8 +11113,8 @@
9329	11113	if (true) // TODO
9330	11114	{
9331	11115	if (cam != lightCamera)
9332		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9333		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11116	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11117	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
9334	11118	}
9335	11119
9336	11120	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -9367,7 +11151,7 @@
9367	11151	}
9368	11152
9369	11153	/**/
9370		- if (true) // drawMode == SELECTION) // != DEFAULT)
	11154	+ if (true) // DrawMode() == SELECTION) // != DEFAULT)
9371	11155	gl.glDisable(gl.GL_LIGHTING);
9372	11156	else
9373	11157	gl.glEnable(gl.GL_LIGHTING);
..	..	@@ -9379,12 +11163,13 @@
9379	11163
9380	11164	gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 63, options2, 0);
9381	11165	gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 62, options3, 0);
	11166	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 61, options4, 0);
9382	11167
9383	11168	options2[0] *= renderCamera.Distance();
9384	11169
9385	11170	lightslot = 64;
9386	11171
9387		- if (!frozen && !ambientOcclusion && isRenderer && drawMode == DEFAULT)
	11172	+ if (!frozen && !ambientOcclusion && isRenderer && DrawMode() == DEFAULT)
9388	11173	{
9389	11174	DrawLights(object);
9390	11175	}
..	..	@@ -9395,7 +11180,7 @@
9395	11180	fragmentMode \|= (lightslot - 64) << 2; // 1; // first bit is available for aniso
9396	11181	//System.out.println("fragmentMode = " + fragmentMode);
9397	11182
9398		- if (drawMode == DEFAULT \|\| drawMode == SELECTION \|\| DEBUG_SELECTION)
	11183	+ if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| IsDebugSelection())
9399	11184	{
9400	11185	/*
9401	11186	if (CULLFACE \|\| (ambientOcclusion && OCCLUSION_CULLING))
..	..	@@ -9428,7 +11213,7 @@
9428	11213	}
9429	11214	}
9430	11215
9431		- if (drawMode == DEFAULT)
	11216	+ if (DrawMode() == DEFAULT)
9432	11217	{
9433	11218	if (WIREFRAME && !ambientOcclusion)
9434	11219	{
..	..	@@ -9446,7 +11231,7 @@
9446	11231	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9447	11232	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9448	11233
9449		- if (!fast/RENDERPROGRAM != 0/ && (drawMode == DEFAULT \|\| drawMode == SHADOW)) // && !WIREFRAME) //
	11234	+ if (!fast/RENDERPROGRAM != 0/ && (DrawMode() == DEFAULT \|\| DrawMode() == SHADOW)) // && !WIREFRAME) //
9450	11235	{
9451	11236	if (vertexMode != 0) // && !fast)
9452	11237	{
..	..	@@ -9466,7 +11251,7 @@
9466	11251	}
9467	11252	}
9468	11253
9469		- if (false) // fast && !IsFreezed() && drawMode != SELECTION && !ambientOcclusion)
	11254	+ if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
9470	11255	{
9471	11256	//gl.glDepthFunc(GL.GL_LEQUAL);
9472	11257	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -9494,7 +11279,7 @@
9494	11279	//gl.glDepthMask(false);
9495	11280	}
9496	11281
9497		- if (false) // drawMode == SHADOW)
	11282	+ if (false) // DrawMode() == SHADOW)
9498	11283	{
9499	11284	//SetColumnMajorData(cameraInverseTransform, view_1);
9500	11285	//System.out.println("light = " + cameraInverseTransform);
..	..	@@ -9508,16 +11293,16 @@
9508	11293	//System.out.println("object = " + object);
9509	11294	if (!frozen && !imageLocked)
9510	11295	{
9511		- if (!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0)
	11296	+ if (!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0)
9512	11297	{
9513	11298	displayAntiAliased(gl);
9514	11299	} else
9515	11300	{
9516	11301	programcount = 0;
9517		- int keepmode = drawMode;
	11302	+ int keepmode = DrawMode();
9518	11303	// if (DEBUG_SELECTION)
9519	11304	// {
9520		-// drawMode = SELECTION;
	11305	+// DrawMode() = SELECTION;
9521	11306	// }
9522	11307	// for point selection
9523	11308	// gl.glGetDoublev(gl.GL_MODELVIEW_MATRIX, tempmat, 0);
..	..	@@ -9527,10 +11312,10 @@
9527	11312	DrawObject(gl);
9528	11313
9529	11314	// jan 2013 System.err.println("RESET ABORT (display)");
9530		- // if (drawMode == DEFAULT)
	11315	+ // if (DrawMode() == DEFAULT)
9531	11316	// ABORTED = false;
9532	11317	fullreset = false;
9533		- drawMode = keepmode;
	11318	+ Globals.drawMode = keepmode; // WARNING
9534	11319	//System.out.println("PROGRAM SWITCH " + programcount);
9535	11320	}
9536	11321	}
..	..	@@ -9538,11 +11323,11 @@
9538	11323	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9539	11324	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9540	11325
9541		- if (drawMode == DEFAULT)
	11326	+ if (DrawMode() == DEFAULT)
9542	11327	{
9543	11328	ReleaseTexture(NOISE_TEXTURE, false);
9544	11329	}
9545		- //if (drawMode == DEFAULT)
	11330	+ //if (DrawMode() == DEFAULT)
9546	11331	{
9547	11332
9548	11333	gl.glActiveTexture(GL.GL_TEXTURE1);
..	..	@@ -9554,7 +11339,7 @@
9554	11339	//else
9555	11340	//gl.glDisable(gl.GL_TEXTURE_2D);
9556	11341	//gl.glPopMatrix();
9557		- if (imageCompleted && ANTIALIAS > 0 && drawMode == DEFAULT && cam != lightCamera && !ambientOcclusion)
	11342	+ if (imageCompleted && ANTIALIAS > 0 && DrawMode() == DEFAULT && cam != lightCamera && !ambientOcclusion)
9558	11343	{
9559	11344	//new Exception().printStackTrace();
9560	11345	//System.out.println("Draw image " + width + ", " + height);
..	..	@@ -9596,7 +11381,7 @@
9596	11381	//gl.glFlush();
9597	11382	}
9598	11383
9599		- if (flash && drawMode == DEFAULT)
	11384	+ if (flash && DrawMode() == DEFAULT)
9600	11385	{
9601	11386	flash = false;
9602	11387	wait = true;
..	..	@@ -9604,9 +11389,9 @@
9604	11389	}
9605	11390
9606	11391	//drawing = false;
9607		- //if(drawMode == DEFAULT)
	11392	+ //if(DrawMode() == DEFAULT)
9608	11393	// niceon = false;
9609		- if (drawMode == DEFAULT)
	11394	+ if (DrawMode() == DEFAULT)
9610	11395	{
9611	11396	currentlydrawing = false;
9612	11397	}
..	..	@@ -9626,7 +11411,7 @@
9626	11411	repaint();
9627	11412	}
9628	11413
9629		- if (isLIVE() && drawMode == DEFAULT) // may 2013
	11414	+ if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
9630	11415	repaint();
9631	11416
9632	11417	displaydone = true;
..	..	@@ -9645,8 +11430,14 @@
9645	11430	{
9646	11431	renderpass++;
9647	11432	// System.out.println("Draw object... ");
	11433	+ STEP = 1;
9648	11434	if (FAST) // in case there is no script
9649		- STEP = 16;
	11435	+ STEP = 8;
	11436	+
	11437	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11438	+ {
	11439	+ STEP *= 4;
	11440	+ }
9650	11441
9651	11442	//object.FullInvariants();
9652	11443
..	..	@@ -9660,10 +11451,10 @@
9660	11451	e.printStackTrace();
9661	11452	}
9662	11453
9663		- if (GraphreeD.RENDERME > 0)
9664		- GraphreeD.RENDERME--; // mechante magouille
	11454	+ if (Grafreed.RENDERME > 0)
	11455	+ Grafreed.RENDERME--; // mechante magouille
9665	11456
9666		- ONESTEP = false;
	11457	+ Globals.ONESTEP = false;
9667	11458	}
9668	11459
9669	11460	static boolean zoomonce = false;
..	..	@@ -9671,11 +11462,11 @@
9671	11462	void DrawObject(GL gl, boolean draw)
9672	11463	{
9673	11464	//System.out.println("DRAW OBJECT " + mouseDown);
9674		-// drawMode = SELECTION;
	11465	+// DrawMode() = SELECTION;
9675	11466	//GL gl = getGL();
9676	11467	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
9677	11468	{
9678		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && drawMode == SHADOW) // && !lightMode)
	11469	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
9679	11470	object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
9680	11471	pingthread.StepToTarget(true); // true);
9681	11472	// zoomonce = false;
..	..	@@ -9696,9 +11487,9 @@
9696	11487	callist = gl.glGenLists(1);
9697	11488	}
9698	11489
9699		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	11490	+ boolean selectmode = DrawMode() == SELECTION \|\| IsDebugSelection();
9700	11491
9701		- boolean active = !selectmode; // drawMode != SELECTION; // mouseDown;
	11492	+ boolean active = !selectmode; // DrawMode() != SELECTION; // mouseDown;
9702	11493
9703	11494	if (!mainDL \|\| !active \|\| touched)
9704	11495	{
..	..	@@ -9725,21 +11516,28 @@
9725	11516	PushMatrix(ClickInfo.matbuffer);
9726	11517	}
9727	11518
9728		- if (drawMode == 0)
	11519	+ if (DrawMode() == 0)
9729	11520	{
9730	11521	// System.out.println("CLEAR +++++++++++++++ +++++++++++++++ +++++++++++++++ +++++++++++++++");
9731	11522
9732	11523	usedtextures.clear();
9733	11524
9734		- BindTextures(DEFAULT_TEXTURES, 2);
	11525	+ try
	11526	+ {
	11527	+ BindTextures(DEFAULT_TEXTURES, 2);
	11528	+ }
	11529	+ catch (Exception e)
	11530	+ {
	11531	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11532	+ }
9735	11533	}
9736	11534	//System.out.println("--> " + stackdepth);
9737		-// GraphreeD.traceon();
	11535	+// GrafreeD.traceon();
9738	11536
9739	11537	// DRAW
9740	11538	object.draw(this, /(Composite)/ object, false, false);
9741	11539
9742		- if (drawMode == DEFAULT)
	11540	+ if (DrawMode() == DEFAULT)
9743	11541	{
9744	11542	if (DEBUG)
9745	11543	{
..	..	@@ -9750,34 +11548,48 @@
9750	11548	selectedpoint.radius = radius;
9751	11549	selectedpoint.recalculate();
9752	11550	selectedpoint.material = new cMaterial();
9753		- selectedpoint.material.color = 0.25f;
	11551	+ selectedpoint.material.color = 0.15f; // Yellow
9754	11552	selectedpoint.material.modulation = 0.75f;
9755	11553
9756		- debugpoint.radius = radius;
9757		- debugpoint.recalculate();
9758		- debugpoint.material = new cMaterial();
9759		- debugpoint.material.color = 0.25f;
9760		- debugpoint.material.modulation = 0.75f;
	11554	+ debugpointG.radius = radius;
	11555	+ debugpointG.recalculate();
	11556	+ debugpointG.material = new cMaterial();
	11557	+ debugpointG.material.color = 0.25f; // Green
	11558	+ debugpointG.material.modulation = 0.75f;
9761	11559
9762		- debugpoint2.radius = radius;
9763		- debugpoint2.recalculate();
9764		- debugpoint2.material = new cMaterial();
9765		- debugpoint2.material.color = 0.75f;
9766		- debugpoint2.material.modulation = 0.75f;
	11560	+ debugpointP.radius = radius;
	11561	+ debugpointP.recalculate();
	11562	+ debugpointP.material = new cMaterial();
	11563	+ debugpointP.material.color = 0.75f; // Purple
	11564	+ debugpointP.material.modulation = 0.75f;
	11565	+
	11566	+ debugpointC.radius = radius;
	11567	+ debugpointC.recalculate();
	11568	+ debugpointC.material = new cMaterial();
	11569	+ debugpointC.material.color = 0.5f; // Cyan
	11570	+ debugpointC.material.modulation = 0.75f;
	11571	+
	11572	+ debugpointR.radius = radius;
	11573	+ debugpointR.recalculate();
	11574	+ debugpointR.material = new cMaterial();
	11575	+ debugpointR.material.color = 0f; // Red
	11576	+ debugpointR.material.modulation = 0.75f;
9767	11577
9768	11578	InitPoints(radius);
9769	11579	}
9770	11580	selectedpoint.draw(this, /(Composite)/ null, false, false);
9771		- //debugpoint.draw(this, /(Composite)/ null, false);
9772		- //debugpoint2.draw(this, /(Composite)/ null, false);
9773		- DrawPoints(this);
	11581	+ debugpointG.draw(this, /(Composite)/ null, false,false);
	11582	+ debugpointP.draw(this, /(Composite)/ null, false,false);
	11583	+ debugpointC.draw(this, /(Composite)/ null, false,false);
	11584	+ debugpointR.draw(this, /(Composite)/ null, false,false);
	11585	+ // DrawPoints(this);
9774	11586	}
9775	11587
9776	11588	// debugstuff.draw(this, /(Composite)/ null, false);
9777	11589	}
9778		-// GraphreeD.traceoff();
	11590	+// GrafreeD.traceoff();
9779	11591	//System.out.println(stackdepth);
9780		- if (drawMode == 0)
	11592	+ if (DrawMode() == 0)
9781	11593	{
9782	11594	ReleaseTextures(DEFAULT_TEXTURES);
9783	11595
..	..	@@ -9802,17 +11614,26 @@
9802	11614
9803	11615	checker = null;
9804	11616
9805		- if (!ambientOcclusion && !IsFrozen() && drawMode == DEFAULT)
	11617	+ if (!ambientOcclusion && !IsFrozen() && DrawMode() == DEFAULT)
9806	11618	FindChecker(object);
9807	11619
9808		- if (checker != null && drawMode == DEFAULT)
	11620	+ if (checker != null && DrawMode() == DEFAULT)
9809	11621	{
9810		- // BindTexture(IMMORTAL_TEXTURE);
	11622	+ //BindTexture(IMMORTAL_TEXTURE);
	11623	+ try
	11624	+ {
	11625	+ BindTextures(checker.GetTextures(), checker.texres);
	11626	+ }
	11627	+ catch (Exception e)
	11628	+ {
	11629	+ System.err.println("FAILED: " + checker.GetTextures());
	11630	+ }
9811	11631	// NEAREST
9812	11632	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
9813	11633	DrawChecker(gl);
9814	11634	//checker.Draw(this, null, false);
9815	11635	// ReleaseTexture(IMMORTAL_TEXTURE);
	11636	+ ReleaseTextures(checker.GetTextures());
9816	11637	}
9817	11638
9818	11639	if (object.parent != null)
..	..	@@ -9825,7 +11646,7 @@
9825	11646	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9826	11647	//gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9827	11648
9828		- if (DISPLAYTEXT && drawMode == DEFAULT)
	11649	+ if (DISPLAYTEXT && DrawMode() == DEFAULT)
9829	11650	{
9830	11651	// Draw it once, then use the raster
9831	11652	Balloon(gl, balloon.createGraphics());
..	..	@@ -9881,14 +11702,14 @@
9881	11702	int[] xs = new int[3];
9882	11703	int[] ys = new int[3];
9883	11704
9884		- void DrawString(Object3D obj) // String string)
	11705	+ public void DrawString(Object3D obj) // String string) // INTERFACE
9885	11706	{
9886		- if (!DISPLAYTEXT \|\| drawMode != DEFAULT)
	11707	+ if (!DISPLAYTEXT \|\| DrawMode() != DEFAULT)
9887	11708	{
9888	11709	return;
9889	11710	}
9890	11711
9891		- String string = obj.GetToolTip();
	11712	+ String string = obj.toString(); //.GetToolTip();
9892	11713
9893	11714	GL gl = GetGL();
9894	11715
..	..	@@ -10205,8 +12026,8 @@
10205	12026	//obj.TransformToWorld(light, light);
10206	12027	for (int i = tp.size(); --i >= 0;)
10207	12028	{
10208		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
10209		- LA.xformPos(light, tp.get(i).toParent, light);
	12029	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12030	+ LA.xformPos(light, tp.get(i).GlobalTransform(), light);
10210	12031	}
10211	12032
10212	12033
..	..	@@ -10223,8 +12044,8 @@
10223	12044	parentcam = cameras[0];
10224	12045	}
10225	12046
10226		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10227		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12047	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12048	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
10228	12049
10229	12050	LA.xformPos(light, renderCamera.toScreen, light);
10230	12051
..	..	@@ -10343,11 +12164,13 @@
10343	12164	"PARAM params6 = program.env[6];" + // bump, noise, borderfade, fog punchthrough
10344	12165	"PARAM params7 = program.env[7];" + // noise power, opacity power
10345	12166	"PARAM options0 = program.env[63];" + // fog density, intensity, elevation
10346		- "PARAM options1 = program.env[62];" + // fog rgb color, image intensity
	12167	+ "PARAM options1 = program.env[62];" + // fog rgb color
	12168	+ "PARAM options2 = program.env[61];" + // image intensity, subsurface, lightsheen
10347	12169	"PARAM pointlight = program.env[127];" + // ...
10348	12170	"PARAM zero = { 0.0, 0.0, 0.0, 0.0 };" +
10349	12171	"PARAM halfhalf = { 0.25, 0.25, 0.25, 1.0 };" +
10350	12172	"PARAM half = { 0.5, 0.5, 0.5, 1.0 };" +
	12173	+ "PARAM threequarter = { 0.75, 0.75, 0.75, 1.0 };" +
10351	12174	"PARAM two = { 2.0, 2.0, 2.0, 1.0 };" +
10352	12175	"PARAM ten = { 10, 10, 10, 1.0 };" +
10353	12176	"PARAM one3rd = { 0.5, 0.33333333333, 0.333333333, 1.0 };" +
..	..	@@ -10368,6 +12191,7 @@
10368	12191	"PARAM lodbias = { 10,10,10,10 };" + // 20, -2, -20, 1.0 };" +
10369	12192	"PARAM infinity = { 100000000, 100000000, 100000000, 1.0 };" +
10370	12193	"PARAM one2048th = { 0.00048828125, 0.00048828125, 0.00048828125, 1.0 };" +
	12194	+ "PARAM ninetenth = { 0.9, 0.9, 0.9, 1.0 };" +
10371	12195	"PARAM almostone = { 0.999, 0.999, 0.999, 1.0 };" +
10372	12196	"PARAM c256 = { 256, 256, 256, 1.0 };" +
10373	12197	"PARAM c256i = { 0.00390625, 0.00390625, 0.00390625, 1.0 };" +
..	..	@@ -10408,6 +12232,10 @@
10408	12232	"TEMP R1;" +
10409	12233	"TEMP R2;" +
10410	12234	"TEMP R3;" +
	12235	+ "TEMP min;" +
	12236	+ "TEMP max;" +
	12237	+ "TEMP average;" +
	12238	+ "TEMP saturation;" +
10411	12239	"TEMP keep1;" +
10412	12240	"TEMP keep2;" +
10413	12241	"TEMP keep3;" +
..	..	@@ -10831,8 +12659,8 @@
10831	12659
10832	12660	// display shadow only (bump == 0)
10833	12661	"SUB temp.x, half.x, shadow.x;" +
10834		- "MOV temp.y, -params6.x;" +
10835		- "SLT temp.z, temp.y, zero.x;" +
	12662	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12663	+ "SLT temp.z, temp.y, -one2048th.x;" +
10836	12664	"SUB temp.y, one.x, temp.z;" +
10837	12665	"MUL temp.x, temp.x, temp.y;" +
10838	12666	"KIL temp.x;" +
..	..	@@ -10938,10 +12766,42 @@
10938	12766
10939	12767	// skin?
10940	12768	// Saturation for skin
10941		- /**/ // c'est ici
10942		- (Skinshader? "DP3 temp.x, final,one;" +
	12769	+ /**/
	12770	+ (Skinshader?
	12771	+ "DP3 average.x, final,one;" +
	12772	+ "MUL average, one3rd.xxxx,average.xxxx;" +
	12773	+
	12774	+ "MIN min.x, final.x,final.y;" +
	12775	+ "MIN min.x, min.x,final.z;" +
	12776	+
	12777	+ "MAX max.x, final.x,final.y;" +
	12778	+ "MAX max.x, max.x,final.z;" +
	12779	+ "MOV max, max.xxxx;" +
	12780	+
	12781	+ "SUB saturation, max, final;" +
	12782	+
	12783	+ "ADD temp.x, max.x, one10th.x;" +
	12784	+ "RCP temp.x, temp.x;" +
	12785	+ "MUL temp.x, temp.x, half.x;" +
	12786	+ "MUL saturation, saturation, temp.xxxx;" +
	12787	+
	12788	+ "DP3 ndotl.x, normald, light;" +
	12789	+ "MAX ndotl.x, ndotl.x, -ndotl.x;" +
	12790	+
	12791	+ "SUB temp.x, one.x, ndotl.x;" +
	12792	+ // Tuning for default skin
	12793	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12794	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12795	+ "ADD temp.y, one.y, options2.y;" + // subsurface
	12796	+ "MUL temp.x, temp.x, temp.y;" +
	12797	+
	12798	+ "MUL saturation, saturation, temp.xxxx;" +
	12799	+ "SUB_SAT temp, max, saturation;" +
	12800	+/**
	12801	+ "DP3 temp.x, final,one;" +
10943	12802	"MUL R2, one3rd.xxxx,temp.xxxx;" +
10944		- "SUB temp, final,R2;" +
	12803	+ "SUB temp, final, R2;" +
	12804	+
10945	12805	// using light angle
10946	12806	"DP3 ndotl.x, normald,light;" +
10947	12807	//"SLT ndotl.y, ndotl.x, zero.x;" +
..	..	@@ -10954,7 +12814,6 @@
10954	12814	// using light intensity
10955	12815	"MOV ndotl.z, R2.x;" +
10956	12816	"MUL ndotl.z, ndotl.z, ndotl.z;" + // tuning...
10957		-
10958	12817	// june 2014
10959	12818	"MAD R1.x, ndotl.z,slope.y,one.x;" +
10960	12819	// "SUB ndotl.x, one.x, ndotl.x;" +
..	..	@@ -10966,6 +12825,7 @@
10966	12825	//"MUL R2.y, shadow.x,R2.y;" + // avril 2014
10967	12826
10968	12827	"MAD temp.x, R2.y, ndotl.y, temp.x;" + // red shift (skin)
	12828	+/**/
10969	12829
10970	12830	// "ADD final, R2,temp;" +
10971	12831	"MOV final, temp;"
..	..	@@ -11055,7 +12915,7 @@
11055	12915	/**/
11056	12916	// HDR
11057	12917	"MOV temp.z, final.a;" +
11058		- "MUL final, final,options1.w;" +
	12918	+ "MUL final, final,options2.x;" +
11059	12919	"MOV final.a, temp.z;" +
11060	12920	/**/
11061	12921
..	..	@@ -11092,10 +12952,17 @@
11092	12952	"MOV final.z, zero.x;" +
11093	12953	"MOV final.a, one.w;":""
11094	12954	) +
	12955	+ /*
11095	12956	(NORMALdebug?"MOV final.x, normal.x;" +
11096	12957	"MOV final.y, normal.y;" +
11097	12958	"MOV final.z, normal.z;" +
11098	12959	"MOV final.a, one.w;":""
	12960	+ ) +
	12961	+ */
	12962	+ (NORMALdebug?"SUB final.x, one.x, final.x;" +
	12963	+ "SUB final.y, one.x, final.y;" +
	12964	+ "SUB final.z, one.x, final.z;" +
	12965	+ "MOV final.a, final.a;":""
11099	12966	) +
11100	12967	// "MOV final, bumpmap;" +
11101	12968	"MOV result.color, final;" +
..	..	@@ -11124,7 +12991,7 @@
11124	12991	//once = true;
11125	12992	}
11126	12993
11127		- System.out.print("Program #" + mode + "; length = " + program.length());
	12994	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
11128	12995	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
11129	12996	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
11130	12997
..	..	@@ -11241,6 +13108,7 @@
11241	13108	String Shadow(String depth, String shadow)
11242	13109	{
11243	13110	return "MAX temp.x, ndotl.x, one64th.x;" +
	13111	+ "MIN temp.x, temp.x, ninetenth.x;" +
11244	13112	/**/
11245	13113	// Sine
11246	13114	"MUL temp.y, temp.x, temp.x;" +
..	..	@@ -11256,12 +13124,16 @@
11256	13124
11257	13125	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
11258	13126	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13127	+
	13128	+ // Compare fragment depth in light space with shadowmap.
11259	13129	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
11260	13130	"SGE temp.y, temp.x, zero.x;" +
11261		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13131	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13132	+
	13133	+ // Reverse comparison
11262	13134	"SUB temp.x, one.x, temp.x;" +
11263	13135	"MUL " + shadow + ".x, temp.x, temp.y;" +
11264		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13136	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
11265	13137	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
11266	13138
11267	13139	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -11275,6 +13147,10 @@
11275	13147	// No shadow for backface
11276	13148	"DP3 temp.x, normal, lightd;" +
11277	13149	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13150	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13151	+
	13152	+ // No shadow when out of frustrum
	13153	+ "SGE temp.x, " + depth + ".z, one.z;" +
11278	13154	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
11279	13155	"";
11280	13156	}
..	..	@@ -11833,7 +13709,7 @@
11833	13709	public void mousePressed(MouseEvent e)
11834	13710	{
11835	13711	//System.out.println("mousePressed: " + e);
11836		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13712	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
11837	13713	}
11838	13714
11839	13715	static long prevtime = 0;
..	..	@@ -11860,14 +13736,16 @@
11860	13736
11861	13737	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
11862	13738
	13739	+ if (BUTTONLESSWHEEL)
11863	13740	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
11864	13741	{
11865	13742	return;
11866	13743	}
11867	13744
	13745	+ boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
11868	13746
11869	13747	// TIMER
11870		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0) // VR
	13748	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
11871	13749	{
11872	13750	keepboxmode = BOXMODE;
11873	13751	keepsupport = SUPPORT;
..	..	@@ -11907,8 +13785,8 @@
11907	13785	// mode \|= META;
11908	13786	//}
11909	13787
11910		- SetMouseMode(WHEEL \| e.getModifiersEx());
11911		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13788	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13789	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
11912	13790	anchorX = ax;
11913	13791	anchorY = ay;
11914	13792	prevX = px;
..	..	@@ -11968,6 +13846,10 @@
11968	13846	// wasliveok = true;
11969	13847	// waslive = false;
11970	13848
	13849	+ // May 2019 Forget it:
	13850	+ if (true)
	13851	+ return;
	13852	+
11971	13853	// source == timer
11972	13854	if (mouseDown)
11973	13855	{
..	..	@@ -11996,7 +13878,7 @@
11996	13878	// ObjEditor.tweenManager.update(1f / 60f);
11997	13879
11998	13880	// fev 2014???
11999		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && drawMode == SHADOW) // && !lightMode)
	13881	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
12000	13882	object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
12001	13883	pingthread.StepToTarget(true); // true);
12002	13884	}
..	..	@@ -12006,7 +13888,7 @@
12006	13888
12007	13889	javax.swing.Timer timer = new javax.swing.Timer(350, this);
12008	13890
12009		- void clickStart(int x, int y, int modifiers)
	13891	+ void clickStart(int x, int y, int modifiers, int modifiersex)
12010	13892	{
12011	13893	if (!wasliveok)
12012	13894	return;
..	..	@@ -12023,7 +13905,7 @@
12023	13905	// touched = true; // main DL
12024	13906	if (isRenderer)
12025	13907	{
12026		- SetMouseMode(modifiers);
	13908	+ SetMouseMode(modifiers, modifiersex);
12027	13909	}
12028	13910
12029	13911	selectX = anchorX = x;
..	..	@@ -12036,7 +13918,7 @@
12036	13918	clicked = true;
12037	13919	hold = false;
12038	13920
12039		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	13921	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
12040	13922	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
12041	13923	{
12042	13924	// System.out.println("RESTART II " + modifiers);
..	..	@@ -12067,7 +13949,7 @@
12067	13949	info.camera = renderCamera;
12068	13950	info.x = x;
12069	13951	info.y = y;
12070		- info.modifiers = modifiers;
	13952	+ info.modifiers = modifiersex;
12071	13953	editObj = object.doEditClick(info, 0);
12072	13954	if (!editObj)
12073	13955	{
..	..	@@ -12084,11 +13966,14 @@
12084	13966
12085	13967	public void mouseDragged(MouseEvent e)
12086	13968	{
	13969	+ Globals.MOUSEDRAGGED = true;
	13970	+
	13971	+ //System.out.println("mouseDragged: " + e);
12087	13972	if (isRenderer)
12088	13973	movingcamera = true;
	13974	+
12089	13975	//if (drawing)
12090	13976	//return;
12091		- //System.out.println("mouseDragged: " + e);
12092	13977	if ((e.getModifiersEx() & CTRL) != 0
12093	13978	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
12094	13979	{
..	..	@@ -12096,7 +13981,7 @@
12096	13981	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12097	13982	}
12098	13983	else
12099		- drag(e.getX(), e.getY(), e.getModifiersEx());
	13984	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
12100	13985
12101	13986	//try { Thread.sleep(1); } catch (Exception ex) {}
12102	13987	}
..	..	@@ -12108,6 +13993,11 @@
12108	13993	cVector tmp = new cVector();
12109	13994	cVector tmp2 = new cVector();
12110	13995	boolean isMoving;
	13996	+
	13997	+ public cVector TargetLookAt()
	13998	+ {
	13999	+ return targetLookAt;
	14000	+ }
12111	14001
12112	14002	class PingThread extends Thread
12113	14003	{
..	..	@@ -12247,7 +14137,7 @@
12247	14137	//System.out.println("---------------- ---------- Paint " + tmp.length2());
12248	14138	if (lightMode)
12249	14139	{
12250		- lighttouched = true;
	14140	+ Globals.lighttouched = true;
12251	14141	}
12252	14142
12253	14143	if (OEILONCE && OEIL)
..	..	@@ -12264,6 +14154,7 @@
12264	14154
12265	14155	public void run()
12266	14156	{
	14157	+ new Exception().printStackTrace();
12267	14158	System.exit(0);
12268	14159	for (;;)
12269	14160	{
..	..	@@ -12305,7 +14196,7 @@
12305	14196	mouseDown = false;
12306	14197	if (lightMode)
12307	14198	{
12308		- lighttouched = true;
	14199	+ Globals.lighttouched = true;
12309	14200	}
12310	14201	repaint();
12311	14202	alreadypainted = true;
..	..	@@ -12313,7 +14204,7 @@
12313	14204	isMoving = false;
12314	14205	} //??
12315	14206
12316		- if (isLIVE() && !alreadypainted)
	14207	+ if (Globals.isLIVE() && !alreadypainted)
12317	14208	{
12318	14209	// FOR DEBUG BREAKPOINT USING PAUSE: while (true)
12319	14210	repaint();
..	..	@@ -12325,9 +14216,9 @@
12325	14216	{
12326	14217	if (lightMode)
12327	14218	{
12328		- lighttouched = true;
	14219	+ Globals.lighttouched = true;
12329	14220	}
12330		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14221	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
12331	14222	}
12332	14223	//else
12333	14224	}
..	..	@@ -12427,7 +14318,7 @@
12427	14318	int X, Y;
12428	14319	boolean SX, SY;
12429	14320
12430		- void drag(int x, int y, int modifiers)
	14321	+ void drag(int x, int y, int modifiers, int modifiersex)
12431	14322	{
12432	14323	if (IsFrozen())
12433	14324	{
..	..	@@ -12436,17 +14327,17 @@
12436	14327
12437	14328	drag = true; // NEW
12438	14329
12439		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14330	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
12440	14331
12441	14332	X = x;
12442	14333	Y = y;
12443	14334	// floating state for animation
12444		- MODIFIERS = modifiers;
12445		- modifiers &= ~1024;
	14335	+ MODIFIERS = modifiersex;
	14336	+ modifiersex &= ~1024;
12446	14337	if (false) // modifiers != 0)
12447	14338	{
12448	14339	//new Exception().printStackTrace();
12449		- System.out.println("mouseDragged: " + modifiers);
	14340	+ System.out.println("mouseDragged: " + modifiersex);
12450	14341	System.out.println("SHIFT = " + SHIFT);
12451	14342	System.out.println("CONTROL = " + COMMAND);
12452	14343	System.out.println("META = " + META);
..	..	@@ -12466,7 +14357,7 @@
12466	14357	info.camera = renderCamera;
12467	14358	info.x = x;
12468	14359	info.y = y;
12469		- object.editWindow.copy.doEditDrag(info);
	14360	+ object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
12470	14361	} else
12471	14362	{
12472	14363	if (x < startX)
..	..	@@ -12568,6 +14459,7 @@
12568	14459	{
12569	14460	manipCamera.Translate(dx, dy, getWidth());
12570	14461	}
	14462	+ else
12571	14463	if ((mouseMode & ZOOM) == 0 && (mouseMode & VR) != 0)
12572	14464	{
12573	14465	manipCamera.RotateInterest(dx, dy);
..	..	@@ -12578,7 +14470,7 @@
12578	14470
12579	14471	if (manipCamera == lightCamera)
12580	14472	{
12581		- lighttouched = true;
	14473	+ Globals.lighttouched = true;
12582	14474	}
12583	14475	/*
12584	14476	switch (mode)
..	..	@@ -12617,7 +14509,6 @@
12617	14509	public void mouseMoved(MouseEvent e)
12618	14510	{
12619	14511	//System.out.println("mouseMoved: " + e);
12620		-
12621	14512	if (isRenderer)
12622	14513	return;
12623	14514
..	..	@@ -12642,7 +14533,10 @@
12642	14533
12643	14534	public void mouseReleased(MouseEvent e)
12644	14535	{
	14536	+ Globals.MOUSEDRAGGED = false;
	14537	+
12645	14538	movingcamera = false;
	14539	+ X = Y = 0;
12646	14540	//System.out.println("mouseReleased: " + e);
12647	14541	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12648	14542	}
..	..	@@ -12665,9 +14559,9 @@
12665	14559	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
12666	14560	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
12667	14561
12668		- if (control \|\| command \|\| IsFrozen())
	14562	+// No delay if (control \|\| command \|\| IsFrozen())
12669	14563	timeout = true;
12670		- else
	14564	+// ?? May 2019 else
12671	14565	// timer.setDelay((modifiers & 128) != 0?0:350);
12672	14566	mouseDown = false;
12673	14567	if (!control && !command) // june 2013
..	..	@@ -12777,7 +14671,7 @@
12777	14671	System.out.println("keyReleased: " + e);
12778	14672	}
12779	14673
12780		- void SetMouseMode(int modifiers)
	14674	+ void SetMouseMode(int modifiers, int modifiersex)
12781	14675	{
12782	14676	//System.out.println("SetMouseMode = " + modifiers);
12783	14677	//modifiers &= ~1024;
..	..	@@ -12789,24 +14683,27 @@
12789	14683	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
12790	14684	// return;
12791	14685	//System.out.println("SetMode = " + modifiers);
12792		- if ((modifiers & WHEEL) == WHEEL)
	14686	+ if ((modifiersex & WHEEL) == WHEEL)
12793	14687	{
12794	14688	mouseMode \|= ZOOM;
12795	14689	}
12796		- if ((modifiers & META) == META)
	14690	+
	14691	+ boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
	14692	+ if (capsLocked) // \|\| (modifiers & META) == META)
12797	14693	{
12798	14694	mouseMode \|= VR; // BACKFORTH;
12799	14695	}
12800		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
12801		- {
12802		- mouseMode \|= SELECT; // BACKFORTH;
12803		- }
12804		- if ((modifiers & COMMAND) == COMMAND)
	14696	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
12805	14697	{
12806	14698	mouseMode \|= SELECT;
12807	14699	}
12808		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14700	+ if ((modifiersex & COMMAND) == COMMAND)
12809	14701	{
	14702	+ mouseMode \|= SELECT;
	14703	+ }
	14704	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
	14705	+ {
	14706	+ mouseMode &= ~VR;
12810	14707	mouseMode \|= TRANSLATE;
12811	14708	}
12812	14709	// if ((modifiers & SHIFT_META) == SHIFT_META)
..	..	@@ -12833,10 +14730,10 @@
12833	14730
12834	14731	if (isRenderer) //
12835	14732	{
12836		- SetMouseMode(modifiers);
	14733	+ SetMouseMode(0, modifiers);
12837	14734	}
12838	14735
12839		- theRenderer.keyPressed(key);
	14736	+ Globals.theRenderer.keyPressed(key);
12840	14737	}
12841	14738
12842	14739	int kompactbit = 4; // power bit
..	..	@@ -12848,7 +14745,7 @@
12848	14745	float SATPOW = 1; // 2; // 0.5f;
12849	14746	float BRIPOW = 1; // 0.5f; // 0.5f;
12850	14747
12851		- void keyPressed(int key)
	14748	+ public void keyPressed(int key)
12852	14749	{
12853	14750	if (key >= '0' && key <= '5')
12854	14751	clampbit = (key-'0');
..	..	@@ -12963,7 +14860,7 @@
12963	14860	case 'B':
12964	14861	BRISMOOTH ^= true;
12965	14862	SHADOWCULLFACE ^= true;
12966		- lighttouched = true;
	14863	+ Globals.lighttouched = true;
12967	14864	repaint();
12968	14865	break;
12969	14866	case 'b':
..	..	@@ -13063,7 +14960,7 @@
13063	14960	repaint();
13064	14961	break;
13065	14962	case 'O':
13066		- drawMode = OCCLUSION;
	14963	+ Globals.drawMode = OCCLUSION; // WARNING
13067	14964	repaint();
13068	14965	break;
13069	14966	case 'o':
..	..	@@ -13154,7 +15051,7 @@
13154	15051	break;
13155	15052	case ' ':
13156	15053	lightMode ^= true;
13157		- lighttouched = true;
	15054	+ Globals.lighttouched = true;
13158	15055	manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
13159	15056	targetLookAt.set(manipCamera.lookAt);
13160	15057	repaint();
..	..	@@ -13166,11 +15063,11 @@
13166	15063	repaint();
13167	15064	break;
13168	15065	case 'Z':
13169		- RESIZETEXTURE ^= true;
13170		- break;
	15066	+ //RESIZETEXTURE ^= true;
	15067	+ //break;
13171	15068	case 'z':
13172		- RENDERSHADOW ^= true;
13173		- lighttouched = true;
	15069	+ Globals.RENDERSHADOW ^= true;
	15070	+ Globals.lighttouched = true;
13174	15071	repaint();
13175	15072	break;
13176	15073	//case UP:
..	..	@@ -13196,7 +15093,8 @@
13196	15093	FlipTransform();
13197	15094	break;
13198	15095	case ENTER:
13199		- object.editWindow.ScreenFit(); // Edit();
	15096	+ // object.editWindow.ScreenFit(); // Edit();
	15097	+ ToggleLive();
13200	15098	break;
13201	15099	case DELETE:
13202	15100	ClearSelection();
..	..	@@ -13284,6 +15182,7 @@
13284	15182	}
13285	15183	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
13286	15184	}
	15185	+
13287	15186	static double OCCLUSIONBOOST = 1; // 0.5;
13288	15187
13289	15188	void keyReleased(int key, int modifiers)
..	..	@@ -13291,11 +15190,11 @@
13291	15190	//mode = ROTATE;
13292	15191	if ((MODIFIERS & COMMAND) == 0) // VR??
13293	15192	{
13294		- SetMouseMode(modifiers);
	15193	+ SetMouseMode(0, modifiers);
13295	15194	}
13296	15195	}
13297	15196
13298		- protected void processKeyEvent(KeyEvent e)
	15197	+ public void processKeyEvent(KeyEvent e)
13299	15198	{
13300	15199	switch (e.getID())
13301	15200	{
..	..	@@ -13425,8 +15324,9 @@
13425	15324
13426	15325	protected void processMouseMotionEvent(MouseEvent e)
13427	15326	{
13428		- //System.out.println("processMouseMotionEvent: " + mouseMode);
13429		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15327	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15328	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15329	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
13430	15330	{
13431	15331	mouseMoved(e);
13432	15332	} else
..	..	@@ -13456,6 +15356,7 @@
13456	15356
13457	15357	void SelectParent()
13458	15358	{
	15359	+ new Exception().printStackTrace();
13459	15360	System.exit(0);
13460	15361	Composite group = (Composite) object;
13461	15362	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -13479,6 +15380,7 @@
13479	15380
13480	15381	void SelectChildren()
13481	15382	{
	15383	+ new Exception().printStackTrace();
13482	15384	System.exit(0);
13483	15385	/*
13484	15386	Composite group = (Composite) object;
..	..	@@ -13643,7 +15545,9 @@
13643	15545	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
13644	15546	//Image img = CreateImage(width, height);
13645	15547	//System.out.println("width = " + width + "; height = " + height + "\n");
	15548	+
13646	15549	Graphics gr = g; // img.getGraphics();
	15550	+
13647	15551	if (!hasMarquee)
13648	15552	{
13649	15553	if (Xmin < Xmax) // !locked)
..	..	@@ -13741,14 +15645,33 @@
13741	15645	if (!isRenderer)
13742	15646	{
13743	15647	object.drawEditHandles(info, 0);
	15648	+
	15649	+ if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	15650	+ {
	15651	+ switch (object.selection.get(0).hitSomething)
	15652	+ {
	15653	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15654	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15655	+ break;
	15656	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15657	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15658	+ break;
	15659	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15660	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15661	+ break;
	15662	+ }
	15663	+
	15664	+ }
13744	15665	}
13745	15666	}
	15667	+
13746	15668	if (isRenderer)
13747	15669	{
13748	15670	//gr.setColor(Color.black);
13749	15671	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
13750	15672	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
13751	15673	}
	15674	+
13752	15675	if (hasMarquee)
13753	15676	{
13754	15677	gr.setXORMode(Color.white);
..	..	@@ -13771,6 +15694,7 @@
13771	15694	//if (g != gr) g.drawImage(img, 0, 0, width, height, null);
13772	15695	}
13773	15696
	15697	+ // To avoid clear.
13774	15698	public void update(Graphics g)
13775	15699	{
13776	15700	paint(g);
..	..	@@ -13860,6 +15784,7 @@
13860	15784	public boolean mouseDown(Event evt, int x, int y)
13861	15785	{
13862	15786	System.out.println("mouseDown: " + evt);
	15787	+ System.exit(0);
13863	15788	/*
13864	15789	locked = true;
13865	15790	drag = false;
..	..	@@ -13903,7 +15828,7 @@
13903	15828	{
13904	15829	keyPressed(0, modifiers);
13905	15830	}
13906		- clickStart(x, y, modifiers);
	15831	+ // clickStart(x, y, modifiers);
13907	15832	return true;
13908	15833	}
13909	15834
..	..	@@ -14021,7 +15946,7 @@
14021	15946	{
14022	15947	keyReleased(0, 0);
14023	15948	}
14024		- drag(x, y, modifiers);
	15949	+ drag(x, y, 0, modifiers);
14025	15950	return true;
14026	15951	}
14027	15952
..	..	@@ -14153,7 +16078,7 @@
14153	16078	Object3D object;
14154	16079	static Object3D trackedobject;
14155	16080	Camera renderCamera; // Light or Eye (or Occlusion)
14156		- /static/ Camera manipCamera; // Light or Eye
	16081	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
14157	16082	/static/ Camera eyeCamera;
14158	16083	/static/ Camera lightCamera;
14159	16084	int cameracount;
..	..	@@ -14373,7 +16298,7 @@
14373	16298	gl.glPushAttrib(GL.GL_ALL_ATTRIB_BITS);
14374	16299	gl.glPushMatrix();
14375	16300	gl.glLoadIdentity();
14376		- PushMatrix(checker.toParent);
	16301	+ //PushMatrix(checker.toParent);
14377	16302
14378	16303	gl.glMatrixMode(GL.GL_TEXTURE);
14379	16304	gl.glPushMatrix();
..	..	@@ -14396,8 +16321,8 @@
14396	16321
14397	16322	gl.glNormal3f(0.0f, 0.0f, 1.0f);
14398	16323
14399		- float step = 0.1666f; //0.25f;
14400		- float stepv = step * 1652 / 998;
	16324	+ float step = 2; // 0.1666f; //0.25f;
	16325	+ float stepv = 2; // step * 1652 / 998;
14401	16326
14402	16327	int i0 = 0;
14403	16328	/*
..	..	@@ -14433,20 +16358,21 @@
14433	16358	/**/
14434	16359	//checker.GetMaterial().opacity = 1.1f;
14435	16360	////checker.GetMaterial().ambient = 0.99f;
14436		- Object3D.materialstack[Object3D.materialdepth] = checker.material;
14437		- Object3D.selectedstack[Object3D.materialdepth] = false;
14438		- cStatic.objectstack[Object3D.materialdepth++] = checker;
	16361	+ materialstack[materialdepth] = checker.material;
	16362	+ selectedstack[materialdepth] = false;
	16363	+ cStatic.objectstack[materialdepth++] = checker;
14439	16364	//System.out.println("material " + material);
14440	16365	//Applet3D.tracein(this, selected);
14441	16366	vector2buffer = checker.projectedVertices;
14442	16367
14443		- checker.GetMaterial().Draw(this, false); // true);
	16368	+ //checker.GetMaterial().Draw(this, false); // true);
	16369	+ DrawMaterial(checker.GetMaterial(), false); // true);
14444	16370
14445		- Object3D.materialdepth -= 1;
14446		- if (Object3D.materialdepth > 0)
	16371	+ materialdepth -= 1;
	16372	+ if (materialdepth > 0)
14447	16373	{
14448		- vector2buffer = cStatic.objectstack[Object3D.materialdepth - 1].projectedVertices;
14449		- Object3D.materialstack[Object3D.materialdepth - 1].Draw(this, Object3D.selectedstack[Object3D.materialdepth - 1]);
	16374	+ vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16375	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
14450	16376	}
14451	16377	//checker.GetMaterial().opacity = 1f;
14452	16378	////checker.GetMaterial().ambient = 1f;
..	..	@@ -14467,15 +16393,27 @@
14467	16393
14468	16394	//float u = (i+1)/2;
14469	16395	//float v = (j+1)/2;
14470		- gl.glTexCoord2f((i + 1) / 2, (j + 1) / 2); // (1,0) // (i+1+step)/2,(j+1)/2);
	16396	+ if (checker.flipV)
	16397	+ gl.glTexCoord2f((i + 1) / 2, 1 - (j + 1) / 2);
	16398	+ else
	16399	+ gl.glTexCoord2f((i + 1) / 2, (j + 1) / 2); // (1,0) // (i+1+step)/2,(j+1)/2);
14471	16400	gl.glVertex3f(i, j, -0.5f);
14472	16401
	16402	+ if (checker.flipV)
	16403	+ gl.glTexCoord2f((i + 1 + step) / 2, 1 - (j + 1) / 2); // (1,1) // (i+1+step)/2,(j+1+step)/2);
	16404	+ else
14473	16405	gl.glTexCoord2f((i + 1 + step) / 2, (j + 1) / 2); // (1,1) // (i+1+step)/2,(j+1+step)/2);
14474	16406	gl.glVertex3f(i + step, j, -0.5f);
14475	16407
	16408	+ if (checker.flipV)
	16409	+ gl.glTexCoord2f((i + 1 + step) / 2, 1 - (j + 1 + stepv) / 2); // (0,1) //(i+1)/2,(j+1+step)/2);
	16410	+ else
14476	16411	gl.glTexCoord2f((i + 1 + step) / 2, (j + 1 + stepv) / 2); // (0,1) //(i+1)/2,(j+1+step)/2);
14477	16412	gl.glVertex3f(i + step, j + stepv, -0.5f);
14478	16413
	16414	+ if (checker.flipV)
	16415	+ gl.glTexCoord2f((i + 1) / 2, 1 - (j + 1 + stepv) / 2); // (0,0) //(i+1)/2,(j+1)/2);
	16416	+ else
14479	16417	gl.glTexCoord2f((i + 1) / 2, (j + 1 + stepv) / 2); // (0,0) //(i+1)/2,(j+1)/2);
14480	16418	gl.glVertex3f(i, j + stepv, -0.5f);
14481	16419	}
..	..	@@ -14487,7 +16425,7 @@
14487	16425	gl.glMatrixMode(GL.GL_PROJECTION);
14488	16426	gl.glPopMatrix();
14489	16427	gl.glMatrixMode(GL.GL_MODELVIEW);
14490		- PopMatrix(null); // checker.toParent); // null);
	16428	+ //PopMatrix(null); // checker.toParent); // null);
14491	16429	gl.glPopMatrix();
14492	16430	PopTextureMatrix(checker.toParent);
14493	16431	gl.glMatrixMode(GL.GL_TEXTURE);
..	..	@@ -14578,6 +16516,7 @@
14578	16516	{
14579	16517	if (!selection)
14580	16518	{
	16519	+ new Exception().printStackTrace();
14581	16520	System.exit(0);
14582	16521	return;
14583	16522	}
..	..	@@ -14600,14 +16539,14 @@
14600	16539
14601	16540	//int tmp = selection_view;
14602	16541	//selection_view = -1;
14603		- int temp = drawMode;
14604		- drawMode = SELECTION;
	16542	+ int temp = DrawMode();
	16543	+ Globals.drawMode = SELECTION; // WARNING
14605	16544	indexcount = 0;
14606	16545	parent.display(drawable);
14607	16546	//selection_view = tmp;
14608	16547	//if (temp == SELECTION)
14609	16548	// temp = DEFAULT; // patch for selection debug
14610		- drawMode = temp;
	16549	+ Globals.drawMode = temp; // WARNING
14611	16550
14612	16551	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
14613	16552
..	..	@@ -14657,6 +16596,11 @@
14657	16596	// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
14658	16597	// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
14659	16598
	16599	+ // Will fit the mesh !!!
	16600	+ selectedpoint.toParent[0][0] = 0.0001;
	16601	+ selectedpoint.toParent[1][1] = 0.0001;
	16602	+ selectedpoint.toParent[2][2] = 0.0001;
	16603	+
14660	16604	glu.gluUnProject(x,y,depth,view,0,tempmat2,0,viewport,0,selectedpoint.toParent[3],0);
14661	16605
14662	16606	// if (object.selection != null && object.selection.Size() > 0)
..	..	@@ -14700,16 +16644,16 @@
14700	16644	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]));
14701	16645	}
14702	16646
14703		- previousselectedpoint = (Sphere) GraphreeD.clone(selectedpoint);
	16647	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
14704	16648	}
14705	16649	}
14706	16650
14707	16651	if (!movingcamera && !PAINTMODE)
14708	16652	object.editWindow.ScreenFitPoint(); // fev 2014
14709	16653
14710		- if (PAINTMODE && GraphreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16654	+ if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
14711	16655	{
14712		- Object3D paintobj = GraphreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16656	+ Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
14713	16657
14714	16658	Object3D group = new Object3D("inst" + paintcount++);
14715	16659
..	..	@@ -14865,7 +16809,7 @@
14865	16809	gl.glDisable(gl.GL_CULL_FACE);
14866	16810	}
14867	16811
14868		- if (!RENDERSHADOW)
	16812	+ if (!Globals.RENDERSHADOW)
14869	16813	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
14870	16814
14871	16815	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -14875,14 +16819,14 @@
14875	16819	//gl.glColorMask(false, false, false, false);
14876	16820
14877	16821	//render_scene_from_light_view(gl, drawable, 0, 0);
14878		- if (RENDERSHADOW && lighttouched && !movingcamera) // && !parent.IsFreezed())
	16822	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
14879	16823	{
14880	16824	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
14881	16825
14882		- int temp = drawMode;
14883		- drawMode = SHADOW;
	16826	+ int temp = DrawMode();
	16827	+ Globals.drawMode = SHADOW; // WARNING
14884	16828	parent.display(drawable);
14885		- drawMode = temp;
	16829	+ Globals.drawMode = temp; // WARNING
14886	16830	}
14887	16831
14888	16832	gl.glCullFace(gl.GL_BACK);
..	..	@@ -14935,7 +16879,6 @@
14935	16879
14936	16880	class AntialiasBuffer implements GLEventListener
14937	16881	{
14938		-
14939	16882	CameraPane parent = null;
14940	16883
14941	16884	AntialiasBuffer(CameraPane p)
..	..	@@ -15045,13 +16988,19 @@
15045	16988	gl.glFlush();
15046	16989
15047	16990	/**/
15048		- gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_BGRA, GL.GL_UNSIGNED_INT_8_8_8_8_REV, occlusionsizebuffer);
	16991	+ gl.glReadPixels(0, 0, OCCLUSION_SIZE, OCCLUSION_SIZE, GL.GL_DEPTH_COMPONENT, GL.GL_FLOAT, occlusionsizebuffer);
15049	16992
15050		- int[] pixels = occlusionsizebuffer.array();
	16993	+ float[] pixels = occlusionsizebuffer.array();
15051	16994
15052	16995	double r = 0, g = 0, b = 0;
15053	16996
15054	16997	double count = 0;
	16998	+
	16999	+ gl.glGetDoublev(gl.GL_PROJECTION_MATRIX, tempmat2, 0);
	17000	+
	17001	+ float mindepth = 1;
	17002	+
	17003	+ double FACTOR = 1;
15055	17004
15056	17005	for (int i = 0; i < pixels.length; i++)
15057	17006	{
..	..	@@ -15136,7 +17085,7 @@
15136	17085
15137	17086	double scale = ray.z; // 1; // cos
15138	17087
15139		- int p = pixels[newindex];
	17088	+ float depth = pixels[newindex];
15140	17089
15141	17090	/*
15142	17091	int newindex2 = (x + 1) * OCCLUSION_SIZE + y;
..	..	@@ -15160,10 +17109,23 @@
15160	17109	scale = (1 - modu) * modv;
15161	17110	*/
15162	17111
15163		- r += ((p >> 16) & 0xFF) * scale / 255;
15164		- g += ((p >> 8) & 0xFF) * scale / 255;
15165		- b += (p & 0xFF) * scale / 255;
	17112	+ //r += ((p >> 16) & 0xFF) * scale / 255;
	17113	+ //g += ((p >> 8) & 0xFF) * scale / 255;
	17114	+ //b += (p & 0xFF) * scale / 255;
	17115	+
	17116	+ if (mindepth > depth)
	17117	+ {
	17118	+ mindepth = depth;
	17119	+ }
15166	17120
	17121	+ double z_eye = tempmat2[34 + 2] / (depth -2.0 + 1.0 - tempmat2[2*4 + 2]);
	17122	+
	17123	+ double factor = 1 - Math.exp(-z_eye * z_eye / FACTOR);
	17124	+
	17125	+ r += factor * scale;
	17126	+ g += factor * scale;
	17127	+ b += factor * scale;
	17128	+
15167	17129	count += scale;
15168	17130	}
15169	17131
..	..	@@ -15261,12 +17223,6 @@
15261	17223	GLUT glut = new GLUT();
15262	17224
15263	17225
15264		- static final public int DEFAULT = 0;
15265		- static final public int SELECTION = 1;
15266		- static final public int SHADOW = 2;
15267		- static final public int OCCLUSION = 3;
15268		- static
15269		- public int drawMode = DEFAULT;
15270	17226	public boolean spherical = false;
15271	17227	static boolean DEBUG_OCCLUSION = false;
15272	17228	static boolean DEBUG_SELECTION = false;
..	..	@@ -15279,10 +17235,12 @@
15279	17235	int AAbuffersize = 0;
15280	17236
15281	17237	//double[] selectedpoint = new double[3];
15282		- static Sphere selectedpoint = new Sphere();
	17238	+ static Superellipsoid selectedpoint = new Superellipsoid();
15283	17239	static Sphere previousselectedpoint = null;
15284		- static Sphere debugpoint = new Sphere();
15285		- static Sphere debugpoint2 = new Sphere();
	17240	+ static Sphere debugpointG = new Sphere();
	17241	+ static Sphere debugpointP = new Sphere();
	17242	+ static Sphere debugpointC = new Sphere();
	17243	+ static Sphere debugpointR = new Sphere();
15286	17244
15287	17245	static Sphere debugpoints[] = new Sphere[8];
15288	17246
..	..	@@ -15313,7 +17271,7 @@
15313	17271	}
15314	17272	}
15315	17273
15316		- static void DrawPoints(CameraPane cpane)
	17274	+ static void DrawPoints(iCameraPane cpane)
15317	17275	{
15318	17276	for (int i=0; i<8; i++) // first and last are red
15319	17277	{
..	..	@@ -15335,7 +17293,8 @@
15335	17293	static IntBuffer texturesizebuffer = IntBuffer.allocate(TEX_SIZE * TEX_SIZE);
15336	17294	static IntBuffer selectsizebuffer = IntBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
15337	17295	static java.nio.FloatBuffer pointselectsizebuffer = java.nio.FloatBuffer.allocate(SELECT_SIZE * SELECT_SIZE);
15338		- static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17296	+ //static IntBuffer occlusionsizebuffer = IntBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
	17297	+ static java.nio.FloatBuffer occlusionsizebuffer = java.nio.FloatBuffer.allocate(OCCLUSION_SIZE * OCCLUSION_SIZE);
15339	17298	static BufferedImage bufimage = new BufferedImage(TEX_SIZE, TEX_SIZE, BufferedImage.TYPE_INT_RGB);
15340	17299	static BufferedImage textest = new cBufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
15341	17300	static java.util.Vector<BufferedImage> billboards = new java.util.Vector<BufferedImage>();
..	..	@@ -15344,10 +17303,11 @@
15344	17303	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
15345	17304	// Depth buffer format
15346	17305	//private int depth_format;
15347		- static public void NextIndex(Object3D o, GL gl)
	17306	+
	17307	+ public void NextIndex()
15348	17308	{
15349	17309	indexcount+=16;
15350		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17310	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
15351	17311	//objects[indexcount] = o;
15352	17312	//System.out.println("indexcount = " + indexcount);
15353	17313	}