~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,13 @@
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;
174	159	}
175	160
176	161	CameraPane(Object3D o, Camera cam, boolean withcontext)
..	..	@@ -206,12 +191,53 @@
206	191	return CURRENTANTIALIAS > 0;
207	192	}
208	193
209		- 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()
210	236	{
211	237	GetGL().glClear(GetGL().GL_DEPTH_BUFFER_BIT);
212	238	}
213	239
214		- void DepthTest(boolean depthtest)
	240	+ public void DepthTest(boolean depthtest)
215	241	{
216	242	if (depthtest)
217	243	GetGL().glDepthFunc(GL.GL_LEQUAL);
..	..	@@ -219,7 +245,7 @@
219	245	GetGL().glDepthFunc(GL.GL_ALWAYS);
220	246	}
221	247
222		- void DepthWrite(boolean depthwrite)
	248	+ public void DepthWrite(boolean depthwrite)
223	249	{
224	250	if (depthwrite)
225	251	GetGL().glDepthMask(true);
..	..	@@ -227,12 +253,1594 @@
227	253	GetGL().glDepthMask(false);
228	254	}
229	255
230		- void BackFaceCull(boolean bfc)
	256	+ public void BackFaceCull(boolean bfc)
231	257	{
232	258	if (bfc)
233	259	GetGL().glEnable(GetGL().GL_CULL_FACE);
234	260	else
235	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	+ if (!hasnorm)
	469	+ {
	470	+ // System.out.println("FUCK!!");
	471	+ LA.vecSub(pv/.pos/, qv/.pos/, obj.v0);
	472	+ LA.vecSub(pv/.pos/, rv/.pos/, obj.v1);
	473	+ LA.vecCross(obj.v0, obj.v1, obj.v2);
	474	+ LA.vecNormalize(obj.v2);
	475	+ gl.glNormal3f((float) obj.v2.x, (float) obj.v2.y, (float) obj.v2.z);
	476	+ }
	477	+
	478	+ // P
	479	+ float x = (float)pv.x;
	480	+ float y = (float)pv.y;
	481	+ float z = (float)pv.z;
	482	+
	483	+ if (hasnorm)
	484	+ {
	485	+// if (!pv.norm.normalized())
	486	+// assert(pv.norm.normalized());
	487	+
	488	+ //System.out.println("normalp = " + pv.norm.x + ", " + pv.norm.y + ", " + pv.norm.z);
	489	+ float nx = (float)pv.norm.x;
	490	+ float ny = (float)pv.norm.y;
	491	+ float nz = (float)pv.norm.z;
	492	+
	493	+ x += nx * obj.NORMALPUSH;
	494	+ y += ny * obj.NORMALPUSH;
	495	+ z += nz * obj.NORMALPUSH;
	496	+
	497	+ gl.glNormal3f(nx, ny, nz);
	498	+ }
	499	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	500	+ SetColor(obj, pv);
	501	+ //gl.glColor4f(r, g, b, 1);
	502	+ //gl.glColor4f(pv.boundary, pv.boundary, pv.boundary, 1);
	503	+ if (obj.flipV)
	504	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	505	+ else
	506	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	507	+ //System.out.println("vertexp = " + pv.x + ", " + pv.y + ", " + pv.z);
	508	+
	509	+ gl.glVertex3f(x, y, z);
	510	+
	511	+ // Q
	512	+ x = (float)qv.x;
	513	+ y = (float)qv.y;
	514	+ z = (float)qv.z;
	515	+
	516	+// Print(pv);
	517	+ if (hasnorm)
	518	+ {
	519	+// assert(qv.norm.normalized());
	520	+ //System.out.println("normalq = " + qv.norm.x + ", " + qv.norm.y + ", " + qv.norm.z);
	521	+ float nx = (float)qv.norm.x;
	522	+ float ny = (float)qv.norm.y;
	523	+ float nz = (float)qv.norm.z;
	524	+
	525	+ x += nx * obj.NORMALPUSH;
	526	+ y += ny * obj.NORMALPUSH;
	527	+ z += nz * obj.NORMALPUSH;
	528	+
	529	+ gl.glNormal3f(nx, ny, nz);
	530	+ }
	531	+ //System.out.println("vertexq = " + qv.s + ", " + qv.t);
	532	+ // boolean locked = false;
	533	+ // float eps = 0.1f;
	534	+ // boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	535	+
	536	+ // int dot = 0; //*/ (int)f.dot;
	537	+
	538	+ // if ((dot&1) == 0)
	539	+ // dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	540	+
	541	+ // if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	542	+ if (obj.flipV)
	543	+ gl.glTexCoord2f((float) qv.s, 1-(float) qv.t);
	544	+ else
	545	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	546	+ // else
	547	+ // {
	548	+ // locked = true;
	549	+ // gl.glTexCoord2f((float) pv.s, (float) pv.t);
	550	+ // }
	551	+ gl.glColor4f(qv.AO, qv.AO, qv.AO, 1);
	552	+ SetColor(obj, qv);
	553	+
	554	+ gl.glVertex3f(x, y, z);
	555	+ //gl.glColor4f(r, g, b, 1);
	556	+ //gl.glColor4f(qv.boundary, qv.boundary, qv.boundary, 1);
	557	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	558	+// Print(qv);
	559	+
	560	+ // R
	561	+ x = (float)rv.x;
	562	+ y = (float)rv.y;
	563	+ z = (float)rv.z;
	564	+
	565	+ if (hasnorm)
	566	+ {
	567	+// assert(rv.norm.normalized());
	568	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	569	+ float nx = (float)rv.norm.x;
	570	+ float ny = (float)rv.norm.y;
	571	+ float nz = (float)rv.norm.z;
	572	+
	573	+ x += nx * obj.NORMALPUSH;
	574	+ y += ny * obj.NORMALPUSH;
	575	+ z += nz * obj.NORMALPUSH;
	576	+
	577	+ gl.glNormal3f(nx, ny, nz);
	578	+ }
	579	+
	580	+ // if ((dot&4) == 0)
	581	+ // dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	582	+
	583	+ // if (wrap \|\| !locked && (dot&8) != 0)
	584	+ if (obj.flipV)
	585	+ gl.glTexCoord2f((float) rv.s, 1-(float) rv.t);
	586	+ else
	587	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	588	+ // else
	589	+ // gl.glTexCoord2f((float) pv.s, (float) pv.t);
	590	+
	591	+ // f.dot = dot;
	592	+
	593	+ gl.glColor4f(rv.AO, rv.AO, rv.AO, 1);
	594	+ SetColor(obj, rv);
	595	+ //gl.glColor4f(r, g, b, 1);
	596	+ //gl.glColor4f(rv.boundary, rv.boundary, rv.boundary, 1);
	597	+ //System.out.println("vertexr = " + rv.x + ", " + rv.y + ", " + rv.z);
	598	+ gl.glVertex3f(x, y, z);
	599	+// Print(rv);
	600	+ //gl.glEnd();
	601	+ }
	602	+ else
	603	+ {
	604	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	605	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	606	+ gl.glVertex3f((float) rv.x, (float) rv.y, (float) rv.z);
	607	+
	608	+ }
	609	+
	610	+ if (false) // (attributes & WIREFRAME) != 0)
	611	+ {
	612	+ gl.glDisable(gl.GL_LIGHTING);
	613	+
	614	+ gl.glBegin(gl.GL_LINE_LOOP);
	615	+ gl.glVertex3d(pv./pos./x, pv./pos./y, pv./pos./z);
	616	+ gl.glVertex3d(qv./pos./x, qv./pos./y, qv./pos./z);
	617	+ gl.glVertex3d(rv./pos./x, rv./pos./y, rv./pos./z);
	618	+ gl.glEnd();
	619	+
	620	+ gl.glEnable(gl.GL_LIGHTING);
	621	+ }
	622	+ }
	623	+
	624	+ /**
	625	+ * <code>draw</code> renders a <code>TriMesh</code> object including
	626	+ * it's normals, colors, textures and vertices.
	627	+ *
	628	+ * @see Renderer#draw(TriMesh)
	629	+ * @param tris
	630	+ * the mesh to render.
	631	+ */
	632	+ public void DrawParticles(TriMesh geo, Object3D shape, boolean selected, boolean rotate) // TriMesh tris)
	633	+ {
	634	+ CameraPane display = this;
	635	+
	636	+ float r = display.modelParams0[0];
	637	+ float g = display.modelParams0[1];
	638	+ float b = display.modelParams0[2];
	639	+ float opacity = display.modelParams5[1];
	640	+
	641	+ //final GL gl = GLU.getCurrentGL();
	642	+ GL gl = display.GetGL(); // getGL();
	643	+
	644	+ FloatBuffer vertBuf = geo.vertBuf;
	645	+
	646	+ int v = vertBuf.capacity();
	647	+
	648	+ int count = 0;
	649	+
	650	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	651	+ gl.glEnable(gl.GL_CULL_FACE);
	652	+ // gl.glScalef(1.0f/1024,1.0f/1024,1.0f/1024);
	653	+ for (int i=0; i<v/3; i++)
	654	+ {
	655	+ int index3 = i*3;
	656	+
	657	+ if (geo.sizeBuf.get(index3+1) == 0)
	658	+ continue;
	659	+
	660	+ count++;
	661	+
	662	+ int index4 = i*4;
	663	+
	664	+ float tx = vertBuf.get(index3);
	665	+ float ty = vertBuf.get(index3+1);
	666	+ float tz = vertBuf.get(index3+2);
	667	+
	668	+ // if (tx == 0 && ty == 0 && tz == 0)
	669	+ // continue;
	670	+
	671	+ gl.glMatrixMode(gl.GL_TEXTURE);
	672	+ gl.glPushMatrix();
	673	+
	674	+ float[] texmat = geo.texmat;
	675	+ texmat[12] = texmat[13] = texmat[14] = i;
	676	+
	677	+ gl.glMultMatrixf(texmat, 0);
	678	+
	679	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	680	+ gl.glPushMatrix();
	681	+
	682	+ gl.glTranslatef(tx,ty,tz);
	683	+
	684	+ if (rotate)
	685	+ gl.glRotatef(i, 0, 1, 0);
	686	+
	687	+ float size = geo.sizeBuf.get(index3) / 100;
	688	+ gl.glScalef(size,size,size);
	689	+
	690	+ float cr = geo.colorBuf.get(index4);
	691	+ float cg = geo.colorBuf.get(index4+1);
	692	+ float cb = geo.colorBuf.get(index4+2);
	693	+ float ca = geo.colorBuf.get(index4+3);
	694	+
	695	+ display.modelParams0[0] = r * cr;
	696	+ display.modelParams0[1] = g * cg;
	697	+ display.modelParams0[2] = b * cb;
	698	+
	699	+ display.modelParams5[1] = opacity * ca;
	700	+
	701	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	702	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	703	+
	704	+ RandomNode.globalseed = (int)geo.sizeBuf.get(index3+2); // i;
	705	+ RandomNode.globalseed2 = RandomNode.globalseed;
	706	+
	707	+// gl.glColor4f(cr,cg,cb,ca);
	708	+ // gl.glScalef(1024/16,1024/16,1024/16);
	709	+ shape.Draw/Node/(display,null,selected,false); // blocked
	710	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	711	+ //gl.glTranslatef(-tx,-ty,-tz);
	712	+ gl.glPopMatrix();
	713	+
	714	+ gl.glMatrixMode(gl.GL_TEXTURE);
	715	+ gl.glPopMatrix();
	716	+ }
	717	+ // gl.glScalef(1024,1024,1024);
	718	+ if (!cf)
	719	+ gl.glDisable(gl.GL_CULL_FACE);
	720	+
	721	+ display.modelParams0[0] = r;
	722	+ display.modelParams0[1] = g;
	723	+ display.modelParams0[2] = b;
	724	+
	725	+ display.modelParams5[1] = opacity;
	726	+
	727	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	728	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	729	+
	730	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	731	+
	732	+// System.err.println("total = " + v/3 + "; displayed = " + count);
	733	+ if (true)
	734	+ return;
	735	+
	736	+//// if (!tris.predraw(this))
	737	+//// {
	738	+//// return;
	739	+//// }
	740	+//// if (Debug.stats)
	741	+//// {
	742	+//// StatCollector.addStat(StatType.STAT_TRIANGLE_COUNT, tris.getTriangleCount());
	743	+//// StatCollector.addStat(StatType.STAT_VERTEX_COUNT, tris.getVertexCount());
	744	+//// StatCollector.addStat(StatType.STAT_GEOM_COUNT, 1);
	745	+//// }
	746	+////
	747	+//// if (tris.getDisplayListID() != -1)
	748	+//// {
	749	+//// renderDisplayList(tris);
	750	+//// return;
	751	+//// }
	752	+////
	753	+//// if (!generatingDisplayList)
	754	+//// {
	755	+//// applyStates(tris.states, tris);
	756	+//// }
	757	+//// if (Debug.stats)
	758	+//// {
	759	+//// StatCollector.startStat(StatType.STAT_RENDER_TIMER);
	760	+//// }
	761	+//// boolean transformed = doTransforms(tris);
	762	+//
	763	+// int glMode = GL.GL_TRIANGLES;
	764	+// switch (getMode())
	765	+// {
	766	+// case Triangles:
	767	+// glMode = GL.GL_TRIANGLES;
	768	+// break;
	769	+// case Strip:
	770	+// glMode = GL.GL_TRIANGLE_STRIP;
	771	+// break;
	772	+// case Fan:
	773	+// glMode = GL.GL_TRIANGLE_FAN;
	774	+// break;
	775	+// }
	776	+//
	777	+// if (!predrawGeometry(gl))
	778	+// {
	779	+// // make sure only the necessary indices are sent through on old
	780	+// // cards.
	781	+// IntBuffer indices = this.getIndexBuffer();
	782	+// if (indices == null)
	783	+// {
	784	+// logger.severe("missing indices on geometry object: " + this.toString());
	785	+// } else
	786	+// {
	787	+// indices.rewind();
	788	+// indices.limit(this.getMaxIndex());
	789	+//
	790	+// gl.glDrawElements(glMode, indices.limit(), GL.GL_UNSIGNED_INT, indices); // TODO Check <count> and assumed <type> of GL_UNSIGNED_INT
	791	+//
	792	+// indices.clear();
	793	+// }
	794	+// } else
	795	+// {
	796	+// gl.glDrawElements(glMode, this.getIndexBuffer().limit(),
	797	+// GL.GL_UNSIGNED_INT, 0);
	798	+// }
	799	+//
	800	+//// postdrawGeometry(tris);
	801	+//// if (transformed)
	802	+//// {
	803	+//// undoTransforms(tris);
	804	+//// }
	805	+////
	806	+//// if (Debug.stats)
	807	+//// {
	808	+//// StatCollector.endStat(StatType.STAT_RENDER_TIMER);
	809	+//// }
	810	+//// tris.postdraw(this);
	811	+ }
	812	+
	813	+ static Camera localcamera = new Camera();
	814	+ static cVector from = new cVector();
	815	+ static cVector to = new cVector();
	816	+
	817	+ public void PrepOcclusion(BoundaryRep br, double[][] transform)
	818	+ {
	819	+ CameraPane cp = this;
	820	+
	821	+ Camera keep = cp.RenderCamera();
	822	+ cp.renderCamera = localcamera;
	823	+
	824	+ if (br.trimmed)
	825	+ {
	826	+ float[] colors = new float[br.positions.length / 3];
	827	+
	828	+ int i3 = 0;
	829	+ for (int i = 0; i < br.positions.length / 3; i++, i3 += 3)
	830	+ {
	831	+ if (br.normals[i3] == 0 && br.normals[i3+1] == 0 && br.normals[i3+2] == 0)
	832	+ continue;
	833	+
	834	+ from.set(br.positions[i3], br.positions[i3 + 1], br.positions[i3 + 2]);
	835	+ to.set(br.positions[i3] + br.normals[i3],
	836	+ br.positions[i3 + 1] + br.normals[i3 + 1],
	837	+ br.positions[i3 + 2] + br.normals[i3 + 2]);
	838	+ LA.xformPos(from, transform, from);
	839	+ LA.xformPos(to, transform, to); // RIGID ONLY
	840	+ localcamera.setAim(from, to);
	841	+
	842	+ CameraPane.occlusionbuffer.display();
	843	+
	844	+ if (CameraPane.DEBUG_OCCLUSION)
	845	+ cp.display(); // debug
	846	+
	847	+ colors[i] = cp.vertexOcclusion.r;
	848	+ //colors[i3 + 1] = cp.vertexOcclusion.g;
	849	+ //colors[i3 + 2] = cp.vertexOcclusion.b;
	850	+
	851	+ if ((i % 100) == 0 && i != 0)
	852	+ {
	853	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	854	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	855	+ System.out.println((int) (100.0 * i / (br.positions.length / 3)) + "% (" + i + " of " + (br.positions.length / 3) + ")");
	856	+ }
	857	+ }
	858	+
	859	+ br.colors = colors;
	860	+ }
	861	+ else
	862	+ {
	863	+ for (int i = 0; i < br.VertexCount(); i++)
	864	+ {
	865	+ Vertex v = br.GetVertex(i);
	866	+
	867	+ if (v.norm == null \|\| v.norm.x == 0 && v.norm.y == 0 && v.norm.z == 0)
	868	+ continue;
	869	+
	870	+ from.set(v.x, v.y, v.z);
	871	+ to.set(v.x+v.norm.x, v.y+v.norm.y, v.z+v.norm.z);
	872	+ LA.xformPos(from, transform, from);
	873	+ LA.xformPos(to, transform, to); // RIGID ONLY
	874	+ localcamera.setAim(from, to);
	875	+
	876	+ CameraPane.occlusionbuffer.display();
	877	+
	878	+ if (CameraPane.DEBUG_OCCLUSION)
	879	+ cp.display(); // debug
	880	+
	881	+ v.AO = cp.vertexOcclusion.r;
	882	+
	883	+ if ((i % 100) == 0 && i != 0)
	884	+ {
	885	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	886	+ //System.out.println("Color = " + cp.vertexOcclusion.r + ", " + cp.vertexOcclusion.g + ", " + cp.vertexOcclusion.b + "; " + (int)(100.0*i/(positions.length/3)) + "% done");
	887	+ System.out.println((int) (100.0 * i / br.VertexCount()) + "% (" + i + " of " + br.VertexCount() + ")");
	888	+ }
	889	+ }
	890	+ }
	891	+
	892	+ //System.out.println("done.");
	893	+
	894	+ cp.renderCamera = keep;
	895	+ }
	896	+
	897	+ void DrawPointFLow(PointFlow pointFlow, Object3D /Composite/ root, boolean selected, boolean blocked)
	898	+ {
	899	+ CameraPane display = this;
	900	+ pointFlow.CreateHT();
	901	+
	902	+ float r = display.modelParams0[0];
	903	+ float g = display.modelParams0[1];
	904	+ float b = display.modelParams0[2];
	905	+ float opacity = display.modelParams5[1];
	906	+
	907	+ //final GL gl = GLU.getCurrentGL();
	908	+ GL gl = display.GetGL(); // getGL();
	909	+
	910	+ int s = pointFlow.points.size();
	911	+
	912	+ boolean cf = gl.glIsEnabled(gl.GL_CULL_FACE);
	913	+ gl.glEnable(gl.GL_CULL_FACE);
	914	+
	915	+ for (int i=s; --i>=0;)
	916	+ //for (int i=0; i<s; i++)
	917	+ {
	918	+ cVector v = pointFlow.points.get(i);
	919	+
	920	+ double mindist = Double.MAX_VALUE;
	921	+
	922	+ double size = pointFlow.minimumSize;
	923	+
	924	+ double distancenext = 0;
	925	+
	926	+ if (i > 0)
	927	+ {
	928	+ cVector w = pointFlow.points.get(i-1);
	929	+
	930	+ double dist = w.distance(v);
	931	+
	932	+ distancenext = dist;
	933	+
	934	+ if (mindist > dist)
	935	+ {
	936	+ mindist = dist;
	937	+ size = mindist*pointFlow.resizefactor;
	938	+ }
	939	+ }
	940	+
	941	+ if (i < s-1)
	942	+ {
	943	+ cVector w = pointFlow.points.get(i+1);
	944	+
	945	+ double dist = w.distance(v);
	946	+
	947	+ if (mindist > dist)
	948	+ {
	949	+ mindist = dist;
	950	+ size = mindist*pointFlow.resizefactor;
	951	+ }
	952	+ }
	953	+
	954	+ if (size < pointFlow.minimumSize)
	955	+ size = pointFlow.minimumSize;
	956	+ if (size > pointFlow.maximumSize)
	957	+ size = pointFlow.maximumSize;
	958	+
	959	+ double tx = v.x;
	960	+ double ty = v.y;
	961	+ double tz = v.z;
	962	+
	963	+ // if (tx == 0 && ty == 0 && tz == 0)
	964	+ // continue;
	965	+
	966	+ gl.glMatrixMode(gl.GL_TEXTURE);
	967	+ gl.glPushMatrix();
	968	+ pointFlow.texmat[12] = pointFlow.texmat[13] = pointFlow.texmat[14] = i;
	969	+
	970	+ gl.glMultMatrixf(pointFlow.texmat, 0);
	971	+
	972	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	973	+ gl.glPushMatrix();
	974	+
	975	+ gl.glTranslated(tx,ty,tz);
	976	+
	977	+ gl.glScaled(size,size,size);
	978	+
	979	+// float cr = colorBuf.get(index4);
	980	+// float cg = colorBuf.get(index4+1);
	981	+// float cb = colorBuf.get(index4+2);
	982	+// float ca = colorBuf.get(index4+3);
	983	+//
	984	+// display.modelParams0[0] = r * cr;
	985	+// display.modelParams0[1] = g * cg;
	986	+// display.modelParams0[2] = b * cb;
	987	+//
	988	+// display.modelParams5[1] = opacity * ca;
	989	+//
	990	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	991	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	992	+//
	993	+// RandomNode.globalseed = (int)sizeBuf.get(index3+2); // i;
	994	+// RandomNode.globalseed2 = RandomNode.globalseed;
	995	+//
	996	+//// gl.glColor4f(cr,cg,cb,ca);
	997	+// // gl.glScalef(1024/16,1024/16,1024/16);
	998	+ pointFlow.geo.Draw/Node/(display,null,selected, blocked);
	999	+
	1000	+ gl.glPopMatrix();
	1001	+
	1002	+ double step = size/4; //
	1003	+
	1004	+ if (i == 0 \|\| size == 0 \|\| distancenext > 8*size \|\| distancenext < step)
	1005	+ continue;
	1006	+
	1007	+ int nbsteps = (int)(distancenext/step);
	1008	+
	1009	+ step = distancenext/nbsteps;
	1010	+
	1011	+ cVector next = pointFlow.points.get(i-1);
	1012	+
	1013	+ tmp.set(next);
	1014	+ tmp.sub(v);
	1015	+ tmp.normalize();
	1016	+ tmp.mul(step);
	1017	+
	1018	+ // calculate next size
	1019	+ mindist = Double.MAX_VALUE;
	1020	+
	1021	+ double nextsize = pointFlow.minimumSize;
	1022	+
	1023	+ if (i > 1)
	1024	+ {
	1025	+ cVector w = pointFlow.points.get(i-2);
	1026	+
	1027	+ double dist = w.distance(next);
	1028	+
	1029	+ if (mindist > dist)
	1030	+ {
	1031	+ mindist = dist;
	1032	+ nextsize = mindist*pointFlow.resizefactor;
	1033	+ }
	1034	+ }
	1035	+
	1036	+ double dist = v.distance(next);
	1037	+
	1038	+ if (mindist > dist)
	1039	+ {
	1040	+ mindist = dist;
	1041	+ nextsize = mindist*pointFlow.resizefactor;
	1042	+ }
	1043	+
	1044	+ if (nextsize < pointFlow.minimumSize)
	1045	+ nextsize = pointFlow.minimumSize;
	1046	+ if (nextsize > pointFlow.maximumSize)
	1047	+ nextsize = pointFlow.maximumSize;
	1048	+ //
	1049	+
	1050	+ double count = 0;
	1051	+
	1052	+ while (distancenext > 0.000000001) // step
	1053	+ {
	1054	+ gl.glPushMatrix();
	1055	+
	1056	+ gl.glTranslated(tx + tmp.xcount, ty + tmp.ycount, tz + tmp.z*count);
	1057	+
	1058	+ double K = count/nbsteps;
	1059	+
	1060	+ double intersize = Knextsize + (1-K)size;
	1061	+
	1062	+ gl.glScaled(intersize,intersize,intersize);
	1063	+
	1064	+ pointFlow.geo.Draw/Node/(display,null,selected,blocked);
	1065	+
	1066	+ count++;
	1067	+
	1068	+ distancenext -= step;
	1069	+
	1070	+ gl.glPopMatrix();
	1071	+ }
	1072	+
	1073	+ if (count != nbsteps)
	1074	+ assert(count == nbsteps);
	1075	+
	1076	+ // gl.glScalef(16.0f/1024,16.0f/1024,16.0f/1024);
	1077	+ //gl.glTranslatef(-tx,-ty,-tz);
	1078	+
	1079	+ gl.glMatrixMode(gl.GL_TEXTURE);
	1080	+ gl.glPopMatrix();
	1081	+ }
	1082	+
	1083	+ if (!cf)
	1084	+ gl.glDisable(gl.GL_CULL_FACE);
	1085	+
	1086	+// display.modelParams0[0] = r;
	1087	+// display.modelParams0[1] = g;
	1088	+// display.modelParams0[2] = b;
	1089	+//
	1090	+// display.modelParams5[1] = opacity;
	1091	+//
	1092	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1093	+// gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1094	+
	1095	+ gl.glMatrixMode(gl.GL_MODELVIEW);
	1096	+ }
	1097	+
	1098	+ public void DrawBox(cVector min, cVector max)
	1099	+ {
	1100	+ javax.media.opengl.GL gl = GetGL();
	1101	+ gl.glBegin(gl.GL_LINES);
	1102	+
	1103	+ gl.glVertex3d(min.x, min.y, min.z);
	1104	+ gl.glVertex3d(min.x, min.y, max.z);
	1105	+ gl.glVertex3d(min.x, min.y, min.z);
	1106	+ gl.glVertex3d(min.x, max.y, min.z);
	1107	+ gl.glVertex3d(min.x, min.y, min.z);
	1108	+ gl.glVertex3d(max.x, min.y, min.z);
	1109	+
	1110	+ gl.glVertex3d(max.x, max.y, max.z);
	1111	+ gl.glVertex3d(min.x, max.y, max.z);
	1112	+ gl.glVertex3d(max.x, max.y, max.z);
	1113	+ gl.glVertex3d(max.x, min.y, max.z);
	1114	+ gl.glVertex3d(max.x, max.y, max.z);
	1115	+ gl.glVertex3d(max.x, max.y, min.z);
	1116	+
	1117	+ gl.glEnd();
	1118	+ }
	1119	+
	1120	+ public void DrawGeometry(BoundaryRep bRep, boolean flipV, boolean selectmode)
	1121	+ {
	1122	+ int[] strips = bRep.getRawIndices();
	1123	+
	1124	+ javax.media.opengl.GL gl = GetGL();
	1125	+
	1126	+ // TRIANGLE STRIP ARRAY
	1127	+ if (bRep.trimmed)
	1128	+ {
	1129	+ float[] v = bRep.getRawVertices();
	1130	+ float[] n = bRep.getRawNormals();
	1131	+ float[] c = bRep.getRawColors();
	1132	+ float[] uv = bRep.getRawUVMap();
	1133	+
	1134	+ int count2 = 0;
	1135	+ int count3 = 0;
	1136	+
	1137	+ if (n.length > 0)
	1138	+ {
	1139	+ for (int i = 0; i < strips.length; i++)
	1140	+ {
	1141	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1142	+
	1143	+ /*
	1144	+ boolean locked = false;
	1145	+ float eps = 0.1f;
	1146	+ boolean wrap = CameraPane.UVWRAP; // true; // UV WRAP TEXTURE ISSUE: true = artifacts, false = nice
	1147	+
	1148	+ int dot = 0;
	1149	+
	1150	+ if ((dot&1) == 0)
	1151	+ dot \|= (Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps) ? 3 : 1;
	1152	+
	1153	+ if (wrap \|\| (dot&2) != 0) // Math.abs(qv.s - pv.s) < eps && Math.abs(qv.t - pv.t) < eps)
	1154	+ gl.glTexCoord2f((float) qv.s, (float) qv.t);
	1155	+ else
	1156	+ {
	1157	+ locked = true;
	1158	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1159	+ }
	1160	+ //System.out.println("vertexq = " + qv.x + ", " + qv.y + ", " + qv.z);
	1161	+ gl.glVertex3f((float) qv.x, (float) qv.y, (float) qv.z);
	1162	+ if (hasnorm)
	1163	+ {
	1164	+ //System.out.println("normalr = " + rv.norm.x + ", " + rv.norm.y + ", " + rv.norm.z);
	1165	+ gl.glNormal3f((float) rv.norm.x, (float) rv.norm.y, (float) rv.norm.z);
	1166	+ }
	1167	+
	1168	+ if ((dot&4) == 0)
	1169	+ dot \|= (Math.abs(rv.s - pv.s) < eps && Math.abs(rv.t - pv.t) < eps) ? 12 : 4;
	1170	+
	1171	+ if (wrap \|\| !locked && (dot&8) != 0)
	1172	+ gl.glTexCoord2f((float) rv.s, (float) rv.t);
	1173	+ else
	1174	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1175	+
	1176	+ f.dot = dot;
	1177	+ */
	1178	+
	1179	+ if (!selectmode)
	1180	+ {
	1181	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1182	+ {
	1183	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1184	+ } else
	1185	+ {
	1186	+ gl.glNormal3f(0, 0, 1);
	1187	+ }
	1188	+
	1189	+ if (c != null)
	1190	+ //System.out.println("glcolor = " + c[count3] + ", " + c[count3+1] + ", " + c[count3+2]);
	1191	+ {
	1192	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1193	+ }
	1194	+ }
	1195	+ if (flipV)
	1196	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1197	+ else
	1198	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1199	+ //System.out.println("vertex1 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1200	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1201	+
	1202	+ count2 += 2;
	1203	+ count3 += 3;
	1204	+ if (!selectmode)
	1205	+ {
	1206	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1207	+ {
	1208	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1209	+ } else
	1210	+ {
	1211	+ gl.glNormal3f(0, 0, 1);
	1212	+ }
	1213	+ if (c != null)
	1214	+ {
	1215	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1216	+ }
	1217	+ }
	1218	+ if (flipV)
	1219	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1220	+ else
	1221	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1222	+ //System.out.println("vertex2 = " + v[count3] + ", " + v[count3+1] + ", " + v[count3+2]);
	1223	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1224	+
	1225	+ count2 += 2;
	1226	+ count3 += 3;
	1227	+ for (int j = 0; j < strips[i] - 2; j++)
	1228	+ {
	1229	+ //gl.glTexCoord2d(...);
	1230	+ if (!selectmode)
	1231	+ {
	1232	+ if (n[count3] != 0 \|\| n[count3 + 1] != 0 \|\| n[count3 + 2] != 0)
	1233	+ {
	1234	+ gl.glNormal3f(n[count3], n[count3 + 1], n[count3 + 2]);
	1235	+ } else
	1236	+ {
	1237	+ gl.glNormal3f(0, 0, 1);
	1238	+ }
	1239	+ if (c != null)
	1240	+ {
	1241	+ gl.glColor4f(c[count3/3], c[count3/3 /* + 1/], c[count3/3 / + 2*/], 1);
	1242	+ }
	1243	+ }
	1244	+
	1245	+ if (flipV)
	1246	+ gl.glTexCoord2f(uv[count2], 1-uv[count2 + 1]);
	1247	+ else
	1248	+ gl.glTexCoord2f(uv[count2], uv[count2 + 1]);
	1249	+ //System.out.println("coord3 = " + uv[count2] + ", " + uv[count2+1]);
	1250	+ gl.glVertex3f(v[count3], v[count3 + 1], v[count3 + 2]);
	1251	+ count2 += 2;
	1252	+ count3 += 3;
	1253	+ }
	1254	+
	1255	+ gl.glEnd();
	1256	+ }
	1257	+ }
	1258	+
	1259	+ assert count3 == v.length;
	1260	+ }
	1261	+ else // !trimmed
	1262	+ {
	1263	+ int count = 0;
	1264	+ for (int i = 0; i < strips.length; i++)
	1265	+ {
	1266	+ gl.glBegin(gl.GL_TRIANGLE_STRIP);
	1267	+
	1268	+ Vertex p = bRep.GetVertex(bRep.indices[count++]);
	1269	+ Vertex q = bRep.GetVertex(bRep.indices[count++]);
	1270	+
	1271	+ drawVertex(gl, p, flipV, selectmode);
	1272	+ drawVertex(gl, q, flipV, selectmode);
	1273	+
	1274	+ for (int j = 0; j < strips[i] - 2; j++)
	1275	+ {
	1276	+ Vertex r = bRep.GetVertex(bRep.indices[count++]);
	1277	+
	1278	+ // if (j%2 == 0)
	1279	+ // drawFace(p, q, r, display, null);
	1280	+ // else
	1281	+ // drawFace(p, r, q, display, null);
	1282	+
	1283	+ // p = q;
	1284	+ // q = r;
	1285	+ drawVertex(gl, r, flipV, selectmode);
	1286	+ }
	1287	+
	1288	+ gl.glEnd();
	1289	+ }
	1290	+ }
	1291	+ }
	1292	+
	1293	+ static cSpring.Point3D temp = new cSpring.Point3D();
	1294	+ static cSpring.Point3D temp2 = new cSpring.Point3D();
	1295	+ static cSpring.Point3D temp3 = new cSpring.Point3D();
	1296	+
	1297	+ public void DrawDynamicMesh(cMesh mesh)
	1298	+ {
	1299	+ GL gl = GetGL(); // getGL();
	1300	+
	1301	+ cSpring.PhysicsController3D Phys = mesh.Phys;
	1302	+
	1303	+ gl.glDisable(gl.GL_LIGHTING);
	1304	+
	1305	+ gl.glLineWidth(1);
	1306	+ gl.glColor3f(1,1,1);
	1307	+ gl.glBegin(gl.GL_LINES);
	1308	+ double scale = 0;
	1309	+ int count = 0;
	1310	+ for (int s=0; s<Phys.allSprings.size(); s++)
	1311	+ {
	1312	+ cSpring.Spring spring = Phys.allSprings.get(s);
	1313	+ if(s == 0)
	1314	+ {
	1315	+ //System.out.println(" spring : " + spring.a.position + "; " + spring.b.position);
	1316	+ }
	1317	+ if (mesh.showsprings)
	1318	+ {
	1319	+ temp.set(spring.a.position);
	1320	+ temp.add(spring.b.position);
	1321	+ temp.mul(0.5);
	1322	+ temp2.set(spring.a.position);
	1323	+ temp2.sub(spring.b.position);
	1324	+ temp2.mul(spring.restLength/2);
	1325	+ temp.sub(temp2);
	1326	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1327	+ temp.add(temp2);
	1328	+ temp.add(temp2);
	1329	+ gl.glVertex3f((float)temp.x, (float)temp.y, (float)temp.z);
	1330	+ }
	1331	+
	1332	+ if (spring.isHandle)
	1333	+ continue;
	1334	+
	1335	+ //if (scale < spring.restLength)
	1336	+ scale += spring.restLength;
	1337	+ count++;
	1338	+ }
	1339	+ gl.glEnd();
	1340	+
	1341	+ if (count == 0)
	1342	+ scale = 0.01;
	1343	+ else
	1344	+ scale /= count * 3;
	1345	+
	1346	+ //scale = 0.25;
	1347	+
	1348	+ if (mesh.ShowInfo())
	1349	+ {
	1350	+ gl.glLineWidth(4);
	1351	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1352	+ {
	1353	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1354	+ if (node.mass == 0)
	1355	+ continue;
	1356	+
	1357	+ int i = node.springs==null?-1:node.springs.size();
	1358	+ gl.glColor3f((i>>2)&1,(i>>1)&1,i&1);
	1359	+ //temp.set(node.springForce.x, node.springForce.y, node.springForce.z);
	1360	+ //temp.normalize();
	1361	+ //gl.glColor3d((temp.x+1)/2, (temp.y+1)/2, (temp.z+1)/2);
	1362	+ gl.glBegin(gl.GL_LINES);
	1363	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1364	+ //gl.glVertex3d(node.position.x + node.normal.xscale, node.position.y + node.normal.yscale, node.position.z + node.normal.z*scale);
	1365	+ gl.glVertex3d(node.position.x + mesh.bRep.GetVertex(s).norm.x*scale,
	1366	+ node.position.y + mesh.bRep.GetVertex(s).norm.y*scale,
	1367	+ node.position.z + mesh.bRep.GetVertex(s).norm.z*scale);
	1368	+ gl.glEnd();
	1369	+ }
	1370	+
	1371	+ gl.glLineWidth(8);
	1372	+ for (int s=0; s<Phys.allNodes.size(); s++)
	1373	+ {
	1374	+ cSpring.DynamicNode node = Phys.allNodes.get(s);
	1375	+
	1376	+ if (node.springs != null)
	1377	+ {
	1378	+ for (int i=0; i<node.springs.size(); i+=1)
	1379	+ {
	1380	+ cSpring.DynamicNode f = node.springs.get(i).GetOther(node);
	1381	+
	1382	+ int c = i+1;
	1383	+ // c = node.springs.get(i).nbcopies;
	1384	+
	1385	+ gl.glColor3f((c>>2)&1,(c>>1)&1,c&1);
	1386	+ gl.glBegin(gl.GL_LINES);
	1387	+ gl.glVertex3d(node.position.x, node.position.y, node.position.z);
	1388	+ 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);
	1389	+ gl.glEnd();
	1390	+ }
	1391	+ }
	1392	+ }
	1393	+
	1394	+ gl.glLineWidth(1);
	1395	+ }
	1396	+
	1397	+ gl.glEnable(gl.GL_LIGHTING);
	1398	+ }
	1399	+
	1400	+ /// INTERFACE
	1401	+
	1402	+ public void StartTriangles()
	1403	+ {
	1404	+ javax.media.opengl.GL gl = GetGL();
	1405	+ gl.glBegin(gl.GL_TRIANGLES);
	1406	+ }
	1407	+
	1408	+ public void EndTriangles()
	1409	+ {
	1410	+ GetGL().glEnd();
	1411	+ }
	1412	+
	1413	+ void drawVertex(javax.media.opengl.GL gl, Vertex pv, boolean flipV, boolean selectmode)
	1414	+ {
	1415	+ if (!selectmode)
	1416	+ {
	1417	+ gl.glNormal3f((float) pv.norm.x, (float) pv.norm.y, (float) pv.norm.z);
	1418	+ gl.glColor4f(pv.AO, pv.AO, pv.AO, 1);
	1419	+
	1420	+ if (flipV)
	1421	+ gl.glTexCoord2f((float) pv.s, 1-(float) pv.t);
	1422	+ else
	1423	+ gl.glTexCoord2f((float) pv.s, (float) pv.t);
	1424	+ }
	1425	+
	1426	+ gl.glVertex3f((float) pv.x, (float) pv.y, (float) pv.z);
	1427	+ }
	1428	+
	1429	+ void SetColor(Object3D obj, Vertex p0)
	1430	+ {
	1431	+ CameraPane display = this;
	1432	+ BoundaryRep bRep = obj.bRep;
	1433	+
	1434	+ if (RENDERPROGRAM == 0)
	1435	+ {
	1436	+ float r = 0;
	1437	+ if (bRep != null)
	1438	+ {
	1439	+ if (bRep.stripified)
	1440	+ {
	1441	+ r = 1;
	1442	+ }
	1443	+ }
	1444	+ float g = 0;
	1445	+ if (bRep != null)
	1446	+ {
	1447	+ if (bRep.trimmed)
	1448	+ {
	1449	+ g = 1;
	1450	+ }
	1451	+ }
	1452	+ float b = 0;
	1453	+ if (obj.support != null && obj.link2master)
	1454	+ {
	1455	+ b = 1;
	1456	+ }
	1457	+ display.GetGL().glColor3f(rp0.AO, gp0.AO, b*p0.AO);
	1458	+ return;
	1459	+ }
	1460	+
	1461	+ if (display.DrawMode() != CameraPane.SHADOW)
	1462	+ return;
	1463	+
	1464	+ javax.media.opengl.GL gl = display.GetGL();
	1465	+// if (true) return;
	1466	+// float ao = p.AO;
	1467	+//
	1468	+// // if (ao == 0 && !bRep.AOdone) // transient problem!
	1469	+// // ao = 1;
	1470	+//
	1471	+// gl.glColor4f(ao, ao, ao, 1);
	1472	+
	1473	+// CameraPane.selectedpoint.
	1474	+// getAverage(cStatic.point1, true);
	1475	+ if (CameraPane.pointflow == null) // !random) // live)
	1476	+ {
	1477	+ return;
	1478	+ }
	1479	+
	1480	+ cStatic.point1.set(0,0,0);
	1481	+ LA.xformPos(cStatic.point1, CameraPane.selectedpoint.toParent, cStatic.point1);
	1482	+
	1483	+ cStatic.point1.sub(p0);
	1484	+
	1485	+
	1486	+// if (marked && (p0.vertexlinks == null \|\| support == null \|\| support.bRep == null)) // no position delta?
	1487	+// {
	1488	+// return;
	1489	+// }
	1490	+
	1491	+ //if (true)
	1492	+ if (cStatic.point1.dot(cStatic.point1) > 0.000001)
	1493	+ {
	1494	+ return;
	1495	+ }
	1496	+
	1497	+ float[] colorV = new float[3];
	1498	+
	1499	+ if (false) // marked)
	1500	+ {
	1501	+ // debug rigging weights
	1502	+ for (int object = 0; object < p0.vertexlinks.length; object++)
	1503	+ {
	1504	+ float weight = p0.weights[object] / p0.totalweight;
	1505	+
	1506	+ // if (weight < 0.1)
	1507	+ // {
	1508	+ // assert(weight == 0);
	1509	+ // continue;
	1510	+ // }
	1511	+
	1512	+ if (p0.vertexlinks[object] == -1)
	1513	+ continue;
	1514	+
	1515	+ Vertex q = obj.support.bRep.GetVertex(p0.vertexlinks[object]);
	1516	+
	1517	+ int color = //1 << object; //
	1518	+ //p.vertexlinks.length;
	1519	+ obj.support.bRep.supports[p0.closestsupport].links[object];
	1520	+ colorV[2] += (color & 1) * weight;
	1521	+ colorV[1] += ((color & 2) >> 1) * weight;
	1522	+ colorV[0] += ((color & 4) >> 2) * weight;
	1523	+ }
	1524	+ }
	1525	+ else
	1526	+ {
	1527	+ if (obj.drawingstarted)
	1528	+ {
	1529	+ // find next point
	1530	+ if (bRep.GetVertex(0).faceindices == null)
	1531	+ {
	1532	+ bRep.InitFaceIndices();
	1533	+ }
	1534	+
	1535	+ double ymin = p0.y;
	1536	+
	1537	+ Vertex newp = p0;
	1538	+
	1539	+ for (int fii = 0; fii < p0.faceindices.length; fii++)
	1540	+ {
	1541	+ int fi = p0.faceindices[fii];
	1542	+
	1543	+ if (fi == -1)
	1544	+ break;
	1545	+
	1546	+ Face f = bRep.GetFace(fi);
	1547	+
	1548	+ Vertex p = bRep.GetVertex(f.p);
	1549	+ Vertex q = bRep.GetVertex(f.q);
	1550	+ Vertex r = bRep.GetVertex(f.r);
	1551	+
	1552	+ int swap = (int)(Math.random()*3);
	1553	+
	1554	+// for (int s=swap; --s>=0;)
	1555	+// {
	1556	+// Vertex t = p;
	1557	+// p = q;
	1558	+// q = r;
	1559	+// r = t;
	1560	+// }
	1561	+ if (ymin > p.y)
	1562	+ {
	1563	+ ymin = p.y;
	1564	+ newp = p;
	1565	+// break;
	1566	+ }
	1567	+ if (ymin > q.y)
	1568	+ {
	1569	+ ymin = q.y;
	1570	+ newp = q;
	1571	+// break;
	1572	+ }
	1573	+ if (ymin > r.y)
	1574	+ {
	1575	+ ymin = r.y;
	1576	+ newp = r;
	1577	+// break;
	1578	+ }
	1579	+ }
	1580	+
	1581	+ CameraPane.selectedpoint.toParent[3][0] = newp.x;
	1582	+ CameraPane.selectedpoint.toParent[3][1] = newp.y;
	1583	+ CameraPane.selectedpoint.toParent[3][2] = newp.z;
	1584	+
	1585	+ obj.drawingstarted = false;
	1586	+
	1587	+ // return;
	1588	+ }
	1589	+
	1590	+ if (false) // CameraPane.DRAW
	1591	+ {
	1592	+ p0.AO = colorV[0] = 2;
	1593	+ colorV[1] = 2;
	1594	+ colorV[2] = 2;
	1595	+ }
	1596	+
	1597	+ CameraPane.pointflow.add(p0);
	1598	+ CameraPane.pointflow.Touch();
	1599	+ }
	1600	+
	1601	+// gl.glColor3f(colorV[0], colorV[1], colorV[2]);
	1602	+// gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
	1603	+// gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
	1604	+ }
	1605	+
	1606	+ void DrawMaterial(cMaterial material, boolean selected)
	1607	+ {
	1608	+ CameraPane display = this;
	1609	+ //new Exception().printStackTrace();
	1610	+
	1611	+ if (display.IsFrozen() && !selected \|\| display.IsAmbientOcclusionOn()) // \|\| display.drawMode == display.SHADOW)
	1612	+ {
	1613	+ return;
	1614	+ }
	1615	+
	1616	+ javax.media.opengl.GL gl = display.GetGL();
	1617	+
	1618	+ //Color col = Color.getHSBColor(color,modulation,1);
	1619	+ //col.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB), CameraPane.modelParams0);
	1620	+ if (!material.multiply)
	1621	+ {
	1622	+ display.color = material.color;
	1623	+ display.saturation = material.modulation;
	1624	+ }
	1625	+ else
	1626	+ {
	1627	+ display.color = material.color2;
	1628	+ display.saturation = material.modulation2;
	1629	+ }
	1630	+
	1631	+ cColor.HSBtoRGB(display.color, display.saturation, 1, display.modelParams0);
	1632	+
	1633	+ float[] colorV = Grafreed.colorV;
	1634	+
	1635	+ /**/
	1636	+ if (display.DrawMode() == display.DEFAULT) // && display.RENDERPROGRAM == 0)
	1637	+ {
	1638	+ colorV[0] = display.modelParams0[0] * material.diffuse;
	1639	+ colorV[1] = display.modelParams0[1] * material.diffuse;
	1640	+ colorV[2] = display.modelParams0[2] * material.diffuse;
	1641	+ colorV[3] = material.opacity;
	1642	+
	1643	+ gl.glColor4f(colorV[0], colorV[1], colorV[2], material.opacity);
	1644	+ //System.out.println("Opacity = " + opacity);
	1645	+
	1646	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_DIFFUSE, colorV, 0);
	1647	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1648	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_DIFFUSE, colorV, 0);
	1649	+
	1650	+ float amb = material.ambient;
	1651	+ if (amb < material.cameralight)
	1652	+ {
	1653	+ amb = material.cameralight;
	1654	+ }
	1655	+ colorV[0] = display.modelParams0[0] * material.diffuse * amb;
	1656	+ colorV[1] = display.modelParams0[1] * material.diffuse * amb;
	1657	+ colorV[2] = display.modelParams0[2] * material.diffuse * amb;
	1658	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_AMBIENT, colorV, 0);
	1659	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1660	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_AMBIENT, colorV, 0);
	1661	+
	1662	+ /**/
	1663	+ colorV[0] = ((1 - material.metalness) + display.modelParams0[0] * material.metalness) * material.specular;
	1664	+ colorV[1] = ((1 - material.metalness) + display.modelParams0[1] * material.metalness) * material.specular;
	1665	+ colorV[2] = ((1 - material.metalness) + display.modelParams0[2] * material.metalness) * material.specular;
	1666	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_SPECULAR, colorV, 0);
	1667	+ //color[0] /= 2; color[1] /= 2; color[2] /= 2;
	1668	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_SPECULAR, colorV, 0);
	1669	+ colorV[0] = 10 / material.shininess; // 1/0.005f;
	1670	+ //System.out.println("shininess = " + colorV[0]);
	1671	+ if (colorV[0] > 128)
	1672	+ {
	1673	+ colorV[0] = 128;
	1674	+ }
	1675	+ gl.glMaterialfv(gl.GL_FRONT, gl.GL_SHININESS, colorV, 0);
	1676	+ gl.glMaterialfv(gl.GL_BACK, gl.GL_SHININESS, colorV, 0);
	1677	+ /**/
	1678	+ }
	1679	+ /**/
	1680	+
	1681	+ //selected = false;
	1682	+ selected = selected && display.flash;
	1683	+
	1684	+ //display.modelParams0[0] = 0; // pigment.r;
	1685	+ //display.modelParams0[1] = 0; // pigment.g;
	1686	+ //display.modelParams0[2] = 0; // pigment.b;
	1687	+ if (!material.multiply)
	1688	+ {
	1689	+ display.modelParams0[3] = material.metalness;
	1690	+ display.modelParams1[0] = material.diffuse;
	1691	+ display.modelParams1[1] = material.specular;
	1692	+ display.modelParams1[2] = 1 / material.shininess;
	1693	+ display.modelParams1[3] = material.shift;
	1694	+ display.modelParams2[0] = material.ambient;
	1695	+ display.modelParams2[1] = material.lightarea;
	1696	+ //System.out.println("light area = " + lightarea);
	1697	+ display.modelParams2[2] = 1 / material.factor; // diffuseness
	1698	+ display.modelParams2[3] = material.velvet;
	1699	+ display.modelParams3[0] = material.sheen;
	1700	+ display.modelParams3[1] = material.subsurface;
	1701	+ display.modelParams3[2] = material.bump; // backlit
	1702	+ display.modelParams3[3] = material.aniso;
	1703	+ display.modelParams4[0] = material.anisoV;
	1704	+ display.modelParams4[1] = selected ? 100 : material.cameralight;
	1705	+ //System.out.println("selected = " + selected);
	1706	+ display.modelParams4[2] = material.diffuseness;
	1707	+ display.modelParams4[3] = material.shadow;
	1708	+ display.modelParams5[0] = material.texture;
	1709	+ display.modelParams5[1] = material.opacity;
	1710	+ display.modelParams5[2] = material.fakedepth;
	1711	+ display.modelParams5[3] = CameraPane.SHADOWCULLFACE ? 0f : (material.shadowbias - 0.005f) / 10;
	1712	+ }
	1713	+ else
	1714	+ {
	1715	+ display.modelParams0[3] = material.metalness2;
	1716	+ display.modelParams1[0] = material.diffuse2;
	1717	+ display.modelParams1[1] = material.specular2;
	1718	+ display.modelParams1[2] = material.shininess2;
	1719	+ display.modelParams1[3] = material.shift2;
	1720	+ display.modelParams2[0] = material.ambient2;
	1721	+ display.modelParams2[1] = material.lightarea2;
	1722	+ display.modelParams2[2] = material.factor2;
	1723	+ display.modelParams2[3] = material.velvet2;
	1724	+ display.modelParams3[0] = material.sheen2;
	1725	+ display.modelParams3[1] = material.subsurface2;
	1726	+ display.modelParams3[2] = material.bump2;
	1727	+ display.modelParams3[3] = material.aniso2;
	1728	+ display.modelParams4[0] = material.anisoV2;
	1729	+ display.modelParams4[1] = material.cameralight2;
	1730	+ //System.out.println("selected = " + selected);
	1731	+ display.modelParams4[2] = material.diffuseness2;
	1732	+ display.modelParams4[3] = material.shadow2;
	1733	+ display.modelParams5[0] = material.texture2;
	1734	+ display.modelParams5[1] = material.opacity2;
	1735	+ display.modelParams5[2] = material.fakedepth2;
	1736	+ display.modelParams5[3] = material.shadowbias2;
	1737	+ }
	1738	+
	1739	+ display.modelParams6[0] = 0;
	1740	+ display.modelParams6[1] = 0;
	1741	+ display.modelParams6[2] = 0;
	1742	+ display.modelParams6[3] = 0;
	1743	+
	1744	+ display.modelParams7[0] = 0;
	1745	+ display.modelParams7[1] = 1000;
	1746	+ display.modelParams7[2] = 0;
	1747	+ display.modelParams7[3] = 0;
	1748	+
	1749	+ display.modelParams6[0] = 100; // criss de bug de bump
	1750	+
	1751	+ Object3D.cVector2[] extparams = display.vector2buffer;
	1752	+ if (extparams != null && extparams.length > 0 && extparams[0] != null)
	1753	+ {
	1754	+ display.modelParams6[0] = extparams[0].x / 1000.0f; // bump
	1755	+ display.modelParams6[1] = extparams[0].y / 1000.0f; // noise
	1756	+ if (extparams.length > 1)
	1757	+ {
	1758	+ display.modelParams6[2] = extparams[1].x / 1000.0f; // borderfade
	1759	+ display.modelParams6[3] = extparams[1].y / 1000.0f; // (float)Math.exp(-extparams[1].y / 1000.0f); // fog punchthrough
	1760	+ if (extparams.length > 2)
	1761	+ {
	1762	+ display.modelParams7[0] = extparams[2].x / 1000.0f; // noise power
	1763	+ float x = extparams[2].y / 1000.0f;
	1764	+ //if (x == 0)
	1765	+ // x = 1f;
	1766	+ 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
	1767	+ if (extparams[2].y > 0)
	1768	+ {
	1769	+ //System.out.println("extparams[1].y = " + extparams[1].y);
	1770	+ //System.out.println("extparams[2].y = " + extparams[2].y);
	1771	+ //System.out.println("opacity power = " + display.modelParams7[1]);
	1772	+ }
	1773	+ }
	1774	+ }
	1775	+ }
	1776	+
	1777	+ //if (display.modelParams6[2] != 0)
	1778	+ /*
	1779	+ System.out.println("modelParams0[0] = " + display.modelParams0[0]);
	1780	+ System.out.println("modelParams0[1] = " + display.modelParams0[1]);
	1781	+ System.out.println("modelParams0[2] = " + display.modelParams0[2]);
	1782	+ System.out.println("modelParams0[3] = " + display.modelParams0[3]);
	1783	+ System.out.println("modelParams1[0] = " + display.modelParams1[0]);
	1784	+ System.out.println("modelParams1[1] = " + display.modelParams1[1]);
	1785	+ System.out.println("modelParams1[2] = " + display.modelParams1[2]);
	1786	+ System.out.println("modelParams1[3] = " + display.modelParams1[3]);
	1787	+ System.out.println("modelParams2[0] = " + display.modelParams2[0]);
	1788	+ System.out.println("modelParams2[1] = " + display.modelParams2[1]);
	1789	+ System.out.println("modelParams2[2] = " + display.modelParams2[2]);
	1790	+ System.out.println("modelParams2[3] = " + display.modelParams2[3]);
	1791	+ System.out.println("modelParams3[0] = " + display.modelParams3[0]);
	1792	+ System.out.println("modelParams3[1] = " + display.modelParams3[1]);
	1793	+ System.out.println("modelParams3[2] = " + display.modelParams3[2]);
	1794	+ System.out.println("modelParams3[3] = " + display.modelParams3[3]);
	1795	+ System.out.println("modelParams4[0] = " + display.modelParams4[0]);
	1796	+ System.out.println("modelParams4[1] = " + display.modelParams4[1]);
	1797	+ System.out.println("modelParams4[2] = " + display.modelParams4[2]);
	1798	+ System.out.println("modelParams4[3] = " + display.modelParams4[3]);
	1799	+ System.out.println("modelParams5[0] = " + display.modelParams5[0]);
	1800	+ System.out.println("modelParams5[1] = " + display.modelParams5[1]);
	1801	+ System.out.println("modelParams5[2] = " + display.modelParams5[2]);
	1802	+ System.out.println("modelParams5[3] = " + display.modelParams5[3]);
	1803	+ System.out.println("modelParams6[0] = " + display.modelParams6[0]);
	1804	+ System.out.println("modelParams6[1] = " + display.modelParams6[1]);
	1805	+ System.out.println("modelParams6[2] = " + display.modelParams6[2]);
	1806	+ System.out.println("modelParams6[3] = " + display.modelParams6[3]);
	1807	+ System.out.println("modelParams7[0] = " + display.modelParams7[0]);
	1808	+ System.out.println("modelParams7[1] = " + display.modelParams7[1]);
	1809	+ System.out.println("modelParams7[2] = " + display.modelParams7[2]);
	1810	+ System.out.println("modelParams7[3] = " + display.modelParams7[3]);
	1811	+ /**/
	1812	+ //assert (display.modelParams6[2] == 0);
	1813	+
	1814	+ //System.out.println("noise power = " + display.modelParams7[0]);
	1815	+ //System.out.println("shadowbias = " + shadowbias);
	1816	+
	1817	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 0, display.modelParams0, 0);
	1818	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 1, display.modelParams1, 0);
	1819	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 2, display.modelParams2, 0);
	1820	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 3, display.modelParams3, 0);
	1821	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 4, display.modelParams4, 0);
	1822	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 5, display.modelParams5, 0);
	1823	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 6, display.modelParams6, 0);
	1824	+ gl.glProgramEnvParameter4fvARB(gl.GL_FRAGMENT_PROGRAM_ARB, 7, display.modelParams7, 0);
	1825	+
	1826	+ int mode = display.FP_SHADER;
	1827	+
	1828	+ if (material.aniso != material.anisoV \|\| material.aniso > 0.002)
	1829	+ {
	1830	+ mode \|= display.FP_ANISO;
	1831	+ }
	1832	+
	1833	+ display.EnableProgram(mode);
	1834	+
	1835	+ //System.out.println("opacity power = " + display.modelParams7[1]);
	1836	+
	1837	+ if (!material.multiply)
	1838	+ {
	1839	+ if (Globals.drawMode == CameraPane.SHADOW)
	1840	+ gl.glDepthMask(material.opacity >= 0.9 && display.modelParams7[1] > 0.1);
	1841	+ else
	1842	+ gl.glDepthMask(material.opacity >= 0.99);
	1843	+ }
236	1844	}
237	1845
238	1846	int matrixdepth = 0; // 10000; // CONFLICT WITH cMESH... WARNING WARNING WARNING WARNING WARNING WARNING !!!!!!!!!!!! 0;
..	..	@@ -253,7 +1861,7 @@
253	1861	currentGL.glMultMatrixd(model, 0);
254	1862	}
255	1863
256		- void PushMatrix(double[][] matrix, int count)
	1864	+ public void PushMatrix(double[][] matrix, int count) // INTERFACE
257	1865	{
258	1866	matrixdepth++;
259	1867	// GrafreeD.tracein(matrix);
..	..	@@ -282,7 +1890,7 @@
282	1890	void PushMatrix(double[][] matrix)
283	1891	{
284	1892	// GrafreeD.tracein(matrix);
285		- PushMatrix(matrix,1);
	1893	+ PushMatrix(matrix, 1);
286	1894	}
287	1895
288	1896	void PushMatrix()
..	..	@@ -298,7 +1906,7 @@
298	1906
299	1907	double[][] tmpmat = new double[4][4];
300	1908
301		- void PopMatrix(double[][] inverse)
	1909	+ public void PopMatrix(double[][] inverse) // INTERFACE
302	1910	{
303	1911	--matrixdepth;
304	1912
..	..	@@ -338,7 +1946,7 @@
338	1946	PushTextureMatrix(matrix, 1);
339	1947	}
340	1948
341		- void PushTextureMatrix(double[][] matrix, int count)
	1949	+ public void PushTextureMatrix(double[][] matrix, int count) // INTERFACE
342	1950	{
343	1951	currentGL.glActiveTexture(GetGL().GL_TEXTURE0);
344	1952
..	..	@@ -352,7 +1960,7 @@
352	1960	currentGL.glMatrixMode(GetGL().GL_MODELVIEW);
353	1961	}
354	1962
355		- void PopTextureMatrix(double[][] inverse)
	1963	+ public void PopTextureMatrix(double[][] inverse) // INTERFACE
356	1964	{
357	1965	currentGL.glActiveTexture(GetGL().GL_TEXTURE0);
358	1966	currentGL.glMatrixMode(GetGL().GL_TEXTURE);
..	..	@@ -379,15 +1987,15 @@
379	1987
380	1988	static int camerachangeframe;
381	1989
382		- boolean SetCamera(Camera cam)
	1990	+ public boolean SetCamera(Camera cam)
383	1991	{
384	1992	// may 2014 if (cam == cameras[0] \|\| cam == cameras[1])
385	1993	// return false;
386	1994
387		- if (REFUSEMODE && isLIVE() && camerachangeframe != 0 && camerachangeframe != framecount)
	1995	+ if (REFUSEMODE && Globals.isLIVE() && camerachangeframe != 0 && camerachangeframe != Globals.framecount)
388	1996	{
389	1997	// check for last change
390		- if (framecount < camerachangeframe + 400) // 120 == 1 second
	1998	+ if (Globals.framecount < camerachangeframe + 400) // 120 == 1 second
391	1999	{
392	2000	// refuse the camera change
393	2001	System.err.println("Camera " + cam + " REFUSED");
..	..	@@ -395,7 +2003,7 @@
395	2003	}
396	2004	}
397	2005
398		- camerachangeframe = framecount;
	2006	+ camerachangeframe = Globals.framecount;
399	2007
400	2008	cam.hAspect = -1; // Read only
401	2009
..	..	@@ -426,7 +2034,7 @@
426	2034	{
427	2035	//System.err.println("Oeil on");
428	2036	TRACK = true;
429		-// JUNE 2014 if (TRACK && trackedobject != null && drawMode == SHADOW) // && !lightMode)
	2037	+// JUNE 2014 if (TRACK && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
430	2038	// object.editWindow.ScreenFit(trackedobject);
431	2039	//pingthread.StepToTarget(true);
432	2040	}
..	..	@@ -435,7 +2043,7 @@
435	2043	{
436	2044	//System.err.println("Oeil on");
437	2045	OEIL = true;
438		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && drawMode == SHADOW) // && !lightMode)
	2046	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
439	2047	object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
440	2048	//pingthread.StepToTarget(true);
441	2049	}
..	..	@@ -499,39 +2107,12 @@
499	2107	{
500	2108	frozen ^= true;
501	2109	// Weird...
502		- lighttouched = true;
	2110	+ Globals.lighttouched = true;
503	2111	}
504	2112
505	2113	void ToggleDL()
506	2114	{
507	2115	mainDL ^= true;
508		- }
509		-
510		- void ToggleTexture()
511		- {
512		- textureon ^= true;
513		- }
514		-
515		- void ToggleLive()
516		- {
517		- setLIVE(isLIVE() ^ true);
518		-
519		- System.err.println("LIVE = " + isLIVE());
520		-
521		- if (!isLIVE()) // save sound
522		- GrafreeD.savesound = true; // wav.save();
523		- // else
524		- repaint(); // start loop // may 2013
525		- }
526		-
527		- void ToggleSupport()
528		- {
529		- SUPPORT ^= true;
530		- }
531		-
532		- void ToggleAbort()
533		- {
534		- ABORTMODE ^= true;
535	2116	}
536	2117
537	2118	void ToggleFullScreen()
..	..	@@ -541,12 +2122,7 @@
541	2122
542	2123	void ToggleCrowd()
543	2124	{
544		- CROWD ^= true;
545		- }
546		-
547		- void ToggleInertia()
548		- {
549		- INERTIA ^= true;
	2125	+ Globals.CROWD ^= true;
550	2126	}
551	2127
552	2128	void ToggleLocal()
..	..	@@ -554,62 +2130,89 @@
554	2130	LOCALTRANSFORM ^= true;
555	2131	}
556	2132
557		- void ToggleFast()
	2133	+ public void ToggleTexture()
	2134	+ {
	2135	+ textureon ^= true;
	2136	+ }
	2137	+
	2138	+ public void ToggleLive()
	2139	+ {
	2140	+ Globals.setLIVE(Globals.isLIVE() ^ true);
	2141	+
	2142	+ System.err.println("LIVE = " + Globals.isLIVE());
	2143	+
	2144	+ if (!Globals.isLIVE()) // save sound
	2145	+ Grafreed.savesound = true; // wav.save();
	2146	+ // else
	2147	+ repaint(); // start loop // may 2013
	2148	+ }
	2149	+
	2150	+ public void ToggleSupport()
	2151	+ {
	2152	+ SUPPORT ^= true;
	2153	+ }
	2154	+
	2155	+ public void ToggleAbort()
	2156	+ {
	2157	+ ABORTMODE ^= true;
	2158	+ }
	2159	+
	2160	+ public void ToggleInertia()
	2161	+ {
	2162	+ INERTIA ^= true;
	2163	+ }
	2164	+
	2165	+ public void ToggleFast()
558	2166	{
559	2167	FAST ^= true;
560	2168	}
561	2169
562		- void ToggleSlowPose()
	2170	+ public void ToggleSlowPose()
563	2171	{
564	2172	SLOWPOSE ^= true;
565	2173	}
566	2174
567		- void ToggleFootContact()
568		- {
569		- FOOTCONTACT ^= true;
570		- }
571		-
572		- void ToggleBoxMode()
	2175	+ public void ToggleBoxMode()
573	2176	{
574	2177	BOXMODE ^= true;
575	2178	}
576	2179
577		- void ToggleSmoothFocus()
	2180	+ public void ToggleZoomBoxMode()
	2181	+ {
	2182	+ ZOOMBOXMODE ^= true;
	2183	+ }
	2184	+
	2185	+ public void ToggleSmoothFocus()
578	2186	{
579	2187	SMOOTHFOCUS ^= true;
580	2188	}
581	2189
582		- void ToggleImageFlip()
	2190	+ public void ToggleImageFlip()
583	2191	{
584	2192	IMAGEFLIP ^= true;
585	2193	}
586	2194
587		- void ToggleSpeakerMocap()
	2195	+ public void ToggleSpeakerMocap()
588	2196	{
589	2197	SPEAKERMOCAP ^= true;
590	2198	}
591	2199
592		- void ToggleSpeakerCamera()
	2200	+ public void ToggleSpeakerCamera()
593	2201	{
594	2202	SPEAKERCAMERA ^= true;
595	2203	}
596	2204
597		- void ToggleSpeakerFocus()
	2205	+ public void ToggleSpeakerFocus()
598	2206	{
599	2207	SPEAKERFOCUS ^= true;
600	2208	}
601	2209
602		- void ToggleDebug()
603		- {
604		- DEBUG ^= true;
605		- }
606		-
607		- void ToggleFrustum()
	2210	+ public void ToggleFrustum()
608	2211	{
609	2212	FRUSTUM ^= true;
610	2213	}
611	2214
612		- void ToggleTrack()
	2215	+ public void ToggleTrack()
613	2216	{
614	2217	TRACK ^= true;
615	2218	if (TRACK)
..	..	@@ -628,25 +2231,35 @@
628	2231	repaint();
629	2232	}
630	2233
631		- void ToggleTrackOnce()
	2234	+ public void ToggleTrackOnce()
632	2235	{
633	2236	TRACKONCE ^= true;
634	2237	}
635	2238
636		- void ToggleShadowTrack()
	2239	+ public void ToggleShadowTrack()
637	2240	{
638	2241	SHADOWTRACK ^= true;
639	2242	repaint();
640	2243	}
641	2244
642		- void ToggleOeil()
	2245	+ public void ToggleOeil()
643	2246	{
644	2247	OEIL ^= true;
645	2248	}
646	2249
647		- void ToggleOeilOnce()
	2250	+ public void ToggleOeilOnce()
648	2251	{
649	2252	OEILONCE ^= true;
	2253	+ }
	2254	+
	2255	+ void ToggleFootContact()
	2256	+ {
	2257	+ FOOTCONTACT ^= true;
	2258	+ }
	2259	+
	2260	+ void ToggleDebug()
	2261	+ {
	2262	+ DEBUG ^= true;
650	2263	}
651	2264
652	2265	void ToggleLookAt()
..	..	@@ -654,9 +2267,9 @@
654	2267	LOOKAT ^= true;
655	2268	}
656	2269
657		- void ToggleRandom()
	2270	+ void ToggleSwitch()
658	2271	{
659		- RANDOM ^= true;
	2272	+ SWITCH ^= true;
660	2273	}
661	2274
662	2275	void ToggleHandles()
..	..	@@ -759,11 +2372,11 @@
759	2372
760	2373	GL currentGL;
761	2374
762		- GL GetGL()
	2375	+ public GL GetGL() // INTERFACE
763	2376	{
764	2377	return currentGL;
765	2378	}
766		-
	2379	+
767	2380	/**/
768	2381	class CacheTexture
769	2382	{
..	..	@@ -2595,6 +4208,7 @@
2595	4208
2596	4209	com.sun.opengl.util.texture.Texture CompressTexture2(String name)
2597	4210	{
	4211	+ new Exception().printStackTrace();
2598	4212	System.exit(0);
2599	4213	com.sun.opengl.util.texture.Texture texture = null;
2600	4214
..	..	@@ -6271,7 +7885,7 @@
6271	7885	return null;
6272	7886	}
6273	7887
6274		- void ReleaseTextures(cTexture tex)
	7888	+ public void ReleaseTextures(cTexture tex) // INTERFACE
6275	7889	{
6276	7890	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
6277	7891	{
..	..	@@ -6307,9 +7921,67 @@
6307	7921	ReleaseTexture(pigment, false);
6308	7922	}
6309	7923
	7924	+ public void ReleasePigmentTexture(cTexture tex) // INTERFACE
	7925	+ {
	7926	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7927	+ {
	7928	+ return;
	7929	+ }
	7930	+
	7931	+ if (tex == null)
	7932	+ {
	7933	+ ReleaseTexture(null, false);
	7934	+ return;
	7935	+ }
	7936	+
	7937	+ String pigment = Object3D.GetPigment(tex);
	7938	+
	7939	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7940	+ {
	7941	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7942	+ // System.out.println("; bump = " + bump);
	7943	+ }
	7944	+
	7945	+ if (pigment.equals(""))
	7946	+ {
	7947	+ pigment = null;
	7948	+ }
	7949	+
	7950	+ ReleaseTexture(pigment, false);
	7951	+ }
	7952	+
	7953	+ public void ReleaseBumpTexture(cTexture tex) // INTERFACE
	7954	+ {
	7955	+ if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
	7956	+ {
	7957	+ return;
	7958	+ }
	7959	+
	7960	+ if (tex == null)
	7961	+ {
	7962	+ ReleaseTexture(null, true);
	7963	+ return;
	7964	+ }
	7965	+
	7966	+ String bump = Object3D.GetBump(tex);
	7967	+
	7968	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	7969	+ {
	7970	+ // System.out.print("RELEASE +++++++++++++++ pigment = " + pigment);
	7971	+ // System.out.println("; bump = " + bump);
	7972	+ }
	7973	+
	7974	+ if (bump.equals(""))
	7975	+ {
	7976	+ bump = null;
	7977	+ }
	7978	+
	7979	+ ReleaseTexture(bump, true);
	7980	+ }
	7981	+
6310	7982	void ReleaseTexture(String tex, boolean bump)
6311	7983	{
6312		- if (// drawMode != 0 \|\| /tex == null \|\|/
	7984	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
6313	7985	ambientOcclusion ) // \|\| !textureon)
6314	7986	{
6315	7987	return;
..	..	@@ -6410,9 +8082,9 @@
6410	8082	}
6411	8083	}
6412	8084
6413		- /boolean/ void BindTextures(cTexture tex, int resolution)
	8085	+ /boolean/ public void BindTextures(cTexture tex, int resolution) throws Exception // INTERFACE
6414	8086	{
6415		- if (// drawMode != 0 \|\| /tex == null \|\|/
	8087	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
6416	8088	ambientOcclusion ) // \|\| !textureon)
6417	8089	{
6418	8090	return; // false;
..	..	@@ -6455,7 +8127,94 @@
6455	8127	return; // true;
6456	8128	}
6457	8129
6458		- CacheTexture GetCacheTexture(String tex, boolean bump, int resolution)
	8130	+ /boolean/ public void BindPigmentTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8131	+ {
	8132	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8133	+ ambientOcclusion ) // \|\| !textureon)
	8134	+ {
	8135	+ return; // false;
	8136	+ }
	8137	+
	8138	+ if (tex == null)
	8139	+ {
	8140	+ BindTexture(null,false,resolution);
	8141	+ return;
	8142	+ }
	8143	+
	8144	+ String pigment = Object3D.GetPigment(tex);
	8145	+
	8146	+ usedtextures.put(pigment, pigment);
	8147	+
	8148	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8149	+ {
	8150	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8151	+ // System.out.println("; bump = " + bump);
	8152	+ }
	8153	+
	8154	+ if (pigment.equals(""))
	8155	+ {
	8156	+ pigment = null;
	8157	+ }
	8158	+
	8159	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8160	+ BindTexture(pigment, false, resolution);
	8161	+ }
	8162	+
	8163	+ /boolean/ public void BindBumpTexture(cTexture tex, int resolution) throws Exception // INTERFACE
	8164	+ {
	8165	+ if (// DrawMode() != 0 \|\| /tex == null \|\|/
	8166	+ ambientOcclusion ) // \|\| !textureon)
	8167	+ {
	8168	+ return; // false;
	8169	+ }
	8170	+
	8171	+ if (tex == null)
	8172	+ {
	8173	+ BindTexture(null,true,resolution);
	8174	+ return;
	8175	+ }
	8176	+
	8177	+ String bump = Object3D.GetBump(tex);
	8178	+
	8179	+ usedtextures.put(bump, bump);
	8180	+
	8181	+ if (!tex.equals(":") && !tex.equals(DEFAULT_TEXTURES))
	8182	+ {
	8183	+ // System.out.print("BIND +++++++++++++++ pigment = " + pigment);
	8184	+ // System.out.println("; bump = " + bump);
	8185	+ }
	8186	+
	8187	+ if (bump.equals(""))
	8188	+ {
	8189	+ bump = null;
	8190	+ }
	8191	+
	8192	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE2);
	8193	+ BindTexture(bump, true, resolution);
	8194	+ GetGL().glActiveTexture(GetGL().GL_TEXTURE0);
	8195	+ }
	8196	+
	8197	+ java.util.HashSet<String> missingTextures = new java.util.HashSet<String>();
	8198	+
	8199	+ private boolean FileExists(String tex)
	8200	+ {
	8201	+ if (missingTextures.contains(tex))
	8202	+ {
	8203	+ return false;
	8204	+ }
	8205	+
	8206	+ boolean fileExists = new File(tex).exists();
	8207	+
	8208	+ if (!fileExists)
	8209	+ {
	8210	+ // If file exists, the "new File()" is not executed sgain
	8211	+ missingTextures.add(tex);
	8212	+ }
	8213	+
	8214	+ return fileExists;
	8215	+ }
	8216	+
	8217	+ CacheTexture GetCacheTexture(String tex, boolean bump, int resolution) throws Exception
6459	8218	{
6460	8219	CacheTexture/com.sun.opengl.util.texture.Texture/ texture = null;
6461	8220
..	..	@@ -6463,12 +8222,18 @@
6463	8222	{
6464	8223	String texname = tex;
6465	8224
6466		- String[] split = tex.split("Textures");
6467		- if (split.length > 1)
6468		- texname = "/Users/nbriere/Textures" + split[split.length-1];
6469		- else
6470		- if (!texname.startsWith("/"))
6471		- texname = "/Users/nbriere/Textures/" + texname;
	8225	+ String fallbackTextureName = defaultDirectory + "/Textures/" + texname;
	8226	+
	8227	+// String[] split = tex.split("Textures");
	8228	+// if (split.length > 1)
	8229	+// texname = "/Users/nbriere/Textures" + split[split.length-1];
	8230	+// else
	8231	+// if (!texname.startsWith("/"))
	8232	+// texname = "/Users/nbriere/Textures/" + texname;
	8233	+ if (!FileExists(tex))
	8234	+ {
	8235	+ texname = fallbackTextureName;
	8236	+ }
6472	8237
6473	8238	if (CACHETEXTURE)
6474	8239	texture = textures.get(texname); // TEXTURE CACHE
..	..	@@ -6537,7 +8302,7 @@
6537	8302	}
6538	8303
6539	8304	cachename = texname.substring(0, texname.length()-4)+ext+".jpg";
6540		- if (!new File(cachename).exists())
	8305	+ if (!FileExists(cachename))
6541	8306	cachename = texname;
6542	8307	else
6543	8308	processbump = false; // don't process bump map again
..	..	@@ -6559,7 +8324,7 @@
6559	8324	}
6560	8325
6561	8326	cachename = texname.substring(0, texname.length()-4)+ext+".png";
6562		- if (!new File(cachename).exists())
	8327	+ if (!FileExists(cachename))
6563	8328	cachename = texname;
6564	8329	else
6565	8330	processbump = false; // don't process bump map again
..	..	@@ -6568,7 +8333,9 @@
6568	8333	texturedata = GetFileTexture(cachename, processbump, resolution);
6569	8334
6570	8335
6571		- if (texturedata != null)
	8336	+ if (texturedata == null)
	8337	+ throw new Exception();
	8338	+
6572	8339	texture = new CacheTexture(com.sun.opengl.util.texture.TextureIO.newTexture(texturedata),resolution);
6573	8340	//texture = GetTexture(tex, bump);
6574	8341	}
..	..	@@ -6690,7 +8457,7 @@
6690	8457	return texture;
6691	8458	}
6692	8459
6693		- com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution)
	8460	+ com.sun.opengl.util.texture.Texture GetTexture(String tex, boolean bump, int resolution) throws Exception
6694	8461	{
6695	8462	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
6696	8463
..	..	@@ -6708,14 +8475,14 @@
6708	8475	return texture!=null?texture.texture:null;
6709	8476	}
6710	8477
6711		- com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution)
	8478	+ public com.sun.opengl.util.texture.TextureData GetTextureData(String tex, boolean bump, int resolution) throws Exception
6712	8479	{
6713	8480	CacheTexture texture = GetCacheTexture(tex, bump, resolution);
6714	8481
6715	8482	return texture!=null?texture.texturedata:null;
6716	8483	}
6717	8484
6718		- boolean BindTexture(String tex, boolean bump, int resolution)
	8485	+ boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
6719	8486	{
6720	8487	if (/tex == null \|\|/ ambientOcclusion ) // \|\| !textureon)
6721	8488	{
..	..	@@ -7312,9 +9079,9 @@
7312	9079	static boolean occlusionInitialized = false;
7313	9080	boolean selection = false;
7314	9081	boolean pointselection = false;
7315		- /static/ boolean lighttouched = true;
	9082	+ ///static/ boolean lighttouched = true;
7316	9083	boolean deselect;
7317		- boolean ambientOcclusion = false;
	9084	+ private boolean ambientOcclusion = false;
7318	9085	static boolean flash = false;
7319	9086	/static/ boolean wait = false;
7320	9087	boolean displaydone = false; // after repaint() calls
..	..	@@ -7603,8 +9370,6 @@
7603	9370
7604	9371	boolean restartframe = false;
7605	9372
7606		- static int framecount = 0; // general-purpose global count
7607		-
7608	9373	void displayAntiAliased(javax.media.opengl.GL gl)
7609	9374	{
7610	9375	//gl.glGetIntegerv(gl.GL_ACCUM_RED_BITS, viewport, 0);
..	..	@@ -7635,7 +9400,7 @@
7635	9400	gl.glClear(gl.GL_ACCUM_BUFFER_BIT);
7636	9401	for (jitter = 0; jitter < ACSIZE; jitter++) //, GrafreeD.wav.cursor += LIVE ? 735 : 0)
7637	9402	{
7638		- framecount++;
	9403	+ Globals.framecount++;
7639	9404
7640	9405	if (CameraPane.tickcount > 0)
7641	9406	CameraPane.tickcount--;
..	..	@@ -7673,7 +9438,7 @@
7673	9438
7674	9439	gl.glLightfv(gl.GL_LIGHT0, gl.GL_POSITION, pos, 0);
7675	9440	*/
7676		- lighttouched = true;
	9441	+ Globals.lighttouched = true;
7677	9442	//System.err.println(" shadowbuffer: " + jitter);
7678	9443	shadowbuffer.display();
7679	9444
..	..	@@ -7694,8 +9459,8 @@
7694	9459	assert (parentcam != renderCamera);
7695	9460
7696	9461	if (renderCamera != lightCamera)
7697		- for (int count = parentcam.GetTransformCount(); --count>=0;)
7698		- LA.matConcat(matrix, parentcam.toParent, matrix);
	9462	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9463	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
7699	9464
7700	9465	// LA.matConcat(renderCamera.toScreen, renderCamera.toParent, matrix);
7701	9466
..	..	@@ -7710,8 +9475,8 @@
7710	9475	LA.matCopy(renderCamera.fromScreen, matrix);
7711	9476
7712	9477	if (renderCamera != lightCamera)
7713		- for (int count = parentcam.GetTransformCount(); --count>=0;)
7714		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	9478	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	9479	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
7715	9480
7716	9481	// LA.matConcat(renderCamera.fromParent, renderCamera.fromScreen, matrix);
7717	9482
..	..	@@ -7783,7 +9548,7 @@
7783	9548	//gl.glFlush();
7784	9549	gl.glAccum(gl.GL_ACCUM, 1.0f / ACSIZE);
7785	9550
7786		- if (ANIMATION && ABORTED)
	9551	+ if (Globals.ANIMATION && ABORTED)
7787	9552	{
7788	9553	System.err.println(" ABORTED FRAME");
7789	9554	break;
..	..	@@ -7813,7 +9578,7 @@
7813	9578	setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
7814	9579
7815	9580	// save image
7816		- if (ANIMATION && !ABORTED)
	9581	+ if (Globals.ANIMATION && !ABORTED)
7817	9582	{
7818	9583	VPwidth = viewport[2];
7819	9584	VPheight = viewport[3];
..	..	@@ -7924,11 +9689,11 @@
7924	9689
7925	9690	// imagecount++;
7926	9691
7927		- String fullname = filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
	9692	+ String fullname = Globals.filename + (i%100000)/10000 + "" + (i%10000)/1000 + "" + (i%1000)/100 + "" + (i%100)/10 + "" + (i%10) + "." + ext;
7928	9693
7929	9694	if (!BOXMODE)
7930	9695	{
7931		- System.out.println("image: " + fullname + " (wav cursor=" + (GrafreeD.wav.cursor / 735 / 4) + ")");
	9696	+ System.out.println("image: " + fullname + " (wav cursor=" + (Grafreed.wav.cursor / 735 / 4) + ")");
7932	9697	}
7933	9698
7934	9699	if (!BOXMODE)
..	..	@@ -7966,7 +9731,7 @@
7966	9731	ABORTED = false;
7967	9732	}
7968	9733	else
7969		- GrafreeD.wav.cursor += 735 * ACSIZE;
	9734	+ Grafreed.wav.cursor += 735 * ACSIZE;
7970	9735
7971	9736	if (false)
7972	9737	{
..	..	@@ -8620,13 +10385,6 @@
8620	10385	}
8621	10386	}
8622	10387
8623		- boolean IsFrozen()
8624		- {
8625		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
8626		-
8627		- return !selectmode && cameracount == 0; // != 0;
8628		- }
8629		-
8630	10388	boolean niceon = false;
8631	10389	javax.swing.Timer AAtimer = new javax.swing.Timer(750, this);
8632	10390	boolean currentlydrawing = false;
..	..	@@ -8636,16 +10394,16 @@
8636	10394
8637	10395	public void display(GLAutoDrawable drawable)
8638	10396	{
8639		- if (GrafreeD.savesound && GrafreeD.hassound)
	10397	+ if (Grafreed.savesound && Grafreed.hassound)
8640	10398	{
8641		- GrafreeD.wav.save();
8642		- GrafreeD.savesound = false;
8643		- GrafreeD.hassound = false;
	10399	+ Grafreed.wav.save();
	10400	+ Grafreed.savesound = false;
	10401	+ Grafreed.hassound = false;
8644	10402	}
8645	10403	// if (DEBUG_SELECTION)
8646	10404	// {
8647		-// if (drawMode != SELECTION)
8648		-// drawMode = SELECTION;
	10405	+// if (DrawMode() != SELECTION)
	10406	+// DrawMode() = SELECTION;
8649	10407	// }
8650	10408
8651	10409	if (!isRenderer)
..	..	@@ -8701,9 +10459,9 @@
8701	10459
8702	10460	//ANTIALIAS = 0;
8703	10461
8704		- if (drawMode == DEFAULT) // && CURRENTANTIALIAS > 0)
	10462	+ if (DrawMode() == DEFAULT) // && CURRENTANTIALIAS > 0)
8705	10463	{
8706		- if (niceon \|\| isLIVE())
	10464	+ if (niceon \|\| Globals.isLIVE())
8707	10465	{
8708	10466	//if(active == 0)
8709	10467	// antialiaser = null;
..	..	@@ -8728,7 +10486,7 @@
8728	10486	assert eyeCamera.shaper_zFar == 1E5f; // 500.0f;
8729	10487	*/
8730	10488
8731		- if (drawMode == DEFAULT)
	10489	+ if (DrawMode() == DEFAULT)
8732	10490	{
8733	10491	currentlydrawing = true;
8734	10492	}
..	..	@@ -8759,18 +10517,18 @@
8759	10517
8760	10518	// if(Applet3D.clipboard != null)
8761	10519	// System.out.println("Clipboard = " + Applet3D.clipboard); //.get(0).parent);
8762		-//drawMode = SELECTION;
	10520	+//DrawMode() = SELECTION;
8763	10521	indexcount = 0;
8764	10522
8765		- if (drawMode == OCCLUSION)
	10523	+ if (DrawMode() == OCCLUSION)
8766	10524	{
8767		- drawMode = DEFAULT;
	10525	+ Globals.drawMode = DEFAULT; // WARNING
8768	10526	ambientOcclusion = true;
8769	10527	setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
8770	10528	Object3D theobject = object;
8771	10529	Object3D theparent = object.parent;
8772	10530	object.parent = null;
8773		- object = (Object3D)GrafreeD.clone(object);
	10531	+ object = (Object3D)Grafreed.clone(object);
8774	10532	object.Stripify();
8775	10533	if (theobject.selection == null \|\| theobject.selection.Size() == 0)
8776	10534	theobject.PreprocessOcclusion(this);
..	..	@@ -8783,19 +10541,19 @@
8783	10541	ambientOcclusion = false;
8784	10542	}
8785	10543
8786		- if (lighttouched && drawMode == DEFAULT && !lightMode) // && !FROZEN)
	10544	+ if (Globals.lighttouched && DrawMode() == DEFAULT) // && !lightMode) // && !FROZEN)
8787	10545	{
8788	10546	//if (RENDERSHADOW) // ?
8789	10547	if (!IsFrozen())
8790	10548	{
8791	10549	// dec 2012
8792		- if (!ambientOcclusion && !(!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0))
	10550	+ if (!ambientOcclusion && !(!flash && DrawMode() == DEFAULT && ANTIALIAS > 0))
8793	10551	{
8794		- framecount++;
	10552	+ Globals.framecount++;
8795	10553	shadowbuffer.display();
8796	10554	}
8797	10555	}
8798		- lighttouched = false; // ??
	10556	+ Globals.lighttouched = false; // ??
8799	10557	//drawing = true;
8800	10558	//lighttouched = true;
8801	10559	}
..	..	@@ -8816,9 +10574,9 @@
8816	10574	//eyeCamera.shaper_fovy = 1;
8817	10575	}
8818	10576
8819		- if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && drawMode == DEFAULT) // SELECTION)
	10577	+ if ((RENDERPROGRAM != 0 \|\| ambientOcclusion \|\| spherical) && DrawMode() == DEFAULT) // SELECTION)
8820	10578	{
8821		- //System.out.println("drawMode = " + drawMode);
	10579	+ //System.out.println("DrawMode() = " + DrawMode());
8822	10580	vertexMode \|= VP_PASS;
8823	10581	//vertexMode \|= VP_PROJECTION;
8824	10582	if (!ambientOcclusion)
..	..	@@ -8878,7 +10636,7 @@
8878	10636	Camera cam = renderCamera; // lightMode?lightCamera:eyeCamera;
8879	10637	//Camera lightcam = new Camera(light0);
8880	10638
8881		- if (drawMode == SHADOW)
	10639	+ if (DrawMode() == SHADOW)
8882	10640	{
8883	10641	/*
8884	10642	gl.glMatrixMode(GL.GL_MODELVIEW);
..	..	@@ -8916,8 +10674,8 @@
8916	10674
8917	10675	// if (parentcam != renderCamera) // not a light
8918	10676	if (cam != lightCamera)
8919		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8920		- LA.matConcat(matrix, parentcam.toParent, matrix);
	10677	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10678	+ LA.matConcat(matrix, parentcam.GlobalTransform(), matrix);
8921	10679
8922	10680	for (int j = 0; j < 4; j++)
8923	10681	{
..	..	@@ -8931,8 +10689,8 @@
8931	10689
8932	10690	// if (parentcam != renderCamera) // not a light
8933	10691	if (cam != lightCamera)
8934		- for (int count = parentcam.GetTransformCount(); --count>=0;)
8935		- LA.matConcat(parentcam.fromParent, matrix, matrix);
	10692	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	10693	+ LA.matConcat(parentcam.GlobalTransformInv(), matrix, matrix);
8936	10694
8937	10695	//LA.matConcat(cam.fromScreen, parentcam.fromParent, matrix);
8938	10696
..	..	@@ -8968,7 +10726,7 @@
8968	10726	gl.glClear(gl.GL_DEPTH_BUFFER_BIT);
8969	10727	} else
8970	10728	{
8971		- if (drawMode != DEFAULT)
	10729	+ if (DrawMode() != DEFAULT)
8972	10730	{
8973	10731	gl.glClearColor(1, 1, 1, 0);
8974	10732	} // 1);
..	..	@@ -9033,7 +10791,7 @@
9033	10791
9034	10792	fast &= !ambientOcclusion;
9035	10793
9036		- if (drawMode == DEFAULT)
	10794	+ if (DrawMode() == DEFAULT)
9037	10795	{
9038	10796	//gl.glEnable(gl.GL_ALPHA_TEST);
9039	10797	//gl.glActiveTexture(GL.GL_TEXTURE0);
..	..	@@ -9191,7 +10949,16 @@
9191	10949	// Bump noise
9192	10950	gl.glActiveTexture(GL.GL_TEXTURE6);
9193	10951	//gl.glBindTexture(GL.GL_TEXTURE_2D, bump_noise);
9194		- BindTexture(NOISE_TEXTURE, false, 2);
	10952	+
	10953	+ try
	10954	+ {
	10955	+ BindTexture(NOISE_TEXTURE, false, 2);
	10956	+ }
	10957	+ catch (Exception e)
	10958	+ {
	10959	+ System.err.println("FAILED: " + NOISE_TEXTURE);
	10960	+ }
	10961	+
9195	10962
9196	10963	gl.glActiveTexture(GL.GL_TEXTURE0);
9197	10964	gl.glEnable(GL.GL_TEXTURE_2D);
..	..	@@ -9231,7 +10998,7 @@
9231	10998	gl.glMatrixMode(gl.GL_PROJECTION);
9232	10999	gl.glLoadIdentity();
9233	11000
9234		- if (drawMode == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
	11001	+ if (DrawMode() == SHADOW \|\| cam == lightCamera) // \|\| (vertexMode&VP_PROJECTION) != 0)
9235	11002	{
9236	11003	//glu.gluPerspective(lightshaper_fovy, 1, lightshaper_zNear, lightshaper_zFar);
9237	11004	double scale = lightCamera.SCALE / lightCamera.Distance();
..	..	@@ -9289,7 +11056,7 @@
9289	11056	//gl.glPushMatrix();
9290	11057	gl.glLoadIdentity();
9291	11058
9292		- if (!ambientOcclusion) // drawMode != OCCLUSION)
	11059	+ if (!ambientOcclusion) // DrawMode() != OCCLUSION)
9293	11060	{
9294	11061	//LA.xformPos(light0, lightCamera.fromScreen, light);
9295	11062	LA.xformDir(dirlight, lightCamera.fromScreen, lightposition);
..	..	@@ -9316,8 +11083,8 @@
9316	11083	System.err.println("parentcam != renderCamera");
9317	11084
9318	11085	// if (cam != lightCamera)
9319		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9320		- LA.xformDir(lightposition, parentcam.toParent, lightposition); // may 2013
	11086	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11087	+ LA.xformDir(lightposition, parentcam.GlobalTransform(), lightposition); // may 2013
9321	11088	}
9322	11089
9323	11090	LA.xformDir(lightposition, cam.toScreen, lightposition);
..	..	@@ -9338,8 +11105,8 @@
9338	11105	if (true) // TODO
9339	11106	{
9340	11107	if (cam != lightCamera)
9341		- for (int count = parentcam.GetTransformCount(); --count>=0;)
9342		- LA.xformDir(light0, parentcam.toParent, light0); // may 2013
	11108	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	11109	+ LA.xformDir(light0, parentcam.GlobalTransform(), light0); // may 2013
9343	11110	}
9344	11111
9345	11112	LA.xformPos(light0, cam.toScreen, light0);
..	..	@@ -9376,7 +11143,7 @@
9376	11143	}
9377	11144
9378	11145	/**/
9379		- if (true) // drawMode == SELECTION) // != DEFAULT)
	11146	+ if (true) // DrawMode() == SELECTION) // != DEFAULT)
9380	11147	gl.glDisable(gl.GL_LIGHTING);
9381	11148	else
9382	11149	gl.glEnable(gl.GL_LIGHTING);
..	..	@@ -9394,7 +11161,7 @@
9394	11161
9395	11162	lightslot = 64;
9396	11163
9397		- if (!frozen && !ambientOcclusion && isRenderer && drawMode == DEFAULT)
	11164	+ if (!frozen && !ambientOcclusion && isRenderer && DrawMode() == DEFAULT)
9398	11165	{
9399	11166	DrawLights(object);
9400	11167	}
..	..	@@ -9405,7 +11172,7 @@
9405	11172	fragmentMode \|= (lightslot - 64) << 2; // 1; // first bit is available for aniso
9406	11173	//System.out.println("fragmentMode = " + fragmentMode);
9407	11174
9408		- if (drawMode == DEFAULT \|\| drawMode == SELECTION \|\| DEBUG_SELECTION)
	11175	+ if (DrawMode() == DEFAULT \|\| DrawMode() == SELECTION \|\| IsDebugSelection())
9409	11176	{
9410	11177	/*
9411	11178	if (CULLFACE \|\| (ambientOcclusion && OCCLUSION_CULLING))
..	..	@@ -9438,7 +11205,7 @@
9438	11205	}
9439	11206	}
9440	11207
9441		- if (drawMode == DEFAULT)
	11208	+ if (DrawMode() == DEFAULT)
9442	11209	{
9443	11210	if (WIREFRAME && !ambientOcclusion)
9444	11211	{
..	..	@@ -9456,7 +11223,7 @@
9456	11223	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9457	11224	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9458	11225
9459		- if (!fast/RENDERPROGRAM != 0/ && (drawMode == DEFAULT \|\| drawMode == SHADOW)) // && !WIREFRAME) //
	11226	+ if (!fast/RENDERPROGRAM != 0/ && (DrawMode() == DEFAULT \|\| DrawMode() == SHADOW)) // && !WIREFRAME) //
9460	11227	{
9461	11228	if (vertexMode != 0) // && !fast)
9462	11229	{
..	..	@@ -9476,7 +11243,7 @@
9476	11243	}
9477	11244	}
9478	11245
9479		- if (false) // fast && !IsFreezed() && drawMode != SELECTION && !ambientOcclusion)
	11246	+ if (false) // fast && !IsFreezed() && DrawMode() != SELECTION && !ambientOcclusion)
9480	11247	{
9481	11248	//gl.glDepthFunc(GL.GL_LEQUAL);
9482	11249	//gl.glClear(gl.GL_COLOR_BUFFER_BIT \| gl.GL_DEPTH_BUFFER_BIT);
..	..	@@ -9504,7 +11271,7 @@
9504	11271	//gl.glDepthMask(false);
9505	11272	}
9506	11273
9507		- if (false) // drawMode == SHADOW)
	11274	+ if (false) // DrawMode() == SHADOW)
9508	11275	{
9509	11276	//SetColumnMajorData(cameraInverseTransform, view_1);
9510	11277	//System.out.println("light = " + cameraInverseTransform);
..	..	@@ -9518,16 +11285,16 @@
9518	11285	//System.out.println("object = " + object);
9519	11286	if (!frozen && !imageLocked)
9520	11287	{
9521		- if (!flash && !lightMode && drawMode == DEFAULT && ANTIALIAS > 0)
	11288	+ if (!flash && !lightMode && DrawMode() == DEFAULT && ANTIALIAS > 0)
9522	11289	{
9523	11290	displayAntiAliased(gl);
9524	11291	} else
9525	11292	{
9526	11293	programcount = 0;
9527		- int keepmode = drawMode;
	11294	+ int keepmode = DrawMode();
9528	11295	// if (DEBUG_SELECTION)
9529	11296	// {
9530		-// drawMode = SELECTION;
	11297	+// DrawMode() = SELECTION;
9531	11298	// }
9532	11299	// for point selection
9533	11300	// gl.glGetDoublev(gl.GL_MODELVIEW_MATRIX, tempmat, 0);
..	..	@@ -9537,10 +11304,10 @@
9537	11304	DrawObject(gl);
9538	11305
9539	11306	// jan 2013 System.err.println("RESET ABORT (display)");
9540		- // if (drawMode == DEFAULT)
	11307	+ // if (DrawMode() == DEFAULT)
9541	11308	// ABORTED = false;
9542	11309	fullreset = false;
9543		- drawMode = keepmode;
	11310	+ Globals.drawMode = keepmode; // WARNING
9544	11311	//System.out.println("PROGRAM SWITCH " + programcount);
9545	11312	}
9546	11313	}
..	..	@@ -9548,11 +11315,11 @@
9548	11315	gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9549	11316	gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9550	11317
9551		- if (drawMode == DEFAULT)
	11318	+ if (DrawMode() == DEFAULT)
9552	11319	{
9553	11320	ReleaseTexture(NOISE_TEXTURE, false);
9554	11321	}
9555		- //if (drawMode == DEFAULT)
	11322	+ //if (DrawMode() == DEFAULT)
9556	11323	{
9557	11324
9558	11325	gl.glActiveTexture(GL.GL_TEXTURE1);
..	..	@@ -9564,7 +11331,7 @@
9564	11331	//else
9565	11332	//gl.glDisable(gl.GL_TEXTURE_2D);
9566	11333	//gl.glPopMatrix();
9567		- if (imageCompleted && ANTIALIAS > 0 && drawMode == DEFAULT && cam != lightCamera && !ambientOcclusion)
	11334	+ if (imageCompleted && ANTIALIAS > 0 && DrawMode() == DEFAULT && cam != lightCamera && !ambientOcclusion)
9568	11335	{
9569	11336	//new Exception().printStackTrace();
9570	11337	//System.out.println("Draw image " + width + ", " + height);
..	..	@@ -9606,7 +11373,7 @@
9606	11373	//gl.glFlush();
9607	11374	}
9608	11375
9609		- if (flash && drawMode == DEFAULT)
	11376	+ if (flash && DrawMode() == DEFAULT)
9610	11377	{
9611	11378	flash = false;
9612	11379	wait = true;
..	..	@@ -9614,9 +11381,9 @@
9614	11381	}
9615	11382
9616	11383	//drawing = false;
9617		- //if(drawMode == DEFAULT)
	11384	+ //if(DrawMode() == DEFAULT)
9618	11385	// niceon = false;
9619		- if (drawMode == DEFAULT)
	11386	+ if (DrawMode() == DEFAULT)
9620	11387	{
9621	11388	currentlydrawing = false;
9622	11389	}
..	..	@@ -9636,7 +11403,7 @@
9636	11403	repaint();
9637	11404	}
9638	11405
9639		- if (isLIVE() && drawMode == DEFAULT) // may 2013
	11406	+ if (Globals.isLIVE() && DrawMode() == DEFAULT) // may 2013
9640	11407	repaint();
9641	11408
9642	11409	displaydone = true;
..	..	@@ -9655,8 +11422,14 @@
9655	11422	{
9656	11423	renderpass++;
9657	11424	// System.out.println("Draw object... ");
	11425	+ STEP = 1;
9658	11426	if (FAST) // in case there is no script
9659		- STEP = 16;
	11427	+ STEP = 8;
	11428	+
	11429	+ if (CURRENTANTIALIAS == 0 \|\| ACSIZE == 1)
	11430	+ {
	11431	+ STEP *= 4;
	11432	+ }
9660	11433
9661	11434	//object.FullInvariants();
9662	11435
..	..	@@ -9670,10 +11443,10 @@
9670	11443	e.printStackTrace();
9671	11444	}
9672	11445
9673		- if (GrafreeD.RENDERME > 0)
9674		- GrafreeD.RENDERME--; // mechante magouille
	11446	+ if (Grafreed.RENDERME > 0)
	11447	+ Grafreed.RENDERME--; // mechante magouille
9675	11448
9676		- ONESTEP = false;
	11449	+ Globals.ONESTEP = false;
9677	11450	}
9678	11451
9679	11452	static boolean zoomonce = false;
..	..	@@ -9681,11 +11454,11 @@
9681	11454	void DrawObject(GL gl, boolean draw)
9682	11455	{
9683	11456	//System.out.println("DRAW OBJECT " + mouseDown);
9684		-// drawMode = SELECTION;
	11457	+// DrawMode() = SELECTION;
9685	11458	//GL gl = getGL();
9686	11459	if ((TRACK \|\| SHADOWTRACK) \|\| zoomonce)
9687	11460	{
9688		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && drawMode == SHADOW) // && !lightMode)
	11461	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
9689	11462	object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
9690	11463	pingthread.StepToTarget(true); // true);
9691	11464	// zoomonce = false;
..	..	@@ -9706,9 +11479,9 @@
9706	11479	callist = gl.glGenLists(1);
9707	11480	}
9708	11481
9709		- boolean selectmode = drawMode == SELECTION \|\| CameraPane.DEBUG_SELECTION;
	11482	+ boolean selectmode = DrawMode() == SELECTION \|\| IsDebugSelection();
9710	11483
9711		- boolean active = !selectmode; // drawMode != SELECTION; // mouseDown;
	11484	+ boolean active = !selectmode; // DrawMode() != SELECTION; // mouseDown;
9712	11485
9713	11486	if (!mainDL \|\| !active \|\| touched)
9714	11487	{
..	..	@@ -9735,13 +11508,20 @@
9735	11508	PushMatrix(ClickInfo.matbuffer);
9736	11509	}
9737	11510
9738		- if (drawMode == 0)
	11511	+ if (DrawMode() == 0)
9739	11512	{
9740	11513	// System.out.println("CLEAR +++++++++++++++ +++++++++++++++ +++++++++++++++ +++++++++++++++");
9741	11514
9742	11515	usedtextures.clear();
9743	11516
9744		- BindTextures(DEFAULT_TEXTURES, 2);
	11517	+ try
	11518	+ {
	11519	+ BindTextures(DEFAULT_TEXTURES, 2);
	11520	+ }
	11521	+ catch (Exception e)
	11522	+ {
	11523	+ System.err.println("FAILED: " + DEFAULT_TEXTURES);
	11524	+ }
9745	11525	}
9746	11526	//System.out.println("--> " + stackdepth);
9747	11527	// GrafreeD.traceon();
..	..	@@ -9749,7 +11529,7 @@
9749	11529	// DRAW
9750	11530	object.draw(this, /(Composite)/ object, false, false);
9751	11531
9752		- if (drawMode == DEFAULT)
	11532	+ if (DrawMode() == DEFAULT)
9753	11533	{
9754	11534	if (DEBUG)
9755	11535	{
..	..	@@ -9801,7 +11581,7 @@
9801	11581	}
9802	11582	// GrafreeD.traceoff();
9803	11583	//System.out.println(stackdepth);
9804		- if (drawMode == 0)
	11584	+ if (DrawMode() == 0)
9805	11585	{
9806	11586	ReleaseTextures(DEFAULT_TEXTURES);
9807	11587
..	..	@@ -9826,13 +11606,20 @@
9826	11606
9827	11607	checker = null;
9828	11608
9829		- if (!ambientOcclusion && !IsFrozen() && drawMode == DEFAULT)
	11609	+ if (!ambientOcclusion && !IsFrozen() && DrawMode() == DEFAULT)
9830	11610	FindChecker(object);
9831	11611
9832		- if (checker != null && drawMode == DEFAULT)
	11612	+ if (checker != null && DrawMode() == DEFAULT)
9833	11613	{
9834	11614	//BindTexture(IMMORTAL_TEXTURE);
9835		- BindTextures(checker.GetTextures(), checker.texres);
	11615	+ try
	11616	+ {
	11617	+ BindTextures(checker.GetTextures(), checker.texres);
	11618	+ }
	11619	+ catch (Exception e)
	11620	+ {
	11621	+ System.err.println("FAILED: " + checker.GetTextures());
	11622	+ }
9836	11623	// NEAREST
9837	11624	GetGL().glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_NEAREST); // GL.GL_LINEAR);
9838	11625	DrawChecker(gl);
..	..	@@ -9851,7 +11638,7 @@
9851	11638	//gl.glDisable(GL.GL_VERTEX_PROGRAM_ARB);
9852	11639	//gl.glDisable(GL.GL_FRAGMENT_PROGRAM_ARB);
9853	11640
9854		- if (DISPLAYTEXT && drawMode == DEFAULT)
	11641	+ if (DISPLAYTEXT && DrawMode() == DEFAULT)
9855	11642	{
9856	11643	// Draw it once, then use the raster
9857	11644	Balloon(gl, balloon.createGraphics());
..	..	@@ -9907,14 +11694,14 @@
9907	11694	int[] xs = new int[3];
9908	11695	int[] ys = new int[3];
9909	11696
9910		- void DrawString(Object3D obj) // String string)
	11697	+ public void DrawString(Object3D obj) // String string) // INTERFACE
9911	11698	{
9912		- if (!DISPLAYTEXT \|\| drawMode != DEFAULT)
	11699	+ if (!DISPLAYTEXT \|\| DrawMode() != DEFAULT)
9913	11700	{
9914	11701	return;
9915	11702	}
9916	11703
9917		- String string = obj.GetToolTip();
	11704	+ String string = obj.toString(); //.GetToolTip();
9918	11705
9919	11706	GL gl = GetGL();
9920	11707
..	..	@@ -10231,8 +12018,8 @@
10231	12018	//obj.TransformToWorld(light, light);
10232	12019	for (int i = tp.size(); --i >= 0;)
10233	12020	{
10234		- for (int count = tp.get(i).GetTransformCount(); --count>=0;)
10235		- LA.xformPos(light, tp.get(i).toParent, light);
	12021	+ //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
	12022	+ LA.xformPos(light, tp.get(i).GlobalTransform(), light);
10236	12023	}
10237	12024
10238	12025
..	..	@@ -10249,8 +12036,8 @@
10249	12036	parentcam = cameras[0];
10250	12037	}
10251	12038
10252		- for (int count = parentcam.GetTransformCount(); --count>=0;)
10253		- LA.xformPos(light, parentcam.toParent, light); // may 2013
	12039	+ //for (int count = parentcam.GetTransformCount(); --count>=0;)
	12040	+ LA.xformPos(light, parentcam.GlobalTransform(), light); // may 2013
10254	12041
10255	12042	LA.xformPos(light, renderCamera.toScreen, light);
10256	12043
..	..	@@ -10864,8 +12651,8 @@
10864	12651
10865	12652	// display shadow only (bump == 0)
10866	12653	"SUB temp.x, half.x, shadow.x;" +
10867		- "MOV temp.y, -params6.x;" +
10868		- "SLT temp.z, temp.y, zero.x;" +
	12654	+ "MOV temp.y, -params5.z;" + // params6.x;" +
	12655	+ "SLT temp.z, temp.y, -one2048th.x;" +
10869	12656	"SUB temp.y, one.x, temp.z;" +
10870	12657	"MUL temp.x, temp.x, temp.y;" +
10871	12658	"KIL temp.x;" +
..	..	@@ -10994,8 +12781,10 @@
10994	12781	"MAX ndotl.x, ndotl.x, -ndotl.x;" +
10995	12782
10996	12783	"SUB temp.x, one.x, ndotl.x;" +
10997		- "ADD temp.x, temp.x, options2.z;" + // lightsheen
10998		- "ADD temp.y, one.y, options2.y;" + // sursurface
	12784	+ // Tuning for default skin
	12785	+ //"ADD temp.x, temp.x, options2.z;" + // lightsheen
	12786	+ "MAD temp.x, options2.z, half.y, temp.x;" + // lightsheen
	12787	+ "ADD temp.y, one.y, options2.y;" + // subsurface
10999	12788	"MUL temp.x, temp.x, temp.y;" +
11000	12789
11001	12790	"MUL saturation, saturation, temp.xxxx;" +
..	..	@@ -11194,7 +12983,7 @@
11194	12983	//once = true;
11195	12984	}
11196	12985
11197		- System.out.print("Program #" + mode + "; length = " + program.length());
	12986	+ System.out.print("Program #" + mode + "; instructions = " + program.split(";").length + "; length = " + program.length());
11198	12987	System.out.println(" - " + (mode >> 3) + " lights; " + ((mode & 2) == 2 ? "anisoUV " : "") + ((mode & 4) == 4 ? "SoftShadow " : ""));
11199	12988	loadProgram(gl, GL.GL_FRAGMENT_PROGRAM_ARB, program);
11200	12989
..	..	@@ -11327,12 +13116,16 @@
11327	13116
11328	13117	"ADD " + depth + ".z, " + depth + ".z, temp.x;" +
11329	13118	//"SUB " + depth + ".z, " + depth + ".z, temp.x;" + // back face shadowing!
	13119	+
	13120	+ // Compare fragment depth in light space with shadowmap.
11330	13121	"SUB temp.x, fragment.texcoord[1].z, " + depth + ".z;" +
11331	13122	"SGE temp.y, temp.x, zero.x;" +
11332		- "SUB " + shadow + ".y, one.x, temp.y;" +
	13123	+ "SUB " + shadow + ".y, one.x, temp.y;" + // Specular is fully occluded
	13124	+
	13125	+ // Reverse comparison
11333	13126	"SUB temp.x, one.x, temp.x;" +
11334	13127	"MUL " + shadow + ".x, temp.x, temp.y;" +
11335		- "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // specular is fully occluded
	13128	+ "SUB " + shadow + ".x, one.x, " + shadow + ".x;" + // diffuse
11336	13129	"POW " + shadow + ".x, " + shadow + ".x, params5.z;" + // fake depth
11337	13130
11338	13131	"SLT " + shadow + ".z, fragment.texcoord[1].z, " + depth + ".z;" +
..	..	@@ -11346,6 +13139,10 @@
11346	13139	// No shadow for backface
11347	13140	"DP3 temp.x, normal, lightd;" +
11348	13141	"SLT temp.x, temp.x, zero.x;" + // shadoweps
	13142	+ "LRP " + shadow + ", temp.x, one, " + shadow + ";" +
	13143	+
	13144	+ // No shadow when out of frustrum
	13145	+ "SGE temp.x, " + depth + ".z, one.z;" +
11349	13146	"LRP " + shadow + ", temp.x, one, " + shadow + ";" +
11350	13147	"";
11351	13148	}
..	..	@@ -11904,7 +13701,7 @@
11904	13701	public void mousePressed(MouseEvent e)
11905	13702	{
11906	13703	//System.out.println("mousePressed: " + e);
11907		- clickStart(e.getX(), e.getY(), e.getModifiersEx());
	13704	+ clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
11908	13705	}
11909	13706
11910	13707	static long prevtime = 0;
..	..	@@ -11931,6 +13728,7 @@
11931	13728
11932	13729	//System.err.println("Dtime = " + Dtime + "; units = " + e.getUnitsToScroll() + "; ratio (units/ms) = " + ratio);
11933	13730
	13731	+ if (BUTTONLESSWHEEL)
11934	13732	if (Math.abs(ratio) < 0.1 \|\| Math.abs(Dtime) == 0) // < 30)
11935	13733	{
11936	13734	return;
..	..	@@ -11939,7 +13737,7 @@
11939	13737	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
11940	13738
11941	13739	// TIMER
11942		- if (!wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
	13740	+ if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
11943	13741	{
11944	13742	keepboxmode = BOXMODE;
11945	13743	keepsupport = SUPPORT;
..	..	@@ -11979,8 +13777,8 @@
11979	13777	// mode \|= META;
11980	13778	//}
11981	13779
11982		- SetMouseMode(WHEEL \| e.getModifiersEx());
11983		- drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0);
	13780	+ SetMouseMode(e.getModifiers(), WHEEL \| e.getModifiersEx());
	13781	+ drag(anchorX, anchorY + e.getUnitsToScroll()*8, 0, 0);
11984	13782	anchorX = ax;
11985	13783	anchorY = ay;
11986	13784	prevX = px;
..	..	@@ -12040,6 +13838,10 @@
12040	13838	// wasliveok = true;
12041	13839	// waslive = false;
12042	13840
	13841	+ // May 2019 Forget it:
	13842	+ if (true)
	13843	+ return;
	13844	+
12043	13845	// source == timer
12044	13846	if (mouseDown)
12045	13847	{
..	..	@@ -12068,7 +13870,7 @@
12068	13870	// ObjEditor.tweenManager.update(1f / 60f);
12069	13871
12070	13872	// fev 2014???
12071		- if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && drawMode == SHADOW) // && !lightMode)
	13873	+ if ((TRACK \|\| SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
12072	13874	object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
12073	13875	pingthread.StepToTarget(true); // true);
12074	13876	}
..	..	@@ -12078,7 +13880,7 @@
12078	13880
12079	13881	javax.swing.Timer timer = new javax.swing.Timer(350, this);
12080	13882
12081		- void clickStart(int x, int y, int modifiers)
	13883	+ void clickStart(int x, int y, int modifiers, int modifiersex)
12082	13884	{
12083	13885	if (!wasliveok)
12084	13886	return;
..	..	@@ -12095,7 +13897,7 @@
12095	13897	// touched = true; // main DL
12096	13898	if (isRenderer)
12097	13899	{
12098		- SetMouseMode(modifiers);
	13900	+ SetMouseMode(modifiers, modifiersex);
12099	13901	}
12100	13902
12101	13903	selectX = anchorX = x;
..	..	@@ -12108,7 +13910,7 @@
12108	13910	clicked = true;
12109	13911	hold = false;
12110	13912
12111		- if (((modifiers & ~1024) & ~0) == 0) // Single or multiple selection
	13913	+ if (((modifiersex & ~1024) & ~0) == 0) // Single or multiple selection
12112	13914	// june 2013 means CTRL_CLICK: if (((modifiers & ~1024) & ~128) == 0) // Single or multiple selection
12113	13915	{
12114	13916	// System.out.println("RESTART II " + modifiers);
..	..	@@ -12139,7 +13941,7 @@
12139	13941	info.camera = renderCamera;
12140	13942	info.x = x;
12141	13943	info.y = y;
12142		- info.modifiers = modifiers;
	13944	+ info.modifiers = modifiersex;
12143	13945	editObj = object.doEditClick(info, 0);
12144	13946	if (!editObj)
12145	13947	{
..	..	@@ -12156,11 +13958,14 @@
12156	13958
12157	13959	public void mouseDragged(MouseEvent e)
12158	13960	{
	13961	+ Globals.MOUSEDRAGGED = true;
	13962	+
	13963	+ //System.out.println("mouseDragged: " + e);
12159	13964	if (isRenderer)
12160	13965	movingcamera = true;
	13966	+
12161	13967	//if (drawing)
12162	13968	//return;
12163		- //System.out.println("mouseDragged: " + e);
12164	13969	if ((e.getModifiersEx() & CTRL) != 0
12165	13970	\|\| (e.getModifiersEx() & COMMAND) != 0) // \|\| IsFrozen())
12166	13971	{
..	..	@@ -12168,7 +13973,7 @@
12168	13973	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12169	13974	}
12170	13975	else
12171		- drag(e.getX(), e.getY(), e.getModifiersEx());
	13976	+ drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
12172	13977
12173	13978	//try { Thread.sleep(1); } catch (Exception ex) {}
12174	13979	}
..	..	@@ -12180,6 +13985,11 @@
12180	13985	cVector tmp = new cVector();
12181	13986	cVector tmp2 = new cVector();
12182	13987	boolean isMoving;
	13988	+
	13989	+ public cVector TargetLookAt()
	13990	+ {
	13991	+ return targetLookAt;
	13992	+ }
12183	13993
12184	13994	class PingThread extends Thread
12185	13995	{
..	..	@@ -12319,7 +14129,7 @@
12319	14129	//System.out.println("---------------- ---------- Paint " + tmp.length2());
12320	14130	if (lightMode)
12321	14131	{
12322		- lighttouched = true;
	14132	+ Globals.lighttouched = true;
12323	14133	}
12324	14134
12325	14135	if (OEILONCE && OEIL)
..	..	@@ -12336,6 +14146,7 @@
12336	14146
12337	14147	public void run()
12338	14148	{
	14149	+ new Exception().printStackTrace();
12339	14150	System.exit(0);
12340	14151	for (;;)
12341	14152	{
..	..	@@ -12377,7 +14188,7 @@
12377	14188	mouseDown = false;
12378	14189	if (lightMode)
12379	14190	{
12380		- lighttouched = true;
	14191	+ Globals.lighttouched = true;
12381	14192	}
12382	14193	repaint();
12383	14194	alreadypainted = true;
..	..	@@ -12385,7 +14196,7 @@
12385	14196	isMoving = false;
12386	14197	} //??
12387	14198
12388		- if (isLIVE() && !alreadypainted)
	14199	+ if (Globals.isLIVE() && !alreadypainted)
12389	14200	{
12390	14201	// FOR DEBUG BREAKPOINT USING PAUSE: while (true)
12391	14202	repaint();
..	..	@@ -12397,9 +14208,9 @@
12397	14208	{
12398	14209	if (lightMode)
12399	14210	{
12400		- lighttouched = true;
	14211	+ Globals.lighttouched = true;
12401	14212	}
12402		- drag(X, (mouseMode != 0) ? Y : anchorY, MODIFIERS);
	14213	+ drag(X, (mouseMode != 0) ? Y : anchorY, 0, MODIFIERS);
12403	14214	}
12404	14215	//else
12405	14216	}
..	..	@@ -12499,7 +14310,7 @@
12499	14310	int X, Y;
12500	14311	boolean SX, SY;
12501	14312
12502		- void drag(int x, int y, int modifiers)
	14313	+ void drag(int x, int y, int modifiers, int modifiersex)
12503	14314	{
12504	14315	if (IsFrozen())
12505	14316	{
..	..	@@ -12508,17 +14319,17 @@
12508	14319
12509	14320	drag = true; // NEW
12510	14321
12511		- boolean continuous = (modifiers & COMMAND) == COMMAND;
	14322	+ boolean continuous = (modifiersex & COMMAND) == COMMAND;
12512	14323
12513	14324	X = x;
12514	14325	Y = y;
12515	14326	// floating state for animation
12516		- MODIFIERS = modifiers;
12517		- modifiers &= ~1024;
	14327	+ MODIFIERS = modifiersex;
	14328	+ modifiersex &= ~1024;
12518	14329	if (false) // modifiers != 0)
12519	14330	{
12520	14331	//new Exception().printStackTrace();
12521		- System.out.println("mouseDragged: " + modifiers);
	14332	+ System.out.println("mouseDragged: " + modifiersex);
12522	14333	System.out.println("SHIFT = " + SHIFT);
12523	14334	System.out.println("CONTROL = " + COMMAND);
12524	14335	System.out.println("META = " + META);
..	..	@@ -12538,7 +14349,7 @@
12538	14349	info.camera = renderCamera;
12539	14350	info.x = x;
12540	14351	info.y = y;
12541		- object.editWindow.copy.doEditDrag(info);
	14352	+ object.editWindow.copy.doEditDrag(info, (modifiers & MouseEvent.BUTTON3_MASK) != 0);
12542	14353	} else
12543	14354	{
12544	14355	if (x < startX)
..	..	@@ -12651,7 +14462,7 @@
12651	14462
12652	14463	if (manipCamera == lightCamera)
12653	14464	{
12654		- lighttouched = true;
	14465	+ Globals.lighttouched = true;
12655	14466	}
12656	14467	/*
12657	14468	switch (mode)
..	..	@@ -12690,7 +14501,6 @@
12690	14501	public void mouseMoved(MouseEvent e)
12691	14502	{
12692	14503	//System.out.println("mouseMoved: " + e);
12693		-
12694	14504	if (isRenderer)
12695	14505	return;
12696	14506
..	..	@@ -12715,7 +14525,10 @@
12715	14525
12716	14526	public void mouseReleased(MouseEvent e)
12717	14527	{
	14528	+ Globals.MOUSEDRAGGED = false;
	14529	+
12718	14530	movingcamera = false;
	14531	+ X = Y = 0;
12719	14532	//System.out.println("mouseReleased: " + e);
12720	14533	clickEnd(e.getX(), e.getY(), e.getModifiersEx());
12721	14534	}
..	..	@@ -12738,9 +14551,9 @@
12738	14551	boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
12739	14552	boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
12740	14553
12741		- if (control \|\| command \|\| IsFrozen())
	14554	+// No delay if (control \|\| command \|\| IsFrozen())
12742	14555	timeout = true;
12743		- else
	14556	+// ?? May 2019 else
12744	14557	// timer.setDelay((modifiers & 128) != 0?0:350);
12745	14558	mouseDown = false;
12746	14559	if (!control && !command) // june 2013
..	..	@@ -12850,7 +14663,7 @@
12850	14663	System.out.println("keyReleased: " + e);
12851	14664	}
12852	14665
12853		- void SetMouseMode(int modifiers)
	14666	+ void SetMouseMode(int modifiers, int modifiersex)
12854	14667	{
12855	14668	//System.out.println("SetMouseMode = " + modifiers);
12856	14669	//modifiers &= ~1024;
..	..	@@ -12862,25 +14675,25 @@
12862	14675	//if (modifiers == 0) // \|\| (modifiers == (1024 \| CONTROL)))
12863	14676	// return;
12864	14677	//System.out.println("SetMode = " + modifiers);
12865		- if ((modifiers & WHEEL) == WHEEL)
	14678	+ if ((modifiersex & WHEEL) == WHEEL)
12866	14679	{
12867	14680	mouseMode \|= ZOOM;
12868	14681	}
12869	14682
12870	14683	boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
12871		- if (capsLocked \|\| (modifiers & META) == META)
	14684	+ if (capsLocked) // \|\| (modifiers & META) == META)
12872	14685	{
12873	14686	mouseMode \|= VR; // BACKFORTH;
12874	14687	}
12875		- if ((modifiers & CTRLCLICK) == CTRLCLICK)
	14688	+ if ((modifiersex & CTRLCLICK) == CTRLCLICK)
12876	14689	{
12877	14690	mouseMode \|= SELECT;
12878	14691	}
12879		- if ((modifiers & COMMAND) == COMMAND)
	14692	+ if ((modifiersex & COMMAND) == COMMAND)
12880	14693	{
12881	14694	mouseMode \|= SELECT;
12882	14695	}
12883		- if ((modifiers & SHIFT) == SHIFT \|\| forcetranslate)
	14696	+ if ((modifiersex & SHIFT) == SHIFT \|\| forcetranslate \|\| (modifiers & MouseEvent.BUTTON3_MASK) != 0)
12884	14697	{
12885	14698	mouseMode &= ~VR;
12886	14699	mouseMode \|= TRANSLATE;
..	..	@@ -12909,10 +14722,10 @@
12909	14722
12910	14723	if (isRenderer) //
12911	14724	{
12912		- SetMouseMode(modifiers);
	14725	+ SetMouseMode(0, modifiers);
12913	14726	}
12914	14727
12915		- theRenderer.keyPressed(key);
	14728	+ Globals.theRenderer.keyPressed(key);
12916	14729	}
12917	14730
12918	14731	int kompactbit = 4; // power bit
..	..	@@ -12924,7 +14737,7 @@
12924	14737	float SATPOW = 1; // 2; // 0.5f;
12925	14738	float BRIPOW = 1; // 0.5f; // 0.5f;
12926	14739
12927		- void keyPressed(int key)
	14740	+ public void keyPressed(int key)
12928	14741	{
12929	14742	if (key >= '0' && key <= '5')
12930	14743	clampbit = (key-'0');
..	..	@@ -13039,7 +14852,7 @@
13039	14852	case 'B':
13040	14853	BRISMOOTH ^= true;
13041	14854	SHADOWCULLFACE ^= true;
13042		- lighttouched = true;
	14855	+ Globals.lighttouched = true;
13043	14856	repaint();
13044	14857	break;
13045	14858	case 'b':
..	..	@@ -13139,7 +14952,7 @@
13139	14952	repaint();
13140	14953	break;
13141	14954	case 'O':
13142		- drawMode = OCCLUSION;
	14955	+ Globals.drawMode = OCCLUSION; // WARNING
13143	14956	repaint();
13144	14957	break;
13145	14958	case 'o':
..	..	@@ -13230,7 +15043,7 @@
13230	15043	break;
13231	15044	case ' ':
13232	15045	lightMode ^= true;
13233		- lighttouched = true;
	15046	+ Globals.lighttouched = true;
13234	15047	manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
13235	15048	targetLookAt.set(manipCamera.lookAt);
13236	15049	repaint();
..	..	@@ -13245,8 +15058,8 @@
13245	15058	//RESIZETEXTURE ^= true;
13246	15059	//break;
13247	15060	case 'z':
13248		- RENDERSHADOW ^= true;
13249		- lighttouched = true;
	15061	+ Globals.RENDERSHADOW ^= true;
	15062	+ Globals.lighttouched = true;
13250	15063	repaint();
13251	15064	break;
13252	15065	//case UP:
..	..	@@ -13361,6 +15174,7 @@
13361	15174	}
13362	15175	//System.out.println("shaper_fovy = " + manipCamera.shaper_fovy);
13363	15176	}
	15177	+
13364	15178	static double OCCLUSIONBOOST = 1; // 0.5;
13365	15179
13366	15180	void keyReleased(int key, int modifiers)
..	..	@@ -13368,11 +15182,11 @@
13368	15182	//mode = ROTATE;
13369	15183	if ((MODIFIERS & COMMAND) == 0) // VR??
13370	15184	{
13371		- SetMouseMode(modifiers);
	15185	+ SetMouseMode(0, modifiers);
13372	15186	}
13373	15187	}
13374	15188
13375		- protected void processKeyEvent(KeyEvent e)
	15189	+ public void processKeyEvent(KeyEvent e)
13376	15190	{
13377	15191	switch (e.getID())
13378	15192	{
..	..	@@ -13502,8 +15316,9 @@
13502	15316
13503	15317	protected void processMouseMotionEvent(MouseEvent e)
13504	15318	{
13505		- //System.out.println("processMouseMotionEvent: " + mouseMode);
13506		- if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15319	+ //System.out.println("processMouseMotionEvent: " + mouseMode + " " + e.getModifiers() + " " + e.getModifiersEx() + " " + e.getButton());
	15320	+ //if (e.getButton() == MouseEvent.NOBUTTON && (mouseMode & SELECT) == 0)
	15321	+ if ((e.getModifiers() & MouseEvent.BUTTON1_MASK) == 0 && (e.getModifiers() & MouseEvent.BUTTON3_MASK) == 0 && (mouseMode & SELECT) == 0)
13507	15322	{
13508	15323	mouseMoved(e);
13509	15324	} else
..	..	@@ -13533,6 +15348,7 @@
13533	15348
13534	15349	void SelectParent()
13535	15350	{
	15351	+ new Exception().printStackTrace();
13536	15352	System.exit(0);
13537	15353	Composite group = (Composite) object;
13538	15354	java.util.Vector selectees = new java.util.Vector(group.selection);
..	..	@@ -13556,6 +15372,7 @@
13556	15372
13557	15373	void SelectChildren()
13558	15374	{
	15375	+ new Exception().printStackTrace();
13559	15376	System.exit(0);
13560	15377	/*
13561	15378	Composite group = (Composite) object;
..	..	@@ -13720,7 +15537,9 @@
13720	15537	info.bounds.setBounds(0, 0, (int) (width * zoom), (int) (height * zoom));
13721	15538	//Image img = CreateImage(width, height);
13722	15539	//System.out.println("width = " + width + "; height = " + height + "\n");
	15540	+
13723	15541	Graphics gr = g; // img.getGraphics();
	15542	+
13724	15543	if (!hasMarquee)
13725	15544	{
13726	15545	if (Xmin < Xmax) // !locked)
..	..	@@ -13818,14 +15637,33 @@
13818	15637	if (!isRenderer)
13819	15638	{
13820	15639	object.drawEditHandles(info, 0);
	15640	+
	15641	+ if (drag && (X != 0 \|\| Y != 0) && object.selection.Size() > 0)
	15642	+ {
	15643	+ switch (object.selection.get(0).hitSomething)
	15644	+ {
	15645	+ case Object3D.hitCenter: gr.setColor(Color.pink);
	15646	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15647	+ break;
	15648	+ case Object3D.hitRotate: gr.setColor(Color.yellow);
	15649	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15650	+ break;
	15651	+ case Object3D.hitScale: gr.setColor(Color.cyan);
	15652	+ gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
	15653	+ break;
	15654	+ }
	15655	+
	15656	+ }
13821	15657	}
13822	15658	}
	15659	+
13823	15660	if (isRenderer)
13824	15661	{
13825	15662	//gr.setColor(Color.black);
13826	15663	//gr.drawRect(info.bounds.x - 1, info.bounds.y - 1, info.bounds.width + 1, info.bounds.height + 1);
13827	15664	//gr.drawRect(info.bounds.x - 2, info.bounds.y - 2, info.bounds.width + 3, info.bounds.height + 3);
13828	15665	}
	15666	+
13829	15667	if (hasMarquee)
13830	15668	{
13831	15669	gr.setXORMode(Color.white);
..	..	@@ -13848,6 +15686,7 @@
13848	15686	//if (g != gr) g.drawImage(img, 0, 0, width, height, null);
13849	15687	}
13850	15688
	15689	+ // To avoid clear.
13851	15690	public void update(Graphics g)
13852	15691	{
13853	15692	paint(g);
..	..	@@ -13937,6 +15776,7 @@
13937	15776	public boolean mouseDown(Event evt, int x, int y)
13938	15777	{
13939	15778	System.out.println("mouseDown: " + evt);
	15779	+ System.exit(0);
13940	15780	/*
13941	15781	locked = true;
13942	15782	drag = false;
..	..	@@ -13980,7 +15820,7 @@
13980	15820	{
13981	15821	keyPressed(0, modifiers);
13982	15822	}
13983		- clickStart(x, y, modifiers);
	15823	+ // clickStart(x, y, modifiers);
13984	15824	return true;
13985	15825	}
13986	15826
..	..	@@ -14098,7 +15938,7 @@
14098	15938	{
14099	15939	keyReleased(0, 0);
14100	15940	}
14101		- drag(x, y, modifiers);
	15941	+ drag(x, y, 0, modifiers);
14102	15942	return true;
14103	15943	}
14104	15944
..	..	@@ -14230,7 +16070,7 @@
14230	16070	Object3D object;
14231	16071	static Object3D trackedobject;
14232	16072	Camera renderCamera; // Light or Eye (or Occlusion)
14233		- /static/ Camera manipCamera; // Light or Eye
	16073	+ /static/ Camera manipCamera; // Light or Eye. Can be Light when Eye, not Eye when Light
14234	16074	/static/ Camera eyeCamera;
14235	16075	/static/ Camera lightCamera;
14236	16076	int cameracount;
..	..	@@ -14510,20 +16350,21 @@
14510	16350	/**/
14511	16351	//checker.GetMaterial().opacity = 1.1f;
14512	16352	////checker.GetMaterial().ambient = 0.99f;
14513		- Object3D.materialstack[Object3D.materialdepth] = checker.material;
14514		- Object3D.selectedstack[Object3D.materialdepth] = false;
14515		- cStatic.objectstack[Object3D.materialdepth++] = checker;
	16353	+ materialstack[materialdepth] = checker.material;
	16354	+ selectedstack[materialdepth] = false;
	16355	+ cStatic.objectstack[materialdepth++] = checker;
14516	16356	//System.out.println("material " + material);
14517	16357	//Applet3D.tracein(this, selected);
14518	16358	vector2buffer = checker.projectedVertices;
14519	16359
14520		- checker.GetMaterial().Draw(this, false); // true);
	16360	+ //checker.GetMaterial().Draw(this, false); // true);
	16361	+ DrawMaterial(checker.GetMaterial(), false); // true);
14521	16362
14522		- Object3D.materialdepth -= 1;
14523		- if (Object3D.materialdepth > 0)
	16363	+ materialdepth -= 1;
	16364	+ if (materialdepth > 0)
14524	16365	{
14525		- vector2buffer = cStatic.objectstack[Object3D.materialdepth - 1].projectedVertices;
14526		- Object3D.materialstack[Object3D.materialdepth - 1].Draw(this, Object3D.selectedstack[Object3D.materialdepth - 1]);
	16366	+ vector2buffer = cStatic.objectstack[materialdepth - 1].projectedVertices;
	16367	+ DrawMaterial(materialstack[materialdepth - 1], selectedstack[materialdepth - 1]);
14527	16368	}
14528	16369	//checker.GetMaterial().opacity = 1f;
14529	16370	////checker.GetMaterial().ambient = 1f;
..	..	@@ -14667,6 +16508,7 @@
14667	16508	{
14668	16509	if (!selection)
14669	16510	{
	16511	+ new Exception().printStackTrace();
14670	16512	System.exit(0);
14671	16513	return;
14672	16514	}
..	..	@@ -14689,14 +16531,14 @@
14689	16531
14690	16532	//int tmp = selection_view;
14691	16533	//selection_view = -1;
14692		- int temp = drawMode;
14693		- drawMode = SELECTION;
	16534	+ int temp = DrawMode();
	16535	+ Globals.drawMode = SELECTION; // WARNING
14694	16536	indexcount = 0;
14695	16537	parent.display(drawable);
14696	16538	//selection_view = tmp;
14697	16539	//if (temp == SELECTION)
14698	16540	// temp = DEFAULT; // patch for selection debug
14699		- drawMode = temp;
	16541	+ Globals.drawMode = temp; // WARNING
14700	16542
14701	16543	//gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
14702	16544
..	..	@@ -14794,16 +16636,16 @@
14794	16636	System.out.println("; fromto " + sel + " " + Trunk(previousselectedpoint.toParent[3][0]) + " " + Trunk(previousselectedpoint.toParent[3][2]) + " " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][2]));
14795	16637	}
14796	16638
14797		- previousselectedpoint = (Sphere) GrafreeD.clone(selectedpoint);
	16639	+ previousselectedpoint = (Sphere) Grafreed.clone(selectedpoint);
14798	16640	}
14799	16641	}
14800	16642
14801	16643	if (!movingcamera && !PAINTMODE)
14802	16644	object.editWindow.ScreenFitPoint(); // fev 2014
14803	16645
14804		- if (PAINTMODE && GrafreeD.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
	16646	+ if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
14805	16647	{
14806		- Object3D paintobj = GrafreeD.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
	16648	+ Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
14807	16649
14808	16650	Object3D group = new Object3D("inst" + paintcount++);
14809	16651
..	..	@@ -14959,7 +16801,7 @@
14959	16801	gl.glDisable(gl.GL_CULL_FACE);
14960	16802	}
14961	16803
14962		- if (!RENDERSHADOW)
	16804	+ if (!Globals.RENDERSHADOW)
14963	16805	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
14964	16806
14965	16807	// SB gl.glPolygonOffset(2.5f, 10);
..	..	@@ -14969,14 +16811,14 @@
14969	16811	//gl.glColorMask(false, false, false, false);
14970	16812
14971	16813	//render_scene_from_light_view(gl, drawable, 0, 0);
14972		- if (RENDERSHADOW && lighttouched && !movingcamera) // && !parent.IsFreezed())
	16814	+ if (Globals.RENDERSHADOW && Globals.lighttouched && (!movingcamera \|\| !Globals.FREEZEONMOVE)) // && !parent.IsFreezed())
14973	16815	{
14974	16816	gl.glClear(GL.GL_COLOR_BUFFER_BIT \| GL.GL_DEPTH_BUFFER_BIT);
14975	16817
14976		- int temp = drawMode;
14977		- drawMode = SHADOW;
	16818	+ int temp = DrawMode();
	16819	+ Globals.drawMode = SHADOW; // WARNING
14978	16820	parent.display(drawable);
14979		- drawMode = temp;
	16821	+ Globals.drawMode = temp; // WARNING
14980	16822	}
14981	16823
14982	16824	gl.glCullFace(gl.GL_BACK);
..	..	@@ -15029,7 +16871,6 @@
15029	16871
15030	16872	class AntialiasBuffer implements GLEventListener
15031	16873	{
15032		-
15033	16874	CameraPane parent = null;
15034	16875
15035	16876	AntialiasBuffer(CameraPane p)
..	..	@@ -15374,12 +17215,6 @@
15374	17215	GLUT glut = new GLUT();
15375	17216
15376	17217
15377		- static final public int DEFAULT = 0;
15378		- static final public int SELECTION = 1;
15379		- static final public int SHADOW = 2;
15380		- static final public int OCCLUSION = 3;
15381		- static
15382		- public int drawMode = DEFAULT;
15383	17218	public boolean spherical = false;
15384	17219	static boolean DEBUG_OCCLUSION = false;
15385	17220	static boolean DEBUG_SELECTION = false;
..	..	@@ -15428,7 +17263,7 @@
15428	17263	}
15429	17264	}
15430	17265
15431		- static void DrawPoints(CameraPane cpane)
	17266	+ static void DrawPoints(iCameraPane cpane)
15432	17267	{
15433	17268	for (int i=0; i<8; i++) // first and last are red
15434	17269	{
..	..	@@ -15460,10 +17295,11 @@
15460	17295	static IntBuffer textbuffer = null; // IntBuffer.allocate(TEXT_WIDTH88 * TEXT_HEIGHT);
15461	17296	// Depth buffer format
15462	17297	//private int depth_format;
15463		- static public void NextIndex(Object3D o, GL gl)
	17298	+
	17299	+ public void NextIndex()
15464	17300	{
15465	17301	indexcount+=16;
15466		- gl.glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
	17302	+ GetGL().glColor3d(((indexcount >>> 16) & 255) / 255.0, ((indexcount >>> 8) & 255) / 255.0, ((indexcount) & 255) / 255.0);
15467	17303	//objects[indexcount] = o;
15468	17304	//System.out.println("indexcount = " + indexcount);
15469	17305	}